r2566 - trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian
Sven Luther
luther@costa.debian.org
Sat, 26 Feb 2005 08:46:17 +0100
Author: luther
Date: 2005-02-26 08:46:16 +0100 (Sat, 26 Feb 2005)
New Revision: 2566
Modified:
trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/build-files
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/flavours
trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/rules
Log:
Now ready upto install phase, only binary rules need fixing.
Modified: trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/build-files
===================================================================
--- trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/build-files 2005-02-26 04:45:35 UTC (rev 2565)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/build-files 2005-02-26 07:46:16 UTC (rev 2566)
@@ -1,6 +1,5 @@
.config
arch/ppc/Makefile
arch/ppc/kernel/Makefile
-arch/ppc/kernel/asm-offsets.c
include/linux/autoconf.h
include/linux/version.h
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 04:45:35 UTC (rev 2565)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control 2005-02-26 07:46:16 UTC (rev 2566)
@@ -16,6 +16,13 @@
is based on the BitKeeper tree used by most active PowerPC developers (See
http://penguinppc.org/dev/kernel.shtml for info).
+Package: kernel-headers-2.4.27-apus
+Section: devel
+Architecture: powerpc
+Provides: kernel-headers, kernel-headers-2.4
+Description: Linux/APUS kernel headers.
+ Read /usr/share/doc/kernel-headers-2.4.27-apus/debian.README.gz for details.
+
Package: kernel-image-2.4.27-apus
Section: base
Architecture: powerpc
@@ -33,12 +40,14 @@
create a custom kernel from the sources. You will also need
kernel-patch-2.4.27-apus
-Package: kernel-headers-2.4.27-apus
+Package: kernel-build-2.4.27-apus
Section: devel
-Architecture: powerpc
-Provides: kernel-headers, kernel-headers-2.4
-Description: Linux/APUS kernel headers.
- Read /usr/share/doc/kernel-headers-2.4.27-apus/debian.README.gz for details.
+Depends: kernel-headers-2.4.27-apus
+Description: build infrastructure for kernel version 2.4.27-apus
+ .
+ Together with kernel-headers-2.4.27-apus, this package provides the
+ infrastructure for building additional modules for 2.4.27-apus
+
Package: kernel-patch-2.4.27-nubus
Architecture: powerpc
Depends: kernel-source-2.4.27
@@ -49,6 +58,13 @@
is based on the BitKeeper tree used by most active PowerPC developers (See
http://penguinppc.org/dev/kernel.shtml for info).
+Package: kernel-headers-2.4.27-nubus
+Section: devel
+Architecture: powerpc
+Provides: kernel-headers, kernel-headers-2.4
+Description: Linux/nubus kernel headers.
+ Read /usr/share/doc/kernel-headers-2.4.27-nubus/debian.README.gz for details.
+
Package: kernel-image-2.4.27-nubus
Section: base
Architecture: powerpc
@@ -66,12 +82,13 @@
create a custom kernel from the sources. You will also need
kernel-patch-
-Package: kernel-headers-2.4.27-nubus
+Package: kernel-build-2.4.27-nubus
Section: devel
-Architecture: powerpc
-Provides: kernel-headers, kernel-headers-2.4
-Description: Linux/nubus kernel headers.
- Read /usr/share/doc/kernel-headers-2.4.27-nubus/debian.README.gz for details.
+Depends: kernel-headers-2.4.27-nubus
+Description: build infrastructure for kernel version 2.4.27-nubus
+ .
+ Together with kernel-headers-2.4.27-nubus, this package provides the
+ infrastructure for building additional modules for 2.4.27-nubus
Package: kernel-patch-2.4.27-powerpc
Architecture: powerpc
@@ -107,6 +124,14 @@
create a custom kernel from the sources. You will also need
kernel-patch-2.4.27-powerpc
+Package: kernel-build-2.4.27-powerpc
+Section: devel
+Depends: kernel-headers-2.4.27-powerpc
+Description: build infrastructure for kernel version 2.4.27-powerpc
+ .
+ Together with kernel-headers-2.4.27-powerpc, this package provides the
+ infrastructure for building additional modules for 2.4.27-powerpc
+
Package: kernel-image-2.4.27-powerpc-smp
Section: base
Architecture: powerpc
@@ -126,6 +151,14 @@
create a custom kernel from the sources. You will also need
kernel-patch-2.4.27-powerpc
+Package: kernel-build-2.4.27-powerpc-smp
+Section: devel
+Depends: kernel-headers-2.4.27-powerpc
+Description: build infrastructure for kernel version 2.4.27-powerpc-smp
+ .
+ Together with kernel-headers-2.4.27-powerpc-smp, this package provides the
+ infrastructure for building additional modules for 2.4.27-powerpc-smp
+
Package: kernel-image-2.4.27-powerpc-small
Section: base
Architecture: powerpc
@@ -146,3 +179,11 @@
create a custom kernel from the sources. You will also need
kernel-patch-2.4.27-powerpc
+Package: kernel-build-2.4.27-powerpc-small
+Section: devel
+Depends: kernel-headers-2.4.27-powerpc
+Description: build infrastructure for kernel version 2.4.27-powerpc-small
+ .
+ Together with kernel-headers-2.4.27-powerpc-small, this package provides the
+ infrastructure for building additional modules for 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 04:45:35 UTC (rev 2565)
+++ 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)
@@ -18,3 +18,11 @@
create a custom kernel from the sources. You will also need
kernel-patch-M4KERNEL-M4SUBARCH
+Package: kernel-build-M4KERNEL-M4FLAVOUR
+Section: devel
+Depends: kernel-headers-M4KERNEL-M4SUBARCH
+Description: build infrastructure for kernel version M4KERNEL-M4FLAVOUR
+ .
+ Together with kernel-headers-M4KERNEL-M4FLAVOUR, this package provides the
+ infrastructure for building additional modules for 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 04:45:35 UTC (rev 2565)
+++ 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)
@@ -17,3 +17,11 @@
create a custom kernel from the sources. You will also need
kernel-patch-M4KERNEL-M4SUBARCH
+Package: kernel-build-M4KERNEL-M4FLAVOUR
+Section: devel
+Depends: kernel-headers-M4KERNEL-M4SUBARCH
+Description: build infrastructure for kernel version M4KERNEL-M4FLAVOUR
+ .
+ Together with kernel-headers-M4KERNEL-M4FLAVOUR, this package provides the
+ infrastructure for building additional modules for 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 04:45:35 UTC (rev 2565)
+++ 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)
@@ -17,3 +17,11 @@
create a custom kernel from the sources. You will also need
kernel-patch-M4KERNEL-M4SUBARCH
+Package: kernel-build-M4KERNEL-M4FLAVOUR
+Section: devel
+Depends: kernel-headers-M4KERNEL-M4SUBARCH
+Description: build infrastructure for kernel version M4KERNEL-M4FLAVOUR
+ .
+ Together with kernel-headers-M4KERNEL-M4FLAVOUR, this package provides the
+ infrastructure for building additional modules for 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 04:45:35 UTC (rev 2565)
+++ 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)
@@ -8,6 +8,13 @@
is based on the BitKeeper tree used by most active PowerPC developers (See
http://penguinppc.org/dev/kernel.shtml for info).
+Package: kernel-headers-M4KERNEL-M4SUBARCH
+Section: devel
+Architecture: powerpc
+Provides: kernel-headers, kernel-headers-2.4
+Description: Linux/APUS kernel headers.
+ Read /usr/share/doc/kernel-headers-M4KERNEL-M4SUBARCH/debian.README.gz for details.
+
Package: kernel-image-M4KERNEL-M4SUBARCH
Section: base
Architecture: powerpc
@@ -25,9 +32,11 @@
create a custom kernel from the sources. You will also need
kernel-patch-M4KERNEL-M4SUBARCH
-Package: kernel-headers-M4KERNEL-M4SUBARCH
+Package: kernel-build-M4KERNEL-M4SUBARCH
Section: devel
-Architecture: powerpc
-Provides: kernel-headers, kernel-headers-2.4
-Description: Linux/APUS kernel headers.
- Read /usr/share/doc/kernel-headers-M4KERNEL-M4SUBARCH/debian.README.gz for details.
+Depends: kernel-headers-M4KERNEL-M4SUBARCH
+Description: build infrastructure for kernel version M4KERNEL-M4SUBARCH
+ .
+ Together with kernel-headers-M4KERNEL-M4SUBARCH, this package provides the
+ infrastructure for building additional modules for 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 04:45:35 UTC (rev 2565)
+++ 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)
@@ -8,6 +8,13 @@
is based on the BitKeeper tree used by most active PowerPC developers (See
http://penguinppc.org/dev/kernel.shtml for info).
+Package: kernel-headers-M4KERNEL-M4SUBARCH
+Section: devel
+Architecture: powerpc
+Provides: kernel-headers, kernel-headers-2.4
+Description: Linux/nubus kernel headers.
+ Read /usr/share/doc/kernel-headers-M4KERNEL-M4SUBARCH/debian.README.gz for details.
+
Package: kernel-image-M4KERNEL-M4SUBARCH
Section: base
Architecture: powerpc
@@ -25,10 +32,11 @@
create a custom kernel from the sources. You will also need
kernel-patch-
-Package: kernel-headers-M4KERNEL-M4SUBARCH
+Package: kernel-build-M4KERNEL-M4SUBARCH
Section: devel
-Architecture: powerpc
-Provides: kernel-headers, kernel-headers-2.4
-Description: Linux/nubus kernel headers.
- Read /usr/share/doc/kernel-headers-M4KERNEL-M4SUBARCH/debian.README.gz for details.
+Depends: kernel-headers-M4KERNEL-M4SUBARCH
+Description: build infrastructure for kernel version M4KERNEL-M4SUBARCH
+ .
+ Together with kernel-headers-M4KERNEL-M4SUBARCH, this package provides the
+ infrastructure for building additional modules for M4KERNEL-M4SUBARCH
Modified: trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/flavours
===================================================================
--- trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/flavours 2005-02-26 04:45:35 UTC (rev 2565)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/flavours 2005-02-26 07:46:16 UTC (rev 2566)
@@ -2,3 +2,4 @@
archs: powerpc
subarchs powerpc: apus nubus powerpc
flavours powerpc: powerpc powerpc-smp powerpc-small
+make-kpkg match powerpc: pmac
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 04:45:35 UTC (rev 2565)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/rules 2005-02-26 07:46:16 UTC (rev 2566)
@@ -16,6 +16,10 @@
arch := $(DEB_HOST_ARCH)
subarchs := $(shell grep "^subarchs $(arch):" debian/flavours | sed -e 's/^subarchs $(arch): *//')
flavours := $(shell grep "^flavours $(subarch):" debian/flavours | sed -e 's/^flavours $(subarch): *//')
+makekpkg := $(shell grep "^make-kpkg match $(subarch):" debian/flavours | sed -e 's/^make-kpkg match $(subarch): *//')
+ifeq (,$(makekpkg))
+makekpkg := $(subarch)
+endif
# cut the upstream version and the Debian revision from the changelog
kernel := $(shell head -1 debian/changelog | sed 's/^.*(\(.*\)-.*).*$$/\1/')
@@ -38,9 +42,10 @@
KFLAVOUR = $(TMP)/kernel-source-$(kernel)-$(subarch)-$(flavour)
KDUMMYSA = $(TMP)/kernel-image-$(kernel)-$(subarch)_$(version)_powerpc.deb
KDUMMY = $(TMP)/kernel-image-$(kernel)-$(flavour)_$(version)_powerpc.deb
-KHEADERS = $(TMP)/kernel-headers-$(kernel)_$(version)_powerpc.deb
+KHEADERS = $(TMP)/kernel-headers-$(kernel)-$(subarch)_$(version)_powerpc.deb
# install locations
+KHEADERDIR = $(CURDIR)/debian/kernel-headers-$(kernel)-$(subarch)
KPATCH = $(CURDIR)/debian/kernel-patch-powerpc-$(subarch)/usr/src/kernel-patches/powerpc/$(kernel)-$(subarch)
KBUILD = $(CURDIR)/debian/kernel-build-$(kernel)-$(flavour)
KBUILDSA = $(CURDIR)/debian/kernel-build-$(kernel)-$(subarch)
@@ -60,7 +65,7 @@
export PARALLEL_BUILD=-j2
export INITRD=Yes
export INITRD_OK=WeKnowWhatWeAreDoing
-export KPKG_SUBARCH=pmac
+#export KPKG_SUBARCH=pmac
# the configure target is responsible for setting up the build arena,
# i.e. unpacking the Debian kernel source, applying the PowerPC patch,
@@ -117,12 +122,14 @@
test -d $(dir $(KSUBARCH)) || mkdir -p $(dir $(KSUBARCH))
cp -al $(KSOURCE) $(KSUBARCH)
+ rm -f $(KSUBARCH)/debian/control
$(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
touch $@
@@ -140,6 +147,10 @@
test -d $(dir $(KFLAVOUR)) || mkdir -p $(dir $(KFLAVOUR))
cp -al $(KSUBARCH) $(KFLAVOUR)
+ rm -f $(KFLAVOUR)/debian/control
+ $(M4) debian/control-arch-$(arch).m4 > $(KFLAVOUR)/debian/control
+ $(M4) debian/control-subarch-$(arch)-$(subarch).m4 >> $(KFLAVOUR)/debian/control
+ $(M4) debian/control-flavour-$(arch)-$(subarch)-$(flavour).m4 >> $(KFLAVOUR)/debian/control
rm -f $(KFLAVOUR)/.config
-$(MAKE) -s -C config $(flavour) > $(KFLAVOUR)/.config
touch $@
@@ -182,13 +193,13 @@
cd $(KSUBARCH); \
MFLAGS="$(filter-out -j --j%,$(MFLAGS))" \
MAKEFLAGS="$(filter-out -j --j%,$(MAKEFLAGS))" \
- make-kpkg --subarch $(subarch) --append-to-version -$(subarch) kernel_headers
+ make-kpkg --subarch $(makekpkg) --append-to-version -$(subarch) kernel_headers
ifeq (,$(flavours))
# Let's build subarches who have no flavours here.
cd $(KSUBARCH); \
MFLAGS="$(filter-out -j --j%,$(MFLAGS))" \
MAKEFLAGS="$(filter-out -j --j%,$(MAKEFLAGS))" \
- make-kpkg --subarch $(subarch) --append-to-version -$(subarch) build
+ make-kpkg --subarch $(makekpkg) --append-to-version -$(subarch) build
endif
touch $@
@@ -203,7 +214,7 @@
cd $(KFLAVOUR); \
MFLAGS="$(filter-out -j --j%,$(MFLAGS))" \
MAKEFLAGS="$(filter-out -j --j%,$(MAKEFLAGS))" \
- make-kpkg --subarch $(flavour) --append-to-version -$(flavour) build
+ make-kpkg --subarch $(makekpkg) --append-to-version -$(flavour) build
touch $@
endif
@@ -245,13 +256,14 @@
# Per subarch install processing.
stamp-install-subarch-$(subarch): \
stamp-install-patch-subarch-$(subarch) \
+stamp-install-headers-subarch-$(subarch) \
$(foreach flavour,$(flavours),stamp-install-flavour-$(subarch)-$(flavour))
ifeq (,$(flavours))
# create and unpack the intermediate kernel image package
cd $(KSUBARCH); \
MFLAGS="$(filter-out -j --j%,$(MFLAGS))" \
MAKEFLAGS="$(filter-out -j --j%,$(MAKEFLAGS))" \
- make-kpkg --subarch $(subarch) --append-to-version -$(subarch) kernel-image
+ make-kpkg --subarch $(makekpkg) --append-to-version -$(subarch) kernel-image
dpkg -x $(KDUMMYSA) $(KIMAGESA)
# copy build infrastructure for kernel modules
@@ -277,6 +289,9 @@
$(M4) debian/unpatch.m4 > debian/unpatch-$(subarch)
$(INSTALL_EXEC) debian/unpatch-$(subarch) $(KPATCH)/unpatch/0$(subarch)
+stamp-install-headers-subarch-$(subarch):
+ dpkg -x $(KHEADERS) $(KHEADERDIR)
+
stamp-install-flavour-$(subarch)-%:
$(MAKE) -f debian/rules stamp-install-flavour-$(subarch)-$* subarch=$(subarch) flavour=$*
@@ -289,7 +304,7 @@
cd $(KFLAVOUR); \
MFLAGS="$(filter-out -j --j%,$(MFLAGS))" \
MAKEFLAGS="$(filter-out -j --j%,$(MAKEFLAGS))" \
- make-kpkg --subarch pmac --append-to-version -$(flavour) kernel-image
+ make-kpkg --subarch $(makekpkg) --append-to-version -$(flavour) kernel-image
dpkg -x $(KDUMMY) $(KIMAGE)
# remove the coff image