diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2012-10-15 05:37:11 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2012-10-15 05:37:25 +0000 |
| commit | 7fdf3fc01a127b6c3c3ed4cf9c0611c7c1b69f6c (patch) | |
| tree | a8c044d08a7b129c2968d20a36ba45d208174a18 | |
| parent | Bump version to 3.4.44 (diff) | |
| download | genkernel-7fdf3fc01a127b6c3c3ed4cf9c0611c7c1b69f6c.tar.gz genkernel-7fdf3fc01a127b6c3c3ed4cf9c0611c7c1b69f6c.tar.bz2 genkernel-7fdf3fc01a127b6c3c3ed4cf9c0611c7c1b69f6c.zip | |
Fix corner cases on OUTPUTDIR.
If you give the kernel O= with the same dir as the source, it will
complain about an unclean tree.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
| -rwxr-xr-x | gen_compile.sh | 2 | ||||
| -rwxr-xr-x | gen_package.sh | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gen_compile.sh b/gen_compile.sh index 87fd5868..71f5a68d 100755 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -25,7 +25,7 @@ compile_kernel_args() { then ARGS="${ARGS} ARCH=\"${KERNEL_ARCH}\"" fi - if [ -n "${KERNEL_OUTPUTDIR}" ] + if [ -n "${KERNEL_OUTPUTDIR}" -a "${KERNEL_OUTPUTDIR}" != "${KERNEL_DIR}" ] then ARGS="${ARGS} O=\"${KERNEL_OUTPUTDIR}\"" fi diff --git a/gen_package.sh b/gen_package.sh index b83ccc1f..ed7a5f4d 100755 --- a/gen_package.sh +++ b/gen_package.sh @@ -20,7 +20,7 @@ gen_minkernpackage() { then gen_die "Cannot locate kernel binary" fi - cd "${KERNEL_DIR}" + cd "${KERNEL_OUTPUTDIR}" 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}" @@ -38,7 +38,7 @@ gen_minkernpackage() { then /bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} System.map-${ARCH}-${KV} else - cp "${KERNEL_DIR}/System.map" "${TEMP}/minkernpackage/System.map-${ARCH}-${KV}" || gen_die 'Could not copy System.map for the kernel package!'; + cp "${KERNEL_OUTPUTDIR}/System.map" "${TEMP}/minkernpackage/System.map-${ARCH}-${KV}" || gen_die 'Could not copy System.map for the kernel package!'; fi cd "${TEMP}/minkernpackage" @@ -75,9 +75,9 @@ gen_kerncache() gen_die "Cannot locate kernel binary" fi - cd "${KERNEL_DIR}" + cd "${KERNEL_OUTPUTDIR}" 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_OUTPUTDIR}/.config" "${TEMP}/kerncache/config-${ARCH}-${KV}" if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then # Support --kernel-config=/proc/config.gz, mainly @@ -85,7 +85,7 @@ gen_kerncache() else cp "${KERNEL_CONFIG}" "${TEMP}/kerncache/config-${ARCH}-${KV}.orig" fi - cp "${KERNEL_DIR}/System.map" "${TEMP}/kerncache/System.map-${ARCH}-${KV}" + cp "${KERNEL_OUTPUTDIR}/System.map" "${TEMP}/kerncache/System.map-${ARCH}-${KV}" if isTrue "${GENZIMAGE}" then cp "${tmp_kernel_binary2}" "${TEMP}/kerncache/kernelz-${ARCH}-${KV}" || gen_die "Could not copy the kernelz for the kernel package" @@ -170,7 +170,7 @@ gen_kerncache_is_valid() else if [ -e "${KERNCACHE}" ] then - KERNEL_CONFIG="/${KERNEL_DIR}/.config" + KERNEL_CONFIG="/${KERNEL_OUTPUTDIR}/.config" if [ "${CMD_KERNEL_CONFIG}" != '' ] then KERNEL_CONFIG="${CMD_KERNEL_CONFIG}" |