X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=gen_compile.sh;h=ccc8b8d58e7d04a1de2b3cbf813a66459fe5883d;hb=a60e920d61e727b3cab90f1b8079acf556cf77c2;hp=d87d2f43b7c3f183d74c438756720951b9304204;hpb=35258a703f6953dcbc31ba9c4059103fed0c8d1d;p=genkernel.git

diff --git a/gen_compile.sh b/gen_compile.sh
index d87d2f4..ccc8b8d 100755
--- 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}" -a "${KERNEL_OUTPUTDIR}" != "${KERNEL_DIR}" ]
+		then
+			ARGS="${ARGS} O=\"${KERNEL_OUTPUTDIR}\""
+		fi
 	fi
 	echo -n "${ARGS}"
 }
@@ -80,6 +84,10 @@ export_utils_args()
 	then
 		export AS="${UTILS_AS}"
 	fi
+	if [ "${UTILS_CROSS_COMPILE}" != '' ]
+	then
+		export CROSS_COMPILE="${UTILS_CROSS_COMPILE}"
+	fi
 }
 
 unset_utils_args()
@@ -100,6 +108,10 @@ unset_utils_args()
 	then
 		unset AS
 	fi
+	if [ "${UTILS_CROSS_COMPILE}" != '' ]
+	then
+		unset CROSS_COMPILE
+	fi
 	reset_args
 }
 
