From patchwork Wed Mar 25 00:30:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1261078 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.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.a=rsa-sha256 header.s=20161025 header.b=Osi2KXdr; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48n8DS57pyz9sRY for ; Wed, 25 Mar 2020 11:31:04 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 647C0884D9; Wed, 25 Mar 2020 00:31:01 +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 zpRDAKIfu9GA; Wed, 25 Mar 2020 00:31:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id BCC44884ED; Wed, 25 Mar 2020 00:31:00 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 474DE1BF32A for ; Wed, 25 Mar 2020 00:30:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 40E0787EB1 for ; Wed, 25 Mar 2020 00:30:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tugkcumVpPc3 for ; Wed, 25 Mar 2020 00:30:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qv1-f66.google.com (mail-qv1-f66.google.com [209.85.219.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9589287EB0 for ; Wed, 25 Mar 2020 00:30:58 +0000 (UTC) Received: by mail-qv1-f66.google.com with SMTP id m2so122536qvu.13 for ; Tue, 24 Mar 2020 17:30:58 -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; bh=azGO1iN5OqPempTN+4ExfRyH5b4craMAiNpR3kTxLo8=; b=Osi2KXdr5cQjauBfmDKlFQas4fyEwOHs18ie8fE3sIwP2YfluhZTu5UYn32hqU4bDO TOsbHDXbT7QrB1N1TM/OpQ6RZ3mZxahMp3/rg+mpQsWIVxddrvjDX782buDkpeKhPIQx vLwfrUonxXKsQ9SwKcCD1adNDDyZj2DfQdbGuxWLDN6WTXkX+DcXcCPjCx6d+fblMXMk 8VBa+IuzajvmfWkwNuhrsHfI8sCiZvIVeq0lUwZediYkJrpso+Bmt9s9QKsv3heosMGY fZFqy8u+TRW1COFLnbfdHos8J2JvHIB78AZmiiTHOmtLUk83S9eUwymaSVTUmg1f/2a6 pKIA== 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; bh=azGO1iN5OqPempTN+4ExfRyH5b4craMAiNpR3kTxLo8=; b=aaD87pfWuLACy887gFWFh2ZNDT1c8bH9P8TxxyIttSEfKcgSZuwiK7g1mpDV+sSjRp t/+5M0hWFRZ1K066kfpSl3tZ2dJCOY36N/JD8wKb2KuFedYda39WR6yDCjfTE3E3uFZE R+VnrEpwFhvcCU4gPqExgaLbqVWFe05WK14ZOJxA5hl7qIB/qMYIMtGCH5ls1z0+D+0j Kj/wwfIr0EDWkdPVeDXnBV+jB19ODJRMITcCUIyTZhEw0TB8Vb5Znjk0TBC0A5YjH+5/ NOWiTzxmhUxUbw6qkGFq0fFm1B+ugSQhaxX/HESCInpUomoOxDVmRsNcj12Wm09y/7ow iq+w== X-Gm-Message-State: ANhLgQ1NHHf3CZGGlX6p6WrlVItLKhPy7vSaPyCJ3pAYsLH02GUNaT24 o8s0Oq2o8zUhbwJewocJbbqZD8z8 X-Google-Smtp-Source: ADFU+vt1+eDQvO5Fs90LUmToWKCCvv8p/2jGJHZLQP55KsfnoPDiOxDjvG4D4ynOu8fEuYSGP5YkHg== X-Received: by 2002:ad4:46d4:: with SMTP id g20mr807143qvw.179.1585096257385; Tue, 24 Mar 2020 17:30:57 -0700 (PDT) Received: from casantos.remote.com ([177.97.95.208]) by smtp.gmail.com with ESMTPSA id c12sm13388139qkg.30.2020.03.24.17.30.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2020 17:30:56 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Tue, 24 Mar 2020 21:30:53 -0300 Message-Id: <20200325003053.6305-1-unixmania@gmail.com> X-Mailer: git-send-email 2.18.2 Subject: [Buildroot] [PATCH] package/busybox: fix target-finalize hook X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlos Santos , Adam Duskett MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos It was searching for CONFIG_ASH=y and CONFIG_HUSH=y at $(@D)/.config, which does not contain the package build path at the target-finalize step. Use $(BUSYBOX_DIR), instead. Signed-off-by: Carlos Santos --- package/busybox/busybox.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 767499b0c0..0da73b4eab 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -329,11 +329,11 @@ endef # Add /bin/{a,hu}sh to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define BUSYBOX_INSTALL_ADD_TO_SHELLS - if grep -q CONFIG_ASH=y $(@D)/.config; then \ + if grep -q CONFIG_ASH=y $(BUSYBOX_DIR)/.config; then \ grep -qsE '^/bin/ash$$' $(TARGET_DIR)/etc/shells \ || echo "/bin/ash" >> $(TARGET_DIR)/etc/shells; \ fi - if grep -q CONFIG_HUSH=y $(@D)/.config; then \ + if grep -q CONFIG_HUSH=y $(BUSYBOX_DIR)/.config; then \ grep -qsE '^/bin/hush$$' $(TARGET_DIR)/etc/shells \ || echo "/bin/hush" >> $(TARGET_DIR)/etc/shells; \ fi