From 1b1bbb43f622c7aec9a660dff89660d3df2e599d Mon Sep 17 00:00:00 2001 From: Corey O'Connor Date: Mon, 4 Oct 2010 16:16:19 -0700 Subject: [PATCH] rename various files --- kernel-bfs-2.6.28/debian/changelog | 6 ++ kernel-bfs-2.6.28/debian/control | 16 ++--- kernel-bfs-2.6.28/debian/kernel-bfs-deinstall | 67 ++++++++++++++++++++ .../debian/kernel-bfs-deinstall.desktop | 7 ++ .../debian/kernel-bfs-flasher.install | 3 + .../debian/kernel-bfs-flasher.postinst.in | 23 +++++++ .../debian/kernel-bfs-flasher.preinst | 27 ++++++++ kernel-bfs-2.6.28/debian/kernel-bfs-flasher.prerm | 9 +++ .../debian/kernel-bfs-flasher.sudoers | 1 + .../debian/kernel-bfs-modules.install | 1 + .../debian/kernel-bfs-modules.postinst.in | 20 ++++++ .../debian/kernel-bfs-modules.postrm.in | 16 +++++ kernel-bfs-2.6.28/debian/kernel-power-deinstall | 67 -------------------- .../debian/kernel-power-deinstall.desktop | 7 -- .../debian/kernel-power-flasher.install | 3 - .../debian/kernel-power-flasher.postinst.in | 23 ------- .../debian/kernel-power-flasher.preinst | 27 -------- .../debian/kernel-power-flasher.prerm | 9 --- .../debian/kernel-power-flasher.sudoers | 1 - .../debian/kernel-power-modules.install | 1 - .../debian/kernel-power-modules.postinst.in | 20 ------ .../debian/kernel-power-modules.postrm.in | 16 ----- kernel-bfs-2.6.28/debian/patches/maemo-build.diff | 2 +- kernel-bfs-2.6.28/debian/rules | 17 +++-- 24 files changed, 197 insertions(+), 192 deletions(-) create mode 100755 kernel-bfs-2.6.28/debian/kernel-bfs-deinstall create mode 100644 kernel-bfs-2.6.28/debian/kernel-bfs-deinstall.desktop create mode 100644 kernel-bfs-2.6.28/debian/kernel-bfs-flasher.install create mode 100644 kernel-bfs-2.6.28/debian/kernel-bfs-flasher.postinst.in create mode 100755 kernel-bfs-2.6.28/debian/kernel-bfs-flasher.preinst create mode 100755 kernel-bfs-2.6.28/debian/kernel-bfs-flasher.prerm create mode 100644 kernel-bfs-2.6.28/debian/kernel-bfs-flasher.sudoers create mode 100644 kernel-bfs-2.6.28/debian/kernel-bfs-modules.install create mode 100644 kernel-bfs-2.6.28/debian/kernel-bfs-modules.postinst.in create mode 100644 kernel-bfs-2.6.28/debian/kernel-bfs-modules.postrm.in delete mode 100755 kernel-bfs-2.6.28/debian/kernel-power-deinstall delete mode 100644 kernel-bfs-2.6.28/debian/kernel-power-deinstall.desktop delete mode 100644 kernel-bfs-2.6.28/debian/kernel-power-flasher.install delete mode 100644 kernel-bfs-2.6.28/debian/kernel-power-flasher.postinst.in delete mode 100755 kernel-bfs-2.6.28/debian/kernel-power-flasher.preinst delete mode 100755 kernel-bfs-2.6.28/debian/kernel-power-flasher.prerm delete mode 100644 kernel-bfs-2.6.28/debian/kernel-power-flasher.sudoers delete mode 100644 kernel-bfs-2.6.28/debian/kernel-power-modules.install delete mode 100644 kernel-bfs-2.6.28/debian/kernel-power-modules.postinst.in delete mode 100644 kernel-bfs-2.6.28/debian/kernel-power-modules.postrm.in diff --git a/kernel-bfs-2.6.28/debian/changelog b/kernel-bfs-2.6.28/debian/changelog index 8f50b22..07e2d86 100644 --- a/kernel-bfs-2.6.28/debian/changelog +++ b/kernel-bfs-2.6.28/debian/changelog @@ -1,3 +1,9 @@ +kernel-power (2.6.28-bfs1) fremantle; urgency=low + + * Rename to avoid collision with kernel-power + + -- Corey O'Connor Mon, 04 Oct 2010 16:50:00 +0800 + kernel-power (2.6.28-maemo40.bfs0) fremantle; urgency=low * BFS version of 2.6.28-maemo40 diff --git a/kernel-bfs-2.6.28/debian/control b/kernel-bfs-2.6.28/debian/control index d2aed3a..b236944 100644 --- a/kernel-bfs-2.6.28/debian/control +++ b/kernel-bfs-2.6.28/debian/control @@ -1,4 +1,4 @@ -Source: kernel-power +Source: kernel-bfs Section: utils Priority: optional Maintainer: Thomas Tanner @@ -6,10 +6,10 @@ XSBC-Bugtracker: https://garage.maemo.org/tracker/?group_id=1528 Build-Depends: debhelper (>= 4.0.0), quilt, sdk-fiasco-gen, libncurses5-dev Standards-Version: 3.8.0 -Package: kernel-power-flasher +Package: kernel-bfs-flasher Section: user/system Architecture: armel -Pre-Depends: kernel-power (= ${binary:Version}), kernel-power-modules (= ${binary:Version}), softupd (>= 0.4.0), maemo-installer-utils +Pre-Depends: kernel-bfs (= ${binary:Version}), kernel-bfs-modules (= ${binary:Version}), softupd (>= 0.4.0), maemo-installer-utils Depends: sudo Conflicts: kernel-flasher-maemo (<= 2.6.28-maemo22), kernel-maemo, kernel-modules-maemo, kernel-headers-maemo, linux-kernel-headers-maemo Recommends: kernel-power-settings, usbip, iptables, mtd-utils, kexec-tools @@ -112,28 +112,28 @@ XB-Maemo-Icon-26: MDItMDZUMTk6Mjk6MjMrMDE6MDBL9SgPAAAAJXRFWHRtb2RpZnktZGF0ZQAy MDA5LTA5LTI3VDA5OjM1OjM0KzAyOjAwrPojkwAAAABJRU5ErkJggg== -Package: kernel-power +Package: kernel-bfs Architecture: armel Conflicts: kernel-maemo Description: Flashable Linux kernel This package provides a flashable kernel image. Use the kernel-flasher-maemo package to automatically flash it. -Package: kernel-power-bootimg +Package: kernel-bfs-bootimg Architecture: armel Description: Linux kernel boot image This package provides a bootable and flashable kernel image for kexec and flashing via USB cable in /boot. This package is optional and only useful for multiboot or experts. -Package: kernel-power-headers +Package: kernel-bfs-headers Architecture: armel Depends: ${shlibs:Depends} Conflicts: kernel-headers-maemo Description: Linux kernel headers This package provides kernel headers. -Package: linux-kernel-power-headers +Package: linux-kernel-bfs-headers Architecture: armel Depends: ${shlibs:Depends} Conflicts: linux-kernel-headers-maemo @@ -141,7 +141,7 @@ Description: Linux Kernel Headers for development This package provides headers from the Linux kernel. These headers are used by the installed headers for GNU glibc and other system libraries. -Package: kernel-power-modules +Package: kernel-bfs-modules Architecture: armel Conflicts: kernel-modules-maemo Depends: module-init-tools (>= 3.3), kernel-power (= ${binary:Version}) | kernel-power-bootimg (= ${binary:Version}) diff --git a/kernel-bfs-2.6.28/debian/kernel-bfs-deinstall b/kernel-bfs-2.6.28/debian/kernel-bfs-deinstall new file mode 100755 index 0000000..f4f89aa --- /dev/null +++ b/kernel-bfs-2.6.28/debian/kernel-bfs-deinstall @@ -0,0 +1,67 @@ +#!/bin/sh +tmp=/tmp/kernel-deinstall +cat > $tmp < /dev/null; then + dbusbox "Error: Application Manager is running. Please close it before deinstallation." + exit 1 +fi +if pgrep -f apt-worker > /dev/null; then + dbusbox "Error: apt is running. Please wait and try again later." + exit 1 +fi + +dbusmsg "Please wait while restoring Nokia kernel..." + +apt-get install --reinstall -y kernel kernel-flasher > $tmp +ok=$? +cat $tmp +if grep -qE "(Could not resolve host|cannot be downloaded)" $tmp; then + dbusbox "Error during deinstallation: Could not download Nokia kernel. Please make sure the internet connection is working." + rm $tmp + exit 1 +fi +if test $ok = 0 && grep -q "Image flashed successfully" $tmp; then : +else + dbusbox "Error during deinstallation: Could not install Nokia kernel." + rm $tmp + exit 1 +fi +dbusmsg "Nokia kernel was restored. Removing enhanced kernel packages..." +apt-get remove -y kernel-power kernel-power-modules > $tmp +ok=$? +cat $tmp +if test $ok = 0; then + dbusbox "Kernel sucessfully deinstalled. Nokia kernel was restored." +else + dbusbox "Warning: Nokia kernel was restored but could not remove enhanced kernel." +fi +rm $tmp +exit $ok diff --git a/kernel-bfs-2.6.28/debian/kernel-bfs-deinstall.desktop b/kernel-bfs-2.6.28/debian/kernel-bfs-deinstall.desktop new file mode 100644 index 0000000..92f81a8 --- /dev/null +++ b/kernel-bfs-2.6.28/debian/kernel-bfs-deinstall.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Version=0.1 +Type=Application +Name=Deinstall Kernel-Power +Exec=sudo /usr/sbin/kernel-power-deinstall +X-Osso-Type=application/x-executable +Terminal=false diff --git a/kernel-bfs-2.6.28/debian/kernel-bfs-flasher.install b/kernel-bfs-2.6.28/debian/kernel-bfs-flasher.install new file mode 100644 index 0000000..a2c6f00 --- /dev/null +++ b/kernel-bfs-2.6.28/debian/kernel-bfs-flasher.install @@ -0,0 +1,3 @@ +debian/kernel-power-deinstall /usr/sbin +debian/kernel-power-deinstall.desktop /usr/share/applications/hildon +debian/kernel-power-flasher.sudoers /etc/sudoers.d diff --git a/kernel-bfs-2.6.28/debian/kernel-bfs-flasher.postinst.in b/kernel-bfs-2.6.28/debian/kernel-bfs-flasher.postinst.in new file mode 100644 index 0000000..8e25f17 --- /dev/null +++ b/kernel-bfs-2.6.28/debian/kernel-bfs-flasher.postinst.in @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + +KERNEL=/boot/zImage-@VERSION@.fiasco + +FLASHER=/sbin/fiasco-image-update + +# they say this is The Right Way (tm) to check for +# scratchbox environment +if [ -L /targets/links/scratchbox.config ]; then + # hehe + true +else + if [ -f $KERNEL -a -x $FLASHER ]; then + $FLASHER $KERNEL + fi +fi + +update-sudoers + +#DEBHELPER# + diff --git a/kernel-bfs-2.6.28/debian/kernel-bfs-flasher.preinst b/kernel-bfs-2.6.28/debian/kernel-bfs-flasher.preinst new file mode 100755 index 0000000..6ce9d6e --- /dev/null +++ b/kernel-bfs-2.6.28/debian/kernel-bfs-flasher.preinst @@ -0,0 +1,27 @@ +#!/bin/sh + +test "$1" = install || exit 0 # upgrades are fine +f=/tmp/kernel-power-msg +cat > $f < /dev/null; then + $dbusmsg string:"This package can only be deinstalled with the application 'Deinstall Kernel-Power'." + exit 1 +fi diff --git a/kernel-bfs-2.6.28/debian/kernel-bfs-flasher.sudoers b/kernel-bfs-2.6.28/debian/kernel-bfs-flasher.sudoers new file mode 100644 index 0000000..67a1914 --- /dev/null +++ b/kernel-bfs-2.6.28/debian/kernel-bfs-flasher.sudoers @@ -0,0 +1 @@ +user ALL = NOPASSWD: /usr/sbin/kernel-power-deinstall diff --git a/kernel-bfs-2.6.28/debian/kernel-bfs-modules.install b/kernel-bfs-2.6.28/debian/kernel-bfs-modules.install new file mode 100644 index 0000000..3bf3837 --- /dev/null +++ b/kernel-bfs-2.6.28/debian/kernel-bfs-modules.install @@ -0,0 +1 @@ +debian/blacklist /etc/modprobe.d diff --git a/kernel-bfs-2.6.28/debian/kernel-bfs-modules.postinst.in b/kernel-bfs-2.6.28/debian/kernel-bfs-modules.postinst.in new file mode 100644 index 0000000..8264cc2 --- /dev/null +++ b/kernel-bfs-2.6.28/debian/kernel-bfs-modules.postinst.in @@ -0,0 +1,20 @@ +#!/bin/sh + +set -e + +cd /lib/modules + +rm -f /lib/modules/current +ls -1d * | grep -v current | while read i; do + /sbin/depmod $i || : +done +ln -s @KVER@ /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%' /sbin/preinit > /sbin/preinit.tmp && \ + chmod +x /sbin/preinit.tmp && \ + mv /sbin/preinit.tmp /sbin/preinit +fi + +#DEBHELPER# + diff --git a/kernel-bfs-2.6.28/debian/kernel-bfs-modules.postrm.in b/kernel-bfs-2.6.28/debian/kernel-bfs-modules.postrm.in new file mode 100644 index 0000000..ed1e2cb --- /dev/null +++ b/kernel-bfs-2.6.28/debian/kernel-bfs-modules.postrm.in @@ -0,0 +1,16 @@ +#!/bin/sh + +#set -e + +test -d /lib/modules/@KVER@ && rm -f /lib/modules/@KVER@/modules.* +rm -f /lib/modules/current +ln -s 2.6.28-omap1 /lib/modules/current + +if test "$1" != upgrade && grep -q 'MODULE_PATH=/lib/modules/`uname -r`' /sbin/preinit; then + sed 's%MODULE_PATH=/lib/modules/`uname -r` #fixed by kernel-power%MODULE_PATH=/lib/modules/current%' /sbin/preinit > /sbin/preinit.tmp && \ + chmod +x /sbin/preinit.tmp && \ + mv /sbin/preinit.tmp /sbin/preinit +fi + +#DEBHELPER# + diff --git a/kernel-bfs-2.6.28/debian/kernel-power-deinstall b/kernel-bfs-2.6.28/debian/kernel-power-deinstall deleted file mode 100755 index f4f89aa..0000000 --- a/kernel-bfs-2.6.28/debian/kernel-power-deinstall +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -tmp=/tmp/kernel-deinstall -cat > $tmp < /dev/null; then - dbusbox "Error: Application Manager is running. Please close it before deinstallation." - exit 1 -fi -if pgrep -f apt-worker > /dev/null; then - dbusbox "Error: apt is running. Please wait and try again later." - exit 1 -fi - -dbusmsg "Please wait while restoring Nokia kernel..." - -apt-get install --reinstall -y kernel kernel-flasher > $tmp -ok=$? -cat $tmp -if grep -qE "(Could not resolve host|cannot be downloaded)" $tmp; then - dbusbox "Error during deinstallation: Could not download Nokia kernel. Please make sure the internet connection is working." - rm $tmp - exit 1 -fi -if test $ok = 0 && grep -q "Image flashed successfully" $tmp; then : -else - dbusbox "Error during deinstallation: Could not install Nokia kernel." - rm $tmp - exit 1 -fi -dbusmsg "Nokia kernel was restored. Removing enhanced kernel packages..." -apt-get remove -y kernel-power kernel-power-modules > $tmp -ok=$? -cat $tmp -if test $ok = 0; then - dbusbox "Kernel sucessfully deinstalled. Nokia kernel was restored." -else - dbusbox "Warning: Nokia kernel was restored but could not remove enhanced kernel." -fi -rm $tmp -exit $ok diff --git a/kernel-bfs-2.6.28/debian/kernel-power-deinstall.desktop b/kernel-bfs-2.6.28/debian/kernel-power-deinstall.desktop deleted file mode 100644 index 92f81a8..0000000 --- a/kernel-bfs-2.6.28/debian/kernel-power-deinstall.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Version=0.1 -Type=Application -Name=Deinstall Kernel-Power -Exec=sudo /usr/sbin/kernel-power-deinstall -X-Osso-Type=application/x-executable -Terminal=false diff --git a/kernel-bfs-2.6.28/debian/kernel-power-flasher.install b/kernel-bfs-2.6.28/debian/kernel-power-flasher.install deleted file mode 100644 index a2c6f00..0000000 --- a/kernel-bfs-2.6.28/debian/kernel-power-flasher.install +++ /dev/null @@ -1,3 +0,0 @@ -debian/kernel-power-deinstall /usr/sbin -debian/kernel-power-deinstall.desktop /usr/share/applications/hildon -debian/kernel-power-flasher.sudoers /etc/sudoers.d diff --git a/kernel-bfs-2.6.28/debian/kernel-power-flasher.postinst.in b/kernel-bfs-2.6.28/debian/kernel-power-flasher.postinst.in deleted file mode 100644 index 8e25f17..0000000 --- a/kernel-bfs-2.6.28/debian/kernel-power-flasher.postinst.in +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -set -e - -KERNEL=/boot/zImage-@VERSION@.fiasco - -FLASHER=/sbin/fiasco-image-update - -# they say this is The Right Way (tm) to check for -# scratchbox environment -if [ -L /targets/links/scratchbox.config ]; then - # hehe - true -else - if [ -f $KERNEL -a -x $FLASHER ]; then - $FLASHER $KERNEL - fi -fi - -update-sudoers - -#DEBHELPER# - diff --git a/kernel-bfs-2.6.28/debian/kernel-power-flasher.preinst b/kernel-bfs-2.6.28/debian/kernel-power-flasher.preinst deleted file mode 100755 index 6ce9d6e..0000000 --- a/kernel-bfs-2.6.28/debian/kernel-power-flasher.preinst +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -test "$1" = install || exit 0 # upgrades are fine -f=/tmp/kernel-power-msg -cat > $f < /dev/null; then - $dbusmsg string:"This package can only be deinstalled with the application 'Deinstall Kernel-Power'." - exit 1 -fi diff --git a/kernel-bfs-2.6.28/debian/kernel-power-flasher.sudoers b/kernel-bfs-2.6.28/debian/kernel-power-flasher.sudoers deleted file mode 100644 index 67a1914..0000000 --- a/kernel-bfs-2.6.28/debian/kernel-power-flasher.sudoers +++ /dev/null @@ -1 +0,0 @@ -user ALL = NOPASSWD: /usr/sbin/kernel-power-deinstall diff --git a/kernel-bfs-2.6.28/debian/kernel-power-modules.install b/kernel-bfs-2.6.28/debian/kernel-power-modules.install deleted file mode 100644 index 3bf3837..0000000 --- a/kernel-bfs-2.6.28/debian/kernel-power-modules.install +++ /dev/null @@ -1 +0,0 @@ -debian/blacklist /etc/modprobe.d diff --git a/kernel-bfs-2.6.28/debian/kernel-power-modules.postinst.in b/kernel-bfs-2.6.28/debian/kernel-power-modules.postinst.in deleted file mode 100644 index 8264cc2..0000000 --- a/kernel-bfs-2.6.28/debian/kernel-power-modules.postinst.in +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -set -e - -cd /lib/modules - -rm -f /lib/modules/current -ls -1d * | grep -v current | while read i; do - /sbin/depmod $i || : -done -ln -s @KVER@ /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%' /sbin/preinit > /sbin/preinit.tmp && \ - chmod +x /sbin/preinit.tmp && \ - mv /sbin/preinit.tmp /sbin/preinit -fi - -#DEBHELPER# - diff --git a/kernel-bfs-2.6.28/debian/kernel-power-modules.postrm.in b/kernel-bfs-2.6.28/debian/kernel-power-modules.postrm.in deleted file mode 100644 index ed1e2cb..0000000 --- a/kernel-bfs-2.6.28/debian/kernel-power-modules.postrm.in +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -#set -e - -test -d /lib/modules/@KVER@ && rm -f /lib/modules/@KVER@/modules.* -rm -f /lib/modules/current -ln -s 2.6.28-omap1 /lib/modules/current - -if test "$1" != upgrade && grep -q 'MODULE_PATH=/lib/modules/`uname -r`' /sbin/preinit; then - sed 's%MODULE_PATH=/lib/modules/`uname -r` #fixed by kernel-power%MODULE_PATH=/lib/modules/current%' /sbin/preinit > /sbin/preinit.tmp && \ - chmod +x /sbin/preinit.tmp && \ - mv /sbin/preinit.tmp /sbin/preinit -fi - -#DEBHELPER# - diff --git a/kernel-bfs-2.6.28/debian/patches/maemo-build.diff b/kernel-bfs-2.6.28/debian/patches/maemo-build.diff index 2575ade..4ac5f77 100644 --- a/kernel-bfs-2.6.28/debian/patches/maemo-build.diff +++ b/kernel-bfs-2.6.28/debian/patches/maemo-build.diff @@ -5,7 +5,7 @@ PATCHLEVEL = 6 SUBLEVEL = 28 -EXTRAVERSION = -+EXTRAVERSION = power-bfs ++EXTRAVERSION = bfs NAME = Erotic Pickled Herring # *DOCUMENTATION* diff --git a/kernel-bfs-2.6.28/debian/rules b/kernel-bfs-2.6.28/debian/rules index c704279..42dd895 100644 --- a/kernel-bfs-2.6.28/debian/rules +++ b/kernel-bfs-2.6.28/debian/rules @@ -3,19 +3,18 @@ WEEK := $(shell date +%Y%W) RELEASE := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }') -REVISION := $(shell echo "$(RELEASE)" | sed 's/\(.*\)-maemo\(.*\)/.10power\2/') -#REVISION := $(shell echo "$(RELEASE)" | sed 's/\(.*\)-maemo\(.*\)/.10powerusb\2/') +REVISION := $(shell echo "$(RELEASE)" | sed 's/\(.*\)-maemo\(.*\)/.10bfs\2/') EXTRAVERSION := EXTRAVERSION=$(REVISION) PACKAGE := kernel -FLASHER_PACKAGE := kernel-power-flasher +FLASHER_PACKAGE := kernel-bfs-flasher #SOURCE_PACKAGE := $(PACKAGE)-source -KERNEL_PACKAGE := $(PACKAGE)-power -BOOTIMG_PACKAGE := $(PACKAGE)-power-bootimg -MODULES_PACKAGE := $(PACKAGE)-power-modules -HEADERS_PACKAGE := $(PACKAGE)-power-headers -KBUILD_PACKAGE := $(PACKAGE)-power-kbuild -LIBC_PACKAGE := linux-kernel-power-headers +KERNEL_PACKAGE := $(PACKAGE)-bfs +BOOTIMG_PACKAGE := $(PACKAGE)-bfs-bootimg +MODULES_PACKAGE := $(PACKAGE)-bfs-modules +HEADERS_PACKAGE := $(PACKAGE)-bfs-headers +KBUILD_PACKAGE := $(PACKAGE)-bfs-kbuild +LIBC_PACKAGE := linux-kernel-bfs-headers BUILDTMP := $(CURDIR)/debian/build #KSRC := $(BUILDTMP)/$(PACKAGE) -- 1.7.9.5