[gentoo-commits] proj/genkernel:ryao commit in: /

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     d3735e62951431d024f9dca94a11e7fd9eaa70fc
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Aug 12 19:03:38 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Aug 12 19:03:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=d3735e62

Merge branch 'genkernel-conf'


 ChangeLog            |    8 +++++++
 defaults/software.sh |   51 ++++++++++++++++++++++++++++++++++++++++++++++++++
 genkernel            |   21 +++++++++++++------
 genkernel.conf       |   40 +--------------------------------------
 4 files changed, 74 insertions(+), 46 deletions(-)

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     c20673837939e0bf8694a9cc5895a1b9e8f2598c
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Aug 12 23:22:13 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Aug 12 23:22:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=c2067383

Merge branch 'software-vars'


 defaults/software.sh |   93 ++++++++++++++++++++++++-------------------------
 genkernel            |    1 +
 genkernel.conf       |    4 +--
 3 files changed, 48 insertions(+), 50 deletions(-)

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     fa6374eb01639b1f25e5de04b48e1889603285ea
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Aug 12 21:39:49 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Aug 12 21:39:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=fa6374eb

Merge branch 'genkernel-conf-2'


 genkernel.conf |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     5375bcd35c315d2072deebbd313042368265baf3
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Sat Aug 25 01:04:23 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 01:04:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=5375bcd3

Remove redundant default no setting

---
 gen_determineargs.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 95d278d..81ac05f 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -102,7 +102,7 @@ determine_real_args() {
 	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 BOOL   ALLRAMDISKMODULES    CMD_ALLRAMDISKMODULES
 	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

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     41af0c3c66b8af08ee6ae3fc4280a63952116ccc
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Sat Aug 25 01:04:23 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 01:18:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=41af0c3c

Remove redundant default no setting

---
 gen_determineargs.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 95d278d..81ac05f 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -102,7 +102,7 @@ determine_real_args() {
 	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 BOOL   ALLRAMDISKMODULES    CMD_ALLRAMDISKMODULES
 	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

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     067125165b56d7584d0597dd2f1fd5bded605e64
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Sat Aug 25 01:04:23 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 01:35:52 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=06712516

Remove redundant default no setting

---
 gen_determineargs.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 95d278d..81ac05f 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -102,7 +102,7 @@ determine_real_args() {
 	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 BOOL   ALLRAMDISKMODULES    CMD_ALLRAMDISKMODULES
 	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

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     1a3cd373c22c7c28d800b079199d8361593f7d9e
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Sat Aug 25 01:04:23 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 01:44:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=1a3cd373

Remove redundant default no setting

---
 gen_determineargs.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 7f352f8..d1ec199 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -102,7 +102,7 @@ determine_real_args() {
 	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 BOOL   ALLRAMDISKMODULES    CMD_ALLRAMDISKMODULES
 	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

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     24dd02bc0cf801c80670a782988fbf80c2c3a8c0
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 21:26:56 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 21:26:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=24dd02bc

Missing Changelog entry.

---
 ChangeLog |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cb365ca..2e142c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,16 @@
 # ChangeLog for genkernel
 # Copyright: 
 # - 2003-2008 Gentoo Foundation
-# - 2008-2011 Various authors (see AUTHORS)
+# - 2008-2012 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 # $Id$
 
+  13 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
+  Put the version of genkernel used in a build into /etc/build_id.
+
+  13 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/linuxrc:
+  Extra creation of /run in the LiveCD scope, before any union/aufs mount.
+
   03 Oct 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.43
 

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     79d7fa1948de033bf5a2523fe8eca25d7f1f4438
Author:     Łukasz Stelmach <stlman <AT> poczta <DOT> fm>
AuthorDate: Thu Sep 13 20:44:45 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 21:48:19 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=79d7fa19

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

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

---
 ChangeLog            |    6 ++++++
 gen_cmdline.sh       |    5 +++++
 gen_compile.sh       |    6 +++++-
 gen_configkernel.sh  |   34 +++++++++++++++++-----------------
 gen_determineargs.sh |    1 +
 gen_funcs.sh         |    3 ++-
 genkernel            |    4 +++-
 7 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d3e7158..8660462 100644
--- 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 a305201..858b850 100755
--- 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 c923967..87fd586 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}" ]
+		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 b0837dd..6271ca0 100755
--- 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 92a6458..eb822b3 100755
--- 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 48a3382..4f0a0fc 100755
--- 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 2c1a62d..1630cd6 100755
--- 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
 

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     63b9e57491e3ac40428885ec5f761fe9bde5e3b2
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 21:28:46 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 21:28:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=63b9e574

Bug #397947: Run depmod on new modules to avoid need to run at every boot on unionfs systems, or systemd that never runs it.

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

---
 ChangeLog      |    4 ++++
 gen_compile.sh |    2 ++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2e142c6..d3e7158 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  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.
+
   13 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
   Put the version of genkernel used in a build into /etc/build_id.
 

diff --git a/gen_compile.sh b/gen_compile.sh
index cbd3432..c923967 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -297,6 +297,8 @@ compile_modules() {
 	export UNAME_MACHINE="${ARCH}"
 	[ "${INSTALL_MOD_PATH}" != '' ] && export INSTALL_MOD_PATH
 	MAKEOPTS="${MAKEOPTS} -j1" compile_generic "modules_install" kernel
+	print_info 1 "        >> Generating module dependency data..."
+	depmod -a -e -b "${INSTALL_MOD_PATH}"/lib/modules/$KV ${KV}
 	unset UNAME_MACHINE
 }
 

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     85d772454a59512c0e9536f366fff3ba6f2b466b
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 22:02:59 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 22:02:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=85d77245

Bug #414581: ensure built-in initramfs compress config options are set to avoid silentoldconfig bailing out.

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

---
 ChangeLog        |    4 ++++
 gen_initramfs.sh |   18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8660462..44477b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  13 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
+  Bug #414581: ensure built-in initramfs compress config options are set to
+  avoid silentoldconfig bailing out.
+
   13 Oct 2012; Łukasz Stelmach <stlman@poczta.fm> gen_cmdline.sh,
   gen_compile.sh, gen_configkernel.sh, gen_determineargs.sh, gen_funcs.sh,
   genkernel:

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index f986ed4..55b9dd9 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -802,10 +802,28 @@ create_initramfs() {
 		# The kernel will do a better job of it than us.
 		mv ${TMPDIR}/initramfs-${KV} ${TMPDIR}/initramfs-${KV}.cpio
 		sed -i '/^.*CONFIG_INITRAMFS_SOURCE=.*$/d' ${KERNEL_DIR}/.config
+		compress_config='INITRAMFS_COMPRESSION_NONE'
+		case ${compress_ext} in
+			gz)  compress_config='INITRAMFS_COMPRESSION_GZIP' ;;
+			bz2) compress_config='INITRAMFS_COMPRESSION_BZIP2' ;;
+			lzma) compress_config='INITRAMFS_COMPRESSION_LZMA' ;;
+			xz) compress_config='INITRAMFS_COMPRESSION_XZ' ;;
+			lzo) compress_config='INITRAMFS_COMPRESSION_LZO' ;;
+			*) compress_config='INITRAMFS_COMPRESSION_NONE' ;;
+		esac
+		# All N default except XZ, so there it gets used if the kernel does
+		# compression on it's own.
 		cat >>${KERNEL_DIR}/.config	<<-EOF
 		CONFIG_INITRAMFS_SOURCE="${TMPDIR}/initramfs-${KV}.cpio${compress_ext}"
 		CONFIG_INITRAMFS_ROOT_UID=0
 		CONFIG_INITRAMFS_ROOT_GID=0
+		CONFIG_INITRAMFS_COMPRESSION_NONE=n
+		CONFIG_INITRAMFS_COMPRESSION_GZIP=n
+		CONFIG_INITRAMFS_COMPRESSION_BZIP2=n
+		CONFIG_INITRAMFS_COMPRESSION_LZMA=n
+		CONFIG_INITRAMFS_COMPRESSION_XZ=y
+		CONFIG_INITRAMFS_COMPRESSION_LZO=n
+		CONFIG_${compress_config}=y
 		EOF
 	else
 		if isTrue "${COMPRESS_INITRD}"

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     12e4beeaf7b52545a16aa8d4655e5d39134c2436
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 00:05:16 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 00:05:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=12e4beea

Bug #432956: Easy to include VirtIO support in kernel.

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

---
 ChangeLog            |    4 ++++
 gen_cmdline.sh       |    5 +++++
 gen_configkernel.sh  |   13 +++++++++++++
 gen_determineargs.sh |    1 +
 4 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 95b25a4..85749dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  14 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> gen_cmdline.sh,
