[gentoo-commits] proj/genkernel:debug-build commit in: /

[gentoo-commits] proj/genkernel:debug-build commit in: /

[Robin H. Johnson]

commit:     4f0697afaa4a62ab391bafc604fe5cb17a73ef46
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 13 21:43:25 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 13 21:43:25 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=4f0697af

Fix LVM build as non-root.

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

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

diff --git a/gen_compile.sh b/gen_compile.sh
index f0f8fee..7e85a86 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -470,9 +470,8 @@ compile_lvm() {
 		print_info 1 'lvm: >> Compiling...'
 		compile_generic '' utils
 		compile_generic "install DESTDIR=${TEMP}/lvm/" utils
-		echo "Finding static"
-		find ${TEMP}/lvm -name '*static'
-		echo "Done finding static"
+		# For some bizzare reason, upstream does u-w on files, and this breaks stuff.
+		chmod -R u+w "${TEMP}/lvm/"
 
 		cd "${TEMP}/lvm"
 		mkdir -p "${TEMP}/lvm/sbin"
@@ -480,7 +479,6 @@ compile_lvm() {
 		pwd
 		${UTILS_CROSS_COMPILE}strip "sbin/lvm.static" ||
 			gen_die 'Could not strip lvm.static!'
-		exit 99
 		# See bug 382555
 		${UTILS_CROSS_COMPILE}strip "sbin/dmsetup.static" ||
 			gen_die 'Could not strip dmsetup.static'

[gentoo-commits] proj/genkernel:debug-build commit in: /

[Robin H. Johnson]

commit:     5898cdcd94a03b344ec1da90102e90236975840e
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 13 21:43:41 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 13 21:43:41 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=5898cdcd

Fix MDADM_CONFIG missing message.

Signed-off-by: Robin H. Johnson <robbat2 <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 5ac9ac1..61f0c41 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -396,7 +396,7 @@ append_mdadm(){
 				cp -a "${MDADM_CONFIG}" "${TEMP}/initramfs-mdadm-temp/etc/mdadm.conf" \
 				|| gen_die "Could not copy mdadm.conf!"
 			else
-				gen_die 'sl${MDADM_CONFIG} does not exist!'
+				gen_die "${MDADM_CONFIG} does not exist!"
 			fi
 		else
 			print_info 1 '		MDADM: Skipping inclusion of mdadm.conf'

[gentoo-commits] proj/genkernel:debug-build commit in: /

[Robin H. Johnson]

commit:     5b079a52bf439ee9af3edd25e6d0229fa97ce17d
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 13 23:01:25 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 13 23:01:25 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=5b079a52

Make it possible to turn off all of the on-exit cleanup.

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

---
 gen_cmdline.sh       |  6 ++++++
 gen_determineargs.sh |  1 +
 genkernel            | 37 ++++++++++++++++++++++---------------
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 715ad49..7bee618 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -22,6 +22,8 @@ longusage() {
   echo "	--logfile=<outfile>	Output file for debug info"
   echo "	--color			Output debug in color"
   echo "	--no-color		Do not output debug in color"
+  echo "	--debug-cleanup	Clean up temporary build directories on exit"
+  echo "	--no-debug-cleanup	Do not remove any temporary directories on exit"
   echo "  Kernel Configuration settings"
   echo "	--menuconfig		Run menuconfig after oldconfig"
   echo "	--no-menuconfig		Do not run menuconfig after oldconfig"
@@ -471,6 +473,10 @@ parse_cmdline() {
 			print_info 2 "USECOLOR: ${USECOLOR}"
 			setColorVars
 			;;
+		--debug-cleanup|--no-debug-cleanup)
+			CMD_DEBUGCLEANUP=`parse_optbool "$*"`
+			print_info 2 "DEBUGCLEANUP: ${DEBUGCLEANUP}"
+			;;
 		--logfile=*)
 			CMD_LOGFILE=`parse_opt "$*"`
 			LOGFILE=`parse_opt "$*"`

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index e0c9984..615f274 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -136,6 +136,7 @@ determine_real_args() {
 	set_config_with_override BOOL   DOKEYMAPAUTO         CMD_DOKEYMAPAUTO
 	set_config_with_override STRING BUSYBOX_CONFIG       CMD_BUSYBOX_CONFIG
 	set_config_with_override BOOL   INSTALL              CMD_INSTALL              "yes"
+	set_config_with_override BOOL   DEBUGCLEANUP         CMD_DEBUGCLEANUP         "yes"
 
 	BOOTDIR=`arch_replace "${BOOTDIR}"`
 	BOOTDIR=${BOOTDIR%/}    # Remove any trailing slash

diff --git a/genkernel b/genkernel
index b62c3f7..f10cd49 100755
--- a/genkernel
+++ b/genkernel
@@ -61,21 +61,28 @@ trap_cleanup(){
 }
 
 cleanup(){
-    if [ -n "$TEMP" -a -d "$TEMP" ]; then
-	rm -rf "$TEMP"
-    fi
-
-    if isTrue ${POSTCLEAR}
-    then
-	    echo
-	    print_info 1 'RUNNING FINAL CACHE/TMP CLEANUP'
-	    print_info 1 "CACHE_DIR: ${CACHE_DIR}"
-	    CLEAR_CACHE_DIR='yes'
-	    setup_cache_dir
-	    echo
-	    print_info 1 "TMPDIR: ${TMPDIR}"
-	    clear_tmpdir
-	    fi
+	if [ "${CMD_DEBUGCLEANUP}" == "no" ]; then
+		print_info 1 "Not running any cleanup per DEBUGCLEANUP"
+		print_info 1 "TEMP: ${TEMP}"
+		print_info 1 "CACHE_DIR: ${CACHE_DIR}"
+		print_info 1 "TMPDIR: ${TMPDIR}"
+	else
+		if [ -n "$TEMP" -a -d "$TEMP" ]; then
+			rm -rf "$TEMP"
+		fi
+
+		if isTrue ${POSTCLEAR}
+		then
+			echo
+			print_info 1 'RUNNING FINAL CACHE/TMP CLEANUP'
+			print_info 1 "CACHE_DIR: ${CACHE_DIR}"
+			CLEAR_CACHE_DIR='yes'
+			setup_cache_dir
+			echo
+			print_info 1 "TMPDIR: ${TMPDIR}"
+			clear_tmpdir
+		fi
+	fi
 }
 
 trap trap_cleanup SIGHUP SIGQUIT SIGINT SIGTERM SIGKILL

[gentoo-commits] proj/genkernel:debug-build commit in: /

[Robin H. Johnson]

commit:     81b2d47d33f0973556e88975fbcc66b442c81764
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 13 23:52:13 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 13 23:52:13 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=81b2d47d

Force ownership of files in building initramfs.

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 61f0c41..070dffc 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -2,7 +2,7 @@
 # $Id$
 
 COPY_BINARIES=false
-CPIO_ARGS="--quiet -o -H newc"
+CPIO_ARGS="--quiet -o -H newc --owner root:root --force-local"
 
 # The copy_binaries function is explicitly released under the CC0 license to
 # encourage wide adoption and re-use.  That means:

[gentoo-commits] proj/genkernel:debug-build commit in: /

[Robin H. Johnson]

commit:     cf40f8d5d5bc9bf46e2b87e9545e3e24523f4ead
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 14 00:47:38 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 14 00:47:38 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=cf40f8d5

Detect mknod failure.

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

---
 gen_initramfs.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 070dffc..d5ee5f6 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -89,12 +89,13 @@ append_base_layout() {
 	echo "proc          /proc       proc    defaults    0 0" >> ${TEMP}/initramfs-base-temp/etc/fstab
 
 	cd ${TEMP}/initramfs-base-temp/dev
-	mknod -m 660 console c 5 1
-	mknod -m 660 null c 1 3
-	mknod -m 660 zero c 1 5
-	mknod -m 600 tty0 c 4 0
-	mknod -m 600 tty1 c 4 1
-	mknod -m 600 ttyS0 c 4 64
+	# TODO: this will fail as non-root
+	mknod -m 660 console c 5 1 || gen_die "failed to mknod"
+	mknod -m 660 null c 1 3 || gen_die "failed to mknod"
+	mknod -m 660 zero c 1 5 || gen_die "failed to mknod"
+	mknod -m 600 tty0 c 4 0 || gen_die "failed to mknod"
+	mknod -m 600 tty1 c 4 1 || gen_die "failed to mknod"
+	mknod -m 600 ttyS0 c 4 64 || gen_die "failed to mknod"
 
 	date -u '+%Y%m%d-%H%M%S' > ${TEMP}/initramfs-base-temp/etc/build_date
 	echo "Genkernel $GK_V" > ${TEMP}/initramfs-base-temp/etc/build_id