Mail archive
alpine-aports

[alpine-aports] [PATCH 2/2] main/xen: enable on aarch64

From: Daniel Sabogal <dsabogalcc_at_gmail.com>
Date: Mon, 4 Sep 2017 17:48:53 -0400

---
 main/xen/APKBUILD           | 13 +++++++++----
 main/xen/musl-support.patch | 10 ++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
index f450aa810a..3dacbf1ea1 100644
--- a/main/xen/APKBUILD
+++ b/main/xen/APKBUILD
_at_@ -3,10 +3,10 @@
 # Maintainer: William Pitcock <nenolod_at_dereferenced.org>
 pkgname=xen
 pkgver=4.9.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Xen hypervisor"
 url="http://www.xen.org/"
-arch="x86_64 armhf"
+arch="x86_64 armhf aarch64"
 license="GPL"
 depends="bash iproute2 logrotate"
 depends_dev="libressl-dev python2-dev e2fsprogs-dev gettext zlib-dev ncurses-dev
_at_@ -89,6 +89,9 @@ x86*)
 arm*)
 	makedepends="$makedepends dtc-dev"
 	;;
+aarch64)
+	makedepends="$makedepends dtc-dev iasl"
+	;;
 esac
 
 install=""
_at_@ -166,6 +169,7 @@ _seabios=/usr/share/seabios/bios-256k.bin
 # Override wrong arch detection from xen-$pkgver/Config.mk.
 case "$CARCH" in
 armhf) export XEN_TARGET_ARCH="arm32";;
+aarch64) export XEN_TARGET_ARCH="arm64";;
 esac
 
 prepare() {
_at_@ -233,7 +237,8 @@ munge_cflags() {
 	unset LC_ALL
 
 	case "$CARCH" in
-	armhf)	export CFLAGS="-mcpu=cortex-a15";;
+	armhf) export CFLAGS="-mcpu=cortex-a15";;
+	aarch64) export CFLAGS="-mcpu=cortex-a53";;
 	esac
 }
 
_at_@ -390,7 +395,7 @@ c3c46f232f0bd9f767b232af7e8ce910a6166b126bd5427bb8dc325aeb2c634b956de3fc225cab5a
 1936ab39a1867957fa640eb81c4070214ca4856a2743ba7e49c0cd017917071a9680d015f002c57fa7b9600dbadd29dcea5887f50e6c133305df2669a7a933f3  qemu-xen_paths.patch
 f095ea373f36381491ad36f0662fb4f53665031973721256b23166e596318581da7cbb0146d0beb2446729adfdb321e01468e377793f6563a67d68b8b0f7ffe3  hotplug-vif-vtrill.patch
 5514d7697c87f7d54d64723d44446b9bd84f6c984e763bd21d4eeaf502bf0c5b765f7b2180f8ca496b3baf97e7efd600b1cc1fdd1284b6ecbffe9846190ca069  rombios-no-pie.patch
-a3197d9c2455983554610031702ea95dc31f1b375b8c1291207d33c9e6114c6928417b4c8138cb5356ee58d07846963143abba5f204ecaee49eab6f84ad5e4f5  musl-support.patch
+e635cf27ca022ca5bc829e089b5e9a3ce9e566d4701d06bc38a22e356de45a71bc33e170d6db333d4efe8389144419cc27834a2eee0bcae9118d4ca9aff64306  musl-support.patch
 77b08e9655e091b0352e4630d520b54c6ca6d659d1d38fbb4b3bfc9ff3e66db433a2e194ead32bb10ff962c382d800a670e82b7a62835b238e294b22808290ea  musl-hvmloader-fix-stdint.patch
 8c3b57eab8641bcee3dbdc1937ea7874f77b9722a5a0aa3ddb8dff8cc0ced7e19703ef5d998621b3809bea7c16f3346cfa47610ec9ab014ad0de12651c94e5ff  stdint_local.h
 853467a2d055c5bfbdc7bdca175a334241be44a7c5ac3c0a84a4bc5463b5c070b66d37e2a557429ef860727a6b7350683af758cc2494d85b6be4d883143a2c0d  elf_local.h
diff --git a/main/xen/musl-support.patch b/main/xen/musl-support.patch
index ead6e08d1e..ec9bd7722d 100644
--- a/main/xen/musl-support.patch
+++ b/main/xen/musl-support.patch
_at_@ -62,3 +62,13 @@
  
  #include "atomicio.h"
  #include "libvhd-journal.h"
+--- xen-4.9.0.orig/tools/libxl/libxl_arm_acpi.c
++++ xen-4.9.0/tools/libxl/libxl_arm_acpi.c
+_at_@ -37,7 +37,7 @@ typedef int64_t s64;
+ #define BITS_PER_LONG 32
+ #endif
+ #endif
+-#define ACPI_MACHINE_WIDTH __BITS_PER_LONG
++#define ACPI_MACHINE_WIDTH BITS_PER_LONG
+ #define COMPILER_DEPENDENT_INT64 int64_t
+ #define COMPILER_DEPENDENT_UINT64 uint64_t
-- 
2.14.1
---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Mon Sep 04 2017 - 17:48:53 UTC