From c59b89b9ce2f80ffa9ba71b0cf4f01adaef114fb Mon Sep 17 00:00:00 2001 From: hy Date: Tue, 31 Mar 2020 15:50:21 +0800 Subject: [PATCH] add packages which are installed on the appliance for openEuler --- ...kages-on-the-appliance-for-openEuler.patch | 57 +++++++++++++++++++ libguestfs.spec | 19 +++++-- 2 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 0000-add-installed-packages-on-the-appliance-for-openEuler.patch diff --git a/0000-add-installed-packages-on-the-appliance-for-openEuler.patch b/0000-add-installed-packages-on-the-appliance-for-openEuler.patch new file mode 100644 index 0000000..934c73a --- /dev/null +++ b/0000-add-installed-packages-on-the-appliance-for-openEuler.patch @@ -0,0 +1,57 @@ +From 11dbce19ad70cea93a48d14982bf020d209d5cd7 Mon Sep 17 00:00:00 2001 +From: hy +Date: Thu, 26 Mar 2020 14:56:37 +0800 +Subject: [PATCH] add packages which are installed on the appliance + +Add packages which are installed on the appliance for openEuler +Signed-off-by: hy +--- + appliance/packagelist.in | 25 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + +diff --git a/appliance/packagelist.in b/appliance/packagelist.in +index 8d2e9d4..d5943ed 100644 +--- a/appliance/packagelist.in ++++ b/appliance/packagelist.in +@@ -11,6 +11,7 @@ dnl ARCHLINUX=1 For Archlinux. + dnl SUSE=1 For OpenSUSE. + dnl FRUGALWARE=1 For Frugalware. + dnl MAGEIA=1 For Mageia. ++dnl OPENEULER=1 For openEuler + dnl + dnl There is also a list of packages which are excluded if they appear + dnl as dependencies of the packages below. See: excludelist.in +@@ -227,6 +228,31 @@ ifelse(MAGEIA,1, + xz + ) + ++ifelse(OPENEULER,1, ++ augeas ++ cryptsetup ++ dhcp ++ genisoimage ++ hivex ++ iproute ++ iputils ++ jansson ++ kernel ++ libcap ++ libldm ++ libtirpc ++ ntfs-3g ++ openssh ++ pcre ++ policycoreutils ++ reiserfs-utils ++ libselinux ++ systemd ++ vim ++ xz ++) ++ + acl + attr + bash +-- +1.8.3.1 + diff --git a/libguestfs.spec b/libguestfs.spec index c34a06d..f9de4f6 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+ @@ -13,6 +13,8 @@ Source0: http://download.libguestfs.org/1.40-stable/libguestfs-1.40.2.tar. Source1: guestfish.sh Source2: yum.conf.in +Patch0000: 0000-add-installed-packages-on-the-appliance-for-openEuler.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 BuildRequires: libselinux-devel, fuse, fuse-devel, pcre-devel, file-devel, libvirt-devel, gperf, flex, bison, libdb-utils, cpio, libconfig-devel, xz-devel @@ -194,8 +196,6 @@ if [ "$(stat -f -L -c %T .)" != "nfs" ] && [ "$(getenforce | tr '[A-Z]' '[a-z]') chcon --reference=/tmp tmp fi -sed -i 's/FEDORA | RHEL | CENTOS)/FEDORA | RHEL | CENTOS | EULEROS | GENERIC)/g' configure - %build ip addr list ||: ip route list ||: @@ -203,7 +203,12 @@ 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 + if [ -e "/.pkgs" ]; then + dir="/.pkgs" + else + dir="/" + fi + find $dir -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 @@ -419,6 +424,12 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/ %exclude %{_mandir}/man1/virt-tar.1* %changelog +* Thu Mar 26 2020 hy - 1:1.40.2-7 +- Type:NA +- ID:NA +- SUG:NA +- DESC: add packages which are installed on the appliance for openEuler and modify the packages found dir. + * Tue Mar 10 2020 yangjian - 1:1.40.2-6 - Type:NA - ID:NA -- Gitee