bump to pre6. resets ARCH env var after utils are compiled

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@360 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/gen_compile.sh b/gen_compile.sh
index ddb7134cd11af9ebbf189b62f8f3fbafe5fc4a39..38fa958003d9e97105a443e54e2dcb9ea6d609e0 100644 (file)
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -52,6 +52,7 @@ compile_utils_args()
 
 export_utils_args()
 {
+       save_args
        if [ "${UTILS_ARCH}" != '' ]
        then
                export ARCH="${UTILS_ARCH}"
@@ -88,10 +89,12 @@ unset_utils_args()
        then
                unset AS
        fi
+       reset_args
 }
 
 export_kernel_args()
 {
+       save_args
        if [ "${KERNEL_CC}" != '' ]
        then
                export CC="${KERNEL_CC}"
@@ -128,6 +131,53 @@ unset_kernel_args()
        then
                unset CROSS_COMPILE
        fi
+       reset_args
+}
+save_args()
+{
+       if [ "${ARCH}" != '' ]
+       then
+               export ORIG_ARCH="${ARCH}"
+       fi
+       if [ "${CC}" != '' ]
+       then
+               export ORIG_CC="${CC}"
+       fi
+       if [ "${LD}" != '' ]
+       then
+               export ORIG_LD="${LD}"
+       fi
+       if [ "${AS}" != '' ]
+       then
+               export ORIG_AS="${AS}"
+       fi
+       if [ "${CROSS_COMPILE}" != '' ]
+       then
+               export ORIG_CROSS_COMPILE="${CROSS_COMPILE}"
+       fi
+}
+reset_args()
+{
+       if [ "${ORIG_ARCH}" != '' ]
+       then
+               export ARCH="${ORIG_ARCH}"
+       fi
+       if [ "${ORIG_CC}" != '' ]
+       then
+               export CC="${ORIG_CC}"
+       fi
+       if [ "${ORIG_LD}" != '' ]
+       then
+               export LD="${ORIG_LD}"
+       fi
+       if [ "${ORIG_AS}" != '' ]
+       then
+               export AS="${ORIG_AS}"
+       fi
+       if [ "${ORIG_CROSS_COMPILE}" != '' ]
+       then
+               export CROSS_COMPILE="${ORIG_CROSS_COMPILE}"
+       fi
 }
 
 compile_generic() {

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 2891d0f0d43aaededa8f79e033f0038a08e2d91b..319225e2cedd9109b637f9e37b6736d48ce1b9e8 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -32,7 +32,7 @@ create_base_layout_cpio() {
 
        # SGI LiveCDs need the following binary (no better place for it than here)
        # getdvhoff is a DEPEND of genkernel, so it *should* exist
-       if [ "${MIPS_EMBEDDED_IMAGE}" != '' -a "${MIPS_LIVECD}" != '']
+       if [ "${MIPS_EMBEDDED_IMAGE}" != '' -a "${MIPS_LIVECD}" != '' ]
        then
                [ -e /usr/lib/getdvhoff/getdvhoff ] \
                        && cp /usr/lib/getdvhoff/getdvhoff ${TEMP}/initramfs-base-temp/bin \

diff --git a/genkernel b/genkernel
index c480a01caf9e13ab15ff9b1a98897655bc07f383..38ef664d844e990dc32b34865c85a010363a24f6 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # Genkernel v3
 
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
-GK_V='3.3.11_pre5'
+GK_V='3.3.11_pre6'
 
 TMPDIR='/var/tmp/genkernel'
 TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified.