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)) From patchwork Mon May 3 02:33:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1472999 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=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (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 4FYRqG6V0rz9sCD for ; Mon, 3 May 2021 12:33:30 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 797EA60AF2; Mon, 3 May 2021 02:33:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TAIu0WaUSgtL; Mon, 3 May 2021 02:33:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 8495760AEE; Mon, 3 May 2021 02:33:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id A6D901BF2AE for ; Mon, 3 May 2021 02:33:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id A38CD40425 for ; Mon, 3 May 2021 02:33:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DviJabZfY6vH for ; Mon, 3 May 2021 02:33:09 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by smtp2.osuosl.org (Postfix) with ESMTPS id DEE7C400C6 for ; Mon, 3 May 2021 02:33:09 +0000 (UTC) Received: by mail-pg1-f179.google.com with SMTP id m12so2653750pgr.9 for ; Sun, 02 May 2021 19:33:09 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=WnxN3jB19KXhLciZ4DfY1KTr/zl8Hsgi9lYPxQgP0us=; b=M9PfZy9u3U1Leys12gkUd1dTjRGya0yfwa0vX67BaZXn5/ionOVGg2U9Ci92tBWf0c c6f/9hVij1CcS9oGKbL+lg9DIKW7KFGNP/cpbpV6d4A/WQSojJ9pV+FP7U0/8xdqmBUK 5n1BHbOY3kQfZVmEVrMKaMaJWax15fAxkRw9a1nGEVaIpMWX3Jlt9H052c9DjVwrfLhz 4gcS6WHk7SaiudchHQeJx62JKLNa9+VfmniihRmLgF3sJauAKqH7+E42WQCSFhi6GmZ2 v3qgzLX8mmKg+/mczHs8AmMNS6eGMQZtS6VEOXGW/tproiZq3ya05mEotaIdKdvYboHN ki6A== X-Gm-Message-State: AOAM530gd5dyW801QJoiTEqo+SLLWONjIyREdKB1FeFtnpCdeIk2v7up USQOqr2nT2PZbSzmPblDsf1AXstoS8/n0w== X-Google-Smtp-Source: ABdhPJy2k2DnFWo4PF47VDUsF4UNj9YIB7upTFWUfx7j3ykkseMiLGLFwnQVk8c2dLfIJfjPXaDwpQ== X-Received: by 2002:a05:6a00:15ce:b029:28e:7a15:107f with SMTP id o14-20020a056a0015ceb029028e7a15107fmr5353392pfu.81.1620009189128; Sun, 02 May 2021 19:33:09 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 May 2021 19:33:08 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Sun, 2 May 2021 19:33:04 -0700 Message-Id: <20210503023305.161122-2-christian@paral.in> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210503023305.161122-1-christian@paral.in> References: <20210503023305.161122-1-christian@paral.in> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v1 2/3] package/fuse-overlayfs: enable building as 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" Signed-off-by: Christian Stewart --- package/Config.in.host | 1 + package/fuse-overlayfs/Config.in.host | 7 +++++++ package/fuse-overlayfs/fuse-overlayfs.mk | 4 ++++ 3 files changed, 12 insertions(+) create mode 100644 package/fuse-overlayfs/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index ba6a68c728..0dbf63f2c8 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -27,6 +27,7 @@ menu "Host utilities" source "package/f2fs-tools/Config.in.host" source "package/faketime/Config.in.host" source "package/fatcat/Config.in.host" + source "package/fuse-overlayfs/Config.in.host" source "package/fwup/Config.in.host" source "package/genext2fs/Config.in.host" source "package/genimage/Config.in.host" diff --git a/package/fuse-overlayfs/Config.in.host b/package/fuse-overlayfs/Config.in.host new file mode 100644 index 0000000000..cf459a4a2a --- /dev/null +++ b/package/fuse-overlayfs/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_FUSE_OVERLAYFS + bool "host fuse-overlayfs" + help + FUSE-overlayfs is an implementation of overlay+shiftfs in + FUSE, intended to be used for rootless containers. + + http://github.com/containers/fuse-overlayfs \ No newline at end of file diff --git a/package/fuse-overlayfs/fuse-overlayfs.mk b/package/fuse-overlayfs/fuse-overlayfs.mk index 707cacce03..36cbfc91fd 100644 --- a/package/fuse-overlayfs/fuse-overlayfs.mk +++ b/package/fuse-overlayfs/fuse-overlayfs.mk @@ -12,4 +12,8 @@ FUSE_OVERLAYFS_LICENSE_FILES = COPYING FUSE_OVERLAYFS_AUTORECONF = YES FUSE_OVERLAYFS_DEPENDENCIES = libfuse3 host-pkgconf +HOST_FUSE_OVERLAYFS_AUTORECONF = YES +HOST_FUSE_OVERLAYFS_DEPENDENCIES = host-libfuse3 host-pkgconf + $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From patchwork Mon May 3 02:33:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1473000 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.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 4FYRqV3ylrz9sCD for ; Mon, 3 May 2021 12:33:42 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 71755405FA; Mon, 3 May 2021 02:33:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TjEhlZwPUXRG; Mon, 3 May 2021 02:33:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 5280240600; Mon, 3 May 2021 02:33:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 48A2B1BF2AE for ; Mon, 3 May 2021 02:33:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 31EB040600 for ; Mon, 3 May 2021 02:33:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1SOvSokqZsVr for ; Mon, 3 May 2021 02:33:11 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by smtp4.osuosl.org (Postfix) with ESMTPS id 1A5BB405FA for ; Mon, 3 May 2021 02:33:11 +0000 (UTC) Received: by mail-pf1-f182.google.com with SMTP id e15so3141906pfv.10 for ; Sun, 02 May 2021 19:33:11 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=gL3NIx+fRvKXcizBBPz3TU5I2fbOi4u3eGUMTqZSrrI=; b=FWzYi5/eMGriNNvx53AdKF1rIaFDm0MpQxUY+f+jw+fe5TTC7N8VO7UC5G/f4fuPGn B8IFE4S5e+SZlKmRTuRUe0A6xS4NegUt6NNJnBkd+gN4CFSdypajHOL0hGzypQGmPVC3 x5ybupRAuOC9PNH3Hb7nw0Vqwx2nHqIgo0Mg4tmlFNJzadH2NguBemcEzd9/uINZdsTX FPu1eMTwWLMZGHYjZXlHgtbKpYNYztJ5OII6xWmUPvsNOn3YwXE1O6MapmKzEAhvE2u1 itSdCVGDxOaFkdbIBxg0PNYzcM9j+bcE9pIfKfx9KTFddiE4OAP582+vPmg3llComO0l W8GA== X-Gm-Message-State: AOAM531aL21Y3CL0ZMHpRMGsQcgp2aLpmNZhN3qcLWnxj3RLL3tImh5K 4t0OqSNFHvzOt+dydSFqnTW5s4Kvvsliwg== X-Google-Smtp-Source: ABdhPJyzPAP1F007kdzDnN4vayG+52gJ7QMVjbZ7hoKgPhBr2GHAZAo6SXYOcsOLHb0fzLRdOIlaYg== X-Received: by 2002:a63:570b:: with SMTP id l11mr16133131pgb.193.1620009190265; Sun, 02 May 2021 19:33:10 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 May 2021 19:33:09 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Sun, 2 May 2021 19:33:05 -0700 Message-Id: <20210503023305.161122-3-christian@paral.in> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210503023305.161122-1-christian@paral.in> References: <20210503023305.161122-1-christian@paral.in> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v1 3/3] package/genuinetools-img: new host and target 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" Img is a standalone, daemon-less, unprivileged Dockerfile and OCI compatible container image builder. It uses the moby-buildkit solver internally. The commands/UX mirror the Docker CLI for workflow compatibility. Using the genuinetools- prefix due to the generic nature of the "img" name. Adds both host and target variants. fuse-overlayfs can be used as an unprivileged and rootless overlay filesystem backend. https://github.com/genuinetools/img Signed-off-by: Christian Stewart --- package/Config.in | 1 + package/Config.in.host | 1 + package/genuinetools-img/Config.in | 23 ++++++++++++++++ package/genuinetools-img/Config.in.host | 9 +++++++ .../genuinetools-img/genuinetools-img.hash | 3 +++ package/genuinetools-img/genuinetools-img.mk | 27 +++++++++++++++++++ 6 files changed, 64 insertions(+) create mode 100644 package/genuinetools-img/Config.in create mode 100644 package/genuinetools-img/Config.in.host create mode 100644 package/genuinetools-img/genuinetools-img.hash create mode 100644 package/genuinetools-img/genuinetools-img.mk diff --git a/package/Config.in b/package/Config.in index 7ac10b9d42..f352f6b168 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2444,6 +2444,7 @@ menu "System tools" source "package/emlog/Config.in" source "package/ftop/Config.in" source "package/getent/Config.in" + source "package/genuinetools-img/Config.in" source "package/gkrellm/Config.in" source "package/htop/Config.in" source "package/ibm-sw-tpm2/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index 0dbf63f2c8..391742856d 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -32,6 +32,7 @@ menu "Host utilities" source "package/genext2fs/Config.in.host" source "package/genimage/Config.in.host" source "package/genpart/Config.in.host" + source "package/genuinetools-img/Config.in.host" source "package/gnupg/Config.in.host" source "package/go/Config.in.host" source "package/go-bootstrap/Config.in.host" diff --git a/package/genuinetools-img/Config.in b/package/genuinetools-img/Config.in new file mode 100644 index 0000000000..eb4992db07 --- /dev/null +++ b/package/genuinetools-img/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_GENUINETOOLS_IMG + bool "genuinetools-img" + depends on BR2_USE_MMU # fuse-overlayfs libfuse3 + depends on !BR2_STATIC_LIBS # fuse-overlayfs libfuse3 + depends on BR2_TOOLCHAIN_HAS_THREADS # fuse-overlayfs libfuse3 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 # fuse-overlayfs + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_USES_UCLIBC + select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency + select BR2_PACKAGE_FUSE_OVERLAYFS # runtime dependency + select BR2_PACKAGE_LIBFUSE3 # fuse-overlayfs + help + Img is a standalone, daemon-less, unprivileged Dockerfile + and OCI compatible container image builder. + + https://github.com/genuinetools/img + +comment "genuinetools-img needs a toolchain w/ threads, dynamic library, headers >= 3.15" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 diff --git a/package/genuinetools-img/Config.in.host b/package/genuinetools-img/Config.in.host new file mode 100644 index 0000000000..bbef88acf6 --- /dev/null +++ b/package/genuinetools-img/Config.in.host @@ -0,0 +1,9 @@ +config BR2_PACKAGE_HOST_GENUINETOOLS_IMG + bool "host genuinetools-img" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_FUSE_OVERLAYFS # runtime dependency + help + Img is a standalone, daemon-less, unprivileged Dockerfile + and OCI compatible container image builder. + + https://github.com/genuinetools/img diff --git a/package/genuinetools-img/genuinetools-img.hash b/package/genuinetools-img/genuinetools-img.hash new file mode 100644 index 0000000000..097ad17d91 --- /dev/null +++ b/package/genuinetools-img/genuinetools-img.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 c6d805ab899db639fa08f0e33fe6673593be8336d288bb1cb4cb81a3229a916f genuinetools-img-0.5.11.tar.gz +sha256 c696614021eafe355c7fb0af3e724fc7fa8729a0c10c27cbed2505bf30a853ce LICENSE diff --git a/package/genuinetools-img/genuinetools-img.mk b/package/genuinetools-img/genuinetools-img.mk new file mode 100644 index 0000000000..08330d1113 --- /dev/null +++ b/package/genuinetools-img/genuinetools-img.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# genuinetools-img +# +################################################################################ + +GENUINETOOLS_IMG_VERSION = 0.5.11 +GENUINETOOLS_IMG_SITE = $(call github,genuinetools,img,v$(GENUINETOOLS_IMG_VERSION)) + +GENUINETOOLS_IMG_LICENSE = MIT +GENUINETOOLS_IMG_LICENSE_FILES = LICENSE + +GENUINETOOLS_IMG_DEPENDENCIES = host-pkgconf +GENUINETOOLS_IMG_GOMOD = github.com/genuinetools/img + +GENUINETOOLS_IMG_TAGS = cgo noembed +GENUINETOOLS_IMG_LDFLAGS = \ + -X $(GENUINETOOLS_IMG_GOMOD)/version.VERSION="$(GENUINETOOLS_IMG_VERSION)" + +HOST_GENUINETOOLS_IMG_TAGS = $(GENUINETOOLS_IMG_TAGS) +HOST_GENUINETOOLS_IMG_LDFLAGS = $(GENUINETOOLS_IMG_LDFLAGS) + +HOST_GENUINETOOLS_IMG_BIN_NAME = genuinetools-img +HOST_GENUINETOOLS_IMG_INSTALL_BINS = $(HOST_GENUINETOOLS_IMG_BIN_NAME) + +$(eval $(golang-package)) +$(eval $(host-golang-package))