main/xen: add xen-bridge subpackage

helper config for setting up a simple xenbr0 with dnsmasq

2 files changed, 30 insertions, 4 deletions

diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
index 363fa58de2..c70ef4f725 100644
--- a/main/xen/APKBUILD
+++ b/main/xen/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=xen
 pkgver=4.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Xen hypervisor"
 url="http://www.xen.org/"
 arch="x86_64 armhf"
@@ -13,7 +13,7 @@ depends_dev="libressl-dev python2-dev e2fsprogs-dev gettext zlib-dev ncurses-dev
         dev86 texinfo perl pciutils-dev glib-dev yajl-dev libnl3-dev
         spice-dev gnutls-dev curl-dev libaio-dev lzo-dev xz-dev util-linux-dev
         e2fsprogs-dev linux-headers argp-standalone perl-dev"
-makedepends="$depends_dev autoconf automake libtool "
+makedepends="$depends_dev autoconf automake libtool dnsmasq"
 options="!strip"
 
 # secfixes:
@@ -75,7 +75,8 @@ install=""
 #if [ "$CARCH" != "armhf" ]; then
 #       subpackages="$pkgname-dbg"
 #fi
-subpackages="$subpackages $pkgname-doc $pkgname-dev $pkgname-libs $pkgname-hypervisor"
+subpackages="$subpackages $pkgname-doc $pkgname-dev $pkgname-libs
+        $pkgname-hypervisor $pkgname-bridge"
 
 # grep _VERSION= stubdom/configure
 _ZLIB_VERSION="1.2.3"
@@ -320,6 +321,30 @@ hypervisor() {
         mv "$pkgdir"/boot "$subpkgdir"/
 }
 
+bridge() {
+        depends="dnsmasq"
+        pkgdesc="Bridge interface for XEN with dhcp"
+        mkdir -p "$subpkgdir"/etc/conf.d \
+                "$subpkgdir"/etc/init.d \
+                "$subpkgdir"/etc/xen
+
+        ln -s dnsmasq "$subpkgdir"/etc/init.d/dnsmasq.xenbr0
+        cat ->>"$subpkgdir"/etc/conf.d/dnsmasq.xenbr0 <<EOF
+                BRIDGE_ADDR="10.0.4.1"
+                BRIDGE_NETMASK="255.255.255.0"
+                BRIDGE_NETWORK="10.0.4.0/24"
+                BRIDGE_DHCP_RANGE="10.0.4.2,10.0.4.254"
+                BRIDGE_DHCP_MAX="253"
+                BRIDGE_MAC="00:16:3f:00:00:00"
+                DNSMASQ_CONFFILE="/etc/xen/dnsmasq.conf"
+EOF
+        cat ->>"$subpkgdir"/etc/xen/dnsmasq.conf <<EOF
+                #dhcp-host=somehost,10.0.4.3
+                #dhcp-host=otherhost,10.0.4.4
+EOF
+
+}
+
 sha512sums="9f535b4bb57d285dfb92c974d55513505cf485b2d7218fe8f6ed62768e2cee7f225b08adf6706590b2c0a04feca16e10915297c33b98e1b110f8ea7035f46c15  xen-4.8.1.tar.gz
 2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf  gmp-4.3.2.tar.bz2
 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb  grub-0.97.tar.gz
@@ -349,7 +374,7 @@ e0dd7069968d51574d6e5603d5738494b112bfda085bc75f10102658be3b2901d8d253c52927c707
 3c86ed48fbee0af4051c65c4a3893f131fa66e47bf083caf20c9b6aa4b63fdead8832f84a58d0e27964bc49ec8397251b34e5be5c212c139f556916dc8da9523  xenconsoled.initd
 30df69cc38d0bed26bc4d6e08a2b62cbdc654d5f663009a05cb3b83b3e3dc5e206362d3fd59abbb753ceb8d6d79eaa6e15d079bb8f4f35dc74667103faf4e85d  xenconsoled.confd
 b1037fdf2fe477e153f7e9408e34943a8e8ca4e5518e6b0513137f95f3abbcbb20acb1de37c875825a1d4a30b2506290ec76b8c9fb183db6b4b0e1cffe329ca5  xendomains.initd
-a3dddcb841a22305cfe1780c4ef6cf1ee67227ca9fe6ca0d24a7cc8be2cff9e5f3fbd75c2faf85e5ce6dc3b73631879ce10e19b02afb4611c72db183e116123a  xendomains.confd
+c7c0eecd5f454d903b57a710902da27dcb2c6b200f88d4eadfab33a447be6b41454109d482aab849a690446ea5c928e619dfc6cf95b7955f00a476f2317bb82b  xendomains.confd
 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426  xen-consoles.logrotate
 bdbe15c924071cdc2d0f23e53ba8e3f837d4b5369bfb218abd3405f9bef25d105269aaf0784baeb69c073a5786b8c82ffdfd414e86874da34293cfdc2c497928  xenqemu.confd
 8475119369409efb8ad930c7735cd3d782191d18fab4fc322a51120c395162ff88e381182876036d1078afd30079dbf3f94a3568689e9b52ba235adead4b97d3  xenqemu.initd"
diff --git a/main/xen/xendomains.confd b/main/xen/xendomains.confd
index ef95cbf22a..50524f29b1 100644
--- a/main/xen/xendomains.confd
+++ b/main/xen/xendomains.confd
@@ -45,3 +45,4 @@ PARALLEL_SHUTDOWN=yes
 #
 XENDOMAINS_CREATE_USLEEP=5000000
 
+#rc_need="dnsmasq.xenbr0"