diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-Remove-unused-linux-fs.h-includes.patch b/meta-oe/recipes-extended/ostree/ostree/0001-Remove-unused-linux-fs.h-includes.patch deleted file mode 100644 index 2659e4696d..0000000000 --- a/meta-oe/recipes-extended/ostree/ostree/0001-Remove-unused-linux-fs.h-includes.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 7d32c352f628747cfadabf9fe7fcc13608e5dfe6 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Wed, 3 Aug 2022 10:37:40 -0400 -Subject: [PATCH] Remove unused `linux/fs.h` includes - -Prep for fixing conflicts introduced by newer glibc. -cc https://github.com/ostreedev/ostree/issues/2685 - -Upstream-Status: Backport [https://github.com/ostreedev/ostree/commit/edba4b33be10c05253bfa94895dfbc8477e44d76] -Signed-off-by: Khem Raj ---- - src/libostree/ostree-repo-commit.c | 1 - - src/ostree/ot-main.c | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c -index afab3fdf..35b16c71 100644 ---- a/src/libostree/ostree-repo-commit.c -+++ b/src/libostree/ostree-repo-commit.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - - #include "otutil.h" -diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c -index b7b50d67..7a4405a5 100644 ---- a/src/ostree/ot-main.c -+++ b/src/ostree/ot-main.c -@@ -28,7 +28,6 @@ - #include - #include - #include --#include - - #include "ot-main.h" - #include "ostree.h" --- -2.37.1 - diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-deploy-Don-t-rebuild-selinux-policy-on-first-deploym.patch b/meta-oe/recipes-extended/ostree/ostree/0001-deploy-Don-t-rebuild-selinux-policy-on-first-deploym.patch deleted file mode 100644 index 248dcf49b8..0000000000 --- a/meta-oe/recipes-extended/ostree/ostree/0001-deploy-Don-t-rebuild-selinux-policy-on-first-deploym.patch +++ /dev/null @@ -1,44 +0,0 @@ -From bd325061dc9585886f7e60e58d9fc0c8b37e71db Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Wed, 9 Nov 2022 11:18:36 -0500 -Subject: [PATCH] deploy: Don't rebuild selinux policy on first deployment - -Basically, it should not be necessary - the policy should be -up-to-date. We don't want to force on continual policy rebuilds. - -Even trying to run bwrap when we're *not* in a booted -root can cause failures in nested containerization scenarios. - -Closes: https://github.com/ostreedev/ostree/issues/2758 - -Upstream-Status: Backport -[https://github.com/ostreedev/ostree/commit/bd325061dc9585886f7e60e58d9fc0c8b37e71db] - -Signed-off-by: Yi Zhao ---- - src/libostree/ostree-sysroot-deploy.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c -index f27ae0e1..26b07080 100644 ---- a/src/libostree/ostree-sysroot-deploy.c -+++ b/src/libostree/ostree-sysroot-deploy.c -@@ -2987,12 +2987,12 @@ sysroot_finalize_deployment (OstreeSysroot *self, - if (!merge_configuration_from (self, merge_deployment, deployment, deployment_dfd, - cancellable, error)) - return FALSE; -- } - - #ifdef HAVE_SELINUX -- if (!sysroot_finalize_selinux_policy(deployment_dfd, error)) -- return FALSE; -+ if (!sysroot_finalize_selinux_policy (deployment_dfd, error)) -+ return FALSE; - #endif /* HAVE_SELINUX */ -+ } - - const char *osdeploypath = glnx_strjoina ("ostree/deploy/", ostree_deployment_get_osname (deployment)); - glnx_autofd int os_deploy_dfd = -1; --- -2.25.1 - 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 new file mode 100644 index 0000000000..1502f1d4fd --- /dev/null +++ b/meta-oe/recipes-extended/ostree/ostree/0001-lib-repo-checkout-Add-ALLPERMS-for-musl.patch @@ -0,0 +1,32 @@ +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-libostree-Remove-including-sys-mount.h.patch b/meta-oe/recipes-extended/ostree/ostree/0001-libostree-Remove-including-sys-mount.h.patch deleted file mode 100644 index 5c2792cf89..0000000000 --- a/meta-oe/recipes-extended/ostree/ostree/0001-libostree-Remove-including-sys-mount.h.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7ff956e4088e0bdc6bfd429f99124a8a9256c181 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 6 Aug 2022 21:44:11 -0700 -Subject: [PATCH] libostree: Remove including sys/mount.h - -This conflicts with linux/mount.h which is included by linux/fs.h -with glibc 2.36+ - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - src/libostree/ostree-sysroot-deploy.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c -index 2dc9f58b..61b19e42 100644 ---- a/src/libostree/ostree-sysroot-deploy.c -+++ b/src/libostree/ostree-sysroot-deploy.c -@@ -23,7 +23,6 @@ - #include - #include - #include --#include - #include - #include - #include --- -2.37.1 - diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-s390x-se-luks-gencpio-There-is-no-bashism.patch b/meta-oe/recipes-extended/ostree/ostree/0001-s390x-se-luks-gencpio-There-is-no-bashism.patch deleted file mode 100644 index 5cf5784f14..0000000000 --- a/meta-oe/recipes-extended/ostree/ostree/0001-s390x-se-luks-gencpio-There-is-no-bashism.patch +++ /dev/null @@ -1,25 +0,0 @@ -From dd55633e49aa43dede3c8e1770ae8761487f050e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 6 Aug 2022 21:52:31 -0700 -Subject: [PATCH] s390x-se-luks-gencpio: There is no bashism - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - src/libostree/s390x-se-luks-gencpio | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libostree/s390x-se-luks-gencpio b/src/libostree/s390x-se-luks-gencpio -index e821e2fe..96c1d123 100755 ---- a/src/libostree/s390x-se-luks-gencpio -+++ b/src/libostree/s390x-se-luks-gencpio -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # This script creates new initramdisk with LUKS config within - set -euo pipefail - --- -2.37.1 - diff --git a/meta-oe/recipes-extended/ostree/ostree_2022.5.bb b/meta-oe/recipes-extended/ostree/ostree_2022.7.bb similarity index 94% rename from meta-oe/recipes-extended/ostree/ostree_2022.5.bb rename to meta-oe/recipes-extended/ostree/ostree_2022.7.bb index c6ac7cbea4..771b17b34b 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2022.5.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2022.7.bb @@ -18,18 +18,15 @@ DEPENDS = " \ " SRC_URI = " \ - gitsm://github.com/ostreedev/ostree;branch=main;protocol=https \ - file://0001-Remove-unused-linux-fs.h-includes.patch \ - file://0001-libostree-Remove-including-sys-mount.h.patch \ - file://0001-s390x-se-luks-gencpio-There-is-no-bashism.patch \ - file://0001-deploy-Don-t-rebuild-selinux-policy-on-first-deploym.patch \ + https://github.com/ostreedev/ostree/releases/download/v${PV}/libostree-${PV}.tar.xz \ + file://0001-lib-repo-checkout-Add-ALLPERMS-for-musl.patch \ file://run-ptest \ " -SRCREV = "15740d042c9c5258a1c082b5e228cf6f115edbb0" +SRC_URI[sha256sum] = "8be2a9261c94e8b9ec4113380ffc480f8598245fb321a009bad4fae4b822411f" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+\.\d+)" -S = "${WORKDIR}/git" +S = "${WORKDIR}/libostree-${PV}" inherit autotools bash-completion gobject-introspection gtk-doc manpages pkgconfig ptest-gnome systemd