Fix ppc not compiling without --genzimage

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

diff --git a/gen_compile.sh b/gen_compile.sh
index fa98c4eb41f4463af9f085d338f3f20a7eef61b9..cffd7dea1b7982ab6d617a9866fba30c084eb267 100644 (file)
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -224,7 +224,7 @@ compile_kernel() {
        cd ${KERNEL_DIR}
        print_info 1 "        >> Compiling ${KV} ${KERNEL_MAKE_DIRECTIVE/_install/ [ install ]/}..."
        compile_generic "${KERNEL_MAKE_DIRECTIVE}" kernel
-       if [ "${KERNEL_MAKE_DIRECTIVE_2}" != '' ]
+       if [ "${KERNEL_MAKE_DIRECTIVE_2}" != '' -a "${GENERATE_Z_IMAGE}" = '1' ]
        then
                print_info 1 "        >> Starting supplimental compile of ${KV}: ${KERNEL_MAKE_DIRECTIVE_2}..."
                compile_generic "${KERNEL_MAKE_DIRECTIVE_2}" kernel
@@ -235,7 +235,7 @@ compile_kernel() {
                        gen_die 'Could not copy the kernel binary to /boot!'
                cp "System.map" "/boot/System.map-${KNAME}-${ARCH}-${KV}" ||
                        gen_die 'Could not copy System.map to /boot!'
-               if [ "${KERNEL_BINARY_2}" != '' ]
+               if [ "${KERNEL_BINARY_2}" != '' -a "${GENERATE_Z_IMAGE}" = '1' ]
                then
                        cp "${KERNEL_BINARY_2}" "/boot/kernelz-${KV}" ||
                                gen_die 'Could not copy the kernelz binary to /boot!'
@@ -245,7 +245,7 @@ compile_kernel() {
                        gen_die "Could not copy the kernel binary to ${TMPDIR}!"
                cp "System.map" "${TMPDIR}/System.map-${KNAME}-${ARCH}-${KV}" ||
                        gen_die "Could not copy System.map to ${TMPDIR}!"
-               if [ "${KERNEL_BINARY_2}" != '' ]
+               if [ "${KERNEL_BINARY_2}" != '' -a "${GENERATE_Z_IMAGE}" = '1' ]
                then
                        cp "${KERNEL_BINARY_2}" "${TMPDIR}/kernelz-${KV}" ||
                                gen_die "Could not copy the kernelz binary to ${TMPDIR}!"

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index e438b76e822233832aa8a1667f6c4a27d0be12ba..c92766f4e6f74ba090735fd8aba4fd935f40dfc1 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -493,8 +493,8 @@ merge_initramfs_cpio_archives(){
 
        cat ${MERGE_LIST} > ${TMPDIR}/initramfs-${KV}
 
-       [ "${KERNEL_MAKE_DIRECTIVE}" == 'zImage.initrd' ] ||
-               [ "${KERNEL_MAKE_DIRECTIVE_2}" == 'zImage.initrd' ] &&
+       [ "${KERNEL_MAKE_DIRECTIVE}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] ||
+               [ "${KERNEL_MAKE_DIRECTIVE_2}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] &&
                        cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/arch/${ARCH}/boot/images/ramdisk.image.gz
 }
 

diff --git a/gen_initrd.sh b/gen_initrd.sh
index fb62702fa171e9f3f3d00f6c58a139dede568254..3558be951b1ce123ab7f518df6310f1ebd0895b2 100644 (file)
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -371,7 +371,7 @@ create_initrd() {
                cp ${TMPDIR}/initrd-${KV} /boot/initrd-${KNAME}-${ARCH}-${KV} ||
                        gen_die 'Could not copy the initrd to /boot!'
        fi
-       [ "${KERNEL_MAKE_DIRECTIVE}" == 'zImage.initrd' ] ||
-               [ "${KERNEL_MAKE_DIRECTIVE_2}" == 'zImage.initrd' ] &&
+       [ "${KERNEL_MAKE_DIRECTIVE}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] ||
+               [ "${KERNEL_MAKE_DIRECTIVE_2}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] &&
                cp ${TMPDIR}/initrd-${KV} ${KERNEL_DIR}/arch/${ARCH}/boot/images/ramdisk.image.gz
 }

diff --git a/gen_package.sh b/gen_package.sh
index f892b159c454c42b763c86e06781aaff236aa954..5d1d4a819ad64899b238442e8f9850548520de64 100644 (file)
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -9,7 +9,7 @@ gen_minkernpackage()
        then
            /bin/tar -xj -C ${TEMP}/minkernpackage -f ${CMD_KERNCACHE} kernel-${ARCH}-${KV}
            /bin/tar -xj -C ${TEMP}/minkernpackage -f ${CMD_KERNCACHE} config-${ARCH}-${KV}
-           if [ "${KERNEL_BINARY_2}" != '' ]
+           if [ "${KERNEL_BINARY_2}" != '' -a "${GENERATE_Z_IMAGE}" = '1' ]
             then
                /bin/tar -xj -C ${TEMP}/minkernpackage -f ${CMD_KERNCACHE} kernelz-${ARCH}-${KV}
             fi
@@ -17,7 +17,7 @@ gen_minkernpackage()
            cd "${KERNEL_DIR}"
            cp "${KERNEL_BINARY}" "${TEMP}/minkernpackage/kernel-${KV}" || gen_die 'Could not the copy kernel for the min kernel package!'
            cp ".config" "${TEMP}/minkernpackage/config-${ARCH}-${KV}" || gen_die 'Could not the copy kernel config for the min kernel package!'
-           if [ "${KERNEL_BINARY_2}" != '' ]
+           if [ "${KERNEL_BINARY_2}" != '' -a "${GENERATE_Z_IMAGE}" = '1' ]
             then
                cp "${KERNEL_BINARY_2}" "${TEMP}/minkernpackage/kernelz-${KV}" || gen_die "Could not copy the kernelz for the min kernel package"
             fi
@@ -59,7 +59,7 @@ gen_kerncache()
        cp "${KERNEL_BINARY}" "${TEMP}/kerncache/kernel-${ARCH}-${KV}" || gen_die 'Could not the copy kernel for the kernel package!'
        cp "${KERNEL_DIR}/.config" "${TEMP}/kerncache/config-${ARCH}-${KV}"
        cp "${KERNEL_DIR}/System.map" "${TEMP}/kerncache/System.map-${ARCH}-${KV}"
-       if [ "${KERNEL_BINARY_2}" != '' ]
+       if [ "${KERNEL_BINARY_2}" != '' -a "${GENERATE_Z_IMAGE}" = '1' ]
         then
                cp "${KERNEL_BINARY_2}" "${TEMP}/kerncache/kernelz-${ARCH}-${KV}" || gen_die "Could not copy the kernelz for the kernel package"
         fi
@@ -85,7 +85,7 @@ gen_kerncache_extract_kernel()
 {
                /bin/tar -f ${KERNCACHE} -C ${TEMP} -xj 
        cp "${TEMP}/kernel-${ARCH}-${KV}" "/boot/kernel-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not copy the kernel binary to /boot!'
-       if [ "${KERNEL_BINARY_2}" != '' ]
+       if [ "${KERNEL_BINARY_2}" != '' -a "${GENERATE_Z_IMAGE}" = '1' ]
         then
                cp "${TEMP}/kernelz-${ARCH}-${KV}" "/boot/kernelz-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not copy the kernel binary to /boot!'
         fi

diff --git a/ppc/config.sh b/ppc/config.sh
index 39ae81eefee023bae46b3e01f1e6ef5015aee582..a1776855556512002e1de142f7b608e70ca9f70b 100644 (file)
--- a/ppc/config.sh
+++ b/ppc/config.sh
@@ -24,4 +24,3 @@ UTILS_AS=as
 UTILS_LD=ld
 
 COMPRESS_INITRD=yes
-GENERATE_Z_IMAGE=1