From patchwork Tue Oct 4 11:53:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 678039 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3spHP325BHz9sBr for ; Tue, 4 Oct 2016 22:53:27 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=efOvjOca; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C7DB791E79; Tue, 4 Oct 2016 11:53:24 +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 pZB96TLSko1A; Tue, 4 Oct 2016 11:53:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1CB1F923D6; Tue, 4 Oct 2016 11:53:23 +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 5B07E1C1644 for ; Tue, 4 Oct 2016 11:53:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4F15E923D6 for ; Tue, 4 Oct 2016 11:53:21 +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 7geUvHGwDvj2 for ; Tue, 4 Oct 2016 11:53:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4C6CF91E79 for ; Tue, 4 Oct 2016 11:53:20 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id f193so14685271wmg.2 for ; Tue, 04 Oct 2016 04:53:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=Mu8zXyBhS1WDosIdYjnmGaOKyB2ZYSp9faniIqLW5f0=; b=efOvjOca6nuyOtGdYPmADV+TBSwHPCe2e1/CxWtiJa/hN6aZ3LsXVAmlKbALr/WOlU r9+Wj3HKnA6Zik5Wo3RSbfRBYcuCjg0Hr8kIgPLf503vE9DE9qdhHh+hgprI6PXSSdet JkN6hxbsxS5bBSHlANLZZUcqWtVvvn8MmKqqI/dwF/b+QveG1eP36HfYMdv/s8RzYKlC VNklTZlJRvlA3KeJCqOP3sSwneAL1+jaJXzR4r35Q+ZFhCxsyICJ8SjTBe3BmpH6jB4W jvlpxzkdxO5Rz/PrKm5i5bnjWQH4bsEeJhs4PQTHks+khujoPftkzoP6nfj0ZppPwXtM V4dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Mu8zXyBhS1WDosIdYjnmGaOKyB2ZYSp9faniIqLW5f0=; b=et2AIEjpJYu2aAi6KaywJRzD48BXyjOtiU9MxlPUltBVaKrxOtvwiJQG82lLJOGGsd arSM/f249N5Mii7GiyPmiXUGbC3SL047cz2Vg9M3HjT1wmNFRtsfu3OZd9EAdZRLwP2d jw0YTJhEuPPECd2tAGb7vMNFJJYWcq+7O7hmjisP/ILdceM+Ljq6jX98OyextPRYC0en eJ7ZyJq8l5tPtzNQ6HdDhkvaaBhyptdCmvmryeuLvZXRPg/IkE7yI6DpkNjP6Lwmbou9 Kh5qMgKSsachUeR6OhOcwjFLnSFZcOzEh61A6HI7G1AK1zGOCPp45U/XPXBud2HEnBOA LSZw== X-Gm-Message-State: AA6/9Rk2F9QhnkIeaK/j23k2AIVKzujXeqkGSbYJ4ZaJfl+xAwhFhpQxUUTKN0aDs34V7Q== X-Received: by 10.28.14.202 with SMTP id 193mr3581591wmo.125.1475581998803; Tue, 04 Oct 2016 04:53:18 -0700 (PDT) Received: from cerise.devialet.com ([88.191.165.76]) by smtp.gmail.com with ESMTPSA id vx7sm3210402wjc.1.2016.10.04.04.53.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Oct 2016 04:53:17 -0700 (PDT) From: Maxime Hadjinlian To: buildroot@buildroot.org Date: Tue, 4 Oct 2016 13:53:20 +0200 Message-Id: <20161004115320.647-1-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [Buildroot] [PATCH] fakeroot: bump version to 1.21-2 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" Since the glibc 2.24-3, and this commit: https://sourceware.org/git/?p=glibc.git;a=commit;h=80f87443eed17838fe453f1f5406ccf5d3698c25 fakeroot will print spurious message about symbols not being found. [...] dlsym(acl_get_fd): /usr/lib/libfakeroot/libfakeroot.so: undefined symbol: acl_get_fd dlsym(acl_get_file): /usr/lib/libfakeroot/libfakeroot.so: undefined symbol: acl_get_file dlsym(acl_set_fd): /usr/lib/libfakeroot/libfakeroot.so: undefined symbol: acl_set_fd dlsym(acl_set_file): /usr/lib/libfakeroot/libfakeroot.so: undefined symbol: acl_set_file dlsym(acl_get_fd): /usr/lib/libfakeroot/libfakeroot.so: undefined symbol: acl_get_fd dlsym(acl_get_file): /usr/lib/libfakeroot/libfakeroot.so: undefined symbol: acl_get_file [...] It doesn't seem to impair the behavior of fakeroot, it's simply annoying for the user. Debian (which is the creator of fakeroot) has a patch which is a workaround: simply don't display the message. Since Debian has other patch that may be of interests to Buildroot and we certainly don't want to maintain our own copies, we now download the debian tarball to apply all of their patches. In this version, the configure and Makefile are not provided so we need to generate them using the 'bootstrap' script included in the source. Finally, the added patch remove the 'doc' subdirectory from being built. Without it, the build ends up in error because the install process is unable to find the manpages files (it looks in the wrong directory) but we don't really care about manpages so it's easier to simply disable building them, gaining a few seconds. Signed-off-by: Maxime Hadjinlian --- .../0001-Makefile.am-remove-doc-subdir.patch | 27 ++++++++++++++++++++++ package/fakeroot/fakeroot.hash | 8 ++++--- package/fakeroot/fakeroot.mk | 13 ++++++++--- 3 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 package/fakeroot/0001-Makefile.am-remove-doc-subdir.patch diff --git a/package/fakeroot/0001-Makefile.am-remove-doc-subdir.patch b/package/fakeroot/0001-Makefile.am-remove-doc-subdir.patch new file mode 100644 index 0000000..9a12752 --- /dev/null +++ b/package/fakeroot/0001-Makefile.am-remove-doc-subdir.patch @@ -0,0 +1,27 @@ +From 9d842122bdd7b59c5166163b6400aa81763bf844 Mon Sep 17 00:00:00 2001 +From: Maxime Hadjinlian +Date: Tue, 4 Oct 2016 11:10:51 +0200 +Subject: [PATCH] Makefile.am: remove doc subdir + +It's not interesting in Buildroot context to make the documentation. + +Signed-off-by: Maxime Hadjinlian +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 6d6f07f..c9c7bb6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + AUTOMAKE_OPTIONS=foreign + ACLOCAL_AMFLAGS = -I build-aux +-SUBDIRS=scripts doc test ++SUBDIRS=scripts test + + noinst_LTLIBRARIES = libcommunicate.la libmacosx.la + libcommunicate_la_SOURCES = communicate.c +-- +2.9.3 + diff --git a/package/fakeroot/fakeroot.hash b/package/fakeroot/fakeroot.hash index f0d436e..f326947 100644 --- a/package/fakeroot/fakeroot.hash +++ b/package/fakeroot/fakeroot.hash @@ -1,4 +1,6 @@ -# From http://snapshot.debian.org/package/fakeroot/1.20.2-1/ -sha1 367040df07043edb630942b21939e493f3fad888 fakeroot_1.20.2.orig.tar.bz2 +# From http://snapshot.debian.org/package/fakeroot/1.21-2/ +sha1 9ce6155c0f3edf310818a09b6b1b8968a8cb0cd4 fakeroot_1.21.orig.tar.gz +sha1 7f09b96b495f3502ff8d805376eb74cd98ee188f fakeroot_1.21-2.debian.tar.xz # Calculated based on the hash above -sha256 7c0a164d19db3efa9e802e0fc7cdfeff70ec6d26cdbdc4338c9c2823c5ea230c fakeroot_1.20.2.orig.tar.bz2 +sha256 2d6ff6900ebc553b0b66d910b5a7ad4889dd738cd757629afe4bc4e80be484e3 fakeroot_1.21-2.debian.tar.xz +sha256 5d293c1b3604b2a9265d1811a9890c749887ef08aec55f3237d32bf35836171a fakeroot_1.21.orig.tar.gz diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk index 168cd13..3209792 100644 --- a/package/fakeroot/fakeroot.mk +++ b/package/fakeroot/fakeroot.mk @@ -4,9 +4,11 @@ # ################################################################################ -FAKEROOT_VERSION = 1.20.2 -FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.bz2 -FAKEROOT_SITE = http://snapshot.debian.org/archive/debian/20141005T221953Z/pool/main/f/fakeroot +FAKEROOT_VERSION = 1.21 +FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.gz +FAKEROOT_SITE = http://snapshot.debian.org/archive/debian/20161003T101329Z/pool/main/f/fakeroot +FAKEROOT_PATCH = \ + http://snapshot.debian.org/archive/debian/20161003T101329Z/pool/main/f/fakeroot/fakeroot_$(FAKEROOT_VERSION)-2.debian.tar.xz # Force capabilities detection off # For now these are process capabilities (faked) rather than file # so they're of no real use @@ -17,4 +19,9 @@ HOST_FAKEROOT_CONF_ENV = \ FAKEROOT_LICENSE = GPLv3+ FAKEROOT_LICENSE_FILES = COPYING +define FAKEROOT_RUN_BOOTSTRAP + cd $(@D) && PATH=$(BR_PATH) ./bootstrap +endef +HOST_FAKEROOT_PRE_CONFIGURE_HOOKS += FAKEROOT_RUN_BOOTSTRAP + $(eval $(host-autotools-package))