From 78b5b1f120a61d3c8dd5bcd4b507ca478b8a9826 Mon Sep 17 00:00:00 2001 From: Frans Pop Date: Tue, 26 Sep 2006 00:27:16 +0000 Subject: * Remove now obsolete distinction between classic and common kpkg. * Update all arches to kernel version 2.6.17. --- build/arch-options/alpha | 3 +-- build/arch-options/amd64 | 3 +-- build/arch-options/arm | 3 +-- build/arch-options/hppa | 3 +-- build/arch-options/i386 | 3 +-- build/arch-options/ia64 | 3 +-- build/arch-options/m68k | 3 +-- build/arch-options/mips | 3 +-- build/arch-options/mipsel | 3 +-- build/arch-options/powerpc | 3 +-- build/arch-options/s390 | 3 +-- build/arch-options/sparc | 3 +-- build/buildone.sh | 4 +++- debian/changelog | 4 +++- en/appendix/chroot-install.xml | 4 ++-- en/post-install/kernel-baking.xml | 23 ++++------------------- 16 files changed, 24 insertions(+), 47 deletions(-) diff --git a/build/arch-options/alpha b/build/arch-options/alpha index 51c5a3fbf..6b22eac0c 100644 --- a/build/arch-options/alpha +++ b/build/arch-options/alpha @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="alpha;not-x86;not-s390;not-m68k;not-powerpc" -kernelversion="2.6.16" +kernelversion="2.6.17" arch_listname="alpha" # These two options should be set if condition 'smp' is set below smp_config_section="General setup" @@ -11,7 +11,6 @@ smp_config_option="Symmetric multi-processing support" # Options below are assembled into one variable 'condition' # in the build scripts -kernelpackage="classic-kpkg" fdisk="fdisk.txt;cfdisk.txt" network="supports-tftp;supports-nfsroot" boot="" diff --git a/build/arch-options/amd64 b/build/arch-options/amd64 index 1aabbc04c..5a55275b3 100644 --- a/build/arch-options/amd64 +++ b/build/arch-options/amd64 @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="amd64;x86;not-s390;not-m68k;not-powerpc;not-alpha" -kernelversion="2.6.16" +kernelversion="2.6.17" arch_listname="amd64" # These two options should be set if condition 'smp' is set below smp_config_section="Processor type and features" @@ -11,7 +11,6 @@ smp_config_option="Symmetric multi-processing support" # Options below are assembled into one variable 'condition' # in the build scripts -kernelpackage="common-kpkg" fdisk="fdisk.txt;cfdisk.txt" network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot" boot="bootable-disk;bootable-usb" diff --git a/build/arch-options/arm b/build/arch-options/arm index b249ff39f..093d1e072 100644 --- a/build/arch-options/arm +++ b/build/arch-options/arm @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="arm;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" -kernelversion="2.6.16" +kernelversion="2.6.17" arch_listname="arm" # These two options should be set if condition 'smp' is set below smp_config_section="N/A" @@ -11,7 +11,6 @@ smp_config_option="N/A" # Options below are assembled into one variable 'condition' # in the build scripts -kernelpackage="common-kpkg" fdisk="fdisk.txt;cfdisk.txt" network="supports-tftp;supports-rarp;supports-dhcp;supports-bootp;supports-nfsroot" boot="" diff --git a/build/arch-options/hppa b/build/arch-options/hppa index baeda6a3b..14192fb0a 100644 --- a/build/arch-options/hppa +++ b/build/arch-options/hppa @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="hppa;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" -kernelversion="2.6.16" +kernelversion="2.6.17" arch_listname="hppa" # These two options should be set if condition 'smp' is set below smp_config_section="Processor type and features" @@ -11,7 +11,6 @@ smp_config_option="Symmetric multi-processing support" # Options below are assembled into one variable 'condition' # in the build scripts -kernelpackage="common-kpkg" fdisk="cfdisk.txt" network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot" boot="" diff --git a/build/arch-options/i386 b/build/arch-options/i386 index dd4bca72a..209b15884 100644 --- a/build/arch-options/i386 +++ b/build/arch-options/i386 @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="i386;x86;not-s390;not-m68k;not-powerpc;not-alpha" -kernelversion="2.6.16" +kernelversion="2.6.17" arch_listname="boot" # These two options should be set if condition 'smp' is set below smp_config_section="Processor type and features" @@ -11,7 +11,6 @@ smp_config_option="Symmetric multi-processing support" # Options below are assembled into one variable 'condition' # in the build scripts -kernelpackage="common-kpkg" fdisk="fdisk.txt;cfdisk.txt" network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot" boot="supports-floppy-boot;bootable-disk;bootable-usb" diff --git a/build/arch-options/ia64 b/build/arch-options/ia64 index 8f86ad8d1..bbb55ef7e 100644 --- a/build/arch-options/ia64 +++ b/build/arch-options/ia64 @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="ia64;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" -kernelversion="2.6.16" +kernelversion="2.6.17" arch_listname="ia64" # These two options should be set if condition 'smp' is set below smp_config_section="General setup" @@ -11,7 +11,6 @@ smp_config_option="SMP support" # Options below are assembled into one variable 'condition' # in the build scripts -kernelpackage="common-kpkg" fdisk="parted.txt;cfdisk.txt" network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot" boot="" diff --git a/build/arch-options/m68k b/build/arch-options/m68k index 7396bbb6b..0a9cf69e6 100644 --- a/build/arch-options/m68k +++ b/build/arch-options/m68k @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="m68k;not-x86;not-s390;not-powerpc;not-alpha" -kernelversion="2.4.27" +kernelversion="2.6.17" arch_listname="68k" # These two options should be set if condition 'smp' is set below smp_config_section="N/A" @@ -11,7 +11,6 @@ smp_config_option="N/A" # Options below are assembled into one variable 'condition' # in the build scripts -kernelpackage="classic-kpkg" fdisk="atari-fdisk.txt;mac-fdisk.txt;amiga-fdisk.txt;pmac-fdisk.txt" network="supports-tftp;supports-rarp;supports-dhcp;supports-bootp;supports-nfsroot" boot="supports-floppy-boot;bootable-disk" diff --git a/build/arch-options/mips b/build/arch-options/mips index bd6ba9586..c5215fca6 100644 --- a/build/arch-options/mips +++ b/build/arch-options/mips @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="mips;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" -kernelversion="2.6.16" +kernelversion="2.6.17" arch_listname="mips" # These two options should be set if condition 'smp' is set below smp_config_section="N/A" @@ -11,7 +11,6 @@ smp_config_option="N/A" # Options below are assembled into one variable 'condition' # in the build scripts -kernelpackage="common-kpkg" fdisk="fdisk.txt;cfdisk.txt" network="supports-tftp;supports-dhcp;supports-nfsroot" boot="" diff --git a/build/arch-options/mipsel b/build/arch-options/mipsel index 61bdea1f4..a56d2cdc7 100644 --- a/build/arch-options/mipsel +++ b/build/arch-options/mipsel @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="mipsel;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" -kernelversion="2.6.16" +kernelversion="2.6.17" arch_listname="mips" # These two options should be set if condition 'smp' is set below smp_config_section="N/A" @@ -11,7 +11,6 @@ smp_config_option="N/A" # Options below are assembled into one variable 'condition' # in the build scripts -kernelpackage="common-kpkg" fdisk="fdisk.txt;cfdisk.txt" network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot" boot="" diff --git a/build/arch-options/powerpc b/build/arch-options/powerpc index 1d970d18f..4cf07d867 100644 --- a/build/arch-options/powerpc +++ b/build/arch-options/powerpc @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="powerpc;not-s390;not-m68k;not-x86;not-alpha" -kernelversion="2.6.16" +kernelversion="2.6.17" arch_listname="powerpc" # These two options should be set if condition 'smp' is set below smp_config_section="Platform support" @@ -11,7 +11,6 @@ smp_config_option="Symmetric multi-processing support" # Options below are assembled into one variable 'condition' # in the build scripts -kernelpackage="common-kpkg" fdisk="mac-fdisk.txt;cfdisk.txt" network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot" boot="supports-floppy-boot;bootable-disk;bootable-usb" diff --git a/build/arch-options/s390 b/build/arch-options/s390 index 889a6b572..906c34c2a 100644 --- a/build/arch-options/s390 +++ b/build/arch-options/s390 @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="s390;not-powerpc;not-m68k;not-x86;not-alpha" -kernelversion="2.6.16" +kernelversion="2.6.17" arch_listname="s390" # These two options should be set if condition 'smp' is set below smp_config_section="Processor type and features" @@ -11,7 +11,6 @@ smp_config_option="Symmetric multi-processing support" # Options below are assembled into one variable 'condition' # in the build scripts -kernelpackage="common-kpkg" fdisk="fdasd.txt;dasdfmt.txt" network="" boot="" diff --git a/build/arch-options/sparc b/build/arch-options/sparc index 8244e8fa5..47a4514c7 100644 --- a/build/arch-options/sparc +++ b/build/arch-options/sparc @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="sparc;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" -kernelversion="2.6.16" +kernelversion="2.6.17" arch_listname="sparc" # These two options should be set if condition 'smp' is set below smp_config_section="General setup" @@ -11,7 +11,6 @@ smp_config_option="Symmetric multi-processing support" # Options below are assembled into one variable 'condition' # in the build scripts -kernelpackage="common-kpkg" fdisk="fdisk.txt" network="supports-tftp;supports-rarp;supports-dhcp;supports-bootp;supports-nfsroot" boot="supports-floppy-boot" diff --git a/build/buildone.sh b/build/buildone.sh index 19ba3e8b7..9fe415a8d 100755 --- a/build/buildone.sh +++ b/build/buildone.sh @@ -72,11 +72,13 @@ create_profiled () { fi # Join all architecture options into one big variable - condition="$kernelpackage;$fdisk;$network;$boot;$smp;$other;$goodies;$unofficial_build;$status;$manual_release" + condition="$fdisk;$network;$boot;$smp;$other;$goodies;$unofficial_build;$status;$manual_release" # Add language options condition="$condition;$optional_paras" # Add build options for the manual condition="$condition;$unofficial_build;$status;$manual_release;$manual_target" + # TODO: Obsoleted, but keep until translations have been updated + condition="$condition;common-kpkg" # Write dynamic non-profilable entities into the file echo "" > $dynamic diff --git a/debian/changelog b/debian/changelog index efc57286d..b12a43190 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,8 +42,10 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low * Correct number of release arches. Thanks to Holger Wansing. Closes: #384321. * Minor corrections reported by Malcolm Parsons. Closes: #388138. * Document new boot parameters theme and directfb/hw-accel. + * Remove now obsolete distinction between classic and common kpkg. + * Update all arches to kernel version 2.6.17. - -- Frans Pop Sat, 23 Sep 2006 21:58:54 +0200 + -- Frans Pop Tue, 26 Sep 2006 02:26:45 +0200 installation-guide (20060726) unstable; urgency=low diff --git a/en/appendix/chroot-install.xml b/en/appendix/chroot-install.xml index a3f707b03..8d192c76a 100644 --- a/en/appendix/chroot-install.xml +++ b/en/appendix/chroot-install.xml @@ -382,13 +382,13 @@ If you intend to boot this system, you probably want a Linux kernel and a boot loader. Identify available pre-packaged kernels with -# apt-cache search kernellinux-image +# apt-cache search linux-image Then install your choice using its package name. -# aptitude install kernellinux-image-&kernelversion;-arch-etc +# aptitude install linux-image-&kernelversion;-arch-etc diff --git a/en/post-install/kernel-baking.xml b/en/post-install/kernel-baking.xml index 28086fd18..9a2d65832 100644 --- a/en/post-install/kernel-baking.xml +++ b/en/post-install/kernel-baking.xml @@ -57,9 +57,7 @@ Don't be afraid to try compiling the kernel. It's fun and profitable. To compile a kernel the Debian way, you need some packages: fakeroot, kernel-package, -kernel-source-&kernelversion; -(the most recent version at the time of this writing) -linux-source-2.6 +linux-source-2.6 and a few others which are probably already installed (see /usr/share/doc/kernel-package/README.gz for the complete list). @@ -78,8 +76,7 @@ Note that you don't have to compile your kernel the Debian way; but we find that using the packaging system to manage your kernel is actually safer and easier. In fact, you can get your kernel sources right from Linus instead of -kernel-source-&kernelversion;, -linux-source-2.6, +linux-source-2.6, yet still use the kernel-package compilation method. @@ -105,13 +102,8 @@ permissions. . We'll also assume that your kernel version is &kernelversion;. Make sure you are in the directory to where you want to unpack the kernel sources, extract them using -tar xjf -/usr/src/kernel-source-&kernelversion;.tar.bz2 -tar xjf -/usr/src/linux-source-&kernelversion;.tar.bz2 -and change to the directory -kernel-source-&kernelversion; -linux-source-&kernelversion; +tar xjf /usr/src/linux-source-&kernelversion;.tar.bz2 +and change to the directory linux-source-&kernelversion; that will have been created. @@ -148,14 +140,8 @@ the power of your machine. Once the compilation is complete, you can install your custom kernel like any package. As root, do - -dpkg -i -../kernel-image-&kernelversion;-subarchitecture_custom.1.0_&architecture;.deb. - - dpkg -i ../linux-image-&kernelversion;-subarchitecture_custom.1.0_&architecture;.deb. - The subarchitecture part is an optional sub-architecture, such as 686, @@ -168,7 +154,6 @@ the System.map will be properly installed containing your current configuration set. Your new kernel package is also clever enough to automatically update your boot loader to use the new kernel. If you have created a modules package, -e.g., if you have PCMCIA, you'll need to install that package as well. -- cgit v1.2.3