diff options
Diffstat (limited to 'main/libvirt')
| -rw-r--r-- | main/libvirt/APKBUILD | 20 | ||||
| -rw-r--r-- | main/libvirt/hugepages.patch | 32 |
2 files changed, 8 insertions, 44 deletions
diff --git a/main/libvirt/APKBUILD b/main/libvirt/APKBUILD index e6e01fbe1e..645fd8261b 100644 --- a/main/libvirt/APKBUILD +++ b/main/libvirt/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=libvirt -pkgver=1.2.7 +pkgver=1.2.8 _ver="${pkgver/_rc/-rc}" -pkgrel=1 +pkgrel=0 pkgdesc="A virtualization API for several hypervisor and container systems" url="http://libvirt.org/" arch="all" @@ -26,7 +26,6 @@ source="http://libvirt.org/sources/$pkgname-$pkgver.tar.gz libvirt.confd libvirt.initd musl-fix-includes.patch - hugepages.patch " if [ "$CARCH" = "x86_64" ]; then @@ -167,18 +166,15 @@ _common_drivers() { "$subpkgdir"/etc/libvirt/ } -md5sums="d556b3d815a222fd9680f9f3948595cb libvirt-1.2.7.tar.gz +md5sums="75114991290f7c8f01dd5223431b9c00 libvirt-1.2.8.tar.gz 1c84a7baeafe0a7f4e9d7ae5180311b7 libvirt.confd d897df38c7e7fa1a297aa551108633c9 libvirt.initd -9da7723b114b2d87558e92828366fbcb musl-fix-includes.patch -599ef898efc6ccd84eea5adb9ff027aa hugepages.patch" -sha256sums="3dfb462cba1188d2c9ba700e1927fa0dbd71f20afdf81ab0c43b27b7fe77defc libvirt-1.2.7.tar.gz +9da7723b114b2d87558e92828366fbcb musl-fix-includes.patch" +sha256sums="0049940b013ea5858b53d9b540c9df9cc3c8cb08750acfd96e9991a1f709e100 libvirt-1.2.8.tar.gz 851ab3f9678f0fa9c3ee03f7fc7bd00c4ee86d5f0777eecf9eb1ffe3243adfd1 libvirt.confd e9fad203434ffaa6afe524e42a9fb6594edad61cb02b1ca60a68d1a7fe0c31ab libvirt.initd -8dfa9dbe71ee21dc53e44bd7cc0127adde1bf3371d6b393657b386bb83f8139b musl-fix-includes.patch -39560b4e879422ee1579575246b591d164e4c5a5107a0458e6a67ef049d15138 hugepages.patch" -sha512sums="de923e56c1ebd43ff208d219cab1422a5f9bcc0b2c55893bafc23441928af5a530f5abe4cd65893d91e83fa090455ed0e376f41d459caa41b03d1b7210e9d876 libvirt-1.2.7.tar.gz +8dfa9dbe71ee21dc53e44bd7cc0127adde1bf3371d6b393657b386bb83f8139b musl-fix-includes.patch" +sha512sums="ec9b661d0d861827d3224a3ba967586b6d5af8f0af3b339e8db5d2b9a28acd4f8af4f44e5409af58955fc3832a3f7e8e61586fb328bcbdeeaf30ed5cc32cb988 libvirt-1.2.8.tar.gz 9aba6ab73219a635c64a340ee8887356e644445c9128734cbce73f5d54778378da2f10a190365ad88a7db8bc95b1fb17f0c6ca41fc41bb786c09e1afe84d65dc libvirt.confd f48c97f93ef4509a86eda6200b3aae5b2c0c6263403bde933b770fd62240dca27bc439bd29b440ea6a47c8337f8b4511230ed915cb5ff54d9a1cf311863f6fa1 libvirt.initd -b6142256bf2700b9e5335c60fe5628e4095a24689c31d54afcab46f46a06b9c0ae676f87f77a487377eafbec11fb7afa9b994aef48a10a39e82f47c45df008ba musl-fix-includes.patch -cc33cdb7af3b44802c3ecbc24c25ec8cb38c5fed8dd78dd1c0f2091dc73c7ec6e062031aa9b4cd564d70ca02278b53ee2f8d8d580667ee8c11e0c1e692d37d8e hugepages.patch" +b6142256bf2700b9e5335c60fe5628e4095a24689c31d54afcab46f46a06b9c0ae676f87f77a487377eafbec11fb7afa9b994aef48a10a39e82f47c45df008ba musl-fix-includes.patch" diff --git a/main/libvirt/hugepages.patch b/main/libvirt/hugepages.patch deleted file mode 100644 index 954dce847c..0000000000 --- a/main/libvirt/hugepages.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/src/util/virfile.c b/src/util/virfile.c -index 9863fd0..7046614 100644 ---- a/src/util/virfile.c -+++ b/src/util/virfile.c -@@ -2953,9 +2953,8 @@ virFileGetDefaultHugepageSize(unsigned long long *size) - goto cleanup; - - if (!(c = strstr(meminfo, HUGEPAGESIZE_STR))) { -- virReportError(VIR_ERR_INTERNAL_ERROR, -- _("Unable to parse %s"), -- PROC_MEMINFO); -+ virReportError(VIR_ERR_NO_SUPPORT, -+ _("Hugepage support not enabled in kernel")); - goto cleanup; - } - c += strlen(HUGEPAGESIZE_STR); -@@ -2993,13 +2992,13 @@ virFileFindHugeTLBFS(virHugeTLBFSPtr *ret_fs, - unsigned long long default_hugepagesz; - - if (virFileGetDefaultHugepageSize(&default_hugepagesz) < 0) -- goto cleanup; -+ return ret; - - if (!(f = setmntent(PROC_MOUNTS, "r"))) { - virReportSystemError(errno, - _("Unable to open %s"), - PROC_MOUNTS); -- goto cleanup; -+ return ret; - } - - while (getmntent_r(f, &mb, mntbuf, sizeof(mntbuf))) { |