diff options
| author |   Eric Edgar <rocket@gentoo.org> | 2005-11-21 17:01:26 +0000 |
|---|---|---|
| committer | Eric Edgar <rocket@gentoo.org> | 2005-11-21 17:01:26 +0000 |
| commit | 6875046a4c2effe4041a5d5345ee88b944202bec (patch) | |
| tree | d14515f67d0b39c6d74e63e6f99c57697f0a1809 /gen_package.sh | |
| parent | Fix {PPC+Catalyst+Pegasos} build failure regression. (diff) | |
| download | genkernel-6875046a4c2effe4041a5d5345ee88b944202bec.tar.gz genkernel-6875046a4c2effe4041a5d5345ee88b944202bec.tar.bz2 genkernel-6875046a4c2effe4041a5d5345ee88b944202bec.zip | |
Fix missing moddeps file by adding a test;Do not keep the initrd/initramfs with a kernelz system as it is already bundled together.
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@324 67a159dc-881f-0410-a524-ba9dfbe2cb84
Diffstat (limited to 'gen_package.sh')
| -rw-r--r-- | gen_package.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/gen_package.sh b/gen_package.sh index f6391bd..86c8f75 100644 --- a/gen_package.sh +++ b/gen_package.sh @@ -23,12 +23,17 @@ gen_minkernpackage() fi fi - if [ "${KERN_24}" != '1' -a "${CMD_BOOTSPLASH}" != '1' ] + + if [ "${GENERATE_Z_IMAGE}" != '1' ] then - [ "${BUILD_INITRD}" -ne 0 ] && { cp "${TMPDIR}/initramfs-${KV}" "${TEMP}/minkernpackage/initramfs-${ARCH}-${KV}" || gen_die 'Could not copy the initramfs for the kernel package!'; } - else - [ "${BUILD_INITRD}" -ne 0 ] && { cp "${TMPDIR}/initrd-${KV}" "${TEMP}/minkernpackage/initrd-${ARCH}-${KV}" || gen_die 'Could not copy the initrd for the kernel package!'; } + if [ "${KERN_24}" != '1' -a "${CMD_BOOTSPLASH}" != '1' ] + then + [ "${BUILD_INITRD}" -ne 0 ] && { cp "${TMPDIR}/initramfs-${KV}" "${TEMP}/minkernpackage/initramfs-${ARCH}-${KV}" || gen_die 'Could not copy the initramfs for the kernel package!'; } + else + [ "${BUILD_INITRD}" -ne 0 ] && { cp "${TMPDIR}/initrd-${KV}" "${TEMP}/minkernpackage/initrd-${ARCH}-${KV}" || gen_die 'Could not copy the initrd for the kernel package!'; } + fi fi + cd "${TEMP}/minkernpackage" /bin/tar -jcpf ${MINKERNPACKAGE} * || gen_die 'Could not compress the kernel package!' cd "${TEMP}" && rm -rf "${TEMP}/minkernpackage" > /dev/null 2>&1 |