diff --git a/fix-not-striped.patch b/fix-not-striped.patch new file mode 100644 index 0000000000000000000000000000000000000000..9c9b9d3569875dd2e8220a30c881c9a6928e0155 --- /dev/null +++ b/fix-not-striped.patch @@ -0,0 +1,37 @@ +From 77c67d0e597f5408c3d005ef624ef3d417271e0e Mon Sep 17 00:00:00 2001 +From: sunguoshuai +Date: Thu, 9 Sep 2021 21:34:40 +0800 +Subject: [PATCH] fix not striped + +--- + appliance/Makefile.am | 1 + + p2v/Makefile.am | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/appliance/Makefile.am b/appliance/Makefile.am +index fc424b1..3f74636 100644 +--- a/appliance/Makefile.am ++++ b/appliance/Makefile.am +@@ -92,6 +92,7 @@ supermin.d/daemon.tar.gz: ../daemon/guestfsd guestfs_shadow.aug + mkdir -p tmp-d$(DAEMON_SUPERMIN_DIR) tmp-d/etc tmp-d/usr/share/guestfs + ln ../daemon/guestfsd tmp-d$(DAEMON_SUPERMIN_DIR)/guestfsd + ln $(srcdir)/guestfs_shadow.aug tmp-d/usr/share/guestfs/guestfs_shadow.aug ++ strip tmp-d/usr/sbin/guestfsd + ( cd tmp-d && tar zcf - * ) > $@-t + rm -r tmp-d + mv $@-t $@ +diff --git a/p2v/Makefile.am b/p2v/Makefile.am +index 92e2c50..a101d22 100644 +--- a/p2v/Makefile.am ++++ b/p2v/Makefile.am +@@ -75,6 +75,7 @@ virtp2vlib_DATA = virt-p2v.xz + + virt-p2v.xz: virt-p2v + rm -f $@ $@-t ++ strip $< + xz --best --keep --stdout $< > $@-t + mv $@-t $@ + +-- +2.30.0 + diff --git a/libguestfs.spec b/libguestfs.spec index aa5ba54e5cf5a17dfbeb75e3ce495ca70062cc6a..9079172dbc5f8bbc4138c5f0d9713d1bbceb8a4e 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -4,7 +4,7 @@ Name: libguestfs Version: 1.40.2 -Release: 14 +Release: 15 Epoch: 1 Summary: A set of tools for accessing and modifying virtual machine (VM) disk images License: LGPLv2+ @@ -15,6 +15,7 @@ Source2: yum.conf.in Patch0000: 0001-libguestfs-PYTHON_LIBS-is-not-set-in-Python-3.8.patch Patch0001: 0002-fts-remove-NOSTAT_LEAF_OPTIMIZATION.patch Patch0002: 0003-port-to-php-8.0.0.patch +Patch0003: fix-not-striped.patch BuildRequires: gcc-c++, rpcgen, libtirpc-devel, supermin-devel >= 5.1.18, hivex-devel >= 1.2.7-7, ocaml-hivex-devel, perl(Pod::Simple), perl(Pod::Man) BuildRequires: /usr/bin/pod2text, po4a, augeas-devel >= 1.7.0, readline-devel, genisoimage, libxml2-devel, createrepo, glibc-static, libselinux-utils @@ -29,7 +30,7 @@ BuildRequires: jpackage-utils, php-devel, gobject-introspection-devel, gjs, acl, BuildRequires: bzip2, coreutils, cpio, cryptsetup, debootstrap, dhclient, diffutils, dosfstools, e2fsprogs, file, findutils, gawk, gdisk, gfs2-utils BuildRequires: grep, gzip, hivex, iproute, iputils, jfsutils, kernel, kmod, kpartx, less, libcap, libldm, libselinux, libxml2, lsof, lsscsi, lvm2, strace BuildRequires: openssh-clients, parted, pciutils, pcre, policycoreutils, procps, psmisc, qemu-img, reiserfs-utils, rsync, scrub, sed, sleuthkit, squashfs-tools -BuildRequires: systemd, tar, udev, util-linux, vim-minimal, which, xfsprogs, yajl, zerofree, hfsplus-tools, ntfs-3g, ntfsprogs gettext-devel +BuildRequires: systemd, tar, udev, util-linux, vim-minimal, which, xfsprogs, yajl, zerofree, hfsplus-tools, ntfs-3g, ntfsprogs gettext-devel binutils %ifarch x86_64 BuildRequires: syslinux syslinux-extlinux %endif @@ -367,7 +368,10 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/ %exclude %{_mandir}/man1/virt-tar.1* %changelog -* Tue 20 Jul 2021 sunguoshuai - 1:1.40.2-14 +* Thu Sep 09 2021 sunguoshuai - 1:1.40.2-15 +- Fix not striped in some binaries + +* Tue Jul 20 2021 sunguoshuai - 1:1.40.2-14 - No /var/cache/yum in build environment and add test incase no cached rpms. * Mon Mar 22 2021 lingsheng - 1:1.40.2-14