From bb62f52e95b4171ea96d1ea8b9db18acd6f9b443 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Mon, 19 Aug 2024 18:05:03 +0100 Subject: [PATCH] composefs: upgrade 1.0.4 -> 1.0.5 - switch to meson build system Changelog [1]: $ git --no-pager log --oneline v1.0.4..v1.0.5 098d985 (tag: v1.0.5) Merge pull request #312 from cgwalters/release 0fae8a8 Release 1.0.5 9bdc377 Merge pull request #310 from cgwalters/symlink-limit b06ea9b Verify payload length early on 3beb011 Merge pull request #308 from cgwalters/minor-rust-lints a695ad4 Merge pull request #309 from giuseppe/libcomposefs-drop-ro 0a0d50f libcomposefs: drop using "ro" option b35dc83 dumpfile: Fix clippy lint a919ab8 rust: Drop unused cfg 3a87868 Merge pull request #307 from giuseppe/not-override-errno bb94687 Merge pull request #306 from giuseppe/mkcomposefs-report-close-errors 76b4da5 mkcompose: report close() errors 502bc27 libcomposefs: do not override errno 2d2c09d Merge pull request #304 from jluebbe/meson 0260856 meson.build: Allow use as a meson subproject 5f512ac Merge pull request #303 from cgwalters/mount-source 91a3047 mount: Consistently use `composefs` as source 45e6179 Merge pull request #302 from cgwalters/info-term f64022f info: Add missing terminator for `longopts` d81cb87 Merge pull request #300 from jluebbe/meson 04c8a8e ci: Add GitHub Actions workflow which uses meson 64709f6 ci: Install meson package b6f2b75 Add meson as an alternative to autotools 942cd73 Merge pull request #299 from giuseppe/composefs-info-set-locale 5072fd7 composefs-info: specify locale to isgraph/isprint 4f19d00 Merge pull request #298 from cgwalters/rust-misc 43a1d28 rust: Add README.md files, link to crates.io a8bc747 rust: Clarify that "composefs-core" is really "composefs" 483356c Merge pull request #297 from cgwalters/rust-include 02213c0 composefs-core: Drop incorrect `include` dce84ff Merge pull request #295 from cgwalters/rust-descr 3d2af03 Merge pull request #296 from Kiskae/upstream-tmpdir-fix 6928fcf test: remove hardcoded /tmp e21be07 rust: Add mandatory `description` field, other misc changes 28dc491 Merge pull request #292 from cgwalters/rust-ci-dual 59c5a27 Merge pull request #293 from cgwalters/rust-minor 689ccc6 rust: Some doc and misc tweaks 426b65d ci: Test Rust code against current C code 32b3f6e Merge pull request #291 from Kiskae/patch-1 f7465b3 use correct `composefs-info` binary [1] https://github.com/containers/composefs/compare/v1.0.4...v1.0.5 Signed-off-by: Jose Quaresma Signed-off-by: Khem Raj --- .../{composefs_1.0.4.bb => composefs_1.0.5.bb} | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) rename meta-oe/recipes-support/composefs/{composefs_1.0.4.bb => composefs_1.0.5.bb} (84%) diff --git a/meta-oe/recipes-support/composefs/composefs_1.0.4.bb b/meta-oe/recipes-support/composefs/composefs_1.0.5.bb similarity index 84% rename from meta-oe/recipes-support/composefs/composefs_1.0.4.bb rename to meta-oe/recipes-support/composefs/composefs_1.0.5.bb index 7b934e4ea40..14133fdcb65 100644 --- a/meta-oe/recipes-support/composefs/composefs_1.0.4.bb +++ b/meta-oe/recipes-support/composefs/composefs_1.0.5.bb @@ -13,20 +13,18 @@ LIC_FILES_CHKSUM = "\ file://LICENSE.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \ " -SRCREV = "7623e4dc89f62ada5724d4e41d0a16d2671312f5" +SRCREV = "098d985a1b9a15ac828d7b2382297a6955e31e40" SRC_URI = "git://github.com/containers/composefs.git;protocol=https;branch=main" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit meson DEPENDS = "openssl" -EXTRA_OECONF += " \ - --disable-man \ - --without-fuse \ +EXTRA_OEMESON += " \ + -Dman=disabled \ + -Dfuse=disabled \ " -LDFLAGS:append:class-native = " -pthread" - BBCLASSEXTEND = "native"