From patchwork Thu May 9 09:31:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jose Quaresma X-Patchwork-Id: 43393 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 573BFC10F1A for ; Thu, 9 May 2024 09:31:39 +0000 (UTC) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.groups.io with SMTP id smtpd.web11.5957.1715247098506403309 for ; Thu, 09 May 2024 02:31:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=eaz02uNX; spf=pass (domain: gmail.com, ip: 209.85.221.49, mailfrom: quaresma.jose@gmail.com) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-34e7a35d5d4so478138f8f.2 for ; Thu, 09 May 2024 02:31:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715247096; x=1715851896; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=pLf7ajHMyqIQN8SBUlW1sVWsWbRXdixMd83YnxcmmSo=; b=eaz02uNX2epDgMbardjfJiCqRSQcgkNT3HocEtbCrL30E7b57W43Q5qYCtUo1HWTvr cGkio2FNZvOVvkowr+QJbF8bxHXPeNzUHtGnV5Hv8YLe23YljiSvXukh+OHWCP72XUML VqtDVTrX9IS+sc/vCZzMCMlTCXsqQpWZT6FDT+dY4vgy2wQ1q1oe65qZZFCTEw7Nuox7 wsABsaWRyiopT7NGu/4E9K1/msW2OB8a3i2+GaG8GN7EuoPY2bQhD8kTOql/55gXGZax b+4jej/mR8ktpbUVL/j3deKBT/TevYBzpiEzjiO0rTzbCBvx1DJvigcomvjK0TJUtYd6 XjAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715247096; x=1715851896; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pLf7ajHMyqIQN8SBUlW1sVWsWbRXdixMd83YnxcmmSo=; b=xF83wAQlGv6GyjFpulJQ45wJT/ZDI4xJ6CPp28AfYWcV96zBYgpoHPRaC69INq0HCG HSdaNEwQNhO1A+nv9yLhVu2FuefJgL3xFmHHg36E/oChOwmB8/kq6RDywRmZZfS+xGfw 1bjPt2D1PAqXupdStoCiF6cFFprS14aH4Ac2icnhNFkyVGapz5w86WwUE6LyrgvhTn8+ EjVhWGljfFNkaMoeFfvj3dwPb2e/ALOsMHoQ+M16ql11ZvyGbABkacd9xPwXzrVAfkvB xQXL0nlcUTd99yD2/K0+9/rWkgVhpBjOuouuMCgtYZ534FaUvpTXjO2Hy//E5mdK47gn hHvw== X-Gm-Message-State: AOJu0YziqD8GrzaarL9lOxZ3aRP5NpAUYylB8nuFs4FlzyQhPy7XAAUr llc+BJjMtZxBK6x7KbhDYdvrgHNa6s8ORXM4XLUCK1y0wd+wZKNpEMKzFQ== X-Google-Smtp-Source: AGHT+IGGKBxGE/6JFqssXbek/etdgaOdJnU1VjHgwmmrP1kxFc3BSF2fLmZoIF20zXE5PPzcNlGGCQ== X-Received: by 2002:a5d:538b:0:b0:34d:8450:c668 with SMTP id ffacd0b85a97d-34fca81033cmr3492710f8f.59.1715247096341; Thu, 09 May 2024 02:31:36 -0700 (PDT) Received: from toster.lan (bl15-243-112.dsl.telepac.pt. [188.80.243.112]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41f42e74625sm62391655e9.0.2024.05.09.02.31.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 02:31:35 -0700 (PDT) From: Jose Quaresma X-Google-Original-From: Jose Quaresma To: openembedded-devel@lists.openembedded.org Cc: Jose Quaresma Subject: [oe][master][scarthgap][PATCH 1/5] composefs: remove fuse3 dependencie Date: Thu, 9 May 2024 10:31:22 +0100 Message-ID: <20240509093126.503764-1-jose.quaresma@foundries.io> X-Mailer: git-send-email 2.45.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 09 May 2024 09:31:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110286 The fuse3 is only used for development purposes and the composefs uses the kernel overlayfs and erofs on the target. The composefs-fuse [1] tool is not even installed by default So all the files installed on the target are the same with and without the fuse, this can be checked with buildhistory. [1] https://github.com/containers/composefs/commit/f5fed9ff093ac57967a4c5253bae3ae294dd8cd9 Signed-off-by: Jose Quaresma --- meta-filesystems/recipes-support/composefs/composefs_1.0.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-filesystems/recipes-support/composefs/composefs_1.0.3.bb b/meta-filesystems/recipes-support/composefs/composefs_1.0.3.bb index 7607b0a12..98eb3e1b3 100644 --- a/meta-filesystems/recipes-support/composefs/composefs_1.0.3.bb +++ b/meta-filesystems/recipes-support/composefs/composefs_1.0.3.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "\ file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \ " -DEPENDS = "fuse3 openssl" +DEPENDS = "openssl" SRCREV = "2d5cdcb9176cfe4ccf1761ef6d78e1c48de35649" PV = "1.0.3" From patchwork Thu May 9 09:31:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jose Quaresma X-Patchwork-Id: 43396 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53B4BC25B77 for ; Thu, 9 May 2024 09:31:49 +0000 (UTC) Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by mx.groups.io with SMTP id smtpd.web11.5960.1715247099914084970 for ; Thu, 09 May 2024 02:31:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hFeFZNI4; spf=pass (domain: gmail.com, ip: 209.85.167.54, mailfrom: quaresma.jose@gmail.com) Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-51ff65b1e14so610022e87.2 for ; Thu, 09 May 2024 02:31:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715247097; x=1715851897; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BxR87aFfpFN5I9tXdYnMxO2TDLXEI8AorK2wcSJ8/Aw=; b=hFeFZNI4+Q4PUD3OCSu7odJwLD6JkHNvKKnBKcFMoZTd4AUC5AkDzfQRzXYJ5wG2UJ qDGxjBZaq1xSxsYqpGGictI7Kvb8OTI4d6s9gMASRVghI16Xee6sSGh9jxmVZPSnfRnB 9LoynrimzmCGPUmKoNHCPHj0Y6KWP1S3cyEbSvXytf/O/kIjIElLN3eG+5NgtJ++Gwef fqpzUvjWg0D/1yuSc/yc1otXL15LQu+hw5aAUlPJagM2InSl77kKJd4Nb1A/c8qtM+hE GU4AGQDXWKty7qi0VmVWlevSByhwwQ3+nHzHExOrba8BPYA73RL2NPB8gVZEqfQJN+tX hxmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715247097; x=1715851897; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BxR87aFfpFN5I9tXdYnMxO2TDLXEI8AorK2wcSJ8/Aw=; b=qVuNK799g1ywh78bUGhLZIDMXHzm5aFTZwfqu2RNtlkT5T2Ubage5cIic8/4MPMriP OUtLnV5lmeeU2ijCRjPKuoBogikDpsbooeLdStRz5IEZzoOxKQEmTz2deTwUS0GlpN9R CS59hD2cVpegn1PoAN8reUWsOAuG6bsMbJg8IOnp23HyFinYewqaLACZM81PwSkTrDPV TWpdVcWvd3veMFnR26bLz60wo2flwc9K5CVR1T+FixM3V3NrTo022w3oNPTzuPVSBeE8 EbH4oDl63qBDx2ezZRDdBRaUEHZr53sdf7BEqTL3hLhVIx3qKukGiq3qSNCbW23WrFU5 vZVg== X-Gm-Message-State: AOJu0YyydYGpysRHQM5TAz8Z9c9xfxxAITXN7dBK9MOgaansWRhbmA0h upqUakjAsqxMby4IXZshO6t5QdOc1jPPVhefGJsZCLHIg3gk8duP5mYmsQ== X-Google-Smtp-Source: AGHT+IGm/Efh1xVNmTaaZayVCkvweaDSl6xxrsH0FgfljnH1ACpWi84eC8uuJR6v8B04dWmtc8flfg== X-Received: by 2002:a05:6512:3e1e:b0:521:cc8a:46db with SMTP id 2adb3069b0e04-521cc8a4841mr2525884e87.37.1715247097051; Thu, 09 May 2024 02:31:37 -0700 (PDT) Received: from toster.lan (bl15-243-112.dsl.telepac.pt. [188.80.243.112]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41f42e74625sm62391655e9.0.2024.05.09.02.31.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 02:31:36 -0700 (PDT) From: Jose Quaresma X-Google-Original-From: Jose Quaresma To: openembedded-devel@lists.openembedded.org Cc: Jose Quaresma Subject: [oe][master][scarthgap][PATCH 2/5] composefs: move from meta-filesystems to meta-oe layer Date: Thu, 9 May 2024 10:31:23 +0100 Message-ID: <20240509093126.503764-2-jose.quaresma@foundries.io> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240509093126.503764-1-jose.quaresma@foundries.io> References: <20240509093126.503764-1-jose.quaresma@foundries.io> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 09 May 2024 09:31:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110288 We can make this more widely available as we don't depend anymore on fuse3. Signed-off-by: Jose Quaresma --- .../recipes-support/composefs/composefs_1.0.3.bb | 0 ...001-musl-basename-use-portable-implementation-for-basena.patch | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {meta-filesystems => meta-oe}/recipes-support/composefs/composefs_1.0.3.bb (100%) rename {meta-filesystems => meta-oe}/recipes-support/composefs/files/0001-musl-basename-use-portable-implementation-for-basena.patch (100%) diff --git a/meta-filesystems/recipes-support/composefs/composefs_1.0.3.bb b/meta-oe/recipes-support/composefs/composefs_1.0.3.bb similarity index 100% rename from meta-filesystems/recipes-support/composefs/composefs_1.0.3.bb rename to meta-oe/recipes-support/composefs/composefs_1.0.3.bb diff --git a/meta-filesystems/recipes-support/composefs/files/0001-musl-basename-use-portable-implementation-for-basena.patch b/meta-oe/recipes-support/composefs/files/0001-musl-basename-use-portable-implementation-for-basena.patch similarity index 100% rename from meta-filesystems/recipes-support/composefs/files/0001-musl-basename-use-portable-implementation-for-basena.patch rename to meta-oe/recipes-support/composefs/files/0001-musl-basename-use-portable-implementation-for-basena.patch From patchwork Thu May 9 09:31:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jose Quaresma X-Patchwork-Id: 43395 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A323C25B4F for ; Thu, 9 May 2024 09:31:49 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.groups.io with SMTP id smtpd.web10.6141.1715247099809599003 for ; Thu, 09 May 2024 02:31:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Hp+hDOo3; spf=pass (domain: gmail.com, ip: 209.85.128.52, mailfrom: quaresma.jose@gmail.com) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-41fd5dc0480so1891975e9.1 for ; Thu, 09 May 2024 02:31:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715247098; x=1715851898; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eQiSupC+sHN6PTNccImGB7glVx2W5zvv4NFmhqLFa0A=; b=Hp+hDOo3QSB24qsxmtQxwV+fUWjzp2+RLx/Eeh0A7YQ+iR2huzBJTwDQnGpcwKK4IH bZsEtENItKxfSVXwW8SSQ75Yrof4gml6lHOKWc0b/vo/s6gijj6V17+F5jY+qwZjA707 BEK+Jc+pjG+r9epKJ2TTNlY4/V1FSCpkta4/Jj3+aKjkTpu8r4DM1lmz5Jyyfn7JfrKs KUg3+H0HzRUtdJbEtBYsIcagvC6mC+sCFSpIBXPzTONCtuF5j7BEVlw1OcTWSz/dMnRl 2e6ZEffRBHzgUrG5VxFNOO7mhN4h4yOAWO20u8+27u8dQJ/V5Z2gSoB6XNvnttBizMPI RkEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715247098; x=1715851898; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eQiSupC+sHN6PTNccImGB7glVx2W5zvv4NFmhqLFa0A=; b=AeAps47FMnWuVengS70Antmg1eoOfSPPdpX1E1sHtxdOv/EIpodC2vxvC2M8i8d7Uj PjNFr0HOeV0BkbAdmsd1T+8ZjcYPvBQabbUn/H4mIocQ6KiwF9Q5mrnCL97zV7q80Jh0 rb3ArmiPP9phbKOLyJLwfeUgOduGUHzHA+xPfMQzdMpinnLZqF/aHjlRuU13P3HF6QHW 9x82ngEWMniWKLlCxuq7ZFWsEhs+T6bBNHaTDQTZxYTVTpTsz+818ApnKFPGljaNdIin VUTWEjP5WU/67qZUdqRUXcM31MEmw7s4F8GIcSTFrf0SGwmeY+O7i4+kyM1x2uJrseUT iRrQ== X-Gm-Message-State: AOJu0YzHinwOTnEu1k44T9vavwI+ynqk9FNgH/XoeaRI3uXX2qhtUROe VdKyNtd/Adn88MEQd3EEms0ucH9Y2cs72VYj/wSoDwxzpkqPhelCJXH0Rw== X-Google-Smtp-Source: AGHT+IEahE1BV9jRjziboIHqTKQl9bjRmqaCrHte66ATBy+s6Iza/iShyrYEJbY7pVR1i7q7Y0KyZw== X-Received: by 2002:a05:600c:4449:b0:418:d6f2:b0c1 with SMTP id 5b1f17b1804b1-41f71ecb218mr40425825e9.26.1715247097817; Thu, 09 May 2024 02:31:37 -0700 (PDT) Received: from toster.lan (bl15-243-112.dsl.telepac.pt. [188.80.243.112]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41f42e74625sm62391655e9.0.2024.05.09.02.31.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 02:31:37 -0700 (PDT) From: Jose Quaresma X-Google-Original-From: Jose Quaresma To: openembedded-devel@lists.openembedded.org Cc: Jose Quaresma Subject: [oe][master][scarthgap][PATCH 3/5] composefs: refactor Date: Thu, 9 May 2024 10:31:24 +0100 Message-ID: <20240509093126.503764-3-jose.quaresma@foundries.io> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240509093126.503764-1-jose.quaresma@foundries.io> References: <20240509093126.503764-1-jose.quaresma@foundries.io> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 09 May 2024 09:31:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110287 - add recipe DESCRIPTION - remove the PV as it can be taken from the recipe name - specify some EXTRA_OECONF configuration to avoid host contamination Signed-off-by: Jose Quaresma --- .../recipes-support/composefs/composefs_1.0.3.bb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-support/composefs/composefs_1.0.3.bb b/meta-oe/recipes-support/composefs/composefs_1.0.3.bb index 98eb3e1b3..76c85ce93 100644 --- a/meta-oe/recipes-support/composefs/composefs_1.0.3.bb +++ b/meta-oe/recipes-support/composefs/composefs_1.0.3.bb @@ -1,4 +1,7 @@ SUMMARY = "Tools to handle creating and mounting composefs images" +DESCRIPTION = "The composefs project combines several underlying Linux \ +features to provide a very flexible mechanism to support read-only mountable \ +filesystem trees, stacking on top of an underlying "lower" Linux filesystem." HOMEPAGE = "https://github.com/containers/composefs" LICENSE = "GPL-3.0-or-later & LGPL-2.0-or-later & Apache-2.0" LIC_FILES_CHKSUM = "\ @@ -9,10 +12,8 @@ LIC_FILES_CHKSUM = "\ file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \ " -DEPENDS = "openssl" -SRCREV = "2d5cdcb9176cfe4ccf1761ef6d78e1c48de35649" -PV = "1.0.3" +SRCREV = "2d5cdcb9176cfe4ccf1761ef6d78e1c48de35649" SRC_URI = "\ git://github.com/containers/composefs.git;protocol=https;branch=main \ file://0001-musl-basename-use-portable-implementation-for-basena.patch \ @@ -21,3 +22,10 @@ SRC_URI = "\ S = "${WORKDIR}/git" inherit autotools pkgconfig + +DEPENDS = "openssl" + +EXTRA_OECONF += " \ + --disable-man \ + --without-fuse \ +" From patchwork Thu May 9 09:31:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jose Quaresma X-Patchwork-Id: 43397 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66456C25B74 for ; Thu, 9 May 2024 09:31:49 +0000 (UTC) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.groups.io with SMTP id smtpd.web10.6142.1715247100882790128 for ; Thu, 09 May 2024 02:31:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=lDK92tPJ; spf=pass (domain: gmail.com, ip: 209.85.128.48, mailfrom: quaresma.jose@gmail.com) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-41c1b75ca31so4881645e9.2 for ; Thu, 09 May 2024 02:31:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715247099; x=1715851899; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bVlgGQe1ZCQ0ll2tuGkFfOksYDiEFx8DeUh8kToZleM=; b=lDK92tPJpMaOwV4bztBoH273+AtzOvUfiMMiQHefsXojxujZ5VrIJKRN9cangsGneJ nmqc4fKGdHz+HXOrdA1qKNI96gXNYk4/BEhXlo0l6DZb6UwZaV9i1CynZ0aQDFWm38aS X6QE0yLYRRnPKpC9YZHIWfn85I5djhLPM2wwqka8g65oiLl900lBegFeLqzanUbWUML+ ItD77LwDudtw1q9/ne/HYDgtoThikJuiwhEc9XtUNs6NxOgFAxhdbSTsVmVYF44dns4Z BPzniEDFwrUTf8BizKKgduyltwN43tI9hDnL9MTw6kv1suSnASd9qRM4zijm+sUutEw7 J+Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715247099; x=1715851899; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bVlgGQe1ZCQ0ll2tuGkFfOksYDiEFx8DeUh8kToZleM=; b=JQUHxkeNyHrH9oKQEmBMHi6F9qs9EdkDrnnm82BhMhM99l5WTbBoZuus9HlaCs4SZ+ UYguu61SfXZ2JlagqvX6kfCldYpfn7HJHFcP4qC5H69H+RNI8mzg7QNA7dM+A/7Fki+G IkRTI3AvRClVFKa9GAH4I3dW9EdsNpvR5OzKTmoGkWF/iJuN5Xp+YPDiSewBg90HpfxX livqDmGzlhBunOL4yVJS6YxPeJmvxjzROp5FyLoQz2WVS+muWQx3bH/4hZMO0DHL1n8o SpQkmEEM94INPPSLQyL6mZGEF/FZAAGH44E5JCt7/L0GZFnaaDX+RqgWp1CLOUsLH49S brew== X-Gm-Message-State: AOJu0YxyntljiEqWjHuN1uWiKz11MDNJpo/mwXJP2VAfJnpDCHGMgtGs bMoh1m8IYlv8F6dE/glLexti9jzwW6CZGiBSzGjD83l8ggIw2Jj3/GYNYg== X-Google-Smtp-Source: AGHT+IECUwaalyRequKZFjJbLdUVYxDbKIHJJLAMyPczYnsI8B+pMML5b7dwtm1KIS+DN2JXIoVH7w== X-Received: by 2002:a05:600c:198d:b0:41a:6229:396b with SMTP id 5b1f17b1804b1-41f71cd12b6mr44834045e9.10.1715247098723; Thu, 09 May 2024 02:31:38 -0700 (PDT) Received: from toster.lan (bl15-243-112.dsl.telepac.pt. [188.80.243.112]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41f42e74625sm62391655e9.0.2024.05.09.02.31.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 02:31:38 -0700 (PDT) From: Jose Quaresma X-Google-Original-From: Jose Quaresma To: openembedded-devel@lists.openembedded.org Cc: Jose Quaresma Subject: [oe][master][scarthgap][PATCH 4/5] composefs: bump ecef20c1 Date: Thu, 9 May 2024 10:31:25 +0100 Message-ID: <20240509093126.503764-4-jose.quaresma@foundries.io> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240509093126.503764-1-jose.quaresma@foundries.io> References: <20240509093126.503764-1-jose.quaresma@foundries.io> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 09 May 2024 09:31:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110289 - This is required to add the native target support. - Drop upstream merged patch: 0001-musl-basename-use-portable-implementation-for-basena.patch https://github.com/containers/composefs/pull/273 Changelog: $ git --no-pager log --oneline HEAD...v1.0.3 ecef20c (HEAD -> main, origin/main, origin/HEAD) Merge pull request #276 from wahtari/copy_file_range e78c7a4 Merge pull request #277 from alexlarsson/fix-newline-error 1d82bc1 mkcomposefs: Drop newline from error string 3e38d73 Added copy_file_range for faster file copy. 85a693d Merge pull request #273 from fboudra/musl-basename 31afa13 musl: basename: use portable implementation for basename API 4776580 Merge pull request #275 from eriksjolund/fix-spelling-in-error-message 4a68a42 Merge pull request #269 from wahtari/threading-for-mkcomposefs 7266546 fuse: fix spelling in error message b49499b added threads in mkcomposefs for digest calculation and file copy d144db0 refactored lcfs_load_node_from_file to enable multi-threading in mkcomposefs af69922 Merge pull request #266 from eriksjolund/erofs-add-missing-free 1eecf38 Merge pull request #267 from eriksjolund/mkcomposefs-add-missing-free a880713 mkcomposefs: Add missing free() 456d618 erofs: Add missing free() and lcfs_node_unref() 1179638 Merge pull request #265 from eriksjolund/handle-empty-basedir-option 301b78f Merge pull request #268 from eriksjolund/set-errno-for-unknown-format 09ca740 writer: Set errno for unknown format a96f786 mountcomposefs: Handle empty basedir option fc9a526 Merge pull request #260 from eriksjolund/handle-error-from-build-node 9b85011 Merge pull request #262 from eriksjolund/add-error-check-and-rearrange 2cb505b Merge pull request #263 from eriksjolund/writer-set-errno 9b417be writer: Set errno d5ffbeb Merge pull request #261 from eriksjolund/add-missing-node-unref 9c393a4 Merge pull request #259 from eriksjolund/handle-error-from-node-set-content 396a3b8 mkcomposefs: Handle NULL from lcfs_node_new() 238a94a lib: Set errno in lcfs_node_new() c1181fa erofs: Handle error from lcfs_build_node_from_image() 49288d5 erofs, mkcomposefs: Handle error from lcfs_node_set_content() 4e0b147 lib: Add missing lcfs_node_unref() 9bc76dd Merge pull request #258 from eriksjolund/fix-missing-options d59dd9b mountcomposefs, mkcomposefs: Add missing options to usage information 418f4f7 Merge pull request #255 from cgwalters/mount-minor-tweaks 72c602a Merge pull request #256 from eriksjolund/fix-error-message 770cc36 fuse: Fix filepath argument in error message 465c079 man/mount.composefs: Fix a typo and two markdown lint warnings 8565a8b Merge pull request #254 from edbaunton/edbaunton/man-mkcomposefs-inline b99a978 man mkcomposefs: detail inlining logic 47f6949 Merge pull request #253 from rborn-tx/support-older-linux-headers 453eaef ci: Add build test for Ubuntu Focal 384f306 mount: Allow building when macro LOOP_CONFIGURE is not available f163eba mount: Allow building when macro MOUNT_ATTR_IDMAP is not available 80e99bd Merge pull request #250 from cgwalters/doc-verification f6e8510 README.md: Fix markdownlint warnings 3b7e567 README.md: Drop removed `signed` mount option 091b51f Merge pull request #247 from cgwalters/readlinkat-overflow 232336d Merge pull request #248 from cgwalters/more-analyzer a6904d6 writer: Close mmap leak e9632ca Merge pull request #246 from eriksjolund/handle-null-from-strndup 6b2192b writer: Fix (almost certainly unreachable) overflow bdc2c4c mkcomposefs: Handle NULL from strndup() e63786d Merge pull request #245 from giuseppe/run-distcheck-ci 5d3fe92 tests: do not hardcode number of threads d6e55bf .github: run make distcheck as part of the CI f6bbf54 Merge pull request #244 from alexlarsson/mount-api 4e5883b mount.composefs: Add tryverity option 15bdcd6 lib: Add TRY_VERITY mount option f884f57 mount: Use the new lowerdir+ and datadir+ options bd6ce95 Merge pull request #243 from giuseppe/add-fuzzing 171eae0 mkcompose: fix crash if no target for hardlink 7b1518f mkcomposefs: tree_from_dump does not exit(2) on errors a8ac3d5 mkcomposefs: reject dump without root node 28a9d6b tests: add fuzzing tests for mkcomposefs 932f748 tools: add fuzzing entrypoint for mkcomposefs Signed-off-by: Jose Quaresma --- .../composefs/composefs_1.0.3.bb | 8 +- ...e-portable-implementation-for-basena.patch | 75 ------------------- 2 files changed, 3 insertions(+), 80 deletions(-) delete mode 100644 meta-oe/recipes-support/composefs/files/0001-musl-basename-use-portable-implementation-for-basena.patch diff --git a/meta-oe/recipes-support/composefs/composefs_1.0.3.bb b/meta-oe/recipes-support/composefs/composefs_1.0.3.bb index 76c85ce93..5d4fa9c31 100644 --- a/meta-oe/recipes-support/composefs/composefs_1.0.3.bb +++ b/meta-oe/recipes-support/composefs/composefs_1.0.3.bb @@ -13,11 +13,9 @@ LIC_FILES_CHKSUM = "\ file://LICENSE.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \ " -SRCREV = "2d5cdcb9176cfe4ccf1761ef6d78e1c48de35649" -SRC_URI = "\ - git://github.com/containers/composefs.git;protocol=https;branch=main \ - file://0001-musl-basename-use-portable-implementation-for-basena.patch \ -" +PV .= "+git${SRCPV}" +SRCREV = "ecef20c18c81943bd17b489ad1484f361b99c792" +SRC_URI = "git://github.com/containers/composefs.git;protocol=https;branch=main" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/composefs/files/0001-musl-basename-use-portable-implementation-for-basena.patch b/meta-oe/recipes-support/composefs/files/0001-musl-basename-use-portable-implementation-for-basena.patch deleted file mode 100644 index 49a0b21c6..000000000 --- a/meta-oe/recipes-support/composefs/files/0001-musl-basename-use-portable-implementation-for-basena.patch +++ /dev/null @@ -1,75 +0,0 @@ -From b21a9d4f10a066cac76bb345d31fdd24afcf3e6f Mon Sep 17 00:00:00 2001 -From: Fathi Boudra -Date: Tue, 9 Apr 2024 08:47:37 +0200 -Subject: [PATCH] musl: basename: use portable implementation for basename API - -musl has removed the non-prototype declaration of basename from string.h which -now results in build errors with newer clang compilers. - -Implement GNU basename behavior using strchr which is portable across libcs. - -Fixes: -| ../../git/tools/mountcomposefs.c:43:20: -| error: call to undeclared function 'basename'; ISO C99 and later do not -| support implicit function declarations [-Wimplicit-function-declaration] -| 43 | const char *bin = basename(argv0); -| | ^ -| ../../git/tools/mountcomposefs.c:43:14: -| error: incompatible integer to pointer conversion initializing 'const char *' -| with an expression of type 'int' [-Wint-conversion] -| 43 | const char *bin = basename(argv0); -| | ^ ~~~~~~~~~~~~~~~ - -For reference: -https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 - -Closes: https://github.com/containers/composefs/issues/272 - -Signed-off-by: Fathi Boudra - -Upstream-Status: Submitted [https://github.com/containers/composefs/pull/273] ---- - libcomposefs/lcfs-utils.h | 6 ++++++ - tools/mkcomposefs.c | 2 +- - tools/mountcomposefs.c | 3 ++- - 3 files changed, 9 insertions(+), 2 deletions(-) - ---- a/tools/mountcomposefs.c -+++ b/tools/mountcomposefs.c -@@ -37,10 +37,11 @@ - #include - - #include "libcomposefs/lcfs-mount.h" -+#include "libcomposefs/lcfs-utils.h" - - static void usage(const char *argv0) - { -- const char *bin = basename(argv0); -+ const char *bin = gnu_basename(argv0); - fprintf(stderr, - "usage: %s [-t type] [-o opt[,opts..]] IMAGE MOUNTPOINT\n" - "Example:\n" ---- a/libcomposefs/lcfs-utils.h -+++ b/libcomposefs/lcfs-utils.h -@@ -161,4 +161,10 @@ static inline void *steal_pointer(void * - /* type safety */ - #define steal_pointer(pp) (0 ? (*(pp)) : (steal_pointer)(pp)) - -+static inline const char *gnu_basename(const char *filename) -+{ -+ const char *p = strrchr(filename, '/'); -+ return p ? p+1 : filename; -+} -+ - #endif ---- a/tools/mkcomposefs.c -+++ b/tools/mkcomposefs.c -@@ -315,7 +315,7 @@ static int fill_store(struct lcfs_node_s - - static void usage(const char *argv0) - { -- const char *bin = basename(argv0); -+ const char *bin = gnu_basename(argv0); - fprintf(stderr, - "Usage: %s [OPTIONS] SOURCE IMAGE\n" - "Options:\n" From patchwork Thu May 9 09:31:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jose Quaresma X-Patchwork-Id: 43394 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 391F6C10F1A for ; Thu, 9 May 2024 09:31:49 +0000 (UTC) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.groups.io with SMTP id smtpd.web10.6143.1715247101322623821 for ; Thu, 09 May 2024 02:31:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=FAL+IuHS; spf=pass (domain: gmail.com, ip: 209.85.128.44, mailfrom: quaresma.jose@gmail.com) Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-4196c62bb4eso5447885e9.2 for ; Thu, 09 May 2024 02:31:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715247099; x=1715851899; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zyJu/cZd2yMs06tQPlFylnx5kwGVl5PdON0bvMd1j8w=; b=FAL+IuHSOZQQgG3RwEqxUA3vRkwe6yI1b8Orx5PUi0qBv5uxwlWv8hPvUG/pHPiw2n K2bPMBJ3vO2nkyrYKecsQ97Fje1AnVkMEyIAeMtimsfdz4DhbGtQTZQqSQXJzIwaOhKI a6bqTEaV/H9pcWASa6/MqpvEUQ5TWrJ4b2NJTdBOfKNgJYd2fzQ9eEGNcOiEarD/uGhe fFTqMWRvopxN/jWYu8H+SoT6CQbT7w3mY9diHonk/lMCtmT7OxZzUlB95zLtXOuUGLWl o7ZntoqX0gwsIv8m+sucmHvj1Cg+F4Q+r1tSkIZ1aSou1tRtQWxbOdi0v4V/XgSSCkxy mnFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715247099; x=1715851899; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zyJu/cZd2yMs06tQPlFylnx5kwGVl5PdON0bvMd1j8w=; b=IzSrGpwlLc38m99gc3j52JJUjeYuNjlCBml8fbHVGdWVNSbzoU+CKNGU7YrCNRbk6i abFIZqv0ZKY8U/XZk2kzHu8P0tuaqAPBF3ujiaPXtHfuZ3of3gFDIM71YiCmp9NYbTws y57N75fD6AS/SguFOtb+cgqKkVyuV6xk/HR021dcnO+OKvLiRcd2RDrvyP+xu0tWYmLz 5kSCl3E8WDHofeFbJiu+TRsGe1d5PK/ShDYNVSnRYZoJf6AfLDHrWw0evzxK9/qt1Hen vLLUPSqvHKHjvGiEZeNedqQ8XZttPsWb8fvpAuNT+T1c59mj6brWVttX0IY+3jWLn9xn 2hJQ== X-Gm-Message-State: AOJu0YxpkXbui7e1u0DgNUlXf4OAYHLJT0/E5PEyzyhvhJ215ScjHkDn gH3Ssej5GJcHXv/og/phd2aM5BsmQHp0VMg/5qcVCmMnICXm+6mm09kySA== X-Google-Smtp-Source: AGHT+IHCpVel0Ij8csFi4EtNa0s/dVAKLKuWLnP/UezvoYVD4dPc8Qs7bh6BiSKN9r/xPxaTKc15Gw== X-Received: by 2002:a05:600c:154c:b0:41b:97c5:ccc7 with SMTP id 5b1f17b1804b1-41f71302dedmr34248845e9.8.1715247099448; Thu, 09 May 2024 02:31:39 -0700 (PDT) Received: from toster.lan (bl15-243-112.dsl.telepac.pt. [188.80.243.112]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41f42e74625sm62391655e9.0.2024.05.09.02.31.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 02:31:39 -0700 (PDT) From: Jose Quaresma X-Google-Original-From: Jose Quaresma To: openembedded-devel@lists.openembedded.org Cc: Jose Quaresma Subject: [oe][master][scarthgap][PATCH 5/5] composefs: add native target support Date: Thu, 9 May 2024 10:31:26 +0100 Message-ID: <20240509093126.503764-5-jose.quaresma@foundries.io> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240509093126.503764-1-jose.quaresma@foundries.io> References: <20240509093126.503764-1-jose.quaresma@foundries.io> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 09 May 2024 09:31:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/110290 The next version of ostree v2024.6 will be available soon and optional will require composefs-native. Signed-off-by: Jose Quaresma --- meta-oe/recipes-support/composefs/composefs_1.0.3.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-oe/recipes-support/composefs/composefs_1.0.3.bb b/meta-oe/recipes-support/composefs/composefs_1.0.3.bb index 5d4fa9c31..38fc8d267 100644 --- a/meta-oe/recipes-support/composefs/composefs_1.0.3.bb +++ b/meta-oe/recipes-support/composefs/composefs_1.0.3.bb @@ -27,3 +27,7 @@ EXTRA_OECONF += " \ --disable-man \ --without-fuse \ " + +LDFLAGS:append:class-native = " -pthread" + +BBCLASSEXTEND = "native"