[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, debian, updated. debian/20080903.git2ea34171-1-6-g1dd4b89

[Luca Capello]

The following commit has been merged in the debian branch:
commit bc2a4be5fc6712f1ea8ae2329c566f5f6e84d931
Author: Luca Capello <luca at pca.it>
Date:   Fri Oct 24 13:52:07 2008 +0200

    debian/rules: new variable VERSION_FULL

diff --git a/debian/changelog b/debian/changelog
index 03906c6..d4873b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ linux-2.6-openmoko (20080903.git2ea34171-2) UNRELEASED; urgency=low
     + correctly capitalize FreeRunner in uImage name.
     + s/Openmoko/Debian/ in uImage name.
     + s/VERSION/VERSION_EXTRA/ since it's used as make's EXTRAVERSION.
+    + new variable VERSION_FULL which reflects the real Linux kernel
+      version (VERSION-PATCHLEVEL-SUBLEVEL) and it's used to identify
+      the vmlinuz image, thus the latter and the modules directory
+      use the same version.
 
  --
 
diff --git a/debian/rules b/debian/rules
index 5233469..4df37c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,7 @@ include /usr/share/quilt/quilt.make
 export DH_VERBOSE=1
 
 VERSION_EXTRA=$(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed -e 's/-[^-]*//')
+VERSION_FULL=2.6.24-$(VERSION_EXTRA)
 
 
 build: build-stamp
@@ -25,7 +26,7 @@ clean: unpatch
 	dh_testroot
 	rm -f build-stamp
 
-	rm -f .config* linux.bin vmlinuz-$(VERSION_EXTRA)
+	rm -f .config* linux.bin vmlinuz-$(VERSION_FULL)
 
 	# Add here commands to clean up after the build process.
 	$(MAKE) clean
@@ -45,12 +46,12 @@ 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_EXTRA)
+		vmlinuz-$(VERSION_FULL)
 
 	# Install the uImage (this is an ugly hack, I know)
 	mkdir `pwd`/debian/`dh_listpackages`/boot/
-	cp vmlinuz-$(VERSION_EXTRA) `pwd`/debian/`dh_listpackages`/boot/
-	cp vmlinuz-$(VERSION_EXTRA) `pwd`/debian/`dh_listpackages`/boot/uImage.bin
+	cp vmlinuz-$(VERSION_FULL) `pwd`/debian/`dh_listpackages`/boot/
+	cp vmlinuz-$(VERSION_FULL) `pwd`/debian/`dh_listpackages`/boot/uImage.bin
 
 	# Install the modules.
 	$(MAKE) INSTALL_MOD_STRIP=1 \

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