r1975 - trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian
Sven Luther
luther@haydn.debian.org
Sun, 05 Dec 2004 18:11:50 -0700
Author: luther
Date: 2004-12-05 18:11:33 -0700 (Sun, 05 Dec 2004)
New Revision: 1975
Added:
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control-official.m4
Modified:
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/changelog
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control-image.m4
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/rules
Log:
Dropped kernel-image metapackages.
Modified debian/rules to make kernel-image metapackage handling easier.
Preparing for the release.
Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/changelog
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/changelog 2004-12-06 01:08:47 UTC (rev 1974)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/changelog 2004-12-06 01:11:33 UTC (rev 1975)
@@ -1,4 +1,4 @@
-kernel-patch-powerpc-2.6.9 (2.6.9-2) UNRELEASED; urgency=low
+kernel-patch-powerpc-2.6.9 (2.6.9-2) unstable; urgency=low
* Compiled SELinux support into the kernel, but left it disabled by
default at boot time. Thanks to Manoj Srivastava for investigating
@@ -35,8 +35,12 @@
- Don't allow tmpfs to be mounted if the driver is not present
(Bug#275874) (Simon Horman)
- -- Sven Luther <luther@debian.org> Mon, 6 Dec 2004 02:03:56 +0100
+ * Modified debian/rules to easily create or not the kernel-image packages.
+ dropped kernel-image metapackages since we officially stay with 2.6.8 for
+ now. (Sven Luther)
+ -- Sven Luther <luther@debian.org> Mon, 6 Dec 2004 02:08:10 +0100
+
kernel-patch-powerpc-2.6.9 (2.6.9-1) unstable; urgency=low
* New upstream release.
Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control 2004-12-06 01:08:47 UTC (rev 1974)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control 2004-12-06 01:11:33 UTC (rev 1975)
@@ -22,15 +22,6 @@
.
This package provides kernel headers files for 2.6.9.
-Package: kernel-image-power3
-Section: base
-Architecture: powerpc
-Depends: kernel-image-2.6.9-power3
-Description: Linux kernel image for power3
- .
- This is a dummy package that will always depend on the latest release
- of the kernel-image package for power3.
-
Package: kernel-build-2.6.9-power3
Architecture: powerpc
Depends: kernel-headers-2.6.9
@@ -48,17 +39,17 @@
Description: Linux kernel image for 2.6.9-power3
.
This package contains the Linux kernel for version 2.6.9-power3.
- It is intended to be run on PowerPC machines with a single Power3
- processor.
-Package: kernel-image-power3-smp
+Package: kernel-image-power3
Section: base
Architecture: powerpc
-Depends: kernel-image-2.6.9-power3-smp
-Description: Linux kernel image for power3-smp
+Depends: kernel-image-2.6.9-power3
+Description: Linux kernel image for power3
.
This is a dummy package that will always depend on the latest release
- of the kernel-image package for power3-smp.
+ of the kernel-image package for power3.
+ It is intended to be run on PowerPC machines with a single Power3
+ processor.
Package: kernel-build-2.6.9-power3-smp
Architecture: powerpc
@@ -77,17 +68,17 @@
Description: Linux kernel image for 2.6.9-power3-smp
.
This package contains the Linux kernel for version 2.6.9-power3-smp.
- It is intended to be run on PowerPC machines with two or more
- Power3 processors, like some IBM RS/6000 boxen.
-Package: kernel-image-power4
+Package: kernel-image-power3-smp
Section: base
Architecture: powerpc
-Depends: kernel-image-2.6.9-power4
-Description: Linux kernel image for power4
+Depends: kernel-image-2.6.9-power3-smp
+Description: Linux kernel image for power3-smp
.
This is a dummy package that will always depend on the latest release
- of the kernel-image package for power4.
+ of the kernel-image package for power3-smp.
+ It is intended to be run on PowerPC machines with two or more
+ Power3 processors, like some IBM RS/6000 boxen.
Package: kernel-build-2.6.9-power4
Architecture: powerpc
@@ -106,17 +97,17 @@
Description: Linux kernel image for 2.6.9-power4
.
This package contains the Linux kernel for version 2.6.9-power4.
- It is intended to be run on PowerPC machines with a single Power4
- processor, the most prominent example being the G5 PowerMac by Apple.
-Package: kernel-image-power4-smp
+Package: kernel-image-power4
Section: base
Architecture: powerpc
-Depends: kernel-image-2.6.9-power4-smp
-Description: Linux kernel image for power4-smp
+Depends: kernel-image-2.6.9-power4
+Description: Linux kernel image for power4
.
This is a dummy package that will always depend on the latest release
- of the kernel-image package for power4-smp.
+ of the kernel-image package for power4.
+ It is intended to be run on PowerPC machines with a single Power4
+ processor, the most prominent example being the G5 PowerMac by Apple.
Package: kernel-build-2.6.9-power4-smp
Architecture: powerpc
@@ -135,19 +126,19 @@
Description: Linux kernel image for 2.6.9-power4-smp
.
This package contains the Linux kernel for version 2.6.9-power4-smp.
- It is intended to be run on PowerPC machines with two or more Power4
- processors. This setup can be found in Apple's dual G5 PowerMacs, as
- well as in a number of IBM RS/6000 boxen, such as the iSeries and
- pSeries machines.
-Package: kernel-image-powerpc
+Package: kernel-image-power4-smp
Section: base
Architecture: powerpc
-Depends: kernel-image-2.6.9-powerpc
-Description: Linux kernel image for powerpc
+Depends: kernel-image-2.6.9-power4-smp
+Description: Linux kernel image for power4-smp
.
This is a dummy package that will always depend on the latest release
- of the kernel-image package for powerpc.
+ of the kernel-image package for power4-smp.
+ It is intended to be run on PowerPC machines with two or more Power4
+ processors. This setup can be found in Apple's dual G5 PowerMacs, as
+ well as in a number of IBM RS/6000 boxen, such as the iSeries and
+ pSeries machines.
Package: kernel-build-2.6.9-powerpc
Architecture: powerpc
@@ -166,17 +157,17 @@
Description: Linux kernel image for 2.6.9-powerpc
.
This package contains the Linux kernel for version 2.6.9-powerpc.
- It is intended to be run on single-processor PowerPC machines,
- including all G3 and G4 models by Apple, as well as older PowerMacs.
-Package: kernel-image-powerpc-smp
+Package: kernel-image-powerpc
Section: base
Architecture: powerpc
-Depends: kernel-image-2.6.9-powerpc-smp
-Description: Linux kernel image for powerpc-smp
+Depends: kernel-image-2.6.9-powerpc
+Description: Linux kernel image for powerpc
.
This is a dummy package that will always depend on the latest release
- of the kernel-image package for powerpc-smp.
+ of the kernel-image package for powerpc.
+ It is intended to be run on single-processor PowerPC machines,
+ including all G3 and G4 models by Apple, as well as older PowerMacs.
Package: kernel-build-2.6.9-powerpc-smp
Architecture: powerpc
@@ -195,5 +186,14 @@
Description: Linux kernel image for 2.6.9-powerpc-smp
.
This package contains the Linux kernel for version 2.6.9-powerpc-smp.
+
+Package: kernel-image-powerpc-smp
+Section: base
+Architecture: powerpc
+Depends: kernel-image-2.6.9-powerpc-smp
+Description: Linux kernel image for powerpc-smp
+ .
+ This is a dummy package that will always depend on the latest release
+ of the kernel-image package for powerpc-smp.
It is intended to be run on most dual-processor PowerPC machines,
most notably the Dual G4 PowerMacs by Apple.
Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control-image.m4
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control-image.m4 2004-12-06 01:08:47 UTC (rev 1974)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control-image.m4 2004-12-06 01:11:33 UTC (rev 1975)
@@ -1,13 +1,4 @@
-Package: kernel-image-M4FLAVOUR
-Section: base
-Architecture: powerpc
-Depends: kernel-image-M4KERNEL-M4FLAVOUR
-Description: Linux kernel image for M4FLAVOUR
- .
- This is a dummy package that will always depend on the latest release
- of the kernel-image package for M4FLAVOUR.
-
Package: kernel-build-M4KERNEL-M4FLAVOUR
Architecture: powerpc
Depends: kernel-headers-M4KERNEL
Copied: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control-official.m4 (from rev 1973, trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control-image.m4)
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control-image.m4 2004-12-05 05:49:59 UTC (rev 1973)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/control-official.m4 2004-12-06 01:11:33 UTC (rev 1975)
@@ -0,0 +1,9 @@
+
+Package: kernel-image-M4FLAVOUR
+Section: base
+Architecture: powerpc
+Depends: kernel-image-M4KERNEL-M4FLAVOUR
+Description: Linux kernel image for M4FLAVOUR
+ .
+ This is a dummy package that will always depend on the latest release
+ of the kernel-image package for M4FLAVOUR.
Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/rules
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/rules 2004-12-06 01:08:47 UTC (rev 1974)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/rules 2004-12-06 01:11:33 UTC (rev 1975)
@@ -7,6 +7,9 @@
# debhelper compatibility version
export DH_COMPAT=4
+# Set to Yes if we are going to generate the metapackages.
+OFFICIAL_VERSION = No
+
# set the build architecture if necessary
DEB_HOST_ARCH ?= $(shell dpkg --print-architecture)
@@ -368,11 +371,14 @@
debian/control: \
debian/changelog debian/flavours \
$(foreach flavour,$(flavours), debian/flavour-$(flavour)) \
-debian/control.stub debian/control-image.m4
+debian/control.stub debian/control-image.m4 debian/control-official.m4
$(M4CONTROL) debian/control.stub > $@
for flavour in $(flavours); do \
- $(M4CONTROL) debian/control-image.m4 >> $@; \
- cat debian/flavour-$$flavour >> $@; \
+ $(M4CONTROL) debian/control-image.m4 >> $@; \
+ if [ "$(OFFICIAL_VERSION)" = "Yes" ]; then \
+ $(M4CONTROL) debian/control-official.m4 >> $@; \
+ fi; \
+ cat debian/flavour-$$flavour >> $@; \
done