同步master分支pr

fix-nestos-installer-iso-command-error.patch

@@ -0,0 +1,12 @@
+--- nestos-installer-v0.14.0/src/iso9660.rs	2022-06-14 16:41:41.000000000 +0800
++++ nestos-installer-v0.14.0-new/src/iso9660.rs	2022-08-23 13:42:03.469259308 +0800
+@@ -120,6 +120,9 @@ impl IsoFs {
+             .with_context(|| format!("listing directory {}", dir.name))?
+         {
+             let record = record?;
++            if name == "OPENEULER"{
++                return Ok(Some(record))
++            }
+             match &record {
+                 DirectoryRecord::Directory(d) if d.name == name => return Ok(Some(record)),
+                 DirectoryRecord::File(f) if f.name == name => return Ok(Some(record)),

nestos-installer.spec

@@ -9,8 +9,8 @@
 %global crate nestos-installer
 
 Name:           rust-nestos-installer
-Version:        0.10.0
-Release:        2
+Version:        0.16.0
+Release:        1
 Summary:        Installer for NestOS
 
 # Upstream license specification: Apache-2.0
@@ -18,9 +18,9 @@ License:        ASL 2.0
 URL:            https://gitee.com/openeuler/nestos-installer
 Source0:        https://gitee.com/openeuler/nestos-installer/repository/archive/v%{version}.tar.gz
 Source1:        %{crate}-%{version}-vendor.tar.gz
+Patch01:        fix-nestos-installer-iso-command-error.patch 
 
-
-BuildRequires:  rust-packaging openssl-devel
+BuildRequires:  rust-packaging openssl-devel zstd-devel
 BuildRequires:  systemd
 
 %global _description %{expand:
@@ -38,15 +38,6 @@ Requires:       gnupg
 Requires:       kpartx
 Requires:       systemd-udev
 Requires:       util-linux
-%ifarch s390x
-# This should be spelled "s390utils-core" but some of the binaries are
-# still moving over from s390utils-base
-Requires:       /usr/sbin/chreipl
-Requires:       /usr/sbin/dasdfmt
-Requires:       /usr/sbin/fdasd
-Requires:       /usr/sbin/lszdev
-Requires:       /usr/sbin/zipl
-%endif
 
 # Since `rust-nestos-installer` creates a `nestos-installer`
 # subpackage with a newer version number, which supersedes the
@@ -65,7 +56,8 @@ Obsoletes:      nestos-installer-dracut < 0.0.1
 
 %prep
 %autosetup -n %{crate}-v%{version} -p1
-tar xvf %{SOURCE1}
+mkdir -p vendor
+tar xvf %{SOURCE1} -C vendor
 %cargo_prep
 sed -i 's/"-Ccodegen-units=1",//' .cargo/config
 
@@ -119,6 +111,15 @@ This subpackage contains boot-time infrastructure for NestOS.  It is not needed
 
 
 %changelog
+* Wed Nov 16 2022 fushanqing <fushanqing@kylinos.cn> - 0.16.0-1
+- update to 0.16.0
+
+* Tue Aug 23 2022 fushanqing <fushanqing@kylinos.cn> - 0.14.0-2
+- fix 'nestos-installer iso' command error
+
+* Mon Jun 13 2022 duyiwei <duyiwei@kylinos.cn> - 0.14.0-1
+- upgrade to 0.14.0
+
 * Wed Jun 08 2022 duyiwei <duyiwei@kylinos.cn> - 0.10.0-2
 - change tar.gz to be the same with upstream