diff options
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/xe-guest-utilities/Makefile | 13 | ||||
-rw-r--r-- | sysutils/xe-guest-utilities/distinfo | 4 | ||||
-rw-r--r-- | sysutils/xe-guest-utilities/patches/patch-xe-update-guest-attrs | 40 |
3 files changed, 37 insertions, 20 deletions
diff --git a/sysutils/xe-guest-utilities/Makefile b/sysutils/xe-guest-utilities/Makefile index 68990a09da1..73d25a538ab 100644 --- a/sysutils/xe-guest-utilities/Makefile +++ b/sysutils/xe-guest-utilities/Makefile @@ -1,14 +1,15 @@ -# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:38 jperkin Exp $ +# $NetBSD: Makefile,v 1.12 2018/10/26 09:15:06 sborrill Exp $ # +# Values from XenServer 7.0 = 7, 0, 0, 125243 # Values from XenServer 6.5.0 = 6, 5, 0, 90977 # Values from XenServer 6.0.2 = 6, 0, 2, 52898 # Values from XenServer 6.0 = 6, 0, 0, 50560 # Values from XenServer 5.6 SP2 = 5, 6, 100, 39153 -XENMAJOR= 6 -XENMINOR= 5 +XENMAJOR= 7 +XENMINOR= 0 XENTEENY= 0 -XENBUILD= 90977 +XENBUILD= 125243 VERSION= ${XENMAJOR}.${XENMINOR}.${XENTEENY} DISTNAME= xe-guest-utilities_5.6.0-595 @@ -34,13 +35,13 @@ NO_BUILD= yes RCD_SCRIPTS= xenguest SUBST_CLASSES+= paths -SUBST_STAGE.paths= pre-configure +SUBST_STAGE.paths= pre-install SUBST_FILES.paths= ${SRCFILES} SUBST_SED.paths= -e "s,@VARBASE@,${VARBASE},g" SUBST_SED.paths+= -e "s,@PREFIX@,${PREFIX},g" SUBST_CLASSES+= version -SUBST_STAGE.version= pre-configure +SUBST_STAGE.version= pre-install SUBST_FILES.version= xe-update-guest-attrs SUBST_SED.version= -e "s,@XENMAJOR@,${XENMAJOR},g" SUBST_SED.version+= -e "s,@XENMINOR@,${XENMINOR},g" diff --git a/sysutils/xe-guest-utilities/distinfo b/sysutils/xe-guest-utilities/distinfo index 12f59aba490..9a41e2af89d 100644 --- a/sysutils/xe-guest-utilities/distinfo +++ b/sysutils/xe-guest-utilities/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2015/11/04 01:32:39 agc Exp $ +$NetBSD: distinfo,v 1.5 2018/10/26 09:15:06 sborrill Exp $ SHA1 (xe-guest-utilities_5.6.0-595.tar.gz) = 7373f2cc37ba3761ee92051513e09787371eb77e RMD160 (xe-guest-utilities_5.6.0-595.tar.gz) = f526fd9ae1b47f22860915aba825ddd440b445b8 SHA512 (xe-guest-utilities_5.6.0-595.tar.gz) = b34cb8afac674fe6d40fda44a03183392c690965ccfb7c708f30c53fb70770b6e3900563356bce3722f37263170dcb368a0725b6f0bb5730e78636c990394061 Size (xe-guest-utilities_5.6.0-595.tar.gz) = 454235 bytes SHA1 (patch-xe-daemon) = 3107fa2e018d66a2ca37b1c2a748c65aa1be3e2f -SHA1 (patch-xe-update-guest-attrs) = 97da7db38dbb42b2a4f8584ece32b7cbb15ea34b +SHA1 (patch-xe-update-guest-attrs) = dc4d1f8d8a60090f5498cce5932d08e832c3045f diff --git a/sysutils/xe-guest-utilities/patches/patch-xe-update-guest-attrs b/sysutils/xe-guest-utilities/patches/patch-xe-update-guest-attrs index 020cac23d23..69c20426dbb 100644 --- a/sysutils/xe-guest-utilities/patches/patch-xe-update-guest-attrs +++ b/sysutils/xe-guest-utilities/patches/patch-xe-update-guest-attrs @@ -1,22 +1,23 @@ -$NetBSD: patch-xe-update-guest-attrs,v 1.3 2015/04/20 08:05:30 sborrill Exp $ +$NetBSD: patch-xe-update-guest-attrs,v 1.4 2018/10/26 09:15:07 sborrill Exp $ -Patch for pkgsrc and NetBSD ifconfig +Support pkgsrc and NetBSD ifconfig --- xe-update-guest-attrs.orig 2010-12-20 15:34:07.000000000 +0000 -+++ xe-update-guest-attrs 2015-04-18 20:24:10.000000000 +0100 ++++ xe-update-guest-attrs 2018-10-25 17:10:36.997953256 +0100 @@ -39,7 +39,7 @@ IPADDR_RE="\([[:digit:]]\{1,3\}\.\)\{3\}[[:digit:]]\{1,3\}" -export PATH=/usr/sbin:/usr/bin:/sbin:/bin -+export PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/pkg/sbin:/usr/pkg/bin ++export PATH=/usr/sbin:/usr/bin:/sbin:/bin:@PREFIX@/sbin:@PREFIX@/bin XENSTORE=${XENSTORE:-xenstore} XENSTORE_UPDATED=0 -@@ -133,49 +133,50 @@ - +@@ -132,50 +132,66 @@ + fi +- -# e.g. -# $ ip addr show -# 1: lo: <LOOPBACK,UP,LOWER_UP> mtu 16436 qdisc noqueue @@ -60,6 +61,8 @@ Patch for pkgsrc and NetBSD ifconfig - sed -n -e '/^[0-9a-z][0-9a-z]*\:/,/^$/d' \ - -e 's/^\([0-9a-z][0-9a-z]*\) .*/ifs="\$ifs \1"; current="\1"; /gp;' \ - -e 's/ *inet addr:\('$IPADDR_RE'\) .*/eval inet_\${current}="\1"; /gp;') ++#NetBSD 7 and earlier: ++# +#xennet0: flags=8863<UP,BROADCAST,NOTRAILERS,RUNNING,SIMPLEX,MULTICAST> mtu 1500 +# capabilities=2800<TCP4CSUM_Tx,UDP4CSUM_Tx> +# enabled=0 @@ -72,6 +75,19 @@ Patch for pkgsrc and NetBSD ifconfig +# inet6 ::1 prefixlen 128 +# inet6 fe80::1%lo0 prefixlen 64 scopeid 0x2 + ++#NetBSD 8 and later: ++# ++#xennet0: flags=0x8863<UP,BROADCAST,NOTRAILERS,RUNNING,SIMPLEX,MULTICAST> mtu 1500 ++# capabilities=2800<TCP4CSUM_Tx,UDP4CSUM_Tx> ++# enabled=0ec_capabilities=1<VLAN_MTU> ++# ec_enabled=0 ++# address: 5e:a4:a1:fc:eb:70 ++# inet 192.168.1.17/24 broadcast 192.168.1.255 flags 0x0 ++# inet 10.20.30.40/16 broadcast 10.20.255.255 flags 0x0 ++# inet6 fe80::5ca4:a1ff:fefc:eb70%xennet0/64 flags 0x0 scopeid 0x1 ++ ++# Original: ++# +#/sbin/ifconfig | \ +# sed -n -e '/^[0-9a-z][0-9a-z]*\:/,/^$/d' \ +# -e 's/^\([0-9a-z][0-9a-z]*\) .*/ifs="\$ifs \1"; current="\1"; /gp;' \ @@ -94,6 +110,7 @@ Patch for pkgsrc and NetBSD ifconfig + if ($2 == "alias") ip = $3 + else ip = $2 + if ($1 == "inet6") sub("%.*", "", ip) ++ sub("/.*", "", ip) + if (ifs[current] != "") ifs[current] = ifs[current] ", " ip + else ifs[current] = ip + } @@ -107,7 +124,7 @@ Patch for pkgsrc and NetBSD ifconfig # network for if in $ifs ; do -@@ -206,16 +207,18 @@ +@@ -206,16 +222,18 @@ fi # whether I support ballooning or not @@ -125,12 +142,11 @@ Patch for pkgsrc and NetBSD ifconfig # build time addons -xenstore_write_cached "attr/PVAddons/MajorVersion" "5" -xenstore_write_cached "attr/PVAddons/MinorVersion" "6" --xenstore_write_cached "attr/PVAddons/MicroVersion" "0" ++xenstore_write_cached "attr/PVAddons/MajorVersion" "7" ++xenstore_write_cached "attr/PVAddons/MinorVersion" "0" + xenstore_write_cached "attr/PVAddons/MicroVersion" "0" -xenstore_write_cached "attr/PVAddons/BuildVersion" "39674" -+xenstore_write_cached "attr/PVAddons/MajorVersion" "@XENMAJOR@" -+xenstore_write_cached "attr/PVAddons/MinorVersion" "@XENMINOR@" -+xenstore_write_cached "attr/PVAddons/MicroVersion" "@XENTEENY@" -+xenstore_write_cached "attr/PVAddons/BuildVersion" "@XENBUILD@" ++xenstore_write_cached "attr/PVAddons/BuildVersion" "125243" xenstore_write_cached "attr/PVAddons/Installed" "1" # update xenstore if necc |