Actually setting permissions. It helps if one remembers to 'git add' before doing...

[genkernel.git] / gen_compile.sh

diff --git a/gen_compile.sh b/gen_compile.sh
old mode 100644 (file)
new mode 100755 (executable)
index a9066e6..40ba84e
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -31,8 +31,15 @@ compile_kernel_args() {
 compile_utils_args()
 {
        local ARGS
-
        ARGS=''
+
+       if [ -n "${UTILS_CROSS_COMPILE}" ]
+       then
+               UTILS_CC="${UTILS_CROSS_COMPILE}gcc"
+               UTILS_LD="${UTILS_CROSS_COMPILE}ld"
+               UTILS_AS="${UTILS_CROSS_COMPILE}as"
+       fi
+
        if [ "${UTILS_ARCH}" != '' ]
        then
                ARGS="ARCH=\"${UTILS_ARCH}\""
@@ -328,14 +335,20 @@ compile_busybox() {
        then
                [ -f "${BUSYBOX_CONFIG}" ] ||
                        gen_die "Could not find busybox config file: ${BUSYBOX_CONFIG}"
-       elif [ -f "${GK_SHARE}/defaults/busy-config" ]
+       elif isTrue "${NETBOOT}" && [ -f "$(arch_replace "${GK_SHARE}/arch/%%ARCH%%/netboot-busy-config")" ]
        then
-               BUSYBOX_CONFIG="${GK_SHARE}/defaults/busy-config"
+               BUSYBOX_CONFIG="$(arch_replace "${GK_SHARE}/arch/%%ARCH%%/netboot-busy-config")"
+       elif isTrue "${NETBOOT}" && [ -f "${GK_SHARE}/netboot/busy-config" ]
+       then
+               BUSYBOX_CONFIG="${GK_SHARE}/netboot/busy-config"
        elif [ -f "$(arch_replace "${GK_SHARE}/arch/%%ARCH%%/busy-config")" ]
        then
                BUSYBOX_CONFIG="$(arch_replace "${GK_SHARE}/arch/%%ARCH%%/busy-config")"
+       elif [ -f "${GK_SHARE}/defaults/busy-config" ]
+       then
+               BUSYBOX_CONFIG="${GK_SHARE}/defaults/busy-config"
        else
-               gendie "Could not find a busybox config file"
+               gen_die "Could not find a busybox config file"
        fi
 
        # Delete cache if stored config's MD5 does not match one to be used