3 files changed, 27 insertions, 33 deletions

diff --git a/recipes-core/runx/runx/0001-make-initrd-cross-install-tweaks.patch b/recipes-core/runx/runx/0001-make-initrd-cross-install-tweaks.patch
index c9fdc5d6..43c621e0 100644
--- a/recipes-core/runx/runx/0001-make-initrd-cross-install-tweaks.patch
+++ b/recipes-core/runx/runx/0001-make-initrd-cross-install-tweaks.patch
@@ -8,15 +8,15 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@xilinx.com>
  kernel/make-initrd | 18 ++++++++++++++++--
  1 file changed, 16 insertions(+), 2 deletions(-)
 
-diff --git a/kernel/make-initrd b/kernel/make-initrd
-index 4c299dc..9ef386f 100755
---- a/kernel/make-initrd
-+++ b/kernel/make-initrd
-@@ -16,8 +16,22 @@ mkdir -p $tmpdir/sys
+Index: git/initrd/make-initrd
+===================================================================
+--- git.orig/initrd/make-initrd
++++ git/initrd/make-initrd
+@@ -23,8 +23,22 @@
  mkdir -p $tmpdir/lib
  mkdir -p $tmpdir/var
  mkdir -p $tmpdir/mnt
--cp `which busybox` $tmpdir/bin
+-cp "$busybox" $tmpdir/bin/busybox
 -$tmpdir/bin/busybox --install $tmpdir/bin
 +
 +
@@ -35,8 +35,5 @@ index 4c299dc..9ef386f 100755
 +    $tmpdir/bin/busybox --install $tmpdir/bin
 +fi
  
- cp $init $tmpdir/init
- chmod +x $tmpdir/init
--- 
-2.17.1
-
+ mkdir -p $tmpdir/etc/init.d
+ cp $init $tmpdir/etc/init.d/rcS
diff --git a/recipes-core/runx/runx/0001-make-kernel-cross-compilation-tweaks.patch b/recipes-core/runx/runx/0001-make-kernel-cross-compilation-tweaks.patch
index 7d66f421..2821b61b 100644
--- a/recipes-core/runx/runx/0001-make-kernel-cross-compilation-tweaks.patch
+++ b/recipes-core/runx/runx/0001-make-kernel-cross-compilation-tweaks.patch
@@ -8,11 +8,11 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@xilinx.com>
  kernel/make-kernel | 41 +++++++++++++++++++++++++++++++++--------
  1 file changed, 33 insertions(+), 8 deletions(-)
 
-diff --git a/kernel/make-kernel b/kernel/make-kernel
-index 33b7150..c684669 100755
---- a/kernel/make-kernel
-+++ b/kernel/make-kernel
-@@ -13,6 +13,7 @@ fi
+Index: git/kernel/make-kernel
+===================================================================
+--- git.orig/kernel/make-kernel
++++ git/kernel/make-kernel
+@@ -13,6 +13,7 @@
  
  kernel_stuffdir=`readlink -f kernel`
  kernel_outpath=$kernel_stuffdir/out
@@ -20,9 +20,9 @@ index 33b7150..c684669 100755
  kernel_builddir=$kernel_stuffdir/build
  kernel_out=$kernel_outpath/kernel
  
-@@ -22,28 +23,52 @@ kernel_tarball="$kernel_name".tar.xz
- kernel_url=https://www.kernel.org/pub/linux/kernel/v4.x/"$kernel_tarball"
- kernel_src_config="$kernel_stuffdir"/cutdown-config.$ARCH
+@@ -22,28 +23,52 @@
+ kernel_url=https://www.kernel.org/pub/linux/kernel/v5.x/"$kernel_tarball"
+ kernel_src_config="$kernel_stuffdir"/cutdown-config."$ARCH"
  kernel_patchesdir="$kernel_stuffdir"/patches
 -kernel_image="$kernel_builddir"/"$kernel_name"/arch/"$ARCH"/boot/"$image"
 +kernel_image="$kernel_builddir"/arch/"$ARCH"/boot/"$image"
