Hi,
Patch was incorrect when debian/ directory existed,
tested now with
$ rm -r debian
$ make-kpkg clean
$ make-kpkg debian
$ make-kpkg clean
I hope I'm assuming right:
'architecture' is the Debian architecture,
'KERNEL_ARCH' is the Kernel architecture.
regards,
junichi
--
[EMAIL PROTECTED],netfort.gr.jp} Debian Project
diff -ur -X /home/dancer/DONTDIFF -x minimal.mk
../kernel-package-10.020-orig/debian/changelog
../kernel-package-10.020-fixbuild2/debian/changelog
--- ../kernel-package-10.020-orig/debian/changelog 2005-12-20
11:14:02.000000000 +0900
+++ ../kernel-package-10.020-fixbuild2/debian/changelog 2005-12-22
08:24:49.000000000 +0900
@@ -1,3 +1,9 @@
+kernel-package (10.020.1) unstable; urgency=low
+
+ * 344335
+
+ -- Junichi Uekawa <[EMAIL PROTECTED]> Thu, 22 Dec 2005 08:08:43 +0900
+
kernel-package (10.020) unstable; urgency=low
* Fix issues with conf.vars. Make build.arch also depend on conf.vars.
diff -ur -X /home/dancer/DONTDIFF -x minimal.mk
../kernel-package-10.020-orig/kernel/ruleset/misc/defaults.mk
../kernel-package-10.020-fixbuild2/kernel/ruleset/misc/defaults.mk
--- ../kernel-package-10.020-orig/kernel/ruleset/misc/defaults.mk
2005-11-04 15:02:42.000000000 +0900
+++ ../kernel-package-10.020-fixbuild2/kernel/ruleset/misc/defaults.mk
2005-12-22 08:19:13.000000000 +0900
@@ -128,7 +128,11 @@
CROSS_ARG:=CROSS_COMPILE=$(KERNEL_CROSS)
endif
-KERNEL_ARCH:=$(architecture)
+ifeq ($(architecture), amd64)
+ KERNEL_ARCH:=x86_64
+else
+ KERNEL_ARCH:=$(architecture)
+endif
DEBCONFIG = $(CONFDIR)/config
IMAGEDIR=/boot
@@ -148,7 +152,13 @@
INT_STEM := $(DEB_HOST_ARCH_OS)
endif
-
+.PHONY: unit-test-defaults.mk
+unit-test-defaults.mk:
+ # run the following commands to unit-test this file:
+ # eval ` dpkg-architecture -s `
+ # make -f kernel/ruleset/misc/defaults.mk unit-test-defaults.mk
+ echo architecture:$(architecture), KERNEL_ARCH:$(KERNEL_ARCH)
+
#Local variables:
#mode: makefile
#End:
