r2557 - trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian
Sven Luther
luther@costa.debian.org
Thu, 24 Feb 2005 23:09:45 +0100
Author: luther
Date: 2005-02-24 23:09:44 +0100 (Thu, 24 Feb 2005)
New Revision: 2557
Modified:
trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/apply.m4
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/rules
trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/unpatch.m4
Log:
More powerpc kernel-patch-powerpc-2.4.27 work.
Modified: trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/apply.m4
===================================================================
--- trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/apply.m4 2005-02-24 21:31:08 UTC (rev 2556)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/apply.m4 2005-02-24 22:09:44 UTC (rev 2557)
@@ -4,9 +4,9 @@
set -e
-ARCHITECTURE=`dpkg --print-installation-architecture`
PATCHNAME=M4SUBARCH
PATCHFILE=debian-M4SUBARCH.diff.gz
+ARCHITECTURE=`dpkg --print-installation-architecture`
if [ -n "$PATCH_DIR" -a -f "$PATCH_DIR/$PATCHFILE" ]; then
PATCHDIR="$PATCH_DIR"
else
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-24 21:31:08 UTC (rev 2556)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/control 2005-02-24 22:09:44 UTC (rev 2557)
@@ -92,6 +92,7 @@
Section: base
Architecture: powerpc
Recommends: kernel-headers-2.4.27-powerpc
+Depends: mkvmlinuz
Suggests: kernel-doc-2.4.27
Provides: kernel-image
Description: Linux/PowerPC kernel binary image for the powerpc flavour
@@ -110,6 +111,7 @@
Section: base
Architecture: powerpc
Recommends: kernel-headers-2.4.27-powerpc
+Depends: mkvmlinuz
Suggests: kernel-doc-2.4.27
Provides: kernel-image
Description: Linux/PowerPC kernel binary image for the powerpc-smp flavour
@@ -129,6 +131,7 @@
Architecture: powerpc
Recommends: kernel-headers-2.4.27-powerpc
Suggests: kernel-doc-2.4.27
+Depends: mkvmlinuz
Provides: kernel-image
Description: Linux/PowerPC kernel binary image for the powerpc-small flavour
This package contains the Linux/PowerPC kernel image, the
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-24 21:31:08 UTC (rev 2556)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/rules 2005-02-24 22:09:44 UTC (rev 2557)
@@ -41,19 +41,19 @@
KHEADERS = $(TMP)/kernel-headers-$(kernel)_$(version)_powerpc.deb
# install locations
-KPATCH = $(CURDIR)/debian/kernel-patch-powerpc-$(subarch)/usr/src/kernel-patches/powerpc/$(version)-$(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)
KBUILDDOC = $(KBUILD)/usr/share/doc/kernel-build-$(kernel)-$(flavour)
-KBUILDDOCSA = $(KBUILD)/usr/share/doc/kernel-build-$(kernel)-$(subarch)
+KBUILDDOCSA = $(KBUILDSA)/usr/share/doc/kernel-build-$(kernel)-$(subarch)
KSRC = $(KBUILD)/usr/src/kernel-build-$(kernel)-$(flavour)
-KSRCSA = $(KBUILD)/usr/src/kernel-build-$(kernel)-$(subarch)
+KSRCSA = $(KBUILDSA)/usr/src/kernel-build-$(kernel)-$(subarch)
KIMAGE = $(CURDIR)/debian/kernel-image-$(kernel)-$(flavour)
KIMAGESA = $(CURDIR)/debian/kernel-image-$(kernel)-$(subarch)
KIMAGEDOC = $(KIMAGE)/usr/share/doc/kernel-image-$(kernel)-$(flavour)
-KIMAGEDOCSA = $(KIMAGE)/usr/share/doc/kernel-image-$(kernel)-$(subarch)
+KIMAGEDOCSA = $(KIMAGESA)/usr/share/doc/kernel-image-$(kernel)-$(subarch)
KLIB = $(KIMAGE)/usr/lib/kernel-image-$(kernel)-$(flavour)
-KLIBSA = $(KIMAGE)/usr/lib/kernel-image-$(kernel)-$(subarch)
+KLIBSA = $(KIMAGESA)/usr/lib/kernel-image-$(kernel)-$(subarch)
# environment for make-kpkg
export APPEND_TO_VERSION=-$(flavour)
@@ -91,6 +91,7 @@
test -d $(KSOURCE)/debian || mkdir $(KSOURCE)/debian
cp -p /usr/share/doc/kernel-source-$(kernel)/changelog.Debian.gz \
$(KSOURCE)/debian/changelog.Debian.kernel-source.gz
+ cd debian; cp -p changelog control copyright $(KSOURCE)/debian
> $(KSOURCE)/debian/official
touch $@
@@ -116,8 +117,9 @@
test -d $(dir $(KSUBARCH)) || mkdir -p $(dir $(KSUBARCH))
cp -al $(KSOURCE) $(KSUBARCH)
+ $(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)
- cd debian; cp -p changelog control copyright $(KSOURCE)/debian
ifneq (,$(flavours))
cd debian; cp -p post-install $(KSOURCE)/debian
endif
@@ -198,7 +200,6 @@
# Per flavour build processing.
stamp-build-flavour-$(subarch)-$(flavour):
- echo "SVEN -> $(MFLAGS) <- SVEN -> $(MAKEFLAGS)";
cd $(KFLAVOUR); \
MFLAGS="$(filter-out -j --j%,$(MFLAGS))" \
MAKEFLAGS="$(filter-out -j --j%,$(MAKEFLAGS))" \
@@ -253,22 +254,23 @@
make-kpkg --subarch $(subarch) --append-to-version -$(subarch) kernel-image
dpkg -x $(KDUMMYSA) $(KIMAGESA)
- # add a README file
- $(INSTALL_DATA) debian/README.kernel-image $(KIMAGEDOCSA)/NEWS.Debian
-
# copy build infrastructure for kernel modules
cd $(KSUBARCH); find scripts -type f ! -name '*.o' | cpio -pd $(KSRCSA)
cat debian/build-files | ( cd $(KSUBARCH); cpio -pd $(KSRCSA) )
- # add a README file
+ # add some README files and the kernel-source changelog
mkdir -p $(KBUILDDOCSA)
$(INSTALL_DATA) debian/README.kernel-build $(KBUILDDOCSA)/README.Debian
+ $(INSTALL_DATA) debian/README.kernel-image $(KIMAGEDOCSA)/NEWS.Debian
+ $(INSTALL_DATA) /usr/share/doc/kernel-source-$(kernel)/changelog.Debian.gz \
+ $(KBUILDDOCSA)/changelog-kernel-source.Debian.gz
touch $@
endif
touch $@
stamp-install-patch-subarch-$(subarch):
+ mkdir -p $(KPATCH)/patches $(KPATCH)/apply $(KPATCH)/unpatch
$(INSTALL_DATA) patches/debian-$(subarch).diff.gz $(KPATCH)/patches
$(M4) debian/apply.m4 > debian/apply-$(subarch)
$(INSTALL_EXEC) debian/apply-$(subarch) $(KPATCH)/apply/0$(subarch)
@@ -293,16 +295,16 @@
# remove the coff image
rm -f $(KIMAGE)/boot/vmlinux.coff-$(kernel)-$(flavour)
- # add a README file
- $(INSTALL_DATA) debian/README.kernel-image $(KIMAGEDOC)/NEWS.Debian
-
# copy build infrastructure for kernel modules
cd $(KFLAVOUR); find scripts -type f ! -name '*.o' | cpio -pd $(KSRC)
cat debian/build-files | ( cd $(KFLAVOUR); cpio -pd $(KSRC) )
- # add a README file
+ # add some README files and the kernel-source changelog
mkdir -p $(KBUILDDOC)
+ $(INSTALL_DATA) debian/README.kernel-image $(KIMAGEDOC)/NEWS.Debian
$(INSTALL_DATA) debian/README.kernel-build $(KBUILDDOC)/README.Debian
+ $(INSTALL_DATA) /usr/share/doc/kernel-source-$(kernel)/changelog.Debian.gz \
+ $(KBUILDDOC)/changelog-kernel-source.Debian.gz
touch $@
Modified: trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/unpatch.m4
===================================================================
--- trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/unpatch.m4 2005-02-24 21:31:08 UTC (rev 2556)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/unpatch.m4 2005-02-24 22:09:44 UTC (rev 2557)
@@ -4,9 +4,9 @@
set -e
-ARCHITECTURE=`dpkg --print-installation-architecture`
PATCHNAME=M4SUBARCH
PATCHFILE=debian-M4SUBARCH.diff.gz
+ARCHITECTURE=`dpkg --print-installation-architecture`
if [ -n "$PATCH_DIR" -a -f "$PATCH_DIR/$PATCHFILE" ]; then
PATCHDIR="$PATCH_DIR"
else