Revert "main/xen: implement experimental support for running the xenstore as a stubdomain"

fails to build and blocks build server

This reverts commit 157e38bfbb80daadeea3df319acaa6a098a7c280.

4 files changed, 12 insertions, 39 deletions

diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
index 2706b7c5b..1c792ca62 100644
--- a/main/xen/APKBUILD
+++ b/main/xen/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=xen
 pkgver=4.3.1
-pkgrel=2
+pkgrel=1
 pkgdesc="Xen hypervisor"
 url="http://www.xen.org/"
 arch="x86_64"
@@ -38,8 +38,6 @@ source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.g
 	hotplug-vif-vtrill.patch
 	0001-ipxe-dont-clobber-ebp.patch
 
-	init-xenstore-domain.patch
-
 	xenstored.initd
 	xenstored.confd
 	xenconsoled.initd
@@ -205,9 +203,8 @@ f8ea5786b0a6157b9cb3e67e323b592c  qemu-xen-websocket-plain-hack.patch
 066acc4af962c57e2f6cc0286bfdc270  qemu-xen-vnc-robustness.patch
 e449bb3359b490804ffc7b0ae08d62a0  hotplug-vif-vtrill.patch
 229539a822e14a6a62babffd71ecfbf3  0001-ipxe-dont-clobber-ebp.patch
-08a30d56902b660f5102a5c208e545c9  init-xenstore-domain.patch
-ae9b179229df40d6a9cff71ac824ac02  xenstored.initd
-d86504e12f05deca6b3eeeb90157160e  xenstored.confd
+a90c36642f0701a8aaa4ebe4dde430f5  xenstored.initd
+b017ccdd5e1c27bbf1513e3569d4ff07  xenstored.confd
 ed262f15fb880badb53575539468646c  xenconsoled.initd
 ec2252c72050d7d5870a3a629b873ba6  xenconsoled.confd
 1803ddf6877bdf254082365389a4efa9  xend.initd
@@ -234,9 +231,8 @@ e9f6c482fc449e0b540657a8988ad31f2e680b8933e50e6486687a52f6a9ed04  qemu-xen-webso
 f34590761b627d69d2033c1350f2403e9d572b2172e852e3b30e7630bc009a9f  qemu-xen-vnc-robustness.patch
 dd1e784bc455eb62cb85b3fa24bfc34f575ceaab9597ef6a2f1ee7ff7b3cae0a  hotplug-vif-vtrill.patch
 751ef06569de66578b8713dc170976832b0671ac2696f32eb9ad69d60332d594  0001-ipxe-dont-clobber-ebp.patch
-0204d69804e83864cd6b2122f51b9c1940588158a35c159a7ef0c3b8fb0af4cb  init-xenstore-domain.patch
-1b2484c55eb5a879a783068723030c834ad3e12fd92404385e8f999e6bb5d782  xenstored.initd
-991bb7c9da02941556e29714bd96b26e39e57e0a5b514eadd78d9bfa3fa5a9dc  xenstored.confd
+868c77d689ae54b7041da169bfaa01868503337d4105a071eb771f4ec5a0543d  xenstored.initd
+ea9171e71ab3d33061979bcf3bb737156192aa4b0be4d1234438ced75b6fdef3  xenstored.confd
 93bea2eb90ea1b4628854c8141dd351bbd1fbc5959b12795447ea933ad025f01  xenconsoled.initd
 2a74be03eb74f6013242a4a5d721df6cb9b959b43c405de1e32813f52d749060  xenconsoled.confd
 a50a4485e84bcc098ad021556cd2aa7947c228f0a546ab942e880787ced57be3  xend.initd
@@ -263,9 +259,8 @@ bda9105793f2327e1317991762120d0668af0e964076b18c9fdbfd509984b2e88d85df95702c46b2
 a52aa303dd3d9abae3ddb3af788b1f1f7a6bd9eb0c13f67f0995190238f7638f7909ea7d7bf7d778c64edbb6bdae87a5d5654e12440abded083e4818ff204b47  qemu-xen-vnc-robustness.patch
 f095ea373f36381491ad36f0662fb4f53665031973721256b23166e596318581da7cbb0146d0beb2446729adfdb321e01468e377793f6563a67d68b8b0f7ffe3  hotplug-vif-vtrill.patch
 c3a1b270347a99c8ce21118010ad8d817b4462a31cc5c75352faa7086969ef0646f3f4d0922d85c2e504cff091ce7e9fe79c92f983c2ba4af2fae85c52c3835a  0001-ipxe-dont-clobber-ebp.patch
