r1071 - trunk/type-handling/debian
Author: aurel32
Date: 2006-01-18 19:53:08 +0000 (Wed, 18 Jan 2006)
New Revision: 1071
Modified:
trunk/type-handling/debian/changelog
trunk/type-handling/debian/rules
Log:
* Provides and filters out both the Debian and GNU type/CPU. Should fix
the problem with type-handling providing not+hurd on GNU/Hurd.
* Does not provide hurd on GNU/Hurd, as type-handling does not provide
the hurd kernel.
Modified: trunk/type-handling/debian/changelog
===================================================================
--- trunk/type-handling/debian/changelog 2006-01-18 19:27:45 UTC (rev 1070)
+++ trunk/type-handling/debian/changelog 2006-01-18 19:53:08 UTC (rev 1071)
@@ -1,3 +1,12 @@
+type-handling (0.2.18) unstable; urgency=low
+
+ * Provides and filters out both the Debian and GNU type/CPU. Should fix
+ the problem with type-handling providing not+hurd on GNU/Hurd.
+ * Does not provide hurd on GNU/Hurd, as type-handling does not provide
+ the hurd kernel.
+
+ -- Aurelien Jarno <aurel32@debian.org> Wed, 18 Jan 2006 20:29:09 +0100
+
type-handling (0.2.17) unstable; urgency=low
[ Peter Eisentraut ]
Modified: trunk/type-handling/debian/rules
===================================================================
--- trunk/type-handling/debian/rules 2006-01-18 19:27:45 UTC (rev 1070)
+++ trunk/type-handling/debian/rules 2006-01-18 19:53:08 UTC (rev 1071)
@@ -6,21 +6,26 @@
#export DH_VERBOSE=1
DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
-DEB_BUILD_GNU_TYPE = $(DEB_BUILD_ARCH_CPU)-$(DEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-cpus := $(shell grep -v ^\# /usr/share/dpkg/cputable | (while read debian gnu regex ; do echo $${debian} ; done))
-systems=$(shell grep -v ^\# /usr/share/dpkg/ostable | (while read debian gnu regex ; do echo $${debian} ; done))
-systems := $(shell echo $(systems) linux-gnu | tr " " "\n" | grep -vx linux | sort | uniq)
+cpus := $(shell grep -v ^\# /usr/share/dpkg/cputable | (while read debian gnu regex ; do echo $${debian} ; echo $${gnu}; done) | sort -u)
+systems := $(shell grep -v ^\# /usr/share/dpkg/ostable | (while read debian gnu regex ; do echo $${debian} ; echo $${gnu}; done) | sort -u)
-not_cpus := $(shell echo $(cpus) | tr " " "\n" | grep -vx $(DEB_BUILD_ARCH_CPU))
-not_systems := $(shell echo $(systems) | tr " " "\n" | grep -vx $(DEB_BUILD_GNU_SYSTEM))
+not_cpus := $(shell echo $(cpus) | tr " " "\n" | grep -vx $(DEB_BUILD_ARCH_CPU) | grep -vx $(DEB_BUILD_GNU_CPU))
+not_systems := $(shell echo $(systems) | tr " " "\n" | grep -vx $(DEB_BUILD_ARCH_OS) | grep -vx $(DEB_BUILD_GNU_SYSTEM))
not_cpus := $(shell for cpu in $(not_cpus) ; do echo -n , not+$$cpu ; done)
not_systems := $(shell for system in $(not_systems) ; do echo -n , not+$$system ; done)
-provides = $(DEB_BUILD_ARCH_CPU), $(DEB_BUILD_GNU_SYSTEM), $(DEB_BUILD_GNU_TYPE)$(not_cpus)$(not_systems)
+ifneq (hurd,$(DEB_HOST_ARCH_OS))
+provides = $(DEB_HOST_ARCH_OS),
+endif
+provides += $(DEB_BUILD_ARCH_CPU), $(DEB_BUILD_GNU_SYSTEM), $(DEB_BUILD_GNU_TYPE), $(not_cpus), $(not_systems)
+
clean:
dh_testdir
dh_testroot
Reply to: