From a8e6e752823b3b7a04ad4d3d684a68d8cc2ef66c Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Sun, 19 Feb 2023 05:20:26 +0000 Subject: [PATCH] ostree: Upgrade 2022.7 -> 2023.1 Drop upstreamed patches, switch to github-releases for upstream checks, update comments regarding making ptest pass as C.UTF-8 is default in glibc now. Alex Kiernan (2): lib/repo-checkout: Add ALLPERMS for musl tests: Handle musl's ERANGE mapping Benno Rice (1): Replace the radix64 crate with base64 Colin Walters (5): fetcher: Avoid too large queues for metadata processing configure: post-release version bump rust: Bump to 0.17 bindings: Consistently check for `dox` feature Release 2023.1 Dan Nicholson (16): tests/inst: Update hyper-staticfile to 0.9.4 Strip trailing whitespace on all C files repo: Add API to regenerate and sign repo metadata bin/summary: Use ostree_repo_regenerate_metadata commit: Allow skipping automatic summary generation repo: Create metadata commit in ostree_repo_regenerate_metadata lib: Provide internal summary signing with separate directory repo: Prevent publishing summary without matching signature bin: Cleanup documentation of --cache-dir option bin/refs: Sort listing bin/refs: Add option to print revisions bin/remote-refs: Add option to print revisions bin/show: Add options to list metadata keys ostree/dump: Add support for summary metadata keys bin/summary: Add options to show metadata bin/remote-summary: Add options to show metadata Eric Curtin (1): bootloader: Add an aboot (Android) bootloader backend Jonathan Lebon (1): ostree/prune: Calculate reachability under exclusive lock Luca BRUNO (4): lib: assert more invariants configure: use pkg-config with newer gpgme and gpg-error lib/repo: fix an 'unused-function' warning lib/sysroot-upgrader: add some 'nullable' annotations Tareque Md Hanif (1): docs: Fix link to ostree-rs Signed-off-by: Alex Kiernan Signed-off-by: Khem Raj --- ...-repo-checkout-Add-ALLPERMS-for-musl.patch | 32 ------------------- ...1-tests-Handle-musl-s-ERANGE-mapping.patch | 29 ----------------- .../{ostree_2022.7.bb => ostree_2023.1.bb} | 14 +++----- 3 files changed, 5 insertions(+), 70 deletions(-) delete mode 100644 meta-oe/recipes-extended/ostree/ostree/0001-lib-repo-checkout-Add-ALLPERMS-for-musl.patch delete mode 100644 meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-musl-s-ERANGE-mapping.patch rename meta-oe/recipes-extended/ostree/{ostree_2022.7.bb => ostree_2023.1.bb} (93%) diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-lib-repo-checkout-Add-ALLPERMS-for-musl.patch b/meta-oe/recipes-extended/ostree/ostree/0001-lib-repo-checkout-Add-ALLPERMS-for-musl.patch deleted file mode 100644 index 1502f1d4fd..0000000000 --- a/meta-oe/recipes-extended/ostree/ostree/0001-lib-repo-checkout-Add-ALLPERMS-for-musl.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6aef666a2911c15b31efeed08d89fe9997d89e04 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan -Date: Sat, 31 Dec 2022 11:11:14 +0000 -Subject: [PATCH] lib/repo-checkout: Add ALLPERMS for musl - -ALLPERMS is glibc specific, add a definition for musl. - -Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/2797] -Signed-off-by: Alex Kiernan ---- - src/libostree/ostree-core-private.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/libostree/ostree-core-private.h b/src/libostree/ostree-core-private.h -index 2bd2f9848718..48b2b8ab307f 100644 ---- a/src/libostree/ostree-core-private.h -+++ b/src/libostree/ostree-core-private.h -@@ -34,6 +34,11 @@ G_BEGIN_DECLS - #define DEFAULT_DIRECTORY_MODE 0775 - #define DEFAULT_REGFILE_MODE 0660 - -+/* This exists in glibc's sys/stat.h, but not on musl */ -+#ifndef ALLPERMS -+#define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) -+#endif -+ - /* This file contains private implementation data format definitions - * read by multiple implementation .c files. - */ --- -2.39.0 - diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-musl-s-ERANGE-mapping.patch b/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-musl-s-ERANGE-mapping.patch deleted file mode 100644 index d0a8447e3d..0000000000 --- a/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-musl-s-ERANGE-mapping.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bd182584a1e2f820493d9db689598a20c5700ba5 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan -Date: Mon, 2 Jan 2023 10:37:49 +0000 -Subject: [PATCH] tests: Handle musl's ERANGE mapping - -musl uses "Result not representable" for ERANGE, support this in -addition to glibc's "Numerical result out of range". - -Upstream-Status: Backport [https://github.com/ostreedev/ostree/commit/2d4ee168d7eae0afcce356a3f8135294e6d7fe6f] -Signed-off-by: Alex Kiernan ---- - tests/test-commit-timestamp.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test-commit-timestamp.sh b/tests/test-commit-timestamp.sh -index 0688c63a4bdb..de105b768a9c 100755 ---- a/tests/test-commit-timestamp.sh -+++ b/tests/test-commit-timestamp.sh -@@ -40,6 +40,6 @@ fi - ${CMD_PREFIX} ostree --repo=./testrepo show env > show-env.txt - rm -rf testrepo testrepo-files - assert_file_has_content_literal commit-invalid.txt 'Failed to convert SOURCE_DATE_EPOCH' --assert_file_has_content_literal commit-overflowing.txt 'Parsing SOURCE_DATE_EPOCH: Numerical result out of range' -+assert_file_has_content commit-overflowing.txt 'Parsing SOURCE_DATE_EPOCH: \(Numerical result out of range\|Result not representable\)' - assert_file_has_content_literal show-env.txt 'Date: 2009-02-13 23:31:30 +0000' - echo "ok commit with env timestamp" --- -2.39.0 - diff --git a/meta-oe/recipes-extended/ostree/ostree_2022.7.bb b/meta-oe/recipes-extended/ostree/ostree_2023.1.bb similarity index 93% rename from meta-oe/recipes-extended/ostree/ostree_2022.7.bb rename to meta-oe/recipes-extended/ostree/ostree_2023.1.bb index 61e208b3b7..bd566e1c28 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2022.7.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2023.1.bb @@ -17,19 +17,16 @@ DEPENDS = " \ bison-native \ " +GITHUB_BASE_URI = "https://github.com/ostreedev/ostree/releases" SRC_URI = " \ - https://github.com/ostreedev/ostree/releases/download/v${PV}/libostree-${PV}.tar.xz \ - file://0001-lib-repo-checkout-Add-ALLPERMS-for-musl.patch \ - file://0001-tests-Handle-musl-s-ERANGE-mapping.patch \ + ${GITHUB_BASE_URI}/download/v${PV}/libostree-${PV}.tar.xz \ file://run-ptest \ " -SRC_URI[sha256sum] = "8be2a9261c94e8b9ec4113380ffc480f8598245fb321a009bad4fae4b822411f" - -UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+\.\d+)" +SRC_URI[sha256sum] = "dd792b167693a1971c9f6e3168013d906ac035100ff6c719a3b322eb44b96f55" S = "${WORKDIR}/libostree-${PV}" -inherit autotools bash-completion gobject-introspection gtk-doc manpages pkgconfig ptest-gnome systemd +inherit autotools bash-completion gobject-introspection github-releases gtk-doc manpages pkgconfig ptest-gnome systemd # Workaround compile failure: # |../git/src/libotutil/zbase32.c:37:1: error: function returns an aggregate [-Werror=aggregate-return] @@ -183,7 +180,7 @@ RDEPENDS:${PN}:class-target = " \ # ostree-trivial-httpd (requires soup - note soup and curl can coexist) # overlayfs in your kernel # busybox built statically -# C.UTF-8 locale available +# C.UTF-8 locale available (default) # Sufficient disk space/RAM (e.g. core-image-sato-sdk) # # Something like this in your local.conf: @@ -191,7 +188,6 @@ RDEPENDS:${PN}:class-target = " \ # PACKAGECONFIG:append:pn-ostree = " static soup" # KERNEL_EXTRA_FEATURES:append = " features/overlayfs/overlayfs.scc" # TARGET_CFLAGS:append:pn-busybox = " -static" -# IMAGE_LINGUAS:append:libc-glibc = " c" # RDEPENDS:${PN}-ptest += " \ attr \