r1387 - trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian

jensen@haydn.debian.org jensen@haydn.debian.org
Sat, 28 Aug 2004 20:42:37 -0600


Author: jensen
Date: 2004-08-27 06:31:06 -0600 (Fri, 27 Aug 2004)
New Revision: 1387

Added:
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/post-install
Modified:
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/examples
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules
Log:
Moved glue directory generation for mkvmlinuz to a separate script.
Packaged that script into the examples for kernel-patch-powerpc.
Made sure that the .svn subdirectory does not get packaged with same examples.


Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog	2004-08-27 12:22:43 UTC (rev 1386)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog	2004-08-27 12:31:06 UTC (rev 1387)
@@ -7,8 +7,17 @@
   * Enabled default command-line options, which allows the majority of
     PReP machines to boot unattended (Jens Schmalzing).
 
- -- Jens Schmalzing <jensen@debian.org>  Fri, 27 Aug 2004 13:35:07 +0200
+  * Included an example script for debian/post-install in the kernel-patch
+    package.  The script adds the glue that mkvmlinuz needs in order to
+    build a compressed bootable kernel from an uncompressed kernel and
+    optionally a ramdisk.  This is mainly intended for users who want to
+    build their own initrd kernel-image packages on subarchs that don't
+    have a bootloader, but is also useful for creating rescue systems
+    capable of working around a broken bootloader installation.  (Jens
+    Schmalzing).
 
+ -- Jens Schmalzing <jensen@debian.org>  Fri, 27 Aug 2004 14:28:58 +0200
+
 kernel-patch-powerpc-2.6.8 (2.6.8-2) unstable; urgency=high
 
   * Enabled the PPC 601 Fix config option (Sven Luther).

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/examples
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/examples	2004-08-27 12:22:43 UTC (rev 1386)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/examples	2004-08-27 12:31:06 UTC (rev 1387)
@@ -1 +1,2 @@
 config
+debian/post-install

Added: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/post-install
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/post-install	2004-08-27 12:22:43 UTC (rev 1386)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/post-install	2004-08-27 12:31:06 UTC (rev 1387)
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# debian/post-install for kernel-patch-powerpc
+
+# written by Jens Schmalzing <jensen@debian.org>
+
+# This shell script is intended to be put into the debian subdirectory
+# of a Linux kernel tree, where make-kpkg will find and execute it
+# while building a kernel-image package.  The purpose of this script
+# is to add glue (object code, libraries, utilities and so on) from
+# the kernel tree to the kernel-image package.  Later, the mkvmlinuz
+# utility, which is available as a separate Debian package, can use
+# this glue to create a bootable compressed kernel from the
+# uncompressed kernel in the kernel-image package and optionally a
+# ramdisk.  This is especially important on PowerPC subarchitectures
+# that don't have a boot loader, but also comes handy for rescue
+# systems and the like.
+
+KSRC=${PWD}
+KLIB=${PWD}/${IMAGE_TOP}/usr/lib/kernel-image-${version}
+INSTALL_DATA="install -m 644 -o root -g root"
+INSTALL_EXEC="install -m 755 -o root -g root"
+
+# get rid of the coff image (not strictly necessary, but cleaner)
+
+rm -f ${IMAGE_TOP}/boot/vmlinux.coff-${version}
+
+# add glue for creating bootable compressed kernel images
+
+mkdir -p ${KLIB}/boot
+cd ${KSRC}/arch/ppc/boot
+${INSTALL_DATA} ld.script openfirmware/note ${KLIB}/boot
+
+mkdir -p ${KLIB}/lib
+cd ${KSRC}
+${INSTALL_DATA} lib/lib.a ${KLIB}/lib
+${INSTALL_DATA} arch/ppc/boot/lib/lib.a ${KLIB}/lib/ppc.a
+${INSTALL_DATA} arch/ppc/boot/common/lib.a ${KLIB}/lib/common.a
+${INSTALL_DATA} arch/ppc/boot/of1275/lib.a ${KLIB}/lib/of.a
+
+mkdir -p ${KLIB}/obj/openfirmware
+cd ${KSRC}/arch/ppc/boot/openfirmware
+${INSTALL_DATA} *.o ${KLIB}/obj/openfirmware
+rm -f ${KLIB}/obj/openfirmware/image*
+
+mkdir -p ${KLIB}/obj/simple
+cd ${KSRC}/arch/ppc/boot/simple
+${INSTALL_DATA} *.o ${KLIB}/obj/simple
+rm -f ${KLIB}/obj/simple/image*.o
+
+mkdir -p ${KLIB}/utils
+cd ${KSRC}/arch/ppc/boot/utils
+${INSTALL_EXEC} addnote hack-coff mkbugboot mknote mkprep mktree ${KLIB}/utils


