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

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

[Peter Hjalmarsson]

commit:     060b3aef60f26b18eabf54a99c3067e01f4dc9da
Author:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
AuthorDate: Mon Apr 11 11:07:42 2011 +0000
Commit:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
CommitDate: Mon Apr 11 15:58:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=060b3aef

Try to make compression format of the ramdisk customizable.

This is currently untested and might need some work, but should fix bug #279570.

---
 gen_cmdline.sh       |    6 ++++++
 gen_determineargs.sh |    1 +
 gen_initramfs.sh     |   40 ++++++++++++++++++++++++++++++++++++++--
 genkernel.conf       |   11 +++++++++++
 4 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 9e4009e..4ff6d3e 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -46,6 +46,8 @@ longusage() {
   echo "	--callback=<...>	Run the specified arguments after the"
   echo "				kernel and modules have been compiled"
   echo "	--static		Build a static (monolithic kernel)."
+  echo "	--ramdisk-format=<...>	Specify compression format for the ramdisk."
+  echo "				Supported formats are gzip, bzip2, lzma, xz and lzo"
   echo "  Kernel settings"
   echo "	--kerneldir=<dir>	Location of the kernel sources"
   echo "	--kernel-config=<file>	Kernel configuration file to use for compilation"
@@ -252,6 +254,10 @@ parse_cmdline() {
 			CMD_MDADM_CONFIG=`parse_opt "$*"`
 			print_info 2 "CMD_MDADM_CONFIG: $CMD_MDADM_CONFIG"
 			;;
+		--ramdisk-format=*)
+			CMD_RAMDISK_FORMAT=`parse_opt "$*"`
+			print_info 2 "CMD_RAMDISK_FORMAT: $CMD_RAMDISK_FORMAT"
+			;;
 		--no-busybox)
 			CMD_BUSYBOX=0
 			print_info 2 "CMD_BUSYBOX: ${CMD_BUSYBOX}"

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index e680569..54cd261 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -129,6 +129,7 @@ determine_real_args() {
 	set_config_with_override 1 KEYMAP               CMD_KEYMAP               "yes"
 	set_config_with_override 1 DOKEYMAPAUTO         CMD_DOKEYMAPAUTO
 	set_config_with_override 2 BUSYBOX_CONFIG       CMD_BUSYBOX_CONFIG
+	set_config_with_override 2 RAMDISK_FORMAT       CMD_RAMDISK_FORMAT
 
 	BOOTDIR=`arch_replace "${BOOTDIR}"`
 	BOOTDIR=${BOOTDIR%/}    # Remove any trailing slash

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 543f484..e69b821 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -662,6 +662,43 @@ append_data() {
 	fi
 }
 
+compress_initramfs() {
+	local COMPRESS_COMMAND
+
+	case "${RAMDISK_FORMAT}" in
+		GZIP|gzip)
+			COMPRESS_COMMAND="gzip -9 -c"
+			RAMDISK_FORMAT="GZIP"
+		;;
+		BZIP2|bzip2)
+			COMPRESS_COMMAND="bzip2 -9 -c"
+			RAMDISK_FORMAT="BZIP2"
+		;;
+		XZ|xz)
+			COMPRESS_COMMAND="xz -9 -c"
+			RAMDISK_FORMAT="XZ"
+		;;
+		LZMA|lzma)
+			COMPRESS_COMMAND="lzma -9 -c"
+			RAMDISK_FORMAT="LZMA"
+		;;
+		LZO|lzo)
+			COMPRESS_COMMAND="lzop -9 -c"
+			RAMDISK_FORMAT="LZO"
+		;;
+		*)
+			print_info 1 "initramfs: Compression format for ramdisk not given or unsupported, using gzip as default"
+			COMPRESS_COMMAND="gzip -9 -c"
+			RAMDISK_FORMAT="GZIP"
+		;;
+	esac
+
+	grep -q CONFIG_RD_"${RAMDISK_FORMAT}" "${KERNEL_DIR}"/.config || gen_die "Your current kernel does not support a ramdisk compressed with ${RAMDISK_FORMAT}"
+
+	"${COMPRESS_COMMAND}" "$1" > "${CPIO}.compressed"
+	mv -f "${CPIO}.compressed" "${CPIO}"
+}
+
 create_initramfs() {
 	print_info 1 "initramfs: >> Initializing..."
 
@@ -706,8 +743,7 @@ create_initramfs() {
 		append_data 'overlay'
 	fi
 
-	gzip -9 "${CPIO}"
-	mv -f "${CPIO}.gz" "${CPIO}"
+	compress_initramfs "${CPIO}"
 
 	if isTrue "${INTEGRATED_INITRAMFS}"
 	then

diff --git a/genkernel.conf b/genkernel.conf
index a5988da..7b42d9f 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -106,6 +106,17 @@ DISKLABEL="yes"
 # This supersedes the "SPLASH_THEME" option of /etc/conf.d/splash (in early space).
 # SPLASH_THEME="gentoo"
 
+# This option makes it possible to choose what compressor the ramdisk should be
+# compressed with. Take care that the compressor is merged, and that the kernel 
+# has compiled in support for the decompressor.
+# Current supported formats are:
+# gzip (default, requires app-arch/gzip)
+# bzip2 (requires app-arch/bzip2)
+# lzma (requires app-arch/lzma or app-arch/xz)
+# xz (requires app-arch/xz)
+# lzo (requires app-arch/lzop)
+# RAMDISK_FORMAT="gzip
+
 # =========Low Level Compile Settings=========
 #
 # GNU Make to use for kernel.  See also the --kernel-make command line option.

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

[Peter Hjalmarsson]

commit:     f1e3cd9290cd700f407a6d323454f75cd4c53730
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Apr 16 02:37:01 2012 +0000
Commit:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
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:xake commit in: /

[Peter Hjalmarsson]

commit:     a4438ec946201eac5fda78f21d7014d4a46ebcdc
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Jun  4 19:43:10 2012 +0000
Commit:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
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:xake commit in: /

[Peter Hjalmarsson]

commit:     636cbc75c14005d10361cda8f6f0b4bad280bf44
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Jul  8 17:18:46 2012 +0000
Commit:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
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:xake commit in: /

[Peter Hjalmarsson]

commit:     b199b3f0fc72e67dbd77519a0f2e50c1718c3969
Author:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
AuthorDate: Tue Jul 24 06:22:56 2012 +0000
Commit:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
CommitDate: Tue Jul 24 06:22:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b199b3f0

Merge remote-tracking branch 'origin/master' into xake

Conflicts:
	genkernel


 ChangeLog                                          |  127 +++++++++++++++++++
 HACKING                                            |    7 +-
 README                                             |    3 +-
 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/kernel-config                             |    1 +
 arch/x86/modules_load                              |    4 +-
 arch/x86_64/kernel-config                          |    4 +-
 arch/x86_64/modules_load                           |    4 +-
 defaults/initrd.scripts                            |   79 ++++++++----
 defaults/kernel-config                             |    1 +
 defaults/linuxrc                                   |  115 +++++++++++++----
 defaults/modprobe                                  |    5 +-
 defaults/modules_load                              |    4 +-
 doc/genkernel.8.txt                                |    6 +-
 gen_bootloader.sh                                  |   11 +-
 gen_cmdline.sh                                     |    5 +
 gen_compile.sh                                     |   38 +------
 gen_configkernel.sh                                |    8 +-
 gen_determineargs.sh                               |    2 +
 gen_funcs.sh                                       |    2 +-
 gen_initramfs.sh                                   |  133 +++++++++++++++++---
 gen_package.sh                                     |   19 +++-
 genkernel                                          |   26 +++--
 genkernel.conf                                     |    5 -
 .../busybox/{1.18.1 => 1.20.1}/1.18.1-openvt.diff  |    0
 .../busybox-1.20.1-mdstart.patch}                  |   30 +++---
 .../busybox-1.7.4-signal-hack.patch                |    0
 .../1.42/e2fsprogs-1.41.12-getpagesize.patch       |   42 ------
 patches/fuse/2.8.6/fuse-2.8.6-glibc-2.14.patch     |   10 ++
 39 files changed, 508 insertions(+), 205 deletions(-)

diff --cc defaults/linuxrc
index 7d770c9,f434339..fd3520b
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@@ -256,11 -255,34 +259,38 @@@ if [ -z "${REAL_ROOT}" -a \( "${CDROOT}
  then
  	REAL_ROOT="${FAKE_ROOT}"
  fi
 +if [ -z "${REAL_INIT}" -a \( "${CDROOT}" = '0' \)  -a \( "${FAKE_INIT}" != "/linuxrc" \) ]
 +then
 +	REAL_INIT="${FAKE_INIT}"
 +fi
  
+ # Set variables based on the value of REAL_ROOT
+ case "${REAL_ROOT}" in
+ 	ZFS=*)
+ 		ZFS_POOL=${REAL_ROOT#*=}
+ 		ZFS_POOL=${ZFS_POOL%%/*}
+ 		USE_ZFS=1
+ 	;;
+ 	ZFS)
+ 		USE_ZFS=1
+ 	;;
+ esac
+ 
+ # Verify that it is safe to use ZFS
+ if [ "USE_ZFS" = "1" ]
+ then
+ 	if [ -x /sbin/zfs -a -x /sbin/zpool ]
+ 	then
+ 		MY_HWOPTS="${MY_HWOPTS} zfs"
+ 	else
+ 		USE_ZFS=0
+ 
+ 		[ -x /sbin/zfs ] || bad_msg '/sbin/zfs not found!'
+ 		[ -x /sbin/zpool ] || bad_msg '/sbin/zpool not found!'
+ 		bad_msg 'Aborting use of zfs!'
+ 	fi
+ fi
+ 
  splash 'init'
  
  cmdline_hwopts
diff --cc genkernel
index 823d9e3,b6f39e2..0840ead
--- a/genkernel
+++ b/genkernel
@@@ -348,13 -351,23 +348,23 @@@ the
  	[ "${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 "root=ZFS" to use bootfs autodetection or "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'
++	[ "${ZFS}" = '1' ] && print_warning 1 'add either "root=ZFS" (bootfs autodetection) or "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'
- 		print_warning 1 'add "rootfstype=ext3" or "rootfstype=ext4"'
+ 
+ 	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 available, it may be needed to'
+ 		print_warning 1 'add "rootfstype=ext3" or "rootfstype=ext4" to the list of boot parameters.'
+ 	fi
+ 
+ 	unset CONFGREP
  fi
  
  [ "${BOOTRW}" != '' ] && mount -o remount,ro ${BOOTDIR}

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

[Peter Hjalmarsson]

commit:     08e9d742e2ecc246dbece1652810e468f0b6c882
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Jul  8 22:02:29 2012 +0000
Commit:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
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:xake commit in: /

[Peter Hjalmarsson]

commit:     76652966ae35c0e33c10ff1d95cfb30ea90c45fb
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Jul  9 22:44:18 2012 +0000
Commit:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
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:xake commit in: /

[Robin H. Johnson]

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

[Robin H. Johnson]

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

[Robin H. Johnson]

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

[Robin H. Johnson]

commit:     80041c7e036ac828a9044c97492317c60a464cb7
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 21:42:14 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 21:42:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=80041c7e

Merge branch 'master' into xake


 ChangeLog                                          |   68 ++++++++++++-
 HACKING                                            |   17 +++-
 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                            |   13 ++-
 defaults/keymaps/keymapList                        |    2 +-
 defaults/linuxrc                                   |    9 ++-
 defaults/software.sh                               |   50 +++++++++
 doc/genkernel.8.txt                                |    3 +
 gen_cmdline.sh                                     |    6 +
 gen_compile.sh                                     |    2 +
 gen_determineargs.sh                               |    1 +
 gen_initramfs.sh                                   |   33 ++++++-
 genkernel                                          |   24 +++--
 genkernel.conf                                     |   48 ++-------
 .../busybox/{1.18.1 => 1.20.2}/1.18.1-openvt.diff  |    0
 .../busybox-1.20.1-mdstart.patch                   |    0
 .../1.20.2/busybox-1.20.2-glibc-sys-resource.patch |  109 ++++++++++++++++++++
 .../busybox-1.7.4-signal-hack.patch                |    0
 30 files changed, 338 insertions(+), 73 deletions(-)

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

[Peter Hjalmarsson]

commit:     d9598f8b559878c929eaeaa64f2d6c227ea62c03
Author:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
AuthorDate: Mon Oct 15 21:23:26 2012 +0000
Commit:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
CommitDate: Mon Oct 15 21:23:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=d9598f8b

Merge branch 'master' into xake


 ChangeLog                  |   63 ++++++++++++++++++++++++++++++++++++++++++++
 arch/alpha/kernel-config   |    2 +-
 arch/alpha/modules_load    |    5 ++-
 arch/arm/modules_load      |    8 ++++-
 arch/ia64/modules_load     |    5 ++-
 arch/mips/modules_load     |    5 ++-
 arch/parisc/modules_load   |    5 ++-
 arch/parisc64/modules_load |    5 ++-
 arch/ppc/kernel-config     |    4 +-
 arch/ppc/modules_load      |    5 ++-
 arch/ppc64/modules_load    |    5 ++-
 arch/sparc/modules_load    |    5 ++-
 arch/sparc64/modules_load  |    5 ++-
 arch/um/modules_load       |    5 ++-
 arch/x86/kernel-config     |    2 +-
 arch/x86/modules_load      |    3 +-
 arch/x86_64/kernel-config  |    2 +-
 arch/x86_64/modules_load   |    3 +-
 defaults/initrd.defaults   |    7 +++-
 defaults/initrd.scripts    |   12 +++++++-
 defaults/kernel-config     |    2 +-
 defaults/linuxrc           |   10 ++++++-
 defaults/modules_load      |    9 +++---
 doc/genkernel.8.txt        |   21 ++++++++++++--
 gen_cmdline.sh             |   10 +++++++
 gen_compile.sh             |   13 +++++++-
 gen_configkernel.sh        |   55 ++++++++++++++++++++++++++------------
 gen_determineargs.sh       |    2 +
 gen_funcs.sh               |    3 +-
 gen_initramfs.sh           |   23 +++++++++++++++-
 gen_package.sh             |   12 ++++----
 genkernel                  |    6 +++-
 32 files changed, 252 insertions(+), 70 deletions(-)

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

[Peter Hjalmarsson]

commit:     bd6516b779817445be49a9a767f850113ced86c9
Author:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
AuthorDate: Mon Oct 15 21:30:27 2012 +0000
Commit:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
CommitDate: Mon Oct 15 21:39:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=bd6516b7

Call depmod after all possible kernel modules has been installed

This so we also run it for a possible kerncache

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

---
 ChangeLog      |    3 +++
 gen_compile.sh |    7 -------
 genkernel      |   11 +++++++++++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 10680da..0cefed4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  15 Oct 2012; Peter Hjalmarsson <xake@gentoo.org> gen_compile.sh, genkernel:
+  Call depmod after all possible kernel modules has been installed
+
   15 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> genkernel:
   Bump to 3.4.44.2 with depmod corner cases by xake.
 

diff --git a/gen_compile.sh b/gen_compile.sh
index ccc8b8d..5d64d63 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -301,13 +301,6 @@ 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..."
-	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
 }
 

diff --git a/genkernel b/genkernel
index 9c8e45d..533b38e 100755
--- a/genkernel
+++ b/genkernel
@@ -256,6 +256,17 @@ then
 	gen_kerncache_extract_config
 fi
 
+if [ -d "${INSTALL_MOD_PATH}"/lib/modules/${KV} ]
+then
+	print_info 1 "        >> Generating module dependency data..."
+	if [ "${INSTALL_MOD_PATH}" != '' ]
+	then
+		depmod -a -e -F "${KERNEL_OUTPUTDIR}"/System.map -b "${INSTALL_MOD_PATH}" ${KV}
+	else
+		depmod -a -e -F "${KERNEL_OUTPUTDIR}"/System.map ${KV}
+	fi
+fi
+
 # Run callback
 if [ "${CMD_CALLBACK}" != "" ]
 then