[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,,}