t-head/meta-riscv
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-riscv synced 2026-09-06 16:54:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

machine: remove MACHINE_ARCH override to fix package collision

Browse Source 
Machine-specific packages (like Linux kernel) should have
machine-specific PACKAGE_ARCH that is obtained from MACHINE_ARCH. This
allows to separate their build artifacts in TMPDIR.

Currently all RISC-V machines override MACHINE_ARCH and artifacts for
machine-specific recipes collide. For example kernels of both
qemuriscv64 and freedom-u540 machines will be deployed into the same
$D directory.

Remove MACHINE_ARCH override and set tune PACKAGE_ARCH via
PACKAGE_EXTRA_ARCHS.

Signed-off-by: Taras Kondratiuk <takondra@cisco.com>
This commit is contained in:
Taras Kondratiuk
2018-04-29 00:34:07 -07:00
committed by Khem Raj
parent b708de6a45
commit 39a3237db5
5 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
conf/machine/freedom-u540.conf
View File

@@ -6,7 +6,6 @@
require conf/machine/include/tune-riscv.inc
MACHINE_FEATURES = "screen keyboard ext2 ext3 serial"
MACHINE_ARCH = "riscv64"
KERNEL_IMAGETYPE = "vmlinux"

4
conf/machine/include/tune-riscv.inc
View File

@@ -10,10 +10,10 @@ AVAILTUNES += "riscv64 riscv32"
TUNE_FEATURES_tune-riscv64 = "riscv64 littleendian"
TUNE_ARCH_tune-riscv64 = "riscv64"
TUNE_PKGARCH_tune-riscv64 = "riscv64"
PACKAGE_EXTRA_ARCHS_tune-riscv64 = ""
PACKAGE_EXTRA_ARCHS_tune-riscv64 = "riscv64"
TUNE_FEATURES_tune-riscv32 = "riscv32 littleendian"
TUNE_ARCH_tune-riscv32 = "riscv32"
TUNE_PKGARCH_tune-riscv32 = "riscv32"
PACKAGE_EXTRA_ARCHS_tune-riscv32 = ""
PACKAGE_EXTRA_ARCHS_tune-riscv32 = "riscv32"

1
conf/machine/qemuriscv64.conf
View File

@@ -6,7 +6,6 @@ require conf/machine/include/qemu.inc
require conf/machine/include/tune-riscv.inc
MACHINE_FEATURES = "screen keyboard ext2 ext3 serial"
MACHINE_ARCH = "riscv64"
KERNEL_IMAGETYPE = "vmlinux"

2
conf/machine/riscv32.conf
View File

@@ -6,8 +6,6 @@ DEFAULTTUNE = "riscv32"
require conf/machine/include/qemu.inc
require conf/machine/include/tune-riscv.inc
MACHINE_ARCH = "riscv32"
PREFERRED_VERSION_qemu = "${QEMUVERSION}"
PREFERRED_VERSION_qemu-native = "${QEMUVERSION}"
PREFERRED_VERSION_nativesdk-qemu = "${QEMUVERSION}"

2
conf/machine/riscv64.conf
View File

@@ -6,8 +6,6 @@ DEFAULTTUNE = "riscv64"
require conf/machine/include/qemu.inc
require conf/machine/include/tune-riscv.inc
MACHINE_ARCH = "riscv64"
PREFERRED_VERSION_qemu = "${QEMUVERSION}"
PREFERRED_VERSION_qemu-native = "${QEMUVERSION}"
PREFERRED_VERSION_nativesdk-qemu = "${QEMUVERSION}"