diff options
| author | Alex Kiernan <alex.kiernan@gmail.com> | 2023-02-19 05:20:26 +0000 | 
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2023-02-18 21:33:58 -0800 | 
| commit | a8e6e752823b3b7a04ad4d3d684a68d8cc2ef66c (patch) | |
| tree | 138799ae9a68ccd112b767ee3b3ffd52b74f92f4 | |
| parent | 1877172e97d4a48ec9805a02b870ac4ccc57962b (diff) | |
| download | meta-openembedded-a8e6e752823b3b7a04ad4d3d684a68d8cc2ef66c.tar.gz | |
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 <alex.kiernan@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-extended/ostree/ostree/0001-lib-repo-checkout-Add-ALLPERMS-for-musl.patch | 32 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-musl-s-ERANGE-mapping.patch | 29 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/ostree/ostree_2023.1.bb (renamed from meta-oe/recipes-extended/ostree/ostree_2022.7.bb) | 14 | 
3 files changed, 5 insertions, 70 deletions
| 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 @@ | |||
| 1 | From 6aef666a2911c15b31efeed08d89fe9997d89e04 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alex Kiernan <alex.kiernan@gmail.com> | ||
| 3 | Date: Sat, 31 Dec 2022 11:11:14 +0000 | ||
| 4 | Subject: [PATCH] lib/repo-checkout: Add ALLPERMS for musl | ||
| 5 | |||
| 6 | ALLPERMS is glibc specific, add a definition for musl. | ||
| 7 | |||
| 8 | Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/2797] | ||
| 9 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | ||
| 10 | --- | ||
| 11 | src/libostree/ostree-core-private.h | 5 +++++ | ||
| 12 | 1 file changed, 5 insertions(+) | ||
| 13 | |||
| 14 | diff --git a/src/libostree/ostree-core-private.h b/src/libostree/ostree-core-private.h | ||
| 15 | index 2bd2f9848718..48b2b8ab307f 100644 | ||
| 16 | --- a/src/libostree/ostree-core-private.h | ||
| 17 | +++ b/src/libostree/ostree-core-private.h | ||
| 18 | @@ -34,6 +34,11 @@ G_BEGIN_DECLS | ||
| 19 | #define DEFAULT_DIRECTORY_MODE 0775 | ||
| 20 | #define DEFAULT_REGFILE_MODE 0660 | ||
| 21 | |||
| 22 | +/* This exists in glibc's sys/stat.h, but not on musl */ | ||
| 23 | +#ifndef ALLPERMS | ||
| 24 | +#define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) | ||
| 25 | +#endif | ||
| 26 | + | ||
| 27 | /* This file contains private implementation data format definitions | ||
| 28 | * read by multiple implementation .c files. | ||
| 29 | */ | ||
| 30 | -- | ||
| 31 | 2.39.0 | ||
| 32 | |||
| 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 @@ | |||
| 1 | From bd182584a1e2f820493d9db689598a20c5700ba5 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alex Kiernan <alex.kiernan@gmail.com> | ||
| 3 | Date: Mon, 2 Jan 2023 10:37:49 +0000 | ||
| 4 | Subject: [PATCH] tests: Handle musl's ERANGE mapping | ||
| 5 | |||
| 6 | musl uses "Result not representable" for ERANGE, support this in | ||
| 7 | addition to glibc's "Numerical result out of range". | ||
| 8 | |||
| 9 | Upstream-Status: Backport [https://github.com/ostreedev/ostree/commit/2d4ee168d7eae0afcce356a3f8135294e6d7fe6f] | ||
| 10 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | ||
| 11 | --- | ||
| 12 | tests/test-commit-timestamp.sh | 2 +- | ||
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 14 | |||
| 15 | diff --git a/tests/test-commit-timestamp.sh b/tests/test-commit-timestamp.sh | ||
| 16 | index 0688c63a4bdb..de105b768a9c 100755 | ||
| 17 | --- a/tests/test-commit-timestamp.sh | ||
| 18 | +++ b/tests/test-commit-timestamp.sh | ||
| 19 | @@ -40,6 +40,6 @@ fi | ||
| 20 | ${CMD_PREFIX} ostree --repo=./testrepo show env > show-env.txt | ||
| 21 | rm -rf testrepo testrepo-files | ||
| 22 | assert_file_has_content_literal commit-invalid.txt 'Failed to convert SOURCE_DATE_EPOCH' | ||
| 23 | -assert_file_has_content_literal commit-overflowing.txt 'Parsing SOURCE_DATE_EPOCH: Numerical result out of range' | ||
| 24 | +assert_file_has_content commit-overflowing.txt 'Parsing SOURCE_DATE_EPOCH: \(Numerical result out of range\|Result not representable\)' | ||
| 25 | assert_file_has_content_literal show-env.txt 'Date: 2009-02-13 23:31:30 +0000' | ||
| 26 | echo "ok commit with env timestamp" | ||
| 27 | -- | ||
| 28 | 2.39.0 | ||
| 29 | |||
| diff --git a/meta-oe/recipes-extended/ostree/ostree_2022.7.bb b/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 = " \ | |||
| 17 | bison-native \ | 17 | bison-native \ | 
| 18 | " | 18 | " | 
| 19 | 19 | ||
| 20 | GITHUB_BASE_URI = "https://github.com/ostreedev/ostree/releases" | ||
| 20 | SRC_URI = " \ | 21 | SRC_URI = " \ | 
| 21 | https://github.com/ostreedev/ostree/releases/download/v${PV}/libostree-${PV}.tar.xz \ | 22 | ${GITHUB_BASE_URI}/download/v${PV}/libostree-${PV}.tar.xz \ | 
| 22 | file://0001-lib-repo-checkout-Add-ALLPERMS-for-musl.patch \ | ||
| 23 | file://0001-tests-Handle-musl-s-ERANGE-mapping.patch \ | ||
| 24 | file://run-ptest \ | 23 | file://run-ptest \ | 
| 25 | " | 24 | " | 
| 26 | SRC_URI[sha256sum] = "8be2a9261c94e8b9ec4113380ffc480f8598245fb321a009bad4fae4b822411f" | 25 | SRC_URI[sha256sum] = "dd792b167693a1971c9f6e3168013d906ac035100ff6c719a3b322eb44b96f55" | 
| 27 | |||
| 28 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)" | ||
| 29 | 26 | ||
| 30 | S = "${WORKDIR}/libostree-${PV}" | 27 | S = "${WORKDIR}/libostree-${PV}" | 
| 31 | 28 | ||
| 32 | inherit autotools bash-completion gobject-introspection gtk-doc manpages pkgconfig ptest-gnome systemd | 29 | inherit autotools bash-completion gobject-introspection github-releases gtk-doc manpages pkgconfig ptest-gnome systemd | 
| 33 | 30 | ||
| 34 | # Workaround compile failure: | 31 | # Workaround compile failure: | 
| 35 | # |../git/src/libotutil/zbase32.c:37:1: error: function returns an aggregate [-Werror=aggregate-return] | 32 | # |../git/src/libotutil/zbase32.c:37:1: error: function returns an aggregate [-Werror=aggregate-return] | 
| @@ -183,7 +180,7 @@ RDEPENDS:${PN}:class-target = " \ | |||
| 183 | # ostree-trivial-httpd (requires soup - note soup and curl can coexist) | 180 | # ostree-trivial-httpd (requires soup - note soup and curl can coexist) | 
| 184 | # overlayfs in your kernel | 181 | # overlayfs in your kernel | 
| 185 | # busybox built statically | 182 | # busybox built statically | 
| 186 | # C.UTF-8 locale available | 183 | # C.UTF-8 locale available (default) | 
| 187 | # Sufficient disk space/RAM (e.g. core-image-sato-sdk) | 184 | # Sufficient disk space/RAM (e.g. core-image-sato-sdk) | 
| 188 | # | 185 | # | 
| 189 | # Something like this in your local.conf: | 186 | # Something like this in your local.conf: | 
| @@ -191,7 +188,6 @@ RDEPENDS:${PN}:class-target = " \ | |||
| 191 | # PACKAGECONFIG:append:pn-ostree = " static soup" | 188 | # PACKAGECONFIG:append:pn-ostree = " static soup" | 
| 192 | # KERNEL_EXTRA_FEATURES:append = " features/overlayfs/overlayfs.scc" | 189 | # KERNEL_EXTRA_FEATURES:append = " features/overlayfs/overlayfs.scc" | 
| 193 | # TARGET_CFLAGS:append:pn-busybox = " -static" | 190 | # TARGET_CFLAGS:append:pn-busybox = " -static" | 
| 194 | # IMAGE_LINGUAS:append:libc-glibc = " c" | ||
| 195 | # | 191 | # | 
| 196 | RDEPENDS:${PN}-ptest += " \ | 192 | RDEPENDS:${PN}-ptest += " \ | 
| 197 | attr \ | 193 | attr \ | 
