I don't understand gcc/PKGBUILD.mips64el

Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/addresses/PKGBUILD
	community/chmsee/PKGBUILD
	community/coin/PKGBUILD
	community/critterding/PKGBUILD
	community/distcc/PKGBUILD
	community/djview4/PKGBUILD
	community/freedroid/PKGBUILD
	community/gnumail/PKGBUILD
	community/gyachi/PKGBUILD
	community/java-oracle/PKGBUILD
	community/liboop/PKGBUILD
	community/ltris/PKGBUILD
	community/nepim/PKGBUILD
	community/pantomime/PKGBUILD
	community/pyxattr/PKGBUILD
	community/soqt/PKGBUILD
	community/tilda/PKGBUILD
	community/unrealircd/PKGBUILD
	community/uqm/PKGBUILD
	core/dnsutils/PKGBUILD
	core/gcc/PKGBUILD.mips64el
	core/vpnc/PKGBUILD
	extra/apache/PKGBUILD
	extra/bind/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/ccache/PKGBUILD
	extra/claws-mail-extra-plugins/PKGBUILD
	extra/clutter-gst/PKGBUILD
	extra/cups/PKGBUILD
	extra/doxygen/PKGBUILD
	extra/fam/PKGBUILD
	extra/fcitx/PKGBUILD
	extra/gdk-pixbuf2/PKGBUILD
	extra/geoip/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/icedtea-web/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libfwbuilder/PKGBUILD
	extra/libmpd/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/mesa/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/qt/PKGBUILD
	extra/samba/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xulrunner/PKGBUILD
	multilib-testing/lib32-keyutils/PKGBUILD
	multilib-testing/lib32-udev/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-keyutils/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine_gecko/PKGBUILD
	testing/dash/PKGBUILD
	testing/libssh2/PKGBUILD

4 files changed, 35 insertions, 11 deletions

diff --git a/extra/kexec-tools/PKGBUILD b/extra/kexec-tools/PKGBUILD
index d9a26d522..b2121f984 100644
--- a/extra/kexec-tools/PKGBUILD
+++ b/extra/kexec-tools/PKGBUILD
@@ -1,26 +1,30 @@
-# $Id: PKGBUILD 110362 2011-02-19 03:39:03Z allan $
+# $Id: PKGBUILD 136323 2011-08-26 10:46:24Z tpowa $
 # Contributor: Camille Moncelier <pix@devlife.org>, simo <simo@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 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' 'mips64el')
 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
 }
diff --git a/extra/kexec-tools/kexec b/extra/kexec-tools/kexec
index bef5b5ef3..c2e9a78a8 100755
--- a/extra/kexec-tools/kexec
+++ b/extra/kexec-tools/kexec
@@ -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 @@ case "$1" in
   ;;
 
   unload)
-    stat_busy "Unloading Kexec kernel from running kernel"
+    stat_busy "Unloading kexec kernel"
     /sbin/kexec -u
     if [ $? -eq 0 ] ; then
       stat_done
diff --git a/extra/kexec-tools/kexec-tools-2.0.0-purgatory-makefile.patch b/extra/kexec-tools/kexec-tools-2.0.0-purgatory-makefile.patch
new file mode 100644
index 000000000..0c029c8f4
--- /dev/null
+++ b/extra/kexec-tools/kexec-tools-2.0.0-purgatory-makefile.patch
@@ -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)"
diff --git a/extra/kexec-tools/kexec.conf.d b/extra/kexec-tools/kexec.conf.d
index 17b10d228..991a7a27d 100644
--- a/extra/kexec-tools/kexec.conf.d
+++ b/extra/kexec-tools/kexec.conf.d
@@ -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 @@ ROOTPART="$(awk '/^[ \t]*[^#]/ { if ($2 == "/") { print $1; }}' /etc/fstab)"
 KPARAM="ro"
 
 # Path to initrd image, default to stock arch kernel
-INITRD="/boot/kernel26.img"
+INITRD="/boot/initramfs-linux.img"