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 E095F138334 for ; Thu, 18 Jul 2019 15:32:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2CC71E01E4; Thu, 18 Jul 2019 15:32:33 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 13C8AE01E4 for ; Thu, 18 Jul 2019 15:32:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 05F9234797C for ; Thu, 18 Jul 2019 15:32:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A986C6E6 for ; Thu, 18 Jul 2019 15:32:30 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1563463299.04eb24df5462a75d3cddef228ec88af018652145.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_determineargs.sh X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 04eb24df5462a75d3cddef228ec88af018652145 X-VCS-Branch: master Date: Thu, 18 Jul 2019 15:32:30 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 283c97b8-d204-482e-b321-e9a5d5c2b751 X-Archives-Hash: 8c93699e9c6ca1a272427f834efc8329 commit: 04eb24df5462a75d3cddef228ec88af018652145 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Jul 18 15:21:39 2019 +0000 Commit: Thomas Deutschmann gentoo 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 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,,}