From patchwork Wed Mar 6 16:30:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1052412 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="iiBPPeRI"; 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 44Dzm86TqGz9s7T for ; Thu, 7 Mar 2019 03:31:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E82E3830FD; Wed, 6 Mar 2019 16:31:14 +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 EfdUWyNf67p8; Wed, 6 Mar 2019 16:31:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0999C81457; Wed, 6 Mar 2019 16:31:13 +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 178CD1BF578 for ; Wed, 6 Mar 2019 16:31:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 13D7A84AAE for ; Wed, 6 Mar 2019 16:31:11 +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 J2RKu4Uf6qdD for ; Wed, 6 Mar 2019 16:31:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 256FE84837 for ; Wed, 6 Mar 2019 16:31:10 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id x7so6551051wmj.0 for ; Wed, 06 Mar 2019 08:31:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=c3+Z58X6OJCSMaAX7u6rHl3k+ZSAJabZlvcjwKlV/A8=; b=iiBPPeRIS262z5dU1+qSmFJl1bMwPG0OZ4IbvS8Xy1oxliLu6KycTRTVnOoD3/1Ujy SQsueiA4HgxJLZKJ9cx3mfX8PtOIr2A1Id5GpnpDjh+4uwoArybnT7oJ2FRRseoFlg1D q95a/Jl/+8Qi7ksLE2ZhvPbc5fcIG+5qHdeAOB3TZdvvsWTAMlJ8T+ZDaBujwm9a6Ese zvvVx3A/rxUDtepJW8idT1QLhEu6le+5+FscEcbo5Lk7/+yEsFrKPcUDLH1jeQvqZM7e wv60VeYsmOVA/TgJn3jtk9JNUs6j+dzgGBKFZ8M9yLP7Elxfn4T1PEBzwSiOFyJTZPFy MOFg== 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:mime-version :content-transfer-encoding; bh=c3+Z58X6OJCSMaAX7u6rHl3k+ZSAJabZlvcjwKlV/A8=; b=X7OjczgpbVnCcl0diIwVRyV9qsLqqN/VJLJrzQYJK79bgPSVRzdJ7Lhu3616sO29yx YE840Xvlb8qe1QxP0waL5FwJQMOYVaMA3C/4rpvT1vUzjbA0d8Fs2OznCXvz0GMCvn/9 2/n7YA/f5uE/VfJAdTB4SXpLysFiznscwAgoU45viE6nWXDcw49cRE8fn12LduGUzmdI uqoPNe5vT+aV0+nTFly2SfdW6n/6OjmBkOo3k8Hdslswbdloxl1znqYXphQJZeLNs5ub 7qWqgimwKUGiLj1luy/aIirMSZ6/hbijXEd1z8P2kwET8Jgse5lchICWycYykrHciM+T maUQ== X-Gm-Message-State: APjAAAWzXl2HF5prOei4OlIc9p2dwPsT/5JV1pMWXfIEcCh1NUA4kujb nC0fFVjJO5yt4tRAIxtKmQpul8QC X-Google-Smtp-Source: APXvYqxrSkulHBy5Y4E01agezg12IdhvPVxU0m3SpuPGNlacOQCFBaUB57RRyoX2xAnIuOQKkGFhtA== X-Received: by 2002:a1c:6305:: with SMTP id x5mr849744wmb.144.1551889868241; Wed, 06 Mar 2019 08:31:08 -0800 (PST) Received: from lano-work.andritz.com ([80.120.136.76]) by smtp.gmail.com with ESMTPSA id f6sm3588826wrs.45.2019.03.06.08.31.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2019 08:31:07 -0800 (PST) From: Norbert Lange X-Google-Original-From: Norbert Lange To: buildroot@buildroot.org Date: Wed, 6 Mar 2019 17:30:53 +0100 Message-Id: <20190306163054.5918-1-norbert.lange@andritz.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] 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 | 32 ++++++++++++++++++++++++++ package/libfuse3/libfuse3.hash | 7 ++++++ package/libfuse3/libfuse3.mk | 30 ++++++++++++++++++++++++ 5 files changed, 82 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 969f94c911..155c760df1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1229,6 +1229,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..b0373bc43a --- /dev/null +++ b/package/libfuse3/disable_fileops.patch @@ -0,0 +1,32 @@ +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" \ +@@ -42,7 +42,7 @@ + + + if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then +- /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true ++ : # /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true + else + echo "== FURTHER ACTION REQUIRED ==" + echo "Make sure that your init system will start the ${sysconfdir}/init.d/fuse3 init script" diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash new file mode 100644 index 0000000000..d0fd037428 --- /dev/null +++ b/package/libfuse3/libfuse3.hash @@ -0,0 +1,7 @@ +# Locally calculated after checking pgp signature +sha256 88302a8fa56e7871066652495b05faf14b36dca9f1b740e9fb00da0785e60485 fuse-3.4.1.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..eecdb248d3 --- /dev/null +++ b/package/libfuse3/libfuse3.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# libfuse +# +################################################################################ + +LIBFUSE3_VERSION = 3.4.1 +LIBFUSE3_SOURCE = fuse-$(LIBFUSE3_VERSION).tar.xz +LIBFUSE3_SITE = https://github.com/libfuse/libfuse/releases/download/fuse-$(LIBFUSE3_VERSION) +LIBFUSE3_LICENSE = GPL-2.0, LGPL-2.1 +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_PERMISSIONS + /usr/bin/fusermount3 f 4755 0 0 - - - - - +endef + +$(eval $(meson-package)) From patchwork Wed Mar 6 16:30:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1052413 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="sfGitFeI"; 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 44DzmB21xdz9s7T for ; Thu, 7 Mar 2019 03:31:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B62572279E; Wed, 6 Mar 2019 16:31:18 +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 2sOrQQ9XXYRg; Wed, 6 Mar 2019 16:31:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id CBED321503; Wed, 6 Mar 2019 16:31:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 7FF801BF578 for ; Wed, 6 Mar 2019 16:31:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7D50B86512 for ; Wed, 6 Mar 2019 16:31:15 +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 JMjbMMJyjpKo for ; Wed, 6 Mar 2019 16:31:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id B0F90860BC for ; Wed, 6 Mar 2019 16:31:14 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id l5so14123146wrw.6 for ; Wed, 06 Mar 2019 08:31:14 -0800 (PST) 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=Bzawje8tL/vI8BH4gqIgZeaJNvZ5yBQEA0DfWfKjY30=; b=sfGitFeIPK1h1wZzQCKqp0prfeb68K2dfsDK63xOtKiLOvzV8ZArwhhPkgOHSzeK5/ ZQ9/OUPRmzE5WM5iAnUEsQLNPCNvqN1NQLdzVmd7e4xgLlzhGN2Uzg6B8cMpKFPlqe8y jSWjb4eb+VoS0uDzInhzVdjX+WUUCQIztqxXa9IDG1m0ohq8lgS5OjLeVe2YWYsmHNS2 eAHN2Ux05VqyoOLvbwIi/haH/IvTB2q3xvULLReeDyWSNtOAvSA2/Q+akkcYsA61jTAD Lo8EChHqpVYdGdYQUkxUBOasxH6Z7oksdpfHd/a8p/XGhGGRb37rvhvtPiGAdkeUOG1C Uaew== 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=Bzawje8tL/vI8BH4gqIgZeaJNvZ5yBQEA0DfWfKjY30=; b=Trl3Xwu0iQXibbJZEWXb5My6QextEzOJ8+SmmjbQ4oFGmr+85uA3BUllYuiCc0CobJ dWfPQFHx27k7ltG4pKnaBiBtvmKjzqrizDJYvu5Q4dbcNzhSBKXVG2YJ9o534uMcRL6j cO/O+mXrfl+ZTdCia/pPclha0/PEoPKe+W2Uz+dJc5WMC1/vkqjzHRMvXWkJ+BG8a5uB iwW8Cv190qfGReCNJhUY3uBcij6QAFNCZH6XmpxYmtokDYZgQ5OjbohZ2V9bx3vrYgfR pTHBvnXD34zdmszCEkMwJS9vnOhs2KJ1FivDw/p/hBC5jaCHiZxRdT2vC8NiK/R3fS/w TbJw== X-Gm-Message-State: APjAAAWXpI6kUqaVVdwXcXEMmzN4Hg/dIJ45gIjSIeEWCXo9lOiAe/eC 5WphhAOYmxvEftjZx3b5i9XOlcPC X-Google-Smtp-Source: APXvYqxfu211+5TCAEu5aMKkOVxkjLzoBev7bbfaOzhASt931XDiMxknzcNAPlu2vxCy2I2P337YHg== X-Received: by 2002:adf:b784:: with SMTP id s4mr3576923wre.155.1551889872893; Wed, 06 Mar 2019 08:31:12 -0800 (PST) Received: from lano-work.andritz.com ([80.120.136.76]) by smtp.gmail.com with ESMTPSA id f6sm3588826wrs.45.2019.03.06.08.31.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2019 08:31:12 -0800 (PST) From: Norbert Lange X-Google-Original-From: Norbert Lange To: buildroot@buildroot.org Date: Wed, 6 Mar 2019 17:30:54 +0100 Message-Id: <20190306163054.5918-2-norbert.lange@andritz.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190306163054.5918-1-norbert.lange@andritz.com> References: <20190306163054.5918-1-norbert.lange@andritz.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] 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 installed, make sure libfuse3 will be build first and use the auxiliary files from the newer package. Also fix the missing setuid bit for fusermount. Signed-off-by: Norbert Lange --- package/libfuse/libfuse.mk | 10 ++++++++-- package/libfuse3/libfuse3.mk | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk index e8a79a3166..cf7bb2a8e0 100644 --- a/package/libfuse/libfuse.mk +++ b/package/libfuse/libfuse.mk @@ -10,15 +10,21 @@ 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_FUSE3),fuse3) LIBFUSE_CONF_OPTS = \ --disable-example \ --enable-lib \ --enable-util define LIBFUSE_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/bin/fusermount $(TARGET_DIR)/usr/bin/ + $(if $(BR2_PACKAGE_FUSE3),, \ + $(INSTALL) -D -m 0755 $(STAGING_DIR)/usr/bin/fusermount $(TARGET_DIR)/usr/bin/ ) cp -dpf $(STAGING_DIR)/usr/lib/libfuse.so* $(TARGET_DIR)/usr/lib/ endef +define LIBFUSE_PERMISSIONS + $(if $(BR2_PACKAGE_FUSE3),, \ + /usr/bin/fusermount f 4755 0 0 - - - - -) +endef + $(eval $(autotools-package)) diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk index eecdb248d3..be3bf4c746 100644 --- a/package/libfuse3/libfuse3.mk +++ b/package/libfuse3/libfuse3.mk @@ -21,6 +21,7 @@ define LIBFUSE3_INSTALL_TARGET_CMDS $(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 + ln -sf fusermount3 $(TARGET_DIR)/usr/bin/fusermount endef define LIBFUSE3_PERMISSIONS