tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

xen: misc fixes/improvements; drop xm/xend (obsolete and replaced by xl).

Browse Source 
xendomU@.service: use ConditionVirtualization=xen.
*.service: drop Arch specific /etc/conf.d (unneeded).

Remove the DISTDIR workaround when building, just set DISTDIR correctly.
This commit is contained in:
Juan RP
2013-06-07 09:14:38 +02:00
parent f29df30af3
commit 4e2a6450ad
4 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
srcpkgs/xen/files/xenconsoled.service
View File

@@ -9,7 +9,6 @@ Type=simple
Environment=XENCONSOLED_ARGS=
Environment=XENCONSOLED_LOG=none
Environment=XENCONSOLED_LOG_DIR=/var/log/xen/console
EnvironmentFile=-/etc/conf.d/xenconsoled
PIDFile=/var/run/xenconsoled.pid
ExecStartPre=/usr/bin/grep -q control_d /proc/xen/capabilities
ExecStart=/usr/bin/xenconsoled --log=${XENCONSOLED_LOG} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS

1
srcpkgs/xen/files/xendomU@.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=xen domU service for domain %i
Requires=xenstored.service
ConditionVirtualization=xen
[Service]
Type=oneshot

1
srcpkgs/xen/files/xenstored.service
View File

@@ -9,7 +9,6 @@ ConditionPathExists=/proc/xen
[Service]
Type=forking
Environment=XENSTORED_ARGS=
EnvironmentFile=-/etc/conf.d/xenstored
PIDFile=/var/run/xenstored.pid
ExecStartPre=/usr/bin/grep -q control_d /proc/xen/capabilities
ExecStart=/usr/bin/xenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS

44
srcpkgs/xen/template
View File

@@ -2,15 +2,7 @@
pkgname=xen
version=4.2.2
wrksrc=xen-${version}
revision=2
hostmakedepends="which wget bison pkg-config"
makedepends="lzo-devel openssl-devel e2fsprogs-devel zlib-devel gnutls-devel>=3.1.5
libbluetooth-devel pciutils-devel libX11-devel libXext-devel SDL-devel MesaLib-devel
ncurses-devel liblzma-devel python-devel yajl-devel libuuid-devel libglib-devel iproute2
bridge-utils dev86 acpica-utils"
if [ "${XBPS_MACHINE}" = "x86_64" ]; then
makedepends+=" gcc-multilib"
fi
revision=3
short_desc="Xen Hypervisor and Utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xen.org"
@@ -21,15 +13,25 @@ long_desc="
This package provides the official Xen Hypervisor and related utilities
for starting/stopping/accessing unprivileged domains (domUs)."
# Update this if support for ARM7 is added.
only_for_archs="i686 x86_64"
hostmakedepends="which wget bison pkg-config"
makedepends="lzo-devel openssl-devel e2fsprogs-devel zlib-devel gnutls-devel>=3.1.5
libbluetooth-devel pciutils-devel libX11-devel libXext-devel SDL-devel MesaLib-devel
ncurses-devel liblzma-devel python-devel yajl-devel libuuid-devel libglib-devel iproute2
bridge-utils dev86 acpica-utils"
if [ "${XBPS_MACHINE}" = "x86_64" ]; then
makedepends+=" gcc-multilib"
fi
do_configure() {
unset CC LD AR AS RANLIB CPP CFLAGS CPPFLAGS LDFLAGS
./configure ${configure_args}
}
do_build() {
install -d ${DESTDIR}
cd ${DESTDIR}
ln -sf . install
if [ "${XBPS_MACHINE}" = "x86_64" ]; then
install -d ${DESTDIR}/usr/lib
cd ${DESTDIR}/usr
@@ -37,7 +39,7 @@ do_build() {
fi
cd ${wrksrc}
unset CC LD AR AS RANLIB CPP CFLAGS CPPFLAGS LDFLAGS
make ${makejobs} DISTDIR=${DESTDIR}
make ${makejobs} DISTDIR=${wrksrc}/${pkgver}-distdir
}
do_install() {
@@ -82,6 +84,15 @@ do_install() {
# Move bins to /usr/bin.
mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin/
# Drop xen/xm stuff (obsolete).
rm -f ${DESTDIR}/usr/bin/{xm,xend}
rm -f ${DESTDIR}/etc/xen/*.{sxp,xml}
rm -f ${DESTDIR}/usr/share/man/man5/{xmdomain.cfg,xend-config.sxp}.5
rm -f ${DESTDIR}/usr/share/man/man1/xm.1
rm -f ${DESTDIR}/usr/share/doc/xen/html/man/xm.1.html
rm -f ${DESTDIR}/usr/share/doc/xen/html/man/{xmdomain.cfg,xend-config.sxp}.5.html
rm -f ${DESTDIR}/usr/share/examples/xen/xmexample*
}
xen-devel_package() {
@@ -94,7 +105,6 @@ xen-devel_package() {
xen_package() {
make_dirs="
/var/run/xenstored 755 root root
/var/lib/xenstored 755 root root
/var/lib/xen/xenpaging 755 root root
/var/xen/dump 755 root root
@@ -102,11 +112,7 @@ xen_package() {
conf_files="
/etc/default/xendomains
/etc/default/xencommons
/etc/xen/xm-config.xml
/etc/xen/xl.conf
/etc/xen/xend-config.sxp
/etc/xen/xend-pci-quirks.sxp
/etc/xen/xend-pci-permissive.sxp"
/etc/xen/xl.conf"
nostrip_files="
openbios-ppc
openbios-sparc32