diff --git a/recipes-images/images/torizon-base.inc b/recipes-images/images/torizon-base.inc index 458dd766..44871f92 100644 --- a/recipes-images/images/torizon-base.inc +++ b/recipes-images/images/torizon-base.inc @@ -125,5 +125,5 @@ CORE_IMAGE_BASE_INSTALL:append:cfs-signed = "\ " CORE_IMAGE_BASE_INSTALL:append:cfs-support = "\ - composefs-tools \ + composefs \ " diff --git a/recipes-support/composefs-tools/composefs-tools_git.bb b/recipes-support/composefs-tools/composefs-tools_git.bb deleted file mode 100644 index e1be29cf..00000000 --- a/recipes-support/composefs-tools/composefs-tools_git.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "composefs tools" -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. \ -" - -# TODO: REVIEW -# NOTE: multiple licenses have been detected; they have been separated with & -# in the LICENSE value for now since it is a reasonable assumption that all -# of the licenses apply. If instead there is a choice between the multiple -# licenses then you should change the value to separate the licenses with | -# instead of &. If there is any doubt, check the accompanying documentation -# to determine which situation is applicable. -LICENSE = "GPL-2.0-only & GPL-3.0-only & LGPL-2.1-only" -LIC_FILES_CHKSUM = "\ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ - file://tools/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ -" - -DEPENDS = "\ - fuse3 \ - openssl \ -" -# NOTE: We are currently removing the dependency on fuse3 on the native build -# just to avoid having to solve a dependecy chain. -DEPENDS:remove:class-native = "fuse3" - -PV = "1.0.4+git${SRCPV}" -SRC_URI = "git://github.com/containers/composefs.git;protocol=https;branch=main" - -SRCREV = "7623e4dc89f62ada5724d4e41d0a16d2671312f5" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -# The main programs are actually bash scripts (calling a binary under -# bin/.libs), so they need a runtime dependency on bash. -RDEPENDS:${PN} = "bash" - -BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-support/composefs/composefs_%.bbappend b/recipes-support/composefs/composefs_%.bbappend new file mode 100644 index 00000000..4c2a6b50 --- /dev/null +++ b/recipes-support/composefs/composefs_%.bbappend @@ -0,0 +1 @@ +# Placeholder appends file for any changes to composefs recipe diff --git a/recipes-support/composefs/composefs_1.0.5.bb b/recipes-support/composefs/composefs_1.0.5.bb new file mode 100644 index 00000000..14133fdc --- /dev/null +++ b/recipes-support/composefs/composefs_1.0.5.bb @@ -0,0 +1,30 @@ +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 = "\ + file://BSD-2-Clause.txt;md5=121c8a0a8fa5961a26b7863034ebcce8 \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ + file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \ +" + +SRCREV = "098d985a1b9a15ac828d7b2382297a6955e31e40" +SRC_URI = "git://github.com/containers/composefs.git;protocol=https;branch=main" + +S = "${WORKDIR}/git" + +inherit meson + +DEPENDS = "openssl" + +EXTRA_OEMESON += " \ + -Dman=disabled \ + -Dfuse=disabled \ +" + +BBCLASSEXTEND = "native"