On Fri, Dec 28, 2007 at 11:46:20PM +0000, Martin Guy wrote: > Hi! > The armel port is still blocked on this item. The bugfix was > submitted over 7 months ago and included over a month a go in version > control. > If possible, would you expedite an upload of the new version please? > These timescales are glacial! > Thanks >
Given that the bug is still not fixed, I have made a porter NMU which is currently in DELAYED/5. Please find the diff attached. -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' [EMAIL PROTECTED] | [EMAIL PROTECTED] `- people.debian.org/~aurel32 | www.aurel32.net
diff -Nru kernel-package-11.001/debian/changelog kernel-package-11.001/debian/changelog
--- kernel-package-11.001/debian/changelog 2007-05-05 07:48:33.000000000 +0200
+++ kernel-package-11.001/debian/changelog 2008-01-15 00:49:25.000000000 +0100
@@ -1,3 +1,11 @@
+kernel-package (11.001-0.1) unstable; urgency=low
+
+ * Porter NMU.
+ * kernel/ruleset/*.mk: use DEB_HOST_ARCH_OS instead of DEB_HOST_GNU_SYSTEM
+ to fix make-kpkg on armel (Closes: #425971).
+
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Tue, 15 Jan 2008 00:37:03 +0100
+
kernel-package (11.001) unstable; urgency=low
* Bug fix: "kernel-package: Typo "call" -> "cause" in make-kpkg(1)
diff -Nru /tmp/aHqHfrlLcI/kernel-package-11.001/kernel/ruleset/arches/amd64.mk /tmp/6oN0RlhauX/kernel-package-11.001/kernel/ruleset/arches/amd64.mk
--- kernel-package-11.001/kernel/ruleset/arches/amd64.mk 2007-05-05 07:48:30.000000000 +0200
+++ kernel-package-11.001/kernel/ruleset/arches/amd64.mk 2008-01-15 00:40:43.000000000 +0100
@@ -31,7 +31,7 @@
###############################################################################
KERNEL_ARCH=x86_64
-ifeq ($(DEB_HOST_GNU_SYSTEM), linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS), linux)
ifeq ($(strip $(CONFIG_X86_64_XEN)),)
kimage := bzImage
loaderdep=lilo (>= 19.1) | grub
diff -Nru /tmp/aHqHfrlLcI/kernel-package-11.001/kernel/ruleset/arches/i386.mk /tmp/6oN0RlhauX/kernel-package-11.001/kernel/ruleset/arches/i386.mk
--- kernel-package-11.001/kernel/ruleset/arches/i386.mk 2007-05-05 07:48:30.000000000 +0200
+++ kernel-package-11.001/kernel/ruleset/arches/i386.mk 2008-01-15 00:40:43.000000000 +0100
@@ -41,7 +41,7 @@
KPKG_SUBARCH:=$(GUESS_SUBARCH)
endif
DEBCONFIG= $(CONFDIR)/config.$(KPKG_SUBARCH)
-ifeq ($(DEB_HOST_GNU_SYSTEM), linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS), linux)
ifeq ($(strip $(CONFIG_X86_XEN)),)
kimagesrc = $(strip arch/$(KERNEL_ARCH)/boot/$(kimage))
kimagedest = $(INT_IMAGE_DESTDIR)/vmlinuz-$(version)
@@ -68,7 +68,7 @@
else
loaderdep=grub | grub2
loader=grub
- ifeq ($(DEB_HOST_GNU_SYSTEM), kfreebsd-gnu)
+ ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
kimagesrc = $(strip $(KERNEL_ARCH)/compile/GENERIC/kernel)
kimagedest = $(INT_IMAGE_DESTDIR)/kfreebsd-$(version)
endif
diff -Nru /tmp/aHqHfrlLcI/kernel-package-11.001/kernel/ruleset/minimal.mk /tmp/6oN0RlhauX/kernel-package-11.001/kernel/ruleset/minimal.mk
--- kernel-package-11.001/kernel/ruleset/minimal.mk 2007-05-05 07:48:30.000000000 +0200
+++ kernel-package-11.001/kernel/ruleset/minimal.mk 2008-01-15 00:40:43.000000000 +0100
@@ -68,7 +68,7 @@
minimal_clean:
$(REASON)
@echo $(if $(strip $(kpkg_version)),"This is kernel package version $(kpkg_version).","Cleaning.")
-ifeq ($(DEB_HOST_GNU_SYSTEM), linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS), linux)
test ! -f .config || cp -pf .config config.precious
test ! -e stamp-building || rm -f stamp-building
test ! -f Makefile || \
@@ -76,7 +76,7 @@
test ! -f config.precious || mv -f config.precious .config
else
rm -f .config
- ifeq ($(DEB_HOST_GNU_SYSTEM), kfreebsd-gnu)
+ ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
rm -rf bin
if test -e $(architecture)/compile/GENERIC ; then \
$(PMAKE) -C $(architecture)/compile/GENERIC clean ; \
diff -Nru /tmp/aHqHfrlLcI/kernel-package-11.001/kernel/ruleset/misc/defaults.mk /tmp/6oN0RlhauX/kernel-package-11.001/kernel/ruleset/misc/defaults.mk
--- kernel-package-11.001/kernel/ruleset/misc/defaults.mk 2007-05-05 07:48:30.000000000 +0200
+++ kernel-package-11.001/kernel/ruleset/misc/defaults.mk 2008-01-15 00:40:43.000000000 +0100
@@ -140,7 +140,7 @@
include $(DEBDIR)/ruleset/misc/kernel_arch.mk
-ifeq ($(DEB_HOST_GNU_SYSTEM), kfreebsd-gnu)
+ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
PMAKE = PATH=/usr/lib/freebsd/:$(CURDIR)/bin:$(PATH) WERROR= MAKEFLAGS= freebsd-make
endif
diff -Nru /tmp/aHqHfrlLcI/kernel-package-11.001/kernel/ruleset/misc/modules.mk /tmp/6oN0RlhauX/kernel-package-11.001/kernel/ruleset/misc/modules.mk
--- kernel-package-11.001/kernel/ruleset/misc/modules.mk 2007-05-05 07:48:30.000000000 +0200
+++ kernel-package-11.001/kernel/ruleset/misc/modules.mk 2008-01-15 00:40:43.000000000 +0100
@@ -65,17 +65,17 @@
fi)
-ifeq ($(DEB_HOST_GNU_SYSTEM), linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS), linux)
config = .config
else
- ifeq ($(DEB_HOST_GNU_SYSTEM), kfreebsd-gnu)
+ ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
config = $(architecture)/conf/GENERIC
endif
endif
# define MODULES_ENABLED if appropriate
-ifneq ($(filter kfreebsd-gnu, $(DEB_HOST_GNU_SYSTEM)):$(strip $(shell grep -E ^[^\#]*CONFIG_MODULES $(CONFIG_FILE))),:)
+ifneq ($(filter kfreebsd, $(DEB_HOST_ARCH_OS)):$(strip $(shell grep -E ^[^\#]*CONFIG_MODULES $(CONFIG_FILE))),:)
MODULES_ENABLED := YES
endif
diff -Nru /tmp/aHqHfrlLcI/kernel-package-11.001/kernel/ruleset/misc/version_vars.mk /tmp/6oN0RlhauX/kernel-package-11.001/kernel/ruleset/misc/version_vars.mk
--- kernel-package-11.001/kernel/ruleset/misc/version_vars.mk 2007-05-05 07:48:30.000000000 +0200
+++ kernel-package-11.001/kernel/ruleset/misc/version_vars.mk 2008-01-15 00:40:43.000000000 +0100
@@ -35,7 +35,7 @@
###############################################################################
-ifeq ($(DEB_HOST_GNU_SYSTEM), linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS), linux)
localversion_files := $(wildcard localversion*)
# Could have used :=, but some patches do seem to patch the
@@ -102,7 +102,7 @@
endif
endif
else
- ifeq ($(DEB_HOST_GNU_SYSTEM), kfreebsd-gnu)
+ ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
VERSION =$(call doit,grep '^REVISION=' conf/newvers.sh | \
sed -e 's/[^0-9]*\([0-9]\)\..*/\1/')
PATCHLEVEL =$(call doit,grep '^REVISION=' conf/newvers.sh | \
@@ -184,7 +184,7 @@
AM_OFFICIAL := $(call doit,if [ -f debian/official ]; then echo YES; fi )
# See if we are being run in the kernel directory
-ifeq ($(DEB_HOST_GNU_SYSTEM), linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS), linux)
define check_kernel_dir
IN_KERNEL_DIR := $(call doit,if test -d drivers && test -d kernel && test -d fs && test \
-d include/linux ; then \
@@ -192,7 +192,7 @@
fi )
endef
else
- ifeq ($(DEB_HOST_GNU_SYSTEM), kfreebsd-gnu)
+ ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
define check_kernel_dir
IN_KERNEL_DIR := $(call doit,if test -d dev && test -d kern && test -d fs && \
test -d i386/include ; then echo YES; fi)
diff -Nru /tmp/aHqHfrlLcI/kernel-package-11.001/kernel/ruleset/targets/image.mk /tmp/6oN0RlhauX/kernel-package-11.001/kernel/ruleset/targets/image.mk
--- kernel-package-11.001/kernel/ruleset/targets/image.mk 2007-05-05 07:48:30.000000000 +0200
+++ kernel-package-11.001/kernel/ruleset/targets/image.mk 2008-01-15 00:40:43.000000000 +0100
@@ -44,7 +44,7 @@
$(eval $(which_debdir))
$(make_directory) $(TMPTOP)/$(IMAGEDIR)
$(make_directory) $(DOCDIR)/examples
-ifeq ($(DEB_HOST_GNU_SYSTEM), linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS), linux)
$(install_file) Documentation/Changes $(DOCDIR)/
gzip -9qf $(DOCDIR)/Changes
endif
@@ -100,12 +100,12 @@
ifeq ($(strip $(HAVE_EXTRA_DOCS)),YES)
$(install_file) $(extra_docs) $(DOCDIR)/
endif
-ifneq ($(filter kfreebsd-gnu, $(DEB_HOST_GNU_SYSTEM)):$(strip $(shell grep -E ^[^\#]*CONFIG_MODULES $(CONFIG_FILE))),:)
- ifeq ($(DEB_HOST_GNU_SYSTEM):$(strip $(HAVE_NEW_MODLIB)),linux:)
+ifneq ($(filter kfreebsd, $(DEB_HOST_ARCH_OS)):$(strip $(shell grep -E ^[^\#]*CONFIG_MODULES $(CONFIG_FILE))),:)
+ ifeq ($(DEB_HOST_ARCH_OS):$(strip $(HAVE_NEW_MODLIB)),linux:)
$(mod_inst_cmds)
else
# could have also said DEPMOD=/bin/true instead of moving files
- ifeq ($(DEB_HOST_GNU_SYSTEM), linux-gnu)
+ ifeq ($(DEB_HOST_ARCH_OS), linux)
ifneq ($(strip $(KERNEL_CROSS)),)
mv System.map System.precious
endif
@@ -115,7 +115,7 @@
mv System.precious System.map
endif
else
- ifeq ($(DEB_HOST_GNU_SYSTEM), kfreebsd-gnu)
+ ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
mkdir -p $(INSTALL_MOD_PATH)/boot/defaults
install -o root -g root -m 644 \
$(architecture)/conf/GENERIC.hints \
diff -Nru /tmp/aHqHfrlLcI/kernel-package-11.001/kernel/ruleset/targets/target.mk /tmp/6oN0RlhauX/kernel-package-11.001/kernel/ruleset/targets/target.mk
--- kernel-package-11.001/kernel/ruleset/targets/target.mk 2007-05-05 07:48:30.000000000 +0200
+++ kernel-package-11.001/kernel/ruleset/targets/target.mk 2008-01-15 00:40:43.000000000 +0100
@@ -89,7 +89,7 @@
@echo "KPKG_ARCH = $(KPKG_ARCH)" >> .mak
# Fetch the rest of the information from the kernel's Makefile
$(eval $(which_debdir))
-ifeq ($(DEB_HOST_GNU_SYSTEM), linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS), linux)
@$(MAKE) --no-print-directory -sf $(DEBDIR)/ruleset/kernel_version.mk \
ARCH=$(KERNEL_ARCH) $(CROSS_ARG) debian_conf_var >> .mak
endif
@@ -105,11 +105,11 @@
debian/dummy_do_dep:
$(REASON)
-ifeq ($(DEB_HOST_GNU_SYSTEM), linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+$(MAKE) $(EXTRAV_ARG) $(FLAV_ARG) $(CROSS_ARG) \
ARCH=$(KERNEL_ARCH) $(fast_dep) dep
else
- ifeq ($(DEB_HOST_GNU_SYSTEM), kfreebsd-gnu)
+ ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
$(PMAKE) -C $(architecture)/compile/GENERIC depend
endif
endif
@@ -119,12 +119,12 @@
$(REASON)
$(eval $(which_debdir))
$(eval $(deb_rule))
-ifeq ($(DEB_HOST_GNU_SYSTEM), kfreebsd-gnu)
+ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
mkdir -p bin
ln -sf `which gcc-3.4` bin/cc
cd $(architecture)/conf && freebsd-config GENERIC
endif
-ifeq ($(DEB_HOST_GNU_SYSTEM), linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS), linux)
$(MAKE) $(EXTRAV_ARG) $(FLAV_ARG) $(CROSS_ARG) ARCH=$(KERNEL_ARCH) \
$(config_target)
ifeq ($(shell if [ $(VERSION) -gt 2 ]; then \
@@ -254,14 +254,14 @@
mv -f scripts/package/builddeb.kpkg-dist scripts/package/builddeb
test ! -f scripts/package/Makefile.kpkg-dist || \
mv -f scripts/package/Makefile.kpkg-dist scripts/package/Makefile
-ifeq ($(DEB_HOST_GNU_SYSTEM), linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS), linux)
test ! -f .config || cp -pf .config config.precious
test ! -f Makefile || \
$(MAKE) $(FLAV_ARG) $(EXTRAV_ARG) $(CROSS_ARG) ARCH=$(KERNEL_ARCH) distclean
test ! -f config.precious || mv -f config.precious .config
else
rm -f .config
- ifeq ($(DEB_HOST_GNU_SYSTEM), kfreebsd-gnu)
+ ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
rm -rf bin
if test -e $(architecture)/compile/GENERIC ; then \
$(PMAKE) -C $(architecture)/compile/GENERIC clean ; \
@@ -310,7 +310,7 @@
touch Makefile; \
fi; \
fi)
-ifeq ($(DEB_HOST_GNU_SYSTEM), linux-gnu)
+ifeq ($(DEB_HOST_ARCH_OS), linux)
$(MAKE) $(do_parallel) $(EXTRAV_ARG) $(FLAV_ARG) ARCH=$(KERNEL_ARCH) \
$(CROSS_ARG) $(target)
ifneq ($(strip $(shell grep -E ^[^\#]*CONFIG_MODULES $(CONFIG_FILE))),)
@@ -318,7 +318,7 @@
$(CROSS_ARG) modules
endif
else
- ifeq ($(DEB_HOST_GNU_SYSTEM), kfreebsd-gnu)
+ ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
$(PMAKE) -C $(architecture)/compile/GENERIC
endif
endif
signature.asc
Description: Digital signature
