From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 30415138010 for ; Sat, 25 Aug 2012 00:58:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23994E04C8; Sat, 25 Aug 2012 00:58:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DCA90E04C8 for ; Sat, 25 Aug 2012 00:58:37 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E190B33D798 for ; Sat, 25 Aug 2012 00:58:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6CC89E5443 for ; Sat, 25 Aug 2012 00:58:35 +0000 (UTC) From: "Richard Yao" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Yao" Message-ID: <1345856274.3b0ee15525a97e1ae48d7696af2b3af498ce0a69.ryao@gentoo> Subject: [gentoo-commits] proj/genkernel:ryao commit in: /, doc/ X-VCS-Repository: proj/genkernel X-VCS-Files: doc/genkernel.8.txt gen_cmdline.sh gen_determineargs.sh gen_initramfs.sh genkernel.conf X-VCS-Directories: / doc/ X-VCS-Committer: ryao X-VCS-Committer-Name: Richard Yao X-VCS-Revision: 3b0ee15525a97e1ae48d7696af2b3af498ce0a69 X-VCS-Branch: ryao Date: Sat, 25 Aug 2012 00:58:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a9c796e7-cd6a-4bb0-8408-6cbc704c186c X-Archives-Hash: 8c3aaf51e5d097ad012c07d87927b2b3 commit: 3b0ee15525a97e1ae48d7696af2b3af498ce0a69 Author: Rick Farina gentoo org> AuthorDate: Sat Aug 25 00:55:13 2012 +0000 Commit: Richard Yao gentoo org> CommitDate: Sat Aug 25 00:57:54 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=3b0ee155 Add support for e2fsprogs back in Add support for e2fsprogs, specifically mke2fs and e2fsck, back into genkernel. Signed-off-by: Rick Farina gentoo.org> Signed-off-by: Richard Yao gentoo.org> --- doc/genkernel.8.txt | 3 +++ gen_cmdline.sh | 6 ++++++ gen_determineargs.sh | 1 + gen_initramfs.sh | 24 ++++++++++++++++++++++++ genkernel.conf | 3 +++ 5 files changed, 37 insertions(+), 0 deletions(-) diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt index 9a96f32..912f899 100644 --- a/doc/genkernel.8.txt +++ b/doc/genkernel.8.txt @@ -263,6 +263,9 @@ INITIALIZATION *--*[*no-*]*dmraid*:: Includes or excludes DMRAID support. +*--*[*no-*]*e2fsprogs*:: + Includes or excludes e2fsprogs. + *--*[*no-*]*zfs*:: Includes or excludes ZFS support. diff --git a/gen_cmdline.sh b/gen_cmdline.sh index 938b1a5..741d298 100755 --- a/gen_cmdline.sh +++ b/gen_cmdline.sh @@ -91,6 +91,8 @@ longusage() { echo " --mdadm-config= Use file as mdadm.conf in initramfs" echo " --dmraid Include DMRAID support" echo " --no-dmraid Exclude DMRAID support" + echo " --e2fsprogs Include e2fsprogs" + echo " --no-e2fsprogs Exclude e2fsprogs" echo " --zfs Include ZFS support" echo " --no-zfs Exclude ZFS support" echo " --multipath Include Multipath support" @@ -306,6 +308,10 @@ parse_cmdline() { fi print_info 2 "CMD_DMRAID: ${CMD_DMRAID}" ;; + --e2fsprogs|--no-e2fsprogs) + CMD_ZFS=`parse_optbool "$*"` + print_info 2 "CMD_E2FSPROGS: ${CMD_E2FSPROGS}" + ;; --zfs|--no-zfs) CMD_ZFS=`parse_optbool "$*"` print_info 2 "CMD_ZFS: ${CMD_ZFS}" diff --git a/gen_determineargs.sh b/gen_determineargs.sh index 7f352f8..92a6458 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -122,6 +122,7 @@ determine_real_args() { set_config_with_override BOOL GPG CMD_GPG 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 MULTIPATH CMD_MULTIPATH set_config_with_override BOOL FIRMWARE CMD_FIRMWARE diff --git a/gen_initramfs.sh b/gen_initramfs.sh index ac90830..5de95a1 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -127,6 +127,29 @@ 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 + + # Using different name for blkid compatibility + cd ${TEMP} + mkdir -p "${TEMP}/initramfs-e2fsprogs-temp/" + + copy_binaries "${TEMP}"/initramfs-e2fsprogs-temp/ /sbin/{e2fsck,mke2fs} + + for i in /etc/{mke2fs,e2fsck}.conf; do + cp "$i" "${TEMP}/initramfs-e2fsprogs-temp/$(basename $i)" \ + || gen_die "Could not copy over $(basename $i)"; + done + + cd "${TEMP}/initramfs-e2fsprogs-temp/" + log_future_cpio_content + 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 +764,7 @@ create_initramfs() { append_data 'base_layout' append_data 'auxilary' "${BUSYBOX}" append_data 'busybox' "${BUSYBOX}" + append_data 'e2fstools' "${E2FSTOOLS}" append_data 'lvm' "${LVM}" append_data 'dmraid' "${DMRAID}" append_data 'iscsi' "${ISCSI}" diff --git a/genkernel.conf b/genkernel.conf index 5d93a66..af73931 100644 --- a/genkernel.conf +++ b/genkernel.conf @@ -87,6 +87,9 @@ USECOLOR="yes" # Add iSCSI support. #ISCSI="no" +# Add e2fsprogs support. +#E2FSPROGS="no" + # Include support for unionfs #UNIONFS="1"