diff options
| author |   Richard Yao <ryao@cs.stonybrook.edu> | 2012-08-05 12:21:15 -0400 |
|---|---|---|
| committer | Richard Yao <ryao@cs.stonybrook.edu> | 2012-08-05 12:21:15 -0400 |
| commit | 241726fb329e0e53e82f3d8de1688751e4f4eb72 (patch) | |
| tree | f7c8d45330fcab3485bcd64241f70a77d86bdfc8 | |
| parent | Use system LVM binaries, even when not statically linked (diff) | |
| download | genkernel-241726fb329e0e53e82f3d8de1688751e4f4eb72.tar.gz genkernel-241726fb329e0e53e82f3d8de1688751e4f4eb72.tar.bz2 genkernel-241726fb329e0e53e82f3d8de1688751e4f4eb72.zip | |
Correct incorrect merge conflict resolution by using BUILD_DST instead of KERNEL_DIR
| -rwxr-xr-x | gen_configkernel.sh | 4 | ||||
| -rwxr-xr-x | gen_package.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gen_configkernel.sh b/gen_configkernel.sh index 60ba5362..ba05dd23 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -59,9 +59,9 @@ config_kernel() { local message='Could not copy configuration file!' if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then # Support --kernel-config=/proc/config.gz, mainly - zcat "${KERNEL_CONFIG}" > "${KERNEL_DIR}/.config" || gen_die "${message}" + zcat "${KERNEL_CONFIG}" > "${BUILD_DST}/.config" || gen_die "${message}" else - cp "${KERNEL_CONFIG}" "${KERNEL_DIR}/.config" || gen_die "${message}" + cp "${KERNEL_CONFIG}" "${BUILD_DST}/.config" || gen_die "${message}" fi fi diff --git a/gen_package.sh b/gen_package.sh index c80d630b..c580e27d 100755 --- a/gen_package.sh +++ b/gen_package.sh @@ -77,7 +77,7 @@ gen_kerncache() cd "${BUILD_DST}" 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 "${BUILD_DST}/.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 "${BUILD_DST}/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" |