jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 22:26:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

xvisor: fix build on AArch64

Browse Source 
Xvisor was failing to build on AArch64 with:

package/xvisor/xvisor.mk:60: *** No Xvisor defconfig name specified, check your BR2_PACKAGE_XVISOR_DEFCONFIG setting.  Stop.

The first problem is that the Config.in file had a typo: it was using
BR2_AARCH64 instead of BR2_aarch64, and therefore the
BR2_PACKAGE_XVISOR_DEFCONFIG variable had no value.

Once this is fixed, another problem occurs: the ARCH variable needs to
be specified as "arm" for XVisor, for both ARM and AArch64. Therefore,
a XVISOR_ARCH variable is introduced, which is calculated according to
the Buildroot configuration options. Only x86-64, arm and aarch64 are
supported by Xvisor currently, so it remains simple.

Fixes:

  http://autobuild.buildroot.net/results/1719a63ff257f13634a06a14327abfb327984101/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2017-07-05 22:30:55 +02:00
parent 1e5659fff8
commit 117fd5dfbc
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/xvisor/Config.in
View File

@ -35,7 +35,7 @@ config BR2_PACKAGE_XVISOR_DEFCONFIG
default "generic-v5" if BR2_ARM_CPU_ARMV5 default "generic-v5" if BR2_ARM_CPU_ARMV5
default "generic-v6" if BR2_ARM_CPU_ARMV6 default "generic-v6" if BR2_ARM_CPU_ARMV6
default "generic-v7" if BR2_ARM_CPU_ARMV7A default "generic-v7" if BR2_ARM_CPU_ARMV7A
default "generic-v8" if BR2_AARCH64 default "generic-v8" if BR2_aarch64
default "x86_64_generic" if BR2_x86_64 default "x86_64_generic" if BR2_x86_64
depends on BR2_PACKAGE_XVISOR_USE_DEFCONFIG depends on BR2_PACKAGE_XVISOR_USE_DEFCONFIG
help help

10
package/xvisor/xvisor.mk
View File

@ -26,8 +26,16 @@ XVISOR_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_XVISOR_CUSTOM_CONFIG_FILE))
endif endif
XVISOR_KCONFIG_EDITORS = menuconfig XVISOR_KCONFIG_EDITORS = menuconfig
ifeq ($(BR2_x86_64),y)
XVISOR_ARCH = x86
else ifeq ($(BR2_arm)$(BR2_aarch64),y)
XVISOR_ARCH = arm
else
$(error "Architecture not supported by XVisor")
endif
XVISOR_MAKE_ENV = \ XVISOR_MAKE_ENV = \
ARCH=$(if $(BR2_x86_64),x86,$(BR2_ARCH)) \ ARCH=$(XVISOR_ARCH) \
CROSS_COMPILE=$(TARGET_CROSS) CROSS_COMPILE=$(TARGET_CROSS)
XVISOR_MAKE_OPTS = $(if $(VERBOSE),VERBOSE=1) XVISOR_MAKE_OPTS = $(if $(VERBOSE),VERBOSE=1)