[kernel] r18137 - dists/trunk/linux-2.6/debian

Ben Hutchings benh at alioth.debian.org
Thu Sep 29 03:50:25 UTC 2011


Author: benh
Date: Thu Sep 29 03:50:23 2011
New Revision: 18137

Log:
Make kernel-wedge package checks non-fatal in experimental builds

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/rules.real

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Wed Sep 28 14:19:10 2011	(r18136)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Sep 29 03:50:23 2011	(r18137)
@@ -4,6 +4,7 @@
 
   [ Ben Hutchings ]
   * [powerpc/powerpc64] Add missing #include to LPAR console selection fix
+  * Make kernel-wedge package checks non-fatal in experimental builds
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 27 Sep 2011 06:02:56 +0100
 

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	Wed Sep 28 14:19:10 2011	(r18136)
+++ dists/trunk/linux-2.6/debian/rules.real	Thu Sep 29 03:50:23 2011	(r18137)
@@ -11,11 +11,16 @@
 DEB_HOST_MULTIARCH:= $(shell dpkg-architecture -a'$(ARCH)' -qDEB_HOST_MULTIARCH)
 DEB_BUILD_ARCH    := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_BUILD_ARCH)
 UPLOADER  := $(shell dpkg-parsechangelog | sed -ne 's,^Maintainer: .[^<]*<\([^>]*\)>,\1,p')
+DISTRIBUTION := $(shell dpkg-parsechangelog | sed -ne 's,^Distribution: ,,p')
 
 export PYTHONPATH = $(CURDIR)/debian/lib/python
 export DH_OPTIONS
 export DEB_HOST_ARCH DEB_HOST_GNU_TYPE DEB_BUILD_ARCH
 
+ifneq (,$(filter experimental UNRELEASED,$(DISTRIBUTION)))
+  export KW_CHECK_NONFATAL = y
+endif
+
 include debian/rules.defs
 
 stamp = [ -d $(dir $@) ] || mkdir $(dir $@); touch $@



More information about the Kernel-svn-changes mailing list