Date: Friday, August 26, 2011 @ 06:44:37 Author: tpowa Revision: 136322
upgpkg: kexec-tools 2.0.2-4 fix kernel name and shortened start messages Added: kexec-tools/trunk/kexec-tools-2.0.0-purgatory-makefile.patch Modified: kexec-tools/trunk/PKGBUILD kexec-tools/trunk/kexec kexec-tools/trunk/kexec.conf.d --------------------------------------------+ PKGBUILD | 12 ++++++++---- kexec | 8 ++++---- kexec-tools-2.0.0-purgatory-makefile.patch | 20 ++++++++++++++++++++ kexec.conf.d | 4 ++-- 4 files changed, 34 insertions(+), 10 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-08-26 09:20:34 UTC (rev 136321) +++ PKGBUILD 2011-08-26 10:44:37 UTC (rev 136322) @@ -4,23 +4,27 @@ pkgname=kexec-tools pkgver=2.0.2 -pkgrel=3 +pkgrel=4 pkgdesc="Load another kernel from the currently executing Linux kernel" arch=('i686' 'x86_64') url="http://kernel.org/pub/linux/utils/kernel/kexec/" source=("http://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-${pkgver}.tar.bz2" - 'kexec' 'kexec.conf.d') + 'kexec-tools-2.0.0-purgatory-makefile.patch' + 'kexec' + 'kexec.conf.d') depends=('gawk') makedepends=('zlib' 'xz') backup=('etc/conf.d/kexec') license=('GPL2') md5sums=('35d05fed1c97008ac34c5bfb929295eb' - '15599234f174ddc4d2611f32effec6ab' - 'b9ddfb9fbcc7e4e7e7294fe94fa60aeb') + 'b96f47c29757fcadfbc50ea6ea22f839' + 'be059a103e5989519d22fca99f860a64' + '9ca7e31d2c5c66c436a9a2baf20ad9b2') build() { cd $srcdir/$pkgname-$pkgver export LDFLAGS+=" -static" + patch -Np1 -i ../kexec-tools-2.0.0-purgatory-makefile.patch ./configure --prefix=/usr make } Modified: kexec =================================================================== --- kexec 2011-08-26 09:20:34 UTC (rev 136321) +++ kexec 2011-08-26 10:44:37 UTC (rev 136322) @@ -7,19 +7,19 @@ case "$1" in start) - stat_busy "Enabled loading kernel for Kexec into running kernel on reboot" + stat_busy "Enabling kexec on reboot" add_daemon kexec stat_done ;; stop|load) if [ "$RUNLEVEL" = "6" -o "$1" = "load" ]; then - stat_busy "Loading kernel for Kexec into running kernel" + stat_busy "Loading kexec kernel" [ -f "$KPATH" ] || stat_fail [ -f "$INITRD" ] && _INITRD="--initrd=$INITRD" /sbin/kexec -l $KPATH --append="root=$ROOTPART $KPARAM" $_INITRD > /dev/null 2>&1 else - stat_busy "Skipping loading kernel for Kexec into running kernel" + stat_busy "Disabling kexec on reboot" fi if [ $? -eq 0 ] ; then rm_daemon kexec @@ -30,7 +30,7 @@ ;; unload) - stat_busy "Unloading Kexec kernel from running kernel" + stat_busy "Unloading kexec kernel" /sbin/kexec -u if [ $? -eq 0 ] ; then stat_done Added: kexec-tools-2.0.0-purgatory-makefile.patch =================================================================== --- kexec-tools-2.0.0-purgatory-makefile.patch (rev 0) +++ kexec-tools-2.0.0-purgatory-makefile.patch 2011-08-26 10:44:37 UTC (rev 136322) @@ -0,0 +1,20 @@ +diff -up kexec-tools-2.0.0/purgatory/Makefile.orig kexec-tools-2.0.0/purgatory/Makefile +--- kexec-tools-2.0.0/purgatory/Makefile.orig 2011-03-10 11:39:22.100799291 -0500 ++++ kexec-tools-2.0.0/purgatory/Makefile 2011-03-10 11:39:36.422736886 -0500 +@@ -55,14 +55,14 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATO + -I$(srcdir)/util_lib/include \ + -I$(shell $(CC) -print-file-name=include) + $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ +- --no-undefined -nostartfiles -nostdlib -nodefaultlibs \ ++ -nostartfiles -nostdlib -nodefaultlibs \ + -e purgatory_start -r + + $(PURGATORY): $(PURGATORY_OBJS) + $(MKDIR) -p $(@D) + $(CC) $(LDFLAGS) -o $@ $^ + +-# $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB) ++# $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB) + + echo:: + @echo "PURGATORY_SRCS $(PURGATORY_SRCS)" Modified: kexec.conf.d =================================================================== --- kexec.conf.d 2011-08-26 09:20:34 UTC (rev 136321) +++ kexec.conf.d 2011-08-26 10:44:37 UTC (rev 136322) @@ -3,7 +3,7 @@ # # Path to kernel, default to stock arch kernel -KPATH="/boot/vmlinuz26" +KPATH="/boot/vmlinuz-linux" # Root partition # The default attempts to autodetect @@ -13,4 +13,4 @@ KPARAM="ro" # Path to initrd image, default to stock arch kernel -INITRD="/boot/kernel26.img" +INITRD="/boot/initramfs-linux.img"