Add --kernel-outputdir to save files outside the source tree.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

diff --git a/ChangeLog b/ChangeLog
index d3e7158e0b3bb71d40b85c709fa2e2586d23c42e..866046293d29e30c789560ae0c26f2a142ae6703 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@
 # Distributed under the GPL v2
 # $Id$
 
+  13 Oct 2012; Łukasz Stelmach <stlman@poczta.fm> gen_cmdline.sh,
+  gen_compile.sh, gen_configkernel.sh, gen_determineargs.sh, gen_funcs.sh,
+  genkernel:
+  Bug #435210 support external kernel output location, to allow pristine
+  source.
+
   13 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> gen_compile.sh:
   Bug #397947: Run depmod on new modules to avoid need to run at every boot on
   unionfs systems, or systemd that never runs it.

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index a30520189e2f86a78a3ef04449e8319880a204c6..858b850d3a77472468904e80b2626efc12648308 100755 (executable)
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -63,6 +63,7 @@ longusage() {
   echo "       --kernel-make=<makeprg> GNU Make to use for kernel"
   echo "       --kernel-target=<t>     Override default make target (bzImage)"
   echo "       --kernel-binary=<path>  Override default kernel binary path (arch/foo/boot/bar)"
+  echo "       --kernel-outputdir=<path> Save output files outside the source tree."
 
   echo "       --utils-cc=<compiler>   Compiler to use for utilities"
   echo "       --utils-as=<assembler>  Assembler to use for utils"
@@ -214,6 +215,10 @@ parse_cmdline() {
                        CMD_KERNEL_CROSS_COMPILE=$(echo ${CMD_KERNEL_CROSS_COMPILE}|sed -e 's/.*[^-]$/&-/g')
                        print_info 2 "CMD_KERNEL_CROSS_COMPILE: ${CMD_KERNEL_CROSS_COMPILE}"
                        ;;
+               --kernel-outputdir=*)
+                       CMD_KERNEL_OUTPUTDIR=`parse_opt "$*"`
+                       print_info 2 "CMD_KERNEL_OUTPUTDIR: ${CMD_KERNEL_OUTPUTDIR}"
+                       ;;
                --utils-cc=*)
                        CMD_UTILS_CC=`parse_opt "$*"`
                        print_info 2 "CMD_UTILS_CC: ${CMD_UTILS_CC}"

diff --git a/gen_compile.sh b/gen_compile.sh
index c92396717cd2599e2f8c2163b8b6e8172c9f4026..87fd58680c8af4c5e6035e67349e56c533873bd7 100755 (executable)
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -25,6 +25,10 @@ compile_kernel_args() {
                then
                        ARGS="${ARGS} ARCH=\"${KERNEL_ARCH}\""
                fi
+               if [ -n "${KERNEL_OUTPUTDIR}" ]
+               then
+                       ARGS="${ARGS} O=\"${KERNEL_OUTPUTDIR}\""
+               fi
        fi
        echo -n "${ARGS}"
 }