+  gen_configkernel.sh, gen_determineargs.sh:
+  Bug #432956: Easy to include VirtIO support in kernel.
+
   13 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> arch/alpha/modules_load,
   arch/arm/modules_load, arch/ia64/modules_load, arch/mips/modules_load,
   arch/parisc/modules_load, arch/parisc64/modules_load, arch/ppc/modules_load,

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 858b850..5503bb5 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -31,6 +31,7 @@ longusage() {
   echo "	--no-xconfig		Don't run xconfig after oldconfig"
   echo "	--save-config		Save the configuration to /etc/kernels"
   echo "	--no-save-config	Don't save the configuration to /etc/kernels"
+  echo "	--virtio			Include VirtIO kernel code"
   echo "  Kernel Compile settings"
   echo "	--oldconfig		Implies --no-clean and runs a 'make oldconfig'"
   echo "	--clean			Run make clean before compilation"
@@ -321,6 +322,10 @@ parse_cmdline() {
 			CMD_ZFS=`parse_optbool "$*"`
 			print_info 2 "CMD_ZFS: ${CMD_ZFS}"
 			;;
+		--virtio)
+			CMD_VIRTIO=`parse_optbool "$*"`
+			print_info 2 "CMD_VIRTIO: ${CMD_VIRTIO}"
+			;;
 		--multipath|--no-multipath)
 			CMD_MULTIPATH=`parse_optbool "$*"`
 			if [ "$CMD_MULTIPATH" = "1" -a ! -e /usr/include/libdevmapper.h ]

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index b546db1..a69c713 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -147,4 +147,17 @@ config_kernel() {
 	then
 		sed -i ${KERNEL_OUTPUTDIR}/.config -e 's/#\? \?CONFIG_FB_SPLASH is.*/CONFIG_FB_SPLASH=y/g'
 	fi
+	
+	# VirtIO
+	if isTrue ${CMD_VIRTIO} 
+	then 
+		sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_PARAVIRT_GUEST.*/CONFIG_PARAVIRT_GUEST=y/g'
+		sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_PCI.*/CONFIG_VIRTIO_PCI=y/g'
+		sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_BALLOON.*/CONFIG_VIRTIO_BALLOON=y/g'
+		sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_MMIO.*/CONFIG_VIRTIO_MMIO=y/g'
+		sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_BLK.*/CONFIG_VIRTIO_BLK=y/g'
+		sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_SCSI_VIRTIO.*/CONFIG_SCSI_VIRTIO=y/g'
+		sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_NET.*/CONFIG_VIRTIO_NET=y/g'
+		sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VHOST_NET.*/CONFIG_VHOST_NET=y/g'
+	fi 
 }

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index eb822b3..c3756d2 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -125,6 +125,7 @@ determine_real_args() {
 	set_config_with_override STRING MDADM_CONFIG         CMD_MDADM_CONFIG
 	set_config_with_override BOOL   E2FSPROGS            CMD_E2FSPROGS            "no"
 	set_config_with_override BOOL   ZFS                  CMD_ZFS
+	set_config_with_override BOOL   VIRTIO               CMD_VIRTIO				  "no"
 	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"

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     21b2b7f664c152d273bb397fed6e10c8fe4e3c59
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 15 05:39:45 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Mon Oct 15 05:39:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=21b2b7f6

Missing ChangeLog

---
 ChangeLog |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 890050f..51fdf00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
 # - 2008-2012 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 # $Id$
+  
+  15 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> gen_compile.sh,
+  gen_package.sh:
+  Fix corner cases on OUTPUTDIR.
 
   14 Oct 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.44

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     457cc95b07fc706f12bdd9adf6b862ce64361448
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Oct 14 16:25:15 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 16:25:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=457cc95b

Bump version to 3.4.44

---
 ChangeLog |    3 +++
 genkernel |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 85749dd..890050f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  14 Oct 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.44
+
   14 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> gen_cmdline.sh,
   gen_configkernel.sh, gen_determineargs.sh:
   Bug #432956: Easy to include VirtIO support in kernel.

diff --git a/genkernel b/genkernel
index 1630cd6..f4dd4d8 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.43'
+GK_V='3.4.44'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     7fdf3fc01a127b6c3c3ed4cf9c0611c7c1b69f6c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 15 05:37:11 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Mon Oct 15 05:37:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=7fdf3fc0

Fix corner cases on OUTPUTDIR.

If you give the kernel O= with the same dir as the source, it will
complain about an unclean tree.

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

---
 gen_compile.sh |    2 +-
 gen_package.sh |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 87fd586..71f5a68 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -25,7 +25,7 @@ compile_kernel_args() {
 		then
 			ARGS="${ARGS} ARCH=\"${KERNEL_ARCH}\""
 		fi
-		if [ -n "${KERNEL_OUTPUTDIR}" ]
+		if [ -n "${KERNEL_OUTPUTDIR}" -a "${KERNEL_OUTPUTDIR}" != "${KERNEL_DIR}" ]
 		then
 			ARGS="${ARGS} O=\"${KERNEL_OUTPUTDIR}\""
 		fi

diff --git a/gen_package.sh b/gen_package.sh
index b83ccc1..ed7a5f4 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -20,7 +20,7 @@ gen_minkernpackage() {
 		then
 			gen_die "Cannot locate kernel binary"
 		fi
-		cd "${KERNEL_DIR}"
+		cd "${KERNEL_OUTPUTDIR}"
 		cp "${tmp_kernel_binary}" "${TEMP}/minkernpackage/kernel-${KV}" || gen_die 'Could not the copy kernel for the min kernel package!'
 		cp ".config" "${TEMP}/minkernpackage/config-${ARCH}-${KV}" || gen_die 'Could not the copy kernel config for the min kernel package!'
 		if isTrue "${GENZIMAGE}"
@@ -38,7 +38,7 @@ gen_minkernpackage() {
 	then
 		/bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} System.map-${ARCH}-${KV}
 	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_OUTPUTDIR}/System.map" "${TEMP}/minkernpackage/System.map-${ARCH}-${KV}" || gen_die 'Could not copy System.map for the kernel package!';
 	fi
 
 	cd "${TEMP}/minkernpackage"
@@ -75,9 +75,9 @@ gen_kerncache()
 		gen_die "Cannot locate kernel binary"
 	fi
 
-	cd "${KERNEL_DIR}"
+	cd "${KERNEL_OUTPUTDIR}"
 	cp "${tmp_kernel_binary}" "${TEMP}/kerncache/kernel-${ARCH}-${KV}" || gen_die 'Could not the copy kernel for the kernel package!'
-	cp "${KERNEL_DIR}/.config" "${TEMP}/kerncache/config-${ARCH}-${KV}"
+	cp "${KERNEL_OUTPUTDIR}/.config" "${TEMP}/kerncache/config-${ARCH}-${KV}"
 
 	if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then
 		# Support --kernel-config=/proc/config.gz, mainly
@@ -85,7 +85,7 @@ gen_kerncache()
 	else
 		cp "${KERNEL_CONFIG}" "${TEMP}/kerncache/config-${ARCH}-${KV}.orig"
 	fi
-	cp "${KERNEL_DIR}/System.map" "${TEMP}/kerncache/System.map-${ARCH}-${KV}"
+	cp "${KERNEL_OUTPUTDIR}/System.map" "${TEMP}/kerncache/System.map-${ARCH}-${KV}"
 	if isTrue "${GENZIMAGE}"
 	then
 		cp "${tmp_kernel_binary2}" "${TEMP}/kerncache/kernelz-${ARCH}-${KV}" || gen_die "Could not copy the kernelz for the kernel package"
@@ -170,7 +170,7 @@ gen_kerncache_is_valid()
 	else
 		if [ -e "${KERNCACHE}" ]
 		then
-			KERNEL_CONFIG="/${KERNEL_DIR}/.config"
+			KERNEL_CONFIG="/${KERNEL_OUTPUTDIR}/.config"
 			if [ "${CMD_KERNEL_CONFIG}" != '' ]
 			then
 				KERNEL_CONFIG="${CMD_KERNEL_CONFIG}"

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     94ede0aaac0137e68f9511d97c44ddbf7c004cc8
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 15 05:40:28 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Mon Oct 15 05:40:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=94ede0aa

Bump for 3.4.44.1 with bugfix-only.

---
 ChangeLog |    5 ++++-
 genkernel |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 51fdf00..992ab91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,10 @@
 # - 2008-2012 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 # $Id$
-  
+
+  15 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> genkernel:
+  Bump for 3.4.44.1 with bugfix-only.
+
   15 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> gen_compile.sh,
   gen_package.sh:
   Fix corner cases on OUTPUTDIR.

diff --git a/genkernel b/genkernel
index f4dd4d8..1796da3 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.44'
+GK_V='3.4.44.1'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     65f400c541b5f5064110181490d3e3da4b28ddcd
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 15 20:53:50 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Mon Oct 15 20:53:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=65f400c5

Add missing ChangeLog entry for xake's commit

---
 ChangeLog |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 992ab91..0df1690 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  15 Oct 2012; Peter Hjalmarsson <xake@rymdraket.net> gen_compile.sh:
+  Fix calling of depmod.
+
   15 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> genkernel:
   Bump for 3.4.44.1 with bugfix-only.
 

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     d3e34636b1854176fbcfc7fe14d4141c7f7be1f9
Author:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
AuthorDate: Mon Oct 15 20:00:04 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Mon Oct 15 20:13:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=d3e34636

Fix calling of depmod

"depmod -e" needs either -F System.map or -E Module.symvers
"depmod -b" resolvs an empty argument to PWD, so only use -b if
INSTALL_MOD_PATH is actually set

---
 gen_compile.sh |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 71f5a68..ccc8b8d 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -302,7 +302,12 @@ compile_modules() {
 	[ "${INSTALL_MOD_PATH}" != '' ] && export INSTALL_MOD_PATH
 	MAKEOPTS="${MAKEOPTS} -j1" compile_generic "modules_install" kernel
 	print_info 1 "        >> Generating module dependency data..."
-	depmod -a -e -b "${INSTALL_MOD_PATH}"/lib/modules/$KV ${KV}
+	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
 }
 

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     cd1e1a6d86d5101d74481ca275014c02b090bdde
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 15 20:57:58 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Mon Oct 15 20:57:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=cd1e1a6d

Bump to 3.4.44.2 with depmod corner cases by xake.

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

---
 ChangeLog |    3 +++
 genkernel |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0df1690..10680da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  15 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> genkernel:
+  Bump to 3.4.44.2 with depmod corner cases by xake.
+
   15 Oct 2012; Peter Hjalmarsson <xake@rymdraket.net> gen_compile.sh:
   Fix calling of depmod.
 

diff --git a/genkernel b/genkernel
index 1796da3..e84e089 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.44.1'
+GK_V='3.4.44.2'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     71e512c9e42156c847778d41d513a8f6d0989c57
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 26 08:50:56 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Fri Nov  2 16:51:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=71e512c9

Change OUTPUTDIR fallback to KERNEL_DIR

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

---
 gen_determineargs.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index c3756d2..7ad2bab 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -90,7 +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 KERNEL_OUTPUTDIR     CMD_KERNEL_OUTPUTDIR     "${KERNEL_DIR}"
 	set_config_with_override STRING MODPROBEDIR          CMD_MODPROBEDIR          "/etc/modprobe.d"
 
 	set_config_with_override BOOL   SPLASH               CMD_SPLASH

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     a60e920d61e727b3cab90f1b8079acf556cf77c2
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 19 22:20:54 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Fri Oct 19 22:20:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=a60e920d

Missing then keyword.

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

---
 ChangeLog         |    3 +++
 gen_bootloader.sh |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 023016b..7902101 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  19 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> gen_bootloader.sh:
+  Missing then keyword.
+
   15 Oct 2012; Peter Hjalmarsson <xake@rymdraket.net> defaults/linuxrc:
   Support using init= on the command line.
 

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index 7a4f485..5848bd2 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -91,6 +91,7 @@ set_bootloader_grub() {
 			echo "title=Gentoo Linux ($KV)" >> ${GRUB_CONF}
 			echo -e "\tkernel /kernel-${KNAME}-${ARCH}-${KV} root=${GRUB_ROOTFS}" >> ${GRUB_CONF}
 			if [ "${BUILD_INITRD}" = '1' ]
+			then
 				if [ "${PAT}" -gt '4' ]
 				then
 				    echo -e "\tinitrd /initramfs-${KNAME}-${ARCH}-${KV}" >> ${GRUB_CONF}

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     71507545eec3031ade9b4f9a314c53216f2c97f2
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  2 17:15:07 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Fri Nov  2 17:18:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=71507545

Move to autogenerated ChangeLog.

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

---
 .gitignore                 |    1 +
 ChangeLog => ChangeLog.old |    4 +++-
 HACKING                    |    5 ++---
 Makefile                   |    9 ++++++---
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3f8cb55..5d43ffd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /genkernel.8
 /genkernel-*.tar.bz2
+/ChangeLog

diff --git a/ChangeLog b/ChangeLog.old
similarity index 99%
rename from ChangeLog
rename to ChangeLog.old
index 7902101..9128565 100644
--- a/ChangeLog
+++ b/ChangeLog.old
@@ -1,9 +1,11 @@
+# After 2012/11/01, the changelog is now auto-generated.
+# This file is for historical purposes only.
 # ChangeLog for genkernel
 # Copyright: 
 # - 2003-2008 Gentoo Foundation
 # - 2008-2012 Various authors (see AUTHORS)
 # Distributed under the GPL v2
-# $Id$
+# $Id: 7902101f65eb47fdc5ed4b116ee234aa23686e1b $
 
   19 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> gen_bootloader.sh:
   Missing then keyword.

diff --git a/HACKING b/HACKING
index 479f1aa..7ac0a60 100644
--- a/HACKING
+++ b/HACKING
@@ -17,10 +17,9 @@ Testing things:
 
 Rolling a release:
 - Bump the version in the main genkernel file.
-- echangelog "Bump version to ${PV}"
-- git commit -a -m "Bump version to ${PV}"
+- git commit -s -a -m "Bump version to ${PV}"
 - make dist
-- git tag -a -m "Tag release v${PV}" v${PV}
+- git tag -s -a -m "Tag release v${PV}" v${PV}
 - git push ${REMOTE} master --tags
 - upload genkernel-${PV}.tar.bz2 to the hosting:
     scp genkernel-${PV}.tar.bz2 ${USER}@dev.gentoo.org:/space/distfiles-local/

diff --git a/Makefile b/Makefile
index 751bb46..8e31a06 100644
--- a/Makefile
+++ b/Makefile
@@ -2,20 +2,23 @@ PACKAGE_VERSION = `/bin/fgrep GK_V= genkernel | sed "s/.*GK_V='\([^']\+\)'/\1/"`
 distdir = genkernel-$(PACKAGE_VERSION)
 
 # Add off-Git/generated files here that need to be shipped with releases
-EXTRA_DIST = genkernel.8
+EXTRA_DIST = genkernel.8 ChangeLog
 
 genkernel.8: doc/genkernel.8.txt doc/asciidoc.conf Makefile genkernel
 	a2x --conf-file=doc/asciidoc.conf --attribute="genkernelversion=$(PACKAGE_VERSION)" \
 		 --format=manpage -D . "$<"
 
+ChangeLog:
+	git log >$@
+
 clean:
-	rm -f genkernel.8
+	rm -f $(EXTRA_DIST)
 
 check-git-repository:
 	git diff --quiet || { echo 'STOP, you have uncommitted changes in the working directory' ; false ; }
 	git diff --cached --quiet || { echo 'STOP, you have uncommitted changes in the index' ; false ; }
 
-dist: check-git-repository genkernel.8
+dist: check-git-repository $(EXTRA_DIST)
 	rm -Rf "$(distdir)" "$(distdir)".tar "$(distdir)".tar.bz2
 	mkdir "$(distdir)"
 	git ls-files -z | xargs -0 cp --no-dereference --parents --target-directory="$(distdir)" \

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     51af5f5356319e17a804341fcb1e9511c28bf558
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Sat Aug 25 01:04:23 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Mon Nov  5 18:25:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=51af5f53

Remove redundant default no setting

---
 gen_determineargs.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 7ad2bab..afc6fe3 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -103,7 +103,7 @@ determine_real_args() {
 	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 BOOL   ALLRAMDISKMODULES    CMD_ALLRAMDISKMODULES
 	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

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     e8779c232029711ad63942ed850b52c4e30d1c6c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  2 17:15:24 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Fri Nov  2 17:18:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=e8779c23

Bump version.

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

---
 genkernel |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/genkernel b/genkernel
index ca634d4..83fbb51 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.44.2'
+GK_V='3.4.45'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     e4af35fdfcd6115741982fe0371d1b6b5f8c6db4
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  5 18:32:08 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Mon Nov  5 18:32:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=e4af35fd

Make missing ZFS config file failures into warnings, bug #438200

Whenever /etc/zfs/{zdev.conf,zpool.cache} was missing, we would fail.
zpool.cache is not generated during cross compilation, which causes a
failure in Catalyst when building LiveCDs. Users that do not follow a
strict set of installation instructions can also suffer failures as a
consequence of this.

zpool.cache includes information about known pools that enables ZFS to
detect situations where an entire pool disappears. It is also required
to do pool import in corner cases, such as those those involving
file-based pools, and has the beneficial effect of reducing pool import
times.  Unconditional omission of zpool.cache in general is not an
option, but for the situations identified, it is okay to convert the
failure into a warning, which is what we do.

Reported-by: Rick Farina <zero_chaos <AT> gentoo.org>
Reported-by: Alexander Zubkov <green <AT> msu.ru>
Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 64e00e8..99bd3f3 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -410,7 +410,7 @@ append_zfs(){
 	for i in /etc/zfs/{zdev.conf,zpool.cache}
 	do
 		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" \
-			|| gen_die "Could not copy file ${i} for ZFS"
+			|| print_warning 1 "Could not copy file ${i} for ZFS"
 	done
 
 	# Copy binaries

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     f72ef39985a6905f9b694b98d71ae37f6be2c637
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Sun Nov 11 17:27:18 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Nov 11 17:27:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=f72ef399

Use busybox blkdid

Signed-off-by: Richard Yao <ryao <AT> cs.stonybrook.edu>

---
 gen_initramfs.sh |   22 ----------------------
 1 files changed, 0 insertions(+), 22 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 99bd3f3..14b24a3 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -145,26 +145,6 @@ append_e2fsprogs(){
 	rm -rf "${TEMP}"/initramfs-e2fsprogs-temp > /dev/null
 }
 
-append_blkid(){
-	if [ -d "${TEMP}/initramfs-blkid-temp" ]
-	then
-		rm -r "${TEMP}/initramfs-blkid-temp/"
-	fi
-	cd ${TEMP}
-	mkdir -p "${TEMP}/initramfs-blkid-temp/"
-
-	if [[ "${DISKLABEL}" = "1" ]]; then
-		copy_binaries "${TEMP}"/initramfs-blkid-temp/ /sbin/blkid
-	fi
-
-	cd "${TEMP}/initramfs-blkid-temp/"
-	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
-			|| gen_die "compressing blkid cpio"
-	cd "${TEMP}"
-	rm -rf "${TEMP}/initramfs-blkid-temp" > /dev/null
-}
-
 #append_fuse() {
 #	if [ -d "${TEMP}/initramfs-fuse-temp" ]
 #	then
@@ -780,8 +760,6 @@ create_initramfs() {
 
 	append_data 'zfs' "${ZFS}"
 
-	append_data 'blkid' "${DISKLABEL}"
-
 	append_data 'unionfs_fuse' "${UNIONFS}"
 
 	append_data 'splash' "${SPLASH}"

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     255b7ca420e889260e5a8303dda7372a0424186d
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Sun Nov 11 17:27:18 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Nov 11 17:59:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=255b7ca4

Use busybox blkid, bug #442024

Signed-off-by: Richard Yao <ryao <AT> cs.stonybrook.edu>

---
 gen_initramfs.sh |   40 +++++++++++++++++++---------------------
 1 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 99bd3f3..d9ae15f 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -145,25 +145,25 @@ append_e2fsprogs(){
 	rm -rf "${TEMP}"/initramfs-e2fsprogs-temp > /dev/null
 }
 
-append_blkid(){
-	if [ -d "${TEMP}/initramfs-blkid-temp" ]
-	then
-		rm -r "${TEMP}/initramfs-blkid-temp/"
-	fi
-	cd ${TEMP}
-	mkdir -p "${TEMP}/initramfs-blkid-temp/"
-
-	if [[ "${DISKLABEL}" = "1" ]]; then
-		copy_binaries "${TEMP}"/initramfs-blkid-temp/ /sbin/blkid
-	fi
-
-	cd "${TEMP}/initramfs-blkid-temp/"
-	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
-			|| gen_die "compressing blkid cpio"
-	cd "${TEMP}"
-	rm -rf "${TEMP}/initramfs-blkid-temp" > /dev/null
-}
+#append_blkid(){
+#	if [ -d "${TEMP}/initramfs-blkid-temp" ]
+#	then
+#		rm -r "${TEMP}/initramfs-blkid-temp/"
+#	fi
+#	cd ${TEMP}
+#	mkdir -p "${TEMP}/initramfs-blkid-temp/"
+#
+#	if [[ "${DISKLABEL}" = "1" ]]; then
+#		copy_binaries "${TEMP}"/initramfs-blkid-temp/ /sbin/blkid
+#	fi
+#
+#	cd "${TEMP}/initramfs-blkid-temp/"
+#	log_future_cpio_content
+#	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+#			|| gen_die "compressing blkid cpio"
+#	cd "${TEMP}"
+#	rm -rf "${TEMP}/initramfs-blkid-temp" > /dev/null
+#}
 
 #append_fuse() {
 #	if [ -d "${TEMP}/initramfs-fuse-temp" ]
@@ -780,8 +780,6 @@ create_initramfs() {
 
 	append_data 'zfs' "${ZFS}"
 
-	append_data 'blkid' "${DISKLABEL}"
-
 	append_data 'unionfs_fuse' "${UNIONFS}"
 
 	append_data 'splash' "${SPLASH}"

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     6cc7e382d6f5755257bce6f734e8991871dc7b02
Author:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
AuthorDate: Thu Feb  7 12:31:14 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sat Feb  9 21:47:01 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=6cc7e382

Make copy_binaries compatible with lddtree from pax-utils-0.6

On some system the output from the new lddtree does not match with what
genkernel expects, however lddtree have insted gained a new option that
essentially gives what we want with less code.

Signed-off-by: Peter Hjalmarsson <xake <AT> rymdraket.net>

---
 gen_initramfs.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 99bd3f3..3ae9d7a 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -33,13 +33,22 @@ copy_binaries() {
 		fi
 	done
 	# This must be OUTSIDE the for loop, we only want to run lddtree etc ONCE.
-	lddtree "$@" \
+	# lddtree does not have the -V (version) nor the -l (list) options prior to version 1.18
+	if lddtree -V > /dev/null 2>&1 ; then
+		lddtree -l "$@" \
+			| sort \
+			| uniq \
+			| cpio -p --make-directories --dereference --quiet "${destdir}" \
+			|| gen_die "Binary ${f} or some of its library dependencies could not be copied"
+	else
+		lddtree "$@" \
 			| tr ')(' '\n' \
 			| awk  '/=>/{ if($3 ~ /^\//){print $3}}' \
 			| sort \
 			| uniq \
 			| cpio -p --make-directories --dereference --quiet "${destdir}" \
 			|| gen_die "Binary ${f} or some of its library dependencies could not be copied"
+	fi
 }
 
 log_future_cpio_content() {

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     4733b318169415c111d029183c2bc181744b7858
Author:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
AuthorDate: Sun Mar  3 21:11:26 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 21:29:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=4733b318

Unify copy_binaries() more

As suggested by Vapier in bug #450688.

Signed-off-by: Peter Hjalmarsson <xake <AT> rymdraket.net>

---
 gen_initramfs.sh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 3ae9d7a..af6dff6 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -34,21 +34,18 @@ copy_binaries() {
 	done
 	# This must be OUTSIDE the for loop, we only want to run lddtree etc ONCE.
 	# lddtree does not have the -V (version) nor the -l (list) options prior to version 1.18
+	(
 	if lddtree -V > /dev/null 2>&1 ; then
-		lddtree -l "$@" \
-			| sort \
-			| uniq \
-			| cpio -p --make-directories --dereference --quiet "${destdir}" \
-			|| gen_die "Binary ${f} or some of its library dependencies could not be copied"
+		lddtree -l "$@"
 	else
 		lddtree "$@" \
 			| tr ')(' '\n' \
-			| awk  '/=>/{ if($3 ~ /^\//){print $3}}' \
+			| awk  '/=>/{ if($3 ~ /^\//){print $3}}'
+	fi ) \
 			| sort \
 			| uniq \
 			| cpio -p --make-directories --dereference --quiet "${destdir}" \
 			|| gen_die "Binary ${f} or some of its library dependencies could not be copied"
-	fi
 }
 
 log_future_cpio_content() {

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     cbee01a7f960a0ea76ad8ee3b1377f67ba44ac92
Author:     Fabio Erculiani <lxnay <AT> sabayon <DOT> org>
AuthorDate: Thu May  2 12:16:50 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Thu May  2 12:16:50 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=cbee01a7

gen_compile: fix iscsi module path install, s/RELEASE/KV

---
 gen_compile.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index ccc8b8d..aab2716 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -669,12 +669,12 @@ compile_iscsi() {
 		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/"
+		mkdir -p "${TEMP}/initramfs-iscsi-temp/lib/modules/${KV}/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/"
+				cp ${CMD_KERNEL_DIR}/drivers/scsi/${modname}.ko "${TEMP}/initramfs-iscsi-temp/lib/modules/${KV}/kernel/drivers/scsi/"
 			fi
 		done
 

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     ab56be6468b2594ad092d76787d3c7b9a012ec0d
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 23:35:48 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 23:43:04 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=ab56be64

Silence cp error when optional ZFS files are unavailable

Users were seeing the following error message printed:

cp: cannot stat ‘/etc/zfs/zdev.conf’: No such file or directory

Both zdev.conf and zpool.cache are optional files. We were supposed to
print a warning when they were absent, but cp printed its own error
whenever they were missing. We suppress that.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 427ffad..745e15a 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -429,7 +429,7 @@ append_zfs(){
 	# Copy files to /etc/zfs
 	for i in /etc/zfs/{zdev.conf,zpool.cache}
 	do
-		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" \
+		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
 			|| print_warning 1 "Could not copy file ${i} for ZFS"
 	done
 

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     9681b470ebb4dad1339b537950b154a54a21afe7
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 23:35:48 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 23:46:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=9681b470

Silence cp error when optional ZFS files are unavailable

Users were seeing the following error message printed:

cp: cannot stat ‘/etc/zfs/zdev.conf’: No such file or directory

Both zdev.conf and zpool.cache are optional files. We print a warning
when they are absent, but cp printed its own error in addition to our
warning. We suppress that.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 427ffad..745e15a 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -429,7 +429,7 @@ append_zfs(){
 	# Copy files to /etc/zfs
 	for i in /etc/zfs/{zdev.conf,zpool.cache}
 	do
-		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" \
+		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
 			|| print_warning 1 "Could not copy file ${i} for ZFS"
 	done
 

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     fa056924d69fceb3afc151e4294b5206d3a26c51
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 23:35:48 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 23:48:20 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=fa056924

Silence cp error when optional ZFS files are unavailable

Users were seeing the following error message printed:

cp: cannot stat ‘/etc/zfs/zdev.conf’: No such file or directory

Both zdev.conf and zpool.cache are optional files. We print a warning
when they are absent, but cp printed its own error in addition to our
warning. We suppress that.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 427ffad..745e15a 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -429,7 +429,7 @@ append_zfs(){
 	# Copy files to /etc/zfs
 	for i in /etc/zfs/{zdev.conf,zpool.cache}
 	do
-		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" \
+		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
 			|| print_warning 1 "Could not copy file ${i} for ZFS"
 	done
 

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     0fd94f46cdb5f07bc40f2e0b47390a73104ad7df
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  4 02:38:18 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Tue Jun  4 02:38:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=0fd94f46

Bump version to 3.4.46.1

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index c347ddc..7e33f38 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.46'
+GK_V='3.4.46.1'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     5a5b26e9c0d413e536fdff3c05f75e3141c77a6c
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Mon Jun  3 23:51:15 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 23:51:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=5a5b26e9

Bump version to 3.4.46

Signed-off-by: Richard Yao <ryao <AT> cs.stonybrook.edu>

---
 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 83fbb51..c347ddc 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.45'
+GK_V='3.4.46'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     ae7c4d44571fe382e2e2749cd1a19fd235685a27
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 03:06:12 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 03:35:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=ae7c4d44

Suppress grub2-mkconfig output

Every other tool that we run has its output suppressed, so lets be
consistent.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_bootloader.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index 5848bd2..c695cea 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -50,7 +50,7 @@ set_bootloader_grub2() {
 
 	print_info 1 "You can customize Grub2 parameters in /etc/default/grub."
 	print_info 1 "Running grub2-mkconfig to create ${GRUB_CONF}..."
-	grub2-mkconfig -o "${GRUB_CONF}"
+	grub2-mkconfig -o "${GRUB_CONF}" 2> /dev/null
 	[ "${BUILD_RAMDISK}" -ne 0 ] && sed -i 's/ro single/ro debug/' "${GRUB_CONF}"
 }
 

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     9e0f58b9b922f80f4dff6ca5dce7fb50e8bfd3ce
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 23:35:48 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 23:49:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=9e0f58b9

Silence cp error when optional ZFS files are unavailable

Users were seeing the following error message printed:

cp: cannot stat ‘/etc/zfs/zdev.conf’: No such file or directory

Both zdev.conf and zpool.cache are optional files. We print a warning
when they are absent, but cp printed its own error in addition to our
warning. We suppress that.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 427ffad..745e15a 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -429,7 +429,7 @@ append_zfs(){
 	# Copy files to /etc/zfs
 	for i in /etc/zfs/{zdev.conf,zpool.cache}
 	do
-		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" \
+		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
 			|| print_warning 1 "Could not copy file ${i} for ZFS"
 	done
 

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     7da09cd1aca4f65c4359629c40cbc821f893a6b7
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 03:14:18 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 03:35:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=7da09cd1

Remove duplicate files from initramfs

genkernel's initramfs image is built incrementally by appending to the
cpio file. The introduction of copy_binaries resulted in copying
libraries from the host system, which the cpio to include certain
libraries multiple times whenever different stages depended upon the
same library. We finalize the initramfs by first extracting it to a
temporary directory and then compressing it again. The extraction
eliminates the duplicate files.

This makes generated initramfs images smaller by approximately 240KB
(post compression) on my system. In theory, this should make the
initramfs load slightly faster.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 745e15a..6ad51c1 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -796,6 +796,20 @@ create_initramfs() {
 		append_data 'overlay'
 	fi
 
+	# Finalize cpio by removing duplicate files
+	print_info 1 "        >> Finalizing cpio"
+	local TDIR="${TEMP}/initramfs-final"
+	mkdir -p "${TDIR}"
+	cd "${TDIR}"
+
+	cpio --quiet -i -F "${CPIO}" 2> /dev/null \
+		|| gen_die "extracting cpio for finalization"
+	find . -print | cpio ${CPIO_ARGS} -F "${CPIO}" 2>/dev/null \
+		|| gen_die "recompressing cpio"
+
+	cd "${TEMP}"
+	rm -r "${TDIR}"
+
 	if isTrue "${INTEGRATED_INITRAMFS}"
 	then
 		# Explicitly do not compress if we are integrating into the kernel.

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     713b523abf4196ef97963cde973cccdce8609d46
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 03:14:18 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 03:51:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=713b523a

Remove duplicate files from initramfs

genkernel's initramfs image is built incrementally by appending to the
cpio file. The introduction of copy_binaries resulted in copying
libraries from the host system, which causes the cpio to include certain
libraries multiple times whenever different stages depended upon the
same library. We address this by extracting the cpio to a temporary
directory and then compressing it again to "finalize" it. The extraction
eliminates the duplicate files.

This makes generated initramfs images smaller by approximately 240KB
(post compression) on my system. In theory, this should make the
initramfs load slightly faster.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 745e15a..6ad51c1 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -796,6 +796,20 @@ create_initramfs() {
 		append_data 'overlay'
 	fi
 
+	# Finalize cpio by removing duplicate files
+	print_info 1 "        >> Finalizing cpio"
+	local TDIR="${TEMP}/initramfs-final"
+	mkdir -p "${TDIR}"
+	cd "${TDIR}"
+
+	cpio --quiet -i -F "${CPIO}" 2> /dev/null \
+		|| gen_die "extracting cpio for finalization"
+	find . -print | cpio ${CPIO_ARGS} -F "${CPIO}" 2>/dev/null \
+		|| gen_die "recompressing cpio"
+
+	cd "${TEMP}"
+	rm -r "${TDIR}"
+
 	if isTrue "${INTEGRATED_INITRAMFS}"
 	then
 		# Explicitly do not compress if we are integrating into the kernel.

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     0b4aae54598b05e25049093077e1a1e8c74754d1
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 03:14:18 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 05:52:57 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=0b4aae54

Remove duplicate files from initramfs

genkernel's initramfs image is built incrementally by appending to the
cpio file. The introduction of copy_binaries resulted in copying
libraries from the host system, which causes the cpio to include certain
libraries multiple times whenever different stages depended upon the
same library. We address this by extracting the cpio to a temporary
directory and then compressing it again to "finalize" it. The extraction
eliminates the duplicate files.

This makes generated initramfs images slightly smaller and in theory,
should make the initramfs load slightly faster.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 745e15a..6ad51c1 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -796,6 +796,20 @@ create_initramfs() {
 		append_data 'overlay'
 	fi
 
+	# Finalize cpio by removing duplicate files
+	print_info 1 "        >> Finalizing cpio"
+	local TDIR="${TEMP}/initramfs-final"
+	mkdir -p "${TDIR}"
+	cd "${TDIR}"
+
+	cpio --quiet -i -F "${CPIO}" 2> /dev/null \
+		|| gen_die "extracting cpio for finalization"
+	find . -print | cpio ${CPIO_ARGS} -F "${CPIO}" 2>/dev/null \
+		|| gen_die "recompressing cpio"
+
+	cd "${TEMP}"
+	rm -r "${TDIR}"
+
 	if isTrue "${INTEGRATED_INITRAMFS}"
 	then
 		# Explicitly do not compress if we are integrating into the kernel.

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     26dd05c7c47e06cd0d883714f41cc053209eb2cc
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 05:53:44 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 05:53:44 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=26dd05c7

Replace existing modules.* files with modules.dep.bb, bug #472312

Busybox has code that enables us to avoid using a modules.dep file at
the expense of some speed. It was found that it fails to get
dependencies correct, which prevents some modules from loading properly.
We switch to explicit generation of modules.dep.bb to resolve this. At
the same time, we remove various modules.* files that are not used by
busybox to save space. The inclusion of modules.dep.bb should make
module loading slightly faster. The removal of the modules.* should
make the initramfs slightly smaller.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 6ad51c1..7ff6ea0 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -796,7 +796,7 @@ create_initramfs() {
 		append_data 'overlay'
 	fi
 
-	# Finalize cpio by removing duplicate files
+	# Finalize cpio by removing duplicate files and generating modules.dep.bb
 	print_info 1 "        >> Finalizing cpio"
 	local TDIR="${TEMP}/initramfs-final"
 	mkdir -p "${TDIR}"
@@ -804,6 +804,23 @@ create_initramfs() {
 
 	cpio --quiet -i -F "${CPIO}" 2> /dev/null \
 		|| gen_die "extracting cpio for finalization"
+
+	# Remove unused modules.* files
+	rm "${TDIR}/lib/modules/${KV}/modules."*
+
+	# Hack to workaround broken `busybox depmod -b`
+	touch "${TDIR}/proc/modules"
+	if [ ${UID} -eq 0 ]
+	then
+		chroot "${TDIR}" /bin/busybox depmod "${KV}" \
+			|| gen_die "generating busybox modules.dep"
+
+	else
+			fakechroot fakeroot chroot "${TDIR}" /bin/busybox depmod "${KV}" \
+			|| gen_die "generating busybox modules.dep"
+	fi
+	rm "${TDIR}/proc/modules"
+
 	find . -print | cpio ${CPIO_ARGS} -F "${CPIO}" 2>/dev/null \
 		|| gen_die "recompressing cpio"
 

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     60081c578b0d0893b0faff12c820fb41c7abf8a6
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 06:07:48 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 06:08:35 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=60081c57

Update HACKING to use git-shortlog

The old command we used to generate a change history for announcement
emails no longer works, so we switch to git-shortlog.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 HACKING | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/HACKING b/HACKING
index 7ac0a60..d8b9f21 100644
--- a/HACKING
+++ b/HACKING
@@ -35,7 +35,7 @@ Rolling a release:
   <gentoo-genkernel@lists.gentoo.org> and <genkernel@gentoo.org>.
   Use
 
-    PREV_TAG=$(git tag -l | tail -n 2 | head -n 1)
-    git diff ${PREV_TAG}..v${PV} ChangeLog | /bin/grep '^+\($\|  \)' | sed 's|^+ *||' | xsel
+    PREV_TAG=$(git tag -l | tail -n 2 | head -n 1) \
+    git shortlog ${PREV_TAG}..v${PV} | xsel
 
   to generate the mail body.

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     eea69c00bd2d450a626a469ccb841edcec72f401
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 06:07:48 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 06:24:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=eea69c00

Update HACKING to use git-shortlog

The old command we used to generate a change history for announcement
emails no longer works, so we switch to git-shortlog.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 HACKING | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/HACKING b/HACKING
index 7ac0a60..d8b9f21 100644
--- a/HACKING
+++ b/HACKING
@@ -35,7 +35,7 @@ Rolling a release:
   <gentoo-genkernel@lists.gentoo.org> and <genkernel@gentoo.org>.
   Use
 
-    PREV_TAG=$(git tag -l | tail -n 2 | head -n 1)
-    git diff ${PREV_TAG}..v${PV} ChangeLog | /bin/grep '^+\($\|  \)' | sed 's|^+ *||' | xsel
+    PREV_TAG=$(git tag -l | tail -n 2 | head -n 1) \
+    git shortlog ${PREV_TAG}..v${PV} | xsel
 
   to generate the mail body.

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     3d2691807fe5edcfe2f47290a038ca0840ecc2c4
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 07:56:57 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 07:56:57 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=3d269180

Eliminate warnings about missing ZFS files

zpool.cache and zdev.conf are optional files, so instead of warning when
they are missing, we print a message when they are copied.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 6ad51c1..20bb1fd 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -424,13 +424,17 @@ append_zfs(){
 		rm -r "${TEMP}/initramfs-zfs-temp"
 	fi
 
-	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs/"
+	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs"
 
 	# Copy files to /etc/zfs
-	for i in /etc/zfs/{zdev.conf,zpool.cache}
+	for i in zdev.conf zpool.cache
 	do
-		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
-			|| print_warning 1 "Could not copy file ${i} for ZFS"
+		if [ -f /etc/zfs/${i} ]
+		then
+			print_info 1 "  >> Copying system ${i} into initramfs..."
+			cp -a "/etc/zfs/${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
+				|| gen_die "Could not copy file ${i} for ZFS"
+		fi
 	done
 
 	# Copy binaries

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     9d8ecf17fdab02852b831be6e5f613be88ad36a4
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Sun Jun  9 08:13:08 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 08:14:52 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=9d8ecf17

Revert "Make errors stand out more"

Having the debug shell appear whenever an error occurred was incredibly
useful. Commit 5a7bc18180612f5ada377be3df1ae20596ebfdac broke that, so
we revert it.

---
 gen_funcs.sh | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 4f0a0fc..2d47976 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -204,30 +204,29 @@ gen_die() {
 	then
 		print_error 1 "ERROR: ${1}"
 	fi
-	print_error 1 ''
-	print_error 1 "-- Grepping log... --"
-	print_error 1 ''
+	echo
+	print_info 1 "-- Grepping log... --"
+	echo
 
 	if isTrue ${USECOLOR}
 	then
-		GREP_COLOR='1' grep -B5 -E --colour=always "([Ww][Aa][Rr][Nn][Ii][Nn][Gg]|[Ee][Rr][Rr][Oo][Rr][ :,!]|[Ff][Aa][Ii][Ll][Ee]?[Dd]?)" ${LOGFILE} \
-				| sed -s "s|^\(*\)\?|${BAD}*${NORMAL}|"
+		GREP_COLOR='1' grep -B5 -E --colour=always "([Ww][Aa][Rr][Nn][Ii][Nn][Gg]|[Ee][Rr][Rr][Oo][Rr][ :,!]|[Ff][Aa][Ii][Ll][Ee]?[Dd]?)" ${LOGFILE}
 	else
 		grep -B5 -E "([Ww][Aa][Rr][Nn][Ii][Nn][Gg]|[Ee][Rr][Rr][Oo][Rr][ :,!]|[Ff][Aa][Ii][Ll][Ee]?[Dd]?)" ${LOGFILE}
 	fi
-	print_error 1 ''
-	print_error 1 "-- End log... --"
-	print_error 1 ''
-	print_error 1 "Please consult ${LOGFILE} for more information and any"
-	print_error 1 "errors that were reported above."
-	print_error 1 ''
-	print_error 1 "Report any genkernel bugs to bugs.gentoo.org and"
-	print_error 1 "assign your bug to genkernel@gentoo.org. Please include"
-	print_error 1 "as much information as you can in your bug report; attaching"
-	print_error 1 "${LOGFILE} so that your issue can be dealt with effectively."
-	print_error 1 ''
-	print_error 1 'Please do *not* report compilation failures as genkernel bugs!'
-	print_error 1 ''
+	echo
+	print_info 1 "-- End log... --"
+	echo
+	print_info 1 "Please consult ${LOGFILE} for more information and any"
+	print_info 1 "errors that were reported above."
+	echo
+	print_info 1 "Report any genkernel bugs to bugs.gentoo.org and"
+	print_info 1 "assign your bug to genkernel@gentoo.org. Please include"
+	print_info 1 "as much information as you can in your bug report; attaching"
+	print_info 1 "${LOGFILE} so that your issue can be dealt with effectively."
+	print_info 1 ''
+	print_info 1 'Please do *not* report compilation failures as genkernel bugs!'
+	print_info 1 ''
 
 	# Cleanup temp dirs and caches if requested
 	cleanup

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     e9a12c3259f26966a2348f1dd45ceed3d16e8e42
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 06:07:48 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 07:16:16 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=e9a12c32

Update HACKING to use git-shortlog

The old command we used to generate a change history for announcement
emails no longer works, so we switch to git-shortlog.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 HACKING | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/HACKING b/HACKING
index 7ac0a60..d8b9f21 100644
--- a/HACKING
+++ b/HACKING
@@ -35,7 +35,7 @@ Rolling a release:
   <gentoo-genkernel@lists.gentoo.org> and <genkernel@gentoo.org>.
   Use
 
-    PREV_TAG=$(git tag -l | tail -n 2 | head -n 1)
-    git diff ${PREV_TAG}..v${PV} ChangeLog | /bin/grep '^+\($\|  \)' | sed 's|^+ *||' | xsel
+    PREV_TAG=$(git tag -l | tail -n 2 | head -n 1) \
+    git shortlog ${PREV_TAG}..v${PV} | xsel
 
   to generate the mail body.

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     54ff7805ae6f5ed6f83542d2edb2996dfd751de4
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 03:06:12 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 07:16:16 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=54ff7805

Suppress grub2-mkconfig output

Every other tool that we run has its output suppressed, so lets be
consistent.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_bootloader.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index 5848bd2..c695cea 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -50,7 +50,7 @@ set_bootloader_grub2() {
 
 	print_info 1 "You can customize Grub2 parameters in /etc/default/grub."
 	print_info 1 "Running grub2-mkconfig to create ${GRUB_CONF}..."
-	grub2-mkconfig -o "${GRUB_CONF}"
+	grub2-mkconfig -o "${GRUB_CONF}" 2> /dev/null
 	[ "${BUILD_RAMDISK}" -ne 0 ] && sed -i 's/ro single/ro debug/' "${GRUB_CONF}"
 }
 

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     68230039aa1ecd76dcc7862620add7fe27d1bd9c
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Sun Jun  9 08:13:08 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 08:30:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=68230039

Revert "Make errors stand out more"

Having the debug shell appear whenever an error occurred was incredibly
useful. Commit 5a7bc18180612f5ada377be3df1ae20596ebfdac broke that, so
we revert it.

---
 gen_funcs.sh | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 4f0a0fc..2d47976 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -204,30 +204,29 @@ gen_die() {
 	then
 		print_error 1 "ERROR: ${1}"
 	fi
-	print_error 1 ''
-	print_error 1 "-- Grepping log... --"
-	print_error 1 ''
+	echo
+	print_info 1 "-- Grepping log... --"
+	echo
 
 	if isTrue ${USECOLOR}
 	then
-		GREP_COLOR='1' grep -B5 -E --colour=always "([Ww][Aa][Rr][Nn][Ii][Nn][Gg]|[Ee][Rr][Rr][Oo][Rr][ :,!]|[Ff][Aa][Ii][Ll][Ee]?[Dd]?)" ${LOGFILE} \
-				| sed -s "s|^\(*\)\?|${BAD}*${NORMAL}|"
+		GREP_COLOR='1' grep -B5 -E --colour=always "([Ww][Aa][Rr][Nn][Ii][Nn][Gg]|[Ee][Rr][Rr][Oo][Rr][ :,!]|[Ff][Aa][Ii][Ll][Ee]?[Dd]?)" ${LOGFILE}
 	else
 		grep -B5 -E "([Ww][Aa][Rr][Nn][Ii][Nn][Gg]|[Ee][Rr][Rr][Oo][Rr][ :,!]|[Ff][Aa][Ii][Ll][Ee]?[Dd]?)" ${LOGFILE}
 	fi
-	print_error 1 ''
-	print_error 1 "-- End log... --"
-	print_error 1 ''
-	print_error 1 "Please consult ${LOGFILE} for more information and any"
-	print_error 1 "errors that were reported above."
-	print_error 1 ''
-	print_error 1 "Report any genkernel bugs to bugs.gentoo.org and"
-	print_error 1 "assign your bug to genkernel@gentoo.org. Please include"
-	print_error 1 "as much information as you can in your bug report; attaching"
-	print_error 1 "${LOGFILE} so that your issue can be dealt with effectively."
-	print_error 1 ''
-	print_error 1 'Please do *not* report compilation failures as genkernel bugs!'
-	print_error 1 ''
+	echo
+	print_info 1 "-- End log... --"
+	echo
+	print_info 1 "Please consult ${LOGFILE} for more information and any"
+	print_info 1 "errors that were reported above."
+	echo
+	print_info 1 "Report any genkernel bugs to bugs.gentoo.org and"
+	print_info 1 "assign your bug to genkernel@gentoo.org. Please include"
+	print_info 1 "as much information as you can in your bug report; attaching"
+	print_info 1 "${LOGFILE} so that your issue can be dealt with effectively."
+	print_info 1 ''
+	print_info 1 'Please do *not* report compilation failures as genkernel bugs!'
+	print_info 1 ''
 
 	# Cleanup temp dirs and caches if requested
 	cleanup

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     d8e642c42a52f6ee72dec454d4db63c510a66ef6
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 07:56:57 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 08:30:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=d8e642c4

Eliminate warnings about missing ZFS files

zpool.cache and zdev.conf are optional files, so instead of warning when
they are missing, we print a message when they are copied.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 6ad51c1..20bb1fd 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -424,13 +424,17 @@ append_zfs(){
 		rm -r "${TEMP}/initramfs-zfs-temp"
 	fi
 
-	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs/"
+	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs"
 
 	# Copy files to /etc/zfs
-	for i in /etc/zfs/{zdev.conf,zpool.cache}
+	for i in zdev.conf zpool.cache
 	do
-		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
-			|| print_warning 1 "Could not copy file ${i} for ZFS"
+		if [ -f /etc/zfs/${i} ]
+		then
+			print_info 1 "  >> Copying system ${i} into initramfs..."
+			cp -a "/etc/zfs/${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
+				|| gen_die "Could not copy file ${i} for ZFS"
+		fi
 	done
 
 	# Copy binaries

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     888315b03fa99c6c4f7f6b60949722d215eb21f3
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 03:14:18 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 08:30:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=888315b0

Remove duplicate files from initramfs

genkernel's initramfs image is built incrementally by appending to the
cpio file. The introduction of copy_binaries resulted in copying
libraries from the host system, which causes the cpio to include certain
libraries multiple times whenever different stages depended upon the
same library. We address this by extracting the cpio to a temporary
directory and then compressing it again to "finalize" it. The extraction
eliminates the duplicate files.

This makes generated initramfs images slightly smaller and in theory,
should make the initramfs load slightly faster.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 745e15a..6ad51c1 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -796,6 +796,20 @@ create_initramfs() {
 		append_data 'overlay'
 	fi
 
+	# Finalize cpio by removing duplicate files
+	print_info 1 "        >> Finalizing cpio"
+	local TDIR="${TEMP}/initramfs-final"
+	mkdir -p "${TDIR}"
+	cd "${TDIR}"
+
+	cpio --quiet -i -F "${CPIO}" 2> /dev/null \
+		|| gen_die "extracting cpio for finalization"
+	find . -print | cpio ${CPIO_ARGS} -F "${CPIO}" 2>/dev/null \
+		|| gen_die "recompressing cpio"
+
+	cd "${TEMP}"
+	rm -r "${TDIR}"
+
 	if isTrue "${INTEGRATED_INITRAMFS}"
 	then
 		# Explicitly do not compress if we are integrating into the kernel.

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     479ecbeb7892983cd313e38b6a2ad0c6effbd404
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 07:56:57 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 09:48:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=479ecbeb

Eliminate warnings about missing ZFS files

zpool.cache and zdev.conf are optional files, so instead of warning when
they are missing, we print a message when they are copied.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 6ad51c1..fb1e633 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -424,13 +424,17 @@ append_zfs(){
 		rm -r "${TEMP}/initramfs-zfs-temp"
 	fi
 
-	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs/"
+	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs"
 
 	# Copy files to /etc/zfs
-	for i in /etc/zfs/{zdev.conf,zpool.cache}
+	for i in zdev.conf zpool.cache
 	do
-		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
-			|| print_warning 1 "Could not copy file ${i} for ZFS"
+		if [ -f /etc/zfs/${i} ]
+		then
+			print_info 1 "        >> Copying system ${i} into initramfs..."
+			cp -a "/etc/zfs/${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
+				|| gen_die "Could not copy file ${i} for ZFS"
+		fi
 	done
 
 	# Copy binaries

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     15270edd1937717c6f69bf7734e2e0b72a79daa5
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 07:56:57 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 09:51:10 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=15270edd

Eliminate warnings about missing ZFS files

zpool.cache and zdev.conf are optional files, so instead of warning when
they are missing, we print a message when they are copied.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 6ad51c1..872c705 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -424,13 +424,17 @@ append_zfs(){
 		rm -r "${TEMP}/initramfs-zfs-temp"
 	fi
 
-	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs/"
+	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs"
 
 	# Copy files to /etc/zfs
-	for i in /etc/zfs/{zdev.conf,zpool.cache}
+	for i in zdev.conf zpool.cache
 	do
-		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
-			|| print_warning 1 "Could not copy file ${i} for ZFS"
+		if [ -f /etc/zfs/${i} ]
+		then
+			print_info 1 "        >> Including ${i}..."
+			cp -a "/etc/zfs/${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
+				|| gen_die "Could not copy file ${i} for ZFS"
+		fi
 	done
 
 	# Copy binaries

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     92d37df9f1d494bc1595e60114affeca0e7e9c95
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 07:56:57 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 09:52:52 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=92d37df9

Eliminate warnings about missing ZFS files

zpool.cache and zdev.conf are optional files, so instead of warning when
they are missing, we print a message when they are copied.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 6ad51c1..872c705 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -424,13 +424,17 @@ append_zfs(){
 		rm -r "${TEMP}/initramfs-zfs-temp"
 	fi
 
-	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs/"
+	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs"
 
 	# Copy files to /etc/zfs
-	for i in /etc/zfs/{zdev.conf,zpool.cache}
+	for i in zdev.conf zpool.cache
 	do
-		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
-			|| print_warning 1 "Could not copy file ${i} for ZFS"
+		if [ -f /etc/zfs/${i} ]
+		then
+			print_info 1 "        >> Including ${i}..."
+			cp -a "/etc/zfs/${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
+				|| gen_die "Could not copy file ${i} for ZFS"
+		fi
 	done
 
 	# Copy binaries

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     1fcb9b57fc6e2cf923c4486371de2c443a57290a
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 07:56:57 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 09:57:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=1fcb9b57

Eliminate warnings about missing ZFS files

zpool.cache and zdev.conf are optional files, so instead of warning when
they are missing, we print a message when they are copied.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 6ad51c1..ff7ae0e 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -424,13 +424,17 @@ append_zfs(){
 		rm -r "${TEMP}/initramfs-zfs-temp"
 	fi
 
-	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs/"
+	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs"
 
 	# Copy files to /etc/zfs
-	for i in /etc/zfs/{zdev.conf,zpool.cache}
+	for i in zdev.conf zpool.cache
 	do
-		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
-			|| print_warning 1 "Could not copy file ${i} for ZFS"
+		if [ -f /etc/zfs/${i} ]
+		then
+			print_info 1 "        >> Including ${i}"
+			cp -a "/etc/zfs/${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
+				|| gen_die "Could not copy file ${i} for ZFS"
+		fi
 	done
 
 	# Copy binaries

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     b4cccb138ec881c3c1e0610873d0a8a2f6a580fa
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 03:14:18 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 09:57:36 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b4cccb13

Remove duplicate files from initramfs

genkernel's initramfs image is built incrementally by appending to the
cpio file. The introduction of copy_binaries resulted in copying
libraries from the host system, which causes the cpio to include certain
libraries multiple times whenever different stages depended upon the
same library. We address this by extracting the cpio to a temporary
directory and then compressing it again to "finalize" it. The extraction
eliminates the duplicate files.

This makes generated initramfs images slightly smaller and in theory,
should make the initramfs load slightly faster.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 9b354a4..f53f528 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -800,6 +800,20 @@ create_initramfs() {
 		append_data 'overlay'
 	fi
 
+	# Finalize cpio by removing duplicate files
+	print_info 1 "        >> Finalizing cpio..."
+	local TDIR="${TEMP}/initramfs-final"
+	mkdir -p "${TDIR}"
+	cd "${TDIR}"
+
+	cpio --quiet -i -F "${CPIO}" 2> /dev/null \
+		|| gen_die "extracting cpio for finalization"
+	find . -print | cpio ${CPIO_ARGS} -F "${CPIO}" 2>/dev/null \
+		|| gen_die "recompressing cpio"
+
+	cd "${TEMP}"
+	rm -r "${TDIR}"
+
 	if isTrue "${INTEGRATED_INITRAMFS}"
 	then
 		# Explicitly do not compress if we are integrating into the kernel.

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     5d6b4b94a3bebb48707e13feed7cbda6a491ea14
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 07:56:57 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 09:57:24 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=5d6b4b94

Eliminate warnings about missing ZFS files

zpool.cache and zdev.conf are optional files, so instead of warning when
they are missing, we print a message when they are copied.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 745e15a..9b354a4 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -424,13 +424,17 @@ append_zfs(){
 		rm -r "${TEMP}/initramfs-zfs-temp"
 	fi
 
-	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs/"
+	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs"
 
 	# Copy files to /etc/zfs
-	for i in /etc/zfs/{zdev.conf,zpool.cache}
+	for i in zdev.conf zpool.cache
 	do
-		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
-			|| print_warning 1 "Could not copy file ${i} for ZFS"
+		if [ -f /etc/zfs/${i} ]
+		then
+			print_info 1 "        >> Including ${i}"
+			cp -a "/etc/zfs/${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
+				|| gen_die "Could not copy file ${i} for ZFS"
+		fi
 	done
 
 	# Copy binaries

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     cd3f115e095f49498e8115f284418ff49126a41f
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 03:14:18 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 10:01:36 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=cd3f115e

Remove duplicate files from initramfs

genkernel's initramfs image is built incrementally by appending to the
cpio file. The introduction of copy_binaries resulted in copying
libraries from the host system, which causes the cpio to include certain
libraries multiple times whenever different stages depended upon the
same library. We address this by extracting the cpio to a temporary
directory and then compressing it again to "finalize" it. The extraction
eliminates the duplicate files.

This makes generated initramfs images slightly smaller and in theory,
should make the initramfs load slightly faster.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 9b354a4..f53f528 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -800,6 +800,20 @@ create_initramfs() {
 		append_data 'overlay'
 	fi
 
+	# Finalize cpio by removing duplicate files
+	print_info 1 "        >> Finalizing cpio..."
+	local TDIR="${TEMP}/initramfs-final"
+	mkdir -p "${TDIR}"
+	cd "${TDIR}"
+
+	cpio --quiet -i -F "${CPIO}" 2> /dev/null \
+		|| gen_die "extracting cpio for finalization"
+	find . -print | cpio ${CPIO_ARGS} -F "${CPIO}" 2>/dev/null \
+		|| gen_die "recompressing cpio"
+
+	cd "${TEMP}"
+	rm -r "${TDIR}"
+
 	if isTrue "${INTEGRATED_INITRAMFS}"
 	then
 		# Explicitly do not compress if we are integrating into the kernel.

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     3c588f6e15c18bb05a6e719aff864781525025d9
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 07:56:57 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 10:01:35 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=3c588f6e

Eliminate warnings about missing ZFS files

zpool.cache and zdev.conf are optional files, so instead of warning when
they are missing, we print a message when they are copied.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 745e15a..9b354a4 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -424,13 +424,17 @@ append_zfs(){
 		rm -r "${TEMP}/initramfs-zfs-temp"
 	fi
 
-	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs/"
+	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs"
 
 	# Copy files to /etc/zfs
-	for i in /etc/zfs/{zdev.conf,zpool.cache}
+	for i in zdev.conf zpool.cache
 	do
-		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
-			|| print_warning 1 "Could not copy file ${i} for ZFS"
+		if [ -f /etc/zfs/${i} ]
+		then
+			print_info 1 "        >> Including ${i}"
+			cp -a "/etc/zfs/${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
+				|| gen_die "Could not copy file ${i} for ZFS"
+		fi
 	done
 
 	# Copy binaries

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     141fcef83e97dddc7f538035d96c88484f35ee14
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 03:14:18 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 10:05:18 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=141fcef8

Remove duplicate files from initramfs

genkernel's initramfs image is built incrementally by appending to the
cpio file. The introduction of copy_binaries resulted in copying
libraries from the host system, which causes the cpio to include certain
libraries multiple times whenever different stages depended upon the
same library. We address this by extracting the cpio to a temporary
directory and then compressing it again to "finalize" it. The extraction
eliminates the duplicate files.

This makes generated initramfs images slightly smaller and in theory,
should make the initramfs load slightly faster.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 9b354a4..f53f528 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -800,6 +800,20 @@ create_initramfs() {
 		append_data 'overlay'
 	fi
 
+	# Finalize cpio by removing duplicate files
+	print_info 1 "        >> Finalizing cpio..."
+	local TDIR="${TEMP}/initramfs-final"
+	mkdir -p "${TDIR}"
+	cd "${TDIR}"
+
+	cpio --quiet -i -F "${CPIO}" 2> /dev/null \
+		|| gen_die "extracting cpio for finalization"
+	find . -print | cpio ${CPIO_ARGS} -F "${CPIO}" 2>/dev/null \
+		|| gen_die "recompressing cpio"
+
+	cd "${TEMP}"
+	rm -r "${TDIR}"
+
 	if isTrue "${INTEGRATED_INITRAMFS}"
 	then
 		# Explicitly do not compress if we are integrating into the kernel.

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     569e6c8d0227908cd0535f79063df1c99b9c7088
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 07:56:57 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 10:05:18 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=569e6c8d

Eliminate warnings about missing ZFS files

zpool.cache and zdev.conf are optional files, so instead of warning when
they are missing, we print a message when they are copied.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 745e15a..9b354a4 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -424,13 +424,17 @@ append_zfs(){
 		rm -r "${TEMP}/initramfs-zfs-temp"
 	fi
 
-	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs/"
+	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs"
 
 	# Copy files to /etc/zfs
-	for i in /etc/zfs/{zdev.conf,zpool.cache}
+	for i in zdev.conf zpool.cache
 	do
-		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
-			|| print_warning 1 "Could not copy file ${i} for ZFS"
+		if [ -f /etc/zfs/${i} ]
+		then
+			print_info 1 "        >> Including ${i}"
+			cp -a "/etc/zfs/${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
+				|| gen_die "Could not copy file ${i} for ZFS"
+		fi
 	done
 
 	# Copy binaries

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     80257cbd5c8219053f30da50cb33dd75906f927f
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 07:56:57 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 13:16:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=80257cbd

Eliminate warnings about missing ZFS files

zpool.cache and zdev.conf are optional files, so instead of warning when
they are missing, we print a message when they are copied.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index d76aa55..f53f528 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -424,13 +424,17 @@ append_zfs(){
 		rm -r "${TEMP}/initramfs-zfs-temp"
 	fi
 
-	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs/"
+	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs"
 
 	# Copy files to /etc/zfs
-	for i in /etc/zfs/{zdev.conf,zpool.cache}
+	for i in zdev.conf zpool.cache
 	do
-		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
-			|| print_warning 1 "Could not copy file ${i} for ZFS"
+		if [ -f /etc/zfs/${i} ]
+		then
+			print_info 1 "        >> Including ${i}"
+			cp -a "/etc/zfs/${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
+				|| gen_die "Could not copy file ${i} for ZFS"
+		fi
 	done
 
 	# Copy binaries

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     7d962cfb9904419a9a31b4b5a8d572f49afe2682
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 03:14:18 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 13:16:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=7d962cfb

Remove duplicate files from initramfs

genkernel's initramfs image is built incrementally by appending to the
cpio file. The introduction of copy_binaries resulted in copying
libraries from the host system, which causes the cpio to include certain
libraries multiple times whenever different stages depended upon the
same library. We address this by extracting the cpio to a temporary
directory and then compressing it again to "finalize" it. The extraction
eliminates the duplicate files.

This makes generated initramfs images slightly smaller and in theory,
should make the initramfs load slightly faster.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 745e15a..d76aa55 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -796,6 +796,20 @@ create_initramfs() {
 		append_data 'overlay'
 	fi
 
+	# Finalize cpio by removing duplicate files
+	print_info 1 "        >> Finalizing cpio..."
+	local TDIR="${TEMP}/initramfs-final"
+	mkdir -p "${TDIR}"
+	cd "${TDIR}"
+
+	cpio --quiet -i -F "${CPIO}" 2> /dev/null \
+		|| gen_die "extracting cpio for finalization"
+	find . -print | cpio ${CPIO_ARGS} -F "${CPIO}" 2>/dev/null \
+		|| gen_die "recompressing cpio"
+
+	cd "${TEMP}"
+	rm -r "${TDIR}"
+
 	if isTrue "${INTEGRATED_INITRAMFS}"
 	then
 		# Explicitly do not compress if we are integrating into the kernel.

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     86e8b9cc1e08e410486242bcee3e58ff570b2750
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 03:14:18 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 13:24:55 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=86e8b9cc

Remove duplicate files from initramfs

genkernel's initramfs image is built incrementally by appending to the
cpio file. The introduction of copy_binaries resulted in copying
libraries from the host system, which causes the cpio to include certain
libraries multiple times whenever different stages depended upon the
same library. We address this by extracting the cpio to a temporary
directory and then compressing it again to "finalize" it. The extraction
eliminates the duplicate files.

This makes generated initramfs images slightly smaller and in theory,
should make the initramfs load slightly faster.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 745e15a..d76aa55 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -796,6 +796,20 @@ create_initramfs() {
 		append_data 'overlay'
 	fi
 
+	# Finalize cpio by removing duplicate files
+	print_info 1 "        >> Finalizing cpio..."
+	local TDIR="${TEMP}/initramfs-final"
+	mkdir -p "${TDIR}"
+	cd "${TDIR}"
+
+	cpio --quiet -i -F "${CPIO}" 2> /dev/null \
+		|| gen_die "extracting cpio for finalization"
+	find . -print | cpio ${CPIO_ARGS} -F "${CPIO}" 2>/dev/null \
+		|| gen_die "recompressing cpio"
+
+	cd "${TEMP}"
+	rm -r "${TDIR}"
+
 	if isTrue "${INTEGRATED_INITRAMFS}"
 	then
 		# Explicitly do not compress if we are integrating into the kernel.

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     add2463a5e8056a04005842e5a22c29e3e4b467a
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 07:56:57 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 13:24:55 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=add2463a

Eliminate warnings about missing ZFS files

zpool.cache and zdev.conf are optional files, so instead of warning when
they are missing, we print a message when they are copied.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index d76aa55..f53f528 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -424,13 +424,17 @@ append_zfs(){
 		rm -r "${TEMP}/initramfs-zfs-temp"
 	fi
 
-	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs/"
+	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs"
 
 	# Copy files to /etc/zfs
-	for i in /etc/zfs/{zdev.conf,zpool.cache}
+	for i in zdev.conf zpool.cache
 	do
-		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
-			|| print_warning 1 "Could not copy file ${i} for ZFS"
+		if [ -f /etc/zfs/${i} ]
+		then
+			print_info 1 "        >> Including ${i}"
+			cp -a "/etc/zfs/${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
+				|| gen_die "Could not copy file ${i} for ZFS"
+		fi
 	done
 
 	# Copy binaries

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     3851e0653f342668e7911d58c0214dcea6d61b3c
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 07:56:57 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 13:47:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=3851e065

Eliminate warnings about missing ZFS files

zpool.cache and zdev.conf are optional files, so instead of warning when
they are missing, we print a message when they are copied.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 745e15a..9b354a4 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -424,13 +424,17 @@ append_zfs(){
 		rm -r "${TEMP}/initramfs-zfs-temp"
 	fi
 
-	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs/"
+	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs"
 
 	# Copy files to /etc/zfs
-	for i in /etc/zfs/{zdev.conf,zpool.cache}
+	for i in zdev.conf zpool.cache
 	do
-		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
-			|| print_warning 1 "Could not copy file ${i} for ZFS"
+		if [ -f /etc/zfs/${i} ]
+		then
+			print_info 1 "        >> Including ${i}"
+			cp -a "/etc/zfs/${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
+				|| gen_die "Could not copy file ${i} for ZFS"
+		fi
 	done
 
 	# Copy binaries

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     421478ef64c3f543ff7841d90102dfe3849fcf3d
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 03:14:18 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 13:55:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=421478ef

Remove duplicate files from initramfs

genkernel's initramfs image is built incrementally by appending to the
cpio file. The introduction of copy_binaries resulted in copying
libraries from the host system, which causes the cpio to include certain
libraries multiple times whenever different stages depended upon the
same library. We address this by extracting the cpio to a temporary
directory and then compressing it again to "finalize" it. The extraction
eliminates the duplicate files.

This makes generated initramfs images slightly smaller and in theory,
should make the initramfs load slightly faster.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 9b354a4..f53f528 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -800,6 +800,20 @@ create_initramfs() {
 		append_data 'overlay'
 	fi
 
+	# Finalize cpio by removing duplicate files
+	print_info 1 "        >> Finalizing cpio..."
+	local TDIR="${TEMP}/initramfs-final"
+	mkdir -p "${TDIR}"
+	cd "${TDIR}"
+
+	cpio --quiet -i -F "${CPIO}" 2> /dev/null \
+		|| gen_die "extracting cpio for finalization"
+	find . -print | cpio ${CPIO_ARGS} -F "${CPIO}" 2>/dev/null \
+		|| gen_die "recompressing cpio"
+
+	cd "${TEMP}"
+	rm -r "${TDIR}"
+
 	if isTrue "${INTEGRATED_INITRAMFS}"
 	then
 		# Explicitly do not compress if we are integrating into the kernel.

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     f40842d6b6565aeb9df673efd88578b545056e53
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 03:14:18 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 13:56:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=f40842d6

Remove duplicate files from initramfs

genkernel's initramfs image is built incrementally by appending to the
cpio file. The introduction of copy_binaries resulted in copying
libraries from the host system, which causes the cpio to include certain
libraries multiple times whenever different stages depended upon the
same library. We address this by extracting the cpio to a temporary
directory and then compressing it again to "finalize" it. The extraction
eliminates the duplicate files.

This makes generated initramfs images slightly smaller and in theory,
should make the initramfs load slightly faster.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 9b354a4..f53f528 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -800,6 +800,20 @@ create_initramfs() {
 		append_data 'overlay'
 	fi
 
+	# Finalize cpio by removing duplicate files
+	print_info 1 "        >> Finalizing cpio..."
+	local TDIR="${TEMP}/initramfs-final"
+	mkdir -p "${TDIR}"
+	cd "${TDIR}"
+
+	cpio --quiet -i -F "${CPIO}" 2> /dev/null \
+		|| gen_die "extracting cpio for finalization"
+	find . -print | cpio ${CPIO_ARGS} -F "${CPIO}" 2>/dev/null \
+		|| gen_die "recompressing cpio"
+
+	cd "${TEMP}"
+	rm -r "${TDIR}"
+
 	if isTrue "${INTEGRATED_INITRAMFS}"
 	then
 		# Explicitly do not compress if we are integrating into the kernel.

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     02bee767c7de4d7357b4c9dd70912670e93a1497
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 15:20:53 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 15:20:53 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=02bee767

Detect grub2-mkconfig failure

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_bootloader.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index c695cea..b9ec14d 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -50,7 +50,7 @@ set_bootloader_grub2() {
 
 	print_info 1 "You can customize Grub2 parameters in /etc/default/grub."
 	print_info 1 "Running grub2-mkconfig to create ${GRUB_CONF}..."
-	grub2-mkconfig -o "${GRUB_CONF}" 2> /dev/null
+	grub2-mkconfig -o "${GRUB_CONF}" 2> /dev/null || gen_die "grub2-mkconfig failed"
 	[ "${BUILD_RAMDISK}" -ne 0 ] && sed -i 's/ro single/ro debug/' "${GRUB_CONF}"
 }
 

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     8fe9c58c7d7bb203cbf11b0e340be7ac7c4da056
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 14:25:51 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 14:25:51 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=8fe9c58c

Include zdb in initramfs

zdb is useful for debugging during early boot.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index f53f528..3047470 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -438,7 +438,7 @@ append_zfs(){
 	done
 
 	# Copy binaries
-	copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zfs,zpool}
+	copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zdb,zfs,zpool}
 
 	cd "${TEMP}/initramfs-zfs-temp/"
 	log_future_cpio_content

[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     7b9bce67a20ba2fde7e2c08247d359e03bf8e429
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 26 21:32:09 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Mon Aug 26 21:54:59 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=7b9bce67

Copy ld.so.conf and friends when copy_binaries is used

This fixes "error while loading shared libraries libgcc_s.so.1 cannot
open shared object file" when attempting to import a root pool on ARM.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 3047470..40318a2 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 # $Id$
 
+COPY_BINARIES=false
 CPIO_ARGS="--quiet -o -H newc"
 
 # The copy_binaries function is explicitly released under the CC0 license to
@@ -24,6 +25,8 @@ copy_binaries() {
 	local destdir=$1
 	shift
 
+	COPY_BINARIES=true
+
 	for binary in "$@"; do
 		[[ -e "${binary}" ]] \
 				|| gen_die "Binary ${binary} could not be found"
@@ -448,6 +451,28 @@ append_zfs(){
 	rm -rf "${TEMP}/initramfs-zfs-temp" > /dev/null
 }
 
+append_linker() {
+	if [ -d "${TEMP}/initramfs-linker-temp" ]
+	then
+		rm -r "${TEMP}/initramfs-linker-temp"
+	fi
+
+	mkdir -p "${TEMP}/initramfs-linker-temp/etc/ld.so.conf.d"
+
+	cp "/etc/ld.so."{cache,conf} "${TEMP}/initramfs-linker-temp/etc/" 2> /dev/null \
+		|| gen_die "Could not copy ld.so.{cache,conf}"
+
+	cp -r "/etc/ld.so.conf.d" "${TEMP}/initramfs-linker-temp/etc/" 2> /dev/null \
+		|| gen_die "Could not copy ld.so.conf.d"
+
+	cd "${TEMP}/initramfs-linker-temp/"
+	log_future_cpio_content
+	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+			|| gen_die "compressing linker cpio"
+	cd "${TEMP}"
+	rm -rf "${TEMP}/initramfs-linker-temp" > /dev/null
+}
+
 append_splash(){
 	splash_geninitramfs=`which splash_geninitramfs 2>/dev/null`
 	if [ -x "${splash_geninitramfs}" ]
@@ -800,6 +825,11 @@ create_initramfs() {
 		append_data 'overlay'
 	fi
 
+	if ${COPY_BINARIES}
+	then
+		append_data 'linker'
+	fi
+
 	# Finalize cpio by removing duplicate files
 	print_info 1 "        >> Finalizing cpio..."
 	local TDIR="${TEMP}/initramfs-final"