From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E3516139085 for ; Mon, 2 Jan 2017 20:14:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B5E6E0D44; Mon, 2 Jan 2017 20:14:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D6E0AE0D43 for ; Mon, 2 Jan 2017 20:14:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EA4BB341027 for ; Mon, 2 Jan 2017 20:14:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2708A261D for ; Mon, 2 Jan 2017 20:14:38 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1483388052.80524841cdb49683b6af7d49983bca8e9072c037.prometheanfire@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/, / X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/busy-config gen_cmdline.sh gen_compile.sh gen_determineargs.sh X-VCS-Directories: / defaults/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: 80524841cdb49683b6af7d49983bca8e9072c037 X-VCS-Branch: master Date: Mon, 2 Jan 2017 20:14:38 +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: a50115f0-2a92-4e5e-b074-a53554fe976d X-Archives-Hash: cbc785ec34beafc76ea5738cb577b9f1 commit: 80524841cdb49683b6af7d49983bca8e9072c037 Author: Matthew Thode mthode org> AuthorDate: Mon Jan 2 20:14:12 2017 +0000 Commit: Matt Thode gentoo org> CommitDate: Mon Jan 2 20:14:12 2017 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=80524841 make nfs togglable fixes musl builds (requires nfs disabled) defaults/busy-config | 2 +- gen_cmdline.sh | 4 ++++ gen_compile.sh | 4 ++++ gen_determineargs.sh | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/defaults/busy-config b/defaults/busy-config index 74938c6..9561aa1 100644 --- a/defaults/busy-config +++ b/defaults/busy-config @@ -584,7 +584,7 @@ CONFIG_FEATURE_MOUNT_FAKE=y CONFIG_FEATURE_MOUNT_VERBOSE=y CONFIG_FEATURE_MOUNT_HELPERS=y CONFIG_FEATURE_MOUNT_LABEL=y -CONFIG_FEATURE_MOUNT_NFS=y +# CONFIG_FEATURE_MOUNT_NFS is not set CONFIG_FEATURE_MOUNT_CIFS=y CONFIG_FEATURE_MOUNT_FLAGS=y CONFIG_FEATURE_MOUNT_FSTAB=y diff --git a/gen_cmdline.sh b/gen_cmdline.sh index e9f323c..57a8e1d 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}" ;; + --nfs|--no-nfs) + CMD_NFS=`parse_optbool "$*"` + print_info 2 "CMD_NFS: ${CMD_NFS}" + ;; --unionfs|--no-unionfs) CMD_UNIONFS=`parse_optbool "$*"` print_info 2 "CMD_UNIONFS: ${CMD_UNIONFS}" diff --git a/gen_compile.sh b/gen_compile.sh index 2b63f19..70a6732 100755 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -433,6 +433,10 @@ compile_busybox() { 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 cd "${BUSYBOX_DIR}" apply_patches busybox ${BUSYBOX_VER} print_info 1 'busybox: >> Configuring...' diff --git a/gen_determineargs.sh b/gen_determineargs.sh index 5402b45..0d908b6 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -116,6 +116,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 BUSYBOX CMD_BUSYBOX "yes" + set_config_with_override BOOL NFS CMD_NFS "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