diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-09-21 17:31:55 -0700 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-09-22 15:51:17 -0400 |
commit | d945c7a9ededce73a5164089d84cea27a7db43c3 (patch) | |
tree | a73b3c65b1d535c49034c0dfb5bb8ce555b483a1 /recipes-core/runx/runx_git.bb | |
parent | d0ef2f0bf7551383cdb9f9adc3167530d674b22c (diff) | |
download | meta-virtualization-d945c7a9ededce73a5164089d84cea27a7db43c3.tar.gz |
runx: robustness changes
Adding one build and one runtime robustness change:
- build: specify the syroot native as a library path to qemu user.
This allows us to run dynamic executables
- runtime: add a patch to increase the serial fd timeout. We'll
drop this once it is merged upstream.
Signed-off-by: Bruce Ashfield <bruce.ashfield@xilinx.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-core/runx/runx_git.bb')
-rw-r--r-- | recipes-core/runx/runx_git.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-core/runx/runx_git.bb b/recipes-core/runx/runx_git.bb index bf84b2df..53c24641 100644 --- a/recipes-core/runx/runx_git.bb +++ b/recipes-core/runx/runx_git.bb | |||
@@ -12,6 +12,7 @@ SRC_URI = "\ | |||
12 | https://www.kernel.org/pub/linux/kernel/${KERNEL_URL_VER}/${KERNEL_SRC_VER}.tar.xz;destsuffix=git/kernel/build \ | 12 | https://www.kernel.org/pub/linux/kernel/${KERNEL_URL_VER}/${KERNEL_SRC_VER}.tar.xz;destsuffix=git/kernel/build \ |
13 | file://0001-make-kernel-cross-compilation-tweaks.patch \ | 13 | file://0001-make-kernel-cross-compilation-tweaks.patch \ |
14 | file://0001-make-initrd-cross-install-tweaks.patch \ | 14 | file://0001-make-initrd-cross-install-tweaks.patch \ |
15 | file://0001-runX-add-bounded-looping-timeout.patch \ | ||
15 | " | 16 | " |
16 | SRC_URI[md5sum] = "ce9b2d974d27408a61c53a30d3f98fb9" | 17 | SRC_URI[md5sum] = "ce9b2d974d27408a61c53a30d3f98fb9" |
17 | SRC_URI[sha256sum] = "bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491" | 18 | SRC_URI[sha256sum] = "bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491" |
@@ -31,7 +32,7 @@ inherit kernel-arch | |||
31 | 32 | ||
32 | # we have a busybox bbappend that makes /bin available to the | 33 | # we have a busybox bbappend that makes /bin available to the |
33 | # sysroot, and hence gets us the target binary that we need | 34 | # sysroot, and hence gets us the target binary that we need |
34 | DEPENDS = "busybox go-build" | 35 | DEPENDS = "busybox-initrd go-build" |
35 | 36 | ||
36 | # for the kernel build phase | 37 | # for the kernel build phase |
37 | DEPENDS += "openssl-native coreutils-native util-linux-native xz-native bc-native" | 38 | DEPENDS += "openssl-native coreutils-native util-linux-native xz-native bc-native" |
@@ -77,9 +78,8 @@ do_compile() { | |||
77 | 78 | ||
78 | # construct the initrd | 79 | # construct the initrd |
79 | echo "[INFO]: runx: constructing the initrd" | 80 | echo "[INFO]: runx: constructing the initrd" |
80 | |||
81 | cp ${STAGING_DIR_HOST}/bin/busybox.nosuid ${WORKDIR}/busybox | 81 | cp ${STAGING_DIR_HOST}/bin/busybox.nosuid ${WORKDIR}/busybox |
82 | export QEMU_USER=`which qemu-${HOST_ARCH}` | 82 | export QEMU_USER="`which qemu-${HOST_ARCH}` -L ${STAGING_BASELIBDIR}/.." |
83 | export BUSYBOX="${WORKDIR}/busybox" | 83 | export BUSYBOX="${WORKDIR}/busybox" |
84 | export CROSS_COMPILE="t" | 84 | export CROSS_COMPILE="t" |
85 | ${S}/initrd/make-initrd | 85 | ${S}/initrd/make-initrd |