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

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

[Sebastian Pipping]

commit:     06d136ca6a5c8dc23ff0b50e6f10771ac0482730
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu Feb 10 17:13:26 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 17:13:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=06d136ca

Merge branch 'experimental' using --no-ff


 ChangeLog               |   19 +++++++++++++++++++
 defaults/initrd.scripts |   25 ++++++++++++++++++++++---
 defaults/linuxrc        |   19 ++++++++++++++++++-
 genkernel.conf          |    8 ++++++++
 4 files changed, 67 insertions(+), 4 deletions(-)

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

[Sebastian Pipping]

commit:     8097ea8d4c74ff47be2e07efe1b3a45d8871f834
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Tue Feb  8 17:01:11 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Feb  8 17:01:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=8097ea8d

Merge branch 'bug-314575' using --no-ff


 ChangeLog               |    6 ++++++
 defaults/initrd.scripts |    8 +++++++-
 defaults/linuxrc        |    8 +++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

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

[Sebastian Pipping]

commit:     16a7793dda5b79e27f2ba64a11c15e6b410e65cc
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Wed Mar 16 13:44:18 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 13:48:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=16a7793d

Bump version to 3.4.14

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

diff --git a/ChangeLog b/ChangeLog
index 494bc4a..0ed477d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  16 Mar 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.14
+
   16 Mar 2011; Fabio Erculiani <lxnay@sabayon.org> **/modules_load:
   Add btrfs to MODULES_FS
 

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

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

[Sebastian Pipping]

commit:     3261a50884e930e0e422377dd647a16991a6bc42
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Wed Mar 16 13:48:20 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 13:48:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=3261a508

Merge branch experimental using --no-ff


 ChangeLog                  |   14 ++++++++++++++
 arch/alpha/modules_load    |    2 +-
 arch/arm/modules_load      |    2 +-
 arch/ia64/modules_load     |    2 +-
 arch/mips/modules_load     |    2 +-
 arch/parisc/modules_load   |    2 +-
 arch/parisc64/modules_load |    2 +-
 arch/ppc/modules_load      |    2 +-
 arch/ppc64/modules_load    |    2 +-
 arch/sparc/modules_load    |    2 +-
 arch/sparc64/modules_load  |    2 +-
 arch/um/modules_load       |    2 +-
 arch/x86/modules_load      |    2 +-
 arch/x86_64/modules_load   |    2 +-
 defaults/initrd.scripts    |    7 +------
 defaults/modules_load      |    2 +-
 doc/genkernel.8.txt        |    9 +++++++--
 gen_cmdline.sh             |    7 ++++++-
 gen_determineargs.sh       |    1 +
 gen_initramfs.sh           |   15 +++++++++++++--
 genkernel.conf             |    7 ++++++-
 21 files changed, 62 insertions(+), 26 deletions(-)

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

[Sebastian Pipping]

commit:     806df105c9029125cb7314e42c3338d547f4bb60
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Wed Mar 16 13:39:27 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 13:39:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=806df105

Fix changelog

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

diff --git a/ChangeLog b/ChangeLog
index 4ef9a8b..8354928 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,10 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
-  07 Mar 2011; Peter Hjalmarsson <xake@gentoo.org> defaults/initrd.scripts:
+  07 Mar 2011; Peter Hjalmarsson <xake@rymdraket.net> defaults/initrd.scripts:
   Fix typo where the kernelcmd version "dokeymap" was added to MY_HWOPTS
   instead of the HWOPTS version "keymap".
-  Broke setups where only "keymap=<...>" was added to kernelcmd.
+  Broke setups where only "keymap=<...>" was added to kernelcmd (bug #356167)
 
   24 Feb 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
   Fix handling of mdadm.conf (bug #354809)

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

[Sebastian Pipping]

commit:     dca54329612f8f7437efb94baf832c64c60f05ff
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Wed Mar 16 13:42:43 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 13:42:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=dca54329

Extend change log

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

diff --git a/ChangeLog b/ChangeLog
index 8354928..494bc4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  16 Mar 2011; Fabio Erculiani <lxnay@sabayon.org> **/modules_load:
+  Add btrfs to MODULES_FS
+
   07 Mar 2011; Peter Hjalmarsson <xake@rymdraket.net> defaults/initrd.scripts:
   Fix typo where the kernelcmd version "dokeymap" was added to MY_HWOPTS
   instead of the HWOPTS version "keymap".

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

[Sebastian Pipping]

commit:     c9dc25bb55abb9ab410ddec8aa95ff383fe63c38
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Wed Mar 16 14:55:15 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 14:55:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=c9dc25bb

docs: mention keyword InVCS in HACKING

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

diff --git a/HACKING b/HACKING
index b379bf4..2626963 100644
--- a/HACKING
+++ b/HACKING
@@ -19,4 +19,4 @@ Rolling a release:
 - make dist
 - upload genkernel-${PV}.tar.bz2 to the hosting:
     scp genkernel-${PV}.tar.bz2 ${USER}@dev.gentoo.org:/space/distfiles-local/
-- check open bugs with keyword "InSVN" for closability
+- check open bugs with keyword "InSVN" or "InVCS" for closability

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

[Sebastian Pipping]

commit:     4f87856880d31496ff91d22bf3e6da793fb27b60
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Mar 28 18:22:23 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 18:22:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=4f878568

Merge branch 'stable-next' into stable


 ChangeLog                                          |   12 ++++++++++++
 HACKING                                            |    2 +-
 defaults/initrd.scripts                            |    2 +-
 defaults/linuxrc                                   |   17 +++++++++--------
 doc/genkernel.8.txt                                |   10 ++++++----
 gen_cmdline.sh                                     |    5 -----
 gen_compile.sh                                     |   10 +++++++++-
 gen_initramfs.sh                                   |    6 +-----
 .../open-iscsi-2.0.872-omg-calling-configure.patch |   11 +++++++++++
 patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch |   11 +++++++++++
 10 files changed, 61 insertions(+), 25 deletions(-)

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

[Sebastian Pipping]

commit:     ade0b7669be72b77c56d85dcc78761d05815d347
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Mar 28 17:24:06 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 17:24:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=ade0b766

Merge branch 'master' into stable


 HACKING                                            |    2 +-
 doc/genkernel.8.txt                                |    2 +-
 gen_compile.sh                                     |   10 +++++++++-
 .../open-iscsi-2.0.872-omg-calling-configure.patch |   11 +++++++++++
 patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch |   11 +++++++++++
 5 files changed, 33 insertions(+), 3 deletions(-)

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

[Sebastian Pipping]

commit:     be190b4ec14eb49e60af78e730ec1c9d8410c939
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Tue May 31 01:44:58 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue May 31 01:44:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=be190b4e

Output warning in warning color

---
 ChangeLog |    3 +++
 genkernel |   18 +++++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index af5d371..6c402d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  31 May 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Output warning in warning color
+
   31 May 2011; Sebastian Pipping <sping@gentoo.org> doc/genkernel.8.txt,
   genkernel:
   Document boot parameter domdadm (bug #369415)

diff --git a/genkernel b/genkernel
index c74ef60..ec386bd 100755
--- a/genkernel
+++ b/genkernel
@@ -344,15 +344,15 @@ fi
 if [ "${BUILD_RAMDISK}" = '1' ]
 then
 	echo
-	print_info 1 'WARNING... WARNING... WARNING...'
-	print_info 1 'Additional kernel cmdline arguments that *may* be required to boot properly...'
-	[ "${SPLASH}" = '1' ] && print_info 1 "add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer ]"
-	[ "${LVM}" = '1' ] && print_info 1 'add "dolvm" for lvm support'
-	[ "${EVMS}" = '1' ] && print_info 1 'add "doevms" for evms support'
-	[ "${DMRAID}" = '1' ] && print_info 1 'add "dodmraid" for dmraid support'
-	[ "${MDADM}" = '1' ] && print_info 1 'add "domdadm" for RAID support'
-	[ "${DMRAID}" = '1' ] && print_info 1 '	or "dodmraid=<additional options>"'
-	[ "${ISCSI}" = '1' ] && print_info 1 'add at least "iscsi_initiatorname=<initiator name> iscsi_target=<target name> and iscsi_address=<target ip>" for iscsi support'
+	print_warning 1 'WARNING... WARNING... WARNING...'
+	print_warning 1 'Additional kernel cmdline arguments that *may* be required to boot properly...'
+	[ "${SPLASH}" = '1' ] && print_warning 1 "add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer ]"
+	[ "${LVM}" = '1' ] && print_warning 1 'add "dolvm" for lvm support'
+	[ "${EVMS}" = '1' ] && print_warning 1 'add "doevms" for evms support'
+	[ "${DMRAID}" = '1' ] && print_warning 1 'add "dodmraid" for dmraid support'
+	[ "${MDADM}" = '1' ] && print_warning 1 'add "domdadm" for RAID support'
+	[ "${DMRAID}" = '1' ] && print_warning 1 '	or "dodmraid=<additional options>"'
+	[ "${ISCSI}" = '1' ] && print_warning 1 'add at least "iscsi_initiatorname=<initiator name> iscsi_target=<target name> and iscsi_address=<target ip>" for iscsi support'
 fi
 
 [ "${BOOTRW}" != '' ] && mount -o remount,ro ${BOOTDIR}

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

[Sebastian Pipping]

commit:     f23c2e4a293caf85ebb052c0b83ef7100b7574c9
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Tue May 31 01:47:41 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue May 31 01:47:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=f23c2e4a

Re-specify "latest genkernel" as "latest ~arch genkernel"

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

diff --git a/genkernel b/genkernel
index ec386bd..273d9da 100755
--- a/genkernel
+++ b/genkernel
@@ -361,7 +361,7 @@ echo
 print_info 1 'Do NOT report kernel bugs as genkernel bugs unless your bug'
 print_info 1 'is about the default genkernel configuration...'
 print_info 1 ''
-print_info 1 'Make sure you have the latest genkernel before reporting bugs.'
+print_info 1 'Make sure you have the latest ~arch genkernel before reporting bugs.'
 
 #Final Cleanup
 cleanup

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

[Sebastian Pipping]

commit:     15019471add8eb1d16c7af1733ce43a160f7640e
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Tue May 31 13:25:58 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue May 31 13:25:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=15019471

Extend ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index 6ef649f..9670a1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,10 @@
   genkernel:
   Document boot parameter domdadm (bug #369415)
 
+  12 May 2011; Amadeusz Żołnowski <aidecoe@aidecoe.name>
+  defaults/modules_load:
+  Added hpsa to defaults/modules_load; fixes bug #363369
+
   28 Mar 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump to 3.4.15
 

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

[Sebastian Pipping]

commit:     2e16677d197a1ae3a492b686069fb42299c647e5
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Jun  4 01:00:29 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Jun  4 02:02:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=2e16677d

Fix regression from renaming DEBUGLEVEL/DEBUGFILE to LOGLEVEL/LOGFILE

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

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index baa8a04..6f88805 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -70,7 +70,7 @@ determine_real_args() {
 
 	#                               Dest / Config File   Command Line             Arch Default
 	#                               ------------------   ------------             ------------
-	set_config_with_override STRING DEBUGFILE            CMD_DEBUGFILE
+	set_config_with_override STRING LOGFILE              CMD_LOGFILE
 	set_config_with_override STRING KERNEL_DIR           CMD_KERNEL_DIR           "${DEFAULT_KERNEL_SOURCE}"
 	set_config_with_override BOOL   NO_KERNEL_SOURCES    CMD_NO_KERNEL_SOURCES
 	set_config_with_override STRING KNAME                CMD_KERNNAME             "genkernel"

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

[Sebastian Pipping]

commit:     dbede652dc039134284818b021b2ea3974c7241d
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Jun  5 16:06:41 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jun  5 16:06:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=dbede652

Docs: Update note on getting in touch

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

diff --git a/HACKING b/HACKING
index 2626963..57bbbd1 100644
--- a/HACKING
+++ b/HACKING
@@ -2,8 +2,8 @@
 
 This document is a work-in-progress to describe the workflow through the various
 parts of genkernel so that we can split the code into modular chunks.  If you
-are interested in helping with genkernel development, contact Chris Gianelloni
-at wolf31o2@wolf31o2.org for access.
+are interested in helping with genkernel development, please get in touch at
+<genkernel@gentoo.org>.
 
 Phases:
 

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

[Sebastian Pipping]

commit:     bddf1649dcf34be21ac36602d1ae8237ffc3e474
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Tue Jun  7 22:15:26 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Jun  7 22:15:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=bddf1649

Bump version to 3.4.16

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

diff --git a/ChangeLog b/ChangeLog
index b136d87..3c8c32a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  07 Jun 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.16
+
   07 Jun 2011; Sebastian Pipping <sping@gentoo.org> doc/genkernel.8.txt:
   Document most undocumented boot parameters (bug #370369)
 

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

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

[Sebastian Pipping]

commit:     b9b1b765cbbcf16a561d0f2289d6717018eaf2b2
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Wed Jun 22 16:54:09 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 16:54:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b9b1b765

Refactoring: Turn to if-elifs constructs into case blocks

---
 gen_compile.sh |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index ec752ce..eb13dde 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -231,15 +231,17 @@ compile_generic() {
 	local target=${1}
 	local argstype=${2}
 
-	if [ "${argstype}" = 'kernel' ] || [ "${argstype}" = 'runtask' ]
-	then
-		export_kernel_args
-		MAKE=${KERNEL_MAKE}
-	elif [ "${2}" = 'utils' ]
-	then
-		export_utils_args
-		MAKE=${UTILS_MAKE}
-	fi
+	case "${argstype}" in
+		kernel|runtask)
+			export_kernel_args
+			MAKE=${KERNEL_MAKE}
+			;;
+		utils)
+			export_utils_args
+			MAKE=${UTILS_MAKE}
+			;;
+	esac
+
 	case "${argstype}" in
 		kernel) ARGS="`compile_kernel_args`" ;;
 		utils) ARGS="`compile_utils_args`" ;;
@@ -272,13 +274,11 @@ compile_generic() {
 
 	unset MAKE
 	unset ARGS
-	if [ "${argstype}" = 'kernel' ]
-	then
-		unset_kernel_args
-	elif [ "${argstype}" = 'utils' ]
-	then
-		unset_utils_args
-	fi
+
+	case "${argstype}" in
+		kernel) unset_kernel_args ;;
+		utils) unset_utils_args ;;
+	esac
 }
 
 compile_modules() {

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

[Sebastian Pipping]

commit:     381ec0cee4f0df060be1ca8d864f1db587ab7eb7
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Wed Jun 22 16:57:45 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 16:57:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=381ec0ce

Refactoring: Rename mode runtask to kernelruntask

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

diff --git a/gen_compile.sh b/gen_compile.sh
index 281d672..9f3801c 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -232,7 +232,7 @@ compile_generic() {
 	local argstype=${2}
 
 	case "${argstype}" in
-		kernel|runtask)
+		kernel|kernelruntask)
 			export_kernel_args
 			MAKE=${KERNEL_MAKE}
 			;;
@@ -245,14 +245,14 @@ compile_generic() {
 	case "${argstype}" in
 		kernel) ARGS="`compile_kernel_args`" ;;
 		utils) ARGS="`compile_utils_args`" ;;
-		*) ARGS="" ;; # includes runtask
+		*) ARGS="" ;; # includes kernelruntask
 	esac
 	shift 2
 
 	# the eval usage is needed in the next set of code
 	# as ARGS can contain spaces and quotes, eg:
 	# ARGS='CC="ccache gcc"'
-	if [ "${argstype}" == 'runtask' ]
+	if [ "${argstype}" == 'kernelruntask' ]
 	then
 		# Silent operation, forced -j1
 		print_info 2 "COMMAND: ${MAKE} ${MAKEOPTS} -j1 ${ARGS} ${target} $*" 1 0 1

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 2e0737f..284f800 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -76,7 +76,7 @@ config_kernel() {
 	if isTrue ${MENUCONFIG}
 	then
 		print_info 1 'kernel: >> Invoking menuconfig...'
-		compile_generic menuconfig runtask
+		compile_generic menuconfig kernelruntask
 		[ "$?" ] || gen_die 'Error: menuconfig failed!'
 	elif isTrue ${CMD_GCONFIG}
 	then

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

[Sebastian Pipping]

commit:     9ef2c292157f3dbcca445e8e1bc35b20c6325407
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Wed Jun 22 16:55:40 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 16:55:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=9ef2c292

Docs: Add in-code docs on runtask mode of compile_generic()

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

diff --git a/gen_compile.sh b/gen_compile.sh
index eb13dde..281d672 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -254,6 +254,7 @@ compile_generic() {
 	# ARGS='CC="ccache gcc"'
 	if [ "${argstype}" == 'runtask' ]
 	then
+		# Silent operation, forced -j1
 		print_info 2 "COMMAND: ${MAKE} ${MAKEOPTS} -j1 ${ARGS} ${target} $*" 1 0 1
 		eval ${MAKE} -s ${MAKEOPTS} -j1 "${ARGS}" ${target} $*
 		RET=$?

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

[Sebastian Pipping]

commit:     4a7ccf8b0873d75996e4582de5f1db326f20bc45
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Wed Jun 22 17:00:35 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 17:00:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=4a7ccf8b

Make --arch-override= affect "make menuconfig" (bug #247246)

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

diff --git a/ChangeLog b/ChangeLog
index 4ea60ab..80850ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  22 Jun 2011; Sebastian Pipping <sping@gentoo.org> gen_compile.sh:
+  Make --arch-override= affect "make menuconfig" (bug #247246)
+
   13 Jun 2011; Sebastian Pipping <sping@gentoo.org> arch/x86_64/kernel-config:
   Unset CONFIG_EMBEDDED on arch amd64
 

diff --git a/gen_compile.sh b/gen_compile.sh
index 9f3801c..3a815e8 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -243,9 +243,9 @@ compile_generic() {
 	esac
 
 	case "${argstype}" in
-		kernel) ARGS="`compile_kernel_args`" ;;
+		kernel|kernelruntask) ARGS="`compile_kernel_args`" ;;
 		utils) ARGS="`compile_utils_args`" ;;
-		*) ARGS="" ;; # includes kernelruntask
+		*) ARGS="" ;;
 	esac
 	shift 2
 

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

[Sebastian Pipping]

commit:     aea5074809e40b6e8f582d367a271b86fd1d651b
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Jul  3 22:26:27 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 22:26:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=aea50748

Set version to 3.4.17

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

diff --git a/ChangeLog b/ChangeLog
index 862e001..34bf61f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  03 Jul 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Set version to 3.4.17
+
   03 Jul 2011; Sebastian Pipping <sping@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/genkernel b/genkernel
index 38e445f..8a42bf0 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.16'
+GK_V='3.4.17'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.

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

[Sebastian Pipping]

commit:     fdcea9095dd6c32b9f3d501bc475f9f15732482d
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Jul 23 09:33:44 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 09:33:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=fdcea909

Extend ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index 34bf61f..1402b9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 # Distributed under the GPL v2
 # $Id$
 
+  20 Jul 2011; Fabio Erculiani <lxnay@sabayon.org> defaults/config.sh,
+  doc/genkernel.8.txt, gen_cmdline.sh, gen_compile.sh:
+  Make possible to compile XEN based kernels providing --kernel-target= and
+  --kernel-binary= switches
+
   03 Jul 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
   Set version to 3.4.17
 

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

[Robin H. Johnson]

commit:     3d7de35394a704c993b9986c2e70adcd4083ee6b
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 22:34:00 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 22:34:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=3d7de353

Bug #376467: fix kernel version checks for 3.0 kernel.

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

---
 ChangeLog   |    3 +++
 gen_arch.sh |   15 ++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b11433a..4c24c6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  26 Jul 2011; Robin H. Johnson <robbat2@gentoo.org> gen_arch.sh:
+  Bug #376467: fix kernel version checks for 3.0 kernel.
+
   23 Jul 2011; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
   netboot/linuxrc.x:
   Fix permissions of /dev/pts (bug #375947)

diff --git a/gen_arch.sh b/gen_arch.sh
index 079edb2..c7bd3cc 100755
--- a/gen_arch.sh
+++ b/gen_arch.sh
@@ -51,7 +51,10 @@ set_kernel_arch() {
 	KERNEL_ARCH=${ARCH}
 	case ${ARCH} in
 		ppc|ppc64)
-			if [ "${VER}" -eq "2" -a "${PAT}" -ge "6" ]
+			if [ "${VER}" -ge "3" ]
+			then
+					KERNEL_ARCH=powerpc
+			elif [ "${VER}" -eq "2" -a "${PAT}" -ge "6" ]
 			then
 				if [ "${PAT}" -eq "6" -a "${SUB}" -ge "16" ] || [ "${PAT}" -gt "6" ]
 				then
@@ -60,7 +63,10 @@ set_kernel_arch() {
 			fi
 			;;
 		x86)
-			if [ "${VER}" -eq "2" -a "${PAT}" -ge "6" ] || [ "${VER}" -gt "2" ]
+			if [ "${VER}" -ge "3" ]
+			then
+					KERNEL_ARCH=x86
+			elif [ "${VER}" -eq "2" -a "${PAT}" -ge "6" ] || [ "${VER}" -gt "2" ]
 			then
 				if [ "${PAT}" -eq "6" -a "${SUB}" -ge "24" ] || [ "${PAT}" -gt "6" ]
 				then
@@ -71,7 +77,10 @@ set_kernel_arch() {
 			fi
 			;;
 		x86_64)
-			if [ "${VER}" -eq "2" -a "${PAT}" -ge "6" ] || [ "${VER}" -gt "2" ]
+			if [ "${VER}" -ge "3" ]
+			then
+					KERNEL_ARCH=x86
+			elif [ "${VER}" -eq "2" -a "${PAT}" -ge "6" ] || [ "${VER}" -gt "2" ]
 			then
 				if [ "${PAT}" -eq "6" -a "${SUB}" -ge "24" ] || [ "${PAT}" -gt "6" ]
 				then

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

[Sebastian Pipping]

commit:     71f01a35f221ba7c5b750c1abb2adadb33628ed9
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu Jul 28 05:56:49 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 05:57:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=71f01a35

Bump version to 3.4.18

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

diff --git a/ChangeLog b/ChangeLog
index 31e9aae..8da0510 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  28 Jul 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.18
+
   27 Jul 2011; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
   Fix display of seconds waiting (bug #376575)
 

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

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

[Sebastian Pipping]

commit:     691d7aad4d1d2b3a10ec0f13a4ee9bd10cc30249
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Aug  6 17:13:11 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Aug  6 17:13:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=691d7aad

No longer copy /lib/libsysfs*so* for multipath-tools (bug #300841, bug #377709)

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

diff --git a/ChangeLog b/ChangeLog
index a758762..0738649 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  06 Aug 2011; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
+  No longer copy /lib/libsysfs*so* for multipath-tools (bug #300841, bug
+  #377709)
+
   31 Jul 2011; Sebastian Pipping <sping@gentoo.org>
   -patches/busybox/1.7.4/1.7.4-ash-timeout.diff,
   -patches/busybox/1.7.4/1.7.4-mdstart.diff,

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 7fe4421..5c47fd7 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -148,7 +148,7 @@ append_multipath(){
 	mkdir -p "${TEMP}/initramfs-multipath-temp/lib/"
 
 	# Copy files to /lib
-	for i in /lib/{ld-*,libc-*,libc.*,libdl-*,libdl.*,libsysfs*so*,libdevmapper*so*,libpthread*,librt*,libreadline*,libncurses*}
+	for i in /lib/{ld-*,libc-*,libc.*,libdl-*,libdl.*,libdevmapper*so*,libpthread*,librt*,libreadline*,libncurses*}
 	do
 		cp -a "${i}" "${TEMP}/initramfs-multipath-temp/lib" \
 			|| gen_die "Could not copy file ${i} for MULTIPATH"

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

[Amadeusz Żołnowski]

commit:     ed4b49059f7bd5052b9c21119cab138db60e1be4
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  9 14:22:32 2011 +0000
Commit:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 08:11:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=ed4b4905

gen_configkernel: canonicalize path to kernel config

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

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 284f800..faf1874 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -24,6 +24,7 @@ determine_config_file() {
 	else
 		gen_die 'Error: No kernel .config specified, or file not found!'
 	fi
+    KERNEL_CONFIG="$(readlink -f "${KERNEL_CONFIG}")"
 }
 
 config_kernel() {

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

[Fabio Erculiani]

commit:     04c38a93ed72148a8bb0e29e416af5a486a46d60
Author:     Fabio Erculiani <lxnay <AT> sabayon <DOT> org>
AuthorDate: Tue Aug 16 20:00:00 2011 +0000
Commit:     Fabio Erculiani <lxnay <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 20:00:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=04c38a93

gen_compile: always use -j1 with kernel *_install targets, fixes compilation with make 3.82

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

diff --git a/ChangeLog b/ChangeLog
index 0738649..f0547b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  16 Aug 2011; Fabio Erculiani <lxnay@gentoo.org> gen_compile.sh:
+  gen_compile: always use -j1 with kernel *_install targets, fixes compilation
+  with make 3.82
+
   06 Aug 2011; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
   No longer copy /lib/libsysfs*so* for multipath-tools (bug #300841, bug
   #377709)

diff --git a/gen_compile.sh b/gen_compile.sh
index 0758c3a..01b20f8 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -288,7 +288,7 @@ compile_modules() {
 	compile_generic modules kernel
 	export UNAME_MACHINE="${ARCH}"
 	[ "${INSTALL_MOD_PATH}" != '' ] && export INSTALL_MOD_PATH
-	compile_generic "modules_install" kernel
+	MAKEOPTS="${MAKEOPTS} -j1" compile_generic "modules_install" kernel
 	unset UNAME_MACHINE
 }
 
@@ -312,7 +312,7 @@ compile_kernel() {
 	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..."
-		compile_generic "firmware_install" kernel
+		MAKEOPTS="${MAKEOPTS} -j1" compile_generic "firmware_install" kernel
 	else
 		print_info 1 "        >> Not installing firmware as it's included in the kernel already (CONFIG_FIRMWARE_IN_KERNEL=y)..."
 	fi

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

[Fabio Erculiani]

commit:     78667c1e130a6e70eabd03e56ff69123082f73b2
Author:     Fabio Erculiani <lxnay <AT> sabayon <DOT> org>
AuthorDate: Tue Aug 16 20:01:13 2011 +0000
Commit:     Fabio Erculiani <lxnay <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 20:01:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=78667c1e

gen_compile: correct MAKEOPTS usage on utils task

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

diff --git a/ChangeLog b/ChangeLog
index f0547b4..fdba306 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
 # $Id$
 
   16 Aug 2011; Fabio Erculiani <lxnay@gentoo.org> gen_compile.sh:
+  gen_compile: correct MAKEOPTS usage on utils task
+
+  16 Aug 2011; Fabio Erculiani <lxnay@gentoo.org> gen_compile.sh:
   gen_compile: always use -j1 with kernel *_install targets, fixes compilation
   with make 3.82
 

diff --git a/gen_compile.sh b/gen_compile.sh
index 01b20f8..ae66ca2 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -530,7 +530,7 @@ compile_dmraid() {
 		mkdir -p "${TEMP}/dmraid"
 		print_info 1 'dmraid: >> Compiling...'
 		# Force dmraid to be built with -j1 for bug #188273
-		MAKEOPTS=-j1 compile_generic '' utils
+		MAKEOPTS="${MAKEOPTS} -j1" compile_generic '' utils
 		#compile_generic 'install' utils
 		mkdir ${TEMP}/dmraid/sbin
 		install -m 0755 -s tools/dmraid "${TEMP}/dmraid/sbin/dmraid"

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

[Fabio Erculiani]

commit:     7fef86581a32cc6684f4faf7b174d3f39cec89ee
Author:     Fabio Erculiani <lxnay <AT> sabayon <DOT> org>
AuthorDate: Tue Sep 13 09:16:17 2011 +0000
Commit:     Fabio Erculiani <lxnay <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 09:16:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=7fef8658

dmraid requires dmsetup to assign UUID to discovered RAID volumes, close bug #382555

---
 ChangeLog        |    5 +++++
 gen_compile.sh   |    5 ++++-
 gen_initramfs.sh |   13 +++++++++++++
 3 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fbc1418..3814ba6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 # Distributed under the GPL v2
 # $Id$
 
+  13 Sep 2011; Fabio Erculiani <lxnay@gentoo.org> gen_compile.sh,
+  gen_initramfs.sh:
+  dmraid requires dmsetup to assign UUID to discovered RAID volumes, close bug
+  #382555
+
   11 Sep 2011; Fabio Erculiani <lxnay@gentoo.org> defaults/initrd.scripts,
   defaults/linuxrc:
   drop parse_opt usage and crufty, deprecated subshelling through 

diff --git a/gen_compile.sh b/gen_compile.sh
index 2f8a71a..045ca8f 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -451,7 +451,10 @@ compile_lvm() {
 		print_info 1 '      >> Copying to bincache...'
 		strip "sbin/lvm.static" ||
 			gen_die 'Could not strip lvm.static!'
-		/bin/tar -cjf "${LVM_BINCACHE}" sbin/lvm.static ||
+		# See bug 382555
+		strip "sbin/dmsetup.static" ||
+			gen_die 'Could not strip dmsetup.static'
+		/bin/tar -cjf "${LVM_BINCACHE}" sbin/lvm.static sbin/dmsetup.static ||
 			gen_die 'Could not create binary cache'
 
 		cd "${TEMP}"

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 5c47fd7..50ddbe5 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -247,11 +247,21 @@ append_lvm(){
 		print_info 1 '          LVM: Adding support (using local static binary /sbin/lvm.static)...'
 		cp /sbin/lvm.static "${TEMP}/initramfs-lvm-temp/bin/lvm" ||
 			gen_die 'Could not copy over lvm!'
+		# See bug 382555
+		if [ -e '/sbin/dmsetup.static' ]
+		then
+			cp /sbin/dmsetup.static "${TEMP}/initramfs-lvm-temp/bin/dmsetup"
+		fi
 	elif [ -e '/sbin/lvm' ] && LC_ALL="C" ldd /sbin/lvm|grep -q 'not a dynamic executable'
 	then
 		print_info 1 '          LVM: Adding support (using local static binary /sbin/lvm)...'
 		cp /sbin/lvm "${TEMP}/initramfs-lvm-temp/bin/lvm" ||
 			gen_die 'Could not copy over lvm!'
+		# See bug 382555
+		if [ -e '/sbin/dmsetup' ] && LC_ALL="C" ldd /sbin/dmsetup | grep -q 'not a dynamic executable'
+		then
+			cp /sbin/dmsetup "${TEMP}/initramfs-lvm-temp/bin/dmsetup"
+		fi
 	else
 		print_info 1 '          LVM: Adding support (compiling binaries)...'
 		compile_lvm
@@ -259,6 +269,9 @@ append_lvm(){
 			gen_die "Could not extract lvm binary cache!";
 		mv ${TEMP}/initramfs-lvm-temp/sbin/lvm.static ${TEMP}/initramfs-lvm-temp/bin/lvm ||
 			gen_die 'LVM error: Could not move lvm.static to lvm!'
+		# See bug 382555
+		mv ${TEMP}/initramfs-lvm-temp/sbin/dmsetup.static ${TEMP}/initramfs-lvm-temp/bin/dmsetup ||
+			gen_die 'LVM error: Could not move dmsetup.static to dmsetup!'
 	fi
 	if [ -x /sbin/lvm ]
 	then

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

[Robin H. Johnson]

commit:     7fdfe0eee87d9d365a5c13e79301842c1d88c723
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 01:51:23 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 01:51:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=7fdfe0ee

Missed Changelog update before.

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

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

diff --git a/ChangeLog b/ChangeLog
index 3814ba6..d4fb6a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  22 Sept 2011; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts,
+  defaults/linuxrc:
+  Fix trailing backtick and root-on-LVM.
+
   13 Sep 2011; Fabio Erculiani <lxnay@gentoo.org> gen_compile.sh,
   gen_initramfs.sh:
   dmraid requires dmsetup to assign UUID to discovered RAID volumes, close bug

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

[Fabio Erculiani]

commit:     344f0b42e473c216301923df71627834560cf149
Author:     Fabio Erculiani <lxnay <AT> sabayon <DOT> org>
AuthorDate: Tue Oct 25 09:45:41 2011 +0000
Commit:     Fabio Erculiani <lxnay <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 09:45:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=344f0b42

fix random build failures during e2fsprogs, force -j1

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

diff --git a/ChangeLog b/ChangeLog
index 78a722f..9115403 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  25 Oct 2011; Fabio Erculiani <lxnay@gentoo.org> gen_compile.sh:
+  fix random build failures during e2fsprogs, force -j1
+
   08 Oct 2011; Fabio Erculiani <lxnay@gentoo.org> defaults/initrd.defaults,
   defaults/initrd.scripts, defaults/linuxrc:
   Do not hardcode /mnt/cdrom path across the whole code, use CDROOT_PATH

diff --git a/gen_compile.sh b/gen_compile.sh
index fce0750..4f4ed25 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -600,7 +600,7 @@ compile_e2fsprogs() {
 		LDFLAGS=-static ./configure >> ${LOGFILE} 2>&1 ||
 			gen_die 'Configuring e2fsprogs failed!'
 		print_info 1 'e2fsprogs: >> Compiling...'
-		MAKE=${UTILS_MAKE} compile_generic "" ""
+		MAKE=${UTILS_MAKE} MAKEOPTS="${MAKEOPTS} -j1" compile_generic "" ""
 		print_info 1 'blkid: >> Copying to cache...'
 		[ -f "${TEMP}/${E2FSPROGS_DIR}/misc/blkid" ] ||
 			gen_die 'Blkid executable does not exist!'

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

[Sebastian Pipping]

commit:     9bdd75e3cc3a92271d9c0430a0d6fe1639871f75
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Oct 30 13:32:23 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 13:32:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=9bdd75e3

Bump version to 3.4.19

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

diff --git a/ChangeLog b/ChangeLog
index 9115403..361d351 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  30 Oct 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.19
+
   25 Oct 2011; Fabio Erculiani <lxnay@gentoo.org> gen_compile.sh:
   fix random build failures during e2fsprogs, force -j1
 

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

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

[Sebastian Pipping]

commit:     daedf62c307f8f8949769f328f4075088d217597
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Tue Nov  8 17:20:16 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Nov  8 17:20:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=daedf62c

Bump version to 3.4.20

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

diff --git a/ChangeLog b/ChangeLog
index abdcbd5..b56941c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  08 Nov 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.20
+
   31 Oct 2011; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
   Fix return value of crypt_filter() which caused bogus LUKS opening errors
   (bug #383545)

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

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

[Robin H. Johnson]

commit:     14c61e729d9612f57e1ab66b5916d6340935d847
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 03:38:00 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 03:38:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=14c61e72

Add a few more directories and initial device nodes to the initramfs, and improve datestamp. Based on development by WilliamH for initramfs /usr mounting.

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

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index c644694..cfcfe97 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -13,8 +13,13 @@ append_base_layout() {
 	mkdir -p ${TEMP}/initramfs-base-temp/bin
 	mkdir -p ${TEMP}/initramfs-base-temp/etc
 	mkdir -p ${TEMP}/initramfs-base-temp/usr
+	mkdir -p ${TEMP}/initramfs-base-temp/lib
+	mkdir -p ${TEMP}/initramfs-base-temp/mnt
+	mkdir -p ${TEMP}/initramfs-base-temp/run
+	mkdir -p ${TEMP}/initramfs-base-temp/sbin
 	mkdir -p ${TEMP}/initramfs-base-temp/proc
 	mkdir -p ${TEMP}/initramfs-base-temp/temp
+	mkdir -p ${TEMP}/initramfs-base-temp/tmp
 	mkdir -p ${TEMP}/initramfs-base-temp/sys
 	mkdir -p ${TEMP}/initramfs-temp/.initrd
 	mkdir -p ${TEMP}/initramfs-base-temp/var/lock/dmraid
@@ -29,9 +34,12 @@ append_base_layout() {
 	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
 
-	date '+%Y%m%d' > ${TEMP}/initramfs-base-temp/etc/build_date
+	date -u '+%Y%m%d-%H%M%S' > ${TEMP}/initramfs-base-temp/etc/build_date
 
 	cd "${TEMP}/initramfs-base-temp/"
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \

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

[Sebastian Pipping]

commit:     b7f49a343ef9bead404600976594001a7f3f0be6
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Wed Jan  4 14:31:27 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 14:32:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b7f49a34

Extend change log

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

diff --git a/ChangeLog b/ChangeLog
index 9079806..bfb9207 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,13 @@
 # Distributed under the GPL v2
 # $Id$
 
+  04 Jan 2012; Sebastian Pipping <sping@gentoo.org> arch/um/busy-config,
+  defaults/busy-config, netboot/busy-config:
+  Set CONFIG_NFSMOUNT=n in busybox config to fix compilation with glibc 2.14.
+
+  Special thanks:
+  - Borg Onion
+
   04 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> arch/mips/config.sh,
   doc/genkernel.8.txt, gen_cmdline.sh, gen_compile.sh, gen_determineargs.sh,
   gen_funcs.sh, gen_initramfs.sh, genkernel, genkernel.conf:

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

[Sebastian Pipping]

commit:     6bdb1487eddac6b05aa3f751e1c36fe1bd98cf50
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu Jan  5 16:45:17 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Jan  5 16:49:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=6bdb1487

Extend change log

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

diff --git a/ChangeLog b/ChangeLog
index bfb9207..dad32c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,13 @@
 # Distributed under the GPL v2
 # $Id$
 
+  05 Jan 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
+  defaults/linuxrc, doc/genkernel.8.txt:
+  Introduce boot parameter root_trim=(yes|no) for SSDs
+
+  Special thanks:
+  - Christian Kruse
+
   04 Jan 2012; Sebastian Pipping <sping@gentoo.org> arch/um/busy-config,
   defaults/busy-config, netboot/busy-config:
   Set CONFIG_NFSMOUNT=n in busybox config to fix compilation with glibc 2.14.

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

[Sebastian Pipping]

commit:     25cdfbd03a42c6457eeaef0aee96b220941370d9
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu Jan  5 20:29:41 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Jan  5 20:29:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=25cdfbd0

Bump version to 3.4.21

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

diff --git a/ChangeLog b/ChangeLog
index dad32c1..f52f064 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  05 Jan 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.21
+
   05 Jan 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
   defaults/linuxrc, doc/genkernel.8.txt:
   Introduce boot parameter root_trim=(yes|no) for SSDs

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

[Sebastian Pipping]

commit:     f1fffdc8336d2bc3bea8dc11034c79b8852368b9
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu Jan  5 20:31:57 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Jan  5 20:31:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=f1fffdc8

Bump version to 3.4.21.1

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

diff --git a/ChangeLog b/ChangeLog
index f52f064..dfb5c05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,7 @@
 # $Id$
 
   05 Jan 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.21
+  Bump version to 3.4.21.1
 
   05 Jan 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
   defaults/linuxrc, doc/genkernel.8.txt:

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

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

[Robin H. Johnson]

commit:     8139949026114379b06f98dd7bd860f11b01b7a8
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 01:14:53 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 01:14:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=81399490

Add a configuration option for --install, so users can get it as a default. Defaults to "no", due to catalyst.

---
 genkernel.conf |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/genkernel.conf b/genkernel.conf
index 8628267..c6378e2 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -8,6 +8,10 @@
 
 # =========Common Command Line Option Defaults=========
 
+# Should we install to $BOOTDIR?  Default is "no" because genkernel is used in
+# catalyst and stage building.
+#INSTALL="yes"
+
 # Run 'make oldconfig' before compiling this kernel?
 OLDCONFIG="yes"
 

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

[Robin H. Johnson]

commit:     ef4065d0f32c49737f984186a3c0cc8d99446691
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 01:18:23 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 01:18:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=ef4065d0

Multipath has been done for a while now.

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

diff --git a/TODO b/TODO
index 20bc119..73184b9 100644
--- a/TODO
+++ b/TODO
@@ -20,10 +20,6 @@
 	  - ATA over Ethernet
 	  - FCP over Ethernet
 	  - Infiniband over IP
-	- Multipath support
-	  - Block devices (WIP: tsunam)
-	    - Updates/Notification via multipathd (WIP: tsunam)
-	  - Network
 	- Security Tokens for encrypted block devices
 - Document the different code paths and hooks for external modules
 - Add support for Hardware auto-detection

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

[Robin H. Johnson]

commit:     c897f803998fbe85bd898bb7d6e93115df9d8fd2
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 01:11:30 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 01:11:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=c897f803

Fix up changelog

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

---
 ChangeLog |   22 +++++-----------------
 1 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dfb5c05..38d63a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,20 +5,21 @@
 # Distributed under the GPL v2
 # $Id$
 
+  06 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> ChangeLog:
+  Fix up changelog
+
   05 Jan 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.21.1
 
   05 Jan 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
   defaults/linuxrc, doc/genkernel.8.txt:
-  Introduce boot parameter root_trim=(yes|no) for SSDs
-
+  Introduce boot parameter root_trim=(yes|no) for SSDs.
   Special thanks:
   - Christian Kruse
 
   04 Jan 2012; Sebastian Pipping <sping@gentoo.org> arch/um/busy-config,
   defaults/busy-config, netboot/busy-config:
   Set CONFIG_NFSMOUNT=n in busybox config to fix compilation with glibc 2.14.
-
   Special thanks:
   - Borg Onion
 
@@ -56,7 +57,7 @@
   patches/busybox/1.18.1/1.18.1-mdstart.diff:
   Fix patch typo that broke compile.
 
-  22 Sept 2011; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts,
+  22 Sep 2011; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts,
   defaults/linuxrc:
   Fix trailing backtick and root-on-LVM.
 
@@ -71,7 +72,6 @@
 
   30 Aug 2011; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
   Fix quoting issue (bug #380729).
-
   Thanks to:
   - Axel Bringenberg
 
@@ -113,7 +113,6 @@
 
   27 Jul 2011; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
   Fix display of seconds waiting (bug #376575)
-
   Thanks to Richard Scott
 
   26 Jul 2011; Robin H. Johnson <robbat2@gentoo.org> gen_arch.sh:
@@ -176,7 +175,6 @@
   31 May 2011; Sebastian Pipping <sping@gentoo.org> defaults/linuxrc,
   doc/genkernel.8.txt:
   Add rootfstype= boot parameter (bug #221245)
-
   Special thanks:
   - Marcin Kurek
 
@@ -229,7 +227,6 @@
 
   24 Feb 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
   Fix handling of mdadm.conf (bug #354809)
-
   Special thanks:
   - Peter Hjalmarsson
 
@@ -238,20 +235,17 @@
 
   09 Feb 2011; Sebastian Pipping <sping@gentoo.org> genkernel.conf:
   Add SPLASH and SPLASH_THEME to genkernel.conf (bug #268468)
-
   Special thanks:
   - PhobosK
 
   08 Feb 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
   Add iBFT support for iSCSI (bug #314575)
-
   Special thanks:
   - Stefan Behte
 
   7 Feb 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
   Use devtmpfs/tmpfs for /dev (bug #353024)
   Rescue devtmpfs /dev over to chroot (bug #353024, bug #344407)
-
   Special thanks:
   - Peter Hjalmarsson
 
@@ -260,7 +254,6 @@
 
   31 Jan 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
   Speed up LVM activation (bug #351047)
-
   Special thanks:
   - Peter Hjalmarsson
 
@@ -280,7 +273,6 @@
   30 Jan 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
   Enhance console handling on netboot linuxrc (bug #353084)
   Enable shadow on netboot's busybox config (bug #353085)
-
   Special thanks:
   - Raúl Porcel
 
@@ -289,7 +281,6 @@
 
   29 Jan 2011; Sebastian Pipping <sping@gentoo.org> gen_compile.sh:
   No longer require device mapper bincache for compiling lvm (bug #353026)
-
   Special thanks:
   - Peter Hjalmarsson
 
@@ -319,7 +310,6 @@
 
   20 Jan 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
   Add proper mdadm support (bug #282100)
-
   Special thanks:
   - Craig Andrews (Testing)
   - Laurent Pinchart (mdmon/IMSM support)
@@ -332,7 +322,6 @@
   20 Jan 2011; Sebastian Pipping <sping@gentoo.org> gen_configkernel.sh:
   Move application of kernel config after "make mrproper" as that deletes
   .config (whereas "make clean" does not) (bug #351906)
-
   Special thanks:
   - Peter Hjalmarsson
 
@@ -363,7 +352,6 @@
   - Fix warning "cannot remove `/var/cache/genkernel/src'" (bug #347213)
   - Allow configuring the list of busybox applets (bug #326593)
   - Fix arithmetic bug in defaults/initrd.scripts (bug #339789)
-
   Special thanks:
   - Amadeusz Zolnowski (LVM update)
   - Christian Giessner (UUID crypt_root)

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

[Robin H. Johnson]

commit:     0c2c1f564e2a682d173bbd5452974e99b1fa216c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 04:25:05 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 04:25:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=0c2c1f56

Bump version to 3.4.21.2. Stock configuration of 3.4.21.1 generates unbootable initramfs!

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

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

diff --git a/ChangeLog b/ChangeLog
index 36a6026..48843ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  06 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> genkernel:
+  Bump version to 3.4.21.2. Stock configuration of 3.4.21.1 generates
+  unbootable initramfs!
+
   06 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> gen_determineargs.sh,
   genkernel.conf:
   Fix some defaults otherwise you get an initramfs without any modules!

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

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

[Robin H. Johnson]

commit:     e602f05814db85c107490153efdf7ef7c51a8c58
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 04:23:14 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 04:23:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=e602f058

Fix some defaults otherwise you get an initramfs without any modules!

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

---
 ChangeLog            |    4 ++++
 gen_determineargs.sh |    8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 817e1b7..36a6026 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  06 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> gen_determineargs.sh,
+  genkernel.conf:
+  Fix some defaults otherwise you get an initramfs without any modules!
+
   06 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/busy-config:
   Awk support in busybox is needed for initramfs setup code (to parse fstab).
 

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index b68f048..cd91a27 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -72,7 +72,7 @@ determine_real_args() {
 	#                               ------------------   ------------             ------------
 	set_config_with_override STRING LOGFILE              CMD_LOGFILE
 	set_config_with_override STRING KERNEL_DIR           CMD_KERNEL_DIR           "${DEFAULT_KERNEL_SOURCE}"
-	set_config_with_override BOOL   KERNEL_SOURCES		 CMD_KERNEL_SOURCES
+	set_config_with_override BOOL   KERNEL_SOURCES       CMD_KERNEL_SOURCES       "yes"
 	set_config_with_override STRING KNAME                CMD_KERNNAME             "genkernel"
 
 	set_config_with_override STRING MAKEOPTS             CMD_MAKEOPTS             "$DEFAULT_MAKEOPTS"
@@ -98,8 +98,8 @@ determine_real_args() {
 	set_config_with_override STRING MINKERNPACKAGE       CMD_MINKERNPACKAGE
 	set_config_with_override STRING MODULESPACKAGE       CMD_MODULESPACKAGE
 	set_config_with_override STRING KERNCACHE            CMD_KERNCACHE
-	set_config_with_override BOOL   RAMDISKMODULES       CMD_RAMDISKMODULES
-	set_config_with_override BOOL   ALLRAMDISKMODULES    CMD_ALLRAMDISKMODULES
+	set_config_with_override BOOL   RAMDISKMODULES       CMD_RAMDISKMODULES        "yes"
+	set_config_with_override BOOL   ALLRAMDISKMODULES    CMD_ALLRAMDISKMODULES     "no"
 	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
@@ -128,7 +128,7 @@ determine_real_args() {
 	set_config_with_override BOOL   KEYMAP               CMD_KEYMAP               "yes"
 	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
+	set_config_with_override BOOL   INSTALL              CMD_INSTALL              "no"
 
 	BOOTDIR=`arch_replace "${BOOTDIR}"`
 	BOOTDIR=${BOOTDIR%/}    # Remove any trailing slash

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

[Robin H. Johnson]

commit:     d2e62dfd1680219e201f3fcb8322de65769ee788
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 04:17:29 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 04:17:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=d2e62dfd

Missing changelog, I fail.

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

diff --git a/ChangeLog b/ChangeLog
index 38d63a1..817e1b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,16 @@
 # Distributed under the GPL v2
 # $Id$
 
+  06 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/busy-config:
+  Awk support in busybox is needed for initramfs setup code (to parse fstab).
+
+  06 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> TODO:
+  Multipath has been done for a while now.
+
+  06 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> genkernel.conf:
+  Add a configuration option for --install, so users can get it as a default.
+  Defaults to "no", due to catalyst.
+
   06 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> ChangeLog:
   Fix up changelog
 

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

[Robin H. Johnson]

commit:     670d3338c0b5fbc717980e54923e2555a8732bdf
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 06:36:53 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 06:36:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=670d3338

Bump to 3.4.22 to reflect /usr mount support.

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 01598db..ec025d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  06 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> genkernel:
+  Bump to 3.4.22 to reflect /usr mount support.
+
   06 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts,
   defaults/linuxrc:
   Code to mount /usr and other filesystems as needed for new udev and systemd.

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

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

[Robin H. Johnson]

commit:     8a912226e6d9c2135a82fdb5cc2843b483083873
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  8 02:30:21 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 02:30:21 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=8a912226

Verbump for last commit as a fix.

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

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

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

[Sebastian Pipping]

commit:     7314e877123bc0fb8d1193558e1576dee84e9f60
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu Jan 12 03:19:12 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 03:19:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=7314e877

Support application of patches for more tools

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

diff --git a/ChangeLog b/ChangeLog
index 6b26feb..90a4e3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  12 Jan 2012; Sebastian Pipping <sping@gentoo.org> gen_compile.sh:
+  Support application of patches before compilation for tools which previously
+  lacked that support. Special thanks to Tomasz Wasiak (bug #398469)
+
   08 Jan 2012; Sebastian Pipping <sping@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,

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

[Sebastian Pipping]

commit:     9ef832b915dc00ca70831bfbef788290b6e4ac75
Author:     Tomasz Wasiak <tjwasiak <AT> poczta <DOT> onet <DOT> pl>
AuthorDate: Thu Jan 12 03:38:47 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 03:39:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=9ef832b9

Support application of patches for more tools

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

diff --git a/gen_compile.sh b/gen_compile.sh
index d865df8..68dabdb 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -519,6 +519,7 @@ compile_dmraid() {
 			gen_die "Could not extract device-mapper binary cache!";
 
 		cd "${DMRAID_DIR}"
+		apply_patches dmraid ${DMRAID_VER}
 		print_info 1 'dmraid: >> Configuring...'
 
 		LDFLAGS="-L${TEMP}/device-mapper/lib" \
@@ -560,6 +561,7 @@ compile_device_mapper() {
 		[ ! -d "${DEVICE_MAPPER_DIR}" ] &&
 			gen_die "device-mapper directory ${DEVICE_MAPPER_DIR} invalid"
 		cd "${DEVICE_MAPPER_DIR}"
+		apply_patches device-mapper ${DEVICE_MAPPER_VER}
 		CFLAGS="-fPIC" \
 		./configure --prefix=${TEMP}/device-mapper --enable-static_link \
 			--disable-selinux >> ${LOGFILE} 2>&1 ||
@@ -596,6 +598,7 @@ compile_e2fsprogs() {
 		[ ! -d "${E2FSPROGS_DIR}" ] &&
 			gen_die "e2fsprogs directory ${E2FSPROGS_DIR} invalid"
 		cd "${E2FSPROGS_DIR}"
+		apply_patches e2fsprogs ${E2FSPROGS_VER}
 		print_info 1 'e2fsprogs: >> Configuring...'
 		LDFLAGS=-static ./configure >> ${LOGFILE} 2>&1 ||
 			gen_die 'Configuring e2fsprogs failed!'
@@ -627,6 +630,7 @@ compile_fuse() {
 		[ ! -d "${FUSE_DIR}" ] &&
 			gen_die "fuse directory ${FUSE_DIR} invalid"
 		cd "${FUSE_DIR}"
+		apply_patches fuse ${FUSE_VER}
 		print_info 1 'fuse: >> Configuring...'
 		./configure  --disable-kernel-module --disable-example >> ${LOGFILE} 2>&1 ||
 			gen_die 'Configuring fuse failed!'
@@ -663,6 +667,7 @@ compile_unionfs_fuse() {
 		[ ! -d "${UNIONFS_FUSE_DIR}" ] &&
 			gen_die "unionfs-fuse directory ${UNIONFS_FUSE_DIR} invalid"
 		cd "${UNIONFS_FUSE_DIR}"
+		apply_patches unionfs-fuse ${UNIONFS_FUSE_VER}
 		print_info 1 'unionfs-fuse: >> Compiling...'
 		sed -i "/^\(CFLAGS\|CPPFLAGS\)/s:^\\(.*\\)$:\\1 -static -I${TEMP}/${FUSE_DIR}/include -L${TEMP}/${FUSE_DIR}/lib/.libs:" Makefile src/Makefile
 		sed -i "/^LIB = /s:^LIB = \(.*\)$:LIB = -static -L${TEMP}/${FUSE_DIR}/lib/.libs \1 -ldl -lrt:" Makefile src/Makefile
@@ -745,6 +750,7 @@ compile_gpg() {
 		[ ! -d "${GPG_DIR}" ] &&
 			gen_die "gnupg directory ${GPG_DIR} invalid"
 		cd "${GPG_DIR}"
+		apply_patches gnupg ${GPG_VER}
 		print_info 1 'gnupg: >> Configuring...'
 		# --enable-minimal works, but it doesn't reduce the command length much.
 		# Given its history and the precision this needs, explicit is cleaner.

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

[Sebastian Pipping]

commit:     146934e1a8c7c4199d7cee9b0fea6ffaa4d94678
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Fri Jan 13 19:02:43 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 19:02:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=146934e1

Replace "# FOO=bar" by "#FOO=bar" in genkernel.conf (bug #398471)

---
 ChangeLog      |    5 ++++
 genkernel.conf |   60 ++++++++++++++++++++++++++++----------------------------
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 90a4e3d..8b3c23e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 # Distributed under the GPL v2
 # $Id$
 
+  13 Jan 2012; Sebastian Pipping <sping@gentoo.org> genkernel.conf:
+  Replace "# FOO=bar" by "#FOO=bar" in genkernel.conf to (1) distinguish
+  commented-out options from their explanatory comments and (2) to return
+  consistenty (bug #398471)
+
   12 Jan 2012; Sebastian Pipping <sping@gentoo.org> gen_compile.sh:
   Support application of patches before compilation for tools which previously
   lacked that support. Special thanks to Tomasz Wasiak (bug #398469)

diff --git a/genkernel.conf b/genkernel.conf
index c6378e2..b39a952 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -28,13 +28,13 @@ CLEAN="yes"
 MRPROPER="yes"
 
 # Override the arch detection?
-# ARCH_OVERRIDE="x86"
+#ARCH_OVERRIDE="x86"
 
 # Mount BOOTDIR automatically if it isn't mounted?
 MOUNTBOOT="yes"
 
 # Make symlinks in BOOTDIR automatically?
-# SYMLINK="no"
+#SYMLINK="no"
 
 # Save the new configuration in /etc/kernels upon
 # successfull compilation
@@ -44,7 +44,7 @@ SAVE_CONFIG="yes"
 USECOLOR="yes"
 
 # Clear build cache dir
-# CLEAR_CACHE_DIR="yes"
+#CLEAR_CACHE_DIR="yes"
 
 # Clear all tmp files and caches after genkernel has run
 #POSTCLEAR="1"
@@ -54,63 +54,63 @@ USECOLOR="yes"
 # tweaking the following line. Default setting is set up by
 # ${GK_SHARE}/${ARCH_OVERRIDE}/config.sh . The recommended value for -j
 # argument is: <number of processors>*<number of cores per processor>+1
-# MAKEOPTS="-j2"
+#MAKEOPTS="-j2"
 
 # Add in LVM support from static binaries if they exist on the system, or
 # compile static LVM binaries if static ones do not exist.
-# LVM="no"
+#LVM="no"
 
 # Add in Luks support. Needs sys-fs/cryptsetup with -dynamic installed.
-# LUKS="no"
+#LUKS="no"
 
 # Add in GnuPG support
-# GPG="no"
+#GPG="no"
 
 # Add DMRAID support.
-# DMRAID="no"
+#DMRAID="no"
 
 # Include (or suppresses the inclusion of) busybox in the initrd or initramfs.
 # If included, busybox is rebuilt if the cached copy is out of date.
-# BUSYBOX="yes"
+#BUSYBOX="yes"
 
 # Includes mdadm/mdmon binaries in initramfs.
 # Without sys-fs/mdadm[static] installed, this will build a static mdadm.
-# MDADM="no"
+#MDADM="no"
 
 # Specify a custom mdadm.conf.
 # By default the ramdisk will be built *without* an mdadm.conf and will auto-detect
 # arrays during bootup.  Usually, this should not be needed.
-# MDADM_CONFIG="/etc/mdadm.conf"
+#MDADM_CONFIG="/etc/mdadm.conf"
 
 # Add Multipath support.
-# MULTIPATH="no"
+#MULTIPATH="no"
 
 # Add iSCSI support.
-# ISCSI="no"
+#ISCSI="no"
 
 # Include support for unionfs
 #UNIONFS="1"
 
 # Enable copying of firmware into initramfs
-# FIRMWARE="no"
+#FIRMWARE="no"
 # Specify directory to pull from
-# FIRMWARE_DIR="/lib/firmware"
+#FIRMWARE_DIR="/lib/firmware"
 # Specify specific firmware files to include. This overrides FIRMWARE_DIR
-# FIRMWARE_FILES=""
+#FIRMWARE_FILES=""
 
 # Enable disklabel support (copies blkid to initrd)
 DISKLABEL="yes"
 
 # Add new kernel to grub?
-# BOOTLOADER="grub"
+#BOOTLOADER="grub"
 
 # Enable splashutils in early space (initrd). Default is "no".
-# SPLASH="yes"
+#SPLASH="yes"
 
 # Use this splash theme. If commented out - the "default" name theme is used.
 # Also, SPLASH="yes" needs to be enabled for this one to one work.
 # This supersedes the "SPLASH_THEME" option of /etc/conf.d/splash (in early space).
-# SPLASH_THEME="gentoo"
+#SPLASH_THEME="gentoo"
 
 
 # =========Keymap Settings=========
@@ -126,34 +126,34 @@ DISKLABEL="yes"
 # =========Low Level Compile Settings=========
 #
 # GNU Make to use for kernel.  See also the --kernel-make command line option.
-# KERNEL_MAKE="make"
+#KERNEL_MAKE="make"
 
 # Compiler to use for the kernel (e.g. distcc).  See also the --kernel-cc
 # command line option.
-# KERNEL_CC="gcc"
+#KERNEL_CC="gcc"
 
 # Assembler to use for the kernel.  See also the --kernel-as command line
 # option.
-# KERNEL_AS="as"
+#KERNEL_AS="as"
 
 # Linker to use for the kernel.  See also the --kernel-ld command line option.
-# KERNEL_LD="ld"
+#KERNEL_LD="ld"
 
 # GNU Make to use for the utilities.  See also the --utils-make command line
 # option.
-# UTILS_MAKE="make"
+#UTILS_MAKE="make"
 
 # Compiler to use for the utilities (e.g. distcc).  See also the --utils-cc
 # command line option.
-# UTILS_CC="gcc"
+#UTILS_CC="gcc"
 
 # Assembler to use for the utilities.  See also the --utils-as command line
 # option.
-# UTILS_AS="as"
+#UTILS_AS="as"
 
 # Linker to use for the utilities.  See also the --utils-ld command line
 # option.
-# UTILS_LD="ld"
+#UTILS_LD="ld"
 
 
 # Common prefix of cros compile commands
@@ -171,7 +171,7 @@ DISKLABEL="yes"
 #   %%CACHE%% - Final determined cache location
 
 # Set genkernel's temporary work directory.  Default is /var/tmp/genkernel
-# TMPDIR="/var/tmp/genkernel"
+#TMPDIR="/var/tmp/genkernel"
 
 # Set the boot directory, default is /boot
 #BOOTDIR="/boot"
@@ -194,7 +194,7 @@ LOGLEVEL=1
 DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 # Default kernel config (only use to override using
 # arch/%%ARCH%%/kernel-config-${VER}.${PAT} !)
-# DEFAULT_KERNEL_CONFIG="${GK_SHARE}/arch/%%ARCH%%/kernel-config"
+#DEFAULT_KERNEL_CONFIG="${GK_SHARE}/arch/%%ARCH%%/kernel-config"
 
 # Specifies a user created busybox config
 #BUSYBOX_CONFIG="/path/to/file"
@@ -203,7 +203,7 @@ BUSYBOX_VER="VERSION_BUSYBOX"
 BUSYBOX_SRCTAR="${DISTDIR}/busybox-${BUSYBOX_VER}.tar.bz2"
 BUSYBOX_DIR="busybox-${BUSYBOX_VER}"
 BUSYBOX_BINCACHE="%%CACHE%%/busybox-${BUSYBOX_VER}-%%ARCH%%.tar.bz2"
-# BUSYBOX_APPLETS="[ ash sh mount uname echo cut cat"
+#BUSYBOX_APPLETS="[ ash sh mount uname echo cut cat"
 
 DEVICE_MAPPER_VER="VERSION_DMAP"
 DEVICE_MAPPER_DIR="device-mapper.${DEVICE_MAPPER_VER}"

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

[Robin H. Johnson]

commit:     b49f1f377db6482aeb4f0a0a717f54632319ded9
Author:     Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Fri Jan 13 20:30:47 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 20:30:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b49f1f37

Prior to commit a141d715, CMD_NOINSTALL had no default set, but most of the usages were of the form "! isTrue ${CMD_NOINSTALL}", which on an unset value, came out as false. These were replaced by "isTrue ${CMD_INSTALL}", but my analysis of the needed default value was wrong, and was set to false instead of true.

Signed-off-by: Robin H. Johnson <robbat2 <AT> orbis-terrarum.net>

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

diff --git a/ChangeLog b/ChangeLog
index 8b3c23e..e1a5545 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,13 @@
 # Distributed under the GPL v2
 # $Id$
 
+  13 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> gen_determineargs.sh:
+  Prior to commit a141d715, CMD_NOINSTALL had no default set, but most of the
+  usages were of the form "! isTrue ${CMD_NOINSTALL}", which on an unset value,
+  came out as false. These were replaced by "isTrue ${CMD_INSTALL}", but my
+  analysis of the needed default value was wrong, and was set to false instead
+  of true.
+
   13 Jan 2012; Sebastian Pipping <sping@gentoo.org> genkernel.conf:
   Replace "# FOO=bar" by "#FOO=bar" in genkernel.conf to (1) distinguish
   commented-out options from their explanatory comments and (2) to return

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index cd91a27..66f7ee1 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -128,7 +128,7 @@ determine_real_args() {
 	set_config_with_override BOOL   KEYMAP               CMD_KEYMAP               "yes"
 	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              "no"
+	set_config_with_override BOOL   INSTALL              CMD_INSTALL              "yes"
 
 	BOOTDIR=`arch_replace "${BOOTDIR}"`
 	BOOTDIR=${BOOTDIR%/}    # Remove any trailing slash

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

[Sebastian Pipping]

commit:     e53d1931d0d2b8592b04f31143ce0886e0cb190b
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Fri Jan 13 21:44:45 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 21:45:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=e53d1931

Bump version to 3.4.23

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

diff --git a/ChangeLog b/ChangeLog
index 6d2a5a8..1d8b0ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  13 Jan 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.23
+
   13 Jan 2012; Sebastian Pipping <sping@gentoo.org>
   +patches/busybox/1.19.3/1.18.1-openvt.diff,
   +patches/busybox/1.19.3/busybox-1.7.4-signal-hack.patch:

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

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

[Sebastian Pipping]

commit:     de79822567d0a5277a5510b6e224e3e511748705
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Jan 15 00:16:32 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 00:16:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=de798225

Bump version to 3.4.23.1

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

diff --git a/ChangeLog b/ChangeLog
index 7e99f39..006619f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  15 Jan 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.23.1
+
   14 Jan 2012; Sebastian Pipping <sping@gentoo.org> defaults/busy-config:
   Re-activate mdstart in busybox config
 

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

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

[Sebastian Pipping]

commit:     06570e177b5aee015d95bf8dae1687bf8af98e19
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Tue Jan 24 23:26:11 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 23:26:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=06570e17

Extend .gitignore so echangelog ignores release tarballs

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

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

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

[Sebastian Pipping]

commit:     7879a0c74c3b1722f231711c07d92d26880762b8
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Tue Jan 24 23:25:07 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 23:26:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=7879a0c7

Bump version to 3.4.24

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

diff --git a/ChangeLog b/ChangeLog
index fd1e105..370f6fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  24 Jan 2012; Sebastian Pipping <sping@gentoo.org> .gitignore, genkernel:
+  Bump version to 3.4.24
+
   24 Jan 2012; Sebastian Pipping <sping@gentoo.org> arch/alpha/kernel-config,
   arch/ia64/kernel-config, arch/ppc/kernel-config, arch/sparc64/kernel-config,
   arch/x86/kernel-config:

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

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

[Sebastian Pipping]

commit:     7452b0733cb786b32e31af060b8952e41b9e3f59
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Fri Feb  3 14:12:25 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Feb  3 14:13:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=7452b073

Extend change log

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

diff --git a/ChangeLog b/ChangeLog
index 370f6fc..1c39b7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  03 Feb 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
+  Support SD card readers. Patch by Rick Farina
+
   24 Jan 2012; Sebastian Pipping <sping@gentoo.org> .gitignore, genkernel:
   Bump version to 3.4.24
 

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

[Robin H. Johnson]

commit:     1079122ea0c1733024dbebadd2ae8ad2c88a9bee
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Wed Feb  1 03:20:49 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Feb  6 08:19:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=1079122e

copy_binaries: utility function to pick up a binary and needed libs

The existing multipath functionality manually picks up a binary and lots
of needed libraries manually, and sometimes misses libraries if the
binary was linked against something else.

Use lddtree from app-misc/pax-utils to get all libraries with the
binary. The only ones that will be missed are those that are dlopen()ed.
cpio is used for copying to preserve directory structure.

lddtree usage replaces a larger manual function from calling ldd, that
was also vulnerable to injections.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
(commit message rewritten)

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

diff --git a/ChangeLog b/ChangeLog
index bc8be73..5115896 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  06 Feb 2012: Richard Yao <ryao@cs.stonybrook.edu> gen_initramfs.sh:
+  copy_binaries utility function for putting binaries and librares into
+  initramfs (see git commit for full details).
+
   06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts:
   Support virtio devices, and provide fallback of all remaining devices.
 

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 32a1b1e..b96e36e 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -3,6 +3,15 @@
 
 CPIO_ARGS="--quiet -o -H newc"
 
+copy_binaries() {
+
+	local destdir=$1 files=$2
+
+	# Copy files
+	lddtree $files | tr ')(' '\n' |awk  '/=>/{ if($3 ~ /^\//){print $3}}' | sort | uniq | cpio -p --make-directories --dereference --quiet $destdir
+
+}
+
 append_base_layout() {
 	if [ -d "${TEMP}/initramfs-base-temp" ]
 	then

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

[Robin H. Johnson]

commit:     a871576d170277d935306a78acebf24a52103b65
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Mon Feb  6 08:00:32 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Feb  6 08:19:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=a871576d

Fix hardcoded paths in multipath support

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

---
 ChangeLog        |    3 +++
 gen_initramfs.sh |   28 ++--------------------------
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5115896..0dec7c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
 # $Id$
 
   06 Feb 2012: Richard Yao <ryao@cs.stonybrook.edu> gen_initramfs.sh:
+  Refactor multipath initramfs generation using copy_binaries.
+
+  06 Feb 2012: Richard Yao <ryao@cs.stonybrook.edu> gen_initramfs.sh:
   copy_binaries utility function for putting binaries and librares into
   initramfs (see git commit for full details).
 

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index b96e36e..02e6554 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -164,32 +164,8 @@ append_multipath(){
 	mkdir -p "${TEMP}/initramfs-multipath-temp/sbin/"
 	mkdir -p "${TEMP}/initramfs-multipath-temp/lib/"
 
-	# Copy files to /lib
-	for i in /lib/{ld-*,libc-*,libc.*,libdl-*,libdl.*,libdevmapper*so*,libpthread*,librt*,libreadline*,libncurses*}
-	do
-		cp -a "${i}" "${TEMP}/initramfs-multipath-temp/lib" \
-			|| gen_die "Could not copy file ${i} for MULTIPATH"
-	done
-
-	for i in /usr/lib/libaio*
-	do
-		 cp -a "${i}" "${TEMP}/initramfs-multipath-temp/lib" \
-			|| gen_die "Could not copy file ${i} for MULTIPATH"
-	done
-
-	# Copy files to /sbin
-	for i in /sbin/{multipath,kpartx,mpath_prio_*,devmap_name,dmsetup} /lib64/udev/scsi_id
-	do
-		cp -a "${i}" "${TEMP}/initramfs-multipath-temp/sbin" \
-			|| gen_die "Could not copy file ${i} for MULTIPATH"
-	done
-
-	# Copy files to /bin
-	for i in /bin/mountpoint
-	do
-		cp -a "${i}" "${TEMP}/initramfs-multipath-temp/bin" \
-			|| gen_die "Could not copy file ${i} for MULTIPATH"
-	done
+	# Copy files
+	copy_binaries "${TEMP}/initramfs-multipath-temp" "$(echo /sbin/{multipath,kpartx,mpath_prio_*,devmap_name,dmsetup} /lib64/udev/scsi_id /bin/mountpoint)"
 
 	if [ -x /sbin/multipath ]
 	then

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

[Robin H. Johnson]

commit:     5f4d31dfd0eb71c4001afcc6d32a610060901c04
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  6 08:05:54 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Feb  6 08:19:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=5f4d31df

copy_binaries, multipath: refactor for ease of use and readability.

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

---
 ChangeLog        |    3 +++
 gen_initramfs.sh |   20 ++++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0dec7c5..6c2a7d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
+  Refactor copy_binaries and multipath slightly for ease of usage and readability.
+
   06 Feb 2012: Richard Yao <ryao@cs.stonybrook.edu> gen_initramfs.sh:
   Refactor multipath initramfs generation using copy_binaries.
 

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 02e6554..43fd77f 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -4,11 +4,14 @@
 CPIO_ARGS="--quiet -o -H newc"
 
 copy_binaries() {
-
-	local destdir=$1 files=$2
-
-	# Copy files
-	lddtree $files | tr ')(' '\n' |awk  '/=>/{ if($3 ~ /^\//){print $3}}' | sort | uniq | cpio -p --make-directories --dereference --quiet $destdir
+	local destdir=$1
+	shift
+	lddtree "$@" \
+		| tr ')(' '\n' \
+		| awk  '/=>/{ if($3 ~ /^\//){print $3}}' \
+		| sort \
+		| uniq \
+		| cpio -p --make-directories --dereference --quiet $destdir
 
 }
 
@@ -159,13 +162,10 @@ append_multipath(){
 		rm -r "${TEMP}/initramfs-multipath-temp"
 	fi
 	print_info 1 '	Multipath support being added'
-	mkdir -p "${TEMP}/initramfs-multipath-temp/bin/"
-	mkdir -p "${TEMP}/initramfs-multipath-temp/etc/" 
-	mkdir -p "${TEMP}/initramfs-multipath-temp/sbin/"
-	mkdir -p "${TEMP}/initramfs-multipath-temp/lib/"
+	mkdir -p "${TEMP}"/initramfs-multipath-temp/{bin,etc,sbin,lib}/
 
 	# Copy files
-	copy_binaries "${TEMP}/initramfs-multipath-temp" "$(echo /sbin/{multipath,kpartx,mpath_prio_*,devmap_name,dmsetup} /lib64/udev/scsi_id /bin/mountpoint)"
+	copy_binaries "${TEMP}/initramfs-multipath-temp" /sbin/{multipath,kpartx,mpath_prio_*,devmap_name,dmsetup} /lib64/udev/scsi_id /bin/mountpoint
 
 	if [ -x /sbin/multipath ]
 	then

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

[Robin H. Johnson]

commit:     1240654461ea74087a5953da48443f977aa59da6
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  6 09:52:55 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Feb  6 09:52:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=12406544

Bugfixes in new code branches that I didn't test fully.

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

---
 ChangeLog        |    3 +++
 gen_initramfs.sh |   12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ddc3844..c0a09cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
+  Bugfixes in new code branches that I didn't test fully.
+
   06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> doc/genkernel.8.txt,
   gen_cmdline.sh:
   Update documentation for new initramfs compression.

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 3aab15d..5704173 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -709,22 +709,22 @@ create_initramfs() {
 			case ${COMPRESS_INITRD_TYPE} in
 				xz|lzma|bzip2|gzip2|lzo) compression=${COMPRESS_INITRD_TYPE} ;;
 				best)
-					if grep -sq '^CONFIG_RD_XZ=y' ${KERNEL_DIR}/.config && test -n "${cmd_xz}" ;
+					if grep -sq '^CONFIG_RD_XZ=y' ${KERNEL_DIR}/.config && test -n "${cmd_xz}" ; then
 						compression=xz
-					elif grep -sq '^CONFIG_RD_LZMA=y' ${KERNEL_DIR}/.config && test -n "${cmd_lzma}" ;
+					elif grep -sq '^CONFIG_RD_LZMA=y' ${KERNEL_DIR}/.config && test -n "${cmd_lzma}" ; then
 						compression=lzma
-					elif grep -sq '^CONFIG_RD_BZIP2=y' ${KERNEL_DIR}/.config  && test -n "${cmd_bzip2}" ;
+					elif grep -sq '^CONFIG_RD_BZIP2=y' ${KERNEL_DIR}/.config  && test -n "${cmd_bzip2}" ; then
 						compression=bzip2
-					elif grep -sq '^CONFIG_RD_GZIP=y' ${KERNEL_DIR}/.config && test -n "${cmd_gzip}" ;
+					elif grep -sq '^CONFIG_RD_GZIP=y' ${KERNEL_DIR}/.config && test -n "${cmd_gzip}" ; then
 						compression=gzip
-					elif grep -sq '^CONFIG_RD_LZO=y' ${KERNEL_DIR}/.config && test -n "${cmd_lzop}" ;
+					elif grep -sq '^CONFIG_RD_LZO=y' ${KERNEL_DIR}/.config && test -n "${cmd_lzop}" ; then
 						compression=lzo
 					fi ;;
 			esac
 			case $compression in
 				xz) compress_ext='.xz' compress_cmd="${cmd_xz} -e --check=none -z -f -9" ;;
 				lzma) compress_ext='.lzma' compress_cmd="${cmd_lzma} -z -f -9" ;;
-				bzip2) compress_ext='.bz2' compress_cmd="${cmd_bzip2} -z -f -9"
+				bzip2) compress_ext='.bz2' compress_cmd="${cmd_bzip2} -z -f -9" ;;
 				gzip) compress_ext='.gz' compress_cmd="${cmd_gzip} -f -9" ;;
 				lzo) compress_ext='.lzo' compress_cmd="${cmd_lzop} -f -9" ;;
 			esac

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

[Robin H. Johnson]

commit:     45e8dbfa0e6b193662b2c0273f90e66452c4a102
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 01:16:27 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 01:16:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=45e8dbfa

device-mapper "update". It was merged into LVM2-2.02.67 upstream in 2010. Bug #398467 is wrong for the device-mapper update.

---
 ChangeLog            |    5 +++++
 gen_cmdline.sh       |    8 ++++----
 gen_compile.sh       |   33 +--------------------------------
 gen_determineargs.sh |    2 --
 gen_funcs.sh         |    2 +-
 genkernel.conf       |    5 -----
 6 files changed, 11 insertions(+), 44 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f867f22..b77d111 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 # Distributed under the GPL v2
 # $Id$
 
+  12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_cmdline.sh,
+  gen_compile.sh, gen_determineargs.sh, gen_funcs.sh, genkernel.conf:
+  device-mapper "update". It was merged into LVM2-2.02.67 upstream in 2010.
+  Bug #398467 is wrong for the device-mapper update.
+
   09 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts,
   defaults/linuxrc:
   Dogfooding of the /usr mount code with the matching OpenRC change to make the

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 2e68882..184db65 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -295,8 +295,8 @@ parse_cmdline() {
 			CMD_DMRAID=`parse_optbool "$*"`
 			if [ "$CMD_DMRAID" = "1" -a ! -e /usr/include/libdevmapper.h ]
 			then
-				echo 'Error: --dmraid requires device-mapper to be installed'
-				echo '		 on the host system; try "emerge device-mapper".'
+				echo 'Error: --dmraid requires LVM2 to be installed'
+				echo '		 on the host system; try "emerge lvm2".'
 				exit 1
 			fi
 			print_info 2 "CMD_DMRAID: ${CMD_DMRAID}"
@@ -309,8 +309,8 @@ parse_cmdline() {
 			CMD_MULTIPATH=`parse_optbool "$*"`
 			if [ "$CMD_MULTIPATH" = "1" -a ! -e /usr/include/libdevmapper.h ]
 			then
-				echo 'Error: --multipath requires device-mapper to be installed'
-				echo '		 on the host;system; try "emerge device-mapper".'
+				echo 'Error: --multipath requires LVM2 to be installed'
+				echo '		 on the host;system; try "emerge lvm2".'
 				exit 1
 			fi
 			print_info 2 "CMD_MULTIPATH: ${CMD_MULTIPATH}"

diff --git a/gen_compile.sh b/gen_compile.sh
index 68dabdb..aa0f04c 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -551,38 +551,7 @@ compile_dmraid() {
 }
 
 compile_device_mapper() {
-	if [ ! -f "${DEVICE_MAPPER_BINCACHE}" ]
-	then
-		[ ! -f "${DEVICE_MAPPER_SRCTAR}" ] &&
-			gen_die "Could not find device-mapper source tarball: ${DEVICE_MAPPER_SRCTAR}. Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
-		cd "${TEMP}"
-		rm -rf "${DEVICE_MAPPER_DIR}"
-		/bin/tar -zxpf "${DEVICE_MAPPER_SRCTAR}"
-		[ ! -d "${DEVICE_MAPPER_DIR}" ] &&
-			gen_die "device-mapper directory ${DEVICE_MAPPER_DIR} invalid"
-		cd "${DEVICE_MAPPER_DIR}"
-		apply_patches device-mapper ${DEVICE_MAPPER_VER}
-		CFLAGS="-fPIC" \
-		./configure --prefix=${TEMP}/device-mapper --enable-static_link \
-			--disable-selinux >> ${LOGFILE} 2>&1 ||
-			gen_die 'Configuring device-mapper failed!'
-		print_info 1 'device-mapper: >> Compiling...'
-		compile_generic '' utils
-		compile_generic 'install' utils
-		print_info 1 '        >> Copying to cache...'
-		cd "${TEMP}"
-		rm -rf "${TEMP}/device-mapper/man" ||
-			gen_die 'Could not remove manual pages!'
-		strip "${TEMP}/device-mapper/sbin/dmsetup" ||
-			gen_die 'Could not strip dmsetup binary!'
-		/bin/tar -jcpf "${DEVICE_MAPPER_BINCACHE}" device-mapper ||
-			gen_die 'Could not tar up the device-mapper binary!'
-		[ -f "${DEVICE_MAPPER_BINCACHE}" ] ||
-			gen_die 'device-mapper cache not created!'
-		cd "${TEMP}"
-		rm -rf "${DEVICE_MAPPER_DIR}" > /dev/null
-		rm -rf "${TEMP}/device-mapper" > /dev/null
-	fi
+	compile_lvm
 }
 
 compile_e2fsprogs() {

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 4a21530..bbff166 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -138,7 +138,6 @@ determine_real_args() {
 
 	CACHE_DIR=`arch_replace "${CACHE_DIR}"`
 	BUSYBOX_BINCACHE=`cache_replace "${BUSYBOX_BINCACHE}"`
-	DEVICE_MAPPER_BINCACHE=`cache_replace "${DEVICE_MAPPER_BINCACHE}"`
 	LVM_BINCACHE=`cache_replace "${LVM_BINCACHE}"`
 	MDADM_BINCACHE=`cache_replace "${MDADM_BINCACHE}"`
 	DMRAID_BINCACHE=`cache_replace "${DMRAID_BINCACHE}"`
@@ -151,7 +150,6 @@ determine_real_args() {
 	DEFAULT_KERNEL_CONFIG=`arch_replace "${DEFAULT_KERNEL_CONFIG}"`
 	BUSYBOX_CONFIG=`arch_replace "${BUSYBOX_CONFIG}"`
 	BUSYBOX_BINCACHE=`arch_replace "${BUSYBOX_BINCACHE}"`
-	DEVICE_MAPPER_BINCACHE=`arch_replace "${DEVICE_MAPPER_BINCACHE}"`
 	LVM_BINCACHE=`arch_replace "${LVM_BINCACHE}"`
 	MDADM_BINCACHE=`arch_replace "${MDADM_BINCACHE}"`
 	DMRAID_BINCACHE=`arch_replace "${DMRAID_BINCACHE}"`

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 3beabd7..739311b 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -494,7 +494,7 @@ set_config_with_override() {
 }
 
 check_distfiles() {
-	for i in $BUSYBOX_SRCTAR $DEVICE_MAPPER_SRCTAR $MULTIPATH_SRCTAR $LVM_SRCTAR $DMRAID_SRCTAR $E2FSPROGS_SRCTAR $ISCSI_SRCTAR $GPG_SRCTAR
+	for i in $BUSYBOX_SRCTAR $MULTIPATH_SRCTAR $LVM_SRCTAR $DMRAID_SRCTAR $E2FSPROGS_SRCTAR $ISCSI_SRCTAR $GPG_SRCTAR
 	do
 		if [ ! -f "${i}" ]
 		then

diff --git a/genkernel.conf b/genkernel.conf
index 22b18d7..1e4bb31 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -205,11 +205,6 @@ BUSYBOX_DIR="busybox-${BUSYBOX_VER}"
 BUSYBOX_BINCACHE="%%CACHE%%/busybox-${BUSYBOX_VER}-%%ARCH%%.tar.bz2"
 #BUSYBOX_APPLETS="[ ash sh mount uname echo cut cat"
 
-DEVICE_MAPPER_VER="VERSION_DMAP"
-DEVICE_MAPPER_DIR="device-mapper.${DEVICE_MAPPER_VER}"
-DEVICE_MAPPER_SRCTAR="${DISTDIR}/device-mapper.${DEVICE_MAPPER_VER}.tgz"
-DEVICE_MAPPER_BINCACHE="%%CACHE%%/device-mapper-${DEVICE_MAPPER_VER}-%%ARCH%%.tar.bz2"
-
 LVM_VER="VERSION_LVM"
 LVM_DIR="LVM2.${LVM_VER}"
 LVM_SRCTAR="${DISTDIR}/LVM2.${LVM_VER}.tgz"

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

[Robin H. Johnson]

commit:     bd693b8db3aca7bf2771f34a007ecf4e042ca8ff
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 01:50:42 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 01:50:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=bd693b8d

Bug #265005: ensure CROSS_COMPILE is set for cross-compile strip calls to work.

---
 ChangeLog      |    4 ++++
 gen_compile.sh |   18 +++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 17cc4bd..06916d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_compile.sh:
+  Bug #265005: ensure CROSS_COMPILE is set for cross-compile strip calls to
+  work.
+
   12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org>
   +patches/dmraid/dmraid-1.0.0_rc16-as-needed2.patch,
   +patches/dmraid/dmraid-1.0.0_rc16-return-all-sets.patch,

diff --git a/gen_compile.sh b/gen_compile.sh
index aa0f04c..8a53c74 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -80,6 +80,10 @@ export_utils_args()
 	then
 		export AS="${UTILS_AS}"
 	fi
+	if [ "${UTILS_CROSS_COMPILE}" != '' ]
+	then
+		export CROSS_COMPILE="${UTILS_CROSS_COMPILE}"
+	fi
 }
 
 unset_utils_args()
@@ -100,6 +104,10 @@ unset_utils_args()
 	then
 		unset AS
 	fi
+	if [ "${UTILS_CROSS_COMPILE}" != '' ]
+	then
+		unset CROSS_COMPILE
+	fi
 	reset_args
 }
 
@@ -411,7 +419,7 @@ compile_busybox() {
 		print_info 1 'busybox: >> Copying to cache...'
 		[ -f "${TEMP}/${BUSYBOX_DIR}/busybox" ] ||
 			gen_die 'Busybox executable does not exist!'
-		strip "${TEMP}/${BUSYBOX_DIR}/busybox" ||
+		${UTILS_CROSS_COMPILE}strip "${TEMP}/${BUSYBOX_DIR}/busybox" ||
 			gen_die 'Could not strip busybox binary!'
 		tar -cj -C "${TEMP}/${BUSYBOX_DIR}" -f "${BUSYBOX_BINCACHE}" busybox .config .config.gk_orig ||
 			gen_die 'Could not create the busybox bincache!'
@@ -449,7 +457,7 @@ compile_lvm() {
 
 		cd "${TEMP}/lvm"
 		print_info 1 '      >> Copying to bincache...'
-		strip "sbin/lvm.static" ||
+		${UTILS_CROSS_COMPILE}strip "sbin/lvm.static" ||
 			gen_die 'Could not strip lvm.static!'
 		# See bug 382555
 		strip "sbin/dmsetup.static" ||
@@ -576,7 +584,7 @@ compile_e2fsprogs() {
 		print_info 1 'blkid: >> Copying to cache...'
 		[ -f "${TEMP}/${E2FSPROGS_DIR}/misc/blkid" ] ||
 			gen_die 'Blkid executable does not exist!'
-		strip "${TEMP}/${E2FSPROGS_DIR}/misc/blkid" ||
+		${UTILS_CROSS_COMPILE}strip "${TEMP}/${E2FSPROGS_DIR}/misc/blkid" ||
 			gen_die 'Could not strip blkid binary!'
 		bzip2 "${TEMP}/${E2FSPROGS_DIR}/misc/blkid" ||
 			gen_die 'bzip2 compression of blkid failed!'
@@ -610,7 +618,7 @@ compile_fuse() {
 #		print_info 1 'libfuse: >> Copying to cache...'
 #		[ -f "${TEMP}/${FUSE_DIR}/lib/.libs/libfuse.so" ] ||
 #			gen_die 'libfuse.so does not exist!'
-#		strip "${TEMP}/${FUSE_DIR}/lib/.libs/libfuse.so" ||
+#		${UTILS_CROSS_COMPILE}strip "${TEMP}/${FUSE_DIR}/lib/.libs/libfuse.so" ||
 #			gen_die 'Could not strip libfuse.so!'
 #		cd "${TEMP}/${FUSE_DIR}/lib/.libs"
 #		tar -cjf "${FUSE_BINCACHE}" libfuse*so* ||
@@ -644,7 +652,7 @@ compile_unionfs_fuse() {
 		print_info 1 'unionfs-fuse: >> Copying to cache...'
 		[ -f "${TEMP}/${UNIONFS_FUSE_DIR}/src/unionfs" ] ||
 			gen_die 'unionfs binary does not exist!'
-		strip "${TEMP}/${UNIONFS_FUSE_DIR}/src/unionfs" ||
+		${UTILS_CROSS_COMPILE}strip "${TEMP}/${UNIONFS_FUSE_DIR}/src/unionfs" ||
 			gen_die 'Could not strip unionfs binary!'
 		bzip2 "${TEMP}/${UNIONFS_FUSE_DIR}/src/unionfs" ||
 			gen_die 'bzip2 compression of unionfs binary failed!'

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

[Robin H. Johnson]

commit:     8e800df298362c0936712852a80f7b323552fbe7
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 06:47:32 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 06:47:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=8e800df2

More UTILS_CROSS_COMPILE prefix on strip calls.

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

---
 ChangeLog      |    3 +++
 gen_compile.sh |    8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c796941..41db029 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_compile.sh:
+  More UTILS_CROSS_COMPILE prefix on strip calls.
+
   12 Feb 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_compile.sh b/gen_compile.sh
index 8a53c74..bc93be8 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -460,7 +460,7 @@ compile_lvm() {
 		${UTILS_CROSS_COMPILE}strip "sbin/lvm.static" ||
 			gen_die 'Could not strip lvm.static!'
 		# See bug 382555
-		strip "sbin/dmsetup.static" ||
+		${UTILS_CROSS_COMPILE}strip "sbin/dmsetup.static" ||
 			gen_die 'Could not strip dmsetup.static'
 		/bin/tar -cjf "${LVM_BINCACHE}" sbin/lvm.static sbin/dmsetup.static ||
 			gen_die 'Could not create binary cache'
@@ -500,7 +500,7 @@ compile_mdadm() {
 		install -m 0755 -s mdmon "${TEMP}/mdadm/sbin/mdmon"
 		print_info 1 '      >> Copying to bincache...'
 		cd "${TEMP}/mdadm"
-		strip "sbin/mdadm" "sbin/mdmon" ||
+		${UTILS_CROSS_COMPILE}strip "sbin/mdadm" "sbin/mdmon" ||
 			gen_die 'Could not strip mdadm binaries!'
 		/bin/tar -cjf "${MDADM_BINCACHE}" sbin/mdadm sbin/mdmon ||
 			gen_die 'Could not create binary cache'
@@ -702,7 +702,7 @@ compile_iscsi() {
 		print_info 1 'iscsistart: >> Copying to cache...'
 		[ -f "${TEMP}/${ISCSI_DIR}/usr/iscsistart" ] ||
 			gen_die 'iscsistart executable does not exist!'
-		strip "${TEMP}/${ISCSI_DIR}/usr/iscsistart" ||
+		${UTILS_CROSS_COMPILE}strip "${TEMP}/${ISCSI_DIR}/usr/iscsistart" ||
 			gen_die 'Could not strip iscsistart binary!'
 		bzip2 "${TEMP}/${ISCSI_DIR}/usr/iscsistart" ||
 			gen_die 'bzip2 compression of iscsistart failed!'
@@ -749,7 +749,7 @@ compile_gpg() {
 		print_info 1 'gnupg: >> Copying to cache...'
 		[ -f "${TEMP}/${GPG_DIR}/g10/gpg" ] ||
 			gen_die 'gnupg executable does not exist!'
-		strip "${TEMP}/${GPG_DIR}/g10/gpg" ||
+		${UTILS_CROSS_COMPILE}strip "${TEMP}/${GPG_DIR}/g10/gpg" ||
 			gen_die 'Could not strip gpg binary!'
 		bzip2 -z -c "${TEMP}/${GPG_DIR}/g10/gpg" > "${GPG_BINCACHE}" ||
 			gen_die 'Could not copy the gpg binary to the package directory, does the directory exist?'

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

[Robin H. Johnson]

commit:     265363f79df5a545dc47547dbee76972b387e9b7
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 08:31:46 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 08:31:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=265363f7

Fix dmraid building with LVM/device-mapper

dmraid is entirely broken if you try to use the system static
LVM/device-mapper. Instead, always build our own LVM2 for the initramfs,
using DESTDIR for cleaner install. Dead code paths for old LVM2 build
not removed yet until more users have tested.

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

---
 ChangeLog        |    7 +++++++
 gen_compile.sh   |   39 +++++++++++++++++++++------------------
 gen_initramfs.sh |    5 +++--
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 41db029..e5c391b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,13 @@
 # Distributed under the GPL v2
 # $Id$
 
+  14 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_compile.sh,
+  gen_initramfs.sh:
+  dmraid is entirely broken if you try to use the system static
+  LVM/device-mapper. Instead start always building LVM2 for the initramfs,
+  using DESTDIR for cleaner install. Dead code paths for old LVM2 build not
+  removed yet until more users have tested.
+
   12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_compile.sh:
   More UTILS_CROSS_COMPILE prefix on strip calls.
 

diff --git a/gen_compile.sh b/gen_compile.sh
index bc93be8..646e0ef 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -406,7 +406,7 @@ compile_busybox() {
 		/bin/tar -jxpf ${BUSYBOX_SRCTAR} ||
 			gen_die 'Could not extract busybox source tarball!'
 		[ -d "${BUSYBOX_DIR}" ] ||
-			gen_die 'Busybox directory ${BUSYBOX_DIR} is invalid!'
+			gen_die "Busybox directory ${BUSYBOX_DIR} is invalid!"
 		cp "${BUSYBOX_CONFIG}" "${BUSYBOX_DIR}/.config"
 		cp "${BUSYBOX_CONFIG}" "${BUSYBOX_DIR}/.config.gk_orig"
 		cd "${BUSYBOX_DIR}"
@@ -441,19 +441,20 @@ compile_lvm() {
 		/bin/tar -zxpf ${LVM_SRCTAR} ||
 			gen_die 'Could not extract LVM source tarball!'
 		[ -d "${LVM_DIR}" ] ||
-			gen_die 'LVM directory ${LVM_DIR} is invalid!'
+			gen_die "LVM directory ${LVM_DIR} is invalid!"
 		cd "${LVM_DIR}"
 		apply_patches lvm ${LVM_VER}
 		print_info 1 'lvm: >> Configuring...'
 			CFLAGS="-fPIC" \
-			./configure --enable-static_link --prefix=${TEMP}/lvm \
+			./configure --enable-static_link --prefix=/ \
 				--with-lvm1=internal --with-clvmd=none --with-cluster=none \
 				--disable-readline --disable-selinux --with-mirrors=internal \
-				--with-snapshots=internal --with-pool=internal >> ${LOGFILE} 2>&1 || \
+				--with-snapshots=internal --with-pool=internal \
+				>> ${LOGFILE} 2>&1 || \
 				gen_die 'Configure of lvm failed!'
 		print_info 1 'lvm: >> Compiling...'
-			compile_generic '' utils
-			compile_generic 'install' utils
+		compile_generic '' utils
+		compile_generic "install DESTDIR=${TEMP}/lvm/" utils
 
 		cd "${TEMP}/lvm"
 		print_info 1 '      >> Copying to bincache...'
@@ -462,11 +463,11 @@ compile_lvm() {
 		# See bug 382555
 		${UTILS_CROSS_COMPILE}strip "sbin/dmsetup.static" ||
 			gen_die 'Could not strip dmsetup.static'
-		/bin/tar -cjf "${LVM_BINCACHE}" sbin/lvm.static sbin/dmsetup.static ||
+		/bin/tar -cjf "${LVM_BINCACHE}" . ||
 			gen_die 'Could not create binary cache'
 
 		cd "${TEMP}"
-		rm -rf "${TEMP}/device-mapper" > /dev/null
+		rm -rf "${TEMP}/lvm" > /dev/null
 		rm -rf "${LVM_DIR}" lvm
 	fi
 }
@@ -483,7 +484,7 @@ compile_mdadm() {
 		/bin/tar -jxpf "${MDADM_SRCTAR}" ||
 			gen_die 'Could not extract MDADM source tarball!'
 		[ -d "${MDADM_DIR}" ] ||
-			gen_die 'MDADM directory ${MDADM_DIR} is invalid!'
+			gen_die "MDADM directory ${MDADM_DIR} is invalid!"
 
 		cd "${MDADM_DIR}"
 		apply_patches mdadm ${MDADM_VER}
@@ -521,24 +522,26 @@ compile_dmraid() {
 		/bin/tar -jxpf ${DMRAID_SRCTAR} ||
 			gen_die 'Could not extract DMRAID source tarball!'
 		[ -d "${DMRAID_DIR}" ] ||
-			gen_die 'DMRAID directory ${DMRAID_DIR} is invalid!'
-		rm -rf "${TEMP}/device-mapper" > /dev/null
-		/bin/tar -jxpf "${DEVICE_MAPPER_BINCACHE}" -C "${TEMP}" ||
-			gen_die "Could not extract device-mapper binary cache!";
+			gen_die "DMRAID directory ${DMRAID_DIR} is invalid!"
+		rm -rf "${TEMP}/lvm" > /dev/null
+		mkdir -p "${TEMP}/lvm"
+		/bin/tar -jxpf "${LVM_BINCACHE}" -C "${TEMP}/lvm" ||
+			gen_die "Could not extract LVM2 binary cache!";
 
 		cd "${DMRAID_DIR}"
 		apply_patches dmraid ${DMRAID_VER}
 		print_info 1 'dmraid: >> Configuring...'
 
-		LDFLAGS="-L${TEMP}/device-mapper/lib" \
-		CFLAGS="-I${TEMP}/device-mapper/include" \
-		CPPFLAGS="-I${TEMP}/device-mapper/include" \
+		LDFLAGS="-L${TEMP}/lvm/lib" \
+		CFLAGS="-I${TEMP}/lvm/include" \
+		CPPFLAGS="-I${TEMP}/lvm/include" \
+		LIBS="-ldevmapper" \
 		./configure --enable-static_link --prefix=${TEMP}/dmraid >> ${LOGFILE} 2>&1 ||
 			gen_die 'Configure of dmraid failed!'
 
 		# We dont necessarily have selinux installed yet... look into
 		# selinux global support in the future.
-		sed -i tools/Makefile -e "s|DMRAIDLIBS += -lselinux||g"
+		sed -i tools/Makefile -e "/DMRAID_LIBS +=/s|-lselinux||g"
 		###echo "DMRAIDLIBS += -lselinux -lsepol" >> tools/Makefile
 		mkdir -p "${TEMP}/dmraid"
 		print_info 1 'dmraid: >> Compiling...'
@@ -553,7 +556,7 @@ compile_dmraid() {
 			gen_die 'Could not create binary cache'
 
 		cd "${TEMP}"
-		rm -rf "${TEMP}/device-mapper" > /dev/null
+		rm -rf "${TEMP}/lvm" > /dev/null
 		rm -rf "${DMRAID_DIR}" dmraid
 	fi
 }

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 5704173..9a17b3a 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -235,7 +235,7 @@ append_lvm(){
 	cd ${TEMP}
 	mkdir -p "${TEMP}/initramfs-lvm-temp/bin/"
 	mkdir -p "${TEMP}/initramfs-lvm-temp/etc/lvm/"
-	if [ -e '/sbin/lvm.static' ]
+	if false && [ -e '/sbin/lvm.static' ]
 	then
 		print_info 1 '          LVM: Adding support (using local static binary /sbin/lvm.static)...'
 		cp /sbin/lvm.static "${TEMP}/initramfs-lvm-temp/bin/lvm" ||
@@ -245,7 +245,7 @@ append_lvm(){
 		then
 			cp /sbin/dmsetup.static "${TEMP}/initramfs-lvm-temp/bin/dmsetup"
 		fi
-	elif [ -e '/sbin/lvm' ] && LC_ALL="C" ldd /sbin/lvm|grep -q 'not a dynamic executable'
+	elif false && [ -e '/sbin/lvm' ] && LC_ALL="C" ldd /sbin/lvm|grep -q 'not a dynamic executable'
 	then
 		print_info 1 '          LVM: Adding support (using local static binary /sbin/lvm)...'
 		cp /sbin/lvm "${TEMP}/initramfs-lvm-temp/bin/lvm" ||
@@ -265,6 +265,7 @@ append_lvm(){
 		# See bug 382555
 		mv ${TEMP}/initramfs-lvm-temp/sbin/dmsetup.static ${TEMP}/initramfs-lvm-temp/bin/dmsetup ||
 			gen_die 'LVM error: Could not move dmsetup.static to dmsetup!'
+		rm -rf  ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,sbin/{lvm,dmsetup}}
 	fi
 	if [ -x /sbin/lvm ]
 	then

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

[Robin H. Johnson]

commit:     4a3e1ff1cfae09860b87b04fa9f315326910a465
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 10 21:23:28 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 10 21:23:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=4a3e1ff1

Merge remote-tracking branch 'origin/bug-405495'

Conflicts:
	ChangeLog
	arch/x86_64/modules_load


 ChangeLog                |    5 +++++
 arch/x86/modules_load    |    2 ++
 arch/x86_64/modules_load |    3 +++
 defaults/modules_load    |    2 ++
 4 files changed, 12 insertions(+), 0 deletions(-)

diff --cc ChangeLog
index 4d9f866,11b18a4..73f8a9a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -4,98 -4,12 +4,103 @@@
  # - 2008-2011 Various authors (see AUTHORS)
  # Distributed under the GPL v2
  # $Id$
 -
++  
+   25 Feb 2012; Sebastian Pipping <sping@gentoo.org> arch/x86/modules_load,
+   arch/x86_64/modules_load, defaults/modules_load:
+   Make sure the sha256 module makes it into the initramfs (bug #405495).
+   Reported by Ogelpre.
  
 +  20 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/linuxrc:
 +  With the new /usr mounting, if the device path that ends up in /proc/mounts
 +  ends up being different than in /etc/fstab due to symlinks, mount -a will
 +  always exit 32. Avoid by resolving symlinks like util-linux does.
 +
 +  14 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_compile.sh,
 +  gen_initramfs.sh:
 +  dmraid is entirely broken if you try to use the system static
 +  LVM/device-mapper. Instead start always building LVM2 for the initramfs,
 +  using DESTDIR for cleaner install. Dead code paths for old LVM2 build not
 +  removed yet until more users have tested.
 +
 +  12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_compile.sh:
 +  More UTILS_CROSS_COMPILE prefix on strip calls.
 +
 +  12 Feb 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,
 +  arch/ppc64/modules_load, arch/sparc/modules_load, arch/sparc64/modules_load,
 +  arch/um/modules_load, arch/x86/modules_load, arch/x86_64/modules_load,
 +  defaults/modules_load:
 +  Bug #401583: include more DM and MD modules for other RAID/LVM
 +  configurations.
 +
 +  12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_compile.sh:
 +  Bug #265005: ensure CROSS_COMPILE is set for cross-compile strip calls to
 +  work.
 +
 +  12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org>
 +  +patches/dmraid/dmraid-1.0.0_rc16-as-needed2.patch,
 +  +patches/dmraid/dmraid-1.0.0_rc16-return-all-sets.patch,
 +  +patches/dmraid/dmraid-1.0.0_rc16-static-build-fixes.patch,
 +  +patches/dmraid/dmraid-1.0.0_rc16-undo-p-rename.patch,
 +  +patches/dmraid/dmraid-1.0.0.rc16-3-staticlink.patch, genkernel.conf:
 +  Bug #398467: Update dmraid. Also add other patches from Portage tree.
 +
 +  12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_cmdline.sh,
 +  gen_compile.sh, gen_determineargs.sh, gen_funcs.sh, genkernel.conf:
 +  device-mapper "update". It was merged into LVM2-2.02.67 upstream in 2010.
 +  Bug #398467 is wrong for the device-mapper update.
 +
 +  09 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts,
 +  defaults/linuxrc:
 +  Dogfooding of the /usr mount code with the matching OpenRC change to make the
 +  mounts RW revealed some bugs and gotchas in our prior code, now fixed and
 +  verified to work.
 +
 +  06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> arch/alpha/config.sh,
 +  arch/arm/config.sh, arch/ia64/config.sh, arch/mips/config.sh,
 +  arch/parisc/config.sh, arch/parisc64/config.sh, arch/ppc/config.sh,
 +  arch/ppc64/config.sh, arch/sparc/config.sh, arch/sparc64/config.sh,
 +  arch/um/config.sh, arch/x86/config.sh, arch/x86_64/config.sh:
 +  Ensure default for new initramfs compression is used.
 +
 +  06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
 +  Bugfixes in new code branches that I didn't test fully.
 +
 +  06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> doc/genkernel.8.txt,
 +  gen_cmdline.sh:
 +  Update documentation for new initramfs compression.
 +
 +  06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/config.sh,
 +  gen_cmdline.sh, gen_determineargs.sh, gen_initramfs.sh, genkernel.conf:
 +  Import customizable compression for initramfs, based on Pentoo development.
 +
 +  06 Feb 2012: Richard Yao <ryao@cs.stonybrook.edu> 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,
 +  arch/ppc64/modules_load, arch/sparc/modules_load, arch/sparc64/modules_load,
 +  arch/um/modules_load, arch/x86/modules_load, arch/x86_64/modules_load,
 +  defaults/busy-config, defaults/initrd.scripts, defaults/linuxrc,
 +  defaults/modules_load, doc/genkernel.8.txt, gen_cmdline.sh,
 +  gen_determineargs.sh, gen_initramfs.sh, genkernel:
 +  This provides ZFS support, to go with the sys-fs/zfs package.
 +
 +  06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
 +  Refactor copy_binaries and multipath slightly for ease of usage and readability.
 +
 +  06 Feb 2012: Richard Yao <ryao@cs.stonybrook.edu> gen_initramfs.sh:
 +  Refactor multipath initramfs generation using copy_binaries.
 +
 +  06 Feb 2012: Richard Yao <ryao@cs.stonybrook.edu> gen_initramfs.sh:
 +  copy_binaries utility function for putting binaries and librares into
 +  initramfs (see git commit for full details).
 +
 +  06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts:
 +  Support virtio devices, and provide fallback of all remaining devices.
 +
 +  03 Feb 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
 +  Support SD card readers. Patch by Rick Farina
 +
    24 Jan 2012; Sebastian Pipping <sping@gentoo.org> .gitignore, genkernel:
    Bump version to 3.4.24
  
diff --cc arch/x86/modules_load
index 3e9f5ec,bce80c1..2c023e4
--- a/arch/x86/modules_load
+++ b/arch/x86/modules_load
@@@ -25,5 -25,7 +25,7 @@@ MODULES_PCMCIA="pcmcia pcmcia_core yent
  MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech hid-microsoft hid-monterey hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
  
  # Filesystems
 -MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"
 +MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
  
+ # Crypto
+ MODULES_CRYPTO="sha256_generic"
diff --cc arch/x86_64/modules_load
index 4e7d877,7ec2d6e..6d87b80
--- a/arch/x86_64/modules_load
+++ b/arch/x86_64/modules_load
@@@ -24,4 -24,7 +24,7 @@@ MODULES_PCMCIA="pcmcia pcmcia_core yent
  MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech hid-microsoft hid-monterey hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
  
  # Filesystems
 -MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"
 +MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
+ 
+ # Crypto
+ MODULES_CRYPTO="sha256_generic"
diff --cc defaults/modules_load
index b726242,82db084..7ebd0dd
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@@ -24,5 -24,7 +24,7 @@@ MODULES_PCMCIA="pcmcia pcmcia_core yent
  MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
  
  # Filesystems
 -MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"
 +MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
  
+ # Crypto
+ MODULES_CRYPTO="sha256_generic"

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

[Robin H. Johnson]

commit:     b1ae7fa765570390216dccbcf78cbe5c3827cf97
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 10 21:25:13 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 10 21:25:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b1ae7fa7

Bump version for release.

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

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

diff --git a/ChangeLog b/ChangeLog
index 73f8a9a..9e92448 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,10 @@
 # - 2008-2011 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 # $Id$
-  
+
+  10 Mar 2012; Robin H. Johnson <robbat2@gentoo.org> genkernel:
+  Bump version for release.
+
   25 Feb 2012; Sebastian Pipping <sping@gentoo.org> arch/x86/modules_load,
   arch/x86_64/modules_load, defaults/modules_load:
   Make sure the sha256 module makes it into the initramfs (bug #405495).

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

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

[Robin H. Johnson]

commit:     6487f2ee5ff612acacdf4a3f5cb42e1b6b5e6572
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 12 19:37:45 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 12 19:37:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=6487f2ee

Verbump for enabling /usr mounting code.

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

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

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

[Sebastian Pipping]

commit:     d6187d303a7b8e88f783b5ab2ef73907b0147312
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu Mar 22 03:12:27 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 03:12:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=d6187d30

Bump version to 3.4.26

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

diff --git a/ChangeLog b/ChangeLog
index c1f376d..aa381b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  22 Mar 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.26
+
   16 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
   defaults/linuxrc:
   Drop into debug shell when squashfs could not be mounted

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

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

[Sebastian Pipping]

commit:     acbc7becc69b2d4404541bbc16c0e844a19da218
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu Mar 22 03:08:30 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 03:08:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=acbc7bec

Merge branch 'bug-405495'


 defaults/initrd.defaults |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

[Sebastian Pipping]

commit:     5a7bc18180612f5ada377be3df1ae20596ebfdac
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu Mar 22 15:06:50 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 15:06:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=5a7bc181

Make errors stand out more

---
 ChangeLog    |    4 ++++
 gen_funcs.sh |   35 ++++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aa381b8..b2529bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  22 Mar 2012; Sebastian Pipping <sping@gentoo.org> gen_funcs.sh,
+  gen_initramfs.sh:
+  Make errors stand out more
+
   22 Mar 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.26
 

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 739311b..f199014 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -204,29 +204,30 @@ gen_die() {
 	then
 		print_error 1 "ERROR: ${1}"
 	fi
-	echo
-	print_info 1 "-- Grepping log... --"
-	echo
+	print_error 1 ''
+	print_error 1 "-- Grepping log... --"
+	print_error 1 ''
 
 	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}
+		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}|"
 	else
 		grep -B5 -E "([Ww][Aa][Rr][Nn][Ii][Nn][Gg]|[Ee][Rr][Rr][Oo][Rr][ :,!]|[Ff][Aa][Ii][Ll][Ee]?[Dd]?)" ${LOGFILE}
 	fi
-	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 ''
+	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 ''
 
 	# Cleanup temp dirs and caches if requested
 	cleanup

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

[Sebastian Pipping]

commit:     0574d35f3769a1b68ac867b188013445b82cf6e0
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu Mar 22 15:17:12 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 15:17:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=0574d35f

Merge branch 'bug-409277'


 ChangeLog        |    8 ++++++++
 gen_funcs.sh     |   35 ++++++++++++++++++-----------------
 gen_initramfs.sh |   27 +++++++++++++--------------
 3 files changed, 39 insertions(+), 31 deletions(-)

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

[Sebastian Pipping]

commit:     7ee9306c7d68bd8b54219788b61558abc8732e9e
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu Mar 22 15:07:23 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 15:15:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=7ee9306c

Fail hard on LUKS inclusion error (bug #409277), advise about sys-fs/cryptsetup[static], drop support for cryptsetup binary from /bin/

---
 ChangeLog        |    4 ++++
 gen_initramfs.sh |   27 +++++++++++++--------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b2529bf..b6319e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  22 Mar 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
+  Fail hard on LUKS inclusion error (bug #409277), advise about
+  sys-fs/cryptsetup[static], drop support for cryptsetup binary from /bin/
+
   22 Mar 2012; Sebastian Pipping <sping@gentoo.org> gen_funcs.sh,
   gen_initramfs.sh:
   Make errors stand out more

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 9a17b3a..419d557 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -391,6 +391,10 @@ append_overlay(){
 }
 
 append_luks() {
+	local _luks_error_format="LUKS support cannot be included: %s.  Please emerge sys-fs/cryptsetup[static]."
+	local _luks_source=/sbin/cryptsetup
+	local _luks_dest=/sbin/cryptsetup
+
 	if [ -d "${TEMP}/initramfs-luks-temp" ]
 	then
 		rm -r "${TEMP}/initramfs-luks-temp/"
@@ -402,20 +406,15 @@ append_luks() {
 
 	if isTrue ${LUKS}
 	then
-		if is_static /bin/cryptsetup
-		then
-			print_info 1 "Including LUKS support"
-			cp /bin/cryptsetup ${TEMP}/initramfs-luks-temp/sbin/cryptsetup
-			chmod +x "${TEMP}/initramfs-luks-temp/sbin/cryptsetup"
-		elif is_static /sbin/cryptsetup
-		then
-			print_info 1 "Including LUKS support"
-			cp /sbin/cryptsetup ${TEMP}/initramfs-luks-temp/sbin/cryptsetup
-			chmod +x "${TEMP}/initramfs-luks-temp/sbin/cryptsetup"
-		else
-			print_info 1 "LUKS support requires static cryptsetup at /bin/cryptsetup or /sbin/cryptsetup"
-			print_info 1 "Not including LUKS support"
-		fi
+		[ -x "${_luks_source}" ] \
+				|| gen_die "$(printf "${_luks_error_format}" "no file ${_luks_source}")"
+
+		is_static "${_luks_source}" \
+				|| gen_die "$(printf "${_luks_error_format}" "${_luks_source} not a static binary")"
+
+		print_info 1 "Including LUKS support"
+		cp "${_luks_source}" ${TEMP}/initramfs-luks-temp${_luks_dest}
+		chmod +x "${TEMP}/initramfs-luks-temp${_luks_dest}"
 	fi
 
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \

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

[Sebastian Pipping]

commit:     46318550cdfc72a9a7b7b6bb980679c86ae99139
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu Mar 22 15:18:50 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 15:18:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=46318550

Bump version to 3.4.27

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

diff --git a/ChangeLog b/ChangeLog
index b6319e4..e8e73d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  22 Mar 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.27
+
   22 Mar 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
   Fail hard on LUKS inclusion error (bug #409277), advise about
   sys-fs/cryptsetup[static], drop support for cryptsetup binary from /bin/

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

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

[Sebastian Pipping]

commit:     77d997744d0f0c59e8955459fee4a143d1d07759
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Fri Mar 30 17:54:32 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 17:54:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=77d99774

Bump version to 3.4.28

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

diff --git a/ChangeLog b/ChangeLog
index 912f7b7..82da676 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  30 Mar 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.28
+
   29 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
   Restore original /dev/tty after GPG (bug #410073), report and initial patch
   by Brendan Pike

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

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

[Sebastian Pipping]

commit:     62b39fafd6b9b383d85fb97a3e6b4183df5068be
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Fri Mar 30 17:29:14 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 17:29:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=62b39faf

Merge branch 'bug-410073'


 ChangeLog               |    4 ++++
 defaults/initrd.scripts |    8 +++++++-
 2 files changed, 11 insertions(+), 1 deletions(-)

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

[Sebastian Pipping]

commit:     8071dca45640168787ef1f0793301f7c871da088
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Fri Mar 30 17:32:40 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 17:32:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=8071dca4

Merge branch 'fix-docache'

Conflicts:
	ChangeLog


 ChangeLog               |    4 ++++
 defaults/initrd.scripts |    5 ++---
 defaults/linuxrc        |    7 ++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --cc ChangeLog
index a1a3aab,f83809b..912f7b7
--- a/ChangeLog
+++ b/ChangeLog
@@@ -5,24 -5,10 +5,28 @@@
  # Distributed under the GPL v2
  # $Id$
  
 -  17 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
 +  29 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
 +  Restore original /dev/tty after GPG (bug #410073), report and initial patch
 +  by Brendan Pike
 +
 +  22 Mar 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
 +  Bump version to 3.4.27
 +
 +  22 Mar 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
 +  Fail hard on LUKS inclusion error (bug #409277), advise about
 +  sys-fs/cryptsetup[static], drop support for cryptsetup binary from /bin/
 +
 +  22 Mar 2012; Sebastian Pipping <sping@gentoo.org> gen_funcs.sh,
 +  gen_initramfs.sh:
 +  Make errors stand out more
 +
++  22 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
+   defaults/linuxrc:
+   Fix docache (bug #397309)
+ 
 +  22 Mar 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
 +  Bump version to 3.4.26
 +
    16 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
    defaults/linuxrc:
    Drop into debug shell when squashfs could not be mounted

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

[Sebastian Pipping]

commit:     c0ed5530a5f904ab63ccffa2ce3ec43f4720be49
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Apr  8 17:41:34 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 17:41:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=c0ed5530

Fix initrd compression "gzip", reported by Peter Gantner (bug #411197)

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

diff --git a/ChangeLog b/ChangeLog
index 82da676..8c35954 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  08 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
+  Fix initrd compression "gzip", reported by Peter Gantner (bug #411197)
+
   30 Mar 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.28
 

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 419d557..09592bc 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -707,7 +707,7 @@ create_initramfs() {
 			cmd_lzop=$(type -p lzop)
 			local compression
 			case ${COMPRESS_INITRD_TYPE} in
-				xz|lzma|bzip2|gzip2|lzo) compression=${COMPRESS_INITRD_TYPE} ;;
+				xz|lzma|bzip2|gzip|lzo) compression=${COMPRESS_INITRD_TYPE} ;;
 				best)
 					if grep -sq '^CONFIG_RD_XZ=y' ${KERNEL_DIR}/.config && test -n "${cmd_xz}" ; then
 						compression=xz

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

[Sebastian Pipping]

commit:     cfca839587edf11c76f9c1f7781dfba3d0c96d56
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Apr  8 17:42:15 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 17:42:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=cfca8395

Error out on unknown initrd compression, reported by Peter Gantner (bug #411197)

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

diff --git a/ChangeLog b/ChangeLog
index 8c35954..c728da5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
 # $Id$
 
   08 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
+  Error out on unknown initrd compression, reported by Peter Gantner (bug
+  #411197)
+
+  08 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
   Fix initrd compression "gzip", reported by Peter Gantner (bug #411197)
 
   30 Mar 2012; Sebastian Pipping <sping@gentoo.org> genkernel:

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 09592bc..be0da85 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -720,6 +720,9 @@ create_initramfs() {
 					elif grep -sq '^CONFIG_RD_LZO=y' ${KERNEL_DIR}/.config && test -n "${cmd_lzop}" ; then
 						compression=lzo
 					fi ;;
+				*)
+					gen_die "Compression '${COMPRESS_INITRD_TYPE}' unknown"
+					;;
 			esac
 			case $compression in
 				xz) compress_ext='.xz' compress_cmd="${cmd_xz} -e --check=none -z -f -9" ;;

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

[Sebastian Pipping]

commit:     66e5a247041af5406dfbc90acda436c3db0fa463
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Apr  8 18:24:14 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 18:27:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=66e5a247

Add "fastest" to supported initrd compressions

---
 ChangeLog        |    4 ++++
 gen_initramfs.sh |    4 ++--
 genkernel.conf   |    3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2533e58..2db901a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  08 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh,
+  genkernel.conf:
+  Add "fastest" to supported initrd compressions
+
   08 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
   Support comression "lzop" (not just "lzo") as wrongly advertised by comments
   in genkernel.conf before

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 082d525..4838234 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -714,7 +714,7 @@ create_initramfs() {
 			case ${COMPRESS_INITRD_TYPE} in
 				xz|lzma|bzip2|gzip|lzop) compression=${COMPRESS_INITRD_TYPE} ;;
 				lzo) compression=lzop ;;
-				best)
+				best|fastest)
 					for tuple in \
 							'CONFIG_RD_XZ    cmd_xz    xz' \
 							'CONFIG_RD_LZMA  cmd_lzma  lzma' \
@@ -726,7 +726,7 @@ create_initramfs() {
 						cmd_variable_name=$2
 						if grep -sq "^${kernel_option}=y" ${KERNEL_DIR}/.config && test -n "${!cmd_variable_name}" ; then
 							compression=$3
-							break
+							[[ ${COMPRESS_INITRD_TYPE} == best ]] && break
 						fi
 					done
 					;;

diff --git a/genkernel.conf b/genkernel.conf
index 0d14271..c5e7aee 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -314,8 +314,9 @@ GPG_BINCACHE="%%CACHE%%/gnupg-${GPG_VER}-%%ARCH%%.bz2"
 
 # Compress generated initramfs
 #COMPRESS_INITRD="yes"
-# Types of compression: best, xz, lzma, bzip2, gzip, lzop
+# Types of compression: best, xz, lzma, bzip2, gzip, lzop, fastest
 # "best" selects the best available compression method
+# "fastest" selects the fastest available compression method
 #COMPRESS_INITRD_TYPE="best"
 
 

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

[Sebastian Pipping]

commit:     0da4543b8a23b882e536293a8af095707ebafb91
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Apr  8 18:27:01 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 18:27:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=0da4543b

Support comression "lzop" (not just "lzo") as wrongly advertised by comments in genkernel.conf before

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

diff --git a/ChangeLog b/ChangeLog
index c728da5..2533e58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
 # $Id$
 
   08 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
+  Support comression "lzop" (not just "lzo") as wrongly advertised by comments
+  in genkernel.conf before
+
+  08 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
   Error out on unknown initrd compression, reported by Peter Gantner (bug
   #411197)
 

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index a33fa7e..066c389 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -712,7 +712,7 @@ create_initramfs() {
 			pkg_lzop='app-arch/lzop'
 			local compression
 			case ${COMPRESS_INITRD_TYPE} in
-				xz|lzma|bzip2|gzip) compression=${COMPRESS_INITRD_TYPE} ;;
+				xz|lzma|bzip2|gzip|lzop) compression=${COMPRESS_INITRD_TYPE} ;;
 				lzo) compression=lzop ;;
 				best)
 					if grep -sq '^CONFIG_RD_XZ=y' ${KERNEL_DIR}/.config && test -n "${cmd_xz}" ; then

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

[Sebastian Pipping]

commit:     10a2bde198877d240a20d45a93cb523df13d35a0
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Apr  8 18:27:08 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 18:27:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=10a2bde1

Refactor code selecting best available initrd compression

---
 gen_initramfs.sh |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 066c389..082d525 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -715,17 +715,21 @@ create_initramfs() {
 				xz|lzma|bzip2|gzip|lzop) compression=${COMPRESS_INITRD_TYPE} ;;
 				lzo) compression=lzop ;;
 				best)
-					if grep -sq '^CONFIG_RD_XZ=y' ${KERNEL_DIR}/.config && test -n "${cmd_xz}" ; then
-						compression=xz
-					elif grep -sq '^CONFIG_RD_LZMA=y' ${KERNEL_DIR}/.config && test -n "${cmd_lzma}" ; then
-						compression=lzma
-					elif grep -sq '^CONFIG_RD_BZIP2=y' ${KERNEL_DIR}/.config  && test -n "${cmd_bzip2}" ; then
-						compression=bzip2
-					elif grep -sq '^CONFIG_RD_GZIP=y' ${KERNEL_DIR}/.config && test -n "${cmd_gzip}" ; then
-						compression=gzip
-					elif grep -sq '^CONFIG_RD_LZO=y' ${KERNEL_DIR}/.config && test -n "${cmd_lzop}" ; then
-						compression=lzop
-					fi ;;
+					for tuple in \
+							'CONFIG_RD_XZ    cmd_xz    xz' \
+							'CONFIG_RD_LZMA  cmd_lzma  lzma' \
+							'CONFIG_RD_BZIP2 cmd_bzip2 bzip' \
+							'CONFIG_RD_GZIP  cmd_gzip  gzip' \
+							'CONFIG_RD_LZO   cmd_lzop  lzop'; do
+						set -- ${tuple}
+						kernel_option=$1
+						cmd_variable_name=$2
+						if grep -sq "^${kernel_option}=y" ${KERNEL_DIR}/.config && test -n "${!cmd_variable_name}" ; then
+							compression=$3
+							break
+						fi
+					done
+					;;
 				*)
 					gen_die "Compression '${COMPRESS_INITRD_TYPE}' unknown"
 					;;

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

[Sebastian Pipping]

commit:     b7efd3d65836d2ddba3396154e77e7ce62ed0710
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Apr  8 18:03:17 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 18:03:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b7efd3d6

Be more helpful when requested compression is not available

---
 gen_initramfs.sh |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index be0da85..a33fa7e 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -705,9 +705,15 @@ create_initramfs() {
 			cmd_bzip2=$(type -p bzip2)
 			cmd_gzip=$(type -p gzip)
 			cmd_lzop=$(type -p lzop)
+			pkg_xz='app-arch/xz-utils'
+			pkg_lzma='app-arch/xz-utils'
+			pkg_bzip2='app-arch/bzip2'
+			pkg_gzip='app-arch/gzip'
+			pkg_lzop='app-arch/lzop'
 			local compression
 			case ${COMPRESS_INITRD_TYPE} in
-				xz|lzma|bzip2|gzip|lzo) compression=${COMPRESS_INITRD_TYPE} ;;
+				xz|lzma|bzip2|gzip) compression=${COMPRESS_INITRD_TYPE} ;;
+				lzo) compression=lzop ;;
 				best)
 					if grep -sq '^CONFIG_RD_XZ=y' ${KERNEL_DIR}/.config && test -n "${cmd_xz}" ; then
 						compression=xz
@@ -718,18 +724,24 @@ create_initramfs() {
 					elif grep -sq '^CONFIG_RD_GZIP=y' ${KERNEL_DIR}/.config && test -n "${cmd_gzip}" ; then
 						compression=gzip
 					elif grep -sq '^CONFIG_RD_LZO=y' ${KERNEL_DIR}/.config && test -n "${cmd_lzop}" ; then
-						compression=lzo
+						compression=lzop
 					fi ;;
 				*)
 					gen_die "Compression '${COMPRESS_INITRD_TYPE}' unknown"
 					;;
 			esac
+
+			# Check for actual availability
+			cmd_variable_name=cmd_${compression}
+			pkg_variable_name=pkg_${compression}
+			[[ -z "${!cmd_variable_name}" ]] && gen_die "Compression '${compression}' is not available. Please install package '${!pkg_variable_name}'."
+
 			case $compression in
 				xz) compress_ext='.xz' compress_cmd="${cmd_xz} -e --check=none -z -f -9" ;;
 				lzma) compress_ext='.lzma' compress_cmd="${cmd_lzma} -z -f -9" ;;
 				bzip2) compress_ext='.bz2' compress_cmd="${cmd_bzip2} -z -f -9" ;;
 				gzip) compress_ext='.gz' compress_cmd="${cmd_gzip} -f -9" ;;
-				lzo) compress_ext='.lzo' compress_cmd="${cmd_lzop} -f -9" ;;
+				lzop) compress_ext='.lzo' compress_cmd="${cmd_lzop} -f -9" ;;
 			esac
 	
 			if [ -n "${compression}" ]; then

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

[Sebastian Pipping]

commit:     39f67002d55efe0664fb1907608ec96f6a164c8c
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Apr  8 18:32:42 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 18:32:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=39f67002

Merge branch 'bug-411197'


 ChangeLog        |   18 ++++++++++++++++++
 gen_initramfs.sh |   47 +++++++++++++++++++++++++++++++++--------------
 genkernel.conf   |    3 ++-
 3 files changed, 53 insertions(+), 15 deletions(-)

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

[Sebastian Pipping]

commit:     14a930ba44b8e839a8c0bb81c23b6433dee4dbdf
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Apr  8 18:29:22 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 18:29:36 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=14a930ba

Extend change log

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

diff --git a/ChangeLog b/ChangeLog
index 2db901a..0e6d697 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@
   in genkernel.conf before
 
   08 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
+  Be more helpful when requested compression is not available
+
+  08 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
   Error out on unknown initrd compression, reported by Peter Gantner (bug
   #411197)
 

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

[Sebastian Pipping]

commit:     89ec359dbc21be79f03067c9cfa54cdad9db416d
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Apr  8 22:07:17 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 22:07:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=89ec359d

grub-mkconfig -> grub2-mkconfig

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

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index d14b313..ad846cf 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -49,8 +49,8 @@ set_bootloader_grub2() {
     fi
 
     print_info 1 "You can customize Grub2 parameters in /etc/defaults/grub."
-    print_info 1 "Running grub-mkconfig to create ${GRUB_CONF}..."
-    grub-mkconfig -o "${GRUB_CONF}"
+    print_info 1 "Running grub2-mkconfig to create ${GRUB_CONF}..."
+    grub2-mkconfig -o "${GRUB_CONF}"
 }
 
 set_bootloader_grub() {

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

[Sebastian Pipping]

commit:     ae9d882a3e456814c4d8935181bac3328926c929
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Apr  8 22:07:35 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 22:07:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=ae9d882a

/etc/defaults/grub -> /etc/default/grub

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

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index ad846cf..5c05e64 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -48,7 +48,7 @@ set_bootloader_grub2() {
 		return 0
     fi
 
-    print_info 1 "You can customize Grub2 parameters in /etc/defaults/grub."
+    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}"
 }

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

[Sebastian Pipping]

commit:     175270768e9c4e5d9c74b51f9e6ebdcd9070439f
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Apr  8 19:41:19 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 20:47:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=17527076

Reduce code duplication in set_bootloader_grub

---
 gen_bootloader.sh |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index 1debfe9..d14b313 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -33,20 +33,24 @@ set_bootloader_grub_read_device_map() {
 
 set_bootloader_grub2() {
     local GRUB_CONF
-    if [ -e "${BOOTDIR}/grub2/grub.cfg" ]
-    then
-		GRUB_CONF="${BOOTDIR}/grub2/grub.cfg"
-    elif [ -e "${BOOTDIR}/grub/grub.cfg" ]
-    then
-		GRUB_CONF="${BOOTDIR}/grub/grub.cfg"
-    else
+	for candidate in \
+			"${BOOTDIR}/grub2/grub.cfg" \
+			"${BOOTDIR}/grub/grub.cfg" \
+			; do
+		if [[ -e "${candidate}" ]]; then
+			GRUB_CONF=${candidate}
+			break
+		fi
+	done
+
+	if [[ -z "${GRUB_CONF}" ]]; then
 		print_error 1 "Error! Grub2 configuration file does not exist, please ensure grub2 is correctly setup first."
-        	return 0
+		return 0
     fi
 
     print_info 1 "You can customize Grub2 parameters in /etc/defaults/grub."
     print_info 1 "Running grub-mkconfig to create ${GRUB_CONF}..."
-    grub-mkconfig -o ${GRUB_CONF}
+    grub-mkconfig -o "${GRUB_CONF}"
 }
 
 set_bootloader_grub() {

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

[Sebastian Pipping]

commit:     7b0a7999be105411e2cc20c60d7a20ef3277dccf
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Apr  8 22:12:10 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 22:12:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=7b0a7999

Merge branch 'bug-388437'


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

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

[Sebastian Pipping]

commit:     31a4d5f2e1d1d43fb8e39fa0447f6e162759b4d2
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Apr  8 22:13:29 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 22:13:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=31a4d5f2

Bump version to 3.4.29

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

diff --git a/ChangeLog b/ChangeLog
index 025d286..b1c1c75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  08 Apr 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.29
+
   08 Apr 2012; Mike Auty <ikelos@gentoo.org> gen_bootloader.sh:
   Support for Grub 2, adjustements by Tomasz Wasiak
 

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

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

[Sebastian Pipping]

commit:     970824ef5d605e6e3108b52e6645a3a204111e3d
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Apr  8 22:11:24 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 22:11:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=970824ef

Mention Tomasz Wasiak in change log

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

diff --git a/ChangeLog b/ChangeLog
index d34cfec..025d286 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,7 @@
 # $Id$
 
   08 Apr 2012; Mike Auty <ikelos@gentoo.org> gen_bootloader.sh:
-  Support for Grub 2
+  Support for Grub 2, adjustements by Tomasz Wasiak
 
   08 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh,
   genkernel.conf:

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

[Sebastian Pipping]

commit:     b828136a1a79a57380d897607637aafc5db4dbf8
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Apr  9 02:43:09 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Apr  9 02:43:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b828136a

Extend change log

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

diff --git a/ChangeLog b/ChangeLog
index b1c1c75..5de0eff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  09 Apr 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
+  defaults/keymaps/keymapList, defaults/keymaps/sf.map:
+  Add keymap "sf" from Pentoo
+
   08 Apr 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.29
 

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

[Sebastian Pipping]

commit:     72d3994e6af669d54edc716971dea335acb20c93
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Apr  9 02:43:50 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Apr  9 02:43:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=72d3994e

Merge branch 'keymaps'

Acked-by: Rick Farina <sidhayn <AT> gmail.com>


 ChangeLog                    |    4 ++++
 defaults/initrd.scripts      |    3 ++-
 defaults/keymaps.tar.gz      |  Bin 14071 -> 0 bytes
 defaults/keymaps/1.map       |    1 +
 defaults/keymaps/10.map      |    1 +
 defaults/keymaps/11.map      |    1 +
 defaults/keymaps/12.map      |    1 +
 defaults/keymaps/13.map      |    1 +
 defaults/keymaps/14.map      |    1 +
 defaults/keymaps/15.map      |    1 +
 defaults/keymaps/16.map      |    1 +
 defaults/keymaps/17.map      |    1 +
 defaults/keymaps/18.map      |    1 +
 defaults/keymaps/19.map      |    1 +
 defaults/keymaps/2.map       |    1 +
 defaults/keymaps/20.map      |    1 +
 defaults/keymaps/21.map      |    1 +
 defaults/keymaps/22.map      |    1 +
 defaults/keymaps/23.map      |    1 +
 defaults/keymaps/24.map      |    1 +
 defaults/keymaps/25.map      |    1 +
 defaults/keymaps/26.map      |    1 +
 defaults/keymaps/27.map      |    1 +
 defaults/keymaps/28.map      |    1 +
 defaults/keymaps/29.map      |    1 +
 defaults/keymaps/3.map       |    1 +
 defaults/keymaps/30.map      |    1 +
 defaults/keymaps/31.map      |    1 +
 defaults/keymaps/32.map      |    1 +
 defaults/keymaps/33.map      |    1 +
 defaults/keymaps/34.map      |    1 +
 defaults/keymaps/35.map      |    1 +
 defaults/keymaps/36.map      |    1 +
 defaults/keymaps/37.map      |    1 +
 defaults/keymaps/39.map      |    1 +
 defaults/keymaps/4.map       |    1 +
 defaults/keymaps/40.map      |    1 +
 defaults/keymaps/41.map      |    1 +
 defaults/keymaps/42.map      |    1 +
 defaults/keymaps/43.map      |    1 +
 defaults/keymaps/5.map       |    1 +
 defaults/keymaps/6.map       |    1 +
 defaults/keymaps/7.map       |    1 +
 defaults/keymaps/8.map       |    1 +
 defaults/keymaps/9.map       |    1 +
 defaults/keymaps/azerty.map  |  Bin 0 -> 2823 bytes
 defaults/keymaps/be.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/bg.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/br-a.map    |  Bin 0 -> 2823 bytes
 defaults/keymaps/br-l.map    |  Bin 0 -> 2823 bytes
 defaults/keymaps/by.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/cf.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/croat.map   |  Bin 0 -> 2823 bytes
 defaults/keymaps/cz.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/de.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/dk.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/dvorak.map  |  Bin 0 -> 2823 bytes
 defaults/keymaps/es.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/et.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/fi.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/fr.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/gr.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/hu.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/il.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/is.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/it.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/jp.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/keymapList  |   10 ++++++++++
 defaults/keymaps/la.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/lt.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/mk.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/nl.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/no.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/pl.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/pt.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/ro.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/ru.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/se.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/sf.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/sg.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/sk-y.map    |  Bin 0 -> 2823 bytes
 defaults/keymaps/sk-z.map    |  Bin 0 -> 2823 bytes
 defaults/keymaps/slovene.map |  Bin 0 -> 2823 bytes
 defaults/keymaps/trf.map     |  Bin 0 -> 2823 bytes
 defaults/keymaps/ua.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/uk.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/us.map      |  Bin 0 -> 2823 bytes
 defaults/keymaps/wangbe.map  |  Bin 0 -> 2823 bytes
 doc/genkernel.8.txt          |    2 +-
 gen_initramfs.sh             |    6 ++++--
 90 files changed, 63 insertions(+), 4 deletions(-)

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

[Sebastian Pipping]

commit:     bf7a344ceafc14f97e0cc580188340bf8da58c67
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Sun Apr  8 01:20:06 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Apr 12 04:18:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=bf7a344c

Fix README to list dependency introduced by 1079122ea0c1733024dbebadd2ae8ad2c88a9bee

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

diff --git a/README b/README
index 7a83e38..196e956 100644
--- a/README
+++ b/README
@@ -1,8 +1,9 @@
 # $Id$
 
-DEPENDANCIES:
+DEPENDENCIES:
   - GCC and binutils
   - GNU Bash
+  - PaX Utilities
 
 USAGE:
   See http://www.gentoo.org/doc/en/genkernel.xml or

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

[Robin H. Johnson]

commit:     2828226b6fd05929fa04a21b907c3e6b1baac434
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 02:24:47 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 02:25:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=2828226b

gen_initramfs: Release the copy_binaries function as public domain.

The copy_binaries function is explicitly released into the public domain to
encourage wide adoption and re-use.

This is to enable use in some cases of BSD and other licensing, and
specifically avoiding the need to be party to any contributor agreements.
Additionally, the code could be considered of trivial length in some regions.

Written by:
- Robin H. Johnson <robbat2 <AT> gentoo.org> (complete rewrite)
- Richard Yao <ryao <AT> cs.stonybrook.edu> (original concept)

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

---
 ChangeLog        |    3 +++
 gen_initramfs.sh |    7 +++++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f75e034..8490dc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
 # $Id$
 
   14 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
+  Release copy_binaries function as public domain.
+
+  14 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
   Handle other binary paths for LVM.
 
   09 Apr 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index f178b2d..5bffbb0 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -3,6 +3,13 @@
 
 CPIO_ARGS="--quiet -o -H newc"
 
+# The copy_binaries function is explicitly released into the public domain to
+# encourage wide adoption and re-use.
+# Written by: 
+# - Robin H. Johnson <robbat2@gentoo.org> (complete rewrite)
+# - Richard Yao <ryao@cs.stonybrook.edu> (original concept)
+# Usage:
+# copy_binaries DESTDIR BINARIES...
 copy_binaries() {
 	local destdir=$1
 	shift

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

[Robin H. Johnson]

commit:     9f36ecc125bf2c20bd28c0ad513577a858140a77
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 02:13:37 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 02:24:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=9f36ecc1

Handle other possible paths for LVM.

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

---
 ChangeLog        |    3 +++
 gen_initramfs.sh |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5de0eff..f75e034 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  14 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
+  Handle other binary paths for LVM.
+
   09 Apr 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
   defaults/keymaps/keymapList, defaults/keymaps/sf.map:
   Add keymap "sf" from Pentoo

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index f3c14c2..f178b2d 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -265,9 +265,9 @@ append_lvm(){
 		# See bug 382555
 		mv ${TEMP}/initramfs-lvm-temp/sbin/dmsetup.static ${TEMP}/initramfs-lvm-temp/bin/dmsetup ||
 			gen_die 'LVM error: Could not move dmsetup.static to dmsetup!'
-		rm -rf  ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,sbin/{lvm,dmsetup}}
+		rm -rf  ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,{s,}bin/{lvm,dmsetup}}
 	fi
-	if [ -x /sbin/lvm ]
+	if [ -x /sbin/lvm -o -x /bin/lvm ]
 	then
 #		lvm dumpconfig 2>&1 > /dev/null || gen_die 'Could not copy over lvm.conf!'
 #		ret=$?

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

[Sebastian Pipping]

commit:     9e947f441600d0d22cdf31337514c163ac4a3a05
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Apr 16 01:18:48 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 01:58:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=9e947f44

Add error detection to copy_binaries

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index f3c14c2..61ebce1 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -6,13 +6,23 @@ CPIO_ARGS="--quiet -o -H newc"
 copy_binaries() {
 	local destdir=$1
 	shift
-	lddtree "$@" \
-		| tr ')(' '\n' \
-		| awk  '/=>/{ if($3 ~ /^\//){print $3}}' \
-		| sort \
-		| uniq \
-		| cpio -p --make-directories --dereference --quiet $destdir
 
+	for binary in "$@"; do
+		[[ -e "${binary}" ]] \
+				|| gen_die "Binary ${binary} could not be found"
+
+		if LC_ALL=C lddtree "${binary}" 2>&1 | fgrep -q 'not found'; then
+			gen_die "Binary ${binary} is linked to missing libraries and may need to be re-built"
+		fi
+
+		lddtree "${binary}" \
+				| 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"
+	done
 }
 
 append_base_layout() {

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

[Sebastian Pipping]

commit:     23ef50635129dceb4df353b2d03770c287da5864
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Apr 16 01:55:46 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 01:58:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=23ef5063

Support a non-static cryptsetup binary (bug #409277)

.. by making use of copy_binaries

---
 ChangeLog        |    3 +++
 gen_initramfs.sh |    6 +-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5de0eff..8eebbaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  16 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
+  Support a non-static cryptsetup binary (bug #409277)
+
   09 Apr 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
   defaults/keymaps/keymapList, defaults/keymaps/sf.map:
   Add keymap "sf" from Pentoo

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 61ebce1..720a25e 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -419,12 +419,8 @@ append_luks() {
 		[ -x "${_luks_source}" ] \
 				|| gen_die "$(printf "${_luks_error_format}" "no file ${_luks_source}")"
 
-		is_static "${_luks_source}" \
-				|| gen_die "$(printf "${_luks_error_format}" "${_luks_source} not a static binary")"
-
 		print_info 1 "Including LUKS support"
-		cp "${_luks_source}" ${TEMP}/initramfs-luks-temp${_luks_dest}
-		chmod +x "${TEMP}/initramfs-luks-temp${_luks_dest}"
+		copy_binaries "${TEMP}/initramfs-luks-temp/" /sbin/cryptsetup
 	fi
 
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \

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

[Sebastian Pipping]

commit:     0a23f1883ff3a046d6a375ad2d11c0e2c534e48e
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Apr 16 02:35:18 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 02:35:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=0a23f188

Make sure that we can use our own copy_binaries in the future

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 5bffbb0..3dd757b 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -4,7 +4,10 @@
 CPIO_ARGS="--quiet -o -H newc"
 
 # The copy_binaries function is explicitly released into the public domain to
-# encourage wide adoption and re-use.
+# encourage wide adoption and re-use.  That means:
+# - You may use the code of copy_binaries() as Public domain outside of genkernel
+# - Past and future changes to copy_binaries() still need to be licensable under
+#   <GPL v2 or later> to maintain license compatibility with genkernel itself
 # Written by: 
 # - Robin H. Johnson <robbat2@gentoo.org> (complete rewrite)
 # - Richard Yao <ryao@cs.stonybrook.edu> (original concept)

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

[Sebastian Pipping]

commit:     08b7a087524ebbfa47f822d0fd4d8b69fdcc4be9
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Apr 16 02:10:17 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 02:10:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=08b7a087

Bump version to 3.4.30

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

diff --git a/ChangeLog b/ChangeLog
index 8eebbaf..fcdde94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  16 Apr 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.30
+
   16 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
   Support a non-static cryptsetup binary (bug #409277)
 

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

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

[Sebastian Pipping]

commit:     f1e3cd9290cd700f407a6d323454f75cd4c53730
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Apr 16 02:37:01 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 02:37:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=f1e3cd92

Merge branch 'cryptsetup'

Conflicts:
	ChangeLog


 ChangeLog        |   10 ++++++++--
 gen_initramfs.sh |   29 ++++++++++++++++++-----------
 genkernel        |    2 +-
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --cc ChangeLog
index 8490dc3,fcdde94..340de2c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -5,12 -5,12 +5,18 @@@
  # Distributed under the GPL v2
  # $Id$
  
-   14 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
++  16 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
 +  Release copy_binaries function as public domain.
 +
-   14 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
++  16 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
 +  Handle other binary paths for LVM.
 +
+   16 Apr 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+   Bump version to 3.4.30
+ 
+   16 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
+   Support a non-static cryptsetup binary (bug #409277)
+ 
    09 Apr 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
    defaults/keymaps/keymapList, defaults/keymaps/sf.map:
    Add keymap "sf" from Pentoo
diff --cc gen_initramfs.sh
index 3dd757b,720a25e..ca4f090
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@@ -3,16 -3,6 +3,17 @@@
  
  CPIO_ARGS="--quiet -o -H newc"
  
 +# The copy_binaries function is explicitly released into the public domain to
 +# encourage wide adoption and re-use.  That means:
 +# - You may use the code of copy_binaries() as Public domain outside of genkernel
 +# - Past and future changes to copy_binaries() still need to be licensable under
 +#   <GPL v2 or later> to maintain license compatibility with genkernel itself
 +# Written by: 
++# - Sebastian Pipping <sebastian@pipping.org> (partly rewrite)
 +# - Robin H. Johnson <robbat2@gentoo.org> (complete rewrite)
 +# - Richard Yao <ryao@cs.stonybrook.edu> (original concept)
 +# Usage:
 +# copy_binaries DESTDIR BINARIES...
  copy_binaries() {
  	local destdir=$1
  	shift

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

[Sebastian Pipping]

commit:     d31d1e53ff70f154fc998980cd2e941b3d5eda59
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Apr 16 03:06:25 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 03:06:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=d31d1e53

Adjust licensing policy on copy_binaries() after a chat with robbat2

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index ca4f090..a7f8c1f 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -6,8 +6,12 @@ CPIO_ARGS="--quiet -o -H newc"
 # The copy_binaries function is explicitly released into the public domain to
 # encourage wide adoption and re-use.  That means:
 # - You may use the code of copy_binaries() as Public domain outside of genkernel
-# - Past and future changes to copy_binaries() still need to be licensable under
-#   <GPL v2 or later> to maintain license compatibility with genkernel itself
+# - Contributions to this function are put into the Public Domain as well.
+#
+# On a side note: "Both public domain works and the simple license provided by
+#                  CC0 are compatible with the GNU GPL."
+#                 (from https://www.gnu.org/licenses/license-list.html#CC0)
+#
 # Written by: 
 # - Sebastian Pipping <sebastian@pipping.org> (partly rewrite)
 # - Robin H. Johnson <robbat2@gentoo.org> (complete rewrite)

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

[Robin H. Johnson]

commit:     27bbadb6bc71fa5d28d495a489bfbfaba4895a09
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 16 03:15:46 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 03:16:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=27bbadb6

Fix date on some changelog items.

---
 ChangeLog |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ee762dd..6ed045a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,17 +9,17 @@
   Use CC0 instead of public domain for copy_binaries to cover French
   jurisdiction concerns.
 
-  16 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
-  Release copy_binaries function as public domain.
-
-  16 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
-  Handle other binary paths for LVM.
-
   16 Apr 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.30
 
   16 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
   Support a non-static cryptsetup binary (bug #409277)
+ 
+  15 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
+  Release copy_binaries function as public domain.
+
+  15 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
+  Handle other binary paths for LVM.
 
   09 Apr 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
   defaults/keymaps/keymapList, defaults/keymaps/sf.map:

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

[Robin H. Johnson]

commit:     33f49ec6eea61888789011962bcbb6c291d32264
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 16 03:15:01 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 03:16:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=33f49ec6

gen_initramfs: Use CC0 instead of public domain for copy_binaries to cover French jurisdiction concerns.

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

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

diff --git a/ChangeLog b/ChangeLog
index 340de2c..ee762dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
 # $Id$
 
   16 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
+  Use CC0 instead of public domain for copy_binaries to cover French
+  jurisdiction concerns.
+
+  16 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
   Release copy_binaries function as public domain.
 
   16 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index a7f8c1f..7db1c95 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -3,17 +3,19 @@
 
 CPIO_ARGS="--quiet -o -H newc"
 
-# The copy_binaries function is explicitly released into the public domain to
+# The copy_binaries function is explicitly released under the CC0 license to
 # encourage wide adoption and re-use.  That means:
-# - You may use the code of copy_binaries() as Public domain outside of genkernel
-# - Contributions to this function are put into the Public Domain as well.
+# - You may use the code of copy_binaries() as CC0 outside of genkernel
+# - Contributions to this function are licensed under CC0 as well.
+# - If you change it outside of genkernel, please consider sending your
+#   modifications back to genkernel@gentoo.org.
 #
 # On a side note: "Both public domain works and the simple license provided by
 #                  CC0 are compatible with the GNU GPL."
 #                 (from https://www.gnu.org/licenses/license-list.html#CC0)
 #
 # Written by: 
-# - Sebastian Pipping <sebastian@pipping.org> (partly rewrite)
+# - Sebastian Pipping <sebastian@pipping.org> (error checking)
 # - Robin H. Johnson <robbat2@gentoo.org> (complete rewrite)
 # - Richard Yao <ryao@cs.stonybrook.edu> (original concept)
 # Usage:

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

[Robin H. Johnson]

commit:     b2caeadca2a792e6b743332a953792cb357485b9
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 18 02:45:05 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 18 02:45:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b2caeadc

lddtree call must be outside the for loop.

---
 ChangeLog        |    3 +++
 gen_initramfs.sh |   16 ++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6ed045a..761a724 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  18 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
+  lddtree call must be outside the for loop.
+
   16 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
   Use CC0 instead of public domain for copy_binaries to cover French
   jurisdiction concerns.

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 7db1c95..3739fe6 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -31,15 +31,15 @@ copy_binaries() {
 		if LC_ALL=C lddtree "${binary}" 2>&1 | fgrep -q 'not found'; then
 			gen_die "Binary ${binary} is linked to missing libraries and may need to be re-built"
 		fi
-
-		lddtree "${binary}" \
-				| 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"
 	done
+	# This must be OUTSIDE the for loop, we only want to run lddtree etc ONCE.
+	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"
 }
 
 append_base_layout() {

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

[Robin H. Johnson]

commit:     b882252bebf51bfe343106a1634fda333ea6d84b
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Tue Apr 24 05:51:33 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Apr 24 21:02:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b882252b

Fix indentation in set_bootloader_grub2()

---
 gen_bootloader.sh |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index 5c05e64..f0273db 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -32,7 +32,7 @@ set_bootloader_grub_read_device_map() {
 }
 
 set_bootloader_grub2() {
-    local GRUB_CONF
+	local GRUB_CONF
 	for candidate in \
 			"${BOOTDIR}/grub2/grub.cfg" \
 			"${BOOTDIR}/grub/grub.cfg" \
@@ -46,11 +46,11 @@ set_bootloader_grub2() {
 	if [[ -z "${GRUB_CONF}" ]]; then
 		print_error 1 "Error! Grub2 configuration file does not exist, please ensure grub2 is correctly setup first."
 		return 0
-    fi
+	fi
 
-    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}"
+	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}"
 }
 
 set_bootloader_grub() {

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

[Robin H. Johnson]

commit:     18c0dbc872052e37cd8df6862810623d170d3d62
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Tue Apr 24 05:52:08 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Apr 24 21:02:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=18c0dbc8

Make --bootloader=grub2 set debug instead of single in grub.cfg

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

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index f0273db..5b73d97 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -51,6 +51,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}"
+	[ "${BUILD_RAMDISK}" -ne 0 ] && sed -i 's/ro single/ro debug/' "${GRUB_CONF}"
 }
 
 set_bootloader_grub() {

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

[Robin H. Johnson]

commit:     5ce01e863ffd0ab802229d0b6646b37e6cefacd5
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Tue Apr 24 06:31:00 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Apr 24 21:02:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=5ce01e86

Update genkernel ZFS warnings

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

diff --git a/genkernel b/genkernel
index b4a899f..f209c47 100755
--- a/genkernel
+++ b/genkernel
@@ -351,8 +351,8 @@ then
 	[ "${DMRAID}" = '1' ] && print_warning 1 'add "dodmraid" for dmraid support'
 	[ "${MDADM}" = '1' ] && print_warning 1 'add "domdadm" for RAID support'
 	[ "${DMRAID}" = '1' ] && print_warning 1 '	or "dodmraid=<additional options>"'
-	[ "${ZFS}" = '1' ] && print_warning 1 'add "dozfs" for ZFS support'
-	[ "${ZFS}" = '1' ] && print_warning 1 '	and either "real_root=ZFS" to use bootfs autodetection or "real_root=ZFS=<dataset>" to force booting from a specific dataset'
+	[ "${ZFS}" = '1' ] && print_warning 1 'add "dozfs" for ZFS volume management support'
+	[ "${ZFS}" = '1' ] && print_warning 1 'add either "real_root=ZFS" (bootfs autodetection) or "real_root=ZFS=<dataset>" to boot from a ZFS dataset'
 	[ "${ISCSI}" = '1' ] && print_warning 1 'add at least "iscsi_initiatorname=<initiator name> iscsi_target=<target name> and iscsi_address=<target ip>" for iscsi support'
 	if [ `grep 'CONFIG_EXT[0-9]_FS=' "${KERNEL_DIR}"/.config | wc -l` -ge 2 ]; then
 		print_warning 1 'With support for several ext* filesystems around it may be needed to'

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

[Sebastian Pipping]

commit:     9a426b1ae4b82c30737b8ace20dff4a22668ef09
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat May 12 14:21:32 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat May 12 14:21:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=9a426b1a

Bump version to 3.4.31

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

diff --git a/ChangeLog b/ChangeLog
index 761a724..d7c0960 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  12 May 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.31
+
   18 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
   lddtree call must be outside the for loop.
 

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

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

[Sebastian Pipping]

commit:     9743f8b39c6050746d7ff1949fc98999a847c4f9
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon May 14 00:14:13 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon May 14 00:14:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=9743f8b3

Stop removing lvm/dmsetup from the initramfs (bug #415697)

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

diff --git a/ChangeLog b/ChangeLog
index 27a3630..8bff2d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 # Distributed under the GPL v2
 # $Id$
 
+  14 May 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
+  Stop removing lvm/dmsetup from the initramfs (bug #415697), reported by
+  I.zaufi, bug introduced in 9f36ecc125bf2c20bd28c0ad513577a858140a77 affects
+  genkernel >=3.4.30
+
   12 May 2012; Sebastian Pipping <sping@gentoo.org> arch/x86/kernel-config,
   arch/x86_64/kernel-config, defaults/kernel-config:
   Set CONFIG_DEVTMPFS=y on x86, x86_64, default for udev

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 3739fe6..fbcdd44 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -292,7 +292,7 @@ append_lvm(){
 		# See bug 382555
 		mv ${TEMP}/initramfs-lvm-temp/sbin/dmsetup.static ${TEMP}/initramfs-lvm-temp/bin/dmsetup ||
 			gen_die 'LVM error: Could not move dmsetup.static to dmsetup!'
-		rm -rf  ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,{s,}bin/{lvm,dmsetup}}
+		rm -rfv  ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,sbin/{lvm,dmsetup}}
 	fi
 	if [ -x /sbin/lvm -o -x /bin/lvm ]
 	then

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

[Sebastian Pipping]

commit:     efea5aab6681ea1b0261a5a3fd5931652f492eb4
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon May 14 00:14:38 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon May 14 00:14:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=efea5aab

Bump version to 3.4.32

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

diff --git a/ChangeLog b/ChangeLog
index 8bff2d7..561e98d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  14 May 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.32
+
   14 May 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
   Stop removing lvm/dmsetup from the initramfs (bug #415697), reported by
   I.zaufi, bug introduced in 9f36ecc125bf2c20bd28c0ad513577a858140a77 affects

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

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

[Sebastian Pipping]

commit:     1ac90970d68e3791355e2f6de707458350f125c5
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon May 14 00:54:30 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon May 14 00:55:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=1ac90970

Revert verbosity of internals (a debugging leftover)

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index fbcdd44..a0a9df2 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -292,7 +292,7 @@ append_lvm(){
 		# See bug 382555
 		mv ${TEMP}/initramfs-lvm-temp/sbin/dmsetup.static ${TEMP}/initramfs-lvm-temp/bin/dmsetup ||
 			gen_die 'LVM error: Could not move dmsetup.static to dmsetup!'
-		rm -rfv  ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,sbin/{lvm,dmsetup}}
+		rm -rf ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,sbin/{lvm,dmsetup}}
 	fi
 	if [ -x /sbin/lvm -o -x /bin/lvm ]
 	then

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

[Sebastian Pipping]

commit:     419f1cee8b54c7ff69a670af467a5f4139672528
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu May 17 16:04:48 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu May 17 17:25:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=419f1cee

Be verbose bout files being added to initramfs for --loglevel=2 and above

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index a0a9df2..6c9c88a 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -42,6 +42,15 @@ copy_binaries() {
 			|| gen_die "Binary ${f} or some of its library dependencies could not be copied"
 }
 
+log_future_cpio_content() {
+	if [[ "${LOGLEVEL}" -gt 1 ]]; then
+		echo =================================================================
+		echo "About to add these files from '${PWD}' to cpio archive:"
+		find . | xargs ls -ald
+		echo =================================================================
+	fi
+}
+
 append_base_layout() {
 	if [ -d "${TEMP}/initramfs-base-temp" ]
 	then
@@ -81,6 +90,7 @@ append_base_layout() {
 	date -u '+%Y%m%d-%H%M%S' > ${TEMP}/initramfs-base-temp/etc/build_date
 
 	cd "${TEMP}/initramfs-base-temp/"
+	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 			|| gen_die "compressing baselayout cpio"
 	cd "${TEMP}"
@@ -110,6 +120,7 @@ append_busybox() {
 	done
 
 	cd "${TEMP}/initramfs-busybox-temp/"
+	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 			|| gen_die "compressing busybox cpio"
 	cd "${TEMP}"
@@ -127,6 +138,7 @@ append_blkid(){
 		gen_die "Could not extract blkid binary cache!"; }
 	chmod a+x "${TEMP}/initramfs-blkid-temp/sbin/blkid"
 	cd "${TEMP}/initramfs-blkid-temp/"
+	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 			|| gen_die "compressing blkid cpio"
 	cd "${TEMP}"
@@ -158,6 +170,7 @@ append_unionfs_fuse() {
 		gen_die 'Could not extract unionfs-fuse binary cache!'
 	chmod a+x "${TEMP}/initramfs-unionfs-fuse-temp/sbin/unionfs"
 	cd "${TEMP}/initramfs-unionfs-fuse-temp/"
+	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 			|| gen_die "compressing unionfs fuse cpio"
 	cd "${TEMP}"
@@ -178,6 +191,7 @@ append_unionfs_fuse() {
 #	cp -f /etc/suspend.conf "${TEMP}/initramfs-suspend-temp/etc" ||
 #		gen_die 'Could not copy /etc/suspend.conf'
 #	cd "${TEMP}/initramfs-suspend-temp/"
+#	log_future_cpio_content
 #	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 #			|| gen_die "compressing suspend cpio"
 #	rm -r "${TEMP}/initramfs-suspend-temp/"
@@ -205,6 +219,7 @@ append_multipath(){
 		cp /etc/scsi_id.config "${TEMP}/initramfs-multipath-temp/etc/" || gen_die 'could not copy scsi_id.config'
 	fi
 	cd "${TEMP}/initramfs-multipath-temp"
+	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 			|| gen_die "compressing multipath cpio"
 	cd "${TEMP}"
@@ -229,6 +244,7 @@ append_dmraid(){
 		ln -sf raid456.kp raid45.ko
 		cd "${TEMP}/initramfs-dmraid-temp/"
 	fi
+	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 			|| gen_die "compressing dmraid cpio"
 	cd "${TEMP}"
@@ -248,6 +264,7 @@ append_iscsi(){
 		gen_die "Could not extract iscsi binary cache!"
 	chmod a+x "${TEMP}/initramfs-iscsi-temp/bin/iscsistart"
 	cd "${TEMP}/initramfs-iscsi-temp/"
+	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 			|| gen_die "compressing iscsi cpio"
 	cd "${TEMP}"
@@ -307,6 +324,7 @@ append_lvm(){
 #		fi
 	fi
 	cd "${TEMP}/initramfs-lvm-temp/"
+	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 			|| gen_die "compressing lvm cpio"
 	cd "${TEMP}"
@@ -350,6 +368,7 @@ append_mdadm(){
 		fi
 	fi
 	cd "${TEMP}/initramfs-mdadm-temp/"
+	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 			|| gen_die "compressing mdadm cpio"
 	cd "${TEMP}"
@@ -375,6 +394,7 @@ append_zfs(){
 	copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zfs,zpool}
 
 	cd "${TEMP}/initramfs-zfs-temp/"
+	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 			|| gen_die "compressing zfs cpio"
 	cd "${TEMP}"
@@ -402,6 +422,7 @@ append_splash(){
 			cp -f "/usr/share/splashutils/initrd.splash" "${TEMP}/initramfs-splash-temp/etc"
 		fi
 		cd "${TEMP}/initramfs-splash-temp/"
+		log_future_cpio_content
 		find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 			|| gen_die "compressing splash cpio"
 		cd "${TEMP}"
@@ -413,6 +434,7 @@ append_splash(){
 
 append_overlay(){
 	cd ${INITRAMFS_OVERLAY}
+	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 			|| gen_die "compressing overlay cpio"
 }
@@ -440,6 +462,7 @@ append_luks() {
 		copy_binaries "${TEMP}/initramfs-luks-temp/" /sbin/cryptsetup
 	fi
 
+	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "appending cryptsetup to cpio"
 
@@ -470,6 +493,7 @@ append_firmware() {
 	else
 		cp -a "${FIRMWARE_DIR}"/* ${TEMP}/initramfs-firmware-temp/lib/firmware/
 	fi
+	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "appending firmware to cpio"
 	cd "${TEMP}"
@@ -491,6 +515,7 @@ append_gpg() {
 		gen_die 'Could not extract gpg binary cache!'
 	chmod a+x "${TEMP}/initramfs-gpg-temp/sbin/gpg"
 	cd "${TEMP}/initramfs-gpg-temp/"
+	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
 	rm -rf "${TEMP}/initramfs-gpg-temp" > /dev/null
 }
@@ -543,6 +568,7 @@ append_modules() {
 		print_list ${!group_modules} > "${TEMP}/initramfs-modules-${KV}-temp/etc/modules/${group}"
 	done
 	cd "${TEMP}/initramfs-modules-${KV}-temp/"
+	log_future_cpio_content
 	find . | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 			|| gen_die "compressing modules cpio"
 	cd "${TEMP}"
@@ -647,6 +673,7 @@ append_auxilary() {
 	fi
 
 	cd "${TEMP}/initramfs-aux-temp/"
+	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 			|| gen_die "compressing auxilary cpio"
 	cd "${TEMP}"

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

[Sebastian Pipping]

commit:     004c50f81c95c94bb7c95149607c26bf1b9173b3
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu May 17 17:45:00 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu May 17 17:45:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=004c50f8

Add notes on how to test things

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

diff --git a/HACKING b/HACKING
index 57bbbd1..b8f060e 100644
--- a/HACKING
+++ b/HACKING
@@ -11,6 +11,10 @@ Phases:
 - source global scripts
 - 
 
+Testing things:
+  $ cd genkernel
+  $ sudo GK_SHARE="$PWD" ./genkernel initramfs --no-install --no-postclear --loglevel=2
+
 Rolling a release:
 - Bump the version in the main genkernel file.
 - echangelog commit the bump

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

[Sebastian Pipping]

commit:     5dd07746513b7dc576155b25aa9fe5a7b4b96ae1
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu May 17 17:47:29 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu May 17 17:47:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=5dd07746

Bump version to 3.4.33

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

diff --git a/ChangeLog b/ChangeLog
index f5c5f85..83c2829 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  17 May 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.33
+
   17 May 2012; Sebastian Pipping <sping@gentoo.org>
   -patches/e2fsprogs/1.42/e2fsprogs-1.41.12-getpagesize.patch, gen_compile.sh,
   gen_initramfs.sh, genkernel, genkernel.conf:

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

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

[Sebastian Pipping]

commit:     6a387ce36cdd101afa04f867da849e11bdd86f15
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu May 17 18:32:58 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu May 17 18:32:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=6a387ce3

Bump to 3.4.33.1

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

diff --git a/ChangeLog b/ChangeLog
index 0173167..8c26f21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  17 May 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump to 3.4.33.1
+
   17 May 2012; Sebastian Pipping <sping@gentoo.org> defaults/linuxrc:
   Fix call to blkid as "blkid -l -t UUID=foo" (without -o device) does not seem
   to work well with blkid of util-linux

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

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

[Sebastian Pipping]

commit:     b65dae078790631c3637ca593ac6fa822a6be6d6
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon May 28 18:25:52 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon May 28 18:25:52 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b65dae07

Fix an e2fsprogs compilation leftover (bug #417095)

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

diff --git a/ChangeLog b/ChangeLog
index 8c26f21..44edb00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  28 May 2012; Sebastian Pipping <sping@gentoo.org> gen_funcs.sh:
+  Fix an e2fsprogs compilation leftover (bug #417095), reported by Juergen Rose
+
   17 May 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump to 3.4.33.1
 

diff --git a/gen_funcs.sh b/gen_funcs.sh
index f199014..48a3382 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -495,7 +495,7 @@ set_config_with_override() {
 }
 
 check_distfiles() {
-	for i in $BUSYBOX_SRCTAR $MULTIPATH_SRCTAR $LVM_SRCTAR $DMRAID_SRCTAR $E2FSPROGS_SRCTAR $ISCSI_SRCTAR $GPG_SRCTAR
+	for i in $BUSYBOX_SRCTAR $MULTIPATH_SRCTAR $LVM_SRCTAR $DMRAID_SRCTAR $ISCSI_SRCTAR $GPG_SRCTAR
 	do
 		if [ ! -f "${i}" ]
 		then

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

[Sebastian Pipping]

commit:     a4438ec946201eac5fda78f21d7014d4a46ebcdc
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Jun  4 19:43:10 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jun  4 19:43:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=a4438ec9

Merge branch 'bug-418463'

Conflicts:
	ChangeLog


 ChangeLog        |    3 +++
 defaults/linuxrc |    9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --cc ChangeLog
index 76102bd,6047d4f..016128a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -5,11 -5,9 +5,14 @@@
  # Distributed under the GPL v2
  # $Id$
  
+   02 Jun 2012; Sebastian Pipping <sping@gentoo.org> defaults/linuxrc:
+   Support bind mounts from /etc/initramfs.mounts (bug #418463)
+ 
 +  02 Jun 2012; Sebastian Pipping <sping@gentoo.org> arch/x86/modules_load,
 +  arch/x86_64/modules_load, defaults/modules_load:
 +  Make sure that cbc.ko and aes*.ko needed for cbc-essiv:sha256 (=default) disk
 +  encryption are included with the initramfs (bug #416973)
 +
    28 May 2012; Sebastian Pipping <sping@gentoo.org> gen_funcs.sh:
    Fix an e2fsprogs compilation leftover (bug #417095), reported by Juergen Rose
  

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

[Sebastian Pipping]

commit:     25cf86470e5dd1b073494ecf95d1e00cdc9bb9ca
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Jun  4 19:56:39 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jun  4 19:56:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=25cf8647

Be more explicit in developer docs

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

diff --git a/HACKING b/HACKING
index b8f060e..9df627e 100644
--- a/HACKING
+++ b/HACKING
@@ -17,7 +17,8 @@ Testing things:
 
 Rolling a release:
 - Bump the version in the main genkernel file.
-- echangelog commit the bump
+- echangelog "Bump version to ${PV}"
+- git commit -a -m "Bump version to ${PV}"
 - git tag -a -m "Tag release v${PV}" v${PV}
 - git push ${REMOTE} master --tags
 - make dist

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

[Sebastian Pipping]

commit:     ffb7dfd0952412f878def8dac38ead9100098a32
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Jun  4 19:56:56 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jun  4 19:56:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=ffb7dfd0

Bump version to 3.4.34

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

diff --git a/ChangeLog b/ChangeLog
index 016128a..4b4e4b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  04 Jun 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.34
+
   02 Jun 2012; Sebastian Pipping <sping@gentoo.org> defaults/linuxrc:
   Support bind mounts from /etc/initramfs.mounts (bug #418463)
 

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

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

[Sebastian Pipping]

commit:     d78b12f5b505f63c40af40b04bf5aa6236860361
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Jun 10 17:15:58 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jun 10 17:15:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=d78b12f5

Bump version to 3.4.35

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

diff --git a/ChangeLog b/ChangeLog
index 2b79051..8c136b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  10 Jun 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.35
+
   10 Jun 2012; Sebastian Pipping <sping@gentoo.org>
   +patches/busybox/1.20.1/1.18.1-openvt.diff,
   +patches/busybox/1.20.1/busybox-1.7.4-signal-hack.patch,

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

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

[Sebastian Pipping]

commit:     37bfac0bd96b0d5639894c8d2ac6290a0480acf7
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Jun 11 17:17:18 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jun 11 17:17:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=37bfac0b

Extend change log

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

diff --git a/ChangeLog b/ChangeLog
index 8c136b1..3e01d3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  11 Jun 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
+  Respect real_root for plain dm-crypt without LVM (bug #419965)
+
   10 Jun 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.35
 

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

[Sebastian Pipping]

commit:     eb53fc109887339c911754fdb8be4e9511d30e02
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Jun 11 17:38:40 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jun 11 17:38:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=eb53fc10

Bump version to 3.4.36

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

diff --git a/ChangeLog b/ChangeLog
index 3e01d3b..7d5ad59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  11 Jun 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.36
+
   11 Jun 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
   Respect real_root for plain dm-crypt without LVM (bug #419965)
 

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

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

[Sebastian Pipping]

commit:     0db56cdc9d5166abaaaf0b23406cf06d775e2bca
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Jul  1 12:03:51 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 17:17:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=0db56cdc

Support --kernel-config=/proc/config.gz (bug #421027)

---
 ChangeLog           |    4 ++++
 gen_configkernel.sh |    8 +++++++-
 gen_package.sh      |   19 +++++++++++++++++--
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7d5ad59..7b90ca8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  01 Jul 2012; Sebastian Pipping <sping@gentoo.org> gen_configkernel.sh,
+  gen_package.sh:
+  Support --kernel-config=/proc/config.gz (bug #421027)
+
   11 Jun 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.36
 

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 5d619fa..b0837dd 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -56,7 +56,13 @@ config_kernel() {
 	# or we might remove configurations someone is trying to test.
 	if isTrue "${MRPROPER}" || [ ! -f "${KERNEL_DIR}/.config" ]
 	then
-		cp "${KERNEL_CONFIG}" "${KERNEL_DIR}/.config" || gen_die 'Could not copy configuration file!'
+		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}"
+		else
+			cp "${KERNEL_CONFIG}" "${KERNEL_DIR}/.config" || gen_die "${message}"
+		fi
 	fi
 
 	if isTrue "${OLDCONFIG}"

diff --git a/gen_package.sh b/gen_package.sh
index e7c6142..b83ccc1 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -78,7 +78,13 @@ gen_kerncache()
 	cd "${KERNEL_DIR}"
 	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_CONFIG}" "${TEMP}/kerncache/config-${ARCH}-${KV}.orig"
+
+	if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then
+		# Support --kernel-config=/proc/config.gz, mainly
+		zcat "${KERNEL_CONFIG}" > "${TEMP}/kerncache/config-${ARCH}-${KV}.orig"
+	else
+		cp "${KERNEL_CONFIG}" "${TEMP}/kerncache/config-${ARCH}-${KV}.orig"
+	fi
 	cp "${KERNEL_DIR}/System.map" "${TEMP}/kerncache/System.map-${ARCH}-${KV}"
 	if isTrue "${GENZIMAGE}"
 	then
@@ -180,7 +186,16 @@ gen_kerncache_is_valid()
 				else
 					test1=$(grep -v "^#" ${TEMP}/config-${ARCH}-${KV} | md5sum | cut -d " " -f 1)
 				fi
-				test2=$(grep -v "^#" ${KERNEL_CONFIG} | md5sum | cut -d " " -f 1)
+
+				if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then
+					# Support --kernel-config=/proc/config.gz, mainly
+					local CONFGREP=zgrep
+				else
+					local CONFGREP=grep
+				fi
+				test2=$("${CONFGREP}" -v "^#" ${KERNEL_CONFIG} | md5sum | cut -d " " -f 1)
+
+
 				if [ "${test1}" == "${test2}" ]
 				then
 					echo

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

[Sebastian Pipping]

commit:     d21a6c1bfc873e8da7e20dbb28767e7def81c400
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Jul  8 17:20:15 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 17:20:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=d21a6c1b

Add bug reference to change log

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

diff --git a/ChangeLog b/ChangeLog
index 87332a7..08d064b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,7 @@
   Support --kernel-config=/proc/config.gz (bug #421027)
 
   08 Jul 2012; Kenny Cheng <kenny97821419@gmail.com> defaults/linuxrc:
-  Add /run to support openrc >=0.10
+  Add /run to support openrc >=0.10 (bug #425180)
 
   11 Jun 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.36

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

[Sebastian Pipping]

commit:     636cbc75c14005d10361cda8f6f0b4bad280bf44
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Jul  8 17:18:46 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 17:18:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=636cbc75

Merge branch 'bug-421027'

Conflicts:
	ChangeLog


 ChangeLog           |    4 ++++
 gen_configkernel.sh |    8 +++++++-
 gen_package.sh      |   19 +++++++++++++++++--
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --cc ChangeLog
index 1340d09,7b90ca8..87332a7
--- a/ChangeLog
+++ b/ChangeLog
@@@ -5,9 -5,10 +5,13 @@@
  # Distributed under the GPL v2
  # $Id$
  
+   01 Jul 2012; Sebastian Pipping <sping@gentoo.org> gen_configkernel.sh,
+   gen_package.sh:
+   Support --kernel-config=/proc/config.gz (bug #421027)
+ 
 +  08 Jul 2012; Kenny Cheng <kenny97821419@gmail.com> defaults/linuxrc:
 +  Add /run to support openrc >=0.10
 +
    11 Jun 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
    Bump version to 3.4.36
  

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

[Sebastian Pipping]

commit:     88892f5df2453f959539c444a4d0ac161ec70d8f
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Jul  8 21:39:10 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 22:01:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=88892f5d

Use proper ${KERNEL_CONFIG} rather than ${KERNEL_DIR}/.config as input

---
 gen_initramfs.sh |    9 ++++++++-
 genkernel        |   12 +++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index f0b63d9..9ccd5f3 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -754,6 +754,13 @@ create_initramfs() {
 	else
 		if isTrue "${COMPRESS_INITRD}"
 		then
+			if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then
+				# Support --kernel-config=/proc/config.gz, mainly
+				local CONFGREP=zgrep
+			else
+				local CONFGREP=grep
+			fi
+
 			cmd_xz=$(type -p xz)
 			cmd_lzma=$(type -p lzma)
 			cmd_bzip2=$(type -p bzip2)
@@ -778,7 +785,7 @@ create_initramfs() {
 						set -- ${tuple}
 						kernel_option=$1
 						cmd_variable_name=$2
-						if grep -sq "^${kernel_option}=y" ${KERNEL_DIR}/.config && test -n "${!cmd_variable_name}" ; then
+						if ${CONFGREP} -q "^${kernel_option}=y" "${KERNEL_CONFIG}" && test -n "${!cmd_variable_name}" ; then
 							compression=$3
 							[[ ${COMPRESS_INITRD_TYPE} == best ]] && break
 						fi

diff --git a/genkernel b/genkernel
index 61dd493..103c434 100755
--- a/genkernel
+++ b/genkernel
@@ -352,10 +352,20 @@ then
 	[ "${ZFS}" = '1' ] && print_warning 1 'add "dozfs" for ZFS volume management support'
 	[ "${ZFS}" = '1' ] && print_warning 1 'add either "real_root=ZFS" (bootfs autodetection) or "real_root=ZFS=<dataset>" to boot from a ZFS dataset'
 	[ "${ISCSI}" = '1' ] && print_warning 1 'add at least "iscsi_initiatorname=<initiator name> iscsi_target=<target name> and iscsi_address=<target ip>" for iscsi support'
-	if [ `grep 'CONFIG_EXT[0-9]_FS=' "${KERNEL_DIR}"/.config | wc -l` -ge 2 ]; then
+
+	if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then
+		# Support --kernel-config=/proc/config.gz, mainly
+		CONFGREP=zgrep
+	else
+		CONFGREP=grep
+	fi
+
+	if [ `${CONFGREP} 'CONFIG_EXT[0-9]_FS=' "${KERNEL_CONFIG}" | wc -l` -ge 2 ]; then
 		print_warning 1 'With support for several ext* filesystems around it may be needed to'
 		print_warning 1 'add "rootfstype=ext3" or "rootfstype=ext4"'
 	fi
+
+	unset CONFGREP
 fi
 
 [ "${BOOTRW}" != '' ] && mount -o remount,ro ${BOOTDIR}

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

[Sebastian Pipping]

commit:     7045223180032533e066b57c572bbcccb053cfe9
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Jul  8 21:40:49 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 22:01:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=70452231

Fix detection of initramfs compression with bzip2 as best candidate

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

diff --git a/ChangeLog b/ChangeLog
index d3bcf58..3950fa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  08 Jul 2012; Sebastian Pipping <sping@gentoo.org> gen_configkernel.sh,
+  gen_initramfs.sh:
+  Fix detection of initramfs compression with bzip2 as best candidate
+
   08 Jul 2012; Sebastian Pipping <sping@gentoo.org> arch/x86/modules_load,
   arch/x86_64/modules_load, defaults/modules_load:
   Add xts to MODULES_CRYPTO (bug #425028)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 9ccd5f3..6769063 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -779,7 +779,7 @@ create_initramfs() {
 					for tuple in \
 							'CONFIG_RD_XZ    cmd_xz    xz' \
 							'CONFIG_RD_LZMA  cmd_lzma  lzma' \
-							'CONFIG_RD_BZIP2 cmd_bzip2 bzip' \
+							'CONFIG_RD_BZIP2 cmd_bzip2 bzip2' \
 							'CONFIG_RD_GZIP  cmd_gzip  gzip' \
 							'CONFIG_RD_LZO   cmd_lzop  lzop'; do
 						set -- ${tuple}

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

[Sebastian Pipping]

commit:     15a33f3d28d9efa512b736853046224d7d2701d3
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Jul  8 21:42:32 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 22:01:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=15a33f3d

Catch case with no initramfs compression supported by kernel (bug #423847)

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

diff --git a/ChangeLog b/ChangeLog
index 3950fa6..2469de6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
 
   08 Jul 2012; Sebastian Pipping <sping@gentoo.org> gen_configkernel.sh,
   gen_initramfs.sh:
+  Catch case with no initramfs compression supported by kernel (bug #423847)
+
+  08 Jul 2012; Sebastian Pipping <sping@gentoo.org> gen_configkernel.sh,
+  gen_initramfs.sh:
   Fix detection of initramfs compression with bzip2 as best candidate
 
   08 Jul 2012; Sebastian Pipping <sping@gentoo.org> arch/x86/modules_load,

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 6769063..43ef155 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -790,6 +790,7 @@ create_initramfs() {
 							[[ ${COMPRESS_INITRD_TYPE} == best ]] && break
 						fi
 					done
+					[[ -z "${compression}" ]] && gen_die "None of the initramfs we tried are supported by your kernel (config file \"${KERNEL_CONFIG}\"), strange!?"
 					;;
 				*)
 					gen_die "Compression '${COMPRESS_INITRD_TYPE}' unknown"

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

[Sebastian Pipping]

commit:     c718d01381a9a619f71b0b500747604c3c8961c0
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Jul  8 22:00:19 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 22:01:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=c718d013

Improve wording

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

diff --git a/genkernel b/genkernel
index 8343cfe..1cf57fa 100755
--- a/genkernel
+++ b/genkernel
@@ -363,8 +363,8 @@ then
 	fi
 
 	if [ `${CONFGREP} 'CONFIG_EXT[0-9]_FS=' "${KERNEL_CONFIG}" | wc -l` -ge 2 ]; then
-		print_warning 1 'With support for several ext* filesystems around it may be needed to'
-		print_warning 1 'add "rootfstype=ext3" or "rootfstype=ext4"'
+		print_warning 1 'With support for several ext* filesystems available, it may be needed to'
+		print_warning 1 'add "rootfstype=ext3" or "rootfstype=ext4" to the list of boot parameters.'
 	fi
 
 	unset CONFGREP

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

[Sebastian Pipping]

commit:     c57b73f5f8117f79d4b1bd5f66ed6bcd53a91b20
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Jul  8 21:52:10 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 22:01:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=c57b73f5

Always report used kernel config file

---
 ChangeLog |    4 ++++
 genkernel |    2 ++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2469de6..501d9e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  08 Jul 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh,
+  genkernel:
+  Always report used kernel config file
+
   08 Jul 2012; Sebastian Pipping <sping@gentoo.org> gen_configkernel.sh,
   gen_initramfs.sh:
   Catch case with no initramfs compression supported by kernel (bug #423847)

diff --git a/genkernel b/genkernel
index 103c434..8343cfe 100755
--- a/genkernel
+++ b/genkernel
@@ -117,6 +117,7 @@ done
 # get the real arguments for usage...
 
 determine_real_args
+determine_config_file
 
 set_kernel_arch
 
@@ -129,6 +130,7 @@ check_distfiles
 dump_debugcache
 
 NORMAL=${BOLD} print_info 1 "Linux Kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL}..."
+print_info 1 ".. with config file ${KERNEL_CONFIG}"
 
 # Check BOOTDIR is mounted
 if ! isTrue ${CMD_INSTALL}

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

[Sebastian Pipping]

commit:     08e9d742e2ecc246dbece1652810e468f0b6c882
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Jul  8 22:02:29 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 22:02:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=08e9d742

Merge branch 'bug-423847'


 ChangeLog        |   12 ++++++++++++
 gen_initramfs.sh |   12 ++++++++++--
 genkernel        |   18 +++++++++++++++---
 3 files changed, 37 insertions(+), 5 deletions(-)

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

[Sebastian Pipping]

commit:     b45b5b59a3e2dadf749d10099d818af9879583b6
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Jul  8 22:07:38 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 22:07:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b45b5b59

Bump version to 3.4.37

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

diff --git a/ChangeLog b/ChangeLog
index 501d9e4..42b6f7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  08 Jul 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.37
+
   08 Jul 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh,
   genkernel:
   Always report used kernel config file

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

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

[Sebastian Pipping]

commit:     b59e62086df523876b9acbfb74a2d5e05a07bfc7
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Jul  9 22:42:30 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 22:43:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b59e6208

Fix linking of unionfs-fuse 0.24

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

diff --git a/ChangeLog b/ChangeLog
index 2752e7d..289e9fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  09 Jul 2012; Sebastian Pipping <sping@gentoo.org> gen_compile.sh:
+  Fix linking of unionfs-fuse 0.24
+
   09 Jul 2012; Sebastian Pipping <sping@gentoo.org>
   patches/fuse/2.8.6/fuse-2.8.6-glibc-2.14.patch:
   Allow compilation of FUSE 2.8.6 with glibc 2.14 (bug #370411)

diff --git a/gen_compile.sh b/gen_compile.sh
index f1c7405..cbd3432 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -616,7 +616,7 @@ compile_unionfs_fuse() {
 		apply_patches unionfs-fuse ${UNIONFS_FUSE_VER}
 		print_info 1 'unionfs-fuse: >> Compiling...'
 		sed -i "/^\(CFLAGS\|CPPFLAGS\)/s:^\\(.*\\)$:\\1 -static -I${TEMP}/${FUSE_DIR}/include -L${TEMP}/${FUSE_DIR}/lib/.libs:" Makefile src/Makefile
-		sed -i "/^LIB = /s:^LIB = \(.*\)$:LIB = -static -L${TEMP}/${FUSE_DIR}/lib/.libs \1 -ldl -lrt:" Makefile src/Makefile
+		sed -i "/^LIB = /s:^LIB = \(.*\)$:LIB = -static -L${TEMP}/${FUSE_DIR}/lib/.libs \1 -ldl -lpthread -lrt:" Makefile src/Makefile
 		MAKE=${UTILS_MAKE} compile_generic "" ""
 		print_info 1 'unionfs-fuse: >> Copying to cache...'
 		[ -f "${TEMP}/${UNIONFS_FUSE_DIR}/src/unionfs" ] ||

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

[Sebastian Pipping]

commit:     f867c2a849db0a0206da82eb005abc2198a3eb70
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Jul  9 22:24:59 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 22:24:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=f867c2a8

FUSE: Remove invalid configure option --disable-kernel-module

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

diff --git a/gen_compile.sh b/gen_compile.sh
index 3344dc4..f1c7405 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -578,7 +578,7 @@ compile_fuse() {
 		cd "${FUSE_DIR}"
 		apply_patches fuse ${FUSE_VER}
 		print_info 1 'fuse: >> Configuring...'
-		./configure  --disable-kernel-module --disable-example >> ${LOGFILE} 2>&1 ||
+		./configure --disable-example >> ${LOGFILE} 2>&1 ||
 			gen_die 'Configuring fuse failed!'
 		print_info 1 'fuse: >> Compiling...'
 		MAKE=${UTILS_MAKE} compile_generic "" ""

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

[Sebastian Pipping]

commit:     76652966ae35c0e33c10ff1d95cfb30ea90c45fb
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Jul  9 22:44:18 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 22:44:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=76652966

Merge branch 'bug-425080'


 ChangeLog                                      |    7 +++++++
 gen_compile.sh                                 |    4 ++--
 patches/fuse/2.8.6/fuse-2.8.6-glibc-2.14.patch |   10 ++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

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

[Sebastian Pipping]

commit:     75ae62388616edaa62724412d6283a329f117df3
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Jul  9 22:48:13 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 22:48:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=75ae6238

Fix bug reference in change log (bad: #370411, good: #425080)

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

diff --git a/ChangeLog b/ChangeLog
index 289e9fa..21d6a5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,7 @@
 
   09 Jul 2012; Sebastian Pipping <sping@gentoo.org>
   patches/fuse/2.8.6/fuse-2.8.6-glibc-2.14.patch:
-  Allow compilation of FUSE 2.8.6 with glibc 2.14 (bug #370411)
+  Allow compilation of FUSE 2.8.6 with glibc 2.14 (bug #425080)
 
   09 Jul 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
   Restore previous handling of real_root due to report of regressions (bug

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

[Sebastian Pipping]

commit:     32c022da12cb56ce6562223a82ff1e03309e2221
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Jul  9 22:50:12 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 22:50:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=32c022da

Bump version to 3.4.38

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

diff --git a/ChangeLog b/ChangeLog
index 21d6a5f..53bf29d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  09 Jul 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.38
+
   09 Jul 2012; Sebastian Pipping <sping@gentoo.org> gen_compile.sh:
   Fix linking of unionfs-fuse 0.24
 

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

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

[Richard Yao]

commit:     4626f90db75889109476652cbe54bb0ed33d4618
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Tue Jul 17 20:01:15 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Tue Jul 17 20:01:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=4626f90d

Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/genkernel


 ChangeLog                 |    6 ++++++
 arch/x86_64/kernel-config |    4 +++-
 doc/genkernel.8.txt       |    3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

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

[Sebastian Pipping]

commit:     3319bee40feca06043e110373170f1a97c7dc1fd
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Jul 21 01:06:27 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 01:06:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=3319bee4

Bump version to 3.4.39

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

diff --git a/ChangeLog b/ChangeLog
index 3cbafa2..bc9ab5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  21 Jul 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.39
+
   17 Jul 2012; Robin H. Johnson <robbat2@gentoo.org> arch/x86_64/kernel-config:
   Bug #399703: amd64 default kernel config did not have EFI support.
   

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

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

[Richard Yao]

commit:     1883585cd9f0e5a0145a2dc6493b77719fe3c25e
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Sat Jul 21 18:20:24 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 18:20:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=1883585c

Fix whitespace

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

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 3bc1b29..7f352f8 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 MODPROBEDIR          CMD_MODPROBEDIR              "/etc/modprobe.d"
+	set_config_with_override STRING MODPROBEDIR          CMD_MODPROBEDIR          "/etc/modprobe.d"
 
 	set_config_with_override BOOL   SPLASH               CMD_SPLASH
 	set_config_with_override BOOL   POSTCLEAR            CMD_POSTCLEAR

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

[Sebastian Pipping]

commit:     a725f02d008a2546ac3c56513043cb3336833539
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Fri Jul 27 23:10:17 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Jul 27 23:10:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=a725f02d

Bump version to 3.4.40

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

diff --git a/ChangeLog b/ChangeLog
index 1fae6f4..79a318b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  27 Jul 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
+  genkernel:
+  Bump version to 3.4.40
+
   24 Jul 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts:
   Flip awk return values.
 

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

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

[Sebastian Pipping]

commit:     47ac46c0c64ac7d13c3c1e460891ae52352e4eea
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Aug 12 18:43:02 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Aug 12 18:47:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=47ac46c0

Fix parsing of --config=... command line option

Before, --config=... could not be combined with anything else on the command line

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

diff --git a/ChangeLog b/ChangeLog
index 79a318b..bee9ecb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  12 Aug 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Fix parsing of --config=... command line option
+
   27 Jul 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
   genkernel:
   Bump version to 3.4.40

diff --git a/genkernel b/genkernel
index 5ee2d42..98f24d9 100755
--- a/genkernel
+++ b/genkernel
@@ -25,11 +25,12 @@ parse_opt() {
 
 # We don't know where our config is, so we check for it, and default to using
 # /etc/genkernel.conf if nobody has specified one.
-case "$*" in
-	--config=*)
-		CMD_GK_CONFIG=`parse_opt "$*"`
-	;;
-esac
+
+# NOTE: We are look for --config=... in a way that doesn't modify $@ since we access that again, later
+for (( i=1; i<=$# ; i=i+1 )); do
+	eval arg="\$$i"
+	[[ "${arg}" = --config=* ]] && CMD_GK_CONFIG=`parse_opt "${arg}"`
+done
 
 # Pull in our configuration
 _GENKERNEL_CONF=${CMD_GK_CONFIG:-/etc/genkernel.conf}

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

[Sebastian Pipping]

commit:     4588b75c1eec719a59074caca407c20147313348
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Aug 12 18:06:34 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Aug 12 18:13:21 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=4588b75c

Extract variable _MODULES_LOAD to resolve duplication and later re-use

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

diff --git a/genkernel b/genkernel
index 200b3fb..b314440 100755
--- a/genkernel
+++ b/genkernel
@@ -102,7 +102,8 @@ get_official_arch
 
 # Read arch-specific config
 source ${ARCH_CONFIG} || gen_die "Could not read ${ARCH_CONFIG}"
-source ${GK_SHARE}/arch/${ARCH}/modules_load || gen_die "Could not read ${GK_SHARE}/arch/${ARCH}/modules_load"
+_MODULES_LOAD=${GK_SHARE}/arch/${ARCH}/modules_load
+source "${_MODULES_LOAD}" || gen_die "Could not read ${_MODULES_LOAD}"
 
 # Merge modules_load from config
 for group_modules in ${!AMODULES_*}; do

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

[Sebastian Pipping]

commit:     780299182696ffae042061df4fd714e7177abeea
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Aug 12 18:11:07 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Aug 12 18:13:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=78029918

Extract variable _GENKERNEL_CONF to resolve duplication and later re-use

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

diff --git a/genkernel b/genkernel
index b314440..eb149db 100755
--- a/genkernel
+++ b/genkernel
@@ -32,7 +32,8 @@ case "$*" in
 esac
 
 # Pull in our configuration
-source ${CMD_GK_CONFIG:-/etc/genkernel.conf} || small_die "Could not read /etc/genkernel.conf"
+_GENKERNEL_CONF=${CMD_GK_CONFIG:-/etc/genkernel.conf}
+source "${_GENKERNEL_CONF}" || small_die "Could not read ${_GENKERNEL_CONF}"
 
 # Start sourcing other scripts
 source ${GK_SHARE}/gen_funcs.sh || small_die "Could not read ${GK_SHARE}/gen_funcs.sh"

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

[Sebastian Pipping]

commit:     6683592216b047d19874d1515ce72226a98650d7
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Aug 12 18:13:10 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Aug 12 18:14:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=66835922

Report on sourced config files

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

diff --git a/genkernel b/genkernel
index eb149db..5ee2d42 100755
--- a/genkernel
+++ b/genkernel
@@ -102,9 +102,13 @@ echo
 get_official_arch
 
 # Read arch-specific config
+print_info 1 "Using genkernel.conf from ${_GENKERNEL_CONF}"
+print_info 1 "Sourcing arch-specific config.sh from ${ARCH_CONFIG} .."
 source ${ARCH_CONFIG} || gen_die "Could not read ${ARCH_CONFIG}"
 _MODULES_LOAD=${GK_SHARE}/arch/${ARCH}/modules_load
+print_info 1 "Sourcing arch-specific modules_load from ${_MODULES_LOAD} .."
 source "${_MODULES_LOAD}" || gen_die "Could not read ${_MODULES_LOAD}"
+echo
 
 # Merge modules_load from config
 for group_modules in ${!AMODULES_*}; do

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

[Sebastian Pipping]

commit:     d3735e62951431d024f9dca94a11e7fd9eaa70fc
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Aug 12 19:03:38 2012 +0000
Commit:     Sebastian Pipping <sping <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:master commit in: /

[Sebastian Pipping]

commit:     35efd0619ef2a849b93884eb63041db3d428be7f
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Aug 12 21:37:26 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Aug 12 21:37:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=35efd061

Add note on software.sh to genkernel.conf

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

diff --git a/genkernel.conf b/genkernel.conf
index 8e9e424..7998555 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -200,6 +200,12 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 #BUSYBOX_CONFIG="/path/to/file"
 #BUSYBOX_APPLETS="[ ash sh mount uname echo cut cat"
 
+# NOTE: Since genkernel 3.4.41 the version of
+#   busybox, lvm, mdadm, .. have been moved to
+#   /usr/share/genkernel/defaults/software.sh in order to
+#   reduce the merging you have to do during etc-update.
+#   You can still override these settings in here
+#   below the source command.
 source "${GK_SHARE}/defaults/software.sh"
 
 

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

[Sebastian Pipping]

commit:     fa6374eb01639b1f25e5de04b48e1889603285ea
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Aug 12 21:39:49 2012 +0000
Commit:     Sebastian Pipping <sping <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:master commit in: /

[Sebastian Pipping]

commit:     953ca52ea1b57676f0828f267ae10c99a1435921
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Aug 12 21:39:06 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Aug 12 21:39:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=953ca52e

Remove "$Id$" line from genkernel.conf to ease etc-update

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

diff --git a/genkernel.conf b/genkernel.conf
index 7998555..331dbc1 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -1,5 +1,4 @@
 # Configuration file for genkernel
-# $Id$
 
 # This file is sourced by genkernel at startup and determines which options
 # we will be using to compile our kernel.  The order of precidence is simple,

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

[Sebastian Pipping]

commit:     c20673837939e0bf8694a9cc5895a1b9e8f2598c
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Aug 12 23:22:13 2012 +0000
Commit:     Sebastian Pipping <sping <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:master commit in: /

[Richard Yao]

commit:     1cfe39d77dd74c45e310afdd340b3ebaca37dcf1
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Tue Aug 14 14:35:48 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Tue Aug 14 14:35:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=1cfe39d7

Bump version to 3.4.41

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

diff --git a/ChangeLog b/ChangeLog
index 0e32e8d..dde71f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  14 Aug 2012; Richard Yao <ryao@gentoo.org> genkernel:
+  Bump version to 3.4.41
+
   12 Aug 2012; Sebastian Pipping <sping@gentoo.org> +defaults/software.sh,
   genkernel.conf:
   Move software version defaults for defaults/software.sh to ease the

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

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

[Sebastian Pipping]

commit:     63e26c3a2ccb2ff83e8d86616fd8c4a390090248
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Tue Aug 14 15:28:34 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Aug 14 15:28:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=63e26c3a

Extend docs on release process

---
 HACKING |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/HACKING b/HACKING
index 9df627e..a2e197e 100644
--- a/HACKING
+++ b/HACKING
@@ -19,9 +19,23 @@ Rolling a release:
 - Bump the version in the main genkernel file.
 - echangelog "Bump version to ${PV}"
 - git commit -a -m "Bump version to ${PV}"
+- make dist
 - git tag -a -m "Tag release v${PV}" v${PV}
 - git push ${REMOTE} master --tags
-- make dist
 - upload genkernel-${PV}.tar.bz2 to the hosting:
     scp genkernel-${PV}.tar.bz2 ${USER}@dev.gentoo.org:/space/distfiles-local/
+- copy to portage's DISTDIR so you can bump the ebuild
+  before the tarball hits distfile mirrors
+  - cp genkernel-${PV}.tar.bz2 /usr/portage/distfiles/
+- Bump the ebuild
+- Propagate ebuild changes to the live ebuild
 - check open bugs with keyword "InSVN" or "InVCS" for closability
+  and close these bugs with a comment like "Fixed in ${PV}, just released.  Closing."
+- Send a mail with subject "genkernel ${PV} released" to both
+  <gentoo-genkernel@lists.gentoo.org> and <genkernel@gentoo.org>.
+  Use
+
+    PV_PREV=$(git tag -l | tail -n 2 | head -n 1)
+    git diff ${PV_PREV}..${PV} ChangeLog | /bin/grep '^+\($\|  \)' | sed 's|^+ *||' | xsel
+
+  to generate that the mail body.

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

[Richard Yao]

commit:     1d84e6315b882b9cb94699fa802c07b79e4ac6c5
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Tue Aug 14 17:01:05 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Tue Aug 14 17:01:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=1d84e631

Add diff ... | patch ... trick for propagating changes to live ebuild

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

diff --git a/HACKING b/HACKING
index a2e197e..a802779 100644
--- a/HACKING
+++ b/HACKING
@@ -29,6 +29,7 @@ Rolling a release:
   - cp genkernel-${PV}.tar.bz2 /usr/portage/distfiles/
 - Bump the ebuild
 - Propagate ebuild changes to the live ebuild
+    diff genkernel-${OLD_PV}.ebuild genkernel-${NEW_PV}.ebuild | patch genkernel-9999.ebuild
 - check open bugs with keyword "InSVN" or "InVCS" for closability
   and close these bugs with a comment like "Fixed in ${PV}, just released.  Closing."
 - Send a mail with subject "genkernel ${PV} released" to both

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

[Richard Yao]

commit:     4bc0a3a7704aa201b10407ee600364cf3ed0792c
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Tue Aug 14 17:01:05 2012 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Tue Aug 14 17:02:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=4bc0a3a7

Append trick for propagating changes to live ebuild to docs

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

diff --git a/HACKING b/HACKING
index a2e197e..a802779 100644
--- a/HACKING
+++ b/HACKING
@@ -29,6 +29,7 @@ Rolling a release:
   - cp genkernel-${PV}.tar.bz2 /usr/portage/distfiles/
 - Bump the ebuild
 - Propagate ebuild changes to the live ebuild
+    diff genkernel-${OLD_PV}.ebuild genkernel-${NEW_PV}.ebuild | patch genkernel-9999.ebuild
 - check open bugs with keyword "InSVN" or "InVCS" for closability
   and close these bugs with a comment like "Fixed in ${PV}, just released.  Closing."
 - Send a mail with subject "genkernel ${PV} released" to both

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

[Sebastian Pipping]

commit:     af46141a1536327e25bfb64d697b1a264a228f9d
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Sep 10 01:27:40 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Sep 10 01:27:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=af46141a

Bump version to 3.4.42

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

diff --git a/ChangeLog b/ChangeLog
index a0ac016..e7728f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  10 Sep 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.42
+
   10 Sep 2012; Sebastian Pipping <sping@gentoo.org>
   +patches/busybox/1.20.2/busybox-1.20.2-glibc-sys-resource.patch:
   Add busybox 1.20.2 patch: busybox-1.20.2-glibc-sys-resource.patch

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

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

[Sebastian Pipping]

commit:     82754773c5484f89e8918a2f3369a9473e878a6e
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Sep 10 01:38:40 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Sep 10 01:38:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=82754773

docs: Fix mail body generation hint

---
 HACKING |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

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

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

[Sebastian Pipping]

commit:     c9a61ce2c722eec0a6d511914304186ddefb91fd
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Sep 23 22:30:12 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Sep 23 22:30:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=c9a61ce2

Append e2fsck and mke2fs to initramfs

Original patch by Rick Farina

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

diff --git a/ChangeLog b/ChangeLog
index e7728f5..47a81ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  23 Sep 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
+  Append e2fsck and mke2fs to initramfs. Original patch by Rick Farina
+
   10 Sep 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.42
 

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index ac90830..ee21d2f 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -127,6 +127,23 @@ append_busybox() {
 	rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null
 }
 
+append_e2fstools(){
+	if [ -d "${TEMP}"/initramfs-e2fsprogs-temp ]
+	then
+		rm -r "${TEMP}"/initramfs-e2fsprogs-temp
+	fi
+
+	cd "${TEMP}" \
+			|| gen_die "cd '${TEMP}' failed"
+	mkdir -p initramfs-e2fsprogs-temp
+	copy_binaries "${TEMP}"/initramfs-e2fsprogs-temp/ /sbin/{e2fsck,mke2fs}
+
+	cd "${TEMP}"/initramfs-e2fsprogs-temp \
+			|| gen_die "cd '${TEMP}/initramfs-e2fsprogs-temp' failed"
+	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
+	rm -rf "${TEMP}"/initramfs-e2fsprogs-temp > /dev/null
+}
+
 append_blkid(){
 	if [ -d "${TEMP}/initramfs-blkid-temp" ]
 	then
@@ -741,6 +758,7 @@ create_initramfs() {
 	append_data 'base_layout'
 	append_data 'auxilary' "${BUSYBOX}"
 	append_data 'busybox' "${BUSYBOX}"
+	append_data 'e2fstools'
 	append_data 'lvm' "${LVM}"
 	append_data 'dmraid' "${DMRAID}"
 	append_data 'iscsi' "${ISCSI}"

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

[Sebastian Pipping]

commit:     773a8801d64f3cb1f7b9106623f827fc098b8b09
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Wed Oct  3 16:47:00 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Oct  3 16:50:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=773a8801

Use actual kernel config for check of available compression methods (bug #436820)

---
 ChangeLog        |    4 ++++
 gen_initramfs.sh |   14 +++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d453080..96bb1b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  03 Oct 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
+  Use actual kernel config for check of available compression methods (bug
+  #436820)
+
   03 Oct 2012; Dustin Frisch <dustin.frisch@gmail.com> defaults/linuxrc:
   With boot parameter real_init=/foo look for ${NEW_ROOT}/foo, not
   ${NEW_ROOT}/sbin/init (bug #437080)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 9d070f5..29fa652 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -809,7 +809,15 @@ create_initramfs() {
 	else
 		if isTrue "${COMPRESS_INITRD}"
 		then
-			if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then
+			# NOTE:  We do not work with ${KERNEL_CONFIG} here, since things like
+			#        "make oldconfig" or --noclean could be in effect.
+			if [ -f "${KERNEL_DIR}"/.config ]; then
+				local ACTUAL_KERNEL_CONFIG="${KERNEL_DIR}"/.config
+			else
+				local ACTUAL_KERNEL_CONFIG="${KERNEL_CONFIG}"
+			fi
+
+			if [[ "$(file --brief --mime-type "${ACTUAL_KERNEL_CONFIG}")" == application/x-gzip ]]; then
 				# Support --kernel-config=/proc/config.gz, mainly
 				local CONFGREP=zgrep
 			else
@@ -840,12 +848,12 @@ create_initramfs() {
 						set -- ${tuple}
 						kernel_option=$1
 						cmd_variable_name=$2
-						if ${CONFGREP} -q "^${kernel_option}=y" "${KERNEL_CONFIG}" && test -n "${!cmd_variable_name}" ; then
+						if ${CONFGREP} -q "^${kernel_option}=y" "${ACTUAL_KERNEL_CONFIG}" && test -n "${!cmd_variable_name}" ; then
 							compression=$3
 							[[ ${COMPRESS_INITRD_TYPE} == best ]] && break
 						fi
 					done
-					[[ -z "${compression}" ]] && gen_die "None of the initramfs we tried are supported by your kernel (config file \"${KERNEL_CONFIG}\"), strange!?"
+					[[ -z "${compression}" ]] && gen_die "None of the initramfs compression methods we tried are supported by your kernel (config file \"${ACTUAL_KERNEL_CONFIG}\"), strange!?"
 					;;
 				*)
 					gen_die "Compression '${COMPRESS_INITRD_TYPE}' unknown"

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

[Sebastian Pipping]

commit:     192ea46ecd98b97cfb39e00ea43217ca26e52753
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Wed Oct  3 16:53:27 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Oct  3 16:53:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=192ea46e

Bump version to 3.4.43

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

diff --git a/ChangeLog b/ChangeLog
index 96bb1b9..cb365ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  03 Oct 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+  Bump version to 3.4.43
+
   03 Oct 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
   Use actual kernel config for check of available compression methods (bug
   #436820)

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

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

[Robin H. Johnson]

commit:     5d93452a3be7dcc71ad1db96f28e6275d00deb20
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 18:33:23 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 18:33:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=5d93452a

Record the version of Genkernel used to build a given initramfs.

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

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 29fa652..f986ed4 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -88,6 +88,7 @@ append_base_layout() {
 	mknod -m 600 ttyS0 c 4 64
 
 	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
 
 	cd "${TEMP}/initramfs-base-temp/"
 	log_future_cpio_content

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

[Robin H. Johnson]

commit:     63b9e57491e3ac40428885ec5f761fe9bde5e3b2
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 21:28:46 2012 +0000
Commit:     Robin H. Johnson <robbat2 <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:master commit in: /

[Robin H. Johnson]

commit:     79d7fa1948de033bf5a2523fe8eca25d7f1f4438
Author:     Łukasz Stelmach <stlman <AT> poczta <DOT> fm>
AuthorDate: Thu Sep 13 20:44:45 2012 +0000
Commit:     Robin H. Johnson <robbat2 <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:master commit in: /

[Robin H. Johnson]

commit:     24dd02bc0cf801c80670a782988fbf80c2c3a8c0
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 21:26:56 2012 +0000
Commit:     Robin H. Johnson <robbat2 <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:master commit in: /

[Robin H. Johnson]

commit:     85d772454a59512c0e9536f366fff3ba6f2b466b
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 22:02:59 2012 +0000
Commit:     Robin H. Johnson <robbat2 <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:master commit in: /

[Robin H. Johnson]

commit:     12e4beeaf7b52545a16aa8d4655e5d39134c2436
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 00:05:16 2012 +0000
Commit:     Robin H. Johnson <robbat2 <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:master commit in: /

[Sebastian Pipping]

commit:     457cc95b07fc706f12bdd9adf6b862ce64361448
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Oct 14 16:25:15 2012 +0000
Commit:     Sebastian Pipping <sping <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:master commit in: /

[Robin H. Johnson]

commit:     7fdf3fc01a127b6c3c3ed4cf9c0611c7c1b69f6c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 15 05:37:11 2012 +0000
Commit:     Robin H. Johnson <robbat2 <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:master commit in: /

[Robin H. Johnson]

commit:     21b2b7f664c152d273bb397fed6e10c8fe4e3c59
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 15 05:39:45 2012 +0000
Commit:     Robin H. Johnson <robbat2 <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:master commit in: /

[Robin H. Johnson]

commit:     94ede0aaac0137e68f9511d97c44ddbf7c004cc8
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 15 05:40:28 2012 +0000
Commit:     Robin H. Johnson <robbat2 <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:master commit in: /

[Peter Hjalmarsson]

commit:     d3e34636b1854176fbcfc7fe14d4141c7f7be1f9
Author:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
AuthorDate: Mon Oct 15 20:00:04 2012 +0000
Commit:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
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:master commit in: /

[Robin H. Johnson]

commit:     65f400c541b5f5064110181490d3e3da4b28ddcd
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 15 20:53:50 2012 +0000
Commit:     Robin H. Johnson <robbat2 <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:master commit in: /

[Robin H. Johnson]

commit:     cd1e1a6d86d5101d74481ca275014c02b090bdde
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 15 20:57:58 2012 +0000
Commit:     Robin H. Johnson <robbat2 <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:master commit in: /

[Robin H. Johnson]

commit:     a60e920d61e727b3cab90f1b8079acf556cf77c2
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 19 22:20:54 2012 +0000
Commit:     Robin H. Johnson <robbat2 <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:master commit in: /

[Robin H. Johnson]

commit:     71e512c9e42156c847778d41d513a8f6d0989c57
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 26 08:50:56 2012 +0000
Commit:     Robin H. Johnson <robbat2 <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:master commit in: /

[Robin H. Johnson]

commit:     71507545eec3031ade9b4f9a314c53216f2c97f2
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  2 17:15:07 2012 +0000
Commit:     Robin H. Johnson <robbat2 <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:master commit in: /

[Robin H. Johnson]

commit:     e8779c232029711ad63942ed850b52c4e30d1c6c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  2 17:15:24 2012 +0000
Commit:     Robin H. Johnson <robbat2 <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:master commit in: /

[Robin H. Johnson]

commit:     51af5f5356319e17a804341fcb1e9511c28bf558
Author:     Richard Yao <ryao <AT> cs <DOT> stonybrook <DOT> edu>
AuthorDate: Sat Aug 25 01:04:23 2012 +0000
Commit:     Robin H. Johnson <robbat2 <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:master commit in: /

[Robin H. Johnson]

commit:     e4af35fdfcd6115741982fe0371d1b6b5f8c6db4
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  5 18:32:08 2012 +0000
Commit:     Robin H. Johnson <robbat2 <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:master commit in: /

[Peter Hjalmarsson]

commit:     6cc7e382d6f5755257bce6f734e8991871dc7b02
Author:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
AuthorDate: Thu Feb  7 12:31:14 2013 +0000
Commit:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
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 files changed, 10 insertions(+), 1 deletions(-)

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:master commit in: /

[Peter Hjalmarsson]

commit:     4733b318169415c111d029183c2bc181744b7858
Author:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
AuthorDate: Sun Mar  3 21:11:26 2013 +0000
Commit:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
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 files 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:master commit in: /

[Fabio Erculiani]

commit:     cbee01a7f960a0ea76ad8ee3b1377f67ba44ac92
Author:     Fabio Erculiani <lxnay <AT> sabayon <DOT> org>
AuthorDate: Thu May  2 12:16:50 2013 +0000
Commit:     Fabio Erculiani <lxnay <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 files 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:master 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:master 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:master 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:master 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:master 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:master 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:master commit in: /

[Richard Yao]

commit:     22ba87d87600dec26fc10651534db52c496103d1
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:47:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=22ba87d8

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:master 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:master commit in: /

[Richard Yao]

commit:     b55b295288679cba777d43f23ffc101cfcf67064
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 14:01:54 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 14:01:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b55b2952

Bump version to 3.4.47

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 7e33f38..1f42e95 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.46.1'
+GK_V='3.4.47'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.

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

[Richard Yao]

commit:     b613c3db0590d7e3d1263db701848e387214be25
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:35:07 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b613c3db

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:master commit in: /

[Richard Yao]

commit:     b765a85e0399b19530dce001d6e5e73a224bcdbf
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 02:09:39 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Wed Oct  2 12:42:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b765a85e

Advertise CMD_CALLBACK in genkernel.conf

Signed-off-by: Christoph Junghans <ottxor <AT> gentoo.org>

---
 genkernel.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/genkernel.conf b/genkernel.conf
index af73931..00657cb 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -114,6 +114,10 @@ DISKLABEL="yes"
 # This supersedes the "SPLASH_THEME" option of /etc/conf.d/splash (in early space).
 #SPLASH_THEME="gentoo"
 
+# Run the specified command in the current environment after the kernel and
+# modules have been compiled, useful to rebuild external kernel module.
+# use "emerge --quiet @module-rebuild" for >=portage-2.2
+#CMD_CALLBACK=""
 
 # =========Keymap Settings=========
 #

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

[Richard Yao]

commit:     2d720491bd62eb1c87f8da23ec7aef393207bf30
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 24 18:53:39 2014 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Fri Jan 24 18:53:43 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=2d720491

Make --kerncache compatible with recent versions of GNU tar, bug #457168

Older versions of GNU tar would extract files to the interior of the
directory specified after an adjustment via -C was taken into
consideration. Newer versions will perform extraction to the exterior of
that directory. This caused --kerncache to override the /lib symlink
with an actual directory.

We correct this by switching to a more standard syntax that should be
consistent against all tar implementations, including both old and new
versions of GNU tar.

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

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

diff --git a/gen_package.sh b/gen_package.sh
index ed7a5f4..c06521c 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -134,9 +134,9 @@ gen_kerncache_extract_modules()
 		print_info 1 'Extracting kerncache kernel modules'
         	if [ "${INSTALL_MOD_PATH}" != '' ]
 		then
-        		/bin/tar -xjf ${KERNCACHE} -C ${INSTALL_MOD_PATH} lib
+			/bin/tar -xjf ${KERNCACHE} -C ${INSTALL_MOD_PATH}/lib
 		else
-        		/bin/tar -xjf ${KERNCACHE} -C / lib
+			/bin/tar -xjf ${KERNCACHE} -C /lib
 		fi
 	fi
 }

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

[Richard Yao]

commit:     def540b06a3b6e5478308309a6eac55fba358b9f
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 24 19:26:58 2014 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Fri Jan 24 19:27:13 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=def540b0

Revert "Make --kerncache compatible with recent versions of GNU tar, bug #457168"

This reverts commit 2d720491bd62eb1c87f8da23ec7aef393207bf30, which
caused us to have /lib/lib. That got past me when testing.

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

diff --git a/gen_package.sh b/gen_package.sh
index c06521c..ed7a5f4 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -134,9 +134,9 @@ gen_kerncache_extract_modules()
 		print_info 1 'Extracting kerncache kernel modules'
         	if [ "${INSTALL_MOD_PATH}" != '' ]
 		then
-			/bin/tar -xjf ${KERNCACHE} -C ${INSTALL_MOD_PATH}/lib
+        		/bin/tar -xjf ${KERNCACHE} -C ${INSTALL_MOD_PATH} lib
 		else
-			/bin/tar -xjf ${KERNCACHE} -C /lib
+        		/bin/tar -xjf ${KERNCACHE} -C / lib
 		fi
 	fi
 }

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

[Richard Yao]

commit:     e49b8a450aba6eced9caa608a3bfdc38a7dbe677
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 03:06:41 2014 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 03:10:23 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=e49b8a45

Make --kerncache compatible with recent versions of GNU tar, bug #457168

Older versions of GNU tar would extract files to the interior of the
directory specified after an adjustment via -C was taken into
consideration. Newer versions will perform extraction to the exterior of
that directory. This caused --kerncache to override the /lib symlink
with an actual directory.

We correct this by switching to a more standard syntax that should be
consistent against old and new versions of GNU tar, as well as bsdtar.

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

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

diff --git a/gen_package.sh b/gen_package.sh
index ed7a5f4..520d771 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -134,9 +134,9 @@ gen_kerncache_extract_modules()
 		print_info 1 'Extracting kerncache kernel modules'
         	if [ "${INSTALL_MOD_PATH}" != '' ]
 		then
-        		/bin/tar -xjf ${KERNCACHE} -C ${INSTALL_MOD_PATH} lib
+			/bin/tar -xjf ${KERNCACHE} --strip-components 1 -C ${INSTALL_MOD_PATH}/lib
 		else
-        		/bin/tar -xjf ${KERNCACHE} -C / lib
+			/bin/tar -xjf ${KERNCACHE} --strip-components 1 -C /lib
 		fi
 	fi
 }

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

[Richard Yao]

commit:     175087e2365e78480c61abd20e2cf465160d81d5
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: Thu Feb 27 04:29:37 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=175087e2

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"

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

[Richard Yao]

commit:     d6cd840c05a8aa5f4131027ff76aff00d9fc23d2
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: Thu Feb 27 04:28:40 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=d6cd840c

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:master commit in: /

[Richard Yao]

commit:     a2bb8306063fe47279ccd1d4561a327f7df48424
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 27 22:51:27 2014 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Thu Feb 27 22:51:27 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=a2bb8306

Bump version to 3.4.48

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 1f42e95..ff319f2 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.47'
+GK_V='3.4.48'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.

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

[Richard Yao]

commit:     4be2a63948607ae984314e5b214c7743247f4a40
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 15 19:05:00 2014 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Mar 16 00:23:12 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=4be2a639

Record hostid into initramfs

ZFS pool import on non-exported pools is only permitted when the hostid
of the system matches the host id of the last pool to import it. Store
the hostid of the system to ensure that it matches at boot.

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

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 40318a2..26bcdf6 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -99,6 +99,8 @@ append_base_layout() {
 	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
 
+	printf "$(hostid | sed 's/\([0-9A-F]\{2\}\)/\\x\1/gI')" > ${TEMP}/initramfs-base-temp/etc/hostid
+
 	cd "${TEMP}/initramfs-base-temp/"
 	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \

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

[Richard Yao]

commit:     02f25be754697bd64eb95f4afa5f8fdea968f8c4
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 15 18:35:31 2014 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Mar 16 00:23:27 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=02f25be7

Include ZFS support when / is ZFS

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

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

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index afc6fe3..e0c9984 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -124,7 +124,7 @@ determine_real_args() {
 	set_config_with_override BOOL   MDADM                CMD_MDADM
 	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   ZFS                  CMD_ZFS                  "$(rootfs_type_is 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

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

[Richard Yao]

commit:     56505d81c2a1354d5cf06c7cce052f88bd97bf69
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 15 19:26:44 2014 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Mar 16 00:23:20 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=56505d81

Create rootfs_type_is() helper function

This is meant to facilite automatic detection of root filesystems that
require additional support. The main one being ZFS, but btrfs will also
qualify once support has been added.

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

---
 gen_funcs.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 4f0a0fc..37942ad 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -495,6 +495,17 @@ set_config_with_override() {
 	eval ${CfgVar}=\"${Result}\"
 }
 
+rootfs_type_is() {
+	local fstype=$1
+
+	if $(df -t ${fstype} / 2>/dev/null 1>/dev/null)
+	then
+		echo yes
+	else
+		echo no
+	fi
+}
+
 check_distfiles() {
 	for i in $BUSYBOX_SRCTAR $MULTIPATH_SRCTAR $LVM_SRCTAR $DMRAID_SRCTAR $ISCSI_SRCTAR $GPG_SRCTAR
 	do

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

[Richard Yao]

commit:     3892338864a5afa3b720569cb3ab1bb2f9ab44bf
Author:     Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Tue Mar  4 07:21:03 2014 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Mar 16 00:25:24 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=38923388

Fix endless loop in gen_funcs.sh when LOGLEVEL is empty

When LOGLEVEL is unset or empty then genkernel loops endlessly in
gen_funcs.sh.
The solution is to set a proper default loglevel in $USRBIN/genkernel.

Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 genkernel | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/genkernel b/genkernel
index ff319f2..e555791 100755
--- a/genkernel
+++ b/genkernel
@@ -36,6 +36,9 @@ done
 _GENKERNEL_CONF=${CMD_GK_CONFIG:-/etc/genkernel.conf}
 source "${_GENKERNEL_CONF}" || small_die "Could not read ${_GENKERNEL_CONF}"
 
+# set default LOGLEVEL if uninitialized
+LOGLEVEL=${LOGLEVEL:-1}
+
 # Start sourcing other scripts
 source ${GK_SHARE}/defaults/software.sh || small_die "Could not read ${GK_SHARE}/defaults/software.sh"
 source ${GK_SHARE}/gen_funcs.sh || small_die "Could not read ${GK_SHARE}/gen_funcs.sh"

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

[Richard Yao]

commit:     78132dd0e878e685891fe4dbfdd00ca86e57db24
Author:     Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Tue Mar  4 07:25:08 2014 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Mar 16 00:25:16 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=78132dd0

Advertise zfs support in genkernel.conf

Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 genkernel.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/genkernel.conf b/genkernel.conf
index 00657cb..09a7fcc 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -93,6 +93,9 @@ USECOLOR="yes"
 # Include support for unionfs
 #UNIONFS="1"
 
+# Include support for zfs volume management.
+#ZFS="no"
+
 # Enable copying of firmware into initramfs
 #FIRMWARE="no"
 # Specify directory to pull from

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

[Richard Yao]

commit:     2aabd3fda0352ce7c0a1db6fd4c8036aa5704abb
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 17 16:24:09 2014 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Mon Mar 17 16:24:09 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=2aabd3fd

Bump version to 3.4.49

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 e555791..b62c3f7 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.48'
+GK_V='3.4.49'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.

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

[Robin H. Johnson]

commit:     30df162b8c6c1bbbf6f74e62c819f2324a69962e
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 17 19:50:50 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 17 19:50:50 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=30df162b

Remind users that the manpage documents the initramfs parameters.

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

---
 gen_cmdline.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 5503bb5..715ad49 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -161,6 +161,9 @@ longusage() {
   echo "				Compress or do not compress the generated initramfs"
   echo "	--compress-initramfs-type=<arg>"
   echo "				Compression type for initramfs (best, xz, lzma, bzip2, gzip, lzop)"
+  echo
+  echo "For a detailed list of supported initramfs options and flags; issue:"
+  echo "	man 8 genkernel"
 }
 
 usage() {
@@ -175,8 +178,10 @@ usage() {
   echo '	--no-mrproper		Do not run make mrproper before compilation,'
   echo '				this is implied by --no-clean.'
   echo
-  echo 'For a detailed list of supported options and flags; issue:'
+  echo 'For a detailed list of supported commandline options and flags; issue:'
   echo '	genkernel --help'
+  echo 'For a detailed list of supported initramfs options and flags; issue:'
+  echo '	man 8 genkernel'
 }
 
 parse_optbool() {

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

[Robin H. Johnson]

commit:     b845016361b81ec43a4d84a77077ba9390c23a0e
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  6 01:35:01 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Apr  6 01:35:01 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b8450163

Fix install with kernel outputdir.

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

---
 gen_compile.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gen_compile.sh b/gen_compile.sh
index aab2716..f10aa04 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -342,6 +342,9 @@ compile_kernel() {
 	then
 		gen_die "Cannot locate kernel binary"
 	fi
+	# if source != outputdir, we need this:
+	tmp_kernel_binary="${KERNEL_OUTPUTDIR}"/"${tmp_kernel_binary}"
+	tmp_kernel_binary2="${KERNEL_OUTPUTDIR}"/"${tmp_kernel_binary2}"
 
 	if isTrue "${CMD_INSTALL}"
 	then

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

[Robin H. Johnson]

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

Fix System.map location for src!=output dir.

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

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

diff --git a/gen_compile.sh b/gen_compile.sh
index f10aa04..a90977f 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -345,6 +345,7 @@ compile_kernel() {
 	# if source != outputdir, we need this:
 	tmp_kernel_binary="${KERNEL_OUTPUTDIR}"/"${tmp_kernel_binary}"
 	tmp_kernel_binary2="${KERNEL_OUTPUTDIR}"/"${tmp_kernel_binary2}"
+	systemmap="${KERNEL_OUTPUTDIR}"/System.map
 
 	if isTrue "${CMD_INSTALL}"
 	then
@@ -353,7 +354,7 @@ compile_kernel() {
 			"kernel-${KNAME}-${ARCH}-${KV}"
 
 		copy_image_with_preserve "System.map" \
-			"System.map" \
+			"${systemmap}" \
 			"System.map-${KNAME}-${ARCH}-${KV}"
 
 		if isTrue "${GENZIMAGE}"
@@ -365,7 +366,7 @@ compile_kernel() {
 	else
 		cp "${tmp_kernel_binary}" "${TMPDIR}/kernel-${KNAME}-${ARCH}-${KV}" ||
 			gen_die "Could not copy the kernel binary to ${TMPDIR}!"
-		cp "System.map" "${TMPDIR}/System.map-${KNAME}-${ARCH}-${KV}" ||
+		cp "${systemmap}" "${TMPDIR}/System.map-${KNAME}-${ARCH}-${KV}" ||
 			gen_die "Could not copy System.map to ${TMPDIR}!"
 		if isTrue "${GENZIMAGE}"
 		then

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

[Robin H. Johnson]

commit:     c93c617ee0f4ed3b7559208339eecfac4a49c8ec
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:59:31 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=c93c617e

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

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

[Robin H. Johnson]

commit:     6d610cf9afd929e4c973780e1d37746ebf3d15ff
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 14 00:55:25 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 14 00:59:30 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=6d610cf9

LVM install fixes.

Clean up LVM install to work with non-root and handle errors.

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

---
 gen_compile.sh   | 7 +++++--
 gen_initramfs.sh | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index a90977f..9b5df01 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -468,8 +468,11 @@ compile_lvm() {
 				>> ${LOGFILE} 2>&1 || \
 				gen_die 'Configure of lvm failed!'
 		print_info 1 'lvm: >> Compiling...'
-		compile_generic '' utils
-		compile_generic "install DESTDIR=${TEMP}/lvm/" utils
+		compile_generic '' utils || gen_die "failed to build LVM"
+		mkdir -p "${TEMP}/lvm/sbin"
+		compile_generic "install DESTDIR=${TEMP}/lvm/" utils || gen_die "failed to install LVM"
+		# Upstream does u-w on files, and this breaks stuff.
+		chmod -R u+w "${TEMP}/lvm/"
 
 		cd "${TEMP}/lvm"
 		print_info 1 '      >> Copying to bincache...'

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 26bcdf6..5ac9ac1 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -349,7 +349,7 @@ append_lvm(){
 		fi
 	else
 		print_info 1 '          LVM: Adding support (compiling binaries)...'
-		compile_lvm
+		compile_lvm || gen_die "Could not compile LVM"
 		/bin/tar -jxpf "${LVM_BINCACHE}" -C "${TEMP}/initramfs-lvm-temp" ||
 			gen_die "Could not extract lvm binary cache!";
 		mv ${TEMP}/initramfs-lvm-temp/sbin/lvm.static ${TEMP}/initramfs-lvm-temp/bin/lvm ||

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

[Robin H. Johnson]

commit:     deef895b91b8632033a1d1cd151c947f8b73a78a
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: Mon Apr 14 00:59:30 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=deef895b

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:master commit in: /

[Robin H. Johnson]

commit:     6a758d4933d36f0b6b3257b3985bf3670c1a2a56
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: Mon Apr 14 00:59:31 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=6a758d49

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:master commit in: /

[Robin H. Johnson]

commit:     209ceb7d07d9cb039ea2b3d52309a9bd6743e80a
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: Mon Apr 14 00:59:30 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=209ceb7d

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:master commit in: /

[Robin H. Johnson]

commit:     61b063151902ac9cea4362d21a797282b68c428e
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 14 01:30:46 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 14 01:33:09 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=61b06315

Bump version to 3.4.49.1

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

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

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

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

[Robin H. Johnson]

commit:     be1d4c66a79701f400a7bbbea588582164b0f5ca
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 16 08:32:11 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 16 08:32:20 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=be1d4c66

Improve debugcleanup code

- Improve the debug-cleanup code to use isTrue and match other code
  style.
- add explicit return 0 after debug-cleanup to avoid passing a false
  negative failure code up to a higher level function.

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

---
 gen_compile.sh | 30 +++++++++++++++++++-----------
 genkernel      | 12 ++++++------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 9b5df01..0fb33d5 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -430,7 +430,7 @@ compile_busybox() {
 		yes '' 2>/dev/null | compile_generic oldconfig utils
 
 		print_info 1 'busybox: >> Compiling...'
-		compile_generic all utils
+		compile_generic all utils V=1
 		print_info 1 'busybox: >> Copying to cache...'
 		[ -f "${TEMP}/${BUSYBOX_DIR}/busybox" ] ||
 			gen_die 'Busybox executable does not exist!'
@@ -440,7 +440,8 @@ compile_busybox() {
 			gen_die 'Could not create the busybox bincache!'
 
 		cd "${TEMP}"
-		rm -rf "${BUSYBOX_DIR}" > /dev/null
+		isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${BUSYBOX_DIR}" > /dev/null
+		return 0
 	fi
 }
 
@@ -485,8 +486,9 @@ compile_lvm() {
 			gen_die 'Could not create binary cache'
 
 		cd "${TEMP}"
-		rm -rf "${TEMP}/lvm" > /dev/null
-		rm -rf "${LVM_DIR}" lvm
+		isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${TEMP}/lvm" > /dev/null
+		isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${LVM_DIR}" lvm
+		return 0
 	fi
 }
 
@@ -525,7 +527,8 @@ compile_mdadm() {
 			gen_die 'Could not create binary cache'
 
 		cd "${TEMP}"
-		rm -rf "${MDADM_DIR}" mdadm
+		isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${MDADM_DIR}" mdadm
+		return 0
 	fi
 }
 
@@ -574,8 +577,9 @@ compile_dmraid() {
 			gen_die 'Could not create binary cache'
 
 		cd "${TEMP}"
-		rm -rf "${TEMP}/lvm" > /dev/null
-		rm -rf "${DMRAID_DIR}" dmraid
+		isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${TEMP}/lvm" > /dev/null
+		isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${DMRAID_DIR}" dmraid
+		return 0
 	fi
 }
 
@@ -612,7 +616,8 @@ compile_fuse() {
 #			gen_die 'Could not create fuse bincache!'
 
 		cd "${TEMP}"
-#		rm -rf "${FUSE_DIR}" > /dev/null
+#		isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${FUSE_DIR}" > /dev/null
+		return 0
 	fi
 }
 
@@ -647,7 +652,8 @@ compile_unionfs_fuse() {
 			gen_die 'Could not copy the unionfs binary to the package directory, does the directory exist?'
 
 		cd "${TEMP}"
-		rm -rf "${UNIONFS_FUSE_DIR}" > /dev/null
+		isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${UNIONFS_FUSE_DIR}" > /dev/null
+		return 0
 	fi
 }
 
@@ -697,7 +703,8 @@ compile_iscsi() {
 			gen_die 'Could not copy the iscsistart binary to the package directory, does the directory exist?'
 
 		cd "${TEMP}"
-		rm -rf "${ISCSI_DIR}" > /dev/null
+		isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${ISCSI_DIR}" > /dev/null
+		return 0
 	fi
 }
 
@@ -742,6 +749,7 @@ compile_gpg() {
 			gen_die 'Could not copy the gpg binary to the package directory, does the directory exist?'
 
 		cd "${TEMP}"
-		rm -rf "${GPG_DIR}" > /dev/null
+		isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${GPG_DIR}" > /dev/null
+		return 0
 	fi
 }

diff --git a/genkernel b/genkernel
index ed7f3ad..1d2a372 100755
--- a/genkernel
+++ b/genkernel
@@ -61,12 +61,7 @@ trap_cleanup(){
 }
 
 cleanup(){
-	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 isTrue "${CMD_DEBUGCLEANUP}"; then
 		if [ -n "$TEMP" -a -d "$TEMP" ]; then
 			rm -rf "$TEMP"
 		fi
@@ -82,6 +77,11 @@ cleanup(){
 			print_info 1 "TMPDIR: ${TMPDIR}"
 			clear_tmpdir
 		fi
+	else
+		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}"
 	fi
 }
 

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

[Robin H. Johnson]

commit:     0a508d2c948ee6d94603c9b96a712ce187cd36f5
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat May 31 19:56:46 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat May 31 19:56:46 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=0a508d2c

Bump version to 3.4.49.2

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

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

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

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

[Robin H. Johnson]

commit:     76e801c8db8487c2ada3af906327c6466c8108d2
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 22 02:08:34 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jun 22 02:08:34 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=76e801c8

Make gen_minkernpackage use the same kernel naming as the normal path (kerncache).

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

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

diff --git a/gen_package.sh b/gen_package.sh
index 520d771..fa155b9 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -21,11 +21,11 @@ gen_minkernpackage() {
 			gen_die "Cannot locate kernel binary"
 		fi
 		cd "${KERNEL_OUTPUTDIR}"
-		cp "${tmp_kernel_binary}" "${TEMP}/minkernpackage/kernel-${KV}" || gen_die 'Could not the copy kernel for the min kernel package!'
+		cp "${tmp_kernel_binary}" "${TEMP}/minkernpackage/kernel-${ARCH}-${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}"
 		then
-			cp "${tmp_kernel_binary2}" "${TEMP}/minkernpackage/kernelz-${KV}" || gen_die "Could not copy the kernelz for the min kernel package"
+			cp "${tmp_kernel_binary2}" "${TEMP}/minkernpackage/kernelz-${ARCH}-${KV}" || gen_die "Could not copy the kernelz for the min kernel package"
 		fi
 	fi
 

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

[Jorge Manuel B. S. Vicetto]

commit:     9213296399a6eaca67185ca65e309e1e6b6518f3
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 22 02:08:37 2014 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Jun 22 02:08:37 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=92132963

Whitepace.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>

---
 gen_cmdline.sh       |  2 +-
 gen_configkernel.sh  | 20 ++++++++++----------
 gen_determineargs.sh |  2 +-
 gen_initramfs.sh     |  4 ++--
 gen_package.sh       |  2 +-
 genkernel            | 12 ++++++------
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 7bee618..ca6cbcf 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -77,7 +77,7 @@ longusage() {
   echo "				autodetect."
   echo "	--makeopts=<makeopts>	Make options such as -j2, etc..."
   echo "	--mountboot		Mount BOOTDIR automatically if mountable"
-  echo "	--no-mountboot		Don't mount BOOTDIR automatically"  
+  echo "	--no-mountboot		Don't mount BOOTDIR automatically"
   echo "	--bootdir=<dir>		Set the location of the boot-directory, default is /boot"
   echo "	--modprobedir=<dir>	Set the location of the modprobe.d-directory, default is /etc/modprobe.d"
   echo "  Initialization"

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index a69c713..b935de8 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -118,12 +118,12 @@ config_kernel() {
 	fi
 
 	# Multipath
-	if isTrue ${CMD_MULTIPATH} 
-	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_MULTIPATH is.*/CONFIG_DM_MULTIPATH=m/g' 
-		sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_MULTIPATH_RDAC is.*/CONFIG_DM_MULTIPATH_RDAC=m/g' 
-	fi 
+	if isTrue ${CMD_MULTIPATH}
+	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_MULTIPATH is.*/CONFIG_DM_MULTIPATH=m/g'
+		sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_MULTIPATH_RDAC is.*/CONFIG_DM_MULTIPATH_RDAC=m/g'
+	fi
 
 	# Make sure dmraid modules are on if --dmraid
 	if isTrue ${CMD_DMRAID}
@@ -147,10 +147,10 @@ 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 
+	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'
@@ -159,5 +159,5 @@ config_kernel() {
 		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 
+	fi
 }

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 615f274..dc6b2c4 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -4,7 +4,7 @@
 get_KV() {
 	if [ "${KERNEL_SOURCES}" = '0' -a -e "${KERNCACHE}" ]
 	then
-		/bin/tar -xj -C ${TEMP} -f ${KERNCACHE} kerncache.config 
+		/bin/tar -xj -C ${TEMP} -f ${KERNCACHE} kerncache.config
 		if [ -e ${TEMP}/kerncache.config ]
 		then
 			VER=`grep ^VERSION\ \= ${TEMP}/kerncache.config | awk '{ print $3 };'`

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index d5ee5f6..90a6547 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -15,7 +15,7 @@ CPIO_ARGS="--quiet -o -H newc --owner root:root --force-local"
 #                  CC0 are compatible with the GNU GPL."
 #                 (from https://www.gnu.org/licenses/license-list.html#CC0)
 #
-# Written by: 
+# Written by:
 # - Sebastian Pipping <sebastian@pipping.org> (error checking)
 # - Robin H. Johnson <robbat2@gentoo.org> (complete rewrite)
 # - Richard Yao <ryao@cs.stonybrook.edu> (original concept)
@@ -942,7 +942,7 @@ create_initramfs() {
 				gzip) compress_ext='.gz' compress_cmd="${cmd_gzip} -f -9" ;;
 				lzop) compress_ext='.lzo' compress_cmd="${cmd_lzop} -f -9" ;;
 			esac
-	
+
 			if [ -n "${compression}" ]; then
 				print_info 1 "        >> Compressing cpio data (${compress_ext})..."
 				${compress_cmd} "${CPIO}" || gen_die "Compression (${compress_cmd}) failed"

diff --git a/gen_package.sh b/gen_package.sh
index fa155b9..95cc469 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -55,7 +55,7 @@ gen_modulespackage() {
 	then
 	    mkdir -p ${TEMP}/modulespackage/lib/modules
 	    cp -r "${INSTALL_MOD_PATH}/lib/modules/${KV}" "${TEMP}/modulespackage/lib/modules"
-	    cd "${TEMP}/modulespackage" 
+	    cd "${TEMP}/modulespackage"
 	    /bin/tar -jcpf ${MODULESPACKAGE} * || gen_die 'Could not compress the modules package!'
 	else
 	    print_info 1 "Could not create a modules package ${INSTALL_MOD_PATH}/lib/modules/${KV} was not found"

diff --git a/genkernel b/genkernel
index e6c7520..d1f6d4f 100755
--- a/genkernel
+++ b/genkernel
@@ -156,7 +156,7 @@ then
 	isTrue ${MOUNTBOOT} && print_info 2 'Skipping automatic mount of boot'
 else
 	[[ -d ${BOOTDIR} ]] || gen_die "${BOOTDIR} is not a directory"
-	
+
 	if ! egrep -q "[[:space:]]${BOOTDIR}[[:space:]]" /proc/mounts
 	then
 		if egrep -q "^[^#].+[[:space:]]${BOOTDIR}[[:space:]]" /etc/fstab
@@ -215,7 +215,7 @@ fi
 #fi
 
 KERNCACHE_IS_VALID=0
-if [ "${KERNCACHE}" != "" ] 
+if [ "${KERNCACHE}" != "" ]
 then
     gen_kerncache_is_valid
 fi
@@ -224,13 +224,13 @@ if [ ${BUILD_KERNEL} = '1' -a "${KERNCACHE_IS_VALID}" = '0' ]
 then
 	# Configure kernel
 	config_kernel
-	
+
 	# Make prepare
 	if [ "${ARCH_HAVENOPREPARE}" = '' ]
 	then
 		compile_generic prepare kernel
 	fi
-	
+
 	# KV may have changed due to the configuration
 	get_KV
 
@@ -254,13 +254,13 @@ fi
 
 if isTrue "${CMD_INSTALL}"
 then
-	if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ] 
+	if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ]
 	then
 		gen_kerncache_extract_kernel
 	fi
 fi
 
-if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ] 
+if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ]
 then
 	[ "${BUILD_STATIC}" = '0' ] && gen_kerncache_extract_modules
 	gen_kerncache_extract_config

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

[Robin H. Johnson]

commit:     ba88b2e852c94222437dc9567d15942210ef5b6f
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 23 21:58:31 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 23 22:05:18 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=ba88b2e8

gen_package: packaged kernel/initramfs name fixes

Previous commit 76e801c8 did not actually go far enough.

The existing install from kerncache code that is normally used with
passing --install used a form of kernel-${KNAME}-${ARCH}-${KV}.

Instead of just the kernel-${ARCH}-${KV} we were using in commit
76e801c8, or kernel-${KV} that we used before that, let's use the same
naming per the regular path.

Also add safety checks that the kernels exist, as you could get an empty
tarball otherwise!

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

---
 gen_package.sh | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/gen_package.sh b/gen_package.sh
index 1a9068a..9dd166b 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -8,10 +8,18 @@ gen_minkernpackage() {
 	if [ "${KERNCACHE}" != "" ]
 	then
 		/bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} kernel-${ARCH}-${KV}
+		mv minkernpackage/{kernel-${ARCH}-${KV},kernel-${KNAME}-${ARCH}-${KV}}
 		/bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} config-${ARCH}-${KV}
+		mv minkernpackage/{config-${ARCH}-${KV},config-${KNAME}-${ARCH}-${KV}}
 		if isTrue "${GENZIMAGE}"
 		then
 			/bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} kernelz-${ARCH}-${KV}
+			mv minkernpackage/{kernelz-${ARCH}-${KV},kernelz-${KNAME}-${ARCH}-${KV}}
+		fi
+		if [ ! -f minkernpackage/kernel-${KNAME}-${ARCH}-${KV} \
+		  -o ! -f minkernpackage/config-${KNAME}-${ARCH}-${KV} ];
+		then
+			gen_die "Cannot locate kernel binary"
 		fi
 	else
 		local tmp_kernel_binary=$(find_kernel_binary ${KERNEL_BINARY})
@@ -21,24 +29,29 @@ gen_minkernpackage() {
 			gen_die "Cannot locate kernel binary"
 		fi
 		cd "${KERNEL_OUTPUTDIR}"
-		cp "${tmp_kernel_binary}" "${TEMP}/minkernpackage/kernel-${ARCH}-${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!'
+		cp "${tmp_kernel_binary}" "${TEMP}/minkernpackage/kernel-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not the copy kernel for the min kernel package!'
+		cp ".config" "${TEMP}/minkernpackage/config-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not the copy kernel config for the min kernel package!'
 		if isTrue "${GENZIMAGE}"
 		then
-			cp "${tmp_kernel_binary2}" "${TEMP}/minkernpackage/kernelz-${ARCH}-${KV}" || gen_die "Could not copy the kernelz for the min kernel package"
+			cp "${tmp_kernel_binary2}" "${TEMP}/minkernpackage/kernelz-${KNAME}-${ARCH}-${KV}" || gen_die "Could not copy the kernelz for the min kernel package"
 		fi
 	fi
 
 	if ! isTrue "${INTEGRATED_INITRAMFS}"
 	then
-		[ "${BUILD_RAMDISK}" != '0' ] && { cp "${TMPDIR}/initramfs-${KV}" "${TEMP}/minkernpackage/initramfs-${ARCH}-${KV}" || gen_die 'Could not copy the initramfs for the kernel package!'; }
+		[ "${BUILD_RAMDISK}" != '0' ] && { cp "${TMPDIR}/initramfs-${KV}" "${TEMP}/minkernpackage/initramfs-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not copy the initramfs for the kernel package!'; }
 	fi
 
 	if [ "${KERNCACHE}" != "" ]
 	then
 		/bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} System.map-${ARCH}-${KV}
+		mv minkernpackage/{System.map-${ARCH}-${KV},System.map-${KNAME}-${ARCH}-${KV}}
+		if [ ! -f System.map-${KNAME}-${ARCH}-${KV} ]
+		then
+			gen_die 'Could not copy System.map from kerncache for the kernel package!'
+		fi
 	else
-		cp "${KERNEL_OUTPUTDIR}/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-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not copy System.map for the kernel package!';
 	fi
 
 	cd "${TEMP}/minkernpackage"

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

[Robin H. Johnson]

commit:     11fe5382cf4628be7a8b52123c4aeea09b463080
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 23 19:02:44 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 23 22:05:18 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=11fe5382

gen_package: Log where the kern/mod/cache files go

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

---
 gen_package.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gen_package.sh b/gen_package.sh
index 95cc469..4780b6c 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -43,6 +43,7 @@ gen_minkernpackage() {
 
 	cd "${TEMP}/minkernpackage"
 	/bin/tar -jcpf ${MINKERNPACKAGE} * || gen_die 'Could not compress the kernel package!'
+	print_info 3 "Created minimal kernel package: ${MINKERNPACKAGE}"
 	cd "${TEMP}" && rm -rf "${TEMP}/minkernpackage" > /dev/null 2>&1
 }
 
@@ -60,6 +61,7 @@ gen_modulespackage() {
 	else
 	    print_info 1 "Could not create a modules package ${INSTALL_MOD_PATH}/lib/modules/${KV} was not found"
 	fi
+	print_info 3 "Created modules package: ${MODULESPACKAGE}"
 	cd "${TEMP}" && rm -rf "${TEMP}/modulespackage" > /dev/null 2>&1
 }
 gen_kerncache()
@@ -105,6 +107,7 @@ gen_kerncache()
 
 	cd "${TEMP}/kerncache"
 	/bin/tar -jcpf ${KERNCACHE} * || gen_die 'Could not compress the kernel package!'
+	print_info 3 "Created kernel cache: ${KERNCACHE}"
 	cd "${TEMP}" && rm -rf "${TEMP}/kerncache" > /dev/null 2>&1
 }
 

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

[Robin H. Johnson]

commit:     96dc776787d23238a4e8dfedc4514911a3d84c37
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 23 21:56:17 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 23 22:05:18 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=96dc7767

gen_cmdline: fix pkg path getting stuff deleted

If you pass --minkernpackage=X, --modulespackage=X or --kerncache=X with
a relative path, then it's creates the output file in a temporary
working dir that is later removed during cleanup.

Resolve the paths during argument parsing to prevent this.

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

---
 gen_cmdline.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index ca6cbcf..6ef6ae0 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -501,14 +501,17 @@ parse_cmdline() {
 			;;
 		--minkernpackage=*)
 			CMD_MINKERNPACKAGE=`parse_opt "$*"`
+			[ ${CMD_MINKERNPACKAGE:0:1} != / ] && CMD_MINKERNPACKAGE=$PWD/$CMD_MINKERNPACKAGE
 			print_info 2 "MINKERNPACKAGE: ${CMD_MINKERNPACKAGE}"
 			;;
 		--modulespackage=*)
 			CMD_MODULESPACKAGE=`parse_opt "$*"`
+			[ ${CMD_MODULESPACKAGE:0:1} != / ] && CMD_MODULESPACKAGE=$PWD/$CMD_MODULESPACKAGE
 			print_info 2 "MODULESPACKAGE: ${CMD_MODULESPACKAGE}"
 			;;
 		--kerncache=*)
 			CMD_KERNCACHE=`parse_opt "$*"`
+			[ ${CMD_KERNCACHE:0:1} != / ] && CMD_KERNCACHE=$PWD/$CMD_KERNCACHE
 			print_info 2 "KERNCACHE: ${CMD_KERNCACHE}"
 			;;
 		--kernname=*)

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

[Robin H. Johnson]

commit:     d4ad031a3a7ecaa0248f2bce19bfdd2ae0247eee
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 23 21:20:04 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 23 22:05:18 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=d4ad031a

gen_package: print full paths to pkgs/cache output

The files are not created in the PWD when genkernel run without
specifying absolute paths for those arguments and I need to debug where
they are actually going.

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

---
 gen_package.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gen_package.sh b/gen_package.sh
index 4780b6c..1a9068a 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -43,7 +43,7 @@ gen_minkernpackage() {
 
 	cd "${TEMP}/minkernpackage"
 	/bin/tar -jcpf ${MINKERNPACKAGE} * || gen_die 'Could not compress the kernel package!'
-	print_info 3 "Created minimal kernel package: ${MINKERNPACKAGE}"
+	print_info 3 "Created minimal kernel package: $(readlink -f ${MINKERNPACKAGE})"
 	cd "${TEMP}" && rm -rf "${TEMP}/minkernpackage" > /dev/null 2>&1
 }
 
@@ -61,7 +61,7 @@ gen_modulespackage() {
 	else
 	    print_info 1 "Could not create a modules package ${INSTALL_MOD_PATH}/lib/modules/${KV} was not found"
 	fi
-	print_info 3 "Created modules package: ${MODULESPACKAGE}"
+	print_info 3 "Created modules package: $(readlink -f ${MODULESPACKAGE})"
 	cd "${TEMP}" && rm -rf "${TEMP}/modulespackage" > /dev/null 2>&1
 }
 gen_kerncache()
@@ -107,7 +107,7 @@ gen_kerncache()
 
 	cd "${TEMP}/kerncache"
 	/bin/tar -jcpf ${KERNCACHE} * || gen_die 'Could not compress the kernel package!'
-	print_info 3 "Created kernel cache: ${KERNCACHE}"
+	print_info 3 "Created kernel cache: $(readlink -f ${KERNCACHE})"
 	cd "${TEMP}" && rm -rf "${TEMP}/kerncache" > /dev/null 2>&1
 }
 

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

[Robin H. Johnson]

commit:     7a1a9d509e38219824676660f41cb4f097c470c4
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 23 16:36:02 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 23 22:05:18 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=7a1a9d50

genkernel.conf: DISTDIR in /var/cache bad

Move DISTDIR to /usr/share/genkernel/distfiles: /var/cache might be on
tmpfs and wiped each boot.

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

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

diff --git a/genkernel.conf b/genkernel.conf
index 09a7fcc..ad5750e 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -191,7 +191,7 @@ GK_SHARE="${GK_SHARE:-/usr/share/genkernel}"
 # Location of the default cache
 CACHE_DIR="/var/cache/genkernel"
 # Location of DISTDIR, where our source tarballs are stored
-DISTDIR="${CACHE_DIR}/src"
+DISTDIR="${GK_SHARE}/distfiles"
 # Log output file
 LOGFILE="/var/log/genkernel.log"
 # Debug Level

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

[Robin H. Johnson]

commit:     2acd1657b490b14a9c1af0215da0ad07dbdf23c0
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 23 21:18:25 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 23 22:05:18 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=2acd1657

genkernel: Bump version.

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

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

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

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

[Robin H. Johnson]

commit:     6395682f9978a5d8e49a65123c0dd6604cfb0073
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 15 07:26:49 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 15 07:26:54 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=6395682f

Bug #468760: mpath_prio_* tools needed sometimes. Patch by Ian Stakenvicius <axs <AT> gentoo.org>.

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

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 90a6547..b9ff518 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -257,6 +257,13 @@ append_multipath(){
 		/sbin/{multipath,kpartx,mpath_prio_*,devmap_name,dmsetup} \
 		/{lib,lib64}/{udev/scsi_id,multipath/*so} 
 
+	# Support multipath-tools-0.4.8 and previous
+	if [ -x /sbin/mpath_prio_* ]
+	then
+		copy_binaries "${TEMP}/initramfs-multipath-temp" \
+			/sbin/mpath_prio_*
+	fi
+
 	if [ -x /sbin/multipath ]
 	then
 		cp /etc/multipath.conf "${TEMP}/initramfs-multipath-temp/etc/" || gen_die 'could not copy /etc/multipath.conf please check this'

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

[Robin H. Johnson]

commit:     9dc4ca55fc56c42e0ff2a5f4f98bf7fc4797e07f
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 15 07:27:54 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 15 07:27:54 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=9dc4ca55

Bump version to 3.4.51

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

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

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

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

[Richard Yao]

commit:     00b82d63f72c5999e172117a25dce8424e306f3e
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 29 21:42:10 2014 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Mon Aug 11 23:09:59 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=00b82d63

Remove mpath_prio_* and devmap_name from cp command, bug #468760

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 b9ff518..5ddc476 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -254,7 +254,7 @@ append_multipath(){
 	# Copy files
 	copy_binaries "${TEMP}/initramfs-multipath-temp" \
 		/bin/mountpoint \
-		/sbin/{multipath,kpartx,mpath_prio_*,devmap_name,dmsetup} \
+		/sbin/{multipath,kpartx,dmsetup} \
 		/{lib,lib64}/{udev/scsi_id,multipath/*so} 
 
 	# Support multipath-tools-0.4.8 and previous

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

[Richard Yao]

commit:     09b062e6e39d61d3290a7080b0935e52be84bbdc
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 12 15:02:22 2014 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Tue Aug 12 15:02:22 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=09b062e6

Bump version to 3.4.51.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 1042ae6..6304536 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.51'
+GK_V='3.4.51.1'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.

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

[Richard Yao]

commit:     3c70c2093cbb764eada56a5c4e8cfbb29210e18e
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 17 20:20:39 2014 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Aug 17 20:20:39 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=3c70c209

Bump version to 3.4.51.2

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 6304536..1fe1b31 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.51.1'
+GK_V='3.4.51.2'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.

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

[Christoph Junghans]

commit:     cb67b99d67b6948ee33b2f1c2f4fda75522fb728
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 17 19:34:55 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sat Jan 17 19:34:55 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=cb67b99d

compile_generic: fixed print_info for kernel targets

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

diff --git a/gen_compile.sh b/gen_compile.sh
index 0fb33d5..04ed8d6 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -278,7 +278,7 @@ compile_generic() {
 		RET=${PIPESTATUS[0]}
 	else
 		# Output to logfile only
-		print_info 2 "COMMAND: ${MAKE} ${MAKEOPTS} ${ARGS} ${1} $*" 1 0 1
+		print_info 2 "COMMAND: ${MAKE} ${MAKEOPTS} ${ARGS} ${target} $*" 1 0 1
 		eval ${MAKE} ${MAKEOPTS} ${ARGS} ${target} $* >> ${LOGFILE} 2>&1
 		RET=$?
 	fi

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

[Christoph Junghans]

commit:     52238bfbddba7d043690d2a32296e88e78ed541f
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 17 21:59:03 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sun Jan 18 01:22:08 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=52238bfb

Advertise KERNEL_{MAKE_DIRECTIVE,BINARY}_OVERRIDE in genkernel.conf

Signed-off-by: Christoph Junghans <ottxor <AT> gentoo.org>

---
 genkernel.conf | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/genkernel.conf b/genkernel.conf
index ad5750e..0c3955c 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -173,6 +173,13 @@ DISKLABEL="yes"
 # during kernel compilation
 #KERNEL_CROSS_COMPILE="x86_64-pc-linux-gnu"
 
+# Override default make target (bzImage). See also the --kernel-target
+# command line option. Useful to build a uImage on arm
+#KERNEL_MAKE_DIRECTIVE_OVERRIDE="fooImage"
+
+# Override default kernel binary path. See also the --kernel-binary
+# command line option. Useful to install a uImage on arm
+#KERNEL_BINARY_OVERRIDE="arch/foo/boot/bar"
 
 # =========GENKERNEL LOCATION CONFIGURATION============
 # Variables:

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

[Christoph Junghans]

commit:     115084cfb2ec3a78b75aa4e08b93802a87fde19c
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 20 00:01:19 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Jan 20 00:01:19 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=115084cf

genkernel.conf: added another CMD_CALLBACK example

Signed-off-by: Christoph Junghans <ottxor <AT> gentoo.org>

---
 genkernel.conf | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/genkernel.conf b/genkernel.conf
index 7f42b05..ba656f9 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -118,8 +118,9 @@ DISKLABEL="yes"
 #SPLASH_THEME="gentoo"
 
 # Run the specified command in the current environment after the kernel and
-# modules have been compiled, useful to rebuild external kernel module.
-# use "emerge --quiet @module-rebuild" for >=portage-2.2
+# modules have been compiled, useful to rebuild external kernel module
+# (use "emerge --quiet @module-rebuild" for >=portage-2.2) or installing additional
+# files (use 'copy_image_with_preserve dtb path/to/dtb dtb ${KNAME}-${ARCH}-${KV}')
 #CMD_CALLBACK=""
 
 # =========Keymap Settings=========

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

[Richard Farina]

commit:     847f7060bd05b172a191faf2cdc446605f75abcb
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 30 15:08:19 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Jul 30 15:08:19 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=847f7060

switch to xz because why not

-rw-r--r-- 1 zero zero 280K Jul 30 10:55 genkernel-3.4.51.tar.bz2
-rw-r--r-- 1 zero zero 245K Jul 30 10:52 genkernel-3.4.51.tar.xz

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

diff --git a/Makefile b/Makefile
index 8e31a06..76c9492 100644
--- a/Makefile
+++ b/Makefile
@@ -19,12 +19,12 @@ check-git-repository:
 	git diff --cached --quiet || { echo 'STOP, you have uncommitted changes in the index' ; false ; }
 
 dist: check-git-repository $(EXTRA_DIST)
-	rm -Rf "$(distdir)" "$(distdir)".tar "$(distdir)".tar.bz2
+	rm -Rf "$(distdir)" "$(distdir)".tar "$(distdir)".tar.xz
 	mkdir "$(distdir)"
 	git ls-files -z | xargs -0 cp --no-dereference --parents --target-directory="$(distdir)" \
 		$(EXTRA_DIST)
 	tar cf "$(distdir)".tar "$(distdir)"
-	bzip2 -9v "$(distdir)".tar
+	xz -v "$(distdir)".tar
 	rm -Rf "$(distdir)"
 
 .PHONY: clean check-git-repository dist

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

[Richard Farina]

commit:     536025e5ccbbf2fa9101737de30324597f58fbe5
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 30 15:10:47 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Jul 30 15:10:47 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=536025e5

3.4.51.3 so we can close some usb3 bugs

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

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

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

[Richard Yao]

commit:     c745b48e77d85d5caa458fe803ac04e295b4ff24
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 29 21:42:10 2014 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Fri Jul 31 18:04:48 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c745b48e

Remove mpath_prio_* and devmap_name from cp command, bug #468760

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 254f21a..4ec5fea 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -254,7 +254,7 @@ append_multipath(){
 	# Copy files
 	copy_binaries "${TEMP}/initramfs-multipath-temp" \
 		/bin/mountpoint \
-		/sbin/{multipath,kpartx,mpath_prio_*,devmap_name,dmsetup} \
+		/sbin/{multipath,kpartx,dmsetup} \
 		/{lib,lib64}/{udev/scsi_id,multipath/*so} 
 
 	# Support multipath-tools-0.4.8 and previous

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

[Richard Yao]

commit:     4ee008490c3896b1e0fb97f3b5cd5071e166d8dd
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 31 18:08:51 2015 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Fri Jul 31 18:08:54 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4ee00849

Bump version to 3.4.51.4

I neglected to push the 3.4.51.1 and 3.4.51.2 updates to master, which
lead 3.4.51.3 to bring us out of sync. This tag reunifies the two.

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 5ab1936..9f3ec9c 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.51.3'
+GK_V='3.4.51.4'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.

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

[Robin H. Johnson]

commit:     a79ecbd06cf71b3ac5abd2675601a0d750a9908c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 03:31:59 2015 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 03:34:57 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a79ecbd0

Support compressed modules: both XZ & GZIP.

Newer kernels support compressed modules directly.

It's not ideal for genkernel, since it would be double-compressed, but
since genkernel takes the modules the module destination directory after
modules_install, it's the quickest way to a working system again
(because the non-compressed modules aren't installed).

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

 gen_compile.sh   | 6 ++++--
 gen_initramfs.sh | 9 +++++----
 gen_moddeps.sh   | 4 ++++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 04ed8d6..97bd36e 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -683,11 +683,13 @@ compile_iscsi() {
 
 		# if kernel modules exist, copy them to initramfs, otherwise it will be compiled into the kernel
 		mkdir -p "${TEMP}/initramfs-iscsi-temp/lib/modules/${KV}/kernel/drivers/scsi/"
+		KEXT=$(modules_kext)
 		for modname in iscsi_tcp libiscsi scsi_transport_iscsi
 		do
-			if [ -e "${CMD_KERNEL_DIR}/drivers/scsi/${modname}.ko" ]
+			module=${CMD_KERNEL_DIR}/drivers/scsi/${modname}${KEXT}
+			if [ -e "${module}" ]
 			then
-				cp ${CMD_KERNEL_DIR}/drivers/scsi/${modname}.ko "${TEMP}/initramfs-iscsi-temp/lib/modules/${KV}/kernel/drivers/scsi/"
+				cp $module "${TEMP}/initramfs-iscsi-temp/lib/modules/${KV}/kernel/drivers/scsi/"
 			fi
 		done
 

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 4ec5fea..e7f72df 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -293,11 +293,12 @@ append_dmraid(){
 	/bin/tar -jxpf "${DMRAID_BINCACHE}" -C "${TEMP}/initramfs-dmraid-temp" ||
 		gen_die "Could not extract dmraid binary cache!";
 	cd "${TEMP}/initramfs-dmraid-temp/"
-	RAID456=`find . -type f -name raid456.ko`
+	module_ext=$(modules_kext)
+	RAID456=`find . -type f -name raid456${module_ext}`
 	if [ -n "${RAID456}" ]
 	then
-		cd "${RAID456/raid456.ko/}"
-		ln -sf raid456.kp raid45.ko
+		cd "${RAID456/raid456${module_ext}/}"
+		ln -sf raid456.kp $(basename ${RAID456})
 		cd "${TEMP}/initramfs-dmraid-temp/"
 	fi
 	log_future_cpio_content
@@ -614,7 +615,7 @@ print_list()
 append_modules() {
 	local group
 	local group_modules
-	local MOD_EXT=".ko"
+	local MOD_EXT="$(modules_kext)"
 
 	print_info 2 "initramfs: >> Searching for modules..."
 	if [ "${INSTALL_MOD_PATH}" != '' ]

diff --git a/gen_moddeps.sh b/gen_moddeps.sh
index 0867b56..415e095 100755
--- a/gen_moddeps.sh
+++ b/gen_moddeps.sh
@@ -4,6 +4,10 @@
 modules_kext()
 {
 	KEXT=".ko"
+	if grep -sq '^CONFIG_MODULE_COMPRESS=y' "${KERNEL_DIR}"/.config; then
+		grep -sq '^CONFIG_MODULE_COMPRESS_XZ=y' "${KERNEL_DIR}"/.config && KEXT='.ko.xz'
+		grep -sq '^CONFIG_MODULE_COMPRESS_GZIP=y' "${KERNEL_DIR}"/.config && KEXT='.ko.gz'
+	fi
 	echo ${KEXT}
 }
 

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

[Richard Farina]

commit:     e94f322eca85076f3e374f22d2e54a2a929a0199
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 01:44:12 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 01:44:12 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e94f322e

add a target for make distclean

 Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 79d3be9..dafda0e 100644
--- a/Makefile
+++ b/Makefile
@@ -24,8 +24,7 @@ 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 $(EXTRA_DIST)
-	rm -Rf "$(distdir)" "$(distdir)".tar "$(distdir)".tar.xz
+dist: check-git-repository $(EXTRA_DIST) distclean
 	mkdir "$(distdir)"
 	git ls-files -z | xargs -0 cp --no-dereference --parents --target-directory="$(distdir)" \
 		$(EXTRA_DIST)
@@ -33,4 +32,7 @@ dist: check-git-repository $(EXTRA_DIST)
 	xz -v "$(distdir)".tar
 	rm -Rf "$(distdir)"
 
-.PHONY: clean check-git-repository dist
+distclean: clean
+	rm -Rf "$(distdir)" "$(distdir)".tar "$(distdir)".tar.xz
+
+.PHONY: clean check-git-repository dist distclean

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

[Richard Farina]

commit:     3140eb99ff393e596667a5d999c6c7bea4b5229e
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 01:45:45 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 01:45:45 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3140eb99

v3.4.52

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

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

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

[Richard Farina]

commit:     07b46eab8e50791e87a27d8bc3dc1b243ffa58d9
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 01:58:19 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 01:58:19 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=07b46eab

bump to 3.4.52.1 to fix distclean commit and ensure clean tags

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

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

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

[Richard Farina]

commit:     939dde2db13c1bcc327e9e2420043ea2ed7dbe0d
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 01:57:49 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 01:57:49 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=939dde2d

ugh, fix ordering issue that couldn't be solved with quotes

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

diff --git a/Makefile b/Makefile
index dafda0e..7f79e4f 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ 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 $(EXTRA_DIST) distclean
+dist: check-git-repository distclean $(EXTRA_DIST)
 	mkdir "$(distdir)"
 	git ls-files -z | xargs -0 cp --no-dereference --parents --target-directory="$(distdir)" \
 		$(EXTRA_DIST)

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

[Richard Farina]

commit:     f798f48b333873c6b80ac949a31ef1578caee2a1
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 02:26:24 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 02:26:24 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f798f48b

bump to v3.4.52.2

minor change, addition of the pentoo verification feature for cdroot/isoroot.
this is getting a tag because it represents the final unforking of the pentoo
version of genkernel

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

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

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

[Richard Yao]

commit:     1a15b80c8f987cce08cf588f0fae4ccda5a08374
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 15 20:36:48 2015 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 22:16:21 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1a15b80c

Prefer /boot/grub/grub.cfg

Gentoo migrated to /boot/grub/grub.cfg about 18 months ago. Preferring
/boot/grub2/grub.cfg will cause us to update the wrong config file.
Continue supporting the old location should users run old versions
versions.

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 b9ec14d..90c3f9b 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -34,8 +34,8 @@ set_bootloader_grub_read_device_map() {
 set_bootloader_grub2() {
 	local GRUB_CONF
 	for candidate in \
-			"${BOOTDIR}/grub2/grub.cfg" \
 			"${BOOTDIR}/grub/grub.cfg" \
+			"${BOOTDIR}/grub2/grub.cfg" \
 			; do
 		if [[ -e "${candidate}" ]]; then
 			GRUB_CONF=${candidate}

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

[Richard Farina]

commit:     59bdd8e568cd9d084da4c8fc9590913d7e84f16e
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  1 03:24:39 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Sep  1 03:24:39 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=59bdd8e5

minor whitespace fixes

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 01305f4..8fed1eb 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -120,7 +120,7 @@ append_busybox() {
 		rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null
 	fi
 
-	mkdir -p "${TEMP}/initramfs-busybox-temp/bin/" 
+	mkdir -p "${TEMP}/initramfs-busybox-temp/bin/"
 	tar -xjf "${BUSYBOX_BINCACHE}" -C "${TEMP}/initramfs-busybox-temp/bin" busybox ||
 		gen_die 'Could not extract busybox bincache!'
 	chmod +x "${TEMP}/initramfs-busybox-temp/bin/busybox"
@@ -259,7 +259,7 @@ append_multipath(){
 	copy_binaries "${TEMP}/initramfs-multipath-temp" \
 		/bin/mountpoint \
 		/sbin/{multipath,kpartx,dmsetup} \
-		/{lib,lib64}/{udev/scsi_id,multipath/*so} 
+		/{lib,lib64}/{udev/scsi_id,multipath/*so}
 
 	# Support multipath-tools-0.4.8 and previous
 	if [ -x /sbin/mpath_prio_* ]
@@ -678,7 +678,7 @@ append_modules() {
 	find . | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 			|| gen_die "compressing modules cpio"
 	cd "${TEMP}"
-	rm -r "${TEMP}/initramfs-modules-${KV}-temp/"	
+	rm -r "${TEMP}/initramfs-modules-${KV}-temp/"
 }
 
 append_modprobed() {

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

[Richard Farina]

commit:     60d9860a74552dc3d49f8c1735f0068130251c62
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 18:07:55 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 18:27:54 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=60d9860a

Fix build issues with the dmraid module

Attempts at building an initramfs with --dmraid have started to fail very
recently. The failure itself seems to be due to changes to the current
system versions of lvm2, that have brought to light the fact that the
genkernel dmraid has been building using /usr/include/ headers instead of
headers from the genkernel lvm2.  Additionally to this, dmraid requires
libdevmapper-event, and the genkernel version of lvm2 doesn't (didn't ever?)
build this.

This commit addresses both issues, by:

1. Adding --enable-dmeventd --enable-cmdlib to the lvm configuration, so
that libdevmapper-event is available to dmraid

2. Adding a --with-devmappert-prefix= to dmraid configure so that
./configure won't try and override it or otherwise get in the way of
the hard-coded paths we add to CFLAGS.

3. Adding a DEVMAPPEREVENT_CFLAGS var as dmraid ./configure erroneously
does not set this var to anything, despite it being used later.

Received nod from Zero_Chaos for the commit.

 gen_compile.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 97bd36e..99cf37c 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -463,6 +463,7 @@ compile_lvm() {
 		print_info 1 'lvm: >> Configuring...'
 			CFLAGS="-fPIC" \
 			./configure --enable-static_link --prefix=/ \
+				--enable-dmeventd --enable-cmdlib \
 				--with-lvm1=internal --with-clvmd=none --with-cluster=none \
 				--disable-readline --disable-selinux --with-mirrors=internal \
 				--with-snapshots=internal --with-pool=internal \
@@ -555,9 +556,12 @@ compile_dmraid() {
 
 		LDFLAGS="-L${TEMP}/lvm/lib" \
 		CFLAGS="-I${TEMP}/lvm/include" \
+		DEVMAPPEREVENT_CFLAGS="-I${TEMP}/lvm/include" \
 		CPPFLAGS="-I${TEMP}/lvm/include" \
 		LIBS="-ldevmapper" \
-		./configure --enable-static_link --prefix=${TEMP}/dmraid >> ${LOGFILE} 2>&1 ||
+		./configure --enable-static_link \
+			--with-devmapper-prefix="${TEMP}/lvm" \
+			--prefix=${TEMP}/dmraid >> ${LOGFILE} 2>&1 ||
 			gen_die 'Configure of dmraid failed!'
 
 		# We dont necessarily have selinux installed yet... look into

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

[Robin H. Johnson]

commit:     ea69fddd04cc773dbf9988e14b79f51d7f928d3d
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 03:22:17 2015 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 03:22:48 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ea69fddd

Bump to v3.4.52.3.

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

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

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

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

[Robin H. Johnson]

commit:     e6fb30fdf4c31a083452639792d6d40613f6ae56
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  5 19:39:14 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 19:39:14 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e6fb30fd

lvm: ensure /etc/lvm/cache exists for extra vgscan call.

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

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 4420b0b..cf57a62 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -341,6 +341,7 @@ append_lvm(){
 	mkdir -p "${TEMP}/initramfs-lvm-temp/bin/"
 	mkdir -p "${TEMP}/initramfs-lvm-temp/sbin/"
 	mkdir -p "${TEMP}/initramfs-lvm-temp/etc/lvm/"
+	mkdir -p "${TEMP}/initramfs-lvm-temp/etc/lvm/cache"
 	if false && [ -e '/sbin/lvm.static' ]
 	then
 		print_info 1 '          LVM: Adding support (using local static binary /sbin/lvm.static)...'

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

[Robin H. Johnson]

commit:     52711b07263dfa27e660151c0221454c7ac4b3e4
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  5 23:53:30 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 23:53:30 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=52711b07

Bump.

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

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

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

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

[Robin H. Johnson]

commit:     164fcba61cc8cc4458e74f21bcfd97ef2f3aa815
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 20:33:38 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 21:05:34 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=164fcba6

Makefile: Fix kernel config building, ensure targets are always updated properly as well.

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

 Makefile | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 7f79e4f..421a071 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,24 @@
 PACKAGE_VERSION = `/bin/fgrep GK_V= genkernel | sed "s/.*GK_V='\([^']\+\)'/\1/"`
 distdir = genkernel-$(PACKAGE_VERSION)
-KCONF = $(shell ls arch/*/arch-config | sed 's/arch-/generated-/g')
-
+MANPAGE = genkernel.8
 # Add off-Git/generated files here that need to be shipped with releases
-EXTRA_DIST = genkernel.8 ChangeLog $(KCONF)
+EXTRA_DIST = $(MANPAGE) ChangeLog $(KCONF)
 
-default: $(KCONF) genkernel.8
+default: kconfig man
 
-$(KCONF):
-	perl merge.pl defaults/kernel-generic-config $(dir $@)arch-config > $@
+# First argument in the override file
+# Second argument is the base file
+BASE_KCONF = defaults/kernel-generic-config
+ARCH_KCONF = $(wildcard arch/*/arch-config)
+GENERATED_KCONF = $(subst arch-,generated-,$(ARCH_KCONF))
+KCONF = $(GENERATED_KCONF)
 
-genkernel.8: doc/genkernel.8.txt doc/asciidoc.conf Makefile genkernel
-	a2x --conf-file=doc/asciidoc.conf --attribute="genkernelversion=$(PACKAGE_VERSION)" \
-		 --format=manpage -D . "$<"
+debug:
+	@echo "ARCH_KCONF=$(ARCH_KCONF)"
+	@echo "GENERATED_KCONF=$(GENERATED_KCONF)"
+
+kconfig: $(GENERATED_KCONF)
+man: $(MANPAGE)
 
 ChangeLog:
 	git log >$@
@@ -35,4 +41,12 @@ dist: check-git-repository distclean $(EXTRA_DIST)
 distclean: clean
 	rm -Rf "$(distdir)" "$(distdir)".tar "$(distdir)".tar.xz
 
-.PHONY: clean check-git-repository dist distclean
+.PHONY: clean check-git-repository dist distclean kconfig
+
+# Generic rules
+%/generated-config: %/arch-config $(BASE_KCONF) merge.pl Makefile
+	perl merge.pl $^ $(BASE_KCONF) > $@
+
+%.8: doc/%.8.txt doc/asciidoc.conf Makefile genkernel
+	a2x --conf-file=doc/asciidoc.conf --attribute="genkernelversion=$(PACKAGE_VERSION)" \
+		 --format=manpage -D . "$<"

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

[Robin H. Johnson]

commit:     7eb2709abef8e9774f42a5a43b362125bc5aa82a
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 22:14:27 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 22:14:27 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7eb2709a

gen_configkernel: clean up logic, and correctly fall back to non-generated kconfig for arches where the "generated" kconfig is unusable.

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

 gen_configkernel.sh | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 98b6e9c..ac29852 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -3,28 +3,33 @@
 
 # Fills variable KERNEL_CONFIG
 determine_config_file() {
-	if [ "${CMD_KERNEL_CONFIG}" != "" ]
-	then
-		KERNEL_CONFIG="${CMD_KERNEL_CONFIG}"
-	elif [ -f "/etc/kernels/kernel-config-${ARCH}-${KV}" ]
-	then
-		KERNEL_CONFIG="/etc/kernels/kernel-config-${ARCH}-${KV}"
-	elif [ -f "${GK_SHARE}/arch/${ARCH}/kernel-config-${KV}" ]
-	then
-		KERNEL_CONFIG="${GK_SHARE}/arch/${ARCH}/kernel-config-${KV}"
-	elif [ "${DEFAULT_KERNEL_CONFIG}" != "" -a -f "${DEFAULT_KERNEL_CONFIG}" ]
-	then
-		KERNEL_CONFIG="${DEFAULT_KERNEL_CONFIG}"
-	elif [ -f "${GK_SHARE}/arch/${ARCH}/kernel-config-${VER}.${PAT}" ]
-	then
-		KERNEL_CONFIG="${GK_SHARE}/arch/${ARCH}/kernel-config-${VER}.${PAT}"
-	elif [ -f "${GK_SHARE}/arch/${ARCH}/kernel-config" ]
+	for f in \
+		"${CMD_KERNEL_CONFIG}" \
+		"/etc/kernels/kernel-config-${ARCH}-${KV}" \
+		"${GK_SHARE}/arch/${ARCH}/kernel-config-${KV}" \
+		"${DEFAULT_KERNEL_CONFIG}" \
+		"${GK_SHARE}/arch/${ARCH}/kernel-config-${VER}.${PAT}" \
+		"${GK_SHARE}/arch/${ARCH}/generated-config" \
+		"${GK_SHARE}/arch/${ARCH}/kernel-config" \
+		; do
+		if [ -n "${f}" -a -f "${f}" ]
+		then
+			if ! grep -sq THIS_CONFIG_IS_BROKEN "$f"
+			then
+				KERNEL_CONFIG="$f" && break
+			fi
+		fi
+	done
+	if [ -z "${KERNEL_CONFIG}" ]
 	then
-		KERNEL_CONFIG="${GK_SHARE}/arch/${ARCH}/generated-config"
-	else
 		gen_die 'Error: No kernel .config specified, or file not found!'
 	fi
     KERNEL_CONFIG="$(readlink -f "${KERNEL_CONFIG}")"
+	# Validate the symlink result if any
+	if [ ! -f "${KERNEL_CONFIG}" ]
+	then
+		gen_die "Error: No kernel .config: symlinked file not found! ($KERNEL_CONFIG)"
+	fi
 }
 
 config_kernel() {

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

[Robin H. Johnson]

commit:     860d09dc1cf3f08e8ef2caad5b11b19ae6b9fa61
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 22:35:48 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 22:35:48 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=860d09dc

Improve clarity for makefile command.

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

 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0a339e3..207f7cf 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,11 @@ distclean: clean
 
 # Generic rules
 %/generated-config: %/arch-config $(BASE_KCONF) merge.pl Makefile
-	grep -sq THIS_CONFIG_IS_BROKEN $< && cat $< >$@ || grep -sq perl merge.pl $< $(BASE_KCONF) > $@
+	if grep -sq THIS_CONFIG_IS_BROKEN $< ; then \
+		cat $< >$@ ; \
+	else \
+		perl merge.pl $< $(BASE_KCONF) > $@ ; \
+	fi ;
 
 %.8: doc/%.8.txt doc/asciidoc.conf Makefile genkernel
 	a2x --conf-file=doc/asciidoc.conf --attribute="genkernelversion=$(PACKAGE_VERSION)" \

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

[Robin H. Johnson]

commit:     e1762412c77152f5ee04df438e7e9534332b1695
Author:     Austin S. Hemmelgarn <ahferroin7 <AT> gmail <DOT> com>
AuthorDate: Sun Jan 24 06:11:27 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 06:12:24 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e1762412

initramfs: lz4 compression

X-Gentoo-Bug: 553740
X-Gentoo-Bug: 499520
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 gen_initramfs.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index cf57a62..163eedb 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -906,6 +906,7 @@ create_initramfs() {
 			lzma) compress_config='INITRAMFS_COMPRESSION_LZMA' ;;
 			xz) compress_config='INITRAMFS_COMPRESSION_XZ' ;;
 			lzo) compress_config='INITRAMFS_COMPRESSION_LZO' ;;
+			lz4) compress_config='INITRAMFS_COMPRESSION_LZ4' ;;
 			*) compress_config='INITRAMFS_COMPRESSION_NONE' ;;
 		esac
 		# All N default except XZ, so there it gets used if the kernel does
@@ -920,6 +921,7 @@ create_initramfs() {
 		CONFIG_INITRAMFS_COMPRESSION_LZMA=n
 		CONFIG_INITRAMFS_COMPRESSION_XZ=y
 		CONFIG_INITRAMFS_COMPRESSION_LZO=n
+		CONFIG_INITRAMFS_COMPRESSION_LZ4=n
 		CONFIG_${compress_config}=y
 		EOF
 	else
@@ -945,14 +947,16 @@ create_initramfs() {
 			cmd_bzip2=$(type -p bzip2)
 			cmd_gzip=$(type -p gzip)
 			cmd_lzop=$(type -p lzop)
+			cmd_lz4=$(type -p lz4)
 			pkg_xz='app-arch/xz-utils'
 			pkg_lzma='app-arch/xz-utils'
 			pkg_bzip2='app-arch/bzip2'
 			pkg_gzip='app-arch/gzip'
 			pkg_lzop='app-arch/lzop'
+			pkg_lz4='app-arch/lz4'
 			local compression
 			case ${COMPRESS_INITRD_TYPE} in
-				xz|lzma|bzip2|gzip|lzop) compression=${COMPRESS_INITRD_TYPE} ;;
+				xz|lzma|bzip2|gzip|lzop|lz4) compression=${COMPRESS_INITRD_TYPE} ;;
 				lzo) compression=lzop ;;
 				best|fastest)
 					for tuple in \
@@ -960,7 +964,9 @@ create_initramfs() {
 							'CONFIG_RD_LZMA  cmd_lzma  lzma' \
 							'CONFIG_RD_BZIP2 cmd_bzip2 bzip2' \
 							'CONFIG_RD_GZIP  cmd_gzip  gzip' \
-							'CONFIG_RD_LZO   cmd_lzop  lzop'; do
+							'CONFIG_RD_LZO   cmd_lzop  lzop' \
+							'CONFIG_RD_LZ4   cmd_lz4  lz4' \
+							; do
 						set -- ${tuple}
 						kernel_option=$1
 						cmd_variable_name=$2
@@ -987,6 +993,7 @@ create_initramfs() {
 				bzip2) compress_ext='.bz2' compress_cmd="${cmd_bzip2} -z -f -9" ;;
 				gzip) compress_ext='.gz' compress_cmd="${cmd_gzip} -f -9" ;;
 				lzop) compress_ext='.lzo' compress_cmd="${cmd_lzop} -f -9" ;;
+				lz4) compress_ext='.lz4' compress_cmd="${cmd_lz4} -f -9" ;;
 			esac
 
 			if [ -n "${compression}" ]; then

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

[Robin H. Johnson]

commit:     13a31c7b34b8afe93bb38f751eb6b1e45c590dca
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  5 23:45:38 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Feb  5 23:45:54 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=13a31c7b

Makefile: add a check to ensure all output from --help is documented.

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

 Makefile | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 207f7cf..5bea2ba 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ 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 distclean $(EXTRA_DIST)
+dist: verify-doc check-git-repository distclean $(EXTRA_DIST)
 	mkdir "$(distdir)"
 	git ls-files -z | xargs -0 cp --no-dereference --parents --target-directory="$(distdir)" \
 		$(EXTRA_DIST)
@@ -41,7 +41,7 @@ dist: check-git-repository distclean $(EXTRA_DIST)
 distclean: clean
 	rm -Rf "$(distdir)" "$(distdir)".tar "$(distdir)".tar.xz
 
-.PHONY: clean check-git-repository dist distclean kconfig
+.PHONY: clean check-git-repository dist distclean kconfig verify-doc
 
 # Generic rules
 %/generated-config: %/arch-config $(BASE_KCONF) merge.pl Makefile
@@ -54,3 +54,30 @@ distclean: clean
 %.8: doc/%.8.txt doc/asciidoc.conf Makefile genkernel
 	a2x --conf-file=doc/asciidoc.conf --attribute="genkernelversion=$(PACKAGE_VERSION)" \
 		 --format=manpage -D . "$<"
+
+verify-doc: doc/genkernel.8.txt
+	@rm -f faildoc ; \
+	GK_SHARE=. ./genkernel --help | \
+		sed 's,-->, ,g' | \
+		fmt -1 | \
+		grep -e '--' | \
+		tr -s '[:space:].,' ' ' | \
+		sed -r \
+			-e 's,=<[^>]+>,,g' | \
+		tr -s ' ' '\n' | \
+		sed -r \
+			-e 's,[[:space:]]*--(no-)?,,g' \
+			-e '/bootloader/s,=grub,,g' | \
+		while read opt ; do \
+			regex="^*--(...no-...)?$$opt" ; \
+			if ! egrep -e "$$regex" $< -sq ; then \
+				touch faildoc ; \
+				echo "Undocumented option: $$opt" ; \
+			fi ; \
+		done ; \
+	if test -e faildoc ; then \
+		echo "Refusing to build!" ; \
+		rm -f faildoc ; \
+		exit 1 ; \
+	fi ; \
+	rm -f faildoc

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

[Robin H. Johnson]

commit:     29716ce46c58e5c6f33e35b4b575227298f054da
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  6 22:14:05 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Feb  6 22:14:05 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=29716ce4

Major version bump: due to kernel changes this is considered a major unstable bump.

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

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

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

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

[Robin H. Johnson]

commit:     f9324a84796a5dbcac9d3a3fe2bead24f2853aa1
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  7 01:30:15 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Feb  7 01:30:15 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f9324a84

Use KERNEL_OUTPUTDIR more consistently.

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

 gen_compile.sh      |  2 +-
 gen_configkernel.sh | 49 ++++++++++++++++++++++++++-----------------------
 gen_initramfs.sh    |  8 ++++----
 gen_moddeps.sh      |  6 +++---
 4 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index c26a652..8d8f04a 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -697,7 +697,7 @@ compile_iscsi() {
 		KEXT=$(modules_kext)
 		for modname in iscsi_tcp libiscsi scsi_transport_iscsi
 		do
-			module=${CMD_KERNEL_DIR}/drivers/scsi/${modname}${KEXT}
+			module=${KERNEL_OUTPUTDIR}/drivers/scsi/${modname}${KEXT}
 			if [ -e "${module}" ]
 			then
 				cp $module "${TEMP}/initramfs-iscsi-temp/lib/modules/${KV}/kernel/drivers/scsi/"

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index ac29852..81b2b52 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -32,6 +32,15 @@ determine_config_file() {
 	fi
 }
 
+function kconfig_set_opt() {
+	kconfig="$1"
+	optname="$2"
+	optval="$3"
+	sed -i "${kconfig}" \
+		-e "s/^#\? \?${optname}[ =].*/${optname}=${optval}/g" \
+	gen_die "Failed to set ${optname}=${optval} in $kconfig"
+}
+
 config_kernel() {
 	determine_config_file
 	cd "${KERNEL_DIR}" || gen_die 'Could not switch to the kernel directory!'
@@ -110,30 +119,29 @@ config_kernel() {
 	if isTrue ${CMD_GENZIMAGE}
 	then
 		# Make sure Ext2 support is on...
-		sed -e 's/#\? \?CONFIG_EXT2_FS[ =].*/CONFIG_EXT2_FS=y/g' \
-			-i ${KERNEL_OUTPUTDIR}/.config
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT2_FS" "y"
 	fi
 
 	# Make sure lvm modules are on if --lvm
 	if isTrue ${CMD_LVM}
 	then
-		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'
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "m"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_SNAPSHOT" "m"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MIRROR" "m"
 	fi
 
 	# Multipath
 	if isTrue ${CMD_MULTIPATH}
 	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_MULTIPATH is.*/CONFIG_DM_MULTIPATH=m/g'
-		sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_MULTIPATH_RDAC is.*/CONFIG_DM_MULTIPATH_RDAC=m/g'
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "m"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH" "m"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH_RDAC" "m"
 	fi
 
 	# Make sure dmraid modules are on if --dmraid
 	if isTrue ${CMD_DMRAID}
 	then
-		sed -i ${KERNEL_OUTPUTDIR}/.config -e 's/#\? \?CONFIG_BLK_DEV_DM is.*/CONFIG_BLK_DEV_DM=m/g'
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "m"
 	fi
 
 	# Make sure iSCSI modules are enabled in the kernel, if --iscsi
@@ -141,28 +149,23 @@ config_kernel() {
 	# CONFIG_ISCSI_TCP
 	if isTrue ${CMD_ISCSI}
 	then
-		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_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'
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_TCP" "m"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_ISCSI_ATTRS" "m"
 	fi
 
 	if isTrue ${SPLASH}
 	then
-		sed -i ${KERNEL_OUTPUTDIR}/.config -e 's/#\? \?CONFIG_FB_SPLASH is.*/CONFIG_FB_SPLASH=y/g'
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB_SPLASH" "y"
 	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'
+		for k in \
+			CONFIG_PARAVIRT_GUEST CONFIG_VIRTIO_PCI CONFIG_VIRTIO_BALLOON \
+			CONFIG_VIRTIO_MMIO CONFIG_VIRTIO_BLK CONFIG_SCSI_VIRTIO \
+			CONFIG_VIRTIO_NET CONFIG_VHOST_NET ; do
+			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB_SPLASH" "y"
+		done
 	fi
 }

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 163eedb..a03f5b1 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -898,7 +898,7 @@ create_initramfs() {
 		# Explicitly do not compress if we are integrating into the kernel.
 		# 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
+		sed -i '/^.*CONFIG_INITRAMFS_SOURCE=.*$/d' ${KERNEL_OUTPUTDIR}/.config
 		compress_config='INITRAMFS_COMPRESSION_NONE'
 		case ${compress_ext} in
 			gz)  compress_config='INITRAMFS_COMPRESSION_GZIP' ;;
@@ -911,7 +911,7 @@ create_initramfs() {
 		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
+		cat >>${KERNEL_OUTPUTDIR}/.config	<<-EOF
 		CONFIG_INITRAMFS_SOURCE="${TMPDIR}/initramfs-${KV}.cpio${compress_ext}"
 		CONFIG_INITRAMFS_ROOT_UID=0
 		CONFIG_INITRAMFS_ROOT_GID=0
@@ -929,8 +929,8 @@ create_initramfs() {
 		then
 			# NOTE:  We do not work with ${KERNEL_CONFIG} here, since things like
 			#        "make oldconfig" or --noclean could be in effect.
-			if [ -f "${KERNEL_DIR}"/.config ]; then
-				local ACTUAL_KERNEL_CONFIG="${KERNEL_DIR}"/.config
+			if [ -f "${KERNEL_OUTPUTDIR}"/.config ]; then
+				local ACTUAL_KERNEL_CONFIG="${KERNEL_OUTPUTDIR}"/.config
 			else
 				local ACTUAL_KERNEL_CONFIG="${KERNEL_CONFIG}"
 			fi

diff --git a/gen_moddeps.sh b/gen_moddeps.sh
index 415e095..053a183 100755
--- a/gen_moddeps.sh
+++ b/gen_moddeps.sh
@@ -4,9 +4,9 @@
 modules_kext()
 {
 	KEXT=".ko"
-	if grep -sq '^CONFIG_MODULE_COMPRESS=y' "${KERNEL_DIR}"/.config; then
-		grep -sq '^CONFIG_MODULE_COMPRESS_XZ=y' "${KERNEL_DIR}"/.config && KEXT='.ko.xz'
-		grep -sq '^CONFIG_MODULE_COMPRESS_GZIP=y' "${KERNEL_DIR}"/.config && KEXT='.ko.gz'
+	if grep -sq '^CONFIG_MODULE_COMPRESS=y' "${KERNEL_OUTPUTDIR}"/.config; then
+		grep -sq '^CONFIG_MODULE_COMPRESS_XZ=y' "${KERNEL_OUTPUTDIR}"/.config && KEXT='.ko.xz'
+		grep -sq '^CONFIG_MODULE_COMPRESS_GZIP=y' "${KERNEL_OUTPUTDIR}"/.config && KEXT='.ko.gz'
 	fi
 	echo ${KEXT}
 }

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

[Robin H. Johnson]

commit:     3d57190f734199a3ca48bd3a1b411b184b8963b5
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  7 12:18:00 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Feb  7 12:18:00 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3d57190f

gen_configkernel: fix missing ||.

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

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

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 81b2b52..b3a25af 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -38,7 +38,7 @@ function kconfig_set_opt() {
 	optval="$3"
 	sed -i "${kconfig}" \
 		-e "s/^#\? \?${optname}[ =].*/${optname}=${optval}/g" \
-	gen_die "Failed to set ${optname}=${optval} in $kconfig"
+	|| gen_die "Failed to set ${optname}=${optval} in $kconfig"
 }
 
 config_kernel() {

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

[Robin H. Johnson]

commit:     aa3fd1cd490c0e2ad1088a28d325701c2cebcdf1
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  7 12:19:51 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Feb  7 12:19:51 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=aa3fd1cd

Be stricter with module path for firmware.

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

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

diff --git a/gen_compile.sh b/gen_compile.sh
index 8d8f04a..9b9dc5b 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -338,6 +338,8 @@ compile_kernel() {
 	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..."
+		[ "${INSTALL_MOD_PATH}" != '' ] && export INSTALL_MOD_PATH
+		[ "${INSTALL_FW_PATH}" != '' ] && export INSTALL_FW_PATH
 		MAKEOPTS="${MAKEOPTS} -j1" compile_generic "firmware_install" kernel
 	else
 		print_info 1 "        >> Not installing firmware as it's included in the kernel already (CONFIG_FIRMWARE_IN_KERNEL=y)..."

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

[Robin H. Johnson]

commit:     0042cf39f3efd3ed14a9a8a363b82cb43117b4e4
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  7 12:53:17 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Feb  7 12:53:17 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0042cf39

gen_initramfs: drop usage of mknod, so we can almost run without root!

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

 gen_initramfs.sh | 61 ++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 22 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index a03f5b1..fdf2eb1 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -60,6 +60,25 @@ log_future_cpio_content() {
 	fi
 }
 
+append_devices() {
+	# WARNING, does NOT support appending to cpio!
+	cat >"${TEMP}/initramfs-base-temp.devices" <<-EOF
+	dir /dev 0755 0 0
+	nod /dev/console 660 0 0 c 5 1
+	nod /dev/null 660 0 0 c 1 3
+	nod /dev/zero 660 0 0 c 1 5
+	nod /dev/tty0 600 0 0 c 4 0
+	nod /dev/tty1 600 0 0 c 4 1
+	nod /dev/ttyS0 600 0 0 c 4 64
+	EOF
+	if [[ "${LOGLEVEL}" -gt 1 ]]; then
+		echo "Adding devices to cpio:"
+		cat "${TEMP}/initramfs-base-temp.devices"
+	fi
+	${KERNEL_OUTPUTDIR}/usr/gen_init_cpio "${TEMP}/initramfs-base-temp.devices" >"${CPIO}" \
+			|| gen_die "Failed to add devices to cpio"
+}
+
 append_base_layout() {
 	if [ -d "${TEMP}/initramfs-base-temp" ]
 	then
@@ -88,15 +107,6 @@ append_base_layout() {
 	echo "/dev/ram0     /           ext2    defaults	0 0" > ${TEMP}/initramfs-base-temp/etc/fstab
 	echo "proc          /proc       proc    defaults    0 0" >> ${TEMP}/initramfs-base-temp/etc/fstab
 
-	cd ${TEMP}/initramfs-base-temp/dev
-	# 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
 
@@ -829,9 +839,7 @@ create_initramfs() {
 
 	# Create empty cpio
 	CPIO="${TMPDIR}/initramfs-${KV}"
-	echo | cpio ${CPIO_ARGS} -F "${CPIO}" 2>/dev/null \
-		|| gen_die "Could not create empty cpio at ${CPIO}"
-
+	append_data 'devices' # WARNING, must be first!
 	append_data 'base_layout'
 	append_data 'auxilary' "${BUSYBOX}"
 	append_data 'busybox' "${BUSYBOX}"
@@ -880,18 +888,26 @@ create_initramfs() {
 	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"
+	# TODO: maybe replace this with:
+	# http://search.cpan.org/~pixel/Archive-Cpio-0.07/lib/Archive/Cpio.pm
+	# as then we can dedupe ourselves...
+	if [[ $UID -eq 0 ]]; then
+		print_info 1 "        >> Deduping cpio..."
+		local TDIR="${TEMP}/initramfs-final"
+		mkdir -p "${TDIR}"
+		cd "${TDIR}"
+
+		cpio --quiet -i -F "${CPIO}" 2> /dev/null \
+			|| gen_die "extracting cpio for dedupe"
+		find . -print | cpio ${CPIO_ARGS} -F "${CPIO}" 2>/dev/null \
+			|| gen_die "rebuilding cpio for dedupe"
+		cd "${TEMP}"
+		rm -rf "${TDIR}"
+	else
+		print_info 1 "        >> Cannot deduping cpio contents without root; skipping"
+	fi
 
 	cd "${TEMP}"
-	rm -r "${TDIR}"
 
 	if isTrue "${INTEGRATED_INITRAMFS}"
 	then
@@ -998,6 +1014,7 @@ create_initramfs() {
 
 			if [ -n "${compression}" ]; then
 				print_info 1 "        >> Compressing cpio data (${compress_ext})..."
+				print_info 5 "        >> Compression command (${compress_cmd} $CPIO)..."
 				${compress_cmd} "${CPIO}" || gen_die "Compression (${compress_cmd}) failed"
 				mv -f "${CPIO}${compress_ext}" "${CPIO}" || gen_die "Rename failed"
 			else

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

[Robin H. Johnson]

commit:     c37d0daba2f264c72a945dcebd08e9a42d8649f7
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 20:34:09 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 20:34:16 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c37d0dab

fix rootfs detection per bug #552052

ZFS and btrfs tools if not explictly configured (either way), default to
detecting the fstype of the rootfs.

The old rootfs detection method was NOT reliable in all cases; so
replace it with a different way. Future improvements should check for
rootfs AND the local existence of the required binaries (and bail out
early if the the rootrfs was detected but the binaries are not present).

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

 gen_cmdline.sh | 4 ++--
 gen_funcs.sh   | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 01adfdd..e9e7401 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -100,9 +100,9 @@ longusage() {
   echo "	--no-dmraid		Exclude DMRAID support"
   echo "	--e2fsprogs		Include e2fsprogs"
   echo "	--no-e2fsprogs		Exclude e2fsprogs"
-  echo "	--zfs			Include ZFS support"
+  echo "	--zfs			Include ZFS support (enabled by default if rootfs is zfs)"
   echo "	--no-zfs		Exclude ZFS support"
-  echo "	--btrfs			Include Btrfs support"
+  echo "	--btrfs			Include Btrfs support (enabled by default if rootfs is btrfs)"
   echo "	--no-btrfs		Exclude Btrfs support"
   echo "	--multipath		Include Multipath support"
   echo "	--no-multipath	Exclude Multipath support"

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 37942ad..eb807ad 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -498,7 +498,9 @@ set_config_with_override() {
 rootfs_type_is() {
 	local fstype=$1
 
-	if $(df -t ${fstype} / 2>/dev/null 1>/dev/null)
+	# It is possible that the awk will return MULTIPLE lines, depending on your
+	# initramfs setup (one of the entries will be 'rootfs').
+	if awk '($2=="/"){print $3}' /proc/mounts | grep -sq --line-regexp "$fstype" ;
 	then
 		echo yes
 	else

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

[Mike Frysinger]

commit:     4fb8318037a8ea12f54b7c711d702b432113f233
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 06:04:41 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 06:04:41 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4fb83180

adjust System.map die check for #570822

Builds with newer genkernel have been failing in catalyst like so:
* ERROR: Could not copy System.map from kerncache for the kernel package!

The code that added it seems to have been meant to check the minkernpackage/
subdir where the file was renamed instead of the current subdir.  Change the
check to simplify verify the mv didn't fail instead of duplicating the file
name entirely.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 gen_package.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/gen_package.sh b/gen_package.sh
index 9dd166b..b08ff03 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -45,11 +45,8 @@ gen_minkernpackage() {
 	if [ "${KERNCACHE}" != "" ]
 	then
 		/bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} System.map-${ARCH}-${KV}
-		mv minkernpackage/{System.map-${ARCH}-${KV},System.map-${KNAME}-${ARCH}-${KV}}
-		if [ ! -f System.map-${KNAME}-${ARCH}-${KV} ]
-		then
+		mv minkernpackage/{System.map-${ARCH}-${KV},System.map-${KNAME}-${ARCH}-${KV}} ||
 			gen_die 'Could not copy System.map from kerncache for the kernel package!'
-		fi
 	else
 		cp "${KERNEL_OUTPUTDIR}/System.map" "${TEMP}/minkernpackage/System.map-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not copy System.map for the kernel package!';
 	fi

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

[Mike Frysinger]

commit:     1e05f5e3002c97755380fe28ad2f9fb9450a97b8
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 05:55:43 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 05:55:43 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1e05f5e3

always respect kernel settings

Just because someone has passed the cross-compile flag does not mean
the other settings are not interesting as well.  The cross-compile
prefix is used for many tools, but genkernel only allows for setting
of a few, and the other settings (like arch and output dir) should
not be completely ignored.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 gen_compile.sh | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 9b9dc5b..554e645 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -8,27 +8,26 @@ compile_kernel_args() {
 	if [ "${KERNEL_CROSS_COMPILE}" != '' ]
 	then
 		ARGS="${ARGS} CROSS_COMPILE=\"${KERNEL_CROSS_COMPILE}\""
-	else
-		if [ "${KERNEL_CC}" != '' ]
-		then
-			ARGS="CC=\"${KERNEL_CC}\""
-		fi
-		if [ "${KERNEL_LD}" != '' ]
-		then
-			ARGS="${ARGS} LD=\"${KERNEL_LD}\""
-		fi
-		if [ "${KERNEL_AS}" != '' ]
-		then
-			ARGS="${ARGS} AS=\"${KERNEL_AS}\""
-		fi
-		if [ -n "${KERNEL_ARCH}" ]
-		then
-			ARGS="${ARGS} ARCH=\"${KERNEL_ARCH}\""
-		fi
-		if [ -n "${KERNEL_OUTPUTDIR}" -a "${KERNEL_OUTPUTDIR}" != "${KERNEL_DIR}" ]
-		then
-			ARGS="${ARGS} O=\"${KERNEL_OUTPUTDIR}\""
-		fi
+	fi
+	if [ "${KERNEL_CC}" != '' ]
+	then
+		ARGS="CC=\"${KERNEL_CC}\""
+	fi
+	if [ "${KERNEL_LD}" != '' ]
+	then
+		ARGS="${ARGS} LD=\"${KERNEL_LD}\""
+	fi
+	if [ "${KERNEL_AS}" != '' ]
+	then
+		ARGS="${ARGS} AS=\"${KERNEL_AS}\""
+	fi
+	if [ -n "${KERNEL_ARCH}" ]
+	then
+		ARGS="${ARGS} ARCH=\"${KERNEL_ARCH}\""
+	fi
+	if [ -n "${KERNEL_OUTPUTDIR}" -a "${KERNEL_OUTPUTDIR}" != "${KERNEL_DIR}" ]
+	then
+		ARGS="${ARGS} O=\"${KERNEL_OUTPUTDIR}\""
 	fi
 	echo -n "${ARGS}"
 }

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

[Mike Frysinger]

commit:     1962b0ec93bdeda0314b1bb09b08a1c890f0a725
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 06:11:55 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 06:11:55 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1962b0ec

Bump version to 3.5.0.1

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

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

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

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

[Robin H. Johnson]

commit:     33222961623c2e3328f1cc00021da671e07290ee
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 06:09:45 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon May 16 06:09:45 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=33222961

gen_configkernel: bug #486366, fix virtio kconfig.

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

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

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index b3a25af..7e74f32 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -165,7 +165,7 @@ config_kernel() {
 			CONFIG_PARAVIRT_GUEST CONFIG_VIRTIO_PCI CONFIG_VIRTIO_BALLOON \
 			CONFIG_VIRTIO_MMIO CONFIG_VIRTIO_BLK CONFIG_SCSI_VIRTIO \
 			CONFIG_VIRTIO_NET CONFIG_VHOST_NET ; do
-			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB_SPLASH" "y"
+			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "$k" "y"
 		done
 	fi
 }

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

[Robin H. Johnson]

commit:     493af2b716fe55a37139858c9f1e8ddb44df4e71
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 06:49:40 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon May 16 06:49:40 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=493af2b7

gen_cmdline: bug #544172: sanity check on mdadm/dmraid.

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

 gen_cmdline.sh | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index e9e7401..24cb607 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -297,6 +297,12 @@ parse_cmdline() {
 		--mdadm|--no-mdadm)
 			CMD_MDADM=`parse_optbool "$*"`
 			print_info 2 "CMD_MDADM: $CMD_MDADM"
+			if [ "$CMD_MDADM" = "1" -a ! -e /sbin/mdadm ]
+			then
+				echo 'Error: --multipath requires sys-fs/mdadm'
+				echo '		 to be installed on the host system.'
+				exit 1
+			fi
 			;;
 		--mdadm-config=*)
 			CMD_MDADM_CONFIG=`parse_opt "$*"`
@@ -320,10 +326,16 @@ parse_cmdline() {
 			;;
 		--dmraid|--no-dmraid)
 			CMD_DMRAID=`parse_optbool "$*"`
+			if [ "$CMD_DMRAID" = "1" -a ! -e /usr/sbin/dmraid ]
+			then
+				echo 'Error: --dmraid requires sys-fs/dmraid'
+				echo '		 to be installed on the host system.'
+				exit 1
+			fi
 			if [ "$CMD_DMRAID" = "1" -a ! -e /usr/include/libdevmapper.h ]
 			then
-				echo 'Error: --dmraid requires LVM2 to be installed'
-				echo '		 on the host system; try "emerge lvm2".'
+				echo 'Error: --dmraid requires sys-fs/lvm2'
+				echo '		 to be installed on the host system.'
 				exit 1
 			fi
 			print_info 2 "CMD_DMRAID: ${CMD_DMRAID}"
@@ -346,10 +358,16 @@ parse_cmdline() {
 			;;
 		--multipath|--no-multipath)
 			CMD_MULTIPATH=`parse_optbool "$*"`
+			if [ "$CMD_MULTIPATH" = "1" -a ! -e /sbin/multipath ]
+			then
+				echo 'Error: --multipath requires sys-fs/multipath-tools'
+				echo '		 to be installed on the host system.'
+				exit 1
+			fi
 			if [ "$CMD_MULTIPATH" = "1" -a ! -e /usr/include/libdevmapper.h ]
 			then
-				echo 'Error: --multipath requires LVM2 to be installed'
-				echo '		 on the host;system; try "emerge lvm2".'
+				echo 'Error: --multipath requires sys-fs/lvm2'
+				echo '		 to be installed on the host system.'
 				exit 1
 			fi
 			print_info 2 "CMD_MULTIPATH: ${CMD_MULTIPATH}"

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

[Robin H. Johnson]

commit:     dcaf70ea39a54cd5354dc814f1a965a5b2c27506
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 06:57:23 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon May 16 06:57:23 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=dcaf70ea

Bump version to 3.5.0.2

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

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

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

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

[Mike Frysinger]

commit:     a0b9c8b3daa217615bf85f2e3596ce0068c2c847
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 03:17:16 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 03:17:16 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a0b9c8b3

cleanup small_die a bit

Fix quoting, make sure it's clear we're failing, and send output to stderr.

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

diff --git a/genkernel b/genkernel
index 01649f1..a404415 100755
--- a/genkernel
+++ b/genkernel
@@ -11,8 +11,8 @@ TMPDIR='/var/tmp/genkernel'
 TODEBUGCACHE=1 # Until an error occurs or LOGFILE is fully qualified.
 
 small_die() {
-  echo $1
-  exit 1
+	echo "ERROR: $*" >&2
+	exit 1
 }
 
 parse_opt() {

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

[Mike Frysinger]

commit:     f5f28c6c6fa09a746d317c0956659eb6c6454516
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 03:26:49 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 03:26:49 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f5f28c6c

genkernel: simplify/robustify --config parsing

There's no need to use eval here, and the quoting on it is off leading
to incorrect expansion side effects with some inputs.

 genkernel | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/genkernel b/genkernel
index a404415..506a2ca 100755
--- a/genkernel
+++ b/genkernel
@@ -15,21 +15,12 @@ small_die() {
 	exit 1
 }
 
-parse_opt() {
-	case "$1" in
-		*\=*)
-			echo "$1" | cut -f2- -d=
-		;;
-	esac
-}
-
 # We don't know where our config is, so we check for it, and default to using
 # /etc/genkernel.conf if nobody has specified one.
 
 # NOTE: We are look for --config=... in a way that doesn't modify $@ since we access that again, later
-for (( i=1; i<=$# ; i=i+1 )); do
-	eval arg="\$$i"
-	[[ "${arg}" = --config=* ]] && CMD_GK_CONFIG=`parse_opt "${arg}"`
+for arg in "$@"; do
+	[[ "${arg}" == --config=* ]] && CMD_GK_CONFIG=${arg#--config=}
 done
 
 # Pull in our configuration

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

[Mike Frysinger]

commit:     f3299dffb18d26fe500bc59a59a8bc591b2dcf78
Author:     Jason Miller <aidenn0 <AT> geocities <DOT> com>
AuthorDate: Wed Jun 22 23:12:10 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 19:05:06 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f3299dff

gen_initramfs: fix little-endian problem with hostid

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index f113373..1fd5d2a 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -110,7 +110,19 @@ append_base_layout() {
 	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
 
-	printf "$(hostid | sed 's/\([0-9A-F]\{2\}\)/\\x\1/gI')" > ${TEMP}/initramfs-base-temp/etc/hostid
+	# The ZFS tools want the hostid in order to find the right pool.
+	# Assume the initramfs we're building is for this system, so copy
+	# our current hostid into it.
+	# We also have to deal with binary+endianness here: glibc's gethostid
+	# expects the value to be in binary using the native endianness.  But
+	# the coreutils hostid program doesn't show it in the right form.
+	local hostid
+	if file -L "${TEMP}/initramfs-base-temp/bin/sh" | grep -q 'MSB executable'; then
+		hostid="$(hostid)"
+	else
+		hostid="$(hostid | sed -E 's/(..)(..)(..)(..)/\4\3\2\1/')"
+	fi
+	printf "$(echo "${hostid}" | sed 's/\([0-9A-F]\{2\}\)/\\x\1/gI')" > ${TEMP}/initramfs-base-temp/etc/hostid
 
 	mkdir -p "${TEMP}/initramfs-base-temp/etc/mdev/helpers"
 	install -m 644 -t "${TEMP}/initramfs-base-temp/etc" /usr/share/genkernel/mdev/mdev.conf

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

[Robin H. Johnson]

commit:     e8d601f00549fa22424db7af97be1a573f4fb2b0
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 23:25:19 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 23:25:19 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e8d601f0

Bump version to 3.5.0.3.

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

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

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

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

[Robin H. Johnson]

commit:     d0e7c2c7b9615ca369970bf37ae7ad16c293ee17
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 23:23:37 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 23:23:37 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d0e7c2c7

gen_bootloader: grub2-mkconfig is sometimes now grub-mkconfig, per bug #591200.

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

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

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index 4bbd303..fdca749 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -49,8 +49,10 @@ set_bootloader_grub2() {
 	fi
 
 	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 || gen_die "grub2-mkconfig failed"
+	print_info 1 "Running grub-mkconfig to create ${GRUB_CONF}..."
+	grub-mkconfig -o "${GRUB_CONF}" 2> /dev/null ||
+		grub2-mkconfig -o "${GRUB_CONF}" 2> /dev/null ||
+		gen_die "grub-mkconfig failed"
 	[ "${BUILD_RAMDISK}" -ne 0 ] && sed -i 's/ro single/ro debug/' "${GRUB_CONF}"
 }
 

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

[Robin H. Johnson]

commit:     5acd17ee75f0dd37a463a089ed2d00a62db84d25
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 21:31:31 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 21:31:31 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5acd17ee

gen_cmdline: drop parse_opt usage

Commit f5f28c6c removed the parse_opt function, but missed that it was
still used heavily in gen_cmdline's parse_cmdline function. This broke
many commandline arguments.

Remove usage of said function and replace with bash text handling
instead.

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

 gen_cmdline.sh | 92 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 24cb607..94ff68c 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -202,65 +202,65 @@ parse_optbool() {
 parse_cmdline() {
 	case "$*" in
 		--kernel-cc=*)
-			CMD_KERNEL_CC=`parse_opt "$*"`
+			CMD_KERNEL_CC="${*#*=}"
 			print_info 2 "CMD_KERNEL_CC: ${CMD_KERNEL_CC}"
 			;;
 		--kernel-ld=*)
-			CMD_KERNEL_LD=`parse_opt "$*"`
+			CMD_KERNEL_LD="${*#*=}"
 			print_info 2 "CMD_KERNEL_LD: ${CMD_KERNEL_LD}"
 			;;
 		--kernel-as=*)
-			CMD_KERNEL_AS=`parse_opt "$*"`
+			CMD_KERNEL_AS="${*#*=}"
 			print_info 2 "CMD_KERNEL_AS: ${CMD_KERNEL_AS}"
 			;;
 		--kernel-make=*)
-			CMD_KERNEL_MAKE=`parse_opt "$*"`
+			CMD_KERNEL_MAKE="${*#*=}"
 			print_info 2 "CMD_KERNEL_MAKE: ${CMD_KERNEL_MAKE}"
 			;;
 		--kernel-target=*)
-			KERNEL_MAKE_DIRECTIVE_OVERRIDE=`parse_opt "$*"`
+			KERNEL_MAKE_DIRECTIVE_OVERRIDE="${*#*=}"
 			print_info 2 "KERNEL_MAKE_DIRECTIVE_OVERRIDE: ${KERNEL_MAKE_DIRECTIVE_OVERRIDE}"
 			;;
 		--kernel-binary=*)
-			KERNEL_BINARY_OVERRIDE=`parse_opt "$*"`
+			KERNEL_BINARY_OVERRIDE="${*#*=}"
 			print_info 2 "KERNEL_BINARY_OVERRIDE: ${KERNEL_BINARY_OVERRIDE}"
 			;;
 		--kernel-cross-compile=*)
-			CMD_KERNEL_CROSS_COMPILE=`parse_opt "$*"`
+			CMD_KERNEL_CROSS_COMPILE="${*#*=}"
 			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 "$*"`
+			CMD_KERNEL_OUTPUTDIR="${*#*=}"
 			print_info 2 "CMD_KERNEL_OUTPUTDIR: ${CMD_KERNEL_OUTPUTDIR}"
 			;;
 		--utils-cc=*)
-			CMD_UTILS_CC=`parse_opt "$*"`
+			CMD_UTILS_CC="${*#*=}"
 			print_info 2 "CMD_UTILS_CC: ${CMD_UTILS_CC}"
 			;;
 		--utils-ld=*)
-			CMD_UTILS_LD=`parse_opt "$*"`
+			CMD_UTILS_LD="${*#*=}"
 			print_info 2 "CMD_UTILS_LD: ${CMD_UTILS_LD}"
 			;;
 		--utils-as=*)
-			CMD_UTILS_AS=`parse_opt "$*"`
+			CMD_UTILS_AS="${*#*=}"
 			print_info 2 "CMD_UTILS_AS: ${CMD_UTILS_AS}"
 			;;
 		--utils-make=*)
-			CMD_UTILS_MAKE=`parse_opt "$*"`
+			CMD_UTILS_MAKE="${*#*=}"
 			print_info 2 "CMD_UTILS_MAKE: ${CMD_UTILS_MAKE}"
 			;;
 		--utils-cross-compile=*)
-			CMD_UTILS_CROSS_COMPILE=`parse_opt "$*"`
+			CMD_UTILS_CROSS_COMPILE="${*#*=}"
 			CMD_UTILS_CROSS_COMPILE=$(echo ${CMD_UTILS_CROSS_COMPILE}|sed -e 's/.*[^-]$/&-/g')
 			print_info 2 "CMD_UTILS_CROSS_COMPILE: ${CMD_UTILS_CROSS_COMPILE}"
 			;;
 		--utils-arch=*)
-			CMD_UTILS_ARCH=`parse_opt "$*"`
+			CMD_UTILS_ARCH="${*#*=}"
 			print_info 2 "CMD_UTILS_ARCH: ${CMD_ARCHOVERRIDE}"
 			;;
 		--makeopts=*)
-			CMD_MAKEOPTS=`parse_opt "$*"`
+			CMD_MAKEOPTS="${*#*=}"
 			print_info 2 "CMD_MAKEOPTS: ${CMD_MAKEOPTS}"
 			;;
 		--mountboot|--no-mountboot)
@@ -268,11 +268,11 @@ parse_cmdline() {
 			print_info 2 "CMD_MOUNTBOOT: ${CMD_MOUNTBOOT}"
 			;;
 		--bootdir=*)
-			CMD_BOOTDIR=`parse_opt "$*"`
+			CMD_BOOTDIR="${*#*=}"
 			print_info 2 "CMD_BOOTDIR: ${CMD_BOOTDIR}"
 			;;
 		--modprobedir=*)
-			CMD_MODPROBEDIR=`parse_opt "$*"`
+			CMD_MODPROBEDIR="${*#*=}"
 			print_info 2 "CMD_MODPROBEDIR: ${CMD_MODPROBEDIR}"
 			;;
 		--do-keymap-auto)
@@ -305,7 +305,7 @@ parse_cmdline() {
 			fi
 			;;
 		--mdadm-config=*)
-			CMD_MDADM_CONFIG=`parse_opt "$*"`
+			CMD_MDADM_CONFIG="${*#*=}"
 			print_info 2 "CMD_MDADM_CONFIG: $CMD_MDADM_CONFIG"
 			;;
 		--busybox|--no-busybox)
@@ -321,7 +321,7 @@ parse_cmdline() {
 			print_info 2 "CMD_NETBOOT: ${CMD_NETBOOT}"
 			;;
 		--real-root=*)
-			CMD_REAL_ROOT=`parse_opt "$*"`
+			CMD_REAL_ROOT="${*#*=}"
 			print_info 2 "CMD_REAL_ROOT: ${CMD_REAL_ROOT}"
 			;;
 		--dmraid|--no-dmraid)
@@ -373,7 +373,7 @@ parse_cmdline() {
 			print_info 2 "CMD_MULTIPATH: ${CMD_MULTIPATH}"
 			;;
 		--bootloader=*)
-			CMD_BOOTLOADER=`parse_opt "$*"`
+			CMD_BOOTLOADER="${*#*=}"
 			print_info 2 "CMD_BOOTLOADER: ${CMD_BOOTLOADER}"
 			;;
 		--iscsi|--no-iscsi)
@@ -381,7 +381,7 @@ parse_cmdline() {
 			print_info 2 "CMD_ISCSI: ${CMD_ISCSI}"
 			;;
 		--loglevel=*)
-			CMD_LOGLEVEL=`parse_opt "$*"`
+			CMD_LOGLEVEL="${*#*=}"
 			LOGLEVEL="${CMD_LOGLEVEL}"
 			print_info 2 "CMD_LOGLEVEL: ${CMD_LOGLEVEL}"
 			;;
@@ -429,7 +429,7 @@ parse_cmdline() {
 			;;
 		--gensplash=*)
 			CMD_SPLASH=1
-			SPLASH_THEME=`parse_opt "$*"`
+			SPLASH_THEME="${*#*=}"
 			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
 			print_info 2 "SPLASH_THEME: ${SPLASH_THEME}"
 			echo
@@ -444,7 +444,7 @@ parse_cmdline() {
 			;;
 		--splash=*)
 			CMD_SPLASH=1
-			SPLASH_THEME=`parse_opt "$*"`
+			SPLASH_THEME="${*#*=}"
 			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
 			print_info 2 "SPLASH_THEME: ${SPLASH_THEME}"
 			;;
@@ -454,13 +454,13 @@ parse_cmdline() {
 			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
 			;;
 		--gensplash-res=*)
-			SPLASH_RES=`parse_opt "$*"`
+			SPLASH_RES="${*#*=}"
 			print_info 2 "SPLASH_RES: ${SPLASH_RES}"
 			echo
 			print_warning 1 "Please use --splash-res, as --gensplash-res is deprecated."
 			;;
 		--splash-res=*)
-			SPLASH_RES=`parse_opt "$*"`
+			SPLASH_RES="${*#*=}"
 			print_info 2 "SPLASH_RES: ${SPLASH_RES}"
 			;;
 		--install|--no-install)
@@ -476,7 +476,7 @@ parse_cmdline() {
 			print_info 2 "CMD_ALLRAMDISKMODULES: ${CMD_ALLRAMDISKMODULES}"
 			;;
 		--callback=*)
-			CMD_CALLBACK=`parse_opt "$*"`
+			CMD_CALLBACK="${*#*=}"
 			print_info 2 "CMD_CALLBACK: ${CMD_CALLBACK}/$*"
 			;;
 		--static|--no-static)
@@ -484,7 +484,7 @@ parse_cmdline() {
 			print_info 2 "CMD_STATIC: ${CMD_STATIC}"
 			;;
 		--tempdir=*)
-			TMPDIR=`parse_opt "$*"`
+			TMPDIR="${*#*=}"
 			TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$
 			print_info 2 "TMPDIR: ${TMPDIR}"
 			print_info 2 "TEMP: ${TEMP}"
@@ -494,7 +494,7 @@ parse_cmdline() {
 			print_info 2 "CMD_POSTCLEAR: ${CMD_POSTCLEAR}"
 			;;
 		--arch-override=*)
-			CMD_ARCHOVERRIDE=`parse_opt "$*"`
+			CMD_ARCHOVERRIDE="${*#*=}"
 			print_info 2 "CMD_ARCHOVERRIDE: ${CMD_ARCHOVERRIDE}"
 			;;
 		--color|--no-color)
@@ -507,44 +507,44 @@ parse_cmdline() {
 			print_info 2 "DEBUGCLEANUP: ${DEBUGCLEANUP}"
 			;;
 		--logfile=*)
-			CMD_LOGFILE=`parse_opt "$*"`
-			LOGFILE=`parse_opt "$*"`
+			CMD_LOGFILE="${*#*=}"
+			LOGFILE="${*#*=}"
 			print_info 2 "CMD_LOGFILE: ${CMD_LOGFILE}"
 			print_info 2 "LOGFILE: ${CMD_LOGFILE}"
 			;;
 		--kerneldir=*)
-			CMD_KERNEL_DIR=`parse_opt "$*"`
+			CMD_KERNEL_DIR="${*#*=}"
 			print_info 2 "CMD_KERNEL_DIR: ${CMD_KERNEL_DIR}"
 			;;
 		--kernel-config=*)
-			CMD_KERNEL_CONFIG=`parse_opt "$*"`
+			CMD_KERNEL_CONFIG="${*#*=}"
 			print_info 2 "CMD_KERNEL_CONFIG: ${CMD_KERNEL_CONFIG}"
 			;;
 		--module-prefix=*)
-			CMD_INSTALL_MOD_PATH=`parse_opt "$*"`
+			CMD_INSTALL_MOD_PATH="${*#*=}"
 			print_info 2 "CMD_INSTALL_MOD_PATH: ${CMD_INSTALL_MOD_PATH}"
 			;;
 		--cachedir=*)
-			CACHE_DIR=`parse_opt "$*"`
+			CACHE_DIR="${*#*=}"
 			print_info 2 "CACHE_DIR: ${CACHE_DIR}"
 			;;
 		--minkernpackage=*)
-			CMD_MINKERNPACKAGE=`parse_opt "$*"`
+			CMD_MINKERNPACKAGE="${*#*=}"
 			[ ${CMD_MINKERNPACKAGE:0:1} != / ] && CMD_MINKERNPACKAGE=$PWD/$CMD_MINKERNPACKAGE
 			print_info 2 "MINKERNPACKAGE: ${CMD_MINKERNPACKAGE}"
 			;;
 		--modulespackage=*)
-			CMD_MODULESPACKAGE=`parse_opt "$*"`
+			CMD_MODULESPACKAGE="${*#*=}"
 			[ ${CMD_MODULESPACKAGE:0:1} != / ] && CMD_MODULESPACKAGE=$PWD/$CMD_MODULESPACKAGE
 			print_info 2 "MODULESPACKAGE: ${CMD_MODULESPACKAGE}"
 			;;
 		--kerncache=*)
-			CMD_KERNCACHE=`parse_opt "$*"`
+			CMD_KERNCACHE="${*#*=}"
 			[ ${CMD_KERNCACHE:0:1} != / ] && CMD_KERNCACHE=$PWD/$CMD_KERNCACHE
 			print_info 2 "KERNCACHE: ${CMD_KERNCACHE}"
 			;;
 		--kernname=*)
-			CMD_KERNNAME=`parse_opt "$*"`
+			CMD_KERNNAME="${*#*=}"
 			print_info 2 "KERNNAME: ${CMD_KERNNAME}"
 			;;
 		--symlink|--no-symlink)
@@ -556,15 +556,15 @@ parse_cmdline() {
 			print_info 2 "CMD_KERNEL_SOURCES: ${CMD_KERNEL_SOURCES}"
 			;;
 		--initramfs-overlay=*)
-			CMD_INITRAMFS_OVERLAY=`parse_opt "$*"`
+			CMD_INITRAMFS_OVERLAY="${*#*=}"
 			print_info 2 "CMD_INITRAMFS_OVERLAY: ${CMD_INITRAMFS_OVERLAY}"
 			;;
 		--linuxrc=*)
-			CMD_LINUXRC=`parse_opt "$*"`
+			CMD_LINUXRC="${*#*=}"
 			print_info 2 "CMD_LINUXRC: ${CMD_LINUXRC}"
 			;;
 		--busybox-config=*)
-			CMD_BUSYBOX_CONFIG=`parse_opt "$*"`
+			CMD_BUSYBOX_CONFIG="${*#*=}"
 			print_info 2 "CMD_BUSYBOX_CONFIG: ${CMD_BUSYBOX_CONFIG}"
 			;;
 		--genzimage)
@@ -591,12 +591,12 @@ parse_cmdline() {
 			print_info 2 "CMD_FIRMWARE: ${CMD_FIRMWARE}"
 			;;
 		--firmware-dir=*)
-			CMD_FIRMWARE_DIR=`parse_opt "$*"`
+			CMD_FIRMWARE_DIR="${*#*=}"
 			CMD_FIRMWARE=1
 			print_info 2 "CMD_FIRMWARE_DIR: ${CMD_FIRMWARE_DIR}"
 			;;
 		--firmware-files=*)
-			CMD_FIRMWARE_FILES=`parse_opt "$*"`
+			CMD_FIRMWARE_FILES="${*#*=}"
 			CMD_FIRMWARE=1
 			print_info 2 "CMD_FIRMWARE_FILES: ${CMD_FIRMWARE_FILES}"
 			;;
@@ -613,18 +613,18 @@ parse_cmdline() {
 			print_info 2 "CMD_COMPRESS_INITRD=${CMD_COMPRESS_INITRD}"
 			;;
 		--compress-initramfs-type=*|--compress-initrd-type=*)
-			COMPRESS_INITRD_TYPE=`parse_opt "$*"`
+			COMPRESS_INITRD_TYPE="${*#*=}"
 			print_info 2 "CMD_COMPRESS_INITRD_TYPE: ${CMD_LINUXRC}"
 			;;
 		--config=*)
-			print_info 2 "CMD_GK_CONFIG: `parse_opt "$*"`"
+			print_info 2 "CMD_GK_CONFIG: "${*#*=}""
 			;;
 		--nice)
 			CMD_NICE=10
 			print_info 2 "CMD_NICE: ${CMD_NICE}"
 			;;
 		--nice=*)
-			CMD_NICE=`parse_opt "$*"`
+			CMD_NICE="${*#*=}"
 			if [ ${CMD_NICE} -lt 0 -o ${CMD_NICE} -gt 19 ]
 			then
 				echo "Error:  Illegal value specified for --nice= parameter."

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

[Robin H. Johnson]

commit:     b215516a4d6dbee6cc56fbb0fe4a44482936a444
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 21:33:07 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 21:33:07 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b215516a

Bump version to 3.5.0.4

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

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

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

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

[Richard Yao]

commit:     6b5eb0fe52a49b1aa050f4b9f2e46b03f5c2940c
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 14:46:35 2016 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 15:39:24 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6b5eb0fe

Include libgcc_s.so.1 with ZFS support

The resumable send/recv work added an indirect dependency on
libgcc_s.so.1, which libpthread opens via dlopen for _Unwind_Resume().
If we do not include it, we will see:

libgcc_s.so.1 must be installed for pthread_cancel to work

Lets include it for now. We make an effort to include only 1 version.
This might not work on all architectures, but for lack of ability to
test, it will need to do for now. It also will use gcc-config if it is
avaliable.

This also enables functions in zdb that previously did not work due to
the same issue.

Original-patch-by: Jason Zaman <perfinion <AT> gentoo.org>
Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

 gen_initramfs.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 1fd5d2a..ea4a771 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -491,7 +491,14 @@ append_zfs(){
 	done
 
 	# Copy binaries
-	copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zdb,zfs,zpool}
+	# Include libgcc_s.so.1 to workaround zfsonlinux/zfs#4749
+	if type gcc-config 2>&1 1>/dev/null; then
+		copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zdb,zfs,zpool} \
+			"/usr/lib/gcc/$(s=$(gcc-config -c); echo ${s%-*}/${s##*-})/libgcc_s.so.1"
+	else
+		copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zdb,zfs,zpool} \
+			/usr/lib/gcc/*/*/libgcc_s.so.1
+	fi
 
 	cd "${TEMP}/initramfs-zfs-temp/"
 	log_future_cpio_content

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

[Robin H. Johnson]

commit:     e83b5e6d0b48cb87465f3d6c134fecd5c1a2df58
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 22:23:56 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 22:24:00 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e83b5e6d

Bump version to 3.5.0.5

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

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

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

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

[Richard Farina]

commit:     f1009fdc9d720bde0b2332179a44a0be51dcd9c6
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 27 04:36:31 2016 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Oct 27 04:36:31 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f1009fdc

initial early-microcode support

automatically detect if it is possible to prepend cpu ucode to the
initramfs, and then, you know, do it.  Left a few blanks because it's
super later and I'm tired of working on this.  I can continue if no one
beats me to it.

 gen_funcs.sh     |  2 +-
 gen_initramfs.sh | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 7e974de..1bdaa7b 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -262,7 +262,7 @@ then
 	for i in ${TMPDIR_CONTENTS}
 	do
 		print_info 1 "	 >> removing ${i}"
-		rm ${TMPDIR}/${i}
+		rm -r ${TMPDIR}/${i}
 	done
 fi
 }

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index ea4a771..fb74929 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1040,6 +1040,40 @@ create_initramfs() {
 				print_info 1 "        >> Not compressing cpio data ..."
 			fi
 		fi
+		## To early load microcode we need to follow some pretty specific steps
+		## mostly laid out in linux/Documentation/x86/early-microcode.txt
+		#if CONFIG_MICROCODE=y; then
+			print_info 1 "early-microcode: >> Preparing..."
+			UCODEDIR="${TMPDIR}/ucode_tmp/kernel/x86/microcode/"
+			mkdir -p "${UCODEDIR}"
+			#if CONFIG_MICROCODE_INTEL=y; then
+				if [ "$(ls -A /lib/firmware/intel-ucode)" ]; then
+					print_info 1 "                 >> adding GenuineIntel.bin"
+					cat /lib/firmware/intel-ucode/* > "${UCODEDIR}/GenuineIntel.bin" || gen_die "Failed to concat intel cpu ucode"
+				#else
+					#print_info 1 "CONFIG_MICROCODE_INTEL=y set but no ucode available. Please install sys-firmware/intel-microcode[split-ucode]"
+				fi
+			#fi
+			#if CONFIG_MICROCODE_AMD=y; then
+				if [ "$(ls -A /lib/firmware/amd-ucode)" ]; then
+					print_info 1 "                 >> adding AuthenticAMD.bin"
+					cat /lib/firmware/amd-ucode/*.bin > "${UCODEDIR}/AuthenticAMD.bin" || gen_dir "Failed to concat amd cpu ucode"
+				#else
+					#print_info 1 "CONFIG_MICROCODE_AMD=y set but no ucode available.  Please install sys-firmware/linux-firmware"
+				fi
+			#fi
+			if [ "$(ls -A ${UCODE})" ]; then
+				print_info 1 "early-microcode: >> Creating cpio..."
+				pushd "${TMPDIR}/ucode_tmp" > /dev/null
+				find . | cpio -o -H newc > ../ucode.cpio || gen_die "Failed to create cpu microcode cpio"
+				popd > /dev/null
+				print_info 1 "early-microcode: >> Prepending early-microcode to initramfs"
+				cat "${TMPDIR}/ucode.cpio" "${CPIO}" > "${CPIO}.early-microcode" || gen_die "Failed to prepend early-microcode to initramfs"
+				mv -f "${CPIO}.early-microcode" "${CPIO}" || gen_die "Rename failed"
+			#else
+				#print_info 1 "CONFIG_MICROCODE=y is set but no microcode found"
+			fi
+		#fi
 		if isTrue "${WRAP_INITRD}"
 		then
 			local mkimage_cmd=$(type -p mkimage)

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

[Richard Farina]

commit:     1f1a4409da8dcd38aa0ec27f7f07d07ed866bc0b
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 27 15:09:30 2016 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Oct 27 15:09:30 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1f1a4409

enhance early microcode by actually checking if it will work

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index fb74929..1f62f5c 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1042,26 +1042,26 @@ create_initramfs() {
 		fi
 		## To early load microcode we need to follow some pretty specific steps
 		## mostly laid out in linux/Documentation/x86/early-microcode.txt
-		#if CONFIG_MICROCODE=y; then
+		if grep -sq '^CONFIG_MICROCODE=y' "${KERNEL_OUTPUTDIR}"/.config; then
 			print_info 1 "early-microcode: >> Preparing..."
 			UCODEDIR="${TMPDIR}/ucode_tmp/kernel/x86/microcode/"
 			mkdir -p "${UCODEDIR}"
-			#if CONFIG_MICROCODE_INTEL=y; then
+			if grep -sq '^CONFIG_MICROCODE_INTEL=y' "${KERNEL_OUTPUTDIR}"/.config; then
 				if [ "$(ls -A /lib/firmware/intel-ucode)" ]; then
 					print_info 1 "                 >> adding GenuineIntel.bin"
 					cat /lib/firmware/intel-ucode/* > "${UCODEDIR}/GenuineIntel.bin" || gen_die "Failed to concat intel cpu ucode"
-				#else
-					#print_info 1 "CONFIG_MICROCODE_INTEL=y set but no ucode available. Please install sys-firmware/intel-microcode[split-ucode]"
+				else
+					print_info 1 "CONFIG_MICROCODE_INTEL=y set but no ucode available. Please install sys-firmware/intel-microcode[split-ucode]"
 				fi
-			#fi
-			#if CONFIG_MICROCODE_AMD=y; then
+			fi
+			if grep -sq '^CONFIG_MICROCODE_AMD=y' "${KERNEL_OUTPUTDIR}"/.config; then
 				if [ "$(ls -A /lib/firmware/amd-ucode)" ]; then
 					print_info 1 "                 >> adding AuthenticAMD.bin"
 					cat /lib/firmware/amd-ucode/*.bin > "${UCODEDIR}/AuthenticAMD.bin" || gen_dir "Failed to concat amd cpu ucode"
-				#else
-					#print_info 1 "CONFIG_MICROCODE_AMD=y set but no ucode available.  Please install sys-firmware/linux-firmware"
+				else
+					print_info 1 "CONFIG_MICROCODE_AMD=y set but no ucode available.  Please install sys-firmware/linux-firmware"
 				fi
-			#fi
+			fi
 			if [ "$(ls -A ${UCODE})" ]; then
 				print_info 1 "early-microcode: >> Creating cpio..."
 				pushd "${TMPDIR}/ucode_tmp" > /dev/null
@@ -1070,10 +1070,10 @@ create_initramfs() {
 				print_info 1 "early-microcode: >> Prepending early-microcode to initramfs"
 				cat "${TMPDIR}/ucode.cpio" "${CPIO}" > "${CPIO}.early-microcode" || gen_die "Failed to prepend early-microcode to initramfs"
 				mv -f "${CPIO}.early-microcode" "${CPIO}" || gen_die "Rename failed"
-			#else
-				#print_info 1 "CONFIG_MICROCODE=y is set but no microcode found"
+			else
+				print_info 1 "CONFIG_MICROCODE=y is set but no microcode found"
 			fi
-		#fi
+		fi
 		if isTrue "${WRAP_INITRD}"
 		then
 			local mkimage_cmd=$(type -p mkimage)

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

[Robin H. Johnson]

commit:     ad4b9adaacb37ed5ba00538a89c5ef51411dd887
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 27 16:30:25 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 27 16:30:25 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ad4b9ada

Bump version to 3.5.0.6

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

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

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

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

[Matt Thode]

commit:     ea84d161aa142d642443623deb4cac27b028a63a
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Mon Jan  2 00:45:39 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 00:45:39 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ea84d161

update initramfs generation to not always copy ld.so

fixes gen_initramfs.sh on musl systems

 gen_initramfs.sh | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 1f62f5c..268bc2d 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -533,13 +533,24 @@ append_linker() {
 		rm -r "${TEMP}/initramfs-linker-temp"
 	fi
 
-	mkdir -p "${TEMP}/initramfs-linker-temp/etc/ld.so.conf.d"
+	mkdir -p "${TEMP}/initramfs-linker-temp/etc"
 
-	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"
+	if [ -e "/etc/ld.so.conf" ]
+	then
+		cp "/etc/ld.so.conf" "${TEMP}/initramfs-linker-temp/etc/" 2> /dev/null \
+			|| gen_die "Could not copy ld.so.conf"
+	fi
+	if [ -e "/etc/ld.so.cache" ]
+	then
+		cp "/etc/ld.so.cache" "${TEMP}/initramfs-linker-temp/etc/" 2> /dev/null \
+			|| gen_die "Could not copy ld.so.cache"
+	fi
+	if [ -d "/etc/ld.so.conf.d" ]
+	then
+		mkdir -p "${TEMP}/initramfs-linker-temp/etc/ld.so.conf.d"
+		cp -r "/etc/ld.so.conf.d" "${TEMP}/initramfs-linker-temp/etc/" 2> /dev/null \
+			|| gen_die "Could not copy ld.so.conf.d"
+	fi
 
 	cd "${TEMP}/initramfs-linker-temp/"
 	log_future_cpio_content

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

[Matt Thode]

commit:     a22f45125393935e2e0a50cdfc303440cdc946d4
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Mon Jan  2 20:04:56 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 20:04:56 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a22f4512

clean up an if statement

    if [ -f "${BUSYBOX_BINCACHE}" ]

is defined above

 gen_compile.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 3a77a75..2b63f19 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -424,10 +424,7 @@ compile_busybox() {
 		else
 			print_info 1 "busybox: >> Using cache"
 		fi
-	fi
-
-	if [ ! -f "${BUSYBOX_BINCACHE}" ]
-	then
+	else
 		cd "${TEMP}"
 		rm -rf "${BUSYBOX_DIR}" > /dev/null
 		/bin/tar -jxpf ${BUSYBOX_SRCTAR} ||

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

[Robin H. Johnson]

commit:     98c7a1c54c78785862d645df178afdcb8a7722f3
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 20:39:11 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 20:39:11 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=98c7a1c5

gen_compile: ensure toggling NFS options invalidates the bincache of busybox.

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

 gen_compile.sh | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index a730d77..04a7bd4 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -412,11 +412,23 @@ compile_busybox() {
 		gen_die "Could not find a busybox config file"
 	fi
 
+	# Apply config-based tweaks to the busybox config.
+	# This needs to be done before cache validation.
+	cp "${BUSYBOX_CONFIG}" "${TEMP}/busybox-config"
+	if isTrue "${NFS}"
+	then
+		sed -i \
+			-e 's/.*CONFIG_FEATURE_MOUNT_NFS.*/CONFIG_FEATURE_MOUNT_NFS=y/' \
+			"${TEMP}/busybox-config"
+	fi
+
 	# Delete cache if stored config's MD5 does not match one to be used
+	# This exactly just the .config.gk_orig file, and compares it again the
+	# current .config.
 	if [ -f "${BUSYBOX_BINCACHE}" ]
 	then
-		oldconfig_md5=$(tar -xjf "${BUSYBOX_BINCACHE}" -O .config.gk_orig 2>/dev/null | md5sum)
-		newconfig_md5=$(md5sum < "${BUSYBOX_CONFIG}")
+		oldconfig_md5="$(tar -xjf "${BUSYBOX_BINCACHE}" -O .config.gk_orig 2>/dev/null | md5sum)"
+		newconfig_md5="$(md5sum < "${TEMP}/busybox-config")"
 		if [ "${oldconfig_md5}" != "${newconfig_md5}" ]
 		then
 			print_info 1 "busybox: >> Removing stale cache..."
@@ -426,6 +438,9 @@ compile_busybox() {
 		fi
 	fi
 
+	# If the busybox bincache does NOT exist, create it; this cannot be merged
+	# with the above statement, because that statement might remove the
+	# bincache.
 	if [ ! -f "${BUSYBOX_BINCACHE}" ]
 	then
 		cd "${TEMP}"
@@ -434,19 +449,20 @@ compile_busybox() {
 			gen_die 'Could not extract busybox source tarball!'
 		[ -d "${BUSYBOX_DIR}" ] ||
 			gen_die "Busybox directory ${BUSYBOX_DIR} is invalid!"
-		cp "${BUSYBOX_CONFIG}" "${BUSYBOX_DIR}/.config"
-		cp "${BUSYBOX_CONFIG}" "${BUSYBOX_DIR}/.config.gk_orig"
-		if isTrue "${NFS}"
-		then
-			sed -i 's/.*CONFIG_FEATURE_MOUNT_NFS.*/CONFIG_FEATURE_MOUNT_NFS=y/' "${BUSYBOX_DIR}/.config"
-		fi
+
+		cp "${TEMP}/busybox-config" "${BUSYBOX_DIR}/.config"
+		cp "${BUSYBOX_DIR}/.config" "${BUSYBOX_DIR}/.config.gk_orig" # used for the bincache compare
+
 		cd "${BUSYBOX_DIR}"
 		apply_patches busybox ${BUSYBOX_VER}
+
+		# This has the side-effect of changing the .config
 		print_info 1 'busybox: >> Configuring...'
 		yes '' 2>/dev/null | compile_generic oldconfig utils
 
 		print_info 1 'busybox: >> Compiling...'
 		compile_generic all utils V=1
+
 		print_info 1 'busybox: >> Copying to cache...'
 		[ -f "${TEMP}/${BUSYBOX_DIR}/busybox" ] ||
 			gen_die 'Busybox executable does not exist!'

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

[Robin H. Johnson]

commit:     73c852a0c1f0e906fc0a9af64aa642b96bed73e7
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 20:24:55 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 20:24:55 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=73c852a0

Revert "clean up an if statement"

This reverts commit a22f45125393935e2e0a50cdfc303440cdc946d4.

The first if statement checks if busybox cache exists, and if so, does
it need to be invalidated (rm the cache file).

The second if statement checks if the cache does NOT exist, and builds
the new busybox cache.

 gen_compile.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 70a6732..a730d77 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -424,7 +424,10 @@ compile_busybox() {
 		else
 			print_info 1 "busybox: >> Using cache"
 		fi
-	else
+	fi
+
+	if [ ! -f "${BUSYBOX_BINCACHE}" ]
+	then
 		cd "${TEMP}"
 		rm -rf "${BUSYBOX_DIR}" > /dev/null
 		/bin/tar -jxpf ${BUSYBOX_SRCTAR} ||

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

[Robin H. Johnson]

commit:     e04962507dee60ce593dd6bb60ed315340056b12
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 22:24:43 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 22:26:19 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e0496250

gen_configkernel: respect user-set kconfig.

Blindly using kconfig_set_opt can override user-set configuration
options.

Fetch the option from the kconfig first, and override it if needed.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=602768
X-Gentoo-Bug: 602768
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 gen_configkernel.sh | 62 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 52 insertions(+), 10 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index f746dba..8d3534b 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -113,26 +113,53 @@ config_kernel() {
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT2_FS" "y"
 	fi
 
+	# If the user has configured DM as built-in, we need to respect that.
+	cfg_CONFIG_BLK_DEV_DM=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM")
+	case "$cfg_CONFIG_BLK_DEV_DM" in
+		y|m) ;; # Do nothing
+		*) cfg_CONFIG_BLK_DEV_DM='m'
+	esac
+
 	# Make sure lvm modules are on if --lvm
 	if isTrue ${CMD_LVM}
 	then
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "m"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_SNAPSHOT" "m"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MIRROR" "m"
+		cfg_CONFIG_DM_SNAPSHOT=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_SNAPSHOT")
+		case "$cfg_CONFIG_DM_SNAPSHOT" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_DM_SNAPSHOT='m'
+		esac
+		cfg_CONFIG_DM_MIRROR=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MIRROR")
+		case "$cfg_CONFIG_DM_MIRROR" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_DM_MIRROR='m'
+		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_SNAPSHOT" "${cfg_CONFIG_DM_SNAPSHOT}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MIRROR" "${cfg_CONFIG_DM_MIRROR}"
 	fi
 
 	# Multipath
 	if isTrue ${CMD_MULTIPATH}
 	then
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "m"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH" "m"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH_RDAC" "m"
+		cfg_CONFIG_DM_MULTIPATH=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH")
+		case "$cfg_CONFIG_DM_MULTIPATH" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_DM_MULTIPATH='m'
+		esac
+		cfg_CONFIG_DM_MULTIPATH_RDAC=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH_RDAC")
+		case "$cfg_CONFIG_DM_MULTIPATH_RDAC" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_DM_MULTIPATH_RDAC='m'
+		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH" "${cfg_CONFIG_DM_MULTIPATH}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH_RDAC" "${cfg_CONFIG_DM_MULTIPATH_RDAC}"
 	fi
 
 	# Make sure dmraid modules are on if --dmraid
 	if isTrue ${CMD_DMRAID}
 	then
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "m"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}"
 	fi
 
 	# Make sure iSCSI modules are enabled in the kernel, if --iscsi
@@ -140,8 +167,18 @@ config_kernel() {
 	# CONFIG_ISCSI_TCP
 	if isTrue ${CMD_ISCSI}
 	then
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_TCP" "m"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_ISCSI_ATTRS" "m"
+		cfg_CONFIG_ISCSI_TCP=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_TCP")
+		case "$cfg_CONFIG_ISCSI_TCP" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_ISCSI_TCP='m'
+		esac
+		cfg_CONFIG_SCSI_ISCSI_ATTRS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_ISCSI_ATTRS")
+		case "$cfg_CONFIG_SCSI_ISCSI_ATTRS" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_SCSI_ISCSI_ATTRS='m'
+		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_TCP" "${cfg_CONFIG_ISCSI_TCP}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_ISCSI_ATTRS" "${cfg_CONFIG_SCSI_ISCSI_ATTRS}"
 	fi
 
 	if isTrue ${SPLASH}
@@ -167,7 +204,12 @@ config_kernel() {
 			CONFIG_SCSI_VIRTIO \
 			CONFIG_VHOST_NET \
 			; do
-			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "$k" "y"
+			cfg___virtio_opt=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "$k")
+			case "$cfg___virtio_opt" in
+				y|m) ;; # Do nothing
+				*) cfg___virtio_opt='y'
+			esac
+			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "$k" "${cfg___virtio_opt}"
 		done
 	fi
 }

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

[Robin H. Johnson]

commit:     bfde45d5fd1840fe604d024617e8f4dc1edf5430
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 22:26:00 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 22:26:43 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=bfde45d5

gen_funcs: clean whitespace in kconfig_get_opt.

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

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

diff --git a/gen_funcs.sh b/gen_funcs.sh
index d669548..6234189 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -540,7 +540,7 @@ function kconfig_get_opt() {
 	kconfig="$1"
 	optname="$2"
 	sed -n "${kconfig}" \
-		-e "/^#\? \?${optname}[ =].*/{ s/.*${optname}[ =]//g; s/is not set//g; p; q }"
+		-e "/^#\? \?${optname}[ =].*/{ s/.*${optname}[ =]//g; s/is not set\| +//g; p; q }"
 }
 
 function kconfig_set_opt() {

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

[Robin H. Johnson]

commit:     a94d0bbf1c7338691fde2cbf5768fd843c267bb0
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 22:13:29 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 22:13:29 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a94d0bbf

funcs: kconfig_*opt functions can be used for busybox as well.

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

 gen_configkernel.sh | 16 ----------------
 gen_funcs.sh        | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index d050296..f746dba 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -32,22 +32,6 @@ determine_config_file() {
 	fi
 }
 
-function kconfig_get_opt() {
-	kconfig="$1"
-	optname="$2"
-	sed -n "${kconfig}" \
-		-e "/^#\? \?${optname}[ =].*/{ s/.*${optname}[ =]//g; s/is not set//g; p; q }"
-}
-
-function kconfig_set_opt() {
-	kconfig="$1"
-	optname="$2"
-	optval="$3"
-	sed -i "${kconfig}" \
-		-e "s/^#\? \?${optname}[ =].*/${optname}=${optval}/g" \
-	|| gen_die "Failed to set ${optname}=${optval} in $kconfig"
-}
-
 config_kernel() {
 	determine_config_file
 	cd "${KERNEL_DIR}" || gen_die 'Could not switch to the kernel directory!'

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 1bdaa7b..d669548 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -535,3 +535,19 @@ find_kernel_binary() {
 	cd "${curdir}"
 	echo "${tmp_kernel_binary}"
 }
+
+function kconfig_get_opt() {
+	kconfig="$1"
+	optname="$2"
+	sed -n "${kconfig}" \
+		-e "/^#\? \?${optname}[ =].*/{ s/.*${optname}[ =]//g; s/is not set//g; p; q }"
+}
+
+function kconfig_set_opt() {
+	kconfig="$1"
+	optname="$2"
+	optval="$3"
+	sed -i "${kconfig}" \
+		-e "s/^#\? \?${optname}[ =].*/${optname}=${optval}/g" \
+	|| gen_die "Failed to set ${optname}=${optval} in $kconfig"
+}

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

[Robin H. Johnson]

commit:     f502fd4de64f3e2140659e68a430577f2f5227f1
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 22:14:58 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 22:14:58 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f502fd4d

gen_compile: cleaner config changing.

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

 gen_compile.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 04a7bd4..7cc4733 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -417,9 +417,7 @@ compile_busybox() {
 	cp "${BUSYBOX_CONFIG}" "${TEMP}/busybox-config"
 	if isTrue "${NFS}"
 	then
-		sed -i \
-			-e 's/.*CONFIG_FEATURE_MOUNT_NFS.*/CONFIG_FEATURE_MOUNT_NFS=y/' \
-			"${TEMP}/busybox-config"
+		kconfig_set_opt "${TEMP}/busybox-config" CONFIG_FEATURE_MOUNT_NFS y
 	fi
 
 	# Delete cache if stored config's MD5 does not match one to be used

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

[Robin H. Johnson]

commit:     bcedd62696efcef13d537d240f9add87336192a0
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 22:11:43 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 22:11:43 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=bcedd626

gen_configkernel: function to fetch variable.

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

 gen_configkernel.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 390a6da..d050296 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -32,6 +32,13 @@ determine_config_file() {
 	fi
 }
 
+function kconfig_get_opt() {
+	kconfig="$1"
+	optname="$2"
+	sed -n "${kconfig}" \
+		-e "/^#\? \?${optname}[ =].*/{ s/.*${optname}[ =]//g; s/is not set//g; p; q }"
+}
+
 function kconfig_set_opt() {
 	kconfig="$1"
 	optname="$2"

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

[Robin H. Johnson]

commit:     7b26070d4c57e59a4df26b29175be2d46518e919
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 22:37:47 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 22:37:47 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7b26070d

gen_configkernel: ensure ISCSI sysfs params present.

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

 gen_configkernel.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 8d3534b..9c37649 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -167,6 +167,11 @@ config_kernel() {
 	# CONFIG_ISCSI_TCP
 	if isTrue ${CMD_ISCSI}
 	then
+		cfg_CONFIG_ISCSI_BOOT_SYSFS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_BOOT_SYSFS")
+		case "$cfg_CONFIG_ISCSI_BOOT_SYSFS" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_ISCSI_BOOT_SYSFS='m'
+		esac
 		cfg_CONFIG_ISCSI_TCP=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_TCP")
 		case "$cfg_CONFIG_ISCSI_TCP" in
 			y|m) ;; # Do nothing
@@ -177,6 +182,7 @@ config_kernel() {
 			y|m) ;; # Do nothing
 			*) cfg_CONFIG_SCSI_ISCSI_ATTRS='m'
 		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_BOOT_SYSFS" "${cfg_CONFIG_ISCSI_BOOT_SYSFS}"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_TCP" "${cfg_CONFIG_ISCSI_TCP}"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_ISCSI_ATTRS" "${cfg_CONFIG_SCSI_ISCSI_ATTRS}"
 	fi

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

[Robin H. Johnson]

commit:     c2eebda7f0e16390ab0dd45d604285fba403abb8
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 22:57:12 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 22:57:12 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c2eebda7

Make early microcode loading optional.

Nasty corner case with early microcode loading is that there are some
processors that hardlock when the new microcode is loaded.

Disable microcode loading by default to avoid crashing those systems.

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

 gen_cmdline.sh       |  4 ++++
 gen_configkernel.sh  | 22 ++++++++++++++++++++++
 gen_determineargs.sh |  1 +
 gen_initramfs.sh     |  2 +-
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 57a8e1d..f4392f9 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -314,6 +314,10 @@ parse_cmdline() {
 			CMD_BUSYBOX=`parse_optbool "$*"`
 			print_info 2 "CMD_BUSYBOX: ${CMD_BUSYBOX}"
 			;;
+		--microcode|--no-microcode)
+			CMD_MICROCODE=`parse_optbool "$*"`
+			print_info 2 "CMD_MICROCODE: ${CMD_MICROCODE}"
+			;;
 		--nfs|--no-nfs)
 			CMD_NFS=`parse_optbool "$*"`
 			print_info 2 "CMD_NFS: ${CMD_NFS}"

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 9c37649..74693f3 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -218,4 +218,26 @@ config_kernel() {
 			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "$k" "${cfg___virtio_opt}"
 		done
 	fi
+
+	# Microcode setting, intended for early microcode loading
+	# needs to be compiled in.
+	if isTrue ${MICROCODE}
+	then
+		for k in \
+			CONFIG_MICROCODE \
+			CONFIG_MICROCODE_INTEL \
+			CONFIG_MICROCODE_AMD \
+			CONFIG_MICROCODE_OLD_INTERFACE \
+			CONFIG_MICROCODE_INTEL_EARLY \
+			CONFIG_MICROCODE_AMD_EARLY \
+			CONFIG_MICROCODE_EARLY \
+			; do
+			cfg=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "$k")
+			case "$cfg" in
+				y) ;; # Do nothing
+				*) cfg='y'
+			esac
+			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "$k" "${cfg}"
+		done
+	fi
 }

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 0d908b6..2dbd958 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -117,6 +117,7 @@ determine_real_args() {
 	set_config_with_override BOOL   ISCSI                CMD_ISCSI
 	set_config_with_override BOOL   BUSYBOX              CMD_BUSYBOX              "yes"
 	set_config_with_override BOOL   NFS                  CMD_NFS                  "yes"
+	set_config_with_override BOOL   MICROCODE            CMD_MICROCODE
 	set_config_with_override BOOL   UNIONFS              CMD_UNIONFS
 	set_config_with_override BOOL   NETBOOT              CMD_NETBOOT
 	set_config_with_override STRING REAL_ROOT            CMD_REAL_ROOT

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index e968719..afbef92 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1056,7 +1056,7 @@ create_initramfs() {
 		## It only loads monolithic ucode from an uncompressed cpio, which MUST
 		## be before the other cpio archives in the stream.
 		cfg_CONFIG_MICROCODE=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE)
-		if [ "${cfg_CONFIG_MICROCODE}" == "y" ]; then
+		if isTrue "${MICROCODE}" && [ "${cfg_CONFIG_MICROCODE}" == "y" ]; then
 			cfg_CONFIG_MICROCODE_INTEL=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_INTEL)
 			cfg_CONFIG_MICROCODE_AMD=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_AMD)
 			print_info 1 "early-microcode: >> Preparing..."

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

[Robin H. Johnson]

commit:     dae8d61f014283ef86ead2251f2b355004bc3f42
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 22:50:20 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 22:50:20 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=dae8d61f

gen_initramfs: cleaner conditionals for microcode

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

 gen_initramfs.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 268bc2d..e968719 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1053,27 +1053,32 @@ create_initramfs() {
 		fi
 		## To early load microcode we need to follow some pretty specific steps
 		## mostly laid out in linux/Documentation/x86/early-microcode.txt
-		if grep -sq '^CONFIG_MICROCODE=y' "${KERNEL_OUTPUTDIR}"/.config; then
+		## It only loads monolithic ucode from an uncompressed cpio, which MUST
+		## be before the other cpio archives in the stream.
+		cfg_CONFIG_MICROCODE=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE)
+		if [ "${cfg_CONFIG_MICROCODE}" == "y" ]; then
+			cfg_CONFIG_MICROCODE_INTEL=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_INTEL)
+			cfg_CONFIG_MICROCODE_AMD=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_AMD)
 			print_info 1 "early-microcode: >> Preparing..."
 			UCODEDIR="${TMPDIR}/ucode_tmp/kernel/x86/microcode/"
 			mkdir -p "${UCODEDIR}"
-			if grep -sq '^CONFIG_MICROCODE_INTEL=y' "${KERNEL_OUTPUTDIR}"/.config; then
-				if [ "$(ls -A /lib/firmware/intel-ucode)" ]; then
+			if [  "${cfg_CONFIG_MICROCODE_INTEL}" == "y" ]; then
+				if [ -d /lib/firmware/intel-ucode ]; then
 					print_info 1 "                 >> adding GenuineIntel.bin"
 					cat /lib/firmware/intel-ucode/* > "${UCODEDIR}/GenuineIntel.bin" || gen_die "Failed to concat intel cpu ucode"
 				else
 					print_info 1 "CONFIG_MICROCODE_INTEL=y set but no ucode available. Please install sys-firmware/intel-microcode[split-ucode]"
 				fi
 			fi
-			if grep -sq '^CONFIG_MICROCODE_AMD=y' "${KERNEL_OUTPUTDIR}"/.config; then
-				if [ "$(ls -A /lib/firmware/amd-ucode)" ]; then
+			if [  "${cfg_CONFIG_MICROCODE_AMD}" == "y" ]; then
+				if [ -d /lib/firmware/amd-ucode ]; then
 					print_info 1 "                 >> adding AuthenticAMD.bin"
 					cat /lib/firmware/amd-ucode/*.bin > "${UCODEDIR}/AuthenticAMD.bin" || gen_dir "Failed to concat amd cpu ucode"
 				else
 					print_info 1 "CONFIG_MICROCODE_AMD=y set but no ucode available.  Please install sys-firmware/linux-firmware"
 				fi
 			fi
-			if [ "$(ls -A ${UCODE})" ]; then
+			if [ -f "${UCODEDIR}/AuthenticAMD.bin" -o -f "${UCODEDIR}/GenuineIntel.bin" ]; then
 				print_info 1 "early-microcode: >> Creating cpio..."
 				pushd "${TMPDIR}/ucode_tmp" > /dev/null
 				find . | cpio -o -H newc > ../ucode.cpio || gen_die "Failed to create cpu microcode cpio"

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

[Robin H. Johnson]

commit:     8de563ba9df1c81c23a8daccc7c69f45b31cb518
Author:     Vadim A. Misbakh-Soloviov (mva) <gentoo <AT> mva <DOT> name>
AuthorDate: Mon Jan  2 23:08:07 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 23:08:29 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8de563ba

Implement kernel nconfig just like menuconfig.

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

 gen_cmdline.sh       | 19 +++++++++++++++++++
 gen_configkernel.sh  |  5 +++++
 gen_determineargs.sh |  1 +
 genkernel.conf       |  6 ++++++
 4 files changed, 31 insertions(+)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index f4392f9..0e1e7ef 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -27,6 +27,8 @@ longusage() {
   echo "  Kernel Configuration settings"
   echo "	--menuconfig		Run menuconfig after oldconfig"
   echo "	--no-menuconfig		Do not run menuconfig after oldconfig"
+  echo "	--nconfig		Run nconfig after oldconfig"
+  echo "	--no-nconfig		Do not run nconfig after oldconfig"
   echo "	--gconfig			Run gconfig after oldconfig"
   echo "	--no-gconfig		Don't run gconfig after oldconfig"
   echo "	--xconfig			Run xconfig after oldconfig"
@@ -185,6 +187,7 @@ usage() {
   echo
   echo 'Some useful options:'
   echo '	--menuconfig		Run menuconfig after oldconfig'
+  echo '	--nconfig		Run nconfig after oldconfig (requires ncurses)'
   echo '	--no-clean		Do not run make clean before compilation'
   echo '	--no-mrproper		Do not run make mrproper before compilation,'
   echo '				this is implied by --no-clean.'
@@ -411,6 +414,22 @@ parse_cmdline() {
 			CMD_MENUCONFIG=0
 			print_info 2 "CMD_MENUCONFIG: ${CMD_MENUCONFIG}"
 			;;
+		--nconfig)
+			TERM_LINES=`stty -a | head -n 1 | cut -d\  -f5 | cut -d\; -f1`
+			TERM_COLUMNS=`stty -a | head -n 1 | cut -d\  -f7 | cut -d\; -f1`
+			if [[ TERM_LINES -lt 19 || TERM_COLUMNS -lt 80 ]]
+			then
+				echo "Error: You need a terminal with at least 80 columns"
+				echo "		 and 19 lines for --nconfig; try --no-nconfig..."
+				exit 1
+			fi
+			CMD_NCONFIG=1
+			print_info 2 "CMD_NCONFIG: ${CMD_NCONFIG}"
+			;;
+		--no-nconfig)
+			CMD_NCONFIG=0
+			print_info 2 "CMD_NCONFIG: ${CMD_NCONFIG}"
+			;;
 		--gconfig|--no-gconfig)
 			CMD_GCONFIG=`parse_optbool "$*"`
 			print_info 2 "CMD_GCONFIG: ${CMD_GCONFIG}"

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 74693f3..6ca0200 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -90,6 +90,11 @@ config_kernel() {
 		print_info 1 'kernel: >> Invoking menuconfig...'
 		compile_generic menuconfig kernelruntask
 		[ "$?" ] || gen_die 'Error: menuconfig failed!'
+	elif isTrue ${NCONFIG}
+	then
+		print_info 1 'kernel: >> Invoking nconfig...'
+		compile_generic nconfig kernelruntask
+		[ "$?" ] || gen_die 'Error: nconfig failed!'
 	elif isTrue ${CMD_GCONFIG}
 	then
 		print_info 1 'kernel: >> Invoking gconfig...'

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 2dbd958..313dbd0 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -98,6 +98,7 @@ determine_real_args() {
 	set_config_with_override BOOL   POSTCLEAR            CMD_POSTCLEAR
 	set_config_with_override BOOL   MRPROPER             CMD_MRPROPER
 	set_config_with_override BOOL   MENUCONFIG           CMD_MENUCONFIG
+	set_config_with_override BOOL   NCONFIG              CMD_NCONFIG
 	set_config_with_override BOOL   CLEAN                CMD_CLEAN
 
 	set_config_with_override STRING MINKERNPACKAGE       CMD_MINKERNPACKAGE

diff --git a/genkernel.conf b/genkernel.conf
index e62d294..7e5a46f 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -17,6 +17,12 @@ OLDCONFIG="yes"
 # Run 'make menuconfig' before compiling this kernel?
 MENUCONFIG="no"
 
+# Run 'make nconfig' (ncurses 'menuconfig') before compiling this kernel?
+NCONFIG="no"
+
+# Note, that two previous lines are mutual exclusive (logically), while
+# MENUCONFIG has a higher priority if both them is enabled.
+
 # Run 'make clean' before compilation?
 # If set to NO, implies MRPROPER WILL NOT be run
 # Also, if clean is NO, it won't copy over any configuration

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

[Robin H. Johnson]

commit:     dd93708a41535c57ee031abcd519dc7daa6b8d16
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 23:15:43 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 23:15:43 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=dd93708a

bootloader: be clear when a new grub1 config is made.

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

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

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index fdca749..28fa292 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -63,6 +63,7 @@ set_bootloader_grub() {
 
 	if [ ! -e ${GRUB_CONF} ]
 	then
+		print_warning 1 "No ${GRUB_CONF} found, generating!"
 		local GRUB_BOOTFS
 		if [ -n "${BOOTFS}" ]
 		then

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

[Robin H. Johnson]

commit:     087b065856cc545a0e3f6fa34575606bb8bc2d14
Author:     Gil Kloepfer <gbz <AT> kloepfer <DOT> org>
AuthorDate: Mon Jan  2 23:25:22 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 23:25:22 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=087b0658

Document additional modules via AMODULES*

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=499628
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 genkernel.conf | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/genkernel.conf b/genkernel.conf
index 7e5a46f..9ff7e4f 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -290,6 +290,15 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 # included...
 #MINKERNPACKAGE="/path/to/file.bz2"
 
+# Add additional modules to the ramdisk using the module groups defined
+# in /usr/share/genkernel/default/modules_load (see this file for
+# more details).  This would be used if, for example, you
+# required an additional crypto module or network device at boot
+# time and did not want to staticly compile these in the kernel.
+# Options take the form AMODULES_{group} where {group} is one of
+# the groups in modules_load (which are in the form MODULES_{group}).
+# Use this with caution.
+#AMODULES_group="module-to-include another-module"
 
 # File to output a .tar.bz2'd modules after the
 # callbacks have run

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

[Robin H. Johnson]

commit:     9b0c1e77ce56c409831a553aa3eb2bea33d08ad5
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 23:42:28 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 23:42:28 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9b0c1e77

Bump version to 3.5.0.7

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

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

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

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

[Robin H. Johnson]

commit:     018e01ca7cc80058298e0beb50d48c25629db36b
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 23:45:54 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 23:45:54 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=018e01ca

Bump version to 3.5.0.8

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

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

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

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

[Robin H. Johnson]

commit:     5745d52ff41afb75cca4002db768ed76994cc4ae
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 05:05:39 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 05:05:39 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5745d52f

Allow complete override of MODULES_*

The long-standing but undocumented AMODULES_* options allow adding
ADDITIONAL modules during boot, but there was no way to completely
override the MODULES_* variables.

Add this functionality now, and document it in genkernel.conf.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=186652
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 genkernel      | 20 +++++++++++++++++---
 genkernel.conf |  7 +++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/genkernel b/genkernel
index eeaf5dd..444c559 100755
--- a/genkernel
+++ b/genkernel
@@ -105,16 +105,30 @@ echo
 # Set ${ARCH}
 get_official_arch
 
-# Read arch-specific config
 print_info 1 "Using genkernel.conf from ${_GENKERNEL_CONF}"
+# Save any customizations of MODULES_* first.
+override_module_vars="$(compgen -A variable |grep '^MODULES_')"
+for v in $override_module_vars ; do
+	print_info 1 "Saving $v to override defaults"
+	newvar=override_$v
+	eval "${newvar}='${!v}'"
+done
+
+# Read arch-specific config
 print_info 1 "Sourcing arch-specific config.sh from ${ARCH_CONFIG} .."
 source ${ARCH_CONFIG} || gen_die "Could not read ${ARCH_CONFIG}"
 _MODULES_LOAD=${GK_SHARE}/arch/${ARCH}/modules_load
 print_info 1 "Sourcing arch-specific modules_load from ${_MODULES_LOAD} .."
 source "${_MODULES_LOAD}" || gen_die "Could not read ${_MODULES_LOAD}"
-echo
 
-# Merge modules_load from config
+# Now apply customizations of MODULES_*
+for v in $override_module_vars; do
+	newvar=override_$v
+	print_info 1 "Override $v, default (${!v}), new value (${!newvar})"
+	eval "${v}='${!newvar}'"
+done
+
+# Merge additional modules_load from config
 for group_modules in ${!AMODULES_*}; do
 	group="$(echo $group_modules | cut -d_ -f2)"
 	eval cmodules="\$$group_modules"

diff --git a/genkernel.conf b/genkernel.conf
index 9ff7e4f..10a03bc 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -300,6 +300,13 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 # Use this with caution.
 #AMODULES_group="module-to-include another-module"
 
+# Override the default modules in the ramdisk, for a given group, as defined by
+# /usr/share/genkernel/default/modules_load and the per-arch modules_load
+# files. You PROBABLY want to use AMODULES_* above, and NOT MODULES_* here.
+# If you use MODULES_* here, the default and per-arch modules will NOT be used.
+#MODULES_group1="some-module"
+#MODULES_group2="" # Load no modules for this group
+
 # File to output a .tar.bz2'd modules after the
 # callbacks have run
 #MODULESPACKAGE="/path/to/file.bz2"

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

[Robin H. Johnson]

commit:     002df8f1bfc4e9507b040f3badac19806bb031c0
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 05:37:09 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 05:37:09 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=002df8f1

Tweak wording for --strip.

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

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

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 37d1b5c..5c85140 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -178,7 +178,7 @@ longusage() {
   echo "				Strip debug symbols from the installed kernel, modules,"
   echo "				all (default) or none"
   echo "	--no-strip"
-  echo "				Don't strip installed kernel or modules (alias for --strip=none)"
+  echo "				Don't strip installed kernel or modules, alias for --strip=none"
   echo
   echo "For a detailed list of supported initramfs options and flags; issue:"
   echo "	man 8 genkernel"

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

[Robin H. Johnson]

commit:     c54a9a28526ecc43b9d1192f8edb0b06bfdbc59e
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 00:11:31 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 00:11:31 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c54a9a28

Document microcode & NFS more.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=604538
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 gen_cmdline.sh | 4 ++++
 genkernel.conf | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 5c85140..64ea1ab 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -98,6 +98,10 @@ longusage() {
   echo "	--mdadm			Include MDADM/MDMON support"
   echo "	--no-mdadm		Exclude MDADM/MDMON support"
   echo "	--mdadm-config=<file>	Use file as mdadm.conf in initramfs"
+  echo "	--microcode		Include early microcode support"
+  echo "	--no-microcode	Exclude early microcode support"
+  echo "	--nfs			Include NFS support"
+  echo "	--no-nfs		Exclude NFS support"
   echo "	--dmraid		Include DMRAID support"
   echo "	--no-dmraid		Exclude DMRAID support"
   echo "	--e2fsprogs		Include e2fsprogs"

diff --git a/genkernel.conf b/genkernel.conf
index 10a03bc..a95978d 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -74,6 +74,12 @@ USECOLOR="yes"
 # Add in GnuPG support
 #GPG="no"
 
+# Add in early microcode support
+#MICROCODE="no"
+
+# Add in NFS support
+#NFS="no"
+
 # Add DMRAID support.
 #DMRAID="no"
 

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

[Robin H. Johnson]

commit:     1fbcd207b69f959095fc141837ff75a822c3c459
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  8 00:40:02 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 00:40:02 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1fbcd207

gen_cmdline: missing actual commandline option for SSH.

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

 gen_cmdline.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index b4df913..7e8853b 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -404,6 +404,10 @@ parse_cmdline() {
 			CMD_ISCSI=`parse_optbool "$*"`
 			print_info 2 "CMD_ISCSI: ${CMD_ISCSI}"
 			;;
+		--ssh|--no-ssh)
+			CMD_SSH=`parse_optbool "$*"`
+			print_info 2 "CMD_SSH: ${CMD_SSH}"
+			;;
 		--loglevel=*)
 			CMD_LOGLEVEL="${*#*=}"
 			LOGLEVEL="${CMD_LOGLEVEL}"

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

[Robin H. Johnson]

commit:     143ad04bdb887fbc12101fa21d410107ef6664a6
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  7 23:54:44 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 23:54:44 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=143ad04b

Makefile: use git for versioning tarball.

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

 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5bea2ba..e2e5e50 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-PACKAGE_VERSION = `/bin/fgrep GK_V= genkernel | sed "s/.*GK_V='\([^']\+\)'/\1/"`
+#PACKAGE_VERSION = `/bin/fgrep GK_V= genkernel | sed "s/.*GK_V='\([^']\+\)'/\1/"`
+PACKAGE_VERSION = `git describe --tags`
 distdir = genkernel-$(PACKAGE_VERSION)
 MANPAGE = genkernel.8
 # Add off-Git/generated files here that need to be shipped with releases

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

[Robin H. Johnson]

commit:     fed47394442b82575d0397af560273a45a4c4724
Author:     Tomasz Wasiak <tjwasiak <AT> poczta <DOT> onet <DOT> pl>
AuthorDate: Mon Dec 30 17:06:29 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 01:50:38 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fed47394

Kernel nconfig support

Support for nconfig kernel configuration target.
Minor fixes in [g|x]config support.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=496512#c2
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 gen_configkernel.sh  | 29 ++++++++++++-----------------
 gen_determineargs.sh |  2 ++
 genkernel.conf       |  8 ++++----
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 8d53d20..515a541 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -91,30 +91,25 @@ config_kernel() {
 		print_info 1 "kernel: --clean is disabled; not running 'make clean'."
 	fi
 
+	local add_config
 	if isTrue ${MENUCONFIG}
 	then
-		print_info 1 'kernel: >> Invoking menuconfig...'
-		compile_generic menuconfig kernelruntask
-		[ "$?" ] || gen_die 'Error: menuconfig failed!'
-	elif isTrue ${NCONFIG}
+		add_config=menuconfig
+	elif isTrue ${CMD_NCONFIG}
 	then
-		print_info 1 'kernel: >> Invoking nconfig...'
-		compile_generic nconfig kernelruntask
-		[ "$?" ] || gen_die 'Error: nconfig failed!'
+		add_config=nconfig
 	elif isTrue ${CMD_GCONFIG}
 	then
-		print_info 1 'kernel: >> Invoking gconfig...'
-		compile_generic gconfig kernel
-		[ "$?" ] || gen_die 'Error: gconfig failed!'
-
-		CMD_XCONFIG=0
+		add_config=gconfig
+	elif isTrue ${CMD_XCONFIG}
+	then
+		add_config=xconfig
 	fi
 
-	if isTrue ${CMD_XCONFIG}
-	then
-		print_info 1 'kernel: >> Invoking xconfig...'
-		compile_generic xconfig kernel
-		[ "$?" ] || gen_die 'Error: xconfig failed!'
+	if [ x"${add_config}" != x"" ]
+		print_info 1 "kernel: >> Invoking ${add_config}..."
+		compile_generic $add_config kernelruntask
+		[ "$?" ] || gen_die "Error: ${add_config} failed!"
 	fi
 
 	# Force this on if we are using --genzimage

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 5f77c07..09be5f3 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -98,7 +98,9 @@ determine_real_args() {
 	set_config_with_override BOOL   POSTCLEAR            CMD_POSTCLEAR
 	set_config_with_override BOOL   MRPROPER             CMD_MRPROPER
 	set_config_with_override BOOL   MENUCONFIG           CMD_MENUCONFIG
+	set_config_with_override BOOL   GCONFIG              CMD_GCONFIG
 	set_config_with_override BOOL   NCONFIG              CMD_NCONFIG
+	set_config_with_override BOOL   XCONFIG              CMD_XCONFIG
 	set_config_with_override BOOL   CLEAN                CMD_CLEAN
 
 	set_config_with_override STRING MINKERNPACKAGE       CMD_MINKERNPACKAGE

diff --git a/genkernel.conf b/genkernel.conf
index d8f4ede..85a1763 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -16,12 +16,12 @@ OLDCONFIG="yes"
 
 # Run 'make menuconfig' before compiling this kernel?
 MENUCONFIG="no"
-
+# Run 'make gconfig' before compiling this kernel?
+GCONFIG="no"
 # Run 'make nconfig' (ncurses 'menuconfig') before compiling this kernel?
 NCONFIG="no"
-
-# Note, that two previous lines are mutual exclusive (logically), while
-# MENUCONFIG has a higher priority if both them is enabled.
+# Run 'make xconfig' before compiling this kernel?
+XCONFIG="no"
 
 # Run 'make clean' before compilation?
 # If set to NO, implies MRPROPER WILL NOT be run

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

[Robin H. Johnson]

commit:     11da80066b6f5c6bc264ab1c80d8716cb7782282
Author:     Tomasz Wasiak <tjwasiak <AT> poczta <DOT> onet <DOT> pl>
AuthorDate: Sun Jan  8 01:13:02 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 01:50:38 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=11da8006

Enhacements and fixes for kernel configuration file handling

1. Default configuration file should be used as last resort [fix]
2. User should be informed which configuration file will be used when compiling kernel (now if ${KERNEL_OUTPUTDIR}/.config is present user is misinformed) [fix]
3. ${KERNEL_OUTPUTDIR}/.config backup if we are going to mrpoper ${KERNEL_OUTPUTDIR} [fix]

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=496512#c1
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 gen_configkernel.sh | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 6ca0200..8d53d20 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -7,10 +7,10 @@ determine_config_file() {
 		"${CMD_KERNEL_CONFIG}" \
 		"/etc/kernels/kernel-config-${ARCH}-${KV}" \
 		"${GK_SHARE}/arch/${ARCH}/kernel-config-${KV}" \
-		"${DEFAULT_KERNEL_CONFIG}" \
 		"${GK_SHARE}/arch/${ARCH}/kernel-config-${VER}.${PAT}" \
 		"${GK_SHARE}/arch/${ARCH}/generated-config" \
 		"${GK_SHARE}/arch/${ARCH}/kernel-config" \
+		"${DEFAULT_KERNEL_CONFIG}" \
 		; do
 		if [ -n "${f}" -a -f "${f}" ]
 		then
@@ -36,24 +36,30 @@ config_kernel() {
 	determine_config_file
 	cd "${KERNEL_DIR}" || gen_die 'Could not switch to the kernel directory!'
 
-	# Backup current kernel .config
-	if isTrue "${MRPROPER}" || [ ! -f "${KERNEL_OUTPUTDIR}/.config" ]
+	if isTrue ${MRPROPER}
 	then
-		print_info 1 "kernel: Using config from ${KERNEL_CONFIG}"
+		# Backup current kernel .config
 		if [ -f "${KERNEL_OUTPUTDIR}/.config" ]
 		then
-			NOW=`date +--%Y-%m-%d--%H-%M-%S`
-			cp "${KERNEL_OUTPUTDIR}/.config" "${KERNEL_OUTPUTDIR}/.config${NOW}.bak" \
+			# Current .config is different then one we are going to use
+			if ! diff -q "${KERNEL_OUTPUTDIR}"/.config ${KERNEL_CONFIG}
+			then
+				NOW=`date +--%Y-%m-%d--%H-%M-%S`
+				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"
+				print_info 1 "        Previous config backed up to .config${NOW}.bak"
+			fi
 		fi
-	fi
-
-	if isTrue ${MRPROPER}
-	then
+		print_info 1 "kernel: Using config from ${KERNEL_CONFIG}"
 		print_info 1 'kernel: >> Running mrproper...'
 		compile_generic mrproper kernel
 	else
+		if [ -f "${KERNEL_OUTPUTDIR}/.config" ]
+		then
+			print_info 1 "kernel: Using config from ${KERNEL_OUTPUTDIR}/.config"
+		else
+			print_info 1 "kernel: Using config from ${KERNEL_CONFIG}"
+		fi
 		print_info 1 "kernel: --mrproper is disabled; not running 'make mrproper'."
 	fi
 

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

[Robin H. Johnson]

commit:     6421096929ebe8819fa0edeaa80d1496f802ff6f
Author:     Tomasz Wasiak <tjwasiak <AT> poczta <DOT> onet <DOT> pl>
AuthorDate: Mon Dec 30 17:14:39 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 01:50:39 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=64210969

Minor fixes and enhmacements in splash support

1. Check for FB_CON_DECOR in kernel configuration [fix]
2. Additional check for framebuffer support in kernel
3. Make --no-splash|SPLASH="no" default

(minor cleanup to apply)

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=496512#c7
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 515a541..e1a2749 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -196,6 +196,7 @@ config_kernel() {
 	if isTrue ${SPLASH}
 	then
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB_SPLASH" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB_CON_DECOR" "y"
 	fi
 
 	# VirtIO

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 09be5f3..cae8c66 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -94,7 +94,7 @@ determine_real_args() {
 	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
+	set_config_with_override BOOL   SPLASH               CMD_SPLASH               "no"
 	set_config_with_override BOOL   POSTCLEAR            CMD_POSTCLEAR
 	set_config_with_override BOOL   MRPROPER             CMD_MRPROPER
 	set_config_with_override BOOL   MENUCONFIG           CMD_MENUCONFIG

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index e81b477..612ae86 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -565,7 +565,7 @@ append_linker() {
 
 append_splash(){
 	splash_geninitramfs=`which splash_geninitramfs 2>/dev/null`
-	if [ -x "${splash_geninitramfs}" ]
+	if [ -x "${splash_geninitramfs}" ] && grep -q -E '^CONFIG_FRAMEBUFFER_CONSOLE=[y|m]' ${KERNEL_CONFIG}
 	then
 		[ -z "${SPLASH_THEME}" ] && [ -e /etc/conf.d/splash ] && source /etc/conf.d/splash
 		[ -z "${SPLASH_THEME}" ] && SPLASH_THEME=default

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

[Robin H. Johnson]

commit:     b26b523f22f18e50fc94e710547bf9f6e66614b4
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 00:43:13 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 00:43:13 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b26b523f

gen_configkernel: fix syntax error.

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

 gen_configkernel.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index e1a2749..fb0532e 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -107,6 +107,7 @@ config_kernel() {
 	fi
 
 	if [ x"${add_config}" != x"" ]
+	then
 		print_info 1 "kernel: >> Invoking ${add_config}..."
 		compile_generic $add_config kernelruntask
 		[ "$?" ] || gen_die "Error: ${add_config} failed!"

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

[Robin H. Johnson]

commit:     5d40e362d527ed9e5c91921c3dcef625cd266876
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  1 21:39:35 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Apr  1 21:39:35 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5d40e362

gen_configkernel: enable QEMU fw_cfg device support for virtualized kernels.

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

 gen_configkernel.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index fb0532e..0ca6a11 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -217,6 +217,8 @@ config_kernel() {
 			CONFIG_PARAVIRT_GUEST \
 			CONFIG_SCSI_VIRTIO \
 			CONFIG_VHOST_NET \
+			\
+			CONFIG_FW_CFG_SYSFS \
 			; do
 			cfg___virtio_opt=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "$k")
 			case "$cfg___virtio_opt" in

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

[Robin H. Johnson]

commit:     ef68d550d6de4d71098116436b993f4dac27f529
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 23 21:52:30 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 21:52:30 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ef68d550

Bump version to 3.5.0.9

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

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

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

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

[Robin H. Johnson]

commit:     53f9b4f9fde23cfb1b678dab75a00d57956d18c8
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 23 21:58:29 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 21:58:29 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=53f9b4f9

Update release instructions

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

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

diff --git a/HACKING b/HACKING
index d8b9f21..ed553f1 100644
--- a/HACKING
+++ b/HACKING
@@ -17,15 +17,16 @@ Testing things:
 
 Rolling a release:
 - Bump the version in the main genkernel file.
+- make dist # verify it can build.
 - git commit -s -a -m "Bump version to ${PV}"
-- make dist
 - git tag -s -a -m "Tag release v${PV}" v${PV}
+- make dist # Real tarball
 - 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/
+- upload genkernel-${PV}.tar.xz to the hosting:
+    scp genkernel-${PV}.tar.xz ${USER}@dev.gentoo.org:/space/distfiles-local/
 - copy to portage's DISTDIR so you can bump the ebuild
   before the tarball hits distfile mirrors
-  - cp genkernel-${PV}.tar.bz2 /usr/portage/distfiles/
+  - cp genkernel-${PV}.tar.xz /usr/portage/distfiles/
 - Bump the ebuild
 - Propagate ebuild changes to the live ebuild
     diff genkernel-${OLD_PV}.ebuild genkernel-${NEW_PV}.ebuild | patch genkernel-9999.ebuild

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

[Robin H. Johnson]

commit:     ce6c65fdd112d4019d19b2b0668a69751feaf409
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 23 21:56:20 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 21:56:20 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ce6c65fd

Bump version to 3.5.1

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

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

diff --git a/Makefile b/Makefile
index e2e5e50..e7f08a3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #PACKAGE_VERSION = `/bin/fgrep GK_V= genkernel | sed "s/.*GK_V='\([^']\+\)'/\1/"`
-PACKAGE_VERSION = `git describe --tags`
+PACKAGE_VERSION = `git describe --tags |sed 's,^v,,g'`
 distdir = genkernel-$(PACKAGE_VERSION)
 MANPAGE = genkernel.8
 # Add off-Git/generated files here that need to be shipped with releases

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

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

[Robin H. Johnson]

commit:     f882701c35d8bb71ab00e4e99ecbcfc51849859f
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 23 22:15:07 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 22:15:07 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f882701c

Bump version to 3.5.1.0

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

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

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

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

[Robin H. Johnson]

commit:     ce64e5d9ade4f1a102e900c8c63fa0862a1a06d8
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 14 18:51:22 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 18:51:22 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ce64e5d9

Fix LZ4 compression options.

Add quiet and legacy options for better support.

Thanks: pcxmac <turbopascalwiz <AT> gmail.com>
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=619640
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 8bbaa2c..4075f85 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1114,7 +1114,7 @@ create_initramfs() {
 				bzip2) compress_ext='.bz2' compress_cmd="${cmd_bzip2} -z -f -9" ;;
 				gzip) compress_ext='.gz' compress_cmd="${cmd_gzip} -f -9" ;;
 				lzop) compress_ext='.lzo' compress_cmd="${cmd_lzop} -f -9" ;;
-				lz4) compress_ext='.lz4' compress_cmd="${cmd_lz4} -f -9" ;;
+				lz4) compress_ext='.lz4' compress_cmd="${cmd_lz4} -f -9 -l -q" ;;
 			esac
 
 			if [ -n "${compression}" ]; then

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

[Robin H. Johnson]

commit:     83de2d26e38c143499ca47ec3bea4ba93f2b0073
Author:     Chris Henhawke <chris <AT> hamiltonshells <DOT> ca>
AuthorDate: Fri Jul 14 18:55:07 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 18:55:07 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=83de2d26

ZFS: Ensure libgcc_s included.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=617666
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 4075f85..0e66c66 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -495,14 +495,18 @@ append_zfs(){
 
 	# Copy binaries
 	# Include libgcc_s.so.1 to workaround zfsonlinux/zfs#4749
+	local libgccpath
 	if type gcc-config 2>&1 1>/dev/null; then
-		copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zdb,zfs,zpool} \
-			"/usr/lib/gcc/$(s=$(gcc-config -c); echo ${s%-*}/${s##*-})/libgcc_s.so.1"
-	else
-		copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zdb,zfs,zpool} \
-			/usr/lib/gcc/*/*/libgcc_s.so.1
+		libgccpath="/usr/lib/gcc/$(s=$(gcc-config -c); echo ${s%-*}/${s##*-})/libgcc_s.so.1"
+	fi
+	if [[ ! -f ${libgccpath} ]]; then
+		libgccpath="/usr/lib/gcc/*/*/libgcc_s.so.1"
 	fi
 
+	copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zdb,zfs,zpool} ${libgccpath}
+	cd "${TEMP}/initramfs-zfs-temp/lib64"
+	ln -s "..${libgccpath}"
+
 	cd "${TEMP}/initramfs-zfs-temp/"
 	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \

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

[Robin H. Johnson]

commit:     91002e56bb0391bdc31716dd65b42151d230ff62
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 14 19:52:49 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 19:52:58 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=91002e56

Improve release process.

 HACKING  | 6 ++++--
 Makefile | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/HACKING b/HACKING
index ed553f1..62bbd37 100644
--- a/HACKING
+++ b/HACKING
@@ -16,8 +16,10 @@ Testing things:
   $ sudo GK_SHARE="$PWD" ./genkernel initramfs --no-install --no-postclear --loglevel=2
 
 Rolling a release:
-- Bump the version in the main genkernel file.
-- make dist # verify it can build.
+- export PV="NEWVER"
+- Bump the version in the main genkernel file:
+- sed -i "/^GK_V=/s/='.*'$/='$PV'/" genkernel
+- make dist UNCLEAN=1 # verify it can build.
 - git commit -s -a -m "Bump version to ${PV}"
 - git tag -s -a -m "Tag release v${PV}" v${PV}
 - make dist # Real tarball

diff --git a/Makefile b/Makefile
index e7f08a3..d18a3f2 100644
--- a/Makefile
+++ b/Makefile
@@ -28,8 +28,12 @@ clean:
 	rm -f $(EXTRA_DIST)
 
 check-git-repository:
+ifneq ($(UNCLEAN),1)
 	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 ; }
+else
+	@true
+endif
 
 dist: verify-doc check-git-repository distclean $(EXTRA_DIST)
 	mkdir "$(distdir)"

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

[Robin H. Johnson]

commit:     32fb18e77ecfe413f59f0f5c2fff3df67ec3e5bc
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 14 19:47:40 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 19:52:58 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=32fb18e7

Bump version to 3.5.1.1

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

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

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

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

[Robin H. Johnson]

commit:     57aa79a3b093130d605fb8669b497741927e6fb9
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 04:45:45 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 04:45:45 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=57aa79a3

Bump version to 3.5.2.0

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

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

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

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

[Robin H. Johnson]

commit:     a8c367191320a44b435ce9f9b64a4b72f5e4f7da
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 05:03:46 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 05:03:46 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a8c36719

gen_compile: lvm: support lvmetad and more targets: thin, cache, raid

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

 gen_compile.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gen_compile.sh b/gen_compile.sh
index 30d5299..f3f9ef1 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -505,6 +505,8 @@ compile_lvm() {
 			--prefix=/
 			--enable-dmeventd
 			--enable-cmdlib
+			--enable-lib
+			--enable-lvmetad
 			--with-lvm1=internal
 			--with-clvmd=none
 			--with-cluster=none
@@ -513,6 +515,9 @@ compile_lvm() {
 			--with-mirrors=internal
 			--with-snapshots=internal
 			--with-pool=internal
+			--with-thin=internal
+			--with-cache=internal
+			--with-raid=internal
 		)
 		CFLAGS="-fPIC" \
 		./configure "${LVM_CONF[@]}" \

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

[Robin H. Johnson]

commit:     a1052148144e0fd22cd702e41e9db217900c0fac
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 04:53:38 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 04:53:38 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a1052148

gen_compile: make LVM configure options easier to patch.

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

 gen_compile.sh | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 7df0154..30d5299 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -500,14 +500,24 @@ compile_lvm() {
 		cd "${LVM_DIR}"
 		apply_patches lvm ${LVM_VER}
 		print_info 1 'lvm: >> Configuring...'
-			CFLAGS="-fPIC" \
-			./configure --enable-static_link --prefix=/ \
-				--enable-dmeventd --enable-cmdlib \
-				--with-lvm1=internal --with-clvmd=none --with-cluster=none \
-				--disable-readline --disable-selinux --with-mirrors=internal \
-				--with-snapshots=internal --with-pool=internal \
-				>> ${LOGFILE} 2>&1 || \
-				gen_die 'Configure of lvm failed!'
+		LVM_CONF=(
+			--enable-static_link
+			--prefix=/
+			--enable-dmeventd
+			--enable-cmdlib
+			--with-lvm1=internal
+			--with-clvmd=none
+			--with-cluster=none
+			--disable-readline
+			--disable-selinux
+			--with-mirrors=internal
+			--with-snapshots=internal
+			--with-pool=internal
+		)
+		CFLAGS="-fPIC" \
+		./configure "${LVM_CONF[@]}" \
+			>> ${LOGFILE} 2>&1 || \
+			gen_die 'Configure of lvm failed!'
 		print_info 1 'lvm: >> Compiling...'
 		compile_generic '' utils || gen_die "failed to build LVM"
 		mkdir -p "${TEMP}/lvm/sbin"

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

[Robin H. Johnson]

commit:     03753887d6ea4d9cc7c511d36ff74876a70c0dba
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 05:19:32 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 05:19:32 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=03753887

bincache: use genkernel version as cache key, to ensure rebuilding initramfs parts on new GK versions.

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

 gen_determineargs.sh | 37 +++++++++++++++----------------------
 gen_funcs.sh         |  6 +++---
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 41fbe63..fe9f85b 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -152,28 +152,21 @@ determine_real_args() {
 	BOOTDIR=${BOOTDIR%/}    # Remove any trailing slash
 	MODPROBEDIR=${MODPROBEDIR%/}    # Remove any trailing slash
 
-	CACHE_DIR=`arch_replace "${CACHE_DIR}"`
-	BUSYBOX_BINCACHE=`cache_replace "${BUSYBOX_BINCACHE}"`
-	LVM_BINCACHE=`cache_replace "${LVM_BINCACHE}"`
-	MDADM_BINCACHE=`cache_replace "${MDADM_BINCACHE}"`
-	DMRAID_BINCACHE=`cache_replace "${DMRAID_BINCACHE}"`
-	ISCSI_BINCACHE=`cache_replace "${ISCSI_BINCACHE}"`
-	BLKID_BINCACHE=`cache_replace "${BLKID_BINCACHE}"`
-	FUSE_BINCACHE=`cache_replace "${FUSE_BINCACHE}"`
-	UNIONFS_FUSE_BINCACHE=`cache_replace "${UNIONFS_FUSE_BINCACHE}"`
-	GPG_BINCACHE=`cache_replace "${GPG_BINCACHE}"`
-
-	DEFAULT_KERNEL_CONFIG=`arch_replace "${DEFAULT_KERNEL_CONFIG}"`
-	BUSYBOX_CONFIG=`arch_replace "${BUSYBOX_CONFIG}"`
-	BUSYBOX_BINCACHE=`arch_replace "${BUSYBOX_BINCACHE}"`
-	LVM_BINCACHE=`arch_replace "${LVM_BINCACHE}"`
-	MDADM_BINCACHE=`arch_replace "${MDADM_BINCACHE}"`
-	DMRAID_BINCACHE=`arch_replace "${DMRAID_BINCACHE}"`
-	ISCSI_BINCACHE=`arch_replace "${ISCSI_BINCACHE}"`
-	BLKID_BINCACHE=`arch_replace "${BLKID_BINCACHE}"`
-	FUSE_BINCACHE=`arch_replace "${FUSE_BINCACHE}"`
-	UNIONFS_FUSE_BINCACHE=`arch_replace "${UNIONFS_FUSE_BINCACHE}"`
-	GPG_BINCACHE=`arch_replace "${GPG_BINCACHE}"`
+	__VARS_BINCACHE=(
+		BLKID_BINCACHE
+		BUSYBOX_BINCACHE
+		DMRAID_BINCACHE
+		FUSE_BINCACHE
+		GPG_BINCACHE
+		ISCSI_BINCACHE
+		LVM_BINCACHE
+		MDADM_BINCACHE
+		UNIONFS_FUSE_BINCACHE
+	)
+	for v in CACHE_DIR BUSYBOX_CONFIG DEFAULT_KERNEL_CONFIG "${__VARS_BINCACHE[@]}"; do
+		eval "$v='$(arch_replace "${!v}")'"
+		eval "$v='$(cache_replace "${!v}")'"
+	done
 
 	if [ -n "${CMD_BOOTLOADER}" ]
 	then

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 6234189..9c9d3d6 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -184,7 +184,7 @@ arch_replace() {
 }
 
 cache_replace() {
-  var_replace "CACHE" "${CACHE_DIR}" "${1}"
+  var_replace "CACHE" "${CACHE_DIR}/${GK_V}" "${1}"
 }
 
 clear_log() {
@@ -239,7 +239,7 @@ isBootRO()
 setup_cache_dir()
 {
 
-[ ! -d "${CACHE_DIR}" ] && mkdir -p "${CACHE_DIR}"
+[ ! -d "${CACHE_DIR}" ] && mkdir -p "${CACHE_DIR}/${GK_V}"
 
 if [ "${CLEAR_CACHE_DIR}" == 'yes' ]
 then
@@ -248,7 +248,7 @@ then
 	do
 		print_info 1 "	 >> removing ${i}"
 		rm "${i}"
-	done < <(find "${CACHE_DIR}" -maxdepth 1 -type f -name '*.tar.*' -o -name '*.bz2')
+	done < <(find "${CACHE_DIR}" -maxdepth 2 -type f -name '*.tar.*' -o -name '*.bz2')
 fi
 
 }

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

[Robin H. Johnson]

commit:     1c0c5daadb6632fa503bf980104789f74db72c7f
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 06:24:42 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 06:28:16 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1c0c5daa

gen_compile: be a little bit more verbose about patching.

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

 gen_compile.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index f3f9ef1..76e11a8 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -208,17 +208,19 @@ reset_args()
 apply_patches() {
 	util=$1
 	version=$2
+	patchdir=${GK_SHARE}/patches/${util}/${version}
 
-	if [ -d "${GK_SHARE}/patches/${util}/${version}" ]
+	if [ -d "${patchdir}" ]
 	then
 		print_info 1 "${util}: >> Applying patches..."
-		for i in ${GK_SHARE}/patches/${util}/${version}/*{diff,patch}
+		for i in ${patchdir}/*{diff,patch}
 		do
 			[ -f "${i}" ] || continue
 			patch_success=0
 			for j in `seq 0 5`
 			do
-				patch -p${j} --backup-if-mismatch -f < "${i}" >/dev/null
+				patch -p${j} --backup-if-mismatch -f < "${i}" --dry-run >/dev/null && \
+					patch -p${j} --backup-if-mismatch -f < "${i}"
 				if [ $? = 0 ]
 				then
 					patch_success=1
@@ -232,6 +234,8 @@ apply_patches() {
 				gen_die "could not apply patch ${i} for ${util}-${version}"
 			fi
 		done
+	else
+		print_info 1 "${util}: >> No patches found in $patchdir ..."
 	fi
 }
 

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

[Robin H. Johnson]

commit:     b5719a7a45673faada9502bba39c5e9af9e16a30
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 06:26:38 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 06:28:16 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b5719a7a

gen_compile: allow lvm-2.02.173 to compile

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

 gen_compile.sh | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 76e11a8..19ea1ce 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -502,15 +502,20 @@ compile_lvm() {
 		[ -d "${LVM_DIR}" ] ||
 			gen_die "LVM directory ${LVM_DIR} is invalid!"
 		cd "${LVM_DIR}"
+		print_info 1 'lvm: >> Patching ...'
 		apply_patches lvm ${LVM_VER}
+		# we currently have a patch that changes configure.ac
+		# once given patch is dropped, drop autoconf too
+		print_info 1 'lvm: >> Autoconf ...'
+		autoconf || gen_die 'Autoconf failed for LVM2'
 		print_info 1 'lvm: >> Configuring...'
 		LVM_CONF=(
 			--enable-static_link
 			--prefix=/
-			--enable-dmeventd
+			--disable-dmeventd # Fails to build libdm-string.c:(.text+0x1481): undefined reference to `nearbyintl'
 			--enable-cmdlib
-			--enable-lib
-			--enable-lvmetad
+			--enable-applib
+			--disable-lvmetad
 			--with-lvm1=internal
 			--with-clvmd=none
 			--with-cluster=none
@@ -524,12 +529,16 @@ compile_lvm() {
 			--with-raid=internal
 		)
 		CFLAGS="-fPIC" \
+		LIBS='-luuid -lrt -lpthread -lm' \
+		LDFLAGS='-Wl,--no-as-needed' \
 		./configure "${LVM_CONF[@]}" \
 			>> ${LOGFILE} 2>&1 || \
 			gen_die 'Configure of lvm failed!'
 		print_info 1 'lvm: >> Compiling...'
 		compile_generic '' utils || gen_die "failed to build LVM"
+
 		mkdir -p "${TEMP}/lvm/sbin"
+		print_info 1 'lvm: >> Installing to DESTDIR...'
 		compile_generic "install DESTDIR=${TEMP}/lvm/" utils || gen_die "failed to install LVM"
 		# Upstream does u-w on files, and this breaks stuff.
 		chmod -R u+w "${TEMP}/lvm/"

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

[Robin H. Johnson]

commit:     f6b465debcc65eda41084008cd24aad9c2f6f0fc
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 06:27:10 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 06:28:16 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f6b465de

gen_compile: allow mdadm-4 to compile.

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

 gen_compile.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 19ea1ce..1cd1ebf 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -576,17 +576,20 @@ compile_mdadm() {
 
 		cd "${MDADM_DIR}"
 		apply_patches mdadm ${MDADM_VER}
-		sed -i "/^CFLAGS = /s:^CFLAGS = \(.*\)$:CFLAGS = -Os:" Makefile
-		sed -i "/^CXFLAGS = /s:^CXFLAGS = \(.*\)$:CXFLAGS = -Os:" Makefile
-		sed -i "/^CWFLAGS = /s:^CWFLAGS = \(.*\)$:CWFLAGS = -Wall:" Makefile
-		sed -i "s/^# LDFLAGS = -static/LDFLAGS = -static/" Makefile
+		defs='-DNO_DLM -DNO_COROSYNC'
+		sed -i \
+			-e "/^CFLAGS = /s:^CFLAGS = \(.*\)$:CFLAGS = -Os ${defs}:" \
+			-e "/^CXFLAGS = /s:^CXFLAGS = \(.*\)$:CXFLAGS = -Os ${defs}:" \
+			-e "/^CWFLAGS = /s:^CWFLAGS = \(.*\)$:CWFLAGS = -Wall:" \
+			-e "s/^# LDFLAGS = -static/LDFLAGS = -static/" \
+			Makefile || gen_die "Failed to sed mdadm Makefile"
 
 		print_info 1 'mdadm: >> Compiling...'
-			compile_generic 'mdadm mdmon' utils
+		compile_generic 'mdadm mdmon' utils
 
 		mkdir -p "${TEMP}/mdadm/sbin"
-		install -m 0755 -s mdadm "${TEMP}/mdadm/sbin/mdadm"
-		install -m 0755 -s mdmon "${TEMP}/mdadm/sbin/mdmon"
+		install -m 0755 -s mdadm "${TEMP}/mdadm/sbin/mdadm" || gen_die "Failed mdadm install"
+		install -m 0755 -s mdmon "${TEMP}/mdadm/sbin/mdmon" || gen_die "Failed mdmon install"
 		print_info 1 '      >> Copying to bincache...'
 		cd "${TEMP}/mdadm"
 		${UTILS_CROSS_COMPILE}strip "sbin/mdadm" "sbin/mdmon" ||

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

[Robin H. Johnson]

commit:     a4ff177a32209a92ac48cb17e70b1546d305628d
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 06:23:52 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 06:28:15 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a4ff177a

gen_funcs: make per-version cachedir

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

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

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 9e8cb1c..656ddef 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -239,7 +239,7 @@ isBootRO()
 setup_cache_dir()
 {
 
-[ ! -d "${CACHE_DIR}" ] && mkdir -p "${CACHE_DIR}/${GK_V}"
+[ ! -d "${CACHE_DIR}/${GK_V}" ] && mkdir -p "${CACHE_DIR}/${GK_V}"
 
 if [ "${CLEAR_CACHE_DIR}" == 'yes' ]
 then

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

[Robin H. Johnson]

commit:     8f98a77a94aac23dce90a71f5623fe8dbcc1783b
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 06:25:26 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 06:28:16 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8f98a77a

gen_initramfs: ensure LVM config options are suitable from initramfs.

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

 gen_initramfs.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 0e66c66..62a88c8 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -416,11 +416,22 @@ append_lvm(){
 #		ret=$?
 #		if [ ${ret} != 0 ]
 #		then
-			cp /etc/lvm/lvm.conf "${TEMP}/initramfs-lvm-temp/etc/lvm/" ||
+			cp /etc/lvm/lvm.conf "${TEMP}/initramfs-lvm-temp/etc/lvm/" || \
 				gen_die 'Could not copy over lvm.conf!'
 #		else
 #			gen_die 'Could not copy over lvm.conf!'
 #		fi
+
+		# Some LVM config options need changing, because the functionality is
+		# not compiled in:
+		sed -r -i \
+			-e '/^[[:space:]]*obtain_device_list_from_udev/s,=.*,= 0,g' \
+			-e '/^[[:space:]]*use_lvmetad/s,=.*,= 0,g' \
+			-e '/^[[:space:]]*monitoring/s,=.*,= 0,g' \
+			-e '/^[[:space:]]*external_device_info_source/s,=.*,= "none",g' \
+			-e '/^[[:space:]]*units/s,=.*"r",= "h",g' \
+			"${TEMP}/initramfs-lvm-temp/etc/lvm/lvm.conf" || \
+				gen_die 'Could not sed lvm.conf!'
 	fi
 	cd "${TEMP}/initramfs-lvm-temp/"
 	log_future_cpio_content

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

[Robin H. Johnson]

commit:     2e75e7625dea6b33da999b48436719d2dc54b7cc
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 06:23:33 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 06:28:12 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2e75e762

gen_funcs: less cleanup if debug.

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

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

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 9c9d3d6..9e8cb1c 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -227,7 +227,7 @@ gen_die() {
 	print_error 1 ''
 
 	# Cleanup temp dirs and caches if requested
-	cleanup
+	isTrue "${CMD_DEBUGCLEANUP}"  && cleanup
   	exit 1
 }
 

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

[Robin H. Johnson]

commit:     c4522b5f9adbb9f607f4ae90a8e1a3d9b1aafaea
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 06:29:44 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 06:29:44 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c4522b5f

Bump version to 3.5.2.0

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

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

[Robin H. Johnson]

commit:     4d7d4e146bbecf6cc039ce3e5cdf89a91b751f4e
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  4 05:42:35 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Sep  4 05:42:35 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4d7d4e14

gen_initramfs: catch lddtree failure.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=618056
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 62a88c8..2be35c4 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -39,11 +39,13 @@ copy_binaries() {
 	# 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 "$@"
+		lddtree -l "$@" \
+			|| gen_die "Binary ${f} or some of its library dependencies could not be copied"
 	else
 		lddtree "$@" \
 			| tr ')(' '\n' \
-			| awk  '/=>/{ if($3 ~ /^\//){print $3}}'
+			| awk  '/=>/{ if($3 ~ /^\//){print $3}}' \
+			|| gen_die "Binary ${f} or some of its library dependencies could not be copied"
 	fi ) \
 			| sort \
 			| uniq \

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

[Robin H. Johnson]

commit:     89644bc7ae667dc37337fd1384347cdf3e298acd
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  7 17:43:31 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Sep  7 17:43:31 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=89644bc7

Bump version to 3.5.2.1

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

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

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

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

[Robin H. Johnson]

commit:     aec8ab97e010a0234dae1d731e82fa6d55a0b240
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 28 08:27:40 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 08:27:40 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=aec8ab97

Bump version to 3.5.2.2

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

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

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

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

[Robin H. Johnson]

commit:     3e5fbaa7aa9b879acfadc37097fad8e1de5aad69
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 31 18:58:55 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 31 18:58:55 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3e5fbaa7

Bump version to 3.5.2.3

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

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

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

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

[Robin H. Johnson]

commit:     caa98450d35c8884eaf502547db5b13932fb163a
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 31 18:46:28 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 31 18:46:28 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=caa98450

gen_configkernel: validate depmod/MODULE_COMPRESS

If there is a mismatch between compression support in depmod and the
kernel module settings, a bad initramfs would have been generated prior
to this commit. Validate and die early instead of building that bad
initramfs, so you don't get boot failures.

Impacts before:
- modules.dep and related files can be empty.
- module dependency verification for initramfs assembly can miss
  dependent modules.

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

 gen_configkernel.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 476a883..26e4610 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -125,6 +125,21 @@ config_kernel() {
 	if isTrue "$cfg_CONFIG_MODULES" ; then
 		# yes, we support modules, set 'm' for new stuff.
 		newcfg_setting='m'
+		# Compare the kernel module compression vs the depmod module compression support
+		# WARNING: if the buildhost has +XZ but the target machine has -XZ, you will get failures!
+		cfg_CONFIG_MODULE_COMPRESS_GZIP=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MODULE_COMPRESS_GZIP")
+		cfg_CONFIG_MODULE_COMPRESS_XZ=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MODULE_COMPRESS_XZ")
+		if isTrue "${cfg_CONFIG_MODULE_COMPRESS_GZIP}"; then
+			depmod_GZIP=$(/sbin/depmod -V | tr ' ' '\n' | awk '/ZLIB/{print $1; exit}')
+			if [[ "${depmod_GZIP}" != "+ZLIB" ]]; then
+				gen_die 'depmod does not support ZLIB/GZIP, cannot build with CONFIG_MODULE_COMPRESS_GZIP'
+			fi
+		elif isTrue "${cfg_CONFIG_MODULE_COMPRESS_XZ}" ; then
+			depmod_XZ=$(/sbin/depmod -V | tr ' ' '\n' | awk '/XZ/{print $1; exit}')
+			if [[ "${depmod_XZ}" != "+XZ" ]]; then
+				gen_die 'depmod does not support XZ, cannot build with CONFIG_MODULE_COMPRESS_XZ'
+			fi
+		fi
 	else
 		# no, we support modules, set 'y' for new stuff.
 		newcfg_setting='y'

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

[Robin H. Johnson]

commit:     7e7984bf05103fe1cf13c76327636893ccd051a7
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 31 18:32:16 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 31 18:32:16 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7e7984bf

gen_configkernel: if building non-modular, have to set =y not =m.

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

 gen_configkernel.sh | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 68c116f..476a883 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -120,11 +120,21 @@ config_kernel() {
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT2_FS" "y"
 	fi
 
+	# Do we support modules at all?
+	cfg_CONFIG_MODULES=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MODULES")
+	if isTrue "$cfg_CONFIG_MODULES" ; then
+		# yes, we support modules, set 'm' for new stuff.
+		newcfg_setting='m'
+	else
+		# no, we support modules, set 'y' for new stuff.
+		newcfg_setting='y'
+	fi
+
 	# If the user has configured DM as built-in, we need to respect that.
 	cfg_CONFIG_BLK_DEV_DM=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM")
 	case "$cfg_CONFIG_BLK_DEV_DM" in
 		y|m) ;; # Do nothing
-		*) cfg_CONFIG_BLK_DEV_DM='m'
+		*) cfg_CONFIG_BLK_DEV_DM=${newcfg_setting}
 	esac
 
 	# Make sure lvm modules are on if --lvm
@@ -133,12 +143,12 @@ config_kernel() {
 		cfg_CONFIG_DM_SNAPSHOT=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_SNAPSHOT")
 		case "$cfg_CONFIG_DM_SNAPSHOT" in
 			y|m) ;; # Do nothing
-			*) cfg_CONFIG_DM_SNAPSHOT='m'
+			*) cfg_CONFIG_DM_SNAPSHOT=${newcfg_setting}
 		esac
 		cfg_CONFIG_DM_MIRROR=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MIRROR")
 		case "$cfg_CONFIG_DM_MIRROR" in
 			y|m) ;; # Do nothing
-			*) cfg_CONFIG_DM_MIRROR='m'
+			*) cfg_CONFIG_DM_MIRROR=${newcfg_setting}
 		esac
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_SNAPSHOT" "${cfg_CONFIG_DM_SNAPSHOT}"
@@ -151,12 +161,12 @@ config_kernel() {
 		cfg_CONFIG_DM_MULTIPATH=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH")
 		case "$cfg_CONFIG_DM_MULTIPATH" in
 			y|m) ;; # Do nothing
-			*) cfg_CONFIG_DM_MULTIPATH='m'
+			*) cfg_CONFIG_DM_MULTIPATH=${newcfg_setting}
 		esac
 		cfg_CONFIG_DM_MULTIPATH_RDAC=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH_RDAC")
 		case "$cfg_CONFIG_DM_MULTIPATH_RDAC" in
 			y|m) ;; # Do nothing
-			*) cfg_CONFIG_DM_MULTIPATH_RDAC='m'
+			*) cfg_CONFIG_DM_MULTIPATH_RDAC=${newcfg_setting}
 		esac
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH" "${cfg_CONFIG_DM_MULTIPATH}"
@@ -177,17 +187,17 @@ config_kernel() {
 		cfg_CONFIG_ISCSI_BOOT_SYSFS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_BOOT_SYSFS")
 		case "$cfg_CONFIG_ISCSI_BOOT_SYSFS" in
 			y|m) ;; # Do nothing
-			*) cfg_CONFIG_ISCSI_BOOT_SYSFS='m'
+			*) cfg_CONFIG_ISCSI_BOOT_SYSFS=${newcfg_setting}
 		esac
 		cfg_CONFIG_ISCSI_TCP=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_TCP")
 		case "$cfg_CONFIG_ISCSI_TCP" in
 			y|m) ;; # Do nothing
-			*) cfg_CONFIG_ISCSI_TCP='m'
+			*) cfg_CONFIG_ISCSI_TCP=${newcfg_setting}
 		esac
 		cfg_CONFIG_SCSI_ISCSI_ATTRS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_ISCSI_ATTRS")
 		case "$cfg_CONFIG_SCSI_ISCSI_ATTRS" in
 			y|m) ;; # Do nothing
-			*) cfg_CONFIG_SCSI_ISCSI_ATTRS='m'
+			*) cfg_CONFIG_SCSI_ISCSI_ATTRS=${newcfg_setting}
 		esac
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_BOOT_SYSFS" "${cfg_CONFIG_ISCSI_BOOT_SYSFS}"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_TCP" "${cfg_CONFIG_ISCSI_TCP}"

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

[Robin H. Johnson]

commit:     7337c72be6e41fa265024bfb7eecbee0e5809144
Author:     Daniel Robbins <drobbins <AT> funtoo <DOT> org>
AuthorDate: Sun Nov 12 02:43:28 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Nov 15 03:05:20 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7337c72b

Allow MODULES variables to have underscores in them.

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 2be35c4..d4f56db 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -814,7 +814,7 @@ append_modules() {
 
 	mkdir -p "${TEMP}/initramfs-modules-${KV}-temp/etc/modules"
 	for group_modules in ${!MODULES_*}; do
-		group="$(echo $group_modules | cut -d_ -f2 | tr "[:upper:]" "[:lower:]")"
+		group="$(echo $group_modules | cut -d_ -f2- | tr "[:upper:]" "[:lower:]")"
 		print_list ${!group_modules} > "${TEMP}/initramfs-modules-${KV}-temp/etc/modules/${group}"
 	done
 	cd "${TEMP}/initramfs-modules-${KV}-temp/"

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

[Robin H. Johnson]

commit:     e2b9b516f9f5c9b31a6b9309e85a82036900c66d
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 15 03:15:00 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Nov 15 03:15:00 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e2b9b516

gen_compile: avoid busybox CONFIG_FEATURE_MOUNT_NFS due to libtirpc

With glibc switching to rpc via libtirpc, we cannot be sure that the
user has libtirpc.

Additionally, it looks like it might be be required since the 2.6.36
kernel so let's just disable it for now.

Bug: https://bugs.gentoo.org/637446
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/gen_compile.sh b/gen_compile.sh
index 1cd1ebf..3bb8051 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -428,10 +428,11 @@ compile_busybox() {
 	# Apply config-based tweaks to the busybox config.
 	# This needs to be done before cache validation.
 	cp "${BUSYBOX_CONFIG}" "${TEMP}/busybox-config"
-	if isTrue "${NFS}"
-	then
-		kconfig_set_opt "${TEMP}/busybox-config" CONFIG_FEATURE_MOUNT_NFS y
-	fi
+
+	# If you want mount.nfs to work on older than 2.6.something, you might need to turn this on.
+	#isTrue "${NFS}" && nfs_opt='y'
+	nfs_opt='n'
+	kconfig_set_opt "${TEMP}/busybox-config" CONFIG_FEATURE_MOUNT_NFS $nfs_opt
 
 	# Delete cache if stored config's MD5 does not match one to be used
 	# This exactly just the .config.gk_orig file, and compares it again the

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

[Robin H. Johnson]

commit:     e4165acaa8d09c4e032e992dd7d79d312bb781ea
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 16 23:04:30 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Nov 16 23:04:30 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e4165aca

gen_compile: firmware-install is obsolete upstream.

Linux, as of v4.14, no longer includes firmware in the source package,
and has completely removed the firmware_install target.

Users should install the sys-apps/linux-firmware package instead.

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

 gen_cmdline.sh |  3 ++-
 gen_compile.sh | 15 +++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 1091d4d..203cae8 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -171,7 +171,8 @@ longusage() {
   echo "				overrides --firmware-dir. For multiple files,"
   echo "				separate the filenames with a comma"
   echo "	--firmware-install"
-  echo "				Enable installation firmware onto root filesystem."
+  echo "				Enable installing firmware onto root filesystem"
+  echo "				(only available for kernels older than v4.14)"
   echo "	--integrated-initramfs, --no-integrated-initramfs"
   echo "				Include/exclude the generated initramfs in the kernel"
   echo "				instead of keeping it as a separate file"

diff --git a/gen_compile.sh b/gen_compile.sh
index 3bb8051..02f3de5 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -346,16 +346,19 @@ compile_kernel() {
 		compile_generic "${KERNEL_MAKE_DIRECTIVE_2}" kernel
 	fi
 
-	if isTrue "${FIRMWARE_INSTALL}" ; then
-		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
+	if isTrue "${FIRMWARE_INSTALL}" && [ ! -e "${KERNEL_DIR}/ihex2fw.c" ] ; then
+		# Kernel v4.14 removed firmware from the kernel sources, including the
+		# ihex2fw.c tool source. Try and detect the tool to see if we are in >=v4.14
+		print_warning 1 "        >> Linux v4.14 removed in-kernel firmware, you MUST install the sys-kernel/linux-firmware package!"
+	elif isTrue "${FIRMWARE_INSTALL}" ; then
+		local cfg_CONFIG_FIRMWARE_IN_KERNEL=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" CONFIG_FIRMWARE_IN_KERNEL)
+		if isTrue "$cfg_CONFIG_FIRMWARE_IN_KERNEL"; then
+			print_info 1 "        >> Not installing firmware as it's included in the kernel already (CONFIG_FIRMWARE_IN_KERNEL=y)..."
+		else
 			print_info 1 "        >> Installing firmware ('make firmware_install') due to CONFIG_FIRMWARE_IN_KERNEL != y..."
 			[ "${INSTALL_MOD_PATH}" != '' ] && export INSTALL_MOD_PATH
 			[ "${INSTALL_FW_PATH}" != '' ] && export INSTALL_FW_PATH
 			MAKEOPTS="${MAKEOPTS} -j1" compile_generic "firmware_install" kernel
-		else
-			print_info 1 "        >> Not installing firmware as it's included in the kernel already (CONFIG_FIRMWARE_IN_KERNEL=y)..."
 		fi
 	else
 		print_info 1 "        >> Not installing firmware as requested by configuration FIRMWARE_INSTALL=no..."

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

[Robin H. Johnson]

commit:     449b2ae584442a4bf6f8644cd998b62ab5e84f57
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 16 23:39:51 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Nov 16 23:39:51 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=449b2ae5

Bump version to 3.5.2.4

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

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

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

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

[Robin H. Johnson]

commit:     482e2c70b253b9d62fc907d6612d80addd3358c1
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 18 21:24:12 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 21:24:12 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=482e2c70

gen_cmdline: bzImage target should not create initramfs.

Closes: https://bugs.gentoo.org/511964
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 203cae8..0ca0f8d 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -715,7 +715,7 @@ parse_cmdline() {
 		bzImage)
 			BUILD_KERNEL=1
 			BUILD_MODULES=0
-			BUILD_RAMDISK=1
+			BUILD_RAMDISK=0
 			CMD_RAMDISKMODULES=0
 			print_info 2 "CMD_RAMDISKMODULES: ${CMD_RAMDISKMODULES}"
 			;;

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

[Robin H. Johnson]

commit:     de034a52625200a6ef0286540435f6c4bf55230c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 18 21:28:21 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 21:28:21 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=de034a52

gen_cmdline: make --mdadm local binary requirement less strict

Closes: https://bugs.gentoo.org/630314
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 gen_cmdline.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 0ca0f8d..3d9611f 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -318,9 +318,7 @@ parse_cmdline() {
 			print_info 2 "CMD_MDADM: $CMD_MDADM"
 			if [ "$CMD_MDADM" = "1" -a ! -e /sbin/mdadm ]
 			then
-				echo 'Error: --multipath requires sys-fs/mdadm'
-				echo '		 to be installed on the host system.'
-				exit 1
+				print_warning 'Warning: --mdadm generally requires sys-fs/mdadm present on the host system'
 			fi
 			;;
 		--mdadm-config=*)

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

[Robin H. Johnson]

commit:     10b971c5299a4e4303eab5b594a96636cd234c98
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 22:53:16 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 22:53:16 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=10b971c5

gen_compile: fix dmraid lvm linking

This will hopefully fix dmraid linking against newer LVM.

Bug: https://bugs.gentoo.org/631368
Suggested-by: Ian Stakenvicius <axs <AT> gentoo.org>
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 gen_compile.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 02f3de5..c287054 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -632,7 +632,8 @@ compile_dmraid() {
 		CFLAGS="-I${TEMP}/lvm/include" \
 		DEVMAPPEREVENT_CFLAGS="-I${TEMP}/lvm/include" \
 		CPPFLAGS="-I${TEMP}/lvm/include" \
-		LIBS="-ldevmapper" \
+		LIBS="-ldevmapper -lm -lrt -lpthread" \
+		LDFLAGS='-Wl,--no-as-needed' \
 		./configure --enable-static_link \
 			--with-devmapper-prefix="${TEMP}/lvm" \
 			--prefix=${TEMP}/dmraid >> ${LOGFILE} 2>&1 ||

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

[Robin H. Johnson]

commit:     5cab38a2aec2d6886eb8525240c83b3ee70b3d5d
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 07:05:47 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 07:05:47 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5cab38a2

gen_compile: modules should respect --no-install

Closes: https://bugs.gentoo.org/505810
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/gen_compile.sh b/gen_compile.sh
index c287054..0036338 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -308,6 +308,10 @@ compile_modules() {
 	print_info 1 "        >> Compiling ${KV} modules..."
 	cd ${KERNEL_DIR}
 	compile_generic modules kernel
+
+	# If we are not installing modules, just shortcut this now.
+	isTrue "${CMD_INSTALL}" || return 0
+
 	export UNAME_MACHINE="${ARCH}"
 	[ "${INSTALL_MOD_PATH}" != '' ] && export INSTALL_MOD_PATH
 	if [ "${CMD_STRIP_TYPE}" == "all" -o "${CMD_STRIP_TYPE}" == "modules" ]

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

[Robin H. Johnson]

commit:     bcc638d1d7829fdcc5804848a0204a71a7456724
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 07:09:08 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 07:09:08 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=bcc638d1

Bump version to 3.5.2.5

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

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

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

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

[Robin H. Johnson]

commit:     ab9871b37b4110d1ba17d9a1a2187f18cb4ab402
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  4 18:13:49 2018 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Apr  4 18:13:49 2018 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ab9871b3

Bump version to 3.5.3.0

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

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

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

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

[Robin H. Johnson]

commit:     f40ff987f9064fe269d7d8bebcec435e6bfe7bbd
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  4 18:06:26 2018 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Apr  4 18:12:23 2018 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f40ff987

Merge remote-tracking branch 'origin/overlayfs'

Bring in new OverlayFS support by Rick Farina (Zero_Chaos)
<zerochaos <AT> gentoo.org>.

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

 defaults/initrd.defaults |   4 +
 defaults/initrd.scripts  | 173 +++++++++++++++++++++++-----
 defaults/linuxrc         | 286 ++++++++++++++++++++++++-----------------------
 3 files changed, 301 insertions(+), 162 deletions(-)

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

[Robin H. Johnson]

commit:     67adad0510221685c62a29c7b544474a01cd7a73
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 13 15:24:50 2018 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 13 17:26:19 2018 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=67adad05

Revert "gen_compile: modules should respect --no-install"

This reverts commit 5cab38a2aec2d6886eb8525240c83b3ee70b3d5d.

Modules are also used by kerncache, minkernpackage, modulespackage and
possibly more.

See-Also: https://bugs.gentoo.org/505810#c3
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

diff --git a/gen_compile.sh b/gen_compile.sh
index 0036338..c287054 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -308,10 +308,6 @@ compile_modules() {
 	print_info 1 "        >> Compiling ${KV} modules..."
 	cd ${KERNEL_DIR}
 	compile_generic modules kernel
-
-	# If we are not installing modules, just shortcut this now.
-	isTrue "${CMD_INSTALL}" || return 0
-
 	export UNAME_MACHINE="${ARCH}"
 	[ "${INSTALL_MOD_PATH}" != '' ] && export INSTALL_MOD_PATH
 	if [ "${CMD_STRIP_TYPE}" == "all" -o "${CMD_STRIP_TYPE}" == "modules" ]

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

[Robin H. Johnson]

commit:     6051e248cff250e67b583d9d2c08e852e7d19195
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 13 17:27:22 2018 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 13 17:27:22 2018 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6051e248

Bump version to 3.5.3.2

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

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

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

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

[Robin H. Johnson]

commit:     40bfb5a0208db57a339dfc8e55a222fa67b63d5f
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 13 15:28:26 2018 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 13 17:26:20 2018 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=40bfb5a0

Bump version to 3.5.3.1

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

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

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

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

[Thomas Deutschmann]

commit:     c50e1b21e08946449b76f340a201b5da28c08846
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue May  8 00:16:10 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue May  8 00:16:10 2018 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c50e1b21

Bump version to 3.5.3.3

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

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

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

[Robin H. Johnson]

commit:     f83726effaac578d25058b3a6f46292b02136cd7
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 12 21:25:04 2018 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 21:25:45 2018 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f83726ef

Merge remote-tracking branch 'github-robbat2/pr/17'

Closes: https://github.com/robbat2/genkernel/pull/17
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/initrd.scripts |  6 +++---
 defaults/linuxrc        | 19 +++++++++++++++----
 doc/genkernel.8.txt     |  6 +++---
 3 files changed, 21 insertions(+), 10 deletions(-)

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

[Ben Kohler]

commit:     e594872f3d33b874cdf4de0ed0b02feac5b046ec
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 19 00:46:07 2018 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Jul 19 00:46:07 2018 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e594872f

genkernel.conf: fix a couple of paths in comments, thanks Mason LB

Closes: https://bugs.gentoo.org/661560

 genkernel.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/genkernel.conf b/genkernel.conf
index 85a1763..5e5a67b 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -300,7 +300,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 #MINKERNPACKAGE="/path/to/file.bz2"
 
 # Add additional modules to the ramdisk using the module groups defined
-# in /usr/share/genkernel/default/modules_load (see this file for
+# in /usr/share/genkernel/defaults/modules_load (see this file for
 # more details).  This would be used if, for example, you
 # required an additional crypto module or network device at boot
 # time and did not want to staticly compile these in the kernel.
@@ -310,7 +310,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 #AMODULES_group="module-to-include another-module"
 
 # Override the default modules in the ramdisk, for a given group, as defined by
-# /usr/share/genkernel/default/modules_load and the per-arch modules_load
+# /usr/share/genkernel/defaults/modules_load and the per-arch modules_load
 # files. You PROBABLY want to use AMODULES_* above, and NOT MODULES_* here.
 # If you use MODULES_* here, the default and per-arch modules will NOT be used.
 #MODULES_group1="some-module"

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

[Robin H. Johnson]

commit:     febc1b12b5b393e918da94b9f1c029f2adcea215
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  4 23:19:46 2018 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Aug  4 23:25:31 2018 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=febc1b12

microcode: add flexability: type & initramfs control

Bug reported that the MICROCODE option did not provide enough
flexability, as it enabled both AMD & Intel options by default, and
placed both sets of microcode into the initramfs.

Existing boolean option MICROCODE is now a string, which takes
no/all/amd/intel as inputs, describing which variant of kernel options
to enable. Boolean inputs are converted to no/all settings. This option
no longer include microcode in initramfs.

New option MICROCODE_INITRAMFS, enabled by default, includes the
microcode for matching kernel config options (INTEL/AMD) into the
initramfs. For users using sys-boot/grub-2.02-r1 or another bootloader
that supports multiple initramfs options, this option can be safely
disabled.

Fixes: https://bugs.gentoo.org/662492
Reported-by: Joerg Schaible <joerg.schaible <AT> gmx.de>
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 gen_cmdline.sh       | 18 +++++++++++++++---
 gen_configkernel.sh  | 18 ++++++++----------
 gen_determineargs.sh | 11 ++++++++++-
 gen_initramfs.sh     |  3 ++-
 genkernel.conf       | 10 ++++++++--
 5 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 3d9611f..853723b 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -98,8 +98,9 @@ longusage() {
   echo "	--mdadm			Include MDADM/MDMON support"
   echo "	--no-mdadm		Exclude MDADM/MDMON support"
   echo "	--mdadm-config=<file>	Use file as mdadm.conf in initramfs"
-  echo "	--microcode		Include early microcode support"
-  echo "	--no-microcode	Exclude early microcode support"
+  echo "	--microcode[=<type>]	Include early microcode support, for 'all'/'amd'/'intel' CPU types"
+  echo "	--no-microcode			Exclude early microcode support"
+  echo "	--microcode-initramfs	Include early microcode in initramfs"
   echo "	--nfs			Include NFS support"
   echo "	--no-nfs		Exclude NFS support"
   echo "	--dmraid		Include DMRAID support"
@@ -330,9 +331,20 @@ parse_cmdline() {
 			print_info 2 "CMD_BUSYBOX: ${CMD_BUSYBOX}"
 			;;
 		--microcode|--no-microcode)
-			CMD_MICROCODE=`parse_optbool "$*"`
+			case `parse_optbool "$*"` in
+				0) CMD_MICROCODE='no' ;;
+				1) CMD_MICROCODE='all' ;;
+			esac
 			print_info 2 "CMD_MICROCODE: ${CMD_MICROCODE}"
 			;;
+		--microcode=*)
+			CMD_MICROCODE="${*#*=}"
+			print_info 2 "CMD_MICROCODE: $CMD_MICROCODE"
+			;;
+		--microcode-initramfs|--no-microcode-initramfs)
+			CMD_MICROCODE_INITRAMFS=`parse_optbool "$*"`
+			print_info 2 "CMD_MICROCODE_INITRAMFS: ${CMD_MICROCODE_INITRAMFS}"
+			;;
 		--nfs|--no-nfs)
 			CMD_NFS=`parse_optbool "$*"`
 			print_info 2 "CMD_NFS: ${CMD_NFS}"

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 697c478..475526a 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -277,17 +277,15 @@ config_kernel() {
 
 	# Microcode setting, intended for early microcode loading
 	# needs to be compiled in.
-	if isTrue ${MICROCODE}
+	kconfig_microcode_intel=(CONFIG_MICROCODE_INTEL CONFIG_MICROCODE_INTEL_EARLY)
+	kconfig_microcode_amd=(CONFIG_MICROCODE_AMD CONFIG_MICROCODE_AMD_EARLY)
+	if [[ -n "${MICROCODE}" ]]
 	then
-		for k in \
-			CONFIG_MICROCODE \
-			CONFIG_MICROCODE_INTEL \
-			CONFIG_MICROCODE_AMD \
-			CONFIG_MICROCODE_OLD_INTERFACE \
-			CONFIG_MICROCODE_INTEL_EARLY \
-			CONFIG_MICROCODE_AMD_EARLY \
-			CONFIG_MICROCODE_EARLY \
-			; do
+		kconfigs=(CONFIG_MICROCODE CONFIG_MICROCODE_OLD_INTERFACE CONFIG_MICROCODE_EARLY)
+		[[ "$MICROCODE" == all ]] && kconfigs+=( ${kconfig_microcode_amd[@]} ${kconfig_microcode_intel[@]} )
+		[[ "$MICROCODE" == amd ]] && kconfigs+=( ${kconfig_microcode_amd[@]} )
+		[[ "$MICROCODE" == intel ]] && kconfigs+=( ${kconfig_microcode_intel[@]} )
+		for k in "${kconfigs[@]}" ; do
 			cfg=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "$k")
 			case "$cfg" in
 				y) ;; # Do nothing

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index b686fca..bd0150a 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -121,7 +121,8 @@ determine_real_args() {
 	set_config_with_override BOOL   HYPERV               CMD_HYPERV
 	set_config_with_override BOOL   BUSYBOX              CMD_BUSYBOX              "yes"
 	set_config_with_override BOOL   NFS                  CMD_NFS                  "yes"
-	set_config_with_override BOOL   MICROCODE            CMD_MICROCODE
+	set_config_with_override STRING MICROCODE            CMD_MICROCODE            "all"
+	set_config_with_override BOOL   MICROCODE_INITRAMFS  CMD_MICROCODE_INITRAMFS  "yes"
 	set_config_with_override BOOL   UNIONFS              CMD_UNIONFS
 	set_config_with_override BOOL   NETBOOT              CMD_NETBOOT
 	set_config_with_override STRING REAL_ROOT            CMD_REAL_ROOT
@@ -234,5 +235,13 @@ determine_real_args() {
 		INTEGRATED_INITRAMFS=0
 	fi
 
+	MICROCODE=${MICROCODE,,}
+	case ${MICROCODE} in
+		all|amd|intel) ;;
+		y|yes|1|true|t) MICROCODE='all' ;;
+		n|no|none|0|false|f) MICROCODE='' ;;
+		*) gen_die "Invalid microcode '${MICROCODE}', --microcode=<type> requires one of: no, all, intel, amd" ;;
+	esac
+
 	get_KV
 }

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 768f291..a2c55c6 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1149,7 +1149,8 @@ create_initramfs() {
 		## It only loads monolithic ucode from an uncompressed cpio, which MUST
 		## be before the other cpio archives in the stream.
 		cfg_CONFIG_MICROCODE=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE)
-		if isTrue "${MICROCODE}" && [ "${cfg_CONFIG_MICROCODE}" == "y" ]; then
+		if isTrue "${MICROCODE_INITRAMFS}" && [ "${cfg_CONFIG_MICROCODE}" == "y" ]; then
+			print_info 1 "--microcode-initramfs is enabled by default for compatability but made obsolete by sys-boot/grub-2.02-r1"
 			cfg_CONFIG_MICROCODE_INTEL=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_INTEL)
 			cfg_CONFIG_MICROCODE_AMD=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_AMD)
 			print_info 1 "early-microcode: >> Preparing..."

diff --git a/genkernel.conf b/genkernel.conf
index 5e5a67b..57cb2b0 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -74,8 +74,14 @@ USECOLOR="yes"
 # Add in GnuPG support
 #GPG="no"
 
-# Add in early microcode support
-#MICROCODE="no"
+# Add in early microcode support: this sets the kernel options for early microcode loading
+# Acceptible values: empty/"no", "all", "intel", "amd"
+#MICROCODE="all"
+
+# Include early microcode in generated initramfs
+# This is enabled by default for upgrade compatability, however is obsoleted by
+# sys-boot/grub-2.02-r1, which supports multiple initramfs in the bootloader.
+#MICROCODE_INITRAMFS="no"
 
 # Add in NFS support
 #NFS="no"

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

[Robin H. Johnson]

commit:     2d5bd27c646ae5a32d84ad3741686770d87f68fa
Author:     Luca Barbato <luca.barbato <AT> gmail <DOT> com>
AuthorDate: Wed Aug 15 13:37:05 2018 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 19 07:32:29 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2d5bd27c

Fix ppc64le support

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

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

diff --git a/gen_arch.sh b/gen_arch.sh
index 866a40f..1c9ec37 100755
--- a/gen_arch.sh
+++ b/gen_arch.sh
@@ -50,7 +50,7 @@ get_official_arch() {
 set_kernel_arch() {
 	KERNEL_ARCH=${ARCH}
 	case ${ARCH} in
-		ppc|ppc64)
+		ppc|ppc64*)
 			if [ "${VER}" -ge "3" ]
 			then
 					KERNEL_ARCH=powerpc

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

[Robin H. Johnson]

commit:     0fdb8feba2d4e3c49ed541c6c9ebf6f2ca6f7457
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 18 23:06:40 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 19 07:39:28 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0fdb8feb

defaults/config: fix KERNEL_MAKE_DIRECTIVE_OVERRIDE

Merge gentoo/genkernel PR#6
Merge robbat2/genkernel PR#19

This was PR'd to different forks, with the same branch delta.

Fixes: https://github.com/gentoo/genkernel/pull/6
Fixes: https://github.com/robbat2/genkernel/pull/19
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/config.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

[Robin H. Johnson]

commit:     143469ee4885e9936d6afbe645a048e9936101a2
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 18 22:58:49 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 19 07:33:39 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=143469ee

gen_arch: Fix ppc64le support

Merge gentoo/genkernel/PR#7

Closes: https://github.com/gentoo/genkernel/pull/7
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

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

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

[Robin H. Johnson]

commit:     0ce3b16ce577a54f83b8b54e972b7a9b30cd6c37
Author:     Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Thu Feb 28 06:39:30 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Feb 28 06:40:14 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0ce3b16c

Merge pull request #18 from gyakovlev/zfs-encryption

Add basic zfs encryption support, small fixes

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

 defaults/linuxrc | 49 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 14 deletions(-)

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

[Robin H. Johnson]

commit:     c082eb1318dd438d1bd01dc038feffa9d47bc237
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 28 06:42:53 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 05:53:57 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c082eb13

Merge 'remove NFS rsize/wsize options from default'

Rebased original commit b9b6c2d98aa19edcfda95a65c417719e714a67be to
fix CRLF commit message that broke parsing of the headers.

Fixes: https://github.com/gentoo/genkernel/pull/4
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/initrd.defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[Robin H. Johnson]

commit:     31d264e222708f12e0b952dda5a2c2909f3e4d45
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  1 05:59:51 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 05:59:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=31d264e2

Merge branch 'github-gentoo/pr/8'

Fixes: https://github.com/gentoo/genkernel/pull/8
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/initrd.defaults |  2 +-
 defaults/initrd.scripts  | 18 +++++++++---------
 defaults/login-remote.sh | 37 +++++++++++++++++++++++--------------
 3 files changed, 33 insertions(+), 24 deletions(-)

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

[Ben Kohler]

commit:     4980dddaa91b4198a1b3f3ff852278ad680a6372
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  7 20:42:06 2019 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Mar  7 20:42:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4980ddda

genkernel.conf: remove misleading comment about INSTALL default

Fixes: https://bugs.gentoo.org/663550

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 genkernel.conf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/genkernel.conf b/genkernel.conf
index 57cb2b0..1533c7a 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -7,8 +7,7 @@
 
 # =========Common Command Line Option Defaults=========
 
-# Should we install to $BOOTDIR?  Default is "no" because genkernel is used in
-# catalyst and stage building.
+# Should we install to $BOOTDIR?
 #INSTALL="yes"
 
 # Run 'make oldconfig' before compiling this kernel?

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

[Robin H. Johnson]

commit:     8ae9d5aa160bbc698efbc7a169ddf30381cd2ad2
Author:     crocket <748856+crocket <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sat Mar  2 09:58:58 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 05:43:14 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8ae9d5aa

Explain dozfs in more detail

Signed-off-by: crocket <crockabiscuit <AT> gmail.com>
(cherry picked from commit cf2c05f163128d9cc93117595c677fca35fc1649)
Fixes: https://github.com/robbat2/genkernel/pull/25
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 genkernel | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/genkernel b/genkernel
index ba3c3bd..61dddca 100755
--- a/genkernel
+++ b/genkernel
@@ -376,6 +376,8 @@ then
 	[ "${DMRAID}" = '1' ] && print_warning 1 '	or "dodmraid=<additional options>"'
 	[ "${ZFS}" = '1' ] && print_warning 1 'add "dozfs" for ZFS volume management support'
 	[ "${ZFS}" = '1' ] && print_warning 1 '	and either "root=ZFS" to use bootfs autodetection or "root=ZFS=<dataset>" to force booting from a specific dataset'
+	[ "${ZFS}" = '1' ] && print_warning 1 'If importing ZFS pool is slow, add dozfs=cache or dozfs=force to kernel commandline.'
+	[ "${ZFS}" = '1' ] && print_warning 1 '"man genkernel" explains "dozfs" in detail.'
 	[ "${BTRFS}" = '1' ] && print_warning 1 'add "dobtrfs" for Btrfs device scanning support'
 	[ "${ISCSI}" = '1' ] && print_warning 1 'add at least "iscsi_initiatorname=<initiator name> iscsi_target=<target name> and iscsi_address=<target ip>" for iscsi support'
 

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

[Ben Kohler]

commit:     2effaa1441944936193d7ee40c386e33bd5d253d
Author:     José Pekkarinen <koalinux <AT> gmail <DOT> com>
AuthorDate: Sun Jun 24 05:29:56 2018 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 17:05:03 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2effaa14

Use firmware prefix and path in initramfs generation

Mimic kernel behaviour of a prefix where to lookup firmware and a file with its path from prefix to avoid confusion on how to use these parameters. This also prevents in folder firmware(ex. i915,amdgpu...) to be copied straight to /lib/firmware in the initramfs.

Signed-off-by: José Pekkarinen <koalinux <AT> gmail.com>
Fixes: https://github.com/gentoo/genkernel/pull/5
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index a2c55c6..b4200c7 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -722,7 +722,7 @@ append_dropbear(){
 }
 
 append_firmware() {
-	if [ -z "${FIRMWARE_FILES}" -a ! -d "${FIRMWARE_DIR}" ]
+	if [ ! -d "${FIRMWARE_DIR}" ]
 	then
 		gen_die "specified firmware directory (${FIRMWARE_DIR}) does not exist"
 	fi
@@ -736,10 +736,12 @@ append_firmware() {
 	then
 		OLD_IFS=$IFS
 		IFS=","
+		pushd ${FIRMWARE_DIR} >/dev/null
 		for i in ${FIRMWARE_FILES}
 		do
-			cp -L "${i}" ${TEMP}/initramfs-firmware-temp/lib/firmware/
+			cp -L --parents "${i}" ${TEMP}/initramfs-firmware-temp/lib/firmware/
 		done
+		popd >/dev/null
 		IFS=$OLD_IFS
 	else
 		cp -a "${FIRMWARE_DIR}"/* ${TEMP}/initramfs-firmware-temp/lib/firmware/

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

[Ben Kohler]

commit:     d547aa065061b0bdd4c79001b3ecf4da760d817d
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  8 17:06:35 2019 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 17:06:35 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d547aa06

genkernel.conf: update & clarify comments regarding FIRMWARE_* behavior

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 genkernel.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/genkernel.conf b/genkernel.conf
index 1533c7a..858a52b 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -130,7 +130,8 @@ USECOLOR="yes"
 #FIRMWARE="no"
 # Specify directory to pull from
 #FIRMWARE_DIR="/lib/firmware"
-# Specify specific firmware files to include. This overrides FIRMWARE_DIR
+# Specify firmware files to include, relative to FIRMWARE_DIR.  If empty or
+# unset, the full contents of FIRMWARE_DIR will be copied recursively.
 #FIRMWARE_FILES=""
 
 # Enable disklabel support (copies blkid to initrd)

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

[Ben Kohler]

commit:     c576f99b0bbdb2c938d5b73eee61d876ef7cca88
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  8 22:09:17 2019 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 22:09:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c576f99b

Misc improvements for FIRMWARE* handling

Change append_firmware to use a space separated list rather than
comma-separated.  Also simplify that code a bit.

Add checks to ensure FIRMWARE_FILES is a space-separated list, and
using relative paths.  Adjust genkernel.conf comments to clarify those
requirements.

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 gen_determineargs.sh | 9 +++++++++
 gen_initramfs.sh     | 8 +-------
 genkernel.conf       | 5 +++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index bd0150a..fee7f75 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -243,5 +243,14 @@ determine_real_args() {
 		*) gen_die "Invalid microcode '${MICROCODE}', --microcode=<type> requires one of: no, all, intel, amd" ;;
 	esac
 
+	if isTrue "${FIRMWARE}"
+	then
+		for ff in ${FIRMWARE_FILES}; do
+			[[ ${ff} = /* ]] && gen_die "FIRMWARE_FILES should list paths relative to FIRMWARE_DIR, not absolute."
+		done
+
+		[[ "${FIRMWARE_FILES}" = *,* ]] && gen_die "FIRMWARE_FILES should be a space-separated list."
+	fi
+
 	get_KV
 }

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index b4200c7..9b8f76c 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -734,15 +734,9 @@ append_firmware() {
 	cd "${TEMP}/initramfs-firmware-temp"
 	if [ -n "${FIRMWARE_FILES}" ]
 	then
-		OLD_IFS=$IFS
-		IFS=","
 		pushd ${FIRMWARE_DIR} >/dev/null
-		for i in ${FIRMWARE_FILES}
-		do
-			cp -L --parents "${i}" ${TEMP}/initramfs-firmware-temp/lib/firmware/
-		done
+		cp -rL --parents --target-directory="${TEMP}/initramfs-firmware-temp/lib/firmware/" ${FIRMWARE_FILES}
 		popd >/dev/null
-		IFS=$OLD_IFS
 	else
 		cp -a "${FIRMWARE_DIR}"/* ${TEMP}/initramfs-firmware-temp/lib/firmware/
 	fi

diff --git a/genkernel.conf b/genkernel.conf
index 858a52b..6eae321 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -130,8 +130,9 @@ USECOLOR="yes"
 #FIRMWARE="no"
 # Specify directory to pull from
 #FIRMWARE_DIR="/lib/firmware"
-# Specify firmware files to include, relative to FIRMWARE_DIR.  If empty or
-# unset, the full contents of FIRMWARE_DIR will be copied recursively.
+# Specify a space-separated list of firmware files or directories to include,
+# relative to FIRMWARE_DIR.  If empty or unset, the full contents of 
+# FIRMWARE_DIR will be included.
 #FIRMWARE_FILES=""
 
 # Enable disklabel support (copies blkid to initrd)

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

[Thomas Deutschmann]

commit:     f63dd6233d70692d56146a982b6a9dbd84012ff0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  9 20:47:00 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar  9 20:50:00 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f63dd623

Add LUKS2 support

LUKS2 requires libgcc_s.so.1 because libargon2 uses pthread_cancel.

Re-use code from append_zfs instead of duplicating code.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 51 ++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 13 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 9b8f76c..420e9fe 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -507,19 +507,7 @@ append_zfs(){
 		fi
 	done
 
-	# Copy binaries
-	# Include libgcc_s.so.1 to workaround zfsonlinux/zfs#4749
-	local libgccpath
-	if type gcc-config 2>&1 1>/dev/null; then
-		libgccpath="/usr/lib/gcc/$(s=$(gcc-config -c); echo ${s%-*}/${s##*-})/libgcc_s.so.1"
-	fi
-	if [[ ! -f ${libgccpath} ]]; then
-		libgccpath="/usr/lib/gcc/*/*/libgcc_s.so.1"
-	fi
-
-	copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zdb,zfs,zpool} ${libgccpath}
-	cd "${TEMP}/initramfs-zfs-temp/lib64"
-	ln -s "..${libgccpath}"
+	copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zdb,zfs,zpool}
 
 	cd "${TEMP}/initramfs-zfs-temp/"
 	log_future_cpio_content
@@ -548,6 +536,38 @@ append_btrfs() {
 	rm -rf "${TEMP}/initramfs-btrfs-temp" > /dev/null
 }
 
+append_libgcc_s() {
+	if [ -d "${TEMP}/initramfs-libgcc_s-temp" ]
+	then
+		rm -r "${TEMP}/initramfs-libgcc_s-temp"
+	fi
+
+	mkdir -p "${TEMP}/initramfs-libgcc_s-temp"
+
+	# Include libgcc_s.so.1:
+	#   - workaround for zfsonlinux/zfs#4749
+	#   - required for LUKS2 (libargon2 uses pthread_cancel)
+	local libgccpath
+	if type gcc-config 2>&1 1>/dev/null; then
+		libgccpath="/usr/lib/gcc/$(s=$(gcc-config -c); echo ${s%-*}/${s##*-})/libgcc_s.so.1"
+	fi
+	if [[ ! -f ${libgccpath} ]]; then
+		libgccpath="/usr/lib/gcc/*/*/libgcc_s.so.1"
+	fi
+
+	# Copy binaries
+	copy_binaries "${TEMP}/initramfs-libgcc_s-temp" ${libgccpath}
+	cd "${TEMP}/initramfs-libgcc_s-temp/lib64"
+	ln -s "..${libgccpath}"
+
+	cd "${TEMP}/initramfs-libgcc_s-temp/"
+	log_future_cpio_content
+	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+			|| gen_die "compressing libgcc_s cpio"
+	cd "${TEMP}"
+	rm -rf "${TEMP}/initramfs-libgcc_s-temp" > /dev/null
+}
+
 append_linker() {
 	if [ -d "${TEMP}/initramfs-linker-temp" ]
 	then
@@ -990,6 +1010,11 @@ create_initramfs() {
 
 	append_data 'modprobed'
 
+	if isTrue "${ZFS}" || isTrue "${LUKS}"
+	then
+		append_data 'libgcc_s'
+	fi
+
 	if isTrue "${FIRMWARE}" && [ -n "${FIRMWARE_DIR}" ]
 	then
 		append_data 'firmware'

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

[Thomas Deutschmann]

commit:     65207ce9470fe81d94450e453765af9633fedc4e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 23:25:52 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 23:25:52 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=65207ce9

gen_initramfs: catch lddtree failure for real.

Fixes: https://bugs.gentoo.org/618056
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 420e9fe..9c50179 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -972,6 +972,13 @@ append_data() {
 }
 
 create_initramfs() {
+	local lddtree_testfile=`which cpio 2>/dev/null`
+	if [[ -z "${lddtree_testfile}" || ! -e "${lddtree_testfile}" ]]; then
+		print_warning 1 "cpio binary not found -- cannot check if lddtree is working!"
+	elif ! lddtree "${lddtree_testfile}" 1>/dev/null 2>&1; then
+		gen_die "'lddtree ${lddtree_testfile}' failed -- cannot generate initramfs without working lddtree!"
+	fi
+
 	local compress_ext=""
 	print_info 1 "initramfs: >> Initializing..."
 

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

[Thomas Deutschmann]

commit:     631469dc525ca896b90220bd5712665eec4c4f82
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 20:26:31 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 20:26:31 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=631469dc

Unify output

Use new "getIndent" function to unify output.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_compile.sh   |  88 +++++++++++++++++++++----------------------
 gen_funcs.sh     |  17 +++++++++
 gen_initramfs.sh | 111 +++++++++++++++++++++++++++++--------------------------
 genkernel        |  17 ++-------
 4 files changed, 122 insertions(+), 111 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index c287054..74319bd 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -212,7 +212,7 @@ apply_patches() {
 
 	if [ -d "${patchdir}" ]
 	then
-		print_info 1 "${util}: >> Applying patches..."
+		print_info 1 "$(getIndent 3)${util}: >> Applying patches..."
 		for i in ${patchdir}/*{diff,patch}
 		do
 			[ -f "${i}" ] || continue
@@ -229,13 +229,13 @@ apply_patches() {
 			done
 			if [ ${patch_success} -eq 1 ]
 			then
-				print_info 1 "          - `basename ${i}`"
+				print_info 1 "$(getIndent 4) - `basename ${i}`"
 			else
 				gen_die "could not apply patch ${i} for ${util}-${version}"
 			fi
 		done
 	else
-		print_info 1 "${util}: >> No patches found in $patchdir ..."
+		print_info 1 "$(getIndent 3)${util}: >> No patches found in $patchdir ..."
 	fi
 }
 
@@ -305,21 +305,21 @@ compile_generic() {
 }
 
 compile_modules() {
-	print_info 1 "        >> Compiling ${KV} modules..."
+	print_info 1 "$(getIndent 3)>> Compiling ${KV} modules..."
 	cd ${KERNEL_DIR}
 	compile_generic modules kernel
 	export UNAME_MACHINE="${ARCH}"
 	[ "${INSTALL_MOD_PATH}" != '' ] && export INSTALL_MOD_PATH
 	if [ "${CMD_STRIP_TYPE}" == "all" -o "${CMD_STRIP_TYPE}" == "modules" ]
 	then
-		print_info 1 "        >> Installing ${KV} modules (and stripping)"
+		print_info 1 "$(getIndent 3)>> Installing ${KV} modules (and stripping)"
 		INSTALL_MOD_STRIP=1
 		export INSTALL_MOD_STRIP
 	else
-		print_info 1 "        >> Installing ${KV} modules"
+		print_info 1 "$(getIndent 3)>> Installing ${KV} modules"
 	fi
 	MAKEOPTS="${MAKEOPTS} -j1" compile_generic "modules_install" kernel
-	print_info 1 "        >> Generating module dependency data..."
+	print_info 1 "$(getIndent 3)>> Generating module dependency data..."
 	if [ "${INSTALL_MOD_PATH}" != '' ]
 	then
 		depmod -a -e -F "${KERNEL_OUTPUTDIR}"/System.map -b "${INSTALL_MOD_PATH}" ${KV}
@@ -338,30 +338,30 @@ compile_kernel() {
 	if [ "${KERNEL_MAKE_DIRECTIVE_OVERRIDE}" != "${DEFAULT_KERNEL_MAKE_DIRECTIVE_OVERRIDE}" ]; then
 		kernel_make_directive="${KERNEL_MAKE_DIRECTIVE_OVERRIDE}"
 	fi
-	print_info 1 "        >> Compiling ${KV} ${kernel_make_directive/_install/ [ install ]/}..."
+	print_info 1 "$(getIndent 3)>> Compiling ${KV} ${kernel_make_directive/_install/ [ install ]/}..."
 	compile_generic "${kernel_make_directive}" kernel
 	if [ "${KERNEL_MAKE_DIRECTIVE_2}" != '' ]
 	then
-		print_info 1 "        >> Starting supplimental compile of ${KV}: ${KERNEL_MAKE_DIRECTIVE_2}..."
+		print_info 1 "$(getIndent 3)>> Starting supplimental compile of ${KV}: ${KERNEL_MAKE_DIRECTIVE_2}..."
 		compile_generic "${KERNEL_MAKE_DIRECTIVE_2}" kernel
 	fi
 
 	if isTrue "${FIRMWARE_INSTALL}" && [ ! -e "${KERNEL_DIR}/ihex2fw.c" ] ; then
 		# Kernel v4.14 removed firmware from the kernel sources, including the
 		# ihex2fw.c tool source. Try and detect the tool to see if we are in >=v4.14
-		print_warning 1 "        >> Linux v4.14 removed in-kernel firmware, you MUST install the sys-kernel/linux-firmware package!"
+		print_warning 1 "$(getIndent 3)>> Linux v4.14 removed in-kernel firmware, you MUST install the sys-kernel/linux-firmware package!"
 	elif isTrue "${FIRMWARE_INSTALL}" ; then
 		local cfg_CONFIG_FIRMWARE_IN_KERNEL=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" CONFIG_FIRMWARE_IN_KERNEL)
 		if isTrue "$cfg_CONFIG_FIRMWARE_IN_KERNEL"; then
-			print_info 1 "        >> Not installing firmware as it's included in the kernel already (CONFIG_FIRMWARE_IN_KERNEL=y)..."
+			print_info 1 "$(getIndent 3)>> Not installing firmware as it's included in the kernel already (CONFIG_FIRMWARE_IN_KERNEL=y)..."
 		else
-			print_info 1 "        >> Installing firmware ('make firmware_install') due to CONFIG_FIRMWARE_IN_KERNEL != y..."
+			print_info 1 "$(getIndent 3)>> Installing firmware ('make firmware_install') due to CONFIG_FIRMWARE_IN_KERNEL != y..."
 			[ "${INSTALL_MOD_PATH}" != '' ] && export INSTALL_MOD_PATH
 			[ "${INSTALL_FW_PATH}" != '' ] && export INSTALL_FW_PATH
 			MAKEOPTS="${MAKEOPTS} -j1" compile_generic "firmware_install" kernel
 		fi
 	else
-		print_info 1 "        >> Not installing firmware as requested by configuration FIRMWARE_INSTALL=no..."
+		print_info 1 "$(getIndent 3)>> Not installing firmware as requested by configuration FIRMWARE_INSTALL=no..."
 	fi
 
 	local tmp_kernel_binary=$(find_kernel_binary ${KERNEL_BINARY_OVERRIDE:-${KERNEL_BINARY}})
@@ -446,10 +446,10 @@ compile_busybox() {
 		newconfig_md5="$(md5sum < "${TEMP}/busybox-config")"
 		if [ "${oldconfig_md5}" != "${newconfig_md5}" ]
 		then
-			print_info 1 "busybox: >> Removing stale cache..."
+			print_info 1 "$(getIndent 3)busybox: >> Removing stale cache..."
 			rm -rf "${BUSYBOX_BINCACHE}"
 		else
-			print_info 1 "busybox: >> Using cache"
+			print_info 1 "$(getIndent 3)busybox: >> Using cache"
 		fi
 	fi
 
@@ -472,13 +472,13 @@ compile_busybox() {
 		apply_patches busybox ${BUSYBOX_VER}
 
 		# This has the side-effect of changing the .config
-		print_info 1 'busybox: >> Configuring...'
+		print_info 1 "$(getIndent 3)busybox: >> Configuring..."
 		yes '' 2>/dev/null | compile_generic oldconfig utils
 
-		print_info 1 'busybox: >> Compiling...'
+		print_info 1 "$(getIndent 3)busybox: >> Compiling..."
 		compile_generic all utils V=1
 
-		print_info 1 'busybox: >> Copying to cache...'
+		print_info 1 "$(getIndent 3)busybox: >> Copying to bincache..."
 		[ -f "${TEMP}/${BUSYBOX_DIR}/busybox" ] ||
 			gen_die 'Busybox executable does not exist!'
 		${UTILS_CROSS_COMPILE}strip "${TEMP}/${BUSYBOX_DIR}/busybox" ||
@@ -495,7 +495,7 @@ compile_busybox() {
 compile_lvm() {
 	if [ -f "${LVM_BINCACHE}" ]
 	then
-		print_info 1 "lvm: >> Using cache"
+		print_info 1 "$(getIndent 3)lvm: >> Using cache"
 	else
 		[ -f "${LVM_SRCTAR}" ] ||
 			gen_die "Could not find LVM source tarball: ${LVM_SRCTAR}! Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
@@ -506,13 +506,13 @@ compile_lvm() {
 		[ -d "${LVM_DIR}" ] ||
 			gen_die "LVM directory ${LVM_DIR} is invalid!"
 		cd "${LVM_DIR}"
-		print_info 1 'lvm: >> Patching ...'
+		print_info 1 "$(getIndent 3)lvm: >> Patching ..."
 		apply_patches lvm ${LVM_VER}
 		# we currently have a patch that changes configure.ac
 		# once given patch is dropped, drop autoconf too
-		print_info 1 'lvm: >> Autoconf ...'
+		print_info 1 "$(getIndent 3)lvm: >> Autoconf ..."
 		autoconf || gen_die 'Autoconf failed for LVM2'
-		print_info 1 'lvm: >> Configuring...'
+		print_info 1 "$(getIndent 3)lvm: >> Configuring..."
 		LVM_CONF=(
 			--enable-static_link
 			--prefix=/
@@ -538,17 +538,17 @@ compile_lvm() {
 		./configure "${LVM_CONF[@]}" \
 			>> ${LOGFILE} 2>&1 || \
 			gen_die 'Configure of lvm failed!'
-		print_info 1 'lvm: >> Compiling...'
+		print_info 1 "$(getIndent 3)lvm: >> Compiling..."
 		compile_generic '' utils || gen_die "failed to build LVM"
 
 		mkdir -p "${TEMP}/lvm/sbin"
-		print_info 1 'lvm: >> Installing to DESTDIR...'
+		print_info 1 "$(getIndent 3)lvm: >> Installing to DESTDIR..."
 		compile_generic "install DESTDIR=${TEMP}/lvm/" utils || gen_die "failed to install LVM"
 		# Upstream does u-w on files, and this breaks stuff.
 		chmod -R u+w "${TEMP}/lvm/"
 
 		cd "${TEMP}/lvm"
-		print_info 1 '      >> Copying to bincache...'
+		print_info 1 "$(getIndent 3)lvm: >> Copying to bincache..."
 		${UTILS_CROSS_COMPILE}strip "sbin/lvm.static" ||
 			gen_die 'Could not strip lvm.static!'
 		# See bug 382555
@@ -567,7 +567,7 @@ compile_lvm() {
 compile_mdadm() {
 	if [ -f "${MDADM_BINCACHE}" ]
 	then
-		print_info 1 '		MDADM: Using cache'
+		print_info 1 "$(getIndent 3)MDADM: Using cache"
 	else
 		[ -f "${MDADM_SRCTAR}" ] ||
 			gen_die "Could not find MDADM source tarball: ${MDADM_SRCTAR}! Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
@@ -588,13 +588,13 @@ compile_mdadm() {
 			-e "s/^# LDFLAGS = -static/LDFLAGS = -static/" \
 			Makefile || gen_die "Failed to sed mdadm Makefile"
 
-		print_info 1 'mdadm: >> Compiling...'
+		print_info 1 "$(getIndent 3)mdadm: >> Compiling..."
 		compile_generic 'mdadm mdmon' utils
 
 		mkdir -p "${TEMP}/mdadm/sbin"
 		install -m 0755 -s mdadm "${TEMP}/mdadm/sbin/mdadm" || gen_die "Failed mdadm install"
 		install -m 0755 -s mdmon "${TEMP}/mdadm/sbin/mdmon" || gen_die "Failed mdmon install"
-		print_info 1 '      >> Copying to bincache...'
+		print_info 1 "$(getIndent 3)mdadm: >> Copying to bincache..."
 		cd "${TEMP}/mdadm"
 		${UTILS_CROSS_COMPILE}strip "sbin/mdadm" "sbin/mdmon" ||
 			gen_die 'Could not strip mdadm binaries!'
@@ -626,7 +626,7 @@ compile_dmraid() {
 
 		cd "${DMRAID_DIR}"
 		apply_patches dmraid ${DMRAID_VER}
-		print_info 1 'dmraid: >> Configuring...'
+		print_info 1 "$(getIndent 3)dmraid: >> Configuring..."
 
 		LDFLAGS="-L${TEMP}/lvm/lib" \
 		CFLAGS="-I${TEMP}/lvm/include" \
@@ -644,13 +644,13 @@ compile_dmraid() {
 		sed -i tools/Makefile -e "/DMRAID_LIBS +=/s|-lselinux||g"
 		###echo "DMRAIDLIBS += -lselinux -lsepol" >> tools/Makefile
 		mkdir -p "${TEMP}/dmraid"
-		print_info 1 'dmraid: >> Compiling...'
+		print_info 1 "$(getIndent 3)dmraid: >> Compiling..."
 		# Force dmraid to be built with -j1 for bug #188273
 		MAKEOPTS="${MAKEOPTS} -j1" compile_generic '' utils
 		#compile_generic 'install' utils
 		mkdir ${TEMP}/dmraid/sbin
 		install -m 0755 -s tools/dmraid "${TEMP}/dmraid/sbin/dmraid"
-		print_info 1 '      >> Copying to bincache...'
+		print_info 1 "$(getIndent 3)dmraid: >> Copying to bincache..."
 		cd "${TEMP}/dmraid"
 		/bin/tar -cjf "${DMRAID_BINCACHE}" sbin/dmraid ||
 			gen_die 'Could not create binary cache'
@@ -678,14 +678,14 @@ compile_fuse() {
 			gen_die "fuse directory ${FUSE_DIR} invalid"
 		cd "${FUSE_DIR}"
 		apply_patches fuse ${FUSE_VER}
-		print_info 1 'fuse: >> Configuring...'
+		print_info 1 "$(getIndent 3)fuse: >> Configuring..."
 		./configure --disable-example >> ${LOGFILE} 2>&1 ||
 			gen_die 'Configuring fuse failed!'
-		print_info 1 'fuse: >> Compiling...'
+		print_info 1 "$(getIndent 3)fuse: >> Compiling..."
 		MAKE=${UTILS_MAKE} compile_generic "" ""
 
 		# Since we're linking statically against libfuse, we don't need to cache the .so
-#		print_info 1 'libfuse: >> Copying to cache...'
+#		print_info 1 "$(getIndent 3)libfuse: >> Copying to bincache..."
 #		[ -f "${TEMP}/${FUSE_DIR}/lib/.libs/libfuse.so" ] ||
 #			gen_die 'libfuse.so does not exist!'
 #		${UTILS_CROSS_COMPILE}strip "${TEMP}/${FUSE_DIR}/lib/.libs/libfuse.so" ||
@@ -716,11 +716,11 @@ compile_unionfs_fuse() {
 			gen_die "unionfs-fuse directory ${UNIONFS_FUSE_DIR} invalid"
 		cd "${UNIONFS_FUSE_DIR}"
 		apply_patches unionfs-fuse ${UNIONFS_FUSE_VER}
-		print_info 1 'unionfs-fuse: >> Compiling...'
+		print_info 1 "$(getIndent 3)unionfs-fuse: >> Compiling..."
 		sed -i "/^\(CFLAGS\|CPPFLAGS\)/s:^\\(.*\\)$:\\1 -static -I${TEMP}/${FUSE_DIR}/include -L${TEMP}/${FUSE_DIR}/lib/.libs:" Makefile src/Makefile
 		sed -i "/^LIB = /s:^LIB = \(.*\)$:LIB = -static -L${TEMP}/${FUSE_DIR}/lib/.libs \1 -ldl -lpthread -lrt:" Makefile src/Makefile
 		MAKE=${UTILS_MAKE} compile_generic "" ""
-		print_info 1 'unionfs-fuse: >> Copying to cache...'
+		print_info 1 "$(getIndent 3)unionfs-fuse: >> Copying to bincache..."
 		[ -f "${TEMP}/${UNIONFS_FUSE_DIR}/src/unionfs" ] ||
 			gen_die 'unionfs binary does not exist!'
 		${UTILS_CROSS_COMPILE}strip "${TEMP}/${UNIONFS_FUSE_DIR}/src/unionfs" ||
@@ -746,12 +746,12 @@ compile_iscsi() {
 		tar -xpf "${ISCSI_SRCTAR}"
 		[ ! -d "${ISCSI_DIR}" ] &&
 			gen_die "ISCSI directory ${ISCSI_DIR} invalid"
-				print_info 1 'iSCSI: >> Compiling...'
+		print_info 1 "$(getIndent 3)iSCSI: >> Compiling..."
 		cd "${TEMP}/${ISCSI_DIR}"
 		apply_patches iscsi ${ISCSI_VER}
 
 		# Only build userspace
-		print_info 1 'iSCSI: >> Configuring userspace...'
+		print_info 1 "$(getIndent 3)iSCSI: >> Configuring userspace..."
 		cd utils/open-isns || gen_die 'Could not enter open-isns dir'
 		# we currently have a patch that changes configure.ac
 		# once given patch is dropped, drop autoconf too
@@ -772,8 +772,8 @@ compile_iscsi() {
 			fi
 		done
 
-	        cd "${TEMP}/initramfs-iscsi-temp/"
-		print_info 1 'iscsistart: >> Copying to cache...'
+		cd "${TEMP}/initramfs-iscsi-temp/"
+		print_info 1 "$(getIndent 3)iscsistart: >> Copying to bincache..."
 		[ -f "${TEMP}/${ISCSI_DIR}/usr/iscsistart" ] ||
 			gen_die 'iscsistart executable does not exist!'
 		${UTILS_CROSS_COMPILE}strip "${TEMP}/${ISCSI_DIR}/usr/iscsistart" ||
@@ -792,7 +792,7 @@ compile_iscsi() {
 compile_gpg() {
 	if [ -f "${GPG_BINCACHE}" ]
 	then
-		print_info 1 "gnupg: >> Using cache"
+		print_info 1 "$(getIndent 3)gnupg: >> Using cache"
 	else
 		[ ! -f "${GPG_SRCTAR}" ] &&
 			gen_die "Could not find gnupg source tarball: ${GPG_SRCTAR}. Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
@@ -803,7 +803,7 @@ compile_gpg() {
 			gen_die "gnupg directory ${GPG_DIR} invalid"
 		cd "${GPG_DIR}"
 		apply_patches gnupg ${GPG_VER}
-		print_info 1 'gnupg: >> Configuring...'
+		print_info 1 "$(getIndent 3)gnupg: >> Configuring..."
 		# --enable-minimal works, but it doesn't reduce the command length much.
 		# Given its history and the precision this needs, explicit is cleaner.
 		LDFLAGS='-static' CFLAGS='-Os' ./configure --prefix=/ \
@@ -819,9 +819,9 @@ compile_gpg() {
 			--without-libpth-prefix --without-libiconv-prefix --without-libintl-prefix\
 			--without-zlib --without-bzip2 --without-libusb --without-readline \
 				>> ${LOGFILE} 2>&1 || gen_die 'Configuring gnupg failed!'
-		print_info 1 'gnupg: >> Compiling...'
+		print_info 1 "$(getIndent 3)gnupg: >> Compiling..."
 		compile_generic "" "utils"
-		print_info 1 'gnupg: >> Copying to cache...'
+		print_info 1 "$(getIndent 3)gnupg: >> Copying to bincache..."
 		[ -f "${TEMP}/${GPG_DIR}/g10/gpg" ] ||
 			gen_die 'gnupg executable does not exist!'
 		${UTILS_CROSS_COMPILE}strip "${TEMP}/${GPG_DIR}/g10/gpg" ||

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 656ddef..618aab6 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -231,6 +231,23 @@ gen_die() {
   	exit 1
 }
 
+getIndent() {
+	[[ "$#" -lt '1' ]] &&
+		gen_die 'getIndent(): improper usage!'
+
+	local _level=${1}
+	local _indent=
+	local _indentTemplate="        "
+	local i=0
+
+	while [[ ${i} -lt ${_level} ]]; do
+		_indent+=${_indentTemplate}
+		i=$[$i+1]
+	done
+
+	echo "${_indent}"
+}
+
 isBootRO()
 {
 	return $(awk '( $2 == "'${BOOTDIR}'" && $4 ~ /(^|,)ro(,|$)/){ I=1; exit }END{print !I }' /proc/mounts);

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 9c50179..175ccc5 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -5,7 +5,7 @@ COPY_BINARIES=false
 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:
+# encourage wide adoption and re-use. That means:
 # - You may use the code of copy_binaries() as CC0 outside of genkernel
 # - Contributions to this function are licensed under CC0 as well.
 # - If you change it outside of genkernel, please consider sending your
@@ -44,7 +44,7 @@ copy_binaries() {
 	else
 		lddtree "$@" \
 			| tr ')(' '\n' \
-			| awk  '/=>/{ if($3 ~ /^\//){print $3}}' \
+			| awk '/=>/{ if($3 ~ /^\//){print $3}}' \
 			|| gen_die "Binary ${f} or some of its library dependencies could not be copied"
 	fi ) \
 			| sort \
@@ -104,7 +104,7 @@ append_base_layout() {
 	mkdir -p ${TEMP}/initramfs-base-temp/sbin
 	mkdir -p ${TEMP}/initramfs-base-temp/usr/bin
 	mkdir -p ${TEMP}/initramfs-base-temp/usr/sbin
-	ln -s  lib  ${TEMP}/initramfs-base-temp/lib64
+	ln -s lib ${TEMP}/initramfs-base-temp/lib64
 
 	echo "/dev/ram0     /           ext2    defaults	0 0" > ${TEMP}/initramfs-base-temp/etc/fstab
 	echo "proc          /proc       proc    defaults    0 0" >> ${TEMP}/initramfs-base-temp/etc/fstab
@@ -116,7 +116,7 @@ append_base_layout() {
 	# Assume the initramfs we're building is for this system, so copy
 	# our current hostid into it.
 	# We also have to deal with binary+endianness here: glibc's gethostid
-	# expects the value to be in binary using the native endianness.  But
+	# expects the value to be in binary using the native endianness. But
 	# the coreutils hostid program doesn't show it in the right form.
 	local hostid
 	if file -L "${TEMP}/initramfs-base-temp/bin/sh" | grep -q 'MSB executable'; then
@@ -145,6 +145,8 @@ append_busybox() {
 		rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null
 	fi
 
+	compile_busybox
+
 	mkdir -p "${TEMP}/initramfs-busybox-temp/bin/"
 	tar -xf "${BUSYBOX_BINCACHE}" -C "${TEMP}/initramfs-busybox-temp/bin" busybox ||
 		gen_die 'Could not extract busybox bincache!'
@@ -239,6 +241,9 @@ append_unionfs_fuse() {
 	then
 		rm -r "${TEMP}/initramfs-unionfs-fuse-temp"
 	fi
+
+	compile_unionfs_fuse
+
 	cd ${TEMP}
 	mkdir -p "${TEMP}/initramfs-unionfs-fuse-temp/sbin/"
 	bzip2 -dc "${UNIONFS_FUSE_BINCACHE}" > "${TEMP}/initramfs-unionfs-fuse-temp/sbin/unionfs" ||
@@ -257,7 +262,7 @@ append_unionfs_fuse() {
 #	then
 #		rm -r "${TEMP}/initramfs-suspend-temp/"
 #	fi
-#	print_info 1 'SUSPEND: Adding support (compiling binaries)...'
+#	print_info 1 "$(getIndent 2)SUSPEND: Adding support (compiling binaries)..."
 #	compile_suspend
 #	mkdir -p "${TEMP}/initramfs-suspend-temp/"
 #	/bin/tar -xpf "${SUSPEND_BINCACHE}" -C "${TEMP}/initramfs-suspend-temp" ||
@@ -277,7 +282,7 @@ append_multipath(){
 	then
 		rm -r "${TEMP}/initramfs-multipath-temp"
 	fi
-	print_info 1 '	Multipath support being added'
+	print_info 1 "$(getIndent 2)Multipath: Adding support (using system binaries)..."
 	mkdir -p "${TEMP}"/initramfs-multipath-temp/{bin,etc,sbin,lib}/
 
 	# Copy files
@@ -316,7 +321,7 @@ append_dmraid(){
 	then
 		rm -r "${TEMP}/initramfs-dmraid-temp/"
 	fi
-	print_info 1 'DMRAID: Adding support (compiling binaries)...'
+	print_info 1 "$(getIndent 2)DMRAID: Adding support (compiling binaries)..."
 	compile_dmraid
 	mkdir -p "${TEMP}/initramfs-dmraid-temp/"
 	/bin/tar -xpf "${DMRAID_BINCACHE}" -C "${TEMP}/initramfs-dmraid-temp" ||
@@ -345,7 +350,7 @@ append_iscsi(){
 	then
 		rm -r "${TEMP}/initramfs-iscsi-temp/"
 	fi
-	print_info 1 'iSCSI: Adding support (compiling binaries)...'
+	print_info 1 "$(getIndent 2)iSCSI: Adding support (compiling binaries)..."
 	compile_iscsi
 	cd ${TEMP}
 	mkdir -p "${TEMP}/initramfs-iscsi-temp/bin/"
@@ -372,7 +377,7 @@ append_lvm(){
 	mkdir -p "${TEMP}/initramfs-lvm-temp/etc/lvm/cache"
 	if false && [ -e '/sbin/lvm.static' ]
 	then
-		print_info 1 '          LVM: Adding support (using local static binary /sbin/lvm.static)...'
+		print_info 1 "$(getIndent 2)LVM: Adding support (using local static binary /sbin/lvm.static)..."
 		cp /sbin/lvm.static "${TEMP}/initramfs-lvm-temp/sbin/lvm" ||
 			gen_die 'Could not copy over lvm!'
 		# See bug 382555
@@ -382,7 +387,7 @@ append_lvm(){
 		fi
 	elif false && [ -e '/sbin/lvm' ] && LC_ALL="C" ldd /sbin/lvm|grep -q 'not a dynamic executable'
 	then
-		print_info 1 '          LVM: Adding support (using local static binary /sbin/lvm)...'
+		print_info 1 "$(getIndent 2)LVM: Adding support (using local static binary /sbin/lvm)..."
 		cp /sbin/lvm "${TEMP}/initramfs-lvm-temp/sbin/lvm" ||
 			gen_die 'Could not copy over lvm!'
 		# See bug 382555
@@ -391,7 +396,7 @@ append_lvm(){
 			cp /sbin/dmsetup "${TEMP}/initramfs-lvm-temp/bin/dmsetup"
 		fi
 	else
-		print_info 1 '          LVM: Adding support (compiling binaries)...'
+		print_info 1 "$(getIndent 2)LVM: Adding support (compiling binaries)..."
 		compile_lvm || gen_die "Could not compile LVM"
 		/bin/tar -xpf "${LVM_BINCACHE}" -C "${TEMP}/initramfs-lvm-temp" ||
 			gen_die "Could not extract lvm binary cache!";
@@ -464,17 +469,17 @@ append_mdadm(){
 				gen_die "${MDADM_CONFIG} does not exist!"
 			fi
 		else
-			print_info 1 '		MDADM: Skipping inclusion of mdadm.conf'
+			print_info 1 "$(getIndent 2)MDADM: Skipping inclusion of mdadm.conf"
 		fi
 
 		if [ -e '/sbin/mdadm' ] && LC_ALL="C" ldd /sbin/mdadm | grep -q 'not a dynamic executable' \
 		&& [ -e '/sbin/mdmon' ] && LC_ALL="C" ldd /sbin/mdmon | grep -q 'not a dynamic executable'
 		then
-			print_info 1 '		MDADM: Adding support (using local static binaries /sbin/mdadm and /sbin/mdmon)...'
+			print_info 1 "$(getIndent 2)MDADM: Adding support (using local static binaries /sbin/mdadm and /sbin/mdmon)..."
 			cp /sbin/mdadm /sbin/mdmon "${TEMP}/initramfs-mdadm-temp/sbin/" ||
 				gen_die 'Could not copy over mdadm!'
 		else
-			print_info 1 '		MDADM: Adding support (compiling binaries)...'
+			print_info 1 "$(getIndent 2)MDADM: Adding support (compiling binaries)..."
 			compile_mdadm
 			/bin/tar -xpf "${MDADM_BINCACHE}" -C "${TEMP}/initramfs-mdadm-temp" ||
 				gen_die "Could not extract mdadm binary cache!";
@@ -501,7 +506,7 @@ append_zfs(){
 	do
 		if [ -f /etc/zfs/${i} ]
 		then
-			print_info 1 "        >> Including ${i}"
+			print_info 1 "$(getIndent 2)zfs: >> 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
@@ -607,7 +612,7 @@ append_splash(){
 	then
 		[ -z "${SPLASH_THEME}" ] && [ -e /etc/conf.d/splash ] && source /etc/conf.d/splash
 		[ -z "${SPLASH_THEME}" ] && SPLASH_THEME=default
-		print_info 1 "  >> Installing splash [ using the ${SPLASH_THEME} theme ]..."
+		print_info 1 "$(getIndent 1)>> Installing splash [ using the ${SPLASH_THEME} theme ]..."
 		if [ -d "${TEMP}/initramfs-splash-temp" ]
 		then
 			rm -r "${TEMP}/initramfs-splash-temp/"
@@ -628,7 +633,7 @@ append_splash(){
 		cd "${TEMP}"
 		rm -r "${TEMP}/initramfs-splash-temp/"
 	else
-		print_warning 1 '               >> No splash detected; skipping!'
+		print_warning 1 "$(getIndent 1)>> No splash detected; skipping!"
 	fi
 }
 
@@ -640,7 +645,7 @@ append_overlay(){
 }
 
 append_luks() {
-	local _luks_error_format="LUKS support cannot be included: %s.  Please emerge sys-fs/cryptsetup[static]."
+	local _luks_error_format="LUKS support cannot be included: %s. Please emerge sys-fs/cryptsetup[static]."
 	local _luks_source=/sbin/cryptsetup
 	local _luks_dest=/sbin/cryptsetup
 
@@ -658,7 +663,7 @@ append_luks() {
 		[ -x "${_luks_source}" ] \
 				|| gen_die "$(printf "${_luks_error_format}" "no file ${_luks_source}")"
 
-		print_info 1 "Including LUKS support"
+		print_info 1 "$(getIndent 2)LUKS: Adding support (using system binaries)..."
 		copy_binaries "${TEMP}/initramfs-luks-temp/" /sbin/cryptsetup
 	fi
 
@@ -696,7 +701,7 @@ append_dropbear(){
 	fi
 
 	cd "${TEMP}" \
-                || gen_die "cd '${TEMP}' failed"
+		|| gen_die "cd '${TEMP}' failed"
 	mkdir -p ${TEMP}/initramfs-dropbear-temp/var/run
 	mkdir -p ${TEMP}/initramfs-dropbear-temp/var/log
 	mkdir -p ${TEMP}/initramfs-dropbear-temp/etc/dropbear
@@ -775,7 +780,7 @@ append_gpg() {
 	cd ${TEMP}
 	mkdir -p "${TEMP}/initramfs-gpg-temp/sbin/"
 	if [ ! -e ${GPG_BINCACHE} ] ; then
-		print_info 1 '		GPG: Adding support (compiling binaries)...'
+		print_info 1 "$(getIndent 2)GPG: Adding support (compiling binaries)..."
 		compile_gpg
 	fi
 	bzip2 -dc "${GPG_BINCACHE}" > "${TEMP}/initramfs-gpg-temp/sbin/gpg" ||
@@ -804,9 +809,9 @@ append_modules() {
 	print_info 2 "initramfs: >> Searching for modules..."
 	if [ "${INSTALL_MOD_PATH}" != '' ]
 	then
-	  cd ${INSTALL_MOD_PATH}
+		cd ${INSTALL_MOD_PATH}
 	else
-	  cd /
+		cd /
 	fi
 
 	if [ -d "${TEMP}/initramfs-modules-${KV}-temp" ]
@@ -877,7 +882,7 @@ append_auxilary() {
 	if [ -f "${CMD_LINUXRC}" ]
 	then
 		cp "${CMD_LINUXRC}" "${TEMP}/initramfs-aux-temp/init"
-		print_info 2 "        >> Copying user specified linuxrc: ${CMD_LINUXRC} to init"
+		print_info 2 "$(getIndent 1)>> Copying user specified linuxrc: ${CMD_LINUXRC} to init"
 	else
 		if isTrue ${NETBOOT}
 		then
@@ -933,7 +938,7 @@ append_auxilary() {
 	fi
 	if isTrue $CMD_KEYMAP
 	then
-		print_info 1 "        >> Copying keymaps"
+		print_info 1 "$(getIndent 1)>> Copying keymaps"
 		mkdir -p "${TEMP}/initramfs-aux-temp/lib/"
 		cp -R "${GK_SHARE}/defaults/keymaps" "${TEMP}/initramfs-aux-temp/lib/" \
 				|| gen_die "Error while copying keymaps"
@@ -966,8 +971,8 @@ append_data() {
 	[ $# -eq 0 ] && gen_die "append_data() called with zero arguments"
 	if [ $# -eq 1 ] || isTrue ${var}
 	then
-	    print_info 1 "        >> Appending ${name} cpio data..."
-	    ${func} || gen_die "${func}() failed"
+		print_info 1 "$(getIndent 1)>> Appending ${name} cpio data..."
+		${func} || gen_die "${func}() failed"
 	fi
 }
 
@@ -1043,7 +1048,7 @@ create_initramfs() {
 	# http://search.cpan.org/~pixel/Archive-Cpio-0.07/lib/Archive/Cpio.pm
 	# as then we can dedupe ourselves...
 	if [[ $UID -eq 0 ]]; then
-		print_info 1 "        >> Deduping cpio..."
+		print_info 1 "$(getIndent 1)>> Deduping cpio..."
 		local TDIR="${TEMP}/initramfs-final"
 		mkdir -p "${TDIR}"
 		cd "${TDIR}"
@@ -1055,7 +1060,7 @@ create_initramfs() {
 		cd "${TEMP}"
 		rm -rf "${TDIR}"
 	else
-		print_info 1 "        >> Cannot deduping cpio contents without root; skipping"
+		print_info 1 "$(getIndent 1)>> Cannot deduping cpio contents without root; skipping"
 	fi
 
 	cd "${TEMP}"
@@ -1068,13 +1073,13 @@ create_initramfs() {
 		sed -i '/^.*CONFIG_INITRAMFS_SOURCE=.*$/d' ${KERNEL_OUTPUTDIR}/.config
 		compress_config='INITRAMFS_COMPRESSION_NONE'
 		case ${compress_ext} in
-			gz)  compress_config='INITRAMFS_COMPRESSION_GZIP' ;;
-			bz2) compress_config='INITRAMFS_COMPRESSION_BZIP2' ;;
+			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' ;;
-			lz4) compress_config='INITRAMFS_COMPRESSION_LZ4' ;;
-			*) compress_config='INITRAMFS_COMPRESSION_NONE' ;;
+			xz)   compress_config='INITRAMFS_COMPRESSION_XZ' ;;
+			lzo)  compress_config='INITRAMFS_COMPRESSION_LZO' ;;
+			lz4)  compress_config='INITRAMFS_COMPRESSION_LZ4' ;;
+			*)    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.
@@ -1094,8 +1099,8 @@ create_initramfs() {
 	else
 		if isTrue "${COMPRESS_INITRD}"
 		then
-			# NOTE:  We do not work with ${KERNEL_CONFIG} here, since things like
-			#        "make oldconfig" or --noclean could be in effect.
+			# NOTE: We do not work with ${KERNEL_CONFIG} here, since things like
+			#       "make oldconfig" or --noclean could be in effect.
 			if [ -f "${KERNEL_OUTPUTDIR}"/.config ]; then
 				local ACTUAL_KERNEL_CONFIG="${KERNEL_OUTPUTDIR}"/.config
 			else
@@ -1132,7 +1137,7 @@ create_initramfs() {
 							'CONFIG_RD_BZIP2 cmd_bzip2 bzip2' \
 							'CONFIG_RD_GZIP  cmd_gzip  gzip' \
 							'CONFIG_RD_LZO   cmd_lzop  lzop' \
-							'CONFIG_RD_LZ4   cmd_lz4  lz4' \
+							'CONFIG_RD_LZ4   cmd_lz4   lz4' \
 							; do
 						set -- ${tuple}
 						kernel_option=$1
@@ -1164,12 +1169,12 @@ create_initramfs() {
 			esac
 
 			if [ -n "${compression}" ]; then
-				print_info 1 "        >> Compressing cpio data (${compress_ext})..."
-				print_info 5 "        >> Compression command (${compress_cmd} $CPIO)..."
+				print_info 1 "$(getIndent 1)>> Compressing cpio data (${compress_ext})..."
+				print_info 5 "$(getIndent 1)>> Compression command (${compress_cmd} $CPIO)..."
 				${compress_cmd} "${CPIO}" || gen_die "Compression (${compress_cmd}) failed"
 				mv -f "${CPIO}${compress_ext}" "${CPIO}" || gen_die "Rename failed"
 			else
-				print_info 1 "        >> Not compressing cpio data ..."
+				print_info 1 "$(getIndent 1)>> Not compressing cpio data ..."
 			fi
 		fi
 		## To early load microcode we need to follow some pretty specific steps
@@ -1181,35 +1186,35 @@ create_initramfs() {
 			print_info 1 "--microcode-initramfs is enabled by default for compatability but made obsolete by sys-boot/grub-2.02-r1"
 			cfg_CONFIG_MICROCODE_INTEL=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_INTEL)
 			cfg_CONFIG_MICROCODE_AMD=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_AMD)
-			print_info 1 "early-microcode: >> Preparing..."
+			print_info 1 "$(getIndent 1)>> Adding early-microcode support..."
 			UCODEDIR="${TMPDIR}/ucode_tmp/kernel/x86/microcode/"
 			mkdir -p "${UCODEDIR}"
-			if [  "${cfg_CONFIG_MICROCODE_INTEL}" == "y" ]; then
+			if [ "${cfg_CONFIG_MICROCODE_INTEL}" == "y" ]; then
 				if [ -d /lib/firmware/intel-ucode ]; then
-					print_info 1 "                 >> adding GenuineIntel.bin"
+					print_info 1 "$(getIndent 2)early-microcode: Adding GenuineIntel.bin..."
 					cat /lib/firmware/intel-ucode/* > "${UCODEDIR}/GenuineIntel.bin" || gen_die "Failed to concat intel cpu ucode"
 				else
-					print_info 1 "CONFIG_MICROCODE_INTEL=y set but no ucode available. Please install sys-firmware/intel-microcode[split-ucode]"
+					print_info 1 "$(getIndent 2)early-microcode: CONFIG_MICROCODE_INTEL=y set but no ucode available. Please install sys-firmware/intel-microcode[split-ucode]"
 				fi
 			fi
-			if [  "${cfg_CONFIG_MICROCODE_AMD}" == "y" ]; then
+			if [ "${cfg_CONFIG_MICROCODE_AMD}" == "y" ]; then
 				if [ -d /lib/firmware/amd-ucode ]; then
-					print_info 1 "                 >> adding AuthenticAMD.bin"
+					print_info 1 "$(getIndent 2)early-microcode: Adding AuthenticAMD.bin..."
 					cat /lib/firmware/amd-ucode/*.bin > "${UCODEDIR}/AuthenticAMD.bin" || gen_dir "Failed to concat amd cpu ucode"
 				else
-					print_info 1 "CONFIG_MICROCODE_AMD=y set but no ucode available.  Please install sys-firmware/linux-firmware"
+					print_info 1 "$(getIndent 2)early-microcode: CONFIG_MICROCODE_AMD=y set but no ucode available. Please install sys-firmware/linux-firmware"
 				fi
 			fi
 			if [ -f "${UCODEDIR}/AuthenticAMD.bin" -o -f "${UCODEDIR}/GenuineIntel.bin" ]; then
-				print_info 1 "early-microcode: >> Creating cpio..."
+				print_info 1 "$(getIndent 2)early-microcode: Creating cpio..."
 				pushd "${TMPDIR}/ucode_tmp" > /dev/null
 				find . | cpio -o -H newc > ../ucode.cpio || gen_die "Failed to create cpu microcode cpio"
 				popd > /dev/null
-				print_info 1 "early-microcode: >> Prepending early-microcode to initramfs"
+				print_info 1 "$(getIndent 2)early-microcode: Prepending early-microcode to initramfs..."
 				cat "${TMPDIR}/ucode.cpio" "${CPIO}" > "${CPIO}.early-microcode" || gen_die "Failed to prepend early-microcode to initramfs"
 				mv -f "${CPIO}.early-microcode" "${CPIO}" || gen_die "Rename failed"
 			else
-				print_info 1 "CONFIG_MICROCODE=y is set but no microcode found"
+				print_info 1 "$(getIndent 2)early-microcode: CONFIG_MICROCODE=y is set but no microcode found"
 			fi
 		fi
 		if isTrue "${WRAP_INITRD}"
@@ -1217,8 +1222,8 @@ create_initramfs() {
 			local mkimage_cmd=$(type -p mkimage)
 			[[ -z ${mkimage_cmd} ]] && gen_die "mkimage is not available. Please install package 'dev-embedded/u-boot-tools'."
 			local mkimage_args="-A ${ARCH} -O linux -T ramdisk -C ${compression:-none} -a 0x00000000 -e 0x00000000"
-			print_info 1 "        >> Wrapping initramfs using mkimage..."
-			print_info 2 "${mkimage_cmd} ${mkimage_args} -n initramfs-${KV} -d ${CPIO} ${CPIO}.uboot" 
+			print_info 1 "$(getIndent 1)>> Wrapping initramfs using mkimage..."
+			print_info 2 "$(getIndent 1)${mkimage_cmd} ${mkimage_args} -n initramfs-${KV} -d ${CPIO} ${CPIO}.uboot"
 			${mkimage_cmd} ${mkimage_args} -n "initramfs-${KV}" -d "${CPIO}" "${CPIO}.uboot" >> ${LOGFILE} 2>&1 || gen_die "Wrapping initramfs using mkimage failed"
 			mv -f "${CPIO}.uboot" "${CPIO}" || gen_die "Rename failed"
 		fi

diff --git a/genkernel b/genkernel
index 61dddca..a5ce560 100755
--- a/genkernel
+++ b/genkernel
@@ -4,7 +4,7 @@
 PATH="${PATH}:/sbin:/usr/sbin"
 GK_V='3.5.3.3'
 
-# Set the default for TMPDIR.  May be modified by genkernel.conf or the
+# Set the default for TMPDIR. May be modified by genkernel.conf or the
 # --tempdir command line option.
 TMPDIR='/var/tmp/genkernel'
 
@@ -178,7 +178,7 @@ else
 				fi
 			else
 				print_warning 1 "${BOLD}WARNING${NORMAL}: No mounted ${BOOTDIR} partition detected!"
-				print_warning 1 "         Run ``mount ${BOOTDIR}`` to mount it!"
+				print_warning 1 "$(getIndent 1)Run ``mount ${BOOTDIR}`` to mount it!"
 				echo
 			fi
 		fi
@@ -223,7 +223,7 @@ fi
 KERNCACHE_IS_VALID=0
 if [ "${KERNCACHE}" != "" ]
 then
-    gen_kerncache_is_valid
+	gen_kerncache_is_valid
 fi
 
 if [ ${BUILD_KERNEL} = '1' -a "${KERNCACHE_IS_VALID}" = '0' ]
@@ -307,17 +307,6 @@ fi
 
 if [ "${BUILD_RAMDISK}" = '1' ]
 then
-	if [ "${BUSYBOX}" = '1' ]
-	then
-		# Compile Busybox
-		compile_busybox
-	fi
-
-	if isTrue "${UNIONFS}"
-	then
-		compile_unionfs_fuse
-	fi
-
 	# Compile initramfs
 	create_initramfs
 else

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

[Thomas Deutschmann]

commit:     d407fd36b2ebbc10801f30e5caea99fc68717338
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 20:58:30 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 20:58:30 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d407fd36

Show output of patch command only in loglevel >=2

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_compile.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 7c38859..6e0d107 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -212,6 +212,11 @@ apply_patches() {
 
 	if [ -d "${patchdir}" ]
 	then
+		local silent="-s "
+		if [[ "${LOGLEVEL}" -gt 1 ]]; then
+			silent=
+		fi
+
 		print_info 1 "$(getIndent 3)${util}: >> Applying patches..."
 		for i in ${patchdir}/*{diff,patch}
 		do
@@ -220,7 +225,7 @@ apply_patches() {
 			for j in `seq 0 5`
 			do
 				patch -p${j} --backup-if-mismatch -f < "${i}" --dry-run >/dev/null && \
-					patch -p${j} --backup-if-mismatch -f < "${i}"
+					patch ${silent}-p${j} --backup-if-mismatch -f < "${i}"
 				if [ $? = 0 ]
 				then
 					patch_success=1

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

[Thomas Deutschmann]

commit:     02e67d4860b6a6fd3e9b23e18f757adfd3d62bed
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 22:55:48 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 22:55:48 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=02e67d48

create_initramfs(): Add check for CONFIG_FILE_LOCKING=y when LVM is used

Closes: https://bugs.gentoo.org/673590
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index a0c7601..50315cb 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1080,6 +1080,12 @@ create_initramfs() {
 		local CONFGREP=grep
 	fi
 
+	if isTrue "${LVM}" ; then
+		if ! ${CONFGREP} -q "^CONFIG_FILE_LOCKING=y" "${ACTUAL_KERNEL_CONFIG}" ; then
+			gen_die "LVM will require a kernel with CONFIG_FILE_LOCKING=y set!"
+		fi
+	fi
+
 	if isTrue "${INTEGRATED_INITRAMFS}"
 	then
 		# Explicitly do not compress if we are integrating into the kernel.

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

[Thomas Deutschmann]

commit:     919cbc4b10215b54fb7b1c74b11ea25534243608
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 22:41:06 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 22:41:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=919cbc4b

create_initramfs(): Move ACTUAL_KERNEL_CONFIG block

This will allow us to do additional kernel config checks.

Bug: https://bugs.gentoo.org/673590
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 175ccc5..a0c7601 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1065,6 +1065,21 @@ create_initramfs() {
 
 	cd "${TEMP}"
 
+	# NOTE: We do not work with ${KERNEL_CONFIG} here, since things like
+	#       "make oldconfig" or --noclean could be in effect.
+	if [ -f "${KERNEL_OUTPUTDIR}"/.config ]; then
+		local ACTUAL_KERNEL_CONFIG="${KERNEL_OUTPUTDIR}"/.config
+	else
+		local ACTUAL_KERNEL_CONFIG="${KERNEL_CONFIG}"
+	fi
+
+	if [[ "$(file --brief --mime-type "${ACTUAL_KERNEL_CONFIG}")" == application/x-gzip ]]; then
+		# Support --kernel-config=/proc/config.gz, mainly
+		local CONFGREP=zgrep
+	else
+		local CONFGREP=grep
+	fi
+
 	if isTrue "${INTEGRATED_INITRAMFS}"
 	then
 		# Explicitly do not compress if we are integrating into the kernel.
@@ -1099,21 +1114,6 @@ create_initramfs() {
 	else
 		if isTrue "${COMPRESS_INITRD}"
 		then
-			# NOTE: We do not work with ${KERNEL_CONFIG} here, since things like
-			#       "make oldconfig" or --noclean could be in effect.
-			if [ -f "${KERNEL_OUTPUTDIR}"/.config ]; then
-				local ACTUAL_KERNEL_CONFIG="${KERNEL_OUTPUTDIR}"/.config
-			else
-				local ACTUAL_KERNEL_CONFIG="${KERNEL_CONFIG}"
-			fi
-
-			if [[ "$(file --brief --mime-type "${ACTUAL_KERNEL_CONFIG}")" == application/x-gzip ]]; then
-				# Support --kernel-config=/proc/config.gz, mainly
-				local CONFGREP=zgrep
-			else
-				local CONFGREP=grep
-			fi
-
 			cmd_xz=$(type -p xz)
 			cmd_lzma=$(type -p lzma)
 			cmd_bzip2=$(type -p bzip2)
@@ -1177,6 +1177,7 @@ create_initramfs() {
 				print_info 1 "$(getIndent 1)>> Not compressing cpio data ..."
 			fi
 		fi
+
 		## To early load microcode we need to follow some pretty specific steps
 		## mostly laid out in linux/Documentation/x86/early-microcode.txt
 		## It only loads monolithic ucode from an uncompressed cpio, which MUST

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

[Thomas Deutschmann]

commit:     37339c78c776b74bb20762dae15ca18da7ff1189
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 00:20:57 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 00:26:40 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=37339c78

Adjust indentation of kernel compilation output

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_compile.sh      | 20 ++++++++++----------
 gen_configkernel.sh | 14 +++++++-------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 6e0d107..d08d1e5 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -310,21 +310,21 @@ compile_generic() {
 }
 
 compile_modules() {
-	print_info 1 "$(getIndent 3)>> Compiling ${KV} modules..."
+	print_info 1 "$(getIndent 1)>> Compiling ${KV} modules..."
 	cd ${KERNEL_DIR}
 	compile_generic modules kernel
 	export UNAME_MACHINE="${ARCH}"
 	[ "${INSTALL_MOD_PATH}" != '' ] && export INSTALL_MOD_PATH
 	if [ "${CMD_STRIP_TYPE}" == "all" -o "${CMD_STRIP_TYPE}" == "modules" ]
 	then
-		print_info 1 "$(getIndent 3)>> Installing ${KV} modules (and stripping)"
+		print_info 1 "$(getIndent 1)>> Installing ${KV} modules (and stripping)"
 		INSTALL_MOD_STRIP=1
 		export INSTALL_MOD_STRIP
 	else
-		print_info 1 "$(getIndent 3)>> Installing ${KV} modules"
+		print_info 1 "$(getIndent 1)>> Installing ${KV} modules"
 	fi
 	MAKEOPTS="${MAKEOPTS} -j1" compile_generic "modules_install" kernel
-	print_info 1 "$(getIndent 3)>> Generating module dependency data..."
+	print_info 1 "$(getIndent 1)>> Generating module dependency data..."
 	if [ "${INSTALL_MOD_PATH}" != '' ]
 	then
 		depmod -a -e -F "${KERNEL_OUTPUTDIR}"/System.map -b "${INSTALL_MOD_PATH}" ${KV}
@@ -343,30 +343,30 @@ compile_kernel() {
 	if [ "${KERNEL_MAKE_DIRECTIVE_OVERRIDE}" != "${DEFAULT_KERNEL_MAKE_DIRECTIVE_OVERRIDE}" ]; then
 		kernel_make_directive="${KERNEL_MAKE_DIRECTIVE_OVERRIDE}"
 	fi
-	print_info 1 "$(getIndent 3)>> Compiling ${KV} ${kernel_make_directive/_install/ [ install ]/}..."
+	print_info 1 "$(getIndent 1)>> Compiling ${KV} ${kernel_make_directive/_install/ [ install ]/}..."
 	compile_generic "${kernel_make_directive}" kernel
 	if [ "${KERNEL_MAKE_DIRECTIVE_2}" != '' ]
 	then
-		print_info 1 "$(getIndent 3)>> Starting supplimental compile of ${KV}: ${KERNEL_MAKE_DIRECTIVE_2}..."
+		print_info 1 "$(getIndent 1)>> Starting supplimental compile of ${KV}: ${KERNEL_MAKE_DIRECTIVE_2}..."
 		compile_generic "${KERNEL_MAKE_DIRECTIVE_2}" kernel
 	fi
 
 	if isTrue "${FIRMWARE_INSTALL}" && [ ! -e "${KERNEL_DIR}/ihex2fw.c" ] ; then
 		# Kernel v4.14 removed firmware from the kernel sources, including the
 		# ihex2fw.c tool source. Try and detect the tool to see if we are in >=v4.14
-		print_warning 1 "$(getIndent 3)>> Linux v4.14 removed in-kernel firmware, you MUST install the sys-kernel/linux-firmware package!"
+		print_warning 1 "$(getIndent 1)>> Linux v4.14 removed in-kernel firmware, you MUST install the sys-kernel/linux-firmware package!"
 	elif isTrue "${FIRMWARE_INSTALL}" ; then
 		local cfg_CONFIG_FIRMWARE_IN_KERNEL=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" CONFIG_FIRMWARE_IN_KERNEL)
 		if isTrue "$cfg_CONFIG_FIRMWARE_IN_KERNEL"; then
-			print_info 1 "$(getIndent 3)>> Not installing firmware as it's included in the kernel already (CONFIG_FIRMWARE_IN_KERNEL=y)..."
+			print_info 1 "$(getIndent 1)>> Not installing firmware as it's included in the kernel already (CONFIG_FIRMWARE_IN_KERNEL=y)..."
 		else
-			print_info 1 "$(getIndent 3)>> Installing firmware ('make firmware_install') due to CONFIG_FIRMWARE_IN_KERNEL != y..."
+			print_info 1 "$(getIndent 1)>> Installing firmware ('make firmware_install') due to CONFIG_FIRMWARE_IN_KERNEL != y..."
 			[ "${INSTALL_MOD_PATH}" != '' ] && export INSTALL_MOD_PATH
 			[ "${INSTALL_FW_PATH}" != '' ] && export INSTALL_FW_PATH
 			MAKEOPTS="${MAKEOPTS} -j1" compile_generic "firmware_install" kernel
 		fi
 	else
-		print_info 1 "$(getIndent 3)>> Not installing firmware as requested by configuration FIRMWARE_INSTALL=no..."
+		print_info 1 "$(getIndent 1)>> Not installing firmware as requested by configuration FIRMWARE_INSTALL=no..."
 	fi
 
 	local tmp_kernel_binary=$(find_kernel_binary ${KERNEL_BINARY_OVERRIDE:-${KERNEL_BINARY}})

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 475526a..4242385 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -47,11 +47,11 @@ config_kernel() {
 				NOW=`date +--%Y-%m-%d--%H-%M-%S`
 				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"
+				print_info 1 "$(getIndent 1)Previous config backed up to .config${NOW}.bak"
 			fi
 		fi
 		print_info 1 "kernel: Using config from ${KERNEL_CONFIG}"
-		print_info 1 'kernel: >> Running mrproper...'
+		print_info 1 "$(getIndent 1)>> Running mrproper..."
 		compile_generic mrproper kernel
 	else
 		if [ -f "${KERNEL_OUTPUTDIR}/.config" ]
@@ -78,17 +78,17 @@ config_kernel() {
 
 	if isTrue "${OLDCONFIG}"
 	then
-		print_info 1 '        >> Running oldconfig...'
+		print_info 1 "$(getIndent 1)>> Running oldconfig..."
 		yes '' 2>/dev/null | compile_generic oldconfig kernel 2>/dev/null
 	else
-		print_info 1 "kernel: --oldconfig is disabled; not running 'make oldconfig'."
+		print_info 1 "$(getIndent 1)--oldconfig is disabled; not running 'make oldconfig'."
 	fi
 	if isTrue "${CLEAN}"
 	then
-		print_info 1 'kernel: >> Cleaning...'
+		print_info 1 "$(getIndent 1)>> Cleaning..."
 		compile_generic clean kernel
 	else
-		print_info 1 "kernel: --clean is disabled; not running 'make clean'."
+		print_info 1 "$(getIndent 1)--clean is disabled; not running 'make clean'."
 	fi
 
 	local add_config
@@ -108,7 +108,7 @@ config_kernel() {
 
 	if [ x"${add_config}" != x"" ]
 	then
-		print_info 1 "kernel: >> Invoking ${add_config}..."
+		print_info 1 "$(getIndent 1)>> Invoking ${add_config}..."
 		compile_generic $add_config kernelruntask
 		[ "$?" ] || gen_die "Error: ${add_config} failed!"
 	fi

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

[Thomas Deutschmann]

commit:     eb1e267427641ddef447e342f1ac7dd39242eca5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 18:48:20 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 18:48:20 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=eb1e2674

append_modules(): Adjust indentation

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 50315cb..3ed560e 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -806,7 +806,7 @@ append_modules() {
 	local group_modules
 	local MOD_EXT="$(modules_kext)"
 
-	print_info 2 "initramfs: >> Searching for modules..."
+	print_info 2 "$(getIndent 2)initramfs: >> Searching for modules..."
 	if [ "${INSTALL_MOD_PATH}" != '' ]
 	then
 		cd ${INSTALL_MOD_PATH}
@@ -824,11 +824,11 @@ append_modules() {
 		mymod=`find ./lib/modules/${KV} -name "${i}${MOD_EXT}" 2>/dev/null| head -n 1 `
 		if [ -z "${mymod}" ]
 		then
-			print_warning 2 "Warning :: ${i}${MOD_EXT} not found; skipping..."
+			print_warning 2 "$(getIndent 3) - ${i}${MOD_EXT} not found; skipping..."
 			continue;
 		fi
 
-		print_info 2 "initramfs: >> Copying ${i}${MOD_EXT}..."
+		print_info 2 "$(getIndent 3) - Copying ${i}${MOD_EXT}..."
 		cp -ax --parents "${mymod}" "${TEMP}/initramfs-modules-${KV}-temp"
 	done
 

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

[Thomas Deutschmann]

commit:     8eddd413486f2fc58a56dc615f8f947dfbb62e07
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 01:09:50 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:06:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8eddd413

Fix "--compress-initramfs-type" parameter

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index f8d6a2c..b7bd212 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -679,8 +679,8 @@ parse_cmdline() {
 			print_info 2 "CMD_COMPRESS_INITRD=${CMD_COMPRESS_INITRD}"
 			;;
 		--compress-initramfs-type=*|--compress-initrd-type=*)
-			COMPRESS_INITRD_TYPE="${*#*=}"
-			print_info 2 "CMD_COMPRESS_INITRD_TYPE: ${CMD_LINUXRC}"
+			CMD_COMPRESS_INITRD_TYPE="${*#*=}"
+			print_info 2 "CMD_COMPRESS_INITRD_TYPE: ${CMD_COMPRESS_INITRD_TYPE}"
 			;;
 		--config=*)
 			print_info 2 "CMD_GK_CONFIG: "${*#*=}""

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

[Thomas Deutschmann]

commit:     3376314d1ce344c7d3649314a6f8d46d813115de
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 01:59:25 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:06:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3376314d

Fix "--[no-]debug-cleanup" parameter debug output

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index b7bd212..6388e93 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -565,7 +565,7 @@ parse_cmdline() {
 			;;
 		--debug-cleanup|--no-debug-cleanup)
 			CMD_DEBUGCLEANUP=`parse_optbool "$*"`
-			print_info 2 "DEBUGCLEANUP: ${DEBUGCLEANUP}"
+			print_info 2 "CMD_DEBUGCLEANUP: ${CMD_DEBUGCLEANUP}"
 			;;
 		--logfile=*)
 			CMD_LOGFILE="${*#*=}"

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

[Thomas Deutschmann]

commit:     6454b9ed43325149f3ccb3bab35a42b745d0369b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 00:47:17 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:05:33 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6454b9ed

Convert all remaining options to yes/no values and use isTrue for consistency

Closes: https://bugs.gentoo.org/532084
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_bootloader.sh    |   6 +-
 gen_cmdline.sh       |  90 ++++++++++++++--------------
 gen_configkernel.sh  |  26 ++++----
 gen_determineargs.sh |  12 ++--
 gen_funcs.sh         |  16 ++---
 gen_initramfs.sh     |  18 +++---
 gen_moddeps.sh       |   2 +-
 gen_package.sh       |  20 +++----
 genkernel            |  66 ++++++++++-----------
 genkernel.conf       | 163 ++++++++++++++++++++++++++-------------------------
 10 files changed, 211 insertions(+), 208 deletions(-)

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index 28fa292..2a0a43d 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -53,7 +53,7 @@ set_bootloader_grub2() {
 	grub-mkconfig -o "${GRUB_CONF}" 2> /dev/null ||
 		grub2-mkconfig -o "${GRUB_CONF}" 2> /dev/null ||
 		gen_die "grub-mkconfig failed"
-	[ "${BUILD_RAMDISK}" -ne 0 ] && sed -i 's/ro single/ro debug/' "${GRUB_CONF}"
+	isTrue "${BUILD_RAMDISK}" && sed -i 's/ro single/ro debug/' "${GRUB_CONF}"
 }
 
 set_bootloader_grub() {
@@ -93,11 +93,11 @@ set_bootloader_grub() {
 			echo "# Genkernel generated entry, see GRUB documentation for details" >> ${GRUB_CONF}
 			echo "title=Gentoo Linux ($KV)" >> ${GRUB_CONF}
 			printf "%b\n" "\tkernel /kernel-${KNAME}-${ARCH}-${KV} root=${GRUB_ROOTFS}" >> ${GRUB_CONF}
-			if [ "${BUILD_INITRD}" = '1' ]
+			if isTrue "${BUILD_RAMDISK}"
 			then
 				if [ "${PAT}" -gt '4' ]
 				then
-				    printf "%b\n" "\tinitrd /initramfs-${KNAME}-${ARCH}-${KV}" >> ${GRUB_CONF}
+					printf "%b\n" "\tinitrd /initramfs-${KNAME}-${ARCH}-${KV}" >> ${GRUB_CONF}
 				fi
 			fi
 			echo >> ${GRUB_CONF}

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 853723b..37a078b 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -214,8 +214,8 @@ usage() {
 }
 
 parse_optbool() {
-	local opt=${1/--no-*/0} # false
-	opt=${opt/--*/1} # true
+	local opt=${1/--no-*/no} # false
+	opt=${opt/--*/yes} # true
 	echo $opt
 }
 
@@ -296,8 +296,8 @@ parse_cmdline() {
 			print_info 2 "CMD_MODPROBEDIR: ${CMD_MODPROBEDIR}"
 			;;
 		--do-keymap-auto)
-			CMD_DOKEYMAPAUTO=1
-			CMD_KEYMAP=1
+			CMD_DOKEYMAPAUTO="yes"
+			CMD_KEYMAP="yes"
 			print_info 2 "CMD_DOKEYMAPAUTO: ${CMD_DOKEYMAPAUTO}"
 			;;
 		--keymap|--no-keymap)
@@ -317,7 +317,7 @@ parse_cmdline() {
 		--mdadm|--no-mdadm)
 			CMD_MDADM=`parse_optbool "$*"`
 			print_info 2 "CMD_MDADM: $CMD_MDADM"
-			if [ "$CMD_MDADM" = "1" -a ! -e /sbin/mdadm ]
+			if isTrue "${CMD_MDADM}" && [ ! -e /sbin/mdadm ]
 			then
 				print_warning 'Warning: --mdadm generally requires sys-fs/mdadm present on the host system'
 			fi
@@ -332,8 +332,8 @@ parse_cmdline() {
 			;;
 		--microcode|--no-microcode)
 			case `parse_optbool "$*"` in
-				0) CMD_MICROCODE='no' ;;
-				1) CMD_MICROCODE='all' ;;
+				no)  CMD_MICROCODE='no' ;;
+				yes) CMD_MICROCODE='all' ;;
 			esac
 			print_info 2 "CMD_MICROCODE: ${CMD_MICROCODE}"
 			;;
@@ -363,16 +363,16 @@ parse_cmdline() {
 			;;
 		--dmraid|--no-dmraid)
 			CMD_DMRAID=`parse_optbool "$*"`
-			if [ "$CMD_DMRAID" = "1" -a ! -e /usr/sbin/dmraid ]
+			if isTrue "${CMD_DMRAID}" && [ ! -e /usr/sbin/dmraid ]
 			then
-				echo 'Error: --dmraid requires sys-fs/dmraid'
-				echo '		 to be installed on the host system.'
+				echo 'Error: --dmraid requires sys-fs/dmraid' \
+					'to be installed on the host system.'
 				exit 1
 			fi
-			if [ "$CMD_DMRAID" = "1" -a ! -e /usr/include/libdevmapper.h ]
+			if isTrue "${CMD_DMRAID}" && [ ! -e /usr/include/libdevmapper.h ]
 			then
-				echo 'Error: --dmraid requires sys-fs/lvm2'
-				echo '		 to be installed on the host system.'
+				echo 'Error: --dmraid requires sys-fs/lvm2' \
+					'to be installed on the host system.'
 				exit 1
 			fi
 			print_info 2 "CMD_DMRAID: ${CMD_DMRAID}"
@@ -395,16 +395,16 @@ parse_cmdline() {
 			;;
 		--multipath|--no-multipath)
 			CMD_MULTIPATH=`parse_optbool "$*"`
-			if [ "$CMD_MULTIPATH" = "1" -a ! -e /sbin/multipath ]
+			if isTrue "${CMD_MULTIPATH}" && [ ! -e /sbin/multipath ]
 			then
-				echo 'Error: --multipath requires sys-fs/multipath-tools'
-				echo '		 to be installed on the host system.'
+				echo 'Error: --multipath requires sys-fs/multipath-tools' \
+					'to be installed on the host system.'
 				exit 1
 			fi
-			if [ "$CMD_MULTIPATH" = "1" -a ! -e /usr/include/libdevmapper.h ]
+			if isTrue "${CMD_MULTIPATH}" && [ ! -e /usr/include/libdevmapper.h ]
 			then
-				echo 'Error: --multipath requires sys-fs/lvm2'
-				echo '		 to be installed on the host system.'
+				echo 'Error: --multipath requires sys-fs/lvm2' \
+					'to be installed on the host system.'
 				exit 1
 			fi
 			print_info 2 "CMD_MULTIPATH: ${CMD_MULTIPATH}"
@@ -435,15 +435,15 @@ parse_cmdline() {
 			TERM_COLUMNS=`stty -a | head -n 1 | cut -d\  -f7 | cut -d\; -f1`
 			if [[ TERM_LINES -lt 19 || TERM_COLUMNS -lt 80 ]]
 			then
-				echo "Error: You need a terminal with at least 80 columns"
-				echo "		 and 19 lines for --menuconfig; try --no-menuconfig..."
+				echo 'Error: You need a terminal with at least 80 columns' \
+					'and 19 lines for --menuconfig; try --no-menuconfig...'
 				exit 1
 			fi
-			CMD_MENUCONFIG=1
+			CMD_MENUCONFIG="yes"
 			print_info 2 "CMD_MENUCONFIG: ${CMD_MENUCONFIG}"
 			;;
 		--no-menuconfig)
-			CMD_MENUCONFIG=0
+			CMD_MENUCONFIG="no"
 			print_info 2 "CMD_MENUCONFIG: ${CMD_MENUCONFIG}"
 			;;
 		--nconfig)
@@ -451,15 +451,15 @@ parse_cmdline() {
 			TERM_COLUMNS=`stty -a | head -n 1 | cut -d\  -f7 | cut -d\; -f1`
 			if [[ TERM_LINES -lt 19 || TERM_COLUMNS -lt 80 ]]
 			then
-				echo "Error: You need a terminal with at least 80 columns"
-				echo "		 and 19 lines for --nconfig; try --no-nconfig..."
+				echo 'Error: You need a terminal with at least 80 columns' \
+					'and 19 lines for --nconfig; try --no-nconfig...'
 				exit 1
 			fi
-			CMD_NCONFIG=1
+			CMD_NCONFIG="yes"
 			print_info 2 "CMD_NCONFIG: ${CMD_NCONFIG}"
 			;;
 		--no-nconfig)
-			CMD_NCONFIG=0
+			CMD_NCONFIG="no"
 			print_info 2 "CMD_NCONFIG: ${CMD_NCONFIG}"
 			;;
 		--gconfig|--no-gconfig)
@@ -484,12 +484,12 @@ parse_cmdline() {
 			;;
 		--oldconfig|--no-oldconfig)
 			CMD_OLDCONFIG=`parse_optbool "$*"`
-			[ "$CMD_OLDCONFIG" = "1" ] && CMD_CLEAN=0
+			isTrue "${CMD_OLDCONFIG}" && CMD_CLEAN="no"
 			print_info 2 "CMD_CLEAN: ${CMD_CLEAN}"
 			print_info 2 "CMD_OLDCONFIG: ${CMD_OLDCONFIG}"
 			;;
 		--gensplash=*)
-			CMD_SPLASH=1
+			CMD_SPLASH="yes"
 			SPLASH_THEME="${*#*=}"
 			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
 			print_info 2 "SPLASH_THEME: ${SPLASH_THEME}"
@@ -504,7 +504,7 @@ parse_cmdline() {
 			print_warning 1 "Please use --splash, as --gensplash is deprecated."
 			;;
 		--splash=*)
-			CMD_SPLASH=1
+			CMD_SPLASH="yes"
 			SPLASH_THEME="${*#*=}"
 			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
 			print_info 2 "SPLASH_THEME: ${SPLASH_THEME}"
@@ -653,12 +653,12 @@ parse_cmdline() {
 			;;
 		--firmware-dir=*)
 			CMD_FIRMWARE_DIR="${*#*=}"
-			CMD_FIRMWARE=1
+			CMD_FIRMWARE="yes"
 			print_info 2 "CMD_FIRMWARE_DIR: ${CMD_FIRMWARE_DIR}"
 			;;
 		--firmware-files=*)
 			CMD_FIRMWARE_FILES="${*#*=}"
-			CMD_FIRMWARE=1
+			CMD_FIRMWARE="yes"
 			print_info 2 "CMD_FIRMWARE_FILES: ${CMD_FIRMWARE_FILES}"
 			;;
 		--firmware-install|--no-firmware-install)
@@ -692,7 +692,7 @@ parse_cmdline() {
 			CMD_NICE="${*#*=}"
 			if [ ${CMD_NICE} -lt 0 -o ${CMD_NICE} -gt 19 ]
 			then
-				echo "Error:  Illegal value specified for --nice= parameter."
+				echo 'Error:  Illegal value specified for --nice= parameter.'
 				exit 1
 			fi
 			print_info 2 "CMD_NICE: ${CMD_NICE}"
@@ -710,23 +710,25 @@ parse_cmdline() {
 			print_info 2 "CMD_STRIP_TYPE: ${CMD_STRIP_TYPE}"
 			;;
 		all)
-			BUILD_KERNEL=1
-			BUILD_MODULES=1
-			BUILD_RAMDISK=1
+			BUILD_KERNEL="yes"
+			BUILD_MODULES="yes"
+			BUILD_RAMDISK="yes"
 			;;
 		ramdisk|initramfs)
-			BUILD_RAMDISK=1
+			BUILD_KERNEL="no"
+			BUILD_MODULES="no"
+			BUILD_RAMDISK="yes"
 			;;
 		kernel)
-			BUILD_KERNEL=1
-			BUILD_MODULES=1
-			BUILD_RAMDISK=0
+			BUILD_KERNEL="yes"
+			BUILD_MODULES="yes"
+			BUILD_RAMDISK="no"
 			;;
 		bzImage)
-			BUILD_KERNEL=1
-			BUILD_MODULES=0
-			BUILD_RAMDISK=0
-			CMD_RAMDISKMODULES=0
+			BUILD_KERNEL="yes"
+			BUILD_MODULES="no"
+			BUILD_RAMDISK="no"
+			CMD_RAMDISKMODULES="no"
 			print_info 2 "CMD_RAMDISKMODULES: ${CMD_RAMDISKMODULES}"
 			;;
 		--help)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 4242385..5d4bf23 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -36,7 +36,7 @@ config_kernel() {
 	determine_config_file
 	cd "${KERNEL_DIR}" || gen_die 'Could not switch to the kernel directory!'
 
-	if isTrue ${MRPROPER}
+	if isTrue "${MRPROPER}"
 	then
 		# Backup current kernel .config
 		if [ -f "${KERNEL_OUTPUTDIR}/.config" ]
@@ -92,16 +92,16 @@ config_kernel() {
 	fi
 
 	local add_config
-	if isTrue ${MENUCONFIG}
+	if isTrue "${MENUCONFIG}"
 	then
 		add_config=menuconfig
-	elif isTrue ${CMD_NCONFIG}
+	elif isTrue "${CMD_NCONFIG}"
 	then
 		add_config=nconfig
-	elif isTrue ${CMD_GCONFIG}
+	elif isTrue "${CMD_GCONFIG}"
 	then
 		add_config=gconfig
-	elif isTrue ${CMD_XCONFIG}
+	elif isTrue "${CMD_XCONFIG}"
 	then
 		add_config=xconfig
 	fi
@@ -114,7 +114,7 @@ config_kernel() {
 	fi
 
 	# Force this on if we are using --genzimage
-	if isTrue ${CMD_GENZIMAGE}
+	if isTrue "${CMD_GENZIMAGE}"
 	then
 		# Make sure Ext2 support is on...
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT2_FS" "y"
@@ -153,7 +153,7 @@ config_kernel() {
 	esac
 
 	# Make sure lvm modules are on if --lvm
-	if isTrue ${CMD_LVM}
+	if isTrue "${CMD_LVM}"
 	then
 		cfg_CONFIG_DM_SNAPSHOT=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_SNAPSHOT")
 		case "$cfg_CONFIG_DM_SNAPSHOT" in
@@ -171,7 +171,7 @@ config_kernel() {
 	fi
 
 	# Multipath
-	if isTrue ${CMD_MULTIPATH}
+	if isTrue "${CMD_MULTIPATH}"
 	then
 		cfg_CONFIG_DM_MULTIPATH=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH")
 		case "$cfg_CONFIG_DM_MULTIPATH" in
@@ -189,7 +189,7 @@ config_kernel() {
 	fi
 
 	# Make sure dmraid modules are on if --dmraid
-	if isTrue ${CMD_DMRAID}
+	if isTrue "${CMD_DMRAID}"
 	then
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}"
 	fi
@@ -197,7 +197,7 @@ config_kernel() {
 	# Make sure iSCSI modules are enabled in the kernel, if --iscsi
 	# CONFIG_SCSI_ISCSI_ATTRS
 	# CONFIG_ISCSI_TCP
-	if isTrue ${CMD_ISCSI}
+	if isTrue "${CMD_ISCSI}"
 	then
 		cfg_CONFIG_ISCSI_BOOT_SYSFS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_BOOT_SYSFS")
 		case "$cfg_CONFIG_ISCSI_BOOT_SYSFS" in
@@ -220,7 +220,7 @@ config_kernel() {
 	fi
 
 	# Make sure HyperV modules are enabled in the kernel, if --hyperv
-	if isTrue ${CMD_HYPERV}
+	if isTrue "${CMD_HYPERV}"
 	then
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV" "y"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_UTILS" "y"
@@ -234,14 +234,14 @@ config_kernel() {
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_UIO_HV_GENERIC" "y"
 	fi
 
-	if isTrue ${SPLASH}
+	if isTrue "${SPLASH}"
 	then
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB_SPLASH" "y"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB_CON_DECOR" "y"
 	fi
 
 	# VirtIO
-	if isTrue ${CMD_VIRTIO}
+	if isTrue "${CMD_VIRTIO}"
 	then
 		for k in \
 			CONFIG_VIRTIO \

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 2879287..fdfcef9 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -2,7 +2,7 @@
 # $Id$
 
 get_KV() {
-	if [ "${KERNEL_SOURCES}" = '0' -a -e "${KERNCACHE}" ]
+	if ! isTrue "${KERNEL_SOURCES}" && [ -e "${KERNCACHE}" ]
 	then
 		/bin/tar -x -C ${TEMP} -f ${KERNCACHE} kerncache.config
 		if [ -e ${TEMP}/kerncache.config ]
@@ -181,7 +181,7 @@ determine_real_args() {
 		fi
 	fi
 
-	if [ "${KERNEL_SOURCES}" != "0" ]
+	if isTrue "${KERNEL_SOURCES}"
 	then
 		if [ ! -d ${KERNEL_DIR} ]
 		then
@@ -191,11 +191,11 @@ determine_real_args() {
 
 	if [ -z "${KERNCACHE}" ]
 	then
-		if [ "${KERNEL_DIR}" = '' -a "${KERNEL_SOURCES}" != "0" ]
+		if [ "${KERNEL_DIR}" = '' ] && isTrue "${KERNEL_SOURCES}"
 		then
 			gen_die 'No kernel source directory!'
 		fi
-		if [ ! -e "${KERNEL_DIR}" -a "${KERNEL_SOURCES}" != "0" ]
+		if [ ! -e "${KERNEL_DIR}" ] && isTrue "${KERNEL_SOURCES}"
 		then
 			gen_die 'No kernel source directory!'
 		fi
@@ -210,9 +210,9 @@ determine_real_args() {
 	# imply --no-mrproper.
 	if [ "${CMD_CLEAN}" != '' ]
 	then
-		if ! isTrue ${CLEAN}
+		if ! isTrue "${CLEAN}"
 		then
-			MRPROPER=0
+			MRPROPER="no"
 		fi
 	fi
 

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 618aab6..c5eb28e 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -23,7 +23,7 @@ isTrue() {
 }
 
 setColorVars() {
-if isTrue ${USECOLOR}
+if isTrue "${USECOLOR}"
 then
 	GOOD=$'\e[32;01m'
 	WARN=$'\e[33;01m'
@@ -205,7 +205,7 @@ gen_die() {
 	print_error 1 "-- Grepping log... --"
 	print_error 1 ''
 
-	if isTrue ${USECOLOR}
+	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}|"
@@ -258,12 +258,12 @@ setup_cache_dir()
 
 [ ! -d "${CACHE_DIR}/${GK_V}" ] && mkdir -p "${CACHE_DIR}/${GK_V}"
 
-if [ "${CLEAR_CACHE_DIR}" == 'yes' ]
+if isTrue "${CLEAR_CACHE_DIR}"
 then
 	print_info 1 "Clearing cache dir contents from ${CACHE_DIR}"
 	while read i
 	do
-		print_info 1 "	 >> removing ${i}"
+		print_info 1 "$(getIndent 1)>> removing ${i}"
 		rm "${i}"
 	done < <(find "${CACHE_DIR}" -maxdepth 2 -type f -name '*.tar.*' -o -name '*.bz2')
 fi
@@ -272,7 +272,7 @@ fi
 
 clear_tmpdir()
 {
-if isTrue ${CMD_INSTALL}
+if isTrue "${CMD_INSTALL}"
 then
 	TMPDIR_CONTENTS=`ls ${TMPDIR}`
 	print_info 1 "Removing tmp dir contents"
@@ -313,7 +313,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' ]
+	if isTrue "${SYMLINK}"
 	then
  		print_info 4 "automatically managing symlinks and old images." 1 0
 		if [ -e "${BOOTDIR}/${symlinkName}" ]
@@ -359,7 +359,7 @@ copy_image_with_preserve() {
 
 	# When symlinks are not being managed by genkernel, old symlinks might
     # still be useful.  Leave 'em alone unless managed.
-	if [ "${SYMLINK}" = '1' ]
+	if isTrue "${SYMLINK}"
 	then
 		print_info 5 "  Deleting old symlinks, if any."
 		rm -f "${BOOTDIR}/${symlinkName}"
@@ -405,7 +405,7 @@ copy_image_with_preserve() {
 	cp "${newSrceImage}" "${BOOTDIR}/${currDestImage}" ||
 	    gen_die "Could not copy the ${symlinkName} image to ${BOOTDIR}!"
 
-	if [ "${SYMLINK}" = '1' ]
+	if isTrue "${SYMLINK}"
 	then
 		print_info 5 "  Make new symlink(s) (from ${BOOTDIR}):"
 		print_info 5 "    ${symlinkName} -> ${currDestImage}"

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 3ed560e..4bb45c7 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -210,7 +210,7 @@ append_blkid(){
 	cd ${TEMP}
 	mkdir -p "${TEMP}/initramfs-blkid-temp/"
 
-	if [[ "${DISKLABEL}" = "1" ]]; then
+	if isTrue "${DISKLABEL}"; then
 		copy_binaries "${TEMP}"/initramfs-blkid-temp/ /sbin/blkid
 	fi
 
@@ -457,7 +457,7 @@ append_mdadm(){
 	cd ${TEMP}
 	mkdir -p "${TEMP}/initramfs-mdadm-temp/etc/"
 	mkdir -p "${TEMP}/initramfs-mdadm-temp/sbin/"
-	if [ "${MDADM}" = '1' ]
+	if isTrue "${MDADM}"
 	then
 		if [ -n "${MDADM_CONFIG}" ]
 		then
@@ -658,7 +658,7 @@ append_luks() {
 	mkdir -p "${TEMP}/initramfs-luks-temp/sbin"
 	cd "${TEMP}/initramfs-luks-temp"
 
-	if isTrue ${LUKS}
+	if isTrue "${LUKS}"
 	then
 		[ -x "${_luks_source}" ] \
 				|| gen_die "$(printf "${_luks_error_format}" "no file ${_luks_source}")"
@@ -884,7 +884,7 @@ append_auxilary() {
 		cp "${CMD_LINUXRC}" "${TEMP}/initramfs-aux-temp/init"
 		print_info 2 "$(getIndent 1)>> Copying user specified linuxrc: ${CMD_LINUXRC} to init"
 	else
-		if isTrue ${NETBOOT}
+		if isTrue "${NETBOOT}"
 		then
 			cp "${GK_SHARE}/netboot/linuxrc.x" "${TEMP}/initramfs-aux-temp/init"
 		else
@@ -932,11 +932,11 @@ append_auxilary() {
 	done
 	echo '"' >> "${TEMP}/initramfs-aux-temp/etc/initrd.defaults"
 
-	if isTrue $CMD_DOKEYMAPAUTO
+	if isTrue "${CMD_DOKEYMAPAUTO}"
 	then
 		echo 'MY_HWOPTS="${MY_HWOPTS} keymap"' >> ${TEMP}/initramfs-aux-temp/etc/initrd.defaults
 	fi
-	if isTrue $CMD_KEYMAP
+	if isTrue "${CMD_KEYMAP}"
 	then
 		print_info 1 "$(getIndent 1)>> Copying keymaps"
 		mkdir -p "${TEMP}/initramfs-aux-temp/lib/"
@@ -950,7 +950,7 @@ append_auxilary() {
 	chmod +x "${TEMP}/initramfs-aux-temp/etc/initrd.scripts"
 	chmod +x "${TEMP}/initramfs-aux-temp/etc/initrd.defaults"
 
-	if isTrue ${NETBOOT}
+	if isTrue "${NETBOOT}"
 	then
 		cd "${GK_SHARE}/netboot/misc"
 		cp -pPRf * "${TEMP}/initramfs-aux-temp/"
@@ -969,7 +969,7 @@ append_data() {
 	local func="append_${name}"
 
 	[ $# -eq 0 ] && gen_die "append_data() called with zero arguments"
-	if [ $# -eq 1 ] || isTrue ${var}
+	if [ $# -eq 1 ] || isTrue "${var}"
 	then
 		print_info 1 "$(getIndent 1)>> Appending ${name} cpio data..."
 		${func} || gen_die "${func}() failed"
@@ -1003,7 +1003,7 @@ create_initramfs() {
 	append_data 'multipath' "${MULTIPATH}"
 	append_data 'gpg' "${GPG}"
 
-	if [ "${RAMDISKMODULES}" = '1' ]
+	if isTrue "${RAMDISKMODULES}"
 	then
 		append_data 'modules'
 	else

diff --git a/gen_moddeps.sh b/gen_moddeps.sh
index 053a183..ffc4d31 100755
--- a/gen_moddeps.sh
+++ b/gen_moddeps.sh
@@ -60,7 +60,7 @@ gen_deps()
 
 gen_dep_list()
 {
-	if [ "${ALLRAMDISKMODULES}" = "1" ]; then
+	if isTrue "${ALLRAMDISKMODULES}"; then
 		strip_mod_paths $(find "${INSTALL_MOD_PATH}/lib/modules/${KV}" -name "*$(modules_kext)") | sort
 	else
 		local group_modules

diff --git a/gen_package.sh b/gen_package.sh
index d82322f..2dc701d 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -39,7 +39,7 @@ gen_minkernpackage() {
 
 	if ! isTrue "${INTEGRATED_INITRAMFS}"
 	then
-		[ "${BUILD_RAMDISK}" != '0' ] && { cp "${TMPDIR}/initramfs-${KV}" "${TEMP}/minkernpackage/initramfs-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not copy the initramfs for the kernel package!'; }
+		isTrue "${BUILD_RAMDISK}" && { cp "${TMPDIR}/initramfs-${KV}" "${TEMP}/minkernpackage/initramfs-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not copy the initramfs for the kernel package!'; }
 	fi
 
 	if [ "${KERNCACHE}" != "" ]
@@ -74,6 +74,7 @@ gen_modulespackage() {
 	print_info 3 "Created modules package: $(readlink -f ${MODULESPACKAGE})"
 	cd "${TEMP}" && rm -rf "${TEMP}/modulespackage" > /dev/null 2>&1
 }
+
 gen_kerncache()
 {
 	print_info 1 'Creating kernel cache'
@@ -112,7 +113,7 @@ gen_kerncache()
 
 	if [ -d ${INSTALL_MOD_PATH}/lib/modules/${KV} ]
 	then
-	    cp -r "${INSTALL_MOD_PATH}/lib/modules/${KV}" "${TEMP}/kerncache/lib/modules"
+		cp -r "${INSTALL_MOD_PATH}/lib/modules/${KV}" "${TEMP}/kerncache/lib/modules"
 	fi
 
 	cd "${TEMP}/kerncache"
@@ -142,10 +143,10 @@ gen_kerncache_extract_kernel()
 
 gen_kerncache_extract_modules()
 {
-        if [ -e "${KERNCACHE}" ]
+	if [ -e "${KERNCACHE}" ]
 	then
 		print_info 1 'Extracting kerncache kernel modules'
-        	if [ "${INSTALL_MOD_PATH}" != '' ]
+		if [ "${INSTALL_MOD_PATH}" != '' ]
 		then
 			/bin/tar -xf ${KERNCACHE} --strip-components 1 -C ${INSTALL_MOD_PATH}/lib
 		else
@@ -160,25 +161,24 @@ gen_kerncache_extract_config()
 	then
 		print_info 1 'Extracting kerncache config to /etc/kernels'
 		mkdir -p /etc/kernels
-        	/bin/tar -xf ${KERNCACHE} -C /etc/kernels config-${ARCH}-${KV}
+		/bin/tar -xf ${KERNCACHE} -C /etc/kernels config-${ARCH}-${KV}
 		mv /etc/kernels/config-${ARCH}-${KV} /etc/kernels/kernel-config-${ARCH}-${KV}
 	fi
 }
 
 gen_kerncache_is_valid()
 {
-	KERNCACHE_IS_VALID=0
+	KERNCACHE_IS_VALID="no"
 	if [ "${NO_KERNEL_SOURCES}" = '1' ]
 	then
-
-		BUILD_KERNEL=0
+		BUILD_KERNEL="no"
 		# Can make this more secure ....
 
 		/bin/tar -xf ${KERNCACHE} -C ${TEMP}
 		if [ -e ${TEMP}/config-${ARCH}-${KV} -a -e ${TEMP}/kernel-${ARCH}-${KV} ]
 		then
 			print_info 1 'Valid kernel cache found; no sources will be used'
-			KERNCACHE_IS_VALID=1
+			KERNCACHE_IS_VALID="yes"
 		fi
 	else
 		if [ -e "${KERNCACHE}" ]
@@ -214,7 +214,7 @@ gen_kerncache_is_valid()
 					echo
 					print_info 1 "No kernel configuration change, skipping kernel build..."
 					echo
-					KERNCACHE_IS_VALID=1
+					KERNCACHE_IS_VALID="yes"
 				fi
 			fi
 		fi

diff --git a/genkernel b/genkernel
index a5ce560..59d8c2f 100755
--- a/genkernel
+++ b/genkernel
@@ -58,7 +58,7 @@ cleanup(){
 			rm -rf "$TEMP"
 		fi
 
-		if isTrue ${POSTCLEAR}
+		if isTrue "${POSTCLEAR}"
 		then
 			echo
 			print_info 1 'RUNNING FINAL CACHE/TMP CLEANUP'
@@ -78,9 +78,9 @@ cleanup(){
 }
 
 trap trap_cleanup SIGHUP SIGQUIT SIGINT SIGTERM SIGKILL
-BUILD_KERNEL=0
-BUILD_RAMDISK=0
-BUILD_MODULES=0
+BUILD_KERNEL="no"
+BUILD_RAMDISK="no"
+BUILD_MODULES="no"
 
 # Parse all command line options...
 Options=$* # Save for later
@@ -91,7 +91,7 @@ do
 done
 
 # Check if no action is specified...
-if [ "${BUILD_KERNEL}" = '0' -a "${BUILD_RAMDISK}" = '0' ]
+if ! isTrue "${BUILD_KERNEL}" && ! isTrue "${BUILD_RAMDISK}"
 then
 	usage
 	exit 1
@@ -156,10 +156,10 @@ dump_debugcache
 NORMAL=${BOLD} print_info 1 "Linux Kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL}..."
 print_info 1 ".. with config file ${KERNEL_CONFIG}"
 
-# Check BOOTDIR is mounted
-if ! isTrue ${CMD_INSTALL}
+# Check if BOOTDIR is mounted
+if ! isTrue "${CMD_INSTALL}"
 then
-	isTrue ${MOUNTBOOT} && print_info 2 'Skipping automatic mount of boot'
+	isTrue "${MOUNTBOOT}" && print_info 2 'Skipping automatic mount of boot'
 else
 	[[ -d ${BOOTDIR} ]] || gen_die "${BOOTDIR} is not a directory"
 
@@ -167,7 +167,7 @@ else
 	then
 		if egrep -q "^[^#].+[[:space:]]${BOOTDIR}[[:space:]]" /etc/fstab
 		then
-			if isTrue ${MOUNTBOOT}
+			if isTrue "${MOUNTBOOT}"
 			then
 				if ! mount ${BOOTDIR}
 				then
@@ -184,7 +184,7 @@ else
 		fi
 	elif isBootRO
 	then
-		if isTrue ${MOUNTBOOT}
+		if isTrue "${MOUNTBOOT}"
 		then
 			if ! mount -o remount,rw ${BOOTDIR}
 			then
@@ -220,13 +220,13 @@ fi
 #	echo
 #fi
 
-KERNCACHE_IS_VALID=0
+KERNCACHE_IS_VALID="no"
 if [ "${KERNCACHE}" != "" ]
 then
 	gen_kerncache_is_valid
 fi
 
-if [ ${BUILD_KERNEL} = '1' -a "${KERNCACHE_IS_VALID}" = '0' ]
+if isTrue "${BUILD_KERNEL}" && ! isTrue "${KERNCACHE_IS_VALID}"
 then
 	# Configure kernel
 	config_kernel
@@ -243,12 +243,12 @@ then
 	compile_kernel
 
 	# Compile modules
-	if [ "${BUILD_MODULES}" = '1' -a "${BUILD_STATIC}" = '0' ]
+	if isTrue "${BUILD_MODULES}" && ! isTrue "${BUILD_STATIC}"
 	then
 		compile_modules
 	fi
 
-	if [ "${SAVE_CONFIG}" = '1' ]
+	if isTrue "${SAVE_CONFIG}"
 	then
 		print_info 1 "Copying config for successful build to /etc/kernels/kernel-config-${ARCH}-${KV}"
 		[ ! -e '/etc/kernels' ] && mkdir -p /etc/kernels
@@ -260,15 +260,15 @@ fi
 
 if isTrue "${CMD_INSTALL}"
 then
-	if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ]
+	if [ "${KERNCACHE}" != "" ] && isTrue "${KERNCACHE_IS_VALID}"
 	then
 		gen_kerncache_extract_kernel
 	fi
 fi
 
-if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ]
+if [ "${KERNCACHE}" != "" ] && isTrue "${KERNCACHE_IS_VALID}"
 then
-	[ "${BUILD_STATIC}" = '0' ] && gen_kerncache_extract_modules
+	! isTrue "${BUILD_STATIC}" && gen_kerncache_extract_modules
 	gen_kerncache_extract_config
 fi
 
@@ -305,7 +305,7 @@ then
 	print_info 1 "" 1 0
 fi
 
-if [ "${BUILD_RAMDISK}" = '1' ]
+if isTrue "${BUILD_RAMDISK}"
 then
 	# Compile initramfs
 	create_initramfs
@@ -313,7 +313,7 @@ else
 	print_info 1 'initrd: Not building since only the kernel was requested...'
 fi
 
-if isTrue "${INTEGRATED_INITRAMFS}" #|| [ "${BUILD_KERNEL}" = '1' -a "${KERNCACHE_IS_VALID}" == "0" ]
+if isTrue "${INTEGRATED_INITRAMFS}"
 then
 	# We build the kernel a second time to include the initramfs
 	compile_kernel
@@ -326,7 +326,7 @@ fi
 # Clean up...
 [ -n "${CTEMP}" ] && rm -rf "${TEMP}"
 
-if [ "${BUILD_KERNEL}" = '1' ]
+if isTrue "${BUILD_KERNEL}"
 then
 	if isTrue "${CMD_INSTALL}"
 	then
@@ -337,7 +337,7 @@ then
 	print_info 1 ''
 	print_info 1 'Required Kernel Parameters:'
 	print_info 1 '    root=/dev/$ROOT'
-	if [ "${BUILD_RAMDISK}" = '0' ]
+	if ! isTrue "${BUILD_RAMDISK}"
 	then
 		print_info 1 '    [ And "vga=0x317 splash=verbose" if you use a framebuffer ]'
 		print_info 1 ''
@@ -353,22 +353,22 @@ then
 	fi
 fi
 
-if [ "${BUILD_RAMDISK}" = '1' ]
+if isTrue "${BUILD_RAMDISK}"
 then
 	echo
 	print_warning 1 'WARNING... WARNING... WARNING...'
 	print_warning 1 'Additional kernel cmdline arguments that *may* be required to boot properly...'
-	[ "${SPLASH}" = '1' ] && print_warning 1 "add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer ]"
-	[ "${LVM}" = '1' ] && print_warning 1 'add "dolvm" for lvm support'
-	[ "${DMRAID}" = '1' ] && print_warning 1 'add "dodmraid" for dmraid support'
-	[ "${MDADM}" = '1' ] && print_warning 1 'add "domdadm" for RAID support'
-	[ "${DMRAID}" = '1' ] && print_warning 1 '	or "dodmraid=<additional options>"'
-	[ "${ZFS}" = '1' ] && print_warning 1 'add "dozfs" for ZFS volume management support'
-	[ "${ZFS}" = '1' ] && print_warning 1 '	and either "root=ZFS" to use bootfs autodetection or "root=ZFS=<dataset>" to force booting from a specific dataset'
-	[ "${ZFS}" = '1' ] && print_warning 1 'If importing ZFS pool is slow, add dozfs=cache or dozfs=force to kernel commandline.'
-	[ "${ZFS}" = '1' ] && print_warning 1 '"man genkernel" explains "dozfs" in detail.'
-	[ "${BTRFS}" = '1' ] && print_warning 1 'add "dobtrfs" for Btrfs device scanning support'
-	[ "${ISCSI}" = '1' ] && print_warning 1 'add at least "iscsi_initiatorname=<initiator name> iscsi_target=<target name> and iscsi_address=<target ip>" for iscsi support'
+	isTrue "${SPLASH}" && print_warning 1 "add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer ]"
+	isTrue "${LVM}"    && print_warning 1 'add "dolvm" for LVM support'
+	isTrue "${DMRAID}" && print_warning 1 'add "dodmraid" for dmraid support'
+	isTrue "${MDADM}"  && print_warning 1 'add "domdadm" for MDRAID support'
+	isTrue "${DMRAID}" && print_warning 1 '	or "dodmraid=<additional options>"'
+	isTrue "${ZFS}"    && print_warning 1 'add "dozfs" for ZFS volume management support'
+	isTrue "${ZFS}"    && print_warning 1 '	and either "root=ZFS" to use bootfs autodetection or "root=ZFS=<dataset>" to force booting from a specific dataset'
+	isTrue "${ZFS}"    && print_warning 1 'If importing ZFS pool is slow, add dozfs=cache or dozfs=force to kernel commandline.'
+	isTrue "${ZFS}"    && print_warning 1 '"man genkernel" explains "dozfs" in detail.'
+	isTrue "${BTRFS}"  && print_warning 1 'add "dobtrfs" for Btrfs device scanning support'
+	isTrue "${ISCSI}"  && print_warning 1 'add at least "iscsi_initiatorname=<initiator name> iscsi_target=<target name> and iscsi_address=<target ip>" for iscsi support'
 
 	if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then
 		# Support --kernel-config=/proc/config.gz, mainly

diff --git a/genkernel.conf b/genkernel.conf
index 6eae321..38f6bbf 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -7,146 +7,151 @@
 
 # =========Common Command Line Option Defaults=========
 
-# Should we install to $BOOTDIR?
+# Install to $BOOTDIR
 #INSTALL="yes"
 
-# Run 'make oldconfig' before compiling this kernel?
+# Run 'make oldconfig' before compiling this kernel
 OLDCONFIG="yes"
 
-# Run 'make menuconfig' before compiling this kernel?
+# Run 'make menuconfig' before compiling this kernel
 MENUCONFIG="no"
-# Run 'make gconfig' before compiling this kernel?
+
+# Run 'make gconfig' before compiling this kernel
 GCONFIG="no"
-# Run 'make nconfig' (ncurses 'menuconfig') before compiling this kernel?
+
+# Run 'make nconfig' (ncurses 'menuconfig') before compiling this kernel
 NCONFIG="no"
-# Run 'make xconfig' before compiling this kernel?
+
+# Run 'make xconfig' before compiling this kernel
 XCONFIG="no"
 
-# Run 'make clean' before compilation?
+# Run 'make clean' before compilation
 # If set to NO, implies MRPROPER WILL NOT be run
 # Also, if clean is NO, it won't copy over any configuration
 # file, it will use what's there.
 CLEAN="yes"
 
-# Run 'make mrproper' before configuration/compilation?
+# Run 'make mrproper' before configuration/compilation
 MRPROPER="yes"
 
-# Override the arch detection?
+# Override the arch detection
 #ARCH_OVERRIDE="x86"
 
-# Mount BOOTDIR automatically if it isn't mounted?
+# Mount BOOTDIR automatically if it isn't mounted
 MOUNTBOOT="yes"
 
-# Make symlinks in BOOTDIR automatically?
+# Make symlinks in BOOTDIR automatically
 #SYMLINK="no"
 
 # Save the new configuration in /etc/kernels upon
 # successfull compilation
 SAVE_CONFIG="yes"
 
-# Use Color output in Genkernel?
+# Enable color output in genkernel
 USECOLOR="yes"
 
-# Clear build cache dir
-#CLEAR_CACHE_DIR="yes"
+# Clear build cache dir on gernkernel start
+#CLEAR_CACHE_DIR="no"
 
 # Clear all tmp files and caches after genkernel has run
-#POSTCLEAR="1"
+#POSTCLEAR="no"
 
 # Genkernel uses an independent configuration for MAKEOPTS, and does not source
-# /etc/make.conf . You can override the default setting by uncommenting and
-# tweaking the following line. Default setting is set up by
+# /etc/portage/make.conf . You can override the default setting by uncommenting
+# and tweaking the following line. Default setting is set up by
 # ${GK_SHARE}/${ARCH_OVERRIDE}/config.sh . The recommended value for -j
 # argument is: <number of processors>*<number of cores per processor>+1
 #MAKEOPTS="$(portageq envvar MAKEOPTS)"
 
-# Run the kernel make at the following NICE level.  Default is 10.
-# NICE=10
+# Run the kernel make at the following NICE level
+#NICE=10
 
-# Add in LVM support from static binaries if they exist on the system, or
-# compile static LVM binaries if static ones do not exist.
+# Add LVM support
 #LVM="no"
 
-# Add in Luks support. Needs sys-fs/cryptsetup with -dynamic installed.
+# Add LUKS support
 #LUKS="no"
 
-# Add in GnuPG support
+# Add GnuPG support
 #GPG="no"
 
 # Add in early microcode support: this sets the kernel options for early microcode loading
-# Acceptible values: empty/"no", "all", "intel", "amd"
+# Possible values: empty/"no", "all", "intel", "amd"
 #MICROCODE="all"
 
 # Include early microcode in generated initramfs
 # This is enabled by default for upgrade compatability, however is obsoleted by
 # sys-boot/grub-2.02-r1, which supports multiple initramfs in the bootloader.
-#MICROCODE_INITRAMFS="no"
+#MICROCODE_INITRAMFS="yes"
 
-# Add in NFS support
+# Add NFS support
 #NFS="no"
 
-# Add DMRAID support.
+# Add DMRAID support
 #DMRAID="no"
 
-# Add SSH support.
+# Add SSH support
 #SSH="no"
 
-# Include (or suppresses the inclusion of) busybox in the initrd or initramfs.
-# If included, busybox is rebuilt if the cached copy is out of date.
+# Include busybox in the initramfs. If included, busybox is rebuilt
+# if the cached copy is out of date.
 #BUSYBOX="yes"
 
-# Includes mdadm/mdmon binaries in initramfs.
-# Without sys-fs/mdadm[static] installed, this will build a static mdadm.
+# Add MDRAID support
 #MDADM="no"
 
 # Specify a custom mdadm.conf.
-# By default the ramdisk will be built *without* an mdadm.conf and will auto-detect
+# By default the initramfs will be built *without* an mdadm.conf and will auto-detect
 # arrays during bootup.  Usually, this should not be needed.
 #MDADM_CONFIG="/etc/mdadm.conf"
 
-# Add Multipath support.
+# Add Multipath support
 #MULTIPATH="no"
 
-# Add iSCSI support.
+# Add iSCSI support
 #ISCSI="no"
 
-# Add e2fsprogs support.
+# Add e2fsprogs support
 #E2FSPROGS="no"
 
 # Include support for unionfs
-#UNIONFS="1"
+#UNIONFS="no"
 
-# Include support for zfs volume management.
+# Include support for zfs volume management.  If unset, genkernel will attempt
+# to autodetect and enable this when rootfs is on zfs.
 #ZFS="no"
 
-# Add BTRFS support.
+# Add BTRFS support
 #BTRFS="no"
 
 # Install firmware onto root filesystem
 # Will conflict with sys-kernel/linux-firmware package
 #FIRMWARE_INSTALL="no"
 
-# Enable copying of firmware into initramfs
+# Add firmware(s) to initramfs
 #FIRMWARE="no"
+
 # Specify directory to pull from
 #FIRMWARE_DIR="/lib/firmware"
+
 # Specify a space-separated list of firmware files or directories to include,
 # relative to FIRMWARE_DIR.  If empty or unset, the full contents of 
 # FIRMWARE_DIR will be included.
 #FIRMWARE_FILES=""
 
-# Enable disklabel support (copies blkid to initrd)
+# Add disklabel support (copies blkid to initramfs)
 DISKLABEL="yes"
 
-# Add new kernel to grub?
-#BOOTLOADER="grub"
+# Add new kernel to grub
+# Possible values: empty/"no", "grub", "grub2"
+#BOOTLOADER=""
 
-# Enable splashutils in early space (initrd). Default is "no".
-#SPLASH="yes"
+# Add boot splash using splashutils
+#SPLASH="no"
 
 # Use this splash theme. If commented out - the "default" name theme is used.
-# Also, SPLASH="yes" needs to be enabled for this one to one work.
-# This supersedes the "SPLASH_THEME" option of /etc/conf.d/splash (in early space).
+# Also, SPLASH="yes" needs to be enabled for this one to work.
+# This supersedes the "SPLASH_THEME" option in /etc/conf.d/splash .
 #SPLASH_THEME="gentoo"
 
 # Run the specified command in the current environment after the kernel and
@@ -155,14 +160,14 @@ DISKLABEL="yes"
 # files (use 'copy_image_with_preserve dtb path/to/dtb dtb ${KNAME}-${ARCH}-${KV}')
 #CMD_CALLBACK=""
 
+
 # =========Keymap Settings=========
 #
 # Force keymap selection at boot
-#DOKEYMAPAUTO="yes"
-
+#DOKEYMAPAUTO="no"
 
-# Disables keymap selection support
-#KEYMAP="0"
+# Enables keymap selection support
+#KEYMAP="yes"
 
 
 # =========Low Level Compile Settings=========
@@ -197,11 +202,9 @@ DISKLABEL="yes"
 # option.
 #UTILS_LD="ld"
 
-
 # Common prefix of cros compile commands
 #UTILS_CROSS_COMPILE="x86_64-pc-linux-gnu"
 
-
 # Value of CROSS_COMPILE utils variable
 # during kernel compilation
 #KERNEL_CROSS_COMPILE="x86_64-pc-linux-gnu"
@@ -214,12 +217,14 @@ DISKLABEL="yes"
 # command line option. Useful to install a uImage on arm
 #KERNEL_BINARY_OVERRIDE="arch/foo/boot/bar"
 
+
 # =========GENKERNEL LOCATION CONFIGURATION============
+#
 # Variables:
 #   %%ARCH%%  - Final determined architecture
 #   %%CACHE%% - Final determined cache location
 
-# Set genkernel's temporary work directory.  Default is /var/tmp/genkernel
+# Set genkernel's temporary work directory
 #TMPDIR="/var/tmp/genkernel"
 
 # Set the boot directory, default is /boot
@@ -230,17 +235,22 @@ GK_SHARE="${GK_SHARE:-/usr/share/genkernel}"
 
 # Location of the default cache
 CACHE_DIR="/var/cache/genkernel"
+
 # Location of DISTDIR, where our source tarballs are stored
 DISTDIR="${GK_SHARE}/distfiles"
+
 # Log output file
 LOGFILE="/var/log/genkernel.log"
+
 # Debug Level
 LOGLEVEL=1
 
+
 # =========COMPILED UTILS CONFIGURATION============
 #
 # Default location of kernel source
 DEFAULT_KERNEL_SOURCE="/usr/src/linux"
+
 # Default kernel config (only use to override using
 # arch/%%ARCH%%/kernel-config-${VER}.${PAT} !)
 #DEFAULT_KERNEL_CONFIG="${GK_SHARE}/arch/%%ARCH%%/kernel-config"
@@ -250,7 +260,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 #BUSYBOX_APPLETS="[ ash sh mount uname echo cut cat"
 
 # NOTE: Since genkernel 3.4.41 the version of
-#   busybox, lvm, mdadm, .. have been moved to
+#   busybox, lvm, mdadm, ... have been moved to
 #   /usr/share/genkernel/defaults/software.sh in order to
 #   reduce the merging you have to do during etc-update.
 #   You can still override these settings in here.
@@ -258,32 +268,27 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 
 # =========MISC KERNEL CONFIGURATION============
 #
-# Tag the kernel and ramdisk with a name:
+# Tag the kernel and initramfs with a name:
 # If not defined the option defaults to
 # 'genkernel'
 #KNAME="genkernel"
 
-
 # This option is only valid if kerncache is
 # defined. If there is a valid kerncache no checks
 # will be made against a kernel source tree
-#KERNEL_SOURCES="0"
-
+#KERNEL_SOURCES="yes"
 
 # Build a static (monolithic kernel)
-#BUILD_STATIC="1"
-
+#BUILD_STATIC="no"
 
 # Make and install kernelz image (PowerPC)
-#GENZIMAGE="1"
-
+#GENZIMAGE="no"
 
 # File to output a .tar.bz2'd kernel contents
 # of /lib/modules/ and the kernel config
 # NOTE: This is created before the callbacks
 # are run!
-#KERNCACHE="/path/to/file"
-
+#KERNCACHE="/path/to/file.bz2"
 
 # Prefix to kernel module destination, modules
 # will be installed in <prefix>/lib/modules
@@ -291,22 +296,20 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 #INSTALL_MOD_PATH=""
 
 
-# =========MISC INITRD CONFIGURATION============
+# =========MISC INITRAMFS CONFIGURATION============
 #
-# Copy all kernel modules to the ramdisk
-#ALLRAMDISKMODULES="1"
+# Copy all compiled kernel modules to the initramfs
+#ALLRAMDISKMODULES="no"
 
+# Copy selected modules to the initramfs based on arch-specific modules_load file
+#RAMDISKMODULES="yes"
 
-# Don't copy any modules to the ramdisk
-#RAMDISKMODULES="0"
-
-
-# File to output a .tar.bz2'd kernel and ramdisk:
-# No modules outside of the ramdisk will be
+# File to output a .tar.bz2'd kernel and initramfs:
+# No modules outside of the initramfs will be
 # included...
 #MINKERNPACKAGE="/path/to/file.bz2"
 
-# Add additional modules to the ramdisk using the module groups defined
+# Add additional modules to the initramfs using the module groups defined
 # in /usr/share/genkernel/defaults/modules_load (see this file for
 # more details).  This would be used if, for example, you
 # required an additional crypto module or network device at boot
@@ -316,7 +319,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 # Use this with caution.
 #AMODULES_group="module-to-include another-module"
 
-# Override the default modules in the ramdisk, for a given group, as defined by
+# Override the default modules in the initramfs, for a given group, as defined by
 # /usr/share/genkernel/defaults/modules_load and the per-arch modules_load
 # files. You PROBABLY want to use AMODULES_* above, and NOT MODULES_* here.
 # If you use MODULES_* here, the default and per-arch modules will NOT be used.
@@ -327,19 +330,17 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 # callbacks have run
 #MODULESPACKAGE="/path/to/file.bz2"
 
-
 # Directory structure to include in the initramfs,
 # only available on >=2.6 kernels
 #INITRAMFS_OVERLAY=""
 
-
 # Build the generated initramfs into the kernel instead of
 # keeping it as a separate file
-#INTEGRATED_INITRAMFS="1"
-
+#INTEGRATED_INITRAMFS="no"
 
 # Compress generated initramfs
 #COMPRESS_INITRD="yes"
+
 # Types of compression: best, xz, lzma, bzip2, gzip, lzop, fastest
 # "best" selects the best available compression method
 # "fastest" selects the fastest available compression method
@@ -349,7 +350,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 # WRAP_INITRD=no
 
 # Create a self-contained env in the initramfs
-#NETBOOT="1"
+#NETBOOT="no"
 
 
 # =========MISC BOOT CONFIGURATION============

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

[Thomas Deutschmann]

commit:     98eb64bd3194ad77b093b68612d345f62bee30e5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 02:01:51 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:06:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=98eb64bd

Update bootloader handling

- Add --no-bootloader parameter

- Treat empty BOOTLOADER like "no" value

- Output information when bootloader update was skipped

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_bootloader.sh    |  7 ++++++-
 gen_cmdline.sh       | 18 ++++++++++++++++--
 gen_determineargs.sh |  1 +
 genkernel.conf       |  2 +-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index 2a0a43d..3e3ecb0 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -1,6 +1,8 @@
 # $Id$
 
 set_bootloader() {
+	print_info 1 ''
+
 	case "${BOOTLOADER}" in
 		grub)
 			set_bootloader_grub
@@ -8,8 +10,11 @@ set_bootloader() {
 		grub2)
 			set_bootloader_grub2
 			;;
+		no)
+			print_info 1 "No bootloader set: Skipping bootloader update!"
+			;;
 		*)
-			print_warning "Bootloader ${BOOTLOADER} is not currently supported"
+			print_warning 1 "Bootloader '${BOOTLOADER}' is currently not supported"
 			;;
 	esac
 }

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 6388e93..2fb9ace 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -118,8 +118,10 @@ longusage() {
   echo "	--hyperv		Include Microsoft Hyper-V support"
   echo "	--no-hyperv		Exclude Microsoft Hyper-V support"
   echo "	--ssh			Include SSH (dropbear) support"
-  echo "	--no-ssh 		Exclude SSH (dropbear) support"
-  echo "	--bootloader=grub	Add new kernel to GRUB configuration"
+  echo "	--no-ssh		Exclude SSH (dropbear) support"
+  echo "	--bootloader=(grub|grub2)"
+  echo "				Add new kernel to GRUB (grub) or GRUB2 (grub2) bootloader"
+  echo "	--no-bootloader		Skip bootloader update"
   echo "	--linuxrc=<file>	Specifies a user created linuxrc"
   echo "	--busybox-config=<file>	Specifies a user created busybox config"
   echo "	--genzimage		Make and install kernelz image (PowerPC)"
@@ -411,6 +413,18 @@ parse_cmdline() {
 			;;
 		--bootloader=*)
 			CMD_BOOTLOADER="${*#*=}"
+			[ -z "${CMD_BOOTLOADER}" ] && CMD_BOOTLOADER="no"
+			case "${CMD_BOOTLOADER}" in
+				no|grub|grub2)
+					;;
+				*)
+					echo "Error: Bootloader '${CMD_BOOTLOADER}' is unsupported."
+					exit 1
+			esac
+			print_info 2 "CMD_BOOTLOADER: ${CMD_BOOTLOADER}"
+			;;
+		--no-bootloader)
+			CMD_BOOTLOADER="no"
 			print_info 2 "CMD_BOOTLOADER: ${CMD_BOOTLOADER}"
 			;;
 		--iscsi|--no-iscsi)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index fdfcef9..2a7d008 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -119,6 +119,7 @@ determine_real_args() {
 	set_config_with_override BOOL   DMRAID               CMD_DMRAID
 	set_config_with_override BOOL   ISCSI                CMD_ISCSI
 	set_config_with_override BOOL   HYPERV               CMD_HYPERV
+	set_config_with_override STRING BOOTLOADER           CMD_BOOTLOADER           "no"
 	set_config_with_override BOOL   BUSYBOX              CMD_BUSYBOX              "yes"
 	set_config_with_override BOOL   NFS                  CMD_NFS                  "yes"
 	set_config_with_override STRING MICROCODE            CMD_MICROCODE            "all"

diff --git a/genkernel.conf b/genkernel.conf
index 38f6bbf..687db35 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -144,7 +144,7 @@ DISKLABEL="yes"
 
 # Add new kernel to grub
 # Possible values: empty/"no", "grub", "grub2"
-#BOOTLOADER=""
+#BOOTLOADER="no"
 
 # Add boot splash using splashutils
 #SPLASH="no"

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

[Thomas Deutschmann]

commit:     bb6b5c66e0095189dc858d3575027c8e4ba90f9b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 00:58:11 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:06:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=bb6b5c66

Fix "--[no-]hyperv" parameter

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 37a078b..3832ab4 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -418,7 +418,7 @@ parse_cmdline() {
 			print_info 2 "CMD_ISCSI: ${CMD_ISCSI}"
 			;;
 		--hyperv|--no-hyperv)
-			CMD_ISCSI=`parse_optbool "$*"`
+			CMD_HYPERV=`parse_optbool "$*"`
 			print_info 2 "CMD_HYPERV: ${CMD_HYPERV}"
 			;;
 		--ssh|--no-ssh)

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

[Thomas Deutschmann]

commit:     c8dc95cfa1dc79f1b3790ba35fb4233b6a444b90
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 01:27:42 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:06:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c8dc95cf

gen_funcs.sh: reformat code

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 137 ++++++++++++++++++++++++++++-------------------------------
 1 file changed, 66 insertions(+), 71 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index c5eb28e..3f06584 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -23,22 +23,22 @@ isTrue() {
 }
 
 setColorVars() {
-if isTrue "${USECOLOR}"
-then
-	GOOD=$'\e[32;01m'
-	WARN=$'\e[33;01m'
-	BAD=$'\e[31;01m'
-	NORMAL=$'\e[0m'
-	BOLD=$'\e[0;01m'
-	UNDER=$'\e[4m'
-else
-	GOOD=''
-	WARN=''
-	BAD=''
-	NORMAL=''
-	BOLD=''
-	UNDER=''
-fi
+	if isTrue "${USECOLOR}"
+	then
+		GOOD=$'\e[32;01m'
+		WARN=$'\e[33;01m'
+		BAD=$'\e[31;01m'
+		NORMAL=$'\e[0m'
+		BOLD=$'\e[0;01m'
+		UNDER=$'\e[4m'
+	else
+		GOOD=''
+		WARN=''
+		BAD=''
+		NORMAL=''
+		BOLD=''
+		UNDER=''
+	fi
 }
 setColorVars
 
@@ -154,13 +154,11 @@ print_info() {
 	return 0
 }
 
-print_error()
-{
+print_error() {
 	GOOD=${BAD} print_info "$@"
 }
 
-print_warning()
-{
+print_warning() {
 	GOOD=${WARN} print_info "$@"
 }
 
@@ -169,29 +167,28 @@ print_warning()
 # $2 = variable value
 # $3 = string
 
-var_replace()
-{
-  # Escape '\' and '.' in $2 to make it safe to use
-  # in the later sed expression
-  local SAFE_VAR
-  SAFE_VAR=`echo "${2}" | sed -e 's/\([\/\.]\)/\\\\\\1/g'`
+var_replace() {
+	# Escape '\' and '.' in $2 to make it safe to use
+	# in the later sed expression
+	local SAFE_VAR
+	SAFE_VAR=`echo "${2}" | sed -e 's/\([\/\.]\)/\\\\\\1/g'`
 
-  echo "${3}" | sed -e "s/%%${1}%%/${SAFE_VAR}/g" -
+	echo "${3}" | sed -e "s/%%${1}%%/${SAFE_VAR}/g" -
 }
 
 arch_replace() {
-  var_replace "ARCH" "${ARCH}" "${1}"
+	var_replace "ARCH" "${ARCH}" "${1}"
 }
 
 cache_replace() {
-  var_replace "CACHE" "${CACHE_DIR}/${GK_V}" "${1}"
+	var_replace "CACHE" "${CACHE_DIR}/${GK_V}" "${1}"
 }
 
 clear_log() {
-    if [ -f "${LOGFILE}" ]
-    then
-	(echo > "${LOGFILE}") 2>/dev/null || small_die "Genkernel: Could not write to ${LOGFILE}."
-    fi
+	if [ -f "${LOGFILE}" ]
+	then
+		(echo > "${LOGFILE}") 2>/dev/null || small_die "Genkernel: Could not write to ${LOGFILE}."
+	fi
 }
 
 gen_die() {
@@ -208,7 +205,7 @@ gen_die() {
 	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}|"
+			| sed -s "s|^\(*\)\?|${BAD}*${NORMAL}|"
 	else
 		grep -B5 -E "([Ww][Aa][Rr][Nn][Ii][Nn][Gg]|[Ee][Rr][Rr][Oo][Rr][ :,!]|[Ff][Aa][Ii][Ll][Ee]?[Dd]?)" ${LOGFILE}
 	fi
@@ -227,8 +224,8 @@ gen_die() {
 	print_error 1 ''
 
 	# Cleanup temp dirs and caches if requested
-	isTrue "${CMD_DEBUGCLEANUP}"  && cleanup
-  	exit 1
+	isTrue "${CMD_DEBUGCLEANUP}" && cleanup
+	exit 1
 }
 
 getIndent() {
@@ -248,40 +245,35 @@ getIndent() {
 	echo "${_indent}"
 }
 
-isBootRO()
-{
+isBootRO() {
 	return $(awk '( $2 == "'${BOOTDIR}'" && $4 ~ /(^|,)ro(,|$)/){ I=1; exit }END{print !I }' /proc/mounts);
 }
 
-setup_cache_dir()
-{
-
-[ ! -d "${CACHE_DIR}/${GK_V}" ] && mkdir -p "${CACHE_DIR}/${GK_V}"
-
-if isTrue "${CLEAR_CACHE_DIR}"
-then
-	print_info 1 "Clearing cache dir contents from ${CACHE_DIR}"
-	while read i
-	do
-		print_info 1 "$(getIndent 1)>> removing ${i}"
-		rm "${i}"
-	done < <(find "${CACHE_DIR}" -maxdepth 2 -type f -name '*.tar.*' -o -name '*.bz2')
-fi
+setup_cache_dir() {
+	[ ! -d "${CACHE_DIR}/${GK_V}" ] && mkdir -p "${CACHE_DIR}/${GK_V}"
 
+	if isTrue "${CLEAR_CACHE_DIR}"
+	then
+		print_info 1 "Clearing cache dir contents from ${CACHE_DIR} ..."
+		while read i
+		do
+			print_info 1 "$(getIndent 1)>> removing ${i}"
+			rm "${i}"
+		done < <(find "${CACHE_DIR}" -maxdepth 2 -type f -name '*.tar.*' -o -name '*.bz2')
+	fi
 }
 
-clear_tmpdir()
-{
-if isTrue "${CMD_INSTALL}"
-then
-	TMPDIR_CONTENTS=`ls ${TMPDIR}`
-	print_info 1 "Removing tmp dir contents"
-	for i in ${TMPDIR_CONTENTS}
-	do
-		print_info 1 "	 >> removing ${i}"
-		rm -r ${TMPDIR}/${i}
-	done
-fi
+clear_tmpdir() {
+	if isTrue "${CMD_INSTALL}"
+	then
+		TMPDIR_CONTENTS=`ls ${TMPDIR}`
+		print_info 1 "Removing tmp dir contents"
+		for i in ${TMPDIR_CONTENTS}
+		do
+			print_info 1 "$(getIndent 1)>> removing ${i}"
+			rm -r ${TMPDIR}/${i}
+		done
+	fi
 }
 
 #
@@ -328,6 +320,7 @@ copy_image_with_preserve() {
 			print_info 5 "  Current ${symlinkName} symlink did not exist."
 			print_info 5 "    Defaulted to: ${currDestImage}"
 		fi
+
 		if [ -e "${BOOTDIR}/${currDestImage}" ]
 		then
 			currDestImageExists=1
@@ -346,6 +339,7 @@ copy_image_with_preserve() {
 			print_info 5 "  Old ${symlinkName} symlink did not exist."
 			print_info 5 "    Defaulted to: ${prevDestImage}"
 		fi
+
 		if [ -e "${BOOTDIR}/${prevDestImage}" ]
 		then
 			prevDestImageExists=1
@@ -358,7 +352,7 @@ copy_image_with_preserve() {
 	fi
 
 	# When symlinks are not being managed by genkernel, old symlinks might
-    # still be useful.  Leave 'em alone unless managed.
+	# still be useful.  Leave 'em alone unless managed.
 	if isTrue "${SYMLINK}"
 	then
 		print_info 5 "  Deleting old symlinks, if any."
@@ -375,7 +369,7 @@ copy_image_with_preserve() {
 		#
 		# Case for new and currrent of the same base version.
 		#
- 		print_info 5 "  Same base version.  May have to delete old image to make room."
+		print_info 5 "  Same base version.  May have to delete old image to make room."
 
 		if [ "${currDestImageExists}" = '1' ]
 		then
@@ -387,7 +381,7 @@ copy_image_with_preserve() {
 			print_info 5 "  Moving ${BOOTDIR}/${currDestImage}"
 			print_info 5 "    to ${BOOTDIR}/${currDestImage}.old"
 			mv "${BOOTDIR}/${currDestImage}" "${BOOTDIR}/${currDestImage}.old" ||
-			    gen_die "Could not rename the old ${symlinkName} image!"
+				gen_die "Could not rename the old ${symlinkName} image!"
 			prevDestImage="${currDestImage}.old"
 			prevDestImageExists=1
 		fi
@@ -395,7 +389,7 @@ copy_image_with_preserve() {
 		#
 		# Case for new / current not of the same base version.
 		#
- 		print_info 5 "  Different base version.  Do not delete old images."
+		print_info 5 "  Different base version.  Do not delete old images."
 		prevDestImage="${currDestImage}"
 		currDestImage="${fullDestName}"
 	fi
@@ -403,7 +397,7 @@ copy_image_with_preserve() {
 	print_info 5 "  Copying ${symlinkName}: ${newSrceImage}"
 	print_info 5 "    to ${BOOTDIR}/${currDestImage}"
 	cp "${newSrceImage}" "${BOOTDIR}/${currDestImage}" ||
-	    gen_die "Could not copy the ${symlinkName} image to ${BOOTDIR}!"
+		gen_die "Could not copy the ${symlinkName} image to ${BOOTDIR}!"
 
 	if isTrue "${SYMLINK}"
 	then
@@ -411,12 +405,13 @@ copy_image_with_preserve() {
 		print_info 5 "    ${symlinkName} -> ${currDestImage}"
 		pushd ${BOOTDIR} >/dev/null
 		ln -s "${currDestImage}" "${symlinkName}" || 
-		    gen_die "Could not create the ${symlinkName} symlink!"
+			gen_die "Could not create the ${symlinkName} symlink!"
+
 		if [ "${prevDestImageExists}" = '1' ]
 		then
 			print_info 5 "    ${symlinkName}.old -> ${prevDestImage}"
 			ln -s "${prevDestImage}" "${symlinkName}.old" ||
-			    gen_die "Could not create the ${symlinkName}.old symlink!"
+				gen_die "Could not create the ${symlinkName}.old symlink!"
 		fi
 		popd >/dev/null
 	fi

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

[Thomas Deutschmann]

commit:     0263d25db75177e7e75f03b5177f54f40c060d82
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 01:03:41 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:06:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0263d25d

Add debug output to "--genzimage" parameter to unify parameter handling

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_cmdline.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 3832ab4..f8d6a2c 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -632,6 +632,7 @@ parse_cmdline() {
 			KERNEL_MAKE_DIRECTIVE_2='zImage.initrd'
 			KERNEL_BINARY_2='arch/powerpc/boot/zImage.initrd'
 			CMD_GENZIMAGE="yes"
+			print_info 2 "CMD_GENZIMAGE: ${CMD_GENZIMAGE}"
 #			ENABLE_PEGASOS_HACKS="yes"
 #			print_info 2 "ENABLE_PEGASOS_HACKS: ${ENABLE_PEGASOS_HACKS}"
 			;;

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

[Thomas Deutschmann]

commit:     1380783b7a2ade506b81d3fa29cc2f5682329826
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 01:15:36 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:06:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1380783b

append_devices(): Adjust indentation of verbose output

Signed-off-by: Thomas Deutschmann <whissi <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 4bb45c7..51ac29c 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -74,7 +74,7 @@ append_devices() {
 	nod /dev/ttyS0 600 0 0 c 4 64
 	EOF
 	if [[ "${LOGLEVEL}" -gt 1 ]]; then
-		echo "Adding devices to cpio:"
+		echo "$(getIndent 2)Adding devices to cpio:"
 		cat "${TEMP}/initramfs-base-temp.devices"
 	fi
 	${KERNEL_OUTPUTDIR}/usr/gen_init_cpio "${TEMP}/initramfs-base-temp.devices" >"${CPIO}" \

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

[Thomas Deutschmann]

commit:     610671453f2a29a453facb500c1e7185ae32ec89
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 08:57:28 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 09:18:25 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=61067145

We cannot set new KERNEL_OUTPUTDIR when "make" has already been executed in KERNEL_DIR

This would cause build failures. [Link 1]

Link 1: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Makefile?h=v5.0#n1067
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/gen_compile.sh b/gen_compile.sh
index 14d059d..5c402c8 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -280,7 +280,24 @@ compile_generic() {
 	esac
 
 	case "${argstype}" in
-		kernel|kernelruntask) ARGS="`compile_kernel_args`" ;;
+		kernel|kernelruntask)
+			ARGS="`compile_kernel_args`"
+			if [[ "${ARGS}" = *O=* ]]
+			then
+				if [ -f "${KERNEL_DIR}/.config" -o -d "${KERNEL_DIR}/include/config" ]
+				then
+					# Kernel's build system doesn't remove all files
+					# even when "make clean" was called which will cause
+					# build failures when KERNEL_OUTPUTDIR will change.
+					#
+					# See https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Makefile?h=v5.0#n1067 for details
+					error_message="'${KERNEL_DIR}' is tainted and cannot be used"
+					error_message+=" to compile a kernel with different KERNEL_OUTPUTDIR set."
+					error_message+=" Please re-install a fresh kernel source!"
+					gen_die "${error_message}"
+				fi
+			fi
+			;;
 		utils) ARGS="`compile_utils_args`" ;;
 		*) ARGS="" ;;
 	esac

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

[Thomas Deutschmann]

commit:     459790c8075e8152e764a9d1d070994fd5cb83b6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 03:51:52 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:06:18 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=459790c8

gen_kerncache_is_valid(): No need to do anything if $KERNCACHE file doesn't exist

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_package.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/gen_package.sh b/gen_package.sh
index 32cbf85..bd137ad 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -169,20 +169,21 @@ gen_kerncache_extract_config()
 gen_kerncache_is_valid()
 {
 	KERNCACHE_IS_VALID="no"
-	if ! isTrue "${KERNEL_SOURCES}"
-	then
-		BUILD_KERNEL="no"
-		# Can make this more secure ....
 
-		/bin/tar -xf ${KERNCACHE} -C ${TEMP}
-		if [ -e ${TEMP}/config-${ARCH}-${KV} -a -e ${TEMP}/kernel-${ARCH}-${KV} ]
-		then
-			print_info 1 'Valid kernel cache found; no sources will be used'
-			KERNCACHE_IS_VALID="yes"
-		fi
-	else
-		if [ -e "${KERNCACHE}" ]
+	if [ -e "${KERNCACHE}" ]
+	then
+		if ! isTrue "${KERNEL_SOURCES}"
 		then
+			BUILD_KERNEL="no"
+			# Can make this more secure ....
+
+			/bin/tar -xf ${KERNCACHE} -C ${TEMP}
+			if [ -e ${TEMP}/config-${ARCH}-${KV} -a -e ${TEMP}/kernel-${ARCH}-${KV} ]
+			then
+				print_info 1 'Valid kernel cache found; no sources will be used'
+				KERNCACHE_IS_VALID="yes"
+			fi
+		else
 			KERNEL_CONFIG="/${KERNEL_OUTPUTDIR}/.config"
 			if [ "${CMD_KERNEL_CONFIG}" != '' ]
 			then
@@ -208,7 +209,6 @@ gen_kerncache_is_valid()
 				fi
 				test2=$("${CONFGREP}" -v "^#" ${KERNEL_CONFIG} | md5sum | cut -d " " -f 1)
 
-
 				if [ "${test1}" == "${test2}" ]
 				then
 					echo

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

[Thomas Deutschmann]

commit:     479b2386c8de40a17bc4de4c0723f8c189f14a90
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 06:36:00 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:11:08 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=479b2386

Use mktemp for $TEMP

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_cmdline.sh | 2 +-
 genkernel      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 9bdc157..051350a 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -564,7 +564,7 @@ parse_cmdline() {
 			;;
 		--tempdir=*)
 			TMPDIR="${*#*=}"
-			TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$
+			TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX)
 			print_info 2 "TMPDIR: ${TMPDIR}"
 			print_info 2 "TEMP: ${TEMP}"
 			;;

diff --git a/genkernel b/genkernel
index eca6ea0..c8a9925 100755
--- a/genkernel
+++ b/genkernel
@@ -44,7 +44,7 @@ source ${GK_SHARE}/gen_moddeps.sh || gen_die "Could not read ${GK_SHARE}/gen_mod
 source ${GK_SHARE}/gen_package.sh || gen_die "Could not read ${GK_SHARE}/gen_package.sh"
 source ${GK_SHARE}/gen_bootloader.sh || gen_die "Could not read ${GK_SHARE}/gen_bootloader.sh"
 
-TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$
+TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX)
 
 trap_cleanup(){
 	# Call exit code of 1 for failure

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

[Thomas Deutschmann]

commit:     f965f245f370baf74889c3e499135d3a7f2de772
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 06:28:34 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:11:08 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f965f245

check_distfiles(): Add missing distfiles

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 7b89468..e471834 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -518,7 +518,17 @@ rootfs_type_is() {
 }
 
 check_distfiles() {
-	for i in $BUSYBOX_SRCTAR $MULTIPATH_SRCTAR $LVM_SRCTAR $DMRAID_SRCTAR $ISCSI_SRCTAR $GPG_SRCTAR
+	for i in \
+		$BUSYBOX_SRCTAR \
+		$DMRAID_SRCTAR \
+		$FUSE_SRCTAR \
+		$GPG_SRCTAR \
+		$ISCSI_SRCTAR \
+		$LIBAIO_SRCTAR \
+		$LVM_SRCTAR \
+		$MDADM_SRCTAR \
+		$MULTIPATH_SRCTAR \
+		$UNIONFS_FUSE_SRCTAR
 	do
 		if [ ! -f "${i}" ]
 		then

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

[Thomas Deutschmann]

commit:     196549a830f9ab359fb52824c59d9deada675626
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 03:15:51 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:06:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=196549a8

create_initramfs(): Show message that MICROCODE_INITRAMFS option is obsolete only to Intel users

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 51ac29c..5cafd11 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1190,7 +1190,12 @@ create_initramfs() {
 		## be before the other cpio archives in the stream.
 		cfg_CONFIG_MICROCODE=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE)
 		if isTrue "${MICROCODE_INITRAMFS}" && [ "${cfg_CONFIG_MICROCODE}" == "y" ]; then
-			print_info 1 "--microcode-initramfs is enabled by default for compatability but made obsolete by sys-boot/grub-2.02-r1"
+			if [[ "${MICROCODE}" == intel ]]; then
+				# Only show this information for Intel users because we have no mechanism yet
+				# to generate amd-*.img in /boot after sys-kernel/linux-firmware update
+				print_info 1 "MICROCODE_INITRAMFS option is enabled by default for compatability but made obsolete by >=sys-boot/grub-2.02-r1"
+			fi
+
 			cfg_CONFIG_MICROCODE_INTEL=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_INTEL)
 			cfg_CONFIG_MICROCODE_AMD=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_AMD)
 			print_info 1 "$(getIndent 1)>> Adding early-microcode support..."
@@ -1222,6 +1227,7 @@ create_initramfs() {
 				mv -f "${CPIO}.early-microcode" "${CPIO}" || gen_die "Rename failed"
 			else
 				print_info 1 "$(getIndent 2)early-microcode: CONFIG_MICROCODE=y is set but no microcode found"
+				print_info 1 "$(getIndent 2)early-microcode: You can disable MICROCODE_INITRAMFS option if you use your bootloader to load AMD/Intel ucode initrd"
 			fi
 		fi
 		if isTrue "${WRAP_INITRD}"

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

[Thomas Deutschmann]

commit:     dcfc952708ed4d6f7ffd303178d7b72e79c6aa3c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 04:58:03 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:06:18 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=dcfc9527

Try to compile gen_init_cpio if missing

gen_init_cpio is required in append_devices(). However, when
KERNEL_OUTPUTDIR was cleaned, this file is missing.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_compile.sh   | 17 +++++++++++++++++
 gen_initramfs.sh |  4 ++++
 2 files changed, 21 insertions(+)

diff --git a/gen_compile.sh b/gen_compile.sh
index d08d1e5..14d059d 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -244,6 +244,23 @@ apply_patches() {
 	fi
 }
 
+compile_gen_init_cpio() {
+	local gen_init_cpio_SRC="${KERNEL_DIR}/usr/gen_init_cpio.c"
+	local gen_init_cpio_DIR="${KERNEL_OUTPUTDIR}/usr"
+
+	print_info 1 "$(getIndent 2)>> Compiling gen_init_cpio..."
+
+	[ ! -e "${gen_init_cpio_SRC}" ] && gen_die "'${gen_init_cpio_SRC}' is missing. Cannot compile gen_init_cpio!"
+	[ ! -d "${gen_init_cpio_DIR}" ] && mkdir "${gen_init_cpio_DIR}"
+
+	export_utils_args
+
+	${CC} -O2 "${KERNEL_DIR}/usr/gen_init_cpio.c" -o "${KERNEL_OUTPUTDIR}/usr/gen_init_cpio" -Wl,--no-as-needed ||
+		gen_die 'Failed to compile gen_init_cpio!'
+
+	unset_utils_args
+}
+
 compile_generic() {
 	local RET
 	[ "$#" -lt '2' ] &&

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 5cafd11..f4706a5 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -63,6 +63,10 @@ log_future_cpio_content() {
 }
 
 append_devices() {
+	if [[ ! -x "${KERNEL_OUTPUTDIR}/usr/gen_init_cpio" ]]; then
+		compile_gen_init_cpio
+	fi
+
 	# WARNING, does NOT support appending to cpio!
 	cat >"${TEMP}/initramfs-base-temp.devices" <<-EOF
 	dir /dev 0755 0 0

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

[Thomas Deutschmann]

commit:     a3377ad72f574a717bf366d12d54852d053be5e4
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 03:41:01 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:06:18 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a3377ad7

Fix "--kerncache=/foo/bar.bz2" when used with "--no-kernel-sources"

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/gen_package.sh b/gen_package.sh
index 2dc701d..32cbf85 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -169,7 +169,7 @@ gen_kerncache_extract_config()
 gen_kerncache_is_valid()
 {
 	KERNCACHE_IS_VALID="no"
-	if [ "${NO_KERNEL_SOURCES}" = '1' ]
+	if ! isTrue "${KERNEL_SOURCES}"
 	then
 		BUILD_KERNEL="no"
 		# Can make this more secure ....

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

[Thomas Deutschmann]

commit:     ff96e4f3c6184ebd831e3718cdb4a7bfb13285ed
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 05:33:32 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:11:08 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ff96e4f3

Fix & unify "--help" output

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_cmdline.sh | 56 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index d0e45be..9bdc157 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -22,26 +22,26 @@ 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 "	--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"
   echo "	--nconfig		Run nconfig after oldconfig"
   echo "	--no-nconfig		Do not run nconfig after oldconfig"
-  echo "	--gconfig			Run gconfig after oldconfig"
+  echo "	--gconfig		Run gconfig after oldconfig"
   echo "	--no-gconfig		Don't run gconfig after oldconfig"
-  echo "	--xconfig			Run xconfig after oldconfig"
+  echo "	--xconfig		Run xconfig after oldconfig"
   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 "	--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"
   echo "	--no-clean		Do not run make clean before compilation"
   echo "	--mrproper		Run make mrproper before compilation"
-  echo "	--no-mrproper	Do not run make mrproper before compilation"
+  echo "	--no-mrproper		Do not run make mrproper before compilation"
   echo "	--splash		Install framebuffer splash support into initramfs"
   echo "	--no-splash		Do not install framebuffer splash"
   echo "	--install		Install the kernel after building"
@@ -64,17 +64,20 @@ longusage() {
   echo "	--kernel-cc=<compiler>	Compiler to use for kernel (e.g. distcc)"
   echo "	--kernel-as=<assembler>	Assembler to use for kernel"
   echo "	--kernel-ld=<linker>	Linker to use for kernel"
-  echo "	--kernel-cross-compile=<cross var> CROSS_COMPILE kernel variable"
+  echo "	--kernel-cross-compile=<cross var>"
+  echo "				CROSS_COMPILE kernel variable"
   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 "	--kernel-outputdir=<path>"
+  echo "				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"
   echo "	--utils-ld=<linker>	Linker to use for utils"
   echo "	--utils-make=<makeprog>	GNU Make to use for utils"
-  echo "	--utils-cross-compile=<cross var> CROSS_COMPILE utils variable"
+  echo "	--utils-cross-compile=<cross var>"
+  echo "				CROSS_COMPILE utils variable"
   echo "	--utils-arch=<arch> 	Force to arch for utils only instead of"
   echo "				autodetect."
   echo "	--makeopts=<makeopts>	Make options such as -j2, etc..."
@@ -99,7 +102,7 @@ longusage() {
   echo "	--no-mdadm		Exclude MDADM/MDMON support"
   echo "	--mdadm-config=<file>	Use file as mdadm.conf in initramfs"
   echo "	--microcode[=<type>]	Include early microcode support, for 'all'/'amd'/'intel' CPU types"
-  echo "	--no-microcode			Exclude early microcode support"
+  echo "	--no-microcode		Exclude early microcode support"
   echo "	--microcode-initramfs	Include early microcode in initramfs"
   echo "	--nfs			Include NFS support"
   echo "	--no-nfs		Exclude NFS support"
@@ -107,12 +110,12 @@ longusage() {
   echo "	--no-dmraid		Exclude DMRAID support"
   echo "	--e2fsprogs		Include e2fsprogs"
   echo "	--no-e2fsprogs		Exclude e2fsprogs"
-  echo "	--zfs			Include ZFS support (enabled by default if rootfs is zfs)"
+  echo "	--zfs			Include ZFS support (enabled by default if rootfs is ZFS)"
   echo "	--no-zfs		Exclude ZFS support"
-  echo "	--btrfs			Include Btrfs support (enabled by default if rootfs is btrfs)"
+  echo "	--btrfs			Include Btrfs support (enabled by default if rootfs is Btrfs)"
   echo "	--no-btrfs		Exclude Btrfs support"
   echo "	--multipath		Include Multipath support"
-  echo "	--no-multipath	Exclude Multipath support"
+  echo "	--no-multipath		Exclude Multipath support"
   echo "	--iscsi			Include iSCSI support"
   echo "	--no-iscsi		Exclude iSCSI support"
   echo "	--hyperv		Include Microsoft Hyper-V support"
@@ -126,18 +129,18 @@ longusage() {
   echo "	--busybox-config=<file>	Specifies a user created busybox config"
   echo "	--genzimage		Make and install kernelz image (PowerPC)"
   echo "	--disklabel		Include disk label and uuid support in your ramdisk"
-  echo "	--no-disklabel	Exclude disk label and uuid support in your ramdisk"
+  echo "	--no-disklabel		Exclude disk label and uuid support in your ramdisk"
   echo "	--luks			Include LUKS support"
   echo "				--> 'emerge cryptsetup' with USE=static"
   echo "	--no-luks		Exclude LUKS support"
   echo "	--gpg			Include GPG-armored LUKS key support"
   echo "	--no-gpg		Exclude GPG-armored LUKS key support"
   echo "	--busybox		Include busybox"
-  echo "	--no-busybox	Exclude busybox"
+  echo "	--no-busybox		Exclude busybox"
   echo "	--unionfs		Include support for unionfs"
-  echo "	--no-unionfs	Exclude support for unionfs"
+  echo "	--no-unionfs		Exclude support for unionfs"
   echo "	--netboot		Create a self-contained env in the initramfs"
-  echo "	--no-netboot	Exclude --netboot env"
+  echo "	--no-netboot		Exclude netboot env"
   echo "	--real-root=<foo>	Specify a default for real_root="
   echo "  Internals"
   echo "	--arch-override=<arch>	Force to arch instead of autodetect"
@@ -147,18 +150,18 @@ longusage() {
   echo "				like BusyBox, DMRAID, GnuPG, LVM, MDADM ..."
   echo "	--no-clear-cachedir	Do not clean up on genkernel start"
   echo "	--tempdir=<dir>		Location of genkernel's temporary directory"
-  echo "	--postclear			Clear all tmp files and caches after genkernel has run"
+  echo "	--postclear		Clear all tmp files and caches after genkernel has run"
   echo "	--no-postclear		Do not clean up after genkernel has run"
   echo "  Output Settings"
-  echo "	--kernname=<...> 	Tag the kernel and ramdisk with a name:"
+  echo "	--kernname=<...>	Tag the kernel and ramdisk with a name:"
   echo "				If not defined the option defaults to"
   echo "				'genkernel'"
-  echo "	--minkernpackage=<tbz2> File to output a .tar.bz2'd kernel and ramdisk:"
+  echo "	--minkernpackage=<tbz2>	File to output a .tar.bz2'd kernel and ramdisk:"
   echo "				No modules outside of the ramdisk will be"
   echo "				included..."
-  echo "	--modulespackage=<tbz2> File to output a .tar.bz2'd modules after the"
+  echo "	--modulespackage=<tbz2>	File to output a .tar.bz2'd modules after the"
   echo "				callbacks have run"
-  echo "	--kerncache=<tbz2> 	File to output a .tar.bz2'd kernel contents"
+  echo "	--kerncache=<tbz2>	File to output a .tar.bz2'd kernel contents"
   echo "				of /lib/modules/ and the kernel config"
   echo "				NOTE: This is created before the callbacks"
   echo "				are run!"
@@ -168,8 +171,7 @@ longusage() {
   echo "	--initramfs-overlay=<dir>"
   echo "				Directory structure to include in the initramfs,"
   echo "				only available on 2.6 kernels"
-  echo "	--firmware"
-  echo "				Enable copying of firmware into initramfs"
+  echo "	--firmware		Enable copying of firmware into initramfs"
   echo "	--firmware-dir=<dir>"
   echo "				Specify directory to copy firmware from (defaults"
   echo "				to /lib/firmware)"
@@ -177,8 +179,7 @@ longusage() {
   echo "				Specifies specific firmware files to copy. This"
   echo "				overrides --firmware-dir. For multiple files,"
   echo "				separate the filenames with a comma"
-  echo "	--firmware-install"
-  echo "				Enable installing firmware onto root filesystem"
+  echo "	--firmware-install	Enable installing firmware onto root filesystem"
   echo "				(only available for kernels older than v4.14)"
   echo "	--integrated-initramfs, --no-integrated-initramfs"
   echo "				Include/exclude the generated initramfs in the kernel"
@@ -193,8 +194,7 @@ longusage() {
   echo "	--strip=(all|kernel|modules|none)"
   echo "				Strip debug symbols from none, all, installed kernel (obsolete) or"
   echo "				modules (default)."
-  echo "	--no-strip"
-  echo "				Don't strip installed kernel or modules, alias for --strip=none"
+  echo "	--no-strip		Don't strip installed kernel or modules, alias for --strip=none"
   echo
   echo "For a detailed list of supported initramfs options and flags; issue:"
   echo "	man 8 genkernel"
@@ -204,7 +204,7 @@ usage() {
   echo "Gentoo Linux Genkernel ${GK_V}"
   echo
   echo "Usage: "
-  echo "	genkernel [options] all"
+  echo "	genkernel [options] (all|bzImage|initramfs|kernel)"
   echo
   echo 'Some useful options:'
   echo '	--menuconfig		Run menuconfig after oldconfig'

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

[Thomas Deutschmann]

commit:     31e006d1dc59c52c853d974a00dfbd7ed816e555
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 06:53:32 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:11:08 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=31e006d1

create_initramfs(): Create ucode cpio in $TEMP

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index f4706a5..d684844 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1203,7 +1203,7 @@ create_initramfs() {
 			cfg_CONFIG_MICROCODE_INTEL=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_INTEL)
 			cfg_CONFIG_MICROCODE_AMD=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_AMD)
 			print_info 1 "$(getIndent 1)>> Adding early-microcode support..."
-			UCODEDIR="${TMPDIR}/ucode_tmp/kernel/x86/microcode/"
+			UCODEDIR="${TEMP}/ucode_tmp/kernel/x86/microcode/"
 			mkdir -p "${UCODEDIR}"
 			if [ "${cfg_CONFIG_MICROCODE_INTEL}" == "y" ]; then
 				if [ -d /lib/firmware/intel-ucode ]; then
@@ -1223,11 +1223,11 @@ create_initramfs() {
 			fi
 			if [ -f "${UCODEDIR}/AuthenticAMD.bin" -o -f "${UCODEDIR}/GenuineIntel.bin" ]; then
 				print_info 1 "$(getIndent 2)early-microcode: Creating cpio..."
-				pushd "${TMPDIR}/ucode_tmp" > /dev/null
+				pushd "${TEMP}/ucode_tmp" > /dev/null
 				find . | cpio -o -H newc > ../ucode.cpio || gen_die "Failed to create cpu microcode cpio"
 				popd > /dev/null
 				print_info 1 "$(getIndent 2)early-microcode: Prepending early-microcode to initramfs..."
-				cat "${TMPDIR}/ucode.cpio" "${CPIO}" > "${CPIO}.early-microcode" || gen_die "Failed to prepend early-microcode to initramfs"
+				cat "${TEMP}/ucode.cpio" "${CPIO}" > "${CPIO}.early-microcode" || gen_die "Failed to prepend early-microcode to initramfs"
 				mv -f "${CPIO}.early-microcode" "${CPIO}" || gen_die "Rename failed"
 			else
 				print_info 1 "$(getIndent 2)early-microcode: CONFIG_MICROCODE=y is set but no microcode found"

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

[Thomas Deutschmann]

commit:     556da871e4b867337d3c673e58acecb9d927e6eb
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 15:50:45 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 15:50:45 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=556da871

compile_fuse(): Show message when bincache was used

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/gen_compile.sh b/gen_compile.sh
index 5c402c8..0f32b13 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -785,9 +785,10 @@ compile_fuse() {
 }
 
 compile_unionfs_fuse() {
-	if [ ! -f "${UNIONFS_FUSE_BINCACHE}" ]
+	if [ -f "${UNIONFS_FUSE_BINCACHE}" ]
 	then
-
+		print_info 1 "$(getIndent 3)unionfs-fuse: Using cache"
+	else
 		# We'll call compile_fuse() from here, since it's not needed directly by anything else
 		compile_fuse
 

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

[Thomas Deutschmann]

commit:     d8445a5821d1f173066acc0568239e07f9737593
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 15:51:43 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 15:51:43 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d8445a58

compile_unionfs_fuse(): Show message when bincache was used

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_compile.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 0f32b13..e350dad 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -822,8 +822,10 @@ compile_unionfs_fuse() {
 }
 
 compile_iscsi() {
-	if [ ! -f "${ISCSI_BINCACHE}" ]
+	if [ -f "${ISCSI_BINCACHE}" ]
 	then
+		print_info 1 "$(getIndent 3)iSCSI: Using cache"
+	else
 		[ ! -f "${ISCSI_SRCTAR}" ] &&
 			gen_die "Could not find iSCSI source tarball: ${ISCSI_SRCTAR}. Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
 		cd "${TEMP}"

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

[Thomas Deutschmann]

commit:     45a2a4276baa5d638530312d1d5f19bae3b1e8ad
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 19:51:25 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 19:51:25 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=45a2a427

compile_lvm(): No need to call compile_libaio() when LVM_BINCACHE is valid

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/gen_compile.sh b/gen_compile.sh
index fe8d9be..d7c417e 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -569,12 +569,12 @@ compile_libaio() {
 }
 
 compile_lvm() {
-	compile_libaio
-
 	if [[ -f "${LVM_BINCACHE}" && "${LVM_BINCACHE}" -nt "${LIBAIO_BINCACHE}" ]]
 	then
 		print_info 1 "$(getIndent 3)lvm: >> Using cache"
 	else
+		compile_libaio
+
 		[ -f "${LVM_SRCTAR}" ] ||
 			gen_die "Could not find LVM source tarball: ${LVM_SRCTAR}! Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
 		cd "${TEMP}"

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

[Thomas Deutschmann]

commit:     a780a8f628cd5be6b42454be0d8b66892b12a364
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 23:10:07 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 23:10:07 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a780a8f6

Revert "compile_lvm(): No need to call compile_libaio() when LVM_BINCACHE is valid"

This reverts commit 45a2a4276baa5d638530312d1d5f19bae3b1e8ad.

Let's keep that call to allow to trigger a rebuild.

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

diff --git a/gen_compile.sh b/gen_compile.sh
index a968eee..1c29360 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -569,12 +569,12 @@ compile_libaio() {
 }
 
 compile_lvm() {
+	compile_libaio
+
 	if [[ -f "${LVM_BINCACHE}" && "${LVM_BINCACHE}" -nt "${LIBAIO_BINCACHE}" ]]
 	then
 		print_info 1 "$(getIndent 3)lvm: >> Using cache"
 	else
-		compile_libaio
-
 		[ -f "${LVM_SRCTAR}" ] ||
 			gen_die "Could not find LVM source tarball: ${LVM_SRCTAR}! Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
 		cd "${TEMP}"

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

[Thomas Deutschmann]

commit:     1647b1a27c50b419010ef39f55b55328a6500077
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 01:24:47 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 01:34:10 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1647b1a2

Makefile: Update verify-doc target

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d18a3f2..4751822 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,8 @@ verify-doc: doc/genkernel.8.txt
 		tr -s ' ' '\n' | \
 		sed -r \
 			-e 's,[[:space:]]*--(no-)?,,g' \
-			-e '/bootloader/s,=grub,,g' | \
+			-e '/bootloader/s,=\(grub\|grub2\),,g' \
+			-e '/microcode/s,\[\],,g' | \
 		while read opt ; do \
 			regex="^*--(...no-...)?$$opt" ; \
 			if ! egrep -e "$$regex" $< -sq ; then \

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

[Thomas Deutschmann]

commit:     37f8173af1b05399bc99c53d08feadeccd13fd82
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 01:48:36 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 01:48:36 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=37f8173a

Update longusage()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_cmdline.sh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 051350a..6d9dd39 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -35,7 +35,13 @@ 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 "	--hyperv		Enable Microsoft Hyper-V kernel options in kernel"
+  echo "	--no-hyperv		Don't enable Microsoft Hyper-V kernel options in kernel"
+  echo "	--microcode[=<type>]	Enable early microcode support in kernel configuration,"
+  echo "				'all' for all, 'amd' for AMD and 'intel' for Intel CPU types."
+  echo "	--no-microcode		Don't enable early microcode support in kernel configuration"
+  echo "	--virtio		Enable VirtIO kernel options in kernel"
+  echo "	--no-virtio		Don't enable VirtIO kernel options in kernel"
   echo "  Kernel Compile settings"
   echo "	--oldconfig		Implies --no-clean and runs a 'make oldconfig'"
   echo "	--clean			Run make clean before compilation"
@@ -101,9 +107,9 @@ longusage() {
   echo "	--mdadm			Include MDADM/MDMON support"
   echo "	--no-mdadm		Exclude MDADM/MDMON support"
   echo "	--mdadm-config=<file>	Use file as mdadm.conf in initramfs"
-  echo "	--microcode[=<type>]	Include early microcode support, for 'all'/'amd'/'intel' CPU types"
-  echo "	--no-microcode		Exclude early microcode support"
-  echo "	--microcode-initramfs	Include early microcode in initramfs"
+  echo "	--microcode-initramfs	Prepend early microcode to initramfs"
+  echo "	--no-microcode-initramfs"
+  echo "				Don't prepend early microcode to initramfs"
   echo "	--nfs			Include NFS support"
   echo "	--no-nfs		Exclude NFS support"
   echo "	--dmraid		Include DMRAID support"
@@ -118,8 +124,6 @@ longusage() {
   echo "	--no-multipath		Exclude Multipath support"
   echo "	--iscsi			Include iSCSI support"
   echo "	--no-iscsi		Exclude iSCSI support"
-  echo "	--hyperv		Include Microsoft Hyper-V support"
-  echo "	--no-hyperv		Exclude Microsoft Hyper-V support"
   echo "	--ssh			Include SSH (dropbear) support"
   echo "	--no-ssh		Exclude SSH (dropbear) support"
   echo "	--bootloader=(grub|grub2)"
@@ -395,7 +399,7 @@ parse_cmdline() {
 			CMD_BTRFS=`parse_optbool "$*"`
 			print_info 2 "CMD_BTRFS: ${CMD_BTRFS}"
 			;;
-		--virtio)
+		--virtio|--no-virtio)
 			CMD_VIRTIO=`parse_optbool "$*"`
 			print_info 2 "CMD_VIRTIO: ${CMD_VIRTIO}"
 			;;

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

[Thomas Deutschmann]

commit:     1730c1575e3f51ebc409e7fcb51900f32cbc1cbd
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 02:55:03 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 02:55:03 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1730c157

dropbear: add error handling

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_cmdline.sh   | 12 ++++++++++++
 gen_initramfs.sh | 43 +++++++++++++++++++++++++++++--------------
 2 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 6d9dd39..31b1d79 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -446,6 +446,18 @@ parse_cmdline() {
 		--ssh|--no-ssh)
 			CMD_SSH=`parse_optbool "$*"`
 			print_info 2 "CMD_SSH: ${CMD_SSH}"
+			if isTrue "${CMD_SSH}" && [ ! -e /usr/sbin/dropbear ]
+			then
+				echo 'Error: --ssh requires net-misc/dropbear' \
+					'to be installed on the host system.'
+				exit 1
+			fi
+			if isTrue "${CMD_SSH}" && [ ! -e /etc/dropbear/authorized_keys ]
+			then
+				echo 'Error: --ssh requires that dropbear is configured' \
+					'but /etc/dropbear/authorized_keys does not exist!'
+				exit 1
+			fi
 			;;
 		--loglevel=*)
 			CMD_LOGLEVEL="${*#*=}"

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 1469aaa..a90668e 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -693,15 +693,30 @@ append_dropbear(){
 	then
 		if [ -e /usr/bin/dropbearconvert -a /etc/ssh/ssh_host_rsa_key ]
 		then
-			/usr/bin/dropbearconvert openssh dropbear /etc/ssh/ssh_host_rsa_key /etc/dropbear/dropbear_rsa_host_key
+			if /usr/bin/dropbearconvert openssh dropbear /etc/ssh/ssh_host_rsa_key /etc/dropbear/dropbear_rsa_host_key
+			then
+				print_info 1 "$(getIndent 2)SSH: >> /etc/ssh/ssh_host_rsa_key converted into /etc/dropbear/dropbear_rsa_host_key"
+			else
+				gen_die "RSA host key conversion using dropbearconvert failed"
+			fi
 		else
-			/usr/bin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key -s 4096 > /dev/null
+			if /usr/bin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key -s 4096 > /dev/null
+			then
+				print_info 1 "$(getIndent 2)SSH: >> New dropbear RSA host key /etc/dropbear/dropbear_rsa_host_key created"
+			else
+				gen_die "RSA host key generation using dropbearkey failed"
+			fi
 		fi
 	fi
-	
+
 	if [ ! -e /etc/dropbear/dropbear_dss_host_key ]
 	then
-		/usr/bin/dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key > /dev/null
+		if /usr/bin/dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key > /dev/null
+		then
+			print_info 1 "$(getIndent 2)SSH: >> New dropbear DSS host key /etc/dropbear/dropbear_dss_host_key created"
+		else
+			gen_die "DSS host key generation using dropbearkey failed"
+		fi
 	fi
 
 	cd "${TEMP}" \
@@ -712,20 +727,20 @@ append_dropbear(){
 	mkdir -p ${TEMP}/initramfs-dropbear-temp/bin
 	mkdir -p ${TEMP}/initramfs-dropbear-temp/root/.ssh
 
-	cp -L ${GK_SHARE}/defaults/login-remote.sh ${TEMP}/initramfs-dropbear-temp/bin/
-	cp -L /etc/dropbear/{dropbear_rsa_host_key,dropbear_dss_host_key} ${TEMP}/initramfs-dropbear-temp/etc/dropbear/
-	cp -L /etc/dropbear/authorized_keys ${TEMP}/initramfs-dropbear-temp/root/.ssh
-	cp -L /etc/localtime ${TEMP}/initramfs-dropbear-temp/etc/
+	cp -L ${GK_SHARE}/defaults/login-remote.sh ${TEMP}/initramfs-dropbear-temp/bin/ || gen_die "failed to copy defaults/login-remote.sh"
+	cp -L /etc/dropbear/{dropbear_rsa_host_key,dropbear_dss_host_key} ${TEMP}/initramfs-dropbear-temp/etc/dropbear/ || gen_die "failed to copy dropbear host key(s)"
+	cp -L /etc/dropbear/authorized_keys ${TEMP}/initramfs-dropbear-temp/root/.ssh || gen_die "failed to copy /etc/dropbear/authorized_keys. Did you forget to configure dropbear?"
+	cp -L /etc/localtime ${TEMP}/initramfs-dropbear-temp/etc/ || gen_die "failed to copy /etc/localtime. Please set system's timezone!"
 	if [ ${ARCH} = "x86_64" ]
 	then
 		mkdir -p ${TEMP}/initramfs-dropbear-temp/lib64
-		cp -L /lib64/libnss_files.so.2 ${TEMP}/initramfs-dropbear-temp/lib64/
+		cp -L /lib64/libnss_files.so.2 ${TEMP}/initramfs-dropbear-temp/lib64/ || gen_die "failed to copy libnss_files.so.2"
 	else
 		mkdir -p ${TEMP}/initramfs-dropbear-temp/lib
-		cp -L /lib/libnss_files.so.2 ${TEMP}/initramfs-dropbear-temp/lib/
+		cp -L /lib/libnss_files.so.2 ${TEMP}/initramfs-dropbear-temp/lib/ || gen_die "failed to libnss_files.so.2"
 	fi
-	
-	sed "s/compat/files/g" /etc/nsswitch.conf > ${TEMP}/initramfs-dropbear-temp/etc/nsswitch.conf
+
+	sed "s/compat/files/g" /etc/nsswitch.conf > ${TEMP}/initramfs-dropbear-temp/etc/nsswitch.conf || gen_die "failed to modify /etc/nsswitch.conf"
 	echo "root:x:0:0:root:/root:/bin/login-remote.sh" > ${TEMP}/initramfs-dropbear-temp/etc/passwd
 	echo "/bin/login-remote.sh" > ${TEMP}/initramfs-dropbear-temp/etc/shells
 	echo "root:!:0:0:99999:7:::" > ${TEMP}/initramfs-dropbear-temp/etc/shadow
@@ -739,10 +754,10 @@ append_dropbear(){
 	chmod 0644 ${TEMP}/initramfs-dropbear-temp/etc/group
 	mkfifo ${TEMP}/initramfs-dropbear-temp/etc/dropbear/fifo_root
 	mkfifo ${TEMP}/initramfs-dropbear-temp/etc/dropbear/fifo_swap
-	
+
 	copy_binaries "${TEMP}"/initramfs-dropbear-temp/ /usr/sbin/dropbear \
 		/bin/login /usr/bin/passwd
-	
+
 	log_future_cpio_content
 	cd "${TEMP}"/initramfs-dropbear-temp \
 		|| gen_die "cd '${TEMP}/initramfs-dropbear-temp' failed"

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

[Thomas Deutschmann]

commit:     ad81cac6c150d4ba0136520812f95f508a81d5cd
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 02:20:52 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 02:20:52 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ad81cac6

Make "--[no-]ssh" parameter work

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index cdd6f2a..5b4a240 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -116,6 +116,7 @@ determine_real_args() {
 	set_config_with_override BOOL   SYMLINK              CMD_SYMLINK
 	set_config_with_override STRING INSTALL_MOD_PATH     CMD_INSTALL_MOD_PATH
 	set_config_with_override BOOL   OLDCONFIG            CMD_OLDCONFIG
+	set_config_with_override BOOL   SSH                  CMD_SSH                  "no"
 	set_config_with_override BOOL   LVM                  CMD_LVM
 	set_config_with_override BOOL   DMRAID               CMD_DMRAID
 	set_config_with_override BOOL   ISCSI                CMD_ISCSI

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

[Thomas Deutschmann]

commit:     90144963e0f58b4f507ee023809fb7197a047fcd
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 21:29:15 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 21:29:15 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=90144963

determine_config_file(): reformat code

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 5d4bf23..3b27f6c 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -24,7 +24,9 @@ determine_config_file() {
 	then
 		gen_die 'Error: No kernel .config specified, or file not found!'
 	fi
-    KERNEL_CONFIG="$(readlink -f "${KERNEL_CONFIG}")"
+
+	KERNEL_CONFIG="$(readlink -f "${KERNEL_CONFIG}")"
+
 	# Validate the symlink result if any
 	if [ ! -f "${KERNEL_CONFIG}" ]
 	then

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

[Thomas Deutschmann]

commit:     279f32b6633d8c7b62ef23997387dbb0c61075bf
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 21:34:01 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 21:34:01 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=279f32b6

Prepare for next release

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

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

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

[Thomas Deutschmann]

commit:     8cee82adefe53c37caaa89ee40b5f716f1575570
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 22:12:06 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 05:25:38 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8cee82ad

config_kernel(): don't run 'make clean' when we will also run 'make mrproper'

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 3b27f6c..b115344 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -38,39 +38,55 @@ config_kernel() {
 	determine_config_file
 	cd "${KERNEL_DIR}" || gen_die 'Could not switch to the kernel directory!'
 
+	print_info 1 "kernel: >> Initializing..."
+
+	if isTrue "${CLEAN}" && isTrue "${MRPROPER}"
+	then
+		print_info 1 "$(getIndent 1)>> Skipping 'make clean' -- will run 'make mrproper' later"
+	elif isTrue "${CLEAN}" && ! isTrue "${MRPROPER}"
+	then
+		print_info 1 "$(getIndent 1)>> Cleaning..."
+		compile_generic clean kernel
+	else
+		print_info 1 "$(getIndent 1)>> --clean is disabled; not running 'make clean'."
+	fi
+
 	if isTrue "${MRPROPER}"
 	then
 		# Backup current kernel .config
 		if [ -f "${KERNEL_OUTPUTDIR}/.config" ]
 		then
 			# Current .config is different then one we are going to use
-			if ! diff -q "${KERNEL_OUTPUTDIR}"/.config ${KERNEL_CONFIG}
+			if ! diff -q "${KERNEL_OUTPUTDIR}"/.config "${KERNEL_CONFIG}" > /dev/null
 			then
 				NOW=`date +--%Y-%m-%d--%H-%M-%S`
 				cp "${KERNEL_OUTPUTDIR}/.config" "${KERNEL_OUTPUTDIR}/.config${NOW}.bak" \
 					|| gen_die "Could not backup kernel config (${KERNEL_OUTPUTDIR}/.config)"
-				print_info 1 "$(getIndent 1)Previous config backed up to .config${NOW}.bak"
+				print_info 1 "$(getIndent 1)>> Previous config backed up to .config${NOW}.bak"
 			fi
 		fi
-		print_info 1 "kernel: Using config from ${KERNEL_CONFIG}"
+
 		print_info 1 "$(getIndent 1)>> Running mrproper..."
 		compile_generic mrproper kernel
 	else
 		if [ -f "${KERNEL_OUTPUTDIR}/.config" ]
 		then
-			print_info 1 "kernel: Using config from ${KERNEL_OUTPUTDIR}/.config"
+			print_info 1 "$(getIndent 1)>> Using config from ${KERNEL_OUTPUTDIR}/.config"
 		else
-			print_info 1 "kernel: Using config from ${KERNEL_CONFIG}"
+			print_info 1 "$(getIndent 1)>> Using config from ${KERNEL_CONFIG}"
 		fi
-		print_info 1 "kernel: --mrproper is disabled; not running 'make mrproper'."
+		print_info 1 "$(getIndent 1)>> --mrproper is disabled; not running 'make mrproper'."
 	fi
 
 	# 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_OUTPUTDIR}/.config" ]
 	then
+		print_info 1 "$(getIndent 1)>> Using config from ${KERNEL_CONFIG}"
+
 		local message='Could not copy configuration file!'
-		if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then
+		if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]
+		then
 			# Support --kernel-config=/proc/config.gz, mainly
 			zcat "${KERNEL_CONFIG}" > "${KERNEL_OUTPUTDIR}/.config" || gen_die "${message}"
 		else
@@ -83,14 +99,7 @@ config_kernel() {
 		print_info 1 "$(getIndent 1)>> Running oldconfig..."
 		yes '' 2>/dev/null | compile_generic oldconfig kernel 2>/dev/null
 	else
-		print_info 1 "$(getIndent 1)--oldconfig is disabled; not running 'make oldconfig'."
-	fi
-	if isTrue "${CLEAN}"
-	then
-		print_info 1 "$(getIndent 1)>> Cleaning..."
-		compile_generic clean kernel
-	else
-		print_info 1 "$(getIndent 1)--clean is disabled; not running 'make clean'."
+		print_info 1 "$(getIndent 1)>> --oldconfig is disabled; not running 'make oldconfig'."
 	fi
 
 	local add_config

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

[Thomas Deutschmann]

commit:     5b1e15a3b503253b26a931fa7907d175cb3e08fd
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 03:41:58 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 07:12:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5b1e15a3

config_kernel(): rewrite --lvm handling

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 27704cf..719f055 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -184,9 +184,10 @@ config_kernel() {
 		*) cfg_CONFIG_BLK_DEV_DM=${newcfg_setting}
 	esac
 
-	# Make sure lvm modules are on if --lvm
+	# Make sure lvm modules are enabled in the kernel, if --lvm
 	if isTrue "${CMD_LVM}"
 	then
+		print_info 1 "$(getIndent 1)>> Ensure that required kernel options for LVM support are set..."
 		cfg_CONFIG_DM_SNAPSHOT=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_SNAPSHOT")
 		case "$cfg_CONFIG_DM_SNAPSHOT" in
 			y|m) ;; # Do nothing
@@ -197,9 +198,12 @@ config_kernel() {
 			y|m) ;; # Do nothing
 			*) cfg_CONFIG_DM_MIRROR=${newcfg_setting}
 		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLOCK" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MD" "y"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_SNAPSHOT" "${cfg_CONFIG_DM_SNAPSHOT}"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MIRROR" "${cfg_CONFIG_DM_MIRROR}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FILE_LOCKING" "y"
 	fi
 
 	# Multipath

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

[Thomas Deutschmann]

commit:     56589b38d7d6c6ff07eac8dd23195a58cdcb4190
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 07:06:28 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 07:12:05 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=56589b38

get_KV(): export KV_MAJOR & KV_MINOR

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 5b4a240..1b4a08b 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -63,6 +63,9 @@ get_KV() {
 			KV=${VER}.${PAT}.${SUB}${EXV}${LCV}
 		fi
 	fi
+
+	KV_MAJOR=$(echo $KV | cut -f1 -d.)
+	KV_MINOR=$(echo $KV | cut -f2 -d.)
 }
 
 determine_real_args() {

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

[Thomas Deutschmann]

commit:     96f9bf6c921591e8ada22945029b50637e974567
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 03:40:05 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 07:12:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=96f9bf6c

config_kernel(): rewrite CONFIG_MODULE handling

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index a8627b4..27704cf 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -149,21 +149,26 @@ config_kernel() {
 
 	# Do we support modules at all?
 	cfg_CONFIG_MODULES=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MODULES")
-	if isTrue "$cfg_CONFIG_MODULES" ; then
+	if isTrue "${cfg_CONFIG_MODULES}"
+	then
 		# yes, we support modules, set 'm' for new stuff.
 		newcfg_setting='m'
 		# Compare the kernel module compression vs the depmod module compression support
 		# WARNING: if the buildhost has +XZ but the target machine has -XZ, you will get failures!
 		cfg_CONFIG_MODULE_COMPRESS_GZIP=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MODULE_COMPRESS_GZIP")
 		cfg_CONFIG_MODULE_COMPRESS_XZ=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MODULE_COMPRESS_XZ")
-		if isTrue "${cfg_CONFIG_MODULE_COMPRESS_GZIP}"; then
+		if isTrue "${cfg_CONFIG_MODULE_COMPRESS_GZIP}"
+		then
 			depmod_GZIP=$(/sbin/depmod -V | tr ' ' '\n' | awk '/ZLIB/{print $1; exit}')
-			if [[ "${depmod_GZIP}" != "+ZLIB" ]]; then
+			if [[ "${depmod_GZIP}" != "+ZLIB" ]]
+			then
 				gen_die 'depmod does not support ZLIB/GZIP, cannot build with CONFIG_MODULE_COMPRESS_GZIP'
 			fi
-		elif isTrue "${cfg_CONFIG_MODULE_COMPRESS_XZ}" ; then
+		elif isTrue "${cfg_CONFIG_MODULE_COMPRESS_XZ}"
+		then
 			depmod_XZ=$(/sbin/depmod -V | tr ' ' '\n' | awk '/XZ/{print $1; exit}')
-			if [[ "${depmod_XZ}" != "+XZ" ]]; then
+			if [[ "${depmod_XZ}" != "+XZ" ]]
+			then
 				gen_die 'depmod does not support XZ, cannot build with CONFIG_MODULE_COMPRESS_XZ'
 			fi
 		fi

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

[Thomas Deutschmann]

commit:     75c080f5bb346bf61d39614dac249fc4c8a1e38c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 03:48:04 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 07:12:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=75c080f5

config_kernel(): rewrite --iscsi handling

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 2bf0cc7..16662f6 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -236,10 +236,9 @@ config_kernel() {
 	fi
 
 	# Make sure iSCSI modules are enabled in the kernel, if --iscsi
-	# CONFIG_SCSI_ISCSI_ATTRS
-	# CONFIG_ISCSI_TCP
 	if isTrue "${CMD_ISCSI}"
 	then
+		print_info 1 "$(getIndent 1)>> Ensure that required kernel options for iSCSI support are set..."
 		cfg_CONFIG_ISCSI_BOOT_SYSFS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_BOOT_SYSFS")
 		case "$cfg_CONFIG_ISCSI_BOOT_SYSFS" in
 			y|m) ;; # Do nothing
@@ -255,6 +254,17 @@ config_kernel() {
 			y|m) ;; # Do nothing
 			*) cfg_CONFIG_SCSI_ISCSI_ATTRS=${newcfg_setting}
 		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_NET" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INET" "y"
+
+		cfg_CONFIG_SCSI=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI")
+		case "${cfg_CONFIG_SCSI}" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_SCSI=${newcfg_setting}
+		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI" "${cfg_CONFIG_SCSI}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_LOWLEVEL" "y"
+
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_BOOT_SYSFS" "${cfg_CONFIG_ISCSI_BOOT_SYSFS}"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_TCP" "${cfg_CONFIG_ISCSI_TCP}"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_ISCSI_ATTRS" "${cfg_CONFIG_SCSI_ISCSI_ATTRS}"

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

[Thomas Deutschmann]

commit:     ccaffdee5d396bd4756559b7cab4c0bceb6c8b9b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 03:44:25 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 07:12:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ccaffdee

config_kernel(): rewrite --dmraid handling

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index b0faeeb..2bf0cc7 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -226,9 +226,12 @@ config_kernel() {
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH" "${cfg_CONFIG_DM_MULTIPATH}"
 	fi
 
-	# Make sure dmraid modules are on if --dmraid
+	# Make sure dmraid modules are enabled in the kernel, if --dmraid
 	if isTrue "${CMD_DMRAID}"
 	then
+		print_info 1 "$(getIndent 1)>> Ensure that required kernel options for DMRAID support are set..."
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLOCK" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MD" "y"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}"
 	fi
 

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

[Thomas Deutschmann]

commit:     146de30d358d92a10bab9888898e43735baf4af2
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 03:34:40 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 05:25:45 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=146de30d

kconfig_set_opt(): add possibility to add new kernel options

Bug: https://bugs.gentoo.org/669412
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index b105d64..95c8f30 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -570,7 +570,24 @@ function kconfig_set_opt() {
 	kconfig="$1"
 	optname="$2"
 	optval="$3"
-	sed -i "${kconfig}" \
-		-e "s/^#\? \?${optname}[ =].*/${optname}=${optval}/g" \
-	|| gen_die "Failed to set ${optname}=${optval} in $kconfig"
+
+	curropt=$(grep -E "^#? ?${optname}[ =].*$" "${kconfig}")
+	if [[ -z "${curropt}" ]]
+	then
+		print_info 2 "$(getIndent 2) - Adding option '${optname}' with value '${optval}' to '${kconfig}'..."
+		echo "${optname}=${optval}" >> "${kconfig}" ||
+			gen_die "Failed to add '${optname}=${optval}' to '$kconfig'"
+
+		[ ! -f "${TEMP}/.kconfig_modified" ] && touch "${TEMP}/.kconfig_modified"
+	elif [[ "${curropt}" != "*#*" && "${curropt#*=}" == "${optval}" ]]
+	then
+		print_info 2 "$(getIndent 2) - Option '${optname}=${optval}' already exists in '${kconfig}'; Skipping..."
+	else
+		print_info 2 "$(getIndent 2) - Setting option '${optname}' to '${optval}' in '${kconfig}'..."
+		sed -i "${kconfig}" \
+			-e "s/^#\? \?${optname}[ =].*/${optname}=${optval}/g" ||
+				gen_die "Failed to set '${optname}=${optval}' in '$kconfig'"
+
+		[ ! -f "${TEMP}/.kconfig_modified" ] && touch "${TEMP}/.kconfig_modified"
+	fi
 }

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

[Thomas Deutschmann]

commit:     ea29977b438633337a5ef69d8be318c038fd96b6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 03:39:06 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 07:12:05 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ea29977b

config_kernel(): rewrite --genzimage handling

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index b115344..a8627b4 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -127,8 +127,24 @@ config_kernel() {
 	# Force this on if we are using --genzimage
 	if isTrue "${CMD_GENZIMAGE}"
 	then
+		print_info 1 "$(getIndent 1)>> Ensure that required kernel options for --genzimage are set..."
 		# Make sure Ext2 support is on...
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT2_FS" "y"
+		cfg_CONFIG_EXT2_FS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT2_FS")
+		if ! isTrue "${cfg_CONFIG_EXT2_FS}"
+		then
+			cfg_CONFIG_EXT4_USE_FOR_EXT2=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT4_USE_FOR_EXT2")
+			if ! isTrue "${cfg_CONFIG_EXT4_USE_FOR_EXT2}"
+			then
+				cfg_CONFIG_EXT4_FS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT4_FS")
+				if isTrue "${cfg_CONFIG_EXT4_FS}"
+				then
+					kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT4_USE_FOR_EXT2" "y"
+				else
+					kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLOCK" "y"
+					kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT2_FS" "y"
+				fi
+			fi
+		fi
 	fi
 
 	# Do we support modules at all?

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

[Thomas Deutschmann]

commit:     01237a2d28e1dfdbf910ecf1da342abe8cfc9408
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 03:43:58 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 07:12:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=01237a2d

config_kernel(): rewrite --multipath handling

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 719f055..b0faeeb 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -206,9 +206,10 @@ config_kernel() {
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FILE_LOCKING" "y"
 	fi
 
-	# Multipath
+	# Make sure multipath modules are enabled in the kernel, if --multipath
 	if isTrue "${CMD_MULTIPATH}"
 	then
+		print_info 1 "$(getIndent 1)>> Ensure that required kernel options for multipath support are set..."
 		cfg_CONFIG_DM_MULTIPATH=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH")
 		case "$cfg_CONFIG_DM_MULTIPATH" in
 			y|m) ;; # Do nothing
@@ -219,9 +220,10 @@ config_kernel() {
 			y|m) ;; # Do nothing
 			*) cfg_CONFIG_DM_MULTIPATH_RDAC=${newcfg_setting}
 		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLOCK" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MD" "y"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH" "${cfg_CONFIG_DM_MULTIPATH}"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH_RDAC" "${cfg_CONFIG_DM_MULTIPATH_RDAC}"
 	fi
 
 	# Make sure dmraid modules are on if --dmraid

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

[Thomas Deutschmann]

commit:     8ade87f50689f725e66548fedbe436c5f642c330
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 03:51:55 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 07:12:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8ade87f5

config_kernel(): rewrite --splash handling

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index e80efa8..898bbdd 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -393,9 +393,15 @@ config_kernel() {
 			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_TSCPAGE" "y"
 	fi
 
+	# Make sure kernel supports Splash, if --splash
 	if isTrue "${SPLASH}"
 	then
+		print_info 1 "$(getIndent 1)>> Ensure that required kernel options for Splash support are set..."
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB_SPLASH" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VT" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_TTY" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FRAMEBUFFER_CONSOLE" "y"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB_CON_DECOR" "y"
 	fi
 

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

[Thomas Deutschmann]

commit:     8336c562cba2e5e5132ad4bcb3eea34278df9e04
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 03:51:03 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 07:12:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8336c562

config_kernel(): rewrite --hyperv handling

Fixes: https://bugs.gentoo.org/669412
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 130 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 119 insertions(+), 11 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 16662f6..e80efa8 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -270,19 +270,127 @@ config_kernel() {
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_ISCSI_ATTRS" "${cfg_CONFIG_SCSI_ISCSI_ATTRS}"
 	fi
 
-	# Make sure HyperV modules are enabled in the kernel, if --hyperv
+	# Make sure Hyper-V modules are enabled in the kernel, if --hyperv
 	if isTrue "${CMD_HYPERV}"
 	then
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV" "y"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_UTILS" "y"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_BALLOON" "y"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_STORAGE" "y"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_NET" "y"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_KEYBOARD" "y"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_PCI_HYPERV" "y"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB_HYPERV" "y"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HID_HYPERV_MOUSE" "y"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_UIO_HV_GENERIC" "y"
+		print_info 1 "$(getIndent 1)>> Ensure that required kernel options for Hyper-V support are set..."
+		# Hyper-V deps
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_X86" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_PCI" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ACPI" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_X86_LOCAL_APIC" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERVISOR_GUEST" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_NET" "y"
+
+		cfg_CONFIG_CONNECTOR=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CONNECTOR")
+		case "${cfg_CONFIG_CONNECTOR}" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_CONNECTOR=${newcfg_setting}
+		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CONNECTOR" "${cfg_CONFIG_CONNECTOR}"
+
+		cfg_CONFIG_NLS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_NLS")
+		case "${cfg_CONFIG_NLS}" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_NLS=${newcfg_setting}
+		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_NLS" "${cfg_CONFIG_NLS}"
+
+		cfg_CONFIG_SCSI=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI")
+		case "${cfg_CONFIG_SCSI}" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_SCSI=${newcfg_setting}
+		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI" "${cfg_CONFIG_SCSI}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_LOWLEVEL" "y"
+
+		cfg_CONFIG_SCSI_FC_ATTRS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_FC_ATTRS")
+		case "${cfg_CONFIG_SCSI_FC_ATTRS}" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_SCSI_FC_ATTRS=${newcfg_setting}
+		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_FC_ATTRS" "${cfg_CONFIG_SCSI_FC_ATTRS}"
+
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_NETDEVICES" "y"
+
+		cfg_CONFIG_SERIO=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SERIO")
+		case "${cfg_CONFIG_SERIO}" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_SERIO=${newcfg_setting}
+		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SERIO" "${cfg_CONFIG_SERIO}"
+
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_PCI_MSI" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_PCI_MSI_IRQ_DOMAIN" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_X86_64" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HAS_IOMEM" "y"
+
+		cfg_CONFIG_FB=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB")
+		case "${cfg_CONFIG_FB}" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_FB=${newcfg_setting}
+		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB" "${cfg_CONFIG_FB}"
+
+		cfg_CONFIG_INPUT=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INPUT")
+		case "${cfg_CONFIG_INPUT}" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_INPUT=${newcfg_setting}
+		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INPUT" "${cfg_CONFIG_INPUT}"
+
+		cfg_CONFIG_HID=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HID")
+		case "${cfg_CONFIG_HID}" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_HID=${newcfg_setting}
+		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HID" "${cfg_CONFIG_HID}"
+
+		cfg_CONFIG_UIO=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_UIO")
+		case "${cfg_CONFIG_UIO}" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_UIO=${newcfg_setting}
+		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_UIO" "${cfg_CONFIG_UIO}"
+
+		# Hyper-V modules, activate in order!
+		cfg_CONFIG_HYPERV=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV")
+		case "$cfg_CONFIG_HYPERV" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_HYPERV=${newcfg_setting}
+		esac
+
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV" "${cfg_CONFIG_HYPERV}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_UTILS" "${cfg_CONFIG_HYPERV}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_BALLOON" "${cfg_CONFIG_HYPERV}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_STORAGE" "${cfg_CONFIG_HYPERV}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_NET" "${cfg_CONFIG_HYPERV}"
+
+		if [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4014 ]
+		then
+			cfg_CONFIG_VSOCKETS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VSOCKETS")
+			case "${cfg_CONFIG_VSOCKETS}" in
+				y|m) ;; # Do nothing
+				*) cfg_CONFIG_VSOCKETS=${newcfg_setting}
+			esac
+			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VSOCKETS" "${cfg_CONFIG_VSOCKETS}"
+
+			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_VSOCKETS" "${cfg_CONFIG_HYPERV}"
+		fi
+
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_KEYBOARD" "${cfg_CONFIG_HYPERV}"
+
+		[ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4006 ] &&
+			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_PCI_HYPERV" "${cfg_CONFIG_HYPERV}"
+
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB_HYPERV" "${cfg_CONFIG_HYPERV}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HID_HYPERV_MOUSE" "${cfg_CONFIG_HYPERV}"
+
+		[ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4010 ] &&
+			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_UIO_HV_GENERIC" "${cfg_CONFIG_HYPERV}"
+
+		[ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4012 ] &&
+			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_TSCPAGE" "y"
 	fi
 
 	if isTrue "${SPLASH}"

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

[Thomas Deutschmann]

commit:     9fd158f30aa39cc74883ab7951a78e857eddd217
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 06:09:26 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 08:04:04 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9fd158f3

genkernel.conf: Clearify CLEAN configuration option

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/genkernel.conf b/genkernel.conf
index 74e4b04..3504b26 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -25,15 +25,14 @@
 # Run 'make xconfig' before compiling this kernel
 #XCONFIG="no"
 
-# Run 'make clean' before compilation
-# If set to NO, implies MRPROPER WILL NOT be run
-# Also, if clean is NO, it won't copy over any configuration
-# file, it will use what's there.
-#CLEAN="yes"
-
-# Run 'make mrproper' before configuration/compilation
+# Run 'make mrproper' before compiling this kernel
 #MRPROPER="yes"
 
+# Run 'make clean' before compiling this kernel
+# Only needed if MRPROPER is set to NO because
+# MRPROPER implies 'make clean'.
+#CLEAN="yes"
+
 # Override the arch detection
 #ARCH_OVERRIDE="x86"
 

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

[Thomas Deutschmann]

commit:     ce40b55a84742a694ad8a02503fbc980e8ff8a63
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 06:04:25 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 08:04:04 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ce40b55a

Initialize booleans with their default value for clarity

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 62 ++++++++++++++++++++++++++--------------------------
 genkernel.conf       | 20 ++++++++---------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 1b4a08b..e955540 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -99,58 +99,58 @@ determine_real_args() {
 
 	set_config_with_override BOOL   SPLASH               CMD_SPLASH               "no"
 	set_config_with_override BOOL   CLEAR_CACHEDIR       CMD_CLEAR_CACHEDIR       "no"
-	set_config_with_override BOOL   POSTCLEAR            CMD_POSTCLEAR
-	set_config_with_override BOOL   MRPROPER             CMD_MRPROPER
-	set_config_with_override BOOL   MENUCONFIG           CMD_MENUCONFIG
-	set_config_with_override BOOL   GCONFIG              CMD_GCONFIG
-	set_config_with_override BOOL   NCONFIG              CMD_NCONFIG
-	set_config_with_override BOOL   XCONFIG              CMD_XCONFIG
-	set_config_with_override BOOL   CLEAN                CMD_CLEAN
+	set_config_with_override BOOL   POSTCLEAR            CMD_POSTCLEAR            "no"
+	set_config_with_override BOOL   MRPROPER             CMD_MRPROPER             "yes"
+	set_config_with_override BOOL   MENUCONFIG           CMD_MENUCONFIG           "no"
+	set_config_with_override BOOL   GCONFIG              CMD_GCONFIG              "no"
+	set_config_with_override BOOL   NCONFIG              CMD_NCONFIG              "no"
+	set_config_with_override BOOL   XCONFIG              CMD_XCONFIG              "no"
+	set_config_with_override BOOL   CLEAN                CMD_CLEAN                "yes"
 
 	set_config_with_override STRING MINKERNPACKAGE       CMD_MINKERNPACKAGE
 	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
+	set_config_with_override BOOL   RAMDISKMODULES       CMD_RAMDISKMODULES       "yes"
+	set_config_with_override BOOL   ALLRAMDISKMODULES    CMD_ALLRAMDISKMODULES    "no"
 	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
-	set_config_with_override BOOL   SAVE_CONFIG          CMD_SAVE_CONFIG
-	set_config_with_override BOOL   SYMLINK              CMD_SYMLINK
+	set_config_with_override BOOL   MOUNTBOOT            CMD_MOUNTBOOT            "yes"
+	set_config_with_override BOOL   BUILD_STATIC         CMD_STATIC               "no"
+	set_config_with_override BOOL   SAVE_CONFIG          CMD_SAVE_CONFIG          "yes"
+	set_config_with_override BOOL   SYMLINK              CMD_SYMLINK              "no"
 	set_config_with_override STRING INSTALL_MOD_PATH     CMD_INSTALL_MOD_PATH
-	set_config_with_override BOOL   OLDCONFIG            CMD_OLDCONFIG
+	set_config_with_override BOOL   OLDCONFIG            CMD_OLDCONFIG            "yes"
 	set_config_with_override BOOL   SSH                  CMD_SSH                  "no"
-	set_config_with_override BOOL   LVM                  CMD_LVM
-	set_config_with_override BOOL   DMRAID               CMD_DMRAID
-	set_config_with_override BOOL   ISCSI                CMD_ISCSI
-	set_config_with_override BOOL   HYPERV               CMD_HYPERV
+	set_config_with_override BOOL   LVM                  CMD_LVM                  "no"
+	set_config_with_override BOOL   DMRAID               CMD_DMRAID               "no"
+	set_config_with_override BOOL   ISCSI                CMD_ISCSI                "no"
+	set_config_with_override BOOL   HYPERV               CMD_HYPERV               "no"
 	set_config_with_override STRING BOOTLOADER           CMD_BOOTLOADER           "no"
 	set_config_with_override BOOL   BUSYBOX              CMD_BUSYBOX              "yes"
 	set_config_with_override BOOL   NFS                  CMD_NFS                  "yes"
 	set_config_with_override STRING MICROCODE            CMD_MICROCODE            "all"
 	set_config_with_override BOOL   MICROCODE_INITRAMFS  CMD_MICROCODE_INITRAMFS  "yes"
-	set_config_with_override BOOL   UNIONFS              CMD_UNIONFS
-	set_config_with_override BOOL   NETBOOT              CMD_NETBOOT
+	set_config_with_override BOOL   UNIONFS              CMD_UNIONFS              "no"
+	set_config_with_override BOOL   NETBOOT              CMD_NETBOOT              "no"
 	set_config_with_override STRING REAL_ROOT            CMD_REAL_ROOT
-	set_config_with_override BOOL   DISKLABEL            CMD_DISKLABEL
-	set_config_with_override BOOL   LUKS                 CMD_LUKS
-	set_config_with_override BOOL   GPG                  CMD_GPG
-	set_config_with_override BOOL   MDADM                CMD_MDADM
+	set_config_with_override BOOL   DISKLABEL            CMD_DISKLABEL            "yes"
+	set_config_with_override BOOL   LUKS                 CMD_LUKS                 "no"
+	set_config_with_override BOOL   GPG                  CMD_GPG                  "no"
+	set_config_with_override BOOL   MDADM                CMD_MDADM                "no"
 	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                  "$(rootfs_type_is zfs)"
 	set_config_with_override BOOL   BTRFS                CMD_BTRFS                "$(rootfs_type_is btrfs)"
-	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 BOOL   VIRTIO               CMD_VIRTIO               "no"
+	set_config_with_override BOOL   MULTIPATH            CMD_MULTIPATH            "no"
+	set_config_with_override BOOL   FIRMWARE             CMD_FIRMWARE             "no"
 	set_config_with_override STRING FIRMWARE_DIR         CMD_FIRMWARE_DIR         "/lib/firmware"
 	set_config_with_override STRING FIRMWARE_FILES       CMD_FIRMWARE_FILES
 	set_config_with_override BOOL   FIRMWARE_INSTALL     CMD_FIRMWARE_INSTALL     "no"
-	set_config_with_override BOOL   INTEGRATED_INITRAMFS CMD_INTEGRATED_INITRAMFS
-	set_config_with_override BOOL   WRAP_INITRD          CMD_WRAP_INITRD
-	set_config_with_override BOOL   GENZIMAGE            CMD_GENZIMAGE
+	set_config_with_override BOOL   INTEGRATED_INITRAMFS CMD_INTEGRATED_INITRAMFS "no"
+	set_config_with_override BOOL   WRAP_INITRD          CMD_WRAP_INITRD          "no"
+	set_config_with_override BOOL   GENZIMAGE            CMD_GENZIMAGE            "no"
 	set_config_with_override BOOL   KEYMAP               CMD_KEYMAP               "yes"
-	set_config_with_override BOOL   DOKEYMAPAUTO         CMD_DOKEYMAPAUTO
+	set_config_with_override BOOL   DOKEYMAPAUTO         CMD_DOKEYMAPAUTO         "no"
 	set_config_with_override STRING BUSYBOX_CONFIG       CMD_BUSYBOX_CONFIG
 	set_config_with_override STRING STRIP_TYPE           CMD_STRIP_TYPE           "modules"
 	set_config_with_override BOOL   INSTALL              CMD_INSTALL              "yes"

diff --git a/genkernel.conf b/genkernel.conf
index 4574f7c..74e4b04 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -11,41 +11,41 @@
 #INSTALL="yes"
 
 # Run 'make oldconfig' before compiling this kernel
-OLDCONFIG="yes"
+#OLDCONFIG="yes"
 
 # Run 'make menuconfig' before compiling this kernel
-MENUCONFIG="no"
+#MENUCONFIG="no"
 
 # Run 'make gconfig' before compiling this kernel
-GCONFIG="no"
+#GCONFIG="no"
 
 # Run 'make nconfig' (ncurses 'menuconfig') before compiling this kernel
-NCONFIG="no"
+#NCONFIG="no"
 
 # Run 'make xconfig' before compiling this kernel
-XCONFIG="no"
+#XCONFIG="no"
 
 # Run 'make clean' before compilation
 # If set to NO, implies MRPROPER WILL NOT be run
 # Also, if clean is NO, it won't copy over any configuration
 # file, it will use what's there.
-CLEAN="yes"
+#CLEAN="yes"
 
 # Run 'make mrproper' before configuration/compilation
-MRPROPER="yes"
+#MRPROPER="yes"
 
 # Override the arch detection
 #ARCH_OVERRIDE="x86"
 
 # Mount BOOTDIR automatically if it isn't mounted
-MOUNTBOOT="yes"
+#MOUNTBOOT="yes"
 
 # Make symlinks in BOOTDIR automatically
 #SYMLINK="no"
 
 # Save the new configuration in /etc/kernels upon
 # successfull compilation
-SAVE_CONFIG="yes"
+#SAVE_CONFIG="yes"
 
 # Enable color output in genkernel
 USECOLOR="yes"
@@ -140,7 +140,7 @@ USECOLOR="yes"
 #FIRMWARE_FILES=""
 
 # Add disklabel support (copies blkid to initramfs)
-DISKLABEL="yes"
+#DISKLABEL="yes"
 
 # Add new kernel to grub
 # Possible values: empty/"no", "grub", "grub2"

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

[Thomas Deutschmann]

commit:     f1ad7c2096dd405915a6cf21af4b8e58f4e41b3d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 03:52:54 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 08:03:52 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f1ad7c20

config_kernel(): rewrite --microcode handling

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 8d96838..a5266e4 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -529,17 +529,24 @@ config_kernel() {
 			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_DEV_VIRTIO" "${newvirtio_setting}"
 	fi
 
-	# Microcode setting, intended for early microcode loading
-	# needs to be compiled in.
-	kconfig_microcode_intel=(CONFIG_MICROCODE_INTEL CONFIG_MICROCODE_INTEL_EARLY)
-	kconfig_microcode_amd=(CONFIG_MICROCODE_AMD CONFIG_MICROCODE_AMD_EARLY)
+	# Microcode setting, intended for early microcode loading, if --microcode
 	if [[ -n "${MICROCODE}" ]]
 	then
-		kconfigs=(CONFIG_MICROCODE CONFIG_MICROCODE_OLD_INTERFACE CONFIG_MICROCODE_EARLY)
+		print_info 1 "$(getIndent 1)>> Ensure that required kernel options for early microcode loading support are set..."
+		kconfig_microcode_intel=(CONFIG_MICROCODE_INTEL CONFIG_MICROCODE_INTEL_EARLY)
+
+		kconfig_microcode_amd=(CONFIG_MICROCODE_AMD)
+		[ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -le 4003 ] && kconfig_microcode_amd+=(CONFIG_MICROCODE_AMD_EARLY)
+
+		kconfigs=(CONFIG_MICROCODE CONFIG_MICROCODE_OLD_INTERFACE)
+		[ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -le 4003 ] && kconfigs+=(CONFIG_MICROCODE_EARLY)
+
 		[[ "$MICROCODE" == all ]] && kconfigs+=( ${kconfig_microcode_amd[@]} ${kconfig_microcode_intel[@]} )
 		[[ "$MICROCODE" == amd ]] && kconfigs+=( ${kconfig_microcode_amd[@]} )
 		[[ "$MICROCODE" == intel ]] && kconfigs+=( ${kconfig_microcode_intel[@]} )
-		for k in "${kconfigs[@]}" ; do
+
+		for k in "${kconfigs[@]}"
+		do
 			cfg=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "$k")
 			case "$cfg" in
 				y) ;; # Do nothing

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

[Thomas Deutschmann]

commit:     fcf3076aef8396f394de82dd13b7a470753e2e97
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 07:53:35 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 08:05:23 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fcf3076a

config_kernel(): add sanity check for required options

Sometimes, genkernel modifies kernel config (.config), i.e. when
parameter like "--lvm", "--hyperv" or "--virtio" are set.

However, this can fail (for example if a required dependency is not set).

To avoid problems like an unbootable system, we check for required
options and error out if they are missing.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 69 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 51 insertions(+), 18 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 016d5b2..582d71f 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -124,6 +124,7 @@ config_kernel() {
 		[ "$?" ] || gen_die "Error: ${add_config} failed!"
 	fi
 
+	local -a required_kernel_options
 	[ -f "${TEMP}/.kconfig_modified" ] && rm "${TEMP}/.kconfig_modified"
 
 	# Force this on if we are using --genzimage
@@ -140,10 +141,12 @@ config_kernel() {
 				cfg_CONFIG_EXT4_FS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT4_FS")
 				if isTrue "${cfg_CONFIG_EXT4_FS}"
 				then
-					kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT4_USE_FOR_EXT2" "y"
+					kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT4_USE_FOR_EXT2" "y" &&
+						required_kernel_options+=(CONFIG_EXT4_USE_FOR_EXT2)
 				else
 					kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLOCK" "y"
-					kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT2_FS" "y"
+					kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT2_FS" "y" &&
+						required_kernel_options+=(CONFIG_EXT2_FS)
 				fi
 			fi
 		fi
@@ -202,10 +205,12 @@ config_kernel() {
 		esac
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLOCK" "y"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MD" "y"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}" &&
+			required_kernel_options+=(CONFIG_BLK_DEV_DM)
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_SNAPSHOT" "${cfg_CONFIG_DM_SNAPSHOT}"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MIRROR" "${cfg_CONFIG_DM_MIRROR}"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FILE_LOCKING" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FILE_LOCKING" "y" &&
+			required_kernel_options+=(CONFIG_FILE_LOCKING)
 	fi
 
 	# Make sure multipath modules are enabled in the kernel, if --multipath
@@ -224,8 +229,10 @@ config_kernel() {
 		esac
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLOCK" "y"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MD" "y"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH" "${cfg_CONFIG_DM_MULTIPATH}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}" &&
+			required_kernel_options+=(CONFIG_BLK_DEV_DM)
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH" "${cfg_CONFIG_DM_MULTIPATH}" &&
+			required_kernel_options+=(CONFIG_DM_MULTIPATH)
 	fi
 
 	# Make sure dmraid modules are enabled in the kernel, if --dmraid
@@ -234,7 +241,8 @@ config_kernel() {
 		print_info 1 "$(getIndent 1)>> Ensure that required kernel options for DMRAID support are set..."
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLOCK" "y"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MD" "y"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}" &&
+			required_kernel_options+=(CONFIG_BLK_DEV_DM)
 	fi
 
 	# Make sure iSCSI modules are enabled in the kernel, if --iscsi
@@ -267,9 +275,12 @@ config_kernel() {
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI" "${cfg_CONFIG_SCSI}"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_LOWLEVEL" "y"
 
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_BOOT_SYSFS" "${cfg_CONFIG_ISCSI_BOOT_SYSFS}"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_TCP" "${cfg_CONFIG_ISCSI_TCP}"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_ISCSI_ATTRS" "${cfg_CONFIG_SCSI_ISCSI_ATTRS}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_BOOT_SYSFS" "${cfg_CONFIG_ISCSI_BOOT_SYSFS}" &&
+			required_kernel_options+=(CONFIG_ISCSI_BOOT_SYSFS)
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_TCP" "${cfg_CONFIG_ISCSI_TCP}" &&
+			required_kernel_options+=(CONFIG_ISCSI_TCP)
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_ISCSI_ATTRS" "${cfg_CONFIG_SCSI_ISCSI_ATTRS}" &&
+			required_kernel_options+=(CONFIG_SCSI_ISCSI_ATTRS)
 	fi
 
 	# Make sure Hyper-V modules are enabled in the kernel, if --hyperv
@@ -362,11 +373,15 @@ config_kernel() {
 			*) cfg_CONFIG_HYPERV=${newcfg_setting}
 		esac
 
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV" "${cfg_CONFIG_HYPERV}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV" "${cfg_CONFIG_HYPERV}" &&
+			required_kernel_options+=(CONFIG_HYPERV)
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_UTILS" "${cfg_CONFIG_HYPERV}"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_BALLOON" "${cfg_CONFIG_HYPERV}"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_STORAGE" "${cfg_CONFIG_HYPERV}"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_NET" "${cfg_CONFIG_HYPERV}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_BALLOON" "${cfg_CONFIG_HYPERV}" &&
+			required_kernel_options+=(CONFIG_HYPERV_BALLOON)
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_STORAGE" "${cfg_CONFIG_HYPERV}" &&
+			required_kernel_options+=(CONFIG_HYPERV_STORAGE)
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_NET" "${cfg_CONFIG_HYPERV}" &&
+			required_kernel_options+=(CONFIG_HYPERV_NET)
 
 		if [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4014 ]
 		then
@@ -493,11 +508,15 @@ config_kernel() {
 		fi
 
 		# VirtIO modules, activate in order!
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO" "${newvirtio_setting}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO" "${newvirtio_setting}" &&
+			required_kernel_options+=(CONFIG_VIRTIO)
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_MENU" "y"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_VIRTIO" "${newvirtio_setting}"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_BLK" "${newvirtio_setting}"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_NET" "${newvirtio_setting}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_VIRTIO" "${newvirtio_setting}" &&
+			required_kernel_options+=(CONFIG_SCSI_VIRTIO)
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_BLK" "${newvirtio_setting}" &&
+			required_kernel_options+=(CONFIG_VIRTIO_BLK)
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_NET" "${newvirtio_setting}" &&
+			required_kernel_options+=(CONFIG_VIRTIO_NET)
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_PCI" "${newvirtio_setting}"
 
 		if [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4011 ]
@@ -556,6 +575,8 @@ config_kernel() {
 			esac
 			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "$k" "${cfg}"
 		done
+
+		required_kernel_options+=(CONFIG_MICROCODE)
 	fi
 
 	if [ -f "${TEMP}/.kconfig_modified" ]
@@ -571,4 +592,16 @@ config_kernel() {
 	else
 		print_info 2 "$(getIndent 1)>> genkernel did not need to add/modify any kernel options."
 	fi
+
+	print_info 2 "$(getIndent 1)>> checking for required kernel options..."
+	for required_kernel_option in "${required_kernel_options[@]}"
+	do
+		optval=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "${required_kernel_option}")
+		if [ -z "${optval}" ]
+		then
+			gen_die "something went wrong: Required kernel option '${required_kernel_option}' which genkernel tried to set is missing!"
+		else
+			print_info 2 "$(getIndent 2) - '${required_kernel_option}' is set to '${optval}'"
+		fi
+	done
 }

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

[Thomas Deutschmann]

commit:     3b835e6cab782647e122b0973aad4d910c789ad9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 03:52:30 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 08:03:46 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3b835e6c

config_kernel(): rewrite --virtio handling

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 147 +++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 118 insertions(+), 29 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 898bbdd..8d96838 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -405,39 +405,128 @@ config_kernel() {
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB_CON_DECOR" "y"
 	fi
 
-	# VirtIO
+	# Make sure VirtIO modules are enabled in the kernel, if --virtio
 	if isTrue "${CMD_VIRTIO}"
 	then
-		for k in \
-			CONFIG_VIRTIO \
-			CONFIG_VIRTIO_BALLOON \
-			CONFIG_VIRTIO_BLK \
-			CONFIG_VIRTIO_BLK_SCSI \
-			CONFIG_VIRTIO_CONSOLE \
-			CONFIG_VIRTIO_INPUT \
-			CONFIG_VIRTIO_MMIO \
-			CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES \
-			CONFIG_VIRTIO_NET \
-			CONFIG_VIRTIO_PCI \
-			CONFIG_VIRTIO_VSOCKETS \
-			\
-			CONFIG_BLK_MQ_VIRTIO \
-			CONFIG_CRYPTO_DEV_VIRTIO \
-			CONFIG_DRM_VIRTIO_GPU \
-			CONFIG_HW_RANDOM_VIRTIO \
-			CONFIG_PARAVIRT_GUEST \
-			CONFIG_SCSI_VIRTIO \
-			CONFIG_VHOST_NET \
-			\
-			CONFIG_FW_CFG_SYSFS \
-			; do
-			cfg___virtio_opt=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "$k")
-			case "$cfg___virtio_opt" in
+		print_info 1 "$(getIndent 1)>> Ensure that required kernel options for VirtIO support are set..."
+		# VirtIO deps
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLOCK" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_HW" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MMU" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_NET" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_PCI" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_NETDEVICES" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_NET_CORE" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HAS_IOMEM" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HAS_DMA" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_TTY" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_PARAVIRT_GUEST" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SYSFS" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HAS_IOPORT_MAP" "y"
+
+		cfg_CONFIG_SCSI=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI")
+		case "${cfg_CONFIG_SCSI}" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_SCSI=${newcfg_setting}
+		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI" "${cfg_CONFIG_SCSI}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_LOWLEVEL" "y"
+
+		cfg_CONFIG_DRM=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DRM")
+		case "${cfg_CONFIG_DRM}" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_DRM=${newcfg_setting}
+		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DRM" "${cfg_CONFIG_DRM}"
+
+		cfg_CONFIG_HW_RANDOM=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HW_RANDOM")
+		case "${cfg_CONFIG_HW_RANDOM}" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_HW_RANDOM=${newcfg_setting}
+		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HW_RANDOM" "${cfg_CONFIG_HW_RANDOM}"
+
+		cfg_CONFIG_INPUT=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INPUT")
+		case "${cfg_CONFIG_INPUT}" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_INPUT=${newcfg_setting}
+		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INPUT" "${cfg_CONFIG_INPUT}"
+
+		cfg_CONFIG_VHOST_NET=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VHOST_NET")
+		case "${cfg_CONFIG_VHOST_NET}" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_VHOST_NET=${newcfg_setting}
+		esac
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VHOST_NET" "${cfg_CONFIG_VHOST_NET}"
+
+		if [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4006 ]
+		then
+			cfg_CONFIG_FW_CFG_SYSFS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FW_CFG_SYSFS")
+			case "${cfg_CONFIG_FW_CFG_SYSFS}" in
 				y|m) ;; # Do nothing
-				*) cfg___virtio_opt='y'
+				*) cfg_CONFIG_FW_CFG_SYSFS=${newcfg_setting}
 			esac
-			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "$k" "${cfg___virtio_opt}"
-		done
+			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FW_CFG_SYSFS" "${cfg_CONFIG_FW_CFG_SYSFS}"
+		fi
+
+		cfg_CONFIG_VIRTIO=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO")
+		cfg_CONFIG_SCSI_VIRTIO=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_VIRTIO")
+		cfg_CONFIG_VIRTIO_BLK=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_BLK")
+		cfg_CONFIG_VIRTIO_NET=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_NET")
+		cfg_CONFIG_VIRTIO_PCI=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_PCI")
+		if \
+			isTrue "${cfg_CONFIG_VIRTIO}" || \
+			isTrue "${cfg_CONFIG_SCSI_VIRTIO}" || \
+			isTrue "${cfg_CONFIG_VIRTIO_BLK}" || \
+			isTrue "${cfg_CONFIG_VIRTIO_NET}" || \
+			isTrue "${cfg_CONFIG_VIRTIO_PCI}"
+		then
+			# If the user has configured VirtIO as built-in, we need to respect that.
+			newvirtio_setting="y"
+		else
+			newvirtio_setting=${newcfg_setting}
+		fi
+
+		# VirtIO modules, activate in order!
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO" "${newvirtio_setting}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_MENU" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_VIRTIO" "${newvirtio_setting}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_BLK" "${newvirtio_setting}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_NET" "${newvirtio_setting}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_PCI" "${newvirtio_setting}"
+
+		if [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4011 ]
+		then
+			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_BLK_SCSI" "y"
+			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_MQ_VIRTIO" "y"
+		fi
+
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_BALLOON" "${newvirtio_setting}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_CONSOLE" "${newvirtio_setting}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_INPUT" "${newvirtio_setting}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DRM_VIRTIO_GPU" "${newvirtio_setting}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HW_RANDOM_VIRTIO" "${newvirtio_setting}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_MMIO" "${newvirtio_setting}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES" "y"
+
+		if [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4008 ]
+		then
+			cfg_CONFIG_VSOCKETS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VSOCKETS")
+			case "${cfg_CONFIG_VSOCKETS}" in
+				y|m) ;; # Do nothing
+				*) cfg_CONFIG_VSOCKETS=${newcfg_setting}
+			esac
+			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VSOCKETS" "${cfg_CONFIG_VSOCKETS}"
+
+			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_VSOCKETS" "${newvirtio_setting}"
+			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_VSOCKETS_COMMON" "${newvirtio_setting}"
+		fi
+
+		[ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4010 ] &&
+			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_DEV_VIRTIO" "${newvirtio_setting}"
 	fi
 
 	# Microcode setting, intended for early microcode loading

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

[Thomas Deutschmann]

commit:     bae8d8db8d8a49279f214c90c36ea5b64a982622
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 05:22:42 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 08:03:58 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=bae8d8db

config_kernel(): run def/oldconfig when we have modified .config

This is needed to avoid a prompt if a newly added/modified kernel
config option adds additional option(s) not yet found in .config.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index a5266e4..016d5b2 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -124,6 +124,8 @@ config_kernel() {
 		[ "$?" ] || gen_die "Error: ${add_config} failed!"
 	fi
 
+	[ -f "${TEMP}/.kconfig_modified" ] && rm "${TEMP}/.kconfig_modified"
+
 	# Force this on if we are using --genzimage
 	if isTrue "${CMD_GENZIMAGE}"
 	then
@@ -555,4 +557,18 @@ config_kernel() {
 			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "$k" "${cfg}"
 		done
 	fi
+
+	if [ -f "${TEMP}/.kconfig_modified" ]
+	then
+		if isTrue "${OLDCONFIG}"
+		then
+			print_info 1 "$(getIndent 1)>> Re-running oldconfig due to changed kernel options..."
+			yes '' 2>/dev/null | compile_generic oldconfig kernel 2>/dev/null
+		else
+			print_info 1 "$(getIndent 1)>> Running olddefconfig due to changed kernel options..."
+			compile_generic olddefconfig kernel 2>/dev/null
+		fi
+	else
+		print_info 2 "$(getIndent 1)>> genkernel did not need to add/modify any kernel options."
+	fi
 }

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

[Thomas Deutschmann]

commit:     dcd1ace3f510c6dfb4a023a138f6918c0c942f6e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 08:16:50 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 08:16:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=dcd1ace3

genkernel: use "initramfs" instead of "initrd" in output for consistency

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/genkernel b/genkernel
index 1cb9d2d..c4ce4f8 100755
--- a/genkernel
+++ b/genkernel
@@ -310,7 +310,7 @@ then
 	# Compile initramfs
 	create_initramfs
 else
-	print_info 1 'initrd: Not building since only the kernel was requested...'
+	print_info 1 'initramfs: Not building since only the kernel was requested...'
 fi
 
 if isTrue "${INTEGRATED_INITRAMFS}"

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

[Thomas Deutschmann]

commit:     a8ee89ec7449c19ef0be7f21285d9d6762fa401b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 09:04:28 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 09:04:28 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a8ee89ec

append_base_layout(): create .initrd file in correct directory

Fixes: https://bugs.gentoo.org/653256
Signed-off-by: Thomas Deutschmann <whissi <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 a90668e..03e3d59 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -103,7 +103,7 @@ append_base_layout() {
 	mkdir -p ${TEMP}/initramfs-base-temp/temp
 	mkdir -p ${TEMP}/initramfs-base-temp/tmp
 	mkdir -p ${TEMP}/initramfs-base-temp/sys
-	mkdir -p ${TEMP}/initramfs-temp/.initrd
+	mkdir -p ${TEMP}/initramfs-base-temp/.initrd
 	mkdir -p ${TEMP}/initramfs-base-temp/var/lock/dmraid
 	mkdir -p ${TEMP}/initramfs-base-temp/sbin
 	mkdir -p ${TEMP}/initramfs-base-temp/usr/bin

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

[Thomas Deutschmann]

commit:     d333608c9489abfff00eb65cf7c072927b2b32e1
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 10:59:37 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 10:59:37 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d333608c

gen_package.sh: delete temp files only when DEBUGCLEANUP is not set

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_package.sh | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/gen_package.sh b/gen_package.sh
index bd137ad..d8ffac0 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -2,7 +2,8 @@
 # $Id$
 
 gen_minkernpackage() {
-	print_info 1 'Creating minimal kernel package'
+	print_info 1 ''
+	print_info 1 "Creating minimal kernel package in '${MINKERNPACKAGE}'..."
 	rm -rf "${TEMP}/minkernpackage" > /dev/null 2>&1
 	mkdir "${TEMP}/minkernpackage" || gen_die 'Could not make a directory for the kernel package!'
 	if [ "${KERNCACHE}" != "" ]
@@ -17,7 +18,7 @@ gen_minkernpackage() {
 			mv minkernpackage/{kernelz-${ARCH}-${KV},kernelz-${KNAME}-${ARCH}-${KV}}
 		fi
 		if [ ! -f minkernpackage/kernel-${KNAME}-${ARCH}-${KV} \
-		  -o ! -f minkernpackage/config-${KNAME}-${ARCH}-${KV} ];
+			-o ! -f minkernpackage/config-${KNAME}-${ARCH}-${KV} ];
 		then
 			gen_die "Cannot locate kernel binary"
 		fi
@@ -53,31 +54,37 @@ gen_minkernpackage() {
 
 	cd "${TEMP}/minkernpackage"
 	/bin/tar -jcpf ${MINKERNPACKAGE} * || gen_die 'Could not compress the kernel package!'
-	print_info 3 "Created minimal kernel package: $(readlink -f ${MINKERNPACKAGE})"
-	cd "${TEMP}" && rm -rf "${TEMP}/minkernpackage" > /dev/null 2>&1
+
+	cd "${TEMP}"
+	isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${TEMP}/minkernpackage" > /dev/null
+	return 0
 }
 
 gen_modulespackage() {
-	print_info 1 'Creating modules package'
+	print_info 1 ''
+	print_info 1 "Creating modules package in '${MODULESPACKAGE}'..."
 	rm -rf "${TEMP}/modulespackage" > /dev/null 2>&1
 	mkdir "${TEMP}/modulespackage" || gen_die 'Could not make a directory for the kernel package!'
 
 	if [ -d ${INSTALL_MOD_PATH}/lib/modules/${KV} ]
 	then
-	    mkdir -p ${TEMP}/modulespackage/lib/modules
-	    cp -r "${INSTALL_MOD_PATH}/lib/modules/${KV}" "${TEMP}/modulespackage/lib/modules"
-	    cd "${TEMP}/modulespackage"
-	    /bin/tar -jcpf ${MODULESPACKAGE} * || gen_die 'Could not compress the modules package!'
+		mkdir -p ${TEMP}/modulespackage/lib/modules
+		cp -r "${INSTALL_MOD_PATH}/lib/modules/${KV}" "${TEMP}/modulespackage/lib/modules"
+		cd "${TEMP}/modulespackage"
+		/bin/tar -jcpf ${MODULESPACKAGE} * || gen_die 'Could not compress the modules package!'
 	else
-	    print_info 1 "Could not create a modules package ${INSTALL_MOD_PATH}/lib/modules/${KV} was not found"
+		print_info 1 "Could not create modules package, '${INSTALL_MOD_PATH}/lib/modules/${KV}' was not found"
 	fi
-	print_info 3 "Created modules package: $(readlink -f ${MODULESPACKAGE})"
-	cd "${TEMP}" && rm -rf "${TEMP}/modulespackage" > /dev/null 2>&1
+
+	cd "${TEMP}"
+	isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${TEMP}/modulespackage" > /dev/null
+	return 0
 }
 
 gen_kerncache()
 {
-	print_info 1 'Creating kernel cache'
+	print_info 1 ''
+	print_info 1 "Creating kernel cache in '${KERNCACHE}'..."
 	rm -rf "${TEMP}/kerncache" > /dev/null 2>&1
 	mkdir "${TEMP}/kerncache" || gen_die 'Could not make a directory for the kernel cache!'
 
@@ -118,8 +125,10 @@ gen_kerncache()
 
 	cd "${TEMP}/kerncache"
 	/bin/tar -jcpf ${KERNCACHE} * || gen_die 'Could not compress the kernel package!'
-	print_info 3 "Created kernel cache: $(readlink -f ${KERNCACHE})"
-	cd "${TEMP}" && rm -rf "${TEMP}/kerncache" > /dev/null 2>&1
+
+	cd "${TEMP}"
+	isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${TEMP}/kerncache" > /dev/null
+	return 0
 }
 
 gen_kerncache_extract_kernel()

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

[Thomas Deutschmann]

commit:     ba8d7607b735d08eede975671edcc1e6d9b37345
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 09:48:59 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 09:48:59 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ba8d7607

create_initramfs(): add error checking sed call which ties to delete CONFIG_INITRAMFS_SOURCE

Bug: https://bugs.gentoo.org/656944
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 03e3d59..da5ffcf 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1110,7 +1110,9 @@ create_initramfs() {
 		# Explicitly do not compress if we are integrating into the kernel.
 		# 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_OUTPUTDIR}/.config
+		sed -i '/^.*CONFIG_INITRAMFS_SOURCE=.*$/d' "${KERNEL_OUTPUTDIR}/.config" ||
+			gen_die "failed to delete CONFIG_INITRAMFS_SOURCE from '${KERNEL_OUTPUTDIR}/.config'"
+
 		compress_config='INITRAMFS_COMPRESSION_NONE'
 		case ${compress_ext} in
 			gz)   compress_config='INITRAMFS_COMPRESSION_GZIP' ;;

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

[Thomas Deutschmann]

commit:     4e46cfcd6f50560a9e8c31163663940a99875e0c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 11:53:54 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 11:53:54 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4e46cfcd

ZFS: Change hostid handling

No need to deal with hostid value: We assume that /etc/hostid exists if ZFS
is used. So just copy that existing file.

If file is missing tell user that kernel command-line parameter "spl_hostid=<hostid>"
must be used. Same is true when generated initramfs is used for multiple systems.

Closes: https://bugs.gentoo.org/531192
Closes: https://bugs.gentoo.org/616738
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 26 ++++++++++++--------------
 genkernel        | 23 +++++++++++++++++++----
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index da5ffcf..7c41c2c 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -116,20 +116,6 @@ append_base_layout() {
 	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
 
-	# The ZFS tools want the hostid in order to find the right pool.
-	# Assume the initramfs we're building is for this system, so copy
-	# our current hostid into it.
-	# We also have to deal with binary+endianness here: glibc's gethostid
-	# expects the value to be in binary using the native endianness. But
-	# the coreutils hostid program doesn't show it in the right form.
-	local hostid
-	if file -L "${TEMP}/initramfs-base-temp/bin/sh" | grep -q 'MSB executable'; then
-		hostid="$(hostid)"
-	else
-		hostid="$(hostid | sed -E 's/(..)(..)(..)(..)/\4\3\2\1/')"
-	fi
-	printf "$(echo "${hostid}" | sed 's/\([0-9A-F]\{2\}\)/\\x\1/gI')" > ${TEMP}/initramfs-base-temp/etc/hostid
-
 	mkdir -p "${TEMP}/initramfs-base-temp/etc/mdev/helpers"
 	install -m 644 -t "${TEMP}/initramfs-base-temp/etc" /usr/share/genkernel/mdev/mdev.conf
 	install -m 755 -t "${TEMP}/initramfs-base-temp/etc/mdev/helpers" /usr/share/genkernel/mdev/helpers/nvme
@@ -516,6 +502,18 @@ append_zfs(){
 		fi
 	done
 
+	if [ -f "/etc/hostid" ]
+	then
+		local _hostid=$(hostid)
+		print_info 1 "$(getIndent 2)zfs: >> Embedding hostid '${_hostid}' into initramfs..."
+		cp -a /etc/hostid "${TEMP}/initramfs-zfs-temp/etc" 2> /dev/null \
+			|| gen_die "Failed to copy /etc/hostid"
+
+		echo "${_hostid}" > "${TEMP}/.embedded_hostid"
+	else
+		print_info 2 "$(getIndent 2)zfs: /etc/hostid not found; You must use 'spl_hostid' kernel command-line parameter!"
+	fi
+
 	copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zdb,zfs,zpool}
 
 	cd "${TEMP}/initramfs-zfs-temp/"

diff --git a/genkernel b/genkernel
index c4ce4f8..25e9ca9 100755
--- a/genkernel
+++ b/genkernel
@@ -363,10 +363,25 @@ then
 	isTrue "${DMRAID}" && print_warning 1 'add "dodmraid" for dmraid support'
 	isTrue "${MDADM}"  && print_warning 1 'add "domdadm" for MDRAID support'
 	isTrue "${DMRAID}" && print_warning 1 '	or "dodmraid=<additional options>"'
-	isTrue "${ZFS}"    && print_warning 1 'add "dozfs" for ZFS volume management support'
-	isTrue "${ZFS}"    && print_warning 1 '	and either "root=ZFS" to use bootfs autodetection or "root=ZFS=<dataset>" to force booting from a specific dataset'
-	isTrue "${ZFS}"    && print_warning 1 'If importing ZFS pool is slow, add dozfs=cache or dozfs=force to kernel commandline.'
-	isTrue "${ZFS}"    && print_warning 1 '"man genkernel" explains "dozfs" in detail.'
+
+	if isTrue "{ZFS}"
+	then
+		print_warning 1 'add "dozfs" for ZFS volume management support'
+		print_warning 1 '	and either "root=ZFS" to use bootfs autodetection or "root=ZFS=<dataset>" to force booting from a specific dataset'
+		print_warning 1 ''
+		if [ -f "${TEMP}/.embedded_hostid" ]
+		then
+			local _hostid=$(cat "${TEMP}/.embedded_hostid")
+			print_warning '1' "Hostid '${_hostid}' is embedded into initramfs."
+			print_warning '1' "If you will use this initramfs for a different system you MUST set 'spl_hostid=<hostid>' parameter to overwrite embedded hostid!"
+		else
+			print_warning '1' "No hostid embedded into initramfs. You MUST set 'spl_hostid=<hostid>' parameter to provide hostid for ZFS!"
+		fi
+		print_warning 1 ''
+		print_warning 1 'If importing ZFS pool is slow, add dozfs=cache or dozfs=force to kernel commandline.'
+		print_warning 1 '"man genkernel" explains "dozfs" in detail.'
+	fi
+
 	isTrue "${BTRFS}"  && print_warning 1 'add "dobtrfs" for Btrfs device scanning support'
 	isTrue "${ISCSI}"  && print_warning 1 'add at least "iscsi_initiatorname=<initiator name> iscsi_target=<target name> and iscsi_address=<target ip>" for iscsi support'
 

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

[Thomas Deutschmann]

commit:     ccb86d0e5727b6428abe92ff93929e0c737ad0bd
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 19:25:40 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 19:25:40 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ccb86d0e

set_kernel_arch(): error out if VER, SUB or PAT is not defined

If VER, SUB or PAT is not defined for some reason, bad things will happen.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_arch.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gen_arch.sh b/gen_arch.sh
index 1c9ec37..4ced125 100755
--- a/gen_arch.sh
+++ b/gen_arch.sh
@@ -48,6 +48,10 @@ get_official_arch() {
 }
 
 set_kernel_arch() {
+	[ -z "${VER}" ] && gen_die "cannot set KERNEL_ARCH without VER!"
+	[ -z "${SUB}" ] && gen_die "cannot set KERNEL_ARCH without SUB!"
+	[ -z "${PAT}" ] && gen_die "cannot set KERNEL_ARCH without PAT!"
+
 	KERNEL_ARCH=${ARCH}
 	case ${ARCH} in
 		ppc|ppc64*)

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

[Thomas Deutschmann]

commit:     f0b6734ef4de18b1194032348360180646df23f4
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 21:00:50 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 21:00:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f0b6734e

Rename get_KV() to determine_KV()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 2 +-
 genkernel            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 856d88e..4ce2dc0 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # $Id$
 
-get_KV() {
+determine_KV() {
 	local old_KV=
 	[ -n "${KV}" ] && old_KV="${KV}"
 

diff --git a/genkernel b/genkernel
index 65b7820..395dcee 100755
--- a/genkernel
+++ b/genkernel
@@ -141,7 +141,7 @@ done
 # get the real arguments for usage...
 determine_real_args
 
-get_KV
+determine_KV
 # $KV is now either set to the version from previous compilation,
 # which would include LOCALVERSION suffix, or initialized with
 # unmodified KERNEL_SOURCE version (which normally has no LOCALVERSION set).
@@ -231,7 +231,7 @@ then
 	fi
 
 	# KV may have changed due to the configuration
-	get_KV
+	determine_KV
 	if [ -f "${TEMP}/.old_kv" ]
 	then
 		old_KV=$(cat "${TEMP}/.old_kv")

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

[Thomas Deutschmann]

commit:     4259ed81a58dcdc62c83f27f8a238b92b5613f3c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 19:35:22 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 19:35:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4259ed81

genkernel: Use isTrue for ARCH_HAVENOPREPARE

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 25e9ca9..b9c5d87 100755
--- a/genkernel
+++ b/genkernel
@@ -232,9 +232,11 @@ then
 	config_kernel
 
 	# Make prepare
-	if [ "${ARCH_HAVENOPREPARE}" = '' ]
+	if ! isTrue "${ARCH_HAVENOPREPARE}"
 	then
 		compile_generic prepare kernel
+	else
+		print_info 2 "Skipping 'make prepare' due to ARCH_HAVENOPREPARE=yes!"
 	fi
 
 	# KV may have changed due to the configuration

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

[Thomas Deutschmann]

commit:     b3520bca9d33183c173a402af0bd3040a7240959
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 19:40:58 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 19:40:58 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b3520bca

determine_config_file(): add some verbose output

...to understand what is happening and why.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 582d71f..b7fa63e 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -3,6 +3,7 @@
 
 # Fills variable KERNEL_CONFIG
 determine_config_file() {
+	print_info 2 "Checking for suitable kernel configuration..."
 	for f in \
 		"${CMD_KERNEL_CONFIG}" \
 		"/etc/kernels/kernel-config-${ARCH}-${KV}" \
@@ -10,19 +11,26 @@ determine_config_file() {
 		"${GK_SHARE}/arch/${ARCH}/kernel-config-${VER}.${PAT}" \
 		"${GK_SHARE}/arch/${ARCH}/generated-config" \
 		"${GK_SHARE}/arch/${ARCH}/kernel-config" \
-		"${DEFAULT_KERNEL_CONFIG}" \
-		; do
-		if [ -n "${f}" -a -f "${f}" ]
+		"${DEFAULT_KERNEL_CONFIG}"
+	do
+		[ -z "${f}" ] && continue
+
+		if [ -f "${f}" ]
 		then
-			if ! grep -sq THIS_CONFIG_IS_BROKEN "$f"
+			if grep -sq THIS_CONFIG_IS_BROKEN "$f"
 			then
+				print_info 2 "$(getIndent 1)- '${f}' is marked as broken; Skipping..."
+			else
 				KERNEL_CONFIG="$f" && break
 			fi
+		else
+				print_info 2 "$(getIndent 1)- '${f}' not found; Skipping..."
 		fi
 	done
+
 	if [ -z "${KERNEL_CONFIG}" ]
 	then
-		gen_die 'Error: No kernel .config specified, or file not found!'
+		gen_die 'No kernel .config specified, or file not found!'
 	fi
 
 	KERNEL_CONFIG="$(readlink -f "${KERNEL_CONFIG}")"
@@ -30,7 +38,7 @@ determine_config_file() {
 	# Validate the symlink result if any
 	if [ ! -f "${KERNEL_CONFIG}" ]
 	then
-		gen_die "Error: No kernel .config: symlinked file not found! ($KERNEL_CONFIG)"
+		gen_die "No kernel .config: symlinked file '$KERNEL_CONFIG' not found!"
 	fi
 }
 

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

[Thomas Deutschmann]

commit:     5675f908d614aa5fa7e1b6bb6385df63aa142738
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 19:58:17 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 20:00:41 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5675f908

Call get_KV in genkernel main script only

$KV must be set for determine_config_file. However, for clarity,
call get_KV in main script only and don't rely on other functions.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 2 --
 genkernel            | 7 ++++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index e955540..c88bb4f 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -259,6 +259,4 @@ determine_real_args() {
 
 		[[ "${FIRMWARE_FILES}" = *,* ]] && gen_die "FIRMWARE_FILES should be a space-separated list."
 	fi
-
-	get_KV
 }

diff --git a/genkernel b/genkernel
index 0e716b5..44c34ba 100755
--- a/genkernel
+++ b/genkernel
@@ -139,8 +139,13 @@ done
 
 # Based on genkernel.conf, arch-specific configs, and commandline options,
 # get the real arguments for usage...
-
 determine_real_args
+
+get_KV
+# $KV is now either set to the version from previous compilation,
+# which would include LOCALVERSION suffix, or initialized with
+# unmodified KERNEL_SOURCE version (which normally has no LOCALVERSION set).
+
 determine_config_file
 
 set_kernel_arch

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

[Thomas Deutschmann]

commit:     3abb33bf0e12e38f453e262392572b0c6d47ea7c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 20:37:17 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 20:37:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3abb33bf

genkernel: tell user that shown kernel version is subject to change

When you start with fresh (unused) kernel sources, we will get Kernel
Version from KERNEL_DIR. If you already have compiled that KV, genkernel
maybe use your existing configuration from /etc/kernels (depends on other
settings like --mrproper).

Once your new kernel was built and you are saving configs (--save-config),
we will save the used configuration in /etc/kernels/kernel-config-${ARCH}-${KV}.

If you used --menuconfig during genkernel run to change kernel options like
CONFIG_LOCALVERSION or CONFIG_LOCALVERSION_AUTO or have modified kernel's
Makefile manually to change version, KV is subject to change once
genkernel has called 'make prepare'.

With this change we will tell user when KV has changed to end confusion like
shown in bug 521778.

Closes: https://bugs.gentoo.org/521778
Closes: https://bugs.gentoo.org/352787
Closes: https://bugs.gentoo.org/263927
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/genkernel b/genkernel
index 44c34ba..65b7820 100755
--- a/genkernel
+++ b/genkernel
@@ -158,9 +158,23 @@ check_distfiles
 
 dump_debugcache
 
+KERNCACHE_IS_VALID="no"
+if [ "${KERNCACHE}" != "" ]
+then
+	gen_kerncache_is_valid
+fi
+
 NORMAL=${BOLD} print_info 1 "Linux Kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL}..."
 print_info 1 ".. with config file ${KERNEL_CONFIG}"
 
+if isTrue "${BUILD_KERNEL}" && ! isTrue "${KERNCACHE_IS_VALID}"
+then
+	print_info 1 ""
+	print_info 1 "Note: The version above is subject to change (depends on config and status of kernel sources)."
+	print_info 1 ""
+fi
+
+
 # Check if BOOTDIR is mounted
 if ! isTrue "${CMD_INSTALL}"
 then
@@ -203,12 +217,6 @@ else
 	fi
 fi
 
-KERNCACHE_IS_VALID="no"
-if [ "${KERNCACHE}" != "" ]
-then
-	gen_kerncache_is_valid
-fi
-
 if isTrue "${BUILD_KERNEL}" && ! isTrue "${KERNCACHE_IS_VALID}"
 then
 	# Configure kernel
@@ -224,6 +232,14 @@ then
 
 	# KV may have changed due to the configuration
 	get_KV
+	if [ -f "${TEMP}/.old_kv" ]
+	then
+		old_KV=$(cat "${TEMP}/.old_kv")
+		print_info 1 "Kernel version has changed (probably due to config change) since genkernel start:"
+		print_info 1 "We are now building Linux kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL}..."
+	else
+		print_info 2 "Kernel version has not changed since genkernel start."
+	fi
 
 	compile_kernel
 

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

[Thomas Deutschmann]

commit:     c9aaeed65bf63d24dac5b6dd15566812b3913036
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 19:49:54 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 19:49:54 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c9aaeed6

genkernel: remove dead code which checked for multiple running genkernel instances

Code is disabled since commit 79502f6aa98d98504c5e08c5bf3a3881b68359d8 (2005).

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/genkernel b/genkernel
index 39186c3..0e716b5 100755
--- a/genkernel
+++ b/genkernel
@@ -198,28 +198,6 @@ else
 	fi
 fi
 
-## Check whether another Genkernel is running
-#GENPIDS="`ps -C genkernel --no-headers -o pid | wc -l`"
-#if [ "${GENPIDS}" -gt '3' ]
-#then
-#	[ "${GENPIDS}" -gt '4' ] && EX='s'
-#	print_warning 1 "${BOLD}WARNING${NORMAL}: Another Genkernel instance is running under"
-#	print_warning 1 "         process ID${EX} " 0
-#	GENPIDS=`ps -C genkernel --no-headers -o pid`
-#	printf "%s" "${GENPIDS}" | sed -e "s/$$//; s/ /, /g"
-#	echo 'halting...'
-#	echo
-#	print_warning 1 'Running multiple genkernels on the same source tree will cause data loss!'
-#	print_info 1 "Press ^C to halt; ^D to continue [ ${BOLD}if${NORMAL} you know what you're doing! ]"
-#	echo
-#	CTEMP="${TEMP}"
-#	TEMP=${TMPDIR-/tmp}
-#	TEMP=${TEMP}/genkernel.$RANDOM.$RANDOM.$RANDOM.$$
-#	print_info 1 'thread: Running multiple genkernels may cause problems!'
-#	print_info 1 "thread: Temporary files reallocated to ${TEMP}..."
-#	echo
-#fi
-
 KERNCACHE_IS_VALID="no"
 if [ "${KERNCACHE}" != "" ]
 then

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

[Thomas Deutschmann]

commit:     e94eddc6877546e5beb6d7c4dd40aed7bcc1057f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 19:44:03 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 19:44:03 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e94eddc6

genkernel: remove information about splash=verbose requirement when !BUILD_RAMDISK

This isn't needed anymore.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/genkernel b/genkernel
index b9c5d87..39186c3 100755
--- a/genkernel
+++ b/genkernel
@@ -339,19 +339,12 @@ then
 	print_info 1 ''
 	print_info 1 'Required Kernel Parameters:'
 	print_info 1 '    root=/dev/$ROOT'
-	if ! isTrue "${BUILD_RAMDISK}"
-	then
-		print_info 1 '    [ And "vga=0x317 splash=verbose" if you use a framebuffer ]'
-		print_info 1 ''
-		print_info 1 '    Where $ROOT is the device node for your root partition as the'
-		print_info 1 '    one specified in /etc/fstab'
-	else
-		print_info 1 ''
-		print_info 1 '    Where $ROOT is the device node for your root partition as the'
-		print_info 1 '    one specified in /etc/fstab'
-		print_info 1 ''
-		print_info 1 "If you require Genkernel's hardware detection features; you MUST"
-		print_info 1 'tell your bootloader to use the provided INITRAMFS file.'
+	print_info 1 ''
+	print_info 1 '    Where $ROOT is the device node for your root partition as the'
+	print_info 1 '    one specified in /etc/fstab'
+	print_info 1 ''
+	print_info 1 "If you require Genkernel's hardware detection features; you MUST"
+	print_info 1 'tell your bootloader to use the provided INITRAMFS file.'
 	fi
 fi
 

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

[Thomas Deutschmann]

commit:     58a57b303efb9fb5ce60c0dc40c806e7d7b46db0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 20:04:21 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 20:04:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=58a57b30

get_KV(): refactoring how we determine KV

- Fix handling O= builds (--kernel-outputdir):
  Patch (commit 8de731164496d09384d8be81a3f22316230deb65) from bug 238707
  has probably never worked:

  There's no MAKEARGS in $KERNEL_DIR/Makefile...

  It is enough to read include/linux/version.h or include/linux/utsrelease.h
  from $KERNEL_OUTPUTDIR which is either set to $KERNEL_DIR or is a separate
  directory in which case there will be no files created in $KERNEL_DIR.

- Set marker if KV will change to allow for user notification to avoid confusion.

Bug: https://bugs.gentoo.org/521778
Bug: https://bugs.gentoo.org/352787
Bug: https://bugs.gentoo.org/263927
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 50 +++++++++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index c88bb4f..856d88e 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -2,6 +2,9 @@
 # $Id$
 
 get_KV() {
+	local old_KV=
+	[ -n "${KV}" ] && old_KV="${KV}"
+
 	if ! isTrue "${KERNEL_SOURCES}" && [ -e "${KERNCACHE}" ]
 	then
 		/bin/tar -x -C ${TEMP} -f ${KERNCACHE} kerncache.config
@@ -30,42 +33,47 @@ get_KV() {
 		SUB=`grep ^SUBLEVEL\ \= ${KERNEL_DIR}/Makefile | awk '{ print $3 };'`
 		EXV=`grep ^EXTRAVERSION\ \= ${KERNEL_DIR}/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g" -e 's/\$([a-z]*)//gi'`
 
-		if [ -z "${SUB}" ]
-		then
-			# Handle O= build directories
-			KERNEL_SOURCE_DIR=`grep ^MAKEARGS\ \:\=  ${KERNEL_DIR}/Makefile | awk '{ print $4 };'`
-			[ -z "${KERNEL_SOURCE_DIR}" ] && gen_die "Deriving \${KERNEL_SOURCE_DIR} failed"
-			SUB=`grep ^SUBLEVEL\ \= ${KERNEL_SOURCE_DIR}/Makefile | awk '{ print $3 };'`
-			EXV=`grep ^EXTRAVERSION\ \= ${KERNEL_SOURCE_DIR}/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g" -e 's/\$([a-z]*)//gi'`
-		fi
-
-		cd ${KERNEL_DIR}
-		#compile_generic prepare kernel > /dev/null 2>&1
-		cd - > /dev/null 2>&1
-		[ -f "${KERNEL_DIR}/include/linux/version.h" ] && \
-			VERSION_SOURCE="${KERNEL_DIR}/include/linux/version.h"
-		[ -f "${KERNEL_DIR}/include/linux/utsrelease.h" ] && \
-			VERSION_SOURCE="${KERNEL_DIR}/include/linux/utsrelease.h"
+		# The files we are looking for are always in KERNEL_OUTPUTDIR
+		# because in most cases, KERNEL_OUTPUTDIR == KERNEL_DIR.
+		# If KERNEL_OUTPUTDIR != KERNEL_DIR, --kernel-outputdir is used,
+		# in which case files will only be in KERNEL_OUTPUTDIR.
+		[ -f "${KERNEL_OUTPUTDIR}/include/linux/version.h" ] && \
+			VERSION_SOURCE="${KERNEL_OUTPUTDIR}/include/linux/version.h"
+		[ -f "${KERNEL_OUTPUTDIR}/include/linux/utsrelease.h" ] && \
+			VERSION_SOURCE="${KERNEL_OUTPUTDIR}/include/linux/utsrelease.h"
 		# Handle new-style releases where version.h doesn't have UTS_RELEASE
-		if [ -f ${KERNEL_DIR}/include/config/kernel.release ]
+		if [ -f ${KERNEL_OUTPUTDIR}/include/config/kernel.release ]
 		then
-			UTS_RELEASE=`cat ${KERNEL_DIR}/include/config/kernel.release`
+			print_info 3 "Using '${KERNEL_OUTPUTDIR}/include/config/kernel.release' to extract LOCALVERSION..."
+			UTS_RELEASE=`cat ${KERNEL_OUTPUTDIR}/include/config/kernel.release`
 			LOV=`echo ${UTS_RELEASE}|sed -e "s/${VER}.${PAT}.${SUB}${EXV}//"`
 			KV=${VER}.${PAT}.${SUB}${EXV}${LOV}
 		elif [ -n "${VERSION_SOURCE}" ]
 		then
+			print_info 3 "Using '${VERSION_SOURCE}' to extract LOCALVERSION..."
 			UTS_RELEASE=`grep UTS_RELEASE ${VERSION_SOURCE} | sed -e 's/#define UTS_RELEASE "\(.*\)"/\1/'`
 			LOV=`echo ${UTS_RELEASE}|sed -e "s/${VER}.${PAT}.${SUB}${EXV}//"`
 			KV=${VER}.${PAT}.${SUB}${EXV}${LOV}
 		else
-			determine_config_file
-			LCV=`grep ^CONFIG_LOCALVERSION= "${KERNEL_CONFIG}" | sed -r -e "s/.*=\"(.*)\"/\1/"`
-			KV=${VER}.${PAT}.${SUB}${EXV}${LCV}
+			# We will be here only when currently selected kernel source
+			# is untouched. I.e. after a new kernel sources version was installed
+			# and genkernel was called for the first time.
+			# However, we have no chance to get a LOCALVERSION,
+			# so don't even try -- it would be useless at this stage.
+			print_info 3 "Unable to determine LOCALVERSION -- maybe fresh sources?"
+			KV=${VER}.${PAT}.${SUB}${EXV}
 		fi
 	fi
 
 	KV_MAJOR=$(echo $KV | cut -f1 -d.)
 	KV_MINOR=$(echo $KV | cut -f2 -d.)
+
+	if [ -n "${old_KV}" -a "${KV}" != "${old_KV}" ]
+	then
+		print_info 3 "KV changed from '${old_KV}' to '${KV}'!"
+		echo "${old_KV}" > "${TEMP}/.old_kv" ||
+			gen_die "failed to to store '${old_KV}' in '${TEMP}/.old_kv' marker"
+	fi
 }
 
 determine_real_args() {

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

[Thomas Deutschmann]

commit:     80aca6aa38b43a5e147114ccb8c6434771aef541
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 19:46:36 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 19:46:36 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=80aca6aa

config_kernel(): No need to call determine_config_file again

...which was already called in genkernel before and config file
cannot change at runtime.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index b7fa63e..ecef8bc 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -43,7 +43,6 @@ determine_config_file() {
 }
 
 config_kernel() {
-	determine_config_file
 	cd "${KERNEL_DIR}" || gen_die 'Could not switch to the kernel directory!'
 
 	print_info 1 "kernel: >> Initializing..."

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

[Thomas Deutschmann]

commit:     fe729696c3814267d039d2aad23888acf80b9ede
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 21:38:28 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 21:38:28 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fe729696

compile_gen_init_cpio(): use 'mkdir -p' when creating $KERNEL_OUTPUTDIR/usr

This is usually only required for users using genkernel to create initramfs without
building kernel but it doesn't hurt.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/gen_compile.sh b/gen_compile.sh
index 1c29360..93c2af4 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -251,7 +251,7 @@ compile_gen_init_cpio() {
 	print_info 1 "$(getIndent 2)>> Compiling gen_init_cpio..."
 
 	[ ! -e "${gen_init_cpio_SRC}" ] && gen_die "'${gen_init_cpio_SRC}' is missing. Cannot compile gen_init_cpio!"
-	[ ! -d "${gen_init_cpio_DIR}" ] && mkdir "${gen_init_cpio_DIR}"
+	[ ! -d "${gen_init_cpio_DIR}" ] && mkdir -p "${gen_init_cpio_DIR}" || gen_die "failed to create '${gen_init_cpio_DIR}'!"
 
 	export_utils_args
 

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

[Thomas Deutschmann]

commit:     d030a61ea663f567a6df9bf54dd7d25eac21c0fc
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 23:27:50 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 23:27:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d030a61e

append_modules(): add error checking

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 7c41c2c..6ffdf65 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -823,22 +823,34 @@ append_modules() {
 	local group_modules
 	local MOD_EXT="$(modules_kext)"
 
-	print_info 2 "$(getIndent 2)initramfs: >> Searching for modules..."
+	if [ -d "${TEMP}/initramfs-modules-${KV}-temp" ]
+	then
+		rm -r "${TEMP}/initramfs-modules-${KV}-temp/"
+	fi
+
+	print_info 2 "$(getIndent 2)modules: >> Copying modules to initramfs..."
 	if [ "${INSTALL_MOD_PATH}" != '' ]
 	then
-		cd ${INSTALL_MOD_PATH}
+		cd ${INSTALL_MOD_PATH} || gen_die "Failed to chdir into '${INSTALL_MOD_PATH}'!"
 	else
-		cd /
+		cd / || gen_die "Failed to chdir into '/'!"
 	fi
 
-	if [ -d "${TEMP}/initramfs-modules-${KV}-temp" ]
+	local _MODULES_DIR="${PWD%/}/lib/modules/${KV}"
+	if [ ! -d "${_MODULES_DIR}" ]
 	then
-		rm -r "${TEMP}/initramfs-modules-${KV}-temp/"
+		error_message="'${_MODULES_DIR}' does not exist! Did you forget"
+		error_message+=" to compile kernel before building initramfs?"
+		error_message+=" If you know what you are doing please set '--no-ramdisk-modules'."
+		gen_die "${error_message}"
 	fi
+
 	mkdir -p "${TEMP}/initramfs-modules-${KV}-temp/lib/modules/${KV}"
+
+	local n_copied_modules=0
 	for i in `gen_dep_list`
 	do
-		mymod=`find ./lib/modules/${KV} -name "${i}${MOD_EXT}" 2>/dev/null| head -n 1 `
+		mymod=`find "${_MODULES_DIR}" -name "${i}${MOD_EXT}" 2>/dev/null| head -n 1 `
 		if [ -z "${mymod}" ]
 		then
 			print_warning 2 "$(getIndent 3) - ${i}${MOD_EXT} not found; skipping..."
@@ -846,10 +858,20 @@ append_modules() {
 		fi
 
 		print_info 2 "$(getIndent 3) - Copying ${i}${MOD_EXT}..."
-		cp -ax --parents "${mymod}" "${TEMP}/initramfs-modules-${KV}-temp"
+		cp -ax --parents "${mymod}" "${TEMP}/initramfs-modules-${KV}-temp" ||
+			gen_die "failed to copy '${mymod}' to '${TEMP}/initramfs-modules-${KV}-temp'"
+		n_copied_modules=$[$n_copied_modules+1]
 	done
 
-	cp -ax --parents ./lib/modules/${KV}/modules* ${TEMP}/initramfs-modules-${KV}-temp 2>/dev/null
+	if [ ${n_copied_modules} -eq 0 ]
+	then
+		print_warning 1 "$(getIndent 2)modules: ${n_copied_modules} modules copied. Is that correct?"
+	else
+		print_info 2 "$(getIndent 2)modules: ${n_copied_modules} modules copied!"
+	fi
+
+	cp -ax --parents "${_MODULES_DIR}"/modules* ${TEMP}/initramfs-modules-${KV}-temp ||
+		gen_die "failed to copy '${_MODULES_DIR}/modules*' to '${TEMP}/initramfs-modules-${KV}-temp'"
 
 	mkdir -p "${TEMP}/initramfs-modules-${KV}-temp/etc/modules"
 	for group_modules in ${!MODULES_*}; do

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

[Thomas Deutschmann]

commit:     d9f5d5ddcb4b9865c07983d95c09e07753ee23fd
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 22:38:09 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 22:38:09 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d9f5d5dd

config_kernel(): fix comment

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index ecef8bc..abc2f61 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -185,7 +185,7 @@ config_kernel() {
 			fi
 		fi
 	else
-		# no, we support modules, set 'y' for new stuff.
+		# no, we do NOT support modules, set 'y' for new stuff.
 		newcfg_setting='y'
 	fi
 

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

[Thomas Deutschmann]

commit:     cb0d1ec77ef70df93db51ce4fe7b850b8a3ba59f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 23:30:26 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 23:30:26 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cb0d1ec7

config_kernel(): Force --static and --no-ramdisk-modules

...if kernel doesn't support modules to avoid that genkernel will run
into errors when trying to call 'make modules' or expects to build
initramfs with modules when there aren't any modules.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index abc2f61..541a3a8 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -187,6 +187,21 @@ config_kernel() {
 	else
 		# no, we do NOT support modules, set 'y' for new stuff.
 		newcfg_setting='y'
+
+		if ! isTrue "${BUILD_STATIC}"
+		then
+			local _no_modules_support_warning="$(getIndent 1)>> Forcing --static "
+			if isTrue "${BUILD_RAMDISK}" && isTrue "${RAMDISKMODULES}"
+			then
+				_no_modules_support_warning+="and --no-ramdisk-modules "
+				RAMDISKMODULES="no"
+			fi
+
+			_no_modules_support_warning+="to avoid genkernel failures because kernel does NOT support modules..."
+
+			print_warning 1 "${_no_modules_support_warning}"
+			BUILD_STATIC="yes"
+		fi
 	fi
 
 	# If the user has configured DM as built-in, we need to respect that.

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

[Thomas Deutschmann]

commit:     62ecb93082e4674668b150d71771555d0329dde7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 21:41:06 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 21:41:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=62ecb930

fix splash

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 1 -
 1 file changed, 1 deletion(-)

diff --git a/genkernel b/genkernel
index 395dcee..43f5e5b 100755
--- a/genkernel
+++ b/genkernel
@@ -344,7 +344,6 @@ then
 	print_info 1 ''
 	print_info 1 "If you require Genkernel's hardware detection features; you MUST"
 	print_info 1 'tell your bootloader to use the provided INITRAMFS file.'
-	fi
 fi
 
 if isTrue "${BUILD_RAMDISK}"

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

[Thomas Deutschmann]

commit:     cfcf97fd47f6ffa759536da9ac6faf2c287e2f99
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 23:17:51 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 23:17:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cfcf97fd

longusage(): fix shell completion

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_cmdline.sh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 31b1d79..86150fa 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -185,14 +185,19 @@ longusage() {
   echo "				separate the filenames with a comma"
   echo "	--firmware-install	Enable installing firmware onto root filesystem"
   echo "				(only available for kernels older than v4.14)"
-  echo "	--integrated-initramfs, --no-integrated-initramfs"
-  echo "				Include/exclude the generated initramfs in the kernel"
+  echo "	--integrated-initramfs"
+  echo "				Include the generated initramfs in the kernel"
   echo "				instead of keeping it as a separate file"
-  echo "	--wrap-initrd, --no-wrap-initrd"
-  echo "				Wrap initramfs using mkimage for u-boot boots"
-  echo "	--compress-initramfs, --no-compress-initramfs,"
-  echo "	--compress-initrd, --no-compress-initrd"
-  echo "				Compress or do not compress the generated initramfs"
+  echo "	--no-integrated-initramfs"
+  echo "				Do not include the generated initramfs in the kernel"
+  echo "	--wrap-initrd		Wrap initramfs using mkimage for u-boot boots"
+  echo "	 --no-wrap-initrd	Do not wrap initramfs using mkimage for u-boot boots"
+  echo "	--compress-initramfs"
+  echo "				Compress initramfs"
+  echo "	--no-compress-initramfs"
+  echo "				Do not compress initramfs"
+  echo "	--compress-initrd	Compress initrd"
+  echo "	--no-compress-initrd	Do not compress initrd"
   echo "	--compress-initramfs-type=<arg>"
   echo "				Compression type for initramfs (best, xz, lzma, bzip2, gzip, lzop)"
   echo "	--strip=(all|kernel|modules|none)"

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

[Thomas Deutschmann]

commit:     db881955a5d03740db2dd55f33ffeeda373bf611
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 29 02:53:53 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Mar 29 04:12:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=db881955

determine_config_file(): add support for file path (tilde) expansion

In addition, we make --kernel-config parameter more exclusive:

Before this change, if user had set --kernel-config but value was invalid
(i.e. file didn't exist) we silently fallback to default configuration.

Now we will error out if --kernel-config is set but value is invalid
(i.e. no file).

Closes: https://bugs.gentoo.org/412321
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 67 ++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 24 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 541a3a8..34fdbe1 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -4,41 +4,60 @@
 # Fills variable KERNEL_CONFIG
 determine_config_file() {
 	print_info 2 "Checking for suitable kernel configuration..."
-	for f in \
-		"${CMD_KERNEL_CONFIG}" \
-		"/etc/kernels/kernel-config-${ARCH}-${KV}" \
-		"${GK_SHARE}/arch/${ARCH}/kernel-config-${KV}" \
-		"${GK_SHARE}/arch/${ARCH}/kernel-config-${VER}.${PAT}" \
-		"${GK_SHARE}/arch/${ARCH}/generated-config" \
-		"${GK_SHARE}/arch/${ARCH}/kernel-config" \
-		"${DEFAULT_KERNEL_CONFIG}"
-	do
-		[ -z "${f}" ] && continue
-
-		if [ -f "${f}" ]
+	if [ -n "${CMD_KERNEL_CONFIG}" ]
+	then
+		KERNEL_CONFIG=$(expand_file "${CMD_KERNEL_CONFIG}")
+		if [ -z "${KERNEL_CONFIG}" ]
 		then
-			if grep -sq THIS_CONFIG_IS_BROKEN "$f"
+			error_msg="No kernel .config: Cannot use '${CMD_KERNEL_CONFIG}' value. "
+			error_msg+="Check --kernel-config value or unset "
+			error_msg+="to use default kernel config provided by genkernel."
+			gen_die "${error_msg}"
+		fi
+	else
+		for f in \
+			"/etc/kernels/kernel-config-${ARCH}-${KV}" \
+			"${GK_SHARE}/arch/${ARCH}/kernel-config-${KV}" \
+			"${GK_SHARE}/arch/${ARCH}/kernel-config-${VER}.${PAT}" \
+			"${GK_SHARE}/arch/${ARCH}/generated-config" \
+			"${GK_SHARE}/arch/${ARCH}/kernel-config" \
+			"${DEFAULT_KERNEL_CONFIG}"
+		do
+			[ -z "${f}" ] && continue
+
+			if [ -f "${f}" ]
 			then
-				print_info 2 "$(getIndent 1)- '${f}' is marked as broken; Skipping..."
+				if grep -sq THIS_CONFIG_IS_BROKEN "$f"
+				then
+					print_info 2 "$(getIndent 1)- '${f}' is marked as broken; Skipping..."
+				else
+					KERNEL_CONFIG="$f" && break
+				fi
 			else
-				KERNEL_CONFIG="$f" && break
+					print_info 2 "$(getIndent 1)- '${f}' not found; Skipping..."
 			fi
-		else
-				print_info 2 "$(getIndent 1)- '${f}' not found; Skipping..."
-		fi
-	done
+		done
 
-	if [ -z "${KERNEL_CONFIG}" ]
-	then
-		gen_die 'No kernel .config specified, or file not found!'
+		if [ -z "${KERNEL_CONFIG}" ]
+		then
+			gen_die 'No kernel .config specified, or file not found!'
+		fi
 	fi
 
 	KERNEL_CONFIG="$(readlink -f "${KERNEL_CONFIG}")"
 
 	# Validate the symlink result if any
-	if [ ! -f "${KERNEL_CONFIG}" ]
+	if [ -z "${KERNEL_CONFIG}" -o ! -f "${KERNEL_CONFIG}" ]
 	then
-		gen_die "No kernel .config: symlinked file '$KERNEL_CONFIG' not found!"
+		if [ -n "${CMD_KERNEL_CONFIG}" ]
+		then
+			error_msg="No kernel .config: File '${CMD_KERNEL_CONFIG}' not found! "
+			error_msg+="Check --kernel-config value or unset "
+			error_msg+="to use default kernel config provided by genkernel."
+			gen_die "${error_msg}"
+		else
+			gen_die "No kernel .config: symlinked file '${KERNEL_CONFIG}' not found!"
+		fi
 	fi
 }
 

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

[Thomas Deutschmann]

commit:     a42e9e779795d1a4eff1a48ba14e70f03a64b98e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 29 02:47:43 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Mar 29 02:51:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a42e9e77

Add new function expand_file() to allow file path expansion

Relies on Python os.path.expanduser and realpath from coreutils.

Bug: https://bugs.gentoo.org/412321
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 95c8f30..ba45b02 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -538,6 +538,25 @@ check_distfiles() {
 	done
 }
 
+expand_file() {
+	[[ "$#" -lt '1' ]] &&
+		echo ''
+
+	local file="${1}"
+	local expanded_file=
+
+	expanded_file=$(python -c "import os; print(os.path.expanduser('${file}'))" 2>/dev/null)
+	if [ -z "${expanded_file}" ]
+	then
+		# if Python failed for some reason, just reset
+		expanded_file=${file}
+	fi
+
+	expanded_file=$(realpath -q "${expanded_file}" 2>/dev/null)
+
+	echo "${expanded_file}"
+}
+
 find_kernel_binary() {
 	local kernel_binary=$*
 	local curdir=$(pwd)

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

[Thomas Deutschmann]

commit:     7407ff68589f6067ab3e99f3beff956f2b0f1495
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 29 03:40:49 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Mar 29 04:12:58 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7407ff68

genkernel: Add missing indentation for "KV has changed" output

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/genkernel b/genkernel
index 43f5e5b..0111a32 100755
--- a/genkernel
+++ b/genkernel
@@ -227,7 +227,7 @@ then
 	then
 		compile_generic prepare kernel
 	else
-		print_info 2 "Skipping 'make prepare' due to ARCH_HAVENOPREPARE=yes!"
+		print_info 2 "$(getIndent 1)>> Skipping 'make prepare' due to ARCH_HAVENOPREPARE=yes!"
 	fi
 
 	# KV may have changed due to the configuration
@@ -235,10 +235,10 @@ then
 	if [ -f "${TEMP}/.old_kv" ]
 	then
 		old_KV=$(cat "${TEMP}/.old_kv")
-		print_info 1 "Kernel version has changed (probably due to config change) since genkernel start:"
-		print_info 1 "We are now building Linux kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL}..."
+		print_info 1 "$(getIndent 1)>> Kernel version has changed (probably due to config change) since genkernel start:"
+		print_info 1 "$(getIndent 1)>> We are now building Linux kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL}..."
 	else
-		print_info 2 "Kernel version has not changed since genkernel start."
+		print_info 2 "$(getIndent 1)>> Kernel version has not changed since genkernel start."
 	fi
 
 	compile_kernel

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

[Thomas Deutschmann]

commit:     81b10b5208b7bd17b66bb30cdf19804aa2212267
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 29 04:29:59 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Mar 29 04:29:59 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=81b10b52

genkernel: Use isTrue for $BOOTRW

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/genkernel b/genkernel
index 0111a32..676471c 100755
--- a/genkernel
+++ b/genkernel
@@ -211,7 +211,7 @@ else
 				echo
 			else
 				print_info 1 "mount: ${BOOTDIR} remounted read/write successfully!"
-				BOOTRW=1
+				BOOTRW="yes"
 			fi
 		fi
 	fi
@@ -393,7 +393,7 @@ then
 	unset CONFGREP
 fi
 
-[ "${BOOTRW}" != '' ] && mount -o remount,ro ${BOOTDIR}
+isTrue "${BOOTRW}" && mount -o remount,ro ${BOOTDIR}
 
 echo
 print_info 1 'Do NOT report kernel bugs as genkernel bugs unless your bug'

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

[Thomas Deutschmann]

commit:     60a0ba78d26c1829b77ffa9aa59aac761a970b93
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  3 01:58:56 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Apr  3 01:58:56 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=60a0ba78

Make sure $TMPDIR exists

Since commit 479b2386c8 we are using mktemp to create the temporary folder $TEMP
for the current genkernel run. However, when $TMPDIR doesn't exist, mktemp
will fail.

Reported-By: Aaron Bauman <bman <AT> gentoo.org>
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_cmdline.sh | 1 +
 genkernel      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 795c2c6..c5697e2 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -587,6 +587,7 @@ parse_cmdline() {
 			;;
 		--tempdir=*)
 			TMPDIR="${*#*=}"
+			[ ! -d "${TMPDIR}" ] && mkdir -p "${TMPDIR}" || gen_die "Failed to create '${TMPDIR}'!"
 			TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX)
 			print_info 2 "TMPDIR: ${TMPDIR}"
 			print_info 2 "TEMP: ${TEMP}"

diff --git a/genkernel b/genkernel
index 676471c..6904ff2 100755
--- a/genkernel
+++ b/genkernel
@@ -44,6 +44,7 @@ source ${GK_SHARE}/gen_moddeps.sh || gen_die "Could not read ${GK_SHARE}/gen_mod
 source ${GK_SHARE}/gen_package.sh || gen_die "Could not read ${GK_SHARE}/gen_package.sh"
 source ${GK_SHARE}/gen_bootloader.sh || gen_die "Could not read ${GK_SHARE}/gen_bootloader.sh"
 
+[ ! -d "${TMPDIR}" ] && mkdir -p "${TMPDIR}" || gen_die "Failed to create '${TMPDIR}'!"
 TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX)
 
 trap_cleanup(){
@@ -150,7 +151,7 @@ determine_config_file
 
 set_kernel_arch
 
-[ ! -f "${TEMP}" ] && mkdir -p "${TEMP}"
+[ ! -f "${TEMP}" ] && mkdir "${TEMP}" || gen_die "Failed to create '${TEMP}'!"
 
 setup_cache_dir
 

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

[Thomas Deutschmann]

commit:     2d5c1dc73b2c44200e7bbb0ebb18a46adcc63af1
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  6 18:53:30 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Apr  6 18:53:30 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2d5c1dc7

Fix "Make sure $TMPDIR exists"

Previous attempt to ensure $TMPDIR exists introduced a new bug:
The used one-line if clause was invalid.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_cmdline.sh | 6 +++++-
 genkernel      | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index c5697e2..be04cdb 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -587,8 +587,12 @@ parse_cmdline() {
 			;;
 		--tempdir=*)
 			TMPDIR="${*#*=}"
-			[ ! -d "${TMPDIR}" ] && mkdir -p "${TMPDIR}" || gen_die "Failed to create '${TMPDIR}'!"
+			if [ ! -d "${TMPDIR}" ]
+			then
+				mkdir -p "${TMPDIR}" || gen_die "Failed to create '${TMPDIR}'!"
+			fi
 			TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX)
+			[ -z "${TEMP}" ] && gen_die "mktemp failed!"
 			print_info 2 "TMPDIR: ${TMPDIR}"
 			print_info 2 "TEMP: ${TEMP}"
 			;;

diff --git a/genkernel b/genkernel
index 6904ff2..5337833 100755
--- a/genkernel
+++ b/genkernel
@@ -44,8 +44,13 @@ source ${GK_SHARE}/gen_moddeps.sh || gen_die "Could not read ${GK_SHARE}/gen_mod
 source ${GK_SHARE}/gen_package.sh || gen_die "Could not read ${GK_SHARE}/gen_package.sh"
 source ${GK_SHARE}/gen_bootloader.sh || gen_die "Could not read ${GK_SHARE}/gen_bootloader.sh"
 
-[ ! -d "${TMPDIR}" ] && mkdir -p "${TMPDIR}" || gen_die "Failed to create '${TMPDIR}'!"
+if [ ! -d "${TMPDIR}" ]
+then
+	mkdir -p "${TMPDIR}" || gen_die "Failed to create '${TMPDIR}'!"
+fi
+
 TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX)
+[ -z "${TEMP}" ] && gen_die "mktemp failed!"
 
 trap_cleanup(){
 	# Call exit code of 1 for failure

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

[Thomas Deutschmann]

commit:     4fe6f1a7211fefe3e6817fb7f2a40504704fccc8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  6 19:02:20 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Apr  6 19:03:32 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4fe6f1a7

Remove `mkdir $TEMP` call which is no longer needed

...since we used `mktemp` before which already created that
directory.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_cmdline.sh | 2 +-
 genkernel      | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index be04cdb..ceaf212 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -591,7 +591,7 @@ parse_cmdline() {
 			then
 				mkdir -p "${TMPDIR}" || gen_die "Failed to create '${TMPDIR}'!"
 			fi
-			TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX)
+			TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX 2>/dev/null)
 			[ -z "${TEMP}" ] && gen_die "mktemp failed!"
 			print_info 2 "TMPDIR: ${TMPDIR}"
 			print_info 2 "TEMP: ${TEMP}"

diff --git a/genkernel b/genkernel
index 5337833..bb936a3 100755
--- a/genkernel
+++ b/genkernel
@@ -49,7 +49,7 @@ then
 	mkdir -p "${TMPDIR}" || gen_die "Failed to create '${TMPDIR}'!"
 fi
 
-TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX)
+TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX 2>/dev/null)
 [ -z "${TEMP}" ] && gen_die "mktemp failed!"
 
 trap_cleanup(){
@@ -156,8 +156,6 @@ determine_config_file
 
 set_kernel_arch
 
-[ ! -f "${TEMP}" ] && mkdir "${TEMP}" || gen_die "Failed to create '${TEMP}'!"
-
 setup_cache_dir
 
 check_distfiles

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

[Thomas Deutschmann]

commit:     3a756304719c40443e2e26d942a46c3ab4276d6b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 09:47:19 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 11:58:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3a756304

gen_initramfs.sh: Refactor append_modprobed()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index fd26410..c46721a 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1167,19 +1167,21 @@ append_modprobed() {
 	local TDIR="${TEMP}/initramfs-modprobe.d-temp"
 	if [ -d "${TDIR}" ]
 	then
-		rm -r "${TDIR}"
+		rm -r "${TDIR}" || gen_die "Failed to clean out existing '${TDIR}'!"
 	fi
 
-	mkdir -p "${TDIR}/etc"
-	cp -r "/etc/modprobe.d" "${TDIR}/etc/modprobe.d"
+	mkdir "${TDIR}" || gen_die "Failed to create '${TDIR}'!"
+	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
+
+	mkdir -p "${TDIR}"/etc || gen_die "Failed to create '${TDIR}/etc'!"
 
-	cd "${TDIR}"
+	cp -rL "/etc/modprobe.d" "${TDIR}"/etc/ 2>/dev/null \
+		|| gen_die "Failed to copy '/etc/modprobe.d'!"
+
+	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
-			|| gen_die "compressing modprobe.d cpio"
-
-	cd "${TEMP}"
-	rm -rf "${TDIR}" > /dev/null
+		|| gen_die "Failed to append modprobe.d to cpio!"
 }
 
 # check for static linked file with objdump

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

[Thomas Deutschmann]

commit:     a9fa4b25ddaa9685e7c32d015350b2342651dd8a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 09:17:13 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 11:58:15 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a9fa4b25

gen_initramfs.sh: Refactor append_data()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 82dc5f5..fb3b3ce 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1309,8 +1309,8 @@ append_data() {
 	[ $# -eq 0 ] && gen_die "append_data() called with zero arguments"
 	if [ $# -eq 1 ] || isTrue "${var}"
 	then
-		print_info 1 "$(getIndent 1)>> Appending ${name} cpio data..."
-		${func} || gen_die "${func}() failed"
+		print_info 1 "$(get_indent 1)>> Appending ${name} cpio data ..."
+		${func} || gen_die "${func}() failed!"
 	fi
 }
 

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

[Thomas Deutschmann]

commit:     19e62fbefd06f9f7b890346a3f5220f9d27b37c7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 09:39:56 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 11:58:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=19e62fbe

gen_initramfs.sh: Refactor append_linker()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 55 ++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 21 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 8d6996e..fc756d0 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -642,36 +642,49 @@ append_libgcc_s() {
 }
 
 append_linker() {
-	if [ -d "${TEMP}/initramfs-linker-temp" ]
+	local TDIR="${TEMP}/initramfs-linker-temp"
+	if [ -d "${TDIR}" ]
 	then
-		rm -r "${TEMP}/initramfs-linker-temp"
+		rm -r "${TDIR}" || gen_die "Failed to clean out existing '${TDIR}'!"
 	fi
 
-	mkdir -p "${TEMP}/initramfs-linker-temp/etc"
+	mkdir "${TDIR}" || gen_die "Failed to create '${TDIR}'!"
+	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 
-	if [ -e "/etc/ld.so.conf" ]
-	then
-		cp "/etc/ld.so.conf" "${TEMP}/initramfs-linker-temp/etc/" 2> /dev/null \
-			|| gen_die "Could not copy ld.so.conf"
-	fi
-	if [ -e "/etc/ld.so.cache" ]
-	then
-		cp "/etc/ld.so.cache" "${TEMP}/initramfs-linker-temp/etc/" 2> /dev/null \
-			|| gen_die "Could not copy ld.so.cache"
-	fi
-	if [ -d "/etc/ld.so.conf.d" ]
+	mkdir -p "${TDIR}"/etc || gen_die "Failed to create '${TDIR}/etc'!"
+
+	if isTrue "$(tc-is-cross-compiler)"
 	then
-		mkdir -p "${TEMP}/initramfs-linker-temp/etc/ld.so.conf.d"
-		cp -r "/etc/ld.so.conf.d" "${TEMP}/initramfs-linker-temp/etc/" 2> /dev/null \
-			|| gen_die "Could not copy ld.so.conf.d"
+		# We cannot copy ld files from host because they could be
+		# incompatible with CHOST.  Instead, add ldconfig to allow
+		# initramfs to regenerate on its own (default /etc/ld.so.conf
+		# for initramfs was added via append_base_layout()).
+		mkdir -p "${TDIR}"/sbin || gen_die "Failed to create '${TDIR}/sbin'!"
+
+		local libdir=$(get_chost_libdir)
+		copy_system_binaries "${TDIR}/sbin" "${libdir}/../sbin/ldconfig"
+	else
+		# Only copy /etc/ld.so.conf.d -- /etc/ld.so.conf was already
+		# added to CPIO via append_base_layout() and because we only
+		# append to CPIO, that file wouldn't be used at all.
+		if [ -d "/etc/ld.so.conf.d" ]
+		then
+			mkdir -p "${TDIR}"/etc/ld.so.conf.d || gen_die "Failed to create '${TDIR}/etc/ld.so.conf.d'!"
+			cp -arL "/etc/ld.so.conf.d" "${TDIR}"/etc \
+				|| gen_die "Failed to copy '/etc/ld.so.conf.d'!"
+		fi
+
+		if [ -e "/etc/ld.so.cache" ]
+		then
+			cp -aL "/etc/ld.so.cache" "${TDIR}"/etc/ld.so.cache \
+				|| gen_die "Failed to copy '/etc/ld.so.cache'!"
+		fi
 	fi
 
-	cd "${TEMP}/initramfs-linker-temp/"
+	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	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
+		|| gen_die "Failed to append linker to cpio!"
 }
 
 append_splash(){

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

[Thomas Deutschmann]

commit:     4d685f1f1f13f15fbeee1f7200417949e3818b3d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 09:35:32 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 11:58:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4d685f1f

gen_initramfs.sh: Refactor append_firmware()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index b15f1bf..c7fd1dc 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1032,29 +1032,37 @@ append_dropbear() {
 }
 
 append_firmware() {
-	if [ ! -d "${FIRMWARE_DIR}" ]
+	local TDIR="${TEMP}/initramfs-firmware-temp"
+	if [ -d "${TDIR}" ]
 	then
-		gen_die "specified firmware directory (${FIRMWARE_DIR}) does not exist"
+		rm -r "${TDIR}" || gen_die "Failed to clean out existing '${TDIR}'!"
 	fi
-	if [ -d "${TEMP}/initramfs-firmware-temp" ]
+
+	mkdir "${TDIR}" || gen_die "Failed to create '${TDIR}'!"
+	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
+
+	if [ ! -d "${FIRMWARE_DIR}" ]
 	then
-		rm -r "${TEMP}/initramfs-firmware-temp/"
+		gen_die "Specified firmware directory '${FIRMWARE_DIR}' does not exist!"
 	fi
-	mkdir -p "${TEMP}/initramfs-firmware-temp/lib/firmware"
-	cd "${TEMP}/initramfs-firmware-temp"
+
+	mkdir -p "${TDIR}"/lib/firmware || gen_die "Failed to create '${TDIR}/lib/firmware'!"
+
 	if [ -n "${FIRMWARE_FILES}" ]
 	then
-		pushd ${FIRMWARE_DIR} >/dev/null
-		cp -rL --parents --target-directory="${TEMP}/initramfs-firmware-temp/lib/firmware/" ${FIRMWARE_FILES}
-		popd >/dev/null
+		pushd "${FIRMWARE_DIR}" &>/dev/null || gen_die "Failed to chdir to '${FIRMWARE_DIR}'!"
+		cp -rL --parents --target-directory="${TDIR}/lib/firmware" ${FIRMWARE_FILES} 2>/dev/null \
+			|| gen_die "Failed to copy firmware files (${FIRMWARE_FILES}) to '${TDIR}/lib/firmware'!"
+		popd &>/dev/null || gen_die "Failed to chdir!"
 	else
-		cp -a "${FIRMWARE_DIR}"/* ${TEMP}/initramfs-firmware-temp/lib/firmware/
+		cp -a "${FIRMWARE_DIR}"/* "${TDIR}"/lib/firmware/ 2>/dev/null \
+			|| gen_die "Failed to copy firmware files to '${TDIR}/lib/firmware'!"
 	fi
+
+	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
-		|| gen_die "appending firmware to cpio"
-	cd "${TEMP}"
-	rm -r "${TEMP}/initramfs-firmware-temp/"
+		|| gen_die "Failed to append firmware to cpio!"
 }
 
 append_gpg() {

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

[Thomas Deutschmann]

commit:     d4450fcaad41aff9b2d5a693df80560890730dc1
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 09:36:51 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 11:58:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d4450fca

gen_initramfs.sh: Refactor append_libgcc_s()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index c7fd1dc..8d6996e 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -613,12 +613,14 @@ append_btrfs() {
 }
 
 append_libgcc_s() {
-	if [ -d "${TEMP}/initramfs-libgcc_s-temp" ]
+	local TDIR="${TEMP}/initramfs-libgcc_s-temp"
+	if [ -d "${TDIR}" ]
 	then
-		rm -r "${TEMP}/initramfs-libgcc_s-temp"
+		rm -r "${TDIR}" || gen_die "Failed to clean out existing '${TDIR}'!"
 	fi
 
-	mkdir -p "${TEMP}/initramfs-libgcc_s-temp"
+	mkdir "${TDIR}" || gen_die "Failed to create '${TDIR}'!"
+	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 
 	# Include libgcc_s.so.1:
 	#   - workaround for zfsonlinux/zfs#4749
@@ -631,17 +633,12 @@ append_libgcc_s() {
 		libgccpath="/usr/lib/gcc/*/*/libgcc_s.so.1"
 	fi
 
-	# Copy binaries
-	copy_binaries "${TEMP}/initramfs-libgcc_s-temp" ${libgccpath}
-	cd "${TEMP}/initramfs-libgcc_s-temp/lib64"
-	ln -s "..${libgccpath}"
+	copy_binaries "${TDIR}" ${libgccpath}
 
-	cd "${TEMP}/initramfs-libgcc_s-temp/"
+	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
-			|| gen_die "compressing libgcc_s cpio"
-	cd "${TEMP}"
-	rm -rf "${TEMP}/initramfs-libgcc_s-temp" > /dev/null
+		|| gen_die "Failed to append libgcc_s to cpio!"
 }
 
 append_linker() {

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

[Thomas Deutschmann]

commit:     cdad1c02a69452f6c3a52d5ce92e5009311e0c25
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 09:17:42 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 11:58:15 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cdad1c02

gen_initramfs.sh: Refactor log_future_cpio_content()

Always log to $LOGFILE.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index fb3b3ce..2a0d615 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -63,12 +63,10 @@ copy_binaries() {
 }
 
 log_future_cpio_content() {
-	if [[ "${LOGLEVEL}" -gt 1 ]]; then
-		echo =================================================================
-		echo "About to add these files from '${PWD}' to cpio archive:"
-		find . | xargs ls -ald
-		echo =================================================================
-	fi
+	print_info 2 "=================================================================" 1 0 1
+	print_info 2 "About to add these files from '${PWD}' to cpio archive:" 1 0 1
+	print_info 2 "$(find . | xargs ls -ald)" 1 0 1
+	print_info 2 "=================================================================" 1 0 1
 }
 
 append_devices() {

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

[Thomas Deutschmann]

commit:     92e08d1a13436cd4cd6bc15dc17190df6bef01bf
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 09:24:20 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 11:58:15 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=92e08d1a

gen_initramfs.sh: Refactor append_devices()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 2a0d615..7b282d2 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -70,26 +70,34 @@ log_future_cpio_content() {
 }
 
 append_devices() {
+	local TFILE="${TEMP}/initramfs-base-temp.devices"
+	if [ -f "${TFILE}" ]
+	then
+		rm "${TFILE}" || gen_die "Failed to clean out existing '${TFILE}'!"
+	fi
+
 	if [[ ! -x "${KERNEL_OUTPUTDIR}/usr/gen_init_cpio" ]]; then
 		compile_gen_init_cpio
 	fi
 
 	# WARNING, does NOT support appending to cpio!
-	cat >"${TEMP}/initramfs-base-temp.devices" <<-EOF
+	cat >"${TFILE}" <<-EOF
 	dir /dev 0755 0 0
 	nod /dev/console 660 0 0 c 5 1
-	nod /dev/null 660 0 0 c 1 3
-	nod /dev/zero 660 0 0 c 1 5
+	nod /dev/null 666 0 0 c 1 3
+	nod /dev/zero 666 0 0 c 1 5
 	nod /dev/tty0 600 0 0 c 4 0
 	nod /dev/tty1 600 0 0 c 4 1
 	nod /dev/ttyS0 600 0 0 c 4 64
 	EOF
-	if [[ "${LOGLEVEL}" -gt 1 ]]; then
-		echo "$(getIndent 2)Adding devices to cpio:"
-		cat "${TEMP}/initramfs-base-temp.devices"
-	fi
-	${KERNEL_OUTPUTDIR}/usr/gen_init_cpio "${TEMP}/initramfs-base-temp.devices" >"${CPIO}" \
-			|| gen_die "Failed to add devices to cpio"
+
+	print_info 2 "=================================================================" 1 0 1
+	print_info 2 "Adding the following devices to cpio:" 1 0 1
+	print_info 2 "$(cat "${TFILE}")" 1 0 1
+	print_info 2 "=================================================================" 1 0 1
+
+	"${KERNEL_OUTPUTDIR}"/usr/gen_init_cpio "${TFILE}" >"${CPIO}" \
+		|| gen_die "Failed to append devices to cpio!"
 }
 
 append_base_layout() {

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

[Thomas Deutschmann]

commit:     97999e87aba2a55e3e719742f25eb53265a46df3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 10:40:22 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 11:58:18 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=97999e87

gen_initramfs.sh: Add copy_system_binaries() function

Difference to copy_binaries() is, that copy_system_binaries() does NOT
try to recreate directory structure. Any system binary to copy will be
placed into same destination directory.
Because we focus on *system* binaries, it's safe to assume that everything
belongs to the same directory. This assumption will allow us to copy from
crossdev environments (i.e. /usr/$CHOST).

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 109 insertions(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index df168d8..2b00d5e 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -62,6 +62,114 @@ copy_binaries() {
 		|| gen_die "Binary '${binary}' or some of its library dependencies could not be copied!"
 }
 
+# @FUNCTION: copy_system_binaries
+# @USAGE: <DESTDIR> <system binaries to copy>
+# @DESCRIPTION:
+# Copies system binaries into dest dir.
+#
+# Difference to copy_binaries() is, that copy_system_binaries() does NOT
+# try to recreate directory structure. Any system binary to copy will be
+# placed into same DESTination DIRectory.
+# Because we focus on *system* binaries, it's safe to assume that everything
+# belongs to the same directory. This assumption will allow us to copy from
+# crossdev environments (i.e. /usr/$CHOST).
+copy_system_binaries() {
+	[[ ${#} -lt 2 ]] \
+		&& gen_die "$(get_useful_function_stack "${FUNCNAME}")Invalid usage of ${FUNCNAME}(): Function takes at least two arguments (${#} given)!"
+
+	local destdir=${1}
+	shift
+
+	[[ ! -d "${destdir}" ]] \
+		&& gen_die "$(get_useful_function_stack "${FUNCNAME}")Invalid usage of ${FUNCNAME}(): Destdir '${destdir}' does NOT exist!"
+
+	if [ ! -f "${TEMP}/.system_binaries_copied" ]
+	then
+		touch "${TEMP}/.system_binaries_copied" \
+			|| gen_die "Failed to set '${TEMP}/.system_binaries_copied' marker!"
+	fi
+
+	local binary binary_realpath binary_basename base_dir
+	local binary_dependency binary_dependency_basename
+	for binary in "$@"
+	do
+		[[ -e "${binary}" ]] \
+			|| gen_die "$(get_useful_function_stack)System binary '${binary}' could not be found!"
+
+		print_info 5 "System binary '${binary}' should be copied to '${destdir}' ..."
+
+		binary_basename=$(basename "${binary}")
+		if [[ -z "${binary_basename}" ]]
+		then
+			gen_die "$(get_useful_function_stack)Failed to determine basename of '${binary}'!"
+		else
+			print_info 5 "System binary's basename is '${binary_basename}'."
+		fi
+
+		if [[ -e "${destdir}/${binary_basename}" ]]
+		then
+			print_info 5 "System binary '${binary_basename}' already exists in '${destdir}'; Skipping ..."
+			continue
+		fi
+
+		if [[ -L "${binary}" ]]
+		then
+			binary_realpath=$(realpath "${binary}")
+			if [[ -z "${binary_realpath}" ]]
+			then
+				gen_die "$(get_useful_function_stack)Failed to resolve path to '${binary}'!"
+			elif [[ ! -e "${binary_realpath}" ]]
+			then
+				gen_die "$(get_useful_function_stack)System binary '${binary}' was resolved to '${binary_realpath}' but file does NOT exist!"
+			else
+				print_info 5 "System binary '${binary}' resolved to '${binary_realpath}'."
+				binary=${binary_realpath}
+			fi
+		fi
+
+		base_dir=$(dirname "${binary}")
+		if [[ -z "${base_dir}" ]]
+		then
+			gen_die "$(get_useful_function_stack)Failed to determine directory of '${binary}'!"
+		else
+			print_info 5 "System binary dirname set to '${base_dir}'."
+		fi
+
+		if LC_ALL=C lddtree "${binary}" 2>&1 | fgrep -q 'not found'
+		then
+			gen_die "$(get_useful_function_stack)System binary '${binary}' is linked to missing libraries and may need to be re-built!"
+		fi
+
+		local is_first=1
+		while IFS= read -r -u 3 binary_dependency
+		do
+			binary_dependency_basename=$(basename "${binary_dependency}")
+			if [[ -z "${binary_dependency_basename}" ]]
+			then
+				gen_die "$(get_useful_function_stack)Failed to determine basename of '${binary_dependency}'!"
+			fi
+
+			if [[ ${is_first} -eq 1 ]]
+			then
+				# `lddtree --list` first line is always the binary itself
+				print_info 5 "Copying '${base_dir}/${binary_dependency_basename}' to '${destdir}/' ..."
+				cp -aL "${base_dir}/${binary_dependency_basename}" "${destdir}/${binary_basename}" \
+					|| gen_die "$(get_useful_function_stack)Failed to copy '${base_dir}/${binary_dependency_basename}' to '${destdir}'!"
+
+				is_first=0
+			elif [[ -e "${destdir}/${binary_dependency_basename}" ]]
+			then
+				print_info 5 "System binary '${binary_basename}' already exists in '${destdir}'; Skipping ..."
+				continue
+			else
+				print_info 5 "Need to copy dependency '${base_dir}/${binary_dependency_basename}' ..."
+				"${FUNCNAME}" "${destdir}" "${base_dir}/${binary_dependency_basename}"
+			fi
+		done 3< <(lddtree --list "${binary}" 2>/dev/null)
+		IFS="${GK_DEFAULT_IFS}"
+	done
+}
+
 log_future_cpio_content() {
 	print_info 2 "=================================================================" 1 0 1
 	print_info 2 "About to add these files from '${PWD}' to cpio archive:" 1 0 1
@@ -1413,7 +1521,7 @@ create_initramfs() {
 		append_data 'overlay'
 	fi
 
-	if [ -f "${TEMP}/.binaries_copied" ]
+	if [[ -f "${TEMP}/.binaries_copied" || -f "${TEMP}/.system_binaries_copied" ]]
 	then
 		append_data 'linker'
 	else

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

[Thomas Deutschmann]

commit:     db94e5a20cd0a9bd458a3a3df515f5e47985dab5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 09:51:25 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 11:58:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=db94e5a2

gen_initramfs.sh: Refactor append_splash

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 68 ++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 41 insertions(+), 27 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 56c84c7..aace8c9 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -682,35 +682,49 @@ append_linker() {
 		|| gen_die "Failed to append linker to cpio!"
 }
 
-append_splash(){
-	splash_geninitramfs=`which splash_geninitramfs 2>/dev/null`
-	if [ -x "${splash_geninitramfs}" ] && grep -q -E '^CONFIG_FRAMEBUFFER_CONSOLE=[y|m]' ${KERNEL_CONFIG}
+append_splash() {
+	local TDIR="${TEMP}/initramfs-splash-temp"
+	if [ -d "${TDIR}" ]
 	then
-		[ -z "${SPLASH_THEME}" ] && [ -e /etc/conf.d/splash ] && source /etc/conf.d/splash
-		[ -z "${SPLASH_THEME}" ] && SPLASH_THEME=default
-		print_info 1 "$(getIndent 1)>> Installing splash [ using the ${SPLASH_THEME} theme ]..."
-		if [ -d "${TEMP}/initramfs-splash-temp" ]
-		then
-			rm -r "${TEMP}/initramfs-splash-temp/"
-		fi
-		mkdir -p "${TEMP}/initramfs-splash-temp"
-		cd /
-		local tmp=""
-		[ -n "${SPLASH_RES}" ] && tmp="-r ${SPLASH_RES}"
-		splash_geninitramfs -c "${TEMP}/initramfs-splash-temp" ${tmp} ${SPLASH_THEME} || gen_die "Could not build splash cpio archive"
-		if [ -e "/usr/share/splashutils/initrd.splash" ]; then
-			mkdir -p "${TEMP}/initramfs-splash-temp/etc"
-			cp -f "/usr/share/splashutils/initrd.splash" "${TEMP}/initramfs-splash-temp/etc"
-		fi
-		cd "${TEMP}/initramfs-splash-temp/"
-		log_future_cpio_content
-		find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
-			|| gen_die "compressing splash cpio"
-		cd "${TEMP}"
-		rm -r "${TEMP}/initramfs-splash-temp/"
-	else
-		print_warning 1 "$(getIndent 1)>> No splash detected; skipping!"
+		rm -r "${TDIR}" || gen_die "Failed to clean out existing '${TDIR}'!"
+	fi
+
+	if ! hash splash_geninitramfs &>/dev/null
+	then
+		gen_die "Unable to generate splash, 'splash_geninitramfs' was not found!"
+	fi
+
+	mkdir "${TDIR}" || gen_die "Failed to create '${TDIR}'!"
+	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
+
+	if [ -z "${SPLASH_THEME}" -a -e /etc/conf.d/splash ]
+	then
+		source /etc/conf.d/splash &>/dev/null || gen_die "Failed to source '/etc/conf.d/splash'!"
+	fi
+
+	if [ -z "${SPLASH_THEME}" ]
+	then
+		SPLASH_THEME=default
+	fi
+
+	print_info 1 "$(get_indent 1)>> Installing splash [ using the ${SPLASH_THEME} theme ] ..."
+
+	local res_param=""
+	[ -n "${SPLASH_RES}" ] && res_param="-r ${SPLASH_RES}"
+	splash_geninitramfs -c "${TDIR}" ${res_param} ${SPLASH_THEME} \
+		| gen_die "Failed to build splash cpio archive"
+
+	if [ -e "/usr/share/splashutils/initrd.splash" ]
+	then
+		mkdir -p "${TDIR}"/etc || gen_die "Failed to create '${TDIR}/etc'!"
+		cp -f /usr/share/splashutils/initrd.splash "${TDIR}"/etc/ 2>/dev/null \
+			gen_die "Failed to copy '/usr/share/splashutils/initrd.splash'!"
 	fi
+
+	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
+	log_future_cpio_content
+	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+		|| gen_die "Failed to append splash to cpio!"
 }
 
 append_overlay() {

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

[Thomas Deutschmann]

commit:     8d58e2cf2c6c4cf00f06e9d234e0e70d8fbe5c1a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 10:41:38 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 11:58:18 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8d58e2cf

gen_compile.sh: Remove no longer used functions

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_compile.sh | 243 ---------------------------------------------------------
 1 file changed, 243 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 92efaa0..f62d80d 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -1,249 +1,6 @@
 #!/bin/bash
 # $Id$
 
-compile_kernel_args() {
-	local ARGS
-
-	ARGS=''
-	if [ "${KERNEL_CROSS_COMPILE}" != '' ]
-	then
-		ARGS="${ARGS} CROSS_COMPILE=\"${KERNEL_CROSS_COMPILE}\""
-	fi
-	if [ "${KERNEL_CC}" != '' ]
-	then
-		ARGS="CC=\"${KERNEL_CC}\""
-	fi
-	if [ "${KERNEL_LD}" != '' ]
-	then
-		ARGS="${ARGS} LD=\"${KERNEL_LD}\""
-	fi
-	if [ "${KERNEL_AS}" != '' ]
-	then
-		ARGS="${ARGS} AS=\"${KERNEL_AS}\""
-	fi
-	if [ -n "${KERNEL_ARCH}" ]
-	then
-		ARGS="${ARGS} ARCH=\"${KERNEL_ARCH}\""
-	fi
-	if [ -n "${KERNEL_OUTPUTDIR}" -a "${KERNEL_OUTPUTDIR}" != "${KERNEL_DIR}" ]
-	then
-		ARGS="${ARGS} O=\"${KERNEL_OUTPUTDIR}\""
-	fi
-	printf "%s" "${ARGS}"
-}
-
-compile_utils_args()
-{
-	local ARGS
-	ARGS=''
-
-	if [ -n "${UTILS_CROSS_COMPILE}" ]
-	then
-		UTILS_CC="${UTILS_CROSS_COMPILE}gcc"
-		UTILS_LD="${UTILS_CROSS_COMPILE}ld"
-		UTILS_AS="${UTILS_CROSS_COMPILE}as"
-	fi
-
-	if [ "${UTILS_ARCH}" != '' ]
-	then
-		ARGS="ARCH=\"${UTILS_ARCH}\""
-	fi
-	if [ "${UTILS_CC}" != '' ]
-	then
-		ARGS="CC=\"${UTILS_CC}\""
-	fi
-	if [ "${UTILS_LD}" != '' ]
-	then
-		ARGS="${ARGS} LD=\"${UTILS_LD}\""
-	fi
-	if [ "${UTILS_AS}" != '' ]
-	then
-		ARGS="${ARGS} AS=\"${UTILS_AS}\""
-	fi
-
-	printf "%s" "${ARGS}"
-}
-
-export_utils_args()
-{
-	save_args
-	if [ "${UTILS_ARCH}" != '' ]
-	then
-		export ARCH="${UTILS_ARCH}"
-	fi
-	if [ "${UTILS_CC}" != '' ]
-	then
-		export CC="${UTILS_CC}"
-	fi
-	if [ "${UTILS_LD}" != '' ]
-	then
-		export LD="${UTILS_LD}"
-	fi
-	if [ "${UTILS_AS}" != '' ]
-	then
-		export AS="${UTILS_AS}"
-	fi
-	if [ "${UTILS_CROSS_COMPILE}" != '' ]
-	then
-		export CROSS_COMPILE="${UTILS_CROSS_COMPILE}"
-	fi
-}
-
-unset_utils_args()
-{
-	if [ "${UTILS_ARCH}" != '' ]
-	then
-		unset ARCH
-	fi
-	if [ "${UTILS_CC}" != '' ]
-	then
-		unset CC
-	fi
-	if [ "${UTILS_LD}" != '' ]
-	then
-		unset LD
-	fi
-	if [ "${UTILS_AS}" != '' ]
-	then
-		unset AS
-	fi
-	if [ "${UTILS_CROSS_COMPILE}" != '' ]
-	then
-		unset CROSS_COMPILE
-	fi
-	reset_args
-}
-
-export_kernel_args()
-{
-	if [ "${KERNEL_CC}" != '' ]
-	then
-		export CC="${KERNEL_CC}"
-	fi
-	if [ "${KERNEL_LD}" != '' ]
-	then
-		export LD="${KERNEL_LD}"
-	fi
-	if [ "${KERNEL_AS}" != '' ]
-	then
-		export AS="${KERNEL_AS}"
-	fi
-	if [ "${KERNEL_CROSS_COMPILE}" != '' ]
-	then
-		export CROSS_COMPILE="${KERNEL_CROSS_COMPILE}"
-	fi
-}
-
-unset_kernel_args()
-{
-	if [ "${KERNEL_CC}" != '' ]
-	then
-		unset CC
-	fi
-	if [ "${KERNEL_LD}" != '' ]
-	then
-		unset LD
-	fi
-	if [ "${KERNEL_AS}" != '' ]
-	then
-		unset AS
-	fi
-	if [ "${KERNEL_CROSS_COMPILE}" != '' ]
-	then
-		unset CROSS_COMPILE
-	fi
-}
-save_args()
-{
-	if [ "${ARCH}" != '' ]
-	then
-		export ORIG_ARCH="${ARCH}"
-	fi
-	if [ "${CC}" != '' ]
-	then
-		export ORIG_CC="${CC}"
-	fi
-	if [ "${LD}" != '' ]
-	then
-		export ORIG_LD="${LD}"
-	fi
-	if [ "${AS}" != '' ]
-	then
-		export ORIG_AS="${AS}"
-	fi
-	if [ "${CROSS_COMPILE}" != '' ]
-	then
-		export ORIG_CROSS_COMPILE="${CROSS_COMPILE}"
-	fi
-}
-reset_args()
-{
-	if [ "${ORIG_ARCH}" != '' ]
-	then
-		export ARCH="${ORIG_ARCH}"
-		unset ORIG_ARCH
-	fi
-	if [ "${ORIG_CC}" != '' ]
-	then
-		export CC="${ORIG_CC}"
-		unset ORIG_CC
-	fi
-	if [ "${ORIG_LD}" != '' ]
-	then
-		export LD="${ORIG_LD}"
-		unset ORIG_LD
-	fi
-	if [ "${ORIG_AS}" != '' ]
-	then
-		export AS="${ORIG_AS}"
-		unset ORIG_AS
-	fi
-	if [ "${ORIG_CROSS_COMPILE}" != '' ]
-	then
-		export CROSS_COMPILE="${ORIG_CROSS_COMPILE}"
-		unset ORIG_CROSS_COMPILE
-	fi
-}
-
-apply_patches() {
-	util=$1
-	version=$2
-	patchdir=${GK_SHARE}/patches/${util}/${version}
-
-	if [ -d "${patchdir}" ]
-	then
-		local silent="-s "
-		if [[ "${LOGLEVEL}" -gt 1 ]]; then
-			silent=
-		fi
-
-		print_info 1 "$(getIndent 2)${util}: >> Applying patches ..."
-		for i in ${patchdir}/*{diff,patch}
-		do
-			[ -f "${i}" ] || continue
-			patch_success=0
-			for j in $(seq 0 5)
-			do
-				patch -p${j} --backup-if-mismatch -f < "${i}" --dry-run >/dev/null && \
-					patch ${silent}-p${j} --backup-if-mismatch -f < "${i}"
-				if [ $? = 0 ]
-				then
-					patch_success=1
-					break
-				fi
-			done
-			if [ ${patch_success} -eq 1 ]
-			then
-				print_info 2 "$(getIndent 3) - $(basename "${i}")"
-			else
-				gen_die "Failed to apply patch '${i}' for '${util}-${version}'!"
-			fi
-		done
-	else
-		print_info 1 "$(getIndent 2)${util}: >> No patches found in $patchdir ..."
-	fi
-}
-
 compile_gen_init_cpio() {
 	local gen_init_cpio_SRC="${KERNEL_DIR}/usr/gen_init_cpio.c"
 	local gen_init_cpio_DIR="${KERNEL_OUTPUTDIR}/usr"

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

[Thomas Deutschmann]

commit:     f45c5b7b61b0bd0329cd6ca972a044035ff5b7eb
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 09:58:55 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 11:58:18 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f45c5b7b

gen_initramfs.sh: Refactor create_initramfs()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 197 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 109 insertions(+), 88 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 7723204..df168d8 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1358,7 +1358,7 @@ append_data() {
 }
 
 create_initramfs() {
-	local lddtree_testfile=`which cpio 2>/dev/null`
+	local lddtree_testfile=$(which cpio 2>/dev/null)
 	if [[ -z "${lddtree_testfile}" || ! -e "${lddtree_testfile}" ]]; then
 		print_warning 1 "cpio binary not found -- cannot check if lddtree is working!"
 	elif ! lddtree "${lddtree_testfile}" 1>/dev/null 2>&1; then
@@ -1366,42 +1366,29 @@ create_initramfs() {
 	fi
 
 	local compress_ext=""
-	print_info 1 "initramfs: >> Initializing..."
+	print_info 1 "initramfs: >> Initializing ..."
 
 	# Create empty cpio
 	CPIO="${TMPDIR}/initramfs-${KV}"
 	append_data 'devices' # WARNING, must be first!
 	append_data 'base_layout'
 	append_data 'auxilary' "${BUSYBOX}"
+	append_data 'blkid' "${DISKLABEL}"
+	append_data 'btrfs' "${BTRFS}"
 	append_data 'busybox' "${BUSYBOX}"
-	isTrue "${CMD_E2FSPROGS}" && append_data 'e2fsprogs'
-	append_data 'lvm' "${LVM}"
 	append_data 'dmraid' "${DMRAID}"
+	append_data 'dropbear' "${SSH}"
+	append_data 'e2fsprogs' "${E2FSPROGS}"
+	append_data 'gpg' "${GPG}"
 	append_data 'iscsi' "${ISCSI}"
-	append_data 'mdadm' "${MDADM}"
 	append_data 'luks' "${LUKS}"
-	append_data 'dropbear' "${SSH}"
+	append_data 'lvm' "${LVM}"
+	append_data 'mdadm' "${MDADM}"
+	append_data 'modprobed'
 	append_data 'multipath' "${MULTIPATH}"
-	append_data 'gpg' "${GPG}"
-
-	if isTrue "${RAMDISKMODULES}"
-	then
-		append_data 'modules'
-	else
-		print_info 1 "initramfs: Not copying modules..."
-	fi
-
-	append_data 'zfs' "${ZFS}"
-
-	append_data 'btrfs' "${BTRFS}"
-
-	append_data 'blkid' "${DISKLABEL}"
-
-	append_data 'unionfs_fuse' "${UNIONFS}"
-
 	append_data 'splash' "${SPLASH}"
-
-	append_data 'modprobed'
+	append_data 'unionfs_fuse' "${UNIONFS}"
+	append_data 'zfs' "${ZFS}"
 
 	if isTrue "${ZFS}"
 	then
@@ -1413,8 +1400,15 @@ create_initramfs() {
 		append_data 'firmware'
 	fi
 
+	if isTrue "${RAMDISKMODULES}"
+	then
+		append_data 'modules'
+	else
+		print_info 1 "$(get_indent 1)>> Not copying modules due to --no-ramdisk-modules ..."
+	fi
+
 	# This should always be appended last
-	if [ "${INITRAMFS_OVERLAY}" != '' ]
+	if [ -n "${INITRAMFS_OVERLAY}" ]
 	then
 		append_data 'overlay'
 	fi
@@ -1423,40 +1417,51 @@ create_initramfs() {
 	then
 		append_data 'linker'
 	else
-		print_info 2 "initramfs: Not appending linker because no binaries have been copied ..."
+		print_info 2 "$(get_indent 1)>> Not appending linker because no binaries have been copied ..."
 	fi
 
 	# Finalize cpio by removing duplicate files
 	# TODO: maybe replace this with:
 	# http://search.cpan.org/~pixel/Archive-Cpio-0.07/lib/Archive/Cpio.pm
 	# as then we can dedupe ourselves...
-	if [[ $UID -eq 0 ]]; then
-		print_info 1 "$(getIndent 1)>> Deduping cpio..."
+	if [[ $UID -eq 0 ]]
+	then
+		print_info 1 "$(get_indent 1)>> Deduping cpio ..."
 		local TDIR="${TEMP}/initramfs-final"
-		mkdir -p "${TDIR}"
-		cd "${TDIR}"
+		mkdir -p "${TDIR}" || gen_die "Failed to create '${TDIR}'!"
+		cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
+
+		cpio --quiet -i -F "${CPIO}" 2>/dev/null \
+			|| gen_die "Failed to extract cpio '${CPIO}' for dedupe"
+
+		if [ -e etc/ld.so.cache ] && ! isTrue "$(tc-is-cross-compiler)"
+		then
+			# We can update /etc/ld.so.cache which was copied from host
+			# to actually match initramfs' content.
+			print_info 1 "$(get_indent 1)>> Pre-generating initramfs' /etc/ld.so.cache ..."
+			ldconfig -r . 2>/dev/null \
+				|| gen_die "Failed to pre-generate '${TDIR}/etc/ld.so.cache'!"
+		fi
 
-		cpio --quiet -i -F "${CPIO}" 2> /dev/null \
-			|| gen_die "extracting cpio for dedupe"
 		find . -print | cpio ${CPIO_ARGS} -F "${CPIO}" 2>/dev/null \
 			|| gen_die "rebuilding cpio for dedupe"
-		cd "${TEMP}"
-		rm -rf "${TDIR}"
 	else
-		print_info 1 "$(getIndent 1)>> Cannot deduping cpio contents without root; skipping"
+		print_info 1 "$(get_indent 1)>> Cannot deduping cpio contents without root; Skipping ..."
 	fi
 
-	cd "${TEMP}"
+	cd "${TEMP}" || gen_die "Failed to chdir to '${TEMP}'"
 
 	# NOTE: We do not work with ${KERNEL_CONFIG} here, since things like
 	#       "make oldconfig" or --noclean could be in effect.
-	if [ -f "${KERNEL_OUTPUTDIR}"/.config ]; then
+	if [ -f "${KERNEL_OUTPUTDIR}"/.config ]
+	then
 		local ACTUAL_KERNEL_CONFIG="${KERNEL_OUTPUTDIR}"/.config
 	else
 		local ACTUAL_KERNEL_CONFIG="${KERNEL_CONFIG}"
 	fi
 
-	if [[ "$(file --brief --mime-type "${ACTUAL_KERNEL_CONFIG}")" == application/x-gzip ]]; then
+	if [[ "$(file --brief --mime-type "${ACTUAL_KERNEL_CONFIG}")" == application/x-gzip ]]
+	then
 		# Support --kernel-config=/proc/config.gz, mainly
 		local CONFGREP=zgrep
 	else
@@ -1468,10 +1473,10 @@ create_initramfs() {
 		# Explicitly do not compress if we are integrating into the kernel.
 		# 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_OUTPUTDIR}/.config" ||
-			gen_die "failed to delete CONFIG_INITRAMFS_SOURCE from '${KERNEL_OUTPUTDIR}/.config'"
+		sed -i '/^.*CONFIG_INITRAMFS_SOURCE=.*$/d' "${KERNEL_OUTPUTDIR}/.config" \
+			|| gen_die "failed to delete CONFIG_INITRAMFS_SOURCE from '${KERNEL_OUTPUTDIR}/.config'"
 
-		compress_config='INITRAMFS_COMPRESSION_NONE'
+		local compress_config='INITRAMFS_COMPRESSION_NONE'
 		case ${compress_ext} in
 			gz)   compress_config='INITRAMFS_COMPRESSION_GZIP' ;;
 			bz2)  compress_config='INITRAMFS_COMPRESSION_BZIP2' ;;
@@ -1481,6 +1486,7 @@ create_initramfs() {
 			lz4)  compress_config='INITRAMFS_COMPRESSION_LZ4' ;;
 			*)    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_OUTPUTDIR}/.config	<<-EOF
@@ -1499,23 +1505,24 @@ create_initramfs() {
 	else
 		if isTrue "${COMPRESS_INITRD}"
 		then
-			cmd_xz=$(type -p xz)
-			cmd_lzma=$(type -p lzma)
-			cmd_bzip2=$(type -p bzip2)
-			cmd_gzip=$(type -p gzip)
-			cmd_lzop=$(type -p lzop)
-			cmd_lz4=$(type -p lz4)
-			pkg_xz='app-arch/xz-utils'
-			pkg_lzma='app-arch/xz-utils'
-			pkg_bzip2='app-arch/bzip2'
-			pkg_gzip='app-arch/gzip'
-			pkg_lzop='app-arch/lzop'
-			pkg_lz4='app-arch/lz4'
+			local cmd_xz=$(type -p xz)
+			local cmd_lzma=$(type -p lzma)
+			local cmd_bzip2=$(type -p bzip2)
+			local cmd_gzip=$(type -p gzip)
+			local cmd_lzop=$(type -p lzop)
+			local cmd_lz4=$(type -p lz4)
+			local pkg_xz='app-arch/xz-utils'
+			local pkg_lzma='app-arch/xz-utils'
+			local pkg_bzip2='app-arch/bzip2'
+			local pkg_gzip='app-arch/gzip'
+			local pkg_lzop='app-arch/lzop'
+			local pkg_lz4='app-arch/lz4'
 			local compression
 			case ${COMPRESS_INITRD_TYPE} in
 				xz|lzma|bzip2|gzip|lzop|lz4) compression=${COMPRESS_INITRD_TYPE} ;;
 				lzo) compression=lzop ;;
 				best|fastest)
+					local tuple
 					for tuple in \
 							'CONFIG_RD_XZ    cmd_xz    xz' \
 							'CONFIG_RD_LZMA  cmd_lzma  lzma' \
@@ -1525,10 +1532,10 @@ create_initramfs() {
 							'CONFIG_RD_LZ4   cmd_lz4   lz4' \
 							; do
 						set -- ${tuple}
-						kernel_option=$1
-						cmd_variable_name=$2
+						local kernel_option=${1}
+						local cmd_variable_name=${2}
 						if ${CONFGREP} -q "^${kernel_option}=y" "${ACTUAL_KERNEL_CONFIG}" && test -n "${!cmd_variable_name}" ; then
-							compression=$3
+							compression=${3}
 							[[ ${COMPRESS_INITRD_TYPE} == best ]] && break
 						fi
 					done
@@ -1540,11 +1547,12 @@ create_initramfs() {
 			esac
 
 			# Check for actual availability
-			cmd_variable_name=cmd_${compression}
-			pkg_variable_name=pkg_${compression}
+			local cmd_variable_name=cmd_${compression}
+			local pkg_variable_name=pkg_${compression}
 			[[ -z "${!cmd_variable_name}" ]] && gen_die "Compression '${compression}' is not available. Please install package '${!pkg_variable_name}'."
 
-			case $compression in
+			local compress_ext compress_cmd
+			case ${compression} in
 				xz) compress_ext='.xz' compress_cmd="${cmd_xz} -e --check=none -z -f -9" ;;
 				lzma) compress_ext='.lzma' compress_cmd="${cmd_lzma} -z -f -9" ;;
 				bzip2) compress_ext='.bz2' compress_cmd="${cmd_bzip2} -z -f -9" ;;
@@ -1553,13 +1561,14 @@ create_initramfs() {
 				lz4) compress_ext='.lz4' compress_cmd="${cmd_lz4} -f -9 -l -q" ;;
 			esac
 
-			if [ -n "${compression}" ]; then
-				print_info 1 "$(getIndent 1)>> Compressing cpio data (${compress_ext})..."
-				print_info 5 "$(getIndent 1)>> Compression command (${compress_cmd} $CPIO)..."
+			if [ -n "${compression}" ]
+			then
+				print_info 1 "$(get_indent 1)>> Compressing cpio data (${compress_ext}) ..."
+				print_info 2 "COMMAND: ${compress_cmd} $CPIO" 1 0 1
 				${compress_cmd} "${CPIO}" || gen_die "Compression (${compress_cmd}) failed"
 				mv -f "${CPIO}${compress_ext}" "${CPIO}" || gen_die "Rename failed"
 			else
-				print_info 1 "$(getIndent 1)>> Not compressing cpio data ..."
+				print_info 1 "$(get_indent 1)>> Not compressing cpio data ..."
 			fi
 		fi
 
@@ -1567,55 +1576,66 @@ create_initramfs() {
 		## mostly laid out in linux/Documentation/x86/early-microcode.txt
 		## It only loads monolithic ucode from an uncompressed cpio, which MUST
 		## be before the other cpio archives in the stream.
-		cfg_CONFIG_MICROCODE=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE)
-		if isTrue "${MICROCODE_INITRAMFS}" && [ "${cfg_CONFIG_MICROCODE}" == "y" ]; then
-			if [[ "${MICROCODE}" == intel ]]; then
+		local cfg_CONFIG_MICROCODE=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE)
+		if isTrue "${MICROCODE_INITRAMFS}" && [ "${cfg_CONFIG_MICROCODE}" == "y" ]
+		then
+			if [[ "${MICROCODE}" == intel ]]
+			then
 				# Only show this information for Intel users because we have no mechanism yet
 				# to generate amd-*.img in /boot after sys-kernel/linux-firmware update
 				print_info 1 "MICROCODE_INITRAMFS option is enabled by default for compatability but made obsolete by >=sys-boot/grub-2.02-r1"
 			fi
 
-			cfg_CONFIG_MICROCODE_INTEL=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_INTEL)
-			cfg_CONFIG_MICROCODE_AMD=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_AMD)
-			print_info 1 "$(getIndent 1)>> Adding early-microcode support..."
-			UCODEDIR="${TEMP}/ucode_tmp/kernel/x86/microcode/"
-			mkdir -p "${UCODEDIR}"
-			if [ "${cfg_CONFIG_MICROCODE_INTEL}" == "y" ]; then
-				if [ -d /lib/firmware/intel-ucode ]; then
-					print_info 1 "$(getIndent 2)early-microcode: Adding GenuineIntel.bin..."
+			local cfg_CONFIG_MICROCODE_INTEL=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_INTEL)
+			local cfg_CONFIG_MICROCODE_AMD=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_AMD)
+			print_info 1 "$(get_indent 1)>> Adding early-microcode support ..."
+			local UCODEDIR="${TEMP}/ucode_tmp/kernel/x86/microcode/"
+			mkdir -p "${UCODEDIR}" || gen_die "Failed to create '${UCODEDIR}'!"
+
+			if [[ "${cfg_CONFIG_MICROCODE_INTEL}" == "y" ]]
+			then
+				if [ -d /lib/firmware/intel-ucode ]
+				then
+					print_info 1 "$(get_indent 2)early-microcode: Adding GenuineIntel.bin ..."
 					cat /lib/firmware/intel-ucode/* > "${UCODEDIR}/GenuineIntel.bin" || gen_die "Failed to concat intel cpu ucode"
 				else
-					print_info 1 "$(getIndent 2)early-microcode: CONFIG_MICROCODE_INTEL=y set but no ucode available. Please install sys-firmware/intel-microcode[split-ucode]"
+					print_info 1 "$(get_indent 2)early-microcode: CONFIG_MICROCODE_INTEL=y set but no ucode available. Please install sys-firmware/intel-microcode[split-ucode]"
 				fi
 			fi
-			if [ "${cfg_CONFIG_MICROCODE_AMD}" == "y" ]; then
-				if [ -d /lib/firmware/amd-ucode ]; then
-					print_info 1 "$(getIndent 2)early-microcode: Adding AuthenticAMD.bin..."
+
+			if [[ "${cfg_CONFIG_MICROCODE_AMD}" == "y" ]]
+			then
+				if [ -d /lib/firmware/amd-ucode ]
+				then
+					print_info 1 "$(get_indent 2)early-microcode: Adding AuthenticAMD.bin ..."
 					cat /lib/firmware/amd-ucode/*.bin > "${UCODEDIR}/AuthenticAMD.bin" || gen_dir "Failed to concat amd cpu ucode"
 				else
-					print_info 1 "$(getIndent 2)early-microcode: CONFIG_MICROCODE_AMD=y set but no ucode available. Please install sys-firmware/linux-firmware"
+					print_info 1 "$(get_indent 2)early-microcode: CONFIG_MICROCODE_AMD=y set but no ucode available. Please install sys-firmware/linux-firmware"
 				fi
 			fi
-			if [ -f "${UCODEDIR}/AuthenticAMD.bin" -o -f "${UCODEDIR}/GenuineIntel.bin" ]; then
-				print_info 1 "$(getIndent 2)early-microcode: Creating cpio..."
+
+			if [ -f "${UCODEDIR}/AuthenticAMD.bin" -o -f "${UCODEDIR}/GenuineIntel.bin" ]
+			then
+				print_info 1 "$(get_indent 2)early-microcode: Creating cpio ..."
 				pushd "${TEMP}/ucode_tmp" > /dev/null
 				find . | cpio -o -H newc > ../ucode.cpio || gen_die "Failed to create cpu microcode cpio"
 				popd > /dev/null
-				print_info 1 "$(getIndent 2)early-microcode: Prepending early-microcode to initramfs..."
+				print_info 1 "$(get_indent 2)early-microcode: Prepending early-microcode to initramfs ..."
 				cat "${TEMP}/ucode.cpio" "${CPIO}" > "${CPIO}.early-microcode" || gen_die "Failed to prepend early-microcode to initramfs"
 				mv -f "${CPIO}.early-microcode" "${CPIO}" || gen_die "Rename failed"
 			else
-				print_info 1 "$(getIndent 2)early-microcode: CONFIG_MICROCODE=y is set but no microcode found"
-				print_info 1 "$(getIndent 2)early-microcode: You can disable MICROCODE_INITRAMFS option if you use your bootloader to load AMD/Intel ucode initrd"
+				print_info 1 "$(get_indent 2)early-microcode: CONFIG_MICROCODE=y is set but no microcode found"
+				print_info 1 "$(get_indent 2)early-microcode: You can disable MICROCODE_INITRAMFS option if you use your bootloader to load AMD/Intel ucode initrd"
 			fi
 		fi
+
 		if isTrue "${WRAP_INITRD}"
 		then
 			local mkimage_cmd=$(type -p mkimage)
 			[[ -z ${mkimage_cmd} ]] && gen_die "mkimage is not available. Please install package 'dev-embedded/u-boot-tools'."
 			local mkimage_args="-A ${ARCH} -O linux -T ramdisk -C ${compression:-none} -a 0x00000000 -e 0x00000000"
-			print_info 1 "$(getIndent 1)>> Wrapping initramfs using mkimage..."
-			print_info 2 "$(getIndent 1)${mkimage_cmd} ${mkimage_args} -n initramfs-${KV} -d ${CPIO} ${CPIO}.uboot"
+			print_info 1 "$(get_indent 1)>> Wrapping initramfs using mkimage ..."
+			print_info 2 "$(get_indent 1)${mkimage_cmd} ${mkimage_args} -n initramfs-${KV} -d ${CPIO} ${CPIO}.uboot"
 			${mkimage_cmd} ${mkimage_args} -n "initramfs-${KV}" -d "${CPIO}" "${CPIO}.uboot" >> ${LOGFILE} 2>&1 || gen_die "Wrapping initramfs using mkimage failed"
 			mv -f "${CPIO}.uboot" "${CPIO}" || gen_die "Rename failed"
 		fi
@@ -1625,7 +1645,8 @@ create_initramfs() {
 	then
 		if ! isTrue "${INTEGRATED_INITRAMFS}"
 		then
-			copy_image_with_preserve "initramfs" \
+			copy_image_with_preserve \
+				"initramfs" \
 				"${TMPDIR}/initramfs-${KV}" \
 				"initramfs-${KNAME}-${ARCH}-${KV}"
 		fi

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

[Thomas Deutschmann]

commit:     7033442cf50d7d11740ab3c3e1c93c46e186adfb
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 10:40:59 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 11:58:18 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7033442c

gen_initramfs.sh: Remove dead code

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 2b00d5e..acb5c65 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -404,20 +404,6 @@ append_blkid() {
 		|| gen_die "Failed to append blkid to cpio!"
 }
 
-#append_fuse() {
-#	if [ -d "${TEMP}/initramfs-fuse-temp" ]
-#	then
-#		rm -r "${TEMP}/initramfs-fuse-temp"
-#	fi
-#	cd ${TEMP}
-#	mkdir -p "${TEMP}/initramfs-fuse-temp/lib/"
-#	tar -C "${TEMP}/initramfs-fuse-temp/lib/" -xf "${FUSE_BINCACHE}"
-#	cd "${TEMP}/initramfs-fuse-temp/"
-#	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
-#			|| gen_die "compressing fuse cpio"
-#	rm -rf "${TEMP}/initramfs-fuse-temp" > /dev/null
-#}
-
 append_unionfs_fuse() {
 	local PN=unionfs-fuse
 	local TDIR="${TEMP}/initramfs-${PN}-temp"
@@ -438,26 +424,6 @@ append_unionfs_fuse() {
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
-#append_suspend(){
-#	if [ -d "${TEMP}/initramfs-suspend-temp" ];
-#	then
-#		rm -r "${TEMP}/initramfs-suspend-temp/"
-#	fi
-#	print_info 1 "$(getIndent 2)SUSPEND: Adding support (compiling binaries)..."
-#	compile_suspend
-#	mkdir -p "${TEMP}/initramfs-suspend-temp/"
-#	/bin/tar -xpf "${SUSPEND_BINCACHE}" -C "${TEMP}/initramfs-suspend-temp" ||
-#		gen_die "Could not extract suspend binary cache!"
-#	mkdir -p "${TEMP}/initramfs-suspend-temp/etc"
-#	cp -f /etc/suspend.conf "${TEMP}/initramfs-suspend-temp/etc" ||
-#		gen_die 'Could not copy /etc/suspend.conf'
-#	cd "${TEMP}/initramfs-suspend-temp/"
-#	log_future_cpio_content
-#	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
-#			|| gen_die "compressing suspend cpio"
-#	rm -r "${TEMP}/initramfs-suspend-temp/"
-#}
-
 append_multipath() {
 	local PN=multipath-tools
 	local TDIR="${TEMP}/initramfs-${PN}-temp"

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

[Thomas Deutschmann]

commit:     a76b67b8013df36b4cc5b33d9c3e56dc3fab49db
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 09:50:29 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 11:58:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a76b67b8

gen_initramfs.sh: Refactor append_overlay()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index c4e9bdb..56c84c7 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -713,11 +713,12 @@ append_splash(){
 	fi
 }
 
-append_overlay(){
-	cd ${INITRAMFS_OVERLAY}
+append_overlay() {
+	cd "${INITRAMFS_OVERLAY}"  || gen_die "Failed to chdir to '${INITRAMFS_OVERLAY}'!"
+
 	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
-			|| gen_die "compressing overlay cpio"
+		|| gen_die "Failed to append overlay to cpio!"
 }
 
 append_luks() {

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

[Thomas Deutschmann]

commit:     7ad73a609d5e65fcc0ed9dd087da1f0cc3cd5e4c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 09:48:49 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 11:58:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7ad73a60

gen_initramfs.sh: Refactor append_modules()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 66 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 37 insertions(+), 29 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index c46721a..26b2ea3 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1096,21 +1096,29 @@ print_list()
 }
 
 append_modules() {
-	local group
-	local group_modules
-	local MOD_EXT="$(modules_kext)"
-
-	if [ -d "${TEMP}/initramfs-modules-${KV}-temp" ]
+	local TDIR="${TEMP}/initramfs-modules-${KV}-temp"
+	if [ -d "${TDIR}" ]
 	then
-		rm -r "${TEMP}/initramfs-modules-${KV}-temp/"
+		rm -r "${TDIR}" || gen_die "Failed to clean out existing '${TDIR}'!"
 	fi
 
-	print_info 2 "$(getIndent 2)modules: >> Copying modules to initramfs..."
+	mkdir "${TDIR}" || gen_die "Failed to create '${TDIR}'!"
+	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
+
+	local mydir=
+	for mydir in \
+		etc/modules \
+		lib/modules/${KV} \
+	; do
+		mkdir -p "${TDIR}"/${mydir} || gen_die "Failed to create '${TDIR}/${mydir}'!"
+	done
+
+	print_info 2 "$(get_indent 2)modules: >> Copying modules to initramfs ..."
 	if [ "${INSTALL_MOD_PATH}" != '' ]
 	then
-		cd ${INSTALL_MOD_PATH} || gen_die "Failed to chdir into '${INSTALL_MOD_PATH}'!"
+		cd "${INSTALL_MOD_PATH}" || gen_die "Failed to chdir to '${INSTALL_MOD_PATH}'!"
 	else
-		cd / || gen_die "Failed to chdir into '/'!"
+		cd / || gen_die "Failed to chdir to '/'!"
 	fi
 
 	local _MODULES_DIR="${PWD%/}/lib/modules/${KV}"
@@ -1122,45 +1130,45 @@ append_modules() {
 		gen_die "${error_message}"
 	fi
 
-	mkdir -p "${TEMP}/initramfs-modules-${KV}-temp/lib/modules/${KV}"
-
+	local i= mymod=
+	local MOD_EXT="$(modules_kext)"
 	local n_copied_modules=0
-	for i in `gen_dep_list`
+	for i in $(gen_dep_list)
 	do
-		mymod=`find "${_MODULES_DIR}" -name "${i}${MOD_EXT}" 2>/dev/null| head -n 1 `
+		mymod=$(find "${_MODULES_DIR}" -name "${i}${MOD_EXT}" 2>/dev/null | head -n 1)
 		if [ -z "${mymod}" ]
 		then
-			print_warning 2 "$(getIndent 3) - ${i}${MOD_EXT} not found; skipping..."
+			print_warning 2 "$(get_indent 3) - ${i}${MOD_EXT} not found; Skipping ..."
 			continue;
 		fi
 
-		print_info 2 "$(getIndent 3) - Copying ${i}${MOD_EXT}..."
-		cp -ax --parents "${mymod}" "${TEMP}/initramfs-modules-${KV}-temp" ||
-			gen_die "failed to copy '${mymod}' to '${TEMP}/initramfs-modules-${KV}-temp'"
+		print_info 2 "$(get_indent 3) - Copying ${i}${MOD_EXT} ..."
+		cp -ax --parents "${mymod}" "${TDIR}"/ 2>/dev/null \
+			|| gen_die "Failed to copy '${mymod}' to '${TDIR}/'!"
 		n_copied_modules=$[$n_copied_modules+1]
 	done
 
 	if [ ${n_copied_modules} -eq 0 ]
 	then
-		print_warning 1 "$(getIndent 2)modules: ${n_copied_modules} modules copied. Is that correct?"
+		print_warning 1 "$(get_indent 2)modules: ${n_copied_modules} modules copied. Is that correct?"
 	else
-		print_info 2 "$(getIndent 2)modules: ${n_copied_modules} modules copied!"
+		print_info 2 "$(get_indent 2)modules: ${n_copied_modules} modules copied!"
 	fi
 
-	cp -ax --parents "${_MODULES_DIR}"/modules* ${TEMP}/initramfs-modules-${KV}-temp ||
-		gen_die "failed to copy '${_MODULES_DIR}/modules*' to '${TEMP}/initramfs-modules-${KV}-temp'"
+	cp -ax --parents "${_MODULES_DIR}"/modules* "${TDIR}"/ 2>/dev/null \
+		|| gen_die "Failed to copy '${_MODULES_DIR}/modules*' to '${TDIR}/'!"
 
-	mkdir -p "${TEMP}/initramfs-modules-${KV}-temp/etc/modules"
+	local group_modules= group=
 	for group_modules in ${!MODULES_*}; do
-		group="$(echo $group_modules | cut -d_ -f2- | tr "[:upper:]" "[:lower:]")"
-		print_list ${!group_modules} > "${TEMP}/initramfs-modules-${KV}-temp/etc/modules/${group}"
+		group="$(echo ${group_modules} | cut -d_ -f2- | tr "[:upper:]" "[:lower:]")"
+		print_list ${!group_modules} > "${TDIR}"/etc/modules/${group} \
+			|| gen_die "Failed to create '${TDIR}/etc/modules/${group}'!"
 	done
-	cd "${TEMP}/initramfs-modules-${KV}-temp/"
+
+	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
-			|| gen_die "compressing modules cpio"
-	cd "${TEMP}"
-	rm -r "${TEMP}/initramfs-modules-${KV}-temp/"
+	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+		|| gen_die "Failed to append modules-${KV} to cpio!"
 }
 
 append_modprobed() {

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

[Thomas Deutschmann]

commit:     3ef66728b81c05cda2fce8aa09edcf2b3711949f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 09:56:51 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 11:58:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3ef66728

gen_initramfs.sh: Refactor append_zfs()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh |  7 +++++++
 gen_initramfs.sh     | 38 +++++++++++++++++++++-----------------
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 7d01565..7fd39ef 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -420,6 +420,13 @@ determine_real_args() {
 		then
 			gen_die "--multipath requires --lvm but --no-lvm is set!"
 		fi
+
+		if isTrue "${ZFS}" && isTrue "$(tc-is-cross-compiler)"
+		then
+			local error_msg="Using binpkg for ZFS is not supported."
+			error_msg+=" Therefore we cannot cross-compile like requested!"
+			gen_die "${error_msg}"
+		fi
 	fi
 
 	MICROCODE=${MICROCODE,,}

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 2d178bb..7723204 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -547,45 +547,49 @@ append_mdadm() {
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
-append_zfs(){
-	if [ -d "${TEMP}/initramfs-zfs-temp" ]
+append_zfs() {
+	local PN=zfs
+	local TDIR="${TEMP}/initramfs-${PN}-temp"
+	if [ -d "${TDIR}" ]
 	then
-		rm -r "${TEMP}/initramfs-zfs-temp"
+		rm -r "${TDIR}" || gen_die "Failed to clean out existing '${TDIR}'!"
 	fi
 
-	mkdir -p "${TEMP}/initramfs-zfs-temp/etc/zfs"
+	mkdir "${TDIR}" || gen_die "Failed to create '${TDIR}'!"
+	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
+
+	mkdir -p "${TDIR}"/etc/zfs || gen_die "Failed to create '${TDIR}/etc/zfs'!"
 
 	# Copy files to /etc/zfs
 	for i in zdev.conf zpool.cache
 	do
 		if [ -f /etc/zfs/${i} ]
 		then
-			print_info 1 "$(getIndent 2)zfs: >> 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"
+			print_info 2 "$(get_indent 2)${PN}: >> Including ${i}"
+			cp -aL "/etc/zfs/${i}" "${TDIR}/etc/zfs/${i}" 2>/dev/null \
+				|| gen_die "Could not copy file '/etc/zfs/${i}' for ZFS"
 		fi
 	done
 
 	if [ -f "/etc/hostid" ]
 	then
-		local _hostid=$(hostid)
-		print_info 1 "$(getIndent 2)zfs: >> Embedding hostid '${_hostid}' into initramfs..."
-		cp -a /etc/hostid "${TEMP}/initramfs-zfs-temp/etc" 2> /dev/null \
+		local _hostid=$(hostid 2>/dev/null)
+		print_info 2 "$(get_indent 2)${PN}: >> Embedding hostid '${_hostid}' into initramfs ..."
+		cp -aL /etc/hostid "${TDIR}"/etc/hostid 2>/dev/null \
 			|| gen_die "Failed to copy /etc/hostid"
 
-		echo "${_hostid}" > "${TEMP}/.embedded_hostid"
+		echo "${_hostid}" > "${TEMP}"/.embedded_hostid \
+			|| gen_die "Failed to record system's hostid!"
 	else
-		print_info 2 "$(getIndent 2)zfs: /etc/hostid not found; You must use 'spl_hostid' kernel command-line parameter!"
+		print_warning 1 "$(get_indent 2)${PN}: /etc/hostid not found; You must use 'spl_hostid' kernel command-line parameter!"
 	fi
 
-	copy_binaries "${TEMP}/initramfs-zfs-temp" /sbin/{mount.zfs,zdb,zfs,zpool}
+	copy_binaries "${TDIR}" /sbin/{mount.zfs,zdb,zfs,zpool}
 
-	cd "${TEMP}/initramfs-zfs-temp/"
+	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
-			|| gen_die "compressing zfs cpio"
-	cd "${TEMP}"
-	rm -rf "${TEMP}/initramfs-zfs-temp" > /dev/null
+		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
 append_btrfs() {

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

[Thomas Deutschmann]

commit:     099436ce1505e91663d0c3dd1de5663e37642841
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 15:29:16 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 15:29:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=099436ce

genkernel.conf: Remove deprecated ARCH_OVERRIDE option

Was missed in commit a13fb7217b13511fabfe871a9fa2b701896b8d2f.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel.conf | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/genkernel.conf b/genkernel.conf
index c07cd74..efe7681 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -33,9 +33,6 @@
 # MRPROPER implies 'make clean'.
 #CLEAN="yes"
 
-# Override the arch detection
-#ARCH_OVERRIDE="x86"
-
 # Mount BOOTDIR automatically if it isn't mounted
 #MOUNTBOOT="yes"
 

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

[Thomas Deutschmann]

commit:     74d7acd9ae1cf38725c1f31172e761eeadf857c9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 18:11:34 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 18:11:34 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=74d7acd9

Dropbear: Move --ssh-authorized-keys validation to determine_real_args() function

It's a common error especially for new setups that '/etc/dropbear/authorized_keys'
file will be missing. Moving the check to determine_real_args() will allow us to
bail out very early for better user experience.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 16 ++++++++++++++++
 gen_initramfs.sh     | 15 ++++-----------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index a42cd44..1b3abf8 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -424,6 +424,22 @@ determine_real_args() {
 			gen_die "--multipath requires --lvm but --no-lvm is set!"
 		fi
 
+		if isTrue "${SSH}"
+		then
+			local ssh_authorized_keys_file=$(expand_file "${SSH_AUTHORIZED_KEYS_FILE}")
+			if [ -z "${ssh_authorized_keys_file}" ]
+			then
+				# expand_file() will return also return an empty string when file
+				# doesn't exist!
+				gen_die "--ssh-authorized-keys value '${SSH_AUTHORIZED_KEYS_FILE}' is invalid! Does the file exists?"
+			elif [ ! -s "${ssh_authorized_keys_file}" ]
+			then
+				gen_die "authorized_keys file '${ssh_authorized_keys_file}' is empty!"
+			else
+				declare -gr DROPBEAR_AUTHORIZED_KEYS_FILE="${ssh_authorized_keys_file}"
+			fi
+		fi
+
 		if isTrue "${ZFS}" && isTrue "$(tc-is-cross-compiler)"
 		then
 			local error_msg="Using binpkg for ZFS is not supported."

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 41f0269..973ed9e 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -899,16 +899,9 @@ append_dropbear() {
 		dropbear_command=dropbearconvert
 	fi
 
-	local ssh_authorized_keys_file=$(expand_file "${SSH_AUTHORIZED_KEYS_FILE}")
-	if [ -z "${ssh_authorized_keys_file}" ]
+	if [ -z "${DROPBEAR_AUTHORIZED_KEYS_FILE}" ]
 	then
-		gen_die "--ssh-authorized-keys value '${SSH_AUTHORIZED_KEYS_FILE}' is invalid!"
-	elif [ ! -f "${ssh_authorized_keys_file}" ]
-	then
-		gen_die "authorized_keys file '${ssh_authorized_keys_file}' does NOT exist!"
-	elif [ ! -s "${ssh_authorized_keys_file}" ]
-	then
-		gen_die "authorized_keys file '${ssh_authorized_keys_file}' is empty!"
+		gen_die "Something went wrong: DROPBEAR_AUTHORIZED_KEYS_FILE should already been set but is missing!"
 	fi
 
 	populate_binpkg ${PN}
@@ -1122,8 +1115,8 @@ append_dropbear() {
 	cp -a "${GK_SHARE}"/defaults/unlock-luks.sh "${TDIR}"/usr/sbin/unlock-luks \
 		|| gen_die "Failed to copy '${GK_SHARE}/defaults/unlock-luks.sh' to '${TDIR}/usr/sbin/unlock-luks'"
 
-	cp -aL "${ssh_authorized_keys_file}" "${TDIR}"/root/.ssh/ \
-		|| gen_die "Failed to copy '${ssh_authorized_keys_file}'!"
+	cp -aL "${DROPBEAR_AUTHORIZED_KEYS_FILE}" "${TDIR}"/root/.ssh/ \
+		|| gen_die "Failed to copy '${DROPBEAR_AUTHORIZED_KEYS_FILE}'!"
 
 	cp -aL /etc/localtime "${TDIR}"/etc/ \
 		|| gen_die "Failed to copy '/etc/localtime'. Please set system's timezone!"

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

[Thomas Deutschmann]

commit:     bfff05960d98b53f212bb2fc4b2968f14914e1cc
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 18:10:21 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 18:10:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=bfff0596

genkernel: Add empty line before warning regarding the need of rootfstype parameter

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 1 +
 1 file changed, 1 insertion(+)

diff --git a/genkernel b/genkernel
index d3ba388..7f2e6f7 100755
--- a/genkernel
+++ b/genkernel
@@ -430,6 +430,7 @@ then
 
 	if [ $(${CONFGREP} 'CONFIG_EXT[0-9]_FS=' "${KERNEL_CONFIG}" | wc -l) -ge 2 ]
 	then
+		print_warning 1 ''
 		print_warning 1 'With support for several ext* filesystems available, it may be needed to'
 		print_warning 1 'add "rootfstype=ext3" or "rootfstype=ext4" to the list of boot parameters.'
 	fi

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

[Thomas Deutschmann]

commit:     6521edc23c8de1e6d1b4fe21f424c2f7ee260ea7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 19:48:44 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 19:48:44 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6521edc2

genkernel.conf: Add missing XFSPROGS options

Fixes: ccfe8f4a8123 ("Add --xfsprogs support")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/genkernel.conf b/genkernel.conf
index efe7681..9d809f5 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -123,6 +123,9 @@ NOCOLOR="false"
 # Add BTRFS support
 #BTRFS="no"
 
+# Add xfsprogs support
+#XFSPROGS="no"
+
 # Install firmware onto root filesystem
 # Will conflict with sys-kernel/linux-firmware package
 #FIRMWARE_INSTALL="no"

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

[Thomas Deutschmann]

commit:     f51ac869f40ddd9a8594824cbae1a2f79bee1391
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 22:59:49 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 23:07:46 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f51ac869

genkernel: Bump version to v4.0.0_beta2

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

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

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

[Thomas Deutschmann]

commit:     ea927bfe866822c8f257e9403bdffd69fd3dc88e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 23:05:57 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 23:07:54 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ea927bfe

Makefile: Use shell function

Fixes: d0e76cd8e8dd ("Replace backticks")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

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

diff --git a/Makefile b/Makefile
index 753400b..da579aa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-#PACKAGE_VERSION = $(/bin/fgrep GK_V= genkernel | sed "s/.*GK_V='\([^']\+\)'/\1/")
-PACKAGE_VERSION = $(git describe --tags |sed 's,^v,,g')
+#PACKAGE_VERSION = $(shell /bin/fgrep GK_V= genkernel | sed "s/.*GK_V='\([^']\+\)'/\1/")
+PACKAGE_VERSION = $(shell git describe --tags |sed 's,^v,,g')
 distdir = genkernel-$(PACKAGE_VERSION)
 MANPAGE = genkernel.8
 # Add off-Git/generated files here that need to be shipped with releases

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

[Thomas Deutschmann]

commit:     53de1c37f665cf0f53fa0e5665455e1ddbd1680e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 12:27:01 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 12:27:01 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=53de1c37

genkernel: Show required kernel command-line parameters for --luks

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/genkernel b/genkernel
index dbe4352..15f7fbc 100755
--- a/genkernel
+++ b/genkernel
@@ -409,6 +409,8 @@ then
 	isTrue "${DMRAID}"    && print_warning 1 '- Add "dodmraid" for dmraid support or "dodmraid=<additional options>"'
 	isTrue "${MDADM}"     && print_warning 1 '- Add "domdadm" for MDRAID support'
 	isTrue "${LVM}"       && print_warning 1 '- Add "dolvm" for LVM support'
+	isTrue "${LUKS}"      && print_warning 1 '- Add "crypt_root=<device>" for LUKS-encrypted root'
+	isTrue "${LUKS}"      && print_warning 1 '- Add "crypt_swap=<device>" for LUKS-encrypted swap'
 	isTrue "${SSH}"       && print_warning 1 '- Add "dosshd" to start SSH daemon in initramfs'
 
 	if isTrue "${ZFS}"

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

[Thomas Deutschmann]

commit:     bf0f1ed3aae8d4d1136ae51d6f01c775f8b9195d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 12:24:06 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 12:24:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=bf0f1ed3

genkernel: Show path to initramfs when we did not build kernel and run with --no-install

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/genkernel b/genkernel
index 6f86063..dbe4352 100755
--- a/genkernel
+++ b/genkernel
@@ -389,6 +389,12 @@ fi
 
 if isTrue "${BUILD_RAMDISK}"
 then
+	if ! isTrue "${BUILD_KERNEL}" && ! isTrue "${CMD_INSTALL}"
+	then
+		print_info 1 ''
+		print_info 1 "You will find the initramfs in '${TMPDIR}/initramfs-${KNAME}-${ARCH}-${KV}'."
+	fi
+
 	echo
 	print_warning 1 "${BOLD}WARNING... WARNING... WARNING...${NORMAL}"
 	print_warning 1 'Additional kernel parameters that *may* be required to boot properly:'

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

[Thomas Deutschmann]

commit:     afe05cccd9fa75d542472db15f1b76dbc546f188
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 12:22:24 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 12:22:24 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=afe05ccc

genkernel: Show path to initramfs only when we actually built an initramfs

Fixes b581f3c5b ("genkernel: Reformat initramfs parameter output")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/genkernel b/genkernel
index 1f95854..6f86063 100755
--- a/genkernel
+++ b/genkernel
@@ -358,11 +358,16 @@ then
 	else
 		print_info 1 ''
 		print_info 1 "You will find the kernel image in '${TMPDIR}/kernel-${KNAME}-${ARCH}-${KV}'."
+
 		if isTrue "${GENZIMAGE}"
 		then
 			print_info 1 "You will find the kernelz binary in '${TMPDIR}/kernelz-${KV}'."
 		fi
-		print_info 1 "You will find the initramfs in '${TMPDIR}/initramfs-${KNAME}-${ARCH}-${KV}'."
+
+		if isTrue "${BUILD_RAMDISK}"
+		then
+			print_info 1 "You will find the initramfs in '${TMPDIR}/initramfs-${KNAME}-${ARCH}-${KV}'."
+		fi
 	fi
 
 	print_info 1 ''
@@ -377,7 +382,7 @@ then
 	then
 		echo
 		print_warning 1 "If you require Genkernel's hardware detection features, you ${BOLD}MUST${NORMAL}"
-		print_warning 1 'tell your bootloader to use the provided initramfs file.'
+		print_warning 1 "tell your bootloader to use the provided initramfs file (${TMPDIR}/initramfs-${KNAME}-${ARCH}-${KV})."
 	fi
 	unset show_warning_initramfs_is_required
 fi

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

[Thomas Deutschmann]

commit:     68c2dced0bd720bda2db52ac7bfba6c190fafdcc
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 13:11:39 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 13:11:39 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=68c2dced

gen_configkernel.sh: config_kernel(): Don't check kernelruntask's return value anymore

When compile_generic() was refactored via commit 7b3103c0856dd9ad0652bf2ac27d0d907250ea4e,
error checking was added directly to that function.

Bug: https://bugs.gentoo.org/689890
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 6860f1a..ef88250 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -163,7 +163,6 @@ config_kernel() {
 	then
 		print_info 1 "$(get_indent 1)>> Invoking ${add_config} ..."
 		compile_generic ${add_config} kernelruntask
-		[ $? -eq 0 ] || gen_die "Error: ${add_config} failed!"
 	fi
 
 	local -a required_kernel_options

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     e04895cd0c01e2b39e33dabf1b42e51bc50cc9c4
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 14:17:48 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 14:21:44 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e04895cd

gen_funcs.sh: trap_cleanup(): Log received signal

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 4136122..caae87b 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1041,8 +1041,21 @@ trap_cleanup() {
 		exec &> /dev/tty
 	fi
 
+	local signal_msg=
+	if [ -n "${GK_TRAP_SIGNAL}" ]
+	then
+		case "${GK_TRAP_SIGNAL}" in
+			SIGABRT|SIGHUP|SIGQUIT|SIGINT|SIGTERM)
+				signal_msg=" (signal ${GK_TRAP_SIGNAL} received)"
+				;;
+			*)
+				signal_msg=" (unknown signal ${GK_TRAP_SIGNAL} received)"
+				;;
+		esac
+	fi
+
 	echo ''
-	print_error 1 "Genkernel was unexpectedly terminated."
+	print_error 1 "Genkernel was unexpectedly terminated${signal_msg}."
 	print_error 1 "Please consult '${LOGFILE}' for more information and any"
 	print_error 1 "errors that were reported above."
 	cleanup
@@ -1236,7 +1249,11 @@ unpack() {
 }
 
 set_default_gk_trap() {
-	trap trap_cleanup SIGABRT SIGHUP SIGQUIT SIGINT SIGTERM
+	local signal
+	for signal in SIGABRT SIGHUP SIGQUIT SIGINT SIGTERM
+	do
+		trap "GK_TRAP_SIGNAL=${signal}; trap_cleanup" ${signal}
+	done
 }
 
 #

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     6a3ecc5314d47dee5019e380dfd13877d2e5cd2b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 18:04:31 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 18:04:31 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6a3ecc53

gen_initramfs.sh: copy_system_binaries(): Use "lddtree -l"

Using "--list" parameter is not supported by app-misc/pax-utils[-python].

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 973ed9e..42196c5 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -151,7 +151,7 @@ copy_system_binaries() {
 
 			if [[ ${is_first} -eq 1 ]]
 			then
-				# `lddtree --list` first line is always the binary itself
+				# `lddtree -l` first line is always the binary itself
 				print_info 5 "Copying '${base_dir}/${binary_dependency_basename}' to '${destdir}/' ..."
 				cp -aL "${base_dir}/${binary_dependency_basename}" "${destdir}/${binary_basename}" \
 					|| gen_die "$(get_useful_function_stack)Failed to copy '${base_dir}/${binary_dependency_basename}' to '${destdir}'!"
@@ -165,7 +165,7 @@ copy_system_binaries() {
 				print_info 5 "Need to copy dependency '${base_dir}/${binary_dependency_basename}' ..."
 				"${FUNCNAME}" "${destdir}" "${base_dir}/${binary_dependency_basename}"
 			fi
-		done 3< <(lddtree --list "${binary}" 2>/dev/null)
+		done 3< <(lddtree -l "${binary}" 2>/dev/null)
 		IFS="${GK_DEFAULT_IFS}"
 	done
 }

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     204b9e97920110d267cc28132d76e941ca177b13
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 23:21:57 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 23:27:31 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=204b9e97

Adjust LOGLEVEL

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_cmdline.sh   | 228 +++++++++++++++++++++++++++----------------------------
 gen_funcs.sh     |   6 +-
 gen_initramfs.sh |   2 +-
 3 files changed, 118 insertions(+), 118 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 9f1b7cf..a7b35a8 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -252,98 +252,98 @@ parse_cmdline() {
 	case "$*" in
 		--cross-compile=*)
 			CMD_CROSS_COMPILE="${*#*=}"
-			print_info 2 "CMD_CROSS_COMPILE: ${CMD_CROSS_COMPILE}"
+			print_info 3 "CMD_CROSS_COMPILE: ${CMD_CROSS_COMPILE}"
 			;;
 		--kernel-cc=*)
 			CMD_KERNEL_CC="${*#*=}"
-			print_info 2 "CMD_KERNEL_CC: ${CMD_KERNEL_CC}"
+			print_info 3 "CMD_KERNEL_CC: ${CMD_KERNEL_CC}"
 			;;
 		--kernel-ld=*)
 			CMD_KERNEL_LD="${*#*=}"
-			print_info 2 "CMD_KERNEL_LD: ${CMD_KERNEL_LD}"
+			print_info 3 "CMD_KERNEL_LD: ${CMD_KERNEL_LD}"
 			;;
 		--kernel-as=*)
 			CMD_KERNEL_AS="${*#*=}"
-			print_info 2 "CMD_KERNEL_AS: ${CMD_KERNEL_AS}"
+			print_info 3 "CMD_KERNEL_AS: ${CMD_KERNEL_AS}"
 			;;
 		--kernel-make=*)
 			CMD_KERNEL_MAKE="${*#*=}"
-			print_info 2 "CMD_KERNEL_MAKE: ${CMD_KERNEL_MAKE}"
+			print_info 3 "CMD_KERNEL_MAKE: ${CMD_KERNEL_MAKE}"
 			;;
 		--kernel-target=*)
 			KERNEL_MAKE_DIRECTIVE_OVERRIDE="${*#*=}"
-			print_info 2 "KERNEL_MAKE_DIRECTIVE_OVERRIDE: ${KERNEL_MAKE_DIRECTIVE_OVERRIDE}"
+			print_info 3 "KERNEL_MAKE_DIRECTIVE_OVERRIDE: ${KERNEL_MAKE_DIRECTIVE_OVERRIDE}"
 			;;
 		--kernel-binary=*)
 			KERNEL_BINARY_OVERRIDE="${*#*=}"
-			print_info 2 "KERNEL_BINARY_OVERRIDE: ${KERNEL_BINARY_OVERRIDE}"
+			print_info 3 "KERNEL_BINARY_OVERRIDE: ${KERNEL_BINARY_OVERRIDE}"
 			;;
 		--kernel-outputdir=*)
 			CMD_KERNEL_OUTPUTDIR="${*#*=}"
-			print_info 2 "CMD_KERNEL_OUTPUTDIR: ${CMD_KERNEL_OUTPUTDIR}"
+			print_info 3 "CMD_KERNEL_OUTPUTDIR: ${CMD_KERNEL_OUTPUTDIR}"
 			;;
 		--utils-cc=*)
 			CMD_UTILS_CC="${*#*=}"
-			print_info 2 "CMD_UTILS_CC: ${CMD_UTILS_CC}"
+			print_info 3 "CMD_UTILS_CC: ${CMD_UTILS_CC}"
 			;;
 		--utils-cflags=*)
 			CMD_UTILS_CFLAGS="${*#*=}"
-			print_info 2 "CMD_UTILS_CFLAGS: ${CMD_UTILS_CFLAGS}"
+			print_info 3 "CMD_UTILS_CFLAGS: ${CMD_UTILS_CFLAGS}"
 			;;
 		--utils-ld=*)
 			CMD_UTILS_LD="${*#*=}"
-			print_info 2 "CMD_UTILS_LD: ${CMD_UTILS_LD}"
+			print_info 3 "CMD_UTILS_LD: ${CMD_UTILS_LD}"
 			;;
 		--utils-as=*)
 			CMD_UTILS_AS="${*#*=}"
-			print_info 2 "CMD_UTILS_AS: ${CMD_UTILS_AS}"
+			print_info 3 "CMD_UTILS_AS: ${CMD_UTILS_AS}"
 			;;
 		--utils-make=*)
 			CMD_UTILS_MAKE="${*#*=}"
-			print_info 2 "CMD_UTILS_MAKE: ${CMD_UTILS_MAKE}"
+			print_info 3 "CMD_UTILS_MAKE: ${CMD_UTILS_MAKE}"
 			;;
 		--makeopts=*)
 			CMD_MAKEOPTS="${*#*=}"
-			print_info 2 "CMD_MAKEOPTS: ${CMD_MAKEOPTS}"
+			print_info 3 "CMD_MAKEOPTS: ${CMD_MAKEOPTS}"
 			;;
 		--mountboot|--no-mountboot)
 			CMD_MOUNTBOOT=$(parse_optbool "$*")
-			print_info 2 "CMD_MOUNTBOOT: ${CMD_MOUNTBOOT}"
+			print_info 3 "CMD_MOUNTBOOT: ${CMD_MOUNTBOOT}"
 			;;
 		--bootdir=*)
 			CMD_BOOTDIR="${*#*=}"
-			print_info 2 "CMD_BOOTDIR: ${CMD_BOOTDIR}"
+			print_info 3 "CMD_BOOTDIR: ${CMD_BOOTDIR}"
 			;;
 		--modprobedir=*)
 			CMD_MODPROBEDIR="${*#*=}"
-			print_info 2 "CMD_MODPROBEDIR: ${CMD_MODPROBEDIR}"
+			print_info 3 "CMD_MODPROBEDIR: ${CMD_MODPROBEDIR}"
 			;;
 		--do-keymap-auto)
 			CMD_DOKEYMAPAUTO="yes"
 			CMD_KEYMAP="yes"
-			print_info 2 "CMD_DOKEYMAPAUTO: ${CMD_DOKEYMAPAUTO}"
+			print_info 3 "CMD_DOKEYMAPAUTO: ${CMD_DOKEYMAPAUTO}"
 			;;
 		--keymap|--no-keymap)
 			CMD_KEYMAP=$(parse_optbool "$*")
-			print_info 2 "CMD_KEYMAP: ${CMD_KEYMAP}"
+			print_info 3 "CMD_KEYMAP: ${CMD_KEYMAP}"
 			;;
 		--bcache|--no-bcache)
 			CMD_BCACHE=$(parse_optbool "$*")
-			print_info 2 "CMD_BCACHE: ${CMD_BCACHE}"
+			print_info 3 "CMD_BCACHE: ${CMD_BCACHE}"
 			;;
 		--lvm|--no-lvm)
 			CMD_LVM=$(parse_optbool "$*")
-			print_info 2 "CMD_LVM: ${CMD_LVM}"
+			print_info 3 "CMD_LVM: ${CMD_LVM}"
 			;;
 		--lvm2|--no-lvm2)
 			CMD_LVM=$(parse_optbool "$*")
-			print_info 2 "CMD_LVM: ${CMD_LVM}"
+			print_info 3 "CMD_LVM: ${CMD_LVM}"
 			echo
 			print_warning 1 "Please use --lvm, as --lvm2 is deprecated."
 			;;
 		--mdadm|--no-mdadm)
 			CMD_MDADM=$(parse_optbool "$*")
-			print_info 2 "CMD_MDADM: $CMD_MDADM"
+			print_info 3 "CMD_MDADM: $CMD_MDADM"
 			if isTrue "${CMD_MDADM}" && [ ! -e /sbin/mdadm ]
 			then
 				print_warning 'Warning: --mdadm generally requires sys-fs/mdadm present on the host system'
@@ -351,70 +351,70 @@ parse_cmdline() {
 			;;
 		--mdadm-config=*)
 			CMD_MDADM_CONFIG="${*#*=}"
-			print_info 2 "CMD_MDADM_CONFIG: $CMD_MDADM_CONFIG"
+			print_info 3 "CMD_MDADM_CONFIG: $CMD_MDADM_CONFIG"
 			;;
 		--busybox|--no-busybox)
 			CMD_BUSYBOX=$(parse_optbool "$*")
-			print_info 2 "CMD_BUSYBOX: ${CMD_BUSYBOX}"
+			print_info 3 "CMD_BUSYBOX: ${CMD_BUSYBOX}"
 			;;
 		--microcode|--no-microcode)
 			case $(parse_optbool "$*") in
 				no)  CMD_MICROCODE='no' ;;
 				yes) CMD_MICROCODE='all' ;;
 			esac
-			print_info 2 "CMD_MICROCODE: ${CMD_MICROCODE}"
+			print_info 3 "CMD_MICROCODE: ${CMD_MICROCODE}"
 			;;
 		--microcode=*)
 			CMD_MICROCODE="${*#*=}"
-			print_info 2 "CMD_MICROCODE: $CMD_MICROCODE"
+			print_info 3 "CMD_MICROCODE: $CMD_MICROCODE"
 			;;
 		--microcode-initramfs|--no-microcode-initramfs)
 			CMD_MICROCODE_INITRAMFS=$(parse_optbool "$*")
-			print_info 2 "CMD_MICROCODE_INITRAMFS: ${CMD_MICROCODE_INITRAMFS}"
+			print_info 3 "CMD_MICROCODE_INITRAMFS: ${CMD_MICROCODE_INITRAMFS}"
 			;;
 		--nfs|--no-nfs)
 			CMD_NFS=$(parse_optbool "$*")
-			print_info 2 "CMD_NFS: ${CMD_NFS}"
+			print_info 3 "CMD_NFS: ${CMD_NFS}"
 			;;
 		--unionfs|--no-unionfs)
 			CMD_UNIONFS=$(parse_optbool "$*")
-			print_info 2 "CMD_UNIONFS: ${CMD_UNIONFS}"
+			print_info 3 "CMD_UNIONFS: ${CMD_UNIONFS}"
 			;;
 		--netboot|--no-netboot)
 			CMD_NETBOOT=$(parse_optbool "$*")
-			print_info 2 "CMD_NETBOOT: ${CMD_NETBOOT}"
+			print_info 3 "CMD_NETBOOT: ${CMD_NETBOOT}"
 			;;
 		--real-root=*)
 			CMD_REAL_ROOT="${*#*=}"
-			print_info 2 "CMD_REAL_ROOT: ${CMD_REAL_ROOT}"
+			print_info 3 "CMD_REAL_ROOT: ${CMD_REAL_ROOT}"
 			;;
 		--dmraid|--no-dmraid)
 			CMD_DMRAID=$(parse_optbool "$*")
-			print_info 2 "CMD_DMRAID: ${CMD_DMRAID}"
+			print_info 3 "CMD_DMRAID: ${CMD_DMRAID}"
 			;;
 		--e2fsprogs|--no-e2fsprogs)
 			CMD_E2FSPROGS=$(parse_optbool "$*")
-			print_info 2 "CMD_E2FSPROGS: ${CMD_E2FSPROGS}"
+			print_info 3 "CMD_E2FSPROGS: ${CMD_E2FSPROGS}"
 			;;
 		--xfsprogs|--no-xfsprogs)
 			CMD_XFSPROGS=$(parse_optbool "$*")
-			print_info 2 "CMD_XFSPROGS: ${CMD_XFSPROGS}"
+			print_info 3 "CMD_XFSPROGS: ${CMD_XFSPROGS}"
 			;;
 		--zfs|--no-zfs)
 			CMD_ZFS=$(parse_optbool "$*")
-			print_info 2 "CMD_ZFS: ${CMD_ZFS}"
+			print_info 3 "CMD_ZFS: ${CMD_ZFS}"
 			;;
 		--btrfs|--no-btrfs)
 			CMD_BTRFS=$(parse_optbool "$*")
-			print_info 2 "CMD_BTRFS: ${CMD_BTRFS}"
+			print_info 3 "CMD_BTRFS: ${CMD_BTRFS}"
 			;;
 		--virtio|--no-virtio)
 			CMD_VIRTIO=$(parse_optbool "$*")
-			print_info 2 "CMD_VIRTIO: ${CMD_VIRTIO}"
+			print_info 3 "CMD_VIRTIO: ${CMD_VIRTIO}"
 			;;
 		--multipath|--no-multipath)
 			CMD_MULTIPATH=$(parse_optbool "$*")
-			print_info 2 "CMD_MULTIPATH: ${CMD_MULTIPATH}"
+			print_info 3 "CMD_MULTIPATH: ${CMD_MULTIPATH}"
 			;;
 		--bootloader=*)
 			CMD_BOOTLOADER="${*#*=}"
@@ -426,27 +426,27 @@ parse_cmdline() {
 					echo "Error: Bootloader '${CMD_BOOTLOADER}' is unsupported."
 					exit 1
 			esac
-			print_info 2 "CMD_BOOTLOADER: ${CMD_BOOTLOADER}"
+			print_info 3 "CMD_BOOTLOADER: ${CMD_BOOTLOADER}"
 			;;
 		--no-bootloader)
 			CMD_BOOTLOADER="no"
-			print_info 2 "CMD_BOOTLOADER: ${CMD_BOOTLOADER}"
+			print_info 3 "CMD_BOOTLOADER: ${CMD_BOOTLOADER}"
 			;;
 		--iscsi|--no-iscsi)
 			CMD_ISCSI=$(parse_optbool "$*")
-			print_info 2 "CMD_ISCSI: ${CMD_ISCSI}"
+			print_info 3 "CMD_ISCSI: ${CMD_ISCSI}"
 			;;
 		--hyperv|--no-hyperv)
 			CMD_HYPERV=$(parse_optbool "$*")
-			print_info 2 "CMD_HYPERV: ${CMD_HYPERV}"
+			print_info 3 "CMD_HYPERV: ${CMD_HYPERV}"
 			;;
 		--ssh|--no-ssh)
 			CMD_SSH=$(parse_optbool "$*")
-			print_info 2 "CMD_SSH: ${CMD_SSH}"
+			print_info 3 "CMD_SSH: ${CMD_SSH}"
 			;;
 		--ssh-authorized-keys-file=*)
 			CMD_SSH_AUTHORIZED_KEYS_FILE="${*#*=}"
-			print_info 2 "CMD_SSH_AUTHORIZED_KEYS_FILE: ${CMD_SSH_AUTHORIZED_KEYS_FILE}"
+			print_info 3 "CMD_SSH_AUTHORIZED_KEYS_FILE: ${CMD_SSH_AUTHORIZED_KEYS_FILE}"
 			;;
 		--ssh-host-keys=*)
 			CMD_SSH_HOST_KEYS="${*#*=}"
@@ -455,16 +455,16 @@ parse_cmdline() {
 				echo "Error: --ssh-host-keys value '${CMD_SSH_HOST_KEYS}' is unsupported."
 				exit 1
 			fi
-			print_info 2 "CMD_SSH_HOST_KEYS: ${CMD_SSH_HOST_KEYS}"
+			print_info 3 "CMD_SSH_HOST_KEYS: ${CMD_SSH_HOST_KEYS}"
 			;;
 		--strace|--no-strace)
 			CMD_STRACE=$(parse_optbool "$*")
-			print_info 2 "CMD_STRACE: ${CMD_STRACE}"
+			print_info 3 "CMD_STRACE: ${CMD_STRACE}"
 			;;
 		--loglevel=*)
 			CMD_LOGLEVEL="${*#*=}"
 			LOGLEVEL="${CMD_LOGLEVEL}"
-			print_info 2 "CMD_LOGLEVEL: ${CMD_LOGLEVEL}"
+			print_info 3 "CMD_LOGLEVEL: ${CMD_LOGLEVEL}"
 			;;
 		--menuconfig)
 			TERM_LINES=$(stty -a | head -n 1 | cut -d\  -f5 | cut -d\; -f1)
@@ -476,11 +476,11 @@ parse_cmdline() {
 				exit 1
 			fi
 			CMD_MENUCONFIG="yes"
-			print_info 2 "CMD_MENUCONFIG: ${CMD_MENUCONFIG}"
+			print_info 3 "CMD_MENUCONFIG: ${CMD_MENUCONFIG}"
 			;;
 		--no-menuconfig)
 			CMD_MENUCONFIG="no"
-			print_info 2 "CMD_MENUCONFIG: ${CMD_MENUCONFIG}"
+			print_info 3 "CMD_MENUCONFIG: ${CMD_MENUCONFIG}"
 			;;
 		--nconfig)
 			TERM_LINES=$(stty -a | head -n 1 | cut -d\  -f5 | cut -d\; -f1)
@@ -492,97 +492,97 @@ parse_cmdline() {
 				exit 1
 			fi
 			CMD_NCONFIG="yes"
-			print_info 2 "CMD_NCONFIG: ${CMD_NCONFIG}"
+			print_info 3 "CMD_NCONFIG: ${CMD_NCONFIG}"
 			;;
 		--no-nconfig)
 			CMD_NCONFIG="no"
-			print_info 2 "CMD_NCONFIG: ${CMD_NCONFIG}"
+			print_info 3 "CMD_NCONFIG: ${CMD_NCONFIG}"
 			;;
 		--gconfig|--no-gconfig)
 			CMD_GCONFIG=$(parse_optbool "$*")
-			print_info 2 "CMD_GCONFIG: ${CMD_GCONFIG}"
+			print_info 3 "CMD_GCONFIG: ${CMD_GCONFIG}"
 			;;
 		--xconfig|--no-xconfig)
 			CMD_XCONFIG=$(parse_optbool "$*")
-			print_info 2 "CMD_XCONFIG: ${CMD_XCONFIG}"
+			print_info 3 "CMD_XCONFIG: ${CMD_XCONFIG}"
 			;;
 		--save-config|--no-save-config)
 			CMD_SAVE_CONFIG=$(parse_optbool "$*")
-			print_info 2 "CMD_SAVE_CONFIG: ${CMD_SAVE_CONFIG}"
+			print_info 3 "CMD_SAVE_CONFIG: ${CMD_SAVE_CONFIG}"
 			;;
 		--mrproper|--no-mrproper)
 			CMD_MRPROPER=$(parse_optbool "$*")
-			print_info 2 "CMD_MRPROPER: ${CMD_MRPROPER}"
+			print_info 3 "CMD_MRPROPER: ${CMD_MRPROPER}"
 			;;
 		--clean|--no-clean)
 			CMD_CLEAN=$(parse_optbool "$*")
-			print_info 2 "CMD_CLEAN: ${CMD_CLEAN}"
+			print_info 3 "CMD_CLEAN: ${CMD_CLEAN}"
 			;;
 		--oldconfig|--no-oldconfig)
 			CMD_OLDCONFIG=$(parse_optbool "$*")
 			isTrue "${CMD_OLDCONFIG}" && CMD_CLEAN="no"
-			print_info 2 "CMD_CLEAN: ${CMD_CLEAN}"
-			print_info 2 "CMD_OLDCONFIG: ${CMD_OLDCONFIG}"
+			print_info 3 "CMD_CLEAN: ${CMD_CLEAN}"
+			print_info 3 "CMD_OLDCONFIG: ${CMD_OLDCONFIG}"
 			;;
 		--gensplash=*)
 			CMD_SPLASH="yes"
 			SPLASH_THEME="${*#*=}"
-			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
-			print_info 2 "SPLASH_THEME: ${SPLASH_THEME}"
+			print_info 3 "CMD_SPLASH: ${CMD_SPLASH}"
+			print_info 3 "SPLASH_THEME: ${SPLASH_THEME}"
 			echo
 			print_warning 1 "Please use --splash, as --gensplash is deprecated."
 			;;
 		--gensplash|--no-gensplash)
 			CMD_SPLASH=$(parse_optbool "$*")
 			SPLASH_THEME='default'
-			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
+			print_info 3 "CMD_SPLASH: ${CMD_SPLASH}"
 			echo
 			print_warning 1 "Please use --splash, as --gensplash is deprecated."
 			;;
 		--splash=*)
 			CMD_SPLASH="yes"
 			SPLASH_THEME="${*#*=}"
-			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
-			print_info 2 "SPLASH_THEME: ${SPLASH_THEME}"
+			print_info 3 "CMD_SPLASH: ${CMD_SPLASH}"
+			print_info 3 "SPLASH_THEME: ${SPLASH_THEME}"
 			;;
 		--splash|--no-splash)
 			CMD_SPLASH=$(parse_optbool "$*")
 			SPLASH_THEME='default'
-			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
+			print_info 3 "CMD_SPLASH: ${CMD_SPLASH}"
 			;;
 		--gensplash-res=*)
 			SPLASH_RES="${*#*=}"
-			print_info 2 "SPLASH_RES: ${SPLASH_RES}"
+			print_info 3 "SPLASH_RES: ${SPLASH_RES}"
 			echo
 			print_warning 1 "Please use --splash-res, as --gensplash-res is deprecated."
 			;;
 		--splash-res=*)
 			SPLASH_RES="${*#*=}"
-			print_info 2 "SPLASH_RES: ${SPLASH_RES}"
+			print_info 3 "SPLASH_RES: ${SPLASH_RES}"
 			;;
 		--install|--no-install)
 			CMD_INSTALL=$(parse_optbool "$*")
-			print_info 2 "CMD_INSTALL: ${CMD_INSTALL}"
+			print_info 3 "CMD_INSTALL: ${CMD_INSTALL}"
 			;;
 		--ramdisk-modules|--no-ramdisk-modules)
 			CMD_RAMDISKMODULES=$(parse_optbool "$*")
-			print_info 2 "CMD_RAMDISKMODULES: ${CMD_RAMDISKMODULES}"
+			print_info 3 "CMD_RAMDISKMODULES: ${CMD_RAMDISKMODULES}"
 			;;
 		--all-ramdisk-modules|--no-all-ramdisk-modules)
 			CMD_ALLRAMDISKMODULES=$(parse_optbool "$*")
-			print_info 2 "CMD_ALLRAMDISKMODULES: ${CMD_ALLRAMDISKMODULES}"
+			print_info 3 "CMD_ALLRAMDISKMODULES: ${CMD_ALLRAMDISKMODULES}"
 			;;
 		--module-rebuild|--no-module-rebuild)
 			CMD_MODULEREBUILD=$(parse_optbool "$*")
-			print_info 2 "CMD_MODULEREBUILD: ${CMD_MODULEREBUILD}"
+			print_info 3 "CMD_MODULEREBUILD: ${CMD_MODULEREBUILD}"
 			;;
 		--callback=*)
 			CMD_CALLBACK="${*#*=}"
-			print_info 2 "CMD_CALLBACK: ${CMD_CALLBACK}/$*"
+			print_info 3 "CMD_CALLBACK: ${CMD_CALLBACK}/$*"
 			;;
 		--static|--no-static)
 			CMD_STATIC=$(parse_optbool "$*")
-			print_info 2 "CMD_STATIC: ${CMD_STATIC}"
+			print_info 3 "CMD_STATIC: ${CMD_STATIC}"
 			;;
 		--tempdir=*)
 			TMPDIR="${*#*=}"
@@ -592,12 +592,12 @@ parse_cmdline() {
 			fi
 			TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX 2>/dev/null)
 			[ -z "${TEMP}" ] && gen_die "mktemp failed!"
-			print_info 2 "TMPDIR: ${TMPDIR}"
-			print_info 2 "TEMP: ${TEMP}"
+			print_info 3 "TMPDIR: ${TMPDIR}"
+			print_info 3 "TEMP: ${TEMP}"
 			;;
 		--postclear|--no-postclear)
 			CMD_POSTCLEAR=$(parse_optbool "$*")
-			print_info 2 "CMD_POSTCLEAR: ${CMD_POSTCLEAR}"
+			print_info 3 "CMD_POSTCLEAR: ${CMD_POSTCLEAR}"
 			;;
 		--color|--no-color)
 			CMD_COLOR=$(parse_optbool "$*")
@@ -607,139 +607,139 @@ parse_cmdline() {
 			else
 				NOCOLOR=true
 			fi
-			print_info 2 "CMD_COLOR: ${CMD_COLOR}"
+			print_info 3 "CMD_COLOR: ${CMD_COLOR}"
 			set_color_vars
 			;;
 		--cleanup|--no-cleanup)
 			CMD_CLEANUP=$(parse_optbool "$*")
-			print_info 2 "CMD_CLEANUP: ${CMD_CLEANUP}"
+			print_info 3 "CMD_CLEANUP: ${CMD_CLEANUP}"
 			;;
 		--logfile=*)
 			CMD_LOGFILE="${*#*=}"
-			print_info 2 "CMD_LOGFILE: ${CMD_LOGFILE}"
+			print_info 3 "CMD_LOGFILE: ${CMD_LOGFILE}"
 			;;
 		--kerneldir=*)
 			CMD_KERNEL_DIR="${*#*=}"
-			print_info 2 "CMD_KERNEL_DIR: ${CMD_KERNEL_DIR}"
+			print_info 3 "CMD_KERNEL_DIR: ${CMD_KERNEL_DIR}"
 			;;
 		--kernel-config=*)
 			CMD_KERNEL_CONFIG="${*#*=}"
-			print_info 2 "CMD_KERNEL_CONFIG: ${CMD_KERNEL_CONFIG}"
+			print_info 3 "CMD_KERNEL_CONFIG: ${CMD_KERNEL_CONFIG}"
 			;;
 		--module-prefix=*)
 			CMD_INSTALL_MOD_PATH="${*#*=}"
-			print_info 2 "CMD_INSTALL_MOD_PATH: ${CMD_INSTALL_MOD_PATH}"
+			print_info 3 "CMD_INSTALL_MOD_PATH: ${CMD_INSTALL_MOD_PATH}"
 			;;
 		--cachedir=*)
 			CACHE_DIR="${*#*=}"
-			print_info 2 "CACHE_DIR: ${CACHE_DIR}"
+			print_info 3 "CACHE_DIR: ${CACHE_DIR}"
 			;;
 		--clear-cachedir|--no-clear-cachedir)
 			CMD_CLEAR_CACHEDIR=$(parse_optbool "$*")
-			print_info 2 "CMD_CLEAR_CACHEDIR: ${CMD_CLEAR_CACHEDIR}"
+			print_info 3 "CMD_CLEAR_CACHEDIR: ${CMD_CLEAR_CACHEDIR}"
 			;;
 		--minkernpackage=*)
 			CMD_MINKERNPACKAGE="${*#*=}"
-			print_info 2 "MINKERNPACKAGE: ${CMD_MINKERNPACKAGE}"
+			print_info 3 "MINKERNPACKAGE: ${CMD_MINKERNPACKAGE}"
 			;;
 		--modulespackage=*)
 			CMD_MODULESPACKAGE="${*#*=}"
-			print_info 2 "MODULESPACKAGE: ${CMD_MODULESPACKAGE}"
+			print_info 3 "MODULESPACKAGE: ${CMD_MODULESPACKAGE}"
 			;;
 		--kerncache=*)
 			CMD_KERNCACHE="${*#*=}"
-			print_info 2 "KERNCACHE: ${CMD_KERNCACHE}"
+			print_info 3 "KERNCACHE: ${CMD_KERNCACHE}"
 			;;
 		--kernname=*)
 			CMD_KERNNAME="${*#*=}"
-			print_info 2 "KERNNAME: ${CMD_KERNNAME}"
+			print_info 3 "KERNNAME: ${CMD_KERNNAME}"
 			;;
 		--symlink|--no-symlink)
 			CMD_SYMLINK=$(parse_optbool "$*")
-			print_info 2 "CMD_SYMLINK: ${CMD_SYMLINK}"
+			print_info 3 "CMD_SYMLINK: ${CMD_SYMLINK}"
 			;;
 		--kernel-sources|--no-kernel-sources)
 			CMD_KERNEL_SOURCES=$(parse_optbool "$*")
-			print_info 2 "CMD_KERNEL_SOURCES: ${CMD_KERNEL_SOURCES}"
+			print_info 3 "CMD_KERNEL_SOURCES: ${CMD_KERNEL_SOURCES}"
 			;;
 		--initramfs-overlay=*)
 			CMD_INITRAMFS_OVERLAY="${*#*=}"
-			print_info 2 "CMD_INITRAMFS_OVERLAY: ${CMD_INITRAMFS_OVERLAY}"
+			print_info 3 "CMD_INITRAMFS_OVERLAY: ${CMD_INITRAMFS_OVERLAY}"
 			;;
 		--linuxrc=*)
 			CMD_LINUXRC="${*#*=}"
-			print_info 2 "CMD_LINUXRC: ${CMD_LINUXRC}"
+			print_info 3 "CMD_LINUXRC: ${CMD_LINUXRC}"
 			;;
 		--busybox-config=*)
 			CMD_BUSYBOX_CONFIG="${*#*=}"
-			print_info 2 "CMD_BUSYBOX_CONFIG: ${CMD_BUSYBOX_CONFIG}"
+			print_info 3 "CMD_BUSYBOX_CONFIG: ${CMD_BUSYBOX_CONFIG}"
 			;;
 		--genzimage)
 			KERNEL_MAKE_DIRECTIVE_2='zImage.initrd'
 			KERNEL_BINARY_2='arch/powerpc/boot/zImage.initrd'
 			CMD_GENZIMAGE="yes"
-			print_info 2 "CMD_GENZIMAGE: ${CMD_GENZIMAGE}"
+			print_info 3 "CMD_GENZIMAGE: ${CMD_GENZIMAGE}"
 #			ENABLE_PEGASOS_HACKS="yes"
-#			print_info 2 "ENABLE_PEGASOS_HACKS: ${ENABLE_PEGASOS_HACKS}"
+#			print_info 3 "ENABLE_PEGASOS_HACKS: ${ENABLE_PEGASOS_HACKS}"
 			;;
 		--disklabel|--no-disklabel)
 			CMD_DISKLABEL=$(parse_optbool "$*")
-			print_info 2 "CMD_DISKLABEL: ${CMD_DISKLABEL}"
+			print_info 3 "CMD_DISKLABEL: ${CMD_DISKLABEL}"
 			;;
 		--luks|--no-luks)
 			CMD_LUKS=$(parse_optbool "$*")
-			print_info 2 "CMD_LUKS: ${CMD_LUKS}"
+			print_info 3 "CMD_LUKS: ${CMD_LUKS}"
 			;;
 		--gpg|--no-gpg)
 			CMD_GPG=$(parse_optbool "$*")
-			print_info 2 "CMD_GPG: ${CMD_GPG}"
+			print_info 3 "CMD_GPG: ${CMD_GPG}"
 			;;
 		--firmware|--no-firmware)
 			CMD_FIRMWARE=$(parse_optbool "$*")
-			print_info 2 "CMD_FIRMWARE: ${CMD_FIRMWARE}"
+			print_info 3 "CMD_FIRMWARE: ${CMD_FIRMWARE}"
 			;;
 		--firmware-dir=*)
 			CMD_FIRMWARE_DIR="${*#*=}"
 			CMD_FIRMWARE="yes"
-			print_info 2 "CMD_FIRMWARE_DIR: ${CMD_FIRMWARE_DIR}"
+			print_info 3 "CMD_FIRMWARE_DIR: ${CMD_FIRMWARE_DIR}"
 			;;
 		--firmware-files=*)
 			CMD_FIRMWARE_FILES="${*#*=}"
 			CMD_FIRMWARE="yes"
-			print_info 2 "CMD_FIRMWARE_FILES: ${CMD_FIRMWARE_FILES}"
+			print_info 3 "CMD_FIRMWARE_FILES: ${CMD_FIRMWARE_FILES}"
 			;;
 		--firmware-install|--no-firmware-install)
 			CMD_FIRMWARE_INSTALL=$(parse_optbool "$*")
-			print_info 2 "CMD_FIRMWARE_INSTALL: ${CMD_FIRMWARE_INSTALL}"
+			print_info 3 "CMD_FIRMWARE_INSTALL: ${CMD_FIRMWARE_INSTALL}"
 			;;
 		--integrated-initramfs|--no-integrated-initramfs)
 			CMD_INTEGRATED_INITRAMFS=$(parse_optbool "$*")
-			print_info 2 "CMD_INTEGRATED_INITRAMFS=${CMD_INTEGRATED_INITRAMFS}"
+			print_info 3 "CMD_INTEGRATED_INITRAMFS=${CMD_INTEGRATED_INITRAMFS}"
 			;;
 		--wrap-initrd|--no-wrap-initrd)
 			CMD_WRAP_INITRD=$(parse_optbool "$*")
-			print_info 2 "CMD_WRAP_INITRD=${CMD_WRAP_INITRD}"
+			print_info 3 "CMD_WRAP_INITRD=${CMD_WRAP_INITRD}"
 			;;
 		--compress-initramfs|--no-compress-initramfs)
 			CMD_COMPRESS_INITRD=$(parse_optbool "$*")
-			print_info 2 "CMD_COMPRESS_INITRD=${CMD_COMPRESS_INITRD}"
+			print_info 3 "CMD_COMPRESS_INITRD=${CMD_COMPRESS_INITRD}"
 			;;
 		--compress-initrd|--no-compress-initrd)
 			CMD_COMPRESS_INITRD=$(parse_optbool "$*")
-			print_info 2 "CMD_COMPRESS_INITRD=${CMD_COMPRESS_INITRD}"
+			print_info 3 "CMD_COMPRESS_INITRD=${CMD_COMPRESS_INITRD}"
 			echo
 			print_warning 1 "Please use --[no-]compress-initramfs, as --[no-]compress-initrd is deprecated."
 			;;
 		--compress-initramfs-type=*|--compress-initrd-type=*)
 			CMD_COMPRESS_INITRD_TYPE="${*#*=}"
-			print_info 2 "CMD_COMPRESS_INITRD_TYPE: ${CMD_COMPRESS_INITRD_TYPE}"
+			print_info 3 "CMD_COMPRESS_INITRD_TYPE: ${CMD_COMPRESS_INITRD_TYPE}"
 			;;
 		--config=*)
-			print_info 2 "CMD_GK_CONFIG: "${*#*=}""
+			print_info 3 "CMD_GK_CONFIG: "${*#*=}""
 			;;
 		--nice)
 			CMD_NICE=10
-			print_info 2 "CMD_NICE: ${CMD_NICE}"
+			print_info 3 "CMD_NICE: ${CMD_NICE}"
 			;;
 		--nice=*)
 			CMD_NICE="${*#*=}"
@@ -748,19 +748,19 @@ parse_cmdline() {
 				echo 'Error:  Illegal value specified for --nice= parameter.'
 				exit 1
 			fi
-			print_info 2 "CMD_NICE: ${CMD_NICE}"
+			print_info 3 "CMD_NICE: ${CMD_NICE}"
 			;;
 		--no-nice)
 			CMD_NICE=0
-			print_info 2 "CMD_NICE: ${CMD_NICE}"
+			print_info 3 "CMD_NICE: ${CMD_NICE}"
 			;;
 		--strip=*)
 			CMD_STRIP_TYPE=$(parse_opt "$*")
-			print_info 2 "CMD_STRIP_TYPE: ${CMD_STRIP_TYPE}"
+			print_info 3 "CMD_STRIP_TYPE: ${CMD_STRIP_TYPE}"
 			;;
 		--no-strip)
 			CMD_STRIP_TYPE=none
-			print_info 2 "CMD_STRIP_TYPE: ${CMD_STRIP_TYPE}"
+			print_info 3 "CMD_STRIP_TYPE: ${CMD_STRIP_TYPE}"
 			;;
 		all)
 			BUILD_KERNEL="yes"
@@ -782,7 +782,7 @@ parse_cmdline() {
 			BUILD_MODULES="no"
 			BUILD_RAMDISK="no"
 			CMD_RAMDISKMODULES="no"
-			print_info 2 "CMD_RAMDISKMODULES: ${CMD_RAMDISKMODULES}"
+			print_info 3 "CMD_RAMDISKMODULES: ${CMD_RAMDISKMODULES}"
 			;;
 		--help)
 			longusage

diff --git a/gen_funcs.sh b/gen_funcs.sh
index caae87b..15548d3 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1447,16 +1447,16 @@ kconfig_set_opt() {
 	local curropt=$(grep -E "^#? ?${optname}[ =].*$" "${kconfig}")
 	if [[ -z "${curropt}" ]]
 	then
-		print_info 2 "$(get_indent ${indentlevel}) - Adding option '${optname}' with value '${optval}' to '${kconfig}'..."
+		print_info 3 "$(get_indent ${indentlevel}) - Adding option '${optname}' with value '${optval}' to '${kconfig}'..."
 		echo "${optname}=${optval}" >> "${kconfig}" \
 			|| gen_die "Failed to add '${optname}=${optval}' to '$kconfig'"
 
 		[ ! -f "${TEMP}/.kconfig_modified" ] && touch "${TEMP}/.kconfig_modified"
 	elif [[ "${curropt}" != "*#*" && "${curropt#*=}" == "${optval}" ]]
 	then
-		print_info 2 "$(get_indent ${indentlevel}) - Option '${optname}=${optval}' already set in '${kconfig}'; Skipping ..."
+		print_info 3 "$(get_indent ${indentlevel}) - Option '${optname}=${optval}' already set in '${kconfig}'; Skipping ..."
 	else
-		print_info 2 "$(get_indent ${indentlevel}) - Setting option '${optname}' to '${optval}' in '${kconfig}'..."
+		print_info 3 "$(get_indent ${indentlevel}) - Setting option '${optname}' to '${optval}' in '${kconfig}'..."
 		sed -i "${kconfig}" \
 			-e "s/^#\? \?${optname}[ =].*/${optname}=${optval}/g" \
 			|| gen_die "Failed to set '${optname}=${optval}' in '$kconfig'"

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 42196c5..9c701f5 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1268,7 +1268,7 @@ append_modules() {
 			continue;
 		fi
 
-		print_info 2 "$(get_indent 3) - Copying ${i}${MOD_EXT} ..."
+		print_info 3 "$(get_indent 3) - Copying ${i}${MOD_EXT} ..."
 		cp -ax --parents "${mymod}" "${TDIR}"/ 2>/dev/null \
 			|| gen_die "Failed to copy '${mymod}' to '${TDIR}/'!"
 		n_copied_modules=$[$n_copied_modules+1]

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     95404d6b022f71c8017d5400e7c47d4a09845433
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 23:30:36 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 23:30:36 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=95404d6b

gen_configkernel.sh: config_kernel(): No need to re-check required kernel options when config wasn't modified

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index ef88250..c37a9cb 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -724,20 +724,20 @@ config_kernel() {
 			print_info 1 "$(get_indent 1)>> Running 'make olddefconfig' due to changed kernel options ..."
 			compile_generic olddefconfig kernel 2>/dev/null
 		fi
+
+		print_info 2 "$(get_indent 1)>> Checking if required kernel options are still present ..."
+		local required_kernel_option=
+		for required_kernel_option in "${required_kernel_options[@]}"
+		do
+			local optval=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "${required_kernel_option}")
+			if [ -z "${optval}" ]
+			then
+				gen_die "Something went wrong: Required kernel option '${required_kernel_option}' which genkernel tried to set is missing!"
+			else
+				print_info 3 "$(get_indent 2) - '${required_kernel_option}' is set to '${optval}'"
+			fi
+		done
 	else
 		print_info 2 "$(get_indent 1)>> genkernel did not need to add/modify any kernel options."
 	fi
-
-	print_info 2 "$(get_indent 1)>> Checking if required kernel options are still present ..."
-	local required_kernel_option=
-	for required_kernel_option in "${required_kernel_options[@]}"
-	do
-		local optval=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "${required_kernel_option}")
-		if [ -z "${optval}" ]
-		then
-			gen_die "Something went wrong: Required kernel option '${required_kernel_option}' which genkernel tried to set is missing!"
-		else
-			print_info 3 "$(get_indent 2) - '${required_kernel_option}' is set to '${optval}'"
-		fi
-	done
 }

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     f27b8c12bde5028a050fe7ae313bdee7dd1bbdc7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 00:04:44 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 00:04:44 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f27b8c12

Adjust LOGLEVEL

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_compile.sh   | 12 ++++++------
 gen_initramfs.sh | 20 ++++++++++----------
 gen_package.sh   |  6 +++---
 gen_worker.sh    |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index cc7b1aa..a2c70a8 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -37,7 +37,7 @@ compile_external_modules() {
 	fi
 
 	print_info 1 "$(get_indent 1)>> Compiling out-of-tree module(s) ..."
-	print_info 2 "COMMAND: ${command}" 1 0 1
+	print_info 3 "COMMAND: ${command}" 1 0 1
 
 	if [ "${LOGLEVEL}" -gt 3 ]
 	then
@@ -199,18 +199,18 @@ compile_generic() {
 	if [ "${argstype}" == 'kernelruntask' ]
 	then
 		# Silent operation, forced -j1
-		print_info 2 "COMMAND: ${NICEOPTS}${MAKE} ${MAKEOPTS} -j1 ${ARGS} ${target} $*" 1 0 1
+		print_info 3 "COMMAND: ${NICEOPTS}${MAKE} ${MAKEOPTS} -j1 ${ARGS} ${target} $*" 1 0 1
 		eval ${NICEOPTS}${MAKE} -s ${MAKEOPTS} -j1 ${ARGS} ${target} $*
 		RET=$?
 	elif [ "${LOGLEVEL}" -gt 3 ]
 	then
 		# Output to stdout and logfile
-		print_info 2 "COMMAND: ${NICEOPTS}${MAKE} ${MAKEOPTS} ${ARGS} ${target} $*" 1 0 1
+		print_info 3 "COMMAND: ${NICEOPTS}${MAKE} ${MAKEOPTS} ${ARGS} ${target} $*" 1 0 1
 		eval ${NICEOPTS}${MAKE} ${MAKEOPTS} ${ARGS} ${target} $* 2>&1 | tee -a "${LOGFILE}"
 		RET=${PIPESTATUS[0]}
 	else
 		# Output to logfile only
-		print_info 2 "COMMAND: ${NICEOPTS}${MAKE} ${MAKEOPTS} ${ARGS} ${target} $*" 1 0 1
+		print_info 3 "COMMAND: ${NICEOPTS}${MAKE} ${MAKEOPTS} ${ARGS} ${target} $*" 1 0 1
 		eval ${NICEOPTS}${MAKE} ${MAKEOPTS} ${ARGS} ${target} $* >> "${LOGFILE}" 2>&1
 		RET=$?
 	fi
@@ -340,7 +340,7 @@ compile_kernel() {
 }
 
 determine_busybox_config_file() {
-	print_info 2 "$(get_indent 3)busybox: >> Checking for suitable busybox configuration ..."
+	print_info 2 "$(get_indent 2)busybox: >> Checking for suitable busybox configuration ..."
 
 	if [ -n "${CMD_BUSYBOX_CONFIG}" ]
 	then
@@ -378,7 +378,7 @@ determine_busybox_config_file() {
 				BUSYBOX_CONFIG="$f"
 				break
 			else
-				print_info 3 "$(get_indent 1)- '${f}' not found; Skipping ..."
+				print_info 3 "$(get_indent 3)- '${f}' not found; Skipping ..."
 			fi
 		done
 

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 9c701f5..f5162bb 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -171,10 +171,10 @@ copy_system_binaries() {
 }
 
 log_future_cpio_content() {
-	print_info 2 "=================================================================" 1 0 1
-	print_info 2 "About to add these files from '${PWD}' to cpio archive:" 1 0 1
-	print_info 2 "$(find . | xargs ls -ald)" 1 0 1
-	print_info 2 "=================================================================" 1 0 1
+	print_info 3 "=================================================================" 1 0 1
+	print_info 3 "About to add these files from '${PWD}' to cpio archive:" 1 0 1
+	print_info 3 "$(find . | xargs ls -ald)" 1 0 1
+	print_info 3 "=================================================================" 1 0 1
 }
 
 append_devices() {
@@ -199,10 +199,10 @@ append_devices() {
 	nod /dev/ttyS0 600 0 0 c 4 64
 	EOF
 
-	print_info 2 "=================================================================" 1 0 1
-	print_info 2 "Adding the following devices to cpio:" 1 0 1
-	print_info 2 "$(cat "${TFILE}")" 1 0 1
-	print_info 2 "=================================================================" 1 0 1
+	print_info 3 "=================================================================" 1 0 1
+	print_info 3 "Adding the following devices to cpio:" 1 0 1
+	print_info 3 "$(cat "${TFILE}")" 1 0 1
+	print_info 3 "=================================================================" 1 0 1
 
 	"${KERNEL_OUTPUTDIR}"/usr/gen_init_cpio "${TFILE}" >"${CPIO}" \
 		|| gen_die "Failed to append devices to cpio!"
@@ -1264,7 +1264,7 @@ append_modules() {
 		mymod=$(find "${_MODULES_DIR}" -name "${i}${MOD_EXT}" 2>/dev/null | head -n 1)
 		if [ -z "${mymod}" ]
 		then
-			print_warning 2 "$(get_indent 3) - ${i}${MOD_EXT} not found; Skipping ..."
+			print_warning 3 "$(get_indent 3) - ${i}${MOD_EXT} not found; Skipping ..."
 			continue;
 		fi
 
@@ -1674,7 +1674,7 @@ create_initramfs() {
 			if [ -n "${compression}" ]
 			then
 				print_info 1 "$(get_indent 1)>> Compressing cpio data (${compress_ext}) ..."
-				print_info 2 "COMMAND: ${compress_cmd} $CPIO" 1 0 1
+				print_info 3 "COMMAND: ${compress_cmd} $CPIO" 1 0 1
 				${compress_cmd} "${CPIO}" || gen_die "Compression (${compress_cmd}) failed"
 				mv -f "${CPIO}${compress_ext}" "${CPIO}" || gen_die "Rename failed"
 			else

diff --git a/gen_package.sh b/gen_package.sh
index e869705..bee9989 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -79,7 +79,7 @@ gen_minkernpackage() {
 	local -a tar_cmd=( "$(get_tar_cmd "${MINKERNPACKAGE}")" )
 	tar_cmd+=( '*' )
 
-	print_info 2 "COMMAND: ${tar_cmd[*]}" 1 0 1
+	print_info 3 "COMMAND: ${tar_cmd[*]}" 1 0 1
 	eval "${tar_cmd[@]}" || gen_die "Failed to create compressed min kernel package '${MINKERNPACKAGE}'!"
 }
 
@@ -99,7 +99,7 @@ gen_modulespackage() {
 		local -a tar_cmd=( "$(get_tar_cmd "${MODULESPACKAGE}")" )
 		tar_cmd+=( '*' )
 
-		print_info 2 "COMMAND: ${tar_cmd[*]}" 1 0 1
+		print_info 3 "COMMAND: ${tar_cmd[*]}" 1 0 1
 		eval "${tar_cmd[@]}" || gen_die "Failed to create compressed modules package '${MODULESPACKAGE}'!"
 	else
 		print_info 1 "'${INSTALL_MOD_PATH}/lib/modules/${KV}' was not found; Skipping creation of modules package in '${MODULESPACKAGE}' ..."
@@ -171,7 +171,7 @@ gen_kerncache() {
 	local -a tar_cmd=( "$(get_tar_cmd "${KERNCACHE}")" )
 	tar_cmd+=( '*' )
 
-	print_info 2 "COMMAND: ${tar_cmd[*]}" 1 0 1
+	print_info 3 "COMMAND: ${tar_cmd[*]}" 1 0 1
 	eval "${tar_cmd[@]}" || gen_die "Failed to create compressed kernel package '${KERNCACHE}'!"
 }
 

diff --git a/gen_worker.sh b/gen_worker.sh
index 8b59f1a..caf407a 100755
--- a/gen_worker.sh
+++ b/gen_worker.sh
@@ -62,7 +62,7 @@ gkexec() {
 	local -a command=( "${1}" )
 	local pipes=${2:-0}
 
-	print_info 2 "COMMAND: ${command[@]}" 1 0 1
+	print_info 3 "COMMAND: ${command[@]}" 1 0 1
 
 	command+=( "$(catch_output_and_failures "Command '${command[@]}' failed!" ${pipes})" )
 	eval "${command[@]}"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     7e5137e6b0d68f5d59b59c773d98dfa27c662ef6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 00:06:14 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 00:06:14 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7e5137e6

genkernel: Bump version to v4.0.0_beta3

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 391879e..cae0330 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_beta2'
+GK_V='4.0.0_beta3'
 
 # Set the default for TMPDIR. May be modified by genkernel.conf or the
 # --tempdir command line option.

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     c0bcc845e351dcd020fdc41f574476992e84e4dc
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 11:41:09 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 12:16:00 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c0bcc845

gen_initramfs.sh: create_initramfs(): Make MCU CPIO creation silent but log content

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index f3b0ba0..6085ee8 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1727,9 +1727,10 @@ create_initramfs() {
 			if [ -f "${UCODEDIR}/AuthenticAMD.bin" -o -f "${UCODEDIR}/GenuineIntel.bin" ]
 			then
 				print_info 1 "$(get_indent 2)early-microcode: Creating cpio ..."
-				pushd "${TEMP}/ucode_tmp" > /dev/null
-				find . -print0 | cpio --null -o -H newc > ../ucode.cpio || gen_die "Failed to create cpu microcode cpio"
-				popd > /dev/null
+				pushd "${TEMP}/ucode_tmp" &>/dev/null || gen_die "Failed to chdir to '${TEMP}/ucode_tmp'!"
+				log_future_cpio_content
+				find . -print0 | cpio --quiet --null -o -H newc > ../ucode.cpio || gen_die "Failed to create cpu microcode cpio"
+				popd &>/dev/null || gen_die "Failed to chdir!"
 				print_info 1 "$(get_indent 2)early-microcode: Prepending early-microcode to initramfs ..."
 				cat "${TEMP}/ucode.cpio" "${CPIO}" > "${CPIO}.early-microcode" || gen_die "Failed to prepend early-microcode to initramfs"
 				mv -f "${CPIO}.early-microcode" "${CPIO}" || gen_die "Rename failed"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     e55a6c5c7a39a17bea902301125092e1952a931c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 11:31:13 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 12:16:00 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e55a6c5c

gen_initramfs.sh: Use find with -print0 parameter to support files with whitespaces

Bug: https://bugs.gentoo.org/689952
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 58 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index f5162bb..f3b0ba0 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -2,7 +2,7 @@
 # $Id$
 
 COPY_BINARIES=false
-CPIO_ARGS="--quiet -o -H newc --owner root:root --force-local"
+CPIO_ARGS="--quiet --null -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:
@@ -173,7 +173,7 @@ copy_system_binaries() {
 log_future_cpio_content() {
 	print_info 3 "=================================================================" 1 0 1
 	print_info 3 "About to add these files from '${PWD}' to cpio archive:" 1 0 1
-	print_info 3 "$(find . | xargs ls -ald)" 1 0 1
+	print_info 3 "$(find . -print0 | xargs --null ls -ald)" 1 0 1
 	print_info 3 "=================================================================" 1 0 1
 }
 
@@ -304,7 +304,7 @@ append_base_layout() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append baselayout to cpio!"
 }
 
@@ -355,7 +355,7 @@ append_busybox() {
 	copy_system_binaries "${TDIR}"/lib "${libdir}"/libnss_dns.so.2
 
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -376,7 +376,7 @@ append_e2fsprogs() {
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -400,7 +400,7 @@ append_blkid() {
 	rm -rf usr/
 
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append blkid to cpio!"
 }
 
@@ -420,7 +420,7 @@ append_unionfs_fuse() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -456,7 +456,7 @@ append_multipath() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -485,7 +485,7 @@ append_dmraid() {
 	mkdir -p "${TDIR}"/var/lock/dmraid || gen_die "Failed to create '${TDIR}/var/lock/dmraid'!"
 
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append dmraid to cpio!"
 }
 
@@ -505,7 +505,7 @@ append_iscsi() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append iscsi to cpio!"
 }
 
@@ -575,7 +575,7 @@ append_lvm() {
 	fi
 
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append lvm to cpio!"
 }
 
@@ -617,7 +617,7 @@ append_mdadm() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -638,7 +638,7 @@ append_xfsprogs() {
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -683,7 +683,7 @@ append_zfs() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -704,7 +704,7 @@ append_btrfs() {
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -733,7 +733,7 @@ append_libgcc_s() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append libgcc_s to cpio!"
 }
 
@@ -779,7 +779,7 @@ append_linker() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append linker to cpio!"
 }
 
@@ -824,7 +824,7 @@ append_splash() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append splash to cpio!"
 }
 
@@ -844,7 +844,7 @@ append_strace() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -852,7 +852,7 @@ append_overlay() {
 	cd "${INITRAMFS_OVERLAY}"  || gen_die "Failed to chdir to '${INITRAMFS_OVERLAY}'!"
 
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append overlay to cpio!"
 }
 
@@ -876,7 +876,7 @@ append_luks() {
 	rm -rf usr/
 
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append luks to cpio!"
 }
 
@@ -1154,7 +1154,7 @@ append_dropbear() {
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
 
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -1188,7 +1188,7 @@ append_firmware() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append firmware to cpio!"
 }
 
@@ -1208,7 +1208,7 @@ append_gpg() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -1293,7 +1293,7 @@ append_modules() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append modules-${KV} to cpio!"
 }
 
@@ -1314,7 +1314,7 @@ append_modprobed() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append modprobe.d to cpio!"
 }
 
@@ -1449,7 +1449,7 @@ append_auxilary() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 		|| gen_die "Failed to append auxilary to cpio!"
 }
 
@@ -1553,7 +1553,7 @@ create_initramfs() {
 				|| gen_die "Failed to pre-generate '${TDIR}/etc/ld.so.cache'!"
 		fi
 
-		find . -print | cpio ${CPIO_ARGS} -F "${CPIO}" 2>/dev/null \
+		find . -print0 | cpio ${CPIO_ARGS} -F "${CPIO}" 2>/dev/null \
 			|| gen_die "rebuilding cpio for dedupe"
 	else
 		print_info 1 "$(get_indent 1)>> Cannot deduping cpio contents without root; Skipping ..."
@@ -1728,7 +1728,7 @@ create_initramfs() {
 			then
 				print_info 1 "$(get_indent 2)early-microcode: Creating cpio ..."
 				pushd "${TEMP}/ucode_tmp" > /dev/null
-				find . | cpio -o -H newc > ../ucode.cpio || gen_die "Failed to create cpu microcode cpio"
+				find . -print0 | cpio --null -o -H newc > ../ucode.cpio || gen_die "Failed to create cpu microcode cpio"
 				popd > /dev/null
 				print_info 1 "$(get_indent 2)early-microcode: Prepending early-microcode to initramfs ..."
 				cat "${TEMP}/ucode.cpio" "${CPIO}" > "${CPIO}.early-microcode" || gen_die "Failed to prepend early-microcode to initramfs"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     323c9f71d7d8255ac104bc1066e292e3f69c4a92
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 11:29:49 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 12:15:54 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=323c9f71

genkernel: Use $BOOTDIR in msg regarding genkernel hardware detection feature

Bug: https://bugs.gentoo.org/689950
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/genkernel b/genkernel
index cae0330..eae61a3 100755
--- a/genkernel
+++ b/genkernel
@@ -379,11 +379,11 @@ then
 	print_info 1 'Where $ROOT is the device node for your root partition as the'
 	print_info 1 'one specified in /etc/fstab'
 
-	if isTrue "${show_warning_initramfs_is_required}"
+	if isTrue "${show_warning_initramfs_is_required}" && isTrue "${BUILD_RAMDISK}"
 	then
 		echo
 		print_warning 1 "If you require Genkernel's hardware detection features, you ${BOLD}MUST${NORMAL}"
-		print_warning 1 "tell your bootloader to use the provided initramfs file (${TMPDIR}/initramfs-${KNAME}-${ARCH}-${KV})."
+		print_warning 1 "tell your bootloader to use the provided initramfs file (${BOOTDIR}/initramfs-${KNAME}-${ARCH}-${KV})."
 	fi
 	unset show_warning_initramfs_is_required
 fi
@@ -394,6 +394,10 @@ then
 	then
 		print_info 1 ''
 		print_info 1 "You will find the initramfs in '${TMPDIR}/initramfs-${KNAME}-${ARCH}-${KV}'."
+	elif ! isTrue "${BUILD_KERNEL}" && isTrue "${CMD_INSTALL}"
+	then
+		print_info 1 ''
+		print_info 1 "You will find the initramfs in '${BOOTDIR}/initramfs-${KNAME}-${ARCH}-${KV}'."
 	fi
 
 	echo

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     ceb6c89a2dc12952a2e025184f2b55c47108c70d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 12:15:02 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 12:16:00 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ceb6c89a

genkernel: Replace echo with print_* functions for pretty $LOGFILE

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/genkernel b/genkernel
index eae61a3..abeb2db 100755
--- a/genkernel
+++ b/genkernel
@@ -87,7 +87,7 @@ NORMAL=${GOOD} print_info 1 "Gentoo Linux Genkernel; Version ${GK_V}${NORMAL}"
 print_info 1 "Using genkernel configuration from '${_GENKERNEL_CONF}' ..."
 unset _GENKERNEL_CONF
 print_info 1 "Running with options: ${GK_OPTIONS}"
-echo
+print_info 1 '' 1 0
 
 # Save any customizations of MODULES_* first.
 override_module_vars="$(compgen -A variable |grep '^MODULES_')"
@@ -182,14 +182,14 @@ else
 				if ! mount ${BOOTDIR}
 				then
 					print_warning 1 "${BOLD}WARNING${NORMAL}: Failed to mount ${BOOTDIR}!"
-					echo
+					print_warning 1 '' 1 0
 				else
 					print_info 1 "mount: ${BOOTDIR} mounted successfully!"
 				fi
 			else
 				print_warning 1 "${BOLD}WARNING${NORMAL}: No mounted ${BOOTDIR} partition detected!"
 				print_warning 1 "$(get_indent 1)Run ``mount ${BOOTDIR}`` to mount it!"
-				echo
+				print_warning 1 '' 1 0
 			fi
 		fi
 	elif is_boot_ro
@@ -199,7 +199,7 @@ else
 			if ! mount -o remount,rw ${BOOTDIR}
 			then
 				print_warning 1 "${BOLD}WARNING${NORMAL}: Failed to remount ${BOOTDIR} RW!"
-				echo
+				print_warning 1 '' 1 0
 			else
 				print_info 1 "mount: ${BOOTDIR} remounted read/write successfully!"
 				BOOTRW="yes"
@@ -283,16 +283,16 @@ then
 
 	if [ "${CALLBACK_ESCAPE}" -eq 0 ]
 	then
-		echo
-		echo
+		print_info 1 '' 1 0
+		print_info 1 '' 1 0
 		eval ${CMD_CALLBACK} | tee -a "${LOGFILE}"
 		CMD_STATUS="${PIPESTATUS[0]}"
-		echo
+		print_info 1 '' 1 0
 		print_info 1 "<<< Callback exit status: ${CMD_STATUS}"
 		[ "${CMD_STATUS}" -ne 0 ] && gen_die '--callback failed!'
 	else
-		echo
-		print_info 1 ">>> Callback cancelled ..."
+		print_warning 1 '' 1 0
+		print_warning 1 ">>> Callback cancelled ..."
 	fi
 
 	# restore default trap
@@ -381,7 +381,7 @@ then
 
 	if isTrue "${show_warning_initramfs_is_required}" && isTrue "${BUILD_RAMDISK}"
 	then
-		echo
+		print_warning 1 '' 1 0
 		print_warning 1 "If you require Genkernel's hardware detection features, you ${BOLD}MUST${NORMAL}"
 		print_warning 1 "tell your bootloader to use the provided initramfs file (${BOOTDIR}/initramfs-${KNAME}-${ARCH}-${KV})."
 	fi
@@ -400,7 +400,7 @@ then
 		print_info 1 "You will find the initramfs in '${BOOTDIR}/initramfs-${KNAME}-${ARCH}-${KV}'."
 	fi
 
-	echo
+	print_warning 1 '' 1 0
 	print_warning 1 "${BOLD}WARNING... WARNING... WARNING...${NORMAL}"
 	print_warning 1 'Additional kernel parameters that *may* be required to boot properly:'
 	isTrue "${SPLASH}"    && print_warning 1 "- Add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer ]"
@@ -458,7 +458,7 @@ fi
 
 isTrue "${BOOTRW}" && mount -o remount,ro ${BOOTDIR}
 
-echo
+print_info 1 '' 1 0
 print_info 1 'Do NOT report kernel bugs as genkernel bugs unless your bug'
 print_info 1 'is about the default genkernel configuration...'
 print_info 1 ''

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     6082914b86b3575b879e0ad4c8850adc11a50c02
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 12:18:32 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 12:18:32 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6082914b

genkernel: Bump version to v4.0.0_beta4

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index abeb2db..470dd05 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_beta3'
+GK_V='4.0.0_beta4'
 
 # Set the default for TMPDIR. May be modified by genkernel.conf or the
 # --tempdir command line option.

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     e4cf87fe9c39e792d8975c90c3dd47ac70adb669
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 14:48:38 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 14:48:38 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e4cf87fe

initramfs: Add meta files used by dracut's lsinitrd

This will allow dracut's lsinitrd to process our initramfs.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 6085ee8..3203cac 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -226,6 +226,7 @@ append_base_layout() {
 		etc \
 		etc/mdev/helpers \
 		lib \
+		lib/dracut \
 		mnt \
 		proc \
 		run \
@@ -283,6 +284,38 @@ append_base_layout() {
 	echo "Genkernel $GK_V" > "${TDIR}"/etc/build_id \
 		|| gen_die "Failed to create '${TDIR}/etc/build_id'!"
 
+	# Allow lsinitrd from dracut to process our initramfs
+	echo "$(cat "${TDIR}/etc/build_id") ($(cat "${TDIR}/etc/build_date"))" > "${TDIR}"/lib/dracut/dracut-gk-version.info \
+		|| gen_die "Failed to create '${TDIR}/lib/dracut/dracut-gk-version.info'!"
+
+	local -a build_parameters
+	isTrue "${COMPRESS_INITRD}" && build_parameters+=( --compress-initramfs ) || build_parameters+=( --no-compress-initramfs )
+	isTrue "${MICROCODE_INITRAMFS}" && build_parameters+=( --microcode-initramfs ) || build_parameters+=( --no-microcode-initramfs )
+	isTrue "${RAMDISKMODULES}" && build_parameters+=( --ramdisk-modules ) || build_parameters+=( --no-ramdisk-modules )
+	isTrue "${BUSYBOX}" && build_parameters+=( --busybox ) || build_parameters+=( --no-busybox )
+	isTrue "${DISKLABEL}" && build_parameters+=( --disklabel ) || build_parameters+=( --no-disklabel )
+	isTrue "${BTRFS}" && build_parameters+=( --btrfs ) || build_parameters+=( --no-btrfs )
+	isTrue "${ISCSI}" && build_parameters+=( --iscsi ) || build_parameters+=( --no-iscsi )
+	isTrue "${MULTIPATH}" && build_parameters+=( --multipath ) || build_parameters+=( --no-multipath )
+	isTrue "${DMRAID}" && build_parameters+=( --dmraid ) || build_parameters+=( --no-dmraid )
+	isTrue "${MDADM}" && build_parameters+=( --mdadm ) || build_parameters+=( --no-mdadm )
+	isTrue "${LVM}" && build_parameters+=( --lvm ) || build_parameters+=( --no-lvm )
+	isTrue "${UNIONFS}" && build_parameters+=( --unionfs ) || build_parameters+=( --no-unionfs )
+	isTrue "${ZFS}" && build_parameters+=( --zfs ) || build_parameters+=( --no-zfs )
+	isTrue "${SPLASH}" && build_parameters+=( --splash ) || build_parameters+=( --no-splash )
+	isTrue "${STRACE}" && build_parameters+=( --strace ) || build_parameters+=( --no-strace )
+	isTrue "${GPG}" && build_parameters+=( --gpg ) || build_parameters+=( --no-gpg )
+	isTrue "${LUKS}" && build_parameters+=( --luks ) || build_parameters+=( --no-luks )
+	isTrue "${FIRMWARE}" && build_parameters+=( --firmware ) || build_parameters+=( --no-firmware )
+	[ -n "${FIRMWARE_DIR}" ] && build_parameters+=( --firmware-dir="${FIRMWARE_DIR}" )
+	[ -n "${FIRMWARE_FILES}" ] && build_parameters+=( --firmware-files="${FIRMWARE_FILES}" )
+	isTrue "${SSH}" && build_parameters+=( --ssh ) || build_parameters+=( --no-ssh )
+	isTrue "${E2FSPROGS}" && build_parameters+=( --e2fsprogs ) || build_parameters+=( --no-e2fsprogs )
+	isTrue "${XFSPROGS}" && build_parameters+=( --xfsprogs ) || build_parameters+=( --no-xfsprogs )
+
+	echo "${build_parameters[@]}" > "${TDIR}"/lib/dracut/build-parameter.txt \
+		|| gen_die "Failed to create '${TDIR}/lib/dracut/build-parameter.txt'!"
+
 	dd if=/dev/zero of="${TDIR}/var/log/lastlog" bs=1 count=0 seek=0 &>/dev/null \
 		|| die "Failed to create '${TDIR}/var/log/lastlog'!"
 
@@ -1701,6 +1734,7 @@ create_initramfs() {
 			print_info 1 "$(get_indent 1)>> Adding early-microcode support ..."
 			local UCODEDIR="${TEMP}/ucode_tmp/kernel/x86/microcode/"
 			mkdir -p "${UCODEDIR}" || gen_die "Failed to create '${UCODEDIR}'!"
+			echo 1 > "${TEMP}/ucode_tmp/early_cpio"
 
 			if [[ "${cfg_CONFIG_MICROCODE_INTEL}" == "y" ]]
 			then

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     1c8e96a6f71513799cc9ef2697f18b9ec9348059
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 14:50:35 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 14:50:35 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1c8e96a6

gen_initramfs.sh: create_initramfs(): When deduping CPIO, use --reproducible parameter

Signed-off-by: Thomas Deutschmann <whissi <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 3203cac..9f8fa6d 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1586,7 +1586,7 @@ create_initramfs() {
 				|| gen_die "Failed to pre-generate '${TDIR}/etc/ld.so.cache'!"
 		fi
 
-		find . -print0 | cpio ${CPIO_ARGS} -F "${CPIO}" 2>/dev/null \
+		find . -print0 | sort -z | cpio ${CPIO_ARGS} --reproducible -F "${CPIO}" 2>/dev/null \
 			|| gen_die "rebuilding cpio for dedupe"
 	else
 		print_info 1 "$(get_indent 1)>> Cannot deduping cpio contents without root; Skipping ..."

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     4560f31efa1ed95b0ed3c2369637fc6ecf6a35ed
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 16:33:18 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 16:33:18 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4560f31e

gen_initramfs.sh: append_base_layout(): Record --keymap parameter in build-parameter.txt

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 9f8fa6d..d5383f5 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -289,6 +289,15 @@ append_base_layout() {
 		|| gen_die "Failed to create '${TDIR}/lib/dracut/dracut-gk-version.info'!"
 
 	local -a build_parameters
+
+	if isTrue "${KEYMAP}"
+	then
+		build_parameters+=( --keymap )
+		isTrue "${DOKEYMAPAUTO}" && build_parameters+=( --do-keymap-auto )
+	else
+		build_parameters+=( --no-keymap )
+	fi
+
 	isTrue "${COMPRESS_INITRD}" && build_parameters+=( --compress-initramfs ) || build_parameters+=( --no-compress-initramfs )
 	isTrue "${MICROCODE_INITRAMFS}" && build_parameters+=( --microcode-initramfs ) || build_parameters+=( --no-microcode-initramfs )
 	isTrue "${RAMDISKMODULES}" && build_parameters+=( --ramdisk-modules ) || build_parameters+=( --no-ramdisk-modules )

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     979a5e59b766b2defad9f1252baae9524debc99b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 18:49:49 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 18:49:49 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=979a5e59

gen_configkernel.sh: config_kernel(): Fix code style

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index c37a9cb..c0c2439 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -250,8 +250,8 @@ config_kernel() {
 	then
 		print_info 2 "$(get_indent 1)>> Ensure that required kernel options for bcache support are set ..."
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MD" "y"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BCACHE" "${newcfg_setting}" &&
-			required_kernel_options+=( 'CONFIG_BCACHE' )
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BCACHE" "${newcfg_setting}" \
+			&& required_kernel_options+=( 'CONFIG_BCACHE' )
 	fi
 
 	# Make sure lvm modules are enabled in the kernel, if --lvm
@@ -286,26 +286,26 @@ config_kernel() {
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO" "y"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MD" "y"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_NET" "y"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}" &&
-			required_kernel_options+=( 'CONFIG_BLK_DEV_DM' )
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_CRYPT" "${cfg_CONFIG_BLK_DEV_DM}" &&
-			required_kernel_options+=( 'CONFIG_DM_CRYPT' )
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}" \
+			&& required_kernel_options+=( 'CONFIG_BLK_DEV_DM' )
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_CRYPT" "${cfg_CONFIG_BLK_DEV_DM}" \
+			&& required_kernel_options+=( 'CONFIG_DM_CRYPT' )
 
 		local cfg_CONFIG_CRYPTO_AES=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_AES")
 		case "${cfg_CONFIG_CRYPTO_AES}" in
 			y|m) ;; # Do nothing
 			*) cfg_CONFIG_CRYPTO_AES=${newcfg_setting}
 		esac
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_XTS" "${cfg_CONFIG_CRYPTO_AES}" &&
-			required_kernel_options+=( 'CONFIG_CRYPTO_XTS' )
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_SHA256" "${cfg_CONFIG_CRYPTO_AES}" &&
-			required_kernel_options+=( 'CONFIG_CRYPTO_SHA256' )
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_AES" "${cfg_CONFIG_CRYPTO_AES}" &&
-			required_kernel_options+=( 'CONFIG_CRYPTO_AES' )
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_USER_API_HASH" "${cfg_CONFIG_CRYPTO_AES}" &&
-			required_kernel_options+=( 'CONFIG_CRYPTO_USER_API_HASH' )
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_USER_API_SKCIPHER" "${cfg_CONFIG_CRYPTO_AES}" &&
-			required_kernel_options+=( 'CONFIG_CRYPTO_USER_API_SKCIPHER' )
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_XTS" "${cfg_CONFIG_CRYPTO_AES}" \
+			&& required_kernel_options+=( 'CONFIG_CRYPTO_XTS' )
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_SHA256" "${cfg_CONFIG_CRYPTO_AES}" \
+			&& required_kernel_options+=( 'CONFIG_CRYPTO_SHA256' )
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_AES" "${cfg_CONFIG_CRYPTO_AES}" \
+			&& required_kernel_options+=( 'CONFIG_CRYPTO_AES' )
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_USER_API_HASH" "${cfg_CONFIG_CRYPTO_AES}" \
+			&& required_kernel_options+=( 'CONFIG_CRYPTO_USER_API_HASH' )
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_USER_API_SKCIPHER" "${cfg_CONFIG_CRYPTO_AES}" \
+			&& required_kernel_options+=( 'CONFIG_CRYPTO_USER_API_SKCIPHER' )
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_USER_API_AEAD" "${cfg_CONFIG_CRYPTO_AES}"
 
 		local cfg_CONFIG_X86=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_X86")

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     71fbd7a7cbce3a1ece700953d36767ac68bdf4ac
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 18:50:23 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 18:50:23 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=71fbd7a7

gen_configkernel.sh: config_kernel(): Ensure that CONFIG_TTY & CONFIG_UNIX98_PTYS is set

...when building initramfs.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index c0c2439..503812c 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -238,6 +238,17 @@ config_kernel() {
 		fi
 	fi
 
+	if isTrue "${BUILD_RAMDISK}"
+	then
+		# We really need this or we will fail to boot
+		print_info 2 "$(get_indent 1)>> Ensure that required kernel options for genkernel's initramfs usage are set ..."
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_TTY" "y" \
+			&& required_kernel_options+=( 'CONFIG_TTY' )
+
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_UNIX98_PTYS" "y" \
+			&& required_kernel_options+=( 'CONFIG_UNIX98_PTYS' )
+	fi
+
 	# If the user has configured DM as built-in, we need to respect that.
 	local cfg_CONFIG_BLK_DEV_DM=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM")
 	case "${cfg_CONFIG_BLK_DEV_DM}" in

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     6671aa9863d4d1f7259b0ef722e5bd0246b4d86d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 10:19:23 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 10:19:23 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6671aa98

Fix hppa support

Make sure we pull in correct genkernel arch-specific configuration.
Kernel arch is always "parisc".

Bug: https://bugs.gentoo.org/658692
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_arch.sh          | 3 +++
 gen_determineargs.sh | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/gen_arch.sh b/gen_arch.sh
index f070a6f..7aef963 100755
--- a/gen_arch.sh
+++ b/gen_arch.sh
@@ -8,6 +8,9 @@ determine_kernel_arch() {
 
 	KERNEL_ARCH=${ARCH}
 	case ${ARCH} in
+		parisc|parisc64)
+			KERNEL_ARCH=parisc
+			;;
 		ppc|ppc64*)
 			if [ "${VER}" -ge "3" ]
 			then

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 9fa8357..76c5b0d 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -204,6 +204,12 @@ determine_real_args() {
 			arm*)
 				ARCH="arm"
 				;;
+			hppa64*)
+				ARCH="parisc64"
+				;;
+			hppa*)
+				ARCH="parisc"
+				;;
 			i386)
 				ARCH="ia32"
 				;;

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     8ccaf4101e7a16a92c6654acc9d58e2238e6e689
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 10:38:06 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 10:38:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8ccaf410

gen_determineargs.sh: determine_real_args(): Log readings

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 76c5b0d..7bebea1 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -244,6 +244,8 @@ determine_real_args() {
 		if [ -z "${ARCH}" ]
 		then
 			gen_die "Was unable to determine machine hardware name using 'uname -m'!"
+		else
+			print_info 5 "Read '${ARCH}' from 'uname -m' ..."
 		fi
 
 		case "${ARCH}" in
@@ -276,15 +278,18 @@ determine_real_args() {
 	then
 		gen_die "Failed to determine CBUILD using '${build_cc} -dumpmachine' command!"
 	else
+		print_info 5 "CBUILD set to '${CBUILD}' ..."
 		CHOST="${CBUILD}"
 	fi
 	unset build_cc
 
-	if [ "${CMD_CROSS_COMPILE}" != '' ]
+	if [ -n "${CMD_CROSS_COMPILE}" ]
 	then
 		CHOST="${CMD_CROSS_COMPILE}"
 	fi
 
+	print_info 5 "CHOST set to '${CHOST}' ..."
+
 	# Initialize variables
 	BOOTDIR=$(arch_replace "${BOOTDIR}")
 	BOOTDIR=${BOOTDIR%/}    # Remove any trailing slash

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     ced7a8141c6d311eee4928959fb42919ed34e6e6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 00:25:08 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 00:25:08 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ced7a814

Change --microcode-initramfs handling

- Always add microcode to initramfs when user has set
  --microcode-initramfs option despite kernel support.

- Show warning when kernel will be unable to use microcode.

- Inform user that --microcode-initramfs is not the recommended
  method to load microcode when bootloader supports multiple
  initramfs and /boot/{amd,intel}-uc.img is available (currently
  only true for --microcode=intel).

- --microcode-initramfs and --integrated-initramfs options are
  mutually exclusive.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 13 +++++++++++++
 gen_initramfs.sh     | 53 +++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 7bebea1..f345944 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -468,6 +468,19 @@ determine_real_args() {
 		*) gen_die "Invalid microcode '${MICROCODE}', --microcode=<type> requires one of: no, all, intel, amd" ;;
 	esac
 
+	if isTrue "${BUILD_RAMDISK}"  && isTrue "${MICROCODE_INITRAMFS}" && [[ -z "${MICROCODE}" ]]
+	then
+		print_warning 1 '--microcode=no implies --no-microcode-initramfs; Will not add any microcode to initramfs ...'
+		print_warning 1 '' 1 0
+		MICROCODE_INITRAMFS=no
+	fi
+
+	if isTrue "${BUILD_RAMDISK}"  && isTrue "${MICROCODE_INITRAMFS}" && isTrue "${INTEGRATED_INITRAMFS}"
+	then
+		# Force a user decision
+		gen_die "Cannot embed microcode in initramfs when --integrated-initramfs is set. Either change option to --no-integrated-initramfs or --no-microcode-initramfs!"
+	fi
+
 	if isTrue "${FIRMWARE}"
 	then
 		for ff in ${FIRMWARE_FILES}; do

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index d5383f5..1479a5d 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1728,16 +1728,9 @@ create_initramfs() {
 		## mostly laid out in linux/Documentation/x86/early-microcode.txt
 		## It only loads monolithic ucode from an uncompressed cpio, which MUST
 		## be before the other cpio archives in the stream.
-		local cfg_CONFIG_MICROCODE=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE)
-		if isTrue "${MICROCODE_INITRAMFS}" && [ "${cfg_CONFIG_MICROCODE}" == "y" ]
+		if isTrue "${MICROCODE_INITRAMFS}"
 		then
-			if [[ "${MICROCODE}" == intel ]]
-			then
-				# Only show this information for Intel users because we have no mechanism yet
-				# to generate amd-*.img in /boot after sys-kernel/linux-firmware update
-				print_info 1 "MICROCODE_INITRAMFS option is enabled by default for compatability but made obsolete by >=sys-boot/grub-2.02-r1"
-			fi
-
+			local cfg_CONFIG_MICROCODE=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE)
 			local cfg_CONFIG_MICROCODE_INTEL=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_INTEL)
 			local cfg_CONFIG_MICROCODE_AMD=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_AMD)
 			print_info 1 "$(get_indent 1)>> Adding early-microcode support ..."
@@ -1745,25 +1738,42 @@ create_initramfs() {
 			mkdir -p "${UCODEDIR}" || gen_die "Failed to create '${UCODEDIR}'!"
 			echo 1 > "${TEMP}/ucode_tmp/early_cpio"
 
-			if [[ "${cfg_CONFIG_MICROCODE_INTEL}" == "y" ]]
+			if [ "${cfg_CONFIG_MICROCODE}" != "y" ]
 			then
+				print_warning 1 "$(get_indent 2)early-microcode: Will add microcode(s) like requested but kernel has set CONFIG_MICROCODE=n"
+			fi
+
+			if [[ "${MICROCODE}" == 'all' || "${MICROCODE}" == 'intel' ]]
+			then
+				if [[ "${cfg_CONFIG_MICROCODE_INTEL}" != "y" ]]
+				then
+					print_warning 1 "$(get_indent 2)early-microcode: Will add Intel microcode(s) like requested (--microcode=${MICROCODE}) but kernel has set CONFIG_MICROCODE_INTEL=n"
+				fi
+
 				if [ -d /lib/firmware/intel-ucode ]
 				then
 					print_info 1 "$(get_indent 2)early-microcode: Adding GenuineIntel.bin ..."
 					cat /lib/firmware/intel-ucode/* > "${UCODEDIR}/GenuineIntel.bin" || gen_die "Failed to concat intel cpu ucode"
 				else
-					print_info 1 "$(get_indent 2)early-microcode: CONFIG_MICROCODE_INTEL=y set but no ucode available. Please install sys-firmware/intel-microcode[split-ucode]"
+					print_warning 1 "$(get_indent 2)early-microcode: Unable to add Intel microcode like requested (--microcode=${MICROCODE}); No ucode is available."
+					print_warning 1 "$(get_indent 2)                 Is sys-firmware/intel-microcode[split-ucode] installed?"
 				fi
 			fi
 
-			if [[ "${cfg_CONFIG_MICROCODE_AMD}" == "y" ]]
+			if [[ "${MICROCODE}" == 'all' || "${MICROCODE}" == 'amd' ]]
 			then
+				if [[ "${cfg_CONFIG_MICROCODE_AMD}" != "y" ]]
+				then
+					print_warning 1 "$(get_indent 2)early-microcode: Will add AMD microcode(s) like requested (--microcode=${MICROCODE}) but kernel has set CONFIG_MICROCODE_AMD=n"
+				fi
+
 				if [ -d /lib/firmware/amd-ucode ]
 				then
 					print_info 1 "$(get_indent 2)early-microcode: Adding AuthenticAMD.bin ..."
 					cat /lib/firmware/amd-ucode/*.bin > "${UCODEDIR}/AuthenticAMD.bin" || gen_dir "Failed to concat amd cpu ucode"
 				else
-					print_info 1 "$(get_indent 2)early-microcode: CONFIG_MICROCODE_AMD=y set but no ucode available. Please install sys-firmware/linux-firmware"
+					print_warning 1 "$(get_indent 2)early-microcode: Unable to add AMD microcode like requested (--microcode=${MICROCODE}); No ucode is available."
+					print_warning 1 "$(get_indent 2)                 Is sys-firmware/linux-firmware installed?"
 				fi
 			fi
 
@@ -1778,9 +1788,22 @@ create_initramfs() {
 				cat "${TEMP}/ucode.cpio" "${CPIO}" > "${CPIO}.early-microcode" || gen_die "Failed to prepend early-microcode to initramfs"
 				mv -f "${CPIO}.early-microcode" "${CPIO}" || gen_die "Rename failed"
 			else
-				print_info 1 "$(get_indent 2)early-microcode: CONFIG_MICROCODE=y is set but no microcode found"
-				print_info 1 "$(get_indent 2)early-microcode: You can disable MICROCODE_INITRAMFS option if you use your bootloader to load AMD/Intel ucode initrd"
+				print_warning 1 "$(get_indent 2)early-microcode: No microcode found; Will not prepend any microcode to initramfs ..."
+				print_info 1    "$(get_indent 2)                 ${BOLD}Note:${NORMAL} You can set --no-microcode-initramfs if you load microcode on your own"
+			fi
+
+			if ! isTrue "${WRAP_INITRD}" && [[ "${MICROCODE}" == intel ]]
+			then
+				# Only show this information for Intel users because we have no mechanism yet
+				# to generate amd-*.img in /boot after sys-kernel/linux-firmware update
+				print_info 1 ''
+				print_info 1 "${BOLD}Note:${NORMAL}"
+				print_info 1 '--microcode-initramfs option is enabled by default for backward compatability.'
+				print_info 1 'If your bootloader can load multiple initramfs it is recommended to load'
+				print_info 1 '/boot/intel-uc.img instead of embedding microcode into initramfs.'
 			fi
+		else
+			print_info 3 "$(get_indent 1)>> --no-microcode-initramfs is set; Skipping early-microcode support ..."
 		fi
 
 		if isTrue "${WRAP_INITRD}"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     8eef5eaba19f1949deb9b5dd3cf035d2cdcdf950
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 00:43:28 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 00:43:28 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8eef5eab

genkernel: Bump to v4.0.0_beta5

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index fb08ea7..c0b2b31 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_beta4'
+GK_V='4.0.0_beta5'
 
 # Set the default for TMPDIR. May be modified by genkernel.conf or the
 # --tempdir command line option.

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     8458d98a5d16efedb9a027d929a13062676b6827
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 00:16:00 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 00:16:00 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8458d98a

Rework --mountboot handling

- Move code to own function.

- Use same logic like mount-boot.eclass.

- Ensure to restore state of boot partition on exit/error.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 genkernel    |  44 +---------------
 2 files changed, 167 insertions(+), 46 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 15548d3..c453962 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -325,10 +325,6 @@ get_indent() {
 	echo "${_indent}"
 }
 
-is_boot_ro() {
-	return $(awk '( $2 == "'${BOOTDIR}'" && $4 ~ /(^|,)ro(,|$)/){ I=1; exit }END{print !I }' /proc/mounts);
-}
-
 setup_cache_dir() {
 	if [ ! -d "${GK_V_CACHEDIR}" ]
 	then
@@ -1058,6 +1054,7 @@ trap_cleanup() {
 	print_error 1 "Genkernel was unexpectedly terminated${signal_msg}."
 	print_error 1 "Please consult '${LOGFILE}' for more information and any"
 	print_error 1 "errors that were reported above."
+	restore_boot_mount_state silent
 	cleanup
 	exit 1
 }
@@ -1343,6 +1340,88 @@ set_config_with_override() {
 	eval ${CfgVar}=\"${Result}\"
 }
 
+# @FUNCTION: restore_boot_mount_state
+# @USAGE: [<silent>]
+# @DESCRIPTION:
+# Restores mount state of boot partition to state before genkernel start.
+#
+# <silent> When set makes umount errors non-fatal and will use a loglevel
+#          of 5 for any output.
+restore_boot_mount_state() {
+	local silent=no
+	[ -n "${1}" ] && silent=yes
+
+	isTrue "${MOUNTBOOT}" || return
+
+	if [ -f "${TEMP}/.bootdir.remount" ]
+	then
+		local msg="mount: >> Automatically remounting boot partition as read-only on '${BOOTDIR}' as it was previously ..."
+		if isTrue "${silent}"
+		then
+			print_info 5 "${msg}"
+		else
+			print_info 1 '' 1 0
+			print_info 1 "${msg}"
+		fi
+
+		mount -o remount,ro "${BOOTDIR}" &>/dev/null
+		if [ $? -ne 0 ]
+		then
+			local error_msg="Failed to restore read-only state of boot partition on '${BOOTDIR}'!"
+			if isTrue "${silent}"
+			then
+				print_error 1 "${error_msg}"
+				return
+			else
+				gen_die "${error_msg}"
+			fi
+		else
+			rm "${TEMP}/.bootdir.remount" \
+				|| gen_die "Failed to remove bootdir state file '${TEMP}/.bootdir.remount'!"
+		fi
+	elif [ -f "${TEMP}/.bootdir.mount" ]
+	then
+		local msg="mount: >> Automatically unmounting boot partition from '${BOOTDIR}' as it was previously ..."
+		if isTrue "${silent}"
+		then
+			print_info 5 "${msg}"
+		else
+			print_info 1 '' 1 0
+			print_info 1 "${msg}"
+		fi
+
+		umount "${BOOTDIR}" &>/dev/null
+		if [ $? -ne 0 ]
+		then
+			local error_msg="Failed to restore mount state of boot partition on '${BOOTDIR}'!"
+			if isTrue "${silent}"
+			then
+				print_error 1 "${error_msg}"
+				return
+			else
+				gen_die "${error_msg}"
+			fi
+		else
+			rm "${TEMP}/.bootdir.mount" \
+				|| gen_die "Failed to remove bootdir state file '${TEMP}/.bootdir.mount'!"
+		fi
+	else
+		local msg="mount: >> Boot partition state on '${BOOTDIR}' was not changed; Skipping restore boot partition state ..."
+		if [ -f "${TEMP}/.bootdir.no_boot_partition" ]
+		then
+			msg="mount: >> '${BOOTDIR}' is not a mountpoint; Nothing to restore ..."
+		fi
+
+		print_info 5 '' 1 0
+		print_info 5 "${msg}"
+
+		rm "${TEMP}/.bootdir.no_boot_partition" \
+			|| gen_die "Failed to remove bootdir state file '${TEMP}/.bootdir.no_boot_partition'!"
+
+		return
+	fi
+}
+
 rootfs_type_is() {
 	local fstype=$1
 
@@ -1465,5 +1544,87 @@ kconfig_set_opt() {
 	fi
 }
 
+make_bootdir_writable() {
+	[ -z "${BOOTDIR}" ] && gen_die "--bootdir is not set!"
+
+	local bootdir_status=unknown
+
+	# Based on mount-boot.eclass code
+	local fstabstate=$(awk "!/^#|^[[:blank:]]+#|^${BOOTDIR//\//\\/}/ {print \$2}" /etc/fstab 2>/dev/null | egrep "^${BOOTDIR}$" )
+	local procstate=$(awk "\$2 ~ /^${BOOTDIR//\//\\/}\$/ {print \$2}" /proc/mounts 2>/dev/null)
+	local proc_ro=$(awk '{ print $2 " ," $4 "," }' /proc/mounts 2>/dev/null | sed -n "/${BOOTDIR//\//\\/} .*,ro,/p")
+
+	if [ -n "${fstabstate}" ] && [ -n "${procstate}" ]
+	then
+		if [ -n "${proc_ro}" ]
+		then
+			bootdir_status=1
+		else
+			bootdir_status=0
+		fi
+	elif [ -n "${fstabstate}" ] && [ -z "${procstate}" ]
+	then
+		bootdir_status=2
+	else
+		bootdir_status=3
+	fi
+
+	case "${bootdir_status}" in
+		0)
+			# Nothing to do -- just pimp the logfile output
+			print_info 5 '' 1 0
+			print_info 5 "mount: >> Boot partition is already mounted in read-write mode on '${BOOTDIR}'."
+			;;
+		1)	# Remount it rw.
+			if ! isTrue "${MOUNTBOOT}"
+			then
+				gen_die "Boot partition is mounted read-only on '${BOOTDIR}' and I am not allowed to remount due to set --no-mountboot option!"
+			fi
+
+			mount -o remount,rw "${BOOTDIR}" &>/dev/null
+			if [ $? -eq 0 ]
+			then
+				print_info 1 "mount: >> Boot partition was temporarily remounted in read-write mode on '${BOOTDIR}' ..."
+
+				touch "${TEMP}"/.bootdir.remount
+			else
+				gen_die "Failed to remount boot partition in read-write mode on '${BOOTDIR}'!"
+			fi
+			;;
+		2)	# Mount it rw.
+			if ! isTrue "${MOUNTBOOT}"
+			then
+				gen_die "Boot partition is not mounted on '${BOOTDIR}' and I am not allowed to mount due to set --no-mountboot option!"
+			fi
+
+			mount "${BOOTDIR}" -o rw &>/dev/null
+			if [ $? -eq 0 ]
+			then
+				print_info 1 '' 1 0
+				print_info 1 "mount: >> Boot partition was temporarily mounted on '${BOOTDIR}' ..."
+
+				touch "${TEMP}"/.bootdir.mount
+			else
+				gen_die "Failed to mount set bootdir '${BOOTDIR}'!"
+			fi
+			;;
+		3)
+			# Nothing really to do
+			print_info 5 '' 1 0
+			print_info 5 "mount: >> '${BOOTDIR}' is not a mountpoint; Assuming no separate boot partition ..."
+
+			touch "${TEMP}"/.bootdir.no_boot_partition
+			;;
+		*)
+			gen_die "Internal error: BOOTDIR status ${bootdir_status} is unknown!"
+			;;
+	esac
+
+	if [ ! -w "${BOOTDIR}" ]
+	then
+		gen_die "Cannot write to bootdir '${BOOTDIR}'!"
+	fi
+}
+
 unset GK_DEFAULT_IFS
 declare -r GK_DEFAULT_IFS="${IFS}"

diff --git a/genkernel b/genkernel
index 470dd05..bb53452 100755
--- a/genkernel
+++ b/genkernel
@@ -166,47 +166,7 @@ then
 	print_info 1 ""
 fi
 
-# Check if BOOTDIR is mounted
-if ! isTrue "${CMD_INSTALL}"
-then
-	isTrue "${MOUNTBOOT}" && print_info 2 'Skipping automatic mount of boot'
-else
-	[[ -d ${BOOTDIR} ]] || gen_die "${BOOTDIR} is not a directory"
-
-	if ! egrep -q "[[:space:]]${BOOTDIR}[[:space:]]" /proc/mounts
-	then
-		if egrep -q "^[^#].+[[:space:]]${BOOTDIR}[[:space:]]" /etc/fstab
-		then
-			if isTrue "${MOUNTBOOT}"
-			then
-				if ! mount ${BOOTDIR}
-				then
-					print_warning 1 "${BOLD}WARNING${NORMAL}: Failed to mount ${BOOTDIR}!"
-					print_warning 1 '' 1 0
-				else
-					print_info 1 "mount: ${BOOTDIR} mounted successfully!"
-				fi
-			else
-				print_warning 1 "${BOLD}WARNING${NORMAL}: No mounted ${BOOTDIR} partition detected!"
-				print_warning 1 "$(get_indent 1)Run ``mount ${BOOTDIR}`` to mount it!"
-				print_warning 1 '' 1 0
-			fi
-		fi
-	elif is_boot_ro
-	then
-		if isTrue "${MOUNTBOOT}"
-		then
-			if ! mount -o remount,rw ${BOOTDIR}
-			then
-				print_warning 1 "${BOLD}WARNING${NORMAL}: Failed to remount ${BOOTDIR} RW!"
-				print_warning 1 '' 1 0
-			else
-				print_info 1 "mount: ${BOOTDIR} remounted read/write successfully!"
-				BOOTRW="yes"
-			fi
-		fi
-	fi
-fi
+isTrue "${CMD_INSTALL}" && make_bootdir_writable
 
 if isTrue "${BUILD_KERNEL}" && ! isTrue "${KERNCACHE_IS_VALID}"
 then
@@ -456,7 +416,7 @@ then
 	unset CONFGREP
 fi
 
-isTrue "${BOOTRW}" && mount -o remount,ro ${BOOTDIR}
+isTrue "${CMD_INSTALL}" && restore_boot_mount_state
 
 print_info 1 '' 1 0
 print_info 1 'Do NOT report kernel bugs as genkernel bugs unless your bug'

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     343d6ed90d4b62c53443abfac20d701a998ea0d5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 00:34:30 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 00:34:30 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=343d6ed9

Normalize output

- Try to use "<module>: >> $msg" notation.

- Try to group modules and separate them by blank lines.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_package.sh | 11 ++++-------
 genkernel      | 30 +++++++++++++++++++-----------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/gen_package.sh b/gen_package.sh
index bee9989..ca46a2c 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -2,8 +2,7 @@
 # $Id$
 
 gen_minkernpackage() {
-	print_info 1 ''
-	print_info 1 "Creating minimal kernel package in '${MINKERNPACKAGE}' ..."
+	print_info 1 "minkernpkg: >> Creating minimal kernel package in '${MINKERNPACKAGE}' ..."
 	rm -rf "${TEMP}/minkernpackage" >/dev/null 2>&1
 	mkdir "${TEMP}/minkernpackage" || gen_die "Failed to create '${TEMP}/minkernpackage'!"
 	if [ -n "${KERNCACHE}" ]
@@ -86,8 +85,7 @@ gen_minkernpackage() {
 gen_modulespackage() {
 	if [ -d "${INSTALL_MOD_PATH}/lib/modules/${KV}" ]
 	then
-		print_info 1 ''
-		print_info 1 "Creating modules package in '${MODULESPACKAGE}' ..."
+		print_info 1 "modulespkg: >> Creating modules package in '${MODULESPACKAGE}' ..."
 		rm -rf "${TEMP}/modulespackage" >/dev/null 2>&1
 		mkdir "${TEMP}/modulespackage" || gen_die "Failed to create '${TEMP}/modulespackage'!"
 
@@ -102,13 +100,12 @@ gen_modulespackage() {
 		print_info 3 "COMMAND: ${tar_cmd[*]}" 1 0 1
 		eval "${tar_cmd[@]}" || gen_die "Failed to create compressed modules package '${MODULESPACKAGE}'!"
 	else
-		print_info 1 "'${INSTALL_MOD_PATH}/lib/modules/${KV}' was not found; Skipping creation of modules package in '${MODULESPACKAGE}' ..."
+		print_info 1 "modulespkg: >> '${INSTALL_MOD_PATH}/lib/modules/${KV}' was not found; Skipping creation of modules package in '${MODULESPACKAGE}' ..."
 	fi
 }
 
 gen_kerncache() {
-	print_info 1 ''
-	print_info 1 "Creating kernel cache in '${KERNCACHE}' ..."
+	print_info 1 "kerncache: >> Creating kernel cache in '${KERNCACHE}' ..."
 	rm -rf "${TEMP}/kerncache" >/dev/null 2>&1
 	mkdir "${TEMP}/kerncache" || gen_die "Failed to create '${TEMP}/kerncache'!"
 

diff --git a/genkernel b/genkernel
index bb53452..fb08ea7 100755
--- a/genkernel
+++ b/genkernel
@@ -161,15 +161,16 @@ print_info 1 "Using kernel config file '${KERNEL_CONFIG}' ..."
 
 if isTrue "${BUILD_KERNEL}" && ! isTrue "${KERNCACHE_IS_VALID}"
 then
-	print_info 1 ""
+	print_info 1 ''
 	print_info 1 "Note: The version above is subject to change (depends on config and status of kernel sources)."
-	print_info 1 ""
 fi
 
 isTrue "${CMD_INSTALL}" && make_bootdir_writable
 
 if isTrue "${BUILD_KERNEL}" && ! isTrue "${KERNCACHE_IS_VALID}"
 then
+	print_info 1 '' 1 0
+
 	# Configure kernel
 	config_kernel
 
@@ -215,12 +216,14 @@ if isTrue "${CMD_INSTALL}"
 then
 	if isTrue "${KERNCACHE_IS_VALID}"
 	then
+		print_info 1 '' 1 0
 		gen_kerncache_extract_kernel
 	fi
 fi
 
 if isTrue "${KERNCACHE_IS_VALID}"
 then
+	print_info 1 '' 1 0
 	! isTrue "${BUILD_STATIC}" && gen_kerncache_extract_modules
 	gen_kerncache_extract_config
 fi
@@ -228,7 +231,7 @@ fi
 # Run callback
 if [ -n "${CMD_CALLBACK}" ]
 then
-	print_info 1 "" 1 0
+	print_info 1 '' 1 0
 	print_info 1 "Preparing to run callback: \"${CMD_CALLBACK}\"" 0
 
 	CALLBACK_ESCAPE=0
@@ -243,7 +246,6 @@ then
 
 	if [ "${CALLBACK_ESCAPE}" -eq 0 ]
 	then
-		print_info 1 '' 1 0
 		print_info 1 '' 1 0
 		eval ${CMD_CALLBACK} | tee -a "${LOGFILE}"
 		CMD_STATUS="${PIPESTATUS[0]}"
@@ -261,18 +263,18 @@ fi
 
 if isTrue "${BUILD_RAMDISK}"
 then
-	print_info 1 ''
+	print_info 1 '' 1 0
 
 	# Compile initramfs
 	create_initramfs
 else
-	print_info 1 ''
+	print_info 1 '' 1 0
 	print_info 1 "initramfs: >> Not building since only the kernel was requested ..."
 fi
 
 if isTrue "${INTEGRATED_INITRAMFS}"
 then
-	print_info 1 ''
+	print_info 1 '' 1 0
 
 	# We build the kernel a second time to include the initramfs
 	compile_kernel
@@ -285,20 +287,26 @@ then
 		# Only update KERNCACHE when KERNCACHE wasn't used because
 		# when it was used nothing has been changed so no update is
 		# necessary.
+		print_info 1 '' 1 0
 		gen_kerncache
 	else
-		print_info 3 "Kerncache was used and kernel/modules therefore didn't change; Skipping '${KERNCACHE}' generation ..."
+		print_info 3 '' 1 0
+		print_info 3 "kerncache: >> Existing kerncache was used and kernel/modules therefore didn't change; Skipping '${KERNCACHE}' generation ..."
 	fi
 fi
 
-[ -n "${MINKERNPACKAGE}" ] && gen_minkernpackage
-[ -n "${MODULESPACKAGE}" ] && gen_modulespackage
+if [ -n "${MINKERNPACKAGE}" -o -n "${MODULESPACKAGE}" ]
+then
+	print_info 1 '' 1 0
+	[ -n "${MINKERNPACKAGE}" ] && gen_minkernpackage
+	[ -n "${MODULESPACKAGE}" ] && gen_modulespackage
+fi
 
 if isTrue "${BUILD_KERNEL}"
 then
 	show_warning_initramfs_is_required=yes
 
-	print_info 1 ''
+	print_info 1 '' 1 0
 	print_info 1 'Kernel compiled successfully!'
 
 	if isTrue "${CMD_INSTALL}"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     d94f83a2bec20a65c3f06b78fff301802d55df95
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 00:32:47 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 00:32:47 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d94f83a2

gen_initramfs.sh: create_initramfs(): Output reason when initramfs compression is skipped

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 1479a5d..8419a20 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1713,15 +1713,12 @@ create_initramfs() {
 				lz4) compress_ext='.lz4' compress_cmd="${cmd_lz4} -f -9 -l -q" ;;
 			esac
 
-			if [ -n "${compression}" ]
-			then
-				print_info 1 "$(get_indent 1)>> Compressing cpio data (${compress_ext}) ..."
-				print_info 3 "COMMAND: ${compress_cmd} $CPIO" 1 0 1
-				${compress_cmd} "${CPIO}" || gen_die "Compression (${compress_cmd}) failed"
-				mv -f "${CPIO}${compress_ext}" "${CPIO}" || gen_die "Rename failed"
-			else
-				print_info 1 "$(get_indent 1)>> Not compressing cpio data ..."
-			fi
+			print_info 1 "$(get_indent 1)>> Compressing cpio data (${compress_ext}) ..."
+			print_info 3 "COMMAND: ${compress_cmd} $CPIO" 1 0 1
+			${compress_cmd} "${CPIO}" || gen_die "Compression (${compress_cmd}) failed"
+			mv -f "${CPIO}${compress_ext}" "${CPIO}" || gen_die "Rename failed"
+		else
+			print_info 3 "$(get_indent 1)>> --no-compress-initramfs is set; Skipping compression of initramfs ..."
 		fi
 
 		## To early load microcode we need to follow some pretty specific steps

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     04eb24df5462a75d3cddef228ec88af018652145
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 15:21:39 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 15:21:39 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=04eb24df

gen_determineargs.sh: determine_real_args(): Bail out when --no-busybox is set but we require busybox

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index f345944..c969188 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -458,6 +458,32 @@ determine_real_args() {
 			error_msg+=" Therefore we cannot cross-compile like requested!"
 			gen_die "${error_msg}"
 		fi
+
+		if ! isTrue "${BUSYBOX}"
+		then
+			local -a FEATURES_REQUIRING_BUSYBOX
+			FEATURES_REQUIRING_BUSYBOX+=( BTRFS )
+			FEATURES_REQUIRING_BUSYBOX+=( DMRAID )
+			FEATURES_REQUIRING_BUSYBOX+=( ISCSI )
+			FEATURES_REQUIRING_BUSYBOX+=( KEYMAP )
+			FEATURES_REQUIRING_BUSYBOX+=( LVM )
+			FEATURES_REQUIRING_BUSYBOX+=( LUKS )
+			FEATURES_REQUIRING_BUSYBOX+=( MDADM )
+			FEATURES_REQUIRING_BUSYBOX+=( MULTIPATH )
+			FEATURES_REQUIRING_BUSYBOX+=( SPLASH )
+			FEATURES_REQUIRING_BUSYBOX+=( SSH )
+			FEATURES_REQUIRING_BUSYBOX+=( ZFS )
+
+			local FEATURE_REQUIRING_BUSYBOX
+			for FEATURE_REQUIRING_BUSYBOX in "${FEATURES_REQUIRING_BUSYBOX[@]}"
+			do
+				if isTrue "${!FEATURE_REQUIRING_BUSYBOX}"
+				then
+					gen_die "--no-busybox set but --${FEATURE_REQUIRING_BUSYBOX,,} requires --busybox!"
+				fi
+			done
+			unset FEATURE_REQUIRING_BUSYBOX FEATURES_REQUIRING_BUSYBOX
+		fi
 	fi
 
 	MICROCODE=${MICROCODE,,}

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     7aa2e795e8bfb6fecb7e659617c98c5e7db845a5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 15:30:17 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 15:30:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7aa2e795

gen_funcs.sh: restore_boot_mount_state(): Delete .bootdir.no_boot_partition only when present

Fixes 8458d98a ("Rework --mountboot handling")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index c453962..31e4a6c 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1410,14 +1410,14 @@ restore_boot_mount_state() {
 		if [ -f "${TEMP}/.bootdir.no_boot_partition" ]
 		then
 			msg="mount: >> '${BOOTDIR}' is not a mountpoint; Nothing to restore ..."
+
+			rm "${TEMP}/.bootdir.no_boot_partition" \
+				|| gen_die "Failed to remove bootdir state file '${TEMP}/.bootdir.no_boot_partition'!"
 		fi
 
 		print_info 5 '' 1 0
 		print_info 5 "${msg}"
 
-		rm "${TEMP}/.bootdir.no_boot_partition" \
-			|| gen_die "Failed to remove bootdir state file '${TEMP}/.bootdir.no_boot_partition'!"
-
 		return
 	fi
 }

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     f46f77ed1dd0bd0c9854deea63d7b16432040298
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 15:31:55 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 15:31:55 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f46f77ed

genkernel: Bump to v4.0.0_beta6

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index c0b2b31..d0f45c4 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_beta5'
+GK_V='4.0.0_beta6'
 
 # Set the default for TMPDIR. May be modified by genkernel.conf or the
 # --tempdir command line option.

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     a1060b6f27a547b28a5c603768b43cfa84137ec0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 12:03:28 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 12:03:28 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a1060b6f

gen_funcs.sh: is_valid_triplet(): Relax regex

Bug: https://bugs.gentoo.org/690262
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 31e4a6c..67b5d21 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -221,7 +221,7 @@ is_valid_triplet() {
 	local triplet=${1}
 	local is_triplet=no
 
-	if [[ "${triplet}" =~ ^[a-zA-Z0-9]{2,}-[a-zA-Z0-9]{2,}-[a-zA-Z0-9]{2,} ]]
+	if [[ "${triplet}" =~ ^[^-]{2,}-[^-]{2,}-.{2,} ]]
 	then
 		is_triplet=yes
 	fi

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     308b68d815498b4069f9de83d631dfed5c45b5e9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 11:56:34 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 11:56:34 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=308b68d8

genkernel: bump to v4.0.0_beta7

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index d0f45c4..6bc477b 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_beta6'
+GK_V='4.0.0_beta7'
 
 # Set the default for TMPDIR. May be modified by genkernel.conf or the
 # --tempdir command line option.

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     2c91f07c4a459efb6a8fbc11ec2525cc3020b96f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 15:33:44 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 15:38:56 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2c91f07c

genkernel: Unset any already set non-empty variables named like a genkernel option

This will ensure that we will always use genkernel's default value
like expected if option isn't set in genkernel config file or on
command-line.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/genkernel b/genkernel
index 6bc477b..ccd0820 100755
--- a/genkernel
+++ b/genkernel
@@ -24,15 +24,40 @@ do
 	[[ "${arg}" == --config=* ]] && CMD_GK_CONFIG=${arg#--config=}
 done
 
-# Pull in our configuration
+# Pull in our configuration to get GK_SHARE only...
 _GENKERNEL_CONF=${CMD_GK_CONFIG:-/etc/genkernel.conf}
-source "${_GENKERNEL_CONF}" || small_die "Could not read ${_GENKERNEL_CONF}"
+GK_SHARE=$(source "${_GENKERNEL_CONF}" &>/dev/null && echo ${GK_SHARE})
 
 if [ -z "${GK_SHARE}" ]
 then
 	small_die "GK_SHARE is not set. Please check used genkernel config file at '${_GENKERNEL_CONF}'!"
 fi
 
+# Make sure that we do not clash with the environment
+GK_DETERMINEARGS_FILE="${GK_SHARE}/gen_determineargs.sh"
+GK_SETTINGS=( $(awk '/[^#]set_config_with_override/ { print $3 }' "${GK_DETERMINEARGS_FILE}" 2>/dev/null) )
+if [ ${#GK_SETTINGS[@]} -gt 0 ]
+then
+	for GK_SETTING in "${GK_SETTINGS[@]}"
+	do
+		for var_to_unset in ${GK_SETTING} CMD_${GK_SETTING}
+		do
+			if [ -n "${!var_to_unset}" ]
+			then
+				echo "WARNING: Will unset existing variable '${var_to_unset}' to avoid clashing with genkernel config ..." >&2
+				unset ${var_to_unset} || small_die "Failed to unset existing variable '${var_to_unset}'!"
+			fi
+		done
+	done
+
+	unset GK_DETERMINEARGS_FILE GK_SETTINGS GK_SETTING var_to_unset
+else
+	small_die "Failed to extract genkernel options from '${GK_DETERMINEARGS_FILE}'!"
+fi
+
+# Now we can source our configuration...
+source "${_GENKERNEL_CONF}" || small_die "Could not read ${_GENKERNEL_CONF}"
+
 # set default LOGLEVEL if uninitialized
 LOGLEVEL=${LOGLEVEL:-1}
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     0e65a9e6769cbcd3f59cd5facb15ac03983f4859
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 21:23:47 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 15:47:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0e65a9e6

gen_funcs.sh: dump_debugcache(): Echo DEBUGCACHE when $LOGFILE isn't writable

This can happen until determine_real_args() was called.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index de8cd7f..0277eb2 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -44,7 +44,15 @@ set_color_vars
 
 dump_debugcache() {
 	TODEBUGCACHE=no
-	echo "${DEBUGCACHE}" >> "${LOGFILE}"
+
+	if [ -w "${LOGFILE}" ]
+	then
+		echo "${DEBUGCACHE}" >> "${LOGFILE}"
+	else
+		echo "WARNING: Cannot write to '${LOGFILE}'!"
+		echo "${DEBUGCACHE}"
+	fi
+
 	DEBUGCACHE=
 }
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     87488d8efc2a5fff214a3ab8171c903debd5e075
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 21:52:54 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 15:47:52 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=87488d8e

gen_initramfs.sh: create_initramfs(): Fix ldconfig config call

We must specify full qualified config file.

Signed-off-by: Thomas Deutschmann <whissi <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 55cf295..c9c1253 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1609,7 +1609,7 @@ create_initramfs() {
 			# We can update /etc/ld.so.cache which was copied from host
 			# to actually match initramfs' content.
 			print_info 1 "$(get_indent 1)>> Pre-generating initramfs' /etc/ld.so.cache ..."
-			ldconfig -r . 2>/dev/null \
+			ldconfig -f "${TDIR}/etc/ld.so.conf" -r . 2>/dev/null \
 				|| gen_die "Failed to pre-generate '${TDIR}/etc/ld.so.cache'!"
 		fi
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     046b5c0b55e092e658ec0d3fd7971c326df7afa0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 21:17:53 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 15:47:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=046b5c0b

genkernel: Move $LOGFILE initialization to determine_real_args()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 24 ++++++++++++++++++++++++
 gen_funcs.sh         |  9 ---------
 genkernel            |  3 ---
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index d39412c..72741fc 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -188,6 +188,30 @@ determine_real_args() {
 	set_config_with_override BOOL   INSTALL                  CMD_INSTALL                  "yes"
 	set_config_with_override BOOL   CLEANUP                  CMD_CLEANUP                  "yes"
 
+	local can_write_log=no
+	if [ -w "${LOGFILE}" ]
+	then
+		can_write_log=yes
+	elif [ -w "$(dirname "${LOGFILE}")" ]
+	then
+		can_write_log=yes
+	fi
+
+	if ! isTrue "${can_write_log}"
+	then
+		small_die "Cannot write to '${LOGFILE}'!"
+	fi
+
+	if [ -f "${LOGFILE}" ]
+	then
+		# Truncate existing logfile
+		echo > "${LOGFILE}" 2>/dev/null || small_die "Could not write to '${LOGFILE}'!"
+	else
+		touch "${LOGFILE}" || small_die "Failed to create '${LOGFILE}'!"
+	fi
+
+	dump_debugcache
+
 	if [ ! -d "${TMPDIR}" ]
 	then
 		mkdir -p "${TMPDIR}" || gen_die "Failed to create '${TMPDIR}'!"

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 5681d0d..de8cd7f 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -264,15 +264,6 @@ cache_replace() {
 	var_replace "CACHE" "${GK_V_CACHEDIR}" "${1}"
 }
 
-start_log() {
-	if [ -f "${LOGFILE}" ]
-	then
-		(echo > "${LOGFILE}") 2>/dev/null || small_die "Genkernel: Could not write to '${LOGFILE}'."
-	fi
-
-	dump_debugcache
-}
-
 gen_die() {
 	set +x
 

diff --git a/genkernel b/genkernel
index 8991e69..50de3f7 100755
--- a/genkernel
+++ b/genkernel
@@ -95,7 +95,6 @@ then
 	exit 1
 fi
 
-start_log
 NORMAL=${GOOD} print_info 1 "Gentoo Linux Genkernel; Version ${GK_V}${NORMAL}"
 print_info 1 "Using genkernel configuration from '${_GENKERNEL_CONF}' ..."
 unset _GENKERNEL_CONF
@@ -161,8 +160,6 @@ setup_cache_dir
 
 check_distfiles
 
-dump_debugcache
-
 KERNCACHE_IS_VALID="no"
 if [ -n "${KERNCACHE}" ]
 then

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     4ddc6b5da63a9a63acfd958f5b0c2a00cd238c0d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 21:57:48 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 16:01:52 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4ddc6b5d

gen_initramfs.sh: create_initramfs(): Move lddtree functional test to determine_real_args()

This will allow us to bail out early in case lddtree isn't working.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 10 ++++++++++
 gen_initramfs.sh     |  7 -------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 72741fc..52de7a3 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -517,6 +517,16 @@ determine_real_args() {
 			done
 			unset FEATURE_REQUIRING_BUSYBOX FEATURES_REQUIRING_BUSYBOX
 		fi
+
+		local lddtree_testfile=$(which cpio 2>/dev/null)
+		if [[ -z "${lddtree_testfile}" || ! -e "${lddtree_testfile}" ]]
+		then
+			# This will be fatal because we cpio either way
+			gen_die "cpio binary not found. Is app-arch/cpio installed?"
+		elif ! lddtree -l "${lddtree_testfile}" 1>/dev/null 2>&1
+		then
+			gen_die "'lddtree -l ${lddtree_testfile}' failed -- cannot generate initramfs without working lddtree!"
+		fi
 	fi
 
 	MICROCODE=${MICROCODE,,}

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index c9c1253..08a65e2 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1526,13 +1526,6 @@ append_data() {
 }
 
 create_initramfs() {
-	local lddtree_testfile=$(which cpio 2>/dev/null)
-	if [[ -z "${lddtree_testfile}" || ! -e "${lddtree_testfile}" ]]; then
-		print_warning 1 "cpio binary not found -- cannot check if lddtree is working!"
-	elif ! lddtree "${lddtree_testfile}" 1>/dev/null 2>&1; then
-		gen_die "'lddtree ${lddtree_testfile}' failed -- cannot generate initramfs without working lddtree!"
-	fi
-
 	local compress_ext=""
 	print_info 1 "initramfs: >> Initializing ..."
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     c93c13d41709bc0eb5c3ba04c17660567323cc69
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 21:24:57 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 15:47:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c93c13d4

gen_funcs.sh: gen_die(): Don't advertise $LOGFILE until determine_real_args() was called

Before determine_real_args() was called, $LOGFILE will probably contain content
from a previous run.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 0277eb2..60267a4 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -282,9 +282,14 @@ gen_die() {
 		print_error 1 "ERROR: ${1}"
 	fi
 
-	print_error 1 "Please consult '${LOGFILE}' for more information and any"
-	print_error 1 "errors that were reported above."
-	print_error 1 ''
+	# Don't trust $LOGFILE before determine_real_args() was called
+	if [ -n "${CMD_LOGFILE}" -a -s "${LOGFILE}" ]
+	then
+		print_error 1 "Please consult '${LOGFILE}' for more information and any"
+		print_error 1 "errors that were reported above."
+		print_error 1 ''
+	fi
+
 	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"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     2cefc2738a7fd73139b3c80ad16b4deacd12920c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 21:13:33 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 15:47:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2cefc273

genkernel: Move --tempdir handling to determine_real_args()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_cmdline.sh       | 11 ++---------
 gen_determineargs.sh |  9 +++++++++
 genkernel            | 12 ------------
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index a7b35a8..b9f1326 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -585,15 +585,8 @@ parse_cmdline() {
 			print_info 3 "CMD_STATIC: ${CMD_STATIC}"
 			;;
 		--tempdir=*)
-			TMPDIR="${*#*=}"
-			if [ ! -d "${TMPDIR}" ]
-			then
-				mkdir -p "${TMPDIR}" || gen_die "Failed to create '${TMPDIR}'!"
-			fi
-			TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX 2>/dev/null)
-			[ -z "${TEMP}" ] && gen_die "mktemp failed!"
-			print_info 3 "TMPDIR: ${TMPDIR}"
-			print_info 3 "TEMP: ${TEMP}"
+			CMD_TMPDIR="${*#*=}"
+			print_info 3 "CMD_TMPDIR: ${CMD_TMPDIR}"
 			;;
 		--postclear|--no-postclear)
 			CMD_POSTCLEAR=$(parse_optbool "$*")

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index c969188..d39412c 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -97,6 +97,7 @@ determine_real_args() {
 
 	#                               Dest / Config File   Command Line                     Arch Default
 	#                               ------------------   ------------                     ------------
+	set_config_with_override STRING TMPDIR                   CMD_TMPDIR                   "/var/tmp/genkernel"
 	set_config_with_override STRING LOGFILE                  CMD_LOGFILE                  "/var/log/genkernel.conf"
 	set_config_with_override STRING KERNEL_DIR               CMD_KERNEL_DIR               "${DEFAULT_KERNEL_SOURCE}"
 	set_config_with_override BOOL   KERNEL_SOURCES           CMD_KERNEL_SOURCES           "yes"
@@ -187,6 +188,14 @@ determine_real_args() {
 	set_config_with_override BOOL   INSTALL                  CMD_INSTALL                  "yes"
 	set_config_with_override BOOL   CLEANUP                  CMD_CLEANUP                  "yes"
 
+	if [ ! -d "${TMPDIR}" ]
+	then
+		mkdir -p "${TMPDIR}" || gen_die "Failed to create '${TMPDIR}'!"
+	fi
+
+	declare -gr TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX 2>/dev/null)
+	[ -z "${TEMP}" ] && gen_die "'mktemp -d -p \"${TMPDIR}\" gk.XXXXXXXX' failed!"
+
 	declare -gr GK_V_CACHEDIR="${CACHE_DIR}/${GK_V}"
 
 	if [ -n "${CMD_CROSS_COMPILE}" ]

diff --git a/genkernel b/genkernel
index ccd0820..8991e69 100755
--- a/genkernel
+++ b/genkernel
@@ -4,10 +4,6 @@
 PATH="${PATH}:/sbin:/usr/sbin"
 GK_V='4.0.0_beta7'
 
-# Set the default for TMPDIR. May be modified by genkernel.conf or the
-# --tempdir command line option.
-TMPDIR='/var/tmp/genkernel'
-
 TODEBUGCACHE=yes # Until an error occurs or LOGFILE is fully qualified.
 
 small_die() {
@@ -75,14 +71,6 @@ source "${GK_SHARE}"/gen_moddeps.sh || gen_die "Could not read '${GK_SHARE}/gen_
 source "${GK_SHARE}"/gen_package.sh || gen_die "Could not read '${GK_SHARE}/gen_package.sh'"
 source "${GK_SHARE}"/gen_bootloader.sh || gen_die "Could not read '${GK_SHARE}/gen_bootloader.sh'"
 
-if [ ! -d "${TMPDIR}" ]
-then
-	mkdir -p "${TMPDIR}" || gen_die "Failed to create '${TMPDIR}'!"
-fi
-
-TEMP=$(mktemp -d -p "${TMPDIR}" gk.XXXXXXXX 2>/dev/null)
-[ -z "${TEMP}" ] && gen_die "mktemp failed!"
-
 export GK_MASTER_PID=${BASHPID}
 
 set_default_gk_trap

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     3352116b60a054823171b2cbe5cd15ee95af3d6c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 21:22:24 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 15:47:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3352116b

Use small_die() instead of gen_die() until determine_real_args() was called

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_cmdline.sh |  3 +--
 genkernel      | 18 +++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index b9f1326..b17e35c 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -786,8 +786,7 @@ parse_cmdline() {
 			exit 0
 			;;
 		*)
-			echo "Error: Unknown option '$*'!"
-			exit 1
+			small_die "Unknown option '$*'!"
 			;;
 	esac
 }

diff --git a/genkernel b/genkernel
index 50de3f7..dd275e2 100755
--- a/genkernel
+++ b/genkernel
@@ -61,15 +61,15 @@ LOGLEVEL=${LOGLEVEL:-1}
 source "${GK_SHARE}"/defaults/software.sh || small_die "Could not read '${GK_SHARE}/defaults/software.sh'"
 source "${GK_SHARE}"/defaults/config.sh || small_die "Could not read '${GK_SHARE}/defaults/config.sh'"
 source "${GK_SHARE}"/gen_funcs.sh || small_die "Could not read '${GK_SHARE}/gen_funcs.sh'"
-source "${GK_SHARE}"/gen_cmdline.sh || gen_die "Could not read '${GK_SHARE}/gen_cmdline.sh'"
-source "${GK_SHARE}"/gen_arch.sh || gen_die "Could not read '${GK_SHARE}/gen_arch.sh'"
-source "${GK_SHARE}"/gen_determineargs.sh || gen_die "Could not read '${GK_SHARE}/gen_determineargs.sh'"
-source "${GK_SHARE}"/gen_compile.sh || gen_die "Could not read '${GK_SHARE}/gen_compile.sh'"
-source "${GK_SHARE}"/gen_configkernel.sh || gen_die "Could not read '${GK_SHARE}/gen_configkernel.sh'"
-source "${GK_SHARE}"/gen_initramfs.sh || gen_die "Could not read '${GK_SHARE}/gen_initramfs.sh'"
-source "${GK_SHARE}"/gen_moddeps.sh || gen_die "Could not read '${GK_SHARE}/gen_moddeps.sh'"
-source "${GK_SHARE}"/gen_package.sh || gen_die "Could not read '${GK_SHARE}/gen_package.sh'"
-source "${GK_SHARE}"/gen_bootloader.sh || gen_die "Could not read '${GK_SHARE}/gen_bootloader.sh'"
+source "${GK_SHARE}"/gen_cmdline.sh || small_die "Could not read '${GK_SHARE}/gen_cmdline.sh'"
+source "${GK_SHARE}"/gen_arch.sh || small_die "Could not read '${GK_SHARE}/gen_arch.sh'"
+source "${GK_SHARE}"/gen_determineargs.sh || small_die "Could not read '${GK_SHARE}/gen_determineargs.sh'"
+source "${GK_SHARE}"/gen_compile.sh || small_die "Could not read '${GK_SHARE}/gen_compile.sh'"
+source "${GK_SHARE}"/gen_configkernel.sh || small_die "Could not read '${GK_SHARE}/gen_configkernel.sh'"
+source "${GK_SHARE}"/gen_initramfs.sh || small_die "Could not read '${GK_SHARE}/gen_initramfs.sh'"
+source "${GK_SHARE}"/gen_moddeps.sh || small_die "Could not read '${GK_SHARE}/gen_moddeps.sh'"
+source "${GK_SHARE}"/gen_package.sh || small_die "Could not read '${GK_SHARE}/gen_package.sh'"
+source "${GK_SHARE}"/gen_bootloader.sh || small_die "Could not read '${GK_SHARE}/gen_bootloader.sh'"
 
 export GK_MASTER_PID=${BASHPID}
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     3938405f01a57d3946b4cabdbc363338ec7f67cc
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 21:02:28 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 15:47:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3938405f

gen_funcs.sh: set_color_vars(): Define NORMAL as last color

This will fix output when running with "set -x" very early.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 67b5d21..5681d0d 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -25,19 +25,19 @@ isTrue() {
 set_color_vars() {
 	if ! isTrue "${NOCOLOR}"
 	then
+		BOLD=$'\e[0;01m'
+		UNDER=$'\e[4m'
 		GOOD=$'\e[32;01m'
 		WARN=$'\e[33;01m'
 		BAD=$'\e[31;01m'
 		NORMAL=$'\e[0m'
-		BOLD=$'\e[0;01m'
-		UNDER=$'\e[4m'
 	else
+		BOLD=''
+		UNDER=''
 		GOOD=''
 		WARN=''
 		BAD=''
 		NORMAL=''
-		BOLD=''
-		UNDER=''
 	fi
 }
 set_color_vars

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     04c99a4377558ed18ed142a5286d3a1b8bfff2b3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 21:44:25 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 15:47:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=04c99a43

genkernel: Restore empty line in callback out

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 1 +
 1 file changed, 1 insertion(+)

diff --git a/genkernel b/genkernel
index dd275e2..8886938 100755
--- a/genkernel
+++ b/genkernel
@@ -256,6 +256,7 @@ then
 
 	if [ "${CALLBACK_ESCAPE}" -eq 0 ]
 	then
+		print_info 1 '' 1 0
 		print_info 1 '' 1 0
 		eval ${CMD_CALLBACK} | tee -a "${LOGFILE}"
 		CMD_STATUS="${PIPESTATUS[0]}"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     306dd3f2f8c5eb1638a419f691781b68eeaf8d58
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 22:03:27 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 16:02:00 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=306dd3f2

gen_funcs.sh: gkbuild(): Export $TMPDIR

Some portage programs like eltpatch depend on $TMPDIR.

Bug: https://bugs.gentoo.org/690264
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 60267a4..6161405 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1140,8 +1140,9 @@ gkbuild() {
 		LOGLEVEL="${LOGLEVEL}"
 		LOGFILE="${LOGFILE}"
 		NOCOLOR="${NOCOLOR}"
-		TEMP="${TEMP}"
 		SANDBOX_WRITE="${LOGFILE}:${TEMP}"
+		TEMP="${TEMP}"
+		TMPDIR="${TEMP}"
 	)
 
 	envvars+=(

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     59fe82729598ab45340df87166b2e0adf664d586
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 22:07:43 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 16:02:01 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=59fe8272

gen_initramfs.sh: append_mdadm(): Log when mdadm config was copied

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 08a65e2..5b30b7a 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -664,6 +664,8 @@ append_mdadm() {
 
 	if [ -n "${MDADM_CONFIG}" ]
 	then
+		print_info 2 "$(get_indent 2)${PN}: >> Adding '${MDADM_CONFIG}' ..."
+
 		if [ -f "${MDADM_CONFIG}" ]
 		then
 			cp -aL "${MDADM_CONFIG}" "${TDIR}"/etc/mdadm.conf 2>/dev/null \

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     758e3a8069cc97938fd3cd7c3c7bd04285cfaa97
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 22:49:30 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 16:09:45 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=758e3a80

gen_initramfs.sh: Rename $CPIO to $CPIO_ARCHIVE

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 84 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 696125b..1fcfdce 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -192,7 +192,7 @@ append_devices() {
 		chmod 0755 dev || gen_die "Failed to chmod of '${TDIR}/dev' to 0755!"
 
 		log_future_cpio_content
-		find . -print0 | cpio ${CPIO_ARGS} -F "${CPIO}" \
+		find . -print0 | cpio ${CPIO_ARGS} -F "${CPIO_ARCHIVE}" \
 			|| gen_die "Failed to append devices to cpio!"
 	else
 		local TFILE="${TEMP}/initramfs-base-temp.devices"
@@ -221,7 +221,7 @@ append_devices() {
 		print_info 3 "$(cat "${TFILE}")" 1 0 1
 		print_info 3 "=================================================================" 1 0 1
 
-		"${KERNEL_OUTPUTDIR}"/usr/gen_init_cpio "${TFILE}" >"${CPIO}" \
+		"${KERNEL_OUTPUTDIR}"/usr/gen_init_cpio "${TFILE}" >"${CPIO_ARCHIVE}" \
 			|| gen_die "Failed to append devices to cpio!"
 	fi
 }
@@ -364,7 +364,7 @@ append_base_layout() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append baselayout to cpio!"
 }
 
@@ -415,7 +415,7 @@ append_busybox() {
 	copy_system_binaries "${TDIR}"/lib "${libdir}"/libnss_dns.so.2
 
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -436,7 +436,7 @@ append_e2fsprogs() {
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -460,7 +460,7 @@ append_blkid() {
 	rm -rf usr/
 
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append blkid to cpio!"
 }
 
@@ -480,7 +480,7 @@ append_unionfs_fuse() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -516,7 +516,7 @@ append_multipath() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -545,7 +545,7 @@ append_dmraid() {
 	mkdir -p "${TDIR}"/var/lock/dmraid || gen_die "Failed to create '${TDIR}/var/lock/dmraid'!"
 
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append dmraid to cpio!"
 }
 
@@ -565,7 +565,7 @@ append_iscsi() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append iscsi to cpio!"
 }
 
@@ -635,7 +635,7 @@ append_lvm() {
 	fi
 
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append lvm to cpio!"
 }
 
@@ -679,7 +679,7 @@ append_mdadm() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -700,7 +700,7 @@ append_xfsprogs() {
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -745,7 +745,7 @@ append_zfs() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -766,7 +766,7 @@ append_btrfs() {
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -795,7 +795,7 @@ append_libgcc_s() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append libgcc_s to cpio!"
 }
 
@@ -841,7 +841,7 @@ append_linker() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append linker to cpio!"
 }
 
@@ -886,7 +886,7 @@ append_splash() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append splash to cpio!"
 }
 
@@ -906,7 +906,7 @@ append_strace() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -914,7 +914,7 @@ append_overlay() {
 	cd "${INITRAMFS_OVERLAY}"  || gen_die "Failed to chdir to '${INITRAMFS_OVERLAY}'!"
 
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append overlay to cpio!"
 }
 
@@ -938,7 +938,7 @@ append_luks() {
 	rm -rf usr/
 
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append luks to cpio!"
 }
 
@@ -1216,7 +1216,7 @@ append_dropbear() {
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
 
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -1250,7 +1250,7 @@ append_firmware() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append firmware to cpio!"
 }
 
@@ -1270,7 +1270,7 @@ append_gpg() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 }
 
@@ -1355,7 +1355,7 @@ append_modules() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append modules-${KV} to cpio!"
 }
 
@@ -1376,7 +1376,7 @@ append_modprobed() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append modprobe.d to cpio!"
 }
 
@@ -1511,7 +1511,7 @@ append_auxilary() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
+	find . -print0 | cpio ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append auxilary to cpio!"
 }
 
@@ -1532,7 +1532,7 @@ create_initramfs() {
 	print_info 1 "initramfs: >> Initializing ..."
 
 	# Create empty cpio
-	CPIO="${TMPDIR}/initramfs-${KNAME}-${ARCH}-${KV}"
+	CPIO_ARCHIVE="${TMPDIR}/initramfs-${KNAME}-${ARCH}-${KV}"
 	append_data 'devices' # WARNING, must be first!
 	append_data 'base_layout'
 	append_data 'auxilary' "${BUSYBOX}"
@@ -1596,8 +1596,8 @@ create_initramfs() {
 		mkdir -p "${TDIR}" || gen_die "Failed to create '${TDIR}'!"
 		cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 
-		cpio --quiet -i -F "${CPIO}" 2>/dev/null \
-			|| gen_die "Failed to extract cpio '${CPIO}' for dedupe"
+		cpio --quiet -i -F "${CPIO_ARCHIVE}" 2>/dev/null \
+			|| gen_die "Failed to extract cpio '${CPIO_ARCHIVE}' for dedupe"
 
 		if [ -e etc/ld.so.cache ] && ! isTrue "$(tc-is-cross-compiler)"
 		then
@@ -1608,7 +1608,7 @@ create_initramfs() {
 				|| gen_die "Failed to pre-generate '${TDIR}/etc/ld.so.cache'!"
 		fi
 
-		find . -print0 | sort -z | cpio ${CPIO_ARGS} --reproducible -F "${CPIO}" 2>/dev/null \
+		find . -print0 | sort -z | cpio ${CPIO_ARGS} --reproducible -F "${CPIO_ARCHIVE}" 2>/dev/null \
 			|| gen_die "rebuilding cpio for dedupe"
 	else
 		print_info 1 "$(get_indent 1)>> Cannot deduping cpio contents without root; Skipping ..."
@@ -1637,7 +1637,7 @@ create_initramfs() {
 	then
 		# Explicitly do not compress if we are integrating into the kernel.
 		# The kernel will do a better job of it than us.
-		mv "${CPIO}" "${CPIO}.cpio"
+		mv "${CPIO_ARCHIVE}" "${CPIO_ARCHIVE}.cpio"
 		sed -i '/^.*CONFIG_INITRAMFS_SOURCE=.*$/d' "${KERNEL_OUTPUTDIR}/.config" \
 			|| gen_die "failed to delete CONFIG_INITRAMFS_SOURCE from '${KERNEL_OUTPUTDIR}/.config'"
 
@@ -1655,7 +1655,7 @@ create_initramfs() {
 		# All N default except XZ, so there it gets used if the kernel does
 		# compression on it's own.
 		cat >>${KERNEL_OUTPUTDIR}/.config	<<-EOF
-		CONFIG_INITRAMFS_SOURCE="${CPIO}.cpio${compress_ext}"
+		CONFIG_INITRAMFS_SOURCE="${CPIO_ARCHIVE}.cpio${compress_ext}"
 		CONFIG_INITRAMFS_ROOT_UID=0
 		CONFIG_INITRAMFS_ROOT_GID=0
 		CONFIG_INITRAMFS_COMPRESSION_NONE=n
@@ -1727,9 +1727,9 @@ create_initramfs() {
 			esac
 
 			print_info 1 "$(get_indent 1)>> Compressing cpio data (${compress_ext}) ..."
-			print_info 3 "COMMAND: ${compress_cmd} $CPIO" 1 0 1
-			${compress_cmd} "${CPIO}" || gen_die "Compression (${compress_cmd}) failed"
-			mv -f "${CPIO}${compress_ext}" "${CPIO}" || gen_die "Rename failed"
+			print_info 3 "COMMAND: ${compress_cmd} ${CPIO_ARCHIVE}" 1 0 1
+			${compress_cmd} "${CPIO_ARCHIVE}" || gen_die "Compression (${compress_cmd}) failed"
+			mv -f "${CPIO_ARCHIVE}${compress_ext}" "${CPIO_ARCHIVE}" || gen_die "Rename failed"
 		else
 			print_info 3 "$(get_indent 1)>> --no-compress-initramfs is set; Skipping compression of initramfs ..."
 		fi
@@ -1795,8 +1795,8 @@ create_initramfs() {
 				find . -print0 | cpio --quiet --null -o -H newc > ../ucode.cpio || gen_die "Failed to create cpu microcode cpio"
 				popd &>/dev/null || gen_die "Failed to chdir!"
 				print_info 1 "$(get_indent 2)early-microcode: Prepending early-microcode to initramfs ..."
-				cat "${TEMP}/ucode.cpio" "${CPIO}" > "${CPIO}.early-microcode" || gen_die "Failed to prepend early-microcode to initramfs"
-				mv -f "${CPIO}.early-microcode" "${CPIO}" || gen_die "Rename failed"
+				cat "${TEMP}/ucode.cpio" "${CPIO_ARCHIVE}" > "${CPIO_ARCHIVE}.early-microcode" || gen_die "Failed to prepend early-microcode to initramfs"
+				mv -f "${CPIO_ARCHIVE}.early-microcode" "${CPIO_ARCHIVE}" || gen_die "Rename failed"
 			else
 				print_warning 1 "$(get_indent 2)early-microcode: No microcode found; Will not prepend any microcode to initramfs ..."
 				print_info 1    "$(get_indent 2)                 ${BOLD}Note:${NORMAL} You can set --no-microcode-initramfs if you load microcode on your own"
@@ -1822,9 +1822,9 @@ create_initramfs() {
 			[[ -z ${mkimage_cmd} ]] && gen_die "mkimage is not available. Please install package 'dev-embedded/u-boot-tools'."
 			local mkimage_args="-A ${ARCH} -O linux -T ramdisk -C ${compression:-none} -a 0x00000000 -e 0x00000000"
 			print_info 1 "$(get_indent 1)>> Wrapping initramfs using mkimage ..."
-			print_info 2 "$(get_indent 1)${mkimage_cmd} ${mkimage_args} -n initramfs-${KNAME}-${ARCH}-${KV} -d ${CPIO} ${CPIO}.uboot"
-			${mkimage_cmd} ${mkimage_args} -n "initramfs-${KNAME}-${ARCH}-${KV}" -d "${CPIO}" "${CPIO}.uboot" >> ${LOGFILE} 2>&1 || gen_die "Wrapping initramfs using mkimage failed"
-			mv -f "${CPIO}.uboot" "${CPIO}" || gen_die "Rename failed"
+			print_info 2 "$(get_indent 1)${mkimage_cmd} ${mkimage_args} -n initramfs-${KNAME}-${ARCH}-${KV} -d ${CPIO_ARCHIVE} ${CPIO_ARCHIVE}.uboot"
+			${mkimage_cmd} ${mkimage_args} -n "initramfs-${KNAME}-${ARCH}-${KV}" -d "${CPIO_ARCHIVE}" "${CPIO_ARCHIVE}.uboot" >> ${LOGFILE} 2>&1 || gen_die "Wrapping initramfs using mkimage failed"
+			mv -f "${CPIO_ARCHIVE}.uboot" "${CPIO_ARCHIVE}" || gen_die "Rename failed"
 		fi
 	fi
 
@@ -1834,7 +1834,7 @@ create_initramfs() {
 		then
 			copy_image_with_preserve \
 				"initramfs" \
-				"${CPIO}" \
+				"${CPIO_ARCHIVE}" \
 				"initramfs-${KNAME}-${ARCH}-${KV}"
 		fi
 	fi

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     6d10b53f0f8dd8044a506a0896cc8dda656bbd65
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 22:43:05 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 16:09:45 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6d10b53f

gen_initramfs.sh: create_initramfs(): Fix CPIO archive naming

Even when we not install, make sure that the archive file has
the correct final name.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 5b30b7a..696125b 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1532,7 +1532,7 @@ create_initramfs() {
 	print_info 1 "initramfs: >> Initializing ..."
 
 	# Create empty cpio
-	CPIO="${TMPDIR}/initramfs-${KV}"
+	CPIO="${TMPDIR}/initramfs-${KNAME}-${ARCH}-${KV}"
 	append_data 'devices' # WARNING, must be first!
 	append_data 'base_layout'
 	append_data 'auxilary' "${BUSYBOX}"
@@ -1637,7 +1637,7 @@ create_initramfs() {
 	then
 		# Explicitly do not compress if we are integrating into the kernel.
 		# The kernel will do a better job of it than us.
-		mv ${TMPDIR}/initramfs-${KV} ${TMPDIR}/initramfs-${KV}.cpio
+		mv "${CPIO}" "${CPIO}.cpio"
 		sed -i '/^.*CONFIG_INITRAMFS_SOURCE=.*$/d' "${KERNEL_OUTPUTDIR}/.config" \
 			|| gen_die "failed to delete CONFIG_INITRAMFS_SOURCE from '${KERNEL_OUTPUTDIR}/.config'"
 
@@ -1655,7 +1655,7 @@ create_initramfs() {
 		# All N default except XZ, so there it gets used if the kernel does
 		# compression on it's own.
 		cat >>${KERNEL_OUTPUTDIR}/.config	<<-EOF
-		CONFIG_INITRAMFS_SOURCE="${TMPDIR}/initramfs-${KV}.cpio${compress_ext}"
+		CONFIG_INITRAMFS_SOURCE="${CPIO}.cpio${compress_ext}"
 		CONFIG_INITRAMFS_ROOT_UID=0
 		CONFIG_INITRAMFS_ROOT_GID=0
 		CONFIG_INITRAMFS_COMPRESSION_NONE=n
@@ -1822,8 +1822,8 @@ create_initramfs() {
 			[[ -z ${mkimage_cmd} ]] && gen_die "mkimage is not available. Please install package 'dev-embedded/u-boot-tools'."
 			local mkimage_args="-A ${ARCH} -O linux -T ramdisk -C ${compression:-none} -a 0x00000000 -e 0x00000000"
 			print_info 1 "$(get_indent 1)>> Wrapping initramfs using mkimage ..."
-			print_info 2 "$(get_indent 1)${mkimage_cmd} ${mkimage_args} -n initramfs-${KV} -d ${CPIO} ${CPIO}.uboot"
-			${mkimage_cmd} ${mkimage_args} -n "initramfs-${KV}" -d "${CPIO}" "${CPIO}.uboot" >> ${LOGFILE} 2>&1 || gen_die "Wrapping initramfs using mkimage failed"
+			print_info 2 "$(get_indent 1)${mkimage_cmd} ${mkimage_args} -n initramfs-${KNAME}-${ARCH}-${KV} -d ${CPIO} ${CPIO}.uboot"
+			${mkimage_cmd} ${mkimage_args} -n "initramfs-${KNAME}-${ARCH}-${KV}" -d "${CPIO}" "${CPIO}.uboot" >> ${LOGFILE} 2>&1 || gen_die "Wrapping initramfs using mkimage failed"
 			mv -f "${CPIO}.uboot" "${CPIO}" || gen_die "Rename failed"
 		fi
 	fi
@@ -1834,7 +1834,7 @@ create_initramfs() {
 		then
 			copy_image_with_preserve \
 				"initramfs" \
-				"${TMPDIR}/initramfs-${KV}" \
+				"${CPIO}" \
 				"initramfs-${KNAME}-${ARCH}-${KV}"
 		fi
 	fi

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     e9eaf78b66f511ff8c4f38cd42a8d0bcdf5180a7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 22:09:56 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 16:02:01 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e9eaf78b

gen_funcs.sh: set_config_with_override(): Bail out when we failed to set config variable

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 6161405..9aa4e24 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1317,14 +1317,18 @@ set_config_with_override() {
 		then
 			Result=${!CfgVar}
 			# we need to set the CMD_* according to configfile...
-			eval ${OverrideVar}=\"${Result}\"
+			eval ${OverrideVar}=\"${Result}\" \
+				|| small_die "Failed to set variable '${OverrideVar}=${Result}' !"
+
 			print_info 5 "  $CfgVar set in config file to \"${Result}\"."
 		else
 			if [ -n "$Default" ]
 			then
 				Result=${Default}
 				# set OverrideVar to Result, otherwise CMD_* may not be initialized...
-				eval ${OverrideVar}=\"${Result}\"
+				eval ${OverrideVar}=\"${Result}\" \
+					|| small_die "Failed to set variable '${OverrideVar}=${Result}' !"
+
 				print_info 5 "  $CfgVar defaulted to \"${Result}\"."
 			else
 				print_info 5 "  $CfgVar not set."
@@ -1342,7 +1346,8 @@ set_config_with_override() {
 		fi
 	fi
 
-	eval ${CfgVar}=\"${Result}\"
+	eval ${CfgVar}=\"${Result}\" \
+		|| small_die "Failed to set variable '${CfgVar}=${Result}' !"
 }
 
 # @FUNCTION: restore_boot_mount_state

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     dae2cb4fd217150b0a1741252d9ed3c6856a4dc5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 21 15:40:16 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 16:09:45 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=dae2cb4f

genkernel: Make sure additional variables which can clash with genkernel are unset

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/genkernel b/genkernel
index 751b7af..45e1fec 100755
--- a/genkernel
+++ b/genkernel
@@ -34,6 +34,10 @@ GK_DETERMINEARGS_FILE="${GK_SHARE}/gen_determineargs.sh"
 GK_SETTINGS=( $(awk '/[^#]set_config_with_override/ { print $3 }' "${GK_DETERMINEARGS_FILE}" 2>/dev/null) )
 if [ ${#GK_SETTINGS[@]} -gt 0 ]
 then
+	GK_SETTINGS+=( CALLBACK )
+	GK_SETTINGS+=( EXTRAVERSION )
+	GK_SETTINGS+=( MOD_INSTALL )
+
 	for GK_SETTING in "${GK_SETTINGS[@]}"
 	do
 		for var_to_unset in ${GK_SETTING} CMD_${GK_SETTING}

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     a4bb71486a6f9a857540b9494dd68de7774340fd
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 21 18:23:25 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 18:23:25 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a4bb7148

Makefile: Fix verify-doc target

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index da579aa..36a73fd 100644
--- a/Makefile
+++ b/Makefile
@@ -73,7 +73,8 @@ verify-doc: doc/genkernel.8.txt
 		sed -r \
 			-e 's,[[:space:]]*--(no-)?,,g' \
 			-e '/bootloader/s,=\(grub\|grub2\),,g' \
-			-e '/microcode/s,\[\],,g' | \
+			-e '/microcode/s,=\(all\|amd\|intel\),,g' \
+			-e '/ssh-host-keys/s,=\(create\|create-from-host\|runtime\),,g' | \
 		while read opt ; do \
 			regex="^*--(...no-...)?$$opt" ; \
 			if ! egrep -e "$$regex" $< -sq ; then \

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     0227cb27406e0de9bf09e0c28dd46da39b37e4a1
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 21 18:27:09 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 18:27:09 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0227cb27

gen_cmdline.sh: longusage(): Fix --microcode parameter

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_cmdline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 17d66d2..247a674 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -39,7 +39,7 @@ longusage() {
   echo "	--no-bcache		Don't enable block layer cache (bcache) support in kernel"
   echo "	--hyperv		Enable Microsoft Hyper-V kernel options in kernel"
   echo "	--no-hyperv		Don't enable Microsoft Hyper-V kernel options in kernel"
-  echo "	--microcode=(all,amd,intel)"
+  echo "	--microcode=(all|amd|intel)"
   echo "				Enable early microcode support in kernel configuration,"
   echo "				'all' for all (default), 'amd' for AMD and 'intel' for"
   echo "				Intel CPU types"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     2efa8b87cfbbae16eb3737669398d44d7c467774
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 21 18:26:21 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 18:26:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2efa8b87

genkernel: Bump to v4.0.0_beta8

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 45e1fec..b6f1eaa 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_beta7'
+GK_V='4.0.0_beta8'
 
 TODEBUGCACHE=yes # Until an error occurs or LOGFILE is fully qualified.
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     a8ef5e91d91ca5292bc7381db11ab1153cb73ffc
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 19:08:21 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 19:08:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a8ef5e91

gen_configkernel.sh: Refactor kernel config handling in config_kernel()

Make sure that we always end up with set kernel config when no
kernel config exists in kernel outputdir.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 44 +++++++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index a5ad953..9a4812f 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -72,9 +72,17 @@ determine_kernel_config_file() {
 }
 
 config_kernel() {
+	local diff_cmd="$(which zdiff 2>/dev/null)"
+	if [ -z "${diff_cmd}" ]
+	then
+		print_warning 5 "zdiff is not available."
+		diff_cmd="diff"
+	fi
+
 	cd "${KERNEL_DIR}" || gen_die "Failed to chdir to '${KERNEL_DIR}'!"
 
 	print_info 1 "kernel: >> Initializing ..."
+
 	if isTrue "${CLEAN}" && isTrue "${MRPROPER}"
 	then
 		print_info 2 "$(get_indent 1)>> --mrproper is set; Skipping 'make clean' ..."
@@ -92,16 +100,20 @@ config_kernel() {
 		if [ -f "${KERNEL_OUTPUTDIR}/.config" ]
 		then
 			# Current .config is different then one we are going to use
-			if [ -n "${CMD_KERNEL_CONFIG}" -a "${CMD_KERNEL_CONFIG}" = "default" ] || \
-				! diff -q "${KERNEL_OUTPUTDIR}"/.config "${KERNEL_CONFIG}" >/dev/null
+			if [ -n "${CMD_KERNEL_CONFIG}" -a "${CMD_KERNEL_CONFIG}" = "default" ] \
+				|| ! "${diff_cmd}" -q "${KERNEL_OUTPUTDIR}"/.config "${KERNEL_CONFIG}" >/dev/null
 			then
 				NOW=$(date +--%Y-%m-%d--%H-%M-%S)
 				cp "${KERNEL_OUTPUTDIR}/.config" "${KERNEL_OUTPUTDIR}/.config${NOW}.bak" \
 					|| gen_die "Could not backup kernel config (${KERNEL_OUTPUTDIR}/.config)"
 				print_info 1 "$(get_indent 1)>> Previous config backed up to .config${NOW}.bak"
 
-				[ -n "${CMD_KERNEL_CONFIG}" -a "${CMD_KERNEL_CONFIG}" = "default" ] &&
-					rm "${KERNEL_OUTPUTDIR}/.config" >/dev/null
+				if [ -n "${CMD_KERNEL_CONFIG}" -a "${CMD_KERNEL_CONFIG}" = "default" ]
+				then
+					print_info 3 "$(get_indent 1)>> Default kernel config was forced; Deleting existing kernel config '${KERNEL_OUTPUTDIR}/.config' ..."
+					rm "${KERNEL_OUTPUTDIR}/.config" >/dev/null \
+						|| gen_die "Failed to delete '${KERNEL_OUTPUTDIR}/.config'!"
+				fi
 			fi
 		fi
 	fi
@@ -111,22 +123,15 @@ config_kernel() {
 		print_info 1 "$(get_indent 1)>> Running 'make mrproper' ..."
 		compile_generic mrproper kernel
 	else
-		if [ -f "${KERNEL_OUTPUTDIR}/.config" ]
-		then
-			print_info 1 "$(get_indent 1)>> Using config from '${KERNEL_OUTPUTDIR}/.config' ..."
-		else
-			print_info 1 "$(get_indent 1)>> Using config from '${KERNEL_CONFIG}' ..."
-		fi
 		print_info 1 "$(get_indent 1)>> --no-mrproper is set; Skipping 'make mrproper' ..."
 	fi
 
-	# 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_OUTPUTDIR}/.config" ]
+	if [ ! -f "${KERNEL_OUTPUTDIR}/.config" ]
 	then
-		print_info 1 "$(get_indent 1)>> Using config from '${KERNEL_CONFIG}' ..."
+		# We always need a kernel config file...
+		print_info 3 "$(get_indent 1)>> Copying '${KERNEL_CONFIG}' to '${KERNEL_OUTPUTDIR}/.config' ..."
 
-		local message="Could not copy configuration file '${KERNEL_CONFIG}'!"
+		local message="Failed to copy kernel config file '${KERNEL_CONFIG}' to '${KERNEL_OUTPUTDIR}/.config'!"
 		if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}" 2>/dev/null)" == application/x-gzip ]]
 		then
 			# Support --kernel-config=/proc/config.gz, mainly
@@ -134,6 +139,15 @@ config_kernel() {
 		else
 			cp -aL "${KERNEL_CONFIG}" "${KERNEL_OUTPUTDIR}/.config" || gen_die "${message}"
 		fi
+	else
+		if ! "${diff_cmd}" -q "${KERNEL_OUTPUTDIR}"/.config "${KERNEL_CONFIG}" >/dev/null
+		then
+			print_warning 2 "$(get_indent 1)>> Will ignore kernel config from '${KERNEL_CONFIG}'"
+			print_warning 2 "$(get_indent 1)   in favor of already existing but different kernel config"
+			print_warning 2 "$(get_indent 1)   found in '${KERNEL_OUTPUTDIR}/.config' ..."
+		else
+			print_info 3 "$(get_indent 1)>> Can keep using already existing '${KERNEL_OUTPUTDIR}/.config' which is identical to --kernel-config file  ..."
+		fi
 	fi
 
 	if isTrue "${OLDCONFIG}"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     c09d959757ab97a50b9af373b975f7b7c4ecf99a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 19:05:02 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 19:06:30 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c09d9597

gen_determineargs.sh: determine_real_args(): Try to create $KERNEL_OUTPUTDIR when $KERNEL_DIR != $KERNEL_OUTPUTDIR

That's typically the case when user has set --kernel-outputdir option.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index a82fb0a..549fb59 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -459,6 +459,12 @@ determine_real_args() {
 
 	if isTrue "${BUILD_KERNEL}"
 	then
+		if [ "${KERNEL_DIR}" != "${KERNEL_OUTPUTDIR}" -a ! -d "${KERNEL_OUTPUTDIR}" ]
+		then
+			print_warning 3 "Set --kernel-outputdir '${KERNEL_OUTPUTDIR}' does not exist; Will try to create ..."
+			mkdir -p "${KERNEL_OUTPUTDIR}" || gen_die "Failed to create '${KERNEL_OUTPUTDIR}'!"
+		fi
+
 		if [ -n "${KERNEL_LOCALVERSION}" ]
 		then
 			case "${KERNEL_LOCALVERSION}" in

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     a90adc8ef85e897c2e69beed6f7b650359179cd7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 19:17:34 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 19:17:34 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a90adc8e

genkernel: bump to v4.0.0_beta9

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 39ed262..d5e9b06 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_beta8'
+GK_V='4.0.0_beta9'
 
 TODEBUGCACHE=yes # Until an error occurs or LOGFILE is fully qualified.
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     75fd4f4d05df729511f071b2c1a163f08f522622
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 19:00:10 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 19:00:10 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=75fd4f4d

gen_initramfs.sh: Refactor append_modules() to not include --module-prefix

Make sure to chdir into ${INSTALL_MOD_PATH%/}/lib/modules/${KV} before
copying modules to avoid inclusion of --module-prefix path.

Bug: https://bugs.gentoo.org/690260
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 1fcfdce..eb3aed7 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1301,29 +1301,32 @@ append_modules() {
 		mkdir -p "${TDIR}"/${mydir} || gen_die "Failed to create '${TDIR}/${mydir}'!"
 	done
 
+	local modules_dstdir="${TDIR}/lib/modules/${KV}"
+	local modules_srcdir="/lib/modules/${KV}"
+
 	print_info 2 "$(get_indent 2)modules: >> Copying modules to initramfs ..."
-	if [ "${INSTALL_MOD_PATH}" != '' ]
+
+	if [ -n "${INSTALL_MOD_PATH}" ]
 	then
-		cd "${INSTALL_MOD_PATH}" || gen_die "Failed to chdir to '${INSTALL_MOD_PATH}'!"
-	else
-		cd / || gen_die "Failed to chdir to '/'!"
+		modules_srcdir="${INSTALL_MOD_PATH%/}${modules_srcdir}"
 	fi
 
-	local _MODULES_DIR="${PWD%/}/lib/modules/${KV}"
-	if [ ! -d "${_MODULES_DIR}" ]
+	if [ ! -d "${modules_srcdir}" ]
 	then
-		error_message="'${_MODULES_DIR}' does not exist! Did you forget"
+		error_message="'${modules_srcdir}' does not exist! Did you forget"
 		error_message+=" to compile kernel before building initramfs?"
 		error_message+=" If you know what you are doing please set '--no-ramdisk-modules'."
 		gen_die "${error_message}"
 	fi
 
+	cd "${modules_srcdir}" || gen_die "Failed to chdir to '${modules_srcdir}'!"
+
 	local i= mymod=
 	local MOD_EXT="$(modules_kext)"
 	local n_copied_modules=0
 	for i in $(gen_dep_list)
 	do
-		mymod=$(find "${_MODULES_DIR}" -name "${i}${MOD_EXT}" 2>/dev/null | head -n 1)
+		mymod=$(find . -name "${i}${MOD_EXT}" 2>/dev/null | head -n 1)
 		if [ -z "${mymod}" ]
 		then
 			print_warning 3 "$(get_indent 3) - ${i}${MOD_EXT} not found; Skipping ..."
@@ -1331,8 +1334,8 @@ append_modules() {
 		fi
 
 		print_info 3 "$(get_indent 3) - Copying ${i}${MOD_EXT} ..."
-		cp -ax --parents "${mymod}" "${TDIR}"/ 2>/dev/null \
-			|| gen_die "Failed to copy '${mymod}' to '${TDIR}/'!"
+		cp -ax --parents --target-directory "${modules_dstdir}" "${mymod}" 2>/dev/null \
+			|| gen_die "Failed to copy '${modules_srcdir}/${mymod}' to '${modules_dstdir}'!"
 		n_copied_modules=$[$n_copied_modules+1]
 	done
 
@@ -1343,11 +1346,12 @@ append_modules() {
 		print_info 2 "$(get_indent 2)modules: ${n_copied_modules} modules copied!"
 	fi
 
-	cp -ax --parents "${_MODULES_DIR}"/modules* "${TDIR}"/ 2>/dev/null \
-		|| gen_die "Failed to copy '${_MODULES_DIR}/modules*' to '${TDIR}/'!"
+	cp -ax --parents --target-directory "${modules_dstdir}" modules* 2>/dev/null \
+		|| gen_die "Failed to copy '${modules_srcdir}/modules*' to '${modules_dstdir}'!"
 
 	local group_modules= group=
-	for group_modules in ${!MODULES_*}; do
+	for group_modules in ${!MODULES_*}
+	do
 		group="$(echo ${group_modules} | cut -d_ -f2- | tr "[:upper:]" "[:lower:]")"
 		print_list ${!group_modules} > "${TDIR}"/etc/modules/${group} \
 			|| gen_die "Failed to create '${TDIR}/etc/modules/${group}'!"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     84367a16cd13999842f58a48a3e66e8ed8f76507
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 19:12:21 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 19:14:14 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=84367a16

genkernel: Fix initramfs location in msg regarding genkernel hardware detection feature

The fix for bug 689950 was incomplete: Sometimes, $TMPDIR is correct.

Fixes 323c9f71d7 ("genkernel: Use $BOOTDIR in msg regarding genkernel hardware detection feature")
Bug: https://bugs.gentoo.org/689950
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index b6f1eaa..39ed262 100755
--- a/genkernel
+++ b/genkernel
@@ -380,9 +380,12 @@ then
 
 	if isTrue "${show_warning_initramfs_is_required}" && isTrue "${BUILD_RAMDISK}"
 	then
+		INITRAMFS_INSTALLED_IN="${TMPDIR}"
+		isTrue "${CMD_INSTALL}" && INITRAMFS_INSTALLED_IN="${BOOTDIR}"
+
 		print_warning 1 '' 1 0
 		print_warning 1 "If you require Genkernel's hardware detection features, you ${BOLD}MUST${NORMAL}"
-		print_warning 1 "tell your bootloader to use the provided initramfs file (${BOOTDIR}/initramfs-${KNAME}-${ARCH}-${KV})."
+		print_warning 1 "tell your bootloader to use the provided initramfs file (${INITRAMFS_INSTALLED_IN}/initramfs-${KNAME}-${ARCH}-${KV})."
 	fi
 	unset show_warning_initramfs_is_required
 fi

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     10e69db8ae7dc7ccfb1b4f5bad1e6f179c7d9bf1
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 19:11:23 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 19:11:23 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=10e69db8

Log genkernel start and end time

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 9 ++-------
 gen_funcs.sh         | 5 +++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 549fb59..eb0cd74 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -204,13 +204,8 @@ determine_real_args() {
 		small_die "Cannot write to '${LOGFILE}'!"
 	fi
 
-	if [ -f "${LOGFILE}" ]
-	then
-		# Truncate existing logfile
-		echo > "${LOGFILE}" 2>/dev/null || small_die "Could not write to '${LOGFILE}'!"
-	else
-		touch "${LOGFILE}" || small_die "Failed to create '${LOGFILE}'!"
-	fi
+	GK_TIME_START=$(date +%s)
+	echo ">>> Started genkernel v${GK_V} on: $(date +"%Y-%m-%d %H:%M:%S")" > "${LOGFILE}" 2>/dev/null || small_die "Could not write to '${LOGFILE}'!"
 
 	dump_debugcache
 

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 33b05b7..3c91372 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -370,6 +370,11 @@ cleanup() {
 		print_info 3 "CACHE_DIR: ${CACHE_DIR}"
 		print_info 3 "TMPDIR: ${TMPDIR}"
 	fi
+
+	GK_TIME_END=$(date +%s)
+	let GK_TIME_RUNTIME_SECONDS=${GK_TIME_END}-${GK_TIME_START}
+	let GK_TIME_RUNTIME_DAYS=${GK_TIME_RUNTIME_SECONDS}/86400
+	TZ= printf ">>> Ended on: $(date +"%Y-%m-%d %H:%M:%S") (after %d days%(%k hours %M minutes %S seconds)T)\n" ${GK_TIME_RUNTIME_DAYS} ${GK_TIME_RUNTIME_SECONDS} >> "${LOGFILE}" 2>/dev/null
 }
 
 clear_tmpdir() {

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     9595cfa3498003ca3d5f53aade101f271b3dca24
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 16:12:01 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 16:13:41 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9595cfa3

gen_funcs.sh: gen_die(): Just trigger trap function when died in subshell

This will ensure that only one function will call cleanup().

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 94bf550..97a85dd 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -282,26 +282,31 @@ gen_die() {
 		print_error 1 "ERROR: ${1}"
 	fi
 
-	# Don't trust $LOGFILE before determine_real_args() was called
-	if [ -n "${CMD_LOGFILE}" -a -s "${LOGFILE}" ]
+	if [[ -n "${GK_MASTER_PID}" && ${BASHPID} != ${GK_MASTER_PID} ]]
 	then
-		print_error 1 "Please consult '${LOGFILE}' for more information and any"
-		print_error 1 "errors that were reported above."
-		print_error 1 ''
-	fi
+		# We died in a subshell! Let's trigger trap function...
+		kill -s SIGTERM ${GK_MASTER_PID}
+	else
+		# Don't trust $LOGFILE before determine_real_args() was called
+		if [ -n "${CMD_LOGFILE}" -a -s "${LOGFILE}" ]
+		then
+			print_error 1 "Please consult '${LOGFILE}' for more information and any"
+			print_error 1 "errors that were reported above."
+			print_error 1 ''
+		fi
 
-	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 ${BOLD}*not*${NORMAL} report ${BOLD}kernel${NORMAL} compilation failures as genkernel bugs!"
-	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 ${BOLD}*not*${NORMAL} report ${BOLD}kernel${NORMAL} compilation failures as genkernel bugs!"
+		print_error 1 ''
 
-	# Cleanup temp dirs and caches if requested
-	cleanup
+		# Cleanup temp dirs and caches if requested
+		cleanup
+	fi
 
-	[[ -n "${GK_MASTER_PID}" && ${BASHPID} != ${GK_MASTER_PID} ]] && kill -s SIGTERM ${GK_MASTER_PID}
 	exit 1
 }
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     88e6818dcc2c28e991c18a691d4057106fe0f541
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 16:22:21 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 16:22:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=88e6818d

genkernel: bump to v4.0.0_beta10

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 9625353..58d4cf3 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_beta9'
+GK_V='4.0.0_beta10'
 
 TODEBUGCACHE=yes # Until an error occurs or LOGFILE is fully qualified.
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     df7d41f1e2fd5056a06418bb379e351b52424b3d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 16:15:18 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 16:15:18 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=df7d41f1

gen_funcs.sh: Add is_gzipped() function

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 97a85dd..a1a3cf6 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -209,6 +209,32 @@ can_run_programs_compiled_by_genkernel() {
 	echo "${can_run_programs}"
 }
 
+is_gzipped() {
+	[[ ${#} -ne 1 ]] \
+		&& gen_die "$(get_useful_function_stack "${FUNCNAME}")Invalid usage of ${FUNCNAME}(): Function takes exactly one argument (${#} given)!"
+
+	local file_to_check=${1}
+
+	if [ ! -f "${file_to_check}" ]
+	then
+		gen_die "$(get_useful_function_stack "${FUNCNAME}")Invalid usage of ${FUNCNAME}(): File '${file_to_check}' does not exist!"
+	fi
+
+	local file_is_gzipped=no
+	local file_mimetype=$(file --brief --mime-type "${file_to_check}" 2>/dev/null)
+
+	case "${file_mimetype}" in
+		application/x-gzip)
+			file_is_gzipped=yes
+			;;
+		application/gzip)
+			file_is_gzipped=yes
+			;;
+	esac
+
+	echo "${file_is_gzipped}"
+}
+
 is_valid_ssh_host_keys_parameter_value() {
 	local parameter_value=${1}
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     1e51b25dc650f363f1bd284666441d968f0e3e08
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 16:21:30 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 16:21:30 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1e51b25d

Make use of new is_gzipped() function

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 2 +-
 gen_initramfs.sh    | 2 +-
 gen_package.sh      | 6 ++++--
 genkernel           | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 9a4812f..9a33717 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -132,7 +132,7 @@ config_kernel() {
 		print_info 3 "$(get_indent 1)>> Copying '${KERNEL_CONFIG}' to '${KERNEL_OUTPUTDIR}/.config' ..."
 
 		local message="Failed to copy kernel config file '${KERNEL_CONFIG}' to '${KERNEL_OUTPUTDIR}/.config'!"
-		if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}" 2>/dev/null)" == application/x-gzip ]]
+		if isTrue "$(is_gzipped "${KERNEL_CONFIG}")"
 		then
 			# Support --kernel-config=/proc/config.gz, mainly
 			zcat "${KERNEL_CONFIG}" > "${KERNEL_OUTPUTDIR}/.config" || gen_die "${message}"

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index eb3aed7..9a06855 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1629,7 +1629,7 @@ create_initramfs() {
 		local ACTUAL_KERNEL_CONFIG="${KERNEL_CONFIG}"
 	fi
 
-	if [[ "$(file --brief --mime-type "${ACTUAL_KERNEL_CONFIG}")" == application/x-gzip ]]
+	if isTrue "$(is_gzipped "${ACTUAL_KERNEL_CONFIG}")"
 	then
 		# Support --kernel-config=/proc/config.gz, mainly
 		local CONFGREP=zgrep

diff --git a/gen_package.sh b/gen_package.sh
index ca46a2c..665f101 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -123,7 +123,8 @@ gen_kerncache() {
 	cp -aL "${KERNEL_OUTPUTDIR}/.config" "${TEMP}/kerncache/config-${ARCH}-${KV}" \
 		|| gen_die "Could not copy the kernel config '${KERNEL_OUTPUTDIR}/.config' for the kernel package!"
 
-	if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then
+	if isTrue "$(is_gzipped "${KERNEL_CONFIG}")"
+	then
 		# Support --kernel-config=/proc/config.gz, mainly
 		zcat "${KERNEL_CONFIG}" > "${TEMP}/kerncache/config-${ARCH}-${KV}.orig" \
 			|| gen_die "Could not copy the kernel config '${KERNEL_CONFIG}' for the kernel package!"
@@ -250,7 +251,8 @@ gen_kerncache_is_valid() {
 					local test1=$(grep -v "^#" "${TEMP}/config-${ARCH}-${KV}" | md5sum | cut -d " " -f 1)
 				fi
 
-				if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then
+				if isTrue "$(is_gzipped "${KERNEL_CONFIG}")"
+				then
 					# Support --kernel-config=/proc/config.gz, mainly
 					local CONFGREP=zgrep
 				else

diff --git a/genkernel b/genkernel
index 0368acd..9625353 100755
--- a/genkernel
+++ b/genkernel
@@ -442,7 +442,7 @@ then
 		print_warning 1 '"man genkernel" explains "dozfs" in detail.'
 	fi
 
-	if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]
+	if isTrue "$(is_gzipped "${KERNEL_CONFIG}")"
 	then
 		# Support --kernel-config=/proc/config.gz, mainly
 		CONFGREP=zgrep

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     9418b9d65972045d2087b24b214bad1ecc8ab197
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 27 21:30:15 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 21:19:39 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9418b9d6

genkernel: Normalize output

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_package.sh |  8 ++++++--
 genkernel      | 23 +++++++++++++++++------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/gen_package.sh b/gen_package.sh
index 4a1ca43..0240b80 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -174,6 +174,7 @@ gen_kerncache() {
 }
 
 gen_kerncache_extract_kernel() {
+	print_info 1 "Extracting kerncache kernel from '${KERNCACHE}' ..."
 	"${TAR_COMMAND}" -xf "${KERNCACHE}" -C "${TEMP}" \
 		|| gen_die "Failed to extract '${KERNCACHE}' to '${TEMP}'!"
 
@@ -238,6 +239,7 @@ gen_kerncache_is_valid() {
 
 			if [ -e "${TEMP}/config-${ARCH}-${KV}" -a -e "${TEMP}/kernel-${ARCH}-${KV}" ]
 			then
+				print_info 1 '' 1 0
 				print_info 1 'Valid kerncache found; No sources will be used ...'
 				KERNCACHE_IS_VALID="yes"
 			fi
@@ -262,9 +264,11 @@ gen_kerncache_is_valid() {
 
 				if [[ "${test1}" == "${test2}" ]]
 				then
+					print_info 1 '' 1 0
 					print_info 1 "Valid kerncache '${KERNCACHE}' found; Will skip kernel build step ..."
 					KERNCACHE_IS_VALID="yes"
 				else
+					print_info 1 '' 1 0
 					print_info 1 "Kerncache kernel config differs from '${KERNEL_CONFIG}'; Ignoring outdated kerncache '${KERNCACHE}' ..."
 				fi
 			else
@@ -274,14 +278,14 @@ gen_kerncache_is_valid() {
 					invalid_reason="Kernel config '${KERNEL_CONFIG}' does not exist -- cannot validate kerncache"
 				fi
 
+				print_info 1 '' 1 0
 				print_info 1 "${invalid_reason}; Ignorning kerncache '${KERNCACHE}' ..."
 			fi
 		fi
 	else
+		print_warning 1 '' 1 0
 		print_warning 1 "Kerncache '${KERNCACHE}' does not exist (yet?); Ignoring ..."
 	fi
 
-	echo
-
 	export KERNCACHE_IS_VALID
 }

diff --git a/genkernel b/genkernel
index 58d4cf3..34de18f 100755
--- a/genkernel
+++ b/genkernel
@@ -103,7 +103,6 @@ NORMAL=${GOOD} print_info 1 "Gentoo Linux Genkernel; Version ${GK_V}${NORMAL}"
 print_info 1 "Using genkernel configuration from '${_GENKERNEL_CONF}' ..."
 unset _GENKERNEL_CONF
 print_info 1 "Running with options: ${GK_OPTIONS}"
-print_info 1 '' 1 0
 
 # Save any customizations of MODULES_* first.
 override_module_vars="$(compgen -A variable |grep '^MODULES_')"
@@ -118,6 +117,7 @@ determine_real_args
 
 if isTrue "${BUILD_RAMDISK}" && ! isTrue "${SANDBOX}"
 then
+	print_warning 1 '' 1 0
 	print_warning 1 "${BOLD}WARNING:${NORMAL} Will build initramfs ${BOLD}without${NORMAL} sandbox support " 0
 
 	SANDBOX_WARNING_TIMER=0
@@ -129,9 +129,9 @@ then
 	done
 
 	print_warning 1 '' 1 0
-	print_warning 1 '' 1 0
 fi
 
+print_info 2 '' 1 0
 print_info 2 "Sourcing default modules_load from '${GK_SHARE}/defaults/modules_load' ..."
 source "${GK_SHARE}/defaults/modules_load" || gen_die "Could not read '${GK_SHARE}/defaults/modules_load'!"
 
@@ -186,6 +186,7 @@ then
 	gen_kerncache_is_valid
 fi
 
+print_info 1 '' 1 0
 print_info 1 "Working with Linux kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL}"
 print_info 1 "Using kernel config file '${KERNEL_CONFIG}' ..."
 
@@ -255,8 +256,13 @@ fi
 
 if isTrue "${KERNCACHE_IS_VALID}"
 then
+	if ! isTrue "${BUILD_STATIC}"
+	then
+		print_info 1 '' 1 0
+		gen_kerncache_extract_modules
+	fi
+
 	print_info 1 '' 1 0
-	! isTrue "${BUILD_STATIC}" && gen_kerncache_extract_modules
 	gen_kerncache_extract_config
 fi
 
@@ -328,11 +334,16 @@ then
 	fi
 fi
 
-if [ -n "${MINKERNPACKAGE}" -o -n "${MODULESPACKAGE}" ]
+if [ -n "${MINKERNPACKAGE}" ]
+then
+	print_info 1 '' 1 0
+	gen_minkernpackage
+fi
+
+if [ -n "${MODULESPACKAGE}" ]
 then
 	print_info 1 '' 1 0
-	[ -n "${MINKERNPACKAGE}" ] && gen_minkernpackage
-	[ -n "${MODULESPACKAGE}" ] && gen_modulespackage
+	gen_modulespackage
 fi
 
 if isTrue "${BUILD_KERNEL}"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     efe9365be7d8b0aab2d0768f05848f89657b45ee
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 27 20:29:25 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 21:19:30 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=efe9365b

gen_determineargs.sh: determine_real_args(): Fix LOCALVERSION validation pattern

Fixes c859019 ("Add --kernel-localversion option")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index f1c887e..3674cf0 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -477,7 +477,7 @@ determine_real_args() {
 				UNSET)
 					;;
 				*)
-					local valid_localversion_pattern='^-[A-Za-z0-9\-_]{1,}$'
+					local valid_localversion_pattern='^[A-Za-z0-9_.-]{1,}$'
 					if [[ ! "${KERNEL_LOCALVERSION}" =~ ${valid_localversion_pattern} ]]
 					then
 						gen_die "--kernel-localversion value '${KERNEL_LOCALVERSION}' does not match '${valid_localversion_pattern}' regex!"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     fd466708edd8e02bce891a1a1061694975f187de
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 27 22:25:54 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 21:19:39 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fd466708

genkernel: Call gen_kerncache_extract_config() only when --save-config is set

gen_kerncache_extract_config() will write /etc/kernels/kernel-config-* file.
When not using --kerncache, we will create that file only when --save-config
option is set. Let's assume user wants the same when using --kerncache...

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/genkernel b/genkernel
index 34de18f..da3d2d8 100755
--- a/genkernel
+++ b/genkernel
@@ -262,8 +262,11 @@ then
 		gen_kerncache_extract_modules
 	fi
 
-	print_info 1 '' 1 0
-	gen_kerncache_extract_config
+	if isTrue "${SAVE_CONFIG}"
+	then
+		print_info 1 '' 1 0
+		gen_kerncache_extract_config
+	fi
 fi
 
 # Run callback

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     730032d9d81c298497365feb84f8768ea5ad1231
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 21:36:10 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 20:00:27 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=730032d9

genkernel: Fix output when $KV has changed

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/genkernel b/genkernel
index e405a95..31f994e 100755
--- a/genkernel
+++ b/genkernel
@@ -233,9 +233,9 @@ then
 
 		old_KV=$(cat "${TEMP}/.old_kv")
 		print_info 1 "$(get_indent 1)>> Kernel version has changed (probably due to config change) since genkernel start:"
-		print_info 1 "$(get_indent 1)>> We are now building Linux kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL} ..."
+		print_info 1 "$(get_indent 1)   We are now building Linux kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL} ..."
 	else
-		print_info 2 "$(get_indent 1)>> Kernel version has not changed since genkernel start."
+		print_info 2 "$(get_indent 1)>> Kernel version has not changed since genkernel start"
 	fi
 
 	compile_kernel

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     8acef68eac8dc4f7a6e937d11c4dd8713431e9b6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 00:09:39 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 20:00:27 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8acef68e

Export $PATH to genkernel worker

For example required for ccache.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 59c7507..cb0763a 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -595,6 +595,7 @@ dropbear_create_key() {
 		"LOGLEVEL='${LOGLEVEL}'"
 		"LOGFILE='${LOGFILE}'"
 		"NOCOLOR='${NOCOLOR}'"
+		"PATH='${PATH}'"
 		"TEMP='${TEMP}'"
 	)
 
@@ -670,6 +671,7 @@ dropbear_generate_key_info_file() {
 		"LOGLEVEL='${LOGLEVEL}'"
 		"LOGFILE='${LOGFILE}'"
 		"NOCOLOR='${NOCOLOR}'"
+		"PATH='${PATH}'"
 		"TEMP='${TEMP}'"
 	)
 
@@ -1197,6 +1199,7 @@ gkbuild() {
 		"LOGLEVEL='${LOGLEVEL}'"
 		"LOGFILE='${LOGFILE}'"
 		"NOCOLOR='${NOCOLOR}'"
+		"PATH='${PATH}'"
 		"TEMP='${TEMP}'"
 		"TMPDIR='${TEMP}'"
 	)
@@ -1285,6 +1288,7 @@ unpack() {
 		"LOGLEVEL='${LOGLEVEL}'"
 		"LOGFILE='${LOGFILE}'"
 		"NOCOLOR='${NOCOLOR}'"
+		"PATH='${PATH}'"
 		"TEMP='${TEMP}'"
 	)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     f1d4e1574faf52d756c9f8af088b5f379f5b9798
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 21:16:36 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 20:00:27 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f1d4e157

genkernel: Only show information about kernel when kernel was actually installed

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/genkernel b/genkernel
index d8700ea..e405a95 100755
--- a/genkernel
+++ b/genkernel
@@ -407,11 +407,15 @@ then
 		esac
 	else
 		print_info 1 ''
-		print_info 1 "You will find the kernel image in '${TMPDIR}/${GK_FILENAME_TEMP_KERNEL}'."
 
-		if isTrue "${GENZIMAGE}"
+		if ! isTrue "${KERNCACHE_IS_VALID}"
 		then
-			print_info 1 "You will find the kernelz binary in '${TMPDIR}/${GK_FILENAME_TEMP_KERNELZ}'."
+			print_info 1 "You will find the kernel image in '${TMPDIR}/${GK_FILENAME_TEMP_KERNEL}'."
+
+			if isTrue "${GENZIMAGE}"
+			then
+				print_info 1 "You will find the kernelz binary in '${TMPDIR}/${GK_FILENAME_TEMP_KERNELZ}'."
+			fi
 		fi
 
 		if isTrue "${BUILD_RAMDISK}"
@@ -420,13 +424,16 @@ then
 		fi
 	fi
 
-	print_info 1 ''
-	print_info 1 'Required kernel parameter:'
-	print_info 1 ''
-	print_info 1 '	root=/dev/$ROOT'
-	print_info 1 ''
-	print_info 1 'Where $ROOT is the device node for your root partition as the'
-	print_info 1 'one specified in /etc/fstab'
+	if isTrue "${CMD_INSTALL}" || ! isTrue "${KERNCACHE_IS_VALID}"
+	then
+		print_info 1 ''
+		print_info 1 'Required kernel parameter:'
+		print_info 1 ''
+		print_info 1 '	root=/dev/$ROOT'
+		print_info 1 ''
+		print_info 1 'Where $ROOT is the device node for your root partition as the'
+		print_info 1 'one specified in /etc/fstab'
+	fi
 
 	if isTrue "${show_warning_initramfs_is_required}" && isTrue "${BUILD_RAMDISK}"
 	then

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     86ce6816b789e707fa8348624b0643beeeb3c7eb
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 21:07:17 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 20:00:26 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=86ce6816

genkernel: Don't allow building kernel only when --kerncache is used but --no-install is set

This just don't make sense. We wouldn't do anything.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/genkernel b/genkernel
index 31a880d..f33379c 100755
--- a/genkernel
+++ b/genkernel
@@ -188,6 +188,14 @@ then
 	gen_kerncache_is_valid
 fi
 
+if isTrue "${KERNCACHE_IS_VALID}" && ! isTrue "${CMD_INSTALL}" && ! isTrue "${BUILD_RAMDISK}"
+then
+	error_msg="Nothing to do: Selected action does not include building initramfs."
+	error_msg+=" Because kerncache is valid, no kernel will be build."
+	error_msg+=" However, due to set --no-install option, we will not even install kernel binary from kerncache."
+	gen_die "${error_msg}"
+fi
+
 print_info 1 '' 1 0
 print_info 1 "Working with Linux kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL}"
 print_info 1 "Using kernel config file '${KERNEL_CONFIG}' ..."

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     15b34c0a3b9c63cbedc25db05081fc5e2ed00b67
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 21:10:49 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 20:00:26 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=15b34c0a

genkernel: Don't install modules to /lib/modules when --kerncache is used but --no-install is set

Bug: https://bugs.gentoo.org/505810
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/genkernel b/genkernel
index f33379c..c3aa8d1 100755
--- a/genkernel
+++ b/genkernel
@@ -280,6 +280,21 @@ if isTrue "${KERNCACHE_IS_VALID}"
 then
 	if ! isTrue "${BUILD_STATIC}"
 	then
+		if ! isTrue "${CMD_INSTALL}" && [ -z "${INSTALL_MOD_PATH}" ]
+		then
+			# We have to set $INSTALL_MOD_PATH to avoid installing files
+			# to /lib/modules because --no-install was set
+			INSTALL_MOD_PATH="$(mktemp -d -p "${TEMP}" kerncache-modules.XXXXXXX 2>/dev/null)"
+			if [ -z "${INSTALL_MOD_PATH}" ]
+			then
+				gen_die "Internal error: Variable 'INSTALL_MOD_PATH' is empty; mktemp() for kerncache modules failed!"
+			else
+				print_info 5 '' 1 0
+				print_info 5 "INSTALL_MOD_PATH set to '${INSTALL_MOD_PATH}' because --kerncache is used but --no-install was set ..."
+				mkdir "${INSTALL_MOD_PATH}/lib" || gen_die "Failed to create '${INSTALL_MOD_PATH}/lib'!"
+			fi
+		fi
+
 		print_info 1 '' 1 0
 		gen_kerncache_extract_modules
 	fi

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     77abf7456bf0af2b145e44a0148fcecae882b9b9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 23:25:31 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 20:00:27 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=77abf745

gen_funcs.sh: Refactor get_chost_libdir() error handling

We need to check each returned value because last call to
dirname() would return "." when called for an empty path
caused by a previous failure.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index a1fe98a..59c7507 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -736,9 +736,21 @@ debug_breakpoint() {
 
 get_chost_libdir() {
 	local cc=$(tc-getCC)
-	local libdir=$(dirname "$(realpath "$(${cc} -print-file-name=libnss_files.so)")")
 
-	if [[ -z "${libdir}" ]]
+	local test_file=$("${cc}" -print-file-name=libnss_files.so 2>/dev/null)
+	if [ -z "${test_file}" ]
+	then
+		gen_die "$(get_useful_function_stack "${FUNCNAME}")Unable to determine CHOST's libdir: '${cc} -print-file-name=libnss_files.so' returned nothing!"
+	fi
+
+	local test_file_realpath=$(realpath "${test_file}" 2>/dev/null)
+	if [ -z "${test_file_realpath}" ]
+	then
+		gen_die "$(get_useful_function_stack "${FUNCNAME}")Unable to determine CHOST's libdir: 'realpath \"${test_file}\"' returned nothing!"
+	fi
+
+	local libdir=$(dirname "${test_file_realpath}" 2>/dev/null)
+	if [ -z "${libdir}" ]
 	then
 		gen_die "$(get_useful_function_stack "${FUNCNAME}")Unable to determine CHOST's libdir!"
 	fi

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     e900e7c9c02cc00cfa13ab50f440dfba236e9417
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 21:14:31 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 20:00:26 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e900e7c9

genkernel: Combine kerncache conditionals

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/genkernel b/genkernel
index c3aa8d1..d8700ea 100755
--- a/genkernel
+++ b/genkernel
@@ -267,17 +267,14 @@ then
 	fi
 fi
 
-if isTrue "${CMD_INSTALL}"
+if isTrue "${KERNCACHE_IS_VALID}"
 then
-	if isTrue "${KERNCACHE_IS_VALID}"
+	if isTrue "${CMD_INSTALL}"
 	then
 		print_info 1 '' 1 0
 		gen_kerncache_extract_kernel
 	fi
-fi
 
-if isTrue "${KERNCACHE_IS_VALID}"
-then
 	if ! isTrue "${BUILD_STATIC}"
 	then
 		if ! isTrue "${CMD_INSTALL}" && [ -z "${INSTALL_MOD_PATH}" ]

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     b4a90d77ea10bf9ca993c7b464d4d789535e1577
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 13:47:45 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 20:02:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b4a90d77

gen_determineargs.sh: determine_real_args(): Don't allow TMPDIR with spaces

This just won't work -- many packages like util-linux don't support spaces
in builddir path and will fail when applying libtool magic.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh |  7 +++++++
 gen_funcs.sh         | 16 ++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index b64cdba..9170080 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -380,6 +380,13 @@ determine_real_args() {
 
 	dump_debugcache
 
+	if isTrue "$(has_space_characters "${TMPDIR}")"
+	then
+		# Packages like util-linux will fail to compile when path to
+		# build dir contains spaces
+		gen_die "--tmpdir '${TMPDIR}' contains space character(s) which are not supported!"
+	fi
+
 	if [ ! -d "${TMPDIR}" ]
 	then
 		mkdir -p "${TMPDIR}" || gen_die "Failed to create '${TMPDIR}'!"

diff --git a/gen_funcs.sh b/gen_funcs.sh
index e700ae1..c042513 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -209,6 +209,22 @@ can_run_programs_compiled_by_genkernel() {
 	echo "${can_run_programs}"
 }
 
+has_space_characters() {
+	[[ ${#} -ne 1 ]] \
+		&& gen_die "$(get_useful_function_stack "${FUNCNAME}")Invalid usage of ${FUNCNAME}(): Function takes exactly one argument (${#} given)!"
+
+	local testvalue=${1}
+	local has_space_characters=no
+
+	local space_pattern='[[:space:]]'
+	if [[ "${testvalue}" =~ ${space_pattern} ]]
+	then
+		has_space_characters=yes
+	fi
+
+	echo "${has_space_characters}"
+}
+
 is_gzipped() {
 	[[ ${#} -ne 1 ]] \
 		&& gen_die "$(get_useful_function_stack "${FUNCNAME}")Invalid usage of ${FUNCNAME}(): Function takes exactly one argument (${#} given)!"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     2f855273fc88de81cf3ae1208549c58c9bc91ba5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 13:41:41 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 20:02:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2f855273

gen_determineargs.sh: determine_KV(): Quote $KERNEL_OUTPUTDIR

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index f4b3cf7..b64cdba 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -44,10 +44,10 @@ determine_KV() {
 		[ -f "${KERNEL_OUTPUTDIR}/include/linux/utsrelease.h" ] && \
 			VERSION_SOURCE="${KERNEL_OUTPUTDIR}/include/linux/utsrelease.h"
 		# Handle new-style releases where version.h doesn't have UTS_RELEASE
-		if [ -f ${KERNEL_OUTPUTDIR}/include/config/kernel.release ]
+		if [ -f "${KERNEL_OUTPUTDIR}/include/config/kernel.release" ]
 		then
 			print_info 3 "Using '${KERNEL_OUTPUTDIR}/include/config/kernel.release' to extract LOCALVERSION ..."
-			UTS_RELEASE=$(cat ${KERNEL_OUTPUTDIR}/include/config/kernel.release)
+			UTS_RELEASE=$(cat "${KERNEL_OUTPUTDIR}/include/config/kernel.release")
 			LOV=$(echo ${UTS_RELEASE}|sed -e "s/${VER}.${PAT}.${SUB}${EXV}//")
 			KV=${VER}.${PAT}.${SUB}${EXV}${LOV}
 		elif [ -n "${VERSION_SOURCE}" ]

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     c7200d139371d5c0cf8b60143a0abb60d8013c00
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 00:12:45 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 20:00:27 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c7200d13

gen_funcs.sh: gkbuild(): Export any set CCACHE_* and DISTCC_* variable

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index cb0763a..e700ae1 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1233,6 +1233,19 @@ gkbuild() {
 		"STRIP='$(tc-getSTRIP)'"
 	)
 
+	local envvar_prefix envvars_to_export envvar_to_export
+	for envvar_prefix in CCACHE_ DISTCC_
+	do
+		envvars_to_export=$(compgen -A variable | grep "^${envvar_prefix}")
+		for envvar_to_export in ${envvars_to_export}
+		do
+			[ -z "${envvar_to_export}" ] && break
+
+			envvars+=( "${envvar_to_export}='${!envvar_to_export}'" )
+		done
+	done
+	unset envvar_prefix envvars_to_export envvar_to_export
+
 	if [ ${NICE} -ne 0 ]
 	then
 		NICEOPTS="nice -n${NICE} "

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     da27142c8819c05ed3bd75de1c4623d867e48f71
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 13:54:38 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 20:02:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=da27142c

gen_determineargs.sh: determine_real_args(): Don't allow KERNEL_OUTPUTDIR with spaces

Kernel Makefile just don't support that.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 9170080..8044a97 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -680,6 +680,12 @@ determine_real_args() {
 
 	if isTrue "${BUILD_KERNEL}"
 	then
+		if isTrue "$(has_space_characters "${KERNEL_OUTPUTDIR}")"
+		then
+			# Kernel Makefile doesn't support spaces in outputdir path...
+			gen_die "--kernel-outputdir '${KERNEL_OUTPUTDIR}' contains space character(s) which are not supported!"
+		fi
+
 		if [ "${KERNEL_DIR}" != "${KERNEL_OUTPUTDIR}" -a ! -d "${KERNEL_OUTPUTDIR}" ]
 		then
 			print_warning 3 "Set --kernel-outputdir '${KERNEL_OUTPUTDIR}' does not exist; Will try to create ..."

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     778172c34bd532fc3438b9386ed1875e8c4ec671
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  2 07:44:49 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug  2 07:44:49 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=778172c3

gen_compile.sh: compile_modules(): Don't set INSTALL_MOD_STRIP when --no-strip

Kernel Makefile will pass INSTALL_MOD_STRIP value to "strip" command
resulting in errors like

  strip: '0': No such file

otherwise.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_compile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 0cf6114..5371ce2 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -236,7 +236,7 @@ compile_modules() {
 		local -x INSTALL_MOD_STRIP=1
 	else
 		print_info 1 "$(get_indent 1)>> Installing ${KV} modules ..."
-		local -x INSTALL_MOD_STRIP=0
+		unset INSTALL_MOD_STRIP
 	fi
 
 	compile_generic "modules_install" kernel

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     fa11c50a6e1ab284fafa1fceed6b5e32be58547d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  2 07:45:15 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug  2 07:45:15 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fa11c50a

genkernel: bump to v4.0.0_beta11

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 31f994e..6db8133 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_beta10'
+GK_V='4.0.0_beta11'
 
 TODEBUGCACHE=yes # Until an error occurs or LOGFILE is fully qualified.
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     c47369316bd38b737fc2806723049211db2461e1
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  3 00:18:15 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug  3 00:41:01 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c4736931

gen_initramfs.sh: create_initramfs(): Always show warning that --microcode-initramfs is deprecated

Now that we can generate amd-uc.img via sys-kernel/linux-firmware[initramfs] and
intel-uc.img via sys-firmware/intel-microcode[initramfs] tell all users that
--microcode-initramfs is deprecated.

Loading microcode via /boot/{amd,intel}-uc.img instead of embedding into
initramfs is recommended because this will allow user to update microcode
independently of initramfs updates through package updates.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index fb269b8..36b4678 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1806,15 +1806,14 @@ create_initramfs() {
 				print_info 1    "$(get_indent 2)                 ${BOLD}Note:${NORMAL} You can set --no-microcode-initramfs if you load microcode on your own"
 			fi
 
-			if ! isTrue "${WRAP_INITRD}" && [[ "${MICROCODE}" == intel ]]
+			if ! isTrue "${WRAP_INITRD}"
 			then
-				# Only show this information for Intel users because we have no mechanism yet
-				# to generate amd-*.img in /boot after sys-kernel/linux-firmware update
 				print_info 1 ''
 				print_info 1 "${BOLD}Note:${NORMAL}"
 				print_info 1 '--microcode-initramfs option is enabled by default for backward compatability.'
 				print_info 1 'If your bootloader can load multiple initramfs it is recommended to load'
-				print_info 1 '/boot/intel-uc.img instead of embedding microcode into initramfs.'
+				print_info 1 '/boot/{amd,intel}-uc.img instead of embedding microcode into initramfs so you'
+				print_info 1 'can update microcode via package update independently of initramfs updates.'
 			fi
 		else
 			print_info 3 "$(get_indent 1)>> --no-microcode-initramfs is set; Skipping early-microcode support ..."

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     dbbf68a8cc697e7a5b5a401981d4e065f0eb19f6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  4 11:17:46 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug  4 11:17:46 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=dbbf68a8

gen_determineargs.sh: determine_output_filenames(): Check for valid kernel filename first

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 8044a97..f9bab6e 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -222,10 +222,10 @@ determine_output_filenames() {
 	fi
 
 	local -a filename_vars
-	filename_vars+=( 'GK_FILENAME_INITRAMFS;--initramfs-filename' )
-	filename_vars+=( 'GK_FILENAME_INITRAMFS_SYMLINK;--initramfs-symlink-name' )
 	filename_vars+=( 'GK_FILENAME_KERNEL;--kernel-filename' )
 	filename_vars+=( 'GK_FILENAME_KERNEL_SYMLINK;--kernel-symlink-name' )
+	filename_vars+=( 'GK_FILENAME_INITRAMFS;--initramfs-filename' )
+	filename_vars+=( 'GK_FILENAME_INITRAMFS_SYMLINK;--initramfs-symlink-name' )
 	filename_vars+=( 'GK_FILENAME_SYSTEMMAP;--systemmap-filename' )
 	filename_vars+=( 'GK_FILENAME_SYSTEMMAP_SYMLINK;--systemmap-symlink-name' )
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     8b98f9740405a83645a03c88b625f2905f59239f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  4 11:19:18 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug  4 11:19:18 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8b98f974

gen_determineargs.sh: determine_real_args(): Allow "+" char in LOCALVERSION

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index f9bab6e..48c0c33 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -640,7 +640,7 @@ determine_real_args() {
 
 	# We always need to populate KERNEL_LOCALVERSION to be able to warn
 	# if user changed value but didn't rebuild kernel
-	local valid_localversion_pattern='^[A-Za-z0-9_.-]{1,}$'
+	local valid_localversion_pattern='^[A-Za-z0-9_.+-]{1,}$'
 
 	if [ -n "${KERNEL_LOCALVERSION}" ]
 	then

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     117519303e1a91b2e115993b28a886def4771092
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  4 11:20:10 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug  4 11:35:58 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=11751930

gen_determineargs.sh: determine_output_filenames(): Allow "+" char in filename

Allowed in LOCALVERSION and automatically set by kernel's setlocalversion
script when SCM sources are modified.

Bug: https://bugs.gentoo.org/691412
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 48c0c33..d2fbd86 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -229,7 +229,7 @@ determine_output_filenames() {
 	filename_vars+=( 'GK_FILENAME_SYSTEMMAP;--systemmap-filename' )
 	filename_vars+=( 'GK_FILENAME_SYSTEMMAP_SYMLINK;--systemmap-symlink-name' )
 
-	local valid_filename_pattern='^[a-zA-Z0-9_.-]{1,}$'
+	local valid_filename_pattern='^[a-zA-Z0-9_.+-]{1,}$'
 	local filename_combo filename_varname filename_option
 
 	for filename_combo in "${filename_vars[@]}"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     1026f3c18f89fb41ea6f7673380ed75eb2a3d20a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  4 11:31:39 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug  4 11:36:11 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1026f3c1

gen_compile.sh: compile_external_modules(): Export KERNEL_OUTPUTDIR as KV_OUT_DIR

Needed for emerge to find kernel config when KERNEL_OUTPUTDIR != KERNEL_DIR.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_compile.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gen_compile.sh b/gen_compile.sh
index 5371ce2..fb77e2b 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -36,6 +36,8 @@ compile_external_modules() {
 		return
 	fi
 
+	local -x KV_OUT_DIR="${KERNEL_OUTPUTDIR}"
+
 	print_info 1 "$(get_indent 1)>> Compiling out-of-tree module(s) ..."
 	print_info 3 "COMMAND: ${command}" 1 0 1
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     86dcf9aa5faa2ecd11c8303d6e551db858afe7c5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  7 15:39:40 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug  7 15:45:44 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=86dcf9aa

gen_determineargs.sh: determine_real_args(): Move GK_TIME_START initialization to genkernel

We maybe trigger a failure before determine_real_args() was called
and therefore need this value very early.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 1 -
 genkernel            | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index d2fbd86..d3669b8 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -375,7 +375,6 @@ determine_real_args() {
 		small_die "Cannot write to '${LOGFILE}'!"
 	fi
 
-	GK_TIME_START=$(date +%s)
 	echo ">>> Started genkernel v${GK_V} on: $(date +"%Y-%m-%d %H:%M:%S")" > "${LOGFILE}" 2>/dev/null || small_die "Could not write to '${LOGFILE}'!"
 
 	dump_debugcache

diff --git a/genkernel b/genkernel
index 6db8133..ff79e44 100755
--- a/genkernel
+++ b/genkernel
@@ -4,6 +4,8 @@
 PATH="${PATH}:/sbin:/usr/sbin"
 GK_V='4.0.0_beta11'
 
+GK_TIME_START=$(date +%s)
+
 TODEBUGCACHE=yes # Until an error occurs or LOGFILE is fully qualified.
 
 small_die() {

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     70de004ed8550d2c1f9b81140659fee005c2b33f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  7 15:38:10 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug  7 15:45:19 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=70de004e

gen_cmdline.sh: parse_cmdline(): We no longer require /sbin/mdadm to be present on host system

In addition, this will remove an invalid call to print_warning.

Bug: https://bugs.gentoo.org/691686
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_cmdline.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index dcf479b..7e74182 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -366,15 +366,11 @@ parse_cmdline() {
 			;;
 		--mdadm|--no-mdadm)
 			CMD_MDADM=$(parse_optbool "$*")
-			print_info 3 "CMD_MDADM: $CMD_MDADM"
-			if isTrue "${CMD_MDADM}" && [ ! -e /sbin/mdadm ]
-			then
-				print_warning 'Warning: --mdadm generally requires sys-fs/mdadm present on the host system'
-			fi
+			print_info 3 "CMD_MDADM: ${CMD_MDADM}"
 			;;
 		--mdadm-config=*)
 			CMD_MDADM_CONFIG="${*#*=}"
-			print_info 3 "CMD_MDADM_CONFIG: $CMD_MDADM_CONFIG"
+			print_info 3 "CMD_MDADM_CONFIG: ${CMD_MDADM_CONFIG}"
 			;;
 		--busybox|--no-busybox)
 			CMD_BUSYBOX=$(parse_optbool "$*")

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     01a319d31fa8dfc6dba903ca202f4a915d49f2dc
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 18:20:45 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 18:34:33 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=01a319d3

gen_configkernel.sh: determine_kernel_config_file(): Add kconfig containing KERNEL_LOCALVERSION to kconfig candidate list

Since we added $ARCH to KERNEL_LOCALVERSION by default,
$KV from fresh kernel sources won't match with saved kernel
config file anymore which will break kernel upgrades when
saved kernel config file was just copied to new kernel
version without removing LOV part.

WIth this commit we still prefer extracted $KV when looking
for kernel config file, however, we will also look for
kernel config file where $KV contains KERNEL_LOCALVERSION
we are going to use in addition.

Bug: https://bugs.gentoo.org/691852
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 4cfd246..2ff983f 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -17,17 +17,41 @@ determine_kernel_config_file() {
 		fi
 	else
 		local -a kconfig_candidates
-		kconfig_candidates+=( "${GK_SHARE}/arch/${ARCH}/kernel-config-${KV}" )
-		kconfig_candidates+=( "${GK_SHARE}/arch/${ARCH}/kernel-config-${VER}.${PAT}" )
-		kconfig_candidates+=( "${GK_SHARE}/arch/${ARCH}/generated-config" )
-		kconfig_candidates+=( "${GK_SHARE}/arch/${ARCH}/kernel-config" )
-		kconfig_candidates+=( "${DEFAULT_KERNEL_CONFIG}" )
+
+		local -a gk_kconfig_candidates
+		gk_kconfig_candidates+=( "${GK_SHARE}/arch/${ARCH}/kernel-config-${KV}" )
+		gk_kconfig_candidates+=( "${GK_SHARE}/arch/${ARCH}/kernel-config-${VER}.${PAT}" )
+		gk_kconfig_candidates+=( "${GK_SHARE}/arch/${ARCH}/generated-config" )
+		gk_kconfig_candidates+=( "${GK_SHARE}/arch/${ARCH}/kernel-config" )
+		gk_kconfig_candidates+=( "${DEFAULT_KERNEL_CONFIG}" )
 
 		if [ -n "${CMD_KERNEL_CONFIG}" -a "${CMD_KERNEL_CONFIG}" = "default" ]
 		then
 			print_info 1 "Default configuration was forced. Will ignore any user kernel configuration!"
+			kconfig_candidates=( ${gk_kconfig_candidates[@]} )
 		else
-			kconfig_candidates=( "/etc/kernels/${GK_FILENAME_CONFIG}" "/etc/kernels/kernel-config-${ARCH}-${KV}" ${kconfig_candidates[@]} )
+			local -a user_kconfig_candidates
+
+			# Always prefer kernel config based on actual $KV reading
+			user_kconfig_candidates+=( "/etc/kernels/${GK_FILENAME_CONFIG}" )
+
+			if [ -n "${KERNEL_LOCALVERSION}" -a "${KERNEL_LOCALVERSION}" != "UNSET" ]
+			then
+				# Look for kernel config based on KERNEL_LOCALVERSION
+				# which we are going to use, too.
+				# This will allow user to copy previous kernel config file
+				# which includes LOV by default to new version when doing
+				# kernel upgrade since we add $ARCH to $LOV by default.
+				user_kconfig_candidates+=( "/etc/kernels/kernel-config-${VER}.${PAT}.${SUB}${EXV}${KERNEL_LOCALVERSION}" )
+			fi
+
+			# Look for genkernel-3.x configs for backward compatibility, too
+			user_kconfig_candidates+=( "/etc/kernels/kernel-config-${ARCH}-${KV}" )
+
+			kconfig_candidates=(
+				 ${user_kconfig_candidates[@]}
+				 ${gk_kconfig_candidates[@]}
+			)
 		fi
 
 		local f

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     1bfce82450579fff8a2771651d4623a8006c6b47
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 19:30:36 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 19:30:36 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1bfce824

gen_funcs.sh: gen_die(): Call restore_boot_mount_state()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index c042513..3c9c56f 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -352,6 +352,8 @@ gen_die() {
 		print_error 1 "Please do ${BOLD}*not*${NORMAL} report ${BOLD}kernel${NORMAL} compilation failures as genkernel bugs!"
 		print_error 1 ''
 
+		restore_boot_mount_state
+
 		# Cleanup temp dirs and caches if requested
 		cleanup
 	fi

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     523a63f000a9d2f620a5d1bba05ba15b63ca26cf
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 19:06:29 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 19:06:29 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=523a63f0

genkernel: bump to v4.0.0_beta12

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index ff79e44..185c406 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_beta11'
+GK_V='4.0.0_beta12'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     14aa6eae52b8b9ae476ad2de13cb87f45e28f38b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 19:35:39 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 19:35:39 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=14aa6eae

gen_funcs.sh: make_bootdir_writable(): Fix ro check

Make sure we check $BOOTDIR only for ro and not any mount containing
$BOOTDIR value.

Bug: https://bugs.gentoo.org/691872
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 3c9c56f..da9bc08 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1746,7 +1746,7 @@ make_bootdir_writable() {
 	# Based on mount-boot.eclass code
 	local fstabstate=$(awk "!/^#|^[[:blank:]]+#|^${BOOTDIR//\//\\/}/ {print \$2}" /etc/fstab 2>/dev/null | egrep "^${BOOTDIR}$" )
 	local procstate=$(awk "\$2 ~ /^${BOOTDIR//\//\\/}\$/ {print \$2}" /proc/mounts 2>/dev/null)
-	local proc_ro=$(awk '{ print $2 " ," $4 "," }' /proc/mounts 2>/dev/null | sed -n "/${BOOTDIR//\//\\/} .*,ro,/p")
+	local proc_ro=$(awk '{ print $2 " ," $4 "," }' /proc/mounts 2>/dev/null | sed -n "/^${BOOTDIR//\//\\/} .*,ro,/p")
 
 	if [ -n "${fstabstate}" ] && [ -n "${procstate}" ]
 	then

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     9de72e7d230f7ad8822825ad204136233af95f47
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 19:15:07 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 19:48:28 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9de72e7d

gen_initramfs.sh: create_initramfs(): Change /etc/ld.so.cache creation

- Always generate or update /etc/ld.so.cache when possible.

- ldconfig will chroot due to "-r" parameter. Therefore, "-f" parameter
  expects 'relative' path from chrooted root.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 36b4678..c5e4a67 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1603,12 +1603,12 @@ create_initramfs() {
 		"${CPIO_COMMAND}" --quiet -i -F "${CPIO_ARCHIVE}" 2>/dev/null \
 			|| gen_die "Failed to extract cpio '${CPIO_ARCHIVE}' for dedupe"
 
-		if [ -e etc/ld.so.cache ] && ! isTrue "$(tc-is-cross-compiler)"
+		if ! isTrue "$(tc-is-cross-compiler)"
 		then
-			# We can update /etc/ld.so.cache which was copied from host
+			# We can generate or update /etc/ld.so.cache which was copied from host
 			# to actually match initramfs' content.
 			print_info 1 "$(get_indent 1)>> Pre-generating initramfs' /etc/ld.so.cache ..."
-			ldconfig -f "${TDIR}/etc/ld.so.conf" -r . 2>/dev/null \
+			ldconfig -f /etc/ld.so.conf -r "${TDIR}" 2>/dev/null \
 				|| gen_die "Failed to pre-generate '${TDIR}/etc/ld.so.cache'!"
 		fi
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     3e9ffa310cfcbadbe5c17160e72f0ff86feed8e4
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 19:42:14 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 19:48:58 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3e9ffa31

gen_initramfs.sh: create_initramfs(): Disable sandbox for ldconfig

ldconfig will use chroot(). However, sandbox doesn't understand
that and believes we are writing to /etc/ld.so.cache... which is wrong.

Bug: https://bugs.gentoo.org/431038
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index c5e4a67..23ed9dc 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1608,7 +1608,8 @@ create_initramfs() {
 			# We can generate or update /etc/ld.so.cache which was copied from host
 			# to actually match initramfs' content.
 			print_info 1 "$(get_indent 1)>> Pre-generating initramfs' /etc/ld.so.cache ..."
-			ldconfig -f /etc/ld.so.conf -r "${TDIR}" 2>/dev/null \
+			# Need to disable sandbox which doesn't understand chroot(), bug #431038
+			SANDBOX_ON=0 ldconfig -f /etc/ld.so.conf -r "${TDIR}" 2>/dev/null \
 				|| gen_die "Failed to pre-generate '${TDIR}/etc/ld.so.cache'!"
 		fi
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     79b66d82bdfa4ade09336a54865633c69eeaf154
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 18:15:02 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 18:15:02 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=79b66d82

gen_funcs.sh: Move KCONFIG_MODIFIED_MARKER declaration to determine_real_args()

Since we moved $TEMP declaration to determine_real_args(), we also
need to move KCONFIG_MODIFIED_MARKER to determine_real_args().

Fixes 2cefc27 ("genkernel: Move --tempdir handling to determine_real_args()")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 2 ++
 gen_funcs.sh         | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index d3669b8..8f1efb6 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -396,6 +396,8 @@ determine_real_args() {
 
 	declare -gr GK_V_CACHEDIR="${CACHE_DIR}/${GK_V}"
 
+	declare -gr KCONFIG_MODIFIED_MARKER="${TEMP}/.kconfig_modified"
+
 	if [ -n "${CMD_CROSS_COMPILE}" ]
 	then
 		if ! isTrue "$(is_valid_triplet "${CMD_CROSS_COMPILE}")"

diff --git a/gen_funcs.sh b/gen_funcs.sh
index da9bc08..3f285e3 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1704,8 +1704,6 @@ kconfig_get_opt() {
 		-e "/^#\? \?${optname}[ =].*/{ s/.*${optname}[ =]//g; s/is not set\| +//g; p; q }"
 }
 
-KCONFIG_MODIFIED_MARKER="${TEMP}/.kconfig_modified"
-
 kconfig_set_opt() {
 	[[ ${#} -lt 3 ]] \
 		&& gen_die "$(get_useful_function_stack "${FUNCNAME}")Invalid usage of ${FUNCNAME}(): Function takes at least three arguments (${#} given)!"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     4c616f86aba11258042b20b82e86ef2a527806af
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 19:55:53 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 19:55:53 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4c616f86

genkernel: bump to v4.0.0_beta13

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 185c406..32d226e 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_beta12'
+GK_V='4.0.0_beta13'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     2140d6a1aa41efb34a3017e04eadbc4e17344010
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 14:48:32 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 14:48:32 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2140d6a1

genkernel: bump to v4.0.0_beta14

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 32d226e..9c58a9e 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_beta13'
+GK_V='4.0.0_beta14'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     f7b489829ebfeb93b52a75552c5f22cd00dc1fb3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 29 20:48:13 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Aug 29 20:48:13 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f7b48982

genkernel: bump to v4.0.0_beta15

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 9c58a9e..27e8273 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_beta14'
+GK_V='4.0.0_beta15'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     381b319cdee541dccf0180774acb3952ee60b281
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 16:08:38 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 16:08:38 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=381b319c

gen_funcs.sh: Import makeopts_jobs function from multiprocessing eclass

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 381c645..c3bcee6 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1853,5 +1853,25 @@ make_bootdir_writable() {
 	fi
 }
 
+# @FUNCTION: makeopts_jobs
+# @USAGE: [${MAKEOPTS}] [${inf:-999}]
+# @DESCRIPTION:
+# Searches the arguments (defaults to ${MAKEOPTS}) and extracts the jobs number
+# specified therein.  Useful for running non-make tools in parallel too.
+# i.e. if the user has MAKEOPTS=-j9, this will echo "9" -- we can't return the
+# number as bash normalizes it to [0, 255].  If the flags haven't specified a
+# -j flag, then "1" is shown as that is the default `make` uses.  Since there's
+# no way to represent infinity, we return ${inf} (defaults to 999) if the user
+# has -j without a number.
+makeopts_jobs() {
+	[[ $# -eq 0 ]] && set -- "${MAKEOPTS}"
+	# This assumes the first .* will be more greedy than the second .*
+	# since POSIX doesn't specify a non-greedy match (i.e. ".*?").
+	local jobs=$(echo " $* " | sed -r -n \
+		-e 's:.*[[:space:]](-[a-z]*j|--jobs[=[:space:]])[[:space:]]*([0-9]+).*:\2:p' \
+		-e "s:.*[[:space:]](-[a-z]*j|--jobs)[[:space:]].*:${2:-999}:p")
+	echo ${jobs:-1}
+}
+
 unset GK_DEFAULT_IFS
 declare -r GK_DEFAULT_IFS="${IFS}"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     9a057f02f055237593d0b29fcc9357786a659195
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 16:07:50 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 16:07:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9a057f02

gen_funcs.sh: Import gcc-* functions from toolchain eclass

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 3f285e3..381c645 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -321,6 +321,41 @@ kv_replace() {
 	var_replace "KV" "${KV}" "${1}"
 }
 
+# Internal func.  The first argument is the version info to expand.
+# Query the preprocessor to improve compatibility across different
+# compilers rather than maintaining a --version flag matrix. #335943
+_gcc_fullversion() {
+	local ver="$1"; shift
+	set -- $($(tc-getCPP "$@") -E -P - <<<"__GNUC__ __GNUC_MINOR__ __GNUC_PATCHLEVEL__")
+	eval echo "$ver"
+}
+
+# @FUNCTION: gcc-fullversion
+# @RETURN: compiler version (major.minor.micro: [3.4.6])
+gcc-fullversion() {
+	_gcc_fullversion '$1.$2.$3' "$@"
+}
+# @FUNCTION: gcc-version
+# @RETURN: compiler version (major.minor: [3.4].6)
+gcc-version() {
+	_gcc_fullversion '$1.$2' "$@"
+}
+# @FUNCTION: gcc-major-version
+# @RETURN: major compiler version (major: [3].4.6)
+gcc-major-version() {
+	_gcc_fullversion '$1' "$@"
+}
+# @FUNCTION: gcc-minor-version
+# @RETURN: minor compiler version (minor: 3.[4].6)
+gcc-minor-version() {
+	_gcc_fullversion '$2' "$@"
+}
+# @FUNCTION: gcc-micro-version
+# @RETURN: micro compiler version (micro: 3.4.[6])
+gcc-micro-version() {
+	_gcc_fullversion '$3' "$@"
+}
+
 gen_die() {
 	set +x
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     b7a262c626e1e969fcb6590e3ab3f2c628e849d0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 20:33:40 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Sep  1 20:33:40 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b7a262c6

genkernel: bump to v4.0.0_beta16

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 27e8273..7d0fad9 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_beta15'
+GK_V='4.0.0_beta16'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     7a7bbbc82fc8bf343d89dba9aa99086a582956c5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  8 12:46:03 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Sep  8 12:46:03 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7a7bbbc8

genkernel: bump to v4.0.0_beta17

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 7d0fad9..bb69a05 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_beta16'
+GK_V='4.0.0_beta17'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     8952a5286dd67de883700cb238b225849d7b1aa9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 16 21:28:59 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Sep 16 21:28:59 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8952a528

gen_funcs.sh: Add tc-getBUILD_CXX() function

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index f835220..9e7d573 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1096,6 +1096,10 @@ tc-getBUILD_CC() {
 	tc-getBUILD_PROG CC gcc "$@"
 }
 
+tc-getBUILD_CXX() {
+	tc-getBUILD_PROG CXX g++ "$@"
+}
+
 tc-getCC() {
 	tc-getPROG CC gcc "$@"
 }

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     3e58c7e7b88e19e1480c8bf2a0d2645e818f57ac
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 16 21:30:53 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Sep 16 21:30:53 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3e58c7e7

genkernel: bump to v4.0.0_beta18

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index bb69a05..8c95c7c 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_beta17'
+GK_V='4.0.0_beta18'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     4b896513136628bc6b038dff585ac39fc9e27f78
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 29 15:30:37 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 15:34:40 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4b896513

gen_determineargs.sh: determine_KV(): Define global KV_NUMERIC variable

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index db6ccf9..82ce4ed 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -74,6 +74,7 @@ determine_KV() {
 
 	KV_MAJOR=$(echo $KV | cut -f1 -d.)
 	KV_MINOR=$(echo $KV | cut -f2 -d.)
+	KV_NUMERIC=$((${KV_MAJOR} * 1000 + ${KV_MINOR}))
 
 	if [ -n "${old_KV}" -a "${KV}" != "${old_KV}" ]
 	then

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     ef914100a474196ddb27049fd95ce573ebc4805d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 29 15:07:14 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 15:34:23 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ef914100

gen_configkernel.sh: config_kernel(): Update --microcode kernel options handling

- Don't try to set CONFIG_MICROCODE_*EARLY for >= linux-4.4

- Check for CONFIG_MICROCODE_{AMD,INTEL} in sanity check

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 39 ++++++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 2ff983f..5a4b5ce 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -753,20 +753,29 @@ config_kernel() {
 	then
 		if isTrue "${KERNEL_SUPPORT_MICROCODE}"
 		then
+			local -a kconfigs_microcode
+			local -a kconfigs_microcode_amd
+			local -a kconfigs_microcode_intel
+
 			print_info 2 "$(get_indent 1)>> Ensure that required kernel options for early microcode loading support are set ..."
-			kconfig_microcode_intel=(CONFIG_MICROCODE_INTEL CONFIG_MICROCODE_INTEL_EARLY)
+			kconfigs_microcode+=( 'CONFIG_MICROCODE' )
+			kconfigs_microcode+=( 'CONFIG_MICROCODE_OLD_INTERFACE' )
+			[ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -le 4003 ] && kconfigs_microcode+=( 'CONFIG_MICROCODE_EARLY' )
 
-			kconfig_microcode_amd=(CONFIG_MICROCODE_AMD)
-			[ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -le 4003 ] && kconfig_microcode_amd+=(CONFIG_MICROCODE_AMD_EARLY)
+			# Intel
+			kconfigs_microcode_intel+=( 'CONFIG_MICROCODE_INTEL' )
+			[ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -le 4003 ] && kconfigs_microcode_intel+=( 'CONFIG_MICROCODE_INTEL_EARLY' )
 
-			kconfigs=(CONFIG_MICROCODE CONFIG_MICROCODE_OLD_INTERFACE)
-			[ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -le 4003 ] && kconfigs+=(CONFIG_MICROCODE_EARLY)
+			# AMD
+			kconfigs_microcode_amd=( 'CONFIG_MICROCODE_AMD' )
+			[ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -le 4003 ] && kconfigs_microcode_amd+=( 'CONFIG_MICROCODE_AMD_EARLY' )
 
-			[[ "$MICROCODE" == all ]] && kconfigs+=( ${kconfig_microcode_amd[@]} ${kconfig_microcode_intel[@]} )
-			[[ "$MICROCODE" == amd ]] && kconfigs+=( ${kconfig_microcode_amd[@]} )
-			[[ "$MICROCODE" == intel ]] && kconfigs+=( ${kconfig_microcode_intel[@]} )
+			[[ "${MICROCODE}" == all ]]   && kconfigs_microcode+=( ${kconfigs_microcode_amd[@]} ${kconfigs_microcode_intel[@]} )
+			[[ "${MICROCODE}" == amd ]]   && kconfigs_microcode+=( ${kconfigs_microcode_amd[@]} )
+			[[ "${MICROCODE}" == intel ]] && kconfigs_microcode+=( ${kconfigs_microcode_intel[@]} )
 
-			for k in "${kconfigs[@]}"
+			local k
+			for k in "${kconfigs_microcode[@]}"
 			do
 				local cfg=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "$k")
 				case "${cfg}" in
@@ -777,6 +786,18 @@ config_kernel() {
 			done
 
 			required_kernel_options+=( 'CONFIG_MICROCODE' )
+			case "${MICROCODE}" in
+				amd)
+					required_kernel_options+=( 'CONFIG_MICROCODE_AMD' )
+					;;
+				intel)
+					required_kernel_options+=( 'CONFIG_MICROCODE_INTEL' )
+					;;
+				all)
+					required_kernel_options+=( 'CONFIG_MICROCODE_AMD' )
+					required_kernel_options+=( 'CONFIG_MICROCODE_INTEL' )
+					;;
+			esac
 		else
 			print_info 1 "$(get_indent 1)>> Ignoring --microcode parameter; Architecture does not support microcode loading ..."
 		fi

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     cea37f350778e214bed8891be8b178e24e4820d0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  2 12:31:33 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Oct  2 12:31:33 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cea37f35

gen_determineargs.sh: determine_real_args(): Add --strip=<type> validation

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 5b43160..fdef153 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -698,6 +698,14 @@ determine_real_args() {
 
 	if isTrue "${BUILD_KERNEL}"
 	then
+		case "${CMD_STRIP_TYPE}" in
+			all|kernel|modules|none)
+				;;
+			*)
+				gen_die "Invalid strip type '${CMD_STRIP_TYPE}'; --strip=<type> requires one of: all, kernel, modules, none"
+				;;
+		esac
+
 		if isTrue "$(has_space_characters "${KERNEL_OUTPUTDIR}")"
 		then
 			# Kernel Makefile doesn't support spaces in outputdir path...

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     7bdd21625c16726a6fe229f17890cd53c104676c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 29 23:02:25 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 23:02:25 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7bdd2162

gen_funcs.sh: _tc-getPROG(): Quote type command argument

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 2fe88fb..23f6d30 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1068,7 +1068,7 @@ _tc-getPROG() {
 	fi
 
 	local search=
-	[[ -n ${tuple} ]] && search=$(type -p ${tuple}-${prog[0]})
+	[[ -n ${tuple} ]] && search=$(type -p "${tuple}-${prog[0]}")
 	[[ -n ${search} ]] && prog[0]=${search##*/}
 
 	export ${var}="${prog[*]}"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     b6a711fc8b667a9c6f198b79268385e9d20423f3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 29 15:32:37 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 15:34:41 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b6a711fc

gen_compile.sh: compile_kernel(): Use global KV_NUMERIC variable

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_compile.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index fb77e2b..c782f9b 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -274,7 +274,7 @@ compile_kernel() {
 		compile_generic "${KERNEL_MAKE_DIRECTIVE_2}" kernel
 	fi
 
-	if isTrue "${FIRMWARE_INSTALL}" && [ $((${KV_MAJOR} * 1000 + ${KV_MINOR})) -ge 4014 ]
+	if isTrue "${FIRMWARE_INSTALL}" && [ ${KV_NUMERIC} -ge 4014 ]
 	then
 		# Kernel v4.14 removed firmware from the kernel sources
 		print_warning 1 "$(get_indent 1)>> Linux v4.14 removed in-kernel firmware, you MUST install the sys-kernel/linux-firmware package!"
@@ -290,7 +290,7 @@ compile_kernel() {
 			[ "${INSTALL_FW_PATH}" != '' ] && export INSTALL_FW_PATH
 			MAKEOPTS="${MAKEOPTS} -j1" compile_generic "firmware_install" kernel
 		fi
-	elif [ $((${KV_MAJOR} * 1000 + ${KV_MINOR})) -lt 4014 ]
+	elif [ ${KV_NUMERIC} -lt 4014 ]
 	then
 		print_info 1 "$(get_indent 1)>> Skipping installation of bundled firmware due to --no-firmware-install ..."
 	fi

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     80cb0abc18d2ff9143f657c960eebd7aa082f61a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  2 12:29:14 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Oct  2 12:29:14 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=80cb0abc

gen_cmdline.sh: Move --bootloader validation to determine_real_args()

This will allow us to always validate set bootloader at a single place.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_cmdline.sh       | 7 -------
 gen_determineargs.sh | 8 ++++++++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index d74c8f8..825b80c 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -443,13 +443,6 @@ parse_cmdline() {
 		--bootloader=*)
 			CMD_BOOTLOADER="${*#*=}"
 			[ -z "${CMD_BOOTLOADER}" ] && CMD_BOOTLOADER="no"
-			case "${CMD_BOOTLOADER}" in
-				no|grub|grub2)
-					;;
-				*)
-					echo "Error: Bootloader '${CMD_BOOTLOADER}' is unsupported."
-					exit 1
-			esac
 			print_info 3 "CMD_BOOTLOADER: ${CMD_BOOTLOADER}"
 			;;
 		--no-bootloader)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 28590d3..5b43160 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -557,6 +557,14 @@ determine_real_args() {
 		fi
 	fi
 
+	case "${BOOTLOADER}" in
+		no|grub|grub2)
+			;;
+		*)
+			gen_die "Invalid bootloader '${BOOTLOADER}'; --bootloader=<bootloader> requires one of: no, grub, grub2"
+			;;
+	esac
+
 	if isTrue "${KERNEL_SOURCES}"
 	then
 		if [ ! -d ${KERNEL_DIR} ]

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     e73ff12ad96fd7ea5cb80561dae6418dbe855096
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 29 23:01:08 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 23:01:08 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e73ff12a

gen_funcs.sh: get_chost_libdir(): Don't quote tc-getCC() return value

This will allow user to set UTILS_CC="distcc gcc" for example.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 9e7d573..2fe88fb 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -792,7 +792,7 @@ debug_breakpoint() {
 get_chost_libdir() {
 	local cc=$(tc-getCC)
 
-	local test_file=$("${cc}" -print-file-name=libnss_files.so 2>/dev/null)
+	local test_file=$(${cc} -print-file-name=libnss_files.so 2>/dev/null)
 	if [ -z "${test_file}" ]
 	then
 		gen_die "$(get_useful_function_stack "${FUNCNAME}")Unable to determine CHOST's libdir: '${cc} -print-file-name=libnss_files.so' returned nothing!"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     e2cfd47d5ebb5fcf5b6673438e30d1802ebbdf37
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  2 12:33:16 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Oct  2 12:33:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e2cfd47d

gen_determineargs.sh: determine_real_args(): Normalize --microcode argument validation

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index fdef153..a27e980 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -826,11 +826,11 @@ determine_real_args() {
 	fi
 
 	MICROCODE=${MICROCODE,,}
-	case ${MICROCODE} in
+	case "${MICROCODE}" in
 		all|amd|intel) ;;
 		y|yes|1|true|t) MICROCODE='all' ;;
 		n|no|none|0|false|f) MICROCODE='' ;;
-		*) gen_die "Invalid microcode '${MICROCODE}', --microcode=<type> requires one of: no, all, intel, amd" ;;
+		*) gen_die "Invalid microcode '${MICROCODE}'; --microcode=<type> requires one of: no, all, intel, amd" ;;
 	esac
 
 	if isTrue "${BUILD_RAMDISK}"  && isTrue "${MICROCODE_INITRAMFS}" && [[ -z "${MICROCODE}" ]]

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     45503276b0e4233ad03dcf303fad2dc146862093
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 29 22:59:01 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 22:59:01 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=45503276

gen_determineargs.sh: determine_real_args(): Don't quote tc-getBUILD_CC() return value

This will allow user to set UTILS_CC="distcc gcc" for example.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 82ce4ed..f3cfedf 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -490,7 +490,7 @@ determine_real_args() {
 
 	# set CBUILD and CHOST
 	local build_cc=$(tc-getBUILD_CC)
-	CBUILD=$("${build_cc}" -dumpmachine 2>/dev/null)
+	CBUILD=$(${build_cc} -dumpmachine 2>/dev/null)
 	if [ -z "${CBUILD}" ]
 	then
 		gen_die "Failed to determine CBUILD using '${build_cc} -dumpmachine' command!"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     24365d81911373e036ca684f1bc47f7d4a253637
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  2 12:34:20 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Oct  2 14:43:00 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=24365d81

gen_funcs.sh: cleanup(): Try to kill all running child processes before cleanup

If genkernel was aborted, it maybe possible that child processes are still
running which maybe prevent cleanup.

With this commit, cleanup() will try to kill all running child processes.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index cfe53b9..0e7c5ba 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -438,6 +438,52 @@ setup_cache_dir() {
 }
 
 cleanup() {
+	# Child processes we maybe want to kill can only appear in
+	# current session
+	local session=$(ps -o sess= ${$} 2>/dev/null | awk '{ print $1 }')
+	if [ -n "${session}" ]
+	then
+		# Time to kill any still running child process.
+		# All our childs will have GK_SHARE environment variable set.
+		local -a killed_pids
+
+		local pid_to_kill=
+		while IFS= read -r -u 3 pid_to_kill
+		do
+			# Don't kill ourselves or we will trigger trap
+			[ "${pid_to_kill}" = "${BASHPID}" ] && continue
+
+			# Killing process group allows us to catch grandchilds
+			# with clean environment, too.
+			if kill -${pid_to_kill} &>/dev/null
+			then
+				killed_pids+=( ${pid_to_kill} )
+			fi
+		done 3< <(ps e -s ${session} 2>/dev/null | grep GK_SHARE= 2>/dev/null | awk '{ print $1 }')
+
+		if [ ${#killed_pids[@]} -gt 0 ]
+		then
+			# Be patient -- still running process could prevent cleanup!
+			sleep 3
+
+			# Add one valid pid so that ps command won't fail
+			killed_pids+=( ${BASHPID} )
+
+			killed_pids=$(IFS=,; echo "${killed_pids[*]}")
+
+			# Processes had enough time to gracefully terminate!
+			while IFS= read -r -u 3 pid_to_kill
+			do
+				# Don't kill ourselves or we will trigger trap
+				[ "${pid_to_kill}" = "${BASHPID}" ] && continue
+
+				kill -9 -${pid_to_kill} &>/dev/null
+			done 3< <(ps --no-headers -q ${killed_pids} 2>/dev/null | awk '{ print $1 }')
+		fi
+	else
+		print_warning 1 "Failed to determine session leader; Will not try to stop child processes"
+	fi
+
 	if isTrue "${CLEANUP}"
 	then
 		if [ -n "${TEMP}" -a -d "${TEMP}" ]

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     ad5d9a6e905e19b04822cc20cc00267379c6e27a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 29 15:33:20 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 15:34:41 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ad5d9a6e

gen_configkernel.sh: config_kernel(): Use global KV_NUMERIC variable

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 5a4b5ce..bde9fc5 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -581,7 +581,7 @@ config_kernel() {
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_NET" "${cfg_CONFIG_HYPERV}" \
 			&& required_kernel_options+=( 'CONFIG_HYPERV_NET' )
 
-		if [ $((${KV_MAJOR} * 1000 + ${KV_MINOR})) -ge 4014 ]
+		if [ ${KV_NUMERIC} -ge 4014 ]
 		then
 			local cfg_CONFIG_VSOCKETS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VSOCKETS")
 			case "${cfg_CONFIG_VSOCKETS}" in
@@ -595,16 +595,16 @@ config_kernel() {
 
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_KEYBOARD" "${cfg_CONFIG_HYPERV}"
 
-		[ $((${KV_MAJOR} * 1000 + ${KV_MINOR})) -ge 4006 ] &&
+		[ ${KV_NUMERIC} -ge 4006 ] &&
 			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_PCI_HYPERV" "${cfg_CONFIG_HYPERV}"
 
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB_HYPERV" "${cfg_CONFIG_HYPERV}"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HID_HYPERV_MOUSE" "${cfg_CONFIG_HYPERV}"
 
-		[ $((${KV_MAJOR} * 1000 + ${KV_MINOR})) -ge 4010 ] &&
+		[ ${KV_NUMERIC} -ge 4010 ] &&
 			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_UIO_HV_GENERIC" "${cfg_CONFIG_HYPERV}"
 
-		[ $((${KV_MAJOR} * 1000 + ${KV_MINOR})) -ge 4012 ] &&
+		[ ${KV_NUMERIC} -ge 4012 ] &&
 			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_TSCPAGE" "y"
 	fi
 
@@ -677,7 +677,7 @@ config_kernel() {
 		esac
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VHOST_NET" "${cfg_CONFIG_VHOST_NET}"
 
-		if [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4006 ]
+		if [ ${KV_NUMERIC} -ge 4006 ]
 		then
 			local cfg_CONFIG_FW_CFG_SYSFS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FW_CFG_SYSFS")
 			case "${cfg_CONFIG_FW_CFG_SYSFS}" in
@@ -717,7 +717,7 @@ config_kernel() {
 			&& required_kernel_options+=( 'CONFIG_VIRTIO_NET' )
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_PCI" "${newvirtio_setting}"
 
-		if [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4011 ]
+		if [ ${KV_NUMERIC} -ge 4011 ]
 		then
 			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_BLK_SCSI" "y"
 			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_MQ_VIRTIO" "y"
@@ -731,7 +731,7 @@ config_kernel() {
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_MMIO" "${newvirtio_setting}"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES" "y"
 
-		if [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4008 ]
+		if [ ${KV_NUMERIC} -ge 4008 ]
 		then
 			local cfg_CONFIG_VSOCKETS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VSOCKETS")
 			case "${cfg_CONFIG_VSOCKETS}" in
@@ -744,7 +744,7 @@ config_kernel() {
 			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_VSOCKETS_COMMON" "${newvirtio_setting}"
 		fi
 
-		[ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4010 ] &&
+		[ ${KV_NUMERIC} -ge 4010 ] &&
 			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_DEV_VIRTIO" "${newvirtio_setting}"
 	fi
 
@@ -760,15 +760,15 @@ config_kernel() {
 			print_info 2 "$(get_indent 1)>> Ensure that required kernel options for early microcode loading support are set ..."
 			kconfigs_microcode+=( 'CONFIG_MICROCODE' )
 			kconfigs_microcode+=( 'CONFIG_MICROCODE_OLD_INTERFACE' )
-			[ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -le 4003 ] && kconfigs_microcode+=( 'CONFIG_MICROCODE_EARLY' )
+			[ ${KV_NUMERIC} -le 4003 ] && kconfigs_microcode+=( 'CONFIG_MICROCODE_EARLY' )
 
 			# Intel
 			kconfigs_microcode_intel+=( 'CONFIG_MICROCODE_INTEL' )
-			[ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -le 4003 ] && kconfigs_microcode_intel+=( 'CONFIG_MICROCODE_INTEL_EARLY' )
+			[ ${KV_NUMERIC} -le 4003 ] && kconfigs_microcode_intel+=( 'CONFIG_MICROCODE_INTEL_EARLY' )
 
 			# AMD
 			kconfigs_microcode_amd=( 'CONFIG_MICROCODE_AMD' )
-			[ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -le 4003 ] && kconfigs_microcode_amd+=( 'CONFIG_MICROCODE_AMD_EARLY' )
+			[ ${KV_NUMERIC} -le 4003 ] && kconfigs_microcode_amd+=( 'CONFIG_MICROCODE_AMD_EARLY' )
 
 			[[ "${MICROCODE}" == all ]]   && kconfigs_microcode+=( ${kconfigs_microcode_amd[@]} ${kconfigs_microcode_intel[@]} )
 			[[ "${MICROCODE}" == amd ]]   && kconfigs_microcode+=( ${kconfigs_microcode_amd[@]} )

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     17e112fcedaa5bd5f5c5a8e573bd3fe8dc08879d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  2 12:30:18 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Oct  2 12:30:18 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=17e112fc

gen_cmdline.sh: parse_cmdline(): Fix --strip argument parsing

Closes: https://bugs.gentoo.org/696056
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_cmdline.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 825b80c..fa8a7c3 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -805,7 +805,7 @@ parse_cmdline() {
 			print_info 3 "CMD_NICE: ${CMD_NICE}"
 			;;
 		--strip=*)
-			CMD_STRIP_TYPE=$(parse_opt "$*")
+			CMD_STRIP_TYPE="${*#*=}"
 			print_info 3 "CMD_STRIP_TYPE: ${CMD_STRIP_TYPE}"
 			;;
 		--no-strip)

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     69a58433c0f77a221a142317b2f6e4013aca29f4
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  4 12:46:14 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Oct  4 12:46:14 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=69a58433

genkernel: bump to v4.0.0_beta19

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 8c95c7c..408bca4 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_beta18'
+GK_V='4.0.0_beta19'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     f5e265631ec86909edbbd712947af1f5c933e789
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  9 16:58:54 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Oct  9 16:58:54 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f5e26563

gen_funcs.sh: check_disk_space_requirements(): Fix error message

Fixes 467c2e82 ("Add feature to check for free disk space early at genkernel start")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 0e7c5ba..8a8c490 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1720,7 +1720,7 @@ check_disk_space_requirements() {
 			available_free_disk_space=${available_free_disk_space%M}
 			if [ ${available_free_disk_space} -lt ${CHECK_FREE_DISK_SPACE_KERNELOUTPUTDIR} ]
 			then
-				gen_die "${CHECK_FREE_DISK_SPACE_KERNELOUTPUTDIR} MB free disk space is required in '${BOOTDIR}' but only ${available_free_disk_space} MB is available!"
+				gen_die "${CHECK_FREE_DISK_SPACE_KERNELOUTPUTDIR} MB free disk space is required in '${KERNEL_OUTPUTDIR}' but only ${available_free_disk_space} MB is available!"
 			fi
 		else
 			print_warning 1 "Invalid df value; Skipping free disk space check for '${KERNEL_OUTPUTDIR}' ..."

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     efca47ff5dfb0cb66ac58e3cf1f1b8207c98843c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 03:55:32 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 14:13:03 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=efca47ff

gen_bootloader.sh: set_bootloader_grub_duplicate_default(): Fix code style

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_bootloader.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index 5202047..9178d00 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -157,7 +157,8 @@ set_bootloader_grub_duplicate_default() {
 
 	# Find default entry
 	default=$(sed -rn '/^[[:space:]]*default[[:space:]=]/s/^.*default[[:space:]=]+([[:alnum:]]+).*$/\1/p' "${GRUB_CONF}")
-    if [ -z "${default}" ]; then
+	if [ -z "${default}" ]
+	then
 		print_warning 1 "No default entry found; Assuming 0 ..."
 		default=0
 	fi

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     6b4d839cd9febc3d8e9f4f666512aedab63c870b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 14:18:52 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 14:18:52 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6b4d839c

gen_determineargs.sh: determine_real_args(): Check early if ZFS is installed

This will allow us to error out early if ZFS is missing but was
requested.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index cf76ee2..dbb61c4 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -749,11 +749,21 @@ determine_real_args() {
 			fi
 		fi
 
-		if isTrue "${ZFS}" && isTrue "$(tc-is-cross-compiler)"
+		if isTrue "${ZFS}"
 		then
-			local error_msg="Using binpkg for ZFS is not supported."
-			error_msg+=" Therefore we cannot cross-compile like requested!"
-			gen_die "${error_msg}"
+			if isTrue "$(tc-is-cross-compiler)"
+			then
+				local error_msg="Using binpkg for ZFS is not supported."
+				error_msg+=" Therefore we cannot cross-compile like requested!"
+				gen_die "${error_msg}"
+			fi
+
+			if [ ! -x "/sbin/zfs" ]
+			then
+				local error_msg="'/sbin/zfs' is required for --zfs but file does not exist or is not executable!"
+				error_msg+=" Is sys-fs/zfs installed?"
+				gen_die "${error_msg}"
+			fi
 		fi
 
 		if isTrue "${MULTIPATH}"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     58a1e94ff67926279afbb644fd7c2083e77d0705
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 04:02:23 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 14:13:03 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=58a1e94f

genkernel: bump to v4.0.0_beta20

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 408bca4..a25fc31 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_beta19'
+GK_V='4.0.0_beta20'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     e3ae3cac3825f290b2eca2f7e7d85c235e3e8d4e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 04:00:44 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 14:13:03 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e3ae3cac

gen_bootloader.sh: Recognize set kernel/initramfs name for grub legacy

Fixes 769a07fd ("Make initramfs and kernel filename customizable")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_bootloader.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index 9178d00..68eb721 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -129,14 +129,14 @@ set_bootloader_grub() {
 }
 
 set_bootloader_grub_duplicate_default_replace_kernel_initrd() {
-	sed -r -e "/^[[:space:]]*kernel/s/kernel-[[:alnum:][:punct:]]+/${GK_FILENAME_KERNEL}/" - |
-	sed -r -e "/^[[:space:]]*initrd/s/init(rd|ramfs)-[[:alnum:][:punct:]]+/${GK_FILENAME_INITRAMFS}/"
+	sed -r -e "s/(^[[:space:]]*kernel[[:space:]=]*\/)(${GK_FILENAME_KERNEL%%-*}|${GK_FILENAME_KERNEL_SYMLINK%%-*}|kernel)(-[[:alnum:][:punct:]]+)?/\1${GK_FILENAME_KERNEL}/" - |
+	sed -r -e "s/(^[[:space:]]*initrd[[:space:]=]*\/)(${GK_FILENAME_INITRAMFS%%-*}|${GK_FILENAME_INITRAMFS_SYMLINK%%-*}|initrd|initramfs)(-[[:alnum:][:punct:]]+)?/\1${GK_FILENAME_INITRAMFS}/"
 }
 
 set_bootloader_grub_check_for_existing_entry() {
 	local GRUB_CONF=$1
-	if grep -q "^[[:space:]]*kernel[[:space:]=]*.*/${GK_FILENAME_KERNEL}\([[:space:]]\|$\)" "${GRUB_CONF}" &&
-		grep -q "^[[:space:]]*initrd[[:space:]=]*.*/${GK_FILENAME_INITRAMFS}\([[:space:]]\|$\)" "${GRUB_CONF}"
+	if grep -q "^[[:space:]]*kernel[[:space:]=]*/${GK_FILENAME_KERNEL}\([[:space:]]\|$\)" "${GRUB_CONF}" &&
+		grep -q "^[[:space:]]*initrd[[:space:]=]*/${GK_FILENAME_INITRAMFS}\([[:space:]]\|$\)" "${GRUB_CONF}"
 	then
 		return 0
 	fi

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     82aa560de768b7ce8a974efd304fccc19255fc5c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 19 15:40:04 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:15 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=82aa560d

genkernel: bump to v4.0.0_rc1

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index a25fc31..88dba56 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_beta20'
+GK_V='4.0.0_rc1'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     53aaf284ba9ee180cf35a762ec50d695d224b0a0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 19 16:36:00 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:15 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=53aaf284

gen_determineargs.sh: determine_real_args(): Log when --no-clean forces --no-mrproper

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index c939fc9..5bbe33f 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -374,6 +374,17 @@ determine_real_args() {
 	set_config_with_override BOOL   INSTALL                               CMD_INSTALL                               "yes"
 	set_config_with_override BOOL   CLEANUP                               CMD_CLEANUP                               "yes"
 
+	# Special case:  If --no-clean is specified on the command line,
+	# imply --no-mrproper.
+	if ! isTrue "${CLEAN}"
+	then
+		if isTrue "${MRPROPER}"
+		then
+			print_info 5 "  MRPROPER forced to \"no\" due to --no-clean."
+			MRPROPER="no"
+		fi
+	fi
+
 	# We need to expand and normalize provided $KERNEL_DIR and
 	# we need to do it early because $KERNEL_OUTPUTDIR will be
 	# set to $KERNEL_DIR by default.
@@ -636,16 +647,6 @@ determine_real_args() {
 		fi
 	fi
 
-	# Special case:  If --no-clean is specified on the command line,
-	# imply --no-mrproper.
-	if [ "${CMD_CLEAN}" != '' ]
-	then
-		if ! isTrue "${CLEAN}"
-		then
-			MRPROPER="no"
-		fi
-	fi
-
 	local need_tar=no
 
 	if [ -n "${MINKERNPACKAGE}" ]

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     3f7ea7ec1854367ecddb9057e3491fd63fba8479
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 18:42:13 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:15 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3f7ea7ec

TODO: Update

genkernel.conf should now contain all options.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 TODO | 1 -
 1 file changed, 1 deletion(-)

diff --git a/TODO b/TODO
index a672c07..00e1208 100644
--- a/TODO
+++ b/TODO
@@ -7,7 +7,6 @@
 - Move main config to /etc/genkernel
 - Refactor code to be more simple and extendable
 - Fix all TODO sections in the code
-- Add all options to genkernel.conf
 - Add "include" options to genkernel.conf
 - Allow for architecture-specific or module-specific files to override defaults
 - Create hooks for various points in the build/install phases for modules

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     9db8c8c0e64be497bc579122e3344b0fee7dc302
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 23:51:00 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9db8c8c0

genkernel: Check for [z]grep

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/genkernel b/genkernel
index 88dba56..7cf8f15 100755
--- a/genkernel
+++ b/genkernel
@@ -106,6 +106,16 @@ print_info 1 "Using genkernel configuration from '${_GENKERNEL_CONF}' ..."
 unset _GENKERNEL_CONF
 print_info 1 "Running with options: ${GK_OPTIONS}"
 
+if ! hash grep &>/dev/null
+then
+	gen_die "grep not found. Is sys-apps/grep installed?"
+fi
+
+if ! hash zgrep &>/dev/null
+then
+	print_warning 1 "zgrep not found. Is app-arch/gzip installed? You will be unable to use compressed config files!"
+fi
+
 # Save any customizations of MODULES_* first.
 override_module_vars="$(compgen -A variable |grep '^MODULES_')"
 for v in ${override_module_vars}

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     54a1de904fbff716e7c513d31e07064a499d4512
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 14:38:51 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=54a1de90

gen_configkernel.sh: config_kernel(): Ensure that required kernel options for --mdadm are set

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 6141ba6..7dbcadd 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -340,6 +340,29 @@ config_kernel() {
 			&& required_kernel_options+=( 'CONFIG_BCACHE' )
 	fi
 
+	# Make sure all modues required for MD raid are enabled in the kernel, if --mdadm
+	if isTrue "${CMD_MDADM}"
+	then
+		print_info 2 "$(get_indent 1)>> Ensure that required kernel options for MDADM support are set ..."
+		local cfg_CONFIG_BLK_DEV_MD=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_MD")
+		case "${cfg_CONFIG_BLK_DEV_MD}" in
+			y|m) ;; # Do nothing
+			*) cfg_CONFIG_BLK_DEV_MD=${newcfg_setting}
+		esac
+
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLOCK" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MD" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}" \
+			&& required_kernel_options+=( 'CONFIG_BLK_DEV_DM' )
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_MD" "${cfg_CONFIG_BLK_DEV_MD}" \
+			&& required_kernel_options+=( 'CONFIG_BLK_DEV_MD' )
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MD_LINEAR" "${cfg_CONFIG_BLK_DEV_MD}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MD_RAID0" "${cfg_CONFIG_BLK_DEV_MD}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MD_RAID1" "${cfg_CONFIG_BLK_DEV_MD}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MD_RAID10" "${cfg_CONFIG_BLK_DEV_MD}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MD_RAID456" "${cfg_CONFIG_BLK_DEV_MD}"
+	fi
+
 	# Make sure lvm modules are enabled in the kernel, if --lvm
 	if isTrue "${CMD_LVM}"
 	then

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     736907c35093ddcb866b55811e127a12988e0a8d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 14:05:42 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=736907c3

README: Update

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 README | 41 +++++++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/README b/README
index c202a54..1df4231 100644
--- a/README
+++ b/README
@@ -1,30 +1,45 @@
 # $Id$
 
+GENERAL CONCEPT:
+Genkernel's primary job is to bring up only the basic stuff needed
+to mount your (block) device containing the root filesystem so that
+we can hand off control to real system as soon as possible.
+
+It's _not_ genkernel's goal to load all available modules, to start
+all available devices, to unlock additional volumes, to start network
+or do other fancy stuff. So don't forget to set up your normal boot
+services so that the real system can finish boot and do all of the
+things mentioned above.
+
 DEPENDENCIES:
   - GCC and binutils
   - GNU Bash
   - PaX Utilities
+  - Autoconf and Automake
 
 USAGE:
-  See http://www.gentoo.org/doc/en/genkernel.xml or
+  See https://wiki.gentoo.org/wiki/Genkernel or
   issue ``genkernel --help''.
 
 PORTING:
   To port to other arches:
 
   # cd /usr/share/genkernel
-  # cp -Rp x86 ${myarch}
-  # mkdir /usr/share/genkernel/pkg/${myarch}
+  # cp -Rp x86_64 ${myarch}
 
   Modify what is needed in the /usr/share/genkernel/${myarch}
   directory, as well making a generic kernel-config.
 
+  Check determine_real_args() function in gen_determineargs.sh
+  if you need to add anything like support for your architecture's
+  GCC triplet or mapping to kernel's arch.
+
 IMPORTANT KERNEL NOTES:
   - You MUST have /dev/pts turned on.
   - To boot genkernel properly, the kernel config must have
     Initial RAM disk support.
 
-BOOTING A KERNEL WITH INITRD:
+BOOTING A KERNEL WITH INITRAMFS:
 
   GRUB:
     root=	needs to point to your root partition
@@ -32,8 +47,18 @@ BOOTING A KERNEL WITH INITRD:
     		1024x768 - 16bpp and you'll get a pretty splash if
     		configured properly
 
-  GRUB EXAMPLE ENTRY:
-    title=2.6.0 [ Genkernel ]
+  GRUB 1.x EXAMPLE ENTRY:
+    title Gentoo Linux
     root (hd0,0)
-    kernel (hd0,0)/boot/kernel-2.6.0-gentoo root=/dev/hda3 vga=0x317
-    initrd (hd0,0)/boot/initrd-2.6.0-gentoo
+    kernel /vmlinuz-5.4.2-gentoo-x86_64 root=/dev/sda1 vga=0x791
+    initrd /initramfs-5.4.2-gentoo-x86_64.img
+
+  EXTLINUX (SYSLINUX) EXAMPLE ENTRY:
+    LABEL genkernel-latest
+        MENU LABEL Gentoo Linux (latest)
+        LINUX /kernel
+        INITRD /initramfs
+        APPEND dolvm crypt_root=UUID=a8c5be51-bd1b-4446-a430-1d0ed576fa73 root=UUID=a2e5968c-5917-41ef-bf81-edffd54c8abd rootfs=ext4 root_trim=yes dosshd
+
+  NOTE: The example above uses genkernel's --symlink feature and
+        initramfs was built with --lvm, --luks and --ssh.

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     37a03fdddce73e91dab7c4794fd43baaf94059bb
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 13:44:00 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:17 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=37a03fdd

genkernel: Cleanup newvar

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 7cf8f15..303eba0 100755
--- a/genkernel
+++ b/genkernel
@@ -167,7 +167,7 @@ do
 	print_info 2 "Override $v, default (${!v}), new value (${!newvar})"
 	eval "${v}='${!newvar}'"
 done
-unset v override_module_vars
+unset v override_module_vars newvar
 
 # Merge additional modules_load from config
 for group_modules in ${!AMODULES_*}

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     547207d7db8c6ab5418cb09b6da3afbed0b6e146
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 21 00:00:45 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=547207d7

gen_compile.sh: determine_busybox_config_file(): Move --busybox-config validation to determine_real_args()

This will allow us to fail early.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_compile.sh       | 83 ++++++++++++++++++++--------------------------------
 gen_determineargs.sh | 19 ++++++++++++
 2 files changed, 50 insertions(+), 52 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index c782f9b..9c6b6f0 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -342,68 +342,47 @@ compile_kernel() {
 }
 
 determine_busybox_config_file() {
-	print_info 2 "$(get_indent 2)busybox: >> Checking for suitable busybox configuration ..."
-
-	if [ -n "${CMD_BUSYBOX_CONFIG}" ]
+	if [ -n "${BUSYBOX_CONFIG}" ]
 	then
-		BUSYBOX_CONFIG=$(expand_file "${CMD_BUSYBOX_CONFIG}")
-		if [ -z "${BUSYBOX_CONFIG}" ]
-		then
-			error_msg="No busybox .config: Cannot use '${CMD_BUSYBOX_CONFIG}' value. "
-			error_msg+="Check --busybox-config value or unset "
-			error_msg+="to use default busybox config provided by genkernel."
-			gen_die "${error_msg}"
-		fi
-	else
-		local -a bbconfig_candidates=()
-		local busybox_version=$(get_gkpkg_version busybox)
+		print_info 2 "$(get_indent 2)busybox: >> Using user-specified busybox configuration from '${BUSYBOX_CONFIG}' ..."
+		return
+	fi
 
-		if isTrue "${NETBOOT}"
-		then
-			bbconfig_candidates+=( "$(arch_replace "${GK_SHARE}/arch/%%ARCH%%/netboot-busy-config-${busybox_version}")" )
-			bbconfig_candidates+=( "$(arch_replace "${GK_SHARE}/arch/%%ARCH%%/netboot-busy-config")" )
-			bbconfig_candidates+=( "${GK_SHARE}/netboot/busy-config-${busybox_version}" )
-			bbconfig_candidates+=( "${GK_SHARE}/netboot/busy-config" )
-		fi
-		bbconfig_candidates+=( "$(arch_replace "${GK_SHARE}/arch/%%ARCH%%/busy-config-${busybox_version}")" )
-		bbconfig_candidates+=( "$(arch_replace "${GK_SHARE}/arch/%%ARCH%%/busy-config")" )
-		bbconfig_candidates+=( "${GK_SHARE}/defaults/busy-config-${busybox_version}" )
-		bbconfig_candidates+=( "${GK_SHARE}/defaults/busy-config" )
+	print_info 2 "$(get_indent 2)busybox: >> Checking for suitable busybox configuration ..."
 
-		local f
-		for f in "${bbconfig_candidates[@]}"
-		do
-			[ -z "${f}" ] && continue
+	local -a bbconfig_candidates=()
+	local busybox_version=$(get_gkpkg_version busybox)
 
-			if [ -f "${f}" ]
-			then
-				BUSYBOX_CONFIG="$f"
-				break
-			else
-				print_info 3 "$(get_indent 3)- '${f}' not found; Skipping ..."
-			fi
-		done
-
-		if [ -z "${BUSYBOX_CONFIG}" ]
-		then
-			gen_die 'No busybox .config specified, or file not found!'
-		fi
+	if isTrue "${NETBOOT}"
+	then
+		bbconfig_candidates+=( "$(arch_replace "${GK_SHARE}/arch/%%ARCH%%/netboot-busy-config-${busybox_version}")" )
+		bbconfig_candidates+=( "$(arch_replace "${GK_SHARE}/arch/%%ARCH%%/netboot-busy-config")" )
+		bbconfig_candidates+=( "${GK_SHARE}/netboot/busy-config-${busybox_version}" )
+		bbconfig_candidates+=( "${GK_SHARE}/netboot/busy-config" )
 	fi
+	bbconfig_candidates+=( "$(arch_replace "${GK_SHARE}/arch/%%ARCH%%/busy-config-${busybox_version}")" )
+	bbconfig_candidates+=( "$(arch_replace "${GK_SHARE}/arch/%%ARCH%%/busy-config")" )
+	bbconfig_candidates+=( "${GK_SHARE}/defaults/busy-config-${busybox_version}" )
+	bbconfig_candidates+=( "${GK_SHARE}/defaults/busy-config" )
 
-	BUSYBOX_CONFIG="$(readlink -f "${BUSYBOX_CONFIG}")"
+	local f
+	for f in "${bbconfig_candidates[@]}"
+	do
+		[ -z "${f}" ] && continue
 
-	# Validate the symlink result if any
-	if [ -z "${BUSYBOX_CONFIG}" -o ! -f "${BUSYBOX_CONFIG}" ]
-	then
-		if [ -n "${CMD_BUSYBOX_CONFIG}" ]
+		if [ -f "${f}" ]
 		then
-			error_msg="No busybox .config: File '${CMD_BUSYBOX_CONFIG}' not found! "
-			error_msg+="Check --busybox-config value or unset "
-			error_msg+="to use default busybox config provided by genkernel."
-			gen_die "${error_msg}"
+			BUSYBOX_CONFIG="$f"
+			break
 		else
-			gen_die "No busybox .config: symlinked file '${BUSYBOX_CONFIG}' not found!"
+			print_info 3 "$(get_indent 3)- '${f}' not found; Skipping ..."
 		fi
+	done
+
+	if [ -z "${BUSYBOX_CONFIG}" ]
+	then
+		# Sanity check
+		gen_die 'No busybox .config specified or file not found!'
 	fi
 }
 

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 5bbe33f..2b68a8a 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -923,6 +923,25 @@ determine_real_args() {
 				fi
 			done
 			unset FEATURE_REQUIRING_BUSYBOX FEATURES_REQUIRING_BUSYBOX
+		elif [ -n "${CMD_BUSYBOX_CONFIG}" ]
+		then
+			local BUSYBOX_CONFIG=$(expand_file "${CMD_BUSYBOX_CONFIG}")
+			if [ -z "${BUSYBOX_CONFIG}" ]
+			then
+				gen_die "--busybox-config value '${CMD_BUSYBOX_CONFIG}' failed to expand!"
+			elif [ ! -e "${BUSYBOX_CONFIG}" ]
+			then
+				gen_die "--busybox-config file '${BUSYBOX_CONFIG}' does not exist!"
+			fi
+
+			if ! grep -qE '^CONFIG_.*=' "${BUSYBOX_CONFIG}" &>/dev/null
+			then
+				gen_die "--busybox-config file '${BUSYBOX_CONFIG}' does not look like a valid busybox config: File does not contain any CONFIG_* value!"
+			elif ! grep -qE '^CONFIG_STATIC=y$' "${BUSYBOX_CONFIG}" &>/dev/null
+			then
+				# We cannot check all required options but check at least for CONFIG_STATIC...
+				gen_die "--busybox-config file '${BUSYBOX_CONFIG}' does not contain CONFIG_STATIC=y. This busybox config will not work with genkernel!"
+			fi
 		fi
 
 		DU_COMMAND="$(which du 2>/dev/null)"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     3a863efe8b0542d0202f6fd8d2d863eb2aa96b82
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 17:43:45 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Nov 26 17:43:45 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3a863efe

genkernel: bump to v4.0.0_rc2

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 303eba0..1c921ff 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_rc1'
+GK_V='4.0.0_rc2'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     5ff51e78f1849daa446ebfd2da6844e874926b4d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 14:39:37 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 16:18:57 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5ff51e78

gen_determineargs.sh: determine_real_args(): Cleanup old code

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 2b68a8a..6326a5e 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -785,10 +785,8 @@ determine_real_args() {
 		fi
 	fi
 
-	if ! isTrue "${BUILD_RAMDISK}"
+	if isTrue "${BUILD_RAMDISK}"
 	then
-		INTEGRATED_INITRAMFS=0
-	else
 		if [[ "${CMD_BOOTFONT}" != "none" ]]
 		then
 			if [[ "${CMD_BOOTFONT}" == "current" ]]

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     675e5bf8efaefc2769c74dd2576f49ac5dc6437d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 15:23:23 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 16:18:57 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=675e5bf8

gen_determineargs.sh: determine_real_args(): Create kernel module group for additional modules

This is needed to get modules, used by genkernel features,
like bcache module which is used by "dobcache" feature,
into initramfs.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 9 +++++++++
 gen_moddeps.sh       | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 6326a5e..a5bebd5 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -787,6 +787,10 @@ determine_real_args() {
 
 	if isTrue "${BUILD_RAMDISK}"
 	then
+		# Internal module group to get modules used in genkernel features
+		# into initramfs.
+		GK_INITRAMFS_ADDITIONAL_KMODULES=""
+
 		if [[ "${CMD_BOOTFONT}" != "none" ]]
 		then
 			if [[ "${CMD_BOOTFONT}" == "current" ]]
@@ -851,6 +855,11 @@ determine_real_args() {
 			fi
 		fi
 
+		if isTrue "${BCACHE}"
+		then
+			GK_INITRAMFS_ADDITIONAL_KMODULES+=" bcache"
+		fi
+
 		if isTrue "${ZFS}"
 		then
 			if isTrue "$(tc-is-cross-compiler)"

diff --git a/gen_moddeps.sh b/gen_moddeps.sh
index 1664c33..5e6c980 100755
--- a/gen_moddeps.sh
+++ b/gen_moddeps.sh
@@ -9,7 +9,7 @@ gen_dep_list() {
 		rm -f "${TEMP}/moddeps" >/dev/null
 
 		local group_modules
-		for group_modules in ${!MODULES_*}
+		for group_modules in ${!MODULES_*} GK_INITRAMFS_ADDITIONAL_KMODULES
 		do
 			gen_deps ${!group_modules}
 		done

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     fb6d542359d66bb820b1e7b0f6c524c452dec551
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 19:36:19 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 19:36:19 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fb6d5423

genkernel: bump to v4.0.0_rc3

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 1c921ff..c1b49df 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_rc2'
+GK_V='4.0.0_rc3'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     e1cc1a18a5e3202394cd579eaa6230b5750d84f4
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  4 15:33:22 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Dec  4 15:33:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e1cc1a18

gen_determineargs.sh: determine_real_args(): Adjust authorized_keys file validation

Using "-s" is not enough, file could be a directory. Better check for
content!

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 9e46576..0fd24d5 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -847,9 +847,9 @@ determine_real_args() {
 			elif [ ! -e "${ssh_authorized_keys_file}" ]
 			then
 				gen_die "authorized_keys file '${ssh_authorized_keys_file}' does not exist!"
-			elif [ ! -s "${ssh_authorized_keys_file}" ]
+			elif ! grep -qE '^(ecdsa|ssh)-' "${ssh_authorized_keys_file}" &>/dev/null
 			then
-				gen_die "authorized_keys file '${ssh_authorized_keys_file}' is empty!"
+				gen_die "authorized_keys file '${ssh_authorized_keys_file}' does not look like a valid authorized_keys file: File does not contain any entry matching regular expression '^(ecdsa|ssh)-'!"
 			else
 				declare -gr DROPBEAR_AUTHORIZED_KEYS_FILE="${ssh_authorized_keys_file}"
 			fi

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     6aed9147207be0b96e49d52605397a2fc594ec27
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  4 15:33:48 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Dec  4 15:33:48 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6aed9147

gen_determineargs.sh: determine_real_args(): Fix /etc/multipath.conf check

Using "-s" is not enough, file could be a directory.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 0fd24d5..952b31e 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -900,9 +900,12 @@ determine_real_args() {
 				gen_die "${error_msg}"
 			fi
 
-			if [ ! -s "/etc/multipath.conf" ]
+			if [ ! -e "/etc/multipath.conf" ]
 			then
-				gen_die "'/etc/multipath.conf' is required for --multipath but file does not exist or is empty!"
+				gen_die "'/etc/multipath.conf' is required for --multipath but file does not exist!"
+			elif [[ -d "/etc/multipath.conf" || ! -s "/etc/multipath.conf" ]]
+			then
+				gen_die "'/etc/multipath.conf' is required for --multipath but it is either not a file or is empty!"
 			fi
 		fi
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     a4df7d5f1665151deda4b13beb9e09dfd2e7ee4d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  5 23:55:20 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Dec  5 23:55:20 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a4df7d5f

genkernel: bump to v4.0.0

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index c1b49df..d26b377 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0_rc3'
+GK_V='4.0.0'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     a611a39cabab9836b51d1fc4326c3747cbdcd29a
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  6 15:23:51 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Dec  6 15:25:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a611a39c

Improve SELinux compatibility

Closes: https://bugs.gentoo.org/697074
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 107f02b..f5dd0cd 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -728,7 +728,7 @@ dropbear_create_key() {
 
 	if isTrue "${SANDBOX}"
 	then
-		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}'" )
+		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}:/proc/thread-self/attr/fscreate'" )
 	fi
 
 	# set up worker signal handler
@@ -805,7 +805,7 @@ dropbear_generate_key_info_file() {
 
 	if isTrue "${SANDBOX}"
 	then
-		envvars+=( SANDBOX_WRITE="${LOGFILE}:${TEMP}" )
+		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}:/proc/thread-self/attr/fscreate'" )
 	fi
 
 	# set up worker signal handler
@@ -1397,7 +1397,7 @@ gkbuild() {
 
 	if isTrue "${SANDBOX}"
 	then
-		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}'" )
+		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}:/proc/thread-self/attr/fscreate'" )
 	fi
 
 	# set up gkbuild signal handler
@@ -1452,7 +1452,7 @@ unpack() {
 
 	if isTrue "${SANDBOX}"
 	then
-		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}'" )
+		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}:/proc/thread-self/attr/fscreate'" )
 	fi
 
 	# set up unpack signal handler

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     3f4aae37f864f233981ea45d2069eca30b57e4eb
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  6 15:32:02 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Dec  6 15:32:02 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3f4aae37

genkernel: bump to v4.0.1

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index d26b377..c345c04 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.0'
+GK_V='4.0.1'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     5a8f19e7679ad0dfaaed975afdb75dc027c221eb
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 22:21:12 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 00:05:40 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5a8f19e7

BUGS: Update known bugs

Since commit 758467cebe8cfcaca64c8c3e19243c4a0b788f5a we include
libnss_dns.so when possible to allow for DNS resolution and since
commit 11eff5eb7ad4330c2688ff4795ba33bbf6efcc47 we include
libnss_files.so which is required for dropbear sshd.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 BUGS | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/BUGS b/BUGS
index 84c366c..c8a0b3c 100644
--- a/BUGS
+++ b/BUGS
@@ -3,7 +3,3 @@
 This file lists out some known bugs which need to be resolved.  Do not file bug
 reports against these bugs, as the genkernel team is aware of them and has yet
 to implement a solution.
-
-- busybox linked statically against glibc fails DNS resolution without the
-  /lib/libnss_{files,dns}.so libraries
-- 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     2d6f89d8646178917eb87db94fd710f68f304e3d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 22:27:12 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 00:05:40 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2d6f89d8

gen_funcs.sh: Add is_glibc() function

This function will allow to detect if CHOST is using glibc
or not.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 32d367e..87e4b3a 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -225,6 +225,20 @@ has_space_characters() {
 	echo "${has_space_characters}"
 }
 
+is_glibc() {
+	if ! hash getconf &>/dev/null
+	then
+		gen_die "getconf not found. Unable to determine libc implementation!"
+	fi
+
+	local is_glibc=no
+
+	getconf GNU_LIBC_VERSION &>/dev/null
+	[ $? -eq 0 ] && is_glibc=yes
+
+	echo "${is_glibc}"
+}
+
 is_gzipped() {
 	[[ ${#} -ne 1 ]] \
 		&& gen_die "$(get_useful_function_stack "${FUNCNAME}")Invalid usage of ${FUNCNAME}(): Function takes exactly one argument (${#} given)!"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     5ccd38ac55cb01300066b5c141c48843b15ed2fe
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 22:38:06 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 00:08:42 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5ccd38ac

gen_initramfs.sh: append_dropbear(): Only include libnss_files.so on glibc based CHOST

libnss_files.so is for example is not available on musl.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 4ecdef5..6bc8777 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1324,9 +1324,12 @@ append_dropbear() {
 		fi
 	fi
 
-	local libdir=$(get_chost_libdir)
-	mkdir -p "${TDIR}"/lib || gen_die "Failed to create '${TDIR}/lib'!"
-	copy_system_binaries "${TDIR}"/lib "${libdir}"/libnss_files.so
+	if isTrue "$(is_glibc)"
+	then
+		local libdir=$(get_chost_libdir)
+		mkdir -p "${TDIR}"/lib || gen_die "Failed to create '${TDIR}/lib'!"
+		copy_system_binaries "${TDIR}"/lib "${libdir}"/libnss_files.so
+	fi
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     7d7d95509fcecd86476e705bc52fa147452139c3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 20:56:40 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 00:05:33 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7d7d9550

gen_funcs.sh: get_chost_libdir(): Use libc.a to determine CHOST libdir

libc.a is required for almost every package in initramfs whereas
libnss_files.so isn't available in musl for example.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh     | 7 +++++--
 gen_initramfs.sh | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index f5dd0cd..32d367e 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -860,10 +860,13 @@ debug_breakpoint() {
 get_chost_libdir() {
 	local cc=$(tc-getCC)
 
-	local test_file=$(${cc} -print-file-name=libnss_files.so 2>/dev/null)
+	local test_file=$(${cc} -print-file-name=libc.a 2>/dev/null)
 	if [ -z "${test_file}" ]
 	then
-		gen_die "$(get_useful_function_stack "${FUNCNAME}")Unable to determine CHOST's libdir: '${cc} -print-file-name=libnss_files.so' returned nothing!"
+		gen_die "$(get_useful_function_stack "${FUNCNAME}")Unable to determine CHOST's libdir: '${cc} -print-file-name=libc.a' returned nothing!"
+	elif [[ "${test_file}" == "libc.a" ]]
+	then
+		gen_die "$(get_useful_function_stack "${FUNCNAME}")Unable to determine CHOST's libdir: '${cc} -print-file-name=libc.a' returned no path!"
 	fi
 
 	local test_file_realpath=$(realpath "${test_file}" 2>/dev/null)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 6150cba..ab7b151 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -461,7 +461,7 @@ append_busybox() {
 	# allow for DNS resolution
 	local libdir=$(get_chost_libdir)
 	mkdir -p "${TDIR}"/lib || gen_die "Failed to create '${TDIR}/lib'!"
-	copy_system_binaries "${TDIR}"/lib "${libdir}"/libnss_dns.so.2
+	copy_system_binaries "${TDIR}"/lib "${libdir}"/libnss_dns.so
 
 	log_future_cpio_content
 	find . -print0 | "${CPIO_COMMAND}" ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
@@ -955,7 +955,7 @@ append_linker() {
 		mkdir -p "${TDIR}"/sbin || gen_die "Failed to create '${TDIR}/sbin'!"
 
 		local libdir=$(get_chost_libdir)
-		copy_system_binaries "${TDIR}/sbin" "${libdir}/../sbin/ldconfig"
+		copy_system_binaries "${TDIR}/sbin" "${libdir}/../../sbin/ldconfig"
 	else
 		# Only copy /etc/ld.so.conf.d -- /etc/ld.so.conf was already
 		# added to CPIO via append_base_layout() and because we only
@@ -1323,7 +1323,7 @@ append_dropbear() {
 
 	local libdir=$(get_chost_libdir)
 	mkdir -p "${TDIR}"/lib || gen_die "Failed to create '${TDIR}/lib'!"
-	copy_system_binaries "${TDIR}"/lib "${libdir}"/libnss_files.so.2
+	copy_system_binaries "${TDIR}"/lib "${libdir}"/libnss_files.so
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     df8eaed4da4f2c84671c46ddf8ba12c3070dd08a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 22:37:03 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 00:06:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=df8eaed4

gen_initramfs.sh: append_busybox(): Only include libnss_dns.so on glibc based CHOST

libnss_dns.so is for example not available on musl.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index ab7b151..4ecdef5 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -459,9 +459,12 @@ append_busybox() {
 	done
 
 	# allow for DNS resolution
-	local libdir=$(get_chost_libdir)
-	mkdir -p "${TDIR}"/lib || gen_die "Failed to create '${TDIR}/lib'!"
-	copy_system_binaries "${TDIR}"/lib "${libdir}"/libnss_dns.so
+	if isTrue "$(is_glibc)"
+	then
+		local libdir=$(get_chost_libdir)
+		mkdir -p "${TDIR}"/lib || gen_die "Failed to create '${TDIR}/lib'!"
+		copy_system_binaries "${TDIR}"/lib "${libdir}"/libnss_dns.so
+	fi
 
 	log_future_cpio_content
 	find . -print0 | "${CPIO_COMMAND}" ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     ac9e96c0020c2b2c04329b78af9a4c1bdb392046
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 14 17:35:43 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 18:44:40 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ac9e96c0

gen_determineargs.sh: determine_output_filenames(): Always set GK_FILENAME_* variables

We always need GK_FILENAME_* variables, even when not installing anything.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 952b31e..f0a5a86 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -95,8 +95,6 @@ determine_output_filenames() {
 	GK_FILENAME_TEMP_KERNELZ="kernelz-${ARCH}-${KV}"
 	GK_FILENAME_TEMP_SYSTEMMAP="System.map-${ARCH}-${KV}"
 
-	isTrue "${CMD_INSTALL}" || return
-
 	# Do we have values?
 	if [ -z "${KERNEL_FILENAME}" ]
 	then

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     1b395dd9d38690a0786d750c422d3bd652460a4b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 14 17:37:30 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 18:44:40 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1b395dd9

genkernel: Don't advertise initramfs when it was integrated into kernel

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index c345c04..93f670e 100755
--- a/genkernel
+++ b/genkernel
@@ -432,7 +432,13 @@ then
 
 		if isTrue "${BUILD_RAMDISK}"
 		then
-			print_info 1 "You will find the initramfs in '${TMPDIR}/${GK_FILENAME_TEMP_INITRAMFS}'."
+			if isTrue "${INTEGRATED_INITRAMFS}"
+			then
+				show_warning_initramfs_is_required=no
+				print_info 1 "Initramfs is integrated into kernel image."
+			else
+				print_info 1 "You will find the initramfs in '${TMPDIR}/${GK_FILENAME_TEMP_INITRAMFS}'."
+			fi
 		fi
 	fi
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     9394d2189c6691b78665c2f8adcfc56cedaac08e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 14 17:29:32 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 18:44:38 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9394d218

gen_initramfs.sh: create_initramfs(): Fix building compressed integrated initramfs

Re-compiling kernel failed due to multiple set CONFIG_INITRAMFS_COMPRESSION_*
options.

In addition it is important to call `make olddefconfig` after changing options
to make sure kernel config is still valid and make won't block with user
prompt.

This commit will also ensure that we honor set COMPRESS_INITRD_TYPE.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 87 +++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 61 insertions(+), 26 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 6bc8777..38c77d0 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1853,32 +1853,67 @@ create_initramfs() {
 		sed -i '/^.*CONFIG_INITRAMFS_SOURCE=.*$/d' "${KERNEL_OUTPUTDIR}/.config" \
 			|| gen_die "failed to delete CONFIG_INITRAMFS_SOURCE from '${KERNEL_OUTPUTDIR}/.config'"
 
-		local 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' ;;
-			lz4)  compress_config='INITRAMFS_COMPRESSION_LZ4' ;;
-			*)    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_OUTPUTDIR}/.config	<<-EOF
-		CONFIG_INITRAMFS_SOURCE="${CPIO_ARCHIVE}.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_INITRAMFS_COMPRESSION_LZ4=n
-		CONFIG_${compress_config}=y
-		EOF
+		local compress_config=NONE
+		local -a KNOWN_INITRAMFS_COMPRESSION_TYPES=()
+		KNOWN_INITRAMFS_COMPRESSION_TYPES+=( NONE )
+		KNOWN_INITRAMFS_COMPRESSION_TYPES+=( GZIP )
+		KNOWN_INITRAMFS_COMPRESSION_TYPES+=( BZIP2 )
+		KNOWN_INITRAMFS_COMPRESSION_TYPES+=( LZMA )
+		KNOWN_INITRAMFS_COMPRESSION_TYPES+=( XZ )
+		KNOWN_INITRAMFS_COMPRESSION_TYPES+=( LZO )
+		KNOWN_INITRAMFS_COMPRESSION_TYPES+=( LZ4 )
+
+		if isTrue "${COMPRESS_INITRD}"
+		then
+			case ${COMPRESS_INITRD_TYPE} in
+				gz)
+					compress_config='GZIP'
+					;;
+				bz2)
+					compress_config='BZIP2'
+					;;
+				lzma)
+					compress_config='LZMA'
+					;;
+				xz|best|fastest)
+					compress_config='XZ'
+					;;
+				lzop)
+					compress_config='LZO'
+					;;
+				lz4)
+					compress_config='LZ4'
+					;;
+			esac
+		fi
+
+		print_info 1 "$(get_indent 1)>> --integrated-initramfs is set; Setting CONFIG_INITRAMFS_* options ..."
+
+		[ -f "${KCONFIG_MODIFIED_MARKER}" ] && rm "${KCONFIG_MODIFIED_MARKER}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_SOURCE" "${CPIO_ARCHIVE}.cpio"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_ROOT_UID" "0"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_ROOT_GID" "0"
+
+		local KNOWN_INITRAMFS_COMPRESSION_TYPE
+		local KOPTION_VALUE
+		for KNOWN_INITRAMFS_COMPRESSION_TYPE in "${KNOWN_INITRAMFS_COMPRESSION_TYPES[@]}"
+		do
+			KOPTION_VALUE=n
+			if [[ "${KNOWN_INITRAMFS_COMPRESSION_TYPE}" == "${compress_config}" ]]
+			then
+				KOPTION_VALUE=y
+			fi
+
+			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_COMPRESSION_${KNOWN_INITRAMFS_COMPRESSION_TYPE}" "${KOPTION_VALUE}"
+		done
+
+		if [ -f "${KCONFIG_MODIFIED_MARKER}" ]
+		then
+			print_info 1 "$(get_indent 1)>> Running 'make olddefconfig' due to changed kernel options ..."
+			pushd "${KERNEL_DIR}" &>/dev/null || gen_die "Failed to chdir to '${KERNEL_DIR}'!"
+			compile_generic olddefconfig kernel 2>/dev/null
+			popd &>/dev/null || gen_die "Failed to chdir!"
+		fi
 	else
 		if isTrue "${COMPRESS_INITRD}"
 		then

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     d1db2abba8873278ecceff5dd7a2a63ef0195274
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 16 00:10:33 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Dec 16 00:10:33 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d1db2abb

genkernel.conf: Fix spelling

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel.conf b/genkernel.conf
index bdb5df4..c5d7052 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -40,7 +40,7 @@
 #SYMLINK="no"
 
 # Save the new configuration in /etc/kernels upon
-# successfull compilation
+# successful compilation
 #SAVE_CONFIG="yes"
 
 # Enable color output in genkernel

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     53161dfada35f9d5a766a74413341c69cde0a67a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 03:57:58 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 03:57:58 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=53161dfa

gen_initramfs.sh: create_initramfs(): Fix integrated initramfs creation

- CONFIG_INITRAMFS_SOURCE value must be quoted.

- CONFIG_INITRAMFS_COMPRESSION_* is only available in >=linux-4.10.

- Use CONFIG_RD_* for <linux-4.10. But make sure that only option for
  selected compression type is set and every other type is disabled.
  Otherwise, last set compression type would be used all the time,
  see $KERNEL_DIR/usr/Makefile for details.

- Add sanity check which checks for integrated initramfs.

Bug: https://bugs.gentoo.org/703826
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 21 +++++++++++++++++++--
 genkernel        |  7 +++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 38c77d0..283e308 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1890,7 +1890,8 @@ create_initramfs() {
 		print_info 1 "$(get_indent 1)>> --integrated-initramfs is set; Setting CONFIG_INITRAMFS_* options ..."
 
 		[ -f "${KCONFIG_MODIFIED_MARKER}" ] && rm "${KCONFIG_MODIFIED_MARKER}"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_SOURCE" "${CPIO_ARCHIVE}.cpio"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_INITRD" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_SOURCE" "\"${CPIO_ARCHIVE}.cpio\""
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_ROOT_UID" "0"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_ROOT_GID" "0"
 
@@ -1904,7 +1905,23 @@ create_initramfs() {
 				KOPTION_VALUE=y
 			fi
 
-			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_COMPRESSION_${KNOWN_INITRAMFS_COMPRESSION_TYPE}" "${KOPTION_VALUE}"
+			if [ ${KV_NUMERIC} -ge 4010 ]
+			then
+				kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_COMPRESSION_${KNOWN_INITRAMFS_COMPRESSION_TYPE}" "${KOPTION_VALUE}"
+
+				if [[ "${KOPTION_VALUE}" == "y" && "${KNOWN_INITRAMFS_COMPRESSION_TYPE}" != "NONE" ]]
+				then
+					# Make sure that the kernel can decompress our initramfs
+					kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_RD_${KNOWN_INITRAMFS_COMPRESSION_TYPE}" "${KOPTION_VALUE}"
+				fi
+			else
+				[[ "${KNOWN_INITRAMFS_COMPRESSION_TYPE}" == "NONE" ]] && continue
+
+				# In <linux-4.10, to control used initramfs compression, we have to
+				# disable every supported compression type except compression type
+				# we want to use, (see $KERNEL_DIR/usr/Makefile).
+				kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_RD_${KNOWN_INITRAMFS_COMPRESSION_TYPE}" "${KOPTION_VALUE}"
+			fi
 		done
 
 		if [ -f "${KCONFIG_MODIFIED_MARKER}" ]

diff --git a/genkernel b/genkernel
index 93f670e..3d25634 100755
--- a/genkernel
+++ b/genkernel
@@ -364,6 +364,13 @@ if isTrue "${INTEGRATED_INITRAMFS}"
 then
 	print_info 1 '' 1 0
 
+	cfg_CONFIG_INITRAMFS_SOURCE=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_SOURCE")
+	if [[ "${cfg_CONFIG_INITRAMFS_SOURCE}" != "\"${CPIO_ARCHIVE}.cpio\"" ]]
+	then
+		gen_die "Sanity check failed: CONFIG_INITRAMFS_SOURCE is not set to '${CPIO_ARCHIVE}.cpio' in '${KERNEL_OUTPUTDIR}/.config'!"
+	fi
+	unset cfg_CONFIG_INITRAMFS_SOURCE
+
 	# We build the kernel a second time to include the initramfs
 	compile_kernel
 fi

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     9e10c8f8777bb4bae015f174beb11711ab0b719d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 04:01:27 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 04:01:27 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9e10c8f8

genkernel: Don't advertise initramfs when it was integrated into kernel (2)

Commit 1b395dd9d38690a0786d750c422d3bd652460a4b only handled the case
when --no-install was set.

This commit will also handle the case when --install is set.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/genkernel b/genkernel
index 3d25634..ae2df04 100755
--- a/genkernel
+++ b/genkernel
@@ -458,6 +458,13 @@ then
 		print_info 1 ''
 		print_info 1 'Where $ROOT is the device node for your root partition as the'
 		print_info 1 'one specified in /etc/fstab'
+
+		if isTrue "${INTEGRATED_INITRAMFS}" && isTrue "${BUILD_RAMDISK}"
+		then
+			show_warning_initramfs_is_required=no
+			print_info 1 ''
+			print_info 1 "Initramfs is integrated into kernel image."
+		fi
 	fi
 
 	if isTrue "${show_warning_initramfs_is_required}" && isTrue "${BUILD_RAMDISK}"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     8a8dfb63344f1131b3960aeaacda24a7711e07c2
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 03:59:21 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 03:59:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8a8dfb63

gen_configkernel.sh: config_kernel(): Make sure that CONFIG_INITRAMFS_SOURCE is unset

Ensure that CONFIG_INITRAMFS_SOURCE is unset to avoid clashing with --integrated-initramfs.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 7840491..dd47df6 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -224,6 +224,18 @@ config_kernel() {
 	local -a required_kernel_options
 	[ -f "${KCONFIG_MODIFIED_MARKER}" ] && rm "${KCONFIG_MODIFIED_MARKER}"
 
+	# --integrated-initramfs handling
+	if isTrue "${INTEGRATED_INITRAMFS}"
+	then
+		local cfg_CONFIG_INITRAMFS_SOURCE=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_SOURCE")
+		if [[ -n "${cfg_CONFIG_INITRAMFS_SOURCE}" && ${#cfg_CONFIG_INITRAMFS_SOURCE} -gt 2 ]]
+		then
+			# Checking value length to allow 'CONFIG_INITRAMFS_SOURCE=' and 'CONFIG_INITRAMFS_SOURCE=""'
+			print_info 2 "$(get_indent 1)>> CONFIG_INITRAMFS_SOURCE is already set; Unsetting to avoid clashing with --integrated-initramfs ..."
+			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_SOURCE" ""
+		fi
+	fi
+
 	# Force this on if we are using --genzimage
 	if isTrue "${CMD_GENZIMAGE}"
 	then

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     cb705cfd0dc3800a085f5ccba4681b73b1fe2287
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 17:18:19 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 17:18:19 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cb705cfd

gen_initramfs.sh: create_initramfs(): Make ldconfig failure non-fatal

Having up-to-date /etc/ld.so.cache in initramfs is nice to have but not
critical and ldconfig is known to fail when running under sandbox.

Closes: https://bugs.gentoo.org/704354
Signed-off-by: Thomas Deutschmann <whissi <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 283e308..676b86d 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1811,7 +1811,7 @@ create_initramfs() {
 			print_info 1 "$(get_indent 1)>> Pre-generating initramfs' /etc/ld.so.cache ..."
 			# Need to disable sandbox which doesn't understand chroot(), bug #431038
 			SANDBOX_ON=0 ldconfig -f /etc/ld.so.conf -r "${TDIR}" 2>/dev/null \
-				|| gen_die "Failed to pre-generate '${TDIR}/etc/ld.so.cache'!"
+				|| print_warning 1 "Failed to pre-generate '${TDIR}/etc/ld.so.cache'! Probably due to sandbox/permission problem; Ignoring ..."
 		fi
 
 		find . -print0 | sort -z | "${CPIO_COMMAND}" ${CPIO_ARGS} --reproducible -F "${CPIO_ARCHIVE}" 2>/dev/null \

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     d00387e421e541bad7e3c16e2a7c67bc3c0a1cb7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 17:33:03 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 17:33:03 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d00387e4

gen_funcs.sh: gen_die(): Prevent recursion

Closes: https://bugs.gentoo.org/704546
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 87e4b3a..1f574ad 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -407,6 +407,14 @@ gen_die() {
 		# We died in a subshell! Let's trigger trap function...
 		kill -s SIGTERM ${GK_MASTER_PID}
 	else
+		if [ -z "${GK_DIED_IN}" ]
+		then
+			GK_DIED_IN="$(get_useful_function_stack)"
+		else
+			# We are already dying
+			exit 1
+		fi
+
 		# Don't trust $LOGFILE before determine_real_args() was called
 		if [ -n "${CMD_LOGFILE}" -a -s "${LOGFILE}" ]
 		then

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     9cca61dcffd3969ce31898541a50bafedc4dd6d9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  7 20:06:19 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jan  7 20:09:54 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9cca61dc

gen_compile.sh: compile_modules(): Add parameter "copy_kernel"

When building kernel with integrated initramfs we don't want to
copy kernel to its final location before we integrated initramfs or
otherwise, the second call to compile_modules() would preserve
previous incomplete image.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_compile.sh | 19 +++++++++++++++++++
 genkernel      |  9 +++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 9c6b6f0..4942a0c 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -254,7 +254,20 @@ compile_modules() {
 	fi
 }
 
+# @FUNCTION: compile_kernel
+# @USAGE: <copy_kernel>
+# @DESCRIPTION:
+# Will compile and optionally copy compiled kernel and System.map
+# to its final location.
+#
+# <copy_kernel> Boolean which indicates if kernel and System.map should
+#               get copied to its final location
 compile_kernel() {
+	[[ ${#} -ne 1 ]] \
+		&& gen_die "$(get_useful_function_stack "${FUNCNAME}")Invalid usage of ${FUNCNAME}(): Function takes exactly one argument (${#} given)!"
+
+	local copy_kernel="${1}"
+
 	[ -z "${KERNEL_MAKE}" ] \
 		&& gen_die "KERNEL_MAKE undefined - I don't know how to compile a kernel for this arch!"
 
@@ -295,6 +308,12 @@ compile_kernel() {
 		print_info 1 "$(get_indent 1)>> Skipping installation of bundled firmware due to --no-firmware-install ..."
 	fi
 
+	if ! isTrue "${copy_kernel}"
+	then
+		print_info 5 "Not copying compiled kernel yet (${FUNCNAME} called with copy_kernel=no) ..."
+		return
+	fi
+
 	local tmp_kernel_binary=$(find_kernel_binary ${KERNEL_BINARY_OVERRIDE:-${KERNEL_BINARY}})
 	local tmp_kernel_binary2=$(find_kernel_binary ${KERNEL_BINARY_2})
 	if [ -z "${tmp_kernel_binary}" ]

diff --git a/genkernel b/genkernel
index 8435350..127844a 100755
--- a/genkernel
+++ b/genkernel
@@ -250,7 +250,12 @@ then
 		print_info 2 "$(get_indent 1)>> Kernel version has not changed since genkernel start"
 	fi
 
-	compile_kernel
+	if isTrue "${INTEGRATED_INITRAMFS}"
+	then
+		compile_kernel no
+	else
+		compile_kernel yes
+	fi
 
 	# Compile modules
 	if isTrue "${BUILD_MODULES}" && ! isTrue "${BUILD_STATIC}"
@@ -372,7 +377,7 @@ then
 	unset cfg_CONFIG_INITRAMFS_SOURCE
 
 	# We build the kernel a second time to include the initramfs
-	compile_kernel
+	compile_kernel yes
 fi
 
 if [ -n "${KERNCACHE}" ]

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     66ec240910ffa979fd18fb8528df6660af2d5ee9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 10 23:33:08 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jan 10 23:33:41 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=66ec2409

Style fix: Use curly braces

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_bootloader.sh    |  4 ++--
 gen_cmdline.sh       |  4 ++--
 gen_compile.sh       |  4 ++--
 gen_configkernel.sh  |  8 ++++----
 gen_determineargs.sh | 30 +++++++++++++++---------------
 gen_funcs.sh         | 32 ++++++++++++++++----------------
 genkernel            |  2 +-
 7 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index 68eb721..06fb7ba 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -70,7 +70,7 @@ set_bootloader_grub() {
 		local GRUB_BOOTFS
 		if [ -n "${BOOTFS}" ]
 		then
-			GRUB_BOOTFS=$BOOTFS
+			GRUB_BOOTFS=${BOOTFS}
 		else
 			GRUB_BOOTFS=$(set_bootloader_read_fstab | cut -d' ' -f2)
 		fi
@@ -101,7 +101,7 @@ set_bootloader_grub() {
 
 			# Add grub configuration to grub.conf
 			echo "# Genkernel generated entry, see GRUB documentation for details" >> ${GRUB_CONF}
-			echo "title=Gentoo Linux ($KV)" >> ${GRUB_CONF}
+			echo "title=Gentoo Linux (${KV})" >> ${GRUB_CONF}
 			printf "%b\n" "\tkernel /${GK_FILENAME_KERNEL} root=${GRUB_ROOTFS}" >> ${GRUB_CONF}
 			if isTrue "${BUILD_RAMDISK}"
 			then

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index c33f738..025187f 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -273,7 +273,7 @@ usage() {
 parse_optbool() {
 	local opt=${1/--no-*/no} # false
 	opt=${opt/--*/yes} # true
-	echo $opt
+	echo ${opt}
 }
 
 parse_cmdline() {
@@ -394,7 +394,7 @@ parse_cmdline() {
 			;;
 		--microcode=*)
 			CMD_MICROCODE="${*#*=}"
-			print_info 3 "CMD_MICROCODE: $CMD_MICROCODE"
+			print_info 3 "CMD_MICROCODE: ${CMD_MICROCODE}"
 			;;
 		--microcode-initramfs|--no-microcode-initramfs)
 			CMD_MICROCODE_INITRAMFS=$(parse_optbool "$*")

diff --git a/gen_compile.sh b/gen_compile.sh
index 4942a0c..3f10adb 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -294,7 +294,7 @@ compile_kernel() {
 	elif isTrue "${FIRMWARE_INSTALL}"
 	then
 		local cfg_CONFIG_FIRMWARE_IN_KERNEL=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" CONFIG_FIRMWARE_IN_KERNEL)
-		if isTrue "$cfg_CONFIG_FIRMWARE_IN_KERNEL"
+		if isTrue "${cfg_CONFIG_FIRMWARE_IN_KERNEL}"
 		then
 			print_info 1 "$(get_indent 1)>> Not installing firmware as it's included in the kernel already (CONFIG_FIRMWARE_IN_KERNEL=y) ..."
 		else
@@ -391,7 +391,7 @@ determine_busybox_config_file() {
 
 		if [ -f "${f}" ]
 		then
-			BUSYBOX_CONFIG="$f"
+			BUSYBOX_CONFIG="${f}"
 			break
 		else
 			print_info 3 "$(get_indent 3)- '${f}' not found; Skipping ..."

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index dd47df6..6943050 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -79,11 +79,11 @@ determine_kernel_config_file() {
 
 			if [ -f "${f}" ]
 			then
-				if grep -sq THIS_CONFIG_IS_BROKEN "$f"
+				if grep -sq THIS_CONFIG_IS_BROKEN "${f}"
 				then
 					print_info 2 "$(get_indent 1)- '${f}' is marked as broken; Skipping ..."
 				else
-					KERNEL_CONFIG="$f" && break
+					KERNEL_CONFIG="${f}" && break
 				fi
 			else
 					print_info 2 "$(get_indent 1)- '${f}' not found; Skipping ..."
@@ -845,12 +845,12 @@ config_kernel() {
 			local k
 			for k in "${kconfigs_microcode[@]}"
 			do
-				local cfg=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "$k")
+				local cfg=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "${k}")
 				case "${cfg}" in
 					y) ;; # Do nothing
 					*) cfg='y'
 				esac
-				kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "$k" "${cfg}"
+				kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "${k}" "${cfg}"
 			done
 
 			required_kernel_options+=( 'CONFIG_MICROCODE' )

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index e4aea0c..616f4fe 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -72,8 +72,8 @@ determine_KV() {
 		fi
 	fi
 
-	KV_MAJOR=$(echo $KV | cut -f1 -d.)
-	KV_MINOR=$(echo $KV | cut -f2 -d.)
+	KV_MAJOR=$(echo ${KV} | cut -f1 -d.)
+	KV_MINOR=$(echo ${KV} | cut -f2 -d.)
 	KV_NUMERIC=$((${KV_MAJOR} * 1000 + ${KV_MINOR}))
 
 	if [ -n "${old_KV}" -a "${KV}" != "${old_KV}" ]
@@ -283,20 +283,20 @@ determine_real_args() {
 	set_config_with_override STRING CHECK_FREE_DISK_SPACE_BOOTDIR         CMD_CHECK_FREE_DISK_SPACE_BOOTDIR
 	set_config_with_override STRING CHECK_FREE_DISK_SPACE_KERNELOUTPUTDIR CMD_CHECK_FREE_DISK_SPACE_KERNELOUTPUTDIR
 
-	set_config_with_override STRING COMPRESS_INITRD                       CMD_COMPRESS_INITRD                       "$DEFAULT_COMPRESS_INITRD"
-	set_config_with_override STRING COMPRESS_INITRD_TYPE                  CMD_COMPRESS_INITRD_TYPE                  "$DEFAULT_COMPRESS_INITRD_TYPE"
-	set_config_with_override STRING MAKEOPTS                              CMD_MAKEOPTS                              "$DEFAULT_MAKEOPTS"
+	set_config_with_override STRING COMPRESS_INITRD                       CMD_COMPRESS_INITRD                       "${DEFAULT_COMPRESS_INITRD}"
+	set_config_with_override STRING COMPRESS_INITRD_TYPE                  CMD_COMPRESS_INITRD_TYPE                  "${DEFAULT_COMPRESS_INITRD_TYPE}"
+	set_config_with_override STRING MAKEOPTS                              CMD_MAKEOPTS                              "${DEFAULT_MAKEOPTS}"
 	set_config_with_override STRING NICE                                  CMD_NICE                                  "10"
-	set_config_with_override STRING KERNEL_MAKE                           CMD_KERNEL_MAKE                           "$DEFAULT_KERNEL_MAKE"
-	set_config_with_override STRING UTILS_CFLAGS                          CMD_UTILS_CFLAGS                          "$DEFAULT_UTILS_CFLAGS"
-	set_config_with_override STRING UTILS_MAKE                            CMD_UTILS_MAKE                            "$DEFAULT_UTILS_MAKE"
-	set_config_with_override STRING KERNEL_CC                             CMD_KERNEL_CC                             "$DEFAULT_KERNEL_CC"
-	set_config_with_override STRING KERNEL_LD                             CMD_KERNEL_LD                             "$DEFAULT_KERNEL_LD"
-	set_config_with_override STRING KERNEL_AS                             CMD_KERNEL_AS                             "$DEFAULT_KERNEL_AS"
-	set_config_with_override STRING UTILS_CC                              CMD_UTILS_CC                              "$DEFAULT_UTILS_CC"
-	set_config_with_override STRING UTILS_CXX                             CMD_UTILS_CXX                             "$DEFAULT_UTILS_CXX"
-	set_config_with_override STRING UTILS_LD                              CMD_UTILS_LD                              "$DEFAULT_UTILS_LD"
-	set_config_with_override STRING UTILS_AS                              CMD_UTILS_AS                              "$DEFAULT_UTILS_AS"
+	set_config_with_override STRING KERNEL_MAKE                           CMD_KERNEL_MAKE                           "${DEFAULT_KERNEL_MAKE}"
+	set_config_with_override STRING UTILS_CFLAGS                          CMD_UTILS_CFLAGS                          "${DEFAULT_UTILS_CFLAGS}"
+	set_config_with_override STRING UTILS_MAKE                            CMD_UTILS_MAKE                            "${DEFAULT_UTILS_MAKE}"
+	set_config_with_override STRING KERNEL_CC                             CMD_KERNEL_CC                             "${DEFAULT_KERNEL_CC}"
+	set_config_with_override STRING KERNEL_LD                             CMD_KERNEL_LD                             "${DEFAULT_KERNEL_LD}"
+	set_config_with_override STRING KERNEL_AS                             CMD_KERNEL_AS                             "${DEFAULT_KERNEL_AS}"
+	set_config_with_override STRING UTILS_CC                              CMD_UTILS_CC                              "${DEFAULT_UTILS_CC}"
+	set_config_with_override STRING UTILS_CXX                             CMD_UTILS_CXX                             "${DEFAULT_UTILS_CXX}"
+	set_config_with_override STRING UTILS_LD                              CMD_UTILS_LD                              "${DEFAULT_UTILS_LD}"
+	set_config_with_override STRING UTILS_AS                              CMD_UTILS_AS                              "${DEFAULT_UTILS_AS}"
 
 	set_config_with_override STRING CROSS_COMPILE                         CMD_CROSS_COMPILE
 	set_config_with_override STRING BOOTDIR                               CMD_BOOTDIR                               "/boot"

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 1f574ad..a19cb88 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1537,20 +1537,20 @@ set_default_gk_trap() {
 # - JRG
 #
 set_config_with_override() {
-	local VarType=$1
-	local CfgVar=$2
-	local OverrideVar=$3
-	local Default=$4
+	local VarType=${1}
+	local CfgVar=${2}
+	local OverrideVar=${3}
+	local Default=${4}
 	local Result
 
 	#
 	# Syntax check the function arguments.
 	#
-	case "$VarType" in
+	case "${VarType}" in
 		BOOL|STRING)
 			;;
 		*)
-			gen_die "Illegal variable type \"$VarType\" passed to set_config_with_override()."
+			gen_die "$(get_useful_function_stack "${FUNCNAME}")Invalid usage of ${FUNCNAME}(): Variable type \"${VarType}\" is unknown!"
 			;;
 	esac
 
@@ -1559,9 +1559,9 @@ set_config_with_override() {
 		Result=${!OverrideVar}
 		if [ -n "${!CfgVar}" ]
 		then
-			print_info 5 "  $CfgVar overridden on command line to \"$Result\"."
+			print_info 5 "  ${CfgVar} overridden on command line to \"${Result}\"."
 		else
-			print_info 5 "  $CfgVar set on command line to \"$Result\"."
+			print_info 5 "  ${CfgVar} set on command line to \"${Result}\"."
 		fi
 	else
 		if [ -n "${!CfgVar}" ]
@@ -1571,18 +1571,18 @@ set_config_with_override() {
 			eval ${OverrideVar}=\"${Result}\" \
 				|| small_die "Failed to set variable '${OverrideVar}=${Result}' !"
 
-			print_info 5 "  $CfgVar set in config file to \"${Result}\"."
+			print_info 5 "  ${CfgVar} set in config file to \"${Result}\"."
 		else
-			if [ -n "$Default" ]
+			if [ -n "${Default}" ]
 			then
 				Result=${Default}
 				# set OverrideVar to Result, otherwise CMD_* may not be initialized...
 				eval ${OverrideVar}=\"${Result}\" \
 					|| small_die "Failed to set variable '${OverrideVar}=${Result}' !"
 
-				print_info 5 "  $CfgVar defaulted to \"${Result}\"."
+				print_info 5 "  ${CfgVar} defaulted to \"${Result}\"."
 			else
-				print_info 5 "  $CfgVar not set."
+				print_info 5 "  ${CfgVar} not set."
 			fi
 		fi
 	fi
@@ -1688,7 +1688,7 @@ rootfs_type_is() {
 
 	# It is possible that the awk will return MULTIPLE lines, depending on your
 	# initramfs setup (one of the entries will be 'rootfs').
-	if awk '($2=="/"){print $3}' /proc/mounts | grep -sq --line-regexp "$fstype" ;
+	if awk '($2=="/"){print $3}' /proc/mounts | grep -sq --line-regexp "${fstype}"
 	then
 		echo yes
 	else
@@ -1854,7 +1854,7 @@ find_kernel_binary() {
 	do
 		if [ -e "${i}" ]
 		then
-			tmp_kernel_binary=$i
+			tmp_kernel_binary=${i}
 			break
 		fi
 	done
@@ -1889,7 +1889,7 @@ kconfig_set_opt() {
 	then
 		print_info 3 "$(get_indent ${indentlevel}) - Adding option '${optname}' with value '${optval}' to '${kconfig}'..."
 		echo "${optname}=${optval}" >> "${kconfig}" \
-			|| gen_die "Failed to add '${optname}=${optval}' to '$kconfig'"
+			|| gen_die "Failed to add '${optname}=${optval}' to '${kconfig}'"
 
 		[ ! -f "${TEMP}/.kconfig_modified" ] && touch "${TEMP}/.kconfig_modified"
 	elif [[ "${curropt}" != "*#*" && "${curropt#*=}" == "${optval}" ]]
@@ -1899,7 +1899,7 @@ kconfig_set_opt() {
 		print_info 3 "$(get_indent ${indentlevel}) - Setting option '${optname}' to '${optval}' in '${kconfig}'..."
 		sed -i "${kconfig}" \
 			-e "s/^#\? \?${optname}[ =].*/${optname}=${optval}/g" \
-			|| gen_die "Failed to set '${optname}=${optval}' in '$kconfig'"
+			|| gen_die "Failed to set '${optname}=${optval}' in '${kconfig}'"
 
 		[ ! -f "${KCONFIG_MODIFIED_MARKER}" ] && touch "${KCONFIG_MODIFIED_MARKER}"
 	fi

diff --git a/genkernel b/genkernel
index 127844a..2e0aca9 100755
--- a/genkernel
+++ b/genkernel
@@ -164,7 +164,7 @@ unset _MODULES_LOAD
 for v in ${override_module_vars}
 do
 	newvar=override_${v}
-	print_info 2 "Override $v, default (${!v}), new value (${!newvar})"
+	print_info 2 "Override ${v}, default (${!v}), new value (${!newvar})"
 	eval "${v}='${!newvar}'"
 done
 unset v override_module_vars newvar

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     5eec9816d141ccc5b7a3b32ac1306f3be0bdc8a2
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 16:25:40 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Jan 11 19:54:40 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5eec9816

gen_cmdline.sh: parse_cmdline(): Allow for "=" in --callback

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_cmdline.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index db9c1f8..c0139d4 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -613,8 +613,8 @@ parse_cmdline() {
 			print_info 3 "CMD_MODULEREBUILD_CMD: ${CMD_MODULEREBUILD_CMD}"
 			;;
 		--callback=*)
-			CMD_CALLBACK="${*#*=}"
-			print_info 3 "CMD_CALLBACK: ${CMD_CALLBACK}/$*"
+			CMD_CALLBACK="${*#--callback=}"
+			print_info 3 "CMD_CALLBACK: ${CMD_CALLBACK}"
 			;;
 		--static|--no-static)
 			CMD_STATIC=$(parse_optbool "$*")

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     18060700a1801a7b2bd9d46eccd06f01cdc2ef5c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 21:51:17 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 22:09:32 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=18060700

gen_funcs.sh: find_kernel_binary() refactored

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index a19cb88..821f150 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1846,21 +1846,24 @@ expand_file() {
 }
 
 find_kernel_binary() {
-	local kernel_binary=$*
-	local curdir=$(pwd)
+	local kernel_binary=${*}
+	local kernel_binary_found=
 
-	cd "${KERNEL_OUTPUTDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
+	pushd "${KERNEL_OUTPUTDIR}" &>/dev/null || gen_die "Failed to chdir to '${KERNEL_OUTPUTDIR}'!"
+
+	local i
 	for i in ${kernel_binary}
 	do
 		if [ -e "${i}" ]
 		then
-			tmp_kernel_binary=${i}
+			kernel_binary_found=${i}
 			break
 		fi
 	done
 
-	cd "${curdir}" || gen_die "Failed to chdir to '${TDIR}'!"
-	echo "${tmp_kernel_binary}"
+	popd &>/dev/null || gen_die "Failed to chdir!"
+
+	echo "${kernel_binary_found}"
 }
 
 kconfig_get_opt() {

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     b4bd0ae1a725d3bffdf8766ff80c2cff4c7639e9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 22:02:26 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 22:10:07 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b4bd0ae1

gen_compile.sh: compile_kernel(): Improve error message when kernel binary wasn't found

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_compile.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index 3b96f48..e5254d7 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -312,11 +312,12 @@ compile_kernel() {
 		return
 	fi
 
-	local tmp_kernel_binary=$(find_kernel_binary ${KERNEL_BINARY_OVERRIDE:-${KERNEL_BINARY}})
+	local tmp_kernel_binary_to_look_for="${KERNEL_BINARY_OVERRIDE:-${KERNEL_BINARY}}"
+	local tmp_kernel_binary=$(find_kernel_binary ${tmp_kernel_binary_to_look_for})
 	local tmp_kernel_binary2=$(find_kernel_binary ${KERNEL_BINARY_2})
 	if [ -z "${tmp_kernel_binary}" ]
 	then
-		gen_die "Cannot locate kernel binary"
+		gen_die "Failed to locate kernel binary '${tmp_kernel_binary_to_look_for}' in '${KERNEL_OUTPUTDIR}'!"
 	fi
 
 	# if source != outputdir, we need this:

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     d1331dbe7bbc3bfed1076e946bdda4a987fb3ab5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 21:56:30 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 22:17:25 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d1331dbe

gen_initramfs.sh: create_initramfs(): Outsource compression method handling into set_initramfs_compression_method()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 gen_initramfs.sh    | 63 +------------------------------------------------
 2 files changed, 68 insertions(+), 62 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 6943050..ea7701f 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -113,6 +113,73 @@ determine_kernel_config_file() {
 	fi
 }
 
+set_initramfs_compression_method() {
+	[[ ${#} -ne 1 ]] \
+		&& gen_die "$(get_useful_function_stack "${FUNCNAME}")Invalid usage of ${FUNCNAME}(): Function takes exactly one argument (${#} given)!"
+
+	local kernel_config=${1}
+
+	local compress_config=NONE
+	local -a KNOWN_INITRAMFS_COMPRESSION_TYPES=()
+	KNOWN_INITRAMFS_COMPRESSION_TYPES+=( NONE )
+	KNOWN_INITRAMFS_COMPRESSION_TYPES+=( GZIP )
+	KNOWN_INITRAMFS_COMPRESSION_TYPES+=( BZIP2 )
+	KNOWN_INITRAMFS_COMPRESSION_TYPES+=( LZMA )
+	KNOWN_INITRAMFS_COMPRESSION_TYPES+=( XZ )
+	KNOWN_INITRAMFS_COMPRESSION_TYPES+=( LZO )
+	KNOWN_INITRAMFS_COMPRESSION_TYPES+=( LZ4 )
+
+	case ${COMPRESS_INITRD_TYPE} in
+		gz)
+			compress_config='GZIP'
+			;;
+		bz2)
+			compress_config='BZIP2'
+			;;
+		lzma)
+			compress_config='LZMA'
+			;;
+		xz|best|fastest)
+			compress_config='XZ'
+			;;
+		lzop)
+			compress_config='LZO'
+			;;
+		lz4)
+			compress_config='LZ4'
+			;;
+	esac
+
+	local KNOWN_INITRAMFS_COMPRESSION_TYPE
+	local KOPTION_VALUE
+	for KNOWN_INITRAMFS_COMPRESSION_TYPE in "${KNOWN_INITRAMFS_COMPRESSION_TYPES[@]}"
+	do
+		KOPTION_VALUE=n
+		if [[ "${KNOWN_INITRAMFS_COMPRESSION_TYPE}" == "${compress_config}" ]]
+		then
+			KOPTION_VALUE=y
+		fi
+
+		if [ ${KV_NUMERIC} -ge 4010 ]
+		then
+			kconfig_set_opt "${kernel_config}" "CONFIG_INITRAMFS_COMPRESSION_${KNOWN_INITRAMFS_COMPRESSION_TYPE}" "${KOPTION_VALUE}"
+
+			if [[ "${KOPTION_VALUE}" == "y" && "${KNOWN_INITRAMFS_COMPRESSION_TYPE}" != "NONE" ]]
+			then
+				# Make sure that the kernel can decompress our initramfs
+				kconfig_set_opt "${kernel_config}" "CONFIG_RD_${KNOWN_INITRAMFS_COMPRESSION_TYPE}" "${KOPTION_VALUE}"
+			fi
+		else
+			[[ "${KNOWN_INITRAMFS_COMPRESSION_TYPE}" == "NONE" ]] && continue
+
+			# In <linux-4.10, to control used initramfs compression, we have to
+			# disable every supported compression type except compression type
+			# we want to use, (see $KERNEL_DIR/usr/Makefile).
+			kconfig_set_opt "${kernel_config}" "CONFIG_RD_${KNOWN_INITRAMFS_COMPRESSION_TYPE}" "${KOPTION_VALUE}"
+		fi
+	done
+}
+
 config_kernel() {
 	local diff_cmd="$(which zdiff 2>/dev/null)"
 	if [ -z "${diff_cmd}" ]

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 8620414..783d9a7 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1859,40 +1859,6 @@ create_initramfs() {
 		sed -i '/^.*CONFIG_INITRAMFS_SOURCE=.*$/d' "${KERNEL_OUTPUTDIR}/.config" \
 			|| gen_die "failed to delete CONFIG_INITRAMFS_SOURCE from '${KERNEL_OUTPUTDIR}/.config'"
 
-		local compress_config=NONE
-		local -a KNOWN_INITRAMFS_COMPRESSION_TYPES=()
-		KNOWN_INITRAMFS_COMPRESSION_TYPES+=( NONE )
-		KNOWN_INITRAMFS_COMPRESSION_TYPES+=( GZIP )
-		KNOWN_INITRAMFS_COMPRESSION_TYPES+=( BZIP2 )
-		KNOWN_INITRAMFS_COMPRESSION_TYPES+=( LZMA )
-		KNOWN_INITRAMFS_COMPRESSION_TYPES+=( XZ )
-		KNOWN_INITRAMFS_COMPRESSION_TYPES+=( LZO )
-		KNOWN_INITRAMFS_COMPRESSION_TYPES+=( LZ4 )
-
-		if isTrue "${COMPRESS_INITRD}"
-		then
-			case ${COMPRESS_INITRD_TYPE} in
-				gz)
-					compress_config='GZIP'
-					;;
-				bz2)
-					compress_config='BZIP2'
-					;;
-				lzma)
-					compress_config='LZMA'
-					;;
-				xz|best|fastest)
-					compress_config='XZ'
-					;;
-				lzop)
-					compress_config='LZO'
-					;;
-				lz4)
-					compress_config='LZ4'
-					;;
-			esac
-		fi
-
 		print_info 1 "$(get_indent 1)>> --integrated-initramfs is set; Setting CONFIG_INITRAMFS_* options ..."
 
 		[ -f "${KCONFIG_MODIFIED_MARKER}" ] && rm "${KCONFIG_MODIFIED_MARKER}"
@@ -1901,34 +1867,7 @@ create_initramfs() {
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_ROOT_UID" "0"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_ROOT_GID" "0"
 
-		local KNOWN_INITRAMFS_COMPRESSION_TYPE
-		local KOPTION_VALUE
-		for KNOWN_INITRAMFS_COMPRESSION_TYPE in "${KNOWN_INITRAMFS_COMPRESSION_TYPES[@]}"
-		do
-			KOPTION_VALUE=n
-			if [[ "${KNOWN_INITRAMFS_COMPRESSION_TYPE}" == "${compress_config}" ]]
-			then
-				KOPTION_VALUE=y
-			fi
-
-			if [ ${KV_NUMERIC} -ge 4010 ]
-			then
-				kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_COMPRESSION_${KNOWN_INITRAMFS_COMPRESSION_TYPE}" "${KOPTION_VALUE}"
-
-				if [[ "${KOPTION_VALUE}" == "y" && "${KNOWN_INITRAMFS_COMPRESSION_TYPE}" != "NONE" ]]
-				then
-					# Make sure that the kernel can decompress our initramfs
-					kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_RD_${KNOWN_INITRAMFS_COMPRESSION_TYPE}" "${KOPTION_VALUE}"
-				fi
-			else
-				[[ "${KNOWN_INITRAMFS_COMPRESSION_TYPE}" == "NONE" ]] && continue
-
-				# In <linux-4.10, to control used initramfs compression, we have to
-				# disable every supported compression type except compression type
-				# we want to use, (see $KERNEL_DIR/usr/Makefile).
-				kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_RD_${KNOWN_INITRAMFS_COMPRESSION_TYPE}" "${KOPTION_VALUE}"
-			fi
-		done
+		set_initramfs_compression_method "${KERNEL_OUTPUTDIR}/.config"
 
 		if [ -f "${KCONFIG_MODIFIED_MARKER}" ]
 		then

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     18ef4af6cc34289077b3c345d3cf05a6286d1501
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 13 21:52:32 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jan 13 23:36:56 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=18ef4af6

Makefile: Sort generated kernel config

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 87c758f..a3efcd2 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ distclean: clean
 	if grep -sq THIS_CONFIG_IS_BROKEN $< ; then \
 		cat $< >$@ ; \
 	else \
-		perl merge.pl $< $(BASE_KCONF) > $@ ; \
+		perl merge.pl $< $(BASE_KCONF) | sort > $@ ; \
 	fi ;
 
 %.8: doc/%.8.txt doc/asciidoc.conf Makefile genkernel

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     a6223abe3b87bc544445f1b2ee51019084209181
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 13 00:04:17 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jan 13 23:36:56 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a6223abe

gen_initramfs.sh: append_splash(): Move check for splash_geninitramfs to determine_real_args()

This will allow us to fail early if splash_geninitramfs isn't available.

Bug: https://bugs.gentoo.org/705304
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 8 ++++++++
 gen_initramfs.sh     | 5 -----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 61521d6..fffb3e9 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -848,6 +848,14 @@ determine_real_args() {
 			gen_die "--multipath requires --lvm but --no-lvm is set!"
 		fi
 
+		if isTrue "${SPLASH}"
+		then
+			if ! hash splash_geninitramfs &>/dev/null
+			then
+				gen_die "splash_geninitramfs is required for --splash but was not found!"
+			fi
+		fi
+
 		if isTrue "${SSH}"
 		then
 			local ssh_authorized_keys_file=$(expand_file "${SSH_AUTHORIZED_KEYS_FILE}")

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 783d9a7..0ff4759 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -996,11 +996,6 @@ append_splash() {
 		rm -r "${TDIR}" || gen_die "Failed to clean out existing '${TDIR}'!"
 	fi
 
-	if ! hash splash_geninitramfs &>/dev/null
-	then
-		gen_die "Unable to generate splash, 'splash_geninitramfs' was not found!"
-	fi
-
 	mkdir "${TDIR}" || gen_die "Failed to create '${TDIR}'!"
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     f9be31c0da7e7ec5b842a16ed6805ae66c0a1ca2
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 21:59:59 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 22:17:45 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f9be31c0

gen_configkernel.sh: config_kernel(): Make sure kernel supports set initramfs compression method

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index ea7701f..d651b0c 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -301,6 +301,9 @@ config_kernel() {
 			print_info 2 "$(get_indent 1)>> CONFIG_INITRAMFS_SOURCE is already set; Unsetting to avoid clashing with --integrated-initramfs ..."
 			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_SOURCE" ""
 		fi
+	elif isTrue "${COMPRESS_INITRD}"
+	then
+		set_initramfs_compression_method "${KERNEL_OUTPUTDIR}/.config"
 	fi
 
 	# Force this on if we are using --genzimage

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     851a02a5006bb8603f1749f8995407c12ed81488
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 22:01:29 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 22:17:45 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=851a02a5

gen_configkernel.sh: config_kernel(): Make sure kernel supports initramfs

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index d651b0c..2f9a6a5 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -291,6 +291,12 @@ config_kernel() {
 	local -a required_kernel_options
 	[ -f "${KCONFIG_MODIFIED_MARKER}" ] && rm "${KCONFIG_MODIFIED_MARKER}"
 
+	# Ensure kernel supports initramfs
+	if isTrue "${BUILD_RAMDISK}"
+	then
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_INITRD" "y"
+	fi
+
 	# --integrated-initramfs handling
 	if isTrue "${INTEGRATED_INITRAMFS}"
 	then

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     a2b94a89ec79a208d18e08bc063ff7f27949904a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 14 22:54:32 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 22:54:32 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a2b94a89

genkernel: bump to v4.0.2

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 2e0aca9..8461685 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.1'
+GK_V='4.0.2'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     ae029bbb6836e5a68d87309f7e321dd1062f6c70
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 23 17:55:55 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 17:57:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ae029bbb

sandbox: Set unique SANDBOX_LOG values to avoid collisions

Bug: https://bugs.gentoo.org/704848
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 821f150..1297732 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -750,6 +750,7 @@ dropbear_create_key() {
 
 	if isTrue "${SANDBOX}"
 	then
+		envvars+=( "SANDBOX_LOG='$(get_temp_file "sandbox_XXXXXX.log")'" )
 		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}:/proc/thread-self/attr/fscreate'" )
 	fi
 
@@ -827,6 +828,7 @@ dropbear_generate_key_info_file() {
 
 	if isTrue "${SANDBOX}"
 	then
+		envvars+=( "SANDBOX_LOG='$(get_temp_file "sandbox_XXXXXX.log")'" )
 		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}:/proc/thread-self/attr/fscreate'" )
 	fi
 
@@ -1057,6 +1059,29 @@ get_tc_vars() {
 	echo "${tc_vars[@]}"
 }
 
+# @FUNCTION: get_temp_file
+# @USAGE: [<TEMPLATE>] [<TMPDIR>]
+# @DESCRIPTION:
+# Create and return a temporary file (wrapper for mktemp with
+# built-in error checking and handling).
+#
+# <TEMPLATE> TEMPLATE must contain at least 3 consecutive 'X's in
+#            last component.
+#            Defaults to tmp_XXXXXXXX
+#
+# <TMPDIR>   Directory where the temporary file will be created in.
+#            Defaults to $TEMP
+get_temp_file() {
+	local template=${1:-"tmp_XXXXXXXX"}
+	local tmpdir=${2:-"${TEMP}"}
+	local tempfile=$(mktemp -p "${tmpdir}" ${template} 2>/dev/null)
+
+	[ -z "${tempfile}" ] \
+		&& gen_die "$(get_useful_function_stack "${FUNCNAME}")'mktemp -p \"${tmpdir}\" ${template}' failed!"
+
+	echo "${tempfile}"
+}
+
 get_useful_function_stack() {
 	local end_function=${1:-${FUNCNAME}}
 	local n_functions=${#FUNCNAME[@]}
@@ -1422,6 +1447,7 @@ gkbuild() {
 
 	if isTrue "${SANDBOX}"
 	then
+		envvars+=( "SANDBOX_LOG='$(get_temp_file "sandbox_XXXXXX.log")'" )
 		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}:/proc/thread-self/attr/fscreate'" )
 	fi
 
@@ -1477,6 +1503,7 @@ unpack() {
 
 	if isTrue "${SANDBOX}"
 	then
+		envvars+=( "SANDBOX_LOG='$(get_temp_file "sandbox_XXXXXX.log")'" )
 		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}:/proc/thread-self/attr/fscreate'" )
 	fi
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     679f57ca2e331ef3f8751808989ef8f69b6434fe
Author:     Michael Gerlach <n3ph <AT> cccfr <DOT> de>
AuthorDate: Thu Feb 13 12:57:19 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 13:32:20 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=679f57ca

gen_initramfs.sh: append_splash(): Fix splash_geninitramfs error handling

Closes: https://bugs.gentoo.org/709478
Signed-off-by: Michael Gerlach <n3ph <AT> cccfr.de>
Closes: https://github.com/gentoo/genkernel/pull/13
Signed-off-by: Thomas Deutschmann <whissi <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 0ff4759..2ad4e64 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1014,7 +1014,7 @@ append_splash() {
 	local res_param=""
 	[ -n "${SPLASH_RES}" ] && res_param="-r ${SPLASH_RES}"
 	splash_geninitramfs -c "${TDIR}" ${res_param} ${SPLASH_THEME} \
-		| gen_die "Failed to build splash cpio archive"
+		|| gen_die "Failed to build splash cpio archive"
 
 	if [ -e "/usr/share/splashutils/initrd.splash" ]
 	then

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     5e04dec1c0ab91594f1c03da4cc4e58e4426ee94
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  3 23:49:49 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar  3 23:53:13 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5e04dec1

genkernel: bump to v4.0.3

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 8461685..a2c358d 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.2'
+GK_V='4.0.3'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     37fd6919ed868aeb9f45fa0d908769fc250ae90f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  5 14:36:57 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar  5 14:36:57 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=37fd6919

genkernel: don't filter MAKEOPTS environment variable

Since commit 2c91f07c4a459efb6a8fbc11ec2525cc3020b96f we are filtering
any already set environment variable named like a genkernel option to
avoid clashing with default values.

However, MAKEOPTS is a special variable and it's common in Gentoo
that tools will honor this environment variable.

This commit will change genkernel to no longer filter an already
set MAKEOPTS environment variable.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/genkernel b/genkernel
index a2c358d..68ce1a9 100755
--- a/genkernel
+++ b/genkernel
@@ -42,6 +42,11 @@ then
 
 	for GK_SETTING in "${GK_SETTINGS[@]}"
 	do
+		if [[ "${GK_SETTING}" == "MAKEOPTS" ]]
+		then
+			continue
+		fi
+
 		for var_to_unset in ${GK_SETTING} CMD_${GK_SETTING}
 		do
 			if [ -n "${!var_to_unset}" ]

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     42826cedf4370aabbd5cbf3657ae48e576af0c37
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  5 15:09:41 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar  5 15:09:41 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=42826ced

genkernel: bump to v4.0.4

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 68ce1a9..6163abb 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.3'
+GK_V='4.0.4'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     44e9f8e0794c76de0146fd6037945c8af4476e5b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 25 14:02:27 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 14:02:27 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=44e9f8e0

genkernel: bump to v4.0.5

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 6163abb..857d3f5 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.4'
+GK_V='4.0.5'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     c0e013c9770eca18ea6fc68c87709d6fc6b1dc41
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  7 22:56:13 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Apr  7 22:59:57 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c0e013c9

gen_determineargs.sh: determine_real_args(): Error out early when already running within a sandbox

We cannot spawn a sandbox when we are already running within a sandbox.
This commit will make genkernel error out early to tell user about
the problem.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 6c5d01c..95ec402 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -1012,6 +1012,11 @@ determine_real_args() {
 		SANDBOX_COMMAND=
 		if isTrue "${SANDBOX}"
 		then
+			if [ ${SANDBOX_ON} -eq 1 ]
+			then
+				gen_die "SANDBOX_ON=1 detected -- You cannot use --sandbox when already running within a sandbox!"
+			fi
+
 			SANDBOX_COMMAND="$(which sandbox 2>/dev/null)"
 			if [ -z "${SANDBOX_COMMAND}" ]
 			then

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     c9c666e64e661d3c7f98fa25a1a87d40c8bc4440
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 12:47:31 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 12:49:02 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c9c666e6

genkernel: bump to v4.0.6

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 857d3f5..95d3e72 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.5'
+GK_V='4.0.6'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     17a3633dfca328edb40d46b692476ca87a14b9a7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 11 19:34:59 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Apr 11 19:43:05 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=17a3633d

Makefile: run shellcheck against initramfs' scripts

This should help us catching fatal errors like bug 717102
before release.

Bug: https://bugs.gentoo.org/717102
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 Makefile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a3efcd2..e423ab0 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ else
 	@true
 endif
 
-dist: verify-doc check-git-repository distclean $(EXTRA_DIST)
+dist: verify-shellscripts-initramfs verify-doc check-git-repository distclean $(EXTRA_DIST)
 	mkdir "$(distdir)"
 	git ls-files -z | xargs -0 cp --no-dereference --parents --target-directory="$(distdir)" \
 		$(EXTRA_DIST)
@@ -89,3 +89,13 @@ verify-doc: doc/genkernel.8.txt
 		exit 1 ; \
 	fi ; \
 	rm -f faildoc
+
+verify-shellscripts-initramfs:
+# we need to check every file because a fatal error in
+# an included file (SC1094) is just a warning at the moment
+	shellcheck \
+		--external-sources \
+		--source-path SCRIPTDIR \
+		--severity error \
+		defaults/linuxrc \
+		defaults/initrd.scripts

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     1a63cc1ca74452c21508c529141b318d1ded44a0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 11 19:44:38 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Apr 11 19:44:38 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1a63cc1c

genkernel: bump to v4.0.7

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 95d3e72..33dd89d 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.6'
+GK_V='4.0.7'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     2948a542da6964a4f61a71fd5253c97f803eac34
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 11 23:12:38 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Apr 11 23:12:38 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2948a542

gen_determineargs.sh: determine_real_args(): Quote $SANDBOX_ON

$SANDBOX_ON can be unset causing 'unary operator expected' error.

Fixes c0e013c ("gen_determineargs.sh: determine_real_args(): Error out early when already running within a sandbox")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 95ec402..b1c038d 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -1012,7 +1012,7 @@ determine_real_args() {
 		SANDBOX_COMMAND=
 		if isTrue "${SANDBOX}"
 		then
-			if [ ${SANDBOX_ON} -eq 1 ]
+			if [[ "${SANDBOX_ON}" == "1" ]]
 			then
 				gen_die "SANDBOX_ON=1 detected -- You cannot use --sandbox when already running within a sandbox!"
 			fi

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     6d3f9e4dbfbd42d8e57855785a7f6f73e84c96b7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 15 01:42:06 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 01:42:06 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6d3f9e4d

genkernel: bump to v4.0.8

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 33dd89d..1408fc0 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.7'
+GK_V='4.0.8'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     b3d1b0139a3fb021e934d8a096c6728e15552613
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 15 15:18:00 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 17:04:51 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b3d1b013

gen_initramfs.sh: append_dropbear(): Fix error message shown when net-misc/dropbear is required

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 46b924d..651bfbf 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1239,8 +1239,8 @@ append_dropbear() {
 			then
 				print_info 3 "$(get_indent 2)${PN}: >> Will use existing '${dropbear_command}' program from path to create missing keys ..."
 			else
-				local error_msg="Need to generate '${required_host_keys[*]}' but '${dropbear_command}'"
-				error_msg=" program is missing. Please install net-misc/dropbear and re-run genkernel!"
+				local error_msg="Need to generate '${required_dropbear_host_keys[*]}' but '${dropbear_command}'"
+				error_msg+=" program is missing. Please install net-misc/dropbear and re-run genkernel!"
 				gen_die "${error_msg}"
 			fi
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     04f9b87d25598130f4e2c91b9040b5f8638a8824
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 15 15:13:44 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 17:04:01 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=04f9b87d

gen_initramfs.sh: copy_system_binaries(): Don't check for non-existing linked libraries

lddtree will always report "not found" when doing cross-compile.

Because we will error out later nonetheless when copying will fail, we don't
need such a check in advance.

Closes: https://bugs.gentoo.org/727442
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index d055b24..46b924d 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -135,11 +135,6 @@ copy_system_binaries() {
 			print_info 5 "System binary dirname set to '${base_dir}'."
 		fi
 
-		if LC_ALL=C "${LDDTREE_COMMAND}" "${binary}" 2>&1 | fgrep -q 'not found'
-		then
-			gen_die "$(get_useful_function_stack)System binary '${binary}' is linked to missing libraries and may need to be re-built!"
-		fi
-
 		local is_first=1
 		while IFS= read -r -u 3 binary_dependency
 		do

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     64242cfcdca6d70e7aefaab7e424ad818d701e54
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 02:02:58 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 02:02:58 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=64242cfc

gen_initramfs.sh: append_dropbear(): Add support for ed25519 host keys

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh     |  3 +++
 gen_initramfs.sh | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 1297732..eaba05a 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -789,6 +789,9 @@ dropbear_get_key_type_from_filename() {
 		*_ecdsa_*)
 			type=ecdsa
 			;;
+		*_ed25519_*)
+			type=ed25519
+			;;
 		*_rsa_*)
 			type=rsa
 			;;

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 651bfbf..fd9583b 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1180,6 +1180,12 @@ append_dropbear() {
 				missing_ssh_host_keys=yes
 			fi
 
+			if [ ! -f "/etc/ssh/ssh_host_ed25519_key" ]
+			then
+				print_info 3 "$(get_indent 2)${PN}: >> SSH host key '/etc/ssh/ssh_host_ed25519_key' is missing!"
+				missing_ssh_host_keys=yes
+			fi
+
 			if isTrue "${missing_ssh_host_keys}"
 			then
 				# Should only happen when installing a new system ...
@@ -1190,6 +1196,7 @@ append_dropbear() {
 
 		local -a required_dropbear_host_keys=(
 			/etc/dropbear/dropbear_ecdsa_host_key
+			/etc/dropbear/dropbear_ed25519_host_key
 			/etc/dropbear/dropbear_rsa_host_key
 		)
 
@@ -1218,6 +1225,12 @@ append_dropbear() {
 				then
 					print_info 1 "$(get_indent 2)${PN}: >> Dropbear host key '${required_key}' exists but is older than '/etc/ssh/ssh_host_ecdsa_key'; Removing to force update due to --ssh-host-key=create-from-host ..."
 					rm "${required_key}" || gen_die "Failed to remove outdated '${required_key}' file!"
+				elif [[ "${SSH_HOST_KEYS}" == 'create-from-host' ]] \
+					&& [[ "${required_key}" == *_ed25519_* ]] \
+					&& [[ "${required_key}" -ot "/etc/ssh/ssh_host_ed25519_key" ]]
+				then
+					print_info 1 "$(get_indent 2)${PN}: >> Dropbear host key '${required_key}' exists but is older than '/etc/ssh/ssh_host_ed25519_key'; Removing to force update due to --ssh-host-key=create-from-host ..."
+					rm "${required_key}" || gen_die "Failed to remove outdated '${required_key}' file!"
 				else
 					print_info 3 "$(get_indent 2)${PN}: >> Dropbear host key '${required_key}' exists!"
 					unset required_dropbear_host_keys[${i}]
@@ -1261,8 +1274,8 @@ append_dropbear() {
 			print_info 2 "$(get_indent 2)${PN}: >> Using existing dropbear host keys from /etc/dropbear ..."
 		fi
 
-		cp -aL --target-directory "${initramfs_dropbear_dir}" /etc/dropbear/{dropbear_rsa_host_key,dropbear_ecdsa_host_key} \
-			|| gen_die "Failed to copy '/etc/dropbear/{dropbear_rsa_host_key,dropbear_ecdsa_host_key}'"
+		cp -aL --target-directory "${initramfs_dropbear_dir}" /etc/dropbear/dropbear_{rsa,ecdsa,ed25519}_host_key \
+			|| gen_die "Failed to copy '/etc/dropbear/dropbear_{rsa,ecdsa,ed25519}_host_key'"
 
 		# Try to show embedded dropbear host key details for security reasons.
 		# We do it that complicated to get common used formats.

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     6de6fb24e4bb8e5008566e930ee5fa0fdfd65985
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 23 18:41:05 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jun 23 18:41:05 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6de6fb24

genkernel: bump to v4.0.9

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 1408fc0..0856e25 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.8'
+GK_V='4.0.9'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     c8dcd6cda6a60e59d4891b9b3902ef641afc1d1b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 16:19:59 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:29:15 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c8dcd6cd

gen_determineargs.sh: determine_real_args(): Fix unsetting toolchain variable

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index fca82b2..0cbba36 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -264,7 +264,7 @@ determine_real_args() {
 	for tc_var in ${tc_vars}
 	do
 		tc_varname_build="BUILD_${tc_var}"
-		unset tc_var ${tc_varname_build}
+		unset ${tc_var} ${tc_varname_build}
 	done
 	unset tc_var tc_varname_build tc_vars
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     6060765b464f990bc279c0aee623be84194066ef
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 15 21:34:45 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:29:15 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6060765b

gen_funcs.sh: check_distfiles(): Adjust pattern

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index eaba05a..8c6f412 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1806,7 +1806,7 @@ check_disk_space_requirements() {
 }
 
 check_distfiles() {
-	local source_files=( $(compgen -A variable |grep '^GKPKG_.*SRCTAR$') )
+	local source_files=( $(compgen -A variable |grep '^GKPKG_.*_SRCTAR$') )
 
 	local -a missing_sources
 	local source_file=

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     f8ce2893eaad443efd90b5d93a11e093380113df
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 15 21:35:50 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:29:15 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f8ce2893

gen_determineargs.sh: determine_real_args(): Fix style

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index b1c038d..fca82b2 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -591,8 +591,8 @@ determine_real_args() {
 	vars_to_initialize+=( "BUSYBOX_CONFIG" )
 	vars_to_initialize+=( "DEFAULT_KERNEL_CONFIG" )
 
-	local binpkgs=( $(compgen -A variable |grep '^GKPKG_.*BINPKG$') )
-	local binpkg=
+	local binpkgs=( $(compgen -A variable |grep '^GKPKG_.*_BINPKG$') )
+	local binpkg
 	for binpkg in "${binpkgs[@]}"
 	do
 		pkg_prefixes+=( "${binpkg%_BINPKG}" )
@@ -608,7 +608,7 @@ determine_real_args() {
 	done
 	unset v vars_to_initialize
 
-	declare -gA GKPKG_LOOKUP_TABLE=
+	declare -gA GKPKG_LOOKUP_TABLE=()
 	local pn_varname= pn=
 	for v in "${pkg_prefixes[@]}"
 	do

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     0b5192921d06797c806bf908a0e88c1269f56794
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 14:34:22 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:29:15 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0b519292

gen_configkernel.sh: set_initramfs_compression_method() refactored

- Add handling for compression method "best" and "fastest".

- Make use of new get_initramfs_compression_method_by_{compression,speed}
  functions.

- Set CONFIG_RD_<TYPE>=n or CONFIG_INITRAMFS_COMPRESSION_<TYPE>=n
  only when required to avoid second `make oldconfig` call due to
  changed .config file.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh  | 128 +++++++++++++++++++++++++++++++++++----------------
 gen_determineargs.sh |   2 +
 2 files changed, 90 insertions(+), 40 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 1a7d3d3..6ee57ed 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -119,63 +119,105 @@ set_initramfs_compression_method() {
 
 	local kernel_config=${1}
 
-	local compress_config=NONE
 	local -a KNOWN_INITRAMFS_COMPRESSION_TYPES=()
 	KNOWN_INITRAMFS_COMPRESSION_TYPES+=( NONE )
-	KNOWN_INITRAMFS_COMPRESSION_TYPES+=( GZIP )
-	KNOWN_INITRAMFS_COMPRESSION_TYPES+=( BZIP2 )
-	KNOWN_INITRAMFS_COMPRESSION_TYPES+=( LZMA )
-	KNOWN_INITRAMFS_COMPRESSION_TYPES+=( XZ )
-	KNOWN_INITRAMFS_COMPRESSION_TYPES+=( LZO )
-	KNOWN_INITRAMFS_COMPRESSION_TYPES+=( LZ4 )
-
-	case ${COMPRESS_INITRD_TYPE} in
-		gz)
-			compress_config='GZIP'
-			;;
-		bz2)
-			compress_config='BZIP2'
-			;;
-		lzma)
-			compress_config='LZMA'
-			;;
-		xz|best|fastest)
-			compress_config='XZ'
-			;;
-		lzop)
-			compress_config='LZO'
-			;;
-		lz4)
-			compress_config='LZ4'
-			;;
-	esac
+	KNOWN_INITRAMFS_COMPRESSION_TYPES+=( $(get_initramfs_compression_method_by_compression) )
+
+	if [[ "${COMPRESS_INITRD_TYPE}" =~ ^(BEST|FASTEST)$ ]]
+	then
+		print_info 5 "Determining '${COMPRESS_INITRD_TYPE}' compression method for initramfs ..."
+		local ranked_methods
+		if [[ "${COMPRESS_INITRD_TYPE}" == "BEST" ]]
+		then
+			ranked_methods=( $(get_initramfs_compression_method_by_compression) )
+		else
+			ranked_methods=( $(get_initramfs_compression_method_by_speed) )
+		fi
+
+		local ranked_method
+		for ranked_method in "${ranked_methods[@]}"
+		do
+			print_info 5 "Checking if we can use '${ranked_method}' compression ..."
+
+			# Do we have the user space tool?
+			local compression_tool=${GKICM_LOOKUP_TABLE_CMD[${ranked_method}]/%\ */}
+			if ! hash ${compression_tool} &>/dev/null
+			then
+				print_info 5 "Cannot use '${ranked_method}' compression, the tool '${compression_tool}' to compress initramfs was not found. Is ${GKICM_LOOKUP_TABLE_PKG[${ranked_method}]} installed?"
+				continue
+			fi
+
+			# Is the kernel able to decompress?
+			local koption="CONFIG_RD_${ranked_method}"
+			local value_koption=$(kconfig_get_opt "${kernel_config}" "${koption}")
+			if [[ "${value_koption}" != "y" ]]
+			then
+				print_info 5 "Cannot use '${ranked_method}' compression, kernel option '${koption}' is not set!"
+				continue
+			fi
+
+			print_info 5 "Will use '${ranked_method}' compression -- all requirements are met!"
+			COMPRESS_INITRD_TYPE=${ranked_method}
+			break
+		done
+		unset ranked_method ranked_methods koption value_koption
+
+		if [[ "${COMPRESS_INITRD_TYPE}" =~ ^(BEST|FASTEST)$ ]]
+		then
+			gen_die "None of the initramfs compression methods we tried are supported by your kernel (config file \"${kernel_config}\"), strange!?"
+		fi
+	fi
+
+	local KOPTION_PREFIX=CONFIG_RD_
+	[ ${KV_NUMERIC} -ge 4010 ] && KOPTION_PREFIX=CONFIG_INITRAMFS_COMPRESSION_
+
+	# CONFIG_INITRAMFS_<TYPE> options are only used when CONFIG_INITRAMFS_SOURCE
+	# is set. However, we cannot just check for INTEGRATED_INITRAMFS option here
+	# because on first run kernel will still get compiled without
+	# CONFIG_INITRAMFS_SOURCE set.
+	local has_initramfs_source=no
+	local cfg_CONFIG_INITRAMFS_SOURCE=$(kconfig_get_opt "${kernel_config}" "CONFIG_INITRAMFS_SOURCE")
+	[[ -n "${cfg_CONFIG_INITRAMFS_SOURCE}" && ${#cfg_CONFIG_INITRAMFS_SOURCE} -gt 2 ]] && has_initramfs_source=yes
 
 	local KNOWN_INITRAMFS_COMPRESSION_TYPE
-	local KOPTION_VALUE
+	local KOPTION_VALUE KOPTION_CURRENT_VALUE
 	for KNOWN_INITRAMFS_COMPRESSION_TYPE in "${KNOWN_INITRAMFS_COMPRESSION_TYPES[@]}"
 	do
 		KOPTION_VALUE=n
-		if [[ "${KNOWN_INITRAMFS_COMPRESSION_TYPE}" == "${compress_config}" ]]
+		if [[ "${KNOWN_INITRAMFS_COMPRESSION_TYPE}" == "${COMPRESS_INITRD_TYPE}" ]]
 		then
 			KOPTION_VALUE=y
 		fi
 
-		if [ ${KV_NUMERIC} -ge 4010 ]
+		if isTrue "${has_initramfs_source}"
 		then
-			kconfig_set_opt "${kernel_config}" "CONFIG_INITRAMFS_COMPRESSION_${KNOWN_INITRAMFS_COMPRESSION_TYPE}" "${KOPTION_VALUE}"
+			KOPTION_CURRENT_VALUE=$(kconfig_get_opt "${kernel_config}" "${KOPTION_PREFIX}${KNOWN_INITRAMFS_COMPRESSION_TYPE}")
+			if [[ -n "${KOPTION_CURRENT_VALUE}" ]] \
+				&& [[ "${KOPTION_VALUE}" != "${KOPTION_CURRENT_VALUE}" ]]
+			then
+				# We have to ensure that only the initramfs compression
+				# we want to use is enabled or the last one listed in
+				# $KERNEL_DIR/usr/Makefile will be used
+				# However, no need to set =n value when option isn't set
+				# at all (this will save us one additional "make oldconfig"
+				# run due to changed kernel options).
+				kconfig_set_opt "${kernel_config}" "${KOPTION_PREFIX}${KNOWN_INITRAMFS_COMPRESSION_TYPE}" "${KOPTION_VALUE}"
+			fi
 
-			if [[ "${KOPTION_VALUE}" == "y" && "${KNOWN_INITRAMFS_COMPRESSION_TYPE}" != "NONE" ]]
+			if [[ "${KOPTION_VALUE}" == "y" ]]
 			then
-				# Make sure that the kernel can decompress our initramfs
-				kconfig_set_opt "${kernel_config}" "CONFIG_RD_${KNOWN_INITRAMFS_COMPRESSION_TYPE}" "${KOPTION_VALUE}"
+				echo "${KOPTION_PREFIX}${KNOWN_INITRAMFS_COMPRESSION_TYPE}" >> "${KCONFIG_REQUIRED_OPTIONS}" \
+					|| gen_die "Failed to add '${KOPTION_PREFIX}${KNOWN_INITRAMFS_COMPRESSION_TYPE}' to '${KCONFIG_REQUIRED_OPTIONS}'!"
 			fi
-		else
-			[[ "${KNOWN_INITRAMFS_COMPRESSION_TYPE}" == "NONE" ]] && continue
+		fi
 
-			# In <linux-4.10, to control used initramfs compression, we have to
-			# disable every supported compression type except compression type
-			# we want to use, (see $KERNEL_DIR/usr/Makefile).
+		if [[ "${KOPTION_VALUE}" == "y" && "${KNOWN_INITRAMFS_COMPRESSION_TYPE}" != "NONE" ]]
+		then
+			# Make sure that the kernel can always decompress our initramfs
 			kconfig_set_opt "${kernel_config}" "CONFIG_RD_${KNOWN_INITRAMFS_COMPRESSION_TYPE}" "${KOPTION_VALUE}"
+
+			echo "CONFIG_RD_${KNOWN_INITRAMFS_COMPRESSION_TYPE}" >> "${KCONFIG_REQUIRED_OPTIONS}" \
+				|| gen_die "Failed to add 'CONFIG_RD_${KNOWN_INITRAMFS_COMPRESSION_TYPE}' to '${KCONFIG_REQUIRED_OPTIONS}'!"
 		fi
 	done
 }
@@ -965,6 +1007,12 @@ config_kernel() {
 			compile_generic olddefconfig kernel 2>/dev/null
 		fi
 
+		if [ -f "${KCONFIG_REQUIRED_OPTIONS}" ]
+		then
+			# Pick up required options from other functions
+			required_kernel_options+=( $(cat "${KCONFIG_REQUIRED_OPTIONS}" | sort -u) )
+		fi
+
 		print_info 2 "$(get_indent 1)>> Checking if required kernel options are still present ..."
 		local required_kernel_option=
 		for required_kernel_option in "${required_kernel_options[@]}"

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 406d1d5..956e3bf 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -479,6 +479,8 @@ determine_real_args() {
 
 	declare -gr KCONFIG_MODIFIED_MARKER="${TEMP}/.kconfig_modified"
 
+	declare -gr KCONFIG_REQUIRED_OPTIONS="${TEMP}/.kconfig_required_options"
+
 	if [ -n "${CMD_CROSS_COMPILE}" ]
 	then
 		if ! isTrue "$(is_valid_triplet "${CMD_CROSS_COMPILE}")"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     d5097672ea7de99c74a43a5fd9e90858f2fee956
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 16 01:48:49 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:28:40 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d5097672

gen_configkernel.sh: config_kernel(): Don't set CONFIG_CRYPTO_AES_{X86_64,586} for >=linux-5.4

Options were removed in linux-5.4 [Link 1].

Link 1: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1d2c3279311e4f03fcf164e1366f2fda9f4bfccf
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

merge

 gen_configkernel.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 7804949..1a7d3d3 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -533,8 +533,15 @@ config_kernel() {
 			then
 				kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_SHA1_SSSE3" "${cfg_CONFIG_CRYPTO_AES}"
 				kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_SHA256_SSSE3" "${cfg_CONFIG_CRYPTO_AES}"
-				kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_AES_X86_64" "${cfg_CONFIG_CRYPTO_AES}"
-			else
+
+				if [ ${KV_NUMERIC} -lt 5004 ]
+				then
+					kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_AES_X86_64" "${cfg_CONFIG_CRYPTO_AES}"
+				fi
+			fi
+
+			if [ ${KV_NUMERIC} -lt 5004 ]
+			then
 				kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_AES_586" "${cfg_CONFIG_CRYPTO_AES}"
 			fi
 		fi

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     550341ce8adf4fed720939050f36a53d6044227d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 14:42:53 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:29:15 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=550341ce

gen_configkernel.sh: config_kernel(): Re-order config checks

Re-order config checks for better logical grouping.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 47 +++++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 6ee57ed..b76d1b7 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -333,25 +333,35 @@ config_kernel() {
 	local -a required_kernel_options
 	[ -f "${KCONFIG_MODIFIED_MARKER}" ] && rm "${KCONFIG_MODIFIED_MARKER}"
 
-	# Ensure kernel supports initramfs
 	if isTrue "${BUILD_RAMDISK}"
 	then
+		# We really need this or we will fail to boot
+		print_info 2 "$(get_indent 1)>> Ensure that required kernel options for genkernel's initramfs usage are set ..."
+
+		# Ensure kernel supports initramfs
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_INITRD" "y"
-	fi
 
-	# --integrated-initramfs handling
-	if isTrue "${INTEGRATED_INITRAMFS}"
-	then
-		local cfg_CONFIG_INITRAMFS_SOURCE=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_SOURCE")
-		if [[ -n "${cfg_CONFIG_INITRAMFS_SOURCE}" && ${#cfg_CONFIG_INITRAMFS_SOURCE} -gt 2 ]]
+		# Stuff required by init script
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_TTY" "y" \
+			&& required_kernel_options+=( 'CONFIG_TTY' )
+
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_UNIX98_PTYS" "y" \
+			&& required_kernel_options+=( 'CONFIG_UNIX98_PTYS' )
+
+		# --integrated-initramfs handling
+		if isTrue "${INTEGRATED_INITRAMFS}"
+		then
+			local cfg_CONFIG_INITRAMFS_SOURCE=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_SOURCE")
+			if [[ -n "${cfg_CONFIG_INITRAMFS_SOURCE}" && ${#cfg_CONFIG_INITRAMFS_SOURCE} -gt 2 ]]
+			then
+				# Checking value length to allow 'CONFIG_INITRAMFS_SOURCE=' and 'CONFIG_INITRAMFS_SOURCE=""'
+				print_info 2 "$(get_indent 1)>> CONFIG_INITRAMFS_SOURCE is already set; Unsetting to avoid clashing with --integrated-initramfs ..."
+				kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_SOURCE" ""
+			fi
+		elif isTrue "${COMPRESS_INITRD}"
 		then
-			# Checking value length to allow 'CONFIG_INITRAMFS_SOURCE=' and 'CONFIG_INITRAMFS_SOURCE=""'
-			print_info 2 "$(get_indent 1)>> CONFIG_INITRAMFS_SOURCE is already set; Unsetting to avoid clashing with --integrated-initramfs ..."
-			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_SOURCE" ""
+			set_initramfs_compression_method "${KERNEL_OUTPUTDIR}/.config"
 		fi
-	elif isTrue "${COMPRESS_INITRD}"
-	then
-		set_initramfs_compression_method "${KERNEL_OUTPUTDIR}/.config"
 	fi
 
 	# Force this on if we are using --genzimage
@@ -443,17 +453,6 @@ config_kernel() {
 		fi
 	fi
 
-	if isTrue "${BUILD_RAMDISK}"
-	then
-		# We really need this or we will fail to boot
-		print_info 2 "$(get_indent 1)>> Ensure that required kernel options for genkernel's initramfs usage are set ..."
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_TTY" "y" \
-			&& required_kernel_options+=( 'CONFIG_TTY' )
-
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_UNIX98_PTYS" "y" \
-			&& required_kernel_options+=( 'CONFIG_UNIX98_PTYS' )
-	fi
-
 	# If the user has configured DM as built-in, we need to respect that.
 	local cfg_CONFIG_BLK_DEV_DM=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM")
 	case "${cfg_CONFIG_BLK_DEV_DM}" in

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     7fab524616e5cba29598dba7e4d57014f2222433
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 14:46:21 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:29:15 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7fab5246

gen_funcs.sh: Fix duplicated tc-getSTRIP()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index e681c1e..984787b 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1294,11 +1294,7 @@ tc-getRANLIB() {
 }
 
 tc-getSTRIP() {
-	tc-getPROG STRIP strip
-}
-
-tc-getSTRIP() {
-	tc-getPROG STRIP strip "$@";
+	tc-getPROG STRIP strip "$@"
 }
 
 tc-is-cross-compiler() {

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     b432f67903a419af3189abe3637300a42554415d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 15:03:47 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:29:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b432f679

gen_compile.sh: compile_generic() refactored

- Use an array to construct command to run.

- Make sure we set all environment variables used by kernel's build
  system to honor our toolchain.
  Tested with with sys-devel/binutils-config[-native-symlinks]
  and sys-devel/gcc-config[-native-symlinks].

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_compile.sh | 117 +++++++++++++++++----------------------------------------
 gen_funcs.sh   |  22 +++++++++++
 2 files changed, 57 insertions(+), 82 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index e5254d7..0fa6912 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -80,85 +80,42 @@ compile_generic() {
 	local argstype=${2}
 	local RET
 
+	local -a compile_cmd=()
+
+	if [ ${NICE} -ne 0 ]
+	then
+		compile_cmd+=( nice "-n${NICE}" )
+	fi
+
 	case "${argstype}" in
 		kernel|kernelruntask)
 			if [ -z "${KERNEL_MAKE}" ]
 			then
 				gen_die "KERNEL_MAKE undefined - I don't know how to compile a kernel for this arch!"
 			else
-				local MAKE=${KERNEL_MAKE}
+				local -x MAKE=${KERNEL_MAKE}
+				compile_cmd+=( "${MAKE}" "${MAKEOPTS}" )
 			fi
 
-			# Build kernel compile parameter.
-			local ARGS=""
+			if [[ "${argstype}" == 'kernelruntask' ]]
+			then
+				# silent operation, forced -j1
+				compile_cmd+=( -s -j1 )
+			fi
 
-			# Allow for CC/LD... user override!
-			local -a kernel_vars
-			kernel_vars+=( 'ARCH' )
-			kernel_vars+=( 'AS' )
-			kernel_vars+=( 'CC' )
-			kernel_vars+=( 'LD' )
+			# Pass kernel compile parameter
+			compile_cmd+=( "ARCH='${KERNEL_ARCH}'" )
 
-			local kernel_var=
-			for kernel_var in "${kernel_vars[@]}"
+			local tc_var
+			for tc_var in AS AR CC LD NM OBJCOPY OBJDUMP READELF STRIP
 			do
-				local kernel_varname="KERNEL_${kernel_var}"
-				local kernel_default_varname="DEFAULT_${kernel_varname}"
-
-				if [[ -z "${!kernel_default_varname}" ]] \
-					|| [[ -n "${!kernel_default_varname}" ]] \
-					&& [[ "${!kernel_varname}" != "${!kernel_default_varname}" ]]
-				then
-					ARGS="${ARGS} ${kernel_var}=\"${!kernel_varname}\""
-				fi
+				compile_cmd+=( "${tc_var}='$(TC_PROG_TYPE=KERNEL tc-get${tc_var})'" )
 			done
-			unset kernel_var kernel_vars kernel_varname kernel_default_varname
 
-			if isTrue "$(tc-is-cross-compiler)"
-			then
-				local can_tc_cross_compile=no
-				local cpu_cbuild=${CBUILD%%-*}
-				local cpu_chost=${CHOST%%-*}
-
-				case "${cpu_cbuild}" in
-					powerpc64*)
-						if [[ "${cpu_chost}" == "powerpc" ]]
-						then
-							can_tc_cross_compile=yes
-						fi
-						;;
-					x86_64*)
-						if [[ "${cpu_chost}" == "i686" ]]
-						then
-							can_tc_cross_compile=yes
-						fi
-						;;
-				esac
-
-				if isTrue "${can_tc_cross_compile}"
-				then
-					local -a kernel_vars
-					kernel_vars+=( 'AS' )
-					kernel_vars+=( 'CC' )
-					kernel_vars+=( 'LD' )
-
-					local kernel_var=
-					for kernel_var in "${kernel_vars[@]}"
-					do
-						if [[ "${ARGS}" == *${kernel_var}=* ]]
-						then
-							# User wants to run specific program ...
-							continue
-						else
-							ARGS="${ARGS} ${kernel_var}=\"$(tc-get${kernel_var})\""
-						fi
-					done
-					unset kernel_var kernel_vars
-				else
-					ARGS="${ARGS} CROSS_COMPILE=\"${CHOST}-\""
-				fi
-				unset can_tc_cross_compile cpu_cbuild cpu_chost
-			fi
+			compile_cmd+=( "HOSTAR='$(tc-getBUILD_AR)'" )
+			compile_cmd+=( "HOSTCC='$(tc-getBUILD_CC)'" )
+			compile_cmd+=( "HOSTCXX='$(tc-getBUILD_CXX)'" )
+			compile_cmd+=( "HOSTLD='$(tc-getBUILD_LD)'" )
 
 			if [ -n "${KERNEL_OUTPUTDIR}" -a "${KERNEL_OUTPUTDIR}" != "${KERNEL_DIR}" ]
 			then
@@ -174,7 +131,7 @@ compile_generic() {
 					error_message+=" Please re-install a fresh kernel source!"
 					gen_die "${error_message}"
 				else
-					ARGS="${ARGS} O=\"${KERNEL_OUTPUTDIR}\""
+					compile_cmd+=( "O='${KERNEL_OUTPUTDIR}'" )
 				fi
 			fi
 			;;
@@ -184,34 +141,30 @@ compile_generic() {
 			gen_die "${error_msg}"
 			;;
 	esac
-	shift 2
 
-	if [ ${NICE} -ne 0 ]
-	then
-		NICEOPTS="nice -n${NICE} "
-	else
-		NICEOPTS=""
-	fi
+	compile_cmd+=( "${target}" )
+
+	print_info 3 "COMMAND: ${compile_cmd[*]}" 1 0 1
 
 	# the eval usage is needed in the next set of code
 	# as ARGS can contain spaces and quotes, eg:
 	# ARGS='CC="ccache gcc"'
-	if [ "${argstype}" == 'kernelruntask' ]
+	if [[ "${argstype}" == 'kernelruntask' ]]
 	then
-		# Silent operation, forced -j1
-		print_info 3 "COMMAND: ${NICEOPTS}${MAKE} ${MAKEOPTS} -j1 ${ARGS} ${target} $*" 1 0 1
-		eval ${NICEOPTS}${MAKE} -s ${MAKEOPTS} -j1 ${ARGS} ${target} $*
+		eval "${compile_cmd[@]}"
 		RET=$?
 	elif [ "${LOGLEVEL}" -gt 3 ]
 	then
 		# Output to stdout and logfile
-		print_info 3 "COMMAND: ${NICEOPTS}${MAKE} ${MAKEOPTS} ${ARGS} ${target} $*" 1 0 1
-		eval ${NICEOPTS}${MAKE} ${MAKEOPTS} ${ARGS} ${target} $* 2>&1 | tee -a "${LOGFILE}"
+		compile_cmd+=( "2>&1 | tee -a '${LOGFILE}'" )
+
+		eval "${compile_cmd[@]}"
 		RET=${PIPESTATUS[0]}
 	else
 		# Output to logfile only
-		print_info 3 "COMMAND: ${NICEOPTS}${MAKE} ${MAKEOPTS} ${ARGS} ${target} $*" 1 0 1
-		eval ${NICEOPTS}${MAKE} ${MAKEOPTS} ${ARGS} ${target} $* >> "${LOGFILE}" 2>&1
+		compile_cmd+=( ">> '${LOGFILE}' 2>&1" )
+
+		eval "${compile_cmd[@]}"
 		RET=$?
 	fi
 

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 81a7026..4d604e4 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1240,14 +1240,31 @@ tc-getAS() {
 	tc-getPROG AR ar "$@"
 }
 
+tc-getBUILD_AR() {
+	tc-getBUILD_PROG AR ar "$@"
+}
+
 tc-getBUILD_CC() {
 	tc-getBUILD_PROG CC gcc "$@"
 }
 
+tc-getBUILD_CPP() {
+	local cc=$(tc-getBUILD_CC)
+	tc-getPROG CPP "${cc} -E" "$@"
+}
+
 tc-getBUILD_CXX() {
 	tc-getBUILD_PROG CXX g++ "$@"
 }
 
+tc-getBUILD_LD() {
+	tc-getBUILD_PROG LD ld "$@"
+}
+
+tc-getBUILD_READELF() {
+	tc-getBUILD_PROG READELF readelf "$@"
+}
+
 tc-getCC() {
 	tc-getPROG CC gcc "$@"
 }
@@ -1277,6 +1294,10 @@ tc-getOBJDUMP() {
 	tc-getPROG OBJDUMP objdump "$@"
 }
 
+tc-getREADELF() {
+	tc-getPROG READELF readelf "$@"
+}
+
 tc-getBUILD_PROG() {
 	local vars="BUILD_$1 $1_FOR_BUILD HOST$1"
 	# respect host vars if not cross-compiling
@@ -1442,6 +1463,7 @@ gkbuild() {
 		"OBJCOPY='$(tc-getOBJCOPY)'"
 		"OBJDUMP='$(tc-getOBJDUMP)'"
 		"RANLIB='$(tc-getRANLIB)'"
+		"READELF='$(tc-getREADELF)'"
 		"STRIP='$(tc-getSTRIP)'"
 	)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     273895a03648c2175de1e40e50d32cde020def97
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 16:13:49 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:29:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=273895a0

gen_funcs.sh: get_tc_vars(): Add READELF and OBJDUMP

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 4d604e4..507fadf 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1080,7 +1080,9 @@ get_tc_vars() {
 	tc_vars+=( STRIP )
 	tc_vars+=( NM )
 	tc_vars+=( RANLIB )
+	tc_vars+=( READELF )
 	tc_vars+=( OBJCOPY )
+	tc_vars+=( OBJDUMP )
 	tc_vars+=( PKG_CONFIG )
 
 	echo "${tc_vars[@]}"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     b2cd6f1408b75dbef2bf24ffbff1e0f9376c94c3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 15:08:03 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:29:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b2cd6f14

gen_funcs.sh: _tc-getPROG(): Fix overriding of default program

tc-getBUILD_PROG() could pass multiple variables so we need to check
all variables until we find our config variable containing user's value.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 507fadf..6917202 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1167,8 +1167,16 @@ _tc-getPROG() {
 		type=KERNEL
 	fi
 
-	local prog_default_varname="DEFAULT_${type}_${var}"
-	local prog_override_varname="${type}_${var}"
+	local prog_default_varname=
+	local prog_override_varname=
+	for v in ${vars} ; do
+		prog_default_varname="DEFAULT_${type}_${v}"
+		if [[ -n "${!prog_default_varname}" ]]
+		then
+			prog_override_varname="${type}_${v}"
+			break
+		fi
+	done
 
 	if [[ -n "${!prog_default_varname}" ]] \
 		&& [[ "${!prog_override_varname}" != "${!prog_default_varname}" ]]

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     c0da04e2e1b224c5f153e81818d7734f4fbf7fe5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 14:47:25 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:29:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c0da04e2

gen_funcs.sh: tc-getRANLIB(): Normalized

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 984787b..81a7026 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1290,7 +1290,7 @@ tc-getPROG() {
 }
 
 tc-getRANLIB() {
-	tc-getPROG RANLIB ranlib
+	tc-getPROG RANLIB ranlib "$@"
 }
 
 tc-getSTRIP() {

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     a864c2fa9a75c488355a9f4821aa5bc97cc188c5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 16 17:56:38 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 17:56:38 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a864c2fa

gen_initramfs.sh: create_initramfs(): Call set_initramfs_compression_method() when not building kernel

We need to call set_initramfs_compression_method() manually when we didn't build
kernel in same run to ensure that $COMPRESS_INITRD_TYPE is initialized.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 617c656..ba7b5e8 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1912,6 +1912,13 @@ create_initramfs() {
 	else
 		if isTrue "${COMPRESS_INITRD}"
 		then
+			if ! isTrue "${BUILD_KERNEL}"
+			then
+				# We need to initialize COMPRESS_INITRD_TYPE in case it was set
+				# to best/fastest
+				set_initramfs_compression_method "${KERNEL_OUTPUTDIR}/.config"
+			fi
+
 			print_info 1 "$(get_indent 1)>> Compressing cpio data (${GKICM_LOOKUP_TABLE_EXT[${COMPRESS_INITRD_TYPE}]}) ..."
 			print_info 3 "COMMAND: ${GKICM_LOOKUP_TABLE_CMD[${COMPRESS_INITRD_TYPE}]} ${CPIO_ARCHIVE}" 1 0 1
 			${GKICM_LOOKUP_TABLE_CMD[${COMPRESS_INITRD_TYPE}]} "${CPIO_ARCHIVE}" || gen_die "Initramfs compression using '${GKICM_LOOKUP_TABLE_CMD[${COMPRESS_INITRD_TYPE}]}' failed"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     2192d8130e11d5aeca1d49c02f76edca5e96895c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 16 16:20:19 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 16:20:19 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2192d813

gen_configkernel.sh: config_kernel(): Ensure that CONFIG_INITRAMFS_SOURCE is always unset

config_kernel() runs only once. For this run, even when --integrated-initramfs is set,
the kernel option CONFIG_INITRAMFS_SOURCE should be unset *when* we are also tasked to
create an initramfs.

Otherwise, functions like set_initramfs_compression_method() can fail when used kernel
config had integrated initramfs but new kernel doesn't.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index b76d1b7..ba6d401 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -348,17 +348,17 @@ config_kernel() {
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_UNIX98_PTYS" "y" \
 			&& required_kernel_options+=( 'CONFIG_UNIX98_PTYS' )
 
-		# --integrated-initramfs handling
-		if isTrue "${INTEGRATED_INITRAMFS}"
+		# Make sure that CONFIG_INITRAMFS_SOURCE is unset so we don't clash
+		# with any other genkernel functionality.
+		local cfg_CONFIG_INITRAMFS_SOURCE=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_SOURCE")
+		if [[ -n "${cfg_CONFIG_INITRAMFS_SOURCE}" && ${#cfg_CONFIG_INITRAMFS_SOURCE} -gt 2 ]]
 		then
-			local cfg_CONFIG_INITRAMFS_SOURCE=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_SOURCE")
-			if [[ -n "${cfg_CONFIG_INITRAMFS_SOURCE}" && ${#cfg_CONFIG_INITRAMFS_SOURCE} -gt 2 ]]
-			then
-				# Checking value length to allow 'CONFIG_INITRAMFS_SOURCE=' and 'CONFIG_INITRAMFS_SOURCE=""'
-				print_info 2 "$(get_indent 1)>> CONFIG_INITRAMFS_SOURCE is already set; Unsetting to avoid clashing with --integrated-initramfs ..."
-				kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_SOURCE" ""
-			fi
-		elif isTrue "${COMPRESS_INITRD}"
+			# Checking value length to allow 'CONFIG_INITRAMFS_SOURCE=' and 'CONFIG_INITRAMFS_SOURCE=""'
+			print_info 2 "$(get_indent 1)>> CONFIG_INITRAMFS_SOURCE is set; Unsetting to avoid problems ..."
+			kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_SOURCE" ""
+		fi
+
+		if isTrue "${COMPRESS_INITRD}"
 		then
 			set_initramfs_compression_method "${KERNEL_OUTPUTDIR}/.config"
 		fi

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     9f2db2e36ca16832c88598eb86b8187f2e9806c5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 20 02:26:51 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 02:26:51 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9f2db2e3

gen_funcs.sh: tc-getAS(): Fix typo

Actually return AS and not AR.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index a58fbbb..2dfae7d 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1249,7 +1249,7 @@ tc-getAR() {
 }
 
 tc-getAS() {
-	tc-getPROG AR ar "$@"
+	tc-getPROG AS as "$@"
 }
 
 tc-getBUILD_AR() {

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     d3e5a4a5096bb7ee8e375e82d28a0b9c96b43656
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 20 15:40:06 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 15:40:06 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d3e5a4a5

genkernel: bump to v4.0.10

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index c0fd96d..e34bd78 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.9'
+GK_V='4.0.10'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     d1d7132dea49dd5b553818940d8785a5a4a94821
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 21:11:25 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 22:56:47 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d1d7132d

gen_initramfs: Fix style

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index ba7b5e8..fa6460c 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -488,7 +488,6 @@ append_e2fsprogs() {
 	unpack "$(get_gkpkg_binpkg "${PN}")" "${TDIR}"
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
-
 	log_future_cpio_content
 	find . -print0 | "${CPIO_COMMAND}" ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
@@ -515,7 +514,6 @@ append_b2sum() {
 	unpack "$(get_gkpkg_binpkg "${PN}")" "${TDIR}"
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
-
 	log_future_cpio_content
 	find . -print0 | "${CPIO_COMMAND}" ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append b2sum to cpio!"
@@ -835,7 +833,6 @@ append_xfsprogs() {
 	unpack "$(get_gkpkg_binpkg "${PN}")" "${TDIR}"
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
-
 	log_future_cpio_content
 	find . -print0 | "${CPIO_COMMAND}" ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
@@ -913,7 +910,6 @@ append_btrfs() {
 	unpack "$(get_gkpkg_binpkg "${PN}")" "${TDIR}"
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
-
 	log_future_cpio_content
 	find . -print0 | "${CPIO_COMMAND}" ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
@@ -1086,7 +1082,6 @@ append_strace() {
 
 append_overlay() {
 	cd "${INITRAMFS_OVERLAY}"  || gen_die "Failed to chdir to '${INITRAMFS_OVERLAY}'!"
-
 	log_future_cpio_content
 	find . -print0 | "${CPIO_COMMAND}" ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append overlay to cpio!"
@@ -1417,7 +1412,6 @@ append_dropbear() {
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
-
 	find . -print0 | "${CPIO_COMMAND}" ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
 		|| gen_die "Failed to append ${PN} to cpio!"
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     b01f68cd4af87bd16ca51b4a291d84271fe4ce51
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 21:10:11 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 22:56:47 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b01f68cd

genkernel: bump to v4.1.0_beta1

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index e34bd78..434d6be 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.0.10'
+GK_V='4.1.0_beta1'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     19df7f243f9440a8192d112363daa26aca69c846
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  1 18:08:44 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug  1 20:35:00 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=19df7f24

gen_initramfs.sh: create_initramfs(): Use correct kernel config

Bug: https://bugs.gentoo.org/733946
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index c583318..d1a0e33 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -2022,21 +2022,21 @@ create_initramfs() {
 
 	cd "${TEMP}" || gen_die "Failed to chdir to '${TEMP}'"
 
-	# NOTE: We do not work with ${KERNEL_CONFIG} here, since things like
-	#       "make oldconfig" or --no-clean could be in effect.
-	if [ -s "${KERNEL_OUTPUTDIR}/.config" ]
+	local kconfig_file_used="${KERNEL_CONFIG}"
+	if isTrue "${BUILD_KERNEL}"
 	then
-		local ACTUAL_KERNEL_CONFIG="${KERNEL_OUTPUTDIR}/.config"
-	else
-		local ACTUAL_KERNEL_CONFIG="${KERNEL_CONFIG}"
+		kconfig_file_used="${KERNEL_OUTPUTDIR}/.config"
 	fi
 
-	if isTrue "$(is_gzipped "${ACTUAL_KERNEL_CONFIG}")"
+	if isTrue "$(is_gzipped "${kconfig_file_used}")"
 	then
-		# Support --kernel-config=/proc/config.gz, mainly
-		local CONFGREP=zgrep
-	else
-		local CONFGREP=grep
+		print_info 5 "Compressed kernel config '${kconfig_file_used}' found; Must decompress to temporary file ..."
+
+		local kconfig_file_tmp="${TEMP}/current_kernel.config"
+		zcat "${kconfig_file_used}" > "${kconfig_file_tmp}" \
+			|| gen_die "Failed to decompress '${kconfig_file_used}' to '${kconfig_file_tmp}'!"
+
+		kconfig_file_used="${kconfig_file_tmp}"
 	fi
 
 	if isTrue "${INTEGRATED_INITRAMFS}"
@@ -2044,20 +2044,18 @@ create_initramfs() {
 		# Explicitly do not compress if we are integrating into the kernel.
 		# The kernel will do a better job of it than us.
 		mv "${CPIO_ARCHIVE}" "${CPIO_ARCHIVE}.cpio"
-		sed -i '/^.*CONFIG_INITRAMFS_SOURCE=.*$/d' "${KERNEL_OUTPUTDIR}/.config" \
-			|| gen_die "failed to delete CONFIG_INITRAMFS_SOURCE from '${KERNEL_OUTPUTDIR}/.config'"
 
 		print_info 1 "$(get_indent 1)>> --integrated-initramfs is set; Setting CONFIG_INITRAMFS_* options ..."
 
 		[ -f "${KCONFIG_MODIFIED_MARKER}" ] && rm "${KCONFIG_MODIFIED_MARKER}"
 		[ -f "${KCONFIG_REQUIRED_OPTIONS}" ] && rm "${KCONFIG_REQUIRED_OPTIONS}"
 
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_INITRD" "y"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_SOURCE" "\"${CPIO_ARCHIVE}.cpio\""
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_ROOT_UID" "0"
-		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_ROOT_GID" "0"
+		kconfig_set_opt "${kconfig_file_used}" "CONFIG_BLK_DEV_INITRD" "y"
+		kconfig_set_opt "${kconfig_file_used}" "CONFIG_INITRAMFS_SOURCE" "\"${CPIO_ARCHIVE}.cpio\""
+		kconfig_set_opt "${kconfig_file_used}" "CONFIG_INITRAMFS_ROOT_UID" "0"
+		kconfig_set_opt "${kconfig_file_used}" "CONFIG_INITRAMFS_ROOT_GID" "0"
 
-		set_initramfs_compression_method "${KERNEL_OUTPUTDIR}/.config"
+		set_initramfs_compression_method "${kconfig_file_used}"
 
 		if [ -f "${KCONFIG_MODIFIED_MARKER}" ]
 		then
@@ -2072,8 +2070,9 @@ create_initramfs() {
 			if ! isTrue "${BUILD_KERNEL}" || isTrue "${KERNCACHE_IS_VALID}"
 			then
 				# We need to initialize COMPRESS_INITRD_TYPE in case it was set
-				# to best/fastest
-				set_initramfs_compression_method "${KERNEL_OUTPUTDIR}/.config"
+				# to best/fastest and validate if used kernel config can decompress
+				# set COMPRESS_INITRD_TYPE at all.
+				set_initramfs_compression_method "${kconfig_file_used}"
 			fi
 
 			print_info 1 "$(get_indent 1)>> Compressing cpio data (${GKICM_LOOKUP_TABLE_EXT[${COMPRESS_INITRD_TYPE}]}) ..."
@@ -2090,9 +2089,9 @@ create_initramfs() {
 		## be before the other cpio archives in the stream.
 		if isTrue "${MICROCODE_INITRAMFS}"
 		then
-			local cfg_CONFIG_MICROCODE=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE)
-			local cfg_CONFIG_MICROCODE_INTEL=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_INTEL)
-			local cfg_CONFIG_MICROCODE_AMD=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}"/.config CONFIG_MICROCODE_AMD)
+			local cfg_CONFIG_MICROCODE=$(kconfig_get_opt "${kconfig_file_used}" CONFIG_MICROCODE)
+			local cfg_CONFIG_MICROCODE_INTEL=$(kconfig_get_opt "${kconfig_file_used}" CONFIG_MICROCODE_INTEL)
+			local cfg_CONFIG_MICROCODE_AMD=$(kconfig_get_opt "${kconfig_file_used}" CONFIG_MICROCODE_AMD)
 			print_info 1 "$(get_indent 1)>> Adding early-microcode support ..."
 			local UCODEDIR="${TEMP}/ucode_tmp/kernel/x86/microcode/"
 			mkdir -p "${UCODEDIR}" || gen_die "Failed to create '${UCODEDIR}'!"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     0a29fabd3246599c3b5884440c3dfa8afac0c277
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  1 13:43:13 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug  1 20:34:59 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0a29fabd

genkernel: Move grep/zgrep check to determine_real_args()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 14 ++++++++++++++
 genkernel            | 10 ----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index d145d16..d8f3028 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -279,6 +279,20 @@ determine_real_args() {
 		gen_die "'realpath -m /' failed. We need a realpath version which supports '-m' mode!"
 	fi
 
+	if hash grep &>/dev/null
+	then
+		GREP_CMD=grep
+	else
+		gen_die "grep not found. Is sys-apps/grep installed?"
+	fi
+
+	if hash zgrep &>/dev/null
+	then
+		ZGREP_CMD=zgrep
+	else
+		print_warning 1 "zgrep not found. Is app-arch/gzip installed? You will be unable to use compressed config files!"
+	fi
+
 	print_info 4 "Resolving config file, command line, and arch default settings."
 
 	#                               Dest / Config File                    Command Line                              Arch Default

diff --git a/genkernel b/genkernel
index 1a12bbb..c7b90d8 100755
--- a/genkernel
+++ b/genkernel
@@ -112,16 +112,6 @@ print_info 1 "Using genkernel configuration from '${_GENKERNEL_CONF}' ..."
 unset _GENKERNEL_CONF
 print_info 1 "Running with options: ${GK_OPTIONS}"
 
-if ! hash grep &>/dev/null
-then
-	gen_die "grep not found. Is sys-apps/grep installed?"
-fi
-
-if ! hash zgrep &>/dev/null
-then
-	print_warning 1 "zgrep not found. Is app-arch/gzip installed? You will be unable to use compressed config files!"
-fi
-
 # Save any customizations of MODULES_* first.
 override_module_vars="$(compgen -A variable |grep '^MODULES_')"
 for v in ${override_module_vars}

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     c8624437130d318d93596453d0057f8fdfbe1ed2
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  1 13:48:43 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug  1 20:35:00 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c8624437

Unify 'confgrep' handling via new get_grep_cmd_for_file() function

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 10 ++--------
 gen_funcs.sh        | 21 +++++++++++++++++++++
 gen_package.sh      | 10 ++--------
 genkernel           | 14 +++-----------
 4 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index ba6d401..666f525 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -16,14 +16,8 @@ determine_kernel_config_file() {
 			gen_die "--kernel-config file '${KERNEL_CONFIG}' does not exist!"
 		fi
 
-		if isTrue "$(is_gzipped "${KERNEL_CONFIG}")"
-		then
-			local CONFGREP=zgrep
-		else
-			local CONFGREP=grep
-		fi
-
-		if ! ${CONFGREP} -qE '^CONFIG_.*=' "${KERNEL_CONFIG}" &>/dev/null
+		local confgrep_cmd=$(get_grep_cmd_for_file "${KERNEL_CONFIG}")
+		if ! "${confgrep_cmd}" -qE '^CONFIG_.*=' "${KERNEL_CONFIG}" &>/dev/null
 		then
 			gen_die "--kernel-config file '${KERNEL_CONFIG}' does not look like a valid kernel config: File does not contain any CONFIG_* value!"
 		fi

diff --git a/gen_funcs.sh b/gen_funcs.sh
index b9aa510..f2f075a 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -440,6 +440,27 @@ gen_die() {
 	exit 1
 }
 
+get_grep_cmd_for_file() {
+	[[ ${#} -ne 1 ]] \
+		&& gen_die "$(get_useful_function_stack "${FUNCNAME}")Invalid usage of ${FUNCNAME}(): Function takes exactly one argument (${#} given)!"
+
+	local config_file=${1}
+
+	local grep_cmd=${GREP_CMD}
+	if isTrue "$(is_gzipped "${config_file}")"
+	then
+		grep_cmd=${ZGREP_CMD}
+	fi
+
+	# zgrep for example is optional
+	if [ -z "${grep_cmd}" ]
+	then
+		gen_die "$(get_useful_function_stack "${FUNCNAME}")No grep implementation found which can process '${config_file}'!"
+	fi
+
+	echo "${grep_cmd}"
+}
+
 # @FUNCTION: get_indent
 # @USAGE: <level>
 # @DESCRIPTION:

diff --git a/gen_package.sh b/gen_package.sh
index aad52de..271f038 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -259,14 +259,8 @@ gen_kerncache_is_valid() {
 					local test1=$(grep -v "^#" "${TEMP}/${GK_FILENAME_TEMP_CONFIG}" | md5sum | cut -d " " -f 1)
 				fi
 
-				if isTrue "$(is_gzipped "${KERNEL_CONFIG}")"
-				then
-					# Support --kernel-config=/proc/config.gz, mainly
-					local CONFGREP=zgrep
-				else
-					local CONFGREP=grep
-				fi
-				local test2=$("${CONFGREP}" -v "^#" "${KERNEL_CONFIG}" | md5sum | cut -d " " -f 1)
+				local confgrep_cmd=$(get_grep_cmd_for_file "${KERNEL_CONFIG}")
+				local test2=$("${confgrep_cmd}" -v "^#" "${KERNEL_CONFIG}" | md5sum | cut -d " " -f 1)
 
 				if [[ "${test1}" == "${test2}" ]]
 				then

diff --git a/genkernel b/genkernel
index c7b90d8..b96e388 100755
--- a/genkernel
+++ b/genkernel
@@ -530,22 +530,14 @@ then
 		print_warning 1 '"man genkernel" explains "dozfs" in detail.'
 	fi
 
-	if isTrue "$(is_gzipped "${KERNEL_CONFIG}")"
-	then
-		# Support --kernel-config=/proc/config.gz, mainly
-		CONFGREP=zgrep
-	else
-		CONFGREP=grep
-	fi
-
-	if [ $(${CONFGREP} 'CONFIG_EXT[0-9]_FS=' "${KERNEL_CONFIG}" | wc -l) -ge 2 ]
+	CONFGREP_CMD=$(get_grep_cmd_for_file "${KERNEL_CONFIG}")
+	if [ $("${CONFGREP_CMD}" 'CONFIG_EXT[0-9]_FS=' "${KERNEL_CONFIG}" | wc -l) -ge 2 ]
 	then
 		print_warning 1 ''
 		print_warning 1 'With support for several ext* filesystems available, it may be needed to'
 		print_warning 1 'add "rootfstype=ext3" or "rootfstype=ext4" to the list of boot parameters.'
 	fi
-
-	unset CONFGREP
+	unset CONFGREP_CMD
 fi
 
 isTrue "${CMD_INSTALL}" && restore_boot_mount_state

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     dcac082e5182388556b5841cc2f0e2e8f80bc279
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  1 19:53:51 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug  1 20:34:39 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=dcac082e

gen_initramfs.sh: create_initramfs(): set_initramfs_compression_method() must be called when kerncache is used

Follow-up: a864c2f ("gen_initramfs.sh: create_initramfs(): Call set_initramfs_compression_method() when not building kernel")
Signed-off-by: Thomas Deutschmann <whissi <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 570100e..e48fa06 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -2069,7 +2069,7 @@ create_initramfs() {
 	else
 		if isTrue "${COMPRESS_INITRD}"
 		then
-			if ! isTrue "${BUILD_KERNEL}"
+			if ! isTrue "${BUILD_KERNEL}" || isTrue "${KERNCACHE_IS_VALID}"
 			then
 				# We need to initialize COMPRESS_INITRD_TYPE in case it was set
 				# to best/fastest

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     6b2ad24605d0bd6320cdd006e9ca78fdcbaa7a27
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  1 18:11:48 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug  1 20:35:00 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6b2ad246

gen_configkernel.sh: set_initramfs_compression_method(): Ensure that set compression method is supported by the kernel

When we didn't build kernel we have to be sure that kernel can actually
decompress chosen initramfs compression type.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 666f525..b30d079 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -119,7 +119,7 @@ set_initramfs_compression_method() {
 
 	if [[ "${COMPRESS_INITRD_TYPE}" =~ ^(BEST|FASTEST)$ ]]
 	then
-		print_info 5 "Determining '${COMPRESS_INITRD_TYPE}' compression method for initramfs ..."
+		print_info 5 "Determining '${COMPRESS_INITRD_TYPE}' compression method for initramfs using kernel config '${kernel_config}' ..."
 		local ranked_methods
 		if [[ "${COMPRESS_INITRD_TYPE}" == "BEST" ]]
 		then
@@ -162,6 +162,20 @@ set_initramfs_compression_method() {
 		fi
 	fi
 
+	if ! isTrue "${BUILD_KERNEL}"
+	then
+		local cfg_DECOMPRESS_SUPPORT=$(kconfig_get_opt "${kernel_config}" "CONFIG_RD_${COMPRESS_INITRD_TYPE}")
+		if [[ "${cfg_DECOMPRESS_SUPPORT}" != "y" ]]
+		then
+			gen_die "The kernel config '${kernel_config}' this initramfs will be build for cannot decompress set --compress-initrd-type '${COMPRESS_INITRD_TYPE}'!"
+		fi
+
+		# If we are not building kernel, there is no point in
+		# changing kernel config file at all so exit function
+		# here.
+		return
+	fi
+
 	local KOPTION_PREFIX=CONFIG_RD_
 	[ ${KV_NUMERIC} -ge 4010 ] && KOPTION_PREFIX=CONFIG_INITRAMFS_COMPRESSION_
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     f6bf1e2ee59f836b0c9cfd64617dea29f89891ed
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  1 18:56:45 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug  1 20:48:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f6bf1e2e

gen_determineargs.sh: determine_real_args(): Check if we can write into /etc/kernels when --save-config is set

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 75dc151..d9056e4 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -891,6 +891,21 @@ determine_real_args() {
 				gen_die "--module-rebuild-cmd '${MODULEREBUILD_CMD}' contains at least one of the following disallowed characters: '\$&|>()'!"
 			fi
 		fi
+
+		if isTrue "${SAVE_CONFIG}"
+		then
+			local kconf_savedir=/etc/kernels
+			if [ ! -d "${kconf_savedir}" ]
+			then
+				kconf_savedir=/etc
+				[ ! -d "${kconf_savedir}" ] && kconf_savedir=/
+			fi
+
+			if [ ! -w "${kconf_savedir}" ]
+			then
+				gen_die "Cannot write to '${kconf_savedir}' but --save-config is set!"
+			fi
+		fi
 	fi
 
 	if isTrue "${BUILD_RAMDISK}"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     3cf52d4eacdde88edce23e96262d8870f65dccb8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  1 18:58:14 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug  1 20:48:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3cf52d4e

genkernel: Fail if we cannot save kernel config

Now that we check in determine_real_args() if we can write into /etc/kernels
or bail out early in case we cannot but --save-config was set, we can be
more explicit and fail now in case we failed to save kernel config.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/genkernel b/genkernel
index b601eb0..efa4360 100755
--- a/genkernel
+++ b/genkernel
@@ -263,10 +263,15 @@ then
 	if isTrue "${SAVE_CONFIG}"
 	then
 		print_info 1 "$(get_indent 1)>> Saving config of successful build to '/etc/kernels/${GK_FILENAME_CONFIG}' ..."
-		[ ! -e '/etc/kernels' ] && mkdir -p /etc/kernels
-		cp "${KERNEL_OUTPUTDIR}/.config" "/etc/kernels/${GK_FILENAME_CONFIG}" || \
-			print_warning 1 "Unable to copy the kernel configuration file; Ignoring non-fatal error ..."
-			# Just a warning because ordinary users are not allowed to write in /etc
+
+		if [ ! -d '/etc/kernels' ]
+		then
+			mkdir -p /etc/kernels \
+				|| gen_die "Failed to create '/etc/kernels'!"
+		fi
+
+		cp -aL "${KERNEL_OUTPUTDIR}/.config" "/etc/kernels/${GK_FILENAME_CONFIG}" \
+			|| gen_die "Failed to copy kernel configuration to '/etc/kernels'!"
 	fi
 elif [[ -n "${KERNEL_LOCALVERSION}" && "${KERNEL_LOCALVERSION}" != "${LOV}" ]]
 then

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     b77e7ab91fe14f238eb6a4a7a0f0b963909fb1a1
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  1 18:55:27 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug  1 20:48:20 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b77e7ab9

genkernel: Update kerncache only when kernel was built

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/genkernel b/genkernel
index b96e388..b601eb0 100755
--- a/genkernel
+++ b/genkernel
@@ -378,11 +378,8 @@ fi
 
 if [ -n "${KERNCACHE}" ]
 then
-	if ! isTrue "${KERNCACHE_IS_VALID}"
+	if isTrue "${BUILD_KERNEL}" && ! isTrue "${KERNCACHE_IS_VALID}"
 	then
-		# Only update KERNCACHE when KERNCACHE wasn't used because
-		# when it was used nothing has been changed so no update is
-		# necessary.
 		print_info 1 '' 1 0
 		gen_kerncache
 	else

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     1d4ba1fa03d91a8cef9df6eb43c48d1064264812
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  1 22:29:13 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug  1 22:29:13 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1d4ba1fa

gen_package.sh: gen_kerncache_extract_kernel(): Create target directory if missing

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_package.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/gen_package.sh b/gen_package.sh
index 271f038..5182d51 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -204,15 +204,18 @@ gen_kerncache_extract_kernel() {
 }
 
 gen_kerncache_extract_modules() {
-	print_info 1 "Extracting kerncache kernel modules from '${KERNCACHE}' ..."
-	if [ -n "${INSTALL_MOD_PATH}" ]
+	local modules_dir=/lib
+	[ -n "${INSTALL_MOD_PATH}" ] && modules_dir="${INSTALL_MOD_PATH}/lib"
+
+	if [ ! -d "${modules_dir}" ]
 	then
-		"${TAR_COMMAND}" -xf "${KERNCACHE}" --strip-components 1 -C "${INSTALL_MOD_PATH}"/lib \
-			|| gen_die "Failed to extract kerncache modules from '${KERNCACHE}' to '${INSTALL_MOD_PATH}/lib'!"
-	else
-		"${TAR_COMMAND}" -xf "${KERNCACHE}" --strip-components 1 -C /lib \
-			|| gen_die "Failed to extract kerncache modules from '${KERNCACHE}' to '${INSTALL_MOD_PATH}/lib'!"
+		mkdir -p "${modules_dir}" ||  gen_die "Failed to create '${modules_dir}'!"
 	fi
+
+	print_info 1 "Extracting kerncache kernel modules from '${KERNCACHE}' into '${modules_dir}' ..."
+
+	"${TAR_COMMAND}" -xf "${KERNCACHE}" --strip-components 1 -C "${modules_dir}" \
+		|| gen_die "Failed to extract kerncache modules from '${KERNCACHE}' to '${modules_dir}'!"
 }
 
 gen_kerncache_extract_config() {

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     2d46cd1a6950e674254306d8ba2229b5d4ff441f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  2 22:28:50 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug  2 22:42:11 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2d46cd1a

gen_initramfs.sh: append_modules(): Output used modules src directory

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 3cd535c..84629a2 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1678,8 +1678,6 @@ append_modules() {
 	local modules_dstdir="${TDIR}/lib/modules/${KV}"
 	local modules_srcdir="/lib/modules/${KV}"
 
-	print_info 2 "$(get_indent 2)modules: >> Copying modules to initramfs ..."
-
 	if [ -n "${KERNEL_MODULES_PREFIX}" ]
 	then
 		modules_srcdir="${KERNEL_MODULES_PREFIX%/}${modules_srcdir}"
@@ -1695,6 +1693,8 @@ append_modules() {
 
 	cd "${modules_srcdir}" || gen_die "Failed to chdir to '${modules_srcdir}'!"
 
+	print_info 2 "$(get_indent 2)modules: >> Copying modules from '${modules_srcdir}' to initramfs ..."
+
 	local i= mymod=
 	local MOD_EXT="$(modules_kext)"
 	local n_copied_modules=0

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     febeae936c626eb4c0a44654cda2a6351671098b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  2 22:01:21 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug  2 22:42:11 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=febeae93

gen_determineargs.sh: determine_real_args(): Set KERNEL_MODULES_PREFIX to temporary location when --no-install is set

This will ensure that we won't install anything on user's system when
--no-install was set.

While here, make use of expand_file() for --kernel-modules-prefix.

Bug: https://bugs.gentoo.org/505810
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 25 +++++++++++++++++++++++++
 genkernel            | 15 ---------------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 3a7882d..4457fe4 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -1170,6 +1170,31 @@ determine_real_args() {
 		fi
 	fi
 
+	if ! isTrue "${CMD_INSTALL}"
+	then
+		if [ -n "${KERNEL_MODULES_PREFIX}" ]
+		then
+			print_warning 1 '--no-install is set; Ignoring --kernel-modules-prefix ...'
+		fi
+
+		# User does not want that anything will get installed
+		# so install modules into our temporary directory instead.
+		KERNEL_MODULES_PREFIX="${TEMP}/mod_prefix"
+	elif [ -n "${KERNEL_MODULES_PREFIX}" ]
+	then
+		KERNEL_MODULES_PREFIX=$(expand_file "${CMD_KERNEL_MODULES_PREFIX}")
+		if [ -z "${KERNEL_MODULES_PREFIX}" ]
+		then
+			gen_die "Failed to expand set --kernel-modules-prefix '${CMD_KERNEL_MODULES_PREFIX}'!"
+		fi
+
+		if [ ! -d "${KERNEL_MODULES_PREFIX}" ]
+		then
+			print_warning 3 "Set --kernel-modules-prefix '${KERNEL_MODULES_PREFIX}' does not exist; Will try to create ..."
+			mkdir -p "${KERNEL_MODULES_PREFIX}" || gen_die "Failed to create '${KERNEL_MODULES_PREFIX}'!"
+		fi
+	fi
+
 	MICROCODE=${MICROCODE,,}
 	case "${MICROCODE}" in
 		all|amd|intel) ;;

diff --git a/genkernel b/genkernel
index a155a9c..575ba2b 100755
--- a/genkernel
+++ b/genkernel
@@ -296,21 +296,6 @@ then
 
 	if ! isTrue "${BUILD_STATIC}"
 	then
-		if ! isTrue "${CMD_INSTALL}" && [ -z "${KERNEL_MODULE_PREFIX}" ]
-		then
-			# We have to set $KERNEL_MODULE_PREFIX to avoid installing files
-			# to /lib/modules because --no-install was set
-			KERNEL_MODULE_PREFIX="$(mktemp -d -p "${TEMP}" kerncache-modules_XXXXXXX 2>/dev/null)"
-			if [ -z "${KERNEL_MODULE_PREFIX}" ]
-			then
-				gen_die "Internal error: Variable 'KERNEL_MODULE_PREFIX' is empty; mktemp() for kerncache modules failed!"
-			else
-				print_info 5 '' 1 0
-				print_info 5 "KERNEL_MODULE_PREFIX set to '${KERNEL_MODULE_PREFIX}' because --kerncache is used but --no-install was set ..."
-				mkdir "${KERNEL_MODULE_PREFIX}/lib" || gen_die "Failed to create '${KERNEL_MODULE_PREFIX}/lib'!"
-			fi
-		fi
-
 		print_info 1 '' 1 0
 		gen_kerncache_extract_modules
 	fi

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     9fdb3acb257e7103a89e8f47fe8cb23e614efe84
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  2 10:44:56 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug  2 22:40:14 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9fdb3acb

Make use of expand_file() for --linuxrc option

Bug: https://bugs.gentoo.org/483146
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 13 +++++++++++++
 gen_initramfs.sh     | 13 +++++--------
 genkernel.conf       |  3 +++
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 0a404ee..3a7882d 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -353,6 +353,7 @@ determine_real_args() {
 	set_config_with_override BOOL   RAMDISKMODULES                        CMD_RAMDISKMODULES                        "yes"
 	set_config_with_override BOOL   ALLRAMDISKMODULES                     CMD_ALLRAMDISKMODULES                     "no"
 	set_config_with_override STRING INITRAMFS_OVERLAY                     CMD_INITRAMFS_OVERLAY
+	set_config_with_override STRING LINUXRC                               CMD_LINUXRC
 	set_config_with_override BOOL   MOUNTBOOT                             CMD_MOUNTBOOT                             "yes"
 	set_config_with_override BOOL   BUILD_STATIC                          CMD_STATIC                                "no"
 	set_config_with_override BOOL   SAVE_CONFIG                           CMD_SAVE_CONFIG                           "yes"
@@ -1145,6 +1146,18 @@ determine_real_args() {
 			fi
 		fi
 
+		if [ -n "${LINUXRC}" ]
+		then
+			LINUXRC=$(expand_file "${CMD_LINUXRC}" 2>/dev/null)
+			if [ -z "${LINUXRC}" ]
+			then
+				gen_die "--linuxrc value '${CMD_LINUXRC}' failed to expand!"
+			elif [ ! -e "${LINUXRC}" ]
+			then
+				gen_die "--linuxrc file '${LINUXRC}' does not exist!"
+			fi
+		fi
+
 		need_tar=yes
 	fi
 

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 24ddcb5..3cd535c 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1795,18 +1795,14 @@ append_auxilary() {
 	done
 
 	local mylinuxrc=
-	if [ -f "${CMD_LINUXRC}" ]
+	if [ -n "${LINUXRC}" ]
 	then
-		mylinuxrc="${CMD_LINUXRC}"
+		mylinuxrc="${LINUXRC}"
 		print_info 2 "$(get_indent 2)>> Copying user specified linuxrc '${mylinuxrc}' to '/init' ..."
-		cp -aL "${mylinuxrc}" "${TDIR}"/init 2>/dev/null \
-			|| gen_die "Failed to copy '${mylinuxrc}' to '${TDIR}/init'!"
 	elif isTrue "${NETBOOT}"
 	then
 		mylinuxrc="${GK_SHARE}/netboot/linuxrc.x"
 		print_info 2 "$(get_indent 2)>> Copying netboot specific linuxrc '${mylinuxrc}' to '/init' ..."
-		cp -aL "${mylinuxrc}" "${TDIR}"/init 2>/dev/null \
-			|| gen_die "Failed to copy '${mylinuxrc}' to '${TDIR}/init'!"
 	else
 		if [ -f "${GK_SHARE}/arch/${ARCH}/linuxrc" ]
 		then
@@ -1816,10 +1812,11 @@ append_auxilary() {
 		fi
 
 		print_info 2 "$(get_indent 2)>> Copying '${mylinuxrc}' to '/init' ..."
-		cp -aL "${mylinuxrc}" "${TDIR}"/init 2>/dev/null \
-			|| gen_die "Failed to copy '${mylinuxrc}' to '${TDIR}/init'!"
 	fi
 
+	cp -aL "${mylinuxrc}" "${TDIR}"/init 2>/dev/null \
+		|| gen_die "Failed to copy '${mylinuxrc}' to '${TDIR}/init'!"
+
 	# Make sure it's executable
 	chmod 0755 "${TDIR}"/init || gen_die "Failed to chmod of '${TDIR}/init' to 0755!"
 

diff --git a/genkernel.conf b/genkernel.conf
index 93cf8e7..654f185 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -363,6 +363,9 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 #MODULES_group1="some-module"
 #MODULES_group2="" # Load no modules for this group
 
+# Override the default used linuxrc script.
+#LINUXRC="/path/to/custom/linuxrc"
+
 # Archive file created using tar containing modules after
 # the callbacks have run
 #MODULESPACKAGE="/path/to/file.tar.xz"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     62d89ac8535e108febac546d432fa75fd5758278
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  4 08:17:34 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Aug  4 08:17:34 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=62d89ac8

genkernel: bump to v4.1.0_rc1

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 575ba2b..b0600be 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.1.0_beta1'
+GK_V='4.1.0_rc1'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     198b1ad3cd7ae32d689c5f6d7dd2d2761fe9f5ff
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 09:05:39 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 09:05:39 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=198b1ad3

genkernel: bump to v4.1.0

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index b0600be..88c8708 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.1.0_rc1'
+GK_V='4.1.0'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     d729714908b1830189356a92ac433b5e237ae43d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 17 23:11:33 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 23:11:33 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d7297149

gen_determineargs.sh: determine_real_args(): --integrated-initramfs requires building of kernel and initramfs

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 4457fe4..7332bb0 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -1170,6 +1170,14 @@ determine_real_args() {
 		fi
 	fi
 
+	if isTrue "${INTEGRATED_INITRAMFS}"
+	then
+		if  ! isTrue "${BUILD_KERNEL}" || ! isTrue "${BUILD_RAMDISK}"
+		then
+			gen_die "Invalid action specified: --integrated-initramfs option requires action \"all\", i.e. building of kernel and initramfs at the same time!"
+		fi
+	fi
+
 	if ! isTrue "${CMD_INSTALL}"
 	then
 		if [ -n "${KERNEL_MODULES_PREFIX}" ]

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     9e38bfe0fe48ae6508680a37fd5cbf37620b57cc
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 17 23:10:20 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 23:10:20 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9e38bfe0

gen_funcs.sh: kconfig_set_opt(): Change separator to allow setting of paths

Bug: https://bugs.gentoo.org/737598
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 0eea8ee..208a7e9 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -2033,7 +2033,7 @@ kconfig_set_opt() {
 	else
 		print_info 3 "$(get_indent ${indentlevel}) - Setting option '${optname}' to '${optval}' in '${kconfig}'..."
 		sed -i "${kconfig}" \
-			-e "s/^#\? \?${optname}[ =].*/${optname}=${optval}/g" \
+			-e "s|^#\? \?${optname}[ =].*|${optname}=${optval}|g" \
 			|| gen_die "Failed to set '${optname}=${optval}' in '${kconfig}'"
 
 		[ ! -f "${KCONFIG_MODIFIED_MARKER}" ] && touch "${KCONFIG_MODIFIED_MARKER}"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     3c1154bac1bf1da4adc07c933e3ee6177dd42500
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 21 13:10:23 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 13:10:23 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3c1154ba

gen_configkernel.sh: config_kernel(): Set CONFIG_CRYPTO_AES_586 only for X86

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index b30d079..5bccf5d 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -587,11 +587,11 @@ config_kernel() {
 				then
 					kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_AES_X86_64" "${cfg_CONFIG_CRYPTO_AES}"
 				fi
-			fi
-
-			if [ ${KV_NUMERIC} -lt 5004 ]
-			then
-				kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_AES_586" "${cfg_CONFIG_CRYPTO_AES}"
+			else
+				if [ ${KV_NUMERIC} -lt 5004 ]
+				then
+					kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_AES_586" "${cfg_CONFIG_CRYPTO_AES}"
+				fi
 			fi
 		fi
 	fi

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     34893756f574a8a51037e3290bbb58e03951eed2
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 11:41:39 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 11:41:39 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=34893756

gen_initramfs.sh: append_zfs(): don't check package file list with realpath

Bug: https://bugs.gentoo.org/738740
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 84629a2..26cc5a4 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1024,7 +1024,6 @@ append_zfs() {
 	local udevdir=$(get_udevdir)
 	local udevdir_initramfs="/usr/lib/udev"
 	local udev_files=( $(qlist -e sys-fs/zfs:0 \
-		| xargs --no-run-if-empty realpath \
 		| grep -E -- "^${udevdir}")
 	)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     5232dfdcb1447a5bf6f495e463dd7900554f95ce
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 11:43:39 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 11:43:39 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5232dfdc

gen_initramfs.sh: append_multipath(): don't check package file list with realpath

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 26cc5a4..eaa6f30 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -719,7 +719,6 @@ append_multipath() {
 	local udevdir=$(get_udevdir)
 	local udevdir_initramfs="/usr/lib/udev"
 	local udev_files=( $(qlist -e sys-fs/multipath-tools:0 \
-		| xargs --no-run-if-empty realpath \
 		| grep -E -- "^${udevdir}")
 	)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     494fa0725ce3c3b4b8044d53ea6c13fce2c823bb
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 17:19:05 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 17:19:05 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=494fa072

gen_initramfs.sh: append_modules(): Update modules.* files to represent initramfs content

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index eaa6f30..5bee813 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1721,6 +1721,11 @@ append_modules() {
 	cp -ax --parents --target-directory "${modules_dstdir}" modules* 2>/dev/null \
 		|| gen_die "Failed to copy '${modules_srcdir}/modules*' to '${modules_dstdir}'!"
 
+	print_info 2 "$(get_indent 2)modules: Updating modules.dep ..."
+	local a depmod_cmd=( depmod -a -b "${TDIR}" ${KV} )
+	print_info 3 "COMMAND: ${depmod_cmd[*]}" 1 0 1
+	eval "${depmod_cmd[@]}" || gen_die "Failed to run '${depmod_cmd[*]}'!"
+
 	local group_modules= group=
 	for group_modules in ${!MODULES_*}
 	do

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     677bd0d12e45fe210ec39ddba6f25a4917c94c2c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 22:53:54 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 22:53:54 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=677bd0d1

genkernel: bump to v4.1.1

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 88c8708..7da1295 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.1.0'
+GK_V='4.1.1'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     684e165fbf91e848a73127cdd7e8be96b6bc0eb3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 22:58:08 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 13:45:37 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=684e165f

gen_initramfs.sh: append_base_layout(): move /run/utmp to /var/run/utmp

Will fix

  syslogin_perform_logout: logout(pts/0) returned an error: No such file or directory

error logged by dropbear.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 5bee813..875068c 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -429,8 +429,8 @@ append_base_layout() {
 	dd if=/dev/zero of="${TDIR}/var/log/wtmp" bs=1 count=0 seek=0 &>/dev/null \
 		|| die "Failed to create '${TDIR}/var/log/wtmp'!"
 
-	dd if=/dev/zero of="${TDIR}/run/utmp" bs=1 count=0 seek=0 &>/dev/null \
-		|| die "Failed to create '${TDIR}/run/utmp'!"
+	dd if=/dev/zero of="${TDIR}/var/run/utmp" bs=1 count=0 seek=0 &>/dev/null \
+		|| die "Failed to create '${TDIR}/var/run/utmp'!"
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     b5c0ce739f90eeb8408616dd04971951129a5016
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 22:48:16 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 13:45:37 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b5c0ce73

gen_configkernel.sh: config_kernel(): Ensure kernel supports TMPFS

This is required for UDEV support.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index d08a8d9..56b5665 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -350,6 +350,11 @@ config_kernel() {
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_INITRD" "y"
 
 		# Stuff required by init script
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MMU" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SHMEM" "y"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_TMPFS" "y" \
+			&& required_kernel_options+=( 'CONFIG_TMPFS' )
+
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_TTY" "y" \
 			&& required_kernel_options+=( 'CONFIG_TTY' )
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     0bb175ba11cf09d6e3f64d2670039ca01a874c10
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 12:56:29 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 13:45:38 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0bb175ba

gen_funcs.sh: _tc-getPROG(): Prevent override with empty value

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 208a7e9..ab7a7ce 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1220,6 +1220,7 @@ _tc-getPROG() {
 	done
 
 	if [[ -n "${!prog_default_varname}" ]] \
+		&& [[ -n "${!prog_override_varname}" ]] \
 		&& [[ "${!prog_override_varname}" != "${!prog_default_varname}" ]]
 	then
 		# User wants to run specific program

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     4f9a09147887a6d108a8e55ab47a53d1016efee9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 19:35:33 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 19:35:33 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4f9a0914

gen_initramfs.sh: append_base_layout(): Create /etc/{group,passwd,shadow} in this function

These files should be present all the time, not just when built with --ssh option set.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 75 +++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 58 insertions(+), 17 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index fcfa827..ae71c38 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -302,6 +302,7 @@ append_base_layout() {
 		usr/bin \
 		usr/lib \
 		usr/sbin \
+		var/empty \
 		var/log \
 		var/run/lock \
 	; do
@@ -333,6 +334,63 @@ append_base_layout() {
 	echo "proc          /proc       proc    defaults    0 0" >> "${TDIR}"/etc/fstab \
 		|| gen_die "Failed to add proc to '${TDIR}/etc/fstab'!"
 
+	print_info 2 "$(get_indent 2)>> Adding /etc/{group,passwd,shadow} ..."
+	cat >"${TDIR}"/etc/group <<-EOF
+	root:x:0:root
+	bin:x:1:root,bin,daemon
+	daemon:x:2:root,bin,daemon
+	sys:x:3:root,bin,adm
+	adm:x:4:root,adm,daemon
+	tty:x:5:
+	disk:x:6:root,adm
+	lp:x:7:lp
+	mem:x:8:
+	kmem:x:9:
+	wheel:x:10:root
+	floppy:x:11:root
+	news:x:13:news
+	uucp:x:14:uucp
+	console:x:17:
+	audio:x:18:
+	cdrom:x:19:
+	dialout:x:20:
+	tape:x:26:root
+	video:x:27:root
+	render:x:28:
+	rpc:x:32:
+	kvm:x:78:
+	usb:x:85:
+	input:x:97:
+	utmp:x:406:
+	nogroup:x:65533:
+	nobody:x:65534:
+	EOF
+
+	chmod 0644 "${TDIR}"/etc/group \
+		|| gen_die "Failed to chmod of '${TDIR}/etc/group'!"
+
+	cat >"${TDIR}"/etc/passwd <<-EOF
+	root:x:0:0:root:/root:/usr/bin/login-remote.sh
+	nobody:x:65534:65534:nobody:/var/empty:/bin/false
+	EOF
+
+	chmod 0644 "${TDIR}"/etc/passwd \
+		|| gen_die "Failed to chmod of '${TDIR}/etc/passwd'!"
+
+	echo "root:!:0:0:99999:7:::" > "${TDIR}"/etc/shadow \
+		|| gen_die "Failed to create '/etc/shadow'!"
+
+	chmod 0640 "${TDIR}"/etc/shadow \
+		|| gen_die "Failed to chmod of '${TDIR}/etc/shadow'!"
+
+	print_info 2 "$(get_indent 2)>> Adding /etc/nsswitch.conf ..."
+	cat >"${TDIR}"/etc/nsswitch.conf <<-EOF
+	# /etc/nsswitch.conf generated by genkernel
+	passwd:    files
+	shadow:    files
+	group:     files
+	EOF
+
 	print_info 2 "$(get_indent 2)>> Adding /etc/ld.so.conf ..."
 	cat >"${TDIR}"/etc/ld.so.conf <<-EOF
 	# ld.so.conf generated by genkernel
@@ -1548,18 +1606,10 @@ append_dropbear() {
 	cp -aL /etc/localtime "${TDIR}"/etc/ \
 		|| gen_die "Failed to copy '/etc/localtime'. Please set system's timezone!"
 
-	echo "root:x:0:0:root:/root:/usr/bin/login-remote.sh" > "${TDIR}"/etc/passwd \
-		|| gen_die "Failed to create '/etc/passwd'!"
 
 	echo "/usr/bin/login-remote.sh" > "${TDIR}"/etc/shells \
 		|| gen_die "Failed to create '/etc/shells'!"
 
-	echo "root:!:0:0:99999:7:::" > "${TDIR}"/etc/shadow \
-		|| gen_die "Failed to create '/etc/shadow'!"
-
-	echo "root:x:0:root" > "${TDIR}"/etc/group \
-		|| gen_die "Failed to create '/etc/group'!"
-
 	chmod 0755 "${TDIR}"/usr/bin/login-remote.sh \
 		|| gen_die "Failed to chmod of '${TDIR}/usr/bin/login-remote.sh'!"
 
@@ -1572,15 +1622,6 @@ append_dropbear() {
 	chmod 0755 "${TDIR}"/usr/sbin/unlock-zfs \
 		|| gen_die "Failed to chmod of '${TDIR}/usr/sbin/unlock-zfs'!"
 
-	chmod 0640 "${TDIR}"/etc/shadow \
-		|| gen_die "Failed to chmod of '${TDIR}/etc/shadow'!"
-
-	chmod 0644 "${TDIR}"/etc/passwd \
-		|| gen_die "Failed to chmod of '${TDIR}/etc/passwd'!"
-
-	chmod 0644 "${TDIR}"/etc/group \
-		|| gen_die "Failed to chmod of '${TDIR}/etc/group'!"
-
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
 	find . -print0 | "${CPIO_COMMAND}" ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     9257a804c47118d926b061120df69cf75756369d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 19:34:20 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 19:34:20 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9257a804

gen_initramfs.sh: append_base_layout(): Symlink '/etc/mtab' to '/proc/self/mounts'

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 5b86108..fcfa827 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -363,6 +363,9 @@ append_base_layout() {
 	chmod 0755 "${TDIR}"/usr/sbin/gksosreport \
 		|| gen_die "Failed to chmod of '${TDIR}/usr/sbin/gksosreport'!"
 
+	ln -s /proc/self/mounts "${TDIR}"/etc/mtab \
+		|| gen_die "Failed to symlink '/etc/mtab' to '/proc/self/mounts'!"
+
 	# Allow lsinitrd from dracut to process our initramfs
 	echo "$(cat "${TDIR}/etc/build_id") ($(cat "${TDIR}/etc/build_date"))" > "${TDIR}"/lib/dracut/dracut-gk-version.info \
 		|| gen_die "Failed to create '${TDIR}/lib/dracut/dracut-gk-version.info'!"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     9e797bba6f42add85b347ef2711fbb939bdebf09
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 19:33:33 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 19:33:33 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9e797bba

gen_initramfs.sh: append_base_layout(): Add /etc/initrd-release

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 315bb22..5b86108 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -345,9 +345,18 @@ append_base_layout() {
 	date -u '+%Y-%m-%d %H:%M:%S UTC' > "${TDIR}"/etc/build_date \
 		|| gen_die "Failed to create '${TDIR}/etc/build_date'!"
 
-	echo "Genkernel $GK_V" > "${TDIR}"/etc/build_id \
+	echo "Genkernel ${GK_V}" > "${TDIR}"/etc/build_id \
 		|| gen_die "Failed to create '${TDIR}/etc/build_id'!"
 
+	cat >"${TDIR}"/etc/initrd-release <<-EOF
+	NAME="genkernel"
+	VERSION="genkernel-${GK_V}"
+	ID=genkernel
+	VERSION_ID=${GK_V}
+	PRETTY_NAME="Gentoo/Linux genkernel-${GK_V} (Initramfs)"
+	ANSI_COLOR="0;34"
+	EOF
+
 	cp -a "${GK_SHARE}"/defaults/gksosreport.sh "${TDIR}"/usr/sbin/gksosreport \
 		|| gen_die "Failed to copy '${GK_SHARE}/defaults/gksosreport.sh' to '${TDIR}/usr/sbin/gksosreport'"
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     7e19fd8c176859836b477cb655ebe16c11ec1ca5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 21:26:54 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 21:26:54 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7e19fd8c

genkernel: bump to v4.1.2

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 7da1295..595c6ea 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.1.1'
+GK_V='4.1.2'
 
 GK_TIME_START=$(date +%s)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     6c6a0203851e8eb639680a97df2f9e0aaf2dadde
Author:     Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru>
AuthorDate: Sun Aug 30 17:59:10 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 21:08:12 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6c6a0203

genkernel.conf: document lz4 compression in comment

Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru>
Closes: https://github.com/gentoo/genkernel/pull/20
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel.conf b/genkernel.conf
index 71d4fb9..fff188f 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -378,7 +378,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 # Compress generated initramfs
 #COMPRESS_INITRD="yes"
 
-# Types of compression: best, xz, lzma, bzip2, gzip, lzop, fastest
+# Types of compression: best, xz, lzma, bzip2, gzip, lzop, lz4, fastest
 # "best" selects the best available compression method
 # "fastest" selects the fastest available compression method
 #COMPRESS_INITRD_TYPE="best"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     9fc630bf5abbf092ca4dd8cb1e14b0446ed3fe7d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 21:09:29 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 21:09:29 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9fc630bf

genkernel.conf: document zstd compression in comment

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel.conf b/genkernel.conf
index fff188f..fdf00fa 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -378,7 +378,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 # Compress generated initramfs
 #COMPRESS_INITRD="yes"
 
-# Types of compression: best, xz, lzma, bzip2, gzip, lzop, lz4, fastest
+# Types of compression: best, xz, lzma, bzip2, gzip, lzop, lz4, zstd, fastest
 # "best" selects the best available compression method
 # "fastest" selects the fastest available compression method
 #COMPRESS_INITRD_TYPE="best"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     f00973ece9cf491f49c65048b653696d863627d6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 21:30:50 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 21:30:50 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f00973ec

gen_funcs.sh: check_disk_space_requirements(): Force LC_ALL=C

This should make parsing df output more stable in case non-English locales are used.

Closes: https://github.com/gentoo/genkernel/pull/21
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index ab7a7ce..72296e6 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1853,7 +1853,7 @@ check_disk_space_requirements() {
 			gen_die "--check-free-disk-space-bootdir value '${CHECK_FREE_DISK_SPACE_BOOTDIR}' is not a valid number!"
 		fi
 
-		available_free_disk_space=$(unset POSIXLY_CORRECT && df -BM "${BOOTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
+		available_free_disk_space=$(unset POSIXLY_CORRECT && LC_ALL="C" df -BM "${BOOTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
 		if [ -n "${available_free_disk_space}" ]
 		then
 			print_info 2 '' 1 0
@@ -1890,7 +1890,7 @@ check_disk_space_requirements() {
 			gen_die "--check-free-disk-space-kerneloutputdir value '${CHECK_FREE_DISK_SPACE_KERNELOUTPUTDIR}' is not a valid number!"
 		fi
 
-		available_free_disk_space=$(unset POSIXLY_CORRECT && df -BM "${KERNEL_OUTPUTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
+		available_free_disk_space=$(unset POSIXLY_CORRECT && LC_ALL="C" df -BM "${KERNEL_OUTPUTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
 		if [ -n "${available_free_disk_space}" ]
 		then
 			print_info 2 '' 1 0

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     4739e23d90dfbe677bee54529ae4908f4a4177d6
Author:     Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru>
AuthorDate: Mon Aug 31 09:26:38 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 13:24:18 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4739e23d

gen_determineargs.sh: determine_real_args(): remove duplicated config override for BUSYBOX_CONFIG

Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru>
Closes: https://github.com/gentoo/genkernel/pull/23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index f28c8d6..265c557 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -415,7 +415,6 @@ determine_real_args() {
 	set_config_with_override BOOL   GENZIMAGE                             CMD_GENZIMAGE                             "no"
 	set_config_with_override BOOL   KEYMAP                                CMD_KEYMAP                                "yes"
 	set_config_with_override BOOL   DOKEYMAPAUTO                          CMD_DOKEYMAPAUTO                          "no"
-	set_config_with_override STRING BUSYBOX_CONFIG                        CMD_BUSYBOX_CONFIG
 	set_config_with_override STRING STRIP_TYPE                            CMD_STRIP_TYPE                            "modules"
 	set_config_with_override BOOL   INSTALL                               CMD_INSTALL                               "yes"
 	set_config_with_override BOOL   CLEANUP                               CMD_CLEANUP                               "yes"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     ac0681731e259ab9e2d8f5b65e008d296cde369e
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 07:11:00 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Feb  6 15:10:48 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ac068173

genkernel.conf: typo fix: s/staticly/statically/

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel.conf b/genkernel.conf
index fdf00fa..a8507d1 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -347,7 +347,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 # in /usr/share/genkernel/defaults/modules_load (see this file for
 # more details).  This would be used if, for example, you
 # required an additional crypto module or network device at boot
-# time and did not want to staticly compile these in the kernel.
+# time and did not want to statically compile these in the kernel.
 # Options take the form AMODULES_{group} where {group} is one of
 # the groups in modules_load (which are in the form MODULES_{group}).
 # Use this with caution.

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     bf226837ba99f3151cf6b682210a02261263fe96
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 09:18:00 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Feb  6 15:13:39 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=bf226837

gen_initramfs.sh: fix typo: s/auxilary/auxiliary/g

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index ae71c38..aca2f90 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1833,7 +1833,7 @@ is_static() {
 	return $?
 }
 
-append_auxilary() {
+append_auxiliary() {
 	local TDIR="${TEMP}/initramfs-aux-temp"
 	if [ -d "${TDIR}" ]
 	then
@@ -1956,7 +1956,7 @@ append_auxilary() {
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content
 	find . -print0 | "${CPIO_COMMAND}" ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \
-		|| gen_die "Failed to append auxilary to cpio!"
+		|| gen_die "Failed to append auxiliary to cpio!"
 
 	cd "${TEMP}" || die "Failed to chdir to '${TEMP}'!"
 	if isTrue "${CLEANUP}"
@@ -1987,7 +1987,7 @@ create_initramfs() {
 	append_data 'util-linux'
 	append_data 'eudev'
 	append_data 'devicemanager'
-	append_data 'auxilary' "${BUSYBOX}"
+	append_data 'auxiliary' "${BUSYBOX}"
 	append_data 'busybox' "${BUSYBOX}"
 	append_data 'b2sum' "${B2SUM}"
 	append_data 'btrfs' "${BTRFS}"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     ca0338252c5a6837f420ad93114f481d7af32afc
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  6 16:22:37 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Feb  6 16:27:46 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ca033825

genkernel: make sure GREP_OPTIONS is unset

We are using grep command and user could have set GREP_OPTIONS
environment variable which could cause problems.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 1 +
 1 file changed, 1 insertion(+)

diff --git a/genkernel b/genkernel
index 85c2021..7d5a75e 100755
--- a/genkernel
+++ b/genkernel
@@ -46,6 +46,7 @@ then
 	GK_SETTINGS+=( EXTRAVERSION )
 	GK_SETTINGS+=( INSTALL_MOD_PATH )
 	GK_SETTINGS+=( MOD_INSTALL )
+	GK_SETTINGS+=( GREP_OPTIONS )
 
 	for GK_SETTING in "${GK_SETTINGS[@]}"
 	do

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     0785165ca64b8e6396a24043789d0bfb8b3359d3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  6 16:18:10 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Feb  6 16:18:10 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0785165c

genkernel: normalize locales

We need to ensure we are using same locales within genkernel
because some regular expressions or program output we parse
maybe different depending on used locales.

Bug: https://bugs.gentoo.org/763165
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/genkernel b/genkernel
index 6ec8905..85c2021 100755
--- a/genkernel
+++ b/genkernel
@@ -4,6 +4,12 @@
 PATH="${PATH}:/sbin:/usr/sbin"
 GK_V='4.1.2'
 
+# Normalize locales
+export LC_ALL=C
+export LANG=C
+unset LC_MESSAGES
+unset LC_CTYPE
+
 GK_TIME_START=$(date +%s)
 
 TODEBUGCACHE=yes # Until an error occurs or LOGFILE is fully qualified.

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     f775b28727ea9ec06f1a8b651f4a5b45367874f4
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  8 22:25:24 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Feb  8 22:25:24 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f775b287

gen_initramfs.sh: remove unused function is_static()

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index aca2f90..3fc400d 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1827,12 +1827,6 @@ append_modprobed() {
 	fi
 }
 
-# check for static linked file with objdump
-is_static() {
-	LANG="C" LC_ALL="C" objdump -T $1 2>&1 | grep "not a dynamic object" > /dev/null
-	return $?
-}
-
 append_auxiliary() {
 	local TDIR="${TEMP}/initramfs-aux-temp"
 	if [ -d "${TDIR}" ]

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     fc5ef56e4ec6c7fdf90c8b53d8b3a35bb7f7ef8f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  8 22:29:02 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Feb  8 22:29:02 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fc5ef56e

gen_funcs.sh: check_disk_space_requirements(): use global LC_ALL

Since commit 0785165ca64 we set LC_ALL in global scope.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 72296e6..ab7a7ce 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1853,7 +1853,7 @@ check_disk_space_requirements() {
 			gen_die "--check-free-disk-space-bootdir value '${CHECK_FREE_DISK_SPACE_BOOTDIR}' is not a valid number!"
 		fi
 
-		available_free_disk_space=$(unset POSIXLY_CORRECT && LC_ALL="C" df -BM "${BOOTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
+		available_free_disk_space=$(unset POSIXLY_CORRECT && df -BM "${BOOTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
 		if [ -n "${available_free_disk_space}" ]
 		then
 			print_info 2 '' 1 0
@@ -1890,7 +1890,7 @@ check_disk_space_requirements() {
 			gen_die "--check-free-disk-space-kerneloutputdir value '${CHECK_FREE_DISK_SPACE_KERNELOUTPUTDIR}' is not a valid number!"
 		fi
 
-		available_free_disk_space=$(unset POSIXLY_CORRECT && LC_ALL="C" df -BM "${KERNEL_OUTPUTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
+		available_free_disk_space=$(unset POSIXLY_CORRECT && df -BM "${KERNEL_OUTPUTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
 		if [ -n "${available_free_disk_space}" ]
 		then
 			print_info 2 '' 1 0

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     24b33a6f4657df846e70c65e85a88d5c7578b004
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  8 22:28:01 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Feb  8 22:28:01 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=24b33a6f

gen_initramfs.sh: copy_binaries(): use global LC_ALL

Since commit 0785165ca64 we set LC_ALL in global scope.

Signed-off-by: Thomas Deutschmann <whissi <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 3fc400d..f5fcd98 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -37,7 +37,7 @@ copy_binaries() {
 		[[ -e "${binary}" ]] \
 			|| gen_die "Binary ${binary} could not be found"
 
-		if LC_ALL=C "${LDDTREE_COMMAND}" "${binary}" 2>&1 | grep -F -q 'not found'
+		if "${LDDTREE_COMMAND}" "${binary}" 2>&1 | grep -F -q 'not found'
 		then
 			gen_die "Binary ${binary} is linked to missing libraries and may need to be re-built"
 		fi

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     98e1bc5365d8fdfed07f7589088c9895de67c256
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  9 13:13:01 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 13:13:01 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=98e1bc53

gen_initramfs.sh: append_eudev(): log udevadm errors to $LOGFILE

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index f5fcd98..65a966d 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -628,7 +628,8 @@ append_eudev() {
 		local gen_hwdb_cmd=( "${TDIR}/usr/bin/udevadm" )
 		gen_hwdb_cmd+=( hwdb --update --root "${TDIR}" )
 		print_info 3 "COMMAND: ${gen_hwdb_cmd[*]}" 1 0 1
-		eval "${gen_hwdb_cmd[@]}" || gen_die "Failed to pre-generate initramfs' /etc/udev/hwdb.bin!"
+		eval "${gen_hwdb_cmd[@]}" 2>&1 | tee -a "${LOGFILE}" \
+			|| gen_die "Failed to pre-generate initramfs' /etc/udev/hwdb.bin!"
 
 		# Now that we have a pre-generated hwdb in initramfs
 		# we can delete source files

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     c8a6845ff99a1fe5928d331375242f07bf49fac1
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 20:52:30 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 03:43:37 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c8a6845f

gen_configkernel.sh: config_kernel(): don't set CONFIG_MICROCODE_OLD_INTERFACE for $KV > 4.3 anymore

sys-apps/microcode-ctl which uses this interface was already removed
from repository in 2018.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 56b5665..00eab73 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -978,7 +978,7 @@ config_kernel() {
 
 			print_info 2 "$(get_indent 1)>> Ensure that required kernel options for early microcode loading support are set ..."
 			kconfigs_microcode+=( 'CONFIG_MICROCODE' )
-			kconfigs_microcode+=( 'CONFIG_MICROCODE_OLD_INTERFACE' )
+			[ ${KV_NUMERIC} -le 4003 ] && kconfigs_microcode+=( 'CONFIG_MICROCODE_OLD_INTERFACE' )
 			[ ${KV_NUMERIC} -le 4003 ] && kconfigs_microcode+=( 'CONFIG_MICROCODE_EARLY' )
 
 			# Intel

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     1ffe1409c796372459a4985f8fe3f10fffe6e816
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 22:31:50 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 22:31:50 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1ffe1409

gen_moddeps.sh: modules_dep_list(): match module more precise

The current pattern is not precise enough. I.e. when looking for
Realtek network driver module (realtek.ko), we also get a match on
Realtek HD audio codec module (snd-hda-codec-realtek.ko).

This commit will make the pattern more precise.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_moddeps.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_moddeps.sh b/gen_moddeps.sh
index fd7800f..193338d 100755
--- a/gen_moddeps.sh
+++ b/gen_moddeps.sh
@@ -50,7 +50,7 @@ modules_dep_list() {
 	KEXT=$(modules_kext)
 	if [ -f "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}/modules.dep" ]
 	then
-		cat "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}/modules.dep" | grep ${1}${KEXT}\: | cut -d\:  -f2
+		grep -F -- "/${1}${KEXT}:" "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}/modules.dep" | cut -d\:  -f2
 	fi
 }
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     63dc301f06f80253e341da756e9cb10aca336eb8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 20:53:56 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 20:53:56 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=63dc301f

genkernel: show warning when CONFIG_CMDLINE_OVERRIDE=y is set

Link 1: https://forums.gentoo.org/viewtopic-t-1131897.html
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/genkernel b/genkernel
index 7d5a75e..046e0e3 100755
--- a/genkernel
+++ b/genkernel
@@ -532,6 +532,18 @@ then
 		print_warning 1 'add "rootfstype=ext3" or "rootfstype=ext4" to the list of boot parameters.'
 	fi
 	unset CONFGREP_CMD
+
+	cfg_CONFIG_CMDLINE_OVERRIDE=$(kconfig_get_opt "${KERNEL_CONFIG}" CONFIG_CMDLINE_OVERRIDE)
+	if [ "${cfg_CONFIG_CMDLINE_OVERRIDE}" = "y" ]
+	then
+		cfg_CONFIG_CMDLINE=$(kconfig_get_opt "${KERNEL_CONFIG}" CONFIG_CMDLINE)
+		print_warning 1 ''
+		print_warning 1 "${BOLD}Note:${NORMAL}"
+		print_warning 1 'You have set CONFIG_CMDLINE_OVERRIDE=y.'
+		print_warning 1 "You will be unable to alter set kernel parameters (${cfg_CONFIG_CMDLINE}) at runtime!"
+		unset cfg_CONFIG_CMDLINE
+	fi
+	unset cfg_CONFIG_CMDLINE_OVERRIDE
 fi
 
 isTrue "${CMD_INSTALL}" && restore_boot_mount_state

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     7436269f07727daf13eabef57c6cc936e4e294e2
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 20:57:46 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 21:02:24 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7436269f

genkernel: fix used kernel.config

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/genkernel b/genkernel
index 046e0e3..e6424ba 100755
--- a/genkernel
+++ b/genkernel
@@ -478,8 +478,10 @@ fi
 
 if isTrue "${BUILD_RAMDISK}"
 then
+	kconfig_file_used="${KERNEL_OUTPUTDIR}/.config"
 	if ! isTrue "${BUILD_KERNEL}"
 	then
+		kconfig_file_used="${KERNEL_CONFIG}"
 		INITRAMFS_FILE="${TMPDIR}/${GK_FILENAME_TEMP_INITRAMFS}"
 		isTrue "${CMD_INSTALL}" && INITRAMFS_FILE="${BOOTDIR}/${GK_FILENAME_INITRAMFS}"
 
@@ -524,8 +526,8 @@ then
 		print_warning 1 '"man genkernel" explains "dozfs" in detail.'
 	fi
 
-	CONFGREP_CMD=$(get_grep_cmd_for_file "${KERNEL_CONFIG}")
-	if [ $("${CONFGREP_CMD}" 'CONFIG_EXT[0-9]_FS=' "${KERNEL_CONFIG}" | wc -l) -ge 2 ]
+	CONFGREP_CMD=$(get_grep_cmd_for_file "${kconfig_file_used}")
+	if [ $("${CONFGREP_CMD}" 'CONFIG_EXT[0-9]_FS=' "${kconfig_file_used}" | wc -l) -ge 2 ]
 	then
 		print_warning 1 ''
 		print_warning 1 'With support for several ext* filesystems available, it may be needed to'
@@ -533,17 +535,17 @@ then
 	fi
 	unset CONFGREP_CMD
 
-	cfg_CONFIG_CMDLINE_OVERRIDE=$(kconfig_get_opt "${KERNEL_CONFIG}" CONFIG_CMDLINE_OVERRIDE)
+	cfg_CONFIG_CMDLINE_OVERRIDE=$(kconfig_get_opt "${kconfig_file_used}" CONFIG_CMDLINE_OVERRIDE)
 	if [ "${cfg_CONFIG_CMDLINE_OVERRIDE}" = "y" ]
 	then
-		cfg_CONFIG_CMDLINE=$(kconfig_get_opt "${KERNEL_CONFIG}" CONFIG_CMDLINE)
+		cfg_CONFIG_CMDLINE=$(kconfig_get_opt "${kconfig_file_used}" CONFIG_CMDLINE)
 		print_warning 1 ''
 		print_warning 1 "${BOLD}Note:${NORMAL}"
 		print_warning 1 'You have set CONFIG_CMDLINE_OVERRIDE=y.'
 		print_warning 1 "You will be unable to alter set kernel parameters (${cfg_CONFIG_CMDLINE}) at runtime!"
 		unset cfg_CONFIG_CMDLINE
 	fi
-	unset cfg_CONFIG_CMDLINE_OVERRIDE
+	unset cfg_CONFIG_CMDLINE_OVERRIDE kconfig_file_used
 fi
 
 isTrue "${CMD_INSTALL}" && restore_boot_mount_state

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     588d9254f66d090e593033da2aa9a257d6e3bfce
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 19 02:35:50 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Mar 19 02:45:48 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=588d9254

gen_configkernel.sh: config_kernel(): Warn when kernel config did not change

When user requests to modify kernel config, i.e. `genkernel --menuconfig`
but kernel config did not change, show a warning to allow user to notice.

This can happen for example when user loaded a different kernel config
in dialog but forgot to save to $KERNEL_OUTPUTDIR/.config which is
required in that case.

Link 1: https://forums.gentoo.org/viewtopic-p-8588232.html#8588232
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 00eab73..bff3fdc 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -334,8 +334,17 @@ config_kernel() {
 
 	if [ -n "${add_config}" ]
 	then
+		local kconfig_md5sum_old="$(md5sum < "${KERNEL_OUTPUTDIR}/.config")"
+
 		print_info 1 "$(get_indent 1)>> Invoking ${add_config} ..."
 		compile_generic ${add_config} kernelruntask
+
+		local kconfig_md5sum_new="$(md5sum < "${KERNEL_OUTPUTDIR}/.config")"
+		if [[ "${kconfig_md5sum_old}" == "${kconfig_md5sum_new}" ]]
+		then
+			print_warning 1 "$(get_indent 1)>> Kernel config was not modified!"
+		fi
+		unset kconfig_md5sum_old kconfig_md5sum_new
 	fi
 
 	local -a required_kernel_options

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     3c1cb4d8c8c9889406e093c6af27932c3fd590bd
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 19 02:46:22 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Mar 19 02:46:22 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3c1cb4d8

genkernel: bump to v4.2.0

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index e6424ba..39e5a0b 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.1.2'
+GK_V='4.2.0'
 
 # Normalize locales
 export LC_ALL=C

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     cbe66396bdcfdcecd0bbd933c1c94704fd43a13e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 26 22:57:50 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 22:57:50 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cbe66396

gen_initramfs.sh: append_zfs(): Update UDEV dir in UDEV rules

Because we are copying UDEV rules from host system, we have
to ensure that used UDEV dir matches our initramfs environment to
prevent errors like

  failed to execute '/lib/udev/vdev_id' '/lib/udev/vdev_id -e': No such file or directory

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 9a9f07d..aedd038 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1111,6 +1111,15 @@ append_zfs() {
 		local dest_file="${TDIR%/}${udev_file/${udevdir}/${udevdir_initramfs}}"
 		cp -aL "${udev_file}" "${dest_file}" \
 			|| gen_die "Failed to copy '${udev_file}' to '${dest_file}'"
+
+		if [[ "${dest_file}" == *.rules ]]
+		then
+			print_info 5 "Updating UDEV dir in '${dest_file}' ..."
+			sed -i \
+				-e "s|${udevdir}|${udevdir_initramfs}|g" \
+				"${dest_file}" \
+				|| gen_die "Failed to update UDEV dir in '${dest_file}'"
+		fi
 	done
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     61049d2954dcf04bd2a2f38ac398fc406e45695f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 26 23:39:06 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 23:39:06 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=61049d29

gen_compile.sh: populate_binpkg(): Throw away binpkg when glibc has changed

It was reported that dropbear in genkernel initramfs crashed when
client tried to connect.

The problem is, that while we are compiling statically, we still depend
on used glibc version. I.e. dropbear binpkg was created against glibc
version A, but when genkernel initramfs will be created, we will copy
system libraries from whatever glibc version host is currently using which
doesn't necessarily need to match used glibc version when binpkg was
created which could result in reported problem.

This commit will make genkernel treat binpkg as stale when glibc was
changed since binpkg was created to force a rebuild.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_compile.sh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gen_compile.sh b/gen_compile.sh
index d755150..e2b86cc 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -510,6 +510,23 @@ populate_binpkg() {
 		unset patch patchdir
 	fi
 
+	if [[ -f "${BINPKG}" ]]
+	then
+		if isTrue "$(is_glibc)"
+		then
+			local libdir=$(get_chost_libdir)
+			local glibc_test_file="${libdir}/libnss_files.so"
+
+			if [[ "${BINPKG}" -ot "${glibc_test_file}" ]]
+			then
+				print_info 3 "${CHECK_LEVEL_PREFIX}Glibc (${glibc_test_file}) is newer than us; Removing stale ${P} binpkg ..."
+				rm "${BINPKG}" || gen_die "Failed to remove stale binpkg '${BINPKG}'!"
+			fi
+
+			print_info 3 "${CHECK_LEVEL_PREFIX}Existing ${P} binpkg is newer than glibc (${glibc_test_file}); Skipping ..."
+		fi
+	fi
+
 	if [[ ! -f "${BINPKG}" ]]
 	then
 		print_info 3 "${CHECK_LEVEL_PREFIX}Binpkg '${BINPKG}' does NOT exist; Need to build ${P} ..."

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     cd6555b521d3e62b982ef53e798ea8cf0152b82d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 26 23:00:33 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 23:00:33 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cd6555b5

gen_initramfs.sh: append_zfs(): Copy /etc/zfs/vdev_id.conf

Used by vdev_id UDEV helper.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index aedd038..b826f17 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1067,7 +1067,8 @@ append_zfs() {
 	mkdir -p "${TDIR}"/etc/zfs || gen_die "Failed to create '${TDIR}/etc/zfs'!"
 
 	# Copy files to /etc/zfs
-	for i in zdev.conf zpool.cache
+	local i
+	for i in vdev_id.conf zdev.conf zpool.cache
 	do
 		if [ -f /etc/zfs/${i} ]
 		then

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     38302477f5553fb04897fe50940c1250d718703d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 27 00:24:46 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 27 00:24:46 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=38302477

genkernel: bump to v4.2.1

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 39e5a0b..28fc0c7 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.2.0'
+GK_V='4.2.1'
 
 # Normalize locales
 export LC_ALL=C

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     228102522e6139470fe86df52a29bd68e583f935
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  5 22:13:13 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul  5 23:40:51 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=22810252

gen_moddeps.sh: modules_kext(): Add ZSTD support for kernel modules

Bug: https://bugs.gentoo.org/800506
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_moddeps.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gen_moddeps.sh b/gen_moddeps.sh
index 0842249..8c44039 100755
--- a/gen_moddeps.sh
+++ b/gen_moddeps.sh
@@ -61,6 +61,7 @@ modules_kext() {
 	module_compression_algorithms[NONE]='.ko'
 	module_compression_algorithms[GZIP]='.ko.gz'
 	module_compression_algorithms[XZ]='.ko.xz'
+	module_compression_algorithms[ZSTD]='.ko.zst'
 
 	local module_compression_algorithm
 	for module_compression_algorithm in "${!module_compression_algorithms[@]}"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     e7f7d6a7126ecec0bc7a62dd45cb140fa1e8684e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  5 22:19:47 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul  5 23:40:51 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e7f7d6a7

gen_initramfs.sh: append_modules(): Export KEXT variable

This will allow us to call modules_kext() just once.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index b826f17..52c5cb8 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1759,18 +1759,18 @@ append_modules() {
 	print_info 2 "$(get_indent 2)modules: >> Copying modules from '${modules_srcdir}' to initramfs ..."
 
 	local i= mymod=
-	local MOD_EXT="$(modules_kext)"
+	local -x KEXT="$(modules_kext)"
 	local n_copied_modules=0
 	for i in $(gen_dep_list)
 	do
-		mymod=$(find . -name "${i}${MOD_EXT}" 2>/dev/null | head -n 1)
+		mymod=$(find . -name "${i}${KEXT}" 2>/dev/null | head -n 1)
 		if [ -z "${mymod}" ]
 		then
-			print_warning 3 "$(get_indent 3) - ${i}${MOD_EXT} not found; Skipping ..."
+			print_warning 3 "$(get_indent 3) - ${i}${KEXT} not found; Skipping ..."
 			continue;
 		fi
 
-		print_info 3 "$(get_indent 3) - Copying ${i}${MOD_EXT} ..."
+		print_info 3 "$(get_indent 3) - Copying ${i}${KEXT} ..."
 		cp -ax --parents --target-directory "${modules_dstdir}" "${mymod}" 2>/dev/null \
 			|| gen_die "Failed to copy '${modules_srcdir}/${mymod}' to '${modules_dstdir}'!"
 		n_copied_modules=$[$n_copied_modules+1]

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     234ce291bece29b012edcb0482a3b170c86be631
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  5 22:04:41 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul  5 23:40:51 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=234ce291

gen_moddeps.sh: modules_kext() refactored

CONFIG_MODULE_COMPRESS is gone in >=5.13. Refactor to check
for compression algorithm instead which is backward compatible.

Link 1: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d4bbe942098b0c9b487d424a3c545c9ed56462d7
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_moddeps.sh | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/gen_moddeps.sh b/gen_moddeps.sh
index 193338d..0842249 100755
--- a/gen_moddeps.sh
+++ b/gen_moddeps.sh
@@ -57,11 +57,29 @@ modules_dep_list() {
 modules_kext() {
 	local KEXT='.ko'
 
-	if grep -sq '^CONFIG_MODULE_COMPRESS=y' "${KERNEL_OUTPUTDIR}"/.config
-	then
-		grep -sq '^CONFIG_MODULE_COMPRESS_XZ=y' "${KERNEL_OUTPUTDIR}"/.config && KEXT='.ko.xz'
-		grep -sq '^CONFIG_MODULE_COMPRESS_GZIP=y' "${KERNEL_OUTPUTDIR}"/.config && KEXT='.ko.gz'
-	fi
+	declare -A module_compression_algorithms=()
+	module_compression_algorithms[NONE]='.ko'
+	module_compression_algorithms[GZIP]='.ko.gz'
+	module_compression_algorithms[XZ]='.ko.xz'
+
+	local module_compression_algorithm
+	for module_compression_algorithm in "${!module_compression_algorithms[@]}"
+	do
+		print_info 5 "Checking if module compression algorithm '${module_compression_algorithm}' is being used ..."
+
+		local koption="CONFIG_MODULE_COMPRESS_${module_compression_algorithm}"
+		local value_koption=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "${koption}")
+		if [[ "${value_koption}" != "y" ]]
+		then
+			print_info 5 "Cannot use '${module_compression_algorithm}' algorithm for module compression, kernel option '${koption}' is not set!"
+			continue
+		fi
+
+		print_info 5 "Will use '${module_compression_algorithm}' algorithm for kernel module compression!"
+		KEXT="${module_compression_algorithms[${module_compression_algorithm}]}"
+		break
+	done
+	unset module_compression_algorithms module_compression_algorithm koption value_koption
 
 	echo ${KEXT}
 }

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     8ba2f9ddb92f380251fc0bb98e1be724d5289eca
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  5 22:21:08 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul  5 23:40:51 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8ba2f9dd

gen_moddeps.sh: gen_dep_list(): Use global KEXT variable

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_moddeps.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_moddeps.sh b/gen_moddeps.sh
index 8c44039..61f6deb 100755
--- a/gen_moddeps.sh
+++ b/gen_moddeps.sh
@@ -4,7 +4,7 @@
 gen_dep_list() {
 	if isTrue "${ALLRAMDISKMODULES}"
 	then
-		strip_mod_paths $(find "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}" -name "*$(modules_kext)") | sort
+		strip_mod_paths $(find "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}" -name "*${KEXT}") | sort
 	else
 		rm -f "${TEMP}/moddeps" >/dev/null
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     a646434678303f214449f045711930c2610ce0a8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  5 22:21:49 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul  5 23:40:51 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a6464346

gen_moddeps.sh: modules_dep_list(): Use global KEXT variable

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_moddeps.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gen_moddeps.sh b/gen_moddeps.sh
index 61f6deb..30e1709 100755
--- a/gen_moddeps.sh
+++ b/gen_moddeps.sh
@@ -47,7 +47,6 @@ gen_deps() {
 }
 
 modules_dep_list() {
-	KEXT=$(modules_kext)
 	if [ -f "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}/modules.dep" ]
 	then
 		grep -F -- "/${1}${KEXT}:" "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}/modules.dep" | cut -d\:  -f2

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     8a7e6909326b5b70076bdedb38513d93cb0d3117
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  5 22:23:02 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul  5 23:40:51 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8a7e6909

gen_funcs.sh: expand_file(): Outsource embedded Python call

This will allow us to set proper shebang for dev-lang/python-exec[-native-symlinks]
support.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh     |  2 +-
 path_expander.py | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index ab7a7ce..7257229 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1952,7 +1952,7 @@ expand_file() {
 	local file="${1}"
 	local expanded_file=
 
-	expanded_file=$(python -c "import os; print(os.path.expanduser('${file}'))" 2>/dev/null)
+	expanded_file=$("${GK_SHARE}/path_expander.py" "${file}" 2>/dev/null)
 	if [ -z "${expanded_file}" ]
 	then
 		# if Python failed for some reason, just reset

diff --git a/path_expander.py b/path_expander.py
new file mode 100755
index 0000000..82accad
--- /dev/null
+++ b/path_expander.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+
+def main(argv):
+	if len(argv) != 1:
+		print(
+			"%s expects exactly one argument but %s were given!"
+			% (os.path.basename(__file__), len(argv)),
+			file=sys.stderr
+		)
+		sys.exit(1)
+
+	print(os.path.expanduser(argv[0]))
+
+if __name__ == "__main__":
+	main(sys.argv[1:])

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     c282bf0b47ed82baadd7967e68f5c6006ee34dc8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  6 01:44:31 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul  6 01:44:31 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c282bf0b

gen_funcs.sh: get_tar_cmd(): Use 'xz -T<makejobs>' instead of pxz

No need to depend on pxz for multithreaded compression anymore.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 7257229..d40607c 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1073,7 +1073,7 @@ get_tar_cmd() {
 		pcmd=$(which pbzip2 2>/dev/null)
 	elif [[ "${archive_file}" == *.tar.xz ]]
 	then
-		pcmd=$(which pxz 2>/dev/null)
+		pcmd="'xz -T$(makeopts_jobs)'"
 	elif [[ "${archive_file}" == *.tar.gz ]]
 	then
 		pcmd=$(which pigz 2>/dev/null)

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     80f530bf79105fa980f2e0077663fc3bfbf8f3a0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  6 17:30:11 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul  6 17:30:33 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=80f530bf

genkernel: Bump to v4.2.2

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 28fc0c7..fb0fb58 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.2.1'
+GK_V='4.2.2'
 
 # Normalize locales
 export LC_ALL=C

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     ceeff435c0b4dc92c30c26b7f3ec8da3fbbd77c0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  8 16:31:03 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul  8 16:35:51 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ceeff435

gen_moddeps.sh: Move modules_kext() to determine_KEXT()

We want debug output but then we cannot use return value
from this function.

Transforming function to determine_KEXT() like determine_KV()
will fix the problem and allows us to keep debug output.

Fixes: 234ce29 ("gen_moddeps.sh: modules_kext() refactored")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 35 +++++++++++++++++++++++++++++++++++
 gen_initramfs.sh     |  3 ++-
 gen_moddeps.sh       | 31 -------------------------------
 3 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 3e6e4dd..21d3b22 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -1,6 +1,41 @@
 #!/bin/bash
 # $Id$
 
+determine_KEXT() {
+	local kconfig_file_used="${KERNEL_CONFIG}"
+	if isTrue "${BUILD_KERNEL}"
+	then
+		kconfig_file_used="${KERNEL_OUTPUTDIR}/.config"
+	fi
+
+	KEXT='.ko'
+
+	declare -A module_compression_algorithms=()
+	module_compression_algorithms[NONE]='.ko'
+	module_compression_algorithms[GZIP]='.ko.gz'
+	module_compression_algorithms[XZ]='.ko.xz'
+	module_compression_algorithms[ZSTD]='.ko.zst'
+
+	local module_compression_algorithm
+	for module_compression_algorithm in "${!module_compression_algorithms[@]}"
+	do
+		print_info 5 "Checking if module compression algorithm '${module_compression_algorithm}' is being used ..."
+
+		local koption="CONFIG_MODULE_COMPRESS_${module_compression_algorithm}"
+		local value_koption=$(kconfig_get_opt "${kconfig_file_used}" "${koption}")
+		if [[ "${value_koption}" != "y" ]]
+		then
+			print_info 5 "Cannot use '${module_compression_algorithm}' algorithm for module compression, kernel option '${koption}' is not set!"
+			continue
+		fi
+
+		print_info 5 "Will use '${module_compression_algorithm}' algorithm for kernel module compression!"
+		KEXT="${module_compression_algorithms[${module_compression_algorithm}]}"
+		break
+	done
+	unset module_compression_algorithms module_compression_algorithm koption value_koption
+}
+
 determine_KV() {
 	local old_KV=
 	[ -n "${KV}" ] && old_KV="${KV}"

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 52c5cb8..b9aeb0b 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1754,12 +1754,13 @@ append_modules() {
 		gen_die "${error_message}"
 	fi
 
+	determine_KEXT
+
 	cd "${modules_srcdir}" || gen_die "Failed to chdir to '${modules_srcdir}'!"
 
 	print_info 2 "$(get_indent 2)modules: >> Copying modules from '${modules_srcdir}' to initramfs ..."
 
 	local i= mymod=
-	local -x KEXT="$(modules_kext)"
 	local n_copied_modules=0
 	for i in $(gen_dep_list)
 	do

diff --git a/gen_moddeps.sh b/gen_moddeps.sh
index 30e1709..89a562b 100755
--- a/gen_moddeps.sh
+++ b/gen_moddeps.sh
@@ -53,37 +53,6 @@ modules_dep_list() {
 	fi
 }
 
-modules_kext() {
-	local KEXT='.ko'
-
-	declare -A module_compression_algorithms=()
-	module_compression_algorithms[NONE]='.ko'
-	module_compression_algorithms[GZIP]='.ko.gz'
-	module_compression_algorithms[XZ]='.ko.xz'
-	module_compression_algorithms[ZSTD]='.ko.zst'
-
-	local module_compression_algorithm
-	for module_compression_algorithm in "${!module_compression_algorithms[@]}"
-	do
-		print_info 5 "Checking if module compression algorithm '${module_compression_algorithm}' is being used ..."
-
-		local koption="CONFIG_MODULE_COMPRESS_${module_compression_algorithm}"
-		local value_koption=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "${koption}")
-		if [[ "${value_koption}" != "y" ]]
-		then
-			print_info 5 "Cannot use '${module_compression_algorithm}' algorithm for module compression, kernel option '${koption}' is not set!"
-			continue
-		fi
-
-		print_info 5 "Will use '${module_compression_algorithm}' algorithm for kernel module compression!"
-		KEXT="${module_compression_algorithms[${module_compression_algorithm}]}"
-		break
-	done
-	unset module_compression_algorithms module_compression_algorithm koption value_koption
-
-	echo ${KEXT}
-}
-
 # Pass module deps list
 strip_mod_paths() {
 	local x

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     ab340c3e3bc34a8ca46f83a4d1d0d0bbc20f0ea2
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  8 21:09:06 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul  8 21:09:06 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ab340c3e

genkernel: Bump to v4.2.3

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index fb0fb58..2df47f1 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.2.2'
+GK_V='4.2.3'
 
 # Normalize locales
 export LC_ALL=C

[gentoo-commits] proj/genkernel:master commit in: /

[Matt Turner]

commit:     be489a166f78f9cb2e89e8749094a6ddd0310ade
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 13 05:07:20 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Sep 13 05:07:20 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=be489a16

gen_cmdline.sh: Add objcopy/objdump/ranlib/readelf/strip to longusage

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 gen_cmdline.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index e3c985e..e53de69 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -92,6 +92,11 @@ longusage() {
   echo "	--kernel-ld=<linker>	Linker to use for kernel"
   echo "	--kernel-make=<makeprg> GNU Make to use for kernel"
   echo "	--kernel-nm=<nm>	NM utility to use for kernel"
+  echo "	--kernel-objcopy=<objcopy>	OBJCOPY utility to use for kernel"
+  echo "	--kernel-objdump=<objdump>	OBJDUMP utility to use for kernel"
+  echo "	--kernel-ranlib=<ranlib>	RANLIB utility to use for kernel"
+  echo "	--kernel-readelf=<readelf>	READELF utility to use for kernel"
+  echo "	--kernel-strip=<strip>	STRIP utility 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>"
@@ -104,6 +109,11 @@ longusage() {
   echo "	--utils-ld=<linker>	Linker to use for utils"
   echo "	--utils-make=<makeprog>	GNU Make to use for utils"
   echo "	--utils-nm=<nm>		NM utility to use for utils"
+  echo "	--utils-objcopy=<objcopy>	OBJCOPY utility to use for utils"
+  echo "	--utils-objdump=<objdump>	OBJDUMP utility to use for utils"
+  echo "	--utils-ranlib=<ranlib>		RANLIB utility to use for utils"
+  echo "	--utils-readelf=<readelf>	READELF utility to use for utils"
+  echo "	--utils-strip=<strip>	STRIP utility to use for utils"
   echo "	--makeopts=<makeopts>	Make options such as -j2, etc ..."
   echo "	--mountboot		Mount BOOTDIR automatically if mountable"
   echo "	--no-mountboot		Don't mount BOOTDIR automatically"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     67aaf064020dbf844fce7d86b617a862e3273232
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 25 14:10:21 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Sep 25 14:10:21 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=67aaf064

genkernel: Bump to v4.2.4

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 2df47f1..c20e0df 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.2.3'
+GK_V='4.2.4'
 
 # Normalize locales
 export LC_ALL=C

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     c869ac450ae286908cfed582b0c51fe327555833
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 30 21:12:52 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Sep 30 21:12:52 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c869ac45

gen_initramfs.sh: append_modprobed(): Adopt changes from sys-apps/baselayout-2.8

In >=sys-apps/baselayout-2.8, /etc/modprobe.d was moved to /lib/modprobe.d.

This commit will try to copy /etc/modprobe.d and /lib/modprobe.d but will
no longer fail if one directory is missing.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 8f11127..56d6a03 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1832,10 +1832,19 @@ append_modprobed() {
 	mkdir "${TDIR}" || gen_die "Failed to create '${TDIR}'!"
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 
-	mkdir -p "${TDIR}"/etc || gen_die "Failed to create '${TDIR}/etc'!"
+	local modprobe_dir
+	for modprobe_dir in /etc/modprobe.d /lib/modprobe.d
+	do
+		if [[ ! -e "${modprobe_dir}" ]]; then
+			print_info 5 "'${modprobe_dir}' does not exist; Skipping ..."
+			continue
+		fi
+
+		mkdir -p "${TDIR}${modprobe_dir}" || gen_die "Failed to create '${TDIR}${modprobe_dir}'!"
 
-	cp -rL "/etc/modprobe.d" "${TDIR}"/etc/ 2>/dev/null \
-		|| gen_die "Failed to copy '/etc/modprobe.d'!"
+		cp -aL "${modprobe_dir}"/. "${TDIR}${modprobe_dir}" 2>/dev/null \
+			|| gen_die "Failed to copy '${modprobe_dir}'!"
+	done
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
 	log_future_cpio_content

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     782f8a0cbea9358d0fadc17c6a043d10cd6165fb
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 27 16:56:00 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Oct 27 16:56:00 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=782f8a0c

genkernel: Bump to v4.2.5

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index c20e0df..3116505 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.2.4'
+GK_V='4.2.5'
 
 # Normalize locales
 export LC_ALL=C

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     ab723c54aa0fef50384dbbb936614c7430f5413b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 14 23:57:12 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Nov 15 01:23:26 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ab723c54

gen_initramfs.sh: append_busybox: NSS dns module was merged into libc in >=glibc-2.34

Bug: https://bugs.gentoo.org/823716
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 56d6a03..fef8046 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -562,8 +562,16 @@ append_busybox() {
 	if isTrue "$(is_glibc)"
 	then
 		local libdir=$(get_chost_libdir)
-		mkdir -p "${TDIR}"/lib || gen_die "Failed to create '${TDIR}/lib'!"
-		copy_system_binaries "${TDIR}"/lib "${libdir}"/libnss_dns.so
+		local libnss_dns="${libdir}/libnss_dns.so"
+
+		# NSS dns module was moved into libc in >=glibc-2.34
+		# but when this file exists we are probably dealing with older glibc
+		# and need to manually copy the module.
+		if [[ -f "${libnss_dns}" ]]
+		then
+			mkdir -p "${TDIR}"/lib || gen_die "Failed to create '${TDIR}/lib'!"
+			copy_system_binaries "${TDIR}"/lib "${libnss_dns}"
+		fi
 	fi
 
 	log_future_cpio_content

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     fb2a687bba457e5408bc3bd979568c9a18c51be5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 14 23:57:58 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Nov 15 01:24:37 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fb2a687b

gen_initramfs.sh: append_dropbear: NSS files module was merged into libc in >=glibc-2.34

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_initramfs.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index fef8046..4ec296e 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1601,8 +1601,16 @@ append_dropbear() {
 	if isTrue "$(is_glibc)"
 	then
 		local libdir=$(get_chost_libdir)
-		mkdir -p "${TDIR}"/lib || gen_die "Failed to create '${TDIR}/lib'!"
-		copy_system_binaries "${TDIR}"/lib "${libdir}"/libnss_files.so
+		local libnss_files="${libdir}/libnss_files.so"
+
+		# NSS files module was moved into libc in >=glibc-2.34
+		# but when this file exists we are probably dealing with older glibc
+		# and need to manually copy the module.
+		if [[ -f "${libnss_files}" ]]
+		then
+			mkdir -p "${TDIR}"/lib || gen_die "Failed to create '${TDIR}/lib'!"
+			copy_system_binaries "${TDIR}"/lib "${libnss_files}"
+		fi
 	fi
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     6473e0a96a03598a9e22904d1fe011913efaac5a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 14 23:46:30 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 14 23:46:30 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6473e0a9

gen_compile.sh: populate_binpkg(): Use libc.a for testing if glibc has changed

NSS files module was merged into libc in >=glibc-2.34 so it can't be used
to test for changed glibc version anymore.

Using libc.a seems to be the better alternative which we use already in
get_chost_libdir() and depend on in general.

In addition, a check was added to ensure that our glibc test file really
exists (older-than check would pass if our test file would be missing
which is not what we want).

Fixes: 61049d29 ("gen_compile.sh: populate_binpkg(): Throw away binpkg when glibc has changed")
Bug: https://bugs.gentoo.org/823716
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_compile.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index e2b86cc..9af128b 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -515,7 +515,12 @@ populate_binpkg() {
 		if isTrue "$(is_glibc)"
 		then
 			local libdir=$(get_chost_libdir)
-			local glibc_test_file="${libdir}/libnss_files.so"
+			local glibc_test_file="${libdir}/libc.a"
+
+			if [[ ! -f "${glibc_test_file}" ]]
+			then
+				gen_die "Internal error: File '${glibc_test_file}' not found! Do not know how to deal with this glibc version."
+			fi
 
 			if [[ "${BINPKG}" -ot "${glibc_test_file}" ]]
 			then

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     c790b6e2c5bd4841a7469bdd8f6e3eee8bf82453
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 15 00:19:31 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Nov 15 01:24:49 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c790b6e2

gen_determineargs.sh: determine_real_args(): Make kmod only required for non-static kernels

Fixes: 153a877d ("Refactor (compressed) kernel module handling")
Bug: https://bugs.gentoo.org/821484
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 15 +++++++++------
 gen_funcs.sh         |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 027c696..07b2202 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -314,12 +314,6 @@ determine_real_args() {
 		gen_die "'realpath -m /' failed. We need a realpath version which supports '-m' mode!"
 	fi
 
-	KMOD_CMD=$(which kmod 2>/dev/null)
-	if [ -z "${KMOD_CMD}" ]
-	then
-		gen_die "kmod not found. Is sys-apps/kmod installed?"
-	fi
-
 	if hash grep &>/dev/null
 	then
 		GREP_CMD=grep
@@ -1233,6 +1227,15 @@ determine_real_args() {
 		fi
 	fi
 
+	KMOD_CMD=$(which kmod 2>/dev/null)
+	if ! isTrue "${BUILD_STATIC}"
+	then
+		if [ -z "${KMOD_CMD}" ]
+		then
+			gen_die "kmod not found. Is sys-apps/kmod installed?"
+		fi
+	fi
+
 	if ! isTrue "${CMD_INSTALL}"
 	then
 		if [ -n "${KERNEL_MODULES_PREFIX}" ]

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 6bc59e6..500caf2 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -322,7 +322,7 @@ is_kext_supported_by_kmod() {
 					is_supported=yes
 					break
 				fi
-			done < <("${KMOD_CMD}" -V)
+			done < <("${KMOD_CMD}" -V 2>/dev/null)
 			;;
 	esac
 

[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     5c13fd41b6043b18432dc6a28ab3c9aa69a8de88
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 15 01:19:36 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Nov 15 01:24:49 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5c13fd41

genkernel: Bump to v4.2.6

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 3116505..83a01d5 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.2.5'
+GK_V='4.2.6'
 
 # Normalize locales
 export LC_ALL=C

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     1bb3cc10d51026ad500bc9cec883f1f2f0c445ec
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sun May 15 22:49:21 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun May 15 23:13:55 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1bb3cc10

gen_funcs: Add an install_exe function

This helps when the build uses slibtool where the compiled binary output
path differs from GNU libtool.

Signed-off-by: orbea <orbea <AT> riseup.net>

 gen_funcs.sh | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 500caf2..a4dc0e4 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1974,6 +1974,29 @@ check_distfiles() {
 	fi
 }
 
+# @FUNCTION: install_exe
+# @USAGE: <file> <destination>
+# @DESCRIPTION:
+# Finds an executable binary file and installs it in cases where there may be
+# similarly named shell wrapper scripts. This happens when GNU libtool creates
+# an executable named 'foo' while slibtool creates '.libs/foo' and 'foo' is a
+# shell script that should not be installed.
+install_exe() {
+	local file="${1##*/}"
+	local dest="${2}"
+
+	local dir
+	[[ "${1%/*}" == "${file}" ]] || dir="${1%/*}/"
+
+	[[ -f "${dir}${file}" ]] || gen_die "File '${dir}${file}' does not exist!"
+
+	# Ensure only the binaries are installed and not a similarly named wrapper script
+	find "${S}/${dir}" -type f -name "${file}" -print0 |
+		xargs -0 file | grep executable | grep ELF | cut -f 1 -d : |
+		xargs -I '{}' cp -a '{}' "${dest}" ||
+		gen_die "Failed to copy '${S}/${dir}${file}' to '${dest}'!"
+}
+
 # @FUNCTION: expand_file
 # @USAGE: <file>
 # @DESCRIPTION:

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     110cffbf0a10a6dabe902eecb9c139663ad737af
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 16:37:51 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun May 15 22:10:07 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=110cffbf

gen_initramfs.sh: append devicemanager only for specific modules

dmraid
luks
lvm
multipath

Bug: https://bugs.gentoo.org/749957
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 gen_funcs.sh     |  9 +++++++++
 gen_initramfs.sh | 11 +++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 500caf2..db396e3 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -22,6 +22,15 @@ isTrue() {
 	return 1
 }
 
+anyTrue() {
+	local x
+	for x
+	do
+		isTrue "${x}" && return 0
+	done
+	return 1
+}
+
 set_color_vars() {
 	if ! isTrue "${NOCOLOR}"
 	then

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 4ec296e..0b74f4c 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -2007,11 +2007,14 @@ append_auxiliary() {
 }
 
 append_data() {
-	local name=$1 var=$2
+	[ $# -eq 0 ] && gen_die "append_data() called with zero arguments"
+
+	local name=$1
 	local func="append_${name}"
 
-	[ $# -eq 0 ] && gen_die "append_data() called with zero arguments"
-	if [ $# -eq 1 ] || isTrue "${var}"
+	shift
+
+	if [ $# -eq 0 ] || anyTrue "$@"
 	then
 		print_info 1 "$(get_indent 1)>> Appending ${name} cpio data ..."
 		${func} || gen_die "${func}() failed!"
@@ -2037,7 +2040,7 @@ create_initramfs() {
 	append_data 'base_layout'
 	append_data 'util-linux'
 	append_data 'eudev'
-	append_data 'devicemanager'
+	append_data 'devicemanager' "${DMRAID}" "${LVM}" "${LUKS}" "${MULTIPATH}"
 	append_data 'auxiliary' "${BUSYBOX}"
 	append_data 'busybox' "${BUSYBOX}"
 	append_data 'b2sum' "${B2SUM}"

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     ad62b864867c2d97dd71cd38f000fb8c7550c6a9
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 05:15:49 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon May 16 05:16:38 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ad62b864

Add support for LUKS detached header (another attempt)

Note: commit 73a05632d61171685ac4960c6b684cefa6d82afd is
significantly easier to review by ignoring whitespace changes.

Closes: https://github.com/gentoo/genkernel/pull/28
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/initrd.scripts | 162 +++++++++++++++++++++++++++++++++++++++++++-----
 defaults/linuxrc        |  18 ++++++
 doc/genkernel.8.txt     |  22 +++++++
 3 files changed, 186 insertions(+), 16 deletions(-)

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     78968ce2101c68eabe38956495ba9d7b7f095875
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 04:57:54 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon May 16 04:57:54 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=78968ce2

gkbuild: Install the correct binaries with slibtool

Closes: https://github.com/gentoo/genkernel/pull/33
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 gen_funcs.sh                | 23 +++++++++++++++++++++++
 gkbuilds/cryptsetup.gkbuild |  3 +--
 gkbuilds/util-linux.gkbuild |  7 ++-----
 3 files changed, 26 insertions(+), 7 deletions(-)

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     33edf44c8f25e510625ea5f155629848dc1144dd
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 05:02:01 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon May 16 05:02:17 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=33edf44c

defaults/initrd.scripts: Get rid of extra padding

Note: commit efdf4d0affb587655d703140db86d45ffd2a1ede is significantly
easier to review by ignoring whitespace changes.

Closes: https://github.com/gentoo/genkernel/pull/30
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/initrd.scripts | 184 ++++++++++++++++++++++++------------------------
 1 file changed, 92 insertions(+), 92 deletions(-)

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     4efdb878a0d4ef361c3f39c62410e2afb51efb54
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 04:53:37 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon May 16 04:53:37 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4efdb878

gen_initramfs.sh: append devicemanager only for dmraid, luks, or lvm

Closes: https://github.com/gentoo/genkernel/pull/35
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 gen_funcs.sh     |  9 +++++++++
 gen_initramfs.sh | 11 +++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     4e7f2d85b4b754acd54b9fc6353b2f96ef545057
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 16:45:49 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon May 16 16:45:49 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4e7f2d85

Updating open-iscsi to 2.1.4

Closes: https://github.com/gentoo/genkernel/pull/34
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 .../2.0.878/open-iscsi-2.0.878-gcc-10.patch        | 107 ---------------------
 .../open-iscsi-2.0.878-static-iscsistart.patch     |  11 ---
 .../open-iscsi-2.1.4-Makefiles.patch}              |   8 +-
 .../2.1.4/open-iscsi-2.1.4-static-iscsistart.patch |  11 +++
 4 files changed, 15 insertions(+), 122 deletions(-)

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     edefa80c999972b0dffdc5c9cf9d880156e6e0db
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 20:34:54 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue May 24 20:34:54 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=edefa80c

add keyctl support for loading LUKS passphrase into a keyring

Merges: https://github.com/gentoo/genkernel/pull/10
Closes: https://github.com/gentoo/genkernel/pull/10
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/initrd.scripts   | 52 ++++++++++++++++++++++++++++++++++++++++++++++-
 defaults/linuxrc          | 34 +++++++++++++++++++++++++++++--
 defaults/software.sh      |  7 +++++++
 doc/genkernel.8.txt       | 24 ++++++++++++++++++++++
 gen_cmdline.sh            |  6 ++++++
 gen_determineargs.sh      |  2 ++
 gen_initramfs.sh          | 29 ++++++++++++++++++++++++++
 genkernel.conf            |  3 +++
 gkbuilds/keyutils.gkbuild | 27 ++++++++++++++++++++++++
 9 files changed, 181 insertions(+), 3 deletions(-)

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     144ba9a735ff65d65fc1d3dbd8902f5ecd5b7ba8
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat May 28 20:51:31 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat May 28 20:51:31 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=144ba9a7

Detached header: fix bootstrap calls and sleeps, remove extra bracket

Merges: https://github.com/gentoo/genkernel/pull/37
Closes: https://github.com/gentoo/genkernel/pull/37
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/initrd.scripts | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     d244a241a7565b920ba0a30274fddc5c88ea0e8a
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat May 28 20:53:41 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat May 28 20:53:41 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d244a241

Additional test to allow for hibernation resume

Merges: https://github.com/gentoo/genkernel/pull/38
Closes: https://github.com/gentoo/genkernel/pull/38
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/linuxrc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     aef014f88bd2ef8a125ca082bb654e7a64f8b77c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 16:52:12 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun May 29 16:52:12 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=aef014f8

Fixes a mistake with quotation usage when testing for LVM flag

Closes: https://github.com/gentoo/genkernel/pull/39
Merges: https://github.com/gentoo/genkernel/pull/39
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/linuxrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     248bd41e5d20cf42652295148c7856a39d94591c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 02:53:29 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 02:53:29 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=248bd41e

Merge Enable threaded XZ compression by default

Merges: https://github.com/gentoo/genkernel/pull/41
Closes: https://github.com/gentoo/genkernel/pull/41
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/compression_methods.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[gentoo-commits] proj/genkernel:master commit in: /

[Matt Turner]

commit:     0229b8f9741c1365e8c647f26c9109249be2eaf2
Author:     Matoro Mahri <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Thu Oct 13 01:00:26 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Oct 19 22:41:48 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0229b8f9

Fix s390 support

Make sure we pull in correct genkernel arch-specific configuration.
Kernel arch is always "s390".

Closes: https://github.com/gentoo/genkernel/pull/43
Signed-off-by: Matoro Mahri <matoro <AT> users.noreply.github.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 gen_arch.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gen_arch.sh b/gen_arch.sh
index 6da31aa..b232c3c 100755
--- a/gen_arch.sh
+++ b/gen_arch.sh
@@ -26,6 +26,9 @@ determine_kernel_arch() {
 		riscv|riscv64*)
 			KERNEL_ARCH=riscv
 			;;
+		s390*)
+			KERNEL_ARCH=s390
+			;;
 		x86)
 			if [ "${VER}" -ge "3" ]
 			then

[gentoo-commits] proj/genkernel:master commit in: /

[Matt Turner]

commit:     b390c44f05ee12b04f16d3f7e5cdd9b5dec99262
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 19:06:17 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Nov 14 19:06:17 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b390c44f

genkernel 4.3.1

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 83a01d5..3da389b 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.2.6'
+GK_V='4.3.1'
 
 # Normalize locales
 export LC_ALL=C

[gentoo-commits] proj/genkernel:master commit in: /

[Matt Turner]

commit:     92427dc0d11b26b03fcfb9c6de7c23fac32c7888
Author:     Matoro Mahri <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Wed Dec 21 20:01:26 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 18:57:02 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=92427dc0

Reimplement --kernel-cross-compile= for genkernel 4.x

This restores the --kernel-cross-compile= option from genkernel 3.x,
which controls only the --kernel-xxx= options as opposed to both kernel
and userspace options controlled by --cross-compile=.

Also adds documentation on the missing options in default
genkernel.conf.

Bug: https://bugs.gentoo.org/716862
Signed-off-by: Matoro Mahri <matoro <AT> users.noreply.github.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 gen_cmdline.sh       |  6 ++++++
 gen_determineargs.sh | 23 ++++++++++++-----------
 genkernel.conf       | 25 +++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 0cba7d1..2a4d3de 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -86,6 +86,8 @@ longusage() {
   echo "  Low-Level Compile settings"
   echo "	--cross-compile=<target-triplet>"
   echo "				Target triple (i.e. aarch64-linux-gnu) to build for"
+  echo "	--kernel-cross-compile=<target-triplet>"
+  echo "				Target triple (i.e. aarch64-linux-gnu) to build kernel for"
   echo "	--kernel-ar=<archiver>	Archiver to use for kernel"
   echo "	--kernel-as=<assembler>	Assembler to use for kernel"
   echo "	--kernel-cc=<compiler>	Compiler to use for kernel (e.g. distcc)"
@@ -304,6 +306,10 @@ parse_cmdline() {
 			CMD_CROSS_COMPILE="${*#*=}"
 			print_info 3 "CMD_CROSS_COMPILE: ${CMD_CROSS_COMPILE}"
 			;;
+			--kernel-cross-compile=*)
+			CMD_KERNEL_CROSS_COMPILE="${*#*=}"
+			print_info 3 "CMD_KERNEL_CROSS_COMPILE: ${CMD_KERNEL_CROSS_COMPILE}"
+			;;
 		--kernel-ar=*)
 			CMD_KERNEL_AR="${*#*=}"
 			print_info 3 "CMD_KERNEL_AR: ${CMD_KERNEL_AR}"

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index ef69414..7122ea3 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -353,19 +353,20 @@ determine_real_args() {
 	set_config_with_override STRING CHOST                                 CMD_CHOST                                 "${DEFAULT_CHOST}"
 	set_config_with_override STRING MAKEOPTS                              CMD_MAKEOPTS                              "${DEFAULT_MAKEOPTS}"
 	set_config_with_override STRING NICE                                  CMD_NICE                                  "10"
-	set_config_with_override STRING KERNEL_AS                             CMD_KERNEL_AS                             "${DEFAULT_KERNEL_AS}"
-	set_config_with_override STRING KERNEL_AR                             CMD_KERNEL_AR                             "${DEFAULT_KERNEL_AR}"
-	set_config_with_override STRING KERNEL_CC                             CMD_KERNEL_CC                             "${DEFAULT_KERNEL_CC}"
-	set_config_with_override STRING KERNEL_CFLAGS                         CMD_KERNEL_CFLAGS                         "${DEFAULT_KERNEL_CFLAGS}"
+	set_config_with_override STRING KERNEL_CROSS_COMPILE                  CMD_KERNEL_CROSS_COMPILE
+	set_config_with_override STRING KERNEL_AS                             CMD_KERNEL_AS                             "$([[ -n "${KERNEL_CROSS_COMPILE}" ]] && echo "${KERNEL_CROSS_COMPILE}-${DEFAULT_KERNEL_AS}" || echo "${DEFAULT_KERNEL_AS}")"
+	set_config_with_override STRING KERNEL_AR                             CMD_KERNEL_AR                             "$([[ -n "${KERNEL_CROSS_COMPILE}" ]] && echo "${KERNEL_CROSS_COMPILE}-${DEFAULT_KERNEL_AR}" || echo "${DEFAULT_KERNEL_AR}")"
+	set_config_with_override STRING KERNEL_CC                             CMD_KERNEL_CC                             "$([[ -n "${KERNEL_CROSS_COMPILE}" ]] && echo "${KERNEL_CROSS_COMPILE}-${DEFAULT_KERNEL_CC}" || echo "${DEFAULT_KERNEL_CC}")"
 	set_config_with_override STRING KERNEL_CXX                            CMD_KERNEL_CXX                            "${DEFAULT_KERNEL_CXX}"
-	set_config_with_override STRING KERNEL_LD                             CMD_KERNEL_LD                             "${DEFAULT_KERNEL_LD}"
-	set_config_with_override STRING KERNEL_NM                             CMD_KERNEL_NM                             "${DEFAULT_KERNEL_NM}"
+	set_config_with_override STRING KERNEL_CFLAGS                         CMD_KERNEL_CFLAGS                         "${DEFAULT_KERNEL_CFLAGS}"
+	set_config_with_override STRING KERNEL_LD                             CMD_KERNEL_LD                             "$([[ -n "${KERNEL_CROSS_COMPILE}" ]] && echo "${KERNEL_CROSS_COMPILE}-${DEFAULT_KERNEL_LD}" || echo "${DEFAULT_KERNEL_LD}")"
 	set_config_with_override STRING KERNEL_MAKE                           CMD_KERNEL_MAKE                           "${DEFAULT_KERNEL_MAKE}"
-	set_config_with_override STRING KERNEL_OBJCOPY                        CMD_KERNEL_OBJCOPY                        "${DEFAULT_KERNEL_OBJCOPY}"
-	set_config_with_override STRING KERNEL_OBJDUMP                        CMD_KERNEL_OBJDUMP                        "${DEFAULT_KERNEL_OBJDUMP}"
-	set_config_with_override STRING KERNEL_RANLIB                         CMD_KERNEL_RANLIB                         "${DEFAULT_KERNEL_RANLIB}"
-	set_config_with_override STRING KERNEL_READELF                        CMD_KERNEL_READELF                        "${DEFAULT_KERNEL_READELF}"
-	set_config_with_override STRING KERNEL_STRIP                          CMD_KERNEL_STRIP                          "${DEFAULT_KERNEL_STRIP}"
+	set_config_with_override STRING KERNEL_NM                             CMD_KERNEL_NM                             "$([[ -n "${KERNEL_CROSS_COMPILE}" ]] && echo "${KERNEL_CROSS_COMPILE}-${DEFAULT_KERNEL_NM}" || echo "${DEFAULT_KERNEL_NM}")"
+	set_config_with_override STRING KERNEL_OBJCOPY                        CMD_KERNEL_OBJCOPY                        "$([[ -n "${KERNEL_CROSS_COMPILE}" ]] && echo "${KERNEL_CROSS_COMPILE}-${DEFAULT_KERNEL_OBJCOPY}" || echo "${DEFAULT_KERNEL_OBJCOPY}")"
+	set_config_with_override STRING KERNEL_OBJDUMP                        CMD_KERNEL_OBJDUMP                        "$([[ -n "${KERNEL_CROSS_COMPILE}" ]] && echo "${KERNEL_CROSS_COMPILE}-${DEFAULT_KERNEL_OBJDUMP}" || echo "${DEFAULT_KERNEL_OBJDUMP}")"
+	set_config_with_override STRING KERNEL_RANLIB                         CMD_KERNEL_RANLIB                         "$([[ -n "${KERNEL_CROSS_COMPILE}" ]] && echo "${KERNEL_CROSS_COMPILE}-${DEFAULT_KERNEL_RANLIB}" || echo "${DEFAULT_KERNEL_RANLIB}")"
+	set_config_with_override STRING KERNEL_READELF                        CMD_KERNEL_READELF                        "$([[ -n "${KERNEL_CROSS_COMPILE}" ]] && echo "${KERNEL_CROSS_COMPILE}-${DEFAULT_KERNEL_READELF}" || echo "${DEFAULT_KERNEL_READELF}")"
+	set_config_with_override STRING KERNEL_STRIP                          CMD_KERNEL_STRIP                          "$([[ -n "${KERNEL_CROSS_COMPILE}" ]] && echo "${KERNEL_CROSS_COMPILE}-${DEFAULT_KERNEL_STRIP}" || echo "${DEFAULT_KERNEL_STRIP}")"
 	set_config_with_override STRING UTILS_AS                              CMD_UTILS_AS                              "${DEFAULT_UTILS_AS}"
 	set_config_with_override STRING UTILS_AR                              CMD_UTILS_AR                              "${DEFAULT_UTILS_AR}"
 	set_config_with_override STRING UTILS_CC                              CMD_UTILS_CC                              "${DEFAULT_UTILS_CC}"

diff --git a/genkernel.conf b/genkernel.conf
index 7045e18..9a262f0 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -217,6 +217,26 @@ NOCOLOR="false"
 # GNU Make to use for kernel.  See also the --kernel-make command line option.
 #KERNEL_MAKE="make"
 
+# objcopy utility to use for the kernel.  See also the --kernel-objcopy command
+# line option.
+#KERNEL_OBJCOPY="objcopy"
+
+# objdump utility to use for the kernel.  See also the --kernel-objdump command
+# line option.
+#KERNEL_OBJDUMP="objdump"
+
+# ranlib utility to use for the kernel.  See also the --kernel-ranlib command
+# line option.
+#KERNEL_RANLIB="ranlib"
+
+# readelf utility to use for the kernel.  See also the --kernel-readelf command
+# line option.
+#KERNEL_READELF="readelf"
+
+# strip utility to use for the kernel.  See also the --kernel-strip command line
+# option.
+#KERNEL_STRIP="strip"
+
 # Assembler to use for the utilities.  See also the --utils-as command line
 # option.
 #UTILS_AS="as"
@@ -248,6 +268,11 @@ NOCOLOR="false"
 # cross-compile, leave blank for auto detection.
 #CROSS_COMPILE=""
 
+# Target triple (i.e. aarch64-linux-gnu) to build kernel for.  Utilities will be
+# built for the native target, not this target. If you do not cross-compile,
+# leave blank.
+#KERNEL_CROSS_COMPILE=""
+
 # Override default make target (bzImage). See also the --kernel-target
 # command line option. Useful to build a uImage on arm.
 #KERNEL_MAKE_DIRECTIVE_OVERRIDE="fooImage"

[gentoo-commits] proj/genkernel:master commit in: /

[Matt Turner]

commit:     5dfa1e52c74aaef22f244187c613f7a95f5c66ca
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  8 18:58:13 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 18:58:13 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5dfa1e52

genkernel 4.3.2

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 3da389b..ddea44b 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.3.1'
+GK_V='4.3.2'
 
 # Normalize locales
 export LC_ALL=C

[gentoo-commits] proj/genkernel:master commit in: /

[Matt Turner]

commit:     82afd329906102e73e9a1da5e02282cd48a4d1d3
Author:     Diego Viola <diego.viola <AT> gmail <DOT> com>
AuthorDate: Sun Dec 25 06:46:48 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 17:20:41 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=82afd329

genkernel.conf: make section titles more consistent

by capitalizing all section titles and using the same amount of =
characters.

Closes: https://github.com/gentoo/genkernel/pull/45
Signed-off-by: Diego Viola <diego.viola <AT> gmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 genkernel.conf | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/genkernel.conf b/genkernel.conf
index 9a262f0..75c6d39 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -5,7 +5,7 @@
 # with the internal settings being least important, configuration file
 # settings next, and command line options being most important.
 
-# =========Common Command Line Option Defaults=========
+# =========COMMON COMMAND LINE OPTION DEFAULTS=========
 
 # Install to $BOOTDIR
 #INSTALL="yes"
@@ -185,7 +185,7 @@ NOCOLOR="false"
 #CMD_CALLBACK=""
 
 
-# =========Keymap Settings=========
+# =========KEYMAP SETTINGS=========
 #
 # Force keymap selection at boot
 #DOKEYMAPAUTO="no"
@@ -194,7 +194,7 @@ NOCOLOR="false"
 #KEYMAP="yes"
 
 
-# =========Low Level Compile Settings=========
+# =========LOW LEVEL COMPILE SETTINGS=========
 #
 # Assembler to use for the kernel.  See also the --kernel-as command line
 # option.
@@ -282,7 +282,7 @@ NOCOLOR="false"
 #KERNEL_BINARY_OVERRIDE="arch/foo/boot/bar"
 
 
-# =========GENKERNEL LOCATION CONFIGURATION============
+# =========GENKERNEL LOCATION CONFIGURATION=========
 #
 # Variables:
 #   %%ARCH%%  - Final determined architecture
@@ -310,7 +310,7 @@ LOGFILE="/var/log/genkernel.log"
 LOGLEVEL=1
 
 
-# =========COMPILED UTILS CONFIGURATION============
+# =========COMPILED UTILS CONFIGURATION=========
 #
 # Default location of kernel source
 DEFAULT_KERNEL_SOURCE="/usr/src/linux"
@@ -329,7 +329,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 #   You can still override these settings in here.
 
 
-# =========MISC KERNEL CONFIGURATION============
+# =========MISC KERNEL CONFIGURATION=========
 #
 # Set kernel filename which will be used when kernel will be installed
 # into BOOTDIR. See man page to learn more about available placeholders.
@@ -364,7 +364,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 #KERNEL_MODULES_PREFIX=""
 
 
-# =========MISC INITRAMFS CONFIGURATION============
+# =========MISC INITRAMFS CONFIGURATION=========
 #
 # Set initramfs filename which will be used when initramfs will be
 # installed into BOOTDIR. See man page to learn more about available
@@ -432,7 +432,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 #NETBOOT="no"
 
 
-# =========MISC BOOT CONFIGURATION============
+# =========MISC BOOT CONFIGURATION=========
 #
 # Specify a default for real_root=
 #REAL_ROOT="/dev/one/two/gentoo"

[gentoo-commits] proj/genkernel:master commit in: /

[Ben Kohler]

commit:     75d666895ff428ca18863674bcf7e5ebf176505b
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed May 24 16:24:32 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed May 24 16:26:35 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=75d66689

gen_initramfs.sh: force no-color on qlist calls

In some cases, qlist's pipe detection may not work, and this is fatal to
our build. Let's just force -C on all qlist calls.

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 gen_initramfs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 227badd..986b3b4 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -801,7 +801,7 @@ append_multipath() {
 
 	local udevdir=$(get_udevdir)
 	local udevdir_initramfs="/usr/lib/udev"
-	local udev_files=( $(qlist -e sys-fs/multipath-tools:0 \
+	local udev_files=( $(qlist -eC sys-fs/multipath-tools:0 \
 		| grep -E -- "^${udevdir}")
 	)
 
@@ -1131,7 +1131,7 @@ append_zfs() {
 
 	local udevdir=$(get_udevdir)
 	local udevdir_initramfs="/usr/lib/udev"
-	local udev_files=( $(qlist -e sys-fs/zfs:0 \
+	local udev_files=( $(qlist -eC sys-fs/zfs:0 \
 		| grep -E -- "^${udevdir}")
 	)
 

[gentoo-commits] proj/genkernel:master commit in: /

[Matt Turner]

commit:     a21ae3df4f20ad26b38050f92b2ef39ced5b81ff
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 02:38:20 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon May 29 02:38:20 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a21ae3df

genkernel 4.3.3

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 0bc3c88..7974801 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.3.2'
+GK_V='4.3.3'
 
 # Normalize locales
 export LC_ALL=C

[gentoo-commits] proj/genkernel:master commit in: /

[Matt Turner]

commit:     6174b60e52dd872219b7fd931f1018f835124ce1
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 02:37:46 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon May 29 02:37:46 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6174b60e

genkernel: Fix typo

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index ddea44b..0bc3c88 100755
--- a/genkernel
+++ b/genkernel
@@ -289,7 +289,7 @@ then
 		:
 	else
 		print_warning 1 '' 1 0
-		print_warning 1 "Current kernel's LOCALVERSION is set to '${LOV}'; Will ignore set --kernel-localversion value '${KERNEL_LOCALVERSION}' because kernel was not build ..."
+		print_warning 1 "Current kernel's LOCALVERSION is set to '${LOV}'; Will ignore set --kernel-localversion value '${KERNEL_LOCALVERSION}' because kernel was not built ..."
 	fi
 fi
 

[gentoo-commits] proj/genkernel:master commit in: /

[Sam James]

commit:     53dba2d14be25629a7449ba35eff8a47d9a9254c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  5 18:22:18 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul  5 18:23:13 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=53dba2d1

genkernel: bump to 4.3.5

Signed-off-by: Sam James <sam <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 7974801..98bbee1 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.3.3'
+GK_V='4.3.5'
 
 # Normalize locales
 export LC_ALL=C

[gentoo-commits] proj/genkernel:master commit in: /

[Sam James]

commit:     09bcd9cdf271f3890d1d0ce67a3bb5849618688e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 26 08:49:55 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 10:42:11 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=09bcd9cd

gen_determineargs.sh: update sys-fs/udev reference

Noticed after ulm reported it on IRC.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 gen_determineargs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 7122ea3..fd3a4ae 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -1079,7 +1079,7 @@ determine_real_args() {
 			if [ ! -x "/lib/udev/scsi_id" ]
 			then
 				local error_msg="'/lib/udev/scsi_id' is required for --multipath but file does not exist or is not executable!"
-				error_msg+=" This file is usually provided by sys-fs/{eudev,udev} or sys-apps/systemd!"
+				error_msg+=" This file is usually provided by: sys-apps/systemd-utils, sys-fs/eudev, or sys-apps/systemd!"
 				gen_die "${error_msg}"
 			fi
 

[gentoo-commits] proj/genkernel:master commit in: /

[Sam James]

commit:     c96acc3259ed4a4d8d3605ef27013f9cec4c1ed6
Author:     Vladimir Vrzić <vvrzic <AT> gmail <DOT> com>
AuthorDate: Tue Apr 27 11:41:19 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 28 09:52:55 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c96acc32

gen_funcs.sh: use stat(1) to check free disk space

By using stat(1) to get free disk space we avoid tricky parsing
of df(1) output.

Signed-off-by: Vladimir Vrzić <vvrzic <AT> gmail.com>
Closes: https://github.com/gentoo/genkernel/pull/22
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gen_funcs.sh | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 476f5ee..c31e15a 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1904,20 +1904,21 @@ check_disk_space_requirements() {
 			gen_die "--check-free-disk-space-bootdir value '${CHECK_FREE_DISK_SPACE_BOOTDIR}' is not a valid number!"
 		fi
 
-		available_free_disk_space=$(unset POSIXLY_CORRECT && df -BM "${BOOTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
+		available_free_disk_space="$(($(stat -fc '%f * %S' "${BOOTDIR}")))"
 		if [ -n "${available_free_disk_space}" ]
 		then
 			print_info 2 '' 1 0
 			print_info 2 "Checking for at least ${CHECK_FREE_DISK_SPACE_BOOTDIR} MB free disk space in '${BOOTDIR}' ..."
-			print_info 5 "df reading: ${available_free_disk_space}"
+			print_info 5 "stat(1) reading: ${available_free_disk_space} bytes free"
 
-			available_free_disk_space=${available_free_disk_space%M}
-			if [ ${available_free_disk_space} -lt ${CHECK_FREE_DISK_SPACE_BOOTDIR} ]
+			bytes_in_mb=1048576
+			minimum_free_space_bytes_bootdir="$((${CHECK_FREE_DISK_SPACE_BOOTDIR} * ${bytes_in_mb}))"
+			if [ "${available_free_disk_space}" -lt "${minimum_free_space_bytes_bootdir}" ]
 			then
-				gen_die "${CHECK_FREE_DISK_SPACE_BOOTDIR} MB free disk space is required in '${BOOTDIR}' but only ${available_free_disk_space} MB is available!"
+				gen_die "${CHECK_FREE_DISK_SPACE_BOOTDIR} MB free disk space is required in '${BOOTDIR}' but only ${available_free_disk_space} bytes is available!"
 			fi
 		else
-			print_warning 1 "Invalid df value; Skipping free disk space check for '${BOOTDIR}' ..."
+			print_warning 1 "Invalid stat(1) value; Skipping free disk space check for '${BOOTDIR}' ..."
 		fi
 	fi
 
@@ -1941,20 +1942,21 @@ check_disk_space_requirements() {
 			gen_die "--check-free-disk-space-kerneloutputdir value '${CHECK_FREE_DISK_SPACE_KERNELOUTPUTDIR}' is not a valid number!"
 		fi
 
-		available_free_disk_space=$(unset POSIXLY_CORRECT && df -BM "${KERNEL_OUTPUTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
+		available_free_disk_space="$(($(stat -fc '%f * %S' "${KERNEL_OUTPUTDIR}")))"
 		if [ -n "${available_free_disk_space}" ]
 		then
 			print_info 2 '' 1 0
 			print_info 2 "Checking for at least ${CHECK_FREE_DISK_SPACE_KERNELOUTPUTDIR} MB free disk space in '${KERNEL_OUTPUTDIR}' ..."
-			print_info 5 "df reading: ${available_free_disk_space}"
+			print_info 5 "stat(1) reading: ${available_free_disk_space} bytes free"
 
-			available_free_disk_space=${available_free_disk_space%M}
-			if [ ${available_free_disk_space} -lt ${CHECK_FREE_DISK_SPACE_KERNELOUTPUTDIR} ]
+			bytes_in_mb=1048576
+			minimum_free_space_bytes_kerneloutputdir="$((${CHECK_FREE_DISK_SPACE_KERNELOUTPUTDIR} * ${bytes_in_mb}))"
+			if [ "${available_free_disk_space}" -lt "${minimum_free_space_bytes_kerneloutputdir}" ]
 			then
-				gen_die "${CHECK_FREE_DISK_SPACE_KERNELOUTPUTDIR} MB free disk space is required in '${KERNEL_OUTPUTDIR}' but only ${available_free_disk_space} MB is available!"
+				gen_die "${CHECK_FREE_DISK_SPACE_KERNELOUTPUTDIR} MB free disk space is required in '${KERNEL_OUTPUTDIR}' but only ${available_free_disk_space} bytes is available!"
 			fi
 		else
-			print_warning 1 "Invalid df value; Skipping free disk space check for '${KERNEL_OUTPUTDIR}' ..."
+			print_warning 1 "Invalid stat(1) value; Skipping free disk space check for '${KERNEL_OUTPUTDIR}' ..."
 		fi
 	fi
 }

[gentoo-commits] proj/genkernel:master commit in: /

[Sam James]

commit:     28edb3860520f5dfc0678f1ec0d7fe65a29ca8ed
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 28 15:41:31 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 28 15:41:31 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=28edb386

genkernel 4.3.6

Signed-off-by: Sam James <sam <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 98bbee1..0e3fc55 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.3.5'
+GK_V='4.3.6'
 
 # Normalize locales
 export LC_ALL=C

[gentoo-commits] proj/genkernel:master commit in: /

[Sam James]

commit:     cbb69958759cef4d4df4b3e24b3348a9601deb3e
Author:     FlyingWaffle <flyingwaffle <AT> pm <DOT> me>
AuthorDate: Sat May 28 22:59:43 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 05:47:44 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cbb69958

Changed firmware and modules requirements to warnings.

Depending on system configuration and hardware, added firmware and
modules might not be required for Plymouth to function.

Bug: https://bugs.gentoo.org/753617
Signed-off-by: FlyingWaffle <flyingwaffle <AT> pm.me>
Closes: https://github.com/gentoo/genkernel/pull/29
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gen_determineargs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 448e507..cefa614 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -1029,12 +1029,12 @@ determine_real_args() {
 
 		if isTrue "${PLYMOUTH}" && ! isTrue "${FIRMWARE}"
 		then
-			gen_die "--plymouth requires --firmware but --no-firmware is set!"
+			print_warning 3 "--plymouth potentially requires graphics firmware to function! Please configure your --firmware flags appropriately!"
 		fi
 
 		if isTrue "${PLYMOUTH}" && ! isTrue "${ALLRAMDISKMODULES}"
 		then
-			gen_die "--plymouth requires --all-ramdisk-modules but --no-all-ramdisk-modules is set!"
+			print_warning 3 "--plymouth potentially requires DRM kernel modules to function! Please configure your --ramdisk-modules flags appropriately!"
 		fi
 
 		if isTrue "${SSH}"

[gentoo-commits] proj/genkernel:master commit in: /

[Sam James]

commit:     08b4f191c9fb064f8564d888e3969a02b0384a32
Author:     Dmitry Baranov <reagentoo <AT> gmail <DOT> com>
AuthorDate: Wed Jun  1 17:21:18 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 06:18:18 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=08b4f191

firmware: copy only the necessary firmware(s) into initramfs

FIRMWARE=yes behavior is changed:
Only the minimum number of firmware files will be copied.
The list is generated using the `modinfo -F firmware [modules]...` command.
The ability to copy all firmware(s) is also available with a new
ALLFIRMWARE setting (see the modified genkernel.conf for more details).

As for changes in the source code:
gen_moddeps.sh: Significantly redesigned module list generation.
To get a list of modules, use the `mod_dep_list()` function instead
of `gen_dep_list()`. Modules that are not in the kernel (=n or invalid)
will be filtered out. Aliases will be replaced with real names
(including dependencies).

Signed-off-by: Dmitry Baranov <reagentoo <AT> gmail.com>
Closes: https://github.com/gentoo/genkernel/pull/40
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gen_cmdline.sh       |  8 +++++
 gen_configkernel.sh  |  7 ----
 gen_determineargs.sh |  1 +
 gen_initramfs.sh     | 91 ++++++++++++++++++++++++++++++------------------
 gen_moddeps.sh       | 98 ++++++++++++++++++++++++----------------------------
 genkernel            | 10 ++++++
 genkernel.conf       | 10 ++++--
 7 files changed, 130 insertions(+), 95 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index b6ad861..5857d48 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -62,6 +62,7 @@ longusage() {
   echo "	--ramdisk-modules	Copy required modules to the initramfs"
   echo "	--no-ramdisk-modules	Don't copy any modules to the initramfs"
   echo "	--all-ramdisk-modules	Copy all kernel modules to the initramfs"
+  echo "	--no-all-ramdisk-modules	Don't copy all kernel modules to the initramfs"
   echo "	--module-rebuild	Automatically run 'emerge @module-rebuild' when"
   echo "				necessary (and possible)"
   echo "	--no-module-rebuild	Don't automatically run 'emerge @module-rebuild'"
@@ -239,6 +240,9 @@ longusage() {
   echo "	--initramfs-symlink-name=<...>"
   echo "				Set initramfs symlink name"
   echo "	--firmware		Enable copying of firmware into initramfs"
+  echo "	--no-firmware	Disable copying of firmware into initramfs"
+  echo "	--all-firmware	Enable copying of all firmware into initramfs"
+  echo "	--no-all-firmware	Disable copying of all firmware into initramfs"
   echo "	--firmware-dir=<dir>"
   echo "				Specify directory to copy firmware from (defaults"
   echo "				to /lib/firmware)"
@@ -867,6 +871,10 @@ parse_cmdline() {
 			CMD_FIRMWARE=$(parse_optbool "$*")
 			print_info 3 "CMD_FIRMWARE: ${CMD_FIRMWARE}"
 			;;
+		--all-firmware|--no-all-firmware)
+			CMD_ALLFIRMWARE=$(parse_optbool "$*")
+			print_info 3 "CMD_FIRMWARE: ${CMD_ALLFIRMWARE}"
+			;;
 		--firmware-dir=*)
 			CMD_FIRMWARE_DIR="${*#*=}"
 			CMD_FIRMWARE="yes"

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index ebb3a44..d074005 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -347,13 +347,6 @@ config_kernel() {
 		unset kconfig_md5sum_old kconfig_md5sum_new
 	fi
 
-	# Check for suitable kmod
-	determine_KEXT
-	if ! isTrue "$(is_kext_supported_by_kmod "${KEXT}")"
-	then
-		gen_die "${KMOD_CMD} does not support chosen module compression algorithm. Please re-emerge sys-apps/kmod with USE=$(get_kext_kmod_use_flag "${KEXT}") enabled or adjust CONFIG_MODULE_COMPRESS_* kernel option!"
-	fi
-
 	local -a required_kernel_options
 	[ -f "${KCONFIG_MODIFIED_MARKER}" ] && rm "${KCONFIG_MODIFIED_MARKER}"
 

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index cefa614..d29ad48 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -445,6 +445,7 @@ determine_real_args() {
 	set_config_with_override BOOL   VIRTIO                                CMD_VIRTIO                                "no"
 	set_config_with_override BOOL   MULTIPATH                             CMD_MULTIPATH                             "no"
 	set_config_with_override BOOL   FIRMWARE                              CMD_FIRMWARE                              "no"
+	set_config_with_override BOOL   ALLFIRMWARE                           CMD_ALLFIRMWARE                           "no"
 	set_config_with_override STRING FIRMWARE_DIR                          CMD_FIRMWARE_DIR                          "/lib/firmware"
 	set_config_with_override STRING FIRMWARE_FILES                        CMD_FIRMWARE_FILES
 	set_config_with_override BOOL   FIRMWARE_INSTALL                      CMD_FIRMWARE_INSTALL                      "no"

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index ad61faa..2cfa0fd 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1762,15 +1762,42 @@ append_firmware() {
 
 	mkdir -p "${TDIR}"/lib/firmware || gen_die "Failed to create '${TDIR}/lib/firmware'!"
 
-	if [ ${#FIRMWARE_FILES[@]} -gt 0 ]
+	local -a fwlist=()
+
+	if isTrue "${ALLFIRMWARE}"
 	then
-		pushd "${FIRMWARE_DIR}" &>/dev/null || gen_die "Failed to chdir to '${FIRMWARE_DIR}'!"
-		cp -rL --parents --target-directory="${TDIR}/lib/firmware" "${FIRMWARE_FILES[@]}" 2>/dev/null \
-			|| gen_die "Failed to copy firmware files (${FIRMWARE_FILES}) to '${TDIR}/lib/firmware'!"
-		popd &>/dev/null || gen_die "Failed to chdir!"
-	else
 		cp -a "${FIRMWARE_DIR}"/* "${TDIR}"/lib/firmware/ 2>/dev/null \
 			|| gen_die "Failed to copy firmware files to '${TDIR}/lib/firmware'!"
+	elif [ ${#FIRMWARE_FILES[@]} -gt 0 ]
+	then
+		fwlist=( "${FIRMWARE_FILES[@]}" )
+	else
+		local myfw=
+		while IFS= read -r -u 3 myfw
+		do
+			if [ -z "${myfw}" ]
+			then
+				gen_die "modinfo error!"
+			fi
+
+			if [ ! -f "${FIRMWARE_DIR}/${myfw}" ]
+			then
+				print_warning 3 "$(get_indent 3) - ${myfw} is missing; Ignoring ..."
+				continue
+			fi
+
+			fwlist+=( "${myfw}" )
+		done 3< <( (
+			modinfo -b "${KERNEL_MODULES_PREFIX%/}" -k "${KV}" -F firmware $(mod_dep_list) 2>/dev/null || echo
+		) | sort | uniq )
+	fi
+
+	if [ ${#fwlist[@]} -gt 0 ]
+	then
+		pushd "${FIRMWARE_DIR}" &>/dev/null || gen_die "Failed to chdir to '${FIRMWARE_DIR}'!"
+		cp -rL --parents --target-directory="${TDIR}/lib/firmware" "${fwlist[@]}" 2>/dev/null \
+			|| gen_die "Failed to copy firmware files to '${TDIR}/lib/firmware'!"
+		popd &>/dev/null || gen_die "Failed to chdir!"
 	fi
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
@@ -1864,34 +1891,42 @@ append_modules() {
 		gen_die "${error_message}"
 	fi
 
-	determine_KEXT
-
 	cd "${modules_srcdir}" || gen_die "Failed to chdir to '${modules_srcdir}'!"
 
-	print_info 2 "$(get_indent 2)modules: >> Copying modules from '${modules_srcdir}' to initramfs ..."
+	print_info 2 "$(get_indent 2)modules: >> Searching modules in '${modules_srcdir}' ..."
 
-	local i= mymod=
-	local n_copied_modules=0
-	for i in $(gen_dep_list)
+	local mymod=
+	local -a modlist=()
+	while IFS= read -r -u 3 mymod
 	do
-		mymod=$(find . -name "${i}${KEXT}" 2>/dev/null | head -n 1)
 		if [ -z "${mymod}" ]
 		then
-			print_warning 3 "$(get_indent 3) - ${i}${KEXT} not found; Skipping ..."
-			continue;
+			gen_die "modinfo error!"
 		fi
 
-		print_info 3 "$(get_indent 3) - Copying ${i}${KEXT} ..."
-		cp -ax --parents --target-directory "${modules_dstdir}" "${mymod}" 2>/dev/null \
-			|| gen_die "Failed to copy '${modules_srcdir}/${mymod}' to '${modules_dstdir}'!"
-		n_copied_modules=$[$n_copied_modules+1]
-	done
+		if [ "${mymod}" = '(builtin)' ]
+		then
+			continue
+		fi
 
-	if [ ${n_copied_modules} -eq 0 ]
+		if [ ! -f "${mymod}" ]
+		then
+			gen_die "Module '${i}${KEXT}' is missing!"
+		fi
+
+		modlist+=( "${mymod/#${modules_srcdir}\//}" )
+	done 3< <( (
+		modinfo -b "${KERNEL_MODULES_PREFIX%/}" -k "${KV}" -F filename $(mod_dep_list) 2>/dev/null || echo
+	) | sort | uniq )
+
+	if [ ${#modlist[@]} -gt 0 ]
 	then
-		print_warning 1 "$(get_indent 2)modules: ${n_copied_modules} modules copied. Is that correct?"
+		print_info 2 "$(get_indent 2)modules: >> Copying modules from '${modules_srcdir}' to initramfs ..."
+		cp -ax --parents --target-directory "${modules_dstdir}" "${modlist[@]}" 2>/dev/null \
+			|| gen_die "Failed to copy modules!"
+		print_info 2 "$(get_indent 2)modules: ${#modlist[@]} modules copied!"
 	else
-		print_info 2 "$(get_indent 2)modules: ${n_copied_modules} modules copied!"
+		print_warning 1 "$(get_indent 2)modules: 0 modules copied. Is that correct?"
 	fi
 
 	cp -ax --parents --target-directory "${modules_dstdir}" modules* 2>/dev/null \
@@ -2108,16 +2143,6 @@ append_data() {
 create_initramfs() {
 	print_info 1 "initramfs: >> Initializing ..."
 
-	if ! isTrue "${BUILD_KERNEL}"
-	then
-		# Check early for suitable kmod
-		determine_KEXT
-		if ! isTrue "$(is_kext_supported_by_kmod "${KEXT}")"
-		then
-			gen_die "${KMOD_CMD} does not support chosen module compression algorithm. Please re-emerge sys-apps/kmod with USE=$(get_kext_kmod_use_flag "${KEXT}") enabled or adjust CONFIG_MODULE_COMPRESS_* kernel option!"
-		fi
-	fi
-
 	# Create empty cpio
 	CPIO_ARCHIVE="${TMPDIR}/${GK_FILENAME_TEMP_INITRAMFS}"
 	append_data 'devices' # WARNING, must be first!

diff --git a/gen_moddeps.sh b/gen_moddeps.sh
index 89a562b..f175b72 100755
--- a/gen_moddeps.sh
+++ b/gen_moddeps.sh
@@ -1,69 +1,63 @@
 #!/bin/bash
 # $Id$
 
+mod_dep_list() {
+	if [ ! -f "${TEMP}/moddeps" ]
+	then
+		gen_dep_list > "${TEMP}/moddeps"
+	fi
+
+	cat "${TEMP}/moddeps"
+}
+
 gen_dep_list() {
+	local moddir="${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}"
+
 	if isTrue "${ALLRAMDISKMODULES}"
 	then
-		strip_mod_paths $(find "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}" -name "*${KEXT}") | sort
+		cat "${moddir}/modules.builtin"
+		cat "${moddir}/modules.order"
 	else
-		rm -f "${TEMP}/moddeps" >/dev/null
+		local -a modlist=()
 
-		local group_modules
-		for group_modules in ${!MODULES_*} GK_INITRAMFS_ADDITIONAL_KMODULES
+		local mygroups
+		for mygroups in ${!MODULES_*} GK_INITRAMFS_ADDITIONAL_KMODULES
 		do
-			gen_deps ${!group_modules}
+			modlist+=( ${!mygroups} )
 		done
 
-		# Only list each module once
-		if [ -f "${TEMP}/moddeps" ]
-		then
-			cat "${TEMP}/moddeps" | sort | uniq
-		fi
-	fi
-}
+		modlist=( $(printf '%s\n' "${modlist[@]}" | sort | uniq) )
 
-gen_deps() {
-	local modlist
-	local deps
+		modlist+=( $(
+			local -a rxargs=( "${modlist[@]}" )
 
-	local x
-	for x in ${*}
-	do
-		echo ${x} >> "${TEMP}/moddeps"
-		modlist=$(modules_dep_list ${x})
-		if [ "${modlist}" != "" -a "${modlist}" != " " ]
-		then
-			deps=$(strip_mod_paths ${modlist})
-		else
-			deps=""
-		fi
+			rxargs=( "${rxargs[@]/#/-ealias\ }" )
+			rxargs=( "${rxargs[@]/%/\ }" )
 
-		local y
-		for y in ${deps}
-		do
-			echo ${y} >> "${TEMP}/moddeps"
-		done
-	done
-}
-
-modules_dep_list() {
-	if [ -f "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}/modules.dep" ]
-	then
-		grep -F -- "/${1}${KEXT}:" "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}/modules.dep" | cut -d\:  -f2
-	fi
-}
+			cat "${moddir}/modules.alias" \
+				| grep -F "${rxargs[@]}" \
+				| cut -d' ' -f3-
+		) )
 
-# Pass module deps list
-strip_mod_paths() {
-	local x
-	local ret
-	local myret
+		modlist=( $(printf '%s\n' "${modlist[@]}" | sort | uniq) )
 
-	for x in ${*}
-	do
-		ret=$(basename ${x} | cut -d. -f1)
-		myret="${myret} ${ret}"
-	done
-
-	echo "${myret}"
+		local mydeps mymod
+		while IFS=" " read -r -u 3 mymod mydeps
+		do
+			echo ${mymod%:}
+			printf '%s\n' ${mydeps}
+		done 3< <(
+			local -a rxargs=( "${modlist[@]}" )
+
+			rxargs=( "${rxargs[@]/#/-e\/}" )
+			rxargs=( "${rxargs[@]/%/${KEXT}:}" )
+
+			cat "${moddir}/modules.builtin" \
+				| xargs printf '%s:\n' \
+				| grep -F "${rxargs[@]}"
+
+			cat "${moddir}/modules.dep" \
+				| grep -F "${rxargs[@]}"
+		)
+	fi | xargs basename -s "${KEXT}" | sort | uniq
 }

diff --git a/genkernel b/genkernel
index b32d0a3..83313ea 100755
--- a/genkernel
+++ b/genkernel
@@ -352,6 +352,16 @@ if isTrue "${BUILD_RAMDISK}"
 then
 	print_info 1 '' 1 0
 
+	if isTrue "${FIRMWARE}" || isTrue "${RAMDISKMODULES}"
+	then
+		# Check for suitable kmod
+		determine_KEXT
+		if ! isTrue "$(is_kext_supported_by_kmod "${KEXT}")"
+		then
+			gen_die "${KMOD_CMD} does not support chosen module compression algorithm. Please re-emerge sys-apps/kmod with USE=$(get_kext_kmod_use_flag "${KEXT}") enabled or adjust CONFIG_MODULE_COMPRESS_* kernel option!"
+		fi
+	fi
+
 	# Compile initramfs
 	create_initramfs
 else

diff --git a/genkernel.conf b/genkernel.conf
index dae0b42..c4b44ea 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -144,15 +144,19 @@ NOCOLOR="false"
 # Will conflict with sys-kernel/linux-firmware package
 #FIRMWARE_INSTALL="no"
 
-# Add firmware(s) to initramfs
+# Include full contents of FIRMWARE_DIR
+# (if FIRMWARE option below is set to YES).
+#ALLFIRMWARE="no"
+
+# Add firmware(s) to initramfs required by copied modules
 #FIRMWARE="no"
 
 # Specify directory to pull from
 #FIRMWARE_DIR="/lib/firmware"
 
 # Specify a comma-separated list of firmware files or directories to include,
-# relative to FIRMWARE_DIR.  If empty or unset, the full contents of 
-# FIRMWARE_DIR will be included (if FIRMWARE option above is set to YES).
+# relative to FIRMWARE_DIR (if FIRMWARE option above is set to YES
+# and ALLFIRMWARE is set to NO).
 #FIRMWARE_FILES=""
 
 # Add new kernel to grub

[gentoo-commits] proj/genkernel:master commit in: /

[Sam James]

commit:     1c32ab6b94a459d72764f59ec978c1d04de6fd83
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 21 13:51:21 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 21 13:51:21 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1c32ab6b

genkernel: prepare for 4.3.7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 83313ea..31a79a2 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.3.6'
+GK_V='4.3.7'
 
 # Normalize locales
 export LC_ALL=C

[gentoo-commits] proj/genkernel:master commit in: /

[Sam James]

commit:     c691ab1f1e2493e5ca16ab23545ad3c87f152802
Author:     Dmitry Baranov <reagentoo <AT> gmail <DOT> com>
AuthorDate: Wed Oct 25 12:27:17 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 01:58:52 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c691ab1f

gen_moddeps.sh: fix including extra modules when ALLRAMDISKMODULES="yes"

depmod util doesn't care about updating modules.order
when the new extra modules was installed.

Bug: https://bugs.gentoo.org/916233
Signed-off-by: Dmitry Baranov <reagentoo <AT> gmail.com>
Closes: https://github.com/gentoo/genkernel/pull/51
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gen_moddeps.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_moddeps.sh b/gen_moddeps.sh
index 556751d..070131c 100755
--- a/gen_moddeps.sh
+++ b/gen_moddeps.sh
@@ -27,7 +27,7 @@ gen_dep_list() {
 	if isTrue "${ALLRAMDISKMODULES}"
 	then
 		cat "${moddir}/modules.builtin"
-		cat "${moddir}/modules.order"
+		cat "${moddir}/modules.dep" | cut -d':' -f1
 	else
 		local -a modlist=() moddeplist=()
 

[gentoo-commits] proj/genkernel:master commit in: /

[Sam James]

commit:     5bd81ee6cbbe582c60f0f9971dbb0b60b061b6a4
Author:     Dmitry Baranov <reagentoo <AT> gmail <DOT> com>
AuthorDate: Sat Sep  9 10:37:38 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 01:58:52 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5bd81ee6

gen_moddeps.sh: introduce xbasename()

Introduce xbasename() wrapper to use it instead of xargs basename.
It guards from two cases:
- zero count of module names is passing from pipe
- module name starting with "-" interprets as option

Signed-off-by: Dmitry Baranov <reagentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gen_moddeps.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/gen_moddeps.sh b/gen_moddeps.sh
index 6915746..556751d 100755
--- a/gen_moddeps.sh
+++ b/gen_moddeps.sh
@@ -10,6 +10,17 @@ mod_dep_list() {
 	cat "${TEMP}/moddeps"
 }
 
+xbasename() {
+	local -a moddeplist=( $( </dev/stdin ) )
+
+	if (( ${#moddeplist[@]} > 0 ))
+	then
+		# prepend slash to each moddeplist element
+		# to avoid passing elements as basename options
+		basename -s "${KEXT}" "${moddeplist[@]/#/\/}"
+	fi
+}
+
 gen_dep_list() {
 	local moddir="${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}"
 
@@ -60,5 +71,5 @@ gen_dep_list() {
 		)
 
 		printf '%s\n' "${moddeplist[@]}"
-	fi | xargs basename -s "${KEXT}" | sort | uniq
+	fi | xbasename | sort | uniq
 }

[gentoo-commits] proj/genkernel:master commit in: /

[Sam James]

commit:     bdf7f9e549314ffd69a8dfbe41f1d5ecd86cc99d
Author:     Dmitry Baranov <reagentoo <AT> gmail <DOT> com>
AuthorDate: Sat Sep  9 10:20:20 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 01:58:52 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=bdf7f9e5

gen_moddeps.sh: don't use echo/printf inside the cycle

Also prevent printing empty line if mydeps column is null.

Signed-off-by: Dmitry Baranov <reagentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gen_moddeps.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gen_moddeps.sh b/gen_moddeps.sh
index f175b72..6915746 100755
--- a/gen_moddeps.sh
+++ b/gen_moddeps.sh
@@ -18,7 +18,7 @@ gen_dep_list() {
 		cat "${moddir}/modules.builtin"
 		cat "${moddir}/modules.order"
 	else
-		local -a modlist=()
+		local -a modlist=() moddeplist=()
 
 		local mygroups
 		for mygroups in ${!MODULES_*} GK_INITRAMFS_ADDITIONAL_KMODULES
@@ -44,8 +44,7 @@ gen_dep_list() {
 		local mydeps mymod
 		while IFS=" " read -r -u 3 mymod mydeps
 		do
-			echo ${mymod%:}
-			printf '%s\n' ${mydeps}
+			moddeplist+=( ${mymod%:} ${mydeps} )
 		done 3< <(
 			local -a rxargs=( "${modlist[@]}" )
 
@@ -59,5 +58,7 @@ gen_dep_list() {
 			cat "${moddir}/modules.dep" \
 				| grep -F "${rxargs[@]}"
 		)
+
+		printf '%s\n' "${moddeplist[@]}"
 	fi | xargs basename -s "${KEXT}" | sort | uniq
 }

[gentoo-commits] proj/genkernel:master commit in: /

[Sam James]

commit:     411625928382d759140c2f09f948d33af331cc17
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 28 01:59:26 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 01:59:26 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=41162592

genkernel: prepare for 4.3.8

Signed-off-by: Sam James <sam <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 31a79a2..ab0e9d6 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.3.7'
+GK_V='4.3.8'
 
 # Normalize locales
 export LC_ALL=C

[gentoo-commits] proj/genkernel:master commit in: /

[Ben Kohler]

commit:     4c52a1b8f83494c72d036f0955c5ad57c51e554e
Author:     Michal Privoznik <michal.privoznik <AT> gmail <DOT> com>
AuthorDate: Fri Dec  8 13:16:50 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Jan 19 18:26:25 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4c52a1b8

gen_configkernel: Prepare for kernel-6.6

The microcode related config options were removed in [1] and
microcode loading is enabled when support for corresponding CPU
is enabled. Basically, this is equivalent to renaming options:

  CONFIG_MICROCODE_AMD -> CONFIG_CPU_SUP_AMD
  CONFIG_MICROCODE_INTEL -> CONFIG_CPU_SUP_INTEL

Reflect this change in gen_configkernel.sh.

Bug: https://bugs.gentoo.org/913659
1: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e6bcfdd75d53390a67f67237f4eafc77d9772056
Signed-off-by: Michal Privoznik <michal.privoznik <AT> gmail.com>
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 gen_configkernel.sh | 16 ++++++++++------
 genkernel           |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index d074005..17f9eaf 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -991,11 +991,13 @@ config_kernel() {
 			[ ${KV_NUMERIC} -le 4003 ] && kconfigs_microcode+=( 'CONFIG_MICROCODE_EARLY' )
 
 			# Intel
-			kconfigs_microcode_intel+=( 'CONFIG_MICROCODE_INTEL' )
+			[ ${KV_NUMERIC} -ge 6006 ] && kconfigs_microcode_intel+=( 'CONFIG_CPU_SUP_INTEL' )
+			[ ${KV_NUMERIC} -lt 6006 ] && kconfigs_microcode_intel+=( 'CONFIG_MICROCODE_INTEL' )
 			[ ${KV_NUMERIC} -le 4003 ] && kconfigs_microcode_intel+=( 'CONFIG_MICROCODE_INTEL_EARLY' )
 
 			# AMD
-			kconfigs_microcode_amd=( 'CONFIG_MICROCODE_AMD' )
+			[ ${KV_NUMERIC} -ge 6006 ] && kconfigs_microcode_amd+=( 'CONFIG_CPU_SUP_AMD' )
+			[ ${KV_NUMERIC} -lt 6006 ] && kconfigs_microcode_amd+=( 'CONFIG_MICROCODE_AMD' )
 			[ ${KV_NUMERIC} -le 4003 ] && kconfigs_microcode_amd+=( 'CONFIG_MICROCODE_AMD_EARLY' )
 
 			[[ "${MICROCODE}" == all ]]   && kconfigs_microcode+=( ${kconfigs_microcode_amd[@]} ${kconfigs_microcode_intel[@]} )
@@ -1016,14 +1018,16 @@ config_kernel() {
 			required_kernel_options+=( 'CONFIG_MICROCODE' )
 			case "${MICROCODE}" in
 				amd)
-					required_kernel_options+=( 'CONFIG_MICROCODE_AMD' )
+					[ ${KV_NUMERIC} -ge 6006 ] && required_kernel_options+=( 'CONFIG_CPU_SUP_AMD' )
+					[ ${KV_NUMERIC} -lt 6006 ] && required_kernel_options+=( 'CONFIG_MICROCODE_AMD' )
 					;;
 				intel)
-					required_kernel_options+=( 'CONFIG_MICROCODE_INTEL' )
+					[ ${KV_NUMERIC} -ge 6006 ] && required_kernel_options+=( 'CONFIG_CPU_SUP_INTEL' )
+					[ ${KV_NUMERIC} -lt 6006 ] && required_kernel_options+=( 'CONFIG_MICROCODE_INTEL' )
 					;;
 				all)
-					required_kernel_options+=( 'CONFIG_MICROCODE_AMD' )
-					required_kernel_options+=( 'CONFIG_MICROCODE_INTEL' )
+					[ ${KV_NUMERIC} -ge 6006 ] && required_kernel_options+=( 'CONFIG_CPU_SUP_AMD' 'CONFIG_CPU_SUP_INTEL' )
+					[ ${KV_NUMERIC} -lt 6006 ] && required_kernel_options+=( 'CONFIG_MICROCODE_AMD' 'CONFIG_MICROCODE_INTEL' )
 					;;
 			esac
 		else

diff --git a/genkernel b/genkernel
index ab0e9d6..feaaad6 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.3.8'
+GK_V='4.3.9'
 
 # Normalize locales
 export LC_ALL=C

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     2be65fba58bd62ab62288bdffcd5029cdc2ecb2a
Author:     Timothy Kenno Handojo <timkenhan <AT> gmail <DOT> com>
AuthorDate: Thu Feb 15 12:01:50 2024 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 05:11:26 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2be65fba

corrected variable issues in make install

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 Makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 4b13597..44a09c1 100644
--- a/Makefile
+++ b/Makefile
@@ -175,10 +175,10 @@ verify-shellscripts-initramfs:
 $(BUILD_DIR)/build-config:
 # $(addprefix $(BUILD_DIR)/temp/,$(TEMPFILES))
 	install -d $(BUILD_DIR)
-	echo ${PREFIX} > $(BUILD_DIR)/PREFIX
-	echo ${BINDIR} > $(BUILD_DIR)/BINDIR
-	echo ${SYSCONFDIR} > $(BUILD_DIR)/SYSCONFDIR
-	echo ${MANDIR} > $(BUILD_DIR)/MANDIR
+	echo $(PREFIX) > $(BUILD_DIR)/PREFIX
+	echo $(BINDIR) > $(BUILD_DIR)/BINDIR
+	echo $(SYSCONFDIR) > $(BUILD_DIR)/SYSCONFDIR
+	echo $(MANDIR) > $(BUILD_DIR)/MANDIR
 	touch $(BUILD_DIR)/build-config
 
 $(BUILD_DIR)/software.sh:
@@ -197,11 +197,11 @@ $(BUILD_DIR)/genkernel: $(addprefix $(BUILD_DIR)/,$(FINAL_DEPS)) $(BUILD_DIR)/so
 
 SHARE_DIRS = arch defaults gkbuilds modules netboot patches worker_modules
 
-install: PREFIX := $(file <$(BUILD_DIR)/PREFIX)
-install: BINDIR := $(file <$(BUILD_DIR)/BINDIR)
-install: SYSCONFDIR := $(file <$(BUILD_DIR)/SYSCONFDIR)
-install: MANDIR := $(file <$(BUILD_DIR)/MANDIR)
 install: all
+	$(eval PREFIX := $(file <$(BUILD_DIR)/PREFIX))
+	$(eval BINDIR := $(file <$(BUILD_DIR)/BINDIR))
+	$(eval SYSCONFDIR := $(file <$(BUILD_DIR)/SYSCONFDIR))
+	$(eval MANDIR := $(file <$(BUILD_DIR)/MANDIR))
 	install -d $(DESTDIR)/$(SYSCONFDIR)
 	install -m 644 $(BUILD_DIR)/genkernel.conf $(DESTDIR)/$(SYSCONFDIR)/
 

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     996770aa1c34b80929f9333fa9dc65cab58b9d85
Author:     Timothy Kenno Handojo <timkenhan <AT> gmail <DOT> com>
AuthorDate: Wed Feb 14 07:56:54 2024 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 05:11:26 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=996770aa

address some feedback from robbat2

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 Makefile | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index 7e90b60..3aa8215 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,8 @@ MANPAGE = genkernel.8
 # Add off-Git/generated files here that need to be shipped with releases
 EXTRA_DIST = $(MANPAGE) ChangeLog $(KCONF)
 
+default: all
+
 # First argument in the override file
 # Second argument is the base file
 BASE_KCONF = defaults/kernel-generic-config
@@ -15,24 +17,20 @@ KCONF = $(GENERATED_KCONF)
 BUILD_DIR = build
 
 FINAL_DEPS = genkernel.conf \
-	gen_cmdline.sh \
-	gen_initramfs.sh \
-	gen_determineargs.sh \
 	gen_arch.sh \
 	gen_bootloader.sh \
+	gen_cmdline.sh \
 	gen_compile.sh \
 	gen_configkernel.sh \
+	gen_determineargs.sh \
 	gen_funcs.sh \
+	gen_initramfs.sh \
 	gen_moddeps.sh \
 	gen_package.sh \
 	gen_worker.sh \
 	path_expander.py
 
-SOFTWARE = BCACHE_TOOLS BOOST BTRFS_PROGS BUSYBOX COREUTILS CRYPTSETUP \
-	DMRAID DROPBEAR EUDEV EXPAT E2FSPROGS FUSE GPG \
-	HWIDS ISCSI JSON_C KMOD LIBAIO LIBGCRYPT LIBGPGERROR LIBXCRYPT LVM \
-	LZO MDADM MULTIPATH_TOOLS POPT STRACE THIN_PROVISIONING_TOOLS UNIONFS_FUSE \
-	USERSPACE_RCU UTIL_LINUX XFSPROGS XZ ZLIB ZSTD
+SOFTWARE = BCACHE_TOOLS BOOST BTRFS_PROGS BUSYBOX COREUTILS CRYPTSETUP DMRAID DROPBEAR EUDEV EXPAT E2FSPROGS FUSE GPG HWIDS ISCSI JSON_C KMOD LIBAIO LIBGCRYPT LIBGPGERROR LIBXCRYPT LVM LZO MDADM MULTIPATH_TOOLS POPT STRACE THIN_PROVISIONING_TOOLS UNIONFS_FUSE USERSPACE_RCU UTIL_LINUX XFSPROGS XZ ZLIB ZSTD
 
 SOFTWARE_VERSION = $(foreach entry, $(SOFTWARE), "VERSION_$(entry)=${VERSION_$(entry)}\n")
 
@@ -149,15 +147,15 @@ $(BUILD_DIR)/software.sh:
 	cat $(BUILD_DIR)/temp/versions defaults/software.sh > $(BUILD_DIR)/software.sh
 
 $(BUILD_DIR)/doc/genkernel.8.txt:
-	install -d $(BUILD_DIR)/doc/
-	cp doc/genkernel.8.txt $(BUILD_DIR)/doc/genkernel.8.txt
+	install -D doc/genkernel.8.txt $(BUILD_DIR)/doc/genkernel.8.txt
 
 $(BUILD_DIR)/%: %
-	install -d $(BUILD_DIR)/
-	cp $< $@
+	install -D $< $@
 
 $(BUILD_DIR)/genkernel: $(addprefix $(BUILD_DIR)/,$(FINAL_DEPS)) $(BUILD_DIR)/software.sh
-	cp genkernel $(BUILD_DIR)/genkernel
+	install genkernel $(BUILD_DIR)/genkernel
+
+SHARE_DIRS = arch defaults gkbuilds modules netboot patches worker_modules
 
 install: PREFIX := $(file <$(BUILD_DIR)/PREFIX)
 install: BINDIR := $(file <$(BUILD_DIR)/BINDIR)
@@ -172,13 +170,7 @@ install: all
 
 	install -d $(DESTDIR)/$(PREFIX)/share/genkernel
 
-	cp -rp arch $(DESTDIR)/$(PREFIX)/share/genkernel/
-	cp -rp defaults $(DESTDIR)/$(PREFIX)/share/genkernel/
-	cp -rp gkbuilds $(DESTDIR)/$(PREFIX)/share/genkernel/
-	cp -rp modules $(DESTDIR)/$(PREFIX)/share/genkernel/
-	cp -rp netboot $(DESTDIR)/$(PREFIX)/share/genkernel/
-	cp -rp patches $(DESTDIR)/$(PREFIX)/share/genkernel/
-	cp -rp worker_modules $(DESTDIR)/$(PREFIX)/share/genkernel/
+	cp -ra $(SHARE_DIRS) $(DESTDIR)/$(PREFIX)/share/genkernel/
 
 	install -m 755 -t $(DESTDIR)/$(PREFIX)/share/genkernel $(addprefix $(BUILD_DIR)/,$(FINAL_DEPS))
 

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     c67369899c1df965f4b08d738022e2f56ced416c
Author:     Timothy Kenno Handojo <timkenhan <AT> gmail <DOT> com>
AuthorDate: Thu Feb 15 07:34:45 2024 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 05:11:26 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c6736989

updated the SOFTWARE list

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 Makefile | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3aa8215..989edd3 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,41 @@ FINAL_DEPS = genkernel.conf \
 	gen_worker.sh \
 	path_expander.py
 
-SOFTWARE = BCACHE_TOOLS BOOST BTRFS_PROGS BUSYBOX COREUTILS CRYPTSETUP DMRAID DROPBEAR EUDEV EXPAT E2FSPROGS FUSE GPG HWIDS ISCSI JSON_C KMOD LIBAIO LIBGCRYPT LIBGPGERROR LIBXCRYPT LVM LZO MDADM MULTIPATH_TOOLS POPT STRACE THIN_PROVISIONING_TOOLS UNIONFS_FUSE USERSPACE_RCU UTIL_LINUX XFSPROGS XZ ZLIB ZSTD
+SOFTWARE = BCACHE_TOOLS \
+ 	BOOST \
+	BTRFS_PROGS \
+	BUSYBOX \
+	COREUTILS \
+	CRYPTSETUP \
+	DMRAID \
+	DROPBEAR \
+	EUDEV \
+	EXPAT \
+	E2FSPROGS \
+	FUSE \
+	GPG \
+	HWIDS \
+	ISCSI \
+	JSON_C \
+	KMOD \
+	LIBAIO \
+	LIBGCRYPT \
+	LIBGPGERROR \
+	LIBXCRYPT \
+	LVM \
+	LZO \
+	MDADM \
+	MULTIPATH_TOOLS \
+	POPT \
+	STRACE \
+	THIN_PROVISIONING_TOOLS \
+	UNIONFS_FUSE \
+	USERSPACE_RCU \
+	UTIL_LINUX \
+	XFSPROGS \
+	XZ \
+	ZLIB \
+	ZSTD
 
 SOFTWARE_VERSION = $(foreach entry, $(SOFTWARE), "VERSION_$(entry)=${VERSION_$(entry)}\n")
 

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     659f4d3e1f1f1299014999530f1b0840466d1fe8
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 05:13:22 2024 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 05:13:22 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=659f4d3e

build: fix whitespace

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 44a09c1..5f8e031 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ FINAL_DEPS = genkernel.conf \
 	path_expander.py
 
 SOFTWARE = BCACHE_TOOLS \
- 	BOOST \
+	BOOST \
 	BTRFS_PROGS \
 	BUSYBOX \
 	COREUTILS \
@@ -219,3 +219,5 @@ install: all
 	install -d $(DESTDIR)/$(MANDIR)
 	install $(BUILD_DIR)/genkernel.8 $(DESTDIR)/$(MANDIR)/man8
 
+# No trailing blank lines please.
+# vim:ft=make:

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     5e5966d0b507fbb2cb96fe8ff5083101e72360e6
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 05:14:32 2024 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 05:14:32 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5e5966d0

build: merge Modernize Makefile

Closes: https://github.com/gentoo/genkernel/pull/56
Thanks: Timothy Kenno Handojo <timkenhan <AT> gmail.com>
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 Makefile             | 136 ++++++++++++++++++++++++++++++++++++++++++++++++---
 defaults/software.sh |  68 +++++++++++++-------------
 2 files changed, 163 insertions(+), 41 deletions(-)

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     f4bf289499f7d06a2a4a5f6d84ce7084075e2664
Author:     Timothy Kenno Handojo <timkenhan <AT> gmail <DOT> com>
AuthorDate: Thu Feb 15 10:00:47 2024 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 05:11:26 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f4bf2894

ensure package version is on the manpage
- added package version on manpage generation
- added versioning on dist pkg generation
- remove manpage generation from dist

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 989edd3..4b13597 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,12 @@
 #PACKAGE_VERSION = $(shell /bin/grep -F -- GK_V= genkernel | sed "s/.*GK_V='\([^']\+\)'/\1/")
+PACKAGE_VERSION = $(file <VERSION)
+ifeq ("$(PACKAGE_VERSION)", "")
 PACKAGE_VERSION = $(shell git describe --tags |sed 's,^v,,g')
+endif
 distdir = genkernel-$(PACKAGE_VERSION)
 MANPAGE = genkernel.8
 # Add off-Git/generated files here that need to be shipped with releases
-EXTRA_DIST = $(MANPAGE) ChangeLog $(KCONF)
+EXTRA_DIST = ChangeLog $(KCONF)
 
 default: all
 
@@ -82,6 +85,7 @@ all: $(BUILD_DIR)/genkernel $(BUILD_DIR)/build-config man kconfig
 debug:
 	@echo "ARCH_KCONF=$(ARCH_KCONF)"
 	@echo "GENERATED_KCONF=$(GENERATED_KCONF)"
+	@echo "PACKAGE_VERSION=$(PACKAGE_VERSION)"
 
 kconfig: $(GENERATED_KCONF)
 man: $(addprefix $(BUILD_DIR)/,$(MANPAGE))
@@ -103,6 +107,7 @@ endif
 
 dist: verify-shellscripts-initramfs verify-doc check-git-repository distclean $(EXTRA_DIST)
 	mkdir "$(distdir)"
+	echo $(PACKAGE_VERSION) > $(distdir)/VERSION
 	git ls-files -z | xargs -0 cp --no-dereference --parents --target-directory="$(distdir)" \
 		$(EXTRA_DIST)
 	tar cf "$(distdir)".tar "$(distdir)"
@@ -124,7 +129,8 @@ distclean: clean
 
 $(BUILD_DIR)/%.8: doc/%.8.txt doc/asciidoc.conf Makefile $(BUILD_DIR)/doc/genkernel.8.txt
 	a2x --conf-file=doc/asciidoc.conf \
-		 --format=manpage -D $(BUILD_DIR) "$(BUILD_DIR)/$<"
+		--format=manpage -D $(BUILD_DIR) --attribute="genkernelversion=$(PACKAGE_VERSION)" \
+		"$(BUILD_DIR)/$<"
 
 verify-doc: doc/genkernel.8.txt
 	@rm -f faildoc ; \

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     c235b05a93283ee47b56887cc7ca72790e1ff8bd
Author:     Timothy Kenno Handojo <timkenhan <AT> gmail <DOT> com>
AuthorDate: Tue Jan 30 06:31:02 2024 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 05:11:25 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c235b05a

modernize makefile

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 Makefile | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 95 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 92d1278..7e90b60 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,6 @@ MANPAGE = genkernel.8
 # Add off-Git/generated files here that need to be shipped with releases
 EXTRA_DIST = $(MANPAGE) ChangeLog $(KCONF)
 
-default: kconfig man
-
 # First argument in the override file
 # Second argument is the base file
 BASE_KCONF = defaults/kernel-generic-config
@@ -14,18 +12,54 @@ ARCH_KCONF = $(wildcard arch/*/arch-config)
 GENERATED_KCONF = $(subst arch-,generated-,$(ARCH_KCONF))
 KCONF = $(GENERATED_KCONF)
 
+BUILD_DIR = build
+
+FINAL_DEPS = genkernel.conf \
+	gen_cmdline.sh \
+	gen_initramfs.sh \
+	gen_determineargs.sh \
+	gen_arch.sh \
+	gen_bootloader.sh \
+	gen_compile.sh \
+	gen_configkernel.sh \
+	gen_funcs.sh \
+	gen_moddeps.sh \
+	gen_package.sh \
+	gen_worker.sh \
+	path_expander.py
+
+SOFTWARE = BCACHE_TOOLS BOOST BTRFS_PROGS BUSYBOX COREUTILS CRYPTSETUP \
+	DMRAID DROPBEAR EUDEV EXPAT E2FSPROGS FUSE GPG \
+	HWIDS ISCSI JSON_C KMOD LIBAIO LIBGCRYPT LIBGPGERROR LIBXCRYPT LVM \
+	LZO MDADM MULTIPATH_TOOLS POPT STRACE THIN_PROVISIONING_TOOLS UNIONFS_FUSE \
+	USERSPACE_RCU UTIL_LINUX XFSPROGS XZ ZLIB ZSTD
+
+SOFTWARE_VERSION = $(foreach entry, $(SOFTWARE), "VERSION_$(entry)=${VERSION_$(entry)}\n")
+
+PREFIX = /usr/local
+BINDIR = $(PREFIX)/bin
+ifeq ($(PREFIX), /usr)
+	SYSCONFDIR = /etc
+else
+	SYSCONFDIR = $(PREFIX)/etc
+endif
+MANDIR = $(PREFIX)/share/man
+
+all: $(BUILD_DIR)/genkernel $(BUILD_DIR)/build-config man kconfig
+
 debug:
 	@echo "ARCH_KCONF=$(ARCH_KCONF)"
 	@echo "GENERATED_KCONF=$(GENERATED_KCONF)"
 
 kconfig: $(GENERATED_KCONF)
-man: $(MANPAGE)
+man: $(addprefix $(BUILD_DIR)/,$(MANPAGE))
 
 ChangeLog:
 	git log >$@
 
 clean:
 	rm -f $(EXTRA_DIST)
+	rm -rf $(BUILD_DIR)
 
 check-git-repository:
 ifneq ($(UNCLEAN),1)
@@ -46,7 +80,7 @@ dist: verify-shellscripts-initramfs verify-doc check-git-repository distclean $(
 distclean: clean
 	rm -Rf "$(distdir)" "$(distdir)".tar "$(distdir)".tar.xz
 
-.PHONY: clean check-git-repository dist distclean kconfig verify-doc
+.PHONY: clean check-git-repository dist distclean kconfig verify-doc install
 
 # Generic rules
 %/generated-config: %/arch-config $(BASE_KCONF) merge.pl Makefile
@@ -56,9 +90,9 @@ distclean: clean
 		perl merge.pl $< $(BASE_KCONF) | sort > $@ ; \
 	fi ;
 
-%.8: doc/%.8.txt doc/asciidoc.conf Makefile genkernel
-	a2x --conf-file=doc/asciidoc.conf --attribute="genkernelversion=$(PACKAGE_VERSION)" \
-		 --format=manpage -D . "$<"
+$(BUILD_DIR)/%.8: doc/%.8.txt doc/asciidoc.conf Makefile $(BUILD_DIR)/doc/genkernel.8.txt
+	a2x --conf-file=doc/asciidoc.conf \
+		 --format=manpage -D $(BUILD_DIR) "$(BUILD_DIR)/$<"
 
 verify-doc: doc/genkernel.8.txt
 	@rm -f faildoc ; \
@@ -99,3 +133,57 @@ verify-shellscripts-initramfs:
 		--severity error \
 		defaults/linuxrc \
 		defaults/initrd.scripts
+
+$(BUILD_DIR)/build-config:
+# $(addprefix $(BUILD_DIR)/temp/,$(TEMPFILES))
+	install -d $(BUILD_DIR)
+	echo ${PREFIX} > $(BUILD_DIR)/PREFIX
+	echo ${BINDIR} > $(BUILD_DIR)/BINDIR
+	echo ${SYSCONFDIR} > $(BUILD_DIR)/SYSCONFDIR
+	echo ${MANDIR} > $(BUILD_DIR)/MANDIR
+	touch $(BUILD_DIR)/build-config
+
+$(BUILD_DIR)/software.sh:
+	install -d $(BUILD_DIR)/temp/
+	echo -e $(SOFTWARE_VERSION) > $(BUILD_DIR)/temp/versions
+	cat $(BUILD_DIR)/temp/versions defaults/software.sh > $(BUILD_DIR)/software.sh
+
+$(BUILD_DIR)/doc/genkernel.8.txt:
+	install -d $(BUILD_DIR)/doc/
+	cp doc/genkernel.8.txt $(BUILD_DIR)/doc/genkernel.8.txt
+
+$(BUILD_DIR)/%: %
+	install -d $(BUILD_DIR)/
+	cp $< $@
+
+$(BUILD_DIR)/genkernel: $(addprefix $(BUILD_DIR)/,$(FINAL_DEPS)) $(BUILD_DIR)/software.sh
+	cp genkernel $(BUILD_DIR)/genkernel
+
+install: PREFIX := $(file <$(BUILD_DIR)/PREFIX)
+install: BINDIR := $(file <$(BUILD_DIR)/BINDIR)
+install: SYSCONFDIR := $(file <$(BUILD_DIR)/SYSCONFDIR)
+install: MANDIR := $(file <$(BUILD_DIR)/MANDIR)
+install: all
+	install -d $(DESTDIR)/$(SYSCONFDIR)
+	install -m 644 $(BUILD_DIR)/genkernel.conf $(DESTDIR)/$(SYSCONFDIR)/
+
+	install -d $(DESTDIR)/$(BINDIR)
+	install -m 755 $(BUILD_DIR)/genkernel $(DESTDIR)/$(BINDIR)/
+
+	install -d $(DESTDIR)/$(PREFIX)/share/genkernel
+
+	cp -rp arch $(DESTDIR)/$(PREFIX)/share/genkernel/
+	cp -rp defaults $(DESTDIR)/$(PREFIX)/share/genkernel/
+	cp -rp gkbuilds $(DESTDIR)/$(PREFIX)/share/genkernel/
+	cp -rp modules $(DESTDIR)/$(PREFIX)/share/genkernel/
+	cp -rp netboot $(DESTDIR)/$(PREFIX)/share/genkernel/
+	cp -rp patches $(DESTDIR)/$(PREFIX)/share/genkernel/
+	cp -rp worker_modules $(DESTDIR)/$(PREFIX)/share/genkernel/
+
+	install -m 755 -t $(DESTDIR)/$(PREFIX)/share/genkernel $(addprefix $(BUILD_DIR)/,$(FINAL_DEPS))
+
+	install $(BUILD_DIR)/software.sh $(DESTDIR)/$(PREFIX)/share/genkernel/defaults
+
+	install -d $(DESTDIR)/$(MANDIR)
+	install $(BUILD_DIR)/genkernel.8 $(DESTDIR)/$(MANDIR)/man8
+

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     4ec9886457a58330843f5c46a38e73fda9957410
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 05:51:53 2024 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 05:51:53 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4ec98864

chore: ChangeLog.old is 11+ years old, omit from releases

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 ChangeLog.old | 4782 ---------------------------------------------------------
 1 file changed, 4782 deletions(-)

diff --git a/ChangeLog.old b/ChangeLog.old
deleted file mode 100644
index 9128565..0000000
--- a/ChangeLog.old
+++ /dev/null
@@ -1,4782 +0,0 @@
-# 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: 7902101f65eb47fdc5ed4b116ee234aa23686e1b $
-
-  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.
-
-  15 Oct 2012; Peter Hjalmarsson <xake@rymdraket.net> README,
-  doc/genkernel.8.txt, gen_bootloader.sh, genkernel:
-  Update the documentation to reflect current status re real_root/init.
-
-  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.
-
-  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.
-
-  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.
-
-  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,
-  arch/ppc64/modules_load, arch/sparc/modules_load, arch/sparc64/modules_load,
-  arch/um/modules_load, arch/x86/modules_load, arch/x86_64/modules_load,
-  defaults/modules_load:
-  Clean up module drift over the years. Just MODULES_CRYPTO left.
-
-  13 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> doc/genkernel.8.txt:
-  Document resume parameters.
-
-  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,
-  arch/ppc64/modules_load, arch/sparc/modules_load, arch/sparc64/modules_load,
-  arch/um/modules_load, arch/x86/modules_load, arch/x86_64/modules_load,
-  defaults/initrd.scripts, defaults/linuxrc, defaults/modules_load,
-  gen_configkernel.sh, gen_initramfs.sh:
-  Bug #286187: Complete multipath support.
-
-  13 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.defaults,
-  defaults/initrd.scripts, defaults/linuxrc, doc/genkernel.8.txt:
-  Bug #351873: More livecd control, and initramfs livecd argument
-  documentation.
-
-  13 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> arch/alpha/kernel-config,
-  arch/ppc/kernel-config, arch/x86/kernel-config, arch/x86_64/kernel-config,
-  defaults/kernel-config:
-  Bug #336170: amd74xx was long-replaced by pata_amd. The old driver is
-  problematic, as even with the pata_amd module loaded, it will not release the
-  device. Disable the old driver on remaining platforms, add pata_amd where
-  missing & needed (not alpha).
-
-  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:
-  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.
-
-  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
-
-  03 Oct 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
-  Use actual kernel config for check of available compression methods (bug
-  #436820)
-
-  03 Oct 2012; Dustin Frisch <dustin.frisch@gmail.com> defaults/linuxrc:
-  With boot parameter real_init=/foo look for ${NEW_ROOT}/foo, not
-  ${NEW_ROOT}/sbin/init (bug #437080)
-
-  23 Sep 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
-  Append e2fsck and mke2fs to initramfs. Original patch by Rick Farina
-
-  10 Sep 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.42
-
-  10 Sep 2012; Sebastian Pipping <sping@gentoo.org>
-  +patches/busybox/1.20.2/busybox-1.20.2-glibc-sys-resource.patch:
-  Add busybox 1.20.2 patch: busybox-1.20.2-glibc-sys-resource.patch
-
-  10 Sep 2012; Sebastian Pipping <sping@gentoo.org>
-  +patches/busybox/1.20.2/1.18.1-openvt.diff,
-  +patches/busybox/1.20.2/busybox-1.7.4-signal-hack.patch,
-  +patches/busybox/1.20.2/busybox-1.20.1-mdstart.patch:
-  Copy busybox patches from 1.20.1 to 1.20.2
-
-  30 Aug 2012; Fabio Erculiani <lxnay@gentoo.org> defaults/linuxrc:
-  mount /mnt/cdrom inside target chroot even when aufs/unionfs is disabled
-
-  14 Aug 2012; Richard Yao <ryao@gentoo.org> genkernel:
-  Bump version to 3.4.41
-
-  12 Aug 2012; Sebastian Pipping <sping@gentoo.org> +defaults/software.sh,
-  genkernel.conf:
-  Move software version defaults for defaults/software.sh to ease the
-  etc-update game
-
-  12 Aug 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Fix parsing of --config=... command line option
-
-  27 Jul 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
-  genkernel:
-  Bump version to 3.4.40
-
-  24 Jul 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts:
-  Flip awk return values.
-
-  24 Jul 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts:
-  Minor thinko in devpts check.
-
-  24 Jul 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts:
-  Prior commit to only mount devtmpfs and devpts if they were not already
-  mounted made assumptions about the device names they were mounted as. Check
-  the filesystem column of /proc/mounts instead.
-
-  21 Jul 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.39
-
-  17 Jul 2012; Robin H. Johnson <robbat2@gentoo.org> arch/x86_64/kernel-config:
-  Bug #399703: amd64 default kernel config did not have EFI support.
-  
-  15 July 2012; Robin H. Johnson <robbat2@gentoo.org> doc/genkernel.8.txt,
-  Document the isoboot option, as designed for GRUB2 usage 3 years ago.
-
-  09 Jul 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.38
-
-  09 Jul 2012; Sebastian Pipping <sping@gentoo.org> gen_compile.sh:
-  Fix linking of unionfs-fuse 0.24
-
-  09 Jul 2012; Sebastian Pipping <sping@gentoo.org>
-  patches/fuse/2.8.6/fuse-2.8.6-glibc-2.14.patch:
-  Allow compilation of FUSE 2.8.6 with glibc 2.14 (bug #425080)
-
-  09 Jul 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
-  Restore previous handling of real_root due to report of regressions (bug
-  #419965)
-
-  08 Jul 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.37
-
-  08 Jul 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh,
-  genkernel:
-  Always report used kernel config file
-
-  08 Jul 2012; Sebastian Pipping <sping@gentoo.org> gen_configkernel.sh,
-  gen_initramfs.sh:
-  Catch case with no initramfs compression supported by kernel (bug #423847)
-
-  08 Jul 2012; Sebastian Pipping <sping@gentoo.org> gen_configkernel.sh,
-  gen_initramfs.sh:
-  Fix detection of initramfs compression with bzip2 as best candidate
-
-  08 Jul 2012; Sebastian Pipping <sping@gentoo.org> arch/x86/modules_load,
-  arch/x86_64/modules_load, defaults/modules_load:
-  Add xts to MODULES_CRYPTO (bug #425028)
-
-  01 Jul 2012; Sebastian Pipping <sping@gentoo.org> gen_configkernel.sh,
-  gen_package.sh:
-  Support --kernel-config=/proc/config.gz (bug #421027)
-
-  08 Jul 2012; Kenny Cheng <kenny97821419@gmail.com> defaults/linuxrc:
-  Add /run to support openrc >=0.10 (bug #425180)
-
-  11 Jun 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.36
-
-  11 Jun 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
-  Respect real_root for plain dm-crypt without LVM (bug #419965)
-
-  10 Jun 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.35
-
-  10 Jun 2012; Sebastian Pipping <sping@gentoo.org>
-  +patches/busybox/1.20.1/1.18.1-openvt.diff,
-  +patches/busybox/1.20.1/busybox-1.7.4-signal-hack.patch,
-  +patches/busybox/1.20.1/busybox-1.20.1-mdstart.patch:
-  Support busybox 1.20.1 (bug #419511)
-
-  04 Jun 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.34
-
-  02 Jun 2012; Sebastian Pipping <sping@gentoo.org> defaults/linuxrc:
-  Support bind mounts from /etc/initramfs.mounts (bug #418463)
-
-  02 Jun 2012; Sebastian Pipping <sping@gentoo.org> arch/x86/modules_load,
-  arch/x86_64/modules_load, defaults/modules_load:
-  Make sure that cbc.ko and aes*.ko needed for cbc-essiv:sha256 (=default) disk
-  encryption are included with the initramfs (bug #416973)
-
-  28 May 2012; Sebastian Pipping <sping@gentoo.org> gen_funcs.sh:
-  Fix an e2fsprogs compilation leftover (bug #417095), reported by Juergen Rose
-
-  17 May 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump to 3.4.33.1
-
-  17 May 2012; Sebastian Pipping <sping@gentoo.org> defaults/linuxrc:
-  Fix call to blkid as "blkid -l -t UUID=foo" (without -o device) does not seem
-  to work well with blkid of util-linux
-
-  17 May 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.33
-
-  17 May 2012; Sebastian Pipping <sping@gentoo.org>
-  -patches/e2fsprogs/1.42/e2fsprogs-1.41.12-getpagesize.patch, gen_compile.sh,
-  gen_initramfs.sh, genkernel, genkernel.conf:
-  Use blkid from system's util-linux rather than compiling e2fsprogs ourselves
-
-  14 May 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.32
-
-  14 May 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
-  Stop removing lvm/dmsetup from the initramfs (bug #415697), reported by
-  I.zaufi, bug introduced in 9f36ecc125bf2c20bd28c0ad513577a858140a77 affects
-  genkernel >=3.4.30
-
-  12 May 2012; Sebastian Pipping <sping@gentoo.org> arch/x86/kernel-config,
-  arch/x86_64/kernel-config, defaults/kernel-config:
-  Set CONFIG_DEVTMPFS=y on x86, x86_64, default for udev
-
-  12 May 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.31
-
-  18 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
-  lddtree call must be outside the for loop.
-
-  16 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
-  Use CC0 instead of public domain for copy_binaries to cover French
-  jurisdiction concerns.
-
-  16 Apr 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.30
-
-  16 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
-  Support a non-static cryptsetup binary (bug #409277)
- 
-  15 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
-  Release copy_binaries function as public domain.
-
-  15 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
-  Handle other binary paths for LVM.
-
-  09 Apr 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
-  defaults/keymaps/keymapList, defaults/keymaps/sf.map:
-  Add keymap "sf" from Pentoo
-
-  08 Apr 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.29
-
-  08 Apr 2012; Mike Auty <ikelos@gentoo.org> gen_bootloader.sh:
-  Support for Grub 2, adjustements by Tomasz Wasiak
-
-  08 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh,
-  genkernel.conf:
-  Add "fastest" to supported initrd compressions
-
-  08 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
-  Support comression "lzop" (not just "lzo") as wrongly advertised by comments
-  in genkernel.conf before
-
-  08 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
-  Be more helpful when requested compression is not available
-
-  08 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
-  Error out on unknown initrd compression, reported by Peter Gantner (bug
-  #411197)
-
-  08 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
-  Fix initrd compression "gzip", reported by Peter Gantner (bug #411197)
-
-  30 Mar 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.28
-
-  29 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
-  Restore original /dev/tty after GPG (bug #410073), report and initial patch
-  by Brendan Pike
-
-  22 Mar 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.27
-
-  22 Mar 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
-  Fail hard on LUKS inclusion error (bug #409277), advise about
-  sys-fs/cryptsetup[static], drop support for cryptsetup binary from /bin/
-
-  22 Mar 2012; Sebastian Pipping <sping@gentoo.org> gen_funcs.sh,
-  gen_initramfs.sh:
-  Make errors stand out more
-
-  22 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
-  defaults/linuxrc:
-  Fix docache (bug #397309)
-
-  22 Mar 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.26
-
-  16 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
-  defaults/linuxrc:
-  Drop into debug shell when squashfs could not be mounted
-
-  16 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
-  defaults/linuxrc:
-  Drop into debug shell when files could not be copied into tmpfs
-
-  16 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
-  defaults/linuxrc:
-  Improve handling of missing /etc/fstab
-
-  16 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
-  No longer use parameter "-r" (for regex intervals) that busybox awk does not
-  support
-
-  10 Mar 2012; Robin H. Johnson <robbat2@gentoo.org> genkernel:
-  Bump version for release.
-
-  25 Feb 2012; Sebastian Pipping <sping@gentoo.org> arch/x86/modules_load,
-  arch/x86_64/modules_load, defaults/modules_load:
-  Make sure the sha256 module makes it into the initramfs (bug #405495).
-  Reported by Ogelpre.
-
-  20 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/linuxrc:
-  With the new /usr mounting, if the device path that ends up in /proc/mounts
-  ends up being different than in /etc/fstab due to symlinks, mount -a will
-  always exit 32. Avoid by resolving symlinks like util-linux does.
-
-  14 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_compile.sh,
-  gen_initramfs.sh:
-  dmraid is entirely broken if you try to use the system static
-  LVM/device-mapper. Instead start always building LVM2 for the initramfs,
-  using DESTDIR for cleaner install. Dead code paths for old LVM2 build not
-  removed yet until more users have tested.
-
-  12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_compile.sh:
-  More UTILS_CROSS_COMPILE prefix on strip calls.
-
-  12 Feb 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,
-  arch/ppc64/modules_load, arch/sparc/modules_load, arch/sparc64/modules_load,
-  arch/um/modules_load, arch/x86/modules_load, arch/x86_64/modules_load,
-  defaults/modules_load:
-  Bug #401583: include more DM and MD modules for other RAID/LVM
-  configurations.
-
-  12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_compile.sh:
-  Bug #265005: ensure CROSS_COMPILE is set for cross-compile strip calls to
-  work.
-
-  12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org>
-  +patches/dmraid/dmraid-1.0.0_rc16-as-needed2.patch,
-  +patches/dmraid/dmraid-1.0.0_rc16-return-all-sets.patch,
-  +patches/dmraid/dmraid-1.0.0_rc16-static-build-fixes.patch,
-  +patches/dmraid/dmraid-1.0.0_rc16-undo-p-rename.patch,
-  +patches/dmraid/dmraid-1.0.0.rc16-3-staticlink.patch, genkernel.conf:
-  Bug #398467: Update dmraid. Also add other patches from Portage tree.
-
-  12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_cmdline.sh,
-  gen_compile.sh, gen_determineargs.sh, gen_funcs.sh, genkernel.conf:
-  device-mapper "update". It was merged into LVM2-2.02.67 upstream in 2010.
-  Bug #398467 is wrong for the device-mapper update.
-
-  09 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts,
-  defaults/linuxrc:
-  Dogfooding of the /usr mount code with the matching OpenRC change to make the
-  mounts RW revealed some bugs and gotchas in our prior code, now fixed and
-  verified to work.
-
-  06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> arch/alpha/config.sh,
-  arch/arm/config.sh, arch/ia64/config.sh, arch/mips/config.sh,
-  arch/parisc/config.sh, arch/parisc64/config.sh, arch/ppc/config.sh,
-  arch/ppc64/config.sh, arch/sparc/config.sh, arch/sparc64/config.sh,
-  arch/um/config.sh, arch/x86/config.sh, arch/x86_64/config.sh:
-  Ensure default for new initramfs compression is used.
-
-  06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
-  Bugfixes in new code branches that I didn't test fully.
-
-  06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> doc/genkernel.8.txt,
-  gen_cmdline.sh:
-  Update documentation for new initramfs compression.
-
-  06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/config.sh,
-  gen_cmdline.sh, gen_determineargs.sh, gen_initramfs.sh, genkernel.conf:
-  Import customizable compression for initramfs, based on Pentoo development.
-
-  06 Feb 2012: Richard Yao <ryao@cs.stonybrook.edu> 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,
-  arch/ppc64/modules_load, arch/sparc/modules_load, arch/sparc64/modules_load,
-  arch/um/modules_load, arch/x86/modules_load, arch/x86_64/modules_load,
-  defaults/busy-config, defaults/initrd.scripts, defaults/linuxrc,
-  defaults/modules_load, doc/genkernel.8.txt, gen_cmdline.sh,
-  gen_determineargs.sh, gen_initramfs.sh, genkernel:
-  This provides ZFS support, to go with the sys-fs/zfs package.
-
-  06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
-  Refactor copy_binaries and multipath slightly for ease of usage and readability.
-
-  06 Feb 2012: Richard Yao <ryao@cs.stonybrook.edu> gen_initramfs.sh:
-  Refactor multipath initramfs generation using copy_binaries.
-
-  06 Feb 2012: Richard Yao <ryao@cs.stonybrook.edu> gen_initramfs.sh:
-  copy_binaries utility function for putting binaries and librares into
-  initramfs (see git commit for full details).
-
-  06 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts:
-  Support virtio devices, and provide fallback of all remaining devices.
-
-  03 Feb 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
-  Support SD card readers. Patch by Rick Farina
-
-  24 Jan 2012; Sebastian Pipping <sping@gentoo.org> .gitignore, genkernel:
-  Bump version to 3.4.24
-
-  24 Jan 2012; Sebastian Pipping <sping@gentoo.org> arch/alpha/kernel-config,
-  arch/ia64/kernel-config, arch/ppc/kernel-config, arch/sparc64/kernel-config,
-  arch/x86/kernel-config:
-  Unset CONFIG_SYSFS_DEPRECATED for udev (bug #335763)
-
-  15 Jan 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.23.1
-
-  14 Jan 2012; Sebastian Pipping <sping@gentoo.org> defaults/busy-config:
-  Re-activate mdstart in busybox config
-
-  14 Jan 2012; Sebastian Pipping <sping@gentoo.org>
-  +patches/busybox/1.19.3/busybox-1.19.3-mdstart.patch:
-  Port mdstart patch to busybox 1.19.3
-
-  13 Jan 2012; Sebastian Pipping <sping@gentoo.org> defaults/busy-config:
-  Busybox config: Enable verbose usage
-
-  13 Jan 2012; Sebastian Pipping <sping@gentoo.org> defaults/busy-config:
-  Update busybox config using "yes '' | make oldconfig"
-
-  13 Jan 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.23
-
-  13 Jan 2012; Sebastian Pipping <sping@gentoo.org>
-  +patches/busybox/1.19.3/1.18.1-openvt.diff,
-  +patches/busybox/1.19.3/busybox-1.7.4-signal-hack.patch:
-  Copy patches from busybox/1.18.1 to busybox/1.19.3
-
-  13 Jan 2012; Sebastian Pipping <sping@gentoo.org>
-  +patches/e2fsprogs/1.42/e2fsprogs-1.41.12-getpagesize.patch:
-  Add a patch for e2fsprogs/1.42 from main tree
-
-  13 Jan 2012; Sebastian Pipping <sping@gentoo.org>
-  +patches/lvm/2.02.88/lvm2-2.02.72-no-export-dynamic.patch:
-  Copy patch from lvm/2.02.74 to lvm/2.02.88
-
-  13 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> gen_determineargs.sh:
-  Prior to commit a141d715, CMD_NOINSTALL had no default set, but most of the
-  usages were of the form "! isTrue ${CMD_NOINSTALL}", which on an unset value,
-  came out as false. These were replaced by "isTrue ${CMD_INSTALL}", but my
-  analysis of the needed default value was wrong, and was set to false instead
-  of true.
-
-  13 Jan 2012; Sebastian Pipping <sping@gentoo.org> genkernel.conf:
-  Replace "# FOO=bar" by "#FOO=bar" in genkernel.conf to (1) distinguish
-  commented-out options from their explanatory comments and (2) to return
-  consistenty (bug #398471)
-
-  12 Jan 2012; Sebastian Pipping <sping@gentoo.org> gen_compile.sh:
-  Support application of patches before compilation for tools which previously
-  lacked that support. Special thanks to Tomasz Wasiak (bug #398469)
-
-  08 Jan 2012; Sebastian Pipping <sping@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,
-  arch/ppc64/modules_load, arch/sparc/modules_load, arch/sparc64/modules_load,
-  arch/um/modules_load, arch/x86/modules_load, arch/x86_64/modules_load:
-  Add mpt2sas to auto-load SCSI modules as requested by Borg Onion
-
-  06 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> genkernel:
-  Bump to 3.4.22 to reflect /usr mount support.
-
-  06 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts,
-  defaults/linuxrc:
-  Code to mount /usr and other filesystems as needed for new udev and systemd.
-
-  06 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> genkernel:
-  Bump version to 3.4.21.2. Stock configuration of 3.4.21.1 generates
-  unbootable initramfs!
-
-  06 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> gen_determineargs.sh,
-  genkernel.conf:
-  Fix some defaults otherwise you get an initramfs without any modules!
-
-  06 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> defaults/busy-config:
-  Awk support in busybox is needed for initramfs setup code (to parse fstab).
-
-  06 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> TODO:
-  Multipath has been done for a while now.
-
-  06 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> genkernel.conf:
-  Add a configuration option for --install, so users can get it as a default.
-  Defaults to "no", due to catalyst.
-
-  06 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> ChangeLog:
-  Fix up changelog
-
-  05 Jan 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.21.1
-
-  05 Jan 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
-  defaults/linuxrc, doc/genkernel.8.txt:
-  Introduce boot parameter root_trim=(yes|no) for SSDs.
-  Special thanks:
-  - Christian Kruse
-
-  04 Jan 2012; Sebastian Pipping <sping@gentoo.org> arch/um/busy-config,
-  defaults/busy-config, netboot/busy-config:
-  Set CONFIG_NFSMOUNT=n in busybox config to fix compilation with glibc 2.14.
-  Special thanks:
-  - Borg Onion
-
-  04 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> arch/mips/config.sh,
-  doc/genkernel.8.txt, gen_cmdline.sh, gen_compile.sh, gen_determineargs.sh,
-  gen_funcs.sh, gen_initramfs.sh, genkernel, genkernel.conf:
-  Provide real boolean commandline options for options that were previously
-  only available as booleans in the config, so that they can be enable in
-  configuration and overridden to disable on the commandline. Remove negation
-  on options: NOINSTALL, NORAMDISKMODULES, NO_KERNEL_SOURCES.
-
-  08 Nov 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.20
-
-  31 Oct 2011; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
-  Fix return value of crypt_filter() which caused bogus LUKS opening errors
-  (bug #383545)
-
-  30 Oct 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.19
-
-  25 Oct 2011; Fabio Erculiani <lxnay@gentoo.org> gen_compile.sh:
-  fix random build failures during e2fsprogs, force -j1
-
-  08 Oct 2011; Fabio Erculiani <lxnay@gentoo.org> defaults/initrd.defaults,
-  defaults/initrd.scripts, defaults/linuxrc:
-  Do not hardcode /mnt/cdrom path across the whole code, use CDROOT_PATH
-  instead. At the same time, mount cdrom into /mnt/cdrom instead of
-  /newroot/mnt/cdrom (which is now just a bind mount), this avoids
-  losetup to expose unavailable paths inside the live system, breaking
-  mkfs.btrfs (next upstream version, which does silly things with
-  /proc/mounts).
-
-  07 Oct 2011; Robin H. Johnson <robbat2@gentoo.org>
-  patches/busybox/1.18.1/1.18.1-mdstart.diff:
-  Fix patch typo that broke compile.
-
-  22 Sep 2011; Robin H. Johnson <robbat2@gentoo.org> defaults/initrd.scripts,
-  defaults/linuxrc:
-  Fix trailing backtick and root-on-LVM.
-
-  13 Sep 2011; Fabio Erculiani <lxnay@gentoo.org> gen_compile.sh,
-  gen_initramfs.sh:
-  dmraid requires dmsetup to assign UUID to discovered RAID volumes, close bug
-  #382555
-
-  11 Sep 2011; Fabio Erculiani <lxnay@gentoo.org> defaults/initrd.scripts,
-  defaults/linuxrc:
-  drop parse_opt usage and crufty, deprecated subshelling through 
-
-  30 Aug 2011; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
-  Fix quoting issue (bug #380729).
-  Thanks to:
-  - Axel Bringenberg
-
-  30 Aug 2011; Sebastian Pipping <sping@gentoo.org>
-  +patches/mdadm/3.1.4/mdadm-3.1.4-z-now.patch, gen_compile.sh:
-  Enable patch application for mdadm, add patch to fix compilation (bug
-  #381089)
-
-  28 Aug 2011; Fabio Erculiani <lxnay@gentoo.org> defaults/initrd.scripts,
-  defaults/linuxrc, doc/genkernel.8.txt:
-  Add basic support to AUFS2, requires kernel with aufs module or built-in
-
-  16 Aug 2011; Fabio Erculiani <lxnay@gentoo.org> gen_compile.sh:
-  gen_compile: correct MAKEOPTS usage on utils task
-
-  16 Aug 2011; Fabio Erculiani <lxnay@gentoo.org> gen_compile.sh:
-  gen_compile: always use -j1 with kernel *_install targets, fixes compilation
-  with make 3.82
-
-  06 Aug 2011; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
-  No longer copy /lib/libsysfs*so* for multipath-tools (bug #300841, bug
-  #377709)
-
-  31 Jul 2011; Sebastian Pipping <sping@gentoo.org>
-  -patches/busybox/1.7.4/1.7.4-ash-timeout.diff,
-  -patches/busybox/1.7.4/1.7.4-mdstart.diff,
-  -patches/busybox/1.7.4/1.7.4-mount-umount-i-option.diff,
-  -patches/busybox/1.7.4/1.7.4-openvt.diff,
-  -patches/busybox/1.7.4/1.7.4-static-error.diff,
-  -patches/busybox/1.7.4/1.7.4-make-3.82.diff, -patches/busybox/1.7.4/README,
-  -patches/busybox/1.7.4/busybox-1.7.4-signal-hack.patch:
-  End support for 4 years old busybox 1.7.4 (bug #377133)
-
-  31 Jul 2011; Sebastian Pipping <sping@gentoo.org> doc/genkernel.8.txt:
-  Improve doc on filing bugs
-
-  28 Jul 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.18
-
-  27 Jul 2011; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
-  Fix display of seconds waiting (bug #376575)
-  Thanks to Richard Scott
-
-  26 Jul 2011; Robin H. Johnson <robbat2@gentoo.org> gen_arch.sh:
-  Bug #376467: fix kernel version checks for 3.0 kernel.
-
-  23 Jul 2011; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
-  netboot/linuxrc.x:
-  Fix permissions of /dev/pts (bug #375947)
-
-  20 Jul 2011; Fabio Erculiani <lxnay@sabayon.org> defaults/config.sh,
-  doc/genkernel.8.txt, gen_cmdline.sh, gen_compile.sh:
-  Make possible to compile XEN based kernels providing --kernel-target= and
-  --kernel-binary= switches
-
-  03 Jul 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Set version to 3.4.17
-
-  03 Jul 2011; Sebastian Pipping <sping@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,
-  arch/ppc64/modules_load, arch/sparc/modules_load, arch/sparc64/modules_load,
-  arch/um/modules_load, arch/x86/modules_load, arch/x86_64/modules_load,
-  defaults/initrd.defaults, defaults/initrd.scripts, defaults/linuxrc,
-  defaults/modules_load, doc/genkernel.8.txt, gen_cmdline.sh,
-  gen_determineargs.sh, gen_initramfs.sh, genkernel, genkernel.conf,
-  maintenance/docmatcher.py:
-  Remove support for sys-fs/evms, as it was removed from Gentoo (bug #372423)
-
-  22 Jun 2011; Sebastian Pipping <sping@gentoo.org> gen_compile.sh:
-  Make --arch-override= affect "make menuconfig" (bug #247246)
-
-  13 Jun 2011; Sebastian Pipping <sping@gentoo.org> arch/x86_64/kernel-config:
-  Unset CONFIG_EMBEDDED on arch amd64
-
-  13 Jun 2011; Sebastian Pipping <sping@gentoo.org> arch/x86/kernel-config,
-  arch/x86_64/kernel-config, defaults/kernel-config:
-  Apply CONFIG_USB_HID=y to archs amd64/x86/default (bug #270983)
-
-  13 Jun 2011; Sebastian Pipping <sping@gentoo.org> arch/x86/kernel-config,
-  arch/x86_64/kernel-config, defaults/kernel-config:
-  Unset CONFIG_IDE on archs amd64/x86/default (bug #357213)
-
-  07 Jun 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.16
-
-  07 Jun 2011; Sebastian Pipping <sping@gentoo.org> doc/genkernel.8.txt:
-  Document most undocumented boot parameters (bug #370369)
-
-  07 Jun 2011; Sebastian Pipping <sping@gentoo.org> doc/genkernel.8.txt:
-  Docs: Fix mixup of boot parameters real_init= and init_opts=
-
-  04 Jun 2011; Sebastian Pipping <sping@gentoo.org> genkernel.conf,
-  maintenance/docmatcher.py:
-  Document remaining options inside genkiernel.conf (bug #367233)
-
-  01 Jun 2011; Sebastian Pipping <sping@gentoo.org> defaults/linuxrc,
-  doc/genkernel.8.txt:
-  Document option lvmraid= and make it imply dolvm (bug #153502)
-
-  31 May 2011; Sebastian Pipping <sping@gentoo.org> defaults/linuxrc,
-  doc/genkernel.8.txt:
-  Add rootfstype= boot parameter (bug #221245)
-  Special thanks:
-  - Marcin Kurek
-
-  31 May 2011; Nelson Batalha <nelson.batalha@gmail.com> defaults/initrd.defaults:
-  Add Kernel 3.0.0 support (bug #369481)
-
-  31 May 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Output warning in warning color
-
-  31 May 2011; Sebastian Pipping <sping@gentoo.org> doc/genkernel.8.txt,
-  genkernel:
-  Document boot parameter domdadm (bug #369415)
-
-  12 May 2011; Amadeusz Żołnowski <aidecoe@aidecoe.name>
-  defaults/modules_load:
-  Added hpsa to defaults/modules_load; fixes bug #363369
-
-  28 Mar 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump to 3.4.15
-
-  24 Mar 2011; Peter Hjalmarsson <xake@rymdraket.net> defaults/linuxrc, initrd.scripts:
-  Rescue /proc and /sys over into chroot
-  Apply mount options noexec,nosuid,nodev to /proc and /sys
-
-  22 Mar 2011; Fabio Erculiani <lxnay@sabayon.org> gen_compile.sh, patches/iscsi/*:
-  Fix compilation of iSCSI
-
-  23 Mar 2011; Peter Hjalmarsson <xake@rymdraket.net> doc/genkernel.8.txt,
-  gen_cmdline.sh, gen_initramfs.sh:
-  Remove "--slowusb" as it is enabled by default now. Also document "noslowusb"
-  ramdisk option that skips it.
-
-  22 Mar 2011; Peter Hjalmarsson <xake@rymdraket.net> defaults/initrd.defaults,
-  defaults/initrd.scripts:
-  Set DO_slowusb as default, and make setup_slowusb unset it if it cannot find
-  a usb-storage attached. This makes genkernel ramdisk adhere to "noslowusb",
-  makes the ramdisk only wait if there is a usb-storage attached and should fix
-  gentoo bug #359619.
-
-  16 Mar 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.14
-
-  16 Mar 2011; Fabio Erculiani <lxnay@sabayon.org> **/modules_load:
-  Add btrfs to MODULES_FS
-
-  07 Mar 2011; Peter Hjalmarsson <xake@rymdraket.net> defaults/initrd.scripts:
-  Fix typo where the kernelcmd version "dokeymap" was added to MY_HWOPTS
-  instead of the HWOPTS version "keymap".
-  Broke setups where only "keymap=<...>" was added to kernelcmd (bug #356167)
-
-  24 Feb 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
-  Fix handling of mdadm.conf (bug #354809)
-  Special thanks:
-  - Peter Hjalmarsson
-
-  10 Feb 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.13
-
-  09 Feb 2011; Sebastian Pipping <sping@gentoo.org> genkernel.conf:
-  Add SPLASH and SPLASH_THEME to genkernel.conf (bug #268468)
-  Special thanks:
-  - PhobosK
-
-  08 Feb 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
-  Add iBFT support for iSCSI (bug #314575)
-  Special thanks:
-  - Stefan Behte
-
-  7 Feb 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
-  Use devtmpfs/tmpfs for /dev (bug #353024)
-  Rescue devtmpfs /dev over to chroot (bug #353024, bug #344407)
-  Special thanks:
-  - Peter Hjalmarsson
-
-  31 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.12.6
-
-  31 Jan 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
-  Speed up LVM activation (bug #351047)
-  Special thanks:
-  - Peter Hjalmarsson
-
-  30 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.12.5
-
-  30 Jan 2011; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
-  Give blkid of e2fsprogs precedence over busybox re-write by putting it into
-  /sbin, not /bin (bug #352746)
-
-  30 Jan 2011; Sebastian Pipping <sping@gentoo.org> arch/x86_64/kernel-config:
-  Enable CONFIG_USB_SUSPEND and CONFIG_PM_RUNTIME for x86_64 (bug #351376)
-
-  30 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.12.4
-
-  30 Jan 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
-  Enhance console handling on netboot linuxrc (bug #353084)
-  Enable shadow on netboot's busybox config (bug #353085)
-  Special thanks:
-  - Raúl Porcel
-
-  29 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.12.3
-
-  29 Jan 2011; Sebastian Pipping <sping@gentoo.org> gen_compile.sh:
-  No longer require device mapper bincache for compiling lvm (bug #353026)
-  Special thanks:
-  - Peter Hjalmarsson
-
-  27 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.12.2
-
-  27 Jan 2011; Sebastian Pipping <sping@gentoo.org> gen_determineargs.sh:
-  Revert kernel release detection fix (regression) (bug #352787)
-
-  23 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.12.1
-
-  23 Jan 2011; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
-  Fix copying of mdadm/mdmon to the initramfs (bug #352496). Thanks to Malcolm
-  Lashley for reporting.
-
-  23 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.12
-
-  22 Jan 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
-  Enable CONFIG_USB_SUSPEND for x86/amd64 (bug #351376)
-  Replace "${MAKEOPTS/-j?/j1}" by "${MAKEOPTS} -j1" (bug #277607)
-
-  21 Jan 2011; Sebastian Pipping <sping@gentoo.org> gen_determineargs.sh:
-  Do not query generated files (like include/config/kernel.release) for kernel
-  version, as they may be out of sync (bug #263927)
-
-  20 Jan 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
-  Add proper mdadm support (bug #282100)
-  Special thanks:
-  - Craig Andrews (Testing)
-  - Laurent Pinchart (mdmon/IMSM support)
-  - Matthias Dahl (Initial patch)
-  - Peter Hjalmarsson (Testing)
-
-  20 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.11.1
-
-  20 Jan 2011; Sebastian Pipping <sping@gentoo.org> gen_configkernel.sh:
-  Move application of kernel config after "make mrproper" as that deletes
-  .config (whereas "make clean" does not) (bug #351906)
-  Special thanks:
-  - Peter Hjalmarsson
-
-  20 Jan 2011; Sebastian Pipping <sping@gentoo.org>
-  patches/busybox/1.18.1/1.18.1-mdstart.diff:
-  busybox 1.18.1: Return of mdstart as an applet (regression) (bug #351909)
-
-  16 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.11
-
-  16 Jan 2011; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
-  Do not sleep after vgscan (bug #351047)
-
-  16 Jan 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
-  Changes:
-  - Fix compilation of LVM 2.02.74 (and 2.02.28) (bug #255196, bug #267383)
-  - Add minimal btrfs support (bug #303529)
-  - Add support for UUID to crypt_root (bug #315467)
-  - Run "make firmware_install" if CONFIG_FIRMWARE_IN_KERNEL != y (bug #244651)
-  - Port busybox patches from 1.7.4 to 1.18.1 (bug #331971)
-  - Handle missing kernel .config better (bug #271528)
-  - Improve slowusb handling (bug #323317)
-  - Add GnuPG 1.x support (bug #217959)
-  - Check return codes of cpio (bug #246370)
-  - Update e2fsprogs/blkid to 1.41.14 (bug #291822)
-  - Create /bin/vg* symlinks when called as /linuxrc, too (bug #307855)
-  - Pick first device when several devices are matching real_root (bug #303531)
-  - Fix warning "cannot remove `/var/cache/genkernel/src'" (bug #347213)
-  - Allow configuring the list of busybox applets (bug #326593)
-  - Fix arithmetic bug in defaults/initrd.scripts (bug #339789)
-  Special thanks:
-  - Amadeusz Zolnowski (LVM update)
-  - Christian Giessner (UUID crypt_root)
-  - dacook (GnuPG 1.x support)
-  - Denis Kaganovich (Busybox patch porting)
-  - devsk (Multi-device patch)
-  - Fabio Erculiani (Slowusb fixes)
-  - Kai Dietrich (Symlink analysis)
-  - Kolbjørn Barmen (Arithmetic fix)
-
-  13 Dec 2010; Sebastian Pipping <sping@gentoo.org> genkernel:
-  Bump version to 3.4.10.908
-
-  13 Dec 2010; <sping@gentoo.org> doc/genkernel.8.txt, gen_cmdline.sh:
-  docs: Document --genzimage
-
-  13 Dec 2010; <sping@gentoo.org> gen_cmdline.sh:
-  Fix a reference to --nomenuconfig into --no-menuconfig
-
-  13 Dec 2010; <sping@gentoo.org> doc/genkernel.8.txt:
-  docs: Update man page from output of --help
-
-  13 Dec 2010; <sping@gentoo.org> doc/genkernel.8.txt:
-  docs: Document keymap= and dokeymap (bug #346017)
-
-  6 Dec 2010; <sping@gentoo.org> genkernel.conf:
-  .conf: Document LUKS variable (bug #346015)
-
-  6 Dec 2010; <sping@gentoo.org> doc/genkernel.8.txt:
-  docs: Mention both "initramfs" and "ramdisk" as available actions
-  (bug #251702)
-
-  6 Dec 2010; <sping@gentoo.org> genkernel.8:
-  man page: Propagate rename of --no-initrdmodules to --no-ramdisk-modules
-
-  29 Nov 2010; <sping@gentoo.org> ChangeLog:
-  Add patch allowing compilation of busybox 1.7.4 with make 3.82 (bug #341943)
-
-  20 Feb 2010; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts:
-  Apply patches from Gentoo bug #268468
-
-  19 Jan 2010; Andrew Gaffney <agaffney@gentoo.org> genkernel:
-  Only call set_bootloader is CMD_NOINSTALL is not set for Gentoo bug
-  #301454
-
-  27 Dec 2009; Andrew Gaffney <agaffney@gentoo.org> arch/alpha/modules_load,
-  arch/arm/modules_load, arch/ia64/kernel-config, arch/ia64/modules_load,
-  arch/mips/modules_load, arch/parisc/modules_load,
-  arch/parisc64/modules_load, arch/ppc/kernel-config, arch/ppc/modules_load,
-  arch/ppc64/modules_load, arch/sparc/modules_load,
-  arch/sparc64/kernel-config, arch/sparc64/modules_load,
-  arch/um/modules_load, arch/x86/kernel-config, arch/x86/modules_load,
-  arch/x86_64/kernel-config, arch/x86_64/modules_load,
-  defaults/kernel-config:
-  Add USB HID modules to modules_load and default kernel-config (for Gentoo
-  bug #270983)
-
-  27 Dec 2009; Andrew Gaffney <agaffney@gentoo.org>
-  arch/alpha/kernel-config, arch/alpha/modules_load, arch/arm/modules_load,
-  arch/ia64/kernel-config, arch/ia64/modules_load, arch/mips/modules_load,
-  arch/parisc/modules_load, arch/parisc64/modules_load,
-  arch/ppc/kernel-config, arch/ppc/modules_load, arch/ppc64/modules_load,
-  arch/sparc/modules_load, arch/sparc64/kernel-config,
-  arch/sparc64/modules_load, arch/um/modules_load, arch/x86/kernel-config,
-  arch/x86/modules_load, arch/x86_64/kernel-config,
-  arch/x86_64/modules_load, defaults/kernel-config, defaults/modules_load:
-  Enable ext4 by default everywhere (for Gentoo bug #268818)
-
-  27 Dec 2009; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts,
-  defaults/linuxrc:
-  Add support for isoboot= option (for Gentoo bug #294268)
-
-  26 Dec 2009; Andrew Gaffney <agaffney@gentoo.org>
-  defaults/initrd.defaults, defaults/initrd.scripts:
-  Properly apply NFS mount options for Gentoo bug #262915
-
-  26 Dec 2009; Andrew Gaffney <agaffney@gentoo.org>
-  arch/alpha/kernel-config, arch/ia64/kernel-config, arch/ppc/kernel-config,
-  arch/x86_64/kernel-config:
-  Enable CONFIG_SCSI_MULTI_LUN option for Gentoo bug #261122
-
-  26 Dec 2009; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts:
-  Apply patch to make sure loop cache directory exists for Gentoo bug
-  #297814
-
-  17 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> HACKING:
-  Document how to roll a release for the next time.
-
-  17 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> genkernel:
-  Tag 3.4.10.907 release.
-
-  06 Dec 2009; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  use a symlink instead of a hardlink for busybox utils (for Gentoo bug
-  #246370)
-
-  23 Nov 2009; Andrew Gaffney <agaffney@gentoo.org> defaults/linuxrc:
-  Fix typo for Gentoo bug #294138
-
-  16 Nov 2009; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Make sure to change back to existant directory before removing the current
-  directory for Gentoo bug #291794
-
-  15 Oct 2009; <craig@haquarter.de> Changelog:
-  added iSCSI support
-
-  22 Sep 2009; <tsunam@gentoo.org> ChangeLog:
-  modified the libaio search so it'll actually work, cause I'm a dork
-
-  21 Sep 2009; <tsunam@gentoo.org> gen_initramfs.sh:
-  Fix broken libraries for multipath per Gentoo bug #284592
-
-  21 Sep 2009; <tsunam@gentoo.org> gen_initramfs.sh:
-  Update to fix broken initramfs caused by multipath config in Gentoo bug #284589
-
-  05 Sep 2009; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts,
-  defaults/linuxrc:
-  Apply patch from Gentoo bug #220913 for tuxonice resume
-
-  14 Aug 2009; Andrew Gaffney <agaffney@gentoo.org> genkernel.conf:
-  Enable DISKLABEL=yes by default
-
-  05 Aug 2009; Andrew Gaffney <agaffney@gentoo.org> genkernel:
-  This is genkernel 3.4.10.906
-
-  25 Jul 2009; Chris Gianelloni <wolf31o2@wolf31o2.org> genkernel.conf,
-  .gitattributes:
-  Adding Id header and Ident for genkernel.conf
-
-  25 Jul 2009; Chris Gianelloni <wolf31o2@wolf31o2.org>
-  arch/alpha/config.sh, arch/arm/config.sh, arch/ia64/config.sh,
-  arch/mips/config.sh, arch/parisc/config.sh, arch/parisc64/config.sh,
-  arch/ppc/config.sh, arch/ppc64/config.sh, arch/sparc/config.sh,
-  arch/sparc64/config.sh, arch/um/config.sh, arch/x86/config.sh,
-  arch/x86_64/config.sh, defaults/config.sh, gen_arch.sh, gen_bootloader.sh,
-  gen_cmdline.sh, gen_compile.sh, gen_configkernel.sh, gen_determineargs.sh,
-  gen_funcs.sh, gen_initramfs.sh, gen_moddeps.sh, gen_package.sh:
-  Adding Id header.
-
-  25 Jul 2009; Chris Gianelloni <wolf31o2@wolf31o2.org> genkernel,
-  .gitattributes:
-  Adding Id header and enabling Ident on *.sh files.
-
-  25 Jul 2009; Chris Gianelloni <wolf31o2@wolf31o2.org> AUTHORS, BUGS,
-  HACKING, README, TODO:
-  Adding Id header.
-
-  25 Jul 2009; Chris Gianelloni <wolf31o2@wolf31o2.org> .gitattributes:
-  Adding additional files to .gitattributes to enable Ident.
-
-  25 Jul 2009; Chris Gianelloni <wolf31o2@wolf31o2.org> +.gitattributes:
-  Adding .gitattributes file.
-
-  19 Jul 2009; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts:
-  Change command used to determine real filename for REAL_RESUME for Gentoo
-  bug #269603
-
-  19 Jul 2009; Andrew Gaffney <agaffney@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, arch/ppc64/modules_load, arch/sparc/modules_load,
-  arch/sparc64/modules_load, arch/um/modules_load, arch/x86/modules_load,
-  arch/x86_64/modules_load, defaults/modules_load:
-  Add aic94xx to MODULES_SCSI for Gentoo bug #277792
-
-  12 Jul 2009; Andrew Gaffney <agaffney@gentoo.org> arch/x86/kernel-config,
-  arch/x86_64/kernel-config:
-  enable CONFIG_SYSFS_DEPRECATED=y in x86/x86_64 kernel-config for Gentoo
-  bug #225249
-
-  12 Jul 2009; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Apply patch for Gentoo bug #276753 for new lvm.static binary
-
-  07 Jul 2009; Chris Gianelloni <wolf31o2@wolf31o2.org> genkernel:
-  Version bumping to 3.4.10.905 for release.
-
-  04 Jul 2009; Andrew Gaffney <agaffney@gentoo.org> gen_funcs.sh, genkernel:
-  Remove code to check for host kernel LOOP support for Gentoo bug #275757
-
-  28 Jun 2009; Andrew Gaffney <agaffney@gentoo.org> defaults/modprobe,
-  genkernel.conf:
-  Restore BOOTLOADER="grub" example line in genkernel.conf for Gentoo bug
-  #274768
-
-  12 May 2009; Andrew Gaffney <agaffney@gentoo.org> arch/x86/modules_load,
-  defaults/initrd.scripts:
-  Apply fix to deference links for Gentoo bug #269603
-
-  09 May 2009; Andrew Gaffney <agaffney@gentoo.org> arch/x86/modules_load:
-  foo
-
-  09 May 2009; Andrew Gaffney <agaffney@gentoo.org> arch/x86/modules_load,
-  arch/x86_64/modules_load:
-  Add dm-crypt module for Gentoo bug #269042
-
-  24 Apr 2009; Chris Gianelloni <wolf31o2@wolf31o2.org> genkernel:
-  Rolling a new genkernel 3.4.10.904 version for testing.
-
-  17 Apr 2009; Andrew Gaffney <agaffney@gentoo.org> netboot/busy-config:
-  Apply patch from Gentoo bug #266373 for additional options in the netboot
-  busy-config
-
-  06 Mar 2009; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Clean up append_multipath() code to copy files in a loop and report file
-  that failed to copy
-
-  06 Mar 2009; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Apply patch from robbat2 to fix whitespace breakage in multipath code
-
-  06 Mar 2009; Andrew Gaffney <agaffney@gentoo.org> gen_determineargs.sh,
-  genkernel.conf:
-  Apply patch from robbat2 to finish wiring up multipath support
-
-  06 Mar 2009; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Modify append_data to die on 0 arguments and check arg 2 with isTrue().
-  Based on a patch from robbat2
-
-  20 Feb 2009; Andrew Gaffney <agaffney@gentoo.org> arch/sparc64/config.sh,
-  gen_compile.sh, gen_funcs.sh, gen_package.sh:
-  Add support for multiple possible kernel binary paths for Gentoo bug
-  #255085
-
-  04 Feb 2009; Andrew Gaffney <agaffney@gentoo.org> defaults/linuxrc:
-  Comment out the exec line for console=*, since it seems to blow up when
-  the param isn't a true device node, such as ttyS0,115200n8
-
-  19 Jan 2009; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts,
-  defaults/linuxrc:
-  Remove detect_sbp2_devices() for Gentoo bug #239474
-
-  16 Jan 2009; Andrew Gaffney <agaffney@gentoo.org> genkernel.conf:
-  Add commented out DISKLABEL=yes option for Gentoo bug #229847
-
-  08 Jan 2009; Chris Gianelloni <wolf31o2@wolf31o2.org> TODO:
-  Added more verbosity to the auto-detection section.
-
-  08 Jan 2009; Chris Gianelloni <wolf31o2@wolf31o2.org> AUTHORS:
-  Updated the AUTHORS section and the header for the ChangeLog, to reflect
-  that individual authors now retain their copyright to code they submit.
-
-  08 Jan 2009; Chris Gianelloni <wolf31o2@wolf31o2.org> TODO:
-  Added a note about Security Tokens, cleaned up the block device section, and
-  added a section about autodetection.
-
-  08 Jan 2009; Chris Gianelloni <wolf31o2@wolf31o2.org> HACKING:
-  Adding a note about contacting me to HACKING.
-
-  08 Jan 2009; Chris Gianelloni <wolf31o2@wolf31o2.org> TODO:
-  Adding multipath support is really two different functions, so split them.
-
-  08 Jan 2009; Chris Gianelloni <wolf31o2@wolf31o2.org> TODO:
-  Adding a note about documenting the code paths.
-
-  08 Jan 2009; Chris Gianelloni <wolf31o2@wolf31o2.org> TODO:
-  Adding new boot support information to the TODO.
-
-  05 Jan 2009; Chris Gianelloni <wolf31o2@wolf31o2.org> TODO, genkernel:
-  Version bump to 3.4.10.903 to resolve bug #250330.
-
-  31 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> gen_arch.sh:
-  Add case for arm* in get_official_arch()
-
-  31 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> netboot/busy-config:
-  Enable CONFIG_MKSWAP for netboot busybox
-
-  26 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> gen_bootloader.sh:
-  Modify grep regex to account for additional suffixes on old kernel names
-
-  24 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> gen_cmdline.sh,
-  gen_determineargs.sh:
-  Add --busybox-config= commandline option
-
-  24 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> netboot/linuxrc.x:
-  Revert to just running /bin/bash on /dev/console for serial. We still
-  start getty on tty2-6
-
-  23 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> gen_cmdline.sh:
-  Allow old 'initramfs' option instead of 'ramdisk' for compatability
-  (bug #251702)
-
-  17 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/linuxrc:
-  Remove the use of 'env -i' when calling switch_root due to Gentoo bug
-  #248688
-
-  16 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> netboot/linuxrc.x:
-  Run the getty commands with proper arguments so they don't die immediately
-
-  16 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> netboot/linuxrc.x:
-  Explicitly set /bin/ashlogin +x during boot
-
-  16 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> netboot/linuxrc.x:
-  Run getty for tty1 in the foreground
-
-  16 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> netboot/linuxrc.x,
-  +netboot/misc/bin/ashlogin:
-  Use getty to launch ash, so that we can use ^C and friends
-
-  16 Dec 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> +BUGS:
-  Adding a BUGS file, where we can list bugs that we have found in genkernel
-  that need to be resolved.
-
-  16 Dec 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> +HACKING:
-  Adding a HACKING file, which I will use to document the various phases of
-  genkernel so we can split up the default functions and also so we can
-  provide hooks into the various phases for external addons.
-
-  16 Dec 2008; Chris Gianelloni <wolf31o2@wolf31o2.org>
-  arch/alpha/config.sh, arch/arm/config.sh, arch/ia64/config.sh,
-  arch/mips/config.sh, arch/parisc/config.sh, arch/parisc64/config.sh,
-  arch/ppc/config.sh, arch/ppc64/config.sh, arch/sparc/config.sh,
-  arch/sparc64/config.sh, arch/um/config.sh, arch/x86/config.sh,
-  arch/x86_64/config.sh, defaults/config.sh, defaults/initrd.defaults,
-  defaults/initrd.scripts, defaults/linuxrc, defaults/udhcpc.scripts,
-  gen_bootloader.sh, gen_compile.sh, gen_configkernel.sh,
-  gen_determineargs.sh, gen_initramfs.sh, gen_moddeps.sh, gen_package.sh,
-  genkernel.conf, netboot/linuxrc.x, netboot/misc/bin/net-setup:
-  Actually setting permissions. It helps if one remembers to 'git add'
-  before doing their commit.
-
-  16 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> netboot/busy-config:
-  Enable GETTY for netboot busy-config
-
-  16 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh:
-  We don't need to add - to UTILS_CROSS_COMPILE since it's already there
-
-  16 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/busy-config,
-  gen_compile.sh, +netboot/busy-config:
-  Separate out main and netboot busy-config
-
-  15 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Use : as a regex separator instead of / since REAL_ROOT will have / in it
-
-  15 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> gen_bootloader.sh:
-  Add check for existing grub.conf entry for kernel
-
-  15 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> gen_bootloader.sh:
-  Default to '0' if 'default' line not found at all in existing grub.conf
-
-  15 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> gen_bootloader.sh:
-  Adding code that duplicates default grub.conf entry to replace old awk
-  script. Based on code written by Mike Auty <ikelos@gentoo.org>
-
-  15 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> +gen_bootloader.sh,
-  gen_cmdline.sh, gen_determineargs.sh, genkernel:
-  Initial commit for re-adding support for --bootloader=grub
-
-  14 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> netboot/linuxrc.x:
-  Change -f checks to -e for /dev nodes Check that dropbear exists before
-  starting it
-
-  14 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh:
-  Explicitly set UTILS_{CC,LD,AS} if UTILS_CROSS_COMPILE is set
-
-  14 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> gen_cmdline.sh:
-  Typo fix for Gentoo bug #250875
-
-  14 Dec 2008; Chris Gianelloni <wolf31o2@wolf31o2.org>
-  arch/alpha/config.sh, arch/arm/config.sh, arch/ia64/config.sh,
-  arch/mips/config.sh, arch/parisc/config.sh, arch/parisc64/config.sh,
-  arch/ppc/config.sh, arch/ppc64/config.sh, arch/sparc/config.sh,
-  arch/sparc64/config.sh, arch/um/config.sh, arch/x86/config.sh,
-  arch/x86_64/config.sh, defaults/config.sh, defaults/initrd.defaults,
-  defaults/initrd.scripts, defaults/linuxrc, defaults/udhcpc.scripts,
-  gen_compile.sh, gen_configkernel.sh, gen_determineargs.sh,
-  gen_initramfs.sh, gen_moddeps.sh, gen_package.sh, genkernel.conf,
-  netboot/linuxrc.x, netboot/misc/bin/net-setup:
-  Setting executable bit properly on shell scripts and configuration files.
-
-  13 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Create /sbin directory in append_luks for bug #250330
-
-  13 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> netboot/linuxrc.x:
-  Disable creation of most standard devices nodes, since we're running mdev
-
-  13 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts,
-  gen_initramfs.sh, netboot/linuxrc.x:
-  Move udhcpc's script to default location
-
-  13 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/busy-config:
-  Enable support klogd and syslogd for netboot
-
-  13 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/linuxrc,
-  gen_cmdline.sh, gen_determineargs.sh, gen_initramfs.sh:
-  Add --real-root=<foo> parameter to specify a default for real_root= in the
-  initramfs for Gentoo bug #249783
-
-  12 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> -arch/alpha/busy-config,
-  -arch/arm/busy-config, -arch/ia64/busy-config, -arch/mips/busy-config,
-  -arch/parisc/busy-config, -arch/parisc64/busy-config,
-  -arch/ppc/busy-config, -arch/ppc64/busy-config, -arch/sparc/busy-config,
-  -arch/sparc64/busy-config, -arch/x86/busy-config,
-  -arch/x86_64/busy-config, gen_compile.sh:
-  Switch search order so arch-specific is first for busy-config Remove
-  unneeded identical busy-config files
-
-  12 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh,
-  genkernel.conf:
-  Remove BUSYBOX_CONFIG from genkernel.conf Add search order for
-  busy-config: user-specified, defaults/busy-config,
-  arch/%%ARCH%%/busy-config
-
-  12 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> -arch/x86/nb-busybox.cf,
-  -defaults/nb-busybox.cf:
-  Remove old nb-busybox.cf files that aren't used anymore
-
-  12 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> +arch/arm/busy-config,
-  +arch/arm/config.sh, +arch/arm/modules_load:
-  Add support for arm from armin76
-
-  12 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> arch/alpha/busy-config,
-  arch/ia64/busy-config, arch/mips/busy-config, arch/parisc/busy-config,
-  arch/parisc64/busy-config, arch/ppc/busy-config, arch/ppc64/busy-config,
-  arch/sparc/busy-config, arch/sparc64/busy-config, arch/um/busy-config,
-  arch/x86/busy-config, arch/x86_64/busy-config, defaults/busy-config:
-  Enable CONFIG_MAKEDEVS in busy-config for netboot
-
-  09 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  s/aux/luks/ for Gentoo bug #250330
-
-  07 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> arch/alpha/busy-config,
-  arch/ia64/busy-config, arch/mips/busy-config, arch/parisc/busy-config,
-  arch/parisc64/busy-config, arch/ppc/busy-config, arch/ppc64/busy-config,
-  arch/sparc/busy-config, arch/sparc64/busy-config, arch/x86/busy-config,
-  arch/x86_64/busy-config, defaults/busy-config, netboot/linuxrc.x:
-  Enable CONFIG_FEATURE_PREFER_APPLETS busybox option export PATH at top of
-  netboot linuxrc
-
-  07 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh,
-  netboot/linuxrc.x:
-  Move all netboot logic from catalyst into gk
-
-  07 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/udhcpc.scripts,
-  gen_cmdline.sh, gen_determineargs.sh, netboot/linuxrc.x:
-  Initial support for --netboot option integrate functionality from netboot
-  udhcpc.scripts into default one
-
-  04 Dec 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> genkernel:
-  Bumping version for release.
-
-  25 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> netboot/linuxrc.x:
-  Use symlinks for busybox utils Use full path to mount since it gets grumpy
-  without it in later bb versions for some reason
-
-  17 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Break apart cryptsetup stuff into separate append_luks() and make
-  append_auxillary() dependent on ${BUSYBOX} for Gentoo bug #247052
-
-  15 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/linuxrc:
-  Applied patch for UUID support for real_resume= from Gentoo bug #239687
-
-  15 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> gen_determineargs.sh:
-  Added modified version of patch from Gentoo bug #238707
-
-  14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Only append unionfs_fuse stuff if UNIONFS is set
-
-  14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/linuxrc,
-  gen_cmdline.sh, gen_determineargs.sh, genkernel:
-  Add --unionfs commandline option to enable building of unionfs-fuse Add
-  nounionfs boot option
-
-  14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts:
-  Add good_msg for creating the union mount
-
-  14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts:
-  Pipe stderr for unionfs mount call to /dev/null to supress getcwd message
-
-  14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts,
-  defaults/linuxrc:
-  Call switch_root with full path
-
-  14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/linuxrc:
-  Call switch_root with 'env -i' to clean out the kernel-defined key/value
-  pairs
-
-  14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/linuxrc:
-  Skip good_root check for /dev/nfs for Gentoo bug #246759
-
-  14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts:
-  Simplify implementation of parse_opt in linuxrc
-
-  14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts,
-  defaults/linuxrc:
-  Small cleanups in unionfs code
-
-  14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> arch/alpha/modules_load,
-  arch/ia64/modules_load, arch/mips/modules_load, arch/parisc/modules_load,
-  arch/parisc64/modules_load, arch/ppc/modules_load,
-  arch/ppc64/modules_load, arch/sparc/modules_load,
-  arch/sparc64/modules_load, arch/um/modules_load, arch/x86/modules_load,
-  arch/x86_64/modules_load, defaults/modules_load, gen_compile.sh,
-  gen_initramfs.sh, genkernel:
-  Add fuse to MODULES_FS Remove direct calls to compile_fuse() and
-  append_fuse() Disable bincache for fuse, since we don't need any files at
-  runtime from it
-
-  14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org>
-  +patches/busybox/1.7.4/1.7.4-mount-umount-i-option.diff,
-  -patches/busybox/1.7.4/1.7.4-simplify-path-debug.diff:
-  Replace debug patch with simple patch to add trivial support for -i option
-  to mount/umount
-
-  13 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts:
-  Add suid,dev to unionfs mount opts
-
-  13 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts:
-  Remove allow_root mount opt, since it conflicts with allow_other
-
-  13 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts,
-  patches/busybox/1.7.4/1.7.4-simplify-path-debug.diff:
-  Change typo in unionfs-fuse mount opt and add -i support to umount
-
-  13 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> arch/alpha/busy-config,
-  arch/ia64/busy-config, arch/mips/busy-config, arch/parisc/busy-config,
-  arch/parisc64/busy-config, arch/ppc/busy-config, arch/ppc64/busy-config,
-  arch/sparc/busy-config, arch/sparc64/busy-config, arch/um/busy-config,
-  arch/x86/busy-config, arch/x86_64/busy-config, defaults/busy-config:
-  Enable CONFIG_FEATURE_MTAB_SUPPORT option for busybox
-
-  13 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts,
-  +patches/busybox/1.7.4/1.7.4-mount-i-option.diff:
-  Add patch for busybox to add -i option to mount command
-
-  13 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh:
-  Compile unionfs-fuse statically
-
-  13 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/linuxrc,
-  gen_initramfs.sh:
-  Make sure that /sbin/unionfs is +x
-
-  13 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh,
-  gen_initramfs.sh:
-  Correct unionfs-fuse bincache path and clean up debugging code
-
-  13 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh:
-  Add -L line into LIB= in Makefile
-
-  13 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh:
-  Unpack fuse source and modify CFLAGS for unionfs-fuse
-
-  12 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh,
-  genkernel.conf:
-  Unpack unionfs-fuse with -j
-
-  12 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> gen_determineargs.sh:
-  Call arch_replace and cache_replace on fuse/unionfs-fuse vars
-
-  12 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> genkernel.conf:
-  Add fuse/unionfs-fuse blocks to genkernel.conf
-
-  12 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> genkernel:
-  Actually call compile_fuse() and compile_unionfs_fuse()
-
-  12 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts,
-  defaults/linuxrc:
-  Add back (modified) unionfs code in linuxrc
-
-  12 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Add append_fuse() and append_unionfs_fuse() functions
-
-  12 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh:
-  Add compile_fuse() and compile_unionfs_fuse()
-
-  04 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> arch/alpha/busy-config,
-  arch/ia64/busy-config, arch/mips/busy-config, arch/parisc/busy-config,
-  arch/parisc64/busy-config, arch/ppc/busy-config, arch/ppc64/busy-config,
-  arch/sparc/busy-config, arch/sparc64/busy-config, arch/um/busy-config,
-  arch/x86/busy-config, arch/x86_64/busy-config, defaults/busy-config:
-  Enabling CONFIG_WGET and CONFIG_FEATURE_TAR_BZIP2 for initial support of
-  Gentoo bug #211976
-
-  31 Oct 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> genkernel:
-  Tagging a 3.4.10.901 release, for testing. Adding periods to ChangeLog to
-  fix syntax hilighting.
-
-  15 Sep 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> AUTHORS:
-  Adding Andrew and Robin to AUTHORS.
-
-  15 Sep 2008; Andrew Gaffney <agaffney@gentoo.org> gen_cmdline.sh:
-  Add dummy handler for --config in gen_cmdline.sh for Gentoo bug #237541.
-
-  12 Sep 2008; Chris Gianelloni <wolf31o2@wolf31o2.org>
-  arch/alpha/modules_load, arch/ia64/modules_load, arch/mips/modules_load,
-  arch/parisc/modules_load, arch/parisc64/modules_load,
-  arch/ppc/modules_load, arch/ppc64/modules_load, arch/sparc/modules_load,
-  arch/sparc64/modules_load, arch/um/modules_load, arch/x86/modules_load,
-  arch/x86_64/modules_load, defaults/initrd.defaults, defaults/modules_load:
-  Removing scsi_wait_scan from PATA/SATA/SCSI and moving it to its own
-  module group. This allows the module to be loaded last, no matter what
-  combination of disks are in the system, allowing for firmware and such to
-  be loaded before genkernel continues, even when asynchronous SCSI scanning
-  is enabled in the kernel.
-
-  31 Aug 2008; Andrew Gaffney <agaffney@gentoo.org> arch/alpha/busy-config,
-  arch/ia64/busy-config, arch/mips/busy-config, arch/parisc/busy-config,
-  arch/parisc64/busy-config, arch/ppc/busy-config, arch/ppc64/busy-config,
-  arch/sparc/busy-config, arch/sparc64/busy-config, arch/um/busy-config,
-  arch/x86/busy-config, arch/x86_64/busy-config, defaults/busy-config,
-  genkernel.conf:
-  Enable CONFIG_ROUTE in busy-configs.
-
-  29 Aug 2008; Andrew Gaffney <agaffney@gentoo.org> arch/alpha/busy-config,
-  arch/ia64/busy-config, arch/mips/busy-config, arch/parisc/busy-config,
-  arch/parisc64/busy-config, arch/ppc/busy-config, arch/ppc64/busy-config,
-  arch/sparc/busy-config, arch/sparc64/busy-config, arch/um/busy-config,
-  arch/x86/busy-config, arch/x86_64/busy-config, defaults/busy-config,
-  defaults/udhcpc.scripts:
-  Enable CONFIG_HOSTNAME in all busy-configs and call 'hostname' with value
-  from DHCP.
-
-  28 Aug 2008; Andrew Gaffney <agaffney@gentoo.org> arch/x86/kernel-config,
-  arch/x86_64/kernel-config:
-  Disabled CONFIG_DEBUG_INFO in x86{,_64} kconfigs.
-
-  25 Aug 2008; Andrew Gaffney <agaffney@gentoo.org>
-  +patches/busybox/1.7.4/README:
-  Add README to busybox patches dir.
-
-  25 Aug 2008; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh:
-  Only apply files from patch dir ending in diff/patch.
-
-  24 Aug 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/linuxrc:
-  Fix CONSOLE= handling code for bug 232012.
-
-  21 Aug 2008; Andrew Gaffney <agaffney@gentoo.org> -gen_bootloader.sh,
-  -gen_bootloader_grub.awk:
-  Remove unneeded files for broken grub code.
-
-  21 Aug 2008; Andrew Gaffney <agaffney@gentoo.org> gen_cmdline.sh,
-  gen_determineargs.sh, genkernel, genkernel.conf:
-  Remove broken grub code.
-
-  07 Aug 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Only append splash portion to initramfs if SPLASH is set.
-
-  29 Jul 2008; Andrew Gaffney <agaffney@gentoo.org> genkernel.8:
-  Fix typo in man page, butt -> but.
-
-  29 Jul 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/udhcpc.scripts:
-  Add support to udhcpc.scripts for default route and DNS servers/domain.
-
-  29 Jul 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts:
-  Remove check for >=2.6 for mounting sysfs.
-
-  29 Jul 2008; Andrew Gaffney <agaffney@gentoo.org> genkernel:
-  Remove check for >=2.6 for 'make prepare'.
-
-  29 Jul 2008; Andrew Gaffney <agaffney@gentoo.org> gen_bootloader.sh,
-  gen_configkernel.sh, gen_moddeps.sh, genkernel.8:
-  Remove a few more 2.4 kernel support remnants.
-
-  29 Jul 2008; Andrew Gaffney <agaffney@gentoo.org> gen_arch.sh, genkernel:
-  Cleanup remaining references to ${ARCH}/ without arch/ prefix.
-
-  29 Jul 2008; Andrew Gaffney <agaffney@gentoo.org> +arch/um/busy-config,
-  +arch/um/config.sh, +arch/um/kernel-config, +arch/um/modules_load,
-  -um/busy-config, -um/config.sh, -um/kernel-config, -um/modules_load:
-  Move um/ underneath arch/ where it belongs.
-
-  28 Jul 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> gen_compile.sh:
-  Removed some unused dietlibc code.
-
-  28 Jul 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> TODO,
-  gen_bootloader.sh, gen_compile.sh, gen_configkernel.sh,
-  gen_determineargs.sh, genkernel:
-  Removed a large chunk of 2.4 kernel support. This will still require some
-  fairly extensive cleaning to completely remove, but I'd say that without a
-  shadow of a doubt, genkernel will not function on 2.4 kernels.
-
-  28 Jul 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> genkernel,
-  genkernel.8:
-  Added a couple more places where I needed to switch INITRD with RAMDISK.
-
-  28 Jul 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> TODO,
-  arch/alpha/modules_load, arch/ia64/modules_load, arch/mips/modules_load,
-  arch/parisc/modules_load, arch/parisc64/modules_load,
-  arch/ppc/modules_load, arch/ppc64/modules_load, arch/sparc/modules_load,
-  arch/sparc64/modules_load, arch/x86/modules_load,
-  arch/x86_64/modules_load, defaults/initrd.scripts, defaults/linuxrc,
-  defaults/modules_load, gen_bootloader.sh, gen_cmdline.sh,
-  gen_determineargs.sh, gen_initramfs.sh, -gen_initrd.sh, gen_moddeps.sh,
-  gen_package.sh, genkernel, genkernel.8:
-  Removed all references to an initrd and renamed most initr{d,amfs} stuff
-  to simply 'ramdisk' to simplify things for the future.
-
-  28 Jul 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> TODO,
-  +defaults/initrd.defaults, +defaults/initrd.scripts,
-  +defaults/keymaps.tar.gz, +defaults/linuxrc, +defaults/modprobe,
-  +defaults/udhcpc.scripts, gen_initramfs.sh, -generic/initrd.defaults,
-  -generic/initrd.scripts, -generic/keymaps.tar.gz, -generic/linuxrc,
-  -generic/modprobe, -generic/udhcpc.scripts:
-  Moving files from generic to defaults, since they are the defaults used
-  globally.
-
-  28 Jul 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> TODO, +modules/README:
-  Added the modules directory, which will be used to store the built-in
-  modules and also for external entities to add their own modules and hooks.
-
-  28 Jul 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> +defaults/busy-config,
-  +defaults/config.sh, +defaults/kernel-config, +defaults/modules_load,
-  +defaults/nb-busybox.cf:
-  Added a defaults directory to store default files for builds. These are
-  overridden by architecture or module specific parameters. This should end
-  up reducing the amount of architecture-specific files needed, especially
-  as most of them have files which are (nearly) identical.
-
-  28 Jul 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> -alpha/busy-config,
-  -alpha/config.sh, -alpha/kernel-config, -alpha/modules_load,
-  +arch/alpha/busy-config, +arch/alpha/config.sh, +arch/alpha/kernel-config,
-  +arch/alpha/modules_load, +arch/ia64/busy-config, +arch/ia64/config.sh,
-  +arch/ia64/kernel-config, +arch/mips/ip22r4k-2006_1.cf,
-  -mips/ip22r4k-2006_1.cf, +arch/ia64/modules_load,
-  +arch/mips/ip22r5k-2006_1.cf, +arch/mips/ip27r10k-2006_1.cf,
-  +arch/mips/ip28r10k-2006_1.cf, +arch/mips/ip30r10k-2006_1.cf,
-  +arch/mips/ip32r5k-2006_1.cf, +arch/mips/ip32rm5k-2006_1.cf,
-  -mips/ip22r5k-2006_1.cf, -mips/ip27r10k-2006_1.cf,
-  -mips/ip28r10k-2006_1.cf, -mips/ip30r10k-2006_1.cf,
-  -mips/ip32r5k-2006_1.cf, -mips/ip32rm5k-2006_1.cf, +arch/mips/busy-config,
-  +arch/mips/config.sh, +arch/mips/modules_load, +arch/mips/nb-busybox.cf,
-  +arch/parisc/busy-config, +arch/parisc/config.sh,
-  +arch/parisc/modules_load, +arch/parisc64/busy-config,
-  +arch/parisc64/config.sh, +arch/parisc64/modules_load,
-  +arch/ppc/busy-config, +arch/ppc/config.sh, +arch/ppc/kernel-config,
-  +arch/ppc/modules_load, +arch/ppc64/busy-config, +arch/ppc64/config.sh,
-  +arch/ppc64/kernel-2.6-pSeries, +arch/ppc64/kernel-2.6.g5,
-  +arch/ppc64/modules_load, +arch/sparc/busy-config, +arch/sparc/config.sh,
-  +arch/sparc/kernel-config, +arch/sparc/modules_load,
-  +arch/sparc64/busy-config, +arch/sparc64/config.sh,
-  +arch/sparc64/kernel-config, +arch/sparc64/modules_load,
-  +arch/x86/busy-config, +arch/x86/config.sh, +arch/x86/kernel-config,
-  +arch/x86/modules_load, +arch/x86/nb-busybox.cf, +arch/x86_64/busy-config,
-  +arch/x86_64/config.sh, +arch/x86_64/kernel-config,
-  +arch/x86_64/modules_load, gen_configkernel.sh, genkernel.conf,
-  -ia64/busy-config, -ia64/config.sh, -ia64/kernel-config,
-  -ia64/modules_load, -mips/busy-config, -mips/config.sh,
-  -mips/modules_load, -mips/nb-busybox.cf, -parisc/busy-config,
-  -parisc/config.sh, -parisc/modules_load, -parisc64/busy-config,
-  -parisc64/config.sh, -parisc64/modules_load, -ppc/busy-config,
-  -ppc/config.sh, -ppc/kernel-config, -ppc/modules_load, -ppc64/busy-config,
-  -ppc64/config.sh, -ppc64/kernel-2.6-pSeries, -ppc64/kernel-2.6.g5,
-  -ppc64/modules_load, -sparc/busy-config, -sparc/config.sh,
-  -sparc/kernel-config, -sparc/modules_load, -sparc64/busy-config,
-  -sparc64/config.sh, -sparc64/kernel-config, -sparc64/modules_load,
-  -x86/busy-config, -x86/config.sh, -x86/kernel-config, -x86/modules_load,
-  -x86/nb-busybox.cf, -x86_64/busy-config, -x86_64/config.sh,
-  -x86_64/kernel-config, -x86_64/modules_load:
-  Moved architecture folders under the arch subfolder.
-
-  05 Jun 2008; Chris Gianelloni <wolf31o2@gentoo.org> -um/kernel-config-2.6,
-  -ppc/kernel-config-2.6, -alpha/kernel-config-2.6, -ia64/kernel-config-2.6,
-  -x86/kernel-config-2.6, -x86_64/kernel-config-2.6, +um/kernel-config,
-  +ppc/kernel-config, +alpha/kernel-config, +ia64/kernel-config,
-  +x86/kernel-config, +x86_64/kernel-config, genkernel:
-  Rename kernel-config-2.6 to kernel-config, since we no longer support 2.4
-  kernels. This is genkernel 3.4.10 for release.
-
-  05 Jun 2008; Chris Gianelloni <wolf31o2@gentoo.org>
-  -ppc/2.6.3-benh2-G4-SMP.autoload, -ppc/2.6.3-benh2-G4.autoload,
-  -ppc/2.6.3-benh2-G5-SMP.autoload, ia64/kernel-config-2.6,
-  -ppc/2.6.3-benh2-G5.autoload, -ppc/G4, -ppc/G4-SMP,
-  +ppc/kernel-config-2.6, x86/kernel-config-2.6, -ppc/G5, -ppc/G5-SMP,
-  alpha/kernel-config-2.6, x86_64/kernel-config-2.6, TODO, -ppc/Pegasos,
-  sparc64/kernel-config:
-  Sync kernel configs from releng/trunk/releases/2008.0/kconfig and remove
-  some unused configs.
-
-  13 May 2008; Andrew Gaffney <agaffney@gentoo.org> generic/linuxrc:
-  Move setup_keymap call to before LUKS setup.
-
-  10 May 2008; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh:
-  Store pre-oldconfig busybox .config for use in bincache comparison.
-
-  09 May 2008; Andrew Gaffney <agaffney@gentoo.org> generic/initrd.defaults,
-  generic/initrd.scripts, generic/linuxrc:
-  Add nomodules kernel commandline parameter to disable loading of modules.
-
-  09 May 2008; Andrew Gaffney <agaffney@gentoo.org> gen_funcs.sh, genkernel,
-  genkernel.conf:
-  Move distfile cache to /var/cache/genkernel/src and add check to make sure
-  all distfiles are present.
-
-  09 May 2008; Chris Gianelloni <wolf31o2@gentoo.org> alpha/modules_load,
-  ia64/modules_load, mips/modules_load, parisc/modules_load,
-  parisc64/modules_load, ppc/modules_load, ppc64/modules_load,
-  sparc/modules_load, sparc64/modules_load, um/modules_load,
-  x86/modules_load, x86_64/modules_load:
-  Added a few SATA and PATA drivers to modules_load.
-
-  09 May 2008; Chris Gianelloni <wolf31o2@gentoo.org> alpha/modules_load,
-  ia64/modules_load, mips/modules_load, parisc/modules_load,
-  parisc64/modules_load, ppc/modules_load, ppc64/modules_load,
-  sparc/modules_load, sparc64/modules_load, um/modules_load,
-  x86/modules_load, x86_64/modules_load:
-  Updated the modules_load files.
-
-  25 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts, genkernel:
-  Enable keymap code when keymap is set on the kernel command line. This is
-  genkernel 3.4.10_pre10 for testing.
-
-  25 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  We need to unset keymap if it doesn't match to keep from hitting an infinite
-  loop.
-
-  24 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org> gen_determineargs.sh,
-  gen_funcs.sh, generic/initrd.scripts, generic/linuxrc:
-  Updated the keymap-handling code so it will be installed and displayed
-  without using --do-auto-keymap with a patch from Florian Schilhabel
-  <fernsehleo@gmx.net> for bug #215822. Also, added a keymap= command line
-  option to allow setting keymap from the bootloader, also from Florian.
-
-  22 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  Change from using a directory check to a file check. This should fix bug
-  #215822.
-
-  12 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.defaults:
-  Move removable storage like USB and firewire after traditional fixed storage
-  like PATA/SATA/SCSI for bug #217347.
-
-  10 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org> TODO, genkernel:
-  Updated TODO.  This is 3.4.10_pre9 for testing.
-
-  08 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.defaults, generic/initrd.scripts:
-  Added scsi to the default list of modules to load.
-
-  05 Apr 2008; Andrew Gaffney <agaffney@gentoo.org> gen_determineargs.sh:
-  Set CMD_KEYMAP to default to yes, so it's enabled unless specifically
-  disabled
-
-  04 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts, genkernel:
-  Added a patch to skip device nodes for devices if at least one partition
-  exists on the device. This aids in LiveUSB usage and is for bug #212794.
-  This is genkernel 3.4.10_pre8.
-
-  03 Apr 2008; Andrew Gaffney <agaffney@gentoo.org> generic/linuxrc:
-  Split up /dev node checks into console/null and tty1
-
-  02 Apr 2008; Andrew Gaffney <agaffney@gentoo.org> generic/linuxrc:
-  Remove initrd-specific code from linuxrc
-
-  30 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_arch.sh:
-  Uncomment ppc/ppc64->powerpc code in set_kernel_arch, since it appears to
-  actually be necessary as of 2.6.24-gentoo-r4
-
-  29 Mar 2008; Andrew Gaffney <agaffney@gentoo.org>
-  +patches/busybox/1.7.4/busybox-1.7.4-signal-hack.patch:
-  Add patch from ebuild in-tree to fix build issue with signals on hppa
-
-  14 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_cmdline.sh,
-  gen_determineargs.sh:
-  Get rid of --initramfs option as it doesn't do anything anymore
-
-  14 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> genkernel,
-  genkernel.conf, -pkg/alpha/README, -pkg/ia64/README, -pkg/mips/.keep,
-  -pkg/parisc/README, -pkg/parisc64/README, -pkg/ppc/README,
-  -pkg/ppc64/README, -pkg/sparc/README, -pkg/sparc64/README, -pkg/um/README,
-  -pkg/x86/README, -pkg/x86_64/README, -pkg/xen0/README, -pkg/xenU/README:
-  Removing pkg directory, since it is no longer necessary. From now on, we'll
-  just pull the tarballs from DISTDIR directly, and we've already moved our
-  caches to /var/tmp/genkernel, so there's nothing left to keep here. This is
-  genkernel 3.4.10_pre7 for testing.
-
-  14 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_package.sh:
-  Copy the original kconfig with a different name than the one used to build
-
-  14 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_package.sh:
-  Include original kconfig in kerncache If original kconfig exists in the
-  kerncache, use that for comparison to the current kconfig
-
-  14 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> genkernel:
-  Switch back to building kernel first
-  Optionally build the kernel a second time if we're integrating the initramfs
-
-  14 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> alpha/modules_load,
-  genkernel, ia64/modules_load, mips/modules_load, parisc/modules_load,
-  parisc64/modules_load, ppc/modules_load, ppc64/modules_load,
-  sparc/modules_load, sparc64/modules_load, um/modules_load,
-  x86/modules_load, x86_64/modules_load:
-  Clean up the modules_load files and add qla2xxx. This is genkernel
-  3.4.10_pre6 for testing.
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Stick CONFIG_INITRAMFS_ROOT_GID in the .config, too
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Remove existing CONFIG_INITRAMFS_SOURCE line and write new one as well as
-  CONFIG_INITRAMFS_ROOT_UID line
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Change sed delimeter
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  We should edit the copy of the kconfig instead of the source file
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh,
-  genkernel:
-  Instead of copying the initramfs into the kernel tree, we now sed the
-  kconfig to point CONFIG_INITRAMFS_SOURCE to the generated image
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> sparc64/modules_load:
-  Add scsi_wait_scan to sparc64's MODULES_SCSI
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> generic/linuxrc:
-  Add a check after mounting NEW_ROOT to see if /dev exists and /sbin/init is
-  executable before moving on
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Change the location we copy the intiramfs to for integrated initramfs
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> generic/linuxrc:
-  Revert last commit as it wasn't a problem
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> generic/linuxrc:
-  Remove -c "/dev/console" from switch_root command
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> generic/linuxrc:
-  Add missing $ to {NORMAL} for broken /dev message
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_package.sh:
-  Spacing cleanups in gen_package.sh
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_arch.sh, genkernel:
-  Remove unsetting of ARCH for callback and change set_kernel_arch debug to
-  use print_info
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_cmdline.sh:
-  It helps to actually add the handling for the --integrated-initramfs option
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_arch.sh:
-  Use echo instead of print
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_arch.sh:
-  Add debug code for set_kernel_arch
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> genkernel:
-  Add debugging code to show ARCH when running callback
-  Unset ARCH when running callback and restore afterwards
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> genkernel:
-  Move set_kernel_arch() call to after determine_real_args() so that get_KV()
-  has populated the vars we need
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_arch.sh:
-  Change powerpc switch kernel version to 2.6.16 for if we ever uncomment it
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_arch.sh,
-  gen_compile.sh, genkernel:
-  Add set_kernel_arch(), which maps the genkernel arch to the arch that the
-  kernel expects based on the version of the kernel
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_cmdline.sh,
-  gen_compile.sh, gen_determineargs.sh, gen_initramfs.sh, gen_initrd.sh,
-  gen_package.sh, genkernel:
-  Get rid of the ENABLE_PEGASOS_HACKS hacks Add INTEGRATED_INITRAMFS option to
-  optionally insert the generated initramfs directly into the kernel image
-  Change default build order to build the kernel last to facilitate the
-  INTEGRATED_INITRAMFS option Add GENZIMAGE option and change various checks
-  from ENABLE_PEGASOS_HACKS to GENZIMAGE
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Argh...Changing the right line helps
-
-  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Change into initramfs-firmware-temp/ instead of
-  initramfs-firmware-temp/lib/firmware/ before doing cpio
-
-  12 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> generic/linuxrc,
-  genkernel:
-  Added a small debug statement to generic/linuxrc so we know when we're
-  hitting the initrd code path. This is genkernel 3.4.10_pre5 for testing.
-
-  12 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Change to new temp directory so the firmware gets copied to the right place
-
-  12 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Copy firmware file with -L so we get the file instead of the symlink
-
-  12 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Fix another quoting malfunction
-
-  12 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> alpha/busy-config,
-  ia64/busy-config, mips/busy-config, parisc/busy-config,
-  parisc64/busy-config, ppc/busy-config, ppc64/busy-config,
-  sparc/busy-config, sparc64/busy-config, x86/busy-config,
-  x86_64/busy-config:
-  Explicitly enable MDADM and MDSTART in busy-config
-
-  12 Mar 2008; Andrew Gaffney <agaffney@gentoo.org>
-  patches/busybox/1.7.4/1.7.4-static-error.diff:
-  Update busybox static-error patch to actually work
-
-  12 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> genkernel.conf:
-  Change BUSYBOX_VER to VERSION_BUSYBOX for genkernel-9999 ebuild.
-
-  11 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh:
-  Remove the quotes when trying to expand a glob
-
-  11 Mar 2008; Andrew Gaffney <agaffney@gentoo.org>
-  patches/busybox/1.7.4/1.7.4-mdadm.diff,
-  patches/busybox/1.7.4/1.7.4-mdstart.diff:
-  Update mdadm and mdstart patches
-
-  11 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh:
-  It helps if we assign the correct value to version
-  Send output of patch command to /dev/null
-  Show a message saying we're patching if there are patches for the util
-
-  11 Mar 2008; Andrew Gaffney <agaffney@gentoo.org>
-  +patches/busybox/1.7.4/1.7.4-static-error.diff:
-  Add busybox patch to remove error about compiling statically
-
-  11 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> alpha/busy-config,
-  gen_compile.sh, ia64/busy-config, mips/busy-config, parisc/busy-config,
-  parisc64/busy-config, ppc/busy-config, ppc64/busy-config,
-  sparc/busy-config, sparc64/busy-config, x86/busy-config,
-  x86_64/busy-config:
-  Update busy-config files for the various arches for busybox 1.7.4
-
-  11 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh,
-  genkernel.conf, +patches/busybox/1.7.4/1.7.4-ash-timeout.diff,
-  +patches/busybox/1.7.4/1.7.4-mdadm.diff,
-  +patches/busybox/1.7.4/1.7.4-mdstart.diff,
-  +patches/busybox/1.7.4/1.7.4-openvt.diff:
-  Add apply_patches() function to automagically apply patches for a given util
-  Add updated busybox patches for 1.7.4 from robbat2
-  Change BUSYBOX_VER to 1.7.4
-
-  11 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  Rearrange checks so the return value is read correctly.
-
-  10 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> alpha/busy-config,
-  gen_initrd.sh, generic/initrd.scripts, generic/linuxrc, ia64/busy-config,
-  mips/busy-config, parisc/busy-config, parisc64/busy-config,
-  ppc/busy-config, ppc64/busy-config, sparc/busy-config,
-  sparc64/busy-config, um/busy-config, x86/busy-config, x86_64/busy-config:
-  Enable CONFIG_HEXDUMP globally for busybox
-  Add getdvhoff replacement function from vapier
-  Remove copying of getdvhoff from system
-
-  10 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_cmdline.sh,
-  gen_determineargs.sh, gen_initramfs.sh, genkernel.conf:
-  Add support for --firmware-files option to make robbat2 happy
-
-  10 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_cmdline.sh,
-  gen_determineargs.sh, gen_initramfs.sh, genkernel.conf:
-  Add support for --firmware and --firmware-dir options to include firmware in
-  the initramfs
-
-  09 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> generic/linuxrc:
-  Apply patch from Vince C <v_cadet@yahoo.fr> to mount sysfs prior to loading
-  modules, so that the mdev firmware loading can actually work
-
-  04 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> gen_initramfs.sh:
-  If we have a raid456.ko module, we need to create a raid45.ko symlink since
-  dmraid can be rather stupid. This should resolve bug #195804.
-
-  04 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> sparc64/kernel-config,
-  alpha/kernel-config-2.6, ia64/kernel-config-2.6, x86/kernel-config-2.6,
-  x86_64/kernel-config-2.6:
-  Updated the kernel configs for arches which have given us their 2008.0
-  configs. This is 3.4.10_pre4 for testing.
-
-  29 Feb 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Redirect which output to /dev/null and put quotes around var in test
-
-  29 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> alpha/modules_load,
-  ia64/modules_load, ppc/modules_load, ppc64/modules_load, um/modules_load,
-  x86_64/modules_load:
-  Changed MDRAID to MDADM for bug #211316.
-
-  28 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
-  gen_initramfs.sh, gen_initrd.sh, generic/initrd.scripts:
-  Added a --no-keymap option for bug #210886.
-
-  28 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> gen_initramfs.sh,
-  generic/linuxrc:
-  Use which to determine the location of splash_geninitramfs, rather than
-  having an endless number of conditional checks for the location. This fixes
-  bug #211521. Thanks to Uriy Zhuravlev <stalkerg@gmail.com> for finding the
-  problem and suggesting a solution.
-
-  20 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
-  -xenU/kernel-config-2.6, -xen0/kernel-config-2.6, genkernel,
-  -xen0/busy-config, -xen0/config.sh, -xen0/modules_load, -xenU/busy-config,
-  -xenU/config.sh, -xenU/modules_load:
-  Removing the xen0 and xenU arches, since they didn't work, anyway. This is
-  genkernel 3.4.10_pre3 for testing.
-
-  20 Feb 2008; Andrew Gaffney <agaffney@gentoo.org> gen_package.sh:
-  Add missing space before closing ]
-
-  19 Feb 2008; Andrew Gaffney <agaffney@gentoo.org> generic/initrd.scripts:
-  Apply patch from bug 210457 to fix variable substitution. Thanks to Paul
-  Taylor <birder@ozemail.com.au> for reporting
-
-  19 Feb 2008; Andrew Gaffney <agaffney@gentoo.org> generic/linuxrc:
-  Remove quotes from around ${ROOT_TREES} so that the dirs are parsed
-  separately by bash/cp
-
-  14 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> gen_compile.sh,
-  gen_determineargs.sh, gen_funcs.sh, gen_initramfs.sh, gen_initrd.sh,
-  generic/initrd.defaults, generic/initrd.scripts, generic/linuxrc,
-  genkernel, genkernel.8, genkernel.conf:
-  Removing DEVFS support from genkernel since we don't support 2.4 kernels
-  anymore. This is 3.4.10_pre2.
-
-  14 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  Added a line to make sure we remove image.squashfs as well as the other loop
-  names used by catalyst.
-
-  14 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> gen_compile.sh:
-  Added another patch from Javier Miqueleiz <javier@miqueleiz.com> in bug
-  #198892 for mdadm 1.1 and 1.2 metadata support.
-
-  14 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.defaults, generic/initrd.scripts, generic/linuxrc:
-  Switch to detection for LOOP and LOOPTYPE when they are not set.
-
-  14 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts, generic/linuxrc:
-  Performed some minor cleanup.
-
-  14 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> generic/linuxrc:
-  Move "busybox --install -s" to outside the /init check. Fix problems with
-  running mknod on a non-CD root filesystem, which will be read-only, for bug
-  #208266.
-
-  14 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> -um/kernel-config-2.4,
-  -alpha/kernel-config-2.4, -parisc64/kernel-config-2.4,
-  -xenU/kernel-config-2.4, -parisc/kernel-config-2.4,
-  -x86/kernel-config-2.4, -xen0/kernel-config-2.4:
-  Removing 2.4 kernel configs, since we aren't supporting 2.4 from here on out.
-
-  14 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> genkernel:
-  We only need to make sure that we have /sbin and /usr/sbin in our PATH for
-  bug #97378, not reset it. Thanks to Justin Bronder <jsbronder@gentoo.org> in
-  bug #209182 for pointing it out. This is genkernel 3.4.10_pre1 for testing.
-
-  14 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
-  gen_compile.sh, gen_determineargs.sh, gen_initramfs.sh, gen_initrd.sh,
-  generic/initrd.scripts, generic/linuxrc, genkernel, genkernel.conf,
-  mips/config.sh:
-  This is the long-awaited unionfs code cleanup. All of the unionfs code in
-  genkernel has been removed.
-
-  07 Feb 2008; Andrew Gaffney <agaffney@gentoo.org> gen_determineargs.sh:
-  Fix two calls to set_config_with_override on CMD_KERNCACHE and some
-  indentation weirdness
-
-  04 Feb 2008; Andrew Gaffney <agaffney@gentoo.org> generic/initrd.scripts:
-  Change &>/dev/null to >/dev/null 2>&1 because busybox ash sucks
-
-  04 Feb 2008; Andrew Gaffney <agaffney@gentoo.org> generic/initrd.scripts,
-  generic/linuxrc:
-  Switch to double quotes where we're interpolating variables, because I suck
-
-  03 Feb 2008; Andrew Gaffney <agaffney@gentoo.org> sparc64/modules_load:
-  Add qla2xxx to sparc64's MODULES_SCSI
-
-  03 Feb 2008; Andrew Gaffney <agaffney@gentoo.org> gen_cmdline.sh,
-  gen_determineargs.sh, gen_moddeps.sh:
-  Add --all-initrd-modules option to copy all kernel modules into
-  initrd/ramfs. This is useful for netboot images
-
-  03 Feb 2008; Andrew Gaffney <agaffney@gentoo.org> generic/initrd.scripts,
-  generic/linuxrc:
-  Add setup_hotplug() function that runs before the modules are loaded to
-  setup mdev as the hotplug event handler. Add $KV to /lib/modules anywhere it
-  occurs to allow for an initramfs with multiple sets of modules
-
-  03 Feb 2008; Andrew Gaffney <agaffney@gentoo.org> gen_configkernel.sh,
-  genkernel.conf:
-  Clean up OLDCONFIG logic and default to OLDCONFIG=yes. This is for bug 207895
-
-  02 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> generic/linuxrc:
-  Moving the code to start resume operations so it doesn't run when booting
-  from CD. We also don't execute the code if there's no real_resume set on the
-  command line, since it will fail, anyway, without it.
-
-  02 Feb 2008; Andrew Gaffney <agaffney@gentoo.org> alpha/modules_load,
-  ia64/modules_load, ppc/modules_load, ppc64/modules_load, um/modules_load,
-  x86/modules_load, x86_64/modules_load, xen0/modules_load,
-  xenU/modules_load:
-  add megaraid module to MODULES_SCSI for bug 206039
-
-  02 Feb 2008; Andrew Gaffney <agaffney@gentoo.org> generic/modprobe:
-  specify the kernel version when looking for a module for bug 208593
-
-  02 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.defaults, generic/initrd.scripts:
-  Removed runUdev, since we no longer use it.
-
-  11 Jan 2008; Chris Gianelloni <wolf31o2@gentoo.org> gen_initramfs.sh,
-  gen_initrd.sh, genkernel:
-  Fixing a problem where we were copying the busybox binary cache into the
-  busybox temporary directory. I am assuming that this was a result of all of
-  the changes we've been doing, and it simply just got everlooked. Thanks to
-  Marek Szuba <cyberman@if.pw.edu.pl> for pointing it out in bug #204087. This
-  is genkernel 3.4.9 FINAL. Enjoy.
-
-  28 Dec 2007; Andrew Gaffney <agaffney@gentoo.org> generic/initrd.defaults,
-  generic/initrd.scripts, generic/linuxrc:
-  Don't scan a bunch of extra devices when CDROOT_DEV is defined.
-
-  28 Dec 2007; Andrew Gaffney <agaffney@gentoo.org> generic/initrd.scripts,
-  generic/linuxrc:
-  Add new cdroot_type=foo kernel commandline parameter to override -t iso9660
-  for bug #182818.
-
-  28 Dec 2007; Andrew Gaffney <agaffney@gentoo.org> generic/initrd.scripts:
-  Put -t auto back to -t iso9660 for mounting a cdrom. This is for bug #162962.
-
-  27 Dec 2007; Andrew Gaffney <agaffney@gentoo.org> genkernel.8:
-  Fix description of --kernel-config for bug #194752.
-
-  27 Dec 2007; Chris Gianelloni <wolf31o2@gentoo.org> genkernel:
-  This is 3.4.9_pre12 for testing.
-
-  23 Dec 2007; Andrew Gaffney <agaffney@gentoo.org> generic/initrd.scripts,
-  generic/linuxrc, genkernel.8:
-  Apply LUKS key patch from bug #162962 from Nelson Batalha
-  <nelson_batalha@hotmail.com>
-
-  14 Dec 2007; Andrew Gaffney <agaffney@gentoo.org> generic/linuxrc:
-  Fix text bolding on serial console for bug #202266 thanks to Michael Hordijk
-  <hoffbrinkle@hotmail.com>.
-
-  13 Dec 2007; Andrew Gaffney <agaffney@gentoo.org> gen_determineargs.sh:
-  Apply a patch from John R. Graham <john_r_graham@mindspring.com> for bug
-  #201482.
-
-  06 Dec 2007; Andrew Gaffney <agaffney@gentoo.org> gen_cmdline.sh:
-  Do s/KERNELDIR/KERNEL_DIR/ for bug #201159.
-
-  06 Dec 2007; Andrew Gaffney <agaffney@gentoo.org> generic/initrd.scripts:
-  Fix typo for bug #201442. Thanks to Michael Hordijk <hoffbrinkle@hotmail.com>.
-
-  03 Dec 2007; Chris Gianelloni <wolf31o2@gentoo.org> genkernel:
-  This is genkernel 3.4.9_pre11 for testing.
-
-  29 Nov 2007; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh,
-  gen_initrd.sh:
-  Do s/elsif/elif/ because I use too many languages and random bash tutorials
-  online can't be trusted.
-
-  28 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_compile.sh,
-  genkernel:
-  Added a patch line for busybox for bug #198892. This is 3.4.9_pre10 for
-  testing.
-
-  24 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_funcs.sh:
-  Added a small patch from John R. Graham <john_r_graham@mindspring.com> to
-  fix arguments with spaces for bug #200161.
-
-  24 Nov 2007; Andrew Gaffney <agaffney@gentoo.org> generic/linuxrc:
-  Use 'read' to get a line at a time to account for directories with spaces in
-  the name. This fixes bug 199701.
-
-  23 Nov 2007; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh,
-  gen_initrd.sh:
-  Look for cryptsetup in /bin and /sbin.
-
-  17 Nov 2007; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh:
-  Force dmraid to be built with -j1 for bug #188273.
-
-  16 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> genkernel.conf:
-  My original sed of LVM2->LVM caught a few too many things. Thanks to Robin
-  Johnson <robbat2@gentoo.org> for pointing them out and providing the fix in
-  bug #198546.
-
-  13 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_determineargs.sh,
-  genkernel.conf, genkernel:
-  Added config defaulting for --mdadm for bug #198694. Thanks to John R.
-  Graham <john_r_graham@mindspring.com> for providing the patch. This is
-  3.4.9_pre9 for testing.
-
-  08 Nov 2007; Andrew Gaffney <agaffney@gentoo.org> gen_arch.sh:
-  Revert patch from bug #190327 as it breaks well more than it fixed.
-
-  07 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> alpha/config.sh,
-  gen_cmdline.sh, gen_determineargs.sh, gen_funcs.sh, gen_initramfs.sh,
-  gen_initrd.sh, gen_package.sh, genkernel, genkernel.conf, ia64/config.sh,
-  mips/config.sh, parisc/config.sh, parisc64/config.sh, ppc/config.sh,
-  ppc64/config.sh, sparc/config.sh, sparc64/config.sh, um/config.sh,
-  x86/config.sh, x86_64/config.sh, xen0/config.sh, xenU/config.sh:
-  Added a nice patch from John R. Graham <john_r_graham@mindspring.com> to
-  allow all command line options to be configurable from within the
-  genkernel.conf file. This is for bug #182616. This is genkernel 3.4.9_pre8
-  for testing.
-
-  07 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  Fixed the noload module code. Thanks to Mijail Fedorovich
-  <mfedorovich@gmail.com> for pointing it out in bug #198187.
-
-  07 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts, generic/linuxrc:
-  Added an update patch from Alon Bar-Lev <alonbl@gentoo.org> in bug #197244
-  to clean up the suspend2 code and rename the functions to tuxonice to match
-  the upstream rename.
-
-  07 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
-  gen_compile.sh, gen_initramfs.sh, gen_initrd.sh, gen_package.sh,
-  genkernel:
-  Added a patch from Joshua Kinard <kumba@gentoo.org> to clean up the Pegasos
-  hacks in genkernel. This is from bug #193826. This is genkernel 3.4.9_pre7
-  for testing.
-
-  07 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_arch.sh:
-  Added a simple patch from Andrew Gaffney <agaffney@gentoo.org> to ensure
-  that we export ARCH before running menuconfig. This is from bug #190327.
-
-  07 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_compile.sh,
-  generic/initrd.scripts, generic/linuxrc:
-  Make sure we still allow dolvm2/doevms2 on the kernel command line and give
-  a warning. I've also added a 2 second delay between vgscan and vgchange.
-  Thanks to Robin H. Johnson <robbat2@gentoo.org> for suggesting the changes
-  and testing.
-
-  02 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> +generic/modprobe,
-  gen_initramfs.sh, gen_initrd.sh, genkernel:
-  Reverting the removal of generic/modprobe for bug #197730. This is genkernel
-  3.4.9_pre6 for testing.
-
-  01 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_compile.sh,
-  gen_initramfs.sh, genkernel:
-  Fixed device-mapper/man removal for bug #196087, fixed mdadm.conf copying,
-  and fixed syntax error for bug #197582. This is genkernel-3.4.9_pre5.
-
-  30 Oct 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  -pkg/suspend-0.5-Makefile.patch, -pkg/busybox-1.1.3+gentoo.tar.bz2,
-  -pkg/devfsd-1.3.25-dietlibc.patch,
-  -pkg/devfsd-1.3.25-dietlibc-kernel25.tar.bz2, alpha/busy-config,
-  gen_cmdline.sh, gen_compile.sh, gen_determineargs.sh, gen_initramfs.sh,
-  generic/initrd.defaults, generic/initrd.scripts, generic/linuxrc,
-  genkernel, ia64/busy-config, mips/busy-config, parisc/busy-config,
-  parisc64/busy-config, ppc/busy-config, ppc64/busy-config,
-  sparc/busy-config, sparc64/busy-config, um/busy-config, x86/busy-config,
-  x86/modules_load, x86_64/busy-config, xen0/busy-config, xenU/busy-config:
-  Added a patch from Alan Hourihane <alanh@fairlite.demon.co.uk> for mdadm
-  support in busybox from bug #172128. This is genkernel 3.4.9_pre4 for
-  testing.
-
-  30 Oct 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_initramfs.sh,
-  generic/initrd.scripts, generic/linuxrc:
-  Made a few minor cleanups here and there.
-
-  12 Oct 2007; Andrew Gaffney <agaffney@gentoo.org> genkernel.8:
-  Update description for --initramfs-overlay in man page to match --help.
-
-  05 Oct 2007; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh,
-  gen_initrd.sh:
-  Remove generic/modprobe and all supporting code, since busybox has it now.
-
-  04 Oct 2007; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  We need to cd out of directory to be deleted for bug #194695. Thanks to Asmund
-  Grammeltvedt <asmundg@big-oil.org> for pointing this out.
-
-  18 Sep 2007; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh,
-  gen_initrd.sh:
-  We don't ever want devfs in an initramfs, so check KERN_24 instead of DEVFS
-  for 2.4 initrd generation
-
-  17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
-  gen_compile.sh, gen_determineargs.sh, gen_funcs.sh, gen_initrd.sh,
-  genkernel, genkernel.8, genkernel.conf:
-  Rename DEBUGLEVEL/DEBUGFILE to LOGLEVEL/LOGFILE to help reduce confusion.
-
-  17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
-  gen_configkernel.sh, genkernel:
-  Some more general cleanup and adding support for using a config file other
-  than /etc/genkernel.conf to add flexibility.
-
-  17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  -pkg/module-init-tools-0.9.15-pre4.tar.bz2,
-  -pkg/klibc-1.1.16-sparc2.patch, -pkg/klibc-1.2.1-nostdinc-flags.patch,
-  -pkg/modutils-2.4.26.tar.bz2:
-  Removing klibc/modutils/module-init-tools files, since we don't need any of
-  them, anymore.
-
-  17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> genkernel:
-  It helps if I use 'g' when doing a sed.
-
-  17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_bootloader.sh,
-  genkernel, genkernel.conf:
-  Removed the use of GK_BIN variable, since it isn't necessary.
-
-  17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> TODO, genkernel.conf:
-  Updated TODO and cleaning up genkernel.conf a bit.
-
-  17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> generic/linuxrc,
-  netboot/misc/bin/net-setup, netboot/misc/etc/fstab:
-  Remove some unnecessary copyright dates from a few files so we don't keep
-  forgetting to update them when we modify the files.
-
-  17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
-  gen_configkernel.sh, gen_determineargs.sh, gen_initramfs.sh, genkernel,
-  genkernel.8, mips/config.sh:
-  Renamed gensplash to splash and marked gensplash as deprecated. This is
-  3.4.9_pre3 for testing.
-
-  17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> TODO,
-  alpha/modules_load, gen_cmdline.sh, gen_compile.sh, gen_configkernel.sh,
-  gen_determineargs.sh, gen_initramfs.sh, gen_initrd.sh,
-  generic/initrd.defaults, generic/initrd.scripts, generic/linuxrc,
-  genkernel, genkernel.8, genkernel.conf, ia64/modules_load, mips/config.sh,
-  ppc/modules_load, ppc64/modules_load, um/modules_load, x86/modules_load,
-  x86_64/modules_load, xen0/modules_load, xenU/modules_load:
-  Changed all instances of EVMS2/LVM2 to EVMS/LVM, respectively. This will
-  keep everything simplified if a newer EVMS/LVM version set appears.
-
-  17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> README,
-  alpha/config.sh, gen_bootloader.sh, gen_cmdline.sh, gen_configkernel.sh,
-  gen_determineargs.sh, gen_initrd.sh, gen_package.sh, genkernel,
-  genkernel.8, genkernel.conf, ia64/config.sh, mips/config.sh,
-  parisc/config.sh, parisc64/config.sh, ppc/config.sh, ppc64/config.sh,
-  sparc/config.sh, sparc64/config.sh, um/config.sh, x86/config.sh,
-  x86_64/config.sh, xen0/config.sh, xenU/config.sh:
-  Removing bootsplash support since it hasn't been in a kernel we've supported
-  for years now, causes confusion amongst users, and really wasn't being used
-  and caused issues with 2.6/initrd creation in some corner cases.
-
-  17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  -pkg/genkernel-svn-suspend.patch:
-  Removing the reversal patch for the suspend removal, since it will no longer
-  apply.
-
-  17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_bootloader.sh,
-  gen_cmdline.sh, gen_compile.sh, gen_determineargs.sh, gen_initramfs.sh,
-  gen_initrd.sh, generic/linuxrc, genkernel, mips/config.sh:
-  Performed some general cleanup on a few files and removed devfs/udev
-  selection code, since we force devfs on 2.4 and mdev on 2.6 kernels.
-
-  30 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
-  gen_compile.sh, gen_configkernel.sh, gen_determineargs.sh,
-  gen_initramfs.sh, generic/initrd.scripts, generic/linuxrc, genkernel,
-  genkernel.conf, +pkg/genkernel-svn-suspend.patch:
-  Removing the suspend support that was added for bug #156445 until suspend is
-  added to the tree and we can determine the proper way to support it. For
-  more information, see bug #156431. This is genkernel 3.4.9_pre2 for testing.
-
-  22 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org> x86/kernel-config-2.6,
-  x86_64/kernel-config-2.6, genkernel:
-  Removed CONFIG_PHYSICAL_START from the x86/amd64 kernel configs for bug
-  #186378. This is genkernel 3.4.9_pre1 for testing.
-
-  22 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org> genkernel:
-  Changing to use console=tty1 instead of CONSOLE=/dev/tty1 with a patch from
-  Matthias Schwarzott <zzam@gentoo.org> for bug #188954.
-
-  22 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org> alpha/modules_load,
-  ia64/modules_load, ppc/modules_load, ppc64/modules_load, um/modules_load,
-  x86/modules_load, x86_64/modules_load, xen0/modules_load,
-  xenU/modules_load:
-  Added arcmsr to MODULES_SCSI for bug #185827.
-
-  22 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  +pkg/suspend-0.5-Makefile.patch:
-  Added suspend-0.5-Makefile.patch to pkg directory for suspend capabilities,
-  bringing it into the repository, from the tree.
-
-  22 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org> genkernel.8:
-  Added a small patch from Tais M. Hansen <tais.hansen@osd.dk> to add doscsi
-  to the genkernel man page for bug #183406.
-
-  21 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_funcs.sh,
-  genkernel.8:
-  Added another patch from John R. Graham <john_r_graham@mindspring.com> for
-  bug #180161.
-
-  26 Jul 2007; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
-  Clean up a cosmetic error introduced by the symlink patch:  
-  ${GK_SHARE}/gen_funcs.sh: line 431: popd:
-  /var/tmp/genkernel/3996.6301.23048.13838/initramfs-modules-${KV}-temp: No
-  such file or directory
-
-  26 Jul 2007; Robin H. Johnson <robbat2@gentoo.org> generic/initrd.scripts,
-  generic/linuxrc:
-  The previous patch from bug #174294 still contained some bugs in the linuxrc
-  and scripts, that caused a failure during boot. Clean them up with one more
-  patch from Nelson Batalha <nelson_batalha@hotmail.com>, again on bug #174294.
-
-  26 Jul 2007; Andrew Gaffney <agaffney@gentoo.org> netboot/linuxrc.x:
-  enhanced netboot linuxrc from gustavoz
-
-  26 Jul 2007; Andrew Gaffney <agaffney@gentoo.org> alpha/busy-config,
-  gen_compile.sh, gen_determineargs.sh, gen_initramfs.sh, gen_initrd.sh,
-  genkernel, genkernel.conf, ia64/busy-config, mips/busy-config,
-  parisc/busy-config, parisc64/busy-config, ppc/busy-config,
-  ppc64/busy-config, sparc/busy-config, sparc64/busy-config,
-  x86/busy-config, x86_64/busy-config, xen0/busy-config, xenU/busy-config:
-  enable CONFIG_INSMOD in all arch busy-config files
-  disable building of static insmod and remove all code related to it
-
-  26 Jul 2007; Andrew Gaffney <agaffney@gentoo.org> gen_package.sh:
-  Patch to compare new config instead of the one left laying around in the
-  kerncache dir. Thanks to Pat Double <gentoo@patdouble.com> in bug #179739
-
-  26 Jul 2007; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh,
-  gen_initramfs.sh, gen_initrd.sh, genkernel.conf:
-  Patch to actually use busybox bincache. Thanks to Pat Double
-  <gentoo@patdouble.com> on bug #180211
-
-  21 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_initrd.sh:
-  Fixed lvm/evms code for initrd generation. Thanks to Vinny
-  <vfuria@gmail.com> on bug #179480 for pointing it out.
-
-  21 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org> alpha/modules_load,
-  generic/initrd.defaults, ia64/modules_load, ppc/modules_load,
-  ppc64/modules_load, um/modules_load, x86/modules_load,
-  x86_64/modules_load, xen0/modules_load, xenU/modules_load:
-  Added new PATA support from Paul Hewlett <paul@gccs.co.za> from bug #180111
-  and also created a separate MDRAID module group.
-
-  21 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts, generic/linuxrc:
-  Added a patch from Nelson Batalha <nelson_batalha@hotmail.com> from bug
-  #174294 to enable the use of encryption on a CD and the location of a key.
-
-  21 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_determineargs.sh,
-  gen_funcs.sh, genkernel, genkernel.8, genkernel.conf:
-  Added two patches from John R. Graham <john_r_graham@mindspring.com> from
-  bug #180161. This should fix bug #180161, bug #144703, and bug #150697.
-
-  21 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org> x86/kernel-config-2.6:
-  Added USB Printer support for bug #176543.
-
-  21 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  Change the check for /livecd when booting a CD to check for a file called
-  livecd, rather than just the existence of /livecd, which should keep it from
-  finding disks with a /livecd directory.
-
-  21 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_package.sh:
-  Added a patch from Andrew Gaffney <agaffney@gentoo.org> from bug #174188 to
-  fix a problem with the System.map file copying that was previously
-  introduced.
-
-  21 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org> genkernel.8:
-  Added patch from Nelson Batalha <nelson_batalha@hotmail.com> from bug
-  #172766 to add documentation for genkernel's LUKS features.
-
-  21 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  Added patch from Nicolas Schlumberger <n.schlumberger@bluewin.ch> to create
-  md devices with LUKS for bug #170753.
-
-  21 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  Reverting patch that was originally added due to bug #160333 due to the
-  problems it caused on the 2007.0 release.
-
-  12 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_package.sh,
-  genkernel:
-  Added a patch from Andrew Gaffney <agaffney@gentoo.org> to add System.map to
-  the tarball for the minimal kernel package for bug #174188. This is also the
-  3.4.8 release.
-
-  12 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org> alpha/modules_load,
-  ia64/modules_load, um/modules_load, x86/modules_load, x86_64/modules_load,
-  xen0/modules_load, xenU/modules_load:
-  Added mptsas to SCSI for bug #174130 and removing raid0/raid1/raid10/raid456
-  from DMRAID.
-
-  12 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_initramfs.sh,
-  gen_initrd.sh:
-  Commented out the checks on the sanity of lvm.conf since they were not quite
-  working right. This should fix bug #173622.
-
-  09 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org> +x86/nb-busybox.cf:
-  Added nb-busybox.cf to x86 on the request of Andrew Gaffney
-  <agaffney@gentoo.org>.
-
-  05 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_initramfs.sh,
-  gen_initrd.sh, genkernel:
-  Added a change to force objdump output to be English for bug #173412 and
-  rolling 3.4.7 final for the release.
-
-  05 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  Added a patch from Daniel Drake <dsd@gentoo.org> to fix splash problems for
-  bug #172562.
-
-  03 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org> genkernel.conf:
-  Some minor config file cleanup.
-
-  03 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
-  genkernel.8:
-  Added a second patch from John R. Graham <john_r_graham@mindspring.com> from
-  bug #169383.
-
-  27 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> alpha/modules_load,
-  ia64/modules_load, x86/modules_load, x86_64/modules_load,
-  xen0/modules_load, xenU/modules_load:
-  Added raid456 to dmraid target for bug #172128.
-
-  26 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_initramfs.sh,
-  gen_initrd.sh:
-  Changed LVM configuration detection to not error.
-
-  26 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> x86/kernel-config-2.6:
-  Added joystick support to the default configuration for bug #171911.
-
-  14 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_initramfs.sh,
-  gen_initrd.sh, genkernel:
-  Before we copy lvm.conf, we run it through 'lvm dumpconfig' to make sure the
-  config is valid for bug #156009. This is 3.4.7_pre5.
-
-  14 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> genkernel.conf:
-  Change the default CACHE_DIR from /usr/share/genkernel/pkg/%%ARCH%% to
-  /var/cache/genkernel/%%ARCH%% for bug #148253.
-
-  13 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> alpha/modules_load,
-  ia64/modules_load, um/modules_load, x86/modules_load, x86_64/modules_load,
-  xen0/modules_load, xenU/modules_load:
-  Added libata to the MODULES_SATA list. This might be why SATA CD drives
-  weren't working for us.
-
-  09 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_compile.sh,
-  gen_determineargs.sh, gen_funcs.sh, gen_initramfs.sh, gen_initrd.sh,
-  gen_package.sh, genkernel:
-  Added a patch by John R. Graham <john_r_graham@mindspring.com> from bug
-  #169383 to improve the --symlink option fairly significantly. This is going
-  to be 3.4.7_pre4 and while I haven't tested this yet, it looks good.
-
-  09 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_initramfs.sh:
-  Fixed lib64 link for bug #168664.
-
-  09 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> x86/kernel-config-2.6:
-  Update default kernel config with the current LiveCD config for 2007.0,
-  which is built on 2.6.19, rather than 2.6.17 only.
-
-  07 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  +pkg/module-init-tools-0.9.15-pre4.tar.bz2,
-  +pkg/busybox-1.1.3+gentoo.tar.bz2,
-  +pkg/devfsd-1.3.25-dietlibc-kernel25.tar.bz2,
-  +pkg/modutils-2.4.26.tar.bz2:
-  Added binary files back and updated busybox with a patch from Peter
-  Alfredsen <peter.alfredsen@gmail.com> in bug #168599.
-
-  07 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  -pkg/module-init-tools-0.9.15-pre4.tar.bz2,
-  -pkg/busybox-1.1.3+gentoo.tar.bz2,
-  -pkg/devfsd-1.3.25-dietlibc-kernel25.tar.bz2,
-  -pkg/modutils-2.4.26.tar.bz2:
-  Removing binary files from pkg since they were corrupted during the CVS->SVN
-  migration.
-
-  07 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> genkernel.8:
-  Fixed up the man page for bug #168500 and bug #168719.
-
-  14 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> genkernel,
-  parisc/config.sh, parisc64/config.sh:
-  Moved the MAKEOPTS check to the top of the file for parisc, so it matches
-  other architectures. This fixes bug #165494. Thanks to Andrew Gaffney
-  <agaffney@gentoo.org> for finding the fix. I'm marking this as 3.4.7_pre3
-  for testing.
-
-  14 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  Adding yet another patch from Fabio Erculiani <lxnay@lxnaydesign.net> from
-  bug #152945.
-
-  12 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts, generic/linuxrc, genkernel:
-  Added a non-braindead version of a patch provided by Fabio Erculiani
-  <lxnay@lxnaydesign.net> in bug #160333. This is completely untested, so I'm
-  rolling up 3.4.7_pre2 to get it tested prior to genkernel 3.4.7 going final.
-
-  12 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> ppc/Pegasos:
-  Add a known-working 2.6.16+ kernel config from
-  http://www.ppczone.org/downloads/config-2.6.16-pegasos for bug #165758.
-
-  12 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> genkernel.conf:
-  Added a note about the MAKEOPTS option to genkernel as suggested in bug
-  #165980.
-
-  12 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> genkernel.8:
-  Added patch from Mike Frysinger <vapier@gentoo.org> to clean up the
-  genkernel man page for bug #166179.
-
-  12 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> generic/linuxrc:
-  Fix REAL_INIT for bug #160635.
-
-  12 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
-  gen_compile.sh, genkernel:
-  Added patch from Fabio Erculiani <lxnay@lxnaydesign.net> to fix unionfs
-  compilation. This is for bug #152945.
-
-  08 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
-  gen_funcs.sh:
-  Added patch from Martin Parm <parmus@diku.dk> to fix the --no-color option.
-  This resolves bug #114156.
-
-  15 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_bootloader.sh:
-  Changed basename to dirname when creating the directory from grub.conf to
-  solve bug #161716.
-
-  09 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org> alpha/modules_load,
-  x86/modules_load, x86_64/modules_load, xen0/modules_load,
-  xenU/modules_load:
-  Added scsi_scan_wait module to modules_load for 2.6.20 support. Thanks to
-  Robin H. Johnson for <robbat2@gentoo.org> for pointing it out.
-
-  27 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> gen_bootloader.sh,
-  generic/initrd.scripts:
-  Added a case statement for the keymap selection to ensure we're always using
-  the named keymaps. This should resolve bug #146714 if everything works
-  correctly. This is 3.4.6, for real.
-
-  27 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  +generic/keymaps.tar.gz:
-  Adding back the known-good copy of keymaps.tar.gz to svn.
-
-  27 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> alpha/busy-config,
-  gen_compile.sh, -generic/keymaps.tar.gz, generic/linuxrc, genkernel,
-  ia64/busy-config, mips/busy-config, parisc/busy-config,
-  parisc64/busy-config, ppc/busy-config, ppc64/busy-config,
-  sparc/busy-config, sparc64/busy-config, um/busy-config, x86/busy-config,
-  x86_64/busy-config, xen0/busy-config, xenU/busy-config:
-  Removing generic/keymaps.tar.gz to replace it with a known-good copy. Blame
-  cvs2svn.  Also, added patch from Alon Bar-Lev <alonbl@gentoo.org> to switch
-  to using switch_root for 2.6 kernels, and a small typo fix from Michael
-  Hordijk <hoffbrinkle@hotmail.com> for bug #158776.
-
-  15 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> gen_initrd.sh,
-  generic/linuxrc, genkernel:
-  Added patches from François-Xavier Roure <fx_roure@yahoo.fr> from bug
-  #149020. This will end up being genkernel 3.4.6, most likely.
-
-  14 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> gen_compile.sh:
-  Adjust selinux stuff in gen_compile.sh to actually do what we intended, not
-  the opposite.
-
-  14 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> gen_compile.sh:
-  Since device-mapper tries to build with selinux by default, we've removed
-  it, then commented out the selinux support. The ebuild will need to
-  enable/disable selinux support based on the selinux USE flag. This should
-  resolve bug #157538.
-
-  13 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  More fixes for similarly-named modules.
-
-  13 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> alpha/busy-config,
-  ia64/busy-config, parisc/busy-config, parisc64/busy-config,
-  ppc/busy-config, ppc64/busy-config, sparc/busy-config,
-  sparc64/busy-config, x86/busy-config, x86_64/busy-config,
-  xen0/busy-config, xenU/busy-config:
-  Disabled full SuSv3 compliant sort, as suggested by Aurélien Francillon
-  <aurelien.francillon@inrialpes.fr> in bug #157777.
-
-  13 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> generic/modprobe:
-  Added a fix for similarly-named modules from bug #158017.
-
-  13 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> gen_compile.sh:
-  Fixed up linking for dmraid for bug #157538.
-
-  13 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> alpha/busy-config,
-  ia64/busy-config, parisc/busy-config, parisc64/busy-config,
-  ppc/busy-config, ppc64/busy-config, sparc/busy-config,
-  sparc64/busy-config, x86/busy-config, x86_64/busy-config,
-  xen0/busy-config, xenU/busy-config:
-  Updated busy-config to work with root=LABEL=<label> for bug #156640.
-
-  13 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> gen_determineargs.sh,
-  gen_initramfs.sh, genkernel, genkernel.conf:
-  Added patch from Daniel Drake <dsd@gentoo.org> in bug #156611 to clean up
-  the initramfs creation and create a 'proper' initramfs, instead of our
-  concatenated monster.
-
-  13 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
-  gen_compile.sh, gen_configkernel.sh, gen_determineargs.sh,
-  gen_initramfs.sh, gen_initrd.sh, generic/initrd.scripts, generic/linuxrc,
-  genkernel.8, genkernel.conf:
-  Added patch from Daniel Drake <dsd@gentoo.org> in bug #156445 to add
-  userspace suspend support to genkernel.
-
-  13 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> gen_initramfs.sh,
-  gen_initrd.sh:
-  Added debug level to LUKS print_info messages for bug #156410.
-
-  03 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> alpha/modules_load,
-  x86/modules_load, x86_64/modules_load:
-  Added raid456 to alpha/amd64/x86 MODULES_EVMS2 and added tg3 to MODULES_NET.
-
-  13 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  Inverted check on CDROOT_DEV, as it should be -z not -n. Thanks to Jakub Moc
-  <jakub@gentoo.org> for coming up with the quick fix in bug #153554. I lied
-  before. This one is really 3.4.5.
-
-  13 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org> generic/linuxrc,
-  genkernel:
-  Added typo fix from Jason Pepas <j.pepas@mail.utexas.edu> in bug #153516.
-  This is 3.4.5.
-
-  13 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org> alpha/busy-config,
-  ia64/busy-config, mips/busy-config, parisc/busy-config,
-  parisc64/busy-config, ppc/busy-config, ppc64/busy-config,
-  sparc/busy-config, sparc64/busy-config, um/busy-config, x86/busy-config,
-  x86_64/busy-config, xen0/busy-config, xenU/busy-config:
-  Added Large File Support thanks to Fabio Erculiani <lxnay@lxnaydesign.net>
-  in bug #152881.
-
-  13 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org> genkernel:
-  Added patch to improve symlink support by Michael Hordijk
-  <hoffbrinkle@hotmail.com> for bug #143217.
-
-  13 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org> generic/linuxrc:
-  Added patch from Tim Steiner <tsteiner@nerdclub.net> to add a real_rootflags
-  parameter for bug #122672.
-
-  13 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts, generic/linuxrc:
-  Added patch to support resuming from encrypted swap. The patch was submitted
-  to bug #152441.
-
-  25 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> genkernel:
-  This is the 3.4.4 release.
-
-  25 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts, generic/linuxrc:
-  Updated with the latest version of the LUKS patches from bug #152441.
-
-  25 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> ChangeLog:
-  Changed mime-type to application/x-gzip for generic/keymaps.tar.gz for bug
-  #151500.
-
-  23 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> generic/linuxrc:
-  Added patch from bug #152441 to improve LUKS support.
-
-  23 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> x86/kernel-config-2.6,
-  x86_64/kernel-config-2.6:
-  Updated kernel configs for amd64/x86 for bug #151609 and bug #152299.
-
-  23 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> genkernel:
-  Changed mime-type property to binary/gzip for keymaps.tar.gz for bug #151500.
-  This is genkernel 3.4.3.
-
-  13 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> gen_initramfs.sh,
-  generic/initrd.defaults, generic/initrd.scripts, +generic/udhcpc.scripts,
-  x86/busy-config, x86/modules_load:
-  Added patch for udhcp support. Patch by Stefan Nickl
-  <snickl@snickl.freaks.de> and submitted to bug #145115.
-
-  13 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> generic/linuxrc:
-  Allow root= for initramfs, instead of only real_root= to specify the root
-  volume. Patch by Salah Coronya <salahx@yahoo.com> from bug #142606.
-
-  13 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> genkernel.8:
-  Added patch from Salah Coronya <salahx@yahoo.com> to document dolvm2 and
-  doevms2 in the genkernel man page from bug #142606.
-
-  13 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> +AUTHORS, genkernel:
-  Added the AUTHORS file and ChangeLog.  This is 3.4.2
-
-  02 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  Added patch for suspend2-sources 2.6.18 by Romeo Benzoni
-  <romeo@benzoni.org> and submitted to bug #148499.
-
-  02 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_determineargs.sh:
-  Added patch from Alon Bar-Lev <alon.barlev@gmail.com> for bug
-  #148498 and also a patch from Robin H. Johnson
-  <robbat2@gentoo.org> to support git-based kernels.
-
-  02 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  x86_64/kernel-config-2.6, -x86_64/kernel-config-2.6-emachines,
-  -x86_64/kernel-config-2.6-smp:
-  Update the amd64 kernel configs from the release.
-
-  16 Sep 2006; Tim Yamin <plasmaroo@gentoo.org>
-  gen_initramfs.sh, genkernel:
-  Should check for /sbin/splash_geninitramfs instead of
-  /usr/sbin/...
-
-  14 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  This change makes it so we only try to mount 'auto' when cdroot
-  is specified. This should fix all of our mounting issues, as
-  well as allow for not only USB keys to use these kernels with a
-  LiveCD kernel/config, but allow it to boot from any media which
-  the kernel has support.
-
-  14 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  Added a symlink for device-mapper stuff. This should resolve
-  both bug #142775 and bug #147015.
-
-  14 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  alpha/modules_load, x86/modules_load, x86_64/modules_load:
-  Added lpfc and scsi_transport_fc for Emulex fibre-channel
-  controllers.
-
-  13 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  alpha/modules_load, x86/modules_load, x86_64/modules_load:
-  Make sure we load the raid0, raid1, and raid10 personalities
-  with dmraid.
-
-  12 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  This is ugly. I mean, really ugly. However, it is the only way
-  to support all of the insane ways that people are trying to boot
-  release media. I really wish we didn't have to support this
-  junk, but a regression really shouldn't happen with our
-  releases. Anyway, hopefully I can come up with a better
-  solution to this in the future.
-
-  12 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  Try using -t iso9660,vfat to our mount command, since we can't
-  use only iso9660 as it breaks booting from a USB stick.
-
-  12 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_initrd.sh:
-  The initrd code was still looking for udev, even though we
-  aren't building it anymore. This should fix bug #145802.
-
-  12 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  ppc/busy-config:
-  Fix NFS mount.
-
-  12 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.defaults:
-  Added emul to ROOT_LINKS for bug #145248.
-
-  12 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  x86/busy-config, x86_64/busy-config:
-  Fixed the NFS mount configuration for busybox for bug #143476.
-
-  12 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  Update the suspend2_resume function for bug #131202.
-
-  12 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  iso9660 -> auto, and added support for checking SUBDIR for the
-  livecd file. This is for bug #147186.
-
-  12 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  x86/kernel-config-2.6, x86_64/kernel-config-2.6:
-  Updated default kernel configurations for x86/amd64 to match the
-  2006.1 release.
-
-  08 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_initramfs.sh:
-  Add more error checking into the splash code and die instead of
-  silently fail on an error.
-
-  23 Aug 2006; Tim Yamin <plasmaroo@gentoo.org>
-  ia64/kernel-config-2.6:
-  Update config, fix #141949.
-
-  22 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts, generic/linuxrc:
-  Added patch for suspend2 for bug #131202.
-
-  15 Aug 2006; Tim Yamin <plasmaroo@gentoo.org> generic/linuxrc:
-  Fix bug #143442.
-
-  13 Aug 2006; Tim Yamin <plasmaroo@gentoo.org>
-  generic/initrd.scripts:
-  Fix devfsd not kicking in on 2.4 on Alpha.
-
-  11 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_compile.sh, genkernel.conf:
-  Add in the kernel version compatibility table from
-  http://www.am-utils.org/project-unionfs.html and ensure that
-  genkernel dies if the unionfs module fails to build. Until now,
-  it would fail and the build would continue without it.
-
-  01 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_initramfs.sh:
-  We should be checking for /usr/bin/splash_geninitramfs, instead.
-
-  31 Jul 2006; Tim Yamin <plasmaroo@gentoo.org> genkernel:
-  3.4.0 final... so much Bad-Ass <TM> that Chuck Norris himself
-  digs it :)
-
-  20 Jul 2006; Tim Yamin <plasmaroo@gentoo.org> gen_cmdline.sh,
-  gen_initramfs.sh, genkernel:
-  Commit fix for bug #141153 from Pylon; 3.4.0_pre4.
-
-  18 Jul 2006; Tim Yamin <plasmaroo@gentoo.org>
-  gen_bootloader.sh, gen_funcs.sh, gen_package.sh, genkernel:
-  Commit patches #91453, #91481 from bug #139866.
-
-  18 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  alpha/modules_load, um/modules_load, x86/modules_load,
-  x86_64/modules_load, xen0/modules_load, xenU/modules_load:
-  Added megaraid drivers for bug #139888.
-
-  16 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_initramfs.sh:
-  Added fix for bug #140445.
-
-  11 Jul 2006; Tim Yamin <plasmaroo@gentoo.org>
-  gen_bootloader.sh, gen_cmdline.sh, gen_compile.sh,
-  gen_determineargs.sh, gen_funcs.sh, gen_initramfs.sh,
-  gen_initrd.sh, gen_package.sh, genkernel, genkernel.conf:
-  Commit patch for bug #139866 by Martin Parm.
-
-  05 Jul 2006; Joshua Kinard <kumba@gentoo.org> generic/linuxrc:
-  Tweak the sgimips section for rootfs mounting to use squashfs
-  instead of ext2.
-
-  30 Jun 2006; Tim Yamin <plasmaroo@gentoo.org> generic/linuxrc:
-  Fix "Cannot read /proc/mounts" cosmetics.
-
-  30 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  alpha/modules_load, um/modules_load, x86/modules_load,
-  x86_64/modules_load, xen0/modules_load, xenU/modules_load:
-  We need firmware_class in our initramfs for ide-cs to work.
-
-  20 Jun 2006; Tim Yamin <plasmaroo@gentoo.org> genkernel,
-  genkernel.conf,
-  -pkg/busybox-1.1.0-gentoo-gk4-20060519-snappie.tar.bz2,
-  +pkg/busybox-1.1.3+gentoo.tar.bz2:
-  Bump busybox to 1.1.3 courtesy of `Kumba.
-
-  19 Jun 2006; Joshua Kinard <kumba@gentoo.org>
-  gen_initramfs.sh, -mips/ip22r4k-2006_0.cf,
-  +mips/ip22r4k-2006_1.cf, -mips/ip22r5k-2006_0.cf,
-  +mips/ip22r5k-2006_1.cf, -mips/ip27r10k-2006_0.cf,
-  +mips/ip27r10k-2006_1.cf, -mips/ip28r10k-2006_0.cf,
-  +mips/ip28r10k-2006_1.cf, -mips/ip30r10k-2006_0.cf,
-  +mips/ip30r10k-2006_1.cf, -mips/ip32r5k-2006_0.cf,
-  mips/ip32r5k-2006_1.cf, -mips/ip32rm52-2006_0.cf,
-  +mips/ip32rm5k-2006_1.cf, mips/nb-busybox.cf, netboot/linuxrc.x:
-  Remove getdvhoff hack in gen_initramfs.sh for mips livecds (it's
-  a busybox applet now), tweak the ip32r5k config, add wget to the
-  mips netboot busybox config. Also import the remaining 2006.1
-  mips-sources configs and remove the old 2006.0 ones.
-
-  12 Jun 2006; Joshua Kinard <kumba@gentoo.org> mips/busy-config:
-  Enable the config option for busybox's --install parameter.
-
-  12 Jun 2006; Joshua Kinard <kumba@gentoo.org>
-  mips/busy-config, +mips/ip32r5k-2006_1.cf, mips/nb-busybox.cf:
-  Add IP32 R5K 2.6.16.20 kernel build, and update LiveCD/Netboot
-  Busybox configs to match with busybox-1.1.3.
-
-  10 Jun 2006; Joshua Kinard <kumba@gentoo.org> mips/config.sh:
-  Modernize the mips genkernel config.
-
-  10 Jun 2006; Joshua Kinard <kumba@gentoo.org>
-  -mips/ip22r4k-2005_1.cf, -mips/ip22r5k-2005_1.cf,
-  -mips/ip27r10k-2005_1.cf, -mips/ip28r10k-2005_1.cf,
-  -mips/ip30r10k-2005_1.cf, -mips/ip32r5k-2005_1.cf:
-  Remove old configs.
-
-  10 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/linuxrc:
-  We can't use vol_id since it was a part of udev.
-
-  09 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  genkernel.8:
-  Added --static to man page for bug #135703.
-
-  09 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_cmdline.sh, gen_determineargs.sh, gen_initramfs.sh,
-  gen_initrd.sh, generic/initrd.scripts, generic/linuxrc:
-  Add a modified version of the two LUKS patches that made their
-  way into bugzilla for bug #122421.
-
-  09 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  alpha/modules_load, generic/initrd.defaults, generic/linuxrc,
-  x86/modules_load, x86_64/modules_load, xen0/modules_load,
-  xenU/modules_load:
-  Added code to allow the root file-system to be a module. This
-  is for bug #118098.
-
-  09 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/linuxrc:
-  Changed real_init to init_opts to be more accurate, and added a
-  proper real_init option to allow the selection of the init
-  executable to run. This is for bug #113426.
-
-  09 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_initramfs.sh, gen_initrd.sh:
-  Added fix for bug #134843 from Thomas Raschbacher
-  <lordvan@gentoo.org> for evms and later glibc versions.
-
-  05 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  genkernel.8:
-  Fixed man page. Thanks to Andrew Yates <andrew@andrewyates.net>
-  for the patch.
-
-  01 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  alpha/busy-config, ia64/busy-config, mips/busy-config,
-  parisc/busy-config, parisc64/busy-config, ppc/busy-config,
-  ppc64/busy-config, sparc/busy-config, sparc64/busy-config,
-  um/busy-config, x86/busy-config, x86_64/busy-config,
-  xen0/busy-config, xenU/busy-config:
-  Added CONFIG_ASH_READ_TIMEOUT=y so we have a timeout value on
-  read, used for keymap selection.
-
-  01 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/linuxrc:
-  More spacing cleanups.
-
-  01 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/linuxrc:
-  I accidentally removed some stuff that needed to be there in my
-  overzealous debug cleanup.
-
-  01 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/linuxrc:
-  Cleaning up debug statements.
-
-  31 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/linuxrc:
-  Ooops... forgot my then after elif. I hope nobody noticed.
-
-  31 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/linuxrc:
-  Change cp to mknod for sr0/loop0 for mips and also for tty1 for
-  splash.
-
-  30 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/linuxrc:
-  Change cp to mknod for console/null.
-
-  25 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts, generic/linuxrc:
-  Fix an error in setup_unionfs and add in some debug support to
-  figure out why/where this initramfs is stopping.
-
-  24 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  Fixed up TODO with actual working code since we don't have awk.
-
-  24 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts, generic/linuxrc:
-  Add in image.squashfs as a squashfs loop, since it is now the
-  default in catalyst. Also, added a nice TODO about docache and
-  size restrictions into cache_cd_contents.
-
-  19 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_cmdline.sh:
-  Just some spacing clean ups in the long usage listing.
-
-  19 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  genkernel.conf:
-  Comment the rest of the udev syuff from genkernel.conf as it
-  shouldn't be necessary anymore with mdev.
-
-  19 May 2006; Tim Yamin <plasmaroo@gentoo.org>
-  alpha/busy-config, gen_compile.sh, gen_initramfs.sh,
-  generic/initrd.scripts, generic/linuxrc, genkernel,
-  genkernel.conf, ia64/busy-config, mips/busy-config,
-  parisc/busy-config, parisc64/busy-config,
-  -pkg/busybox-1.00-headers_fix.patch,
-  -pkg/busybox-1.00-rt-mdstart.plasmaroo.tar.bz2,
-  +pkg/busybox-1.1.0-gentoo-gk4-20060519-snappie.tar.bz2,
-  ppc/busy-config, ppc64/busy-config, sparc/busy-config,
-  sparc64/busy-config, um/busy-config, x86/busy-config,
-  x86_64/busy-config, xen0/busy-config, xenU/busy-config:
-  Update to busybox 1.1.0; port over to use mdev.
-
-  07 May 2006; Tim Yamin <plasmaroo@gentoo.org> gen_cmdline.sh,
-  genkernel:
-  Fix #132408.
-
-  07 May 2006; Tim Yamin <plasmaroo@gentoo.org>
-  gen_initramfs.sh, gen_initrd.sh:
-  Fix #131769.
-
-  27 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_compile.sh:
-  Added patch for unionfs from bug #129965.
-
-  27 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_compile.sh:
-  Add -DUNIONFS_UNSUPPORTED for 2.6.16 and unionfs.
-
-  25 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  alpha/modules_load, x86/modules_load, x86_64/modules_load,
-  xen0/modules_load, xenU/modules_load:
-  Added some more modules to MODULES_SCSI that could be used to
-  boot from a genkernel-compiled kernel on a live system.
-
-  17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_compile.sh, generic/initrd.scripts, generic/linuxrc:
-  Added patch from Mike Auty for udev 088+.
-
-  17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  alpha/modules_load, x86/modules_load, x86_64/modules_load,
-  xen0/modules_load, xenU/modules_load:
-  Added 3ware card drivers to scsi modules on x86/amd64/alpha.
-
-  17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_compile.sh, genkernel:
-  Updated to *hopefully* work with udev 087.
-
-  14 Apr 2006; Tim Yamin <plasmaroo@gentoo.org> alpha/config.sh,
-  ia64/config.sh, parisc/config.sh, parisc64/config.sh,
-  ppc/config.sh, ppc64/config.sh, sparc/config.sh,
-  sparc64/config.sh, um/config.sh, x86/config.sh,
-  x86_64/config.sh, xen0/config.sh, xenU/config.sh:
-  Fix #107628.
-
-  14 Apr 2006; Tim Yamin <plasmaroo@gentoo.org> gen_compile.sh,
-  gen_initramfs.sh, gen_initrd.sh, generic/initrd.scripts,
-  generic/linuxrc, genkernel:
-  ->3.3.11d. Fix #121616, #128805, #129887, #129910.
-
-  14 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  Forgot one part of the patch from bug #121334.
-
-  13 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_compile.sh, genkernel, genkernel.8:
-  Updated the unionfs compiling section. This *should* allow
-  unionfs to build on supported kernels.
-
-  13 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/linuxrc:
-  Uncommented suspend2 support from bug #114266.
-
-  13 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts, generic/linuxrc:
-  Added unionfs patches from bug #121334.
-
-  13 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts, generic/linuxrc, genkernel,
-  x86/busy-config, x86/modules_load, x86_64/busy-config,
-  x86_64/modules_load, xen0/busy-config, xen0/modules_load,
-  xenU/busy-config, xenU/modules_load:
-  Added a check for /dev/tty0 to setup_keymap, added raid
-  personality modules for EVMS, and fixed lots of space/tab
-  issues, along with a general style cleanup. I'm calling this
-  one 3.3.11b internally, and hopefully it will be added to the
-  tree if it resolves bug #124388.
-
-  13 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_cmdline.sh, gen_initramfs.sh, gen_initrd.sh,
-  generic/initrd.defaults, generic/initrd.scripts, generic/linuxrc:
-  dobladecenter->slowusb
-
-  06 Apr 2006; Tim Yamin <plasmaroo@gentoo.org> gen_compile.sh,
-  +pkg/klibc-1.2.1-nostdinc-flags.patch:
-  Add hardened fix for bug #128806.
-
-  24 Mar 2006; Tim Yamin <plasmaroo@gentoo.org>
-  ia64/kernel-config-2.6:
-  Update config for the new Fusion MPT CONFIG_ options on newer
-  2.6 kernels; bug #125353.
-
-  10 Mar 2006; Tim Yamin <plasmaroo@gentoo.org> generic/linuxrc:
-  Fix bug #124251.
-
-  14 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/linuxrc:
-  Updated copyright notice to get KingTaco off my back.
-
-  14 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_initramfs.sh, gen_initrd.sh:
-  Added 0 0 to end of the ram0 line on fstab. Blame KingTaco for
-  pointing it out.
-
-  08 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_compile.sh:
-  Changed unpacking of klibc to use tar j instead of tar z.
-
-  08 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  genkernel.conf:
-  Let's use the bzip2 tarball of klibc by default form now on,
-  shall we...
-
-  07 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> genkernel,
-  +pkg/klibc-1.1.16-sparc2.patch:
-  Added klibc patch for sparc to CVS (from distfiles). This is
-  3.3.11 so like... run in fear or something...
-
-  02 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_cmdline.sh, gen_determineargs.sh, gen_initramfs.sh,
-  gen_initrd.sh, genkernel:
-  Added patch from Kumba to make certain initrd functions less
-  mips-specific.
-
-  27 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_compile.sh, genkernel:
-  Removed save_args/reset_args on kernel. This is 3.3.11_pre7.
-
-  26 Jan 2006; Eric Edgar <rocket@gentoo.org> gen_compile.sh:
-  unset temp vars so they get cleaned up
-
-  26 Jan 2006; Eric Edgar <rocket@gentoo.org> gen_compile.sh,
-  gen_initramfs.sh, genkernel:
-  bump to pre6. resets ARCH env var after utils are compiled
-
-  25 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_arch.sh, gen_compile.sh, genkernel:
-  Added sparc patches for udev/klibc.
-
-  24 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_arch.sh, gen_cmdline.sh, gen_compile.sh,
-  gen_determineargs.sh, genkernel:
-  Added nice and fun patch from dostrow for building on ppc64 (and
-  possibly others) with mixed kernel/userland.
-
-  23 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/linuxrc:
-  Added fix for bug #120031.
-
-  20 Jan 2006; Joshua Kinard <kumba@gentoo.org>
-  +mips/ip32rm52-2006_0.cf:
-  Kernel 2.6.14.6 config for SGI O2 w/ RM5271 CPU ("Nevada")
-
-  15 Jan 2006; Joshua Kinard <kumba@gentoo.org> gen_cmdline.sh,
-  gen_determineargs.sh, genkernel:
-  Add support to genkernel to build a monolithic kernel by
-  skipping module building sections when
-  --static is passed on the gk commandline.
-
-  12 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_compile.sh:
-  Added comment about utils breaking udev so we don't break it
-  again inadvertently.
-
-  12 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_compile.sh, genkernel, +pkg/busybox-1.00-headers_fix.patch:
-  Added busybox headers fix (_pre2) and changed utils to runtask
-  on udev build (_pre3).
-
-  12 Jan 2006; Joshua Kinard <kumba@gentoo.org>
-  netboot/linuxrc.x:
-  chmod +x the udhcpc script on bootup
-
-  12 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_compile.sh, genkernel, -pkg/byteswap.h:
-  Added patch from bug #118324.
-
-  10 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  x86/modules_load, x86_64/modules_load, xen0/modules_load,
-  xenU/modules_load:
-  Added additional SATA controllers to MODULES_SATA for loading
-  into the initrd/initramfs image.
-
-  07 Jan 2006; Joshua Kinard <kumba@gentoo.org>
-  gen_initramfs.sh, +mips/ip22r4k-2006_0.cf,
-  +mips/ip22r5k-2006_0.cf, +mips/ip27r10k-2006_0.cf,
-  +mips/ip28r10k-2006_0.cf, +mips/ip30r10k-2006_0.cf,
-  +mips/ip32r5k-2006_0.cf, +mips/nb-busybox.cf, +netboot,
-  +netboot/linuxrc.x, +netboot/misc, +netboot/misc/bin,
-  +netboot/misc/bin/net-setup, +netboot/misc/etc,
-  +netboot/misc/etc/fstab, +netboot/misc/etc/group,
-  +netboot/misc/etc/inittab, +netboot/misc/etc/passwd,
-  +netboot/misc/etc/profile, +netboot/misc/etc/resolv.conf,
-  +netboot/misc/etc/shadow, +netboot/misc/etc/shells,
-  +netboot/misc/usr, +netboot/misc/usr/share,
-  +netboot/misc/usr/share/terminfo,
-  +netboot/misc/usr/share/terminfo/p,
-  +netboot/misc/usr/share/terminfo/p/putty,
-  +netboot/misc/usr/share/udhcpc,
-  +netboot/misc/usr/share/udhcpc/default.script:
-  Import the Genkernel-side of things for the catalyst2 netboot2
-  module
-
-  06 Jan 2006; Eric Edgar <rocket@gentoo.org> gen_compile.sh:
-  udev compile change from runtask to utils
-
-  03 Jan 2006; Tim Yamin <plasmaroo@gentoo.org>
-  gen_bootloader.sh, gen_compile.sh, gen_determineargs.sh,
-  gen_initramfs.sh, genkernel:
-  Fix #115263, #117392, add a fix to sanify LOCALVERSION if
-  unresolved variables are embedded.
-
-  02 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  alpha/modules_load, um/modules_load, x86/modules_load,
-  x86_64/modules_load, xen0/modules_load, xenU/modules_load:
-  Updated Fusion MPT support for bug #117114.
-
-  21 Dec 2005; Tim Yamin <plasmaroo@gentoo.org> gen_compile.sh:
-  Fix --kernel-cross-compile with PPC64.
-
-  18 Dec 2005; Tim Yamin <plasmaroo@gentoo.org> gen_compile.sh,
-  genkernel:
-  Add a compile_klibc(...) fix for old GNU tars and patch the
-  klibc Makefile to leave /lib alone.
-
-  16 Dec 2005; Tim Yamin <plasmaroo@gentoo.org> gen_compile.sh:
-  runtask -> utils for compile_klibc.
-
-  16 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_compile.sh, genkernel:
-  Added x86/klibc fix.
-
-  16 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  x86/kernel-config-2.6:
-  Added HERMES support to use in-kernel driver rather than
-  external.
-
-  15 Dec 2005; Tim Yamin <plasmaroo@gentoo.org>
-  pkg/busybox-1.00-rt-mdstart.plasmaroo.tar.bz2:
-  Fix #109196.
-
-  15 Dec 2005; Eric Edgar <rocket@gentoo.org> gen_compile.sh,
-  +pkg/byteswap.h:
-  Fix to allow udev 076 and udev 077 to compile... add a missing
-  file byteswap.h to klibc-1.1.1
-
-  15 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  genkernel.conf:
-  Removed versions from all packages that are pulled from upstream
-  so we can use sed in the ebuild to set these, making maintenance
-  easier.
-
-  09 Dec 2005; Eric Edgar <rocket@gentoo.org> gen_compile.sh:
-  add quotes to the ARCH= stuff for the kernel
-
-  09 Dec 2005; Eric Edgar <rocket@gentoo.org> gen_compile.sh:
-  Forcibly set the ARCH when compiling the kernel
-
-  07 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  x86/kernel-config-2.6:
-  Changed CONFIG_BLK_DEV_MD=y for bug #112962.
-
-  06 Dec 2005; Tim Yamin <plasmaroo@gentoo.org>
-  gen_bootloader_grub.awk:
-  Fix #100637.
-
-  05 Dec 2005; Tim Yamin <plasmaroo@gentoo.org> generic/linuxrc:
-  Back out suspend2 support temporarily as per #114266 comment 10.
-
-  05 Dec 2005; Tim Yamin <plasmaroo@gentoo.org> generic/linuxrc:
-  Fix #113634, #114266.
-
-  05 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  x86/kernel-config-2.6:
-  Added USB Printer support for bug #114496.
-
-  28 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  x86/kernel-config-2.6, x86/modules_load, x86_64/modules_load:
-  Added sata_mv to x86/amd64 for Marvell SATA controllers and
-  updated 2.6 kernel config for x86 to match what would be used on
-  a current 2.6.14 LiveCD.
-
-  23 Nov 2005; Eric Edgar <rocket@gentoo.org> genkernel:
-  Version Bump 3.3.8
-
-  23 Nov 2005; Eric Edgar <rocket@gentoo.org> gen_initramfs.sh,
-  gen_initrd.sh:
-  Fix bug 113287
-
-  22 Nov 2005; Eric Edgar <rocket@gentoo.org> genkernel.conf:
-  Update unionfs in genkernel.conf to 1.1.1
-
-  21 Nov 2005; Eric Edgar <rocket@gentoo.org> generic/linuxrc:
-  fix for sys delete bug 109819
-
-  21 Nov 2005; Eric Edgar <rocket@gentoo.org> gen_compile.sh,
-  genkernel.conf:
-  Add support for dmraid1.0.0.rc9 to fix bug 94762
-
-  21 Nov 2005; Eric Edgar <rocket@gentoo.org> gen_initramfs.sh,
-  gen_initrd.sh, gen_moddeps.sh, gen_package.sh:
-  Fix missing moddeps file by adding a test;Do not keep the
-  initrd/initramfs with a kernelz system as it is already bundled
-  together.
-
-  18 Nov 2005; Tim Yamin <plasmaroo@gentoo.org> genkernel:
-  Fix {PPC+Catalyst+Pegasos} build failure regression.
-
-  17 Nov 2005; Tim Yamin <plasmaroo@gentoo.org>
-  -pkg/udev-054.tar.bz2, -pkg/udev-068.tar.bz2:
-  Remove obsoleted udev...
-
-  17 Nov 2005; Eric Edgar <rocket@gentoo.org> gen_compile.sh,
-  gen_determineargs.sh, genkernel.conf:
-  Udev 075 support, klibc 1.1.1, and fixes for ppc on 2.6.14+
-  kernels
-
-  04 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_arch.sh, gen_initramfs.sh, gen_initrd.sh,
-  generic/initrd.scripts, generic/linuxrc, genkernel, +mips,
-  +mips/busy-config, +mips/config.sh, +mips/ip22r4k-2005_1.cf,
-  +mips/ip22r5k-2005_1.cf, +mips/ip27r10k-2005_1.cf,
-  +mips/ip28r10k-2005_1.cf, +mips/ip30r10k-2005_1.cf,
-  +mips/ip32r5k-2005_1.cf, +mips/modules_load, +pkg/mips,
-  +pkg/mips/.keep:
-  Added patches from bug #106338. This means mips support in
-  genkernel. Blame Kumba.
-
-  28 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/linuxrc, genkernel:
-  Changed the version indicator, fixing fstab generation for
-  unionfs, and resolving bug #103332.
-
-  28 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_initramfs.sh:
-  Made symlink relative for bug #105572.
-
-  28 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_compile.sh, genkernel.conf, +pkg/udev-068.tar.bz2:
-  Upgraded to udev 068 and also closing bug #103936.
-
-  28 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_funcs.sh:
-  Added fix for bug #103717.
-
-  21 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  x86/kernel-config-2.6:
-  Updated x86 2.6 kernel configuration.
-
-  10 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  alpha/modules_load, x86/modules_load, x86_64/modules_load:
-  Added fix for bug #102006.
-
-  31 Aug 2005; Eric Edgar <rocket@gentoo.org> genkernel:
-  Update genkernel version number
-
-  31 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  x86/kernel-config-2.6:
-  CONFIG_PRINTER=m for bug #104229.
-
-  30 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts, generic/linuxrc:
-  Add nodetect and doload patch from bug #102643, with some
-  modifications.
-
-  16 Aug 2005; Eric Edgar <rocket@gentoo.org> gen_compile.sh,
-  gen_initrd.sh, generic/initrd.scripts, generic/linuxrc:
-  Fix for bug 83276 and add udevsend binary to initramfs for newer
-  udevs
-
-  16 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  alpha/modules_load, um/modules_load, x86/modules_load,
-  x86_64/modules_load, xen0/modules_load, xenU/modules_load:
-  Added dm-mirror to dmraid on all supported arches for bug
-  #102739.
-
-  15 Aug 2005; Tim Yamin <plasmaroo@gentoo.org> genkernel.8:
-  Fix #101716.
-
-  15 Aug 2005; Tim Yamin <plasmaroo@gentoo.org>
-  gen_configkernel.sh:
-  Fix #88080.
-
-  15 Aug 2005; Tim Yamin <plasmaroo@gentoo.org> gen_cmdline.sh:
-  Fix #102407.
-
-  15 Aug 2005; Tim Yamin <plasmaroo@gentoo.org>
-  pkg/busybox-1.00-rt-mdstart.plasmaroo.tar.bz2:
-  Fix #102491.
-
-  11 Aug 2005; Eric Edgar <rocket@gentoo.org>
-  alpha/modules_load, um/modules_load, x86/modules_load,
-  x86_64/modules_load, xen0/modules_load, xenU/modules_load:
-  Fix bug 102006 for dm-bbr. Added dm-bbr to modules_load files
-  under MODULES_LVM2.
-
-  11 Aug 2005; Eric Edgar <rocket@gentoo.org> gen_initramfs.sh:
-  Fix for bug 91966. Link lib64 to lib in the initramfs
-
-  11 Aug 2005; Eric Edgar <rocket@gentoo.org> gen_compile.sh,
-  generic/linuxrc:
-  Fix for newer udevs to detect udevstart
-
-  06 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_configkernel.sh:
-  Fixed config parsing for dmraid/lvm2 to only set =m if item is
-  not set. Closing bug #101535.
-
-  02 Aug 2005; Eric Edgar <rocket@gentoo.org> gen_cmdline.sh,
-  ppc/config.sh, ppc64/config.sh:
-  Fix incorrect commit
-
-  02 Aug 2005; Eric Edgar <rocket@gentoo.org> gen_cmdline.sh,
-  gen_initramfs.sh, ppc/config.sh, ppc64/config.sh:
-  Create symlink to init named linuxrc. In preparation for the
-  need to pack the cpio into the kernel
-
-  02 Aug 2005; Eric Edgar <rocket@gentoo.org>
-  generic/initrd.scripts:
-  Add iseries virtual cdrom auto scanning support
-
-  01 Aug 2005; Eric Edgar <rocket@gentoo.org> genkernel:
-  Remove unnecessary check for multiple running genkernels.
-
-  01 Aug 2005; Eric Edgar <rocket@gentoo.org> gen_package.sh,
-  genkernel:
-  kerncache wasnt sending the config to /etc/kernels properly
-
-  30 Jul 2005; Tim Yamin <plasmaroo@gentoo.org> gen_cmdline.sh,
-  generic/initrd.scripts, generic/linuxrc, genkernel,
-  ppc/config.sh:
-  Fix cosmetics and PPC without --genzimage.
-
-  30 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_determineargs.sh, gen_initramfs.sh, gen_initrd.sh,
-  generic/initrd.defaults, generic/initrd.scripts,
-  generic/linuxrc, genkernel:
-  Finally making the --bladecenter/dobladecenter stuff correct.
-  Thanks plasmaroo for helping me wrap my head around how this
-  works and to remove my dirty hack.
-
-  29 Jul 2005; Tim Yamin <plasmaroo@gentoo.org> gen_compile.sh,
-  genkernel:
-  >> 3.3.3. Fix KERNEL_MAKE_DIRECTIVE_2 if not using --genzimage.
-
-  29 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_initramfs.sh, gen_initrd.sh, generic/linuxrc:
-  Fixed up the BladeCenter support some more.
-
-  29 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/linuxrc:
-  Added bladecenter boot-time option, also... so kernels don't
-  *have* to be built with --bladecenter.
-
-  29 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.scripts:
-  Fixed up --bladecenter expressions
-
-  29 Jul 2005; Eric Edgar <rocket@gentoo.org>
-  gen_determineargs.sh, gen_initramfs.sh:
-  Fix a few directory creation issues and a typo
-
-  29 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_cmdline.sh, gen_determineargs.sh, generic/initrd.scripts,
-  generic/linuxrc:
-  Added --bladecenter for slow USB CD on IBM BladeCenter.
-
-  29 Jul 2005; Eric Edgar <rocket@gentoo.org> gen_initramfs.sh:
-  Better genkernel.log output for initramfs
-
-  29 Jul 2005; Eric Edgar <rocket@gentoo.org> gen_cmdline.sh:
-  print warning that unionfs flag is disabled at this time
-
-  29 Jul 2005; Eric Edgar <rocket@gentoo.org> gen_cmdline.sh:
-  Remove normal access to unionfs
-
-  29 Jul 2005; Eric Edgar <rocket@gentoo.org> gen_cmdline.sh:
-  Change unionfs so that it is clearly noted as experimental
-
-  28 Jul 2005; Eric Edgar <rocket@gentoo.org> gen_initrd.sh,
-  generic/linuxrc:
-  Fix cp /dev/tty1 error message
-
-  28 Jul 2005; Eric Edgar <rocket@gentoo.org> gen_compile.sh,
-  gen_initramfs.sh, gen_initrd.sh, gen_package.sh, ppc/config.sh:
-  Fix ppc not compiling without --genzimage
-
-  28 Jul 2005; Tim Yamin <plasmaroo@gentoo.org>
-  gen_initramfs.sh, gen_package.sh, generic/initrd.scripts,
-  generic/linuxrc, genkernel, genkernel.8,
-  pkg/busybox-1.00-rt-mdstart.plasmaroo.tar.bz2, ppc/config.sh:
-  >> 3.3.1. Fix #100144, #100169, #100583.
-
-  25 Jul 2005; Eric Edgar <rocket@gentoo.org>
-  gen_determineargs.sh, gen_package.sh:
-  Remove extra TEMP checking code that was commented out
-
-  25 Jul 2005; Eric Edgar <rocket@gentoo.org>
-  gen_determineargs.sh, gen_package.sh, genkernel:
-  Add kernelz- to minkernpackage and kerncache
-
-  22 Jul 2005; Eric Edgar <rocket@gentoo.org>
-  gen_determineargs.sh, gen_package.sh:
-  Remove extra checks that fail
-
-  20 Jul 2005; Eric Edgar <rocket@gentoo.org> gen_package.sh:
-  Fix minkernpackage breakage regarding the TEMP and TMPDIR
-  variable
-
-  19 Jul 2005; Eric Edgar <rocket@gentoo.org>
-  generic/initrd.scripts:
-  Switch order of error messages to make less confusing
-
-  19 Jul 2005; Eric Edgar <rocket@gentoo.org>
-  generic/initrd.scripts, generic/linuxrc, genkernel:
-  Fix exit 1 issue being always called. Add UID support for
-  unionfs. add check for livecd.unionfs file on blockdev
-
-  19 Jul 2005; Eric Edgar <rocket@gentoo.org> gen_compile.sh,
-  gen_funcs.sh, gen_initramfs.sh, gen_initrd.sh, generic/linuxrc,
-  genkernel:
-  Fix --no-install cleaning the tmpdir bug that plasmaroo reported
-
-  18 Jul 2005; Eric Edgar <rocket@gentoo.org> genkernel:
-  Fix info about the framebuffers
-
-  18 Jul 2005; Eric Edgar <rocket@gentoo.org> gen_funcs.sh,
-  genkernel:
-  cause genkernel to die if cant write to the DEBUGFILE. remove
-  extra info strings that arent necessary
-
-  18 Jul 2005; Eric Edgar <rocket@gentoo.org> genkernel:
-  Fix genkernel finishing info messages to be more accurate
-
-  18 Jul 2005; Eric Edgar <rocket@gentoo.org> gen_funcs.sh,
-  genkernel:
-  Cleanup tmpdirs if genkernel dies abnormally
-
-  18 Jul 2005; Eric Edgar <rocket@gentoo.org> gen_initrd.sh:
-  Fix evms bugs with missing sbin for an initrd
-
-  18 Jul 2005; Eric Edgar <rocket@gentoo.org>
-  gen_determineargs.sh, gen_initramfs.sh:
-  Fix evms bugs with missing sbin. Remove prepare line as it
-  probably isnt necessary
-
-  18 Jul 2005; Eric Edgar <rocket@gentoo.org> gen_bootloader.sh,
-  gen_cmdline.sh, gen_determineargs.sh, gen_funcs.sh,
-  gen_initramfs.sh, gen_package.sh, generic/initrd.scripts,
-  generic/linuxrc, genkernel, genkernel.conf:
-  Create additional cleanup options. --postclear for final
-  cleanup and 2 new genkernel.conf options. Also fixup TEMP dir
-  creation and extraneous %%ARCH%% creation in the cache_dir
-
-  16 Jul 2005; Tim Yamin <plasmaroo@gentoo.org>
-  gen_initramfs.sh, gen_initrd.sh, genkernel:
-  Fix #98886.
-
-  15 Jul 2005; Tim Yamin <plasmaroo@gentoo.org> generic/linuxrc,
-  genkernel:
-  >> 3.2.6. Fix mkdir linuxrc issues and bootstrapCD() not getting
-  called as early as it should,
-
-  14 Jul 2005; Tim Yamin <plasmaroo@gentoo.org>
-  generic/initrd.scripts:
-  Fix '[: /dev/md: unknown operand' for LiveCD boots.
-
-  14 Jul 2005; Tim Yamin <plasmaroo@gentoo.org>
-  ia64/kernel-config-2.6:
-  Add USB Storage support.
-
-  14 Jul 2005; Tim Yamin <plasmaroo@gentoo.org> generic/linuxrc:
-  Fix bug #80617.
-
-  14 Jul 2005; Tim Yamin <plasmaroo@gentoo.org>
-  gen_bootloader.sh, +gen_bootloader_grub.awk,
-  gen_determineargs.sh, genkernel, ia64/kernel-config-2.6:
-  Fix #98944, add GRUB :root_device support and add a more
-  versatile grub.conf updater.
-
-  14 Jul 2005; Tim Yamin <plasmaroo@gentoo.org>
-  x86/kernel-config-2.6:
-  Add an updated x86 kernel config from wolf31o2.
-
-  13 Jul 2005; Tim Yamin <plasmaroo@gentoo.org>
-  alpha/busy-config, ia64/busy-config, parisc/busy-config,
-  parisc64/busy-config, ppc/busy-config, ppc64/busy-config,
-  sparc/busy-config, sparc64/busy-config, um/busy-config,
-  x86/busy-config, x86_64/busy-config, xen0/busy-config,
-  xenU/busy-config:
-  Add CONFIG_ASH_TIMEOUT.
-
-  13 Jul 2005; Eric Edgar <rocket@gentoo.org>
-  generic/initrd.scripts:
-  Fix find|grep output
-
-  13 Jul 2005; Eric Edgar <rocket@gentoo.org> gen_initramfs.sh,
-  gen_initrd.sh:
-  Fix typo for evms and removing the swap libs in gen_initramfs
-
-  13 Jul 2005; Tim Yamin <plasmaroo@gentoo.org>
-  alpha/busy-config, gen_bootloader.sh, gen_compile.sh,
-  gen_configkernel.sh, gen_determineargs.sh, gen_initramfs.sh,
-  gen_package.sh, generic/initrd.scripts, generic/linuxrc,
-  genkernel, genkernel.conf, ia64/busy-config, parisc/busy-config,
-  parisc64/busy-config,
-  -pkg/busybox-1.00-pre7-crypto-losetup-2.patch,
-  -pkg/busybox-1.00-pre7-losetup-crypto-alpha.tar.bz2,
-  +pkg/busybox-1.00-rt-mdstart.plasmaroo.tar.bz2, ppc/busy-config,
-  ppc64/busy-config, sparc/busy-config, sparc64/busy-config,
-  um/busy-config, x86/busy-config, x86_64/busy-config,
-  xen0/busy-config, xenU/busy-config:
-  Fix #97672, #98886, #98893, #98897; fix real_root=/dev/mdX:
-  upgraded busybox to 1.00, porting in my read -t and mdstart
-  patches.
-
-  13 Jul 2005; Eric Edgar <rocket@gentoo.org> genkernel:
-  Fix for bug 97672. Call get_KV to get the KV after the prepare
-  has been run
-
-  12 Jul 2005; Eric Edgar <rocket@gentoo.org> gen_cmdline.sh:
-  Fix minor print bug 98744. Shouldnt affect operation but it
-  could be annoying
-
-  12 Jul 2005; Eric Edgar <rocket@gentoo.org> gen_compile.sh:
-  Fix for hardened/selinux systems to have extened attributes, per
-  r2d2's request
-
-  12 Jul 2005; Eric Edgar <rocket@gentoo.org> gen_cmdline.sh,
-  gen_determineargs.sh, genkernel:
-  Adding --symlink to fix bug 98716
-
-  12 Jul 2005; Tim Yamin <plasmaroo@gentoo.org>
-  generic/initrd.scripts, generic/modprobe, genkernel,
-  genkernel.conf:
-  >> 3.2.2. Fix #83771, #97700, #98590, #98594, #98661, #98746.
-
-  12 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.defaults, generic/linuxrc:
-  Added multilib cdboot patch.
-
-  11 Jul 2005; Eric Edgar <rocket@gentoo.org> gen_cmdline.sh,
-  gen_compile.sh, gen_determineargs.sh, gen_initramfs.sh,
-  gen_initrd.sh, generic/initrd.scripts, generic/linuxrc,
-  genkernel, genkernel.conf:
-  ENHANCEMENT bug 83771. Add support for LABEL= and UUID=
-
-  11 Jul 2005; Eric Edgar <rocket@gentoo.org>
-  gen_determineargs.sh:
-  Fix bug 97700. Add additional check for kernel source directory
-  earlier
-
-  11 Jul 2005; Eric Edgar <rocket@gentoo.org> gen_arch.sh:
-  Fix bug 95280 in genkernel. ARCH_OVERRIDE in
-  /etc/genkernel.conf should work now
-
-  11 Jul 2005; Eric Edgar <rocket@gentoo.org>
-  gen_determineargs.sh, generic/initrd.scripts, generic/linuxrc:
-  remove extra make prepare in gen_determineargs.sh that breaks
-  things. Fix md /dev creation bug 98193
-
-  11 Jul 2005; Eric Edgar <rocket@gentoo.org> gen_cmdline.sh:
-  Fix bug 98661 with the missing underscore in gen_cmdline.sh
-
-  11 Jul 2005; Eric Edgar <rocket@gentoo.org>
-  generic/initrd.scripts, generic/linuxrc:
-  Fix to let the /mnt/cdrom/cdupdate.sh script run just before the
-  chroot
-
-  11 Jul 2005; Eric Edgar <rocket@gentoo.org>
-  generic/initrd.scripts:
-  send stderr to /dev/null for lvm startup
-
-  10 Jul 2005; Tim Yamin <plasmaroo@gentoo.org>
-  gen_bootloader.sh, generic/linuxrc, genkernel:
-  Fix #93178, #98436, #98501
-
-  08 Jul 2005; Tim Yamin <plasmaroo@gentoo.org> gen_cmdline.sh,
-  gen_initramfs.sh, generic/initrd.defaults,
-  generic/initrd.scripts, generic/linuxrc, genkernel, genkernel.8,
-  genkernel.conf, x86/busy-config, x86_64/busy-config:
-  >> 3.2.0. Add spock's gensplash fixes, fix initrd startup 'find:
-  ...' errors.
-
-  01 Jul 2005; Tim Yamin <plasmaroo@gentoo.org> ppc/Pegasos:
-  Update Pegasos config from dholm.
-
-  01 Jul 2005; Eric Edgar <rocket@gentoo.org> genkernel:
-  fix bug 97378; setup the PATH environment properly.
-
-  29 Jun 2005; Tim Yamin <plasmaroo@gentoo.org>
-  +pkg/udev-054.tar.bz2, -pkg/udev-058.tar.bz2:
-  Downgrade to 054.
-
-  29 Jun 2005; Eric Edgar <rocket@gentoo.org> gen_compile.sh,
-  gen_determineargs.sh:
-  fix unionfs-modules-bincache naming error. Fix directory change
-  error on unionfs
-
-  29 Jun 2005; Eric Edgar <rocket@gentoo.org> gen_compile.sh:
-  run modules_prepare in the kernel tree before unionfs modules
-  compile
-
-  28 Jun 2005; Tim Yamin <plasmaroo@gentoo.org>
-  pkg/udev-058.tar.bz2:
-  Revert to 1.1.
-
-  28 Jun 2005; Eric Edgar <rocket@gentoo.org> gen_compile.sh,
-  generic/initrd.scripts, generic/linuxrc, pkg/udev-058.tar.bz2:
-  changed to backticks and changed /bin/bash back to /bin/sh
-  which is a valid shell inside the initrd/initramfs
-
-  27 Jun 2005; Tim Yamin <plasmaroo@gentoo.org> gen_compile.sh,
-  genkernel, genkernel.conf, -pkg/udev-054.tar.bz2,
-  +pkg/udev-058.tar.bz2:
-  Update udev and fix for SPARC64.
-
-  27 Jun 2005; Eric Edgar <rocket@gentoo.org>
-  gen_configkernel.sh:
-  bug 97051: Initramfs on 2.6+ kernels dont require ext2
-  filesystem so can drop this forced entry.
-
-  27 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/initrd.defaults, generic/initrd.scripts, generic/linuxrc:
-  Change all EVMS/evms to EVMS2/evms2 for consitency. Also,
-  enabled dodmraid by default.
-
-  27 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  generic/linuxrc:
-  Must use /bin/bash for dollar-sign, parentheses sub-shell syntax.
-
-  27 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  x86/modules_load, x86_64/modules_load:
-  Changed sata_vitesse to sata_vsc and closing bug #97089.
-
-  27 Jun 2005; Eric Edgar <rocket@gentoo.org> generic/linuxrc:
-  linuxrc that should not create avc denied messages for a
-  hardened system.
-
-  24 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> genkernel:
-  _pre12... ph43r...
-
-  24 Jun 2005; Eric Edgar <rocket@gentoo.org> genkernel:
-  Add info for cmdline usage to genkernel
-
-  23 Jun 2005; Eric Edgar <rocket@gentoo.org>
-  generic/initrd.scripts:
-  Fix confusing volume manager message
-
-  23 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  alpha/modules_load, x86_64/modules_load:
-  Add Fusion MPT support
-
-  23 Jun 2005; Eric Edgar <rocket@gentoo.org> x86/modules_load:
-  Add Fusion MPT support for VMWare machines
-
-  23 Jun 2005; Eric Edgar <rocket@gentoo.org> gen_compile.sh:
-  Add missing else
-
-  23 Jun 2005; Eric Edgar <rocket@gentoo.org> gen_compile.sh:
-  Fix missing elif
-
-  22 Jun 2005; Tim Yamin <plasmaroo@gentoo.org> generic/linuxrc,
-  genkernel, pkg/udev-054.tar.bz2:
-  Fix #76082, #86487, #87673, #95993.
-
-  22 Jun 2005; Eric Edgar <rocket@gentoo.org>
-  generic/initrd.scripts, generic/linuxrc:
-  Fix bug 87673. Option passing for dmraid. dodmraid= on the
-  cmdline. sets up /sbin/dmraid -ay .
-
-  22 Jun 2005; Eric Edgar <rocket@gentoo.org> generic/linuxrc:
-  Fix for bug 86487. Allowing a subdirectory of a block device to
-  be chrooted from and booted. New cmdline option subdir=
-
-  22 Jun 2005; Eric Edgar <rocket@gentoo.org> gen_compile.sh:
-  Fix udev for sparc so it compiles properly
-
-  22 Jun 2005; Eric Edgar <rocket@gentoo.org>
-  generic/initrd.scripts, generic/linuxrc:
-  Remove sort because busybox is not compiled with it. Remove
-  unnecessary UML fixes
-
-  22 Jun 2005; Eric Edgar <rocket@gentoo.org> gen_cmdline.sh,
-  gen_compile.sh, gen_determineargs.sh:
-  Fix bug 68903; Allows the CROSS_COMPILE env to be set for
-  kernel compiles. Added --kernel-cross-compile= option
-
-  21 Jun 2005; Tim Yamin <plasmaroo@gentoo.org> gen_cmdline.sh,
-  genkernel, genkernel.8:
-  Fix #95993, #96300.
-
-  20 Jun 2005; Eric Edgar <rocket@gentoo.org>
-  gen_determineargs.sh:
-  Fix genkernel crash when .config is present and testing for
-  Localversion info on a 2.6 kernel
-
-  17 Jun 2005; Eric Edgar <rocket@gentoo.org>
-  gen_determineargs.sh:
-  Fix 2.6 crash detecting LocalVersion, fix 2.4 kernels so they
-  dont do localversion checks as they dont support it
-
-  16 Jun 2005; Eric Edgar <rocket@gentoo.org> gen_compile.sh:
-  udev build fix for no ARCH=um architectures
-
-  16 Jun 2005; Eric Edgar <rocket@gentoo.org>
-  gen_determineargs.sh, gen_initramfs.sh, gen_initrd.sh,
-  gen_moddeps.sh, genkernel:
-  Localversion changes to kerncache, and added a sleep statement
-  so modprobe loop has a chance to work
-
-  15 Jun 2005; Tim Yamin <plasmaroo@gentoo.org> genkernel:
-  Fix devfs for those archs that still need it.
-
-  15 Jun 2005; Tim Yamin <plasmaroo@gentoo.org> gen_cmdline.sh,
-  gen_compile.sh, gen_determineargs.sh, gen_funcs.sh,
-  gen_initramfs.sh, gen_initrd.sh, gen_package.sh,
-  generic/initrd.defaults, generic/initrd.scripts,
-  generic/linuxrc, genkernel, genkernel.conf:
-  Add rocket's unionfs patch and linuxrc cleanup; fix Pegasos with
-  regard to initramfs.
-
-  15 Jun 2005; Tim Yamin <plasmaroo@gentoo.org> ppc/Pegasos,
-  ppc/config.sh:
-  Fix Pegasos on initramfs and add an updated Pegasos config,
-  thanks dholm!
-
-  12 Jun 2005; Tim Yamin <plasmaroo@gentoo.org> generic/linuxrc:
-  Fix 'lib64: No such...' error.
-
-  07 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_package.sh:
-  Fixing up minkernpackage
-
-  07 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  x86_64/kernel-config-2.6:
-  Added floppy module to kernel config for bug #95272.
-
-  04 Jun 2005; Tim Yamin <plasmaroo@gentoo.org>
-  x86_64/kernel-config-2.6:
-  Disable sound stuff, #92711.
-
-  03 Jun 2005; Tim Yamin <plasmaroo@gentoo.org>
-  gen_bootloader.sh, genkernel:
-  Fix syntax.
-
-  02 Jun 2005; Tim Yamin <plasmaroo@gentoo.org>
-  gen_bootloader.sh:
-  Add GRUB support cleanup by Richard Morris (#59192) to show an
-  error if we can't work out device nodes and tell the user to
-  manually generate grub.conf.
-
-  02 Jun 2005; Tim Yamin <plasmaroo@gentoo.org>
-  +gen_initramfs.sh:
-  Add gen_initramfs.sh into CVS from rocket's initramfs support
-  patches.
-
-  02 Jun 2005; Tim Yamin <plasmaroo@gentoo.org> genkernel:
-  Fix #94860; clean up concurrent compile tmpdir-setting.
-
-  02 Jun 2005; Tim Yamin <plasmaroo@gentoo.org>
-  alpha/busy-config, generic/initrd.defaults,
-  generic/initrd.scripts, generic/linuxrc, genkernel.8,
-  ia64/busy-config, parisc/busy-config, parisc64/busy-config,
-  ppc/busy-config, ppc64/busy-config, sparc/busy-config,
-  sparc64/busy-config, um/busy-config, x86/busy-config,
-  x86_64/busy-config, xen0/busy-config, xenU/busy-config:
-  Remove evms and lvm2 from default boot args (they cause hardware
-  issues, so users should explicitly specify them); add NFSboot
-  support patches by Thomas Seiler.
-
-  02 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  x86/kernel-config-2.6:
-  Updated x86 2.6 kernel to 2005.0 config.
-
-  02 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  alpha/kernel-config-2.4, +alpha/kernel-config-2.6,
-  alpha/modules_load, um/modules_load, x86/modules_load,
-  x86_64/modules_load, xen0/modules_load, xenU/modules_load:
-  Updated alpha kernel configs to 2005.0 configs and updated
-  modules_load for alpha, um, x86, x86_64, xen0, and xenU to match
-  x86.
-
-  02 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_configkernel.sh:
-  Added config parsing for dmraid modules if genkernel is called
-  with --dmraid
-
-  25 May 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  gen_configkernel.sh:
-  Added check for --lvm2 and enable lvm2-required modules if they
-  are not enabled already in the supplied .config file.
-
-  25 May 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  x86/modules_load:
-  Adding back in atp870u to modules_load on x86.
-
-  02 May 2005; Tim Yamin <plasmaroo@gentoo.org> x86/modules_load:
-  Add ata_piix.
-
-  22 Apr 2005; Eric Edgar <rocket@gentoo.org> generic/linuxrc:
-  Added support for reading /mnt/cdrom/cdupdate.sh if its
-  executable on the livecd
-
-  22 Apr 2005; Tim Yamin <plasmaroo@gentoo.org> gen_cmdline.sh,
-  gen_compile.sh, gen_configkernel.sh, gen_determineargs.sh,
-  gen_initrd.sh, gen_package.sh, generic/linuxrc, genkernel,
-  genkernel.8, -notes, -pkg/dietlibc-0.27.tar.bz2, +pkg/ia64,
-  +pkg/ia64/README, +pkg/um, +pkg/um/README, +pkg/xen0,
-  +pkg/xen0/README, +pkg/xenU, +pkg/xenU/README, +ppc/Pegasos,
-  ppc/config.sh, +um, +um/busy-config, +um/config.sh,
-  +um/kernel-config-2.4, +um/kernel-config-2.6, +um/modules_load,
-  +xen0, +xen0/busy-config, +xen0/config.sh,
-  +xen0/kernel-config-2.4, +xen0/kernel-config-2.6,
-  +xen0/modules_load, +xenU, +xenU/busy-config, +xenU/config.sh,
-  +xenU/kernel-config-2.4, +xenU/kernel-config-2.6,
-  +xenU/modules_load:
-  >> 3.2.0_beta1; now with extra froz-faktor <TM>.
-
-  29 Mar 2005; Eric Edgar <rocket@gentoo.org> generic/linuxrc:
-  fixed bug in scan delay so that it will work with both udev and
-  devfs
-
-  13 Mar 2005; Tim Yamin <plasmaroo@gentoo.org> generic/linuxrc:
-  Add missing mkdir -p /etc/sysconfig to linuxrc.
-
-  12 Mar 2005; Tim Yamin <plasmaroo@gentoo.org> generic/linuxrc:
-  Get udev to go as the default manager if the udev binary exists
-  and 2.6 or above is being used.
-
-  11 Mar 2005; Tim Yamin <plasmaroo@gentoo.org> gen_compile.sh:
-  mkdir -> mkdir -p
-
-  10 Mar 2005; Tim Yamin <plasmaroo@gentoo.org> gen_compile.sh,
-  genkernel:
-  Fix udev.rules install issue.
-
-  10 Mar 2005; Tim Yamin <plasmaroo@gentoo.org> gen_compile.sh,
-  genkernel, genkernel.conf, -pkg/udev-039.tar.bz2,
-  +pkg/udev-054.tar.bz2:
-  >> 3.1.3. Remove udev static mode; upgrade udev to 054 instead.
-
-  08 Mar 2005; Tim Yamin <plasmaroo@gentoo.org>
-  generic/initrd.defaults, generic/linuxrc:
-  Add patch by Gerte Hoogewerf (gerte <-at-> nieuwenborg.nl) to
-  fix dmraid with cdroot.
-
-  07 Mar 2005; Eric Edgar <rocket@gentoo.org>
-  gen_configkernel.sh:
-  Fix possible broken pipe error message when configuring the
-  kernel
-
-  07 Mar 2005; Eric Edgar <rocket@gentoo.org> gen_compile.sh:
-  Fix for broken pipe when configuring busybox in the
-  gen_compile.sh script
-
-  07 Mar 2005; Tim Yamin <plasmaroo@gentoo.org> generic/linuxrc,
-  genkernel, x86/modules_load, x86_64/modules_load:
-  >> 3.1.1d. Add sata_qstor; fix #83328.
-
-  03 Mar 2005; Tim Yamin <plasmaroo@gentoo.org>
-  generic/initrd.scripts:
-  Check for dummy 'livecd' file instead of 'gentoo'.
-
-  03 Mar 2005; Tim Yamin <plasmaroo@gentoo.org>
-  generic/initrd.scripts, genkernel:
-  >> 3.1.1c. Add LiveCD detection to skip mountable but non-LiveCD
-  media; requires Catalyst 1.1.6.
-
-  02 Mar 2005; Tim Yamin <plasmaroo@gentoo.org> genkernel,
-  genkernel.conf:
-  Bump dmraid, >> 3.1.1.b.
-
-  01 Mar 2005; Tim Yamin <plasmaroo@gentoo.org> gen_compile.sh,
-  genkernel:
-  Fix 2.4 -j0 issue.
-
-  28 Feb 2005; Tim Yamin <plasmaroo@gentoo.org> gen_compile.sh:
-  Fix -j0 2.4 modules breakage.
-
-  25 Feb 2005; Tim Yamin <plasmaroo@gentoo.org> gen_compile.sh,
-  generic/initrd.defaults, genkernel, x86/modules_load,
-  x86_64/modules_load:
-  >> 3.1.0k -- Add MODULES_SATA, fix udev on non-x86 archs where
-  there seem to be problems with KLibC+udev so use a static udev
-  on those.
-
-  24 Feb 2005; Eric Edgar <rocket@gentoo.org> gen_cmdline.sh,
-  gen_determineargs.sh, gen_package.sh, genkernel, genkernel.8:
-  Add support for maxkernpackage
-  creates a tarball containing:
-  kernel
-  initrd
-  contents of /lib/modules
-  kernel config
-
-  24 Feb 2005; Tim Yamin <plasmaroo@gentoo.org> gen_compile.sh:
-  Fix 2.4 strict flag filtering issue.
-
-  24 Feb 2005; Tim Yamin <plasmaroo@gentoo.org> genkernel.8:
-  Document arbitrary scandelay initrd option.
-
-  20 Feb 2005; Tim Yamin <plasmaroo@gentoo.org> generic/linuxrc,
-  genkernel:
-  Fix '/tmp/.initrd/bin/[' to '[' in places before the pivot_root.
-
-  18 Feb 2005; Tim Yamin <plasmaroo@gentoo.org> generic/linuxrc,
-  genkernel, pkg/udev-039.tar.bz2, x86/modules_load:
-  Fix #58686 and #80716.
-
-  17 Feb 2005; Tim Yamin <plasmaroo@gentoo.org> gen_cmdline.sh,
-  gen_compile.sh, gen_determineargs.sh, gen_initrd.sh,
-  generic/linuxrc, genkernel.conf, pkg/udev-039.tar.bz2:
-  Add DMRAID support (thanks rocket!); fix AMD64 udev issues (#65985).
-
-  31 Jan 2005; Tim Yamin <plasmaroo@gentoo.org> generic/linuxrc:
-  Fix #77259.
-
-  30 Jan 2005; Tim Yamin <plasmaroo@gentoo.org> generic/linuxrc,
-  genkernel:
-  Fix #79999.
-
-  27 Jan 2005; Tim Yamin <plasmaroo@gentoo.org> gen_initrd.sh:
-  -eq >> = for the LVM and EVMS2 checks.
-
-  27 Jan 2005; Tim Yamin <plasmaroo@gentoo.org> generic/linuxrc,
-  genkernel:
-  Add patch for turning off LVM and EVMS2 optionally at boot time
-  even if compiled into initrd; bug #79755.
-
-  26 Jan 2005; Tim Yamin <plasmaroo@gentoo.org> gen_initrd.sh:
-  Fix #79502; thanks to rocket for the patch.
-
-  22 Jan 2005; Tim Yamin <plasmaroo@gentoo.org> genkernel:
-  Make udev default for 2.6+
-
-  22 Jan 2005; Tim Yamin <plasmaroo@gentoo.org> generic/linuxrc:
-  Add missing #72253 patch.
-
-  22 Jan 2005; Tim Yamin <plasmaroo@gentoo.org> generic/linuxrc:
-  Add missing echo; #77363.
-
-  22 Jan 2005; Tim Yamin <plasmaroo@gentoo.org>
-  gen_bootloader.sh, generic/initrd.scripts, generic/linuxrc,
-  genkernel:
-  >> 3.1.0e. Fixes #73356, #74758, #77277, #77363, #78636.
-
-  10 Jan 2005; Tim Yamin <plasmaroo@gentoo.org> gen_cmdline.sh,
-  gen_initrd.sh:
-  Add --evms2 patch by Eric Edgar; bug #77385.
-
-  21 Dec 2004; Tim Yamin <plasmaroo@gentoo.org> genkernel,
-  pkg/dietlibc-0.27.tar.bz2:
-  >> 3.1.0d; bug #73112.
-
-  17 Dec 2004; Tim Yamin <plasmaroo@gentoo.org> x86/modules_load:
-  Removing tmscsim module; bug #72055.
-
-  01 Dec 2004; Tim Yamin <plasmaroo@gentoo.org> gen_initrd.sh:
-  Fix for bug #73054.
-
-  30 Nov 2004; Tim Yamin <plasmaroo@gentoo.org>
-  gen_determineargs.sh, gen_initrd.sh:
-  >> 3.0.2c. Adding LVM2 args code to gen_determineargs.sh.
-
-  29 Nov 2004; Tim Yamin <plasmaroo@gentoo.org> genkernel:
-  Bugfix for bug #72342.
-
-  27 Nov 2004; Tim Yamin <plasmaroo@gentoo.org> genkernel,
-  +genkernel.8:
-  Time for our own manpage...
-
-  27 Nov 2004; Tim Yamin <plasmaroo@gentoo.org> gen_cmdline.sh,
-  gen_compile.sh, gen_determineargs.sh, gen_initrd.sh, genkernel,
-  genkernel.conf:
-  LVM2 compilation support; thanks to Eric Edgar for the patch.
-  Bug #72129.
-
-  27 Nov 2004; Tim Yamin <plasmaroo@gentoo.org> gen_initrd.sh,
-  generic/initrd.scripts, generic/linuxrc:
-  Udev speedups; thanks to Eric Edgar for the patch - bug #72253.
-
-  27 Nov 2004; Tim Yamin <plasmaroo@gentoo.org> x86/modules_load:
-  Adding MODULES_LVM2; #72129 // #72253.
-
-  13 Nov 2004; Tim Yamin <plasmaroo@gentoo.org> gen_cmdline.sh,
-  gen_initrd.sh:
-  Adding user-specified /linuxrc support; bug #66198.
-
-  13 Nov 2004; Tim Yamin <plasmaroo@gentoo.org> genkernel:
-  ramdisk=8092 >> ramdisk_size=8092; bug #64864.
-
-  13 Nov 2004; Tim Yamin <plasmaroo@gentoo.org> gen_cmdline.sh,
-  gen_initrd.sh, generic/initrd.defaults, generic/linuxrc:
-  Adding EVMS2 support; bug #61827.
-
-  13 Nov 2004; Tim Yamin <plasmaroo@gentoo.org> gen_initrd.sh:
-  LVM fix, bug #69745.
-
-  05 Nov 2004; Tim Yamin <plasmaroo@gentoo.org> gen_cmdline.sh:
-  Fix for --minkernpackage and 'kernel' only instead of all; bug
-  #70193.
-
-  26 Oct 2004; Tim Yamin <plasmaroo@gentoo.org> x86/modules_load:
-  uchi-hcd >> uhci-hcd.
-
-  25 Oct 2004; Mike Frysinger <vapier@gentoo.org> gen_cmdline.sh:
-  clean up some of the help output
-
-  23 Oct 2004; Tim Yamin <plasmaroo@gentoo.org> README,
-  gen_cmdline.sh, gen_compile.sh, gen_determineargs.sh,
-  gen_initrd.sh, generic/initrd.defaults, generic/initrd.scripts,
-  generic/linuxrc, genkernel, genkernel.conf,
-  -pkg/busybox-1.00-pre2-decl.patch,
-  pkg/busybox-1.00-pre7-losetup-crypto-alpha.tar.bz2,
-  pkg/devfsd-1.3.25-dietlibc-kernel25.tar.bz2,
-  -pkg/dietlibc-0.26.tar.bz2, +pkg/dietlibc-0.27.tar.bz2,
-  -pkg/udev-030.tar.bz2, +pkg/udev-039.tar.bz2, x86/modules_load:
-  >> 3.1.0b.
-
-  09 Oct 2004; Tim Yamin <plasmaroo@gentoo.org> gen_initrd.sh:
-  vgscan >> lvm; bug #44091.
-
-  02 Oct 2004; Travis Tilley <lv@gentoo.org> x86_64/modules_load:
-  fix the sata crap
-
-  27 Sep 2004; Travis Tilley <lv@gentoo.org>
-  x86_64/kernel-config-2.6, x86_64/kernel-config-2.6-smp,
-  x86_64/modules_load:
-  add bluetooth for one user's bluetooth kb+mouse, fix usb module
-  stuff, add in support for an ide chipset used in some em64t boxes
-
-  27 Sep 2004; Travis Tilley <lv@gentoo.org>
-  x86_64/kernel-config-2.6, x86_64/kernel-config-2.6-smp:
-  CONFIG_SCSI_AIC7XXX_OLD, you are the weakest link! goodbye!
-
-  26 Sep 2004; Travis Tilley <lv@gentoo.org>
-  x86_64/kernel-config-2.6, x86_64/kernel-config-2.6-smp:
-  new generic genkernel configs. em64t support, here we come
-
-  19 Sep 2004; Tim Yamin <plasmaroo@gentoo.org>
-  x86/kernel-config-2.6:
-  Adding CONFIG_CRYPTO_ARC4=m; bug #58360.
-
-  19 Sep 2004; Tim Yamin <plasmaroo@gentoo.org>
-  gen_bootloader.sh:
-  Adding updated grub.conf patch from Mathias Gug, bug #57576.
-
-  19 Sep 2004; Tim Yamin <plasmaroo@gentoo.org> gen_compile.sh,
-  gen_funcs.sh, genkernel:
-  Adding robbat2's patch for bug #62365.
-
-  19 Sep 2004; Tim Yamin <plasmaroo@gentoo.org> gen_compile.sh,
-  genkernel, genkernel.conf,
-  pkg/devfsd-1.3.25-dietlibc-kernel25.tar.bz2,
-  -pkg/dietlibc-0.24.tar.bz2, +pkg/dietlibc-0.26.tar.bz2:
-  Disabling dietlibc usage for devfsd and modutils; dietlibc
-  updated to a new Hardened-aware version. Bug #60862.
-
-  18 Sep 2004; Tim Yamin <plasmaroo@gentoo.org> gen_package.sh:
-  Adding missing {} around a logic check; bug #64514.
-
-  23 Aug 2004; Tim Yamin <plasmaroo@gentoo.org> gen_cmdline.sh:
-  --no-lvm-2 >> --no-lvm2 as it should be.
-
-  23 Aug 2004; Tim Yamin <plasmaroo@gentoo.org> gen_funcs.sh:
-  Updated the --cache-dir patch to patch #36982.
-
-  14 Aug 2004; Tim Yamin <plasmaroo@gentoo.org> gen_initrd.sh,
-  +ia64, +ia64/busy-config, +ia64/config.sh,
-  +ia64/kernel-config-2.6, +ia64/modules_load:
-  Added an ia64 config.
-
-  11 Aug 2004; Tim Yamin <plasmaroo@gentoo.org> genkernel:
-  Added a check to disable udev on 2.4 kernels; bug #59687.
-
-  11 Aug 2004; Tim Yamin <plasmaroo@gentoo.org> gen_cmdline.sh,
-  gen_compile.sh, gen_determineargs.sh, gen_initrd.sh,
-  generic/initrd.scripts, generic/linuxrc, genkernel:
-  Added LiveCD udev support.
-
-  07 Aug 2004; Tim Yamin <plasmaroo@gentoo.org>
-  x86/kernel-config-2.6, x86/modules_load:
-  modules_load cleaned up to match the version used for the 2004.2
-  release, also added BusLogic=m to the 2.6 configartion: bug #59310.
-
-  30 Jul 2004; Tim Yamin <plasmaroo@gentoo.org>
-  generic/initrd.scripts:
-  Removed "-t iso9660" which causes issues on Gentoo/PPC-Pegasos,
-  supposedly.
-
-  29 Jul 2004; Tim Yamin <plasmaroo@gentoo.org> gen_cmdline.sh,
-  gen_determineargs.sh, gen_funcs.sh, genkernel, genkernel.conf:
-  Patch for bug #57867 adding --cachedir=<dir> by Martin Parm.
-
-  29 Jul 2004; Tim Yamin <plasmaroo@gentoo.org> gen_initrd.sh,
-  genkernel:
-  '-ne' >> '!=' for LVM2 static support to work properly; bug
-  #58816.
-
-  28 Jul 2004; Tim Yamin <plasmaroo@gentoo.org>
-  x86/kernel-config-2.4:
-  Ext3 shouldn't really be a module - bug #58663.
-
-  28 Jul 2004; Tim Yamin <plasmaroo@gentoo.org> gen_compile.sh,
-  generic/linuxrc:
-  Fix for "udev" not having to be passed to the linuxrc; and a fix
-  for the devfsd bincache not being used.
-
-  28 Jul 2004; Tim Yamin <plasmaroo@gentoo.org>
-  gen_bootloader.sh, gen_cmdline.sh, gen_compile.sh,
-  gen_determineargs.sh, gen_initrd.sh, generic/linuxrc, genkernel,
-  genkernel.conf, +pkg/udev-030.tar.bz2:
-  >> 3.0.2e. Code formatting fixes from Bob Barry, as well as a
-  patch for bug #57953 from Martin Parm. Udev support, bug #49328.
-
-  22 Jul 2004; Tim Yamin <plasmaroo@gentoo.org> gen_compile.sh:
-  Fix for bug #57865. Thanks to Martin Parm for the patch!
-
-  21 Jul 2004; Tim Yamin <plasmaroo@gentoo.org> genkernel:
-  Added a patch for only [re]mounting /boot when installation is
-  required. Patch from bug #57836 by Martin "Parmus" Parm.
-
-  21 Jul 2004; Tim Yamin <plasmaroo@gentoo.org>
-  +gen_bootloader.sh, gen_cmdline.sh, gen_determineargs.sh,
-  genkernel, genkernel.conf:
-  GRUB Bootloader support - bug #57576. Thanks to Mathias Gug for
-  the patch!
-
-  21 Jul 2004; Tim Yamin <plasmaroo@gentoo.org> gen_cmdline.sh,
-  gen_compile.sh, gen_determineargs.sh, gen_initrd.sh,
-  gen_moddeps.sh, genkernel, genkernel.conf:
-  Adding a set of patches submitted by Martin "Parmus" Parm; bugs
-  #57748, #57749, #57751, #57752, and #57761.
-
-  16 Jul 2004; Tim Yamin <plasmaroo@gentoo.org> gen_cmdline.sh,
-  gen_funcs.sh, genkernel:
-  Bug #57297 fix.
-
-  14 Jul 2004; Tim Yamin <plasmaroo@gentoo.org> gen_cmdline.sh,
-  genkernel, pkg/modutils-2.4.26.tar.bz2:
-  >> 3.0.2d. Modutils ./configure* patch for HPPA and an option
-  parsing fix.
-
-  12 Jul 2004; Tim Yamin <plasmaroo@gentoo.org>
-  x86/kernel-config-2.6:
-  Added CONFIG_PRINTER=y; bug #47666.
-
-  12 Jul 2004; Tim Yamin <plasmaroo@gentoo.org>
-  gen_configkernel.sh, x86/config.sh:
-  Added a sed to ensure Ext2 support is on; bug #52558.
-
-  12 Jul 2004; Tim Yamin <plasmaroo@gentoo.org> gen_funcs.sh,
-  gen_initrd.sh, genkernel, x86/modules_load:
-  >> 3.0.2c. Added more PCMCIA modules to the x86 module list; and
-  added the bug
-  #52561 patch.
-
-  03 Jul 2004; Tim Yamin <plasmaroo@gentoo.org> generic/linuxrc:
-  Added a patch allowing arguments to be passed to init by
-  real_init=...; this closes bug #55736.
-
-  19 Jun 2004; Tim Yamin <plasmaroo@gentoo.org>
-  gen_configkernel.sh:
-  Fix for bug #54455; moved the code to create a backup .config
-  upwards since
-  before the "make mrproper" just wiped it out.
-
-  04 Jun 2004; Tim Yamin <plasmaroo@gentoo.org>
-  generic/keymaps.tar.gz:
-  New keymaps tarball lost the keymapList file; added back in.
-
-  03 Jun 2004; Tim Yamin <plasmaroo@gentoo.org>
-  alpha/modules_load, gen_arch.sh, gen_cmdline.sh, gen_compile.sh,
-  gen_configkernel.sh, gen_determineargs.sh, gen_funcs.sh,
-  gen_initrd.sh, gen_moddeps.sh, gen_package.sh,
-  generic/initrd.defaults, generic/initrd.scripts,
-  generic/keymaps.tar.gz, generic/linuxrc, generic/modprobe,
-  genkernel, parisc/modules_load, parisc64/modules_load,
-  pkg/busybox-1.00-pre7-losetup-crypto-alpha.tar.bz2,
-  ppc/modules_load, ppc64/modules_load, sparc/modules_load,
-  sparc64/modules_load, x86/kernel-config-2.4,
-  x86/kernel-config-2.6, x86/modules_load, x86_64/modules_load:
-  New release:
-  
-  * Busybox patched to support loops on 2.4 thus giving 2.4
-  squashfs
-  support.
-  * Various bug fixes; #46167, #46278, #47551, #48219, #48308,
-  #48339, #49728, #51395, #51948.
-  * Speedups: "" > ''; [ ! ... ] && > [ ... ] || et al where
-  applicable.
-
-  11 Apr 2004; Tim Yamin <plasmaroo@gentoo.org>
-  x86/kernel-config-2.6:
-  Modularized parallel support in the X86 2.6 configuration.
-
-  11 Apr 2004; Tim Yamin <plasmaroo@gentoo.org> gen_funcs.sh,
-  generic/linuxrc, genkernel:
-  Bugfixes for bugs #46941, #46641; and a cosmetic fix for LiveCD
-  mount issues.
-
-  02 Apr 2004; Tim Yamin <plasmaroo@gentoo.org> gen_cmdline.sh:
-  Added an error message for mistyped options [ Bug #45946 ] and
-  also shortened the help list into two sections: a long one specified by
-  --help and a short default one.
-
-  02 Apr 2004; Tim Yamin <plasmaroo@gentoo.org> gen_initrd.sh,
-  genkernel:
-  Fix for bug #46596; version header update.
-
-  28 Mar 2004; Tim Yamin <plasmaroo@gentoo.org> generic/linuxrc:
-  Applied the fixed for ``docache'' to work properly on zisofs.
-
-  27 Mar 2004; Tim Yamin <plasmaroo@gentoo.org> gen_compile.sh,
-  gen_initrd.sh, generic/initrd.defaults, generic/linuxrc:
-  A few short fixes: reduced compilation verbosity; bootsplash fix
-  to use both 'bootsplash' and 'bootsplash.conf' rather than 'bootsplash'
-  and also docache support which should work on at least loopFSes for now.
-
-  22 Mar 2004; Jason Wever <weeve@gentoo.org> sparc/config.sh:
-  Fixed MAKEOPTS for sparc32 so kernels will reliably build.
-
-  21 Mar 2004; Tim Yamin <plasmaroo@gentoo.org> README, TODO,
-  gen_cmdline.sh, gen_compile.sh, gen_configkernel.sh,
-  gen_determineargs.sh, gen_funcs.sh, gen_initrd.sh,
-  generic/initrd.defaults, generic/initrd.scripts,
-  +generic/keymaps.tar.gz, generic/linuxrc, generic/modprobe,
-  genkernel, genkernel.conf, x86/modules_load:
-  Version bump. Closes bugs #34948, #37371, #41129, #41166,
-  #42725, #42815, #44127, #44556, and #44601.
-
-  20 Mar 2004; Tim Yamin <plasmaroo@gentoo.org>
-  -pkg/busybox-1.00-pre8-alpha.patch,
-  -pkg/busybox-1.00-pre8-crypto-losetup.patch,
-  -pkg/busybox-1.00-pre8-losetup-alpha.tar.bz2:
-  Removing broken 1.00-pre8 busybox.
-
-  08 Mar 2004; Tom Gall <tgall@gentoo.org>
-  +ppc64/kernel-2.6-pSeries, +ppc64/kernel-2.6.g5:
-  g5 and pseries kernel config
-
-  08 Mar 2004; Brad House <brad_mssw@gentoo.org> +ppc64,
-  +ppc64/busy-config, +ppc64/config.sh, +ppc64/modules_load:
-  ppc64 profile
-
-  06 Mar 2004; Pieter van den Abeele <pvdabeel@gentoo.org>
-  +ppc/2.6.3-benh2-G4-SMP.autoload, +ppc/2.6.3-benh2-G4.autoload,
-  +ppc/2.6.3-benh2-G5-SMP.autoload, +ppc/2.6.3-benh2-G5.autoload:
-  What stuff needs to be automatically loaded for each kernel
-
-  06 Mar 2004; Pieter van den Abeele <pvdabeel@gentoo.org>
-  ppc/G4, ppc/G4-SMP, ppc/G5, ppc/G5-SMP:
-  bugfixes - posible /proc mounting lock bug solution included (removed
-  rivafb support)
-
-  06 Mar 2004; Pieter van den Abeele <pvdabeel@gentoo.org>
-  ppc/G4, ppc/G4-SMP, ppc/G5, ppc/G5-SMP:
-  bugfixed kernels - still rivafb enabled
-
-  01 Mar 2004; Brad House <brad_mssw@gentoo.org> genkernel:
-  version bump
-
-  01 Mar 2004; Brad House <brad_mssw@gentoo.org> genkernel.conf:
-  busybox version change
-
-  27 Feb 2004; Daniel Robbins <drobbins@gentoo.org>
-  gen_initrd.sh:
-  initrd bootsplash fix to use "default"
-
-  27 Feb 2004; Pieter van den Abeele <pvdabeel@gentoo.org>
-  -ppc/G3, -ppc/G3-SMP:
-  Migrated G3 into G4
-
-  26 Feb 2004; Pieter van den Abeele <pvdabeel@gentoo.org>
-  +ppc/G3, +ppc/G3-SMP, +ppc/G4, +ppc/G4-SMP, +ppc/G5,
-  +ppc/G5-SMP, -ppc/kernel-config-2.4-g3g4,
-  -ppc/kernel-config-2.4-g5:
-  Updated kernel .configs.
-  
-  G5-SMP verified to work on dual G5 1.8 w. radeon and 160G SATA
-  Others are being tested right now
-
-  25 Feb 2004; Brad House <brad_mssw@gentoo.org>
-  +pkg/busybox-1.00-pre7-losetup-crypto-alpha.tar.bz2:
-  busybox pre7 patched
-
-  25 Feb 2004; Brad House <brad_mssw@gentoo.org> genkernel,
-  genkernel.conf, +pkg/busybox-1.00-pre7-crypto-losetup-2.patch,
-  -pkg/busybox-1.00-pre7-crypto-losetup-2.tar.bz2,
-  +pkg/busybox-1.00-pre8-alpha.patch,
-  +pkg/busybox-1.00-pre8-crypto-losetup.patch,
-  +pkg/busybox-1.00-pre8-losetup-alpha.tar.bz2:
-  busybox update and alpha fix
-
-  25 Feb 2004; Brad House <brad_mssw@gentoo.org>
-  generic/linuxrc, generic/modprobe:
-  script updates, less debugging, and modprobe return code fix
-
-  25 Feb 2004; Brad House <brad_mssw@gentoo.org>
-  x86/kernel-config-2.4:
-  too many complaints, make reiser static
-
-  22 Feb 2004; Brad House <brad_mssw@gentoo.org> genkernel:
-  version update
-
-  22 Feb 2004; Brad House <brad_mssw@gentoo.org>
-  +pkg/busybox-1.00-pre7-crypto-losetup-2.tar.bz2:
-  busybox tarball
-
-  22 Feb 2004; Brad House <brad_mssw@gentoo.org>
-  generic/linuxrc, genkernel.conf,
-  -pkg/busybox-1.00-pre7-crypto-losetup.patch,
-  -pkg/busybox-1.00-pre7-crypto-patched.tar.bz2,
-  x86_64/kernel-config-2.6, +x86_64/kernel-config-2.6-emachines,
-  +x86_64/kernel-config-2.6-smp:
-  gcloop fixes
-
-  14 Feb 2004; Brad House <brad_mssw@gentoo.org> generic/linuxrc:
-  create /dev/console if for some reason /dev wasn't on the fs
-
-  14 Feb 2004; Brad House <brad_mssw@gentoo.org> genkernel:
-  temp move
-
-  14 Feb 2004; Brad House <brad_mssw@gentoo.org>
-  +pkg/busybox-1.00-pre7-crypto-patched.tar.bz2:
-  pkg
-
-  14 Feb 2004; Brad House <brad_mssw@gentoo.org> genkernel.conf,
-  -pkg/busybox-1.00-pre3-patched.tar.bz2,
-  -pkg/busybox-1.00-pre3.tar.bz2,
-  +pkg/busybox-1.00-pre7-crypto-losetup.patch:
-  busybox updates
-
-  14 Feb 2004; Brad House <brad_mssw@gentoo.org> generic/linuxrc:
-  gcloop fix
-
-  14 Feb 2004; Brad House <brad_mssw@gentoo.org> genkernel,
-  +pkg/ppc, +pkg/ppc/README:
-  updates
-
-  14 Feb 2004; Brad House <brad_mssw@gentoo.org> generic/linuxrc:
-  initrd updates for correctness, squashfs, and gcloop
-
-  12 Feb 2004; Luca Barbato <lu_zero@gentoo.org> +pkg/ppc64,
-  +pkg/ppc64/README, +ppc, +ppc/busy-config, +ppc/config.sh,
-  +ppc/kernel-config-2.4-g3g4, +ppc/kernel-config-2.4-g5,
-  +ppc/modules_load:
-  pvdabeel's first import.
-
-  08 Feb 2004; Brad House <brad_mssw@gentoo.org> generic/linuxrc:
-  typo
-
-  07 Feb 2004; Brad House <brad_mssw@gentoo.org>
-  generic/linuxrc, genkernel:
-  beta10 finalizations
-
-  07 Feb 2004; Brad House <brad_mssw@gentoo.org> gen_compile.sh:
-  make modules_install should use -j1 only
-
-  07 Feb 2004; Brad House <brad_mssw@gentoo.org>
-  gen_configkernel.sh:
-  err, backed up wrong file :)
-
-  03 Feb 2004; Guy Martin <gmsoft@gentoo.org> +parisc64,
-  +parisc64/busy-config, +parisc64/config.sh,
-  +parisc64/kernel-config-2.4, +parisc64/modules_load,
-  +pkg/parisc64, +pkg/parisc64/README:
-  Ported to parisc64
-
-  31 Jan 2004; Brad House <brad_mssw@gentoo.org>
-  gen_determineargs.sh:
-  make commandline debugfile option work
-
-  30 Jan 2004; Brad House <brad_mssw@gentoo.org>
-  generic/modprobe, x86_64/modules_load:
-  modprobe fixes, and scsi module updates for x86_64
-
-  30 Jan 2004; Brad House <brad_mssw@gentoo.org>
-  generic/linuxrc, genkernel:
-  hwopts fix
-
-  28 Jan 2004; Brad House <brad_mssw@gentoo.org> genkernel:
-  cleanups
-
-  28 Jan 2004; Brad House <brad_mssw@gentoo.org> gen_initrd.sh:
-  debugfile truncation fix
-
-  28 Jan 2004; Brad House <brad_mssw@gentoo.org> genkernel:
-  version bump
-
-  28 Jan 2004; Brad House <brad_mssw@gentoo.org>
-  x86/kernel-config-2.6, x86_64/kernel-config-2.6:
-  kernel config updates
-
-  28 Jan 2004; Brad House <brad_mssw@gentoo.org>
-  gen_configkernel.sh, genkernel:
-  misc fixes in relation to kernel configs
-
-  25 Jan 2004; Brain Jackson <iggy@gentoo.org>
-  x86/kernel-config-2.4:
-  new default config, works well with gentoo-sources
-
-  24 Jan 2004; Brad House <brad_mssw@gentoo.org> gen_funcs.sh,
-  generic/linuxrc, genkernel:
-  updates
-
-  18 Jan 2004; Brad House <brad_mssw@gentoo.org> +alpha,
-  +alpha/busy-config, +alpha/config.sh, +alpha/kernel-config-2.4,
-  +alpha/modules_load, +pkg/alpha, +pkg/alpha/README:
-  add alpha profile
-
-  17 Jan 2004; Brad House <brad_mssw@gentoo.org> genkernel:
-  version bump
-
-  17 Jan 2004; Brad House <brad_mssw@gentoo.org> generic/linuxrc:
-  must bind-mount dev for loop devices
-
-  17 Jan 2004; Brad House <brad_mssw@gentoo.org> generic/linuxrc:
-  support multiple loop types
-
-  11 Jan 2004; Brad House <brad_mssw@gentoo.org> generic/linuxrc:
-  not -t ext3 use -t ext2 Im and idiot
-
-  11 Jan 2004; Brad House <brad_mssw@gentoo.org>
-  generic/linuxrc, genkernel:
-  fix for loop device mounting
-
-  11 Jan 2004; Brad House <brad_mssw@gentoo.org> genkernel:
-  genkernel
-
-  11 Jan 2004; Brad House <brad_mssw@gentoo.org>
-  generic/initrd.scripts, generic/linuxrc:
-  more fixes
-
-  11 Jan 2004; Brad House <brad_mssw@gentoo.org>
-  generic/initrd.scripts, generic/linuxrc:
-  fixes
-
-  11 Jan 2004; Brad House <brad_mssw@gentoo.org> generic/linuxrc:
-  livecd fixes
-
-  10 Jan 2004; Brad House <brad_mssw@gentoo.org> gen_compile.sh:
-  uname machine for parisc, etc
-
-  08 Jan 2004; Brad House <brad_mssw@gentoo.org> +pkg/sparc,
-  +pkg/sparc/README, +pkg/sparc64, +pkg/sparc64/README:
-  dont forget placeholders for pkg directory
-
-  08 Jan 2004; Brad House <brad_mssw@gentoo.org>
-  x86_64/kernel-config-2.6:
-  updated config
-
-  08 Jan 2004; Brad House <brad_mssw@gentoo.org> +TODO:
-  todo
-
-  08 Jan 2004; Brad House <brad_mssw@gentoo.org> genkernel:
-  version bump
-
-  08 Jan 2004; Brad House <brad_mssw@gentoo.org> genkernel:
-  fix
-
-  08 Jan 2004; Brad House <brad_mssw@gentoo.org>
-  x86_64/kernel-config-2.6:
-  updated kernel config
-
-  08 Jan 2004; Brad House <brad_mssw@gentoo.org> gen_compile.sh,
-  gen_funcs.sh, genkernel:
-  check for loop devices and fix debug printing
-
-  08 Jan 2004; Brad House <brad_mssw@gentoo.org> gen_cmdline.sh,
-  gen_determineargs.sh, generic/linuxrc, parisc/config.sh,
-  sparc/config.sh, sparc64/config.sh, x86/config.sh,
-  x86_64/config.sh:
-  add makeopts params, and fixes for if old coreutils is in root
-
-  05 Jan 2004; Jason Wever <weeve@gentoo.org> +sparc,
-  +sparc/busy-config, +sparc/config.sh, +sparc/kernel-config,
-  +sparc/modules_load, +sparc64, +sparc64/busy-config,
-  +sparc64/config.sh, +sparc64/kernel-config,
-  +sparc64/modules_load:
-  Added sparc and sparc64 dirs for genkernel.
-
-  03 Jan 2004; Guy Martin <gmsoft@gentoo.org> +parisc,
-  +parisc/busy-config, +parisc/config.sh,
-  +parisc/kernel-config-2.4, +parisc/modules_load, +pkg/parisc,
-  +pkg/parisc/README:
-  Added parisc files
-
-  31 Dec 2003; Seemant Kulleen <seemant@gentoo.org>
-  +x86/kernel-config-2.4:
-  2.4 config thanks to iggycvs add kernel-config-2.4
-
-  24 Dec 2003; Brad House <brad_mssw@gentoo.org>
-  gen_determineargs.sh:
-  no bootsplash fix
-
-  24 Dec 2003; Brad House <brad_mssw@gentoo.org> genkernel:
-  reverse kernel compile with modules make
-
-  23 Dec 2003; Brad House <brad_mssw@gentoo.org> README,
-  +genkernel, -genkernel.sh:
-  genkernel move
-
-  23 Dec 2003; Brad House <brad_mssw@gentoo.org> gen_cmdline.sh,
-  gen_determineargs.sh, gen_initrd.sh, generic/linuxrc,
-  genkernel.sh:
-  no initrd modules stuff
-
-  23 Dec 2003; Brad House <brad_mssw@gentoo.org> gen_cmdline.sh,
-  gen_determineargs.sh, +gen_package.sh, genkernel.sh:
-  changes for livecd stuff
-
-  22 Dec 2003; Brad House <brad_mssw@gentoo.org> README:
-  notes
-
-  22 Dec 2003; Brad House <brad_mssw@gentoo.org>
-  gen_determineargs.sh:
-  get extraversion properly
-
-  17 Dec 2003; Brad House <brad_mssw@gentoo.org>
-  -x86_64/modprobe:
-  remove modprobe from x86_64
-
-  17 Dec 2003; Brad House <brad_mssw@gentoo.org> README,
-  gen_initrd.sh, gen_moddeps.sh, generic/initrd.defaults,
-  generic/initrd.scripts, generic/linuxrc, generic/modprobe,
-  x86_64/modules_load:
-  fixes
-
-  17 Dec 2003; Brad House <brad_mssw@gentoo.org> gen_initrd.sh,
-  generic/linuxrc, -x86/linuxrc, x86/modules_load,
-  x86_64/modules_load:
-  more generic
-
-  17 Dec 2003; Brad House <brad_mssw@gentoo.org> gen_initrd.sh,
-  +generic, +generic/initrd.defaults, +generic/initrd.scripts,
-  +generic/linuxrc, +generic/modprobe, -x86_64/initrd.defaults,
-  -x86_64/initrd.scripts, -x86_64/linuxrc:
-  make more generic
-
-  16 Dec 2003; Brad House <brad_mssw@gentoo.org> gen_initrd.sh,
-  +gen_moddeps.sh, genkernel.sh, +x86_64/initrd.defaults,
-  +x86_64/initrd.scripts, x86_64/linuxrc, +x86_64/modprobe,
-  x86_64/modules_load:
-  integrate new initrd, and module scanning
-
-  10 Dec 2003; Brad House <brad_mssw@gentoo.org> gen_initrd.sh:
-  killall
-
-  10 Dec 2003; Brad House <brad_mssw@gentoo.org> gen_initrd.sh:
-  devfsd fixes
-
-  09 Dec 2003; Brad House <brad_mssw@gentoo.org> gen_compile.sh:
-  typos
-
-  09 Dec 2003; Brad House <brad_mssw@gentoo.org> gen_compile.sh,
-  x86/config.sh, x86_64/config.sh:
-  fix
-
-  09 Dec 2003; Brad House <brad_mssw@gentoo.org>
-  +pkg/busybox-1.00-pre2-decl.patch:
-  stuff
-
-  09 Dec 2003; Brad House <brad_mssw@gentoo.org> gen_cmdline.sh,
-  gen_compile.sh, gen_determineargs.sh, x86/config.sh,
-  x86_64/config.sh:
-  different makes for kernel and utils
-
-  09 Dec 2003; Brad House <brad_mssw@gentoo.org> gen_cmdline.sh,
-  gen_determineargs.sh, x86/config.sh, x86_64/config.sh:
-  add make variable
-
-  09 Dec 2003; Brad House <brad_mssw@gentoo.org> gen_compile.sh,
-  x86/config.sh:
-  KERNEL_MAKE_2 for sparc
-
-  09 Dec 2003; Brad House <brad_mssw@gentoo.org> genkernel.conf,
-  +pkg/busybox-1.00-pre3-patched.tar.bz2:
-  busybox stuff
-
-  09 Dec 2003; Brad House <brad_mssw@gentoo.org> gen_compile.sh,
-  gen_determineargs.sh, genkernel.conf, genkernel.sh:
-  add devfsd support
-
-  09 Dec 2003; Brad House <brad_mssw@gentoo.org>
-  +pkg/devfsd-1.3.25-dietlibc-kernel25.tar.bz2,
-  +pkg/devfsd-1.3.25-dietlibc.patch:
-  devfsd dietlibc stuff
-
-  09 Dec 2003; Brad House <brad_mssw@gentoo.org> gen_compile.sh,
-  x86/config.sh, x86_64/config.sh:
-  fixes
-
-  09 Dec 2003; Brad House <brad_mssw@gentoo.org> gen_compile.sh:
-  umm, make configure scripts work with CC, AS, and LD set or unset
-
-  09 Dec 2003; Brad House <brad_mssw@gentoo.org> gen_compile.sh:
-  don't forget 'env' before
-
-  09 Dec 2003; Brad House <brad_mssw@gentoo.org>
-  +pkg/modutils-2.4.26.tar.bz2:
-  forgot modutils package
-
-  09 Dec 2003; Brad House <brad_mssw@gentoo.org> gen_cmdline.sh,
-  gen_compile.sh, gen_configkernel.sh, gen_determineargs.sh,
-  x86/config.sh, x86_64/config.sh:
-  need seperate toolkit for compilation of kernel and utils on sparc64
-
-  09 Dec 2003; Brad House <brad_mssw@gentoo.org> gen_compile.sh,
-  gen_determineargs.sh:
-  fixes for sparc, cant set LD or AS for sparc64
-
-  09 Dec 2003; Brad House <brad_mssw@gentoo.org>
-  gen_configkernel.sh, gen_determineargs.sh, genkernel.conf,
-  -x86/kernel-config, +x86/kernel-config-2.6,
-  -x86_64/kernel-config, +x86_64/kernel-config-2.6:
-  make friendly with 2.4
-
-  09 Dec 2003; Brad House <brad_mssw@gentoo.org> gen_cmdline.sh,
-  gen_determineargs.sh, +pkg/x86, +pkg/x86/README, +pkg/x86_64,
-  +pkg/x86_64/README:
-  fixes
-
-  09 Dec 2003; Brad House <brad_mssw@gentoo.org> README,
-  gen_compile.sh, gen_initrd.sh, genkernel.conf, genkernel.sh:
-  2.4 kernel updates
-
-  08 Dec 2003; Brad House <brad_mssw@gentoo.org> +README,
-  +gen_arch.sh, +gen_cmdline.sh, +gen_compile.sh,
-  +gen_configkernel.sh, +gen_determineargs.sh, +gen_funcs.sh,
-  +gen_initrd.sh, +genkernel.conf, +genkernel.sh, +notes, +pkg,
-  +pkg/busybox-1.00-pre3.tar.bz2, +pkg/dietlibc-0.24.tar.bz2,
-  +pkg/module-init-tools-0.9.15-pre4.tar.bz2, +x86,
-  +x86/busy-config, +x86/config.sh, +x86/kernel-config,
-  +x86/linuxrc, +x86/modules_load, +x86_64, +x86_64/busy-config,
-  +x86_64/config.sh, +x86_64/kernel-config, +x86_64/linuxrc,
-  +x86_64/modules_load:
-  add new genkernel dev

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     8f90911e1e4b622ee4c716f118b7021e291e90f1
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 05:53:39 2024 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 05:53:39 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8f90911e

doc: point to gitweb for old ChangeLog

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 HACKING | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/HACKING b/HACKING
index 62bbd37..19aa5f9 100644
--- a/HACKING
+++ b/HACKING
@@ -42,3 +42,9 @@ Rolling a release:
     git shortlog ${PREV_TAG}..v${PV} | xsel
 
   to generate the mail body.
+
+Changes:
+Changelogs prior to 2012 are available in Changelog.old [1], removed from
+regular distribution in commit 4ec9886457a58330843f5c46a38e73fda9957410.
+
+[1] https://gitweb.gentoo.org/proj/genkernel.git/tree/ChangeLog.old?id=71507545eec3031ade9b4f9a314c53216f2c97f2

[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     96e15a9bc9c9462f7eb5986bb77e155ca92dd797
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 05:55:17 2024 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 05:55:17 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=96e15a9b

build: fix manpage install

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5f8e031..1e20ef5 100644
--- a/Makefile
+++ b/Makefile
@@ -216,7 +216,7 @@ install: all
 
 	install $(BUILD_DIR)/software.sh $(DESTDIR)/$(PREFIX)/share/genkernel/defaults
 
-	install -d $(DESTDIR)/$(MANDIR)
+	install -d $(DESTDIR)/$(MANDIR)/man8
 	install $(BUILD_DIR)/genkernel.8 $(DESTDIR)/$(MANDIR)/man8
 
 # No trailing blank lines please.

[gentoo-commits] proj/genkernel:master commit in: /

[Ben Kohler]

commit:     b3bec32138a1013ee5191d6f67ae1e1682a194ac
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 21 11:58:35 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 11:58:35 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b3bec321

release 4.3.11

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 genkernel | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/genkernel b/genkernel
index e825e7f..bdde3db 100755
--- a/genkernel
+++ b/genkernel
@@ -1,8 +1,7 @@
 #!/bin/bash
-# $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.3.10'
+GK_V='4.3.11'
 
 # Normalize locales
 export LC_ALL=C

[gentoo-commits] proj/genkernel:master commit in: /

[Ben Kohler]

commit:     cafee187a125b85a70d57b58819398194e219e67
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 26 17:14:36 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Apr 26 17:14:36 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cafee187

release 4.3.12

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index bdde3db..20443db 100755
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.3.11'
+GK_V='4.3.12'
 
 # Normalize locales
 export LC_ALL=C

[gentoo-commits] proj/genkernel:master commit in: /

[Ben Kohler]

commit:     8f678ec1dbed8c40b5a465f1caa6d3e59d07f102
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed May  1 18:07:04 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed May  1 18:07:04 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8f678ec1

release 4.3.13

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 genkernel               |   2 +-
 genkernel-4.3.13.tar.xz | Bin 0 -> 469464 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 20443db..36fea3d 100755
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.3.12'
+GK_V='4.3.13'
 
 # Normalize locales
 export LC_ALL=C

diff --git a/genkernel-4.3.13.tar.xz b/genkernel-4.3.13.tar.xz
new file mode 100644
index 0000000..90de392
Binary files /dev/null and b/genkernel-4.3.13.tar.xz differ

[gentoo-commits] proj/genkernel:master commit in: /

[Ben Kohler]

commit:     9a0e3ba12c89e406f580b32d7df56d1462357526
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed May  1 18:09:39 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed May  1 18:09:39 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9a0e3ba1

.gitignore: ignore .tar.xz releases as well

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 .gitignore              |   1 +
 genkernel-4.3.13.tar.xz | Bin 469464 -> 0 bytes
 2 files changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index f55fd0c..75e2eda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /genkernel.8
 /genkernel-*.tar.bz2
+/genkernel-*.tar.xz
 /ChangeLog
 /arch/*/generated-config

diff --git a/genkernel-4.3.13.tar.xz b/genkernel-4.3.13.tar.xz
deleted file mode 100644
index 90de392..0000000
Binary files a/genkernel-4.3.13.tar.xz and /dev/null differ

[gentoo-commits] proj/genkernel:master commit in: /

[Ben Kohler]

commit:     f310425b9265c097cc515459cccc00841a0a8b30
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed May  1 18:10:43 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed May  1 18:10:43 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f310425b

release 4.3.14

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 36fea3d..8bdb966 100755
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.3.13'
+GK_V='4.3.14'
 
 # Normalize locales
 export LC_ALL=C

[gentoo-commits] proj/genkernel:master commit in: /

[Sam James]

commit:     c9c707c54f94974e4bb7049cfefbd3e99b1c0805
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May  3 06:30:43 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May  3 06:30:51 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c9c707c5

HACKING: /usr/portage/distfiles -> /var/cache/distfiles

Signed-off-by: Sam James <sam <AT> gentoo.org>

 HACKING | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/HACKING b/HACKING
index 19aa5f9..32ab8a6 100644
--- a/HACKING
+++ b/HACKING
@@ -28,7 +28,7 @@ Rolling a release:
     scp genkernel-${PV}.tar.xz ${USER}@dev.gentoo.org:/space/distfiles-local/
 - copy to portage's DISTDIR so you can bump the ebuild
   before the tarball hits distfile mirrors
-  - cp genkernel-${PV}.tar.xz /usr/portage/distfiles/
+  - cp genkernel-${PV}.tar.xz /var/cache/distfiles/
 - Bump the ebuild
 - Propagate ebuild changes to the live ebuild
     diff genkernel-${OLD_PV}.ebuild genkernel-${NEW_PV}.ebuild | patch genkernel-9999.ebuild

[gentoo-commits] proj/genkernel:master commit in: /

[Ben Kohler]

commit:     79a6f985a78beef96c35ed59e5637be384cfc4e8
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon May  6 21:42:16 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon May  6 21:42:16 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=79a6f985

gen_configkernel.sh: use PATH to find depmod

Bug: https://bugs.gentoo.org/931324
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 gen_configkernel.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 17f9eaf..0158e46 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -442,14 +442,14 @@ config_kernel() {
 		local cfg_CONFIG_MODULE_COMPRESS_XZ=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MODULE_COMPRESS_XZ")
 		if isTrue "${cfg_CONFIG_MODULE_COMPRESS_GZIP}"
 		then
-			depmod_GZIP=$(/sbin/depmod -V | tr ' ' '\n' | awk '/ZLIB/{print $1; exit}')
+			depmod_GZIP=$(depmod -V | tr ' ' '\n' | awk '/ZLIB/{print $1; exit}')
 			if [[ "${depmod_GZIP}" != "+ZLIB" ]]
 			then
 				gen_die 'depmod does not support ZLIB/GZIP, cannot build with CONFIG_MODULE_COMPRESS_GZIP'
 			fi
 		elif isTrue "${cfg_CONFIG_MODULE_COMPRESS_XZ}"
 		then
-			depmod_XZ=$(/sbin/depmod -V | tr ' ' '\n' | awk '/XZ/{print $1; exit}')
+			depmod_XZ=$(depmod -V | tr ' ' '\n' | awk '/XZ/{print $1; exit}')
 			if [[ "${depmod_XZ}" != "+XZ" ]]
 			then
 				gen_die 'depmod does not support XZ, cannot build with CONFIG_MODULE_COMPRESS_XZ'

[gentoo-commits] proj/genkernel:master commit in: /

[Ben Kohler]

commit:     64150d2b2993dfc1c6c26bf374e687bfa8f0d686
Author:     Maciej S. Szmigiero <mail <AT> maciej <DOT> szmigiero <DOT> name>
AuthorDate: Tue Mar  5 14:24:09 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon May 20 12:58:56 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=64150d2b

gen_moddeps.sh: always include firmware for built-in modules with ALLFIRMWARE="no"

These do not occur in the "modules.dep" file so they won't be caught by the
dependency scanning loop in gen_dep_list() - they need to be manually added
to the module list.

Closes: #54
Signed-off-by: Maciej S. Szmigiero <mail <AT> maciej.szmigiero.name>
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 gen_moddeps.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gen_moddeps.sh b/gen_moddeps.sh
index 070131c..7e2e070 100755
--- a/gen_moddeps.sh
+++ b/gen_moddeps.sh
@@ -62,14 +62,13 @@ gen_dep_list() {
 			rxargs=( "${rxargs[@]/#/-e\/}" )
 			rxargs=( "${rxargs[@]/%/${KEXT}:}" )
 
-			cat "${moddir}/modules.builtin" \
-				| xargs printf '%s:\n' \
-				| grep -F "${rxargs[@]}"
-
 			cat "${moddir}/modules.dep" \
 				| grep -F "${rxargs[@]}"
 		)
 
+		# Always include firmware for built-in modules
+		cat "${moddir}/modules.builtin"
+
 		printf '%s\n' "${moddeplist[@]}"
 	fi | xbasename | sort | uniq
 }

[gentoo-commits] proj/genkernel:master commit in: /

[Ben Kohler]

commit:     56c89013f80111143170e62c91dddd55184d6cdb
Author:     Dmitriy Baranov <reagentoo <AT> gmail <DOT> com>
AuthorDate: Tue Mar  5 14:24:09 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon May 20 12:58:59 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=56c89013

gen_moddeps.sh: use KEXT along with default '.ko' extension to prevent modinfo error

Also improved gen_dep_list() and get rid xbasename()

Bug: https://bugs.gentoo.org/922663
Closes: #57
Signed-off-by: Dmitriy Baranov <reagentoo <AT> gmail.com>
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 gen_moddeps.sh | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/gen_moddeps.sh b/gen_moddeps.sh
index 7e2e070..ff264f4 100755
--- a/gen_moddeps.sh
+++ b/gen_moddeps.sh
@@ -10,27 +10,17 @@ mod_dep_list() {
 	cat "${TEMP}/moddeps"
 }
 
-xbasename() {
-	local -a moddeplist=( $( </dev/stdin ) )
-
-	if (( ${#moddeplist[@]} > 0 ))
-	then
-		# prepend slash to each moddeplist element
-		# to avoid passing elements as basename options
-		basename -s "${KEXT}" "${moddeplist[@]/#/\/}"
-	fi
-}
-
 gen_dep_list() {
+	local -a modlist=() moddeplist=()
 	local moddir="${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}"
 
+	# Always include firmware for built-in modules
+	moddeplist=( $(cat "${moddir}/modules.builtin") )
+
 	if isTrue "${ALLRAMDISKMODULES}"
 	then
-		cat "${moddir}/modules.builtin"
-		cat "${moddir}/modules.dep" | cut -d':' -f1
+		moddeplist+=( $(cat "${moddir}/modules.dep" | cut -d':' -f1) )
 	else
-		local -a modlist=() moddeplist=()
-
 		local mygroups
 		for mygroups in ${!MODULES_*} GK_INITRAMFS_ADDITIONAL_KMODULES
 		do
@@ -60,15 +50,18 @@ gen_dep_list() {
 			local -a rxargs=( "${modlist[@]}" )
 
 			rxargs=( "${rxargs[@]/#/-e\/}" )
-			rxargs=( "${rxargs[@]/%/${KEXT}:}" )
+			rxargs=(
+				"${rxargs[@]/%/.ko:}"
+				"${rxargs[@]/%/${KEXT}:}"
+			)
 
 			cat "${moddir}/modules.dep" \
 				| grep -F "${rxargs[@]}"
 		)
+	fi
 
-		# Always include firmware for built-in modules
-		cat "${moddir}/modules.builtin"
+	moddeplist=( ${moddeplist[@]##*/} )
+	moddeplist=( ${moddeplist[@]%%.*} )
 
-		printf '%s\n' "${moddeplist[@]}"
-	fi | xbasename | sort | uniq
+	printf '%s\n' "${moddeplist[@]}" | sort | uniq
 }

[gentoo-commits] proj/genkernel:master commit in: /

[Ben Kohler]

commit:     9cfc9c6b7f79a23d7f127b8d83534f264fa1df56
Author:     Dmitriy Baranov <reagentoo <AT> gmail <DOT> com>
AuthorDate: Wed Mar  6 07:48:52 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon May 20 12:58:59 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9cfc9c6b

gen_configkernel.sh: add priority kernel config in determine_kernel_config_file()

This is useful for building an image with sys-kernel/gentoo-kernel.

Signed-off-by: Dmitriy Baranov <reagentoo <AT> gmail.com>
Closes: https://github.com/gentoo/genkernel/pull/57
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 gen_configkernel.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 0158e46..5d3e312 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -25,6 +25,7 @@ determine_kernel_config_file() {
 		local -a kconfig_candidates
 
 		local -a gk_kconfig_candidates
+		gk_kconfig_candidates+=( "${KERNEL_MODULES_PREFIX%/}/lib/modules/${KV}/source/.config" )
 		gk_kconfig_candidates+=( "${GK_SHARE}/arch/${ARCH}/kernel-config-${KV}" )
 		gk_kconfig_candidates+=( "${GK_SHARE}/arch/${ARCH}/kernel-config-${VER}.${PAT}" )
 		gk_kconfig_candidates+=( "${GK_SHARE}/arch/${ARCH}/generated-config" )

[gentoo-commits] proj/genkernel:master commit in: /

[Ben Kohler]

commit:     9d16c25da9935b1b0beb38357fe3c8b4ee2e236b
Author:     Dmitriy Baranov <reagentoo <AT> gmail <DOT> com>
AuthorDate: Tue Mar  5 20:28:49 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon May 20 12:58:59 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9d16c25d

gen_initramfs.sh: unpack compressed modules/firmwares to reduce image size

Signed-off-by: Dmitriy Baranov <reagentoo <AT> gmail.com>
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 gen_funcs.sh     | 34 ++++++++++++++++++++++++++++++++++
 gen_initramfs.sh |  8 ++++++++
 2 files changed, 42 insertions(+)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index c31e15a..70a4969 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -2054,6 +2054,40 @@ expand_file() {
 	echo "${expanded_file}"
 }
 
+find_and_unpack() {
+	local flist
+
+	local fmt
+	for fmt in "$@"
+	do
+		case "${fmt}" in
+		"gz"|"xz"|"zstd")
+			flist=( $(find -type f -name "*.${fmt}") )
+			;;
+		*)
+			gen_die "unknown compression format: ${fmt}"
+			;;
+		esac
+
+		if [ ${#flist[@]} -lt 1 ]
+		then
+			continue
+		fi
+
+		case "${fmt}" in
+		"gz")
+			gunzip "${flist[@]}"
+			;;
+		"xz")
+			unxz "${flist[@]}"
+			;;
+		"zstd")
+			unzstd "${flist[@]}"
+			;;
+		esac
+	done
+}
+
 find_kernel_binary() {
 	local kernel_binary=${*}
 	local kernel_binary_found=

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 486f0e6..aaf108e 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1806,6 +1806,10 @@ append_firmware() {
 		cp -rL --parents --target-directory="${TDIR}/lib/firmware" "${fwlist[@]}" 2>/dev/null \
 			|| gen_die "Failed to copy firmware files to '${TDIR}/lib/firmware'!"
 		popd &>/dev/null || gen_die "Failed to chdir!"
+
+		pushd "${TDIR}/lib/firmware" &>/dev/null || gen_die "Failed to chdir to '${TDIR}/lib/firmware'!"
+		find_and_unpack xz zstd
+		popd &>/dev/null || gen_die "Failed to chdir!"
 	fi
 
 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
@@ -1940,6 +1944,10 @@ append_modules() {
 	cp -ax --parents --target-directory "${modules_dstdir}" modules* 2>/dev/null \
 		|| gen_die "Failed to copy '${modules_srcdir}/modules*' to '${modules_dstdir}'!"
 
+	pushd "${modules_dstdir}" &>/dev/null || gen_die "Failed to chdir to '${modules_dstdir}'!"
+	find_and_unpack gz xz zstd
+	popd &>/dev/null || gen_die "Failed to chdir!"
+
 	print_info 2 "$(get_indent 2)modules: Updating modules.dep ..."
 	local depmod_cmd=( depmod -a -b "${TDIR}" ${KV} )
 	print_info 3 "COMMAND: ${depmod_cmd[*]}" 1 0 1

[gentoo-commits] proj/genkernel:master commit in: /

[Ben Kohler]

commit:     4e00c787cad4c40e6a2991635b37c0f283730d51
Author:     Dmitriy Baranov <reagentoo <AT> gmail <DOT> com>
AuthorDate: Tue Mar  5 14:24:46 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon May 20 12:58:59 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4e00c787

gen_initramfs.sh: fix gen_die message in append_modules()

Signed-off-by: Dmitriy Baranov <reagentoo <AT> gmail.com>
Signed-off-by: Ben Kohler <bkohler <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 aaf108e..87e5149 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1923,7 +1923,7 @@ append_modules() {
 
 		if [ ! -f "${mymod}" ]
 		then
-			gen_die "Module '${i}${KEXT}' is missing!"
+			gen_die "Module '${mymod}' is missing!"
 		fi
 
 		modlist+=( "${mymod/#${modules_srcdir}\//}" )

[gentoo-commits] proj/genkernel:master commit in: /

[Ben Kohler]

commit:     cc7d5e1e32a88dc2a4f144ce6ac9a92a2d679b05
Author:     Dmitriy Baranov <reagentoo <AT> gmail <DOT> com>
AuthorDate: Tue Mar  5 18:53:05 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon May 20 12:58:59 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cc7d5e1e

gen_initramfs.sh: copy compressed firmwares

Signed-off-by: Dmitriy Baranov <reagentoo <AT> gmail.com>
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 gen_initramfs.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 2cfa0fd..486f0e6 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1773,6 +1773,7 @@ append_firmware() {
 		fwlist=( "${FIRMWARE_FILES[@]}" )
 	else
 		local myfw=
+		local -a myfw_f=()
 		while IFS= read -r -u 3 myfw
 		do
 			if [ -z "${myfw}" ]
@@ -1780,13 +1781,20 @@ append_firmware() {
 				gen_die "modinfo error!"
 			fi
 
-			if [ ! -f "${FIRMWARE_DIR}/${myfw}" ]
+			myfw_f=( $(compgen -G "${FIRMWARE_DIR}/${myfw}*") )
+
+			if [ ${#myfw_f[@]} -gt 1 ]
+			then
+				gen_die "excessive number of firmwares!"
+			fi
+
+			if [ ${#myfw_f[@]} -lt 1 ]
 			then
 				print_warning 3 "$(get_indent 3) - ${myfw} is missing; Ignoring ..."
 				continue
 			fi
 
-			fwlist+=( "${myfw}" )
+			fwlist+=( "${myfw_f#${FIRMWARE_DIR}/}" )
 		done 3< <( (
 			modinfo -b "${KERNEL_MODULES_PREFIX%/}" -k "${KV}" -F firmware $(mod_dep_list) 2>/dev/null || echo
 		) | sort | uniq )

[gentoo-commits] proj/genkernel:master commit in: /

[Ben Kohler]

commit:     e5bb05da631d5d6580f176dc6d38c311e70d796a
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 14:37:24 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed May 22 14:37:24 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e5bb05da

release 4.3.15

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 8bdb966..3269c7f 100755
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.3.14'
+GK_V='4.3.15'
 
 # Normalize locales
 export LC_ALL=C

[gentoo-commits] proj/genkernel:master commit in: /

[Ben Kohler]

commit:     0bccb338abf8f986f94b2bd5c2df5ba4c566606d
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 11 18:34:37 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Jun 11 18:34:37 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0bccb338

release 4.3.16

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 genkernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index 3269c7f..ef98cea 100755
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='4.3.15'
+GK_V='4.3.16'
 
 # Normalize locales
 export LC_ALL=C

[gentoo-commits] proj/genkernel:master commit in: /

[Ben Kohler]

commit:     04f2a5ac3c10feefef72782aa2d57a39d989fc74
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sun May 12 15:05:09 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 17:16:35 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=04f2a5ac

build: fix for POSIX shells

When building genkernel where /bin/sh is a POSIX shell such as lksh
(mksh) it will install a malformed software.sh. This is because 'echo
-e' is not portable shell. This can be fixed by using 'printf' instead.

Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/genkernel/pull/60
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 1e20ef5d..637ef1e3 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,7 @@ SOFTWARE = BCACHE_TOOLS \
 	ZLIB \
 	ZSTD
 
-SOFTWARE_VERSION = $(foreach entry, $(SOFTWARE), "VERSION_$(entry)=${VERSION_$(entry)}\n")
+SOFTWARE_VERSION = $(foreach entry, $(SOFTWARE), "VERSION_$(entry)=${VERSION_$(entry)}")
 
 PREFIX = /usr/local
 BINDIR = $(PREFIX)/bin
@@ -183,7 +183,7 @@ $(BUILD_DIR)/build-config:
 
 $(BUILD_DIR)/software.sh:
 	install -d $(BUILD_DIR)/temp/
-	echo -e $(SOFTWARE_VERSION) > $(BUILD_DIR)/temp/versions
+	printf '%s\n' $(SOFTWARE_VERSION) > $(BUILD_DIR)/temp/versions
 	cat $(BUILD_DIR)/temp/versions defaults/software.sh > $(BUILD_DIR)/software.sh
 
 $(BUILD_DIR)/doc/genkernel.8.txt: