From 89e3bb49e81dba1b05a018cc1d0e74353b2c6b62 Mon Sep 17 00:00:00 2001 From: lizhenhua Date: Tue, 26 May 2020 16:50:13 +0800 Subject: [PATCH 1/3] Add yaml file --- libguestfs.spec | 14 +++++++++----- libguestfs.yaml | 4 ++++ 2 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 libguestfs.yaml diff --git a/libguestfs.spec b/libguestfs.spec index c34a06d..ebc6c0d 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -202,11 +202,15 @@ ip route list ||: if ping -c 3 -w 20 8.8.8.8 && wget http://libguestfs.org -O /dev/null; then extra= else - install -d cachedir repo - find /.pkgs/ -type f -name '*.rpm' -print0 | xargs -0 -n 1 cp -t repo - createrepo repo - sed -e "s|@PWD@|$(pwd)|" %{SOURCE2} > yum.conf - extra=--with-supermin-packager-config=$(pwd)/yum.conf + if [ ! -d "/.pkgs" ];then + extra= + else + install -d cachedir repo + find /.pkgs/ -type f -name '*.rpm' -print0 | xargs -0 -n 1 cp -t repo + createrepo repo + sed -e "s|@PWD@|$(pwd)|" %{SOURCE2} > yum.conf + extra=--with-supermin-packager-config=$(pwd)/yum.conf + fi fi %global localconfigure \ diff --git a/libguestfs.yaml b/libguestfs.yaml new file mode 100644 index 0000000..be83263 --- /dev/null +++ b/libguestfs.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: libguestfs/libguestfs +tag_prefix: ^v +seperator: . -- Gitee From bb13c6ad1470f5c24438d154e6c02aa5b392e8c9 Mon Sep 17 00:00:00 2001 From: lizhenhua Date: Tue, 26 May 2020 17:41:38 +0800 Subject: [PATCH 2/3] modify spec file --- libguestfs.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index ebc6c0d..032932d 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -202,15 +202,13 @@ ip route list ||: if ping -c 3 -w 20 8.8.8.8 && wget http://libguestfs.org -O /dev/null; then extra= else - if [ ! -d "/.pkgs" ];then - extra= - else - install -d cachedir repo + install -d cachedir repo + if [ -d "/.pkgs" ];then find /.pkgs/ -type f -name '*.rpm' -print0 | xargs -0 -n 1 cp -t repo - createrepo repo - sed -e "s|@PWD@|$(pwd)|" %{SOURCE2} > yum.conf - extra=--with-supermin-packager-config=$(pwd)/yum.conf fi + createrepo repo + sed -e "s|@PWD@|$(pwd)|" %{SOURCE2} > yum.conf + extra=--with-supermin-packager-config=$(pwd)/yum.conf fi %global localconfigure \ -- Gitee From 358be3e08d31fa553d73ee719a4d680b318e87e4 Mon Sep 17 00:00:00 2001 From: lizhenhua Date: Fri, 29 May 2020 19:44:42 +0800 Subject: [PATCH 3/3] disable appliance --- libguestfs.spec | 67 ++++++++++--------------------------------------- 1 file changed, 13 insertions(+), 54 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index 032932d..c511e7a 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -4,7 +4,7 @@ Name: libguestfs Version: 1.40.2 -Release: 6 +Release: 7 Epoch: 1 Summary: A set of tools for accessing and modifying virtual machine (VM) disk images License: LGPLv2+ @@ -202,13 +202,15 @@ ip route list ||: if ping -c 3 -w 20 8.8.8.8 && wget http://libguestfs.org -O /dev/null; then extra= else - install -d cachedir repo - if [ -d "/.pkgs" ];then + if [ ! -d "/.pkgs" ];then + extra= + else + install -d cachedir repo find /.pkgs/ -type f -name '*.rpm' -print0 | xargs -0 -n 1 cp -t repo + createrepo repo + sed -e "s|@PWD@|$(pwd)|" %{SOURCE2} > yum.conf + extra=--with-supermin-packager-config=$(pwd)/yum.conf fi - createrepo repo - sed -e "s|@PWD@|$(pwd)|" %{SOURCE2} > yum.conf - extra=--with-supermin-packager-config=$(pwd)/yum.conf fi %global localconfigure \ @@ -217,7 +219,7 @@ fi --with-extra="libvirt" \\\ --without-java \\\ $extra -%global localconfigure %{localconfigure} --disable-golang +%global localconfigure %{localconfigure} --disable-golang --disable-appliance %global localmake \ make -j1 -C builder index-parse.c \ @@ -235,17 +237,6 @@ cd - %check -%ifarch x86_64 -export LIBGUESTFS_DEBUG=1 -export LIBGUESTFS_TRACE=1 -export LIBVIRT_DEBUG=1 - -if ! make quickcheck QUICKCHECK_TEST_TOOL_ARGS="-t 1200"; then - cat $HOME/.cache/libvirt/qemu/log/* - exit 1 -fi -%endif - %install gzip -9 ChangeLog @@ -266,41 +257,7 @@ find $RPM_BUILD_ROOT -name 'bindtests.pl' -delete mv $RPM_BUILD_ROOT%{_docdir}/libguestfs installed-docs gzip --best installed-docs/*.xml -cd $RPM_BUILD_ROOT%{_libdir}/guestfs/supermin.d -function move_to -{ - if ! grep -Esq "^$1$" packages; then - echo "move_to $1: package name not found in packages file" - fi - grep -Ev "^$1$" < packages > packages-t - mv packages-t packages - echo "$1" >> "$2" -} -move_to curl zz-packages-dib -move_to debootstrap zz-packages-dib -move_to kpartx zz-packages-dib -move_to qemu-img zz-packages-dib -move_to which zz-packages-dib -move_to sleuthkit zz-packages-forensics -move_to gfs2-utils zz-packages-gfs2 -move_to hfsplus-tools zz-packages-hfsplus -move_to jfsutils zz-packages-jfs -move_to nilfs-utils zz-packages-nilfs -move_to reiserfs-utils zz-packages-reiserfs -move_to iputils zz-packages-rescue -move_to lsof zz-packages-rescue -move_to openssh-clients zz-packages-rescue -move_to pciutils zz-packages-rescue -move_to strace zz-packages-rescue -move_to vim-minimal zz-packages-rescue -move_to rsync zz-packages-rsync -move_to xfsprogs zz-packages-xfs - - -sed 's/^kernel-.*/kernel/' < packages > packages-t -mv packages-t packages -cd - - +install -d $RPM_BUILD_ROOT%{_libdir}/guestfs install -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d @@ -348,7 +305,6 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/ %files devel %{_libdir}/libguestfs.so -%{_sbindir}/libguestfs-make-fixed-appliance %{_includedir}/guestfs.h %{_libdir}/pkgconfig/libguestfs.pc @@ -421,6 +377,9 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/ %exclude %{_mandir}/man1/virt-tar.1* %changelog +* Fri May 29 2020 lizhenhua - 1:1.40.2-7 +- Disable appliance + * Tue Mar 10 2020 yangjian - 1:1.40.2-6 - Type:NA - ID:NA -- Gitee