[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 c359b1e25e1362d3757e71ec75f43275395fc269
Author: Luca Capello <luca at pca.it>
Date:   Fri Oct 24 13:45:06 2008 +0200

    debian/rules: s/VERSION/VERSION_EXTRA/

diff --git a/debian/changelog b/debian/changelog
index 4655646..03906c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ linux-2.6-openmoko (20080903.git2ea34171-2) UNRELEASED; urgency=low
   * debian/rules:
     + correctly capitalize FreeRunner in uImage name.
     + s/Openmoko/Debian/ in uImage name.
+    + s/VERSION/VERSION_EXTRA/ since it's used as make's EXTRAVERSION.
 
  --
 
diff --git a/debian/rules b/debian/rules
index da5ef34..5233469 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,8 @@ include /usr/share/quilt/quilt.make
 
 export DH_VERBOSE=1
 
-VERSION=$(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed -e 's/-[^-]*//')
+VERSION_EXTRA=$(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed -e 's/-[^-]*//')
+
 
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
@@ -15,7 +16,7 @@ build-stamp: $(QUILT_STAMPFN)
 	cp defconfig-gta02 .config
 	yes "" | $(MAKE) ARCH=arm oldconfig
 
-	$(MAKE) ARCH=arm EXTRAVERSION=-$(VERSION)
+	$(MAKE) ARCH=arm EXTRAVERSION=-$(VERSION_EXTRA)
 
 	touch build-stamp
 
@@ -24,7 +25,7 @@ clean: unpatch
 	dh_testroot
 	rm -f build-stamp
 
-	rm -f .config* linux.bin vmlinuz-$(VERSION)
+	rm -f .config* linux.bin vmlinuz-$(VERSION_EXTRA)
 
 	# Add here commands to clean up after the build process.
 	$(MAKE) clean
@@ -44,12 +45,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)
+		vmlinuz-$(VERSION_EXTRA)
 
 	# Install the uImage (this is an ugly hack, I know)
 	mkdir `pwd`/debian/`dh_listpackages`/boot/
-	cp vmlinuz-$(VERSION) `pwd`/debian/`dh_listpackages`/boot/
-	cp vmlinuz-$(VERSION) `pwd`/debian/`dh_listpackages`/boot/uImage.bin
+	cp vmlinuz-$(VERSION_EXTRA) `pwd`/debian/`dh_listpackages`/boot/
+	cp vmlinuz-$(VERSION_EXTRA) `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