X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=gen_determineargs.sh;h=7f352f8ff4d92c9ced40009b73ffb5e0e5f9c256;hb=6683592216b047d19874d1515ce72226a98650d7;hp=d911f07a120c16122565e11d60b50b22fabdb2d3;hpb=18d9c84402485112cd82482fe9b41e171e4140c0;p=genkernel.git diff --git a/gen_determineargs.sh b/gen_determineargs.sh index d911f07..7f352f8 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -2,7 +2,7 @@ # $Id$ get_KV() { - if [ "${NO_KERNEL_SOURCES}" = '1' -a -e "${KERNCACHE}" ] + if [ "${KERNEL_SOURCES}" = '0' -a -e "${KERNCACHE}" ] then /bin/tar -xj -C ${TEMP} -f ${KERNCACHE} kerncache.config if [ -e ${TEMP}/kerncache.config ] @@ -20,15 +20,21 @@ get_KV() { # Configure the kernel # If BUILD_KERNEL=0 then assume --no-clean, menuconfig is cleared + if [ ! -f "${KERNEL_DIR}"/Makefile ] + then + gen_die "Kernel Makefile (${KERNEL_DIR}/Makefile) missing. Maybe re-install the kernel sources." + fi + VER=`grep ^VERSION\ \= ${KERNEL_DIR}/Makefile | awk '{ print $3 };'` PAT=`grep ^PATCHLEVEL\ \= ${KERNEL_DIR}/Makefile | awk '{ print $3 };'` SUB=`grep ^SUBLEVEL\ \= ${KERNEL_DIR}/Makefile | awk '{ print $3 };'` EXV=`grep ^EXTRAVERSION\ \= ${KERNEL_DIR}/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g" -e 's/\$([a-z]*)//gi'` - if [ -z "${SUB}" ]; + if [ -z "${SUB}" ] then # Handle O= build directories KERNEL_SOURCE_DIR=`grep ^MAKEARGS\ \:\= ${KERNEL_DIR}/Makefile | awk '{ print $4 };'` + [ -z "${KERNEL_SOURCE_DIR}" ] && gen_die "Deriving \${KERNEL_SOURCE_DIR} failed" SUB=`grep ^SUBLEVEL\ \= ${KERNEL_SOURCE_DIR}/Makefile | awk '{ print $3 };'` EXV=`grep ^EXTRAVERSION\ \= ${KERNEL_SOURCE_DIR}/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g" -e 's/\$([a-z]*)//gi'` fi @@ -52,7 +58,8 @@ get_KV() { LOV=`echo ${UTS_RELEASE}|sed -e "s/${VER}.${PAT}.${SUB}${EXV}//"` KV=${VER}.${PAT}.${SUB}${EXV}${LOV} else - LCV=`grep ^CONFIG_LOCALVERSION= ${KERNEL_DIR}/.config | sed -r -e "s/.*=\"(.*)\"/\1/"` + determine_config_file + LCV=`grep ^CONFIG_LOCALVERSION= "${KERNEL_CONFIG}" | sed -r -e "s/.*=\"(.*)\"/\1/"` KV=${VER}.${PAT}.${SUB}${EXV}${LCV} fi fi @@ -61,89 +68,98 @@ get_KV() { determine_real_args() { print_info 4 "Resolving config file, command line, and arch default settings." - # Config File Command Line Arch Default - # ----------- ------------ ------------ - set_config_with_override 2 DEBUGFILE CMD_DEBUGFILE - set_config_with_override 2 KERNEL_DIR CMD_KERNEL_DIR "${DEFAULT_KERNEL_SOURCE}" - set_config_with_override 1 NO_KERNEL_SOURCES CMD_NO_KERNEL_SOURCES - set_config_with_override 2 KNAME CMD_KERNNAME "genkernel" - - set_config_with_override 2 MAKEOPTS CMD_MAKEOPTS "$DEFAULT_MAKEOPTS" - set_config_with_override 2 KERNEL_MAKE CMD_KERNEL_MAKE "$DEFAULT_KERNEL_MAKE" - set_config_with_override 2 UTILS_MAKE CMD_UTILS_MAKE "$DEFAULT_UTILS_MAKE" - set_config_with_override 2 KERNEL_CC CMD_KERNEL_CC "$DEFAULT_KERNEL_CC" - set_config_with_override 2 KERNEL_LD CMD_KERNEL_LD "$DEFAULT_KERNEL_LD" - set_config_with_override 2 KERNEL_AS CMD_KERNEL_AS "$DEFAULT_KERNEL_AS" - set_config_with_override 2 UTILS_CC CMD_UTILS_CC "$DEFAULT_UTILS_CC" - set_config_with_override 2 UTILS_LD CMD_UTILS_LD "$DEFAULT_UTILS_LD" - set_config_with_override 2 UTILS_AS CMD_UTILS_AS "$DEFAULT_UTILS_AS" - - set_config_with_override 2 KERNEL_CROSS_COMPILE CMD_KERNEL_CROSS_COMPILE - set_config_with_override 2 UTILS_CROSS_COMPILE CMD_UTILS_CROSS_COMPILE - set_config_with_override 2 BOOTDIR CMD_BOOTDIR "/boot" - - set_config_with_override 1 SPLASH CMD_SPLASH - set_config_with_override 1 POSTCLEAR CMD_POSTCLEAR - set_config_with_override 1 MRPROPER CMD_MRPROPER - set_config_with_override 1 MENUCONFIG CMD_MENUCONFIG - set_config_with_override 1 CLEAN CMD_CLEAN - - set_config_with_override 2 MINKERNPACKAGE CMD_MINKERNPACKAGE - set_config_with_override 2 MODULESPACKAGE CMD_MODULESPACKAGE - set_config_with_override 2 KERNCACHE CMD_KERNCACHE - set_config_with_override 1 NORAMDISKMODULES CMD_NORAMDISKMODULES - set_config_with_override 1 ALLRAMDISKMODULES CMD_ALLRAMDISKMODULES - set_config_with_override 2 INITRAMFS_OVERLAY CMD_INITRAMFS_OVERLAY - set_config_with_override 1 MOUNTBOOT CMD_MOUNTBOOT - set_config_with_override 1 BUILD_STATIC CMD_STATIC - set_config_with_override 1 SAVE_CONFIG CMD_SAVE_CONFIG - set_config_with_override 1 SYMLINK CMD_SYMLINK - set_config_with_override 2 INSTALL_MOD_PATH CMD_INSTALL_MOD_PATH - set_config_with_override 1 OLDCONFIG CMD_OLDCONFIG - set_config_with_override 1 LVM CMD_LVM - set_config_with_override 1 EVMS CMD_EVMS - set_config_with_override 1 DMRAID CMD_DMRAID - set_config_with_override 1 ISCSI CMD_ISCSI - set_config_with_override 1 BUSYBOX CMD_BUSYBOX "yes" - set_config_with_override 1 UNIONFS CMD_UNIONFS - set_config_with_override 1 NETBOOT CMD_NETBOOT - set_config_with_override 2 REAL_ROOT CMD_REAL_ROOT - set_config_with_override 1 DISKLABEL CMD_DISKLABEL - set_config_with_override 1 LUKS CMD_LUKS - set_config_with_override 1 MDADM CMD_MDADM - set_config_with_override 1 MULTIPATH CMD_MULTIPATH - set_config_with_override 1 FIRMWARE CMD_FIRMWARE - set_config_with_override 2 FIRMWARE_DIR CMD_FIRMWARE_DIR "/lib/firmware" - set_config_with_override 2 FIRMWARE_FILES CMD_FIRMWARE_FILES - set_config_with_override 1 INTEGRATED_INITRAMFS CMD_INTEGRATED_INITRAMFS - set_config_with_override 1 GENZIMAGE CMD_GENZIMAGE - set_config_with_override 1 KEYMAP CMD_KEYMAP "yes" - set_config_with_override 1 DOKEYMAPAUTO CMD_DOKEYMAPAUTO - set_config_with_override 2 BUSYBOX_CONFIG CMD_BUSYBOX_CONFIG + # Dest / Config File Command Line Arch Default + # ------------------ ------------ ------------ + set_config_with_override STRING LOGFILE CMD_LOGFILE + set_config_with_override STRING KERNEL_DIR CMD_KERNEL_DIR "${DEFAULT_KERNEL_SOURCE}" + set_config_with_override BOOL KERNEL_SOURCES CMD_KERNEL_SOURCES "yes" + set_config_with_override STRING KNAME CMD_KERNNAME "genkernel" + + set_config_with_override STRING COMPRESS_INITRD CMD_COMPRESS_INITRD "$DEFAULT_COMPRESS_INITRD" + set_config_with_override STRING COMPRESS_INITRD_TYPE CMD_COMPRESS_INITRD_TYPE "$DEFAULT_COMPRESS_INITRD_TYPE" + set_config_with_override STRING MAKEOPTS CMD_MAKEOPTS "$DEFAULT_MAKEOPTS" + set_config_with_override STRING KERNEL_MAKE CMD_KERNEL_MAKE "$DEFAULT_KERNEL_MAKE" + set_config_with_override STRING UTILS_MAKE CMD_UTILS_MAKE "$DEFAULT_UTILS_MAKE" + set_config_with_override STRING KERNEL_CC CMD_KERNEL_CC "$DEFAULT_KERNEL_CC" + set_config_with_override STRING KERNEL_LD CMD_KERNEL_LD "$DEFAULT_KERNEL_LD" + set_config_with_override STRING KERNEL_AS CMD_KERNEL_AS "$DEFAULT_KERNEL_AS" + set_config_with_override STRING UTILS_CC CMD_UTILS_CC "$DEFAULT_UTILS_CC" + set_config_with_override STRING UTILS_LD CMD_UTILS_LD "$DEFAULT_UTILS_LD" + set_config_with_override STRING UTILS_AS CMD_UTILS_AS "$DEFAULT_UTILS_AS" + + 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 MODPROBEDIR CMD_MODPROBEDIR "/etc/modprobe.d" + + set_config_with_override BOOL SPLASH CMD_SPLASH + set_config_with_override BOOL POSTCLEAR CMD_POSTCLEAR + set_config_with_override BOOL MRPROPER CMD_MRPROPER + set_config_with_override BOOL MENUCONFIG CMD_MENUCONFIG + set_config_with_override BOOL CLEAN CMD_CLEAN + + set_config_with_override STRING MINKERNPACKAGE CMD_MINKERNPACKAGE + set_config_with_override STRING MODULESPACKAGE CMD_MODULESPACKAGE + set_config_with_override STRING KERNCACHE CMD_KERNCACHE + set_config_with_override BOOL RAMDISKMODULES CMD_RAMDISKMODULES "yes" + set_config_with_override BOOL ALLRAMDISKMODULES CMD_ALLRAMDISKMODULES "no" + set_config_with_override STRING INITRAMFS_OVERLAY CMD_INITRAMFS_OVERLAY + set_config_with_override BOOL MOUNTBOOT CMD_MOUNTBOOT + set_config_with_override BOOL BUILD_STATIC CMD_STATIC + set_config_with_override BOOL SAVE_CONFIG CMD_SAVE_CONFIG + set_config_with_override BOOL SYMLINK CMD_SYMLINK + set_config_with_override STRING INSTALL_MOD_PATH CMD_INSTALL_MOD_PATH + set_config_with_override BOOL OLDCONFIG CMD_OLDCONFIG + set_config_with_override BOOL LVM CMD_LVM + set_config_with_override BOOL DMRAID CMD_DMRAID + set_config_with_override BOOL ISCSI CMD_ISCSI + set_config_with_override BOOL BUSYBOX CMD_BUSYBOX "yes" + set_config_with_override BOOL UNIONFS CMD_UNIONFS + set_config_with_override BOOL NETBOOT CMD_NETBOOT + set_config_with_override STRING REAL_ROOT CMD_REAL_ROOT + set_config_with_override BOOL DISKLABEL CMD_DISKLABEL + set_config_with_override BOOL LUKS CMD_LUKS + set_config_with_override BOOL GPG CMD_GPG + set_config_with_override BOOL MDADM CMD_MDADM + set_config_with_override STRING MDADM_CONFIG CMD_MDADM_CONFIG + set_config_with_override BOOL ZFS CMD_ZFS + set_config_with_override BOOL MULTIPATH CMD_MULTIPATH + set_config_with_override BOOL FIRMWARE CMD_FIRMWARE + set_config_with_override STRING FIRMWARE_DIR CMD_FIRMWARE_DIR "/lib/firmware" + set_config_with_override STRING FIRMWARE_FILES CMD_FIRMWARE_FILES + set_config_with_override BOOL INTEGRATED_INITRAMFS CMD_INTEGRATED_INITRAMFS + set_config_with_override BOOL GENZIMAGE CMD_GENZIMAGE + set_config_with_override BOOL KEYMAP CMD_KEYMAP "yes" + set_config_with_override BOOL DOKEYMAPAUTO CMD_DOKEYMAPAUTO + set_config_with_override STRING BUSYBOX_CONFIG CMD_BUSYBOX_CONFIG + set_config_with_override BOOL INSTALL CMD_INSTALL "yes" BOOTDIR=`arch_replace "${BOOTDIR}"` BOOTDIR=${BOOTDIR%/} # Remove any trailing slash + MODPROBEDIR=${MODPROBEDIR%/} # Remove any trailing slash CACHE_DIR=`arch_replace "${CACHE_DIR}"` BUSYBOX_BINCACHE=`cache_replace "${BUSYBOX_BINCACHE}"` - DEVICE_MAPPER_BINCACHE=`cache_replace "${DEVICE_MAPPER_BINCACHE}"` LVM_BINCACHE=`cache_replace "${LVM_BINCACHE}"` + MDADM_BINCACHE=`cache_replace "${MDADM_BINCACHE}"` DMRAID_BINCACHE=`cache_replace "${DMRAID_BINCACHE}"` ISCSI_BINCACHE=`cache_replace "${ISCSI_BINCACHE}"` BLKID_BINCACHE=`cache_replace "${BLKID_BINCACHE}"` FUSE_BINCACHE=`cache_replace "${FUSE_BINCACHE}"` UNIONFS_FUSE_BINCACHE=`cache_replace "${UNIONFS_FUSE_BINCACHE}"` - + GPG_BINCACHE=`cache_replace "${GPG_BINCACHE}"` + DEFAULT_KERNEL_CONFIG=`arch_replace "${DEFAULT_KERNEL_CONFIG}"` BUSYBOX_CONFIG=`arch_replace "${BUSYBOX_CONFIG}"` BUSYBOX_BINCACHE=`arch_replace "${BUSYBOX_BINCACHE}"` - DEVICE_MAPPER_BINCACHE=`arch_replace "${DEVICE_MAPPER_BINCACHE}"` LVM_BINCACHE=`arch_replace "${LVM_BINCACHE}"` + MDADM_BINCACHE=`arch_replace "${MDADM_BINCACHE}"` DMRAID_BINCACHE=`arch_replace "${DMRAID_BINCACHE}"` ISCSI_BINCACHE=`arch_replace "${ISCSI_BINCACHE}"` BLKID_BINCACHE=`arch_replace "${BLKID_BINCACHE}"` FUSE_BINCACHE=`arch_replace "${FUSE_BINCACHE}"` UNIONFS_FUSE_BINCACHE=`arch_replace "${UNIONFS_FUSE_BINCACHE}"` + GPG_BINCACHE=`arch_replace "${GPG_BINCACHE}"` if [ -n "${CMD_BOOTLOADER}" ] then @@ -154,8 +170,8 @@ determine_real_args() { BOOTLOADER=`echo "${CMD_BOOTLOADER}" | cut -f1 -d:` fi fi - - if [ "${NO_KERNEL_SOURCES}" != "1" ] + + if [ "${KERNEL_SOURCES}" != "0" ] then if [ ! -d ${KERNEL_DIR} ] then @@ -165,11 +181,11 @@ determine_real_args() { if [ -z "${KERNCACHE}" ] then - if [ "${KERNEL_DIR}" = '' -a "${NO_KERNEL_SOURCES}" != "1" ] + if [ "${KERNEL_DIR}" = '' -a "${KERNEL_SOURCES}" != "0" ] then gen_die 'No kernel source directory!' fi - if [ ! -e "${KERNEL_DIR}" -a "${NO_KERNEL_SOURCES}" != "1" ] + if [ ! -e "${KERNEL_DIR}" -a "${KERNEL_SOURCES}" != "0" ] then gen_die 'No kernel source directory!' fi @@ -180,7 +196,7 @@ determine_real_args() { fi fi - # Special case: If --no-clean is specified on the command line, + # Special case: If --no-clean is specified on the command line, # imply --no-mrproper. if [ "${CMD_CLEAN}" != '' ] then @@ -189,12 +205,12 @@ determine_real_args() { MRPROPER=0 fi fi - + if [ -n "${MINKERNPACKAGE}" ] then mkdir -p `dirname ${MINKERNPACKAGE}` fi - + if [ -n "${MODULESPACKAGE}" ] then mkdir -p `dirname ${MODULESPACKAGE}` @@ -209,6 +225,6 @@ determine_real_args() { then INTEGRATED_INITRAMFS=0 fi - + get_KV }