From patchwork Sun Jan 18 11:34:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 430171 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 2629C1401D0 for ; Sun, 18 Jan 2015 22:37:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 202EA94D40; Sun, 18 Jan 2015 11:37:55 +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 kU0kEdX0Q8Wp; Sun, 18 Jan 2015 11:37:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 6A75594D38; Sun, 18 Jan 2015 11:37:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 4DF3C1C29B5 for ; Sun, 18 Jan 2015 11:37:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id EE1E532FE3 for ; Sun, 18 Jan 2015 11:37:47 +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 GzT6W2qTPp0g for ; Sun, 18 Jan 2015 11:37:46 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp1-g21.free.fr (smtp1-g21.free.fr [212.27.42.1]) by silver.osuosl.org (Postfix) with ESMTPS id 6B96832E93 for ; Sun, 18 Jan 2015 11:37:46 +0000 (UTC) Received: from localhost.localdomain (unknown [81.57.22.125]) by smtp1-g21.free.fr (Postfix) with ESMTP id 96241940036; Sun, 18 Jan 2015 12:35:45 +0100 (CET) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 18 Jan 2015 12:34:59 +0100 Message-Id: <1421580900-15186-2-git-send-email-romain.naour@openwide.fr> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1421580900-15186-1-git-send-email-romain.naour@openwide.fr> References: <1421580900-15186-1-git-send-email-romain.naour@openwide.fr> Subject: [Buildroot] [PATCH 2/3] package/rpm: use external xz library X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: http://autobuild.buildroot.net/results/2c6/2c61562008418ff58fa3085a3342b0e304923073/ Signed-off-by: Romain Naour Reviewed-by: "Yann E. MORIN" --- package/rpm/Config.in | 1 + package/rpm/rpm.mk | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package/rpm/Config.in b/package/rpm/Config.in index 5ec4167..fe7a38a 100644 --- a/package/rpm/Config.in +++ b/package/rpm/Config.in @@ -31,6 +31,7 @@ config BR2_PACKAGE_RPM_BZIP2_PAYLOADS config BR2_PACKAGE_RPM_XZ_PAYLOADS bool "support for xz payloads" depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_XZ help Support for xz payloads in RPM. diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index 74f5b88..ce7189e 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -45,7 +45,10 @@ RPM_CONF_OPTS += --with-file=no endif ifeq ($(BR2_PACKAGE_RPM_XZ_PAYLOADS),y) -RPM_CONF_OPTS += --with-xz +RPM_CONF_OPTS += --with-xz=external +RPM_DEPENDENCIES += xz +else +RPM_CONF_OPTS += --with-xz=none endif ifeq ($(BR2_PACKAGE_RPM_BZIP2_PAYLOADS),y)