On Mon, Sep 26, 2005 at 03:34:11PM +0900, Horms wrote:
> Hi Manoj,
>
> Sven Luther has prepared an update of kernel-package that
> fixes some minor problems that prevent the sarge version
> from being able to compile linux-2.6, which we would
> like to get included in volatile.
>
> The package, and its changes are here, though you
> will have to ask Sven about the details if they
> are non-obvious. I just verified that it worked,
> and Sven has asked me to handle the upload as he is
> busy this week.
>
> I'm writing to you to see if you have any
> objections to this upload. Or alternatively,
> if you would like to make the update yourself.
> The changes are at the following links.
>
> N.B: the packages at the following should be exactly the same.
> Sven's Copy: http://people.debian.org/~luther/kernel/
> My Copy: http://packages.vergenet.net/testing/kernel-package/
And attached is the debdiff output ...
As you see there are two issues, the powerpc/powerpc64 flavours you accepted
for sid earlier, which enables to call the kernel-side mkvmlinuz stuff, and
the defconfig stuff, which Andres worked around, but is over trivial.
Friendly,
Sven Luther
diff -Nru /tmp/A5mYchwHJ3/kernel-package-8.135/debian/changelog
/tmp/JOBfXJYYtq/kernel-package-8.135.sarge1/debian/changelog
--- /tmp/A5mYchwHJ3/kernel-package-8.135/debian/changelog 2005-05-07
10:02:25.000000000 +0200
+++ /tmp/JOBfXJYYtq/kernel-package-8.135.sarge1/debian/changelog
2005-09-08 16:15:43.000000000 +0200
@@ -1,3 +1,11 @@
+kernel-package (8.135.sarge1) unstable; urgency=low
+
+ * Backport to build the new common linux-2.6 kernels packages in sarge.
+ - powerpc generic target (powerpc, powerpc64) fixes.
+ - defconfig target.
+
+ -- Sven Luther <[EMAIL PROTECTED]> Thu, 8 Sep 2005 14:14:38 +0000
+
kernel-package (8.135) unstable; urgency=medium
* Bug fix: "kernel-package incompatible with experimental dpkg", thanks
diff -Nru /tmp/A5mYchwHJ3/kernel-package-8.135/kernel/rules
/tmp/JOBfXJYYtq/kernel-package-8.135.sarge1/kernel/rules
--- /tmp/A5mYchwHJ3/kernel-package-8.135/kernel/rules 2005-05-07
09:40:22.000000000 +0200
+++ /tmp/JOBfXJYYtq/kernel-package-8.135.sarge1/kernel/rules 2005-09-08
08:38:28.000000000 +0200
@@ -316,16 +316,31 @@
endif
##### PowerPC64
-ifeq ($(strip $(architecture)), powerpc64)
- KERNEL_ARCH=ppc64
+ifneq ($(strip $(filter ppc64 powerpc64,$(architecture))),)
kimage := vmlinux
- loader=NoLoader
- target = $(kimage)
kimagesrc = vmlinux
kimagedest = $(INT_IMAGE_DESTDIR)/vmlinux-$(version)
DEBCONFIG= $(CONFDIR)/config.$(KPKG_SUBARCH)
- kelfimagesrc = vmlinux
- kelfimagedest = $(INT_IMAGE_DESTDIR)/vmlinux-$(version)
+ loader=NoLoader
+ ifneq (,$(findstring $(KPKG_SUBARCH), powerpc powerpc64))
+ ifneq (,$(findstring $(KPKG_SUBARCH), powerpc64))
+ KERNEL_ARCH:=ppc64
+ endif
+ ifneq (,$(findstring $(KPKG_SUBARCH), powerpc))
+ KERNEL_ARCH:=ppc
+ NEED_IMAGE_POST_PROCESSING = YES
+ IMAGE_POST_PROCESS_TARGET := mkvmlinuz_support_install
+ IMAGE_POST_PROCESS_DIR := arch/ppc/boot
+ INSTALL_MKVMLINUZ_PATH =
$(SRCTOP)/$(IMAGE_TOP)/usr/lib/kernel-image-${version}
+ endif
+ target := zImage
+ loaderdep=mkvmlinuz
+ else
+ KERNEL_ARCH=ppc64
+ target = $(kimage)
+ kelfimagesrc = vmlinux
+ kelfimagedest = $(INT_IMAGE_DESTDIR)/vmlinux-$(version)
+ endif
endif
### PowerPC
@@ -353,12 +368,30 @@
#endif
endif
- ifeq (,$(findstring $(KPKG_SUBARCH),apus prpmc chrp mbx pmac prep Amiga APUs
CHRP MBX PReP chrp-rs6k nubus ))
+ ifeq (,$(findstring $(KPKG_SUBARCH),apus prpmc chrp mbx pmac prep Amiga APUs
CHRP MBX PReP chrp-rs6k nubus powerpc powerpc64 ))
KPKG_SUBARCH:=$(GUESS_SUBARCH)
endif
KERNEL_ARCH:=ppc
+ ifneq (,$(findstring $(KPKG_SUBARCH), powerpc powerpc64))
+ ifneq (,$(findstring $(KPKG_SUBARCH), powerpc64))
+ KERNEL_ARCH:=ppc64
+ endif
+ ifneq (,$(findstring $(KPKG_SUBARCH), powerpc))
+ KERNEL_ARCH:=ppc
+ NEED_IMAGE_POST_PROCESSING = YES
+ IMAGE_POST_PROCESS_TARGET := mkvmlinuz_support_install
+ IMAGE_POST_PROCESS_DIR := arch/ppc/boot
+ INSTALL_MKVMLINUZ_PATH =
$(SRCTOP)/$(IMAGE_TOP)/usr/lib/kernel-image-${version}
+ endif
+ target := zImage
+ loaderdep=mkvmlinuz
+ kimagesrc = vmlinux
+ kimage := vmlinux
+ kimagedest = $(INT_IMAGE_DESTDIR)/vmlinux-$(version)
+ DEBCONFIG= $(CONFDIR)/config.$(KPKG_SUBARCH)
+ endif
ifneq (,$(findstring $(KPKG_SUBARCH),APUs apus Amiga))
KPKG_SUBARCH:=apus
loader := NoLoader
@@ -2472,6 +2505,12 @@
IMAGE_TOP=$(IMAGE_TOP) STEM=$(INT_STEM) version=$(version) \
debian/post-install; \
fi
+ifeq ($(strip $(NEED_IMAGE_POST_PROCESSING)),YES)
+ if grep $(IMAGE_POST_PROCESS_TARGET) $(IMAGE_POST_PROCESS_DIR)/Makefile
2>&1 >/dev/null; then \
+ $(MAKE) INSTALL_MKVMLINUZ=$(INSTALL_MKVMLINUZ_PATH)
\
+ ARCH=$(KERNEL_ARCH) -C $(IMAGE_POST_PROCESS_DIR)
$(IMAGE_POST_PROCESS_TARGET); \
+ fi
+endif
ifneq ($(strip $(image_clean_hook)),)
(cd $(IMAGE_TOP); \
test -x $(image_clean_hook) && $(image_clean_hook))
diff -Nru /tmp/A5mYchwHJ3/kernel-package-8.135/make-kpkg
/tmp/JOBfXJYYtq/kernel-package-8.135.sarge1/make-kpkg
--- /tmp/A5mYchwHJ3/kernel-package-8.135/make-kpkg 2005-04-13
08:16:43.000000000 +0200
+++ /tmp/JOBfXJYYtq/kernel-package-8.135.sarge1/make-kpkg 2005-09-08
16:14:32.000000000 +0200
@@ -697,8 +697,8 @@
exit 1;
}
- if ($config_target !~ /^(?:|old|menu|x|g)(config)?$/) {
- print "Config type must be one of
{config,oldconfig,menuconfig,xconfig,gconfig}.\n";
+ if ($config_target !~ /^(?:|old|menu|x|g|def)(config)?$/) {
+ print "Config type must be one of
{config,oldconfig,menuconfig,xconfig,gconfig,defconfig}.\n";
print "use --help to display command line syntax help.\n";
exit 1;
}
diff -Nru /tmp/A5mYchwHJ3/kernel-package-8.135/make-kpkg.8
/tmp/JOBfXJYYtq/kernel-package-8.135.sarge1/make-kpkg.8
--- /tmp/A5mYchwHJ3/kernel-package-8.135/make-kpkg.8 2005-05-01
21:17:21.000000000 +0200
+++ /tmp/JOBfXJYYtq/kernel-package-8.135.sarge1/make-kpkg.8 2005-09-08
16:14:20.000000000 +0200
@@ -328,8 +328,8 @@
.BR \-\-config " target"
Change the type of configure done from the default \f(CWoldconfig\fR.
\fItarget\fR must be one of \f(CWoldconfig\fR, \f(CWconfig\fR,
-\f(CWmenuconfig\fR, \f(CWgconfig\fR, \f(CWxconfig\fR; \f(CWold\fR,
-\f(CWmenu\fR, \f(CWg\fR, or \f(CWx\fR.
+\f(CWmenuconfig\fR, \f(CWgconfig\fR, \f(CWxconfig\fR, \f(CWdefconfig\fR,
\f(CWold\fR,
+\f(CWmenu\fR, \f(CWg\fR, \f(CWx\fR, or \f(CWdef\fR.
.Sp
This option is particularly useful when using \s-1PATCH_THE_KERNEL\s0 if some
of the patches change what configuration options are available.
