print_info 1 "${util}: >> Applying patches..."
for i in ${GK_SHARE}/patches/${util}/${version}/*{diff,patch}
do
+ [ -f "${i}" ] || continue
patch_success=0
for j in `seq 0 5`
do
break
fi
done
- if [ ${patch_success} != 1 ]
+ if [ ${patch_success} -eq 1 ]
then
+ print_info 1 " - `basename ${i}`"
+ else
gen_die "could not apply patch ${i} for ${util}-${version}"
fi
done
local target=${1}
local argstype=${2}
- if [ "${argstype}" = 'kernel' ] || [ "${argstype}" = 'runtask' ]
- then
- export_kernel_args
- MAKE=${KERNEL_MAKE}
- elif [ "${2}" = 'utils' ]
- then
- export_utils_args
- MAKE=${UTILS_MAKE}
- fi
case "${argstype}" in
- kernel) ARGS="`compile_kernel_args`" ;;
+ kernel|kernelruntask)
+ export_kernel_args
+ MAKE=${KERNEL_MAKE}
+ ;;
+ utils)
+ export_utils_args
+ MAKE=${UTILS_MAKE}
+ ;;
+ esac
+
+ case "${argstype}" in
+ kernel|kernelruntask) ARGS="`compile_kernel_args`" ;;
utils) ARGS="`compile_utils_args`" ;;
- *) ARGS="" ;; # includes runtask
+ *) ARGS="" ;;
esac
shift 2
# the eval usage is needed in the next set of code
# as ARGS can contain spaces and quotes, eg:
# ARGS='CC="ccache gcc"'
- if [ "${argstype}" == 'runtask' ]
+ if [ "${argstype}" == 'kernelruntask' ]
then
- print_info 2 "COMMAND: ${MAKE} ${MAKEOPTS/-j?/j1} ${ARGS} ${target} $*" 1 0 1
- eval ${MAKE} -s ${MAKEOPTS/-j?/-j1} "${ARGS}" ${target} $*
+ # Silent operation, forced -j1
+ print_info 2 "COMMAND: ${MAKE} ${MAKEOPTS} -j1 ${ARGS} ${target} $*" 1 0 1
+ eval ${MAKE} -s ${MAKEOPTS} -j1 "${ARGS}" ${target} $*
RET=$?
elif [ "${LOGLEVEL}" -gt "1" ]
then
unset MAKE
unset ARGS
- if [ "${argstype}" = 'kernel' ]
- then
- unset_kernel_args
- elif [ "${argstype}" = 'utils' ]
- then
- unset_utils_args
- fi
+
+ case "${argstype}" in
+ kernel) unset_kernel_args ;;
+ utils) unset_utils_args ;;
+ esac
}
compile_modules() {
compile_generic modules kernel
export UNAME_MACHINE="${ARCH}"
[ "${INSTALL_MOD_PATH}" != '' ] && export INSTALL_MOD_PATH
- compile_generic "modules_install" kernel
+ MAKEOPTS="${MAKEOPTS} -j1" compile_generic "modules_install" kernel
unset UNAME_MACHINE
}
[ "${KERNEL_MAKE}" = '' ] &&
gen_die "KERNEL_MAKE undefined - I don't know how to compile a kernel for this arch!"
cd ${KERNEL_DIR}
- print_info 1 " >> Compiling ${KV} ${KERNEL_MAKE_DIRECTIVE/_install/ [ install ]/}..."
- compile_generic "${KERNEL_MAKE_DIRECTIVE}" kernel
+ local kernel_make_directive="${KERNEL_MAKE_DIRECTIVE}"
+ if [ "${KERNEL_MAKE_DIRECTIVE_OVERRIDE}" != "${DEFAULT_KERNEL_MAKE_DIRECTIVE_OVERRIDE}" ]; then
+ kernel_make_directive="${KERNEL_MAKE_DIRECTIVE_OVERRIDE}"
+ fi
+ print_info 1 " >> Compiling ${KV} ${kernel_make_directive/_install/ [ install ]/}..."
+ compile_generic "${kernel_make_directive}" kernel
if [ "${KERNEL_MAKE_DIRECTIVE_2}" != '' ]
then
print_info 1 " >> Starting supplimental compile of ${KV}: ${KERNEL_MAKE_DIRECTIVE_2}..."
compile_generic "${KERNEL_MAKE_DIRECTIVE_2}" kernel
fi
- local tmp_kernel_binary=$(find_kernel_binary ${KERNEL_BINARY})
+ local firmware_in_kernel_line=`fgrep CONFIG_FIRMWARE_IN_KERNEL "${KERNEL_DIR}"/.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..."
+ MAKEOPTS="${MAKEOPTS} -j1" compile_generic "firmware_install" kernel
+ else
+ print_info 1 " >> Not installing firmware as it's included in the kernel already (CONFIG_FIRMWARE_IN_KERNEL=y)..."
+ fi
+
+ local tmp_kernel_binary=$(find_kernel_binary ${KERNEL_BINARY_OVERRIDE:-${KERNEL_BINARY}})
local tmp_kernel_binary2=$(find_kernel_binary ${KERNEL_BINARY_2})
if [ -z "${tmp_kernel_binary}" ]
then
gen_die "Cannot locate kernel binary"
fi
- if ! isTrue "${CMD_NOINSTALL}"
+ if isTrue "${CMD_INSTALL}"
then
copy_image_with_preserve "kernel" \
"${tmp_kernel_binary}" \
}
compile_lvm() {
- compile_device_mapper
- if [ ! -f "${LVM_BINCACHE}" ]
+ if [ -f "${LVM_BINCACHE}" ]
then
+ print_info 1 "lvm: >> Using cache"
+ else
[ -f "${LVM_SRCTAR}" ] ||
gen_die "Could not find LVM source tarball: ${LVM_SRCTAR}! Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
cd "${TEMP}"
gen_die 'Could not extract LVM source tarball!'
[ -d "${LVM_DIR}" ] ||
gen_die 'LVM directory ${LVM_DIR} is invalid!'
- rm -rf "${TEMP}/device-mapper" > /dev/null
- /bin/tar -jxpf "${DEVICE_MAPPER_BINCACHE}" -C "${TEMP}" ||
- gen_die "Could not extract device-mapper binary cache!";
-
cd "${LVM_DIR}"
+ apply_patches lvm ${LVM_VER}
print_info 1 'lvm: >> Configuring...'
- LDFLAGS="-L${TEMP}/device-mapper/lib" \
- CFLAGS="-I${TEMP}/device-mapper/include" \
- CPPFLAGS="-I${TEMP}/device-mapper/include" \
- ./configure --enable-static_link --prefix=${TEMP}/lvm >> ${LOGFILE} 2>&1 ||
+ CFLAGS="-fPIC" \
+ ./configure --enable-static_link --prefix=${TEMP}/lvm \
+ --with-lvm1=internal --with-clvmd=none --with-cluster=none \
+ --disable-readline --disable-selinux --with-mirrors=internal \
+ --with-snapshots=internal --with-pool=internal >> ${LOGFILE} 2>&1 || \
gen_die 'Configure of lvm failed!'
print_info 1 'lvm: >> Compiling...'
compile_generic '' utils
print_info 1 ' >> Copying to bincache...'
strip "sbin/lvm.static" ||
gen_die 'Could not strip lvm.static!'
- /bin/tar -cjf "${LVM_BINCACHE}" sbin/lvm.static ||
+ # See bug 382555
+ strip "sbin/dmsetup.static" ||
+ gen_die 'Could not strip dmsetup.static'
+ /bin/tar -cjf "${LVM_BINCACHE}" sbin/lvm.static sbin/dmsetup.static ||
gen_die 'Could not create binary cache'
cd "${TEMP}"
fi
}
+compile_mdadm() {
+ if [ -f "${MDADM_BINCACHE}" ]
+ then
+ print_info 1 ' MDADM: Using cache'
+ else
+ [ -f "${MDADM_SRCTAR}" ] ||
+ gen_die "Could not find MDADM source tarball: ${MDADM_SRCTAR}! Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
+ cd "${TEMP}"
+ rm -rf "${MDADM_DIR}" > /dev/null
+ /bin/tar -jxpf "${MDADM_SRCTAR}" ||
+ gen_die 'Could not extract MDADM source tarball!'
+ [ -d "${MDADM_DIR}" ] ||
+ gen_die 'MDADM directory ${MDADM_DIR} is invalid!'
+
+ cd "${MDADM_DIR}"
+ apply_patches mdadm ${MDADM_VER}
+ sed -i "/^CFLAGS = /s:^CFLAGS = \(.*\)$:CFLAGS = -Os:" Makefile
+ sed -i "/^CXFLAGS = /s:^CXFLAGS = \(.*\)$:CXFLAGS = -Os:" Makefile
+ sed -i "/^CWFLAGS = /s:^CWFLAGS = \(.*\)$:CWFLAGS = -Wall:" Makefile
+ sed -i "s/^# LDFLAGS = -static/LDFLAGS = -static/" Makefile
+
+ print_info 1 'mdadm: >> Compiling...'
+ compile_generic 'mdadm mdmon' utils
+
+ mkdir -p "${TEMP}/mdadm/sbin"
+ install -m 0755 -s mdadm "${TEMP}/mdadm/sbin/mdadm"
+ install -m 0755 -s mdmon "${TEMP}/mdadm/sbin/mdmon"
+ print_info 1 ' >> Copying to bincache...'
+ cd "${TEMP}/mdadm"
+ strip "sbin/mdadm" "sbin/mdmon" ||
+ gen_die 'Could not strip mdadm binaries!'
+ /bin/tar -cjf "${MDADM_BINCACHE}" sbin/mdadm sbin/mdmon ||
+ gen_die 'Could not create binary cache'
+
+ cd "${TEMP}"
+ rm -rf "${MDADM_DIR}" mdadm
+ fi
+}
+
compile_dmraid() {
compile_device_mapper
if [ ! -f "${DMRAID_BINCACHE}" ]
rm -rf "${TEMP}/device-mapper" > /dev/null
/bin/tar -jxpf "${DEVICE_MAPPER_BINCACHE}" -C "${TEMP}" ||
gen_die "Could not extract device-mapper binary cache!";
-
+
cd "${DMRAID_DIR}"
+ apply_patches dmraid ${DMRAID_VER}
print_info 1 'dmraid: >> Configuring...'
-
+
LDFLAGS="-L${TEMP}/device-mapper/lib" \
CFLAGS="-I${TEMP}/device-mapper/include" \
CPPFLAGS="-I${TEMP}/device-mapper/include" \
mkdir -p "${TEMP}/dmraid"
print_info 1 'dmraid: >> Compiling...'
# Force dmraid to be built with -j1 for bug #188273
- MAKEOPTS=-j1 compile_generic '' utils
+ MAKEOPTS="${MAKEOPTS} -j1" compile_generic '' utils
#compile_generic 'install' utils
mkdir ${TEMP}/dmraid/sbin
install -m 0755 -s tools/dmraid "${TEMP}/dmraid/sbin/dmraid"
[ ! -d "${DEVICE_MAPPER_DIR}" ] &&
gen_die "device-mapper directory ${DEVICE_MAPPER_DIR} invalid"
cd "${DEVICE_MAPPER_DIR}"
+ apply_patches device-mapper ${DEVICE_MAPPER_VER}
+ CFLAGS="-fPIC" \
./configure --prefix=${TEMP}/device-mapper --enable-static_link \
--disable-selinux >> ${LOGFILE} 2>&1 ||
gen_die 'Configuring device-mapper failed!'
[ ! -d "${E2FSPROGS_DIR}" ] &&
gen_die "e2fsprogs directory ${E2FSPROGS_DIR} invalid"
cd "${E2FSPROGS_DIR}"
+ apply_patches e2fsprogs ${E2FSPROGS_VER}
print_info 1 'e2fsprogs: >> Configuring...'
LDFLAGS=-static ./configure >> ${LOGFILE} 2>&1 ||
gen_die 'Configuring e2fsprogs failed!'
print_info 1 'e2fsprogs: >> Compiling...'
- MAKE=${UTILS_MAKE} compile_generic "" ""
+ MAKE=${UTILS_MAKE} MAKEOPTS="${MAKEOPTS} -j1" compile_generic "" ""
print_info 1 'blkid: >> Copying to cache...'
[ -f "${TEMP}/${E2FSPROGS_DIR}/misc/blkid" ] ||
gen_die 'Blkid executable does not exist!'
[ ! -d "${FUSE_DIR}" ] &&
gen_die "fuse directory ${FUSE_DIR} invalid"
cd "${FUSE_DIR}"
+ apply_patches fuse ${FUSE_VER}
print_info 1 'fuse: >> Configuring...'
./configure --disable-kernel-module --disable-example >> ${LOGFILE} 2>&1 ||
gen_die 'Configuring fuse failed!'
[ ! -d "${UNIONFS_FUSE_DIR}" ] &&
gen_die "unionfs-fuse directory ${UNIONFS_FUSE_DIR} invalid"
cd "${UNIONFS_FUSE_DIR}"
+ apply_patches unionfs-fuse ${UNIONFS_FUSE_VER}
print_info 1 'unionfs-fuse: >> Compiling...'
sed -i "/^\(CFLAGS\|CPPFLAGS\)/s:^\\(.*\\)$:\\1 -static -I${TEMP}/${FUSE_DIR}/include -L${TEMP}/${FUSE_DIR}/lib/.libs:" Makefile src/Makefile
sed -i "/^LIB = /s:^LIB = \(.*\)$:LIB = -static -L${TEMP}/${FUSE_DIR}/lib/.libs \1 -ldl -lrt:" Makefile src/Makefile
gen_die "ISCSI directory ${ISCSI_DIR} invalid"
print_info 1 'iSCSI: >> Compiling...'
cd "${TEMP}/${ISCSI_DIR}"
+ apply_patches iscsi ${ISCSI_VER}
# Only build userspace
+ print_info 1 'iSCSI: >> Configuring userspace...'
+ cd utils/open-isns || gen_die 'Could not enter open-isns dir'
+ # we currently have a patch that changes configure.ac
+ # once given patch is dropped, drop autoconf too
+ autoconf || gen_die 'Could not tweak open-iscsi configuration'
+ ./configure --without-slp >> ${LOGFILE} 2>&1 || gen_die 'Could not configure userspace'
+ cd ../.. || gen_die 'wtf?'
MAKE=${UTILS_MAKE} compile_generic "user" ""
-
+
# if kernel modules exist, copy them to initramfs, otherwise it will be compiled into the kernel
mkdir -p "${TEMP}/initramfs-iscsi-temp/lib/modules/${RELEASE}/kernel/drivers/scsi/"
for modname in iscsi_tcp libiscsi scsi_transport_iscsi
[ ! -d "${GPG_DIR}" ] &&
gen_die "gnupg directory ${GPG_DIR} invalid"
cd "${GPG_DIR}"
+ apply_patches gnupg ${GPG_VER}
print_info 1 'gnupg: >> Configuring...'
# --enable-minimal works, but it doesn't reduce the command length much.
# Given its history and the precision this needs, explicit is cleaner.
--without-zlib --without-bzip2 --without-libusb --without-readline \
>> ${LOGFILE} 2>&1 || gen_die 'Configuring gnupg failed!'
print_info 1 'gnupg: >> Compiling...'
- MAKE=${UTILS_MAKE} compile_generic "" ""
+ compile_generic "" "utils"
print_info 1 'gnupg: >> Copying to cache...'
[ -f "${TEMP}/${GPG_DIR}/g10/gpg" ] ||
gen_die 'gnupg executable does not exist!'