volatile backport
I'm working on a backport of linux-2.6 for volatile; the goal is to not
have it require any further backports.
My current patch is attached; I need to figure out what was actually added
to kernel-package wrt mkvmlinuz that powerpc might need. Is there any other
arch-specific stuff that I might be missing, also? I still need to test it
out against the udev that's in sarge.
(I'll use 2.6.12-9 or whatever actually builds on all archs, once it proves
itself against the buildds.)
--- linux-2.6-2.6.12.orig/debian/changelog 2005-09-26 00:58:35.000000000 -0400
+++ linux-2.6-2.6.12/debian/changelog 2005-09-26 00:49:36.000000000 -0400
@@ -1,3 +1,13 @@
+linux-2.6 (2.6.12-5volatile1) sarge-volatile; urgency=high
+
+ * Backport/rebuild for volatile.
+ * Drop make-kpkg defconfig usage; use oldconfig instead, w/ a random
+ .config from the arch/subarch directory.
+ * Lower kernel-package versioned build-dep.
+ * Drop gcc-4.0 build dep.
+
+ -- Andres Salomon <dilinger@debian.org> Mon, 26 Sep 2005 00:22:34 -0400
+
linux-2.6 (2.6.12-6) unstable; urgency=high
[ Andres Salomon, Bastian Blank ]
--- linux-2.6-2.6.12.orig/debian/templates/control.source.in 2005-09-26 00:58:35.000000000 -0400
+++ linux-2.6-2.6.12/debian/templates/control.source.in 2005-09-26 00:49:10.000000000 -0400
@@ -4,5 +4,5 @@
Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
Uploaders: Andres Salomon <dilinger@debian.org>, Bastian Blank <waldi@debian.org>
Standards-Version: 3.6.1.0
-Build-Depends: gcc (>= 4:4.0) [!arm !sparc !alpha !m68k], gcc-3.3 [arm sparc alpha m68k], binutils-hppa64 [hppa], gcc-4.0-hppa64 [hppa], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, console-tools [!s390], sparc-utils [sparc], kernel-package (>= 9.005)
+Build-Depends: binutils-hppa64 [hppa], gcc-4.0-hppa64 [hppa], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, console-tools [!s390], sparc-utils [sparc], kernel-package (>= 8.135)
Build-Depends-Indep: docbook-utils, gs, transfig, xmlto, dh-kpatches (>= 0.99.3)
--- linux-2.6-2.6.12.orig/debian/control 2005-09-26 00:58:35.000000000 -0400
+++ linux-2.6-2.6.12/debian/control 2005-09-26 00:49:43.000000000 -0400
@@ -4,7 +4,7 @@
Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
Uploaders: Andres Salomon <dilinger@debian.org>, Bastian Blank <waldi@debian.org>
Standards-Version: 3.6.1.0
-Build-Depends: gcc (>= 4:4.0) [!arm !sparc !alpha !m68k], gcc-3.3 [arm sparc alpha m68k], binutils-hppa64 [hppa], gcc-4.0-hppa64 [hppa], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, console-tools [!s390], sparc-utils [sparc], kernel-package (>= 9.005)
+Build-Depends: binutils-hppa64 [hppa], gcc-4.0-hppa64 [hppa], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, console-tools [!s390], sparc-utils [sparc], kernel-package (>= 8.135)
Build-Depends-Indep: docbook-utils, gs, transfig, xmlto, dh-kpatches (>= 0.99.3)
Package: linux-source-2.6.12
@@ -60,8 +60,8 @@
Architecture: all
Section: devel
Priority: optional
-Depends: linux-patch-debian-2.6.12 (= 2.6.12-6), linux-source-2.6.12 (= 2.6.12-1) | linux-source-2.6.12 (= 2.6.12-2) | linux-source-2.6.12 (= 2.6.12-3) | linux-source-2.6.12 (= 2.6.12-4) | linux-source-2.6.12 (= 2.6.12-5) | linux-source-2.6.12 (= 2.6.12-6)
-Provides: linux-tree-2.6.12-1, linux-tree-2.6.12-2, linux-tree-2.6.12-3, linux-tree-2.6.12-4, linux-tree-2.6.12-5, linux-tree-2.6.12-6
+Depends: linux-patch-debian-2.6.12 (= 2.6.12-5volatile1), linux-source-2.6.12 (= 2.6.12-1) | linux-source-2.6.12 (= 2.6.12-2) | linux-source-2.6.12 (= 2.6.12-3) | linux-source-2.6.12 (= 2.6.12-4) | linux-source-2.6.12 (= 2.6.12-5) | linux-source-2.6.12 (= 2.6.12-6) | linux-source-2.6.12 (= 2.6.12-5volatile1)
+Provides: linux-tree-2.6.12-1, linux-tree-2.6.12-2, linux-tree-2.6.12-3, linux-tree-2.6.12-4, linux-tree-2.6.12-5, linux-tree-2.6.12-6, linux-tree-2.6.12-5volatile1
Description: Linux kernel source tree for building Debian kernel images
This meta package is used as a build dependency of Debian linux-image
packages to prevent a version discrepancy between the linux-image and
--- linux-2.6-2.6.12.orig/debian/rules.real 2005-09-26 00:58:35.000000000 -0400
+++ linux-2.6-2.6.12/debian/rules.real 2005-09-26 00:47:47.000000000 -0400
@@ -43,7 +43,7 @@
kpkg_header += make-kpkg --append-to-version $(append)-$(ABINAME)
kpkg_header += --arch $(ARCH)
kpkg_header += --stem linux
-kpkg_header += --config defconfig
+kpkg_header += --config oldconfig
kpkg_image := make-kpkg --append-to-version -$(ABINAME)-$(FLAVOUR)
kpkg_image += --arch $(ARCH)
kpkg_image += --stem linux
@@ -196,6 +196,13 @@
$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH): $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
rm -rf $(DIR)
cp -al $(SOURCE_DIR) $(DIR)
+ rm -f $(DIR)/.config
+ for i in $(ccommon); do \
+ if [ -f $${i} ]; then \
+ cat $${i} >> $(DIR)/.config; \
+ fi; \
+ done
+ cat $(firstword $(wildcard $(basedir)/config.*)) >> $(DIR)/.config
cd $(DIR); $(setup_env) $(kpkg_header) configure
touch $@
Reply to: