Added a nice patch from John R. Graham <john_r_graham@mindspring.com> to allow all command line options to be configurable from within the genkernel.conf file. This is for bug #182616. This is genkernel 3.4.9_pre8 for testing.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@557 67a159dc-881f-0410-a524-ba9dfbe2cb84
cleanup-cruft
Chris Gianelloni 17 years ago
parent dcb5af3f6f
commit fba39b8f11

@ -2,6 +2,17 @@
# Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
# $Header: $ # $Header: $
07 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> alpha/config.sh,
gen_cmdline.sh, gen_determineargs.sh, gen_funcs.sh, gen_initramfs.sh,
gen_initrd.sh, gen_package.sh, genkernel, genkernel.conf, ia64/config.sh,
mips/config.sh, parisc/config.sh, parisc64/config.sh, ppc/config.sh,
ppc64/config.sh, sparc/config.sh, sparc64/config.sh, um/config.sh,
x86/config.sh, x86_64/config.sh, xen0/config.sh, xenU/config.sh:
Added a nice patch from John R. Graham <john_r_graham@mindspring.com> to
allow all command line options to be configurable from within the
genkernel.conf file. This is for bug #182616. This is genkernel 3.4.9_pre8
for testing.
07 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> 07 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org>
generic/initrd.scripts: generic/initrd.scripts:
Fixed the noload module code. Thanks to Mijail Fedorovich Fixed the noload module code. Thanks to Mijail Fedorovich

@ -1,20 +1,27 @@
#!/bin/bash #!/bin/bash
#
# Arch-specific options that normally shouldn't be changed.
#
KERNEL_MAKE_DIRECTIVE="boot" KERNEL_MAKE_DIRECTIVE="boot"
KERNEL_MAKE_DIRECTIVE_2="" KERNEL_MAKE_DIRECTIVE_2=""
KERNEL_BINARY="arch/alpha/boot/vmlinux.gz" KERNEL_BINARY="arch/alpha/boot/vmlinux.gz"
[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" COMPRESS_INITRD=yes
KERNEL_MAKE=make #
UTILS_MAKE=make # Arch-specific defaults that can be overridden in the config file or on the
# command line.
#
DEFAULT_MAKEOPTS="-j2"
KERNEL_CC=gcc DEFAULT_KERNEL_MAKE=make
KERNEL_AS=as DEFAULT_UTILS_MAKE=make
KERNEL_LD=ld
UTILS_CC=gcc DEFAULT_KERNEL_CC=gcc
UTILS_AS=as DEFAULT_KERNEL_AS=as
UTILS_LD=ld DEFAULT_KERNEL_LD=ld
COMPRESS_INITRD=yes DEFAULT_UTILS_CC=gcc
DEFAULT_UTILS_AS=as
DEFAULT_UTILS_LD=ld

@ -90,6 +90,7 @@ longusage() {
echo " initrd" echo " initrd"
echo " --luks Include LUKS support" echo " --luks Include LUKS support"
echo " --> 'emerge cryptsetup-luks' with USE=-dynamic" echo " --> 'emerge cryptsetup-luks' with USE=-dynamic"
echo " --no-busybox Do not include busybox in the initrd or initramfs."
echo " Internals" echo " Internals"
echo " --arch-override=<arch> Force to arch instead of autodetect" echo " --arch-override=<arch> Force to arch instead of autodetect"
echo " --cachedir=<dir> Override the default cache location" echo " --cachedir=<dir> Override the default cache location"
@ -192,8 +193,8 @@ parse_cmdline() {
print_info 2 "CMD_MOUNTBOOT: ${CMD_MOUNTBOOT}" print_info 2 "CMD_MOUNTBOOT: ${CMD_MOUNTBOOT}"
;; ;;
--bootdir=*) --bootdir=*)
BOOTDIR=`parse_opt "$*"` CMD_BOOTDIR=`parse_opt "$*"`
print_info 2 "BOOTDIR: ${BOOTDIR}" print_info 2 "CMD_BOOTDIR: ${CMD_BOOTDIR}"
;; ;;
--do-keymap-auto) --do-keymap-auto)
CMD_DOKEYMAPAUTO=1 CMD_DOKEYMAPAUTO=1
@ -235,8 +236,8 @@ parse_cmdline() {
print_info 2 "CMD_MDADM: $CMD_MDADM" print_info 2 "CMD_MDADM: $CMD_MDADM"
;; ;;
--no-busybox) --no-busybox)
CMD_NO_BUSYBOX=1 CMD_BUSYBOX=0
print_info 2 "CMD_NO_BUSYBOX: ${CMD_NO_BUSYBOX}" print_info 2 "CMD_BUSYBOX: ${CMD_BUSYBOX}"
;; ;;
--slowusb) --slowusb)
CMD_SLOWUSB=1 CMD_SLOWUSB=1