-475eb800660dc928914b8c15562f18f24d6e7a76f4cc7bed9249ce52d444c29aec1aef843eb37ade0c7c9616195bbbc1606a3195e25b2bd4b6a1d1af5f69256e  init-xenstore-domain.patch
-99a8758d52818395dce9baf65d429b2545e206bc286b40ddc3490f089485d4651addcb4953e836e3e208b1740c4a0dc87d7cd6e19989360109ad5a9dc76d2c83  xenstored.initd
-093f7fbd43faf0a16a226486a0776bade5dc1681d281c5946a3191c32d74f9699c6bf5d0ab8de9d1195a2461165d1660788e92a3156c9b3c7054d7b2d52d7ff0  xenstored.confd
+880584e0866b1efcf3b7a934f07072ec84c13c782e3e7a15848d38ba8af50259d46db037dca1e037b15274989f2c22acd1134954dd60c59f4ee693b417d03e0d  xenstored.initd
+100cf4112f401f45c1e4e885a5074698c484b40521262f6268fad286498e95f4c51e746f0e94eb43a590bb8e813a397bb53801ccacebec9541020799d8d70514  xenstored.confd
 12f981b2459c65d66e67ec0b32d0d19b95a029bc54c2a79138cfe488d3524a22e51860f755abfe25ddcdaf1b27f2ded59b6e350b9d5f8791193d00e2d3673137  xenconsoled.initd
 30df69cc38d0bed26bc4d6e08a2b62cbdc654d5f663009a05cb3b83b3e3dc5e206362d3fd59abbb753ceb8d6d79eaa6e15d079bb8f4f35dc74667103faf4e85d  xenconsoled.confd
 55766e22d9374b404b96fba9d30aee49bee6c95fabce9c3d2aed1faba04c1573ecd75fe49e27ce1527ecf9064f53ccc15e4c69a1aa4ea3daa44828f38d687d85  xend.initd
diff --git a/main/xen/init-xenstore-domain.patch b/main/xen/init-xenstore-domain.patch
deleted file mode 100644
index 0f529efdc..000000000
--- a/main/xen/init-xenstore-domain.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xen-4.3.1.orig/tools/xenstore/Makefile
-+++ xen-4.3.1/tools/xenstore/Makefile
-@@ -118,6 +118,7 @@
- 	$(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
- 	$(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR)
- 	$(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR)
-+	$(INSTALL_PROG) init-xenstore-domain $(DESTDIR)$(BINDIR)
- 	set -e ; for c in $(CLIENTS) ; do \
- 		ln -f $(DESTDIR)$(BINDIR)/xenstore $(DESTDIR)$(BINDIR)/$${c} ; \
- 	done
diff --git a/main/xen/xenstored.confd b/main/xen/xenstored.confd
index 17be694f9..13363b394 100644
--- a/main/xen/xenstored.confd
+++ b/main/xen/xenstored.confd
@@ -3,8 +3,3 @@ XENSTORED_OPTS=""
 
 # Uncomment for enabling tracing
 # XENSTORED_TRACE=yes
-
-# Uncomment to run the xenstore service as a stubdomain.
-# XENSTORED_STUBDOM=yes
-# XENSTORED_STUBDOM_MEMORY=256
-# XENSTORED_FLASK_LABEL="-"
diff --git a/main/xen/xenstored.initd b/main/xen/xenstored.initd
index 94237e35f..0e13c8c49 100644
--- a/main/xen/xenstored.initd
+++ b/main/xen/xenstored.initd
@@ -44,18 +44,11 @@ start() {
 		_traceopt="-T /var/log/xen/xenstored-trace.log"
 	fi
 
-	if yesno "$XENSTORED_STUBDOM"; then
-		/usr/bin/init-xenstore-domain /usr/lib/xen/boot/xenstore-stubdom.gz \
-			$XENSTORED_STUBDOM_MEMORY \
-			$XENSTORED_FLASK_LABEL
-		wait_xenstored_up
-	else
-		start-stop-daemon --start --exec /usr/sbin/xenstored \
-			--pidfile /var/run/xenstored.pid \
-			-- --pid-file=/var/run/xenstored.pid \
-			$XENSTORED_OPTS $_traceopt
-		wait_xenstored_up
-	fi
+	start-stop-daemon --start --exec /usr/sbin/xenstored \
+		--pidfile /var/run/xenstored.pid \
+		-- --pid-file=/var/run/xenstored.pid \
+		$XENSTORED_OPTS $_traceopt
+	wait_xenstored_up
 	eend $? || return 1
 
 	ebegin "Setting domain0 name record"