@@ -203,6 +215,7 @@ apply_patches() {
 		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
@@ -213,8 +226,10 @@ apply_patches() {
 					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
@@ -228,29 +243,32 @@ compile_generic() {
 	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
@@ -264,18 +282,16 @@ compile_generic() {
 		eval ${MAKE} ${MAKEOPTS} ${ARGS} ${target} $* >> ${LOGFILE} 2>&1
 		RET=$?
 	fi
-	[ "${RET}" -ne '0' ] &&
+	[ ${RET} -ne 0 ] &&
 		gen_die "Failed to compile the \"${target}\" target..."
 
 	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() {
@@ -284,7 +300,14 @@ 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
+	print_info 1 "        >> Generating module dependency data..."
+	if [ "${INSTALL_MOD_PATH}" != '' ]
+	then
+		depmod -a -e -F "${KERNEL_OUTPUTDIR}"/System.map -b "${INSTALL_MOD_PATH}" ${KV}
+	else
+		depmod -a -e -F "${KERNEL_OUTPUTDIR}"/System.map ${KV}
+	fi
 	unset UNAME_MACHINE
 }
 
@@ -292,22 +315,35 @@ compile_kernel() {
 	[ "${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_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..."
+		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}" \
@@ -381,7 +417,7 @@ compile_busybox() {
 		/bin/tar -jxpf ${BUSYBOX_SRCTAR} ||
 			gen_die 'Could not extract busybox source tarball!'
 		[ -d "${BUSYBOX_DIR}" ] ||
-			gen_die 'Busybox directory ${BUSYBOX_DIR} is invalid!'
+			gen_die "Busybox directory ${BUSYBOX_DIR} is invalid!"
 		cp "${BUSYBOX_CONFIG}" "${BUSYBOX_DIR}/.config"
 		cp "${BUSYBOX_CONFIG}" "${BUSYBOX_DIR}/.config.gk_orig"
 		cd "${BUSYBOX_DIR}"
@@ -394,7 +430,7 @@ compile_busybox() {
 		print_info 1 'busybox: >> Copying to cache...'
 		[ -f "${TEMP}/${BUSYBOX_DIR}/busybox" ] ||
 			gen_die 'Busybox executable does not exist!'
-		strip "${TEMP}/${BUSYBOX_DIR}/busybox" ||
+		${UTILS_CROSS_COMPILE}strip "${TEMP}/${BUSYBOX_DIR}/busybox" ||
 			gen_die 'Could not strip busybox binary!'
 		tar -cj -C "${TEMP}/${BUSYBOX_DIR}" -f "${BUSYBOX_BINCACHE}" busybox .config .config.gk_orig ||
 			gen_die 'Could not create the busybox bincache!'
@@ -405,9 +441,10 @@ compile_busybox() {
 }
 
 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}"
@@ -415,35 +452,76 @@ compile_lvm() {
 		/bin/tar -zxpf ${LVM_SRCTAR} ||
 			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!";
-		
+			gen_die "LVM directory ${LVM_DIR} is invalid!"
 		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=/ \
+				--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
-			compile_generic 'install' utils
+		compile_generic '' utils
+		compile_generic "install DESTDIR=${TEMP}/lvm/" utils
 
 		cd "${TEMP}/lvm"
 		print_info 1 '      >> Copying to bincache...'
-		strip "sbin/lvm.static" ||
+		${UTILS_CROSS_COMPILE}strip "sbin/lvm.static" ||
 			gen_die 'Could not strip lvm.static!'
-		/bin/tar -cjf "${LVM_BINCACHE}" sbin/lvm.static ||
+		# See bug 382555
+		${UTILS_CROSS_COMPILE}strip "sbin/dmsetup.static" ||
+			gen_die 'Could not strip dmsetup.static'
+		/bin/tar -cjf "${LVM_BINCACHE}" . ||
 			gen_die 'Could not create binary cache'
 
 		cd "${TEMP}"
-		rm -rf "${TEMP}/device-mapper" > /dev/null
+		rm -rf "${TEMP}/lvm" > /dev/null
 		rm -rf "${LVM_DIR}" lvm
 	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"
+		${UTILS_CROSS_COMPILE}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}" ]
@@ -455,28 +533,31 @@ compile_dmraid() {
 		/bin/tar -jxpf ${DMRAID_SRCTAR} ||
 			gen_die 'Could not extract DMRAID source tarball!'
 		[ -d "${DMRAID_DIR}" ] ||
-			gen_die 'DMRAID directory ${DMRAID_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!";
-		
+			gen_die "DMRAID directory ${DMRAID_DIR} is invalid!"
+		rm -rf "${TEMP}/lvm" > /dev/null
+		mkdir -p "${TEMP}/lvm"
+		/bin/tar -jxpf "${LVM_BINCACHE}" -C "${TEMP}/lvm" ||
+			gen_die "Could not extract LVM2 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" \
+
+		LDFLAGS="-L${TEMP}/lvm/lib" \
+		CFLAGS="-I${TEMP}/lvm/include" \
+		CPPFLAGS="-I${TEMP}/lvm/include" \
+		LIBS="-ldevmapper" \
 		./configure --enable-static_link --prefix=${TEMP}/dmraid >> ${LOGFILE} 2>&1 ||
 			gen_die 'Configure of dmraid failed!'
 
 		# We dont necessarily have selinux installed yet... look into
 		# selinux global support in the future.
-		sed -i tools/Makefile -e "s|DMRAIDLIBS += -lselinux||g"
+		sed -i tools/Makefile -e "/DMRAID_LIBS +=/s|-lselinux||g"
 		###echo "DMRAIDLIBS += -lselinux -lsepol" >> tools/Makefile
 		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"
@@ -486,73 +567,13 @@ compile_dmraid() {
 			gen_die 'Could not create binary cache'
 
 		cd "${TEMP}"
-		rm -rf "${TEMP}/device-mapper" > /dev/null
+		rm -rf "${TEMP}/lvm" > /dev/null
 		rm -rf "${DMRAID_DIR}" dmraid
 	fi
 }
 
 compile_device_mapper() {
-	if [ ! -f "${DEVICE_MAPPER_BINCACHE}" ]
-	then
-		[ ! -f "${DEVICE_MAPPER_SRCTAR}" ] &&
-			gen_die "Could not find device-mapper source tarball: ${DEVICE_MAPPER_SRCTAR}. Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
-		cd "${TEMP}"
-		rm -rf "${DEVICE_MAPPER_DIR}"
-		/bin/tar -zxpf "${DEVICE_MAPPER_SRCTAR}"
-		[ ! -d "${DEVICE_MAPPER_DIR}" ] &&
-			gen_die "device-mapper directory ${DEVICE_MAPPER_DIR} invalid"
-		cd "${DEVICE_MAPPER_DIR}"
-		./configure --prefix=${TEMP}/device-mapper --enable-static_link \
-			--disable-selinux >> ${LOGFILE} 2>&1 ||
-			gen_die 'Configuring device-mapper failed!'
-		print_info 1 'device-mapper: >> Compiling...'
-		compile_generic '' utils
-		compile_generic 'install' utils
-		print_info 1 '        >> Copying to cache...'
-		cd "${TEMP}"
-		rm -rf "${TEMP}/device-mapper/man" ||
-			gen_die 'Could not remove manual pages!'
-		strip "${TEMP}/device-mapper/sbin/dmsetup" ||
-			gen_die 'Could not strip dmsetup binary!'
-		/bin/tar -jcpf "${DEVICE_MAPPER_BINCACHE}" device-mapper ||
-			gen_die 'Could not tar up the device-mapper binary!'
-		[ -f "${DEVICE_MAPPER_BINCACHE}" ] ||
-			gen_die 'device-mapper cache not created!'
-		cd "${TEMP}"
-		rm -rf "${DEVICE_MAPPER_DIR}" > /dev/null
-		rm -rf "${TEMP}/device-mapper" > /dev/null
-	fi
-}
-
-compile_e2fsprogs() {
-	if [ ! -f "${BLKID_BINCACHE}" ]
-	then
-		[ ! -f "${E2FSPROGS_SRCTAR}" ] &&
-			gen_die "Could not find e2fsprogs source tarball: ${E2FSPROGS_SRCTAR}. Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
-		cd "${TEMP}"
-		rm -rf "${E2FSPROGS_DIR}"
-		tar -zxpf "${E2FSPROGS_SRCTAR}"
-		[ ! -d "${E2FSPROGS_DIR}" ] &&
-			gen_die "e2fsprogs directory ${E2FSPROGS_DIR} invalid"
-		cd "${E2FSPROGS_DIR}"
-		print_info 1 'e2fsprogs: >> Configuring...'
-		./configure  --with-ldopts=-static >> ${LOGFILE} 2>&1 ||
-			gen_die 'Configuring e2fsprogs failed!'
-		print_info 1 'e2fsprogs: >> Compiling...'
-		MAKE=${UTILS_MAKE} compile_generic "" ""
-		print_info 1 'blkid: >> Copying to cache...'
-		[ -f "${TEMP}/${E2FSPROGS_DIR}/misc/blkid" ] ||
-			gen_die 'Blkid executable does not exist!'
-		strip "${TEMP}/${E2FSPROGS_DIR}/misc/blkid" ||
-			gen_die 'Could not strip blkid binary!'
-		bzip2 "${TEMP}/${E2FSPROGS_DIR}/misc/blkid" ||
-			gen_die 'bzip2 compression of blkid failed!'
-		mv "${TEMP}/${E2FSPROGS_DIR}/misc/blkid.bz2" "${BLKID_BINCACHE}" ||
-			gen_die 'Could not copy the blkid binary to the package directory, does the directory exist?'
-
-		cd "${TEMP}"
-		rm -rf "${E2FSPROGS_DIR}" > /dev/null
-	fi
+	compile_lvm
 }
 
 compile_fuse() {
@@ -566,8 +587,9 @@ compile_fuse() {
 		[ ! -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 ||
+		./configure --disable-example >> ${LOGFILE} 2>&1 ||
 			gen_die 'Configuring fuse failed!'
 		print_info 1 'fuse: >> Compiling...'
 		MAKE=${UTILS_MAKE} compile_generic "" ""
@@ -576,7 +598,7 @@ compile_fuse() {
 #		print_info 1 'libfuse: >> Copying to cache...'
 #		[ -f "${TEMP}/${FUSE_DIR}/lib/.libs/libfuse.so" ] ||
 #			gen_die 'libfuse.so does not exist!'
-#		strip "${TEMP}/${FUSE_DIR}/lib/.libs/libfuse.so" ||
+#		${UTILS_CROSS_COMPILE}strip "${TEMP}/${FUSE_DIR}/lib/.libs/libfuse.so" ||
 #			gen_die 'Could not strip libfuse.so!'
 #		cd "${TEMP}/${FUSE_DIR}/lib/.libs"
 #		tar -cjf "${FUSE_BINCACHE}" libfuse*so* ||
@@ -602,14 +624,15 @@ compile_unionfs_fuse() {
 		[ ! -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
+		sed -i "/^LIB = /s:^LIB = \(.*\)$:LIB = -static -L${TEMP}/${FUSE_DIR}/lib/.libs \1 -ldl -lpthread -lrt:" Makefile src/Makefile
 		MAKE=${UTILS_MAKE} compile_generic "" ""
 		print_info 1 'unionfs-fuse: >> Copying to cache...'
 		[ -f "${TEMP}/${UNIONFS_FUSE_DIR}/src/unionfs" ] ||
 			gen_die 'unionfs binary does not exist!'
-		strip "${TEMP}/${UNIONFS_FUSE_DIR}/src/unionfs" ||
+		${UTILS_CROSS_COMPILE}strip "${TEMP}/${UNIONFS_FUSE_DIR}/src/unionfs" ||
 			gen_die 'Could not strip unionfs binary!'
 		bzip2 "${TEMP}/${UNIONFS_FUSE_DIR}/src/unionfs" ||
 			gen_die 'bzip2 compression of unionfs binary failed!'
@@ -620,3 +643,98 @@ compile_unionfs_fuse() {
 		rm -rf "${UNIONFS_FUSE_DIR}" > /dev/null
 	fi
 }
+
+compile_iscsi() {
+	if [ ! -f "${ISCSI_BINCACHE}" ]
+	then
+		[ ! -f "${ISCSI_SRCTAR}" ] &&
+			gen_die "Could not find iSCSI source tarball: ${ISCSI_SRCTAR}. Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
+		cd "${TEMP}"
+		rm -rf "${ISCSI_DIR}"
+		tar -zxpf "${ISCSI_SRCTAR}"
+		[ ! -d "${ISCSI_DIR}" ] &&
+			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
+		do
+			if [ -e "${CMD_KERNEL_DIR}/drivers/scsi/${modname}.ko" ]
+			then
+				cp ${CMD_KERNEL_DIR}/drivers/scsi/${modname}.ko "${TEMP}/initramfs-iscsi-temp/lib/modules/${RELEASE}/kernel/drivers/scsi/"
+			fi
+		done
+
+	        cd "${TEMP}/initramfs-iscsi-temp/"
+		print_info 1 'iscsistart: >> Copying to cache...'
+		[ -f "${TEMP}/${ISCSI_DIR}/usr/iscsistart" ] ||
+			gen_die 'iscsistart executable does not exist!'
+		${UTILS_CROSS_COMPILE}strip "${TEMP}/${ISCSI_DIR}/usr/iscsistart" ||
+			gen_die 'Could not strip iscsistart binary!'
+		bzip2 "${TEMP}/${ISCSI_DIR}/usr/iscsistart" ||
+			gen_die 'bzip2 compression of iscsistart failed!'
+		mv "${TEMP}/${ISCSI_DIR}/usr/iscsistart.bz2" "${ISCSI_BINCACHE}" ||
+			gen_die 'Could not copy the iscsistart binary to the package directory, does the directory exist?'
+
+		cd "${TEMP}"
+		rm -rf "${ISCSI_DIR}" > /dev/null
+	fi
+}
+
+compile_gpg() {
+	if [ -f "${GPG_BINCACHE}" ]
+	then
+		print_info 1 "gnupg: >> Using cache"
+	else
+		[ ! -f "${GPG_SRCTAR}" ] &&
+			gen_die "Could not find gnupg source tarball: ${GPG_SRCTAR}. Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
+		cd "${TEMP}"
+		rm -rf "${GPG_DIR}"
+		tar -jxf "${GPG_SRCTAR}"
+		[ ! -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.
+		LDFLAGS='-static' CFLAGS='-Os' ./configure --prefix=/ \
+			--enable-static-rnd=linux --disable-dev-random --disable-asm \
+			--disable-selinux-support --disable-gnupg-iconv --disable-card-support \
+			--disable-agent-support --disable-bzip2 --disable-exec \
+			--disable-photo-viewers --disable-keyserver-helpers --disable-ldap \
+			--disable-hkp --disable-finger --disable-generic --disable-mailto \
+			--disable-keyserver-path --disable-dns-srv --disable-dns-pka \
+			--disable-dns-cert --disable-nls --disable-threads --disable-regex \
+			--disable-optimization --with-included-zlib --without-capabilities \
+			--without-tar --without-ldap --without-libcurl --without-mailprog \
+			--without-libpth-prefix --without-libiconv-prefix --without-libintl-prefix\
+			--without-zlib --without-bzip2 --without-libusb --without-readline \
+				>> ${LOGFILE} 2>&1 || gen_die 'Configuring gnupg failed!'
+		print_info 1 'gnupg: >> Compiling...'
+		compile_generic "" "utils"
+		print_info 1 'gnupg: >> Copying to cache...'
+		[ -f "${TEMP}/${GPG_DIR}/g10/gpg" ] ||
+			gen_die 'gnupg executable does not exist!'
+		${UTILS_CROSS_COMPILE}strip "${TEMP}/${GPG_DIR}/g10/gpg" ||
+			gen_die 'Could not strip gpg binary!'
+		bzip2 -z -c "${TEMP}/${GPG_DIR}/g10/gpg" > "${GPG_BINCACHE}" ||
+			gen_die 'Could not copy the gpg binary to the package directory, does the directory exist?'
+
+		cd "${TEMP}"
+		rm -rf "${GPG_DIR}" > /dev/null
+	fi
+}