mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

ostree: fix selinux policy rebuild error on first deployment

Browse Source 
Backport a patch to fix selinux policy rebuild error on first
deployment.
See: https://github.com/ostreedev/ostree/issues/2758

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao
2022-11-25 14:00:23 +08:00
committed by Khem Raj
parent 71fc243989
commit 290166c46b
2 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/ostree/ostree/0001-deploy-Don-t-rebuild-selinux-policy-on-first-deploym.patch
+44
View File
@@ -0,0 +1,44 @@
From bd325061dc9585886f7e60e58d9fc0c8b37e71db Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
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 <yi.zhao@windriver.com>
---
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
meta-oe/recipes-extended/ostree/ostree_2022.5.bb
+1
View File
@@ -22,6 +22,7 @@ SRC_URI = " \
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 \
file://run-ptest \
"
SRCREV = "15740d042c9c5258a1c082b5e228cf6f115edbb0"