summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2011-02-17 19:56:09 -0600
committerWilliam Pitcock <nenolod@dereferenced.org>2011-02-17 19:56:09 -0600
commit05225cefe91d9318b4bcfe01c73e5a2fbfb780cd (patch)
tree1d92e3329d9fc3bccf181c036fe8319852210f6f
parentbd4729f70cc9cd71d9defca1cd0dc82893bf8f10 (diff)
downloadaports-05225cefe91d9318b4bcfe01c73e5a2fbfb780cd.tar.bz2
aports-05225cefe91d9318b4bcfe01c73e5a2fbfb780cd.tar.xz
main/xen: don't use sed in the build system
-rw-r--r--main/xen/APKBUILD4
-rw-r--r--main/xen/xen-sed-is-broken-hack.patch11
2 files changed, 14 insertions, 1 deletions
diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
index c3ff291ae..d6657db7f 100644
--- a/main/xen/APKBUILD
+++ b/main/xen/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=xen
pkgver=4.0.1
-pkgrel=2
+pkgrel=3
pkgdesc="Xen hypervisor"
url="http://www.xen.org/"
license="GPL"
@@ -17,6 +17,7 @@ source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.g
xen-disable-fsback.patch
xen-disable-werror.patch
xen-dont-use-lib64.patch
+ xen-sed-is-broken-hack.patch
xend.initd
xendomains.initd"
arch="x86_64"
@@ -73,5 +74,6 @@ a569f16a7e3c832ba3fab6154f657244 xen-disable-firmware.patch
03d1fff892e627b812bba4e6c56d696a xen-disable-fsback.patch
949d0d3bc1e8f300a849279b60760c6a xen-disable-werror.patch
b6599060e22b61dabee0fe460b4a0c9d xen-dont-use-lib64.patch
+0cec6a97de9e4bc178f3e71190495cc3 xen-sed-is-broken-hack.patch
1d81b04f8c8b919879a73f0e3d2fe80f xend.initd
a2b5234483f1b5892d22e9315d9c307f xendomains.initd"
diff --git a/main/xen/xen-sed-is-broken-hack.patch b/main/xen/xen-sed-is-broken-hack.patch
new file mode 100644
index 000000000..4168f7206
--- /dev/null
+++ b/main/xen/xen-sed-is-broken-hack.patch
@@ -0,0 +1,11 @@
+--- xen-4.0.1/xen/arch/x86/boot/Makefile
++++ xen-4.0.1.mod/xen/arch/x86/boot/Makefile
+@@ -2,7 +2,7 @@
+
+ head.o: reloc.S
+
+-BOOT_TRAMPOLINE := $(shell sed -n 's,^\#define[[:space:]]\{1\,\}BOOT_TRAMPOLINE[[:space:]]\{1\,\},,p' $(BASEDIR)/include/asm-x86/config.h)
++BOOT_TRAMPOLINE := 0x7c000
+ %.S: %.c
+ RELOC=$(BOOT_TRAMPOLINE) XEN_BITSPERLONG=$(patsubst x86_%,%,$(TARGET_SUBARCH)) $(MAKE) -f build32.mk $@
+