packages/libguestfs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!33 Enable appliance

Browse Source 
From: @maminjie
Reviewed-by: @zhanghua1831,@small_leek
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2020-12-25 14:57:26 +08:00 committed by Gitee
commit 2a7cf5e72f
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libguestfs.spec
View File

@ -4,7 +4,7 @@
Name: libguestfs Name: libguestfs
Version: 1.40.2 Version: 1.40.2
Release: 9 Release: 10
Epoch: 1 Epoch: 1
Summary: A set of tools for accessing and modifying virtual machine (VM) disk images Summary: A set of tools for accessing and modifying virtual machine (VM) disk images
License: LGPLv2+ License: LGPLv2+
@ -27,7 +27,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: 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: 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: 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 BuildRequires: systemd, tar, udev, util-linux, vim-minimal, which, xfsprogs, yajl, zerofree, hfsplus-tools, ntfs-3g, ntfsprogs gettext-devel
%ifarch x86_64 %ifarch x86_64
BuildRequires: syslinux syslinux-extlinux BuildRequires: syslinux syslinux-extlinux
%endif %endif
@ -203,15 +203,11 @@ ip route list ||:
if ping -c 3 -w 20 8.8.8.8 && wget http://libguestfs.org -O /dev/null; then if ping -c 3 -w 20 8.8.8.8 && wget http://libguestfs.org -O /dev/null; then
extra= extra=
else else
if [ ! -d "/.pkgs" ];then mkdir cachedir repo
extra= find /var/cache/{dnf,yum} -type f -name '*.rpm' -print0 | xargs -0 -n 1 cp -t repo
else createrepo repo
install -d cachedir repo sed -e "s|@PWD@|$(pwd)|" %{SOURCE2} > yum.conf
find /.pkgs/ -type f -name '*.rpm' -print0 | xargs -0 -n 1 cp -t repo extra=--with-supermin-packager-config=$(pwd)/yum.conf
createrepo repo
sed -e "s|@PWD@|$(pwd)|" %{SOURCE2} > yum.conf
extra=--with-supermin-packager-config=$(pwd)/yum.conf
fi
fi fi
%global localconfigure \ %global localconfigure \
@ -220,7 +216,7 @@ fi
--with-extra="libvirt" \\\ --with-extra="libvirt" \\\
--without-java \\\ --without-java \\\
$extra $extra
%global localconfigure %{localconfigure} --disable-golang --disable-appliance %global localconfigure %{localconfigure} --disable-golang
%global localmake \ %global localmake \
make -j1 -C builder index-parse.c \ make -j1 -C builder index-parse.c \
@ -308,6 +304,7 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/
%{_libdir}/libguestfs.so %{_libdir}/libguestfs.so
%{_includedir}/guestfs.h %{_includedir}/guestfs.h
%{_libdir}/pkgconfig/libguestfs.pc %{_libdir}/pkgconfig/libguestfs.pc
%{_sbindir}/libguestfs-make-fixed-appliance
%files -n ocaml-%{name} %files -n ocaml-%{name}
%{_libdir}/ocaml/guestfs %{_libdir}/ocaml/guestfs
@ -378,6 +375,9 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/
%exclude %{_mandir}/man1/virt-tar.1* %exclude %{_mandir}/man1/virt-tar.1*
%changelog %changelog
* Wed Dec 16 2020 maminjie <maminjie1@huawei.com> - 1:1.40.2-10
- Enable appliance that is necessary
* Tue Jul 21 2020 sunguoshuai <sunguoshuai@huawei.com> - 1:1.40.2-9 * Tue Jul 21 2020 sunguoshuai <sunguoshuai@huawei.com> - 1:1.40.2-9
- Del the optimization for xfs, which can lead to du and find command aborted. - Del the optimization for xfs, which can lead to du and find command aborted.