diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2016-02-06 17:30:15 -0800 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2016-02-06 17:30:15 -0800 |
| commit | f9324a84796a5dbcac9d3a3fe2bead24f2853aa1 (patch) | |
| tree | 5a205f34047c309f9179a0761c1f15fa5c3ef516 /gen_initramfs.sh | |
| parent | Major version bump: due to kernel changes this is considered a major unstable... (diff) | |
| download | genkernel-f9324a84796a5dbcac9d3a3fe2bead24f2853aa1.tar.gz genkernel-f9324a84796a5dbcac9d3a3fe2bead24f2853aa1.tar.bz2 genkernel-f9324a84796a5dbcac9d3a3fe2bead24f2853aa1.zip | |
Use KERNEL_OUTPUTDIR more consistently.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'gen_initramfs.sh')
| -rwxr-xr-x | gen_initramfs.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 163eedb..a03f5b1 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -898,7 +898,7 @@ create_initramfs() { # Explicitly do not compress if we are integrating into the kernel. # The kernel will do a better job of it than us. mv ${TMPDIR}/initramfs-${KV} ${TMPDIR}/initramfs-${KV}.cpio - sed -i '/^.*CONFIG_INITRAMFS_SOURCE=.*$/d' ${KERNEL_DIR}/.config + sed -i '/^.*CONFIG_INITRAMFS_SOURCE=.*$/d' ${KERNEL_OUTPUTDIR}/.config compress_config='INITRAMFS_COMPRESSION_NONE' case ${compress_ext} in gz) compress_config='INITRAMFS_COMPRESSION_GZIP' ;; @@ -911,7 +911,7 @@ create_initramfs() { esac # All N default except XZ, so there it gets used if the kernel does # compression on it's own. - cat >>${KERNEL_DIR}/.config <<-EOF + cat >>${KERNEL_OUTPUTDIR}/.config <<-EOF CONFIG_INITRAMFS_SOURCE="${TMPDIR}/initramfs-${KV}.cpio${compress_ext}" CONFIG_INITRAMFS_ROOT_UID=0 CONFIG_INITRAMFS_ROOT_GID=0 @@ -929,8 +929,8 @@ create_initramfs() { then # NOTE: We do not work with ${KERNEL_CONFIG} here, since things like # "make oldconfig" or --noclean could be in effect. - if [ -f "${KERNEL_DIR}"/.config ]; then - local ACTUAL_KERNEL_CONFIG="${KERNEL_DIR}"/.config + if [ -f "${KERNEL_OUTPUTDIR}"/.config ]; then + local ACTUAL_KERNEL_CONFIG="${KERNEL_OUTPUTDIR}"/.config else local ACTUAL_KERNEL_CONFIG="${KERNEL_CONFIG}" fi |