diff --git a/kiwi-9.24.1.tar.gz b/kiwi-9.24.1.tar.gz deleted file mode 100644 index 6fb3284..0000000 Binary files a/kiwi-9.24.1.tar.gz and /dev/null differ diff --git a/kiwi-9.25.1.tar.gz b/kiwi-9.25.1.tar.gz new file mode 100644 index 0000000..67323c6 Binary files /dev/null and b/kiwi-9.25.1.tar.gz differ diff --git a/kiwi.spec b/kiwi.spec index 51246de..e8bf906 100644 --- a/kiwi.spec +++ b/kiwi.spec @@ -1,7 +1,7 @@ %{?python_enable_dependency_generator} Name: kiwi -Version: 9.24.1 +Version: 9.25.1 Release: 1 License: GPLv3+ Summary: Flexible operating system image builder @@ -163,6 +163,7 @@ done %license LICENSE %{_bindir}/%{name}* %{python3_sitelib}/%{name}*/ +%exclude %{_bindir}/kiwi-parse-verity %files tools %defattr(-,root,root) @@ -174,6 +175,7 @@ done %{_bindir}/%{name}* %{_datadir}/bash-completion/completions/%{name}-ng %config(noreplace) %{_sysconfdir}/kiwi.yml +%exclude %{_bindir}/kiwi-parse-verity %ifarch %{ix86} x86_64 %files pxeboot @@ -192,6 +194,9 @@ done %{_mandir}/man8/%{name}* %changelog +* Tue Oct 24 2023 yanglongkang - 9.25.1-1 +- update version to 9.25.1 + * Thu Jul 20 2023 yanglongkang - 9.24.1-1 - update version to 9.24.1 diff --git a/openEuler-custom-make.patch b/openEuler-custom-make.patch index 62f4d19..8f4bf42 100644 --- a/openEuler-custom-make.patch +++ b/openEuler-custom-make.patch @@ -134,7 +134,7 @@ index 5b26798..30d30bc 100644 self, mbrid: Optional[SystemIdentifier] = None, @@ -169,15 +177,16 @@ class BootImageKiwi(BootImageBase): data.sync_data( - options=['-a'] + options=Defaults.get_sync_options() ) - boot_directory = temp_boot_root_directory + '/boot' - Path.wipe(boot_directory)