diff options
| author |   Andrew Gaffney <agaffney@gentoo.org> | 2009-02-19 21:41:10 -0600 |
|---|---|---|
| committer | Andrew Gaffney <agaffney@gentoo.org> | 2009-02-19 21:41:10 -0600 |
| commit | 01c51230c36cc226e9bd38a7e986144070fa7d45 (patch) | |
| tree | c9700a846792029295626b3040f54e12be5ae873 /gen_package.sh | |
| parent | Comment out the exec line for console=*, since it seems to blow up when the p... (diff) | |
| download | genkernel-01c51230c36cc226e9bd38a7e986144070fa7d45.tar.gz genkernel-01c51230c36cc226e9bd38a7e986144070fa7d45.tar.bz2 genkernel-01c51230c36cc226e9bd38a7e986144070fa7d45.zip | |
Add support for multiple possible kernel binary paths for gentoo bug #255085
Diffstat (limited to 'gen_package.sh')
| -rwxr-xr-x | gen_package.sh | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/gen_package.sh b/gen_package.sh index 71260098..3b0c046e 100755 --- a/gen_package.sh +++ b/gen_package.sh @@ -13,12 +13,18 @@ gen_minkernpackage() { /bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} kernelz-${ARCH}-${KV} fi else + local tmp_kernel_binary=$(find_kernel_binary ${KERNEL_BINARY}) + local tmp_kernel_binary2=$(find_kernel_binary ${KERNEL_BINARY_2}) + if [ -z "${tmp_kernel_binary}" ] + then + gen_die "Cannot locate kernel binary" + fi cd "${KERNEL_DIR}" - cp "${KERNEL_BINARY}" "${TEMP}/minkernpackage/kernel-${KV}" || gen_die 'Could not the copy kernel for the min kernel package!' + cp "${tmp_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 isTrue "${GENZIMAGE}" then - cp "${KERNEL_BINARY_2}" "${TEMP}/minkernpackage/kernelz-${KV}" || gen_die "Could not copy the kernelz for the min kernel package" + cp "${tmp_kernel_binary2}" "${TEMP}/minkernpackage/kernelz-${KV}" || gen_die "Could not copy the kernelz for the min kernel package" fi fi @@ -60,15 +66,23 @@ gen_kerncache() print_info 1 'Creating kernel cache' rm -rf "${TEMP}/kerncache" > /dev/null 2>&1 mkdir "${TEMP}/kerncache" || gen_die 'Could not make a directory for the kernel cache!' + + local tmp_kernel_binary=$(find_kernel_binary ${KERNEL_BINARY}) + local tmp_kernel_binary2=$(find_kernel_binary ${KERNEL_BINARY_2}) + if [ -z "${tmp_kernel_binary}" ] + then + gen_die "Cannot locate kernel binary" + fi + cd "${KERNEL_DIR}" - cp "${KERNEL_BINARY}" "${TEMP}/kerncache/kernel-${ARCH}-${KV}" || gen_die 'Could not the copy kernel for the kernel package!' + cp "${tmp_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_CONFIG}" "${TEMP}/kerncache/config-${ARCH}-${KV}.orig" cp "${KERNEL_DIR}/System.map" "${TEMP}/kerncache/System.map-${ARCH}-${KV}" if isTrue "${GENZIMAGE}" - then - cp "${KERNEL_BINARY_2}" "${TEMP}/kerncache/kernelz-${ARCH}-${KV}" || gen_die "Could not copy the kernelz for the kernel package" - fi + then + cp "${tmp_kernel_binary2}" "${TEMP}/kerncache/kernelz-${ARCH}-${KV}" || gen_die "Could not copy the kernelz for the kernel package" + fi echo "VERSION = ${VER}" > "${TEMP}/kerncache/kerncache.config" echo "PATCHLEVEL = ${PAT}" >> "${TEMP}/kerncache/kerncache.config" |