r1432 - in trunk/kernel/i386: . kernel-image-2.6.7-i386-2.6.7 kernel-image-2.6.7-i386-2.6.7/debian kernel-image-2.6.8-i386-2.6.8 kernel-latest-2.6-i386/debian
Joshua Kwan
joshk@haydn.debian.org
Sat, 28 Aug 2004 20:50:32 -0600
Author: joshk
Date: 2004-08-28 14:28:43 -0600 (Sat, 28 Aug 2004)
New Revision: 1432
Added:
trunk/kernel/i386/kernel-latest-2.6-i386/
Modified:
trunk/kernel/i386/kernel-image-2.6.7-i386-2.6.7/debian/control
trunk/kernel/i386/kernel-image-2.6.7-i386-2.6.7/post-install
trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/post-install
trunk/kernel/i386/kernel-latest-2.6-i386/debian/changelog
trunk/kernel/i386/kernel-latest-2.6-i386/debian/control
trunk/kernel/i386/kernel-latest-2.6-i386/debian/rules
Log:
kernel-latest stuff for 2.6
Modified: trunk/kernel/i386/kernel-image-2.6.7-i386-2.6.7/debian/control
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.7-i386-2.6.7/debian/control 2004-08-28 20:23:11 UTC (rev 1431)
+++ trunk/kernel/i386/kernel-image-2.6.7-i386-2.6.7/debian/control 2004-08-28 20:28:43 UTC (rev 1432)
@@ -30,15 +30,6 @@
Please read /usr/share/doc/kernel-headers-2.6.7-1/debian.README.gz for
details
-Package: kernel-headers-2.6-386
-Architecture: i386
-Section: devel
-Priority: optional
-Depends: kernel-headers-2.6.7-1-386
-Description: Linux kernel headers 2.6 on 386
- This package will always depend on the latest 2.6 kernel headers available
- for 386.
-
Package: kernel-image-2.6.7-1-386
Architecture: i386
Section: base
@@ -63,15 +54,6 @@
and it is suggested that you install that package if you wish to
create a custom kernel from the sources.
-Package: kernel-image-2.6-386
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-image-2.6.7-1-386
-Description: Linux kernel image for version 2.6 on 386.
- This package will always depend on the latest 2.6 kernel image available
- for 386.
-
Package: kernel-headers-2.6.7-1-686
Architecture: i386
Section: devel
@@ -85,15 +67,6 @@
Please read /usr/share/doc/kernel-headers-2.6.7-1/debian.README.gz for
details
-Package: kernel-headers-2.6-686
-Architecture: i386
-Section: devel
-Priority: optional
-Depends: kernel-headers-2.6.7-1-686
-Description: Linux kernel headers 2.6 on PPro/Celeron/PII/PIII/PIV
- This package will always depend on the latest 2.6 kernel headers available
- for Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV.
-
Package: kernel-image-2.6.7-1-686
Architecture: i386
Section: base
@@ -118,15 +91,6 @@
and it is suggested that you install that package if you wish to
create a custom kernel from the sources.
-Package: kernel-image-2.6-686
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-image-2.6.7-1-686
-Description: Linux kernel image for version 2.6 on PPro/Celeron/PII/PIII/PIV.
- This package will always depend on the latest 2.6 kernel image available
- for Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV.
-
Package: kernel-headers-2.6.7-1-686-smp
Architecture: i386
Section: devel
@@ -141,16 +105,6 @@
Please read /usr/share/doc/kernel-headers-2.6.7-1/debian.README.gz for
details
-Package: kernel-headers-2.6-686-smp
-Architecture: i386
-Section: devel
-Priority: optional
-Depends: kernel-headers-2.6.7-1-686-smp
-Description: Linux kernel headers 2.6 on PPro/Celeron/PII/PIII/PIV SMP
- This package will always depend on the latest 2.6 kernel headers available
- for Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV with SMP support.
- SMP (symmtric multi-processing) is needed if you have multiple processors.
-
Package: kernel-image-2.6.7-1-686-smp
Architecture: i386
Section: base
@@ -176,16 +130,6 @@
and it is suggested that you install that package if you wish to
create a custom kernel from the sources.
-Package: kernel-image-2.6-686-smp
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-image-2.6.7-1-686-smp
-Description: Linux kernel image for version 2.6 on PPro/Celeron/PII/PIII/PIV SMP.
- This package will always depend on the latest 2.6 kernel image available
- for Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV with SMP support.
- SMP (symmtric multi-processing) is needed if you have multiple processors.
-
Package: kernel-headers-2.6.7-1-k7
Architecture: i386
Section: devel
@@ -199,15 +143,6 @@
Please read /usr/share/doc/kernel-headers-2.6.7-1/debian.README.gz for
details
-Package: kernel-headers-2.6-k7
-Architecture: i386
-Section: devel
-Priority: optional
-Depends: kernel-headers-2.6.7-1-k7
-Description: Linux kernel headers 2.6 on AMD K7
- This package will always depend on the latest 2.6 kernel headers available
- for AMD Duron/Athlon.
-
Package: kernel-image-2.6.7-1-k7
Architecture: i386
Section: base
@@ -232,15 +167,6 @@
and it is suggested that you install that package if you wish to
create a custom kernel from the sources.
-Package: kernel-image-2.6-k7
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-image-2.6.7-1-k7
-Description: Linux kernel image for version 2.6 on AMD K7.
- This package will always depend on the latest 2.6 kernel image available
- for AMD Duron/Athlon.
-
Package: kernel-headers-2.6.7-1-k7-smp
Architecture: i386
Section: devel
@@ -255,16 +181,6 @@
Please read /usr/share/doc/kernel-headers-2.6.7-1/debian.README.gz for
details
-Package: kernel-headers-2.6-k7-smp
-Architecture: i386
-Section: devel
-Priority: optional
-Depends: kernel-headers-2.6.7-1-k7-smp
-Description: Linux kernel headers 2.6 on AMD K7 SMP
- This package will always depend on the latest 2.6 kernel headers available
- for AMD Duron/Athlon with SMP support.
- SMP (symmtric multi-processing) is needed if you have multiple processors.
-
Package: kernel-image-2.6.7-1-k7-smp
Architecture: i386
Section: base
@@ -289,14 +205,3 @@
Kernel image packages are generally produced using kernel-package,
and it is suggested that you install that package if you wish to
create a custom kernel from the sources.
-
-Package: kernel-image-2.6-k7-smp
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-image-2.6.7-1-k7-smp
-Description: Linux kernel image for version 2.6 on AMD K7 SMP.
- This package will always depend on the latest 2.6 kernel image available
- for AMD Duron/Athlon with SMP support.
- SMP (symmtric multi-processing) is needed if you have multiple processors.
-
Modified: trunk/kernel/i386/kernel-image-2.6.7-i386-2.6.7/post-install
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.7-i386-2.6.7/post-install 2004-08-28 20:23:11 UTC (rev 1431)
+++ trunk/kernel/i386/kernel-image-2.6.7-i386-2.6.7/post-install 2004-08-28 20:28:43 UTC (rev 1432)
@@ -20,17 +20,6 @@
suffix=${version#*$debnum-}
-prefix=${version%.*}
-
-
-for pkg in \
- kernel-headers-$prefix-$suffix kernel-image-$prefix-$suffix
-do
- debhelper_pre $pkg
- debhelper_post $pkg
-done
-
-
prefix=$DEBIAN_UPSTREAM_VERSION$debnum
pkg=kernel-headers-$version
top=$PWD/debian/$pkg
Modified: trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/post-install
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/post-install 2004-08-28 20:23:11 UTC (rev 1431)
+++ trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/post-install 2004-08-28 20:28:43 UTC (rev 1432)
@@ -20,17 +20,6 @@
suffix=${version#*$debnum-}
-prefix=${version%.*}
-
-
-for pkg in \
- kernel-headers-$prefix-$suffix kernel-image-$prefix-$suffix
-do
- debhelper_pre $pkg
- debhelper_post $pkg
-done
-
-
prefix=$DEBIAN_UPSTREAM_VERSION$debnum
pkg=kernel-headers-$version
top=$PWD/debian/$pkg
Copied: trunk/kernel/i386/kernel-latest-2.6-i386 (from rev 1422, trunk/kernel-2.4/i386/kernel-latest-2.4-i386)
Modified: trunk/kernel/i386/kernel-latest-2.6-i386/debian/changelog
===================================================================
--- trunk/kernel-2.4/i386/kernel-latest-2.4-i386/debian/changelog 2004-08-28 07:27:58 UTC (rev 1422)
+++ trunk/kernel/i386/kernel-latest-2.6-i386/debian/changelog 2004-08-28 20:28:43 UTC (rev 1432)
@@ -1,11 +1,11 @@
-kernel-latest-2.4-i386 (100) UNRELEASED; urgency=low
+kernel-latest-2.6-i386 (100) UNRELEASED; urgency=low
* Created this package for meta packages that had
- previously been provided by kernel-image-2.4.XX-i386
+ previously been provided by kernel-image-2.6.XX-i386
- This is to allow kernel-image packages for multiple
upstream kernel versions to co-exist.
- Initial version is 100, as previous versions of
the meta packages are already in the archive.
- -- Simon Horman <horms@debian.org> Tue, 24 Aug 2004 15:47:38 +0900
+ -- Joshua Kwan <joshk@triplehelix.org> Sat, 28 Aug 2004 13:24:54 -0700
Modified: trunk/kernel/i386/kernel-latest-2.6-i386/debian/control
===================================================================
--- trunk/kernel-2.4/i386/kernel-latest-2.4-i386/debian/control 2004-08-28 07:27:58 UTC (rev 1422)
+++ trunk/kernel/i386/kernel-latest-2.6-i386/debian/control 2004-08-28 20:28:43 UTC (rev 1432)
@@ -1,144 +1,102 @@
-Source: kernel-latest-2.4-i386
+Source: kernel-latest-2.6-i386
Section: devel
Priority: optional
-Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
-Uploaders: William Irwin <wli@debian.org>, Sven Luther <luther@debian.org>, Jens Schmalzing <jensen@debian.org>, Jeff Bailey <jbailey@debian.org>, Dann Frazier <dannf@debian.org>, Simon Horman <horms@debian.org>
+Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
+Uploaders: William Lee Irwin III <wli@debian.org>, Andres Salomon <dilinger@voxel.net>
Standards-Version: 3.6.1
Build-Depends: debhelper (>= 4)
-Package: kernel-image-2.4-386
+Package: kernel-headers-2.6-386
Architecture: i386
-Section: base
+Section: devel
Priority: optional
-Depends: kernel-image-2.4.27-1-386
-Description: Linux kernel image for version 2.4 on 386
- This package will always depend on the latest 2.4 kernel image available for
- 386.
+Depends: kernel-headers-2.6.8-1-386
+Description: Linux kernel headers 2.6 on 386
+ This package will always depend on the latest 2.6 kernel headers available
+ for 386.
-Package: kernel-pcmcia-modules-2.4-386
+Package: kernel-image-2.6-386
Architecture: i386
Section: base
Priority: optional
-Depends: kernel-pcmcia-modules-2.4.27-1-386
-Description: Mainstream PCMCIA modules for version 2.4 on 386
- This package will always depend on the latest 2.4 mainstream PCMCIA modules
- available for
- 386.
+Depends: kernel-image-2.6.8-1-386
+Description: Linux kernel image for version 2.6 on 386.
+ This package will always depend on the latest 2.6 kernel image available
+ for 386.
-Package: kernel-image-2.4-586tsc
+Package: kernel-headers-2.6-686
Architecture: i386
-Section: base
+Section: devel
Priority: optional
-Depends: kernel-image-2.4.27-1-586tsc
-Description: Linux kernel image for version 2.4 on Pentium-Classic
- This package will always depend on the latest 2.4 kernel image available for
- Pentium-Classic.
+Depends: kernel-headers-2.6.8-1-686
+Description: Linux kernel headers 2.6 on PPro/Celeron/PII/PIII/PIV
+ This package will always depend on the latest 2.6 kernel headers available
+ for Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV.
-Package: kernel-pcmcia-modules-2.4-586tsc
+Package: kernel-image-2.6-686
Architecture: i386
Section: base
Priority: optional
-Depends: kernel-pcmcia-modules-2.4.27-1-586tsc
-Description: Mainstream PCMCIA modules for version 2.4 on Pentium-Classic
- This package will always depend on the latest 2.4 mainstream PCMCIA modules
- available for
- Pentium-Classic.
+Depends: kernel-image-2.6.8-1-686
+Description: Linux kernel image for version 2.6 on PPro/Celeron/PII/PIII/PIV.
+ This package will always depend on the latest 2.6 kernel image available
+ for Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV.
-Package: kernel-image-2.4-686
+Package: kernel-headers-2.6-686-smp
Architecture: i386
-Section: base
+Section: devel
Priority: optional
-Depends: kernel-image-2.4.27-1-686
-Description: Linux kernel image for version 2.4 on PPro/Celeron/PII/PIII/PIV
- This package will always depend on the latest 2.4 kernel image available for
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV.
+Depends: kernel-headers-2.6.8-1-686-smp
+Description: Linux kernel headers 2.6 on PPro/Celeron/PII/PIII/PIV SMP
+ This package will always depend on the latest 2.6 kernel headers available
+ for Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV with SMP support.
+ SMP (symmetric multi-processing) is needed if you have multiple processors.
-Package: kernel-pcmcia-modules-2.4-686
+Package: kernel-image-2.6-686-smp
Architecture: i386
Section: base
Priority: optional
-Depends: kernel-pcmcia-modules-2.4.27-1-686
-Description: Mainstream PCMCIA modules for version 2.4 on PPro/Celeron/PII/PIII/PIV
- This package will always depend on the latest 2.4 mainstream PCMCIA modules
- available for
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV.
+Depends: kernel-image-2.6.8-1-686-smp
+Description: Linux kernel image for version 2.6 on PPro/Celeron/PII/PIII/PIV SMP.
+ This package will always depend on the latest 2.6 kernel image available
+ for Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV with SMP support.
+ SMP (symmetric multi-processing) is needed if you have multiple processors.
-Package: kernel-image-2.4-686-smp
+Package: kernel-headers-2.6-k7
Architecture: i386
-Section: base
+Section: devel
Priority: optional
-Depends: kernel-image-2.4.27-1-686-smp
-Description: Linux kernel image for version 2.4 on PPro/Celeron/PII/PIII/PIV SMP
- This package will always depend on the latest 2.4 kernel image available for
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV with SMP support.
- SMP (symmtric multi-processing) is needed if you have multiple processors.
+Depends: kernel-headers-2.6.8-1-k7
+Description: Linux kernel headers 2.6 on AMD K7
+ This package will always depend on the latest 2.6 kernel headers available
+ for AMD Duron/Athlon.
-Package: kernel-pcmcia-modules-2.4-686-smp
+Package: kernel-image-2.6-k7
Architecture: i386
Section: base
Priority: optional
-Depends: kernel-pcmcia-modules-2.4.27-1-686-smp
-Description: Mainstream PCMCIA modules for version 2.4 on PPro/Celeron/PII/PIII/PIV SMP
- This package will always depend on the latest 2.4 mainstream PCMCIA modules
- available for
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV with SMP support.
- SMP (symmtric multi-processing) is needed if you have multiple processors.
+Depends: kernel-image-2.6.8-1-k7
+Description: Linux kernel image for version 2.6 on AMD K7.
+ This package will always depend on the latest 2.6 kernel image available
+ for AMD Duron/Athlon.
-Package: kernel-image-2.4-k6
+Package: kernel-headers-2.6-k7-smp
Architecture: i386
-Section: base
+Section: devel
Priority: optional
-Depends: kernel-image-2.4.27-1-k6
-Description: Linux kernel image for version 2.4 on AMD K6/K6-II/K6-III
- This package will always depend on the latest 2.4 kernel image available for
- AMD K6/K6-II/K6-III.
+Depends: kernel-headers-2.6.8-1-k7-smp
+Description: Linux kernel headers 2.6 on AMD K7 SMP
+ This package will always depend on the latest 2.6 kernel headers available
+ for AMD Duron/Athlon with SMP support.
+ SMP (symmetric multi-processing) is needed if you have multiple processors.
-Package: kernel-pcmcia-modules-2.4-k6
+Package: kernel-image-2.6-k7-smp
Architecture: i386
Section: base
Priority: optional
-Depends: kernel-pcmcia-modules-2.4.27-1-k6
-Description: Mainstream PCMCIA modules for version 2.4 on AMD K6/K6-II/K6-III
- This package will always depend on the latest 2.4 mainstream PCMCIA modules
- available for
- AMD K6/K6-II/K6-III.
+Depends: kernel-image-2.6.8-1-k7-smp
+Description: Linux kernel image for version 2.6 on AMD K7 SMP.
+ This package will always depend on the latest 2.6 kernel image available
+ for AMD Duron/Athlon with SMP support.
+ SMP (symmetric multi-processing) is needed if you have multiple processors.
-Package: kernel-image-2.4-k7
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-image-2.4.27-1-k7
-Description: Linux kernel image for version 2.4 on AMD K7
- This package will always depend on the latest 2.4 kernel image available for
- AMD Duron/Athlon.
-
-Package: kernel-pcmcia-modules-2.4-k7
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-pcmcia-modules-2.4.27-1-k7
-Description: Mainstream PCMCIA modules for version 2.4 on AMD K7
- This package will always depend on the latest 2.4 mainstream PCMCIA modules
- available for
- AMD Duron/Athlon.
-
-Package: kernel-image-2.4-k7-smp
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-image-2.4.27-1-k7-smp
-Description: Linux kernel image for version 2.4 on AMD K7 SMP
- This package will always depend on the latest 2.4 kernel image available for
- AMD Duron/Athlon with SMP support.
- SMP (symmtric multi-processing) is needed if you have multiple processors.
-
-Package: kernel-pcmcia-modules-2.4-k7-smp
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-pcmcia-modules-2.4.27-1-k7-smp
-Description: Mainstream PCMCIA modules for version 2.4 on AMD K7 SMP
- This package will always depend on the latest 2.4 mainstream PCMCIA modules
- available for
- AMD Duron/Athlon with SMP support.
- SMP (symmtric multi-processing) is needed if you have multiple processors.
Modified: trunk/kernel/i386/kernel-latest-2.6-i386/debian/rules
===================================================================
--- trunk/kernel-2.4/i386/kernel-latest-2.4-i386/debian/rules 2004-08-28 07:27:58 UTC (rev 1422)
+++ trunk/kernel/i386/kernel-latest-2.6-i386/debian/rules 2004-08-28 20:28:43 UTC (rev 1432)
@@ -12,24 +12,13 @@
SHELL := sh -e
-FLAVOURS := 386 586tsc 686 686-smp k6 k7 k7-smp
+FLAVOURS := 386 686 686-smp k7 k7-smp
BINARY_ARCH := $(FLAVOURS:=.binary-arch)
-unpack: unpack-stamp
-unpack-stamp:
- dh_testdir
- touch unpack-stamp
+build:
+# Ye olde no-op.
-build: build-stamp
-build-stamp: unpack-stamp
- dh_testdir
- touch build-stamp
-
-debnum:
- @echo $(debnum)
-
clean:
- rm -f *-stamp
dh_testdir
dh_clean
@@ -55,12 +44,11 @@
dh_md5sums --package=$*
dh_builddeb --package=$*
-%.binary-arch: kernel-pcmcia-modules-2.4-%.binary-arch-pkg kernel-image-2.4-%.binary-arch-pkg
+%.binary-arch: kernel-headers-2.6-%.binary-arch-pkg kernel-image-2.6-%.binary-arch-pkg
@true
# Build architecture-dependent files here.
binary-arch: install $(BINARY_ARCH)
- @true
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install unpack