Skip to content

Commit

Permalink
composefs: backport composefs from meta-openembedded
Browse files Browse the repository at this point in the history
Now that composefs is part of meta-openembedded, we can drop the recipe
we maintain in favor of the upstream one.
Since this is only available on master branch, I've backported this
recipe as is to our layer, renamed from 'composefs-tools' to 'composefs'
to be equivalent.

Related-to: TOR-3476

Signed-off-by: Eduardo Ferreira <[email protected]>
  • Loading branch information
EdTheBearded committed Nov 18, 2024
1 parent 2624d44 commit ff82d54
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 45 deletions.
2 changes: 1 addition & 1 deletion recipes-images/images/torizon-base.inc
Original file line number Diff line number Diff line change
Expand Up @@ -125,5 +125,5 @@ CORE_IMAGE_BASE_INSTALL:append:cfs-signed = "\
"

CORE_IMAGE_BASE_INSTALL:append:cfs-support = "\
composefs-tools \
composefs \
"
44 changes: 0 additions & 44 deletions recipes-support/composefs-tools/composefs-tools_git.bb

This file was deleted.

1 change: 1 addition & 0 deletions recipes-support/composefs/composefs_%.bbappend
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Placeholder appends file for any changes to composefs recipe
30 changes: 30 additions & 0 deletions recipes-support/composefs/composefs_1.0.5.bb
Original file line number Diff line number Diff line change
@@ -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"

0 comments on commit ff82d54

Please sign in to comment.