From patchwork Mon May 3 02:33:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1472998 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FYRq02l6Bz9sCD for ; Mon, 3 May 2021 12:33:16 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 86DF984395; Mon, 3 May 2021 02:33:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wKrbAJyqJ3Db; Mon, 3 May 2021 02:33:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id C4B9B8437C; Mon, 3 May 2021 02:33:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E15541BF2AE for ; Mon, 3 May 2021 02:33:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id CFA228437C for ; Mon, 3 May 2021 02:33:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6bxdERw_6ihU for ; Mon, 3 May 2021 02:33:09 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by smtp1.osuosl.org (Postfix) with ESMTPS id ECAB184373 for ; Mon, 3 May 2021 02:33:08 +0000 (UTC) Received: by mail-pg1-f170.google.com with SMTP id s22so2663525pgk.6 for ; Sun, 02 May 2021 19:33:08 -0700 (PDT) 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=WhR0bNV0OIO91fQjH+D7gV+N5eOUXOYbhbJx8tazLmo=; b=OIpfcsPusdD2sy7wddFwKr92BaqXHWYCxbskJT8EolpN3kMQLub4Nw4YWXI26u3KKZ RZr6/VK44PX5FkCaxposh9JrYt/QVLV42+gKL+XLfEmL1QW/0hApRB5sgMhfgLLe413T fOtkJtgMSSGG7E9bTueaNH6u5U67q9yW0U8qPbitAMgrOwZ5x0vTdUVhMgeQ9CBdwevt HGGjKFc59wACIU6YBwTepQpSczb1Jd28oFG8jhHPc+qyiumw+G+mG8Z0MN/abbZ4JTLT ynuzonf2ybnSOA/w9qPIcEw9J7FmKFswRjFmVq0aBR4xDy4NhtUDXMiBNDm7HUby8BvQ jYoQ== X-Gm-Message-State: AOAM532Hh6nSg3ctZaHNP7JWqybinlT9eciagNMl/Qz4mwqydTJYvZXd foQfFMHVxMuivXUPA0694yf9blniNPMNPQ== X-Google-Smtp-Source: ABdhPJzvPab2hWRJlgHpp2YJujT6NX2EaLfKHLnAY2C+zWAnBLHjDDS7f/a4IFGTGFC3vH/m8F0H5w== X-Received: by 2002:a63:4a44:: with SMTP id j4mr15970280pgl.283.1620009188049; Sun, 02 May 2021 19:33:08 -0700 (PDT) Received: from localhost.localdomain (ip98-171-188-220.sb.sd.cox.net. [98.171.188.220]) by smtp.gmail.com with ESMTPSA id y1sm12896565pjt.26.2021.05.02.19.33.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 May 2021 19:33:07 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Sun, 2 May 2021 19:33:03 -0700 Message-Id: <20210503023305.161122-1-christian@paral.in> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v1 1/3] package/libfuse3: allow building as a host 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: Mirza Krak , Christian Stewart , Tian Yuanhao , Asaf Kahlon , Thomas Petazzoni , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Adds 1 patch to fix an install error when building as a host package. Patch was submitted upstream: https://github.com/libfuse/libfuse/pull/598 Signed-off-by: Christian Stewart --- ...er-fix-sysconf-dir-for-init.d-script.patch | 51 +++++++++++++++++++ package/libfuse3/libfuse3.mk | 7 +++ 2 files changed, 58 insertions(+) create mode 100644 package/libfuse3/0001-install_helper-fix-sysconf-dir-for-init.d-script.patch diff --git a/package/libfuse3/0001-install_helper-fix-sysconf-dir-for-init.d-script.patch b/package/libfuse3/0001-install_helper-fix-sysconf-dir-for-init.d-script.patch new file mode 100644 index 0000000000..4599c55e78 --- /dev/null +++ b/package/libfuse3/0001-install_helper-fix-sysconf-dir-for-init.d-script.patch @@ -0,0 +1,51 @@ +From cac00c154be5c8941d40b972bdcc0eb8bf209b93 Mon Sep 17 00:00:00 2001 +From: Christian Stewart +Date: Sun, 2 May 2021 19:04:50 -0700 +Subject: [PATCH] install_helper: fix sysconf dir for init.d script + +Fixes the following build error in Buildroot as a host package: + +Running custom install script 'install_helper.sh /host/etc /host/bin /host/lib/udev/rules.d false ++ sysconfdir=/host/etc ++ bindir=/host/bin ++ udevrulesdir=/host/lib/udev/rules.d ++ useroot=false ++ '[' -z '' ']' ++ DESTDIR= ++ install -D -m 644 /build/host-libfuse3-3.10.3/util/fuse.conf /host/etc/fuse.conf ++ false ++ install -D -m 644 /build/host-libfuse3-3.10.3/util/udev.rules /host/lib/udev/rules.d/99-fuse3.rules ++ install -D -m 755 /build/host-libfuse3-3.10.3/util/init_script /etc/init.d/fuse3 +install: cannot create regular file '/etc/init.d/fuse3': Permission denied +FAILED: install script 'install_helper.sh /host/etc /host/bin /host/lib/udev/rules.d false' exit code 1, stopped +FAILED: meson-install + +Signed-off-by: Christian Stewart +--- + util/install_helper.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/util/install_helper.sh b/util/install_helper.sh +index cb649a7..f4a6163 100755 +--- a/util/install_helper.sh ++++ b/util/install_helper.sh +@@ -40,14 +40,14 @@ install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ + "${DESTDIR}${udevrulesdir}/99-fuse3.rules" + + install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \ +- "${DESTDIR}/etc/init.d/fuse3" ++ "${DESTDIR}${sysconfdir}/init.d/fuse3" + + + 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 + else + echo "== FURTHER ACTION REQUIRED ==" +- echo "Make sure that your init system will start the ${DESTDIR}/etc/init.d/fuse3 init script" ++ echo "Make sure that your init system will start the ${DESTDIR}${sysconfdir}/init.d/fuse3 init script" + fi + + +-- +2.31.1 + diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk index f805eda506..d4522fd063 100644 --- a/package/libfuse3/libfuse3.mk +++ b/package/libfuse3/libfuse3.mk @@ -10,11 +10,17 @@ LIBFUSE3_LICENSE = LGPL-2.1 LIBFUSE3_LICENSE_FILES = LICENSE LIBFUSE3_INSTALL_STAGING = YES LIBFUSE3_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) + LIBFUSE3_CONF_OPTS = \ -Dexamples=false \ -Dudevrulesdir=/lib/udev/rules.d \ -Duseroot=false +HOST_LIBFUSE3_CONF_OPTS = \ + -Dexamples=false \ + -Dudevrulesdir=$(HOST_DIR)/lib/udev/rules.d \ + -Duseroot=false + define LIBFUSE3_DEVICES /dev/fuse c 666 0 0 10 229 0 0 - endef @@ -28,3 +34,4 @@ define LIBFUSE3_LINUX_CONFIG_FIXUPS endef $(eval $(meson-package)) +$(eval $(host-meson-package))