[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, debian, updated. debian/20090105.git69b2aa26-2-1-gff19373

[Luca Capello]

The following commit has been merged in the debian branch:
commit ff193735fa4f5e71a9a26ae4a5848250a8b321e8
Author: Luca Capello <luca at pca.it>
Date:   Thu Feb 12 12:08:32 2009 +0100

    debian/*: s/vmlinuz/uImage.bin/g

diff --git a/debian/changelog b/debian/changelog
index 976b22e..8194ad4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+linux-2.6-openmoko (20090105.git69b2aa26-3) UNRELEASED; urgency=low
+
+  * debian/postinst:
+    + s/vmlinuz/uImage.bin/.
+  * debian/prerm:
+    + s/vmlinuz/uImage.bin/.
+  * debian/rules:
+    + s/vmlinuz/uImage.bin/g, since the resulting binary is a
+      U-Boot image and no more a Linux kernel executable.
+
+ --
+
 linux-2.6-openmoko (20090105.git69b2aa26-2) pkg-fso; urgency=low
 
   * debian/rules:
diff --git a/debian/postinst.in b/debian/postinst.in
index d74819f..10908a9 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -7,6 +7,6 @@ if [ "$1" = "configure" ]; then
     VERSION=@PACKAGE_VERSION@
     UBOOT_IMAGE=/boot/uImage.bin
     if [ ! -e "$UBOOT_IMAGE" ]; then
-	cd /boot && ln -s vmlinuz-"$VERSION" "$UBOOT_IMAGE"
+	cd /boot && ln -s uImage.bin-"$VERSION" "$UBOOT_IMAGE"
     fi
 fi
diff --git a/debian/prerm.in b/debian/prerm.in
index 739045d..1aafab4 100644
--- a/debian/prerm.in
+++ b/debian/prerm.in
@@ -6,7 +6,7 @@ set -e
 if [ "$1" = "remove" -o "$1" = "upgrade" ]; then
     VERSION=@PACKAGE_VERSION@
     UBOOT_IMAGE=/boot/uImage.bin
-    if [ "`readlink $UBOOT_IMAGE`" = "vmlinuz-$VERSION" ]; then
+    if [ "`readlink $UBOOT_IMAGE`" = "uImage.bin-$VERSION" ]; then
 	rm -f "$UBOOT_IMAGE"
     fi
 fi
diff --git a/debian/rules b/debian/rules
index 53d9c75..46d18e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ clean: unpatch
 	dh_testroot
 	rm -f build-stamp debian/postinst debian/prerm
 
-	rm -f .config* linux.bin vmlinuz-$(VERSION_FULL)
+	rm -f .config* linux.bin uImage.bin-$(VERSION_FULL)
 
 	# Add here commands to clean up after the build process.
 	$(MAKE) clean
@@ -51,11 +51,11 @@ install-stamp: build
 		-S arch/arm/boot/compressed/vmlinux linux.bin
 	mkimage -A arm -O linux -T kernel -C none -a 30008000 \
 		-e 30008000 -n "Debian FreeRunner Kernel" -d linux.bin \
-		vmlinuz-$(VERSION_FULL)
+		uImage.bin-$(VERSION_FULL)
 
 	# Install the uImage (this is an ugly hack, I know)
 	mkdir `pwd`/debian/`dh_listpackages`/boot/
-	cp vmlinuz-$(VERSION_FULL) `pwd`/debian/`dh_listpackages`/boot/
+	cp uImage.bin-$(VERSION_FULL) `pwd`/debian/`dh_listpackages`/boot/
 
 	# Install the modules.
 	$(MAKE) INSTALL_MOD_STRIP=1 \

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko