From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BAD8FC433F5 for ; Tue, 9 Nov 2021 10:04:31 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 83AD861167 for ; Tue, 9 Nov 2021 10:04:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 83AD861167 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=buildroot.org Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 60FA760774; Tue, 9 Nov 2021 10:04:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ttRMc0PynDPU; Tue, 9 Nov 2021 10:04:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id C1ECD60764; Tue, 9 Nov 2021 10:04:29 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id C21B41BF34A for ; Tue, 9 Nov 2021 10:03:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 3A10D403DC for ; Tue, 9 Nov 2021 10:03:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CHj7JSfdqvNL for ; Tue, 9 Nov 2021 10:03:28 +0000 (UTC) Received: from busybox.osuosl.org (busybox.osuosl.org [140.211.167.122]) by smtp4.osuosl.org (Postfix) with ESMTP id 80C9B403DE for ; Tue, 9 Nov 2021 10:03:28 +0000 (UTC) Received: by busybox.osuosl.org (Postfix, from userid 4021) id 16FF48B7BE; Tue, 9 Nov 2021 09:59:34 +0000 (UTC) From: Peter Korsgaard To: buildroot@buildroot.org Date: Tue, 9 Nov 2021 10:54:53 +0100 X-Git-Refname: refs/heads/2021.02.x X-Git-Oldrev: 7a2c94540dba4a88c27f3a6c11a5b3ecdce962c1 X-Git-Newrev: a36c47b56f14b362140dba3da8b8429fe4bfc67e X-Patchwork-Hint: ignore Message-Id: <20211109095934.16FF48B7BE@busybox.osuosl.org> Subject: [Buildroot] [git commit branch/2021.02.x] package/kexec: don't override dependencies X-BeenThere: buildroot@buildroot.org 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: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" commit: https://git.buildroot.net/buildroot/commit/?id=a36c47b56f14b362140dba3da8b8429fe4bfc67e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Don't override KEXEC_DEPENDENCIES in a conditional Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 7f1fa3b615aacee8846387eb975bb35309f36015) Signed-off-by: Peter Korsgaard --- package/kexec/kexec.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index c54ce1f11a..86d8be738b 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -16,7 +16,7 @@ KEXEC_MAKE_OPTS = STRIP="$(TARGET_CROSS)strip" ifeq ($(BR2_PACKAGE_KEXEC_ZLIB),y) KEXEC_CONF_OPTS += --with-zlib -KEXEC_DEPENDENCIES = zlib +KEXEC_DEPENDENCIES += zlib else KEXEC_CONF_OPTS += --without-zlib endif _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot