| 1 |
commit: 80524841cdb49683b6af7d49983bca8e9072c037 |
| 2 |
Author: Matthew Thode <mthode <AT> mthode <DOT> org> |
| 3 |
AuthorDate: Mon Jan 2 20:14:12 2017 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 2 20:14:12 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=80524841 |
| 7 |
|
| 8 |
make nfs togglable fixes musl builds (requires nfs disabled) |
| 9 |
|
| 10 |
defaults/busy-config | 2 +- |
| 11 |
gen_cmdline.sh | 4 ++++ |
| 12 |
gen_compile.sh | 4 ++++ |
| 13 |
gen_determineargs.sh | 1 + |
| 14 |
4 files changed, 10 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/defaults/busy-config b/defaults/busy-config |
| 17 |
index 74938c6..9561aa1 100644 |
| 18 |
--- a/defaults/busy-config |
| 19 |
+++ b/defaults/busy-config |
| 20 |
@@ -584,7 +584,7 @@ CONFIG_FEATURE_MOUNT_FAKE=y |
| 21 |
CONFIG_FEATURE_MOUNT_VERBOSE=y |
| 22 |
CONFIG_FEATURE_MOUNT_HELPERS=y |
| 23 |
CONFIG_FEATURE_MOUNT_LABEL=y |
| 24 |
-CONFIG_FEATURE_MOUNT_NFS=y |
| 25 |
+# CONFIG_FEATURE_MOUNT_NFS is not set |
| 26 |
CONFIG_FEATURE_MOUNT_CIFS=y |
| 27 |
CONFIG_FEATURE_MOUNT_FLAGS=y |
| 28 |
CONFIG_FEATURE_MOUNT_FSTAB=y |
| 29 |
|
| 30 |
diff --git a/gen_cmdline.sh b/gen_cmdline.sh |
| 31 |
index e9f323c..57a8e1d 100755 |
| 32 |
--- a/gen_cmdline.sh |
| 33 |
+++ b/gen_cmdline.sh |
| 34 |
@@ -314,6 +314,10 @@ parse_cmdline() { |
| 35 |
CMD_BUSYBOX=`parse_optbool "$*"` |
| 36 |
print_info 2 "CMD_BUSYBOX: ${CMD_BUSYBOX}" |
| 37 |
;; |
| 38 |
+ --nfs|--no-nfs) |
| 39 |
+ CMD_NFS=`parse_optbool "$*"` |
| 40 |
+ print_info 2 "CMD_NFS: ${CMD_NFS}" |
| 41 |
+ ;; |
| 42 |
--unionfs|--no-unionfs) |
| 43 |
CMD_UNIONFS=`parse_optbool "$*"` |
| 44 |
print_info 2 "CMD_UNIONFS: ${CMD_UNIONFS}" |
| 45 |
|
| 46 |
diff --git a/gen_compile.sh b/gen_compile.sh |
| 47 |
index 2b63f19..70a6732 100755 |
| 48 |
--- a/gen_compile.sh |
| 49 |
+++ b/gen_compile.sh |
| 50 |
@@ -433,6 +433,10 @@ compile_busybox() { |
| 51 |
gen_die "Busybox directory ${BUSYBOX_DIR} is invalid!" |
| 52 |
cp "${BUSYBOX_CONFIG}" "${BUSYBOX_DIR}/.config" |
| 53 |
cp "${BUSYBOX_CONFIG}" "${BUSYBOX_DIR}/.config.gk_orig" |
| 54 |
+ if isTrue "${NFS}" |
| 55 |
+ then |
| 56 |
+ sed -i 's/.*CONFIG_FEATURE_MOUNT_NFS.*/CONFIG_FEATURE_MOUNT_NFS=y/' "${BUSYBOX_DIR}/.config" |
| 57 |
+ fi |
| 58 |
cd "${BUSYBOX_DIR}" |
| 59 |
apply_patches busybox ${BUSYBOX_VER} |
| 60 |
print_info 1 'busybox: >> Configuring...' |
| 61 |
|
| 62 |
diff --git a/gen_determineargs.sh b/gen_determineargs.sh |
| 63 |
index 5402b45..0d908b6 100755 |
| 64 |
--- a/gen_determineargs.sh |
| 65 |
+++ b/gen_determineargs.sh |
| 66 |
@@ -116,6 +116,7 @@ determine_real_args() { |
| 67 |
set_config_with_override BOOL DMRAID CMD_DMRAID |
| 68 |
set_config_with_override BOOL ISCSI CMD_ISCSI |
| 69 |
set_config_with_override BOOL BUSYBOX CMD_BUSYBOX "yes" |
| 70 |
+ set_config_with_override BOOL NFS CMD_NFS "yes" |
| 71 |
set_config_with_override BOOL UNIONFS CMD_UNIONFS |
| 72 |
set_config_with_override BOOL NETBOOT CMD_NETBOOT |
| 73 |
set_config_with_override STRING REAL_ROOT CMD_REAL_ROOT |
Archives