From 0c5f007eb40e87ce5450ba1eb574740198f32bf0 Mon Sep 17 00:00:00 2001
From: Henrik Riomar <henrik.riomar@gmail.com>
Date: Thu, 19 Dec 2019 18:47:17 +0100
Subject: [PATCH] main/xen: modernize
---
main/xen/APKBUILD | 44 +++++++++++++++++---------------------------
1 file changed, 17 insertions(+), 27 deletions(-)
diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
index f627ee1cc3fb..b5dcc6373f72 100644
--- a/main/xen/APKBUILD
+++ b/main/xen/APKBUILD
@@ -222,7 +222,6 @@ source="https://downloads.xenproject.org/release/$pkgname/$pkgver/$pkgname-$pkgv
xen-pci.confd
"
-builddir="$srcdir"/$pkgname-$pkgver
_seabios=/usr/share/seabios/bios-256k.bin
# Override wrong arch detection from xen-$pkgver/Config.mk.
@@ -233,7 +232,6 @@ esac
prepare() {
local i _failed= _series=
- cd "$builddir"
for i in $source; do
case $i in
@@ -249,10 +247,10 @@ prepare() {
;;
*/ipxe-git-*)
ln -s "$srcdir"/${i##*/} \
- tools/firmware/etherboot/ipxe.tar.gz || return 1
+ tools/firmware/etherboot/ipxe.tar.gz
;;
*/xen-extfiles/*)
- ln -s "$srcdir"/${i##*/} stubdom/ || return 1
+ ln -s "$srcdir"/${i##*/} stubdom/
;;
esac
done
@@ -266,19 +264,18 @@ prepare() {
# install our stdint_local.h and elf_local.h
install "$srcdir"/stdint_local.h "$srcdir"/elf_local.h \
- "$builddir"/tools/firmware/ || return 1
+ "$builddir"/tools/firmware/
ln -s ../firmware/stdint_local.h "$builddir"/tools/libxl/
# remove all -Werror
msg "Eradicating -Werror..."
- find . -name '*.mk' -o -name 'Make*' | xargs sed -i -e 's/-Werror//g' \
- || return 1
+ find . -name '*.mk' -o -name 'Make*' | xargs sed -i -e 's/-Werror//g'
msg "Updating config.sub..."
- update_config_sub || return 1
+ update_config_sub
msg "Autoreconf..."
- autoreconf || return 1
+ autoreconf
unset CFLAGS
unset LDFLAGS
@@ -305,28 +302,25 @@ munge_cflags() {
# to invoke specific tasks like building the hypervisor. i.e.
# $ abuild configure build_tools
configure() {
- cd "$builddir"
-
msg "Running configure..."
./configure --prefix=/usr \
--build=$CBUILD \
--host=$CHOST \
- --with-system-seabios=$_seabios \
- || return 1
+ --with-system-seabios=$_seabios
}
build_hypervisor() {
munge_cflags
msg "Building hypervisor..."
- make xen || return 1
+ make xen
}
build_tools() {
munge_cflags
msg "Building tools..."
- make tools || return 1
+ make tools
}
build_docs() {
@@ -340,32 +334,29 @@ build_stubdom() {
munge_cflags
msg "Building stub domains..."
- make stubdom || return 1
+ make stubdom
}
build() {
- cd "$builddir"
- configure || return 1
- build_hypervisor || return 1
- build_tools || return 1
- build_docs || return 1
+ configure
+ build_hypervisor
+ build_tools
+ build_docs
case "$CARCH" in
- x86*) build_stubdom || return 1;;
+ x86*) build_stubdom;;
esac
${CC:-gcc} -o xen-fd-is-file "$srcdir"/xen-fd-is-file.c
}
package() {
- cd "$builddir"
unset CFLAGS
unset LDFLAGS
- make -j1 DESTDIR="$pkgdir" install-xen install-tools install-docs \
- || return 1
+ make -j1 DESTDIR="$pkgdir" install-xen install-tools install-docs
case "$CARCH" in
- x86*) make -j1 DESTDIR="$pkgdir" install-stubdom || return 1;;
+ x86*) make -j1 DESTDIR="$pkgdir" install-stubdom;;
esac
# remove default xencommons
@@ -396,7 +387,6 @@ package() {
}
check() {
- cd "$builddir"
make test
}
--
GitLab