From patchwork Sat Mar 30 14:49:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1070873 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.138; helo=whitealder.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="LnBPh3e+"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44WhNC4kz3z9sRx for ; Sun, 31 Mar 2019 01:50:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8E35186995; Sat, 30 Mar 2019 14:50:00 +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 c7qjqXi4-Sa8; Sat, 30 Mar 2019 14:49:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id BF26F869F8; Sat, 30 Mar 2019 14:49:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 93FA61BF83A for ; Sat, 30 Mar 2019 14:49:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 912F286388 for ; Sat, 30 Mar 2019 14:49:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nmM1eE6dugmj for ; Sat, 30 Mar 2019 14:49:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by fraxinus.osuosl.org (Postfix) with ESMTPS id C4D0D85FD0 for ; Sat, 30 Mar 2019 14:49:57 +0000 (UTC) Received: by mail-wr1-f54.google.com with SMTP id r4so6120818wrq.8 for ; Sat, 30 Mar 2019 07:49:57 -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 :mime-version:content-transfer-encoding; bh=7mzarcVxtFawHV5AKsj0DIlARk5ElzGXHCjo+NThzOA=; b=LnBPh3e+d8VGw312M0rnEeeA1c1cjgceLVWA8KuMrBnNwMZ4t+dntJ+/Jyq3bCXtMG WW4BxqZ1eiJLRANyrsbJ70/WV86nrQbZXzVYhQsHj/nHOGkKazD+bob28PmEpDkFhy3j jC5YYT8uxeahv7/bFe5qGJtJ6YBouwt1uapDzmVYH72sa7pc+Ih22ZlxQmBoS4P031A0 cDeKx67PmouP7y/QST3n+STxZqrIbHfyQ8aLD4Rm+8IKD90wnNF3hDYiFPLJN0ufWhTS vciDglRsljLn6YsOPHJNNvw8h6zvT90oLE+QT7G8fyNdd2AxA++m+zKj6bTR6KMCHJQj ErZg== 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:mime-version:content-transfer-encoding; bh=7mzarcVxtFawHV5AKsj0DIlARk5ElzGXHCjo+NThzOA=; b=qAXBANz8KKNNFJYEip6OXNOLTxRe0oSdcFCDZ7pzzw/G//9rp0s0oQPXSRmk8XeUlJ pgh99O90JayxeXYYUgO5wVuDr4JIvJfE4mHWyqVZ30vHj1r7Os63wTdJdrgW6Rf7Z2mh S/ShnSNE+TZZgArLE/9NvGzCF4L4YOJaru8hVEPUqnFaU/9CiKMby3t3RDgJnk1mBwbc VRKQ0maTr45p+kQ8PSrh+jK6nkHWBqirNDcmU71ePqHUyCxmZRVD2Y2xSS5WbJRM+eSQ iBzLwQSBzebWMOGmI0KKR0HMxPDzk1DR+oe0+6nO+rfj5hx2/ZzPWYT7ksLSOk1ChdUk HTAg== X-Gm-Message-State: APjAAAWFpfB2KtSKKpcGsl2DY4XNgp8Nq/pBJrZFucVXEuBkcEIuJfBx /vstCpyuJd0IEzhDbXECdSwBL9Wb X-Google-Smtp-Source: APXvYqz445jzw74+7l3rcOS2gpK0O4kkMIGqThzeEs1q7CKEn2PFUe/fYXJjW8VD3lf/fzrQjv3Quw== X-Received: by 2002:adf:fa47:: with SMTP id y7mr6053297wrr.27.1553957396090; Sat, 30 Mar 2019 07:49:56 -0700 (PDT) Received: from kali.home (lfbn-ren-1-314-196.w2-10.abo.wanadoo.fr. [2.10.15.196]) by smtp.gmail.com with ESMTPSA id x11sm4186862wmh.2.2019.03.30.07.49.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Mar 2019 07:49:55 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 30 Mar 2019 15:49:41 +0100 Message-Id: <20190330144947.27638-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190330144947.27638-1-fontaine.fabrice@gmail.com> References: <20190330144947.27638-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2, 2/8] package/rpm: add optional bzip2 dependency 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: Fabrice Fontaine , James Knight Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" There is no --{disable,enable}-bzip2 option Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Thomas Petazzoni): - Put bump as the first patch in the serie package/rpm/rpm.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index eb9a4a5a51..e076d2a17f 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -8,7 +8,13 @@ RPM_VERSION_MAJOR = 4.14 RPM_VERSION = $(RPM_VERSION_MAJOR).2.1 RPM_SOURCE = rpm-$(RPM_VERSION).tar.bz2 RPM_SITE = http://ftp.rpm.org/releases/rpm-$(RPM_VERSION_MAJOR).x -RPM_DEPENDENCIES = host-pkgconf berkeleydb file popt zlib \ +RPM_DEPENDENCIES = \ + host-pkgconf \ + berkeleydb \ + $(if $(BR2_PACKAGE_BZIP2),bzip2) \ + file \ + popt \ + zlib \ $(TARGET_NLS_DEPENDENCIES) RPM_LICENSE = GPL-2.0 or LGPL-2.0 (library only) RPM_LICENSE_FILES = COPYING