!39 合并master分支改动至openEuler-22.03-LTS-Next

From: @wangyueliang 
Reviewed-by: @duyiwei7w 
Signed-off-by: @duyiwei7w

add-for-support-NestOS-kernel.patch

@@ -0,0 +1,25 @@
+From d28c0e475681a124160c0d423ddccc38ea3c0608 Mon Sep 17 00:00:00 2001
+From: wangyueliang <wangyueliang@kylinos.cn>
+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
+

fix-2022.16-build-error.patch

@@ -0,0 +1,52 @@
+diff -uprN rpm-ostree-2022.16/rust/src/client.rs rpm-ostree-2022.16-new/rust/src/client.rs
+--- rpm-ostree-2022.16/rust/src/client.rs	2022-11-19 01:25:53.000000000 +0800
++++ rpm-ostree-2022.16-new/rust/src/client.rs	2023-02-23 14:54:32.000000000 +0800
+@@ -129,6 +129,7 @@ pub(crate) fn is_src_rpm_arg(arg: &str)
+ /// descriptors for the content.
+ /// TODO(cxx-rs): This would be slightly more elegant as Result<Option<Vec<i32>>>
+ #[context("Handling argument {}", arg)]
++#[allow(unused_variables)]
+ pub(crate) fn client_handle_fd_argument(
+     arg: &str,
+     arch: &str,
+@@ -315,13 +316,15 @@ fn is_yes(s: &str) -> bool {
+ 
+ /// Prompt for confirmation
+ pub(crate) fn confirm() -> CxxResult<bool> {
+-    let mut stdout = std::io::stdout().lock();
+-    let mut stdin = std::io::stdin().lock();
+-    write!(stdout, "Continue? [y/N] ")?;
+-    stdout.flush()?;
++    let stdin = std::io::stdin();
++    let mut stdin_lock = stdin.lock();
++    let stdout = std::io::stdout();
++    let mut stdout_lock = stdout.lock();
++    write!(stdout_lock, "Continue? [y/N] ")?;
++    stdout_lock.flush()?;
+     let mut resp = String::new();
+-    stdin.read_line(&mut resp)?;
+-    Ok(is_yes(resp.as_str().trim()))
++    stdin_lock.read_line(&mut resp)?;
++    Ok(is_yes(resp.trim()))
+ }
+ 
+ /// Prompt for confirmation, and return an error if not agreed
+diff -uprN rpm-ostree-2022.16/vendor/phf/.cargo-checksum.json rpm-ostree-2022.16-new/vendor/phf/.cargo-checksum.json
+--- rpm-ostree-2022.16/vendor/phf/.cargo-checksum.json	2022-11-19 01:41:00.000000000 +0800
++++ rpm-ostree-2022.16-new/vendor/phf/.cargo-checksum.json	2023-02-23 09:44:32.000000000 +0800
+@@ -1 +1 @@
+-{"files":{"CHANGELOG.md":"0e8c35d9be4ea0740abefdf22aac5a3501bc757c5120a106c0160a83b257d78a","Cargo.toml":"5c19e4ee6611b2da953aafa8311690a82cddcff59b07577eec96da3ca1e5a4cf","README.md":"63e1776e08b52979e4ae92f0ccab6c6b86cf5fe643a986f5c130a504cafd6d28","src/lib.rs":"34c7f3a2dc755bfd8246c422708088bc0acf64c8a33cb7bda10c705c4e6f3812","src/map.rs":"db6df0e2465d51b40640bb85cea28a9daca9ff1b0f57a3316608a55fc11879c5","src/ordered_map.rs":"5f849d7c8bea4322911b81a980a9ce988961ccec4029a2254d54ca68aed8cd45","src/ordered_set.rs":"0ed66947623c8a79b1ad2c206ef5a13af701f95c0f36544ab986c9617e2a24a3","src/set.rs":"065a501930c4667877168b99aeca00007dd222865bafc26451cbc9fdf08ad7e6"},"package":"928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"}
+\ No newline at end of file
++{"files":{"CHANGELOG.md":"0e8c35d9be4ea0740abefdf22aac5a3501bc757c5120a106c0160a83b257d78a","Cargo.toml":"5d336ed218103113a13c4ab33a87e44d312a3d63dd5f6de7317955870d205f8d","README.md":"63e1776e08b52979e4ae92f0ccab6c6b86cf5fe643a986f5c130a504cafd6d28","src/lib.rs":"34c7f3a2dc755bfd8246c422708088bc0acf64c8a33cb7bda10c705c4e6f3812","src/map.rs":"db6df0e2465d51b40640bb85cea28a9daca9ff1b0f57a3316608a55fc11879c5","src/ordered_map.rs":"5f849d7c8bea4322911b81a980a9ce988961ccec4029a2254d54ca68aed8cd45","src/ordered_set.rs":"0ed66947623c8a79b1ad2c206ef5a13af701f95c0f36544ab986c9617e2a24a3","src/set.rs":"065a501930c4667877168b99aeca00007dd222865bafc26451cbc9fdf08ad7e6"},"package":"928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"}
+\ No newline at end of file
+diff -uprN rpm-ostree-2022.16/vendor/phf/Cargo.toml rpm-ostree-2022.16-new/vendor/phf/Cargo.toml
+--- rpm-ostree-2022.16/vendor/phf/Cargo.toml	2022-11-19 01:41:00.000000000 +0800
++++ rpm-ostree-2022.16-new/vendor/phf/Cargo.toml	2023-02-23 09:40:29.221890304 +0800
+@@ -51,6 +51,6 @@ macros = ["phf_macros"]
+ std = ["phf_shared/std"]
+ uncased = ["phf_shared/uncased"]
+ unicase = [
+-    "phf_macros?/unicase",
++    "phf_macros/unicase",
+     "phf_shared/unicase",
+ ]

fix-compose-err.patch

@@ -0,0 +1,12 @@
+--- rpm-ostree-2022.16/rust/src/scripts.rs	2022-11-19 01:25:53.000000000 +0800
++++ rpm-ostree-2022.16-new/rust/src/scripts.rs	2023-02-23 10:51:31.000000000 +0800
+@@ -16,6 +16,9 @@ use phf::phf_set;
+ ///
+ /// NOTE FOR GIT history: This list used to live in src/libpriv/rpmostree-script-gperf.gperf
+ static IGNORED_PKG_SCRIPTS: phf::Set<&'static str> = phf_set! {
++    "glibc-common.posttrans",
++    "grub2-efi-x64.prein",
++    "grub2-efi-aa64.prein",
+     "glibc.prein",
+     // We take over depmod/dracut etc.  It's `kernel` in C7 and kernel-core in F25+
+     // XXX: we should probably change this to instead ignore based on the kernel virtual Provides

fix-compose-error-for-selinux.patch

@@ -0,0 +1,30 @@
+From 9ef3d30d9b5c6c8dd8fe72d7aaad499fcda6192a Mon Sep 17 00:00:00 2001
+From: wangyueliang <wangyueliang@kylinos.cn>
+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
+

rpm-ostree.spec

@@ -3,21 +3,32 @@
 %global __provides_exclude_from ^%{_libdir}/%{name}/.*$
 
 Name:		rpm-ostree
-Version:	2022.8
-Release:	2
+Version:	2022.16
+Release:	4
 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}
-%define rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x
+%define rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x riscv64 loongarch64 sw_64
 %endif 
 
 ExclusiveArch: %{rust_arches}
 
+%ifarch loongarch64
+Patch1000:  1000-add-loongarch64-support-not-upstream-modified-files.patch
+%endif
+
+%ifarch sw_64
+Patch1001:  1001-add-sw_64-support-not-upstream-modified-files.patch
+%endif
+
 %if %{defined rusttoolset_version}
 BuildRequires: %{rusttoolset_version}-cargo
 %else
@@ -114,14 +125,38 @@ install -pm 0644 src/daemon/org.projectatomic.rpmostree1.conf %{buildroot}/etc/d
 %{_mandir}/man*/*
 
 %changelog
+* Fri Oct 13 2023 wangyueliang <wangyueliang@kylinos.cn> - 2022.16-4
+- merge feature from branch openEuler-22.03-LTS-SP1：
+- DESC: add loongarch64 and sw_64 support
+- AUTHOR: panchenbo <panchenbo@kylinsec.com.cn>
+
+* Mon Sep 18 2023 wangyueliang <wangyueliang@kylinos.cn> - 2022.16-3
+- fix compose error for selinux.
+- add-for-support-NestOS-kernel.
+
+* Fri Aug 04 2023 Jingwiw  <wangjingwei@iscas.ac.cn> - 2022.16-2
+- enable riscv64 architecture
+
+* Mon May 22 2023 duyiwei <duyiwei@kylinos.cn> - 2022.16-1
+- Update rpm-ostree to 2022.16.
+
+* Thu Dec 29 2022 chenmaodong <chenmaodong@xfusion.com> - 2022.8-4
+- Fix has_modules_enable() check
+
+* Mon Oct 10 2022 fushanqing <fushanqing@kylinos.cn> - 2022.8-3
+- add fix-compose-err.patch
+
 * Wed Aug 03 2022 liukuo <liukuo@kylinos.cn> - 2022.8-2
 - License compliance rectification
 
 * Tue Jun 07 2022 fushanqing <fushanqing@kylinos.cn> - 2022.8-1
 - Update rpm-ostree to 2022.8
 
-* Wed Jan 19 2022 SimpleUpdate Robot <tc@openeuler.org> - 2022.1-1
-- Upgrade to version 2022.1
+* Wed May 11 2022 duyiwei <duyiwei@kylinos.cn> - 2022.7-2
+- update URL (projectatomic->coreos)
+
+* Thu Apr 14 2022 yaoxin <yaoxin30@h-partners.com> - 2022.7-1
+- Update rpm-ostree to 2022.7
 
 * Fri Sep 10 2021 gaihuiying <gaihuiying1@huawei.com> - 2018.8-4
 - Type:bugfix