From b74122fd840ae87d52119a02b82dfb06274614431d8f9492f009fb1e76c1c17b Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 9 Jan 2024 23:04:21 +0000 Subject: [PATCH 1/2] Add -p flag to mkdir in case re-using sandbox. OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=563 --- libguestfs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libguestfs.spec b/libguestfs.spec index 9d3a73a..33175ad 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -97,7 +97,7 @@ sed -i 's/tar zcf/tar -zcf/' appliance/Makefile.am # provide a wrapper to tar that creates bit-reproducible output (boo#1218191) # used in supermin for base.tar.gz, in %install for zz-winsupport.tar.gz zz-scripts.tar.gz and in appliance/Makefile.am for 3 more .tar.gz files SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH:-$(date -r %{SOURCE0} +%%s)} -mkdir ~/bin ; cat >~/bin/tar <~/bin/tar < Date: Thu, 11 Jan 2024 22:57:43 +0000 Subject: [PATCH 2/2] - Copy sorted packagelist to packages during supermin appliance setup. (bsc#1215586) libguestfs.spec OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=564 --- libguestfs.changes | 7 +++++++ libguestfs.spec | 2 ++ 2 files changed, 9 insertions(+) diff --git a/libguestfs.changes b/libguestfs.changes index f90cb8a..8f3efa6 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 11 15:45:00 MST 2024 - carnold@suse.com + +- Copy sorted packagelist to packages during supermin appliance + setup. (bsc#1215586) + libguestfs.spec + ------------------------------------------------------------------- Thu Jan 4 13:10:51 MST 2024 - carnold@suse.com diff --git a/libguestfs.spec b/libguestfs.spec index 33175ad..8967e8c 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -223,6 +223,8 @@ find %{buildroot}/ -name "*.bs" -size 0c -print -delete # OCaml %ocaml_create_file_list # Supermin +# Use RPMs from packagelist for the packages file. Sort and clean leading whitespace. +sort -u appliance/packagelist | awk '{$1=$1};1' > %buildroot%_libdir/guestfs/supermin.d/packages pushd $RPM_BUILD_ROOT%{_libdir}/guestfs/supermin.d function remove