diff options
| author | Ian Bashford <ianbashford@gmail.com> | 2019-12-11 18:49:19 +0000 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-12-12 00:38:34 +0100 |
| commit | 16f328d6e4a9bc97cd6810da641287cb1921a6d9 (patch) | |
| tree | 2d20e9936241a6e2fdd21fd19dedf108b2e43c2b /community/xe-guest-utilities | |
| parent | b4972dff2108f6df570037095ed6ba03416f7706 (diff) | |
| download | aports-16f328d6e4a9bc97cd6810da641287cb1921a6d9.tar.bz2 aports-16f328d6e4a9bc97cd6810da641287cb1921a6d9.tar.xz | |
community/xe-guest-utilities upgrade to 7.17.0
Upgrade to 7.17.0
Patch to xe-linux-distribution to work with alpine and reduce log messages
Diffstat (limited to 'community/xe-guest-utilities')
| -rw-r--r-- | community/xe-guest-utilities/APKBUILD | 23 | ||||
| -rw-r--r-- | community/xe-guest-utilities/detect_distribution.patch | 37 |
2 files changed, 48 insertions, 12 deletions
diff --git a/community/xe-guest-utilities/APKBUILD b/community/xe-guest-utilities/APKBUILD index 3308366402..e26c3f3464 100644 --- a/community/xe-guest-utilities/APKBUILD +++ b/community/xe-guest-utilities/APKBUILD @@ -1,30 +1,28 @@ # Contributor: Ian Bashford <ianbashford@gmail.com> # Maintainer: Ian Bashford <ianbashford@gmail.com> pkgname=xe-guest-utilities -pkgver=7.16.0 -pkgrel=1 +pkgver=7.17.0 +pkgrel=0 pkgdesc="XenServer guest tools" url="https://github.com/xenserver/xe-guest-utilities" arch="x86 x86_64 aarch64" license="BSD-2-Clause" makedepends="go udev" -subpackages="${pkgname}-udev:udev:noarch $pkgname-openrc" +subpackages="$pkgname-udev:udev:noarch $pkgname-openrc" options="!check" -source="${pkgname}-${pkgver}.tar.gz::https://github.com/xenserver/${pkgname}/archive/v${pkgver}.tar.gz +source="$pkgname-$pkgver.tar.gz::https://github.com/xenserver/xe-guest-utilities/archive/v$pkgver.tar.gz $pkgname.initd + detect_distribution.patch " -builddir="$srcdir"/$pkgname-$pkgver - build() { - cd "$builddir" go get golang.org/x/sys/unix make } package() { mkdir -p "$pkgdir" - cp -ar "${builddir}/build/stage/usr/" "$pkgdir/" + cp -ar "$builddir/build/stage/usr/" "$pkgdir/" install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname } @@ -33,10 +31,11 @@ udev() { depends="udev" udev_dir="etc/udev/rules.d" - mkdir -p "${subpkgdir}/${udev_dir}" + mkdir -p "$subpkgdir/$udev_dir" filename="z10_xen-vcpu-hotplug.rules" - install -m644 -D "${builddir}/build/stage/${udev_dir}/${filename}" "${subpkgdir}/${udev_dir}/${filename}" + install -m644 -D "$builddir/build/stage/$udev_dir/$filename" "$subpkgdir/$udev_dir/$filename" } -sha512sums="1055b78b4229fe1826a6f5c62d351d727c633e58295a7f4612c71e4e49634f28e7cb3f687c63111ca0f17a14059f02636c9481a5d3750f1a6de1e9ea7c308394 xe-guest-utilities-7.16.0.tar.gz -3e898b473f6e71ecc5b820717df0a460b31756b68f4bb9bf454df39f430e64ca5e33582c03bfea044d93f49937883fe9b6807c31dee72307750de670bfca8bcd xe-guest-utilities.initd" +sha512sums="fd5772cf7fb607edaf58bc92ae3d17a2ddf1de8465842c9ec83e97ab13a5c0c0d4c3efbb3381ebb8c584f2b30fcc1d328aed6b726eb870b29aa3fae8379e74ee xe-guest-utilities-7.17.0.tar.gz +3e898b473f6e71ecc5b820717df0a460b31756b68f4bb9bf454df39f430e64ca5e33582c03bfea044d93f49937883fe9b6807c31dee72307750de670bfca8bcd xe-guest-utilities.initd +bcb9e25a285683f5136e025e765b8744eb6f6cc5ba7e5e6832a351bc5a0a647b627bdecda6fd22f0d9d624fdd503357f19904da794a988be8108421f57daa5a0 detect_distribution.patch" diff --git a/community/xe-guest-utilities/detect_distribution.patch b/community/xe-guest-utilities/detect_distribution.patch new file mode 100644 index 0000000000..39b9df859a --- /dev/null +++ b/community/xe-guest-utilities/detect_distribution.patch @@ -0,0 +1,37 @@ +diff --git a/./mk/xe-linux-distribution b/./mk/xe-linux-distribution.new +index dc35b2bcbd..a8b1d5899f 100755 +--- a/./mk/xe-linux-distribution ++++ b/./mk/xe-linux-distribution +@@ -462,6 +462,24 @@ identify_boot2docker() + + } + ++identify_alpine() ++{ ++ # only tested with Alpine 3.7+ ++ alpine_release="$1" ++ local major ++ local minor ++ ++ if [ ! -f "${alpine_release}" ]; then ++ return 1 ++ fi ++ ++ major=$(awk -F. '{printf("%s", $1)}' ${alpine_release}) ++ minor=$(awk -F. '{printf("%s.%s", $2, $3)}' ${alpine_release}) ++ ++ write_to_output "alpine" "${major}" "${minor}" "Alpine Linux $(head -n 1 ${alpine_release})" ++} ++ ++ + if [ $# -eq 1 ] ; then + exec 1>"$1" + fi +@@ -484,6 +502,7 @@ if [ -z "${TEST}" ] ; then + identify_lsb lsb_release && exit 0 + identify_debian /etc/debian_version && exit 0 + identify_boot2docker /etc/boot2docker && exit 0 ++ identify_alpine /etc/alpine-release && exit 0 + + + if [ $# -eq 1 ] ; then |