Merge remote-tracking branch 'x'

This commit is contained in:
xdave 2013-06-05 08:36:45 -06:00
commit 95713ce8cc
2 changed files with 8 additions and 6 deletions

View file

@ -1,7 +1,7 @@
# Template file for 'netctl' # Template file for 'netctl'
pkgname=netctl pkgname=netctl
version=1.1 version=1.1
revision=2 revision=3
short_desc="Profile based systemd network management" short_desc="Profile based systemd network management"
maintainer="Ypnose <linuxienATlegtuxDOTorg>" maintainer="Ypnose <linuxienATlegtuxDOTorg>"
homepage="http://projects.archlinux.org/netctl.git/" homepage="http://projects.archlinux.org/netctl.git/"
@ -23,6 +23,6 @@ netctl_package() {
/etc/netctl/interfaces 0750 root root /etc/netctl/interfaces 0750 root root
/etc/netctl/hooks 0750 root root" /etc/netctl/hooks 0750 root root"
pkg_install() { pkg_install() {
vmove usr vmove all
} }
} }

View file

@ -2,11 +2,11 @@
pkgname=xen pkgname=xen
version=4.2.2 version=4.2.2
wrksrc=xen-${version} wrksrc=xen-${version}
revision=1 revision=2
hostmakedepends="which wget bison pkg-config" hostmakedepends="which wget bison pkg-config"
makedepends="lzo-devel openssl-devel e2fsprogs-devel zlib-devel gnutls-devel>=3.1.5 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 libbluetooth-devel pciutils-devel libX11-devel libXext-devel SDL-devel MesaLib-devel
ncurses-devel liblzma-devel python-devel yajl-devel libglib-devel iproute2 ncurses-devel liblzma-devel python-devel yajl-devel libuuid-devel libglib-devel iproute2
bridge-utils dev86 acpica-utils" bridge-utils dev86 acpica-utils"
if [ "${XBPS_MACHINE}" = "x86_64" ]; then if [ "${XBPS_MACHINE}" = "x86_64" ]; then
makedepends+=" gcc-multilib" makedepends+=" gcc-multilib"
@ -23,7 +23,7 @@ long_desc="
do_configure() { do_configure() {
unset CC LD AR AS RANLIB CPP CFLAGS CPPFLAGS LDFLAGS unset CC LD AR AS RANLIB CPP CFLAGS CPPFLAGS LDFLAGS
./configure --prefix=/usr ./configure ${configure_args}
} }
do_build() { do_build() {
@ -48,7 +48,7 @@ do_install() {
cd ${wrksrc} cd ${wrksrc}
fi fi
unset CC LD AR AS RANLIB CPP CFLAGS CPPFLAGS LDFLAGS unset CC LD AR AS RANLIB CPP CFLAGS CPPFLAGS LDFLAGS
make DESTDIR=${DESTDIR} install-xen install-tools make DESTDIR=${DESTDIR} install
# Move example config files into correct directory. # Move example config files into correct directory.
vmkdir usr/share/examples/xen vmkdir usr/share/examples/xen
@ -64,6 +64,8 @@ do_install() {
rm -rf ${DESTDIR}/usr/share/qemu-xen rm -rf ${DESTDIR}/usr/share/qemu-xen
rm -f ${DESTDIR}/boot/xen{,-4,-4.2}.gz rm -f ${DESTDIR}/boot/xen{,-4,-4.2}.gz
rm -f ${DESTDIR}/usr/sbin/xen-python-path rm -f ${DESTDIR}/usr/sbin/xen-python-path
rm -f ${DESTDIR}/{install,COPYING,README,usr/lib/lib}
rm -rf ${DESTDIR}/etc/udev
# Move bash-completion to the correct dir. # Move bash-completion to the correct dir.
vmkdir usr/share/bash-completion/completions vmkdir usr/share/bash-completion/completions