@@ -318,7 +322,7 @@ compile_kernel() {
                compile_generic "${KERNEL_MAKE_DIRECTIVE_2}" kernel
        fi
 
-       local firmware_in_kernel_line=`fgrep CONFIG_FIRMWARE_IN_KERNEL "${KERNEL_DIR}"/.config`
+       local firmware_in_kernel_line=`fgrep CONFIG_FIRMWARE_IN_KERNEL "${KERNEL_OUTPUTDIR}"/.config`
        if [ -n "${firmware_in_kernel_line}" -a "${firmware_in_kernel_line}" != CONFIG_FIRMWARE_IN_KERNEL=y ]
        then
                print_info 1 "        >> Installing firmware ('make firmware_install') due to CONFIG_FIRMWARE_IN_KERNEL != y..."

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index b0837dd05a6c10bba6ffed87518a5bbce580b6b2..6271ca03a7081afaeece4da6f1c19239bebc00b0 100755 (executable)
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -32,14 +32,14 @@ config_kernel() {
        cd "${KERNEL_DIR}" || gen_die 'Could not switch to the kernel directory!'
 
        # Backup current kernel .config
-       if isTrue "${MRPROPER}" || [ ! -f "${KERNEL_DIR}/.config" ]
+       if isTrue "${MRPROPER}" || [ ! -f "${KERNEL_OUTPUTDIR}/.config" ]
        then
                print_info 1 "kernel: Using config from ${KERNEL_CONFIG}"
-               if [ -f "${KERNEL_DIR}/.config" ]
+               if [ -f "${KERNEL_OUTPUTDIR}/.config" ]
                then
                        NOW=`date +--%Y-%m-%d--%H-%M-%S`
-                       cp "${KERNEL_DIR}/.config" "${KERNEL_DIR}/.config${NOW}.bak" \
-                                       || gen_die "Could not backup kernel config (${KERNEL_DIR}/.config)"
+                       cp "${KERNEL_OUTPUTDIR}/.config" "${KERNEL_OUTPUTDIR}/.config${NOW}.bak" \
+                                       || gen_die "Could not backup kernel config (${KERNEL_OUTPUTDIR}/.config)"
                        print_info 1 "        Previous config backed up to .config${NOW}.bak"
                fi
        fi
@@ -54,14 +54,14 @@ config_kernel() {
 
        # If we're not cleaning a la mrproper, then we don't want to try to overwrite the configs
        # or we might remove configurations someone is trying to test.
-       if isTrue "${MRPROPER}" || [ ! -f "${KERNEL_DIR}/.config" ]
+       if isTrue "${MRPROPER}" || [ ! -f "${KERNEL_OUTPUTDIR}/.config" ]
        then
                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}" > "${KERNEL_OUTPUTDIR}/.config" || gen_die "${message}"
                else
-                       cp "${KERNEL_CONFIG}" "${KERNEL_DIR}/.config" || gen_die "${message}"
+                       cp "${KERNEL_CONFIG}" "${KERNEL_OUTPUTDIR}/.config" || gen_die "${message}"
                fi
        fi
 
@@ -106,21 +106,21 @@ config_kernel() {
        then
                # Make sure Ext2 support is on...
                sed -e 's/#\? \?CONFIG_EXT2_FS[ =].*/CONFIG_EXT2_FS=y/g' \
-                       -i ${KERNEL_DIR}/.config 
+                       -i ${KERNEL_OUTPUTDIR}/.config
        fi
 
        # Make sure lvm modules are on if --lvm
        if isTrue ${CMD_LVM}
        then
-               sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_BLK_DEV_DM is.*/CONFIG_BLK_DEV_DM=m/g'
-               sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_SNAPSHOT is.*/CONFIG_DM_SNAPSHOT=m/g'
-               sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_MIRROR is.*/CONFIG_DM_MIRROR=m/g'
+               sed -i ${KERNEL_OUTPUTDIR}/.config -e 's/#\? \?CONFIG_BLK_DEV_DM is.*/CONFIG_BLK_DEV_DM=m/g'
+               sed -i ${KERNEL_OUTPUTDIR}/.config -e 's/#\? \?CONFIG_DM_SNAPSHOT is.*/CONFIG_DM_SNAPSHOT=m/g'
+               sed -i ${KERNEL_OUTPUTDIR}/.config -e 's/#\? \?CONFIG_DM_MIRROR is.*/CONFIG_DM_MIRROR=m/g'
        fi
 
        # Make sure dmraid modules are on if --dmraid
        if isTrue ${CMD_DMRAID}
        then
-               sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_BLK_DEV_DM is.*/CONFIG_BLK_DEV_DM=m/g'
+               sed -i ${KERNEL_OUTPUTDIR}/.config -e 's/#\? \?CONFIG_BLK_DEV_DM is.*/CONFIG_BLK_DEV_DM=m/g'
        fi
 
        # Make sure iSCSI modules are enabled in the kernel, if --iscsi
@@ -128,15 +128,15 @@ config_kernel() {
        # CONFIG_ISCSI_TCP
        if isTrue ${CMD_ISCSI}
        then
-               sed -i ${KERNEL_DIR}/.config -e 's/\# CONFIG_ISCSI_TCP is not set/CONFIG_ISCSI_TCP=m/g'
-               sed -i ${KERNEL_DIR}/.config -e 's/\# CONFIG_SCSI_ISCSI_ATTRS is not set/CONFIG_SCSI_ISCSI_ATTRS=m/g'
+               sed -i ${KERNEL_OUTPUTDIR}/.config -e 's/\# CONFIG_ISCSI_TCP is not set/CONFIG_ISCSI_TCP=m/g'
+               sed -i ${KERNEL_OUTPUTDIR}/.config -e 's/\# CONFIG_SCSI_ISCSI_ATTRS is not set/CONFIG_SCSI_ISCSI_ATTRS=m/g'
 
-               sed -i ${KERNEL_DIR}/.config -e 's/CONFIG_ISCSI_TCP=y/CONFIG_ISCSI_TCP=m/g'
-               sed -i ${KERNEL_DIR}/.config -e 's/CONFIG_SCSI_ISCSI_ATTRS=y/CONFIG_SCSI_ISCSI_ATTRS=m/g'
+               sed -i ${KERNEL_OUTPUTDIR}/.config -e 's/CONFIG_ISCSI_TCP=y/CONFIG_ISCSI_TCP=m/g'
+               sed -i ${KERNEL_OUTPUTDIR}/.config -e 's/CONFIG_SCSI_ISCSI_ATTRS=y/CONFIG_SCSI_ISCSI_ATTRS=m/g'
        fi
 
        if isTrue ${SPLASH}
        then
-               sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_FB_SPLASH is.*/CONFIG_FB_SPLASH=y/g'
+               sed -i ${KERNEL_OUTPUTDIR}/.config -e 's/#\? \?CONFIG_FB_SPLASH is.*/CONFIG_FB_SPLASH=y/g'
        fi
 }

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 92a6458a452aa24d9cb737b2d7c2372da45ab663..eb822b30aa2dda2bbb90b113c339f0e75a64c5a1 100755 (executable)
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -90,6 +90,7 @@ determine_real_args() {
        set_config_with_override STRING KERNEL_CROSS_COMPILE CMD_KERNEL_CROSS_COMPILE
        set_config_with_override STRING UTILS_CROSS_COMPILE  CMD_UTILS_CROSS_COMPILE
        set_config_with_override STRING BOOTDIR              CMD_BOOTDIR              "/boot"
+       set_config_with_override STRING KERNEL_OUTPUTDIR     CMD_KERNEL_OUTPUTDIR     "${DEFAULT_KERNEL_SOURCE}"
        set_config_with_override STRING MODPROBEDIR          CMD_MODPROBEDIR          "/etc/modprobe.d"
 
        set_config_with_override BOOL   SPLASH               CMD_SPLASH

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 48a338253883275dc75cd8ad39e3f1c9ff775132..4f0a0fc25f9cf44b83ae3bbc2e75562f84145c1a 100755 (executable)
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -298,6 +298,7 @@ copy_image_with_preserve() {
 
        # Old product might be a different version.  If so, we need to read
        # the symlink to see what it's name is, if there are symlinks.
+       cd ${KERNEL_OUTPUTDIR}
        if [ "${SYMLINK}" = '1' ]
        then
                print_info 4 "automatically managing symlinks and old images." 1 0
@@ -508,7 +509,7 @@ find_kernel_binary() {
        local kernel_binary=$*
        local curdir=$(pwd)
 
-       cd "${KERNEL_DIR}"
+       cd "${KERNEL_OUTPUTDIR}"
        for i in ${kernel_binary}
        do
                if [ -e "${i}" ]

diff --git a/genkernel b/genkernel
index 2c1a62d879343054ec361e295a08f39d5406c850..1630cd6abb5cb3fe241f954c516acbcc8ca25d38 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -236,7 +236,9 @@ then
        then
                print_info 1 "Copying config for successful build to /etc/kernels/kernel-config-${ARCH}-${KV}"
                [ ! -e '/etc/kernels' ] && mkdir -p /etc/kernels
-               cp "${KERNEL_DIR}/.config" "/etc/kernels/kernel-config-${ARCH}-${KV}"
+               cp "${KERNEL_OUTPUTDIR}/.config" "/etc/kernels/kernel-config-${ARCH}-${KV}" || \
+                       print_warning "Unable to copy the kernel configuration file."
+                       # Just a warning because ordinary users are not allowed to write in /etc
        fi
 fi