r2567 - trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian
Sven Luther
luther@costa.debian.org
Sat, 26 Feb 2005 09:43:55 +0100
Author: luther
Date: 2005-02-26 09:43:55 +0100 (Sat, 26 Feb 2005)
New Revision: 2567
Modified:
trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control
trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control-flavour-powerpc-powerpc-powerpc-small.m4
trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control-flavour-powerpc-powerpc-powerpc-smp.m4
trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control-flavour-powerpc-powerpc-powerpc.m4
trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control-subarch-powerpc-apus.m4
trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control-subarch-powerpc-nubus.m4
trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/rules
Log:
Added missing Architecture fields to the kernel-build packages.
Enabled copying of the post-install rule to the kernel-image package.
Implemented the binary target, package is now ready, or should be.
Modified: trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control
===================================================================
--- trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control 2005-02-26 07:46:16 UTC (rev 2566)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control 2005-02-26 08:43:55 UTC (rev 2567)
@@ -42,6 +42,7 @@
Package: kernel-build-2.4.27-apus
Section: devel
+Architecture: powerpc
Depends: kernel-headers-2.4.27-apus
Description: build infrastructure for kernel version 2.4.27-apus
.
@@ -84,6 +85,7 @@
Package: kernel-build-2.4.27-nubus
Section: devel
+Architecture: powerpc
Depends: kernel-headers-2.4.27-nubus
Description: build infrastructure for kernel version 2.4.27-nubus
.
@@ -111,8 +113,12 @@
Recommends: kernel-headers-2.4.27-powerpc
Depends: mkvmlinuz
Suggests: kernel-doc-2.4.27
-Provides: kernel-image
+Provides: kernel-image, kernel-image-2.4.27-powerpc-chrp, kernel-image-2.4.27-powerpc-chrp-rs6k, kernel-image-2.4.27-powerpc-pmac, kernel-image-2.4.27-powerpc-prep, kernel-modules-2.4.27-powerpc
+Replaces: kernel-image-2.4.27-powerpc-chrp, kernel-image-2.4.27-powerpc-chrp-rs6k, kernel-image-2.4.27-powerpc-pmac, kernel-image-2.4.27-powerpc-prep, kernel-modules-2.4.27-powerpc
+Conflicts: kernel-image-2.4.27-powerpc-chrp, kernel-image-2.4.27-powerpc-chrp-rs6k, kernel-image-2.4.27-powerpc-pmac, kernel-image-2.4.27-powerpc-prep, kernel-modules-2.4.27-powerpc
Description: Linux/PowerPC kernel binary image for the powerpc flavour
+Description: Linux/PowerPC kernel binary image for the powerpc flavour
+Description: Linux/PowerPC kernel binary image for the powerpc flavour
This package contains the Linux/PowerPC kernel image, the
System.map file, and the modules built by the package.
.
@@ -126,6 +132,7 @@
Package: kernel-build-2.4.27-powerpc
Section: devel
+Architecture: powerpc
Depends: kernel-headers-2.4.27-powerpc
Description: build infrastructure for kernel version 2.4.27-powerpc
.
@@ -138,7 +145,9 @@
Recommends: kernel-headers-2.4.27-powerpc
Depends: mkvmlinuz
Suggests: kernel-doc-2.4.27
-Provides: kernel-image
+Provides: kernel-image, kernel-image-2.4.27-powerpc-smp-chrp, kernel-image-2.4.27-powerpc-smp-chrp-rs6k, kernel-image-2.4.27-powerpc-smp-pmac, kernel-image-2.4.27-powerpc-smp-prep, kernel-modules-2.4.27-powerpc-smp
+Replaces: kernel-image-2.4.27-powerpc-smp-chrp, kernel-image-2.4.27-powerpc-smp-chrp-rs6k, kernel-image-2.4.27-powerpc-smp-pmac, kernel-image-2.4.27-powerpc-smp-prep, kernel-modules-2.4.27-powerpc-smp
+Conflicts: kernel-image-2.4.27-powerpc-smp-chrp, kernel-image-2.4.27-powerpc-smp-chrp-rs6k, kernel-image-2.4.27-powerpc-smp-pmac, kernel-image-2.4.27-powerpc-smp-prep, kernel-modules-2.4.27-powerpc-smp
Description: Linux/PowerPC kernel binary image for the powerpc-smp flavour
This package contains the Linux/PowerPC kernel image, the
System.map file, and the modules built by the package.
@@ -153,6 +162,7 @@
Package: kernel-build-2.4.27-powerpc-smp
Section: devel
+Architecture: powerpc
Depends: kernel-headers-2.4.27-powerpc
Description: build infrastructure for kernel version 2.4.27-powerpc-smp
.
@@ -165,7 +175,9 @@
Recommends: kernel-headers-2.4.27-powerpc
Suggests: kernel-doc-2.4.27
Depends: mkvmlinuz
-Provides: kernel-image
+Provides: kernel-image, kernel-image-2.4.27-powerpc-small-chrp, kernel-image-2.4.27-powerpc-small-chrp-rs6k, kernel-image-2.4.27-powerpc-small-pmac, kernel-image-2.4.27-powerpc-small-prep, kernel-modules-2.4.27-powerpc-small
+Replaces: kernel-image-2.4.27-powerpc-small-chrp, kernel-image-2.4.27-powerpc-small-chrp-rs6k, kernel-image-2.4.27-powerpc-small-pmac, kernel-image-2.4.27-powerpc-small-prep, kernel-modules-2.4.27-powerpc-small
+Conflicts: kernel-image-2.4.27-powerpc-small-chrp, kernel-image-2.4.27-powerpc-small-chrp-rs6k, kernel-image-2.4.27-powerpc-small-pmac, kernel-image-2.4.27-powerpc-small-prep, kernel-modules-2.4.27-powerpc-small
Description: Linux/PowerPC kernel binary image for the powerpc-small flavour
This package contains the Linux/PowerPC kernel image, the
System.map file, and the modules built by the package.
@@ -181,6 +193,7 @@
Package: kernel-build-2.4.27-powerpc-small
Section: devel
+Architecture: powerpc
Depends: kernel-headers-2.4.27-powerpc
Description: build infrastructure for kernel version 2.4.27-powerpc-small
.
Modified: trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control-flavour-powerpc-powerpc-powerpc-small.m4
===================================================================
--- trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control-flavour-powerpc-powerpc-powerpc-small.m4 2005-02-26 07:46:16 UTC (rev 2566)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control-flavour-powerpc-powerpc-powerpc-small.m4 2005-02-26 08:43:55 UTC (rev 2567)
@@ -4,7 +4,9 @@
Recommends: kernel-headers-M4KERNEL-M4SUBARCH
Suggests: kernel-doc-M4KERNEL
Depends: mkvmlinuz
-Provides: kernel-image
+Provides: kernel-image, kernel-image-M4KERNEL-M4FLAVOUR-chrp, kernel-image-M4KERNEL-M4FLAVOUR-chrp-rs6k, kernel-image-M4KERNEL-M4FLAVOUR-pmac, kernel-image-M4KERNEL-M4FLAVOUR-prep, kernel-modules-M4KERNEL-M4FLAVOUR
+Replaces: kernel-image-M4KERNEL-M4FLAVOUR-chrp, kernel-image-M4KERNEL-M4FLAVOUR-chrp-rs6k, kernel-image-M4KERNEL-M4FLAVOUR-pmac, kernel-image-M4KERNEL-M4FLAVOUR-prep, kernel-modules-M4KERNEL-M4FLAVOUR
+Conflicts: kernel-image-M4KERNEL-M4FLAVOUR-chrp, kernel-image-M4KERNEL-M4FLAVOUR-chrp-rs6k, kernel-image-M4KERNEL-M4FLAVOUR-pmac, kernel-image-M4KERNEL-M4FLAVOUR-prep, kernel-modules-M4KERNEL-M4FLAVOUR
Description: Linux/PowerPC kernel binary image for the M4FLAVOUR flavour
This package contains the Linux/PowerPC kernel image, the
System.map file, and the modules built by the package.
@@ -20,6 +22,7 @@
Package: kernel-build-M4KERNEL-M4FLAVOUR
Section: devel
+Architecture: powerpc
Depends: kernel-headers-M4KERNEL-M4SUBARCH
Description: build infrastructure for kernel version M4KERNEL-M4FLAVOUR
.
Modified: trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control-flavour-powerpc-powerpc-powerpc-smp.m4
===================================================================
--- trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control-flavour-powerpc-powerpc-powerpc-smp.m4 2005-02-26 07:46:16 UTC (rev 2566)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control-flavour-powerpc-powerpc-powerpc-smp.m4 2005-02-26 08:43:55 UTC (rev 2567)
@@ -4,7 +4,9 @@
Recommends: kernel-headers-M4KERNEL-M4SUBARCH
Depends: mkvmlinuz
Suggests: kernel-doc-M4KERNEL
-Provides: kernel-image
+Provides: kernel-image, kernel-image-M4KERNEL-M4FLAVOUR-chrp, kernel-image-M4KERNEL-M4FLAVOUR-chrp-rs6k, kernel-image-M4KERNEL-M4FLAVOUR-pmac, kernel-image-M4KERNEL-M4FLAVOUR-prep, kernel-modules-M4KERNEL-M4FLAVOUR
+Replaces: kernel-image-M4KERNEL-M4FLAVOUR-chrp, kernel-image-M4KERNEL-M4FLAVOUR-chrp-rs6k, kernel-image-M4KERNEL-M4FLAVOUR-pmac, kernel-image-M4KERNEL-M4FLAVOUR-prep, kernel-modules-M4KERNEL-M4FLAVOUR
+Conflicts: kernel-image-M4KERNEL-M4FLAVOUR-chrp, kernel-image-M4KERNEL-M4FLAVOUR-chrp-rs6k, kernel-image-M4KERNEL-M4FLAVOUR-pmac, kernel-image-M4KERNEL-M4FLAVOUR-prep, kernel-modules-M4KERNEL-M4FLAVOUR
Description: Linux/PowerPC kernel binary image for the M4FLAVOUR flavour
This package contains the Linux/PowerPC kernel image, the
System.map file, and the modules built by the package.
@@ -19,6 +21,7 @@
Package: kernel-build-M4KERNEL-M4FLAVOUR
Section: devel
+Architecture: powerpc
Depends: kernel-headers-M4KERNEL-M4SUBARCH
Description: build infrastructure for kernel version M4KERNEL-M4FLAVOUR
.
Modified: trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control-flavour-powerpc-powerpc-powerpc.m4
===================================================================
--- trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control-flavour-powerpc-powerpc-powerpc.m4 2005-02-26 07:46:16 UTC (rev 2566)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control-flavour-powerpc-powerpc-powerpc.m4 2005-02-26 08:43:55 UTC (rev 2567)
@@ -4,8 +4,12 @@
Recommends: kernel-headers-M4KERNEL-M4SUBARCH
Depends: mkvmlinuz
Suggests: kernel-doc-M4KERNEL
-Provides: kernel-image
+Provides: kernel-image, kernel-image-M4KERNEL-M4FLAVOUR-chrp, kernel-image-M4KERNEL-M4FLAVOUR-chrp-rs6k, kernel-image-M4KERNEL-M4FLAVOUR-pmac, kernel-image-M4KERNEL-M4FLAVOUR-prep, kernel-modules-M4KERNEL-M4FLAVOUR
+Replaces: kernel-image-M4KERNEL-M4FLAVOUR-chrp, kernel-image-M4KERNEL-M4FLAVOUR-chrp-rs6k, kernel-image-M4KERNEL-M4FLAVOUR-pmac, kernel-image-M4KERNEL-M4FLAVOUR-prep, kernel-modules-M4KERNEL-M4FLAVOUR
+Conflicts: kernel-image-M4KERNEL-M4FLAVOUR-chrp, kernel-image-M4KERNEL-M4FLAVOUR-chrp-rs6k, kernel-image-M4KERNEL-M4FLAVOUR-pmac, kernel-image-M4KERNEL-M4FLAVOUR-prep, kernel-modules-M4KERNEL-M4FLAVOUR
Description: Linux/PowerPC kernel binary image for the M4FLAVOUR flavour
+Description: Linux/PowerPC kernel binary image for the M4FLAVOUR flavour
+Description: Linux/PowerPC kernel binary image for the M4FLAVOUR flavour
This package contains the Linux/PowerPC kernel image, the
System.map file, and the modules built by the package.
.
@@ -19,6 +23,7 @@
Package: kernel-build-M4KERNEL-M4FLAVOUR
Section: devel
+Architecture: powerpc
Depends: kernel-headers-M4KERNEL-M4SUBARCH
Description: build infrastructure for kernel version M4KERNEL-M4FLAVOUR
.
Modified: trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control-subarch-powerpc-apus.m4
===================================================================
--- trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control-subarch-powerpc-apus.m4 2005-02-26 07:46:16 UTC (rev 2566)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control-subarch-powerpc-apus.m4 2005-02-26 08:43:55 UTC (rev 2567)
@@ -34,6 +34,7 @@
Package: kernel-build-M4KERNEL-M4SUBARCH
Section: devel
+Architecture: powerpc
Depends: kernel-headers-M4KERNEL-M4SUBARCH
Description: build infrastructure for kernel version M4KERNEL-M4SUBARCH
.
Modified: trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control-subarch-powerpc-nubus.m4
===================================================================
--- trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control-subarch-powerpc-nubus.m4 2005-02-26 07:46:16 UTC (rev 2566)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control-subarch-powerpc-nubus.m4 2005-02-26 08:43:55 UTC (rev 2567)
@@ -34,6 +34,7 @@
Package: kernel-build-M4KERNEL-M4SUBARCH
Section: devel
+Architecture: powerpc
Depends: kernel-headers-M4KERNEL-M4SUBARCH
Description: build infrastructure for kernel version M4KERNEL-M4SUBARCH
.
Modified: trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/rules
===================================================================
--- trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/rules 2005-02-26 07:46:16 UTC (rev 2566)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/rules 2005-02-26 08:43:55 UTC (rev 2567)
@@ -126,9 +126,6 @@
$(M4) debian/control-arch-$(arch).m4 > $(KSUBARCH)/debian/control
$(M4) debian/control-subarch-$(arch)-$(subarch).m4 >> $(KSUBARCH)/debian/control
zcat patches/debian-$(subarch).diff.gz | patch -p1 -d $(KSUBARCH)
-ifneq (,$(flavours))
- cd debian; cp -p post-install $(KSOURCE)/debian
-endif
rm -f $(KSUBARCH)/.config
-$(MAKE) -s -C config $(subarch).default >$(KSUBARCH)/.config
@@ -153,6 +150,9 @@
$(M4) debian/control-flavour-$(arch)-$(subarch)-$(flavour).m4 >> $(KFLAVOUR)/debian/control
rm -f $(KFLAVOUR)/.config
-$(MAKE) -s -C config $(flavour) > $(KFLAVOUR)/.config
+ifeq (powerpc,$(flavours))
+ cd debian; cp -p post-install $(KFLAVOUR)/debian
+endif
touch $@
endif
@@ -327,137 +327,26 @@
endif
endif
-# the binary target is responsible for creating Debian packages from
-# the various package directories created by the install target.
-# Also, it creates additional packages such as kernel-headers directly
-# from the build directories.
-
ifeq ($(DEB_HOST_ARCH),powerpc)
-binary: \
-binary-$(arch) \
-$(foreach subarch,$(subarchs),binary-subarch-$(subarch))
- touch $@
+binary: #configure build install
+ dh_testdir -a
+ dh_testroot -a
+ dh_installdocs -a
+ dh_installexamples -X.svn -a
+ dh_installmodules -a
+ dh_installchangelogs -a
+ dh_compress -X.stub -a
+ dh_link -a
+ dh_strip -a
+ dh_fixperms -a
+ dh_installdeb -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
else
binary:
endif
-# Per arch binary processing.
-binary-$(arch):
- touch $@
-
-ifeq (0,$(MAKELEVEL))
-
-stamp-binary-subarch-%:
- $(MAKE) -f debian/rules binary-subarch-$* subarch=$*
-
-else
-ifeq (1,$(MAKELEVEL))
-
-# Per subarch binary processing.
-stamp-binary-subarch-$(subarch): \
-$(foreach flavour,$(flavours),binary-flavour-$(subarch)-$(flavour))
- touch $@
-
-binary-flavour-$(subarch)-%:
- $(MAKE) -f debian/rules binary-flavour-$(subarch)-$* subarch=$(subarch) flavour=$*
-
-else
-ifeq (2,$(MAKELEVEL))
-
-# Per flavour binary processing.
-binary-flavour-$(subarch)-$(flavour):
- touch $@
-
-endif
-endif
-endif
-
-ifeq ($(DEB_HOST_ARCH),powerpc)
-binary: \
-binary-kernel-patch-powerpc-$(kernel) \
-binary-kernel-headers-$(kernel) \
-$(foreach flavour,$(flavours),binary-flavour-$(flavour))
-else
-binary: binary-arch binary-indep
-binary-arch:
-binary-indep: \
-binary-kernel-patch-powerpc-$(kernel)
-endif
-
-ifeq (0,$(MAKELEVEL))
-
-binary-flavour-%:
- $(MAKE) -f debian/rules binary-flavour-$* flavour=$*
-
-else
-ifeq (1,$(MAKELEVEL))
-
-binary-flavour-$(flavour): \
-binary-kernel-image-$(kernel)-$(flavour) \
-binary-kernel-build-$(kernel)-$(flavour)
-
-endif
-endif
-
-# the following targets do the actual work of creating the packages.
-
-# The kernel-headers package is special since it can be created with a
-# simple call to make-kpkg.
-
-binary-kernel-headers-$(kernel):
- cd $(KSOURCE); APPEND_TO_VERSION='' make-kpkg kernel-headers
- mv $(KHEADERS) ..
- dpkg-distaddfile $(notdir $(KHEADERS)) devel optional
-
-# For all packages that are actually built here, almost all tasks are
-# identical and are therefore collected in a common target. The
-# recursion takes care of passing the package name to the debhelper
-# scripts.
-
-# The kernel-image packages branch from the common packaging procedure
-# just before the creation of the control file, because they need
-# install scripts. Right now, they simply uses the ones from the
-# intermediate package. In the future, it may come handy to modify
-# them slightly, so the following code snippet is kept for reference.
-# It erases $loader and changes $kimage from vmlinux to vmlinuz.
-#
-# for file in {pre,post}{inst,rm}; do \
-# < $(KIMAGE)/DEBIAN/$$file sed \
-# -e's/^\(my..loader.*"\)[a-z]*"/\1"/' \
-# -e's/^\(my..kimage.*"vmlinu\)x/\1z/' > $(KIMAGE)/DEBIAN/$$file; \
-# chmod 755 $(KIMAGE)/DEBIAN/$$file; done
-
-binary-kernel-image-$(kernel)-%: stamp-install-flavour-$(flavour)
- $(MAKE) -f debian/rules binary-image-package DH_OPTIONS=-pkernel-image-$(kernel)-$*
-
-binary-image-package: binary-common-package
- dpkg -e $(KDUMMY) $(KIMAGE)/DEBIAN
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-kernel-patch-%: stamp-install-patch
- $(MAKE) -f debian/rules binary-package DH_OPTIONS=-pkernel-patch-$*
-binary-kernel-%: stamp-install-flavour-$(flavour)
- $(MAKE) -f debian/rules binary-package DH_OPTIONS=-pkernel-$*
-binary-package: binary-common-package
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-common-package:
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installexamples -X.svn
- dh_installmodules
- dh_installchangelogs
- dh_compress -X.stub
- dh_link
- dh_strip
- dh_fixperms
- dh_installdeb
-
# the clean target flushes the whole shebang down the drain, generated
# files in debian/, build directories, stamp files, everything. The
# install-clean target reverts only the install stage, which is nice