@@ -66,10 +66,10 @@ index 33b7150..c684669 100755
      do
          patch -p1 < $i
      done
--    cp $kernel_src_config .config
  fi
 -cd $kernel_builddir/$kernel_name
--make -j4 $image
+-cp $kernel_src_config .config
+-make -j "$(getconf _NPROCESSORS_ONLN)" $image
 +if [[ ! -f $kernel_builddir/.config ]]
 +then
 +    cp $kernel_src_config $kernel_builddir/.config
@@ -78,9 +78,6 @@ index 33b7150..c684669 100755
 +
 +echo "building the kernel ..."
 +eval make O=$kernel_builddir $build_vars oldconfig
-+eval make -j4 O=$kernel_builddir $build_vars $image
++eval make -j "$(getconf _NPROCESSORS_ONLN)" O=$kernel_builddir $build_vars $image
  
  cp $kernel_image $kernel_out
--- 
-2.17.1
-
diff --git a/recipes-core/runx/runx_git.bb b/recipes-core/runx/runx_git.bb
index 3b4cd335..991e6e1f 100644
--- a/recipes-core/runx/runx_git.bb
+++ b/recipes-core/runx/runx_git.bb
@@ -2,15 +2,15 @@ HOMEPAGE = "https://github.com/lf-edge/runx"
 SUMMARY = "runx stuff"
 DESCRIPTION = "Xen Runtime for OCI"
 
-SRCREV_runx = "da0c75c58ae5232d19b1791c33545db3225e1ea9"
+SRCREV_runx = "f24efd33fb18469e9cfe4d1bfe8e2c90ec8c4e93"
 SRC_URI = "\
           git://github.com/lf-edge/runx;nobranch=1;name=runx \
-          https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.15.tar.xz;destsuffix=git/kernel/build \
+          https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz;destsuffix=git/kernel/build \
           file://0001-make-kernel-cross-compilation-tweaks.patch \
           file://0001-make-initrd-cross-install-tweaks.patch \
           "
-SRC_URI[md5sum] = "0d701ac1e2a67d47ce7127432df2c32b"
-SRC_URI[sha256sum] = "5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769"
+SRC_URI[md5sum] = "ce9b2d974d27408a61c53a30d3f98fb9"
+SRC_URI[sha256sum] = "bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=945fc9aa694796a6337395cc291ddd8c"
@@ -31,7 +31,7 @@ DEPENDS = "busybox go-build"
 
 # for the kernel build phase
 DEPENDS += "openssl-native coreutils-native util-linux-native xz-native bc-native"
-DEPENDS += "qemu-native"
+DEPENDS += "qemu-native bison-native"
 
 RDEPENDS_${PN} += " jq bash"
 RDEPENDS_${PN} += " xen-tools-xl go-build socat daemonize"
@@ -77,7 +77,7 @@ do_compile() {
     export QEMU_USER=`which qemu-${HOST_ARCH}`
     export BUSYBOX="${WORKDIR}/busybox"
     export CROSS_COMPILE="t"
-    ${S}/kernel/make-initrd
+    ${S}/initrd/make-initrd
 }
 
 do_install() {
@@ -86,11 +86,11 @@ do_install() {
     
     install -d ${D}${datadir}/runX
     install -m 755 ${S}/kernel/out/kernel ${D}/${datadir}/runX
-    install -m 755 ${S}/kernel/out/initrd ${D}/${datadir}/runX
+    install -m 755 ${S}/initrd/out/initrd ${D}/${datadir}/runX
     install -m 755 ${S}/files/start ${D}/${datadir}/runX
+    install -m 755 ${S}/files/create ${D}/${datadir}/runX
     install -m 755 ${S}/files/state ${D}/${datadir}/runX
     install -m 755 ${S}/files/delete ${D}/${datadir}/runX
-    install -m 755 ${S}/files/serial_bridge ${D}/${datadir}/runX
     install -m 755 ${S}/files/serial_start ${D}/${datadir}/runX