diff --git a/add-for-support-NestOS-kernel.patch b/add-for-support-NestOS-kernel.patch new file mode 100644 index 0000000..ce2a7fa --- /dev/null +++ b/add-for-support-NestOS-kernel.patch @@ -0,0 +1,25 @@ +From d28c0e475681a124160c0d423ddccc38ea3c0608 Mon Sep 17 00:00:00 2001 +From: wangyueliang +Date: Sun, 17 Sep 2023 18:45:22 +0800 +Subject: [PATCH] add for support NestOS kernel + +--- + rust/src/scripts.rs | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/rust/src/scripts.rs b/rust/src/scripts.rs +index 078322a..08ac7de 100644 +--- a/rust/src/scripts.rs ++++ b/rust/src/scripts.rs +@@ -23,6 +23,8 @@ static IGNORED_PKG_SCRIPTS: phf::Set<&'static str> = phf_set! { + "kernel-core.posttrans", + "kernel-debug-core.posttrans", + "kernel-automotive-core.posttrans", ++ // add for support NestOS kernel ++ "NestOS-kernel.posttrans", + // Additionally ignore posttrans scripts for the Oracle Linux `kernel-uek` package + "kernel-uek.posttrans", + // Legacy workaround +-- +2.25.1 + diff --git a/fix-compose-error-for-selinux.patch b/fix-compose-error-for-selinux.patch new file mode 100644 index 0000000..932ee72 --- /dev/null +++ b/fix-compose-error-for-selinux.patch @@ -0,0 +1,30 @@ +From 9ef3d30d9b5c6c8dd8fe72d7aaad499fcda6192a Mon Sep 17 00:00:00 2001 +From: wangyueliang +Date: Mon, 18 Sep 2023 17:29:08 +0800 +Subject: [PATCH] fix compose error for selinux + +--- + src/libpriv/rpmostree-postprocess.cxx | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/src/libpriv/rpmostree-postprocess.cxx b/src/libpriv/rpmostree-postprocess.cxx +index bfadaa7..668b06e 100644 +--- a/src/libpriv/rpmostree-postprocess.cxx ++++ b/src/libpriv/rpmostree-postprocess.cxx +@@ -395,13 +395,6 @@ postprocess_final (int rootfs_dfd, rpmostreecxx::Treefile &treefile, gboolean un + error); + } + +- /* Temporary workaround for https://github.com/openshift/os/issues/1036. */ +- { +- rust::Vec child_argv = { rust::String ("semodule"), rust::String ("-n"), +- rust::String ("--rebuild-if-modules-changed") }; +- ROSCXX_TRY (bubblewrap_run_sync (rootfs_dfd, child_argv, false, (bool)unified_core_mode), +- error); +- } + } + + auto container = treefile.get_container (); +-- +2.25.1 + diff --git a/rpm-ostree.spec b/rpm-ostree.spec index d4924e6..34043ff 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -4,13 +4,15 @@ Name: rpm-ostree Version: 2022.16 -Release: 2 +Release: 3 Summary: Hybrid image/package system License: Apache-2.0 or MIT and GPL-2.0-or-later and LGPL-2.0-or-later URL: https://github.com/coreos/rpm-ostree -Source0: https://github.com/coreos/rpm-ostree/releases/download/v2022.8/%{name}-%{version}.tar.xz +Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/%{name}-%{version}.tar.xz Patch0: fix-compose-err.patch Patch1: fix-2022.16-build-error.patch +Patch2: add-for-support-NestOS-kernel.patch +Patch3: fix-compose-error-for-selinux.patch %if %{with rust} %if !%{defined rust_arches} @@ -115,6 +117,10 @@ install -pm 0644 src/daemon/org.projectatomic.rpmostree1.conf %{buildroot}/etc/d %{_mandir}/man*/* %changelog +* Mon Sep 18 2023 wangyueliang - 2022.16-3 +- fix compose error for selinux. +- add-for-support-NestOS-kernel. + * Fri Aug 04 2023 Jingwiw - 2022.16-2 - enable riscv64 architecture