xen: update to 4.4.1.
This commit is contained in:
parent
a8ad90763b
commit
e60886b966
2 changed files with 12 additions and 41 deletions
|
@ -1,29 +0,0 @@
|
|||
--- Config.mk.orig 2014-04-29 20:54:43.117010822 +0100
|
||||
+++ Config.mk 2014-04-29 20:58:23.100055325 +0100
|
||||
@@ -188,6 +188,8 @@
|
||||
CFLAGS += -std=gnu99
|
||||
|
||||
CFLAGS += -Wall -Wstrict-prototypes
|
||||
+
|
||||
+CFLAGS += -Wno-error=maybe-uninitialized
|
||||
|
||||
# Clang complains about macros that expand to 'if ( ( foo == bar ) ) ...'
|
||||
# and is over-zealous with the printf format lint
|
||||
--- tools/blktap2/drivers/block-qcow.c.orig 2014-03-10 10:43:57.000000000 +0000
|
||||
+++ tools/blktap2/drivers/block-qcow.c 2014-04-30 21:10:26.270699187 +0100
|
||||
@@ -427,6 +427,7 @@
|
||||
|
||||
if (posix_memalign((void **)&tmp_ptr, 4096, 4096) != 0) {
|
||||
DPRINTF("ERROR allocating memory for L1 table\n");
|
||||
+ return -1;
|
||||
}
|
||||
memcpy(tmp_ptr, l1_ptr, 4096);
|
||||
|
||||
@@ -600,6 +601,7 @@
|
||||
|
||||
if (posix_memalign((void **)&tmp_ptr2, 4096, 4096) != 0) {
|
||||
DPRINTF("ERROR allocating memory for L1 table\n");
|
||||
+ return -1;
|
||||
}
|
||||
memcpy(tmp_ptr2, l2_ptr, 4096);
|
||||
lseek(s->fd, l2_offset + (l2_sector << 12), SEEK_SET);
|
|
@ -1,14 +1,14 @@
|
|||
# Template file for 'xen'
|
||||
pkgname=xen
|
||||
version=4.4.0
|
||||
version=4.4.1
|
||||
wrksrc=xen-${version}
|
||||
revision=3
|
||||
revision=1
|
||||
short_desc="The Xen hypervisor utilities"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://xen.org"
|
||||
license="GPL-2"
|
||||
distfiles="http://bits.xensource.com/oss-xen/release/$version/xen-$version.tar.gz"
|
||||
checksum=6910a504fe2ffe8db0e7a44756ce1c4c95e1ccbef942a1fc8da27aced5aac021
|
||||
checksum=55b49d3c4575d7791275125ff87c0f86f1d1e0f7f2718b6fd1c4f88a9bc7ea25
|
||||
|
||||
only_for_archs="x86_64"
|
||||
|
||||
|
@ -18,9 +18,9 @@ makedepends="
|
|||
libbluetooth-devel pciutils-devel libX11-devel libXext-devel SDL-devel MesaLib-devel
|
||||
ncurses-devel liblzma-devel python-devel yajl-devel libuuid-devel libglib-devel
|
||||
dev86 acpica-utils pixman-devel gcc-multilib"
|
||||
|
||||
depends="iproute2 bridge-utils xen-hypervisor"
|
||||
|
||||
build_options="systemd"
|
||||
make_dirs="
|
||||
/var/lib/xenstored 755 root root
|
||||
/var/lib/xen/xenpaging 755 root root
|
||||
|
@ -87,12 +87,14 @@ do_install() {
|
|||
${DESTDIR}/usr/share/bash-completion/completions
|
||||
|
||||
# Install systemd services.
|
||||
vmkdir usr/lib/systemd/system
|
||||
install -m644 ${FILESDIR}/*.{mount,service} ${DESTDIR}/usr/lib/systemd/system
|
||||
vmkdir usr/lib/modules-load.d
|
||||
install -m644 ${FILESDIR}/xen.conf ${DESTDIR}/usr/lib/modules-load.d
|
||||
install -Dm644 ${FILESDIR}/tmpfiles.d-xen.conf \
|
||||
${DESTDIR}/usr/lib/tmpfiles.d/xen.conf
|
||||
if [ "$build_option_systemd" ]; then
|
||||
vmkdir usr/lib/systemd/system
|
||||
install -m644 ${FILESDIR}/*.{mount,service} ${DESTDIR}/usr/lib/systemd/system
|
||||
vmkdir usr/lib/modules-load.d
|
||||
install -m644 ${FILESDIR}/xen.conf ${DESTDIR}/usr/lib/modules-load.d
|
||||
install -Dm644 ${FILESDIR}/tmpfiles.d-xen.conf \
|
||||
${DESTDIR}/usr/lib/tmpfiles.d/xen.conf
|
||||
fi
|
||||
|
||||
# Move bins to /usr/bin.
|
||||
mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin/
|
||||
|
@ -115,7 +117,6 @@ xen-hypervisor_package() {
|
|||
vmove boot
|
||||
}
|
||||
}
|
||||
|
||||
xen-devel_package() {
|
||||
short_desc+=" - development files"
|
||||
depends="xen-libs>=${version}_${revision}"
|
||||
|
@ -125,7 +126,6 @@ xen-devel_package() {
|
|||
vmove "usr/lib/*.so"
|
||||
}
|
||||
}
|
||||
|
||||
xen-libs_package() {
|
||||
short_desc+=" - runtime libraries"
|
||||
replaces="xen<4.3.1_2"
|
||||
|
|
Loading…
Reference in a new issue