From patchwork Fri Jun 1 12:58:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Becker X-Patchwork-Id: 923989 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Sy/DjPBM"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40y4Ct60pNz9s1b for ; Fri, 1 Jun 2018 22:59:22 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4DBEC2E899; Fri, 1 Jun 2018 12:59:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id i9aXKu5ZScxB; Fri, 1 Jun 2018 12:59:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 6FFC722228; Fri, 1 Jun 2018 12:59:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id C148A1CF175 for ; Fri, 1 Jun 2018 12:59:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id BEB6589CB4 for ; Fri, 1 Jun 2018 12:59:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id k7ETz422appK for ; Fri, 1 Jun 2018 12:59:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f44.google.com (mail-lf0-f44.google.com [209.85.215.44]) by hemlock.osuosl.org (Postfix) with ESMTPS id DAA2F89CAF for ; Fri, 1 Jun 2018 12:59:15 +0000 (UTC) Received: by mail-lf0-f44.google.com with SMTP id u4-v6so14709762lff.3 for ; Fri, 01 Jun 2018 05:59:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7t6326NQEZ96/yRqYeLPI2RUO12B2od7GwO/dpSf14Q=; b=Sy/DjPBMYBICDRAq5Tw/AGwXAwb3RFSuvqd820pyYjWqyTASxObnzC21HeEhVoEbHW FV17B+6rnC6CiSVzc0KrmySskTbD05tnq27GtCNuOAV92TJ4K46RVadpIR75HNx+8ZQx x/VXxoLpTecENq4Q/pspZF8JaLQm1A1ibGTk+uDHHqQJmK1X+pP8DVkz+TDcKHthARvG o9TKV1ZBrxZo5QfSGBhmbZhskuHrIBsVI3ikvAPq0b+oc/kZiy4UnK1XBT+uNPJHQfQG sMQZM1Addq83Vp05OBSpcfb35gpGvXOHzPwEpFuoW5DDlriE0ByzwfERuZpnajlO+UeD d5aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7t6326NQEZ96/yRqYeLPI2RUO12B2od7GwO/dpSf14Q=; b=h/Lfl5cDP1ZV900L4V8K0Okq+Ji8tgg9vHXXwTHSoXbrkVVj+Mdacs4hxKm8uAlxL8 grsQu5CRvv8TPDAyPhH+qa+heORn2PvjEHJ2aiVPAjjspnAC2fqwIL43HM2zknvCPBJ8 S6J3vOB6sxT+extpmrIkqKTEsdDvsWb+7/qNJeTgrJYUc3Cy/YL5bwOYCNlC1CiDANdP jHc8TxUl+X+W52uviDcFTOF114reJ4T3RNp4C0jtEKiB9fhNpUl701Hx5Fe8U/0mVeFh 7ftwfysG9rxpS13lKcxhaW54oh36P8M5hexuSQaWg2Ee9tokIRZ5P6hc/WEoOjo/m9Cd M4NA== X-Gm-Message-State: ALKqPwfjc5FYa6Kg3au+YpN5xEXNYA5XKON4s5M2bzotHdiBW60ZuTiH wZY87X5cs2UlqVwnEe2jgStKRFduPF0= X-Google-Smtp-Source: ADUXVKKerAO+vu3I01FXLXCmel1JCE1BCATaOV9qK6x/YUjbhfyd6vmqXrNevZ3CkPGg/Rdt7VJqlw== X-Received: by 2002:a19:a68a:: with SMTP id p132-v6mr6541446lfe.89.1527857953541; Fri, 01 Jun 2018 05:59:13 -0700 (PDT) Received: from stefanb-lnx.localdomain (86-60-143-206-dyn-dsl.ssp.fi. [86.60.143.206]) by smtp.gmail.com with ESMTPSA id q18-v6sm8756027lfi.97.2018.06.01.05.59.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Jun 2018 05:59:12 -0700 (PDT) From: Stefan Becker To: buildroot@buildroot.org Date: Fri, 1 Jun 2018 15:58:59 +0300 Message-Id: <20180601125900.26400-2-chemobejk@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180601125900.26400-1-chemobejk@gmail.com> References: <20180601125900.26400-1-chemobejk@gmail.com> Subject: [Buildroot] [PATCH proposal/next 1/2] package/busybox: add host variant X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Becker , "Yann E . MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Build stripped down version of busybox for the build host to provide "mkpasswd" for the build. This is a replacement for host-mkpasswd. Signed-off-by: Stefan Becker --- fs/common.mk | 2 +- package/Config.in.host | 2 +- package/busybox/Config.in.host | 2 ++ package/busybox/busybox.mk | 28 +++++++++++++++++++ .../skeleton-init-common.mk | 2 +- 5 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 package/busybox/Config.in.host diff --git a/fs/common.mk b/fs/common.mk index 9baf367729..42d5dff569 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -63,7 +63,7 @@ ROOTFS_COMMON_TARGET_DIR = $(FS_DIR)/target ROOTFS_COMMON_DEPENDENCIES = \ host-fakeroot host-makedevs \ - $(if $(PACKAGES_USERS)$(ROOTFS_USERS_TABLES),host-mkpasswd) + $(if $(PACKAGES_USERS)$(ROOTFS_USERS_TABLES),host-busybox) $(ROOTFS_COMMON_TAR): ROOTFS=COMMON $(ROOTFS_COMMON_TAR): FAKEROOT_SCRIPT=$(FS_DIR)/fakeroot.fs diff --git a/package/Config.in.host b/package/Config.in.host index 38543e7390..c524333671 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -2,6 +2,7 @@ menu "Host utilities" source "package/aespipe/Config.in.host" source "package/android-tools/Config.in.host" + source "package/busybox/Config.in.host" source "package/cargo/Config.in.host" source "package/cbootimage/Config.in.host" source "package/checkpolicy/Config.in.host" @@ -31,7 +32,6 @@ menu "Host utilities" source "package/lpc3250loader/Config.in.host" source "package/lttng-babeltrace/Config.in.host" source "package/mfgtools/Config.in.host" - source "package/mkpasswd/Config.in.host" source "package/mtd/Config.in.host" source "package/mtools/Config.in.host" source "package/mxsldr/Config.in.host" diff --git a/package/busybox/Config.in.host b/package/busybox/Config.in.host new file mode 100644 index 0000000000..93774bdf60 --- /dev/null +++ b/package/busybox/Config.in.host @@ -0,0 +1,2 @@ +config BR2_PACKAGE_HOST_MKPASSWD + bool "host mkpasswd" diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 75fe7e137b..aa89f1cc33 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -302,4 +302,32 @@ $(error No BusyBox configuration file specified, check your BR2_PACKAGE_BUSYBOX_ endif endif +# +# Host version of busybox to provide "mkpasswd" for the build +# +HOST_BUSYBOX_BUILD_CONFIG = $(HOST_BUSYBOX_DIR)/.config +define HOST_BUSYBOX_CONFIGURE_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) allnoconfig + $(call KCONFIG_ENABLE_OPT,CONFIG_MKPASSWD,$(HOST_BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_CRYPT,$(HOST_BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_USE_BR_CRYPT_SHA,$(HOST_BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_BUILD_LIBBUSYBOX,$(HOST_BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_INDIVIDUAL,$(HOST_BUSYBOX_BUILD_CONFIG)) +endef + +define HOST_BUSYBOX_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) busybox +endef + +define HOST_BUSYBOX_INSTALL_CMDS + $(HOST_MAKE_ENV) $(MAKE) \ + CONFIG_PREFIX="$(HOST_DIR)" \ + EXTRA_LDFLAGS="-Wl,-rpath,$(HOST_DIR)/lib" \ + -C $(@D) install + rm -f $(HOST_DIR)/bin/sh $(HOST_DIR)/bin/busybox +endef + $(eval $(kconfig-package)) +$(eval $(host-generic-package)) + +MKPASSWD = $(HOST_DIR)/bin/mkpasswd diff --git a/package/skeleton-init-common/skeleton-init-common.mk b/package/skeleton-init-common/skeleton-init-common.mk index e8a0522052..99c87e3861 100644 --- a/package/skeleton-init-common/skeleton-init-common.mk +++ b/package/skeleton-init-common/skeleton-init-common.mk @@ -63,7 +63,7 @@ ifneq ($(filter $$1$$% $$5$$% $$6$$%,$(SKELETON_INIT_COMMON_ROOT_PASSWD)),) SKELETON_INIT_COMMON_ROOT_PASSWORD = '$(SKELETON_INIT_COMMON_ROOT_PASSWD)' else ifneq ($(SKELETON_INIT_COMMON_ROOT_PASSWD),) # This variable will only be evaluated in the finalize stage, so we can -# be sure that host-mkpasswd will have already been built by that time. +# be sure that host-busybox will have already been built by that time. SKELETON_INIT_COMMON_ROOT_PASSWORD = "`$(MKPASSWD) -m "$(SKELETON_INIT_COMMON_PASSWD_METHOD)" "$(SKELETON_INIT_COMMON_ROOT_PASSWD)"`" endif else # !BR2_TARGET_ENABLE_ROOT_LOGIN