From: Pali Rohár <pali.rohar@gmail.com>
Date: Sat, 9 Jul 2011 14:01:26 +0000 (+0200)
Subject: Fixed generating postinst.in and postrm.in files
X-Git-Tag: kernel-power-settings-0.12~10
X-Git-Url: http://git.maemo.org/git/?p=kernel-power;a=commitdiff_plain;h=c54df6c7a9cac2714397762a91b8bbd70735b4db

Fixed generating postinst.in and postrm.in files
---

diff --git a/kernel-power-2.6.28/debian/kernel-power-flasher.postinst.in b/kernel-power-2.6.28/debian/kernel-power-flasher.postinst.in
index 8e25f17..ffa0f8e 100644
--- a/kernel-power-2.6.28/debian/kernel-power-flasher.postinst.in
+++ b/kernel-power-2.6.28/debian/kernel-power-flasher.postinst.in
@@ -2,7 +2,7 @@
 
 set -e
 
-KERNEL=/boot/zImage-@VERSION@.fiasco
+KERNEL=/boot/zImage-@RELEASE@.fiasco
 
 FLASHER=/sbin/fiasco-image-update
 
diff --git a/kernel-power-2.6.28/debian/kernel-power-modules.postinst.in b/kernel-power-2.6.28/debian/kernel-power-modules.postinst.in
index 2ab9cf5..702b45e 100644
--- a/kernel-power-2.6.28/debian/kernel-power-modules.postinst.in
+++ b/kernel-power-2.6.28/debian/kernel-power-modules.postinst.in
@@ -2,20 +2,13 @@
 
 set -e
 
-cd /lib/modules
-ls -1d * | grep -v current | while read i; do
-   /sbin/depmod $i || :
-done
-
+/sbin/depmod @RELEASE@
 rm -f /lib/modules/current
-ln -s @KVER@ /lib/modules/current
+ln -s @RELEASE@ /lib/modules/current
 
 if grep -q "MODULE_PATH=/lib/modules/current" /sbin/preinit; then
     sed 's%MODULE_PATH=/lib/modules/current%MODULE_PATH=/lib/modules/`uname -r` #fixed by kernel-power%' -i /sbin/preinit
 fi
 
-dpkg-divert --local --divert /lib/modules/2.6.28-omap1/JoikuSpot_Bouncer.ko --rename --add /usr/bin/JoikuSpot_Bouncer.ko || :
-ln -sf /lib/modules/current/JoikuSpot_Bouncer.ko /usr/bin/JoikuSpot_Bouncer.ko || :
-
 #DEBHELPER#
 
diff --git a/kernel-power-2.6.28/debian/kernel-power-modules.postrm.in b/kernel-power-2.6.28/debian/kernel-power-modules.postrm.in
index ea8db2f..d99ea82 100644
--- a/kernel-power-2.6.28/debian/kernel-power-modules.postrm.in
+++ b/kernel-power-2.6.28/debian/kernel-power-modules.postrm.in
@@ -2,7 +2,7 @@
 
 set -e
 
-test -d /lib/modules/@KVER@ && rm -f /lib/modules/@KVER@/modules.*
+test -d /lib/modules/@RELEASE@ && rm -f /lib/modules/@RELEASE@/modules.*
 rm -f /lib/modules/current
 ln -s 2.6.28-omap1 /lib/modules/current
 
diff --git a/kernel-power-2.6.28/debian/rules b/kernel-power-2.6.28/debian/rules
index 74e8aa7..6510f9e 100755
--- a/kernel-power-2.6.28/debian/rules
+++ b/kernel-power-2.6.28/debian/rules
@@ -212,7 +212,6 @@ else
 binary-arch: install-libc-headers
 endif
 	sed \
-		-e 's,@VERSION@,$(RELEASE),g' \
 		-e 's,@RELEASE@,$(RELEASE),g' \
 		< $(CURDIR)/debian/$(FLASHER_PACKAGE).postinst.in \
 		> $(CURDIR)/debian/$(FLASHER_PACKAGE).postinst