From patchwork Fri Mar 15 13:30:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1057015 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.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.b="feZE21hQ"; 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 44LRKs27wwz9s3l for ; Sat, 16 Mar 2019 00:30:54 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 61D5D8831E; Fri, 15 Mar 2019 13:30:51 +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 RkX7C8bhrro3; Fri, 15 Mar 2019 13:30:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id BBA2D88319; Fri, 15 Mar 2019 13:30:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 09FEB1BF36B for ; Fri, 15 Mar 2019 13:30:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 06A5F21576 for ; Fri, 15 Mar 2019 13:30:46 +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 KMmre3xjv+t1 for ; Fri, 15 Mar 2019 13:30:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by silver.osuosl.org (Postfix) with ESMTPS id F0314214D2 for ; Fri, 15 Mar 2019 13:30:44 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id e16so6127241wme.1 for ; Fri, 15 Mar 2019 06:30:44 -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=7mSv/2x9OYeOUsbVY1Z4BmSoZsMFVK+a2GG3GxlVjqg=; b=feZE21hQd5MJ3bxeUdVH9QOpOPZEO69cDzTcRhoVFOAX3gQGndvpyHpdOz93vHSzgo lniPw41gpqR6ybGcgViAbrMET7Cmo3tJvyCrn8XhAa28HLHm2XFWSYWfq3Ca4fmfF8nZ mDXcNVUgoB+1Kg8WaU2sdTHlJ98NDj8MHGPROWLvyJoUg2HChaJz+sj+ZwbZdiR0Xeab JlYY2R4NH3XrsLl7PNmJ+irGTRhSITMhoPLJMt/mCKbnXHum+QAnWiT5tM9+7EkvCDNg 9w1nNSLhub+vAquSgYQi4keZ6PZ5V1zLhMmkYqwCCdpBTLjvi5ympe2/qKfaJckrqvO4 aRjw== 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=7mSv/2x9OYeOUsbVY1Z4BmSoZsMFVK+a2GG3GxlVjqg=; b=LqmPzNdHcBv3KffPcADK9qxMO5q61FqqyuaXsF1GsEbIiiCKBhmlB/bD/bnn5g4u+t /vh0vBFFsOTjzxX0UbiU+FizFFa67djhIwMZlLbIfoC4EN+0F0raHn+nwyiIcdgfS40o NDToJ1vGq7rlLoRgmTBlinAd/uqHQd72WH6TcCFSCq4SIOUvCt7RIChOnaqu/9rffdg2 ab5YnECxSBOwbmEZh45QVci7/zClbdPKaNttU38OLwF9o9DrikanrL8ewoCkbnkGq+Ms pv5D/7zpkUVQ+laQacEPHVitpVE8fRpD15b39M3vzLtF44tFKYzNO/RxZFZaZnWKYL2z ruHQ== X-Gm-Message-State: APjAAAUtS/eZoIrsmyGD246Cu7Row+MptuxwSowtckVp2Rs06IwmXaqP emOdsUT2j/ARCgFU+eqSvP4CZdwy X-Google-Smtp-Source: APXvYqwq170AblhE8jgBbafT16Q1HwXY5hHv9/qzD3WL1KjVyjOkccZeurep0KKBiAFLAuFnm1/4CQ== X-Received: by 2002:a1c:387:: with SMTP id 129mr2274476wmd.45.1552656643176; Fri, 15 Mar 2019 06:30:43 -0700 (PDT) Received: from lano-work.andritz.com ([80.120.136.76]) by smtp.gmail.com with ESMTPSA id h10sm3515897wmf.2.2019.03.15.06.30.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Mar 2019 06:30:42 -0700 (PDT) From: Norbert Lange X-Google-Original-From: Norbert Lange To: buildroot@buildroot.org Date: Fri, 15 Mar 2019 14:30:31 +0100 Message-Id: <20190315133033.5275-3-norbert.lange@andritz.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190315133033.5275-1-norbert.lange@andritz.com> References: <20190315133033.5275-1-norbert.lange@andritz.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 2/4] package/libfuse3: new package 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: Norbert Lange Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Norbert Lange --- package/Config.in | 1 + package/libfuse3/Config.in | 12 ++++++++ package/libfuse3/disable_fileops.patch | 23 +++++++++++++++ package/libfuse3/libfuse3.hash | 8 ++++++ package/libfuse3/libfuse3.mk | 40 ++++++++++++++++++++++++++ 5 files changed, 84 insertions(+) create mode 100644 package/libfuse3/Config.in create mode 100644 package/libfuse3/disable_fileops.patch create mode 100644 package/libfuse3/libfuse3.hash create mode 100644 package/libfuse3/libfuse3.mk diff --git a/package/Config.in b/package/Config.in index 3231aada31..bcd1c6297f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1231,6 +1231,7 @@ menu "Filesystem" source "package/libconfig/Config.in" source "package/libconfuse/Config.in" source "package/libfuse/Config.in" + source "package/libfuse3/Config.in" source "package/liblockfile/Config.in" source "package/libnfs/Config.in" source "package/libsysfs/Config.in" diff --git a/package/libfuse3/Config.in b/package/libfuse3/Config.in new file mode 100644 index 0000000000..d349fcd67f --- /dev/null +++ b/package/libfuse3/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_LIBFUSE3 + bool "libfuse3" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # fork() + help + FUSE 3 (Filesystem in UserSpacE) + + https://github.com/libfuse/libfuse + +comment "libfuse3 needs a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libfuse3/disable_fileops.patch b/package/libfuse3/disable_fileops.patch new file mode 100644 index 0000000000..bd3a8e2be3 --- /dev/null +++ b/package/libfuse3/disable_fileops.patch @@ -0,0 +1,23 @@ +diff -burN fuse-3.4.1.org/util/install_helper.sh fuse-3.4.1/util/install_helper.sh +--- fuse-3.4.1.org/util/install_helper.sh 2019-02-12 14:33:18.549507335 +0100 ++++ fuse-3.4.1/util/install_helper.sh 2019-02-12 14:35:20.726772913 +0100 +@@ -22,8 +22,8 @@ + DESTDIR="${DESTDIR%/}" + fi + +-chown root:root "${DESTDIR}${bindir}/fusermount3" +-chmod u+s "${DESTDIR}${bindir}/fusermount3" ++chown root:root "${DESTDIR}${bindir}/fusermount3" || : ++chmod u+s "${DESTDIR}${bindir}/fusermount3" || : + + install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \ + "${DESTDIR}${sysconfdir}/fuse.conf" +@@ -31,7 +31,7 @@ + + if test ! -e "${DESTDIR}/dev/fuse"; then + mkdir -p "${DESTDIR}/dev" +- mknod "${DESTDIR}/dev/fuse" -m 0666 c 10 229 ++ mknod "${DESTDIR}/dev/fuse" -m 0666 c 10 229 || : + fi + + install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash new file mode 100644 index 0000000000..e9b9f8384c --- /dev/null +++ b/package/libfuse3/libfuse3.hash @@ -0,0 +1,8 @@ +# Locally calculated after checking pgp signature +sha256 224dd4a598e23e114395a9717bc79638ab2b1e42c82ae8210aed9365aff325a3 fuse-3.4.2.tar.xz + + +# Hash for license files: +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 GPL2.txt +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL2.txt +sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk new file mode 100644 index 0000000000..ff8d251a96 --- /dev/null +++ b/package/libfuse3/libfuse3.mk @@ -0,0 +1,40 @@ +################################################################################ +# +# libfuse +# +################################################################################ + +LIBFUSE3_VERSION = 3.4.2 +LIBFUSE3_SOURCE = fuse-$(LIBFUSE3_VERSION).tar.xz +LIBFUSE3_SITE = https://github.com/libfuse/libfuse/releases/download/fuse-$(LIBFUSE3_VERSION) +LIBFUSE3_LICENSE = LGPL-2.1 (library), GPL-2.0 (rest) +LIBFUSE3_LICENSE_FILES = GPL2.txt LGPL2.txt LICENSE +LIBFUSE3_INSTALL_STAGING = YES +LIBFUSE3_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) +LIBFUSE3_CONF_OPTS = \ + -Dexamples=false \ + -Dutils=true \ + -Dudevrulesdir=/lib/udev/rules.d + +define LIBFUSE3_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(STAGING_DIR)/usr/bin/fusermount3 $(TARGET_DIR)/usr/bin/ + $(if $(filter y,$(BR2_STATIC_LIBS)),,cp -dpf $(STAGING_DIR)/usr/lib/libfuse3.so* $(TARGET_DIR)/usr/lib/) + mkdir -p $(TARGET_DIR)/lib/udev/rules.d + $(INSTALL) -m 0644 $(STAGING_DIR)/lib/udev/rules.d/*-fuse3.rules $(TARGET_DIR)/lib/udev/rules.d +endef + +define LIBFUSE3_INSTALL_TARGET_POST + ln -sf fusermount3 $(TARGET_DIR)/usr/bin/fusermount +endef + +LIBFUSE3_POST_INSTALL_TARGET_HOOKS += LIBFUSE3_INSTALL_TARGET_POST + +define LIBFUSE3_DEVICES + /dev/fuse c 666 0 0 10 229 0 0 - +endef + +define LIBFUSE3_PERMISSIONS + /usr/bin/fusermount3 f 4755 0 0 - - - - - +endef + +$(eval $(meson-package)) From patchwork Fri Mar 15 13:30:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1057013 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.136; helo=silver.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="Q2SZsslk"; dkim-atps=neutral Received: from silver.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 ozlabs.org (Postfix) with ESMTPS id 44LRKs2rDdz9s3q for ; Sat, 16 Mar 2019 00:30:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 467EA214D2; Fri, 15 Mar 2019 13:30:52 +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 7RyAcGFSJ1IJ; Fri, 15 Mar 2019 13:30:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7B65021576; Fri, 15 Mar 2019 13:30:50 +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 8A3FF1BF36B for ; Fri, 15 Mar 2019 13:30:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 82DF686DF2 for ; Fri, 15 Mar 2019 13:30:47 +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 0G3VBevhrDpP for ; Fri, 15 Mar 2019 13:30:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 18B3B86DE8 for ; Fri, 15 Mar 2019 13:30:46 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id w2so9566275wrt.11 for ; Fri, 15 Mar 2019 06:30:46 -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=15WDrYMxUy5vddot5Qg5JmSKh+A8LA7vNJ4jjkk5dxE=; b=Q2SZsslkVrJlq3kijKxs3ltUIkUrTFpOyzEPWJXD2IDsIWNfPzB8gUWeGfyj5SH0Jh J9Q3KR2GJfPOCRvwXvzRZNA89SOyz0eP+YKi15icO16DlqwVXHvG/lOV8amA7+jMdarI jY+rrymcdP1ontrY7miT4pAGQzXPGAl4WcJGsMmY4LY+ADQN1dBBv90c5t1x9tekPJGq f52937gyEADk+QCnfYw1k6uO6RRHYBR/u3Y4I9MrzhHs6WQo0tawTL88j3qWV2q1tRIO MNKwjA923xfkXOHWxAOSKhPuEGtmh0taM/tBOVcC+LNQYE4Yt6csjdKqcIpb64j/RFfR d1yA== 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=15WDrYMxUy5vddot5Qg5JmSKh+A8LA7vNJ4jjkk5dxE=; b=mjD662s867uDhMbordZM7icZHPGSDcdeP8yd2P3pz1q1SHQrk7YzEM6iKat/XFGPRn iWmzH71Gln6byVymv5bqbZB2sw2IAJTwT3NaMspcvuLocjlnFd8MAlxQC6DGEMhrDK8u P6LOq2LYk6/lgUE2MnL2AmbokDHZaEIIrHFBavZ3FHJ3/yAo4bXOBCDnnghcSaCsler6 XcntCtA7QoYWp6Wu3o/0smIBIfKSbYROjyUIraQJbCPrrZVP9AePyBLxGpAZvoxoS2HS kyR+GndS7ui1cMeD6+SjAiyosggge0l7UIyrqVxzuj7eQOdJoVqUC7bMYLJOG5TrXw1e NrgQ== X-Gm-Message-State: APjAAAUFVixCnVeBdRmy+VkvjhF4h5+ABbhtSHOkabHljH2eeQDEpPJ1 IbqtFAQsf5M5GR/UQdWaz1Vy87jJ X-Google-Smtp-Source: APXvYqzFXfjDZlliCFwlhBI7ol7neIT/Ha7fyAQFJjumJaMfFmTXGR2G0bmO4CHl8WE1m1XDoRZx3w== X-Received: by 2002:adf:cd0f:: with SMTP id w15mr2551071wrm.267.1552656644419; Fri, 15 Mar 2019 06:30:44 -0700 (PDT) Received: from lano-work.andritz.com ([80.120.136.76]) by smtp.gmail.com with ESMTPSA id h10sm3515897wmf.2.2019.03.15.06.30.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Mar 2019 06:30:43 -0700 (PDT) From: Norbert Lange X-Google-Original-From: Norbert Lange To: buildroot@buildroot.org Date: Fri, 15 Mar 2019 14:30:32 +0100 Message-Id: <20190315133033.5275-4-norbert.lange@andritz.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190315133033.5275-1-norbert.lange@andritz.com> References: <20190315133033.5275-1-norbert.lange@andritz.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 3/4] add myself to DEVELOPERS 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: Norbert Lange Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Norbert Lange --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8a57cb2e23..ce0e9234d8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1628,6 +1628,7 @@ F: package/tpm-tools/ F: package/trousers/ N: Norbert Lange +F: package/libfuse3/ F: package/tcf-agent/ N: Olaf Rempel From patchwork Fri Mar 15 13:30:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1057014 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.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.b="RPq69i+x"; 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 44LRKt03K6z9s9N for ; Sat, 16 Mar 2019 00:30:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 859F188316; Fri, 15 Mar 2019 13:30:52 +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 2xXWioyswSro; Fri, 15 Mar 2019 13:30:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 6684D88324; Fri, 15 Mar 2019 13:30:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id C8AC31BF36B for ; Fri, 15 Mar 2019 13:30:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C53DC21576 for ; Fri, 15 Mar 2019 13:30: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 fJPcUNs4Desy for ; Fri, 15 Mar 2019 13:30:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by silver.osuosl.org (Postfix) with ESMTPS id 11169214D2 for ; Fri, 15 Mar 2019 13:30:47 +0000 (UTC) Received: by mail-wm1-f43.google.com with SMTP id f3so6603718wmj.4 for ; Fri, 15 Mar 2019 06:30:46 -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=V74+g1hL4pAVgqHpKf6vaJU6gPvMZf5AXYOE4fqoAx4=; b=RPq69i+xoyrycioxJxVbYI9DNlIFFt45uK+e49IUIHoQsvN2+iwLETfqoG2RSBKKUQ QQCHseWLZFfDo8jOM5MWYnc952qOCLMgDZfxVq7tchc9BJJ6Zt+dq/OwJpDRFrXv94r6 zINifSvgLFP0b18gld8sWQFdKbJfVBFjNxDjoXBgu/KcmGjqEheqj0ARO8949o0ZagNA 3mNikD83ltwqkOrcM4qw2XF/GMDoGooizmGsDh2ssqhi6XM9YYxvSzy7M58mHVO3jJHT wtz0PJTNxKIssiwHS1UEGhcmb2mVHSrbjEgiSll92xH8+p5mjEafWa5aBmLUdJXRadAO 9Caw== 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=V74+g1hL4pAVgqHpKf6vaJU6gPvMZf5AXYOE4fqoAx4=; b=rJKBEMQv1ZsAt3P7ZDg4Cho0poBbasm5Yf67oJwCGUn6iyVLrrTQFzQ6YhmAhcuiGt ql2gNaa3ekSR/ypmNwkJG7NjwEO5G1BuvVlX4DaWnt6e6y8t+sCpS7UOHk+I/zpMIccr koE6gkUlN/m5eQEB+gH8W3X5RsWKOKcIVsHjIuMSnfDZfBrG9Z/9i1GmofENAYrZcplA 3YbTIe5CGXhkwFO0OtxjmVVXYIQjzRAaOINzPwuqpd+YAxINt63LO+FxMYcfq9bsjWfi kccPjtjmILu3qn6jH2Z4DyFfFgliIGGiPV4fBdpNpVVMJO20Z4wOzBiF/4EI1F3fHnqN 3sRw== X-Gm-Message-State: APjAAAWA/2BzGTPVEAU7IuJzAoNZND44v50lDaGQifd4siKk9ZzWkYGR qBeDH8/n7k+w4ELtkoM3H/3dB6MQ X-Google-Smtp-Source: APXvYqw4zyJZufRi3yikqrnRs7GWi0RVVgMx6FSjKywL8NBDYikmDPQCr9mLqu14VxJXc/ARvALi3Q== X-Received: by 2002:a1c:721a:: with SMTP id n26mr2270220wmc.6.1552656645322; Fri, 15 Mar 2019 06:30:45 -0700 (PDT) Received: from lano-work.andritz.com ([80.120.136.76]) by smtp.gmail.com with ESMTPSA id h10sm3515897wmf.2.2019.03.15.06.30.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Mar 2019 06:30:44 -0700 (PDT) From: Norbert Lange X-Google-Original-From: Norbert Lange To: buildroot@buildroot.org Date: Fri, 15 Mar 2019 14:30:33 +0100 Message-Id: <20190315133033.5275-5-norbert.lange@andritz.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190315133033.5275-1-norbert.lange@andritz.com> References: <20190315133033.5275-1-norbert.lange@andritz.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 4/4] package/libfuse: common files from libfuse3 are prefered 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: Norbert Lange Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" if both libfuse and libfuse3 are co-installed, make sure libfuse3 will be build first and only install the files unique to libfuse. The fusermount tool is a simlink to fusermount3, mimicing debians approach. fuse device and udev rule is identicall between packages and only one definition is needed see the libfuse3 Changelog for 3.0.0 for details. Signed-off-by: Norbert Lange --- package/libfuse/libfuse.mk | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk index 84027ebedb..a0a00a6532 100644 --- a/package/libfuse/libfuse.mk +++ b/package/libfuse/libfuse.mk @@ -10,20 +10,44 @@ LIBFUSE_SITE = https://github.com/libfuse/libfuse/releases/download/fuse-$(LIBFU LIBFUSE_LICENSE = GPL-2.0, LGPL-2.1 LIBFUSE_LICENSE_FILES = COPYING COPYING.LIB LIBFUSE_INSTALL_STAGING = YES -LIBFUSE_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) +LIBFUSE_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(if $(BR2_PACKAGE_LIBFUSE3),libfuse3) LIBFUSE_CONF_OPTS = \ --disable-example \ --enable-lib \ --enable-util \ UDEV_RULES_PATH=/lib/udev/rules.d -define LIBFUSE_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/bin/fusermount $(TARGET_DIR)/usr/bin/ - cp -dpf $(STAGING_DIR)/usr/lib/libfuse.so* $(TARGET_DIR)/usr/lib/ +# From libfuse3 README: +# libfuse 3 is designed to be co-installable with libfuse 2. However, some +# files will be installed by both libfuse 2 and libfuse 3 +# (e.g. /etc/fuse.conf, the udev and init scripts, and the mount.fuse(8) manpage). +# These files should be taken from libfuse 3. The format/content is guaranteed +# to remain backwards compatible with libfuse 2. +# +# The way we handle this is to let libfuse3 install as usual, +# but libfuse has to be carefull to not overwrite any common files. +# Also some files are named diferently (udev-rules), +# but only the newer is needed. +# To ensure this, we install in a temporary directory and +# hand-pick the few unique files + +LIBFUSE_INSTALL_TARGET_OPTS = install DESTDIR=$(@D)/tmpinstall + +define LIBFUSE_INSTALL_TARGET_POST + cp -dpf $(@D)/tmpinstall/usr/lib/libfuse.so* $(TARGET_DIR)/usr/lib/ +endef + +LIBFUSE_POST_INSTALL_TARGET_HOOKS += LIBFUSE_INSTALL_TARGET_POST + +ifeq ($(BR2_PACKAGE_LIBFUSE3),) +define LIBFUSE_INSTALL_TARGET_POST_COMMON + $(INSTALL) -D -m 0755 $(@D)/tmpinstall/usr/bin/fusermount $(TARGET_DIR)/usr/bin/fusermount mkdir -p $(TARGET_DIR)/lib/udev/rules.d - cp $(STAGING_DIR)/lib/udev/rules.d/*-fuse.rules $(TARGET_DIR)/lib/udev/rules.d + cp $(@D)/tmpinstall/lib/udev/rules.d/*-fuse.rules $(TARGET_DIR)/lib/udev/rules.d endef +LIBFUSE_POST_INSTALL_TARGET_HOOKS += LIBFUSE_INSTALL_TARGET_POST_COMMON + define LIBFUSE_DEVICES /dev/fuse c 666 0 0 10 229 0 0 - endef @@ -31,5 +55,6 @@ endef define LIBFUSE_PERMISSIONS /usr/bin/fusermount f 4755 0 0 - - - - - endef +endif $(eval $(autotools-package))