Property changes on: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/post-install
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules	2004-08-27 12:22:43 UTC (rev 1386)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules	2004-08-27 12:31:06 UTC (rev 1387)
@@ -77,7 +77,7 @@
 
 # unpack the Debian kernel source, apply the PowerPC patch, add a
 # default .config file and the necessary Debian files (changelog,
-# control, copyright, and official)
+# control, copyright, post-install, and official)
 stamp-configure-prepare:
 
 	test -d $(dir $(KSOURCE)) || mkdir -p $(dir $(KSOURCE))
@@ -88,7 +88,7 @@
 	-$(MAKE) -s -C config default > $(KSOURCE)/.config
 
 	test -d $(KSOURCE)/debian || mkdir $(KSOURCE)/debian
-	cd debian; cp -p changelog control copyright $(KSOURCE)/debian
+	cd debian; cp -p changelog control copyright post-install $(KSOURCE)/debian
 	> $(KSOURCE)/debian/official
 
 	touch $@
@@ -221,24 +221,6 @@
 # remove the coff image
 	rm -f $(KIMAGE)/boot/vmlinux.coff-$(kernel)-$(flavour)
 
-# add objects, libraries, and utilities from the kernel tree
-	mkdir -p $(addprefix $(KLIB)/,obj/openfirmware obj/simple lib boot utils)
-	$(INSTALL_DATA) $(KFLAVOUR)/arch/ppc/boot/openfirmware/*.o $(KLIB)/obj/openfirmware
-	$(INSTALL_DATA) $(KFLAVOUR)/arch/ppc/boot/simple/*.o $(KLIB)/obj/simple
-	rm -f $(KLIB)/obj/openfirmware/image*.o $(KLIB)/obj/simple/image*.o
-	$(INSTALL_DATA) $(KFLAVOUR)/lib/lib.a $(KLIB)/lib
-	$(INSTALL_DATA) $(KFLAVOUR)/arch/ppc/boot/lib/lib.a $(KLIB)/lib/ppc.a
-	$(INSTALL_DATA) $(KFLAVOUR)/arch/ppc/boot/common/lib.a $(KLIB)/lib/common.a
-	$(INSTALL_DATA) $(KFLAVOUR)/arch/ppc/boot/of1275/lib.a $(KLIB)/lib/of.a
-	$(INSTALL_DATA) $(KFLAVOUR)/arch/ppc/boot/ld.script $(KLIB)/boot
-	$(INSTALL_DATA) $(KFLAVOUR)/arch/ppc/boot/openfirmware/note $(KLIB)/boot
-	$(INSTALL_EXEC) $(KFLAVOUR)/arch/ppc/boot/utils/addnote $(KLIB)/utils
-	$(INSTALL_EXEC) $(KFLAVOUR)/arch/ppc/boot/utils/hack-coff $(KLIB)/utils
-	$(INSTALL_EXEC) $(KFLAVOUR)/arch/ppc/boot/utils/mknote $(KLIB)/utils
-	$(INSTALL_EXEC) $(KFLAVOUR)/arch/ppc/boot/utils/mkprep $(KLIB)/utils
-	$(INSTALL_EXEC) $(KFLAVOUR)/arch/ppc/boot/utils/mkbugboot $(KLIB)/utils
-	$(INSTALL_EXEC) $(KFLAVOUR)/arch/ppc/boot/utils/mktree $(KLIB)/utils
-
 # add a README file
 	$(INSTALL_DATA) debian/README.kernel-image $(KIMAGEDOC)/NEWS.Debian
 
@@ -338,7 +320,7 @@
 	dh_testdir
 	dh_testroot
 	dh_installdocs
-	dh_installexamples
+	dh_installexamples -X.svn
 	dh_installmodules
 	dh_installchangelogs
 	dh_compress -X.stub