@ -61,139 +61,64 @@ get_KV() {
KERN_24=1 KERN_24=1
KV=${VER}.${PAT}.${SUB}${EXV} KV=${VER}.${PAT}.${SUB}${EXV}
fi fi
fi
if isTrue "${CMD_DISKLABEL}"
then
DISKLABEL=1
else
DISKLABEL=0
fi
if isTrue "${CMD_LUKS}"
then
LUKS=1
fi fi
} }
determine_real_args() { determine_real_args() {
if [ "${CMD_LOGFILE}" != '' ] print_info 4 "Resolving config file, command line, and arch default settings."
then
LOGFILE="${CMD_LOGFILE}" # Config File Command Line Arch Default
fi # ----------- ------------ ------------
set_config_with_override 2 DEBUGFILE CMD_DEBUGFILE
if [ "${CMD_MAKEOPTS}" != '' ] set_config_with_override 2 KERNEL_DIR CMD_KERNEL_DIR "${DEFAULT_KERNEL_SOURCE}"
then set_config_with_override 1 NO_KERNEL_SOURCES CMD_NO_KERNEL_SOURCES
MAKEOPTS="${CMD_MAKEOPTS}" set_config_with_override 2 KERNCACHE CMD_KERNCACHE
fi set_config_with_override 2 KNAME CMD_KNAME "genkernel"
if [ "${CMD_KERNELDIR}" != '' ] set_config_with_override 2 MAKEOPTS CMD_MAKEOPTS "$DEFAULT_MAKEOPTS"
then set_config_with_override 2 KERNEL_MAKE CMD_KERNEL_MAKE "$DEFAULT_KERNEL_MAKE"
KERNEL_DIR=${CMD_KERNELDIR} set_config_with_override 2 UTILS_MAKE CMD_UTILS_MAKE "$DEFAULT_UTILS_MAKE"
else set_config_with_override 2 KERNEL_CC CMD_KERNEL_CC "$DEFAULT_KERNEL_CC"
KERNEL_DIR=${DEFAULT_KERNEL_SOURCE} set_config_with_override 2 KERNEL_LD CMD_KERNEL_LD "$DEFAULT_KERNEL_LD"
fi 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"
if [ "${CMD_NO_KERNEL_SOURCES}" != "1" ] set_config_with_override 2 UTILS_LD CMD_UTILS_LD "$DEFAULT_UTILS_LD"
then set_config_with_override 2 UTILS_AS CMD_UTILS_AS "$DEFAULT_UTILS_AS"
if [ ! -d ${KERNEL_DIR} ]
then set_config_with_override 2 KERNEL_CROSS_COMPILE CMD_KERNEL_CROSS_COMPILE
gen_die "kernel source directory \"${KERNEL_DIR}\" was not found!" set_config_with_override 2 UTILS_CROSS_COMPILE CMD_UTILS_CROSS_COMPILE
fi set_config_with_override 2 BOOTDIR CMD_BOOTDIR "/boot"
fi
set_config_with_override 1 SPLASH CMD_SPLASH
if [ "${CMD_KERNCACHE}" != "" ] set_config_with_override 1 POSTCLEAR CMD_POSTCLEAR
then set_config_with_override 1 MRPROPER CMD_MRPROPER
if [ "${KERNEL_DIR}" = '' -a "${CMD_NO_KERNEL_SOURCES}" != "1" ] set_config_with_override 1 MENUCONFIG CMD_MENUCONFIG
then set_config_with_override 1 CLEAN CMD_CLEAN
gen_die 'No kernel source directory!'
fi set_config_with_override 2 MINKERNPACKAGE CMD_MINKERNPACKAGE
if [ ! -e "${KERNEL_DIR}" -a "${CMD_NO_KERNEL_SOURCES}" != "1" ] set_config_with_override 2 MODULESPACKAGE CMD_MODULESPACKAGE
then set_config_with_override 2 KERNCACHE CMD_KERNCACHE
gen_die 'No kernel source directory!' set_config_with_override 1 NOINITRDMODULES CMD_NOINITRDMODULES
fi set_config_with_override 2 INITRAMFS_OVERLAY CMD_INITRAMFS_OVERLAY
else set_config_with_override 1 MOUNTBOOT CMD_MOUNTBOOT
if [ "${KERNEL_DIR}" = '' ] set_config_with_override 1 BUILD_STATIC CMD_STATIC
then set_config_with_override 1 BUILD_INITRAMFS CMD_INITRAMFS
gen_die 'Kernel Cache specified but no kernel tree to verify against!' set_config_with_override 1 SAVE_CONFIG CMD_SAVE_CONFIG
fi set_config_with_override 1 SYMLINK CMD_SYMLINK
fi set_config_with_override 2 INSTALL_MOD_PATH CMD_INSTALL_MOD_PATH
set_config_with_override 1 OLDCONFIG CMD_OLDCONFIG
if [ "${CMD_KERNNAME}" != "" ] set_config_with_override 1 LVM CMD_LVM
then set_config_with_override 1 EVMS CMD_EVMS
KNAME=${CMD_KERNNAME} set_config_with_override 1 UNIONFS CMD_UNIONFS
else set_config_with_override 1 DMRAID CMD_DMRAID
KNAME="genkernel" set_config_with_override 1 BUSYBOX CMD_BUSYBOX "yes"
fi set_config_with_override 1 DEVFS CMD_UNDEFINED_CMD "no"
if [ "${CMD_KERNEL_MAKE}" != '' ] set_config_with_override 1 DISKLABEL CMD_DISKLABEL
then set_config_with_override 1 LUKS CMD_LUKS
KERNEL_MAKE="${CMD_KERNEL_MAKE}"
fi
if [ "${KERNEL_MAKE}" = '' ]
then
KERNEL_MAKE='make'
fi
if [ "${CMD_UTILS_MAKE}" != '' ]
then
UTILS_MAKE="${CMD_UTILS_MAKE}"
fi
if [ "${UTILS_MAKE}" = '' ]
then
UTILS_MAKE='make'
fi
if [ "${CMD_KERNEL_CC}" != '' ]
then
KERNEL_CC="${CMD_KERNEL_CC}"
fi
if [ "${CMD_KERNEL_LD}" != '' ]
then
KERNEL_LD="${CMD_KERNEL_LD}"
fi
if [ "${CMD_KERNEL_AS}" != '' ]
then
KERNEL_AS="${CMD_KERNEL_AS}"
fi
if [ "${CMD_KERNEL_CROSS_COMPILE}" != '' ]
then
KERNEL_CROSS_COMPILE="${CMD_KERNEL_CROSS_COMPILE}"
fi
if [ "${CMD_UTILS_CC}" != '' ]
then
UTILS_CC="${CMD_UTILS_CC}"
fi
if [ "${CMD_UTILS_LD}" != '' ]
then
UTILS_LD="${CMD_UTILS_LD}"
fi
if [ "${CMD_UTILS_AS}" != '' ]
then
UTILS_AS="${CMD_UTILS_AS}"
fi
if [ "${CMD_UTILS_CROSS_COMPILE}" != '' ]
then
UTILS_CROSS_COMPILE="${CMD_UTILS_CROSS_COMPILE}"
fi
if [ "${BOOTDIR}" != '' ]
then
BOOTDIR=`arch_replace "${BOOTDIR}"` BOOTDIR=`arch_replace "${BOOTDIR}"`
BOOTDIR=${BOOTDIR%/} # Remove any trailing slash BOOTDIR=${BOOTDIR%/} # Remove any trailing slash
else
BOOTDIR="/boot"
fi
CACHE_DIR=`arch_replace "${CACHE_DIR}"` CACHE_DIR=`arch_replace "${CACHE_DIR}"`
BUSYBOX_BINCACHE=`cache_replace "${BUSYBOX_BINCACHE}"` BUSYBOX_BINCACHE=`cache_replace "${BUSYBOX_BINCACHE}"`
@ -216,200 +141,66 @@ determine_real_args() {
UNIONFS_MODULES_BINCACHE=`arch_replace "${UNIONFS_MODULES_BINCACHE}"` UNIONFS_MODULES_BINCACHE=`arch_replace "${UNIONFS_MODULES_BINCACHE}"`
BLKID_BINCACHE=`arch_replace "${BLKID_BINCACHE}"` BLKID_BINCACHE=`arch_replace "${BLKID_BINCACHE}"`
if [ "${CMD_SPLASH}" != '' ]
then
SPLASH=${CMD_SPLASH}
fi
if isTrue ${SPLASH} if [ "${CMD_BOOTLOADER}" != '' ]
then
SPLASH=1
else
SPLASH=0
fi
if isTrue ${COMPRESS_INITRD}
then
COMPRESS_INITRD=1
else
COMPRESS_INITRD=0
fi
if isTrue ${CMD_POSTCLEAR}
then
POSTCLEAR=1
else
POSTCLEAR=0
fi
if [ "${CMD_MRPROPER}" != '' ]
then
MRPROPER="${CMD_MRPROPER}"
fi
if [ "${CMD_MENUCONFIG}" != '' ]
then
MENUCONFIG="${CMD_MENUCONFIG}"
fi
if [ "${CMD_CLEAN}" != '' ]
then
CLEAN="${CMD_CLEAN}"
if ! isTrue ${CLEAN}
then
MRPROPER=0
fi
fi
if [ "${CMD_MINKERNPACKAGE}" != '' ]
then
MINKERNPACKAGE="${CMD_MINKERNPACKAGE}"
mkdir -p `dirname ${MINKERNPACKAGE}`
fi
if [ "${CMD_MODULESPACKAGE}" != '' ]
then
MODULESPACKAGE="${CMD_MODULESPACKAGE}"
mkdir -p `dirname ${MODULESPACKAGE}`
fi
if [ "${CMD_KERNCACHE}" != '' ]
then
KERNCACHE="${CMD_KERNCACHE}"
mkdir -p `dirname ${KERNCACHE}`
fi
if [ "${CMD_NOINITRDMODULES}" != '' ]
then
NOINITRDMODULES="${CMD_NOINITRDMODULES}"
fi
if [ "${CMD_INITRAMFS_OVERLAY}" != '' ]
then
INITRAMFS_OVERLAY="${CMD_INITRAMFS_OVERLAY}"
fi
if [ "${CMD_MOUNTBOOT}" != '' ]
then then
MOUNTBOOT="${CMD_MOUNTBOOT}" BOOTLOADER="${CMD_BOOTLOADER}"
fi
if isTrue ${MOUNTBOOT} if [ "${CMD_BOOTLOADER}" != "${CMD_BOOTLOADER/:/}" ]
then then
MOUNTBOOT=1 BOOTFS=`echo "${CMD_BOOTLOADER}" | cut -f2- -d:`
else BOOTLOADER=`echo "${CMD_BOOTLOADER}" | cut -f1 -d:`
MOUNTBOOT=0
fi fi
if [ "${CMD_STATIC}" != '' ]
then
BUILD_STATIC=${CMD_STATIC}
fi fi
if isTrue ${BUILD_STATIC} if [ "${NO_KERNEL_SOURCES}" != "1" ]
then then
BUILD_STATIC=1 if [ ! -d ${KERNEL_DIR} ]
else
BUILD_STATIC=0
fi
if [ "${CMD_INITRAMFS}" != '' ]
then then
BUILD_INITRAMFS=${CMD_INITRAMFS} gen_die "kernel source directory \"${KERNEL_DIR}\" was not found!"
fi fi
if isTrue ${BUILD_INITRAMFS}
then
BUILD_INITRAMFS=1
else
BUILD_INITRAMFS=0
fi fi
if [ "${CMD_SAVE_CONFIG}" != '' ] if [ -z "${KERNCACHE}" ]
then then
SAVE_CONFIG="${CMD_SAVE_CONFIG}" if [ "${KERNEL_DIR}" = '' -a "${NO_KERNEL_SOURCES}" != "1" ]
fi
if isTrue "${SAVE_CONFIG}"
then then
SAVE_CONFIG=1 gen_die 'No kernel source directory!'
else
SAVE_CONFIG=0
fi fi
if [ ! -e "${KERNEL_DIR}" -a "${NO_KERNEL_SOURCES}" != "1" ]
if [ "${CMD_SYMLINK}" != '' ]
then then
SYMLINK="${CMD_SYMLINK}" gen_die 'No kernel source directory!'
fi fi
if isTrue "${SYMLINK}"
then
SYMLINK=1
else else
SYMLINK=0 if [ "${KERNEL_DIR}" = '' ]
fi
if [ "${CMD_INSTALL_MOD_PATH}" != '' ]
then
INSTALL_MOD_PATH="${CMD_INSTALL_MOD_PATH}"
fi
if [ "${CMD_BOOTLOADER}" != '' ]
then
BOOTLOADER="${CMD_BOOTLOADER}"
if [ "${CMD_BOOTLOADER}" != "${CMD_BOOTLOADER/:/}" ]
then then
BOOTFS=`echo "${CMD_BOOTLOADER}" | cut -f2- -d:` gen_die 'Kernel Cache specified but no kernel tree to verify against!'
BOOTLOADER=`echo "${CMD_BOOTLOADER}" | cut -f1 -d:`
fi
fi fi
if [ "${CMD_OLDCONFIG}" != '' ]
then
OLDCONFIG="${CMD_OLDCONFIG}"
fi fi
if isTrue "${OLDCONFIG}" # Special case: If --no-clean is specified on the command line,
# imply --no-mrproper.
if [ "${CMD_CLEAN}" != '' ]
then then
OLDCONFIG=1 if ! isTrue ${CLEAN}
else
OLDCONFIG=0
fi
if isTrue "${CMD_LVM}"
then then
LVM=1 MRPROPER=0
else
LVM=0
fi fi
if isTrue "${CMD_EVMS}"
then
EVMS=1
else
EVMS=0
fi fi
if isTrue "${CMD_UNIONFS}" if [ -n "${MINKERNPACKAGE}" ]
then then
UNIONFS=1 mkdir -p `dirname ${MINKERNPACKAGE}`
else
UNIONFS=0
fi fi
if isTrue "${CMD_NO_BUSYBOX}" if [ -n "${MODULESPACKAGE}" ]
then then
BUSYBOX=0 mkdir -p `dirname ${MODULESPACKAGE}`
else
BUSYBOX=1
fi fi
if isTrue "${CMD_DMRAID}" if [ -n "${KERNCACHE}" ]
then then
DMRAID=1 mkdir -p `dirname ${KERNCACHE}`
else
DMRAID=0
fi fi
if isTrue "${CMD_MDADM}" if isTrue "${CMD_MDADM}"

@ -139,13 +139,13 @@ print_info() {
if [ "${NEWLINE}" = '0' ] if [ "${NEWLINE}" = '0' ]
then then
if [ "${TODEBUGCACHE}" -eq 1 ]; then if [ "${TODEBUGCACHE}" -eq '1' ]; then
DEBUGCACHE="${DEBUGCACHE}${STR}" DEBUGCACHE="${DEBUGCACHE}${STR}"
else else
echo -ne "${STR}" >> ${LOGFILE} echo -ne "${STR}" >> ${LOGFILE}
fi fi
else else
if [ "${TODEBUGCACHE}" -eq 1 ]; then if [ "${TODEBUGCACHE}" -eq '1' ]; then
DEBUGCACHE="${DEBUGCACHE}${STR}"$'\n' DEBUGCACHE="${DEBUGCACHE}${STR}"$'\n'
else else
echo "${STR}" >> ${LOGFILE} echo "${STR}" >> ${LOGFILE}
@ -428,3 +428,86 @@ copy_image_with_preserve() {
fi fi
} }
#
# Helper function to allow command line arguments to override configuration
# file specified values and to apply defaults.
#
# Arguments:
# $1 Argument type:
# 1 Switch type arguments (e.g., --color / --no-color).
# 2 Value type arguments (e.g., --debuglevel=5).
# $2 Config file variable name.
# $3 Command line variable name.
# $4 Default. If both the config file variable and the command line
# option are not present, then the config file variable is set to
# this default value. Optional.
#
# The order of priority of these three sources (highest first) is:
# Command line, which overrides
# Config file (/etc/genkernel.conf), which overrides
# Default.
#
# Arguments $2 and $3 are variable *names*, not *values*. This function uses
# various forms of indirection to access the values.
#
# For switch type arguments, all forms of "True" are converted to a numeric 1
# and all forms of "False" (everything else, really) to a numeric 0.
#
# - JRG
#
set_config_with_override() {
local VarType=$1
local CfgVar=$2
local OverrideVar=$3
local Default=$4
local Result
#
# Syntax check the function arguments.
#
case "$VarType" in
1|2)
;;
*)
gen_die "Illegal variable type \"$VarType\" passed to set_config_with_override()."
;;
esac
if [ -n "${!OverrideVar}" ]
then
Result=${!OverrideVar}
if [ -n "${!CfgVar}" ]
then
print_info 5 " $CfgVar overridden on command line to \"$Result\"."
else
print_info 5 " $CfgVar set on command line to \"$Result\"."
fi
else
if [ -n "${!CfgVar}" ]
then
Result=${!CfgVar}
print_info 5 " $CfgVar set in config file to \"${Result}\"."
else
if [ -n "$Default" ]
then
Result=${Default}
print_info 5 " $CfgVar defaulted to \"${Result}\"."
else
print_info 5 " $CfgVar not set."
fi
fi
fi
if [ "$VarType" -eq "1" ]
then
if isTrue "${Result}"
then
Result=1
else
Result=0
fi
fi
eval ${CfgVar}=${Result}
}

@ -456,7 +456,7 @@ create_initramfs() {
append_data 'evms' "${EVMS}" append_data 'evms' "${EVMS}"
append_data 'mdadm' "${MDADM}" append_data 'mdadm' "${MDADM}"
if [ "${NOINITRDMODULES}" = '' ] if [ "${NOINITRDMODULES}" -eq '0' ]
then then
append_data 'modules' append_data 'modules'
else else
@ -480,7 +480,7 @@ create_initramfs() {
# Pegasos hack for merging the initramfs into the kernel at compile time # Pegasos hack for merging the initramfs into the kernel at compile time
cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/arch/powerpc/boot/ramdisk.image.gz && cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/arch/powerpc/boot/ramdisk.image.gz &&
rm ${TMPDIR}/initramfs-${KV} rm ${TMPDIR}/initramfs-${KV}
elif [ ${BUILD_INITRAMFS} -eq 1 ] elif [ ${BUILD_INITRAMFS} -eq '1' ]
then then
# Mips also mimics Pegasos to merge the initramfs into the kernel # Mips also mimics Pegasos to merge the initramfs into the kernel
cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/initramfs.cpio.gz cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/initramfs.cpio.gz

@ -59,7 +59,7 @@ create_base_initrd_sys() {
# SGI LiveCDs need the following binary (no better place for it than here) # SGI LiveCDs need the following binary (no better place for it than here)
# getdvhoff is a DEPEND of genkernel, so it *should* exist # getdvhoff is a DEPEND of genkernel, so it *should* exist
if [ ${BUILD_INITRAMFS} -eq 1 ] if [ ${BUILD_INITRAMFS} -eq '1' ]
then then
[ -e /usr/lib/getdvhoff/getdvhoff ] \ [ -e /usr/lib/getdvhoff/getdvhoff ] \
&& cp /usr/lib/getdvhoff/getdvhoff ${TEMP}/initrd-temp/bin \ && cp /usr/lib/getdvhoff/getdvhoff ${TEMP}/initrd-temp/bin \
@ -111,7 +111,7 @@ create_base_initrd_sys() {
fi fi
# DMRAID # DMRAID
if [ "${DMRAID}" = '1' ] if [ "${DMRAID}" -eq '1' ]
then then
print_info 1 'DMRAID: Adding support (compiling binaries)...' print_info 1 'DMRAID: Adding support (compiling binaries)...'
compile_dmraid compile_dmraid
@ -120,7 +120,7 @@ create_base_initrd_sys() {
fi fi
# LVM # LVM
if [ "${LVM}" = '1' ] if [ "${LVM}" -eq '1' ]
then then
if [ -e '/sbin/lvm' ] && LC_ALL="C" ldd /sbin/lvm|grep -q 'not a dynamic executable'; if [ -e '/sbin/lvm' ] && LC_ALL="C" ldd /sbin/lvm|grep -q 'not a dynamic executable';
then then
@ -156,7 +156,7 @@ create_base_initrd_sys() {
fi fi
# EVMS # EVMS
if [ "${EVMS}" = '1' ] if [ "${EVMS}" -eq '1' ]
then then
if [ -e '/sbin/evms_activate' ] if [ -e '/sbin/evms_activate' ]
then then
@ -348,7 +348,7 @@ create_initrd() {
print_info 1 "initrd: >> Initializing..." print_info 1 "initrd: >> Initializing..."
create_base_initrd_sys create_base_initrd_sys
if [ "${NOINITRDMODULES}" = '' ] if [ "${NOINITRDMODULES}" -eq '0' ]
then then
print_info 1 " >> Copying modules..." print_info 1 " >> Copying modules..."
create_initrd_modules create_initrd_modules

@ -1,17 +1,16 @@
#!/bin/bash #!/bin/bash
gen_minkernpackage() gen_minkernpackage() {
{
print_info 1 'Creating minimal kernel package' print_info 1 'Creating minimal kernel package'
rm -rf "${TEMP}/minkernpackage" > /dev/null 2>&1 rm -rf "${TEMP}/minkernpackage" > /dev/null 2>&1
mkdir "${TEMP}/minkernpackage" || gen_die 'Could not make a directory for the kernel package!' mkdir "${TEMP}/minkernpackage" || gen_die 'Could not make a directory for the kernel package!'
if [ "${CMD_KERNCACHE}" != "" ] if [ "${KERNCACHE}" != "" ]
then then
/bin/tar -xj -C ${TEMP}/minkernpackage -f ${CMD_KERNCACHE} kernel-${ARCH}-${KV} /bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} kernel-${ARCH}-${KV}
/bin/tar -xj -C ${TEMP}/minkernpackage -f ${CMD_KERNCACHE} config-${ARCH}-${KV} /bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} config-${ARCH}-${KV}
if [ "${ENABLE_PEGASOS_HACKS}" = 'yes' ] if [ "${ENABLE_PEGASOS_HACKS}" = 'yes' ]
then then
/bin/tar -xj -C ${TEMP}/minkernpackage -f ${CMD_KERNCACHE} kernelz-${ARCH}-${KV} /bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} kernelz-${ARCH}-${KV}
fi fi
else else
cd "${KERNEL_DIR}" cd "${KERNEL_DIR}"
@ -33,9 +32,9 @@ gen_minkernpackage()
fi fi
fi fi
if [ "${CMD_KERNCACHE}" != "" ] if [ "${KERNCACHE}" != "" ]
then then
/bin/tar -xj -C ${TEMP}/minkernpackage -f ${CMD_KERNCACHE} System.map-${ARCH}-${KV} /bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} System.map-${ARCH}-${KV}
else 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_DIR}/System.map" "${TEMP}/minkernpackage/System.map-${ARCH}-${KV}" || gen_die 'Could not copy System.map for the kernel package!';
fi fi
@ -44,8 +43,8 @@ gen_minkernpackage()
/bin/tar -jcpf ${MINKERNPACKAGE} * || gen_die 'Could not compress the kernel package!' /bin/tar -jcpf ${MINKERNPACKAGE} * || gen_die 'Could not compress the kernel package!'
cd "${TEMP}" && rm -rf "${TEMP}/minkernpackage" > /dev/null 2>&1 cd "${TEMP}" && rm -rf "${TEMP}/minkernpackage" > /dev/null 2>&1
} }
gen_modulespackage()
{ gen_modulespackage() {
print_info 1 'Creating modules package' print_info 1 'Creating modules package'
rm -rf "${TEMP}/modulespackage" > /dev/null 2>&1 rm -rf "${TEMP}/modulespackage" > /dev/null 2>&1
mkdir "${TEMP}/modulespackage" || gen_die 'Could not make a directory for the kernel package!' mkdir "${TEMP}/modulespackage" || gen_die 'Could not make a directory for the kernel package!'
@ -139,7 +138,7 @@ gen_kerncache_extract_config()
gen_kerncache_is_valid() gen_kerncache_is_valid()
{ {
KERNCACHE_IS_VALID=0 KERNCACHE_IS_VALID=0
if [ "${CMD_NO_KERNEL_SOURCES}" = '1' ] if [ "${NO_KERNEL_SOURCES}" = '1' ]
then then
BUILD_KERNEL=0 BUILD_KERNEL=0

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
PATH="/bin:/usr/bin:/sbin:/usr/sbin" PATH="/bin:/usr/bin:/sbin:/usr/sbin"
GK_V='3.4.9_pre7' GK_V='3.4.9_pre8'
# Set the default for TMPDIR. May be modified by genkernel.conf or the # Set the default for TMPDIR. May be modified by genkernel.conf or the
# --tempdir command line option. # --tempdir command line option.
@ -84,7 +84,7 @@ do
done done
# Check if no action is specified... # Check if no action is specified...
if [ "${BUILD_KERNEL}" -eq 0 -a "${BUILD_INITRD}" -eq 0 ] if [ "${BUILD_KERNEL}" -eq '0' -a "${BUILD_INITRD}" -eq '0' ]
then then
usage usage
exit 1 exit 1
@ -212,7 +212,7 @@ then
gen_kerncache_is_valid gen_kerncache_is_valid
fi fi
if [ ${BUILD_KERNEL} -eq 1 -a "${KERNCACHE_IS_VALID}" == "0" ] if [ ${BUILD_KERNEL} -eq '1' -a "${KERNCACHE_IS_VALID}" == "0" ]
then then
# Configure kernel # Configure kernel
config_kernel config_kernel
@ -229,17 +229,17 @@ then
# KV may have changed due to the configuration # KV may have changed due to the configuration
get_KV get_KV
# Compile kernel; If using --genzimage, or building a mips kernel, skip compile # Compile kernel; If using --genzimage, or building a mips kernel, skip
# till after initrd/initramfs is done # compile until after initrd/initramfs is done
[ "${ENABLE_PEGASOS_HACKS}" != 'yes' -a ${BUILD_INITRAMFS} -eq 0 ] && compile_kernel [ "${ENABLE_PEGASOS_HACKS}" != 'yes' -a ${BUILD_INITRAMFS} -eq '0' ] && compile_kernel
# Compile modules # Compile modules
if [ ${BUILD_MODULES} -eq 1 -a ${BUILD_STATIC} -eq 0 ] if [ ${BUILD_MODULES} -eq '1' -a ${BUILD_STATIC} -eq '0' ]
then then
compile_modules compile_modules
fi fi
if [ ${SAVE_CONFIG} -eq 1 ] if [ ${SAVE_CONFIG} -eq '1' ]
then then
print_info 1 "Copying config for successful build to /etc/kernels/kernel-config-${ARCH}-${KV}" print_info 1 "Copying config for successful build to /etc/kernels/kernel-config-${ARCH}-${KV}"
[ ! -e '/etc/kernels' ] && mkdir -p /etc/kernels [ ! -e '/etc/kernels' ] && mkdir -p /etc/kernels
@ -264,11 +264,10 @@ fi
if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ] if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ]
then then
[ ${BUILD_STATIC} -eq 0 ] && gen_kerncache_extract_modules [ ${BUILD_STATIC} -eq '0' ] && gen_kerncache_extract_modules
gen_kerncache_extract_config gen_kerncache_extract_config
fi fi
# Run callback # Run callback
if [ "${CMD_CALLBACK}" != "" ] if [ "${CMD_CALLBACK}" != "" ]
then then
@ -279,13 +278,13 @@ then
CALLBACK_COUNT=0 CALLBACK_COUNT=0
trap "CALLBACK_ESCAPE=1" TERM KILL INT QUIT ABRT trap "CALLBACK_ESCAPE=1" TERM KILL INT QUIT ABRT
while [[ ${CALLBACK_ESCAPE} -eq 0 && ${CALLBACK_COUNT} -lt 5 ]] while [[ ${CALLBACK_ESCAPE} -eq '0' && ${CALLBACK_COUNT} -lt 5 ]]
do do
sleep 1; echo -n '.'; sleep 1; echo -n '.';
let CALLBACK_COUNT=${CALLBACK_COUNT}+1 let CALLBACK_COUNT=${CALLBACK_COUNT}+1
done done
if [ "${CALLBACK_ESCAPE}" -eq 0 ] if [ "${CALLBACK_ESCAPE}" -eq '0' ]
then then
echo echo
echo echo

@ -5,7 +5,7 @@
# with the internal settings being least important, configuration file # with the internal settings being least important, configuration file
# settings next, and command line options being most important. # settings next, and command line options being most important.
# ===========GENKERNEL BASIC CONFIGURATION============= # =========Common Command Line Option Defaults=========
# Run 'make oldconfig' before compiling this kernel? # Run 'make oldconfig' before compiling this kernel?
# If set to "yes", also suppresses the fetch of the kernel .config file from # If set to "yes", also suppresses the fetch of the kernel .config file from
@ -53,6 +53,57 @@ USECOLOR="yes"
# argument is: <number of processors>*<number of cores per processor>+1 # argument is: <number of processors>*<number of cores per processor>+1
# MAKEOPTS="-j2" # MAKEOPTS="-j2"
# Add in LVM support from static binaries if they exist on the system, or
# compile static LVM binaries if static ones do not exist.
# LVM="no"
# Add in EVMS support from static binaries if they exist on the system: you
# should run "emerge evms" first.
# EVMS="no"
# UnionFS support. Under active development. Do not use unless you are working
# on developing this feature.
# UNIONFS="no"
# Add DMRAID support.
# DMRAID="no"
# Include (or suppresses the inclusion of) busybox in the initrd or initramfs.
# If included, busybox is rebuilt if the cached copy is out of date,
# BUSYBOX="yes"
# =========Low Level Compile Settings=========
#
# GNU Make to use for kernel. See also the --kernel-make command line option.
# KERNEL_MAKE="make"
# Compiler to use for the kernel (e.g. distcc). See also the --kernel-cc
# command line option.
# KERNEL_CC="gcc"
# Assembler to use for the kernel. See also the --kernel-as command line
# option.
# KERNEL_AS="as"
# Linker to use for the kernel. See also the --kernel-ld command line option.
# KERNEL_LD="ld"
# GNU Make to use for the utilities. See also the --utils-make command line
# option.
# UTILS_MAKE="make"
# Compiler to use for the utilities (e.g. distcc). See also the --utils-cc
# command line option.
# UTILS_CC="gcc"
# Assembler to use for the utilities. See also the --utils-as command line
# option.
# UTILS_AS="as"
# Linker to use for the utilities. See also the --utils-ld command line
# option.
# UTILS_LD="ld"
# =========GENKERNEL LOCATION CONFIGURATION============ # =========GENKERNEL LOCATION CONFIGURATION============
# Variables: # Variables:
# %%ARCH%% - Final determined architecture # %%ARCH%% - Final determined architecture

@ -1,20 +1,27 @@
#!/bin/bash #!/bin/bash
#
# Arch-specific options that normally shouldn't be changed.
#
KERNEL_MAKE_DIRECTIVE="" KERNEL_MAKE_DIRECTIVE=""
KERNEL_MAKE_DIRECTIVE_2="" KERNEL_MAKE_DIRECTIVE_2=""
KERNEL_BINARY="vmlinux.gz" KERNEL_BINARY="vmlinux.gz"
[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" COMPRESS_INITRD=yes
KERNEL_MAKE=make #
UTILS_MAKE=make # Arch-specific defaults that can be overridden in the config file or on the
# command line.
#
DEFAULT_MAKEOPTS="-j2"
KERNEL_CC=gcc DEFAULT_KERNEL_MAKE=make
KERNEL_AS=as DEFAULT_UTILS_MAKE=make
KERNEL_LD=ld
UTILS_CC=gcc DEFAULT_KERNEL_CC=gcc
UTILS_AS=as DEFAULT_KERNEL_AS=as
UTILS_LD=ld DEFAULT_KERNEL_LD=ld
COMPRESS_INITRD=yes DEFAULT_UTILS_CC=gcc
DEFAULT_UTILS_AS=as
DEFAULT_UTILS_LD=ld

@ -1,17 +1,12 @@
#!/bin/bash #!/bin/bash
# Kernel Build Info #
KERNEL_MAKE=make # Arch-specific options that normally shouldn't be changed.
#
KERNEL_MAKE_DIRECTIVE="vmlinux" KERNEL_MAKE_DIRECTIVE="vmlinux"
KERNEL_MAKE_DIRECTIVE_2="" KERNEL_MAKE_DIRECTIVE_2=""
KERNEL_BINARY="./vmlinux" KERNEL_BINARY="./vmlinux"
# Utils Build Info
UTILS_MAKE=make
UTILS_CC=gcc
UTILS_AS=as
UTILS_LD=ld
# Initrd/Initramfs Options # Initrd/Initramfs Options
COMPRESS_INITRD="yes" COMPRESS_INITRD="yes"
USECOLOR="yes" USECOLOR="yes"
@ -24,3 +19,14 @@ DISKLABEL=0
# genkernel on mips is only used for LiveCDs && netboots. Catalyst # genkernel on mips is only used for LiveCDs && netboots. Catalyst
# will know where to get the kernels at. # will know where to get the kernels at.
CMD_NOINSTALL=1 CMD_NOINSTALL=1
#
# Arch-specific defaults that can be overridden in the config file or on the
# command line.
#
DEFAULT_KERNEL_MAKE=make
DEFAULT_UTILS_MAKE=make
DEFAULT_UTILS_CC=gcc
DEFAULT_UTILS_AS=as
DEFAULT_UTILS_LD=ld

@ -1,20 +1,27 @@
#!/bin/bash #!/bin/bash
#
# Arch-specific options that normally shouldn't be changed.
#
KERNEL_MAKE_DIRECTIVE="vmlinux" KERNEL_MAKE_DIRECTIVE="vmlinux"
KERNEL_MAKE_DIRECTIVE_2="" KERNEL_MAKE_DIRECTIVE_2=""
KERNEL_BINARY="vmlinux" KERNEL_BINARY="vmlinux"
[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" COMPRESS_INITRD=yes
KERNEL_MAKE=make #
UTILS_MAKE=make # Arch-specific defaults that can be overridden in the config file or on the
# command line.
#
DEFAULT_MAKEOPTS="-j2"
KERNEL_CC=gcc DEFAULT_KERNEL_MAKE=make
KERNEL_AS=as DEFAULT_UTILS_MAKE=make
KERNEL_LD=ld
UTILS_CC=gcc DEFAULT_KERNEL_CC=gcc
UTILS_AS=as DEFAULT_KERNEL_AS=as
UTILS_LD=ld DEFAULT_KERNEL_LD=ld
COMPRESS_INITRD=yes DEFAULT_UTILS_CC=gcc
DEFAULT_UTILS_AS=as
DEFAULT_UTILS_LD=ld

@ -1,20 +1,27 @@
#!/bin/bash #!/bin/bash
#
# Arch-specific options that normally shouldn't be changed.
#
KERNEL_MAKE_DIRECTIVE="vmlinux" KERNEL_MAKE_DIRECTIVE="vmlinux"
KERNEL_MAKE_DIRECTIVE_2="" KERNEL_MAKE_DIRECTIVE_2=""
KERNEL_BINARY="vmlinux" KERNEL_BINARY="vmlinux"
[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" COMPRESS_INITRD=yes
KERNEL_MAKE=make #
UTILS_MAKE=make # Arch-specific defaults that can be overridden in the config file or on the
# command line.
#
DEFAULT_MAKEOPTS="-j2"
KERNEL_CC=gcc DEFAULT_KERNEL_MAKE=make
KERNEL_AS=as DEFAULT_UTILS_MAKE=make
KERNEL_LD=ld
UTILS_CC=gcc DEFAULT_KERNEL_CC=gcc
UTILS_AS=as DEFAULT_KERNEL_AS=as
UTILS_LD=ld DEFAULT_KERNEL_LD=ld
COMPRESS_INITRD=yes DEFAULT_UTILS_CC=gcc
DEFAULT_UTILS_AS=as
DEFAULT_UTILS_LD=ld

@ -1,19 +1,26 @@
#!/bin/bash #!/bin/bash
#
# Arch-specific options that normally shouldn't be changed.
#
KERNEL_MAKE_DIRECTIVE="vmlinux" KERNEL_MAKE_DIRECTIVE="vmlinux"
KERNEL_BINARY="vmlinux" KERNEL_BINARY="vmlinux"
[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" COMPRESS_INITRD=yes
KERNEL_MAKE=make #
UTILS_MAKE=make # Arch-specific defaults that can be overridden in the config file or on the
# command line.
#
DEFAULT_MAKEOPTS="-j2"
KERNEL_CC=gcc DEFAULT_KERNEL_MAKE=make
KERNEL_AS=as DEFAULT_UTILS_MAKE=make
KERNEL_LD=ld
UTILS_CC=gcc DEFAULT_KERNEL_CC=gcc
UTILS_AS=as DEFAULT_KERNEL_AS=as
UTILS_LD=ld DEFAULT_KERNEL_LD=ld
COMPRESS_INITRD=yes DEFAULT_UTILS_CC=gcc
DEFAULT_UTILS_AS=as
DEFAULT_UTILS_LD=ld

@ -1,19 +1,26 @@
#!/bin/bash #!/bin/bash
#
# Arch-specific options that normally shouldn't be changed.
#
KERNEL_MAKE_DIRECTIVE="vmlinux" KERNEL_MAKE_DIRECTIVE="vmlinux"
KERNEL_BINARY="vmlinux" KERNEL_BINARY="vmlinux"
[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" COMPRESS_INITRD=yes
KERNEL_MAKE=make #
UTILS_MAKE=make # Arch-specific defaults that can be overridden in the config file or on the
# command line.
#
DEFAULT_MAKEOPTS="-j2"
KERNEL_CC=gcc DEFAULT_KERNEL_MAKE=make
KERNEL_AS=as DEFAULT_UTILS_MAKE=make
KERNEL_LD=ld
UTILS_CC=gcc DEFAULT_KERNEL_CC=gcc
UTILS_AS=as DEFAULT_KERNEL_AS=as
UTILS_LD=ld DEFAULT_KERNEL_LD=ld
COMPRESS_INITRD=yes DEFAULT_UTILS_CC=gcc
DEFAULT_UTILS_AS=as
DEFAULT_UTILS_LD=ld

@ -1,19 +1,26 @@
#!/bin/bash #!/bin/bash
#
# Arch-specific options that normally shouldn't be changed.
#
KERNEL_MAKE_DIRECTIVE="vmlinux" KERNEL_MAKE_DIRECTIVE="vmlinux"
KERNEL_MAKE_DIRECTIVE_2="" KERNEL_MAKE_DIRECTIVE_2=""
KERNEL_BINARY="vmlinux" KERNEL_BINARY="vmlinux"
[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j1" COMPRESS_INITRD=yes
USECOLOR="no"
KERNEL_MAKE=make #
UTILS_MAKE=make # Arch-specific defaults that can be overridden in the config file or on the
# command line.
#
DEFAULT_MAKEOPTS="-j1"
KERNEL_CC=gcc DEFAULT_KERNEL_MAKE=make
DEFAULT_UTILS_MAKE=make
UTILS_CC=gcc DEFAULT_KERNEL_CC=gcc
UTILS_AS=as
UTILS_LD=ld
COMPRESS_INITRD=yes DEFAULT_UTILS_CC=gcc
USECOLOR="no" DEFAULT_UTILS_AS=as
DEFAULT_UTILS_LD=ld

@ -1,21 +1,28 @@
#!/bin/bash #!/bin/bash
#
# Arch-specific options that normally shouldn't be changed.
#
KERNEL_MAKE_DIRECTIVE="vmlinux" KERNEL_MAKE_DIRECTIVE="vmlinux"
KERNEL_MAKE_DIRECTIVE_2="image" KERNEL_MAKE_DIRECTIVE_2="image"
KERNEL_BINARY="arch/sparc64/boot/image" KERNEL_BINARY="arch/sparc64/boot/image"
[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" COMPRESS_INITRD=yes
USECOLOR="no"
KERNEL_MAKE=make #
UTILS_MAKE=make # Arch-specific defaults that can be overridden in the config file or on the
# command line.
#
DEFAULT_MAKEOPTS="-j2"
KERNEL_CC=sparc64-linux-gcc DEFAULT_KERNEL_MAKE=make
#KERNEL_AS=as DEFAULT_UTILS_MAKE=make
#KERNEL_LD=ld
UTILS_CC=gcc DEFAULT_KERNEL_CC=sparc64-linux-gcc
UTILS_AS=as #DEFAULT_KERNEL_AS=as
UTILS_LD=ld #DEFAULT_KERNEL_LD=ld
COMPRESS_INITRD=yes DEFAULT_UTILS_CC=gcc
USECOLOR="no" DEFAULT_UTILS_AS=as
DEFAULT_UTILS_LD=ld

@ -1,21 +1,28 @@
#!/bin/bash #!/bin/bash
#
# Arch-specific options that normally shouldn't be changed.
#
KERNEL_MAKE_DIRECTIVE="linux" KERNEL_MAKE_DIRECTIVE="linux"
KERNEL_MAKE_DIRECTIVE_2="" KERNEL_MAKE_DIRECTIVE_2=""
KERNEL_BINARY="linux" KERNEL_BINARY="linux"
[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" COMPRESS_INITRD=yes
ARCH_HAVENOPREPARE=yes
KERNEL_MAKE="make ARCH=um" #
UTILS_MAKE=make # Arch-specific defaults that can be overridden in the config file or on the
# command line.
#
DEFAULT_MAKEOPTS="-j2"
KERNEL_CC=gcc DEFAULT_KERNEL_MAKE="make ARCH=um"
KERNEL_AS=as DEFAULT_UTILS_MAKE=make
KERNEL_LD=ld
UTILS_CC=gcc DEFAULT_KERNEL_CC=gcc
UTILS_AS=as DEFAULT_KERNEL_AS=as
UTILS_LD=ld DEFAULT_KERNEL_LD=ld
COMPRESS_INITRD=yes DEFAULT_UTILS_CC=gcc
ARCH_HAVENOPREPARE=yes DEFAULT_UTILS_AS=as
DEFAULT_UTILS_LD=ld

@ -1,20 +1,27 @@
#!/bin/bash #!/bin/bash
#
# Arch-specific options that normally shouldn't be changed.
#
KERNEL_MAKE_DIRECTIVE="bzImage" KERNEL_MAKE_DIRECTIVE="bzImage"
KERNEL_MAKE_DIRECTIVE_2="" KERNEL_MAKE_DIRECTIVE_2=""
KERNEL_BINARY="arch/i386/boot/bzImage" KERNEL_BINARY="arch/i386/boot/bzImage"
[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" COMPRESS_INITRD=yes
KERNEL_MAKE=make #
UTILS_MAKE=make # Arch-specific defaults that can be overridden in the config file or on the
# command line.
#
DEFAULT_MAKEOPTS="-j2"
KERNEL_CC=gcc DEFAULT_KERNEL_MAKE=make
KERNEL_AS=as DEFAULT_UTILS_MAKE=make
KERNEL_LD=ld
UTILS_CC=gcc DEFAULT_KERNEL_CC=gcc
UTILS_AS=as DEFAULT_KERNEL_AS=as
UTILS_LD=ld DEFAULT_KERNEL_LD=ld
COMPRESS_INITRD=yes DEFAULT_UTILS_CC=gcc
DEFAULT_UTILS_AS=as
DEFAULT_UTILS_LD=ld

@ -1,20 +1,27 @@
#!/bin/bash #!/bin/bash
#
# Arch-specific options that normally shouldn't be changed.
#
KERNEL_MAKE_DIRECTIVE="bzImage" KERNEL_MAKE_DIRECTIVE="bzImage"
KERNEL_MAKE_DIRECTIVE_2="" KERNEL_MAKE_DIRECTIVE_2=""
KERNEL_BINARY="arch/x86_64/boot/bzImage" KERNEL_BINARY="arch/x86_64/boot/bzImage"
[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" COMPRESS_INITRD=yes
KERNEL_MAKE=make #
UTILS_MAKE=make # Arch-specific defaults that can be overridden in the config file or on the
# command line.
#
DEFAULT_MAKEOPTS="-j2"
KERNEL_CC=gcc DEFAULT_KERNEL_MAKE=make
KERNEL_AS=as DEFAULT_UTILS_MAKE=make
KERNEL_LD=ld
UTILS_CC=gcc DEFAULT_KERNEL_CC=gcc
UTILS_AS=as DEFAULT_KERNEL_AS=as
UTILS_LD=ld DEFAULT_KERNEL_LD=ld
COMPRESS_INITRD=yes DEFAULT_UTILS_CC=gcc
DEFAULT_UTILS_AS=as
DEFAULT_UTILS_LD=ld

@ -1,20 +1,27 @@
#!/bin/bash #!/bin/bash
#
# Arch-specific options that normally shouldn't be changed.
#
KERNEL_MAKE_DIRECTIVE="" KERNEL_MAKE_DIRECTIVE=""
KERNEL_MAKE_DIRECTIVE_2="" KERNEL_MAKE_DIRECTIVE_2=""
KERNEL_BINARY="vmlinuz" KERNEL_BINARY="vmlinuz"
[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" COMPRESS_INITRD=yes
KERNEL_MAKE="make ARCH=xen" #
UTILS_MAKE=make # Arch-specific defaults that can be overridden in the config file or on the
# command line.
#
DEFAULT_MAKEOPTS="-j2"
KERNEL_CC=gcc DEFAULT_KERNEL_MAKE="make ARCH=xen"
KERNEL_AS=as DEFAULT_UTILS_MAKE=make
KERNEL_LD=ld
UTILS_CC=gcc DEFAULT_KERNEL_CC=gcc
UTILS_AS=as DEFAULT_KERNEL_AS=as
UTILS_LD=ld DEFAULT_KERNEL_LD=ld
COMPRESS_INITRD=yes DEFAULT_UTILS_CC=gcc
DEFAULT_UTILS_AS=as
DEFAULT_UTILS_LD=ld

@ -1,20 +1,28 @@
#!/bin/bash #!/bin/bash
#
# Arch-specific options that normally shouldn't be changed.
#
KERNEL_MAKE_DIRECTIVE="" KERNEL_MAKE_DIRECTIVE=""
KERNEL_MAKE_DIRECTIVE_2="" KERNEL_MAKE_DIRECTIVE_2=""
KERNEL_BINARY="vmlinuz" KERNEL_BINARY="vmlinuz"
[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" COMPRESS_INITRD=yes
KERNEL_MAKE="make ARCH=xen" #
UTILS_MAKE=make # Arch-specific defaults that can be overridden in the config file or on the
# command line.
#
DEFAULT_MAKEOPTS="-j2"
KERNEL_CC=gcc DEFAULT_KERNEL_MAKE="make ARCH=xen"
KERNEL_AS=as DEFAULT_UTILS_MAKE=make
KERNEL_LD=ld
UTILS_CC=gcc DEFAULT_KERNEL_CC=gcc
UTILS_AS=as DEFAULT_KERNEL_AS=as
UTILS_LD=ld DEFAULT_KERNEL_LD=ld
DEFAULT_UTILS_CC=gcc
DEFAULT_UTILS_AS=as
DEFAULT_UTILS_LD=ld
COMPRESS_INITRD=yes

Loading…
Cancel
Save