Skip to contentSkip to conversation

runx: add additional dependencies

PATCH In review Bruce Ashfield 3 participants 12 messages Sep 22, 2020 – Oct 2, 2020 Arm/Zynq architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/7 runx: add additional dependencies

From: Bruce Ashfield <[email protected]>

There are some missing dependencies for a fully functional runx host. We add them here.

---
 recipes-core/runx/runx_git.bb | 1 +
 1 file changed, 1 insertion(+)
recipes-core/runx/runx_git.bb +1 -0
index a260071..bf84b2d 100644
@@ -39,6 +39,7 @@ DEPENDS += "qemu-native bison-native"
 
 RDEPENDS_${PN} += " jq bash"
 RDEPENDS_${PN} += " xen-tools-xl go-build socat daemonize"
+RDEPENDS_${PN} += " qemu-system-i386 ca-certificates qemu qemu-keymaps"
 
 do_compile() {
     # we'll need this for the initrd later, so lets error if it isn't what
Signature · 1 line
2.19.1
#1 lore raw

PATCH 2/7 xen: make kernel modules an override possible variable

From: Bruce Ashfield <[email protected]>

Sometimes Xen is built with different mixes of kernel modules and built-in values. If we put our expected/default modules in a variable, they can be overriden by a different kernel provider as required

---
 recipes-extended/images/xen-image-minimal.bb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
recipes-extended/images/xen-image-minimal.bb +7 -7
index 1b45397..6733801 100644
@@ -2,16 +2,16 @@ DESCRIPTION = "A minimal xen image"
 
 INITRD_IMAGE = "core-image-minimal-initramfs"
 
+XEN_KERNEL_MODULES ?= "kernel-module-xen-blkback kernel-module-xen-gntalloc \
+                       kernel-module-xen-gntdev kernel-module-xen-netback kernel-module-xen-wdt \
+                       ${@bb.utils.contains('MACHINE_FEATURES', 'pci', "${XEN_PCIBACK_MODULE}", '', d)} \
+                       ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'kernel-module-xen-acpi-processor', '', d)} \
+                      "
+
 IMAGE_INSTALL += " \
     packagegroup-core-boot \
     packagegroup-core-ssh-openssh \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'kernel-module-xen-acpi-processor', '', d)} \
-    kernel-module-xen-blkback \
-    kernel-module-xen-gntalloc \
-    kernel-module-xen-gntdev \
-    kernel-module-xen-netback \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'pci', "${XEN_PCIBACK_MODULE}", '', d)} \
-    kernel-module-xen-wdt \
+    ${XEN_KERNEL_MODULES} \
     xen-tools \
     qemu \
     "
Signature · 1 line
2.19.1
#2 lore raw

Re: [PATCH 2/7] xen: make kernel modules an override possible variable

Christopher:

I pushed an earlier Xen commit by mistake (make QB assignments weak), but I wanted to bring this one to your attention.

I've been fixing the support for Xen on some Xilinx SOCs and these are my commits to do so.

There's a new dynamic layer for xilinx, and just the one Xen tweak to adjust to some kernel details (when not using linux-yocto).

Let me know if you think it'll cause problems for you .. the default isn't changed, but you never know what you miss when mucking with this stuff.

Bruce

Quoted 45 lines · On Tue, Sep 22, 2020 at 3:45 PM <[email protected]> wrote:

From: Bruce Ashfield <[email protected]>

Sometimes Xen is built with different mixes of kernel modules and built-in values. If we put our expected/default modules in a variable, they can be overriden by a different kernel provider as required

---
 recipes-extended/images/xen-image-minimal.bb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
recipes-extended/images/xen-image-minimal.bb +7 -8
index 1b45397..6733801 100644
@@ -2,16 +2,16 @@ DESCRIPTION = "A minimal xen image"
 
 INITRD_IMAGE = "core-image-minimal-initramfs"
 
+XEN_KERNEL_MODULES ?= "kernel-module-xen-blkback kernel-module-xen-gntalloc \
+                       kernel-module-xen-gntdev kernel-module-xen-netback kernel-module-xen-wdt \
+                       ${@bb.utils.contains('MACHINE_FEATURES', 'pci', "${XEN_PCIBACK_MODULE}", '', d)} \
+                       ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'kernel-module-xen-acpi-processor', '', d)} \
+                      "
+
 IMAGE_INSTALL += " \
     packagegroup-core-boot \
     packagegroup-core-ssh-openssh \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'kernel-module-xen-acpi-processor', '', d)} \
-    kernel-module-xen-blkback \
-    kernel-module-xen-gntalloc \
-    kernel-module-xen-gntdev \
-    kernel-module-xen-netback \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'pci', "${XEN_PCIBACK_MODULE}", '', d)} \
-    kernel-module-xen-wdt \
+    ${XEN_KERNEL_MODULES} \
     xen-tools \
     qemu \
     "
--

2.19.1

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
#3 lore raw

Re: [PATCH 2/7] xen: make kernel modules an override possible variable

Quoted 9 lines · Bruce Ashfield

Christopher:

I pushed an earlier Xen commit by mistake (make QB assignments weak), but I wanted to bring this one to your attention.

I've been fixing the support for Xen on some Xilinx SOCs and these are my commits to do so.

Quoted 6 lines

There's a new dynamic layer for xilinx, and just the one Xen tweak to adjust to some kernel details (when not using linux-yocto).

Let me know if you think it'll cause problems for you .. the default isn't changed, but you never know what you miss when mucking with this stuff.

Bruce - sorry I missed this message earlier. I should have time to take a look at these next week. I can see that they're already in, so can follow up if needed.

Christopher

Quoted 55 lines

Bruce

Quoted 43 lines · On Tue, Sep 22, 2020 at 3:45 PM <[email protected]> wrote:

From: Bruce Ashfield <[email protected]>

Sometimes Xen is built with different mixes of kernel modules and built-in values. If we put our expected/default modules in a variable, they can be overriden by a different kernel provider as required

---
 recipes-extended/images/xen-image-minimal.bb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
recipes-extended/images/xen-image-minimal.bb +7 -8
index 1b45397..6733801 100644
@@ -2,16 +2,16 @@ DESCRIPTION = "A minimal xen image"
 
 INITRD_IMAGE = "core-image-minimal-initramfs"
 
+XEN_KERNEL_MODULES ?= "kernel-module-xen-blkback kernel-module-xen-gntalloc \
+                       kernel-module-xen-gntdev kernel-module-xen-netback kernel-module-xen-wdt \
+                       ${@bb.utils.contains('MACHINE_FEATURES', 'pci', "${XEN_PCIBACK_MODULE}", '', d)} \
+                       ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'kernel-module-xen-acpi-processor', '', d)} \
+                      "
+
 IMAGE_INSTALL += " \
     packagegroup-core-boot \
     packagegroup-core-ssh-openssh \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'kernel-module-xen-acpi-processor', '', d)} \
-    kernel-module-xen-blkback \
-    kernel-module-xen-gntalloc \
-    kernel-module-xen-gntdev \
-    kernel-module-xen-netback \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'pci', "${XEN_PCIBACK_MODULE}", '', d)} \
-    kernel-module-xen-wdt \
+    ${XEN_KERNEL_MODULES} \
     xen-tools \
     qemu \
     "
--
Quoted 2 lines

2.19.1

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

#4 lore raw

PATCH 3/7 busybox: add initrd variant

In reply to Bruce Ashfield

From: Bruce Ashfield <[email protected]>

Add a busybox variant that inherits almost all of its support from the core busybox recipe, but adds configuration values that are appropriate to be used in an initrd.

In particular:

- we build busybox statically
- we enable runlevel and init functionality
- mdev is always enabled
- applet install support is enabled

---
 .../busybox/busybox-initrd/initrd.cfg         | 14 +++++++++++++
 recipes-core/busybox/busybox-initrd/runx.cfg  |  1 +
 recipes-core/busybox/busybox-initrd_1.32.0.bb | 20 +++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 recipes-core/busybox/busybox-initrd/initrd.cfg
 create mode 100644 recipes-core/busybox/busybox-initrd/runx.cfg
 create mode 100644 recipes-core/busybox/busybox-initrd_1.32.0.bb
recipes-core/busybox/busybox-initrd/initrd.cfg new file +14 -0
new file mode 100644
index 0000000..9f64c4c
@@ -0,0 +1,14 @@
+CONFIG_INIT=y
+CNOFIG_FEATURE_UTMP=y
+CONFIG_RUNLEVEL=y
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_HALT=y
+CONFIG_POWEROFF=y
+CONFIG_FEATURE_KILL_DELAY=0
+CONFIG_TELINIT_PATH=""
+CONFIG_INIT_TERMINAL_TYPE=""
+
+# CONFIG_FEATURE_SHADOWPASSWDS is not set
+CONFIG_USE_BB_PWD_GRP=y
+
+CONFIG_STATIC=y
recipes-core/busybox/busybox-initrd/runx.cfg new file +1 -0
new file mode 100644
index 0000000..1f1ac6a
@@ -0,0 +1 @@
+CONFIG_FEATURE_INSTALLER=y
recipes-core/busybox/busybox-initrd_1.32.0.bb new file +20 -0
new file mode 100644
index 0000000..82edb57
@@ -0,0 +1,20 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/busybox-initrd:${COREBASE}/meta/recipes-core/busybox/busybox:${COREBASE}/meta/recipes-core/busybox/files:"
+
+require recipes-core/busybox/busybox_${PV}.bb
+
+SRC_URI += "file://init.cfg \
+            file://mdev.cfg \
+            file://runx.cfg \
+            file://initrd.cfg"
+
+S = "${WORKDIR}/busybox-${PV}"
+
+# override security-flags settings, we have some warnings to ignore
+SECURITY_STRINGFORMAT = ""
+
+# we do this to get the target binary available to recipes that
+# depend on busybox
+SYSROOT_DIRS += "/bin"
+BUSYBOX_SPLIT_SUID = "0"
+
+FILES_${PN} += "${sysconfdir}/init.d/*"
Signature · 1 line
2.19.1
#5 lore raw

Re: [meta-virtualization] [PATCH 3/7] busybox: add initrd variant

Not sure if it's worth adding an DISABLE_STATIC exception for libxcrypt in meta/conf/distro/include/no-static-libs.inc or libxcrypt recipe, but for DISTROs which include conf/distro/include/no-static-libs.inc this recipe fails with:
ld: error: cannot find -lcrypt
because there won't be static libcrypt.a in RSS.

Quoted 88 lines · Bruce Ashfield

From: Bruce Ashfield <[email protected]>

Add a busybox variant that inherits almost all of its support from the core busybox recipe, but adds configuration values that are appropriate to be used in an initrd.

In particular:

- we build busybox statically
- we enable runlevel and init functionality
- mdev is always enabled
- applet install support is enabled

---
 .../busybox/busybox-initrd/initrd.cfg         | 14 +++++++++++++
 recipes-core/busybox/busybox-initrd/runx.cfg  |  1 +
 recipes-core/busybox/busybox-initrd_1.32.0.bb | 20 +++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 recipes-core/busybox/busybox-initrd/initrd.cfg
 create mode 100644 recipes-core/busybox/busybox-initrd/runx.cfg
 create mode 100644 recipes-core/busybox/busybox-initrd_1.32.0.bb
recipes-core/busybox/busybox-initrd/initrd.cfg new file +14 -0
new file mode 100644
index 0000000..9f64c4c
@@ -0,0 +1,14 @@
+CONFIG_INIT=y
+CNOFIG_FEATURE_UTMP=y
+CONFIG_RUNLEVEL=y
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_HALT=y
+CONFIG_POWEROFF=y
+CONFIG_FEATURE_KILL_DELAY=0
+CONFIG_TELINIT_PATH=""
+CONFIG_INIT_TERMINAL_TYPE=""
+
+# CONFIG_FEATURE_SHADOWPASSWDS is not set
+CONFIG_USE_BB_PWD_GRP=y
+
+CONFIG_STATIC=y
recipes-core/busybox/busybox-initrd/runx.cfg new file +1 -0
new file mode 100644
index 0000000..1f1ac6a
@@ -0,0 +1 @@
+CONFIG_FEATURE_INSTALLER=y
recipes-core/busybox/busybox-initrd_1.32.0.bb new file +1 -0
new file mode 100644
index 0000000..82edb57
@@ -0,0 +1,20 @@
+FILESEXTRAPATHS_prepend :=

"${THISDIR}/busybox-initrd:${COREBASE}/meta/recipes-core/busybox/busybox:${COREBASE}/meta/recipes-core/busybox/files:"

recipes-core/busybox/busybox-initrd_1.32.0.bb new file +19 -1
+
+require recipes-core/busybox/busybox_${PV}.bb
+
+SRC_URI += "file://init.cfg \
+            file://mdev.cfg \
+            file://runx.cfg \
+            file://initrd.cfg"
+
+S = "${WORKDIR}/busybox-${PV}"
+
+# override security-flags settings, we have some warnings to ignore
+SECURITY_STRINGFORMAT = ""
+
+# we do this to get the target binary available to recipes that
+# depend on busybox
+SYSROOT_DIRS += "/bin"
+BUSYBOX_SPLIT_SUID = "0"
+
+FILES_${PN} += "${sysconfdir}/init.d/*"
--

2.19.1

#6 lore raw

Re: [meta-virtualization] [PATCH 3/7] busybox: add initrd variant

Quoted 4 lines · Martin Jansa

Not sure if it's worth adding an DISABLE_STATIC exception for libxcrypt in meta/conf/distro/include/no-static-libs.inc or libxcrypt recipe, but for DISTROs which include conf/distro/include/no-static-libs.inc this recipe fails with:
ld: error: cannot find -lcrypt
because there won't be static libcrypt.a in RSS.

Aha.

I hadn't considered that. I should be able to fix that up with a libxcrypte bbappend, that triggers only on a distro feature.

Bruce

Quoted 86 lines · Bruce Ashfield
Quoted 84 lines

From: Bruce Ashfield <[email protected]>

Add a busybox variant that inherits almost all of its support from the core busybox recipe, but adds configuration values that are appropriate to be used in an initrd.

In particular:

- we build busybox statically
- we enable runlevel and init functionality
- mdev is always enabled
- applet install support is enabled

---
 .../busybox/busybox-initrd/initrd.cfg         | 14 +++++++++++++
 recipes-core/busybox/busybox-initrd/runx.cfg  |  1 +
 recipes-core/busybox/busybox-initrd_1.32.0.bb | 20 +++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 recipes-core/busybox/busybox-initrd/initrd.cfg
 create mode 100644 recipes-core/busybox/busybox-initrd/runx.cfg
 create mode 100644 recipes-core/busybox/busybox-initrd_1.32.0.bb
recipes-core/busybox/busybox-initrd/initrd.cfg new file +14 -0
new file mode 100644
index 0000000..9f64c4c
@@ -0,0 +1,14 @@
+CONFIG_INIT=y
+CNOFIG_FEATURE_UTMP=y
+CONFIG_RUNLEVEL=y
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_HALT=y
+CONFIG_POWEROFF=y
+CONFIG_FEATURE_KILL_DELAY=0
+CONFIG_TELINIT_PATH=""
+CONFIG_INIT_TERMINAL_TYPE=""
+
+# CONFIG_FEATURE_SHADOWPASSWDS is not set
+CONFIG_USE_BB_PWD_GRP=y
+
+CONFIG_STATIC=y
recipes-core/busybox/busybox-initrd/runx.cfg new file +1 -0
new file mode 100644
index 0000000..1f1ac6a
@@ -0,0 +1 @@
+CONFIG_FEATURE_INSTALLER=y
recipes-core/busybox/busybox-initrd_1.32.0.bb new file +20 -1
new file mode 100644
index 0000000..82edb57
@@ -0,0 +1,20 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/busybox-initrd:${COREBASE}/meta/recipes-core/busybox/busybox:${COREBASE}/meta/recipes-core/busybox/files:"
+
+require recipes-core/busybox/busybox_${PV}.bb
+
+SRC_URI += "file://init.cfg \
+            file://mdev.cfg \
+            file://runx.cfg \
+            file://initrd.cfg"
+
+S = "${WORKDIR}/busybox-${PV}"
+
+# override security-flags settings, we have some warnings to ignore
+SECURITY_STRINGFORMAT = ""
+
+# we do this to get the target binary available to recipes that
+# depend on busybox
+SYSROOT_DIRS += "/bin"
+BUSYBOX_SPLIT_SUID = "0"
+
+FILES_${PN} += "${sysconfdir}/init.d/*"
--

2.19.1

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
#7 lore raw

Re: [meta-virtualization] [PATCH 3/7] busybox: add initrd variant

Quoted 11 lines · Bruce Ashfield
Quoted 4 lines · Martin Jansa

Not sure if it's worth adding an DISABLE_STATIC exception for libxcrypt in meta/conf/distro/include/no-static-libs.inc or libxcrypt recipe, but for DISTROs which include conf/distro/include/no-static-libs.inc this recipe fails with:
ld: error: cannot find -lcrypt
because there won't be static libcrypt.a in RSS.

Aha.

I hadn't considered that. I should be able to fix that up with a libxcrypte bbappend, that triggers only on a distro feature.

As it turns out, I've already been down the route with the busybox configuration associated with the 'vmsep' distro feature.

So, I split the CONFIG_STATIC into a separate fragment, and only enable it when the vmsep distro feature is set. When vmsep is set, there's a bbappend for libxcrypt that makes sure it is statically available (and that's been in the layer for a while now).

Hopefully that solves the issue.

Bruce

Quoted 95 lines

Bruce

Quoted 78 lines · Bruce Ashfield
Quoted 76 lines

From: Bruce Ashfield <[email protected]>

Add a busybox variant that inherits almost all of its support from the core busybox recipe, but adds configuration values that are appropriate to be used in an initrd.

In particular:

- we build busybox statically
- we enable runlevel and init functionality
- mdev is always enabled
- applet install support is enabled

---
 .../busybox/busybox-initrd/initrd.cfg         | 14 +++++++++++++
 recipes-core/busybox/busybox-initrd/runx.cfg  |  1 +
 recipes-core/busybox/busybox-initrd_1.32.0.bb | 20 +++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 recipes-core/busybox/busybox-initrd/initrd.cfg
 create mode 100644 recipes-core/busybox/busybox-initrd/runx.cfg
 create mode 100644 recipes-core/busybox/busybox-initrd_1.32.0.bb
recipes-core/busybox/busybox-initrd/initrd.cfg new file +14 -0
new file mode 100644
index 0000000..9f64c4c
@@ -0,0 +1,14 @@
+CONFIG_INIT=y
+CNOFIG_FEATURE_UTMP=y
+CONFIG_RUNLEVEL=y
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_HALT=y
+CONFIG_POWEROFF=y
+CONFIG_FEATURE_KILL_DELAY=0
+CONFIG_TELINIT_PATH=""
+CONFIG_INIT_TERMINAL_TYPE=""
+
+# CONFIG_FEATURE_SHADOWPASSWDS is not set
+CONFIG_USE_BB_PWD_GRP=y
+
+CONFIG_STATIC=y
recipes-core/busybox/busybox-initrd/runx.cfg new file +1 -0
new file mode 100644
index 0000000..1f1ac6a
@@ -0,0 +1 @@
+CONFIG_FEATURE_INSTALLER=y
recipes-core/busybox/busybox-initrd_1.32.0.bb new file +18 -0
new file mode 100644
index 0000000..82edb57
@@ -0,0 +1,20 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/busybox-initrd:${COREBASE}/meta/recipes-core/busybox/busybox:${COREBASE}/meta/recipes-core/busybox/files:"
+
+require recipes-core/busybox/busybox_${PV}.bb
+
+SRC_URI += "file://init.cfg \
+            file://mdev.cfg \
+            file://runx.cfg \
+            file://initrd.cfg"
+
+S = "${WORKDIR}/busybox-${PV}"
+
+# override security-flags settings, we have some warnings to ignore
+SECURITY_STRINGFORMAT = ""
+
+# we do this to get the target binary available to recipes that
+# depend on busybox
+SYSROOT_DIRS += "/bin"
+BUSYBOX_SPLIT_SUID = "0"
Quoted 8 lines
Quoted 8 lines
recipes-core/busybox/busybox-initrd_1.32.0.bb new file +2 -1
+
+FILES_${PN} += "${sysconfdir}/init.d/*"
--

2.19.1

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
#8 lore raw

PATCH 4/7 runx: robustness changes

In reply to Bruce Ashfield

From: Bruce Ashfield <[email protected]>

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.

---
 ...001-runX-add-bounded-looping-timeout.patch | 35 +++++++++++++++++++
 recipes-core/runx/runx_git.bb                 |  6 ++--
 2 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 recipes-core/runx/runx/0001-runX-add-bounded-looping-timeout.patch
recipes-core/runx/runx/0001-runX-add-bounded-looping-timeout.patch new file +35 -0
new file mode 100644
index 0000000..b4c6efa
@@ -0,0 +1,35 @@
+From 1cf4ff2137252c63687f54e09626850cfab6e9f9 Mon Sep 17 00:00:00 2001
+From: Rob Woolley <[email protected]>
+Date: Thu, 17 Sep 2020 19:41:06 -0700
+Subject: [PATCH] runX: add bounded / looping timeout
+
+On slower machines, we may need a longer timeout before giving
+up.
+
+Signed-off-by: Rob Woolley <[email protected]>
+---
+ git/runX | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/runX b/runX
+index 492cb4c..70c95e1 100755
+--- a/runX
++++ b/runX
+@@ -119,7 +119,13 @@ then
+         daemonize $workpath/serial_start \
+           "$containerid" \
+           "$crundir"/console_pty
+-        sleep .1
++        for n in 5 4 3 2 1; do
++            if [ ! -l "$crundir"/console_pty ]; then
++              break;
++            else
++              sleep .1;
++            fi;
++        done
+         daemonize $workpath/serial_fd_handler \
+           "$guestconsole" \
+           "$crundir"/console_pty
+-- 
+2.17.1
+
recipes-core/runx/runx_git.bb +3 -3
index bf84b2d..53c2464 100644
@@ -12,6 +12,7 @@ SRC_URI = "\
           https://www.kernel.org/pub/linux/kernel/${KERNEL_URL_VER}/${KERNEL_SRC_VER}.tar.xz;destsuffix=git/kernel/build \
           file://0001-make-kernel-cross-compilation-tweaks.patch \
           file://0001-make-initrd-cross-install-tweaks.patch \
+          file://0001-runX-add-bounded-looping-timeout.patch \
 	  "
 SRC_URI[md5sum] = "ce9b2d974d27408a61c53a30d3f98fb9"
 SRC_URI[sha256sum] = "bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491"
@@ -31,7 +32,7 @@ inherit kernel-arch
 
 # we have a busybox bbappend that makes /bin available to the
 # sysroot, and hence gets us the target binary that we need
-DEPENDS = "busybox go-build"
+DEPENDS = "busybox-initrd go-build"
 
 # for the kernel build phase
 DEPENDS += "openssl-native coreutils-native util-linux-native xz-native bc-native"
@@ -77,9 +78,8 @@ do_compile() {
 
     # construct the initrd
     echo "[INFO]: runx: constructing the initrd"
-
     cp ${STAGING_DIR_HOST}/bin/busybox.nosuid ${WORKDIR}/busybox
-    export QEMU_USER=`which qemu-${HOST_ARCH}`
+    export QEMU_USER="`which qemu-${HOST_ARCH}` -L ${STAGING_BASELIBDIR}/.."
     export BUSYBOX="${WORKDIR}/busybox"
     export CROSS_COMPILE="t"
     ${S}/initrd/make-initrd
Signature · 1 line
2.19.1
#9 lore raw

PATCH 5/7 dynamic-layers: add xilinx dynamic layer for Xen support

In reply to Bruce Ashfield

From: Bruce Ashfield <[email protected]>

Although this dynamic layer currently only adds Xen support, it will eventually hold other board and platform specific tweaks to core meta-virt recipes.

---
 .../xilinx/recipes-extended/xen/xen-xilinx.inc     | 14 ++++++++++++++
 .../xilinx/recipes-extended/xen/xen_4.14.bbappend  |  1 +
 .../xilinx/recipes-extended/xen/xen_git.bbappend   |  1 +
 3 files changed, 16 insertions(+)
 create mode 100644 dynamic-layers/xilinx/recipes-extended/xen/xen-xilinx.inc
 create mode 100644 dynamic-layers/xilinx/recipes-extended/xen/xen_4.14.bbappend
 create mode 100644 dynamic-layers/xilinx/recipes-extended/xen/xen_git.bbappend
dynamic-layers/xilinx/recipes-extended/xen/xen-xilinx.inc new file +14 -0
new file mode 100644
index 0000000..344061a
@@ -0,0 +1,14 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+DEPENDS += "u-boot-mkimage-native"
+DEPENDS += "dtc-native"
+
+XENIMAGE_KERNEL_LOADADDRESS ?= "0x6000000"
+do_deploy_append() {
+       if [ -f ${DEPLOYDIR}/xen-${MACHINE} ]; then
+           uboot-mkimage -A arm64 -T kernel -a ${XENIMAGE_KERNEL_LOADADDRESS} -e ${XENIMAGE_KERNEL_LOADADDRESS} -C none -d ${DEPLOYDIR}/xen-${MACHINE} ${DEPLOYDIR}/xen.ub
+       fi
+}
+
+deltask do_deploy_setscene
+deltask do_populate_sysroot_setscene
dynamic-layers/xilinx/recipes-extended/xen/xen_4.14.bbappend new file +1 -0
new file mode 100644
index 0000000..54edd1b
@@ -0,0 +1 @@
+include xen-xilinx.inc
dynamic-layers/xilinx/recipes-extended/xen/xen_git.bbappend new file +1 -0
new file mode 100644
index 0000000..54edd1b
@@ -0,0 +1 @@
+include xen-xilinx.inc
Signature · 1 line
2.19.1
#10 lore raw

PATCH 6/7 conf: enable xilinx dynamic layer

In reply to Bruce Ashfield

From: Bruce Ashfield <[email protected]>

---
 conf/layer.conf | 2 ++
 1 file changed, 2 insertions(+)
conf/layer.conf +2 -0
index 1ec7a15..16d071b 100644
@@ -24,6 +24,8 @@ BBFILES += "${@' '.join('${LAYERDIR}/dynamic-layers/%s/recipes*/*/*.bb' % layer
 BBFILES_DYNAMIC += " \
     raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/*/*/*.bb \
     raspberrypi:${LAYERDIR}/dynamic-layers/rasbperrypi/*/*/*.bbappend \
+    xilinx:${LAYERDIR}/dynamic-layers/xilinx/*/*/*.bb \
+    xilinx:${LAYERDIR}/dynamic-layers/xilinx/*/*/*.bbappend \
 "
 
 # This should only be incremented on significant changes that will
Signature · 1 line
2.19.1
#11 lore raw

PATCH 7/7 runx: allow internal and external busybox

In reply to Bruce Ashfield

From: Bruce Ashfield <[email protected]>

runx knows how to build its own copy of busybox for its initrd, adding a flag to allow us to select which mode we want.

---
 ...01-Add-busybox-cross-build-for-arm64.patch | 1273 +++++++++++++++++
 .../0002-don-t-call-busybox-install.patch     |  348 +++++
 recipes-core/runx/runx_git.bb                 |   29 +-
 3 files changed, 1645 insertions(+), 5 deletions(-)
 create mode 100644 recipes-core/runx/runx/0001-Add-busybox-cross-build-for-arm64.patch
 create mode 100644 recipes-core/runx/runx/0002-don-t-call-busybox-install.patch
recipes-core/runx/runx/0001-Add-busybox-cross-build-for-arm64.patch new file +1273 -0
new file mode 100644
index 0000000..2f27e9d
@@ -0,0 +1,1273 @@
+From 33502707dd6ae154736ba4685abd89d45244797b Mon Sep 17 00:00:00 2001
+From: Stefano Stabellini <[email protected]>
+Date: Mon, 21 Sep 2020 12:35:05 -0700
+Subject: [PATCH 1/2] Add busybox (cross)build for arm64
+
+So far the busybox binary to use for the domU initrd has to be
+externally provided. While we still support that, also add the ability
+to fetch busybox and cross-compile it with the right config on arm64.
+
+Signed-off-by: Stefano Stabellini <[email protected]>
+---
+ initrd/config.arm64 | 1198 +++++++++++++++++++++++++++++++++++++++++++
+ initrd/make-initrd  |   28 +-
+ 2 files changed, 1224 insertions(+), 2 deletions(-)
+ create mode 100644 initrd/config.arm64
+
+diff --git a/initrd/config.arm64 b/initrd/config.arm64
+new file mode 100644
+index 0000000..5c01829
+--- /dev/null
++++ b/initrd/config.arm64
+@@ -0,0 +1,1198 @@
++#
++# Automatically generated make config: don't edit
++# Busybox version: 1.32.0
++# Mon Sep 21 12:15:18 2020
++#
++CONFIG_HAVE_DOT_CONFIG=y
++
++#
++# Settings
++#
++CONFIG_DESKTOP=y
++# CONFIG_EXTRA_COMPAT is not set
++# CONFIG_FEDORA_COMPAT is not set
++# CONFIG_INCLUDE_SUSv2 is not set
++CONFIG_LONG_OPTS=y
++CONFIG_SHOW_USAGE=y
++CONFIG_FEATURE_VERBOSE_USAGE=y
++CONFIG_FEATURE_COMPRESS_USAGE=y
++CONFIG_LFS=y
++# CONFIG_PAM is not set
++CONFIG_FEATURE_DEVPTS=y
++# CONFIG_FEATURE_UTMP is not set
++# CONFIG_FEATURE_WTMP is not set
++CONFIG_FEATURE_PIDFILE=y
++CONFIG_PID_FILE_PATH="/var/run"
++CONFIG_BUSYBOX=y
++# CONFIG_FEATURE_SHOW_SCRIPT is not set
++CONFIG_FEATURE_INSTALLER=y
++# CONFIG_INSTALL_NO_USR is not set
++CONFIG_FEATURE_SUID=y
++# CONFIG_FEATURE_SUID_CONFIG is not set
++# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
++# CONFIG_FEATURE_PREFER_APPLETS is not set
++CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox"
++# CONFIG_SELINUX is not set
++# CONFIG_FEATURE_CLEAN_UP is not set
++CONFIG_FEATURE_SYSLOG_INFO=y
++CONFIG_FEATURE_SYSLOG=y
++CONFIG_PLATFORM_LINUX=y
++
++#
++# Build Options
++#
++CONFIG_STATIC=y
++# CONFIG_PIE is not set
++# CONFIG_NOMMU is not set
++# CONFIG_BUILD_LIBBUSYBOX is not set
++# CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set
++# CONFIG_FEATURE_INDIVIDUAL is not set
++# CONFIG_FEATURE_SHARED_BUSYBOX is not set
++CONFIG_CROSS_COMPILER_PREFIX=""
++CONFIG_SYSROOT=""
++CONFIG_EXTRA_CFLAGS=""
++CONFIG_EXTRA_LDFLAGS=""
++CONFIG_EXTRA_LDLIBS=""
++# CONFIG_USE_PORTABLE_CODE is not set
++CONFIG_STACK_OPTIMIZATION_386=y
++
++#
++# Installation Options ("make install" behavior)
++#
++# CONFIG_INSTALL_APPLET_SYMLINKS is not set
++# CONFIG_INSTALL_APPLET_HARDLINKS is not set
++# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
++CONFIG_INSTALL_APPLET_DONT=y
++# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
++# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
++# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
++CONFIG_PREFIX="/home/ncopa/aports/main/busybox/pkg/busybox"
++
++#
++# Debugging Options
++#
++# CONFIG_DEBUG is not set
++# CONFIG_DEBUG_PESSIMIZE is not set
++# CONFIG_DEBUG_SANITIZE is not set
++# CONFIG_UNIT_TEST is not set
++# CONFIG_WERROR is not set
++# CONFIG_WARN_SIMPLE_MSG is not set
++CONFIG_NO_DEBUG_LIB=y
++# CONFIG_DMALLOC is not set
++# CONFIG_EFENCE is not set
++
++#
++# Library Tuning
++#
++# CONFIG_FEATURE_USE_BSS_TAIL is not set
++CONFIG_FLOAT_DURATION=y
++CONFIG_FEATURE_RTMINMAX=y
++CONFIG_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS=y
++CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
++# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
++# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
++CONFIG_PASSWORD_MINLEN=6
++CONFIG_MD5_SMALL=0
++CONFIG_SHA3_SMALL=0
++CONFIG_FEATURE_FAST_TOP=y
++# CONFIG_FEATURE_ETC_NETWORKS is not set
++# CONFIG_FEATURE_ETC_SERVICES is not set
++CONFIG_FEATURE_EDITING=y
++CONFIG_FEATURE_EDITING_MAX_LEN=1024
++CONFIG_FEATURE_EDITING_VI=y
++CONFIG_FEATURE_EDITING_HISTORY=8192
++CONFIG_FEATURE_EDITING_SAVEHISTORY=y
++# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set
++CONFIG_FEATURE_REVERSE_SEARCH=y
++CONFIG_FEATURE_TAB_COMPLETION=y
++CONFIG_FEATURE_USERNAME_COMPLETION=y
++CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
++CONFIG_FEATURE_EDITING_WINCH=y
++CONFIG_FEATURE_EDITING_ASK_TERMINAL=y
++CONFIG_LOCALE_SUPPORT=y
++CONFIG_UNICODE_SUPPORT=y
++CONFIG_UNICODE_USING_LOCALE=y
++# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
++CONFIG_SUBST_WCHAR=63
++CONFIG_LAST_SUPPORTED_WCHAR=1114111
++CONFIG_UNICODE_COMBINING_WCHARS=y
++CONFIG_UNICODE_WIDE_WCHARS=y
++# CONFIG_UNICODE_BIDI_SUPPORT is not set
++# CONFIG_UNICODE_NEUTRAL_TABLE is not set
++CONFIG_UNICODE_PRESERVE_BROKEN=y
++CONFIG_FEATURE_NON_POSIX_CP=y
++# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
++CONFIG_FEATURE_USE_SENDFILE=y
++CONFIG_FEATURE_COPYBUF_KB=16
++CONFIG_FEATURE_SKIP_ROOTFS=y
++CONFIG_MONOTONIC_SYSCALL=y
++# CONFIG_IOCTL_HEX2STR_ERROR is not set
++CONFIG_FEATURE_HWIB=y
++
++#
++# Applets
++#
++
++#
++# Archival Utilities
++#
++CONFIG_FEATURE_SEAMLESS_XZ=y
++CONFIG_FEATURE_SEAMLESS_LZMA=y
++CONFIG_FEATURE_SEAMLESS_BZ2=y
++CONFIG_FEATURE_SEAMLESS_GZ=y
++CONFIG_FEATURE_SEAMLESS_Z=y
++# CONFIG_AR is not set
++# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
++# CONFIG_FEATURE_AR_CREATE is not set
++# CONFIG_UNCOMPRESS is not set
++CONFIG_GUNZIP=y
++CONFIG_ZCAT=y
++CONFIG_FEATURE_GUNZIP_LONG_OPTIONS=y
++CONFIG_BUNZIP2=y
++CONFIG_BZCAT=y
++CONFIG_UNLZMA=y
++CONFIG_LZCAT=y
++CONFIG_LZMA=y
++CONFIG_UNXZ=y
++CONFIG_XZCAT=y
++CONFIG_XZ=y
++CONFIG_BZIP2=y
++CONFIG_BZIP2_SMALL=8
++CONFIG_FEATURE_BZIP2_DECOMPRESS=y
++CONFIG_CPIO=y
++CONFIG_FEATURE_CPIO_O=y
++CONFIG_FEATURE_CPIO_P=y
++# CONFIG_DPKG is not set
++# CONFIG_DPKG_DEB is not set
++CONFIG_GZIP=y
++# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
++CONFIG_GZIP_FAST=2
++CONFIG_FEATURE_GZIP_LEVELS=y
++CONFIG_FEATURE_GZIP_DECOMPRESS=y
++CONFIG_LZOP=y
++CONFIG_UNLZOP=y
++CONFIG_LZOPCAT=y
++# CONFIG_LZOP_COMPR_HIGH is not set
++# CONFIG_RPM is not set
++# CONFIG_RPM2CPIO is not set
++CONFIG_TAR=y
++CONFIG_FEATURE_TAR_LONG_OPTIONS=y
++CONFIG_FEATURE_TAR_CREATE=y
++CONFIG_FEATURE_TAR_AUTODETECT=y
++CONFIG_FEATURE_TAR_FROM=y
++CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
++CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y
++CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
++# CONFIG_FEATURE_TAR_TO_COMMAND is not set
++CONFIG_FEATURE_TAR_UNAME_GNAME=y
++CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
++# CONFIG_FEATURE_TAR_SELINUX is not set
++CONFIG_UNZIP=y
++CONFIG_FEATURE_UNZIP_CDF=y
++CONFIG_FEATURE_UNZIP_BZIP2=y
++CONFIG_FEATURE_UNZIP_LZMA=y
++CONFIG_FEATURE_UNZIP_XZ=y
++CONFIG_FEATURE_LZMA_FAST=y
++
++#
++# Coreutils
++#
++CONFIG_BASENAME=y
++CONFIG_CAT=y
++CONFIG_FEATURE_CATN=y
++CONFIG_FEATURE_CATV=y
++CONFIG_CHGRP=y
++CONFIG_CHMOD=y
++CONFIG_CHOWN=y
++CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
++CONFIG_CHROOT=y
++CONFIG_CKSUM=y
++CONFIG_COMM=y
++CONFIG_CP=y
++CONFIG_FEATURE_CP_LONG_OPTIONS=y
++CONFIG_FEATURE_CP_REFLINK=y
++CONFIG_CUT=y
++CONFIG_DATE=y
++CONFIG_FEATURE_DATE_ISOFMT=y
++# CONFIG_FEATURE_DATE_NANO is not set
++CONFIG_FEATURE_DATE_COMPAT=y
++CONFIG_DD=y
++CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
++# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
++CONFIG_FEATURE_DD_IBS_OBS=y
++CONFIG_FEATURE_DD_STATUS=y
++CONFIG_DF=y
++CONFIG_FEATURE_DF_FANCY=y
++CONFIG_DIRNAME=y
++CONFIG_DOS2UNIX=y
++CONFIG_UNIX2DOS=y
++CONFIG_DU=y
++CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
++CONFIG_ECHO=y
++CONFIG_FEATURE_FANCY_ECHO=y
++CONFIG_ENV=y
++CONFIG_EXPAND=y
++CONFIG_UNEXPAND=y
++CONFIG_EXPR=y
++CONFIG_EXPR_MATH_SUPPORT_64=y
++CONFIG_FACTOR=y
++CONFIG_FALSE=y
++CONFIG_FOLD=y
++CONFIG_HEAD=y
++CONFIG_FEATURE_FANCY_HEAD=y
++CONFIG_HOSTID=y
++CONFIG_ID=y
++CONFIG_GROUPS=y
++CONFIG_INSTALL=y
++# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
++CONFIG_LINK=y
++CONFIG_LN=y
++# CONFIG_LOGNAME is not set
++CONFIG_LS=y
++CONFIG_FEATURE_LS_FILETYPES=y
++CONFIG_FEATURE_LS_FOLLOWLINKS=y
++CONFIG_FEATURE_LS_RECURSIVE=y
++CONFIG_FEATURE_LS_WIDTH=y
++CONFIG_FEATURE_LS_SORTFILES=y
++CONFIG_FEATURE_LS_TIMESTAMPS=y
++CONFIG_FEATURE_LS_USERNAME=y
++CONFIG_FEATURE_LS_COLOR=y
++CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
++CONFIG_MD5SUM=y
++CONFIG_SHA1SUM=y
++CONFIG_SHA256SUM=y
++CONFIG_SHA512SUM=y
++CONFIG_SHA3SUM=y
++
++#
++# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
++#
++CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
++CONFIG_MKDIR=y
++CONFIG_MKFIFO=y
++CONFIG_MKNOD=y
++CONFIG_MKTEMP=y
++CONFIG_MV=y
++CONFIG_NICE=y
++CONFIG_NL=y
++CONFIG_NOHUP=y
++CONFIG_NPROC=y
++CONFIG_OD=y
++CONFIG_PASTE=y
++CONFIG_PRINTENV=y
++CONFIG_PRINTF=y
++CONFIG_PWD=y
++CONFIG_READLINK=y
++CONFIG_FEATURE_READLINK_FOLLOW=y
++CONFIG_REALPATH=y
++CONFIG_RM=y
++CONFIG_RMDIR=y
++CONFIG_SEQ=y
++CONFIG_SHRED=y
++CONFIG_SHUF=y
++CONFIG_SLEEP=y
++CONFIG_FEATURE_FANCY_SLEEP=y
++CONFIG_SORT=y
++CONFIG_FEATURE_SORT_BIG=y
++# CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY is not set
++CONFIG_SPLIT=y
++# CONFIG_FEATURE_SPLIT_FANCY is not set
++CONFIG_STAT=y
++CONFIG_FEATURE_STAT_FORMAT=y
++CONFIG_FEATURE_STAT_FILESYSTEM=y
++CONFIG_STTY=y
++CONFIG_SUM=y
++CONFIG_SYNC=y
++CONFIG_FEATURE_SYNC_FANCY=y
++CONFIG_FSYNC=y
++CONFIG_TAC=y
++CONFIG_TAIL=y
++CONFIG_FEATURE_FANCY_TAIL=y
++CONFIG_TEE=y
++CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
++CONFIG_TEST=y
++CONFIG_TEST1=y
++CONFIG_TEST2=y
++CONFIG_FEATURE_TEST_64=y
++CONFIG_TIMEOUT=y
++CONFIG_TOUCH=y
++CONFIG_FEATURE_TOUCH_NODEREF=y
++CONFIG_FEATURE_TOUCH_SUSV3=y
++CONFIG_TR=y
++CONFIG_FEATURE_TR_CLASSES=y
++CONFIG_FEATURE_TR_EQUIV=y
++CONFIG_TRUE=y
++CONFIG_TRUNCATE=y
++CONFIG_TTY=y
++CONFIG_UNAME=y
++CONFIG_UNAME_OSNAME="Linux"
++CONFIG_BB_ARCH=y
++CONFIG_UNIQ=y
++CONFIG_UNLINK=y
++CONFIG_USLEEP=y
++CONFIG_UUDECODE=y
++CONFIG_BASE64=y
++CONFIG_UUENCODE=y
++CONFIG_WC=y
++CONFIG_FEATURE_WC_LARGE=y
++# CONFIG_WHO is not set
++# CONFIG_W is not set
++# CONFIG_USERS is not set
++CONFIG_WHOAMI=y
++CONFIG_YES=y
++
++#
++# Common options
++#
++CONFIG_FEATURE_VERBOSE=y
++
++#
++# Common options for cp and mv
++#
++CONFIG_FEATURE_PRESERVE_HARDLINKS=y
++
++#
++# Common options for df, du, ls
++#
++CONFIG_FEATURE_HUMAN_READABLE=y
++
++#
++# Console Utilities
++#
++CONFIG_CHVT=y
++CONFIG_CLEAR=y
++CONFIG_DEALLOCVT=y
++CONFIG_DUMPKMAP=y
++# CONFIG_FGCONSOLE is not set
++CONFIG_KBD_MODE=y
++CONFIG_LOADFONT=y
++CONFIG_SETFONT=y
++CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y
++CONFIG_DEFAULT_SETFONT_DIR="/usr/share"
++
++#
++# Common options for loadfont and setfont
++#
++CONFIG_FEATURE_LOADFONT_PSF2=y
++CONFIG_FEATURE_LOADFONT_RAW=y
++CONFIG_LOADKMAP=y
++CONFIG_OPENVT=y
++CONFIG_RESET=y
++CONFIG_RESIZE=y
++CONFIG_FEATURE_RESIZE_PRINT=y
++CONFIG_SETCONSOLE=y
++# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
++CONFIG_SETKEYCODES=y
++CONFIG_SETLOGCONS=y
++CONFIG_SHOWKEY=y
++
++#
++# Debian Utilities
++#
++CONFIG_PIPE_PROGRESS=y
++CONFIG_RUN_PARTS=y
++CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
++# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
++# CONFIG_START_STOP_DAEMON is not set
++# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
++# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
++CONFIG_WHICH=y
++
++#
++# klibc-utils
++#
++# CONFIG_MINIPS is not set
++# CONFIG_NUKE is not set
++# CONFIG_RESUME is not set
++# CONFIG_RUN_INIT is not set
++
++#
++# Editors
++#
++CONFIG_AWK=y
++CONFIG_FEATURE_AWK_LIBM=y
++CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y
++CONFIG_CMP=y
++CONFIG_DIFF=y
++CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
++CONFIG_FEATURE_DIFF_DIR=y
++CONFIG_ED=y
++# CONFIG_PATCH is not set
++CONFIG_SED=y
++CONFIG_VI=y
++CONFIG_FEATURE_VI_MAX_LEN=1024
++CONFIG_FEATURE_VI_8BIT=y
++CONFIG_FEATURE_VI_COLON=y
++CONFIG_FEATURE_VI_YANKMARK=y
++CONFIG_FEATURE_VI_SEARCH=y
++# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
++CONFIG_FEATURE_VI_USE_SIGNALS=y
++CONFIG_FEATURE_VI_DOT_CMD=y
++CONFIG_FEATURE_VI_READONLY=y
++CONFIG_FEATURE_VI_SETOPTS=y
++CONFIG_FEATURE_VI_SET=y
++CONFIG_FEATURE_VI_WIN_RESIZE=y
++CONFIG_FEATURE_VI_ASK_TERMINAL=y
++CONFIG_FEATURE_VI_UNDO=y
++CONFIG_FEATURE_VI_UNDO_QUEUE=y
++CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
++CONFIG_FEATURE_ALLOW_EXEC=y
++
++#
++# Finding Utilities
++#
++CONFIG_FIND=y
++CONFIG_FEATURE_FIND_PRINT0=y
++CONFIG_FEATURE_FIND_MTIME=y
++CONFIG_FEATURE_FIND_MMIN=y
++CONFIG_FEATURE_FIND_PERM=y
++CONFIG_FEATURE_FIND_TYPE=y
++CONFIG_FEATURE_FIND_EXECUTABLE=y
++CONFIG_FEATURE_FIND_XDEV=y
++CONFIG_FEATURE_FIND_MAXDEPTH=y
++CONFIG_FEATURE_FIND_NEWER=y
++CONFIG_FEATURE_FIND_INUM=y
++CONFIG_FEATURE_FIND_EXEC=y
++CONFIG_FEATURE_FIND_EXEC_PLUS=y
++CONFIG_FEATURE_FIND_USER=y
++CONFIG_FEATURE_FIND_GROUP=y
++CONFIG_FEATURE_FIND_NOT=y
++CONFIG_FEATURE_FIND_DEPTH=y
++CONFIG_FEATURE_FIND_PAREN=y
++CONFIG_FEATURE_FIND_SIZE=y
++CONFIG_FEATURE_FIND_PRUNE=y
++CONFIG_FEATURE_FIND_QUIT=y
++CONFIG_FEATURE_FIND_DELETE=y
++CONFIG_FEATURE_FIND_EMPTY=y
++CONFIG_FEATURE_FIND_PATH=y
++CONFIG_FEATURE_FIND_REGEX=y
++# CONFIG_FEATURE_FIND_CONTEXT is not set
++CONFIG_FEATURE_FIND_LINKS=y
++CONFIG_GREP=y
++CONFIG_EGREP=y
++CONFIG_FGREP=y
++CONFIG_FEATURE_GREP_CONTEXT=y
++CONFIG_XARGS=y
++CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
++CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
++CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
++CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
++CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
++CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL=y
++CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y
++
++#
++# Init Utilities
++#
++# CONFIG_BOOTCHARTD is not set
++# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
++# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
++CONFIG_HALT=y
++CONFIG_POWEROFF=y
++CONFIG_REBOOT=y
++CONFIG_FEATURE_WAIT_FOR_INIT=y
++# CONFIG_FEATURE_CALL_TELINIT is not set
++CONFIG_TELINIT_PATH=""
++CONFIG_INIT=y
++CONFIG_LINUXRC=y
++CONFIG_FEATURE_USE_INITTAB=y
++CONFIG_FEATURE_KILL_REMOVED=y
++CONFIG_FEATURE_KILL_DELAY=0
++CONFIG_FEATURE_INIT_SCTTY=y
++CONFIG_FEATURE_INIT_SYSLOG=y
++CONFIG_FEATURE_INIT_QUIET=y
++# CONFIG_FEATURE_INIT_COREDUMPS is not set
++CONFIG_INIT_TERMINAL_TYPE="linux"
++# CONFIG_FEATURE_INIT_MODIFY_CMDLINE is not set
++
++#
++# Login/Password Management Utilities
++#
++# CONFIG_FEATURE_SHADOWPASSWDS is not set
++CONFIG_USE_BB_PWD_GRP=y
++# CONFIG_USE_BB_SHADOW is not set
++CONFIG_USE_BB_CRYPT=y
++CONFIG_USE_BB_CRYPT_SHA=y
++CONFIG_ADD_SHELL=y
++CONFIG_REMOVE_SHELL=y
++CONFIG_ADDGROUP=y
++CONFIG_FEATURE_ADDUSER_TO_GROUP=y
++CONFIG_ADDUSER=y
++CONFIG_FEATURE_CHECK_NAMES=y
++CONFIG_LAST_ID=256000
++CONFIG_FIRST_SYSTEM_ID=100
++CONFIG_LAST_SYSTEM_ID=999
++CONFIG_CHPASSWD=y
++CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="sha512"
++CONFIG_CRYPTPW=y
++CONFIG_MKPASSWD=y
++CONFIG_DELUSER=y
++CONFIG_DELGROUP=y
++CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
++CONFIG_GETTY=y
++CONFIG_LOGIN=y
++CONFIG_LOGIN_SESSION_AS_CHILD=y
++CONFIG_LOGIN_SCRIPTS=y
++CONFIG_FEATURE_NOLOGIN=y
++CONFIG_FEATURE_SECURETTY=y
++CONFIG_PASSWD=y
++# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
++CONFIG_SU=y
++CONFIG_FEATURE_SU_SYSLOG=y
++# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
++# CONFIG_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY is not set
++# CONFIG_SULOGIN is not set
++CONFIG_VLOCK=y
++
++#
++# Linux Ext2 FS Progs
++#
++# CONFIG_CHATTR is not set
++CONFIG_FSCK=y
++# CONFIG_LSATTR is not set
++# CONFIG_TUNE2FS is not set
++
++#
++# Linux Module Utilities
++#
++# CONFIG_MODPROBE_SMALL is not set
++CONFIG_DEPMOD=y
++CONFIG_INSMOD=y
++CONFIG_LSMOD=y
++CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
++CONFIG_MODINFO=y
++CONFIG_MODPROBE=y
++CONFIG_FEATURE_MODPROBE_BLACKLIST=y
++CONFIG_RMMOD=y
++
++#
++# Options common to multiple modutils
++#
++CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS=y
++# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
++# CONFIG_FEATURE_2_4_MODULES is not set
++# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
++# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
++# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
++# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
++# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
++CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
++# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
++CONFIG_FEATURE_MODUTILS_ALIAS=y
++CONFIG_FEATURE_MODUTILS_SYMBOLS=y
++CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
++CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
++
++#
++# Linux System Utilities
++#
++CONFIG_ACPID=y
++CONFIG_FEATURE_ACPID_COMPAT=y
++CONFIG_BLKDISCARD=y
++CONFIG_BLKID=y
++CONFIG_FEATURE_BLKID_TYPE=y
++CONFIG_BLOCKDEV=y
++CONFIG_CAL=y
++# CONFIG_CHRT is not set
++CONFIG_DMESG=y
++CONFIG_FEATURE_DMESG_PRETTY=y
++CONFIG_EJECT=y
++CONFIG_FEATURE_EJECT_SCSI=y
++CONFIG_FALLOCATE=y
++CONFIG_FATATTR=y
++CONFIG_FBSET=y
++CONFIG_FEATURE_FBSET_FANCY=y
++CONFIG_FEATURE_FBSET_READMODE=y
++CONFIG_FDFORMAT=y
++CONFIG_FDISK=y
++# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
++CONFIG_FEATURE_FDISK_WRITABLE=y
++CONFIG_FEATURE_AIX_LABEL=y
++CONFIG_FEATURE_SGI_LABEL=y
++CONFIG_FEATURE_SUN_LABEL=y
++CONFIG_FEATURE_OSF_LABEL=y
++CONFIG_FEATURE_GPT_LABEL=y
++CONFIG_FEATURE_FDISK_ADVANCED=y
++CONFIG_FINDFS=y
++CONFIG_FLOCK=y
++CONFIG_FDFLUSH=y
++# CONFIG_FREERAMDISK is not set
++# CONFIG_FSCK_MINIX is not set
++# CONFIG_FSFREEZE is not set
++CONFIG_FSTRIM=y
++CONFIG_GETOPT=y
++CONFIG_FEATURE_GETOPT_LONG=y
++CONFIG_HEXDUMP=y
++CONFIG_FEATURE_HEXDUMP_REVERSE=y
++CONFIG_HD=y
++CONFIG_XXD=y
++CONFIG_HWCLOCK=y
++CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
++CONFIG_IONICE=y
++CONFIG_IPCRM=y
++CONFIG_IPCS=y
++# CONFIG_LAST is not set
++# CONFIG_FEATURE_LAST_FANCY is not set
++CONFIG_LOSETUP=y
++CONFIG_LSPCI=y
++CONFIG_LSUSB=y
++CONFIG_MDEV=y
++CONFIG_FEATURE_MDEV_CONF=y
++CONFIG_FEATURE_MDEV_RENAME=y
++CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
++CONFIG_FEATURE_MDEV_EXEC=y
++CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
++# CONFIG_FEATURE_MDEV_DAEMON is not set
++CONFIG_MESG=y
++CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
++# CONFIG_MKE2FS is not set
++# CONFIG_MKFS_EXT2 is not set
++# CONFIG_MKFS_MINIX is not set
++# CONFIG_FEATURE_MINIX2 is not set
++# CONFIG_MKFS_REISER is not set
++CONFIG_MKDOSFS=y
++CONFIG_MKFS_VFAT=y
++CONFIG_MKSWAP=y
++CONFIG_FEATURE_MKSWAP_UUID=y
++CONFIG_MORE=y
++CONFIG_MOUNT=y
++CONFIG_FEATURE_MOUNT_FAKE=y
++CONFIG_FEATURE_MOUNT_VERBOSE=y
++CONFIG_FEATURE_MOUNT_HELPERS=y
++CONFIG_FEATURE_MOUNT_LABEL=y
++# CONFIG_FEATURE_MOUNT_NFS is not set
++CONFIG_FEATURE_MOUNT_CIFS=y
++CONFIG_FEATURE_MOUNT_FLAGS=y
++CONFIG_FEATURE_MOUNT_FSTAB=y
++# CONFIG_FEATURE_MOUNT_OTHERTAB is not set
++CONFIG_MOUNTPOINT=y
++CONFIG_NOLOGIN=y
++CONFIG_NOLOGIN_DEPENDENCIES=y
++CONFIG_NSENTER=y
++CONFIG_PIVOT_ROOT=y
++CONFIG_RDATE=y
++CONFIG_RDEV=y
++CONFIG_READPROFILE=y
++CONFIG_RENICE=y
++CONFIG_REV=y
++# CONFIG_RTCWAKE is not set
++# CONFIG_SCRIPT is not set
++# CONFIG_SCRIPTREPLAY is not set
++# CONFIG_SETARCH is not set
++CONFIG_LINUX32=y
++CONFIG_LINUX64=y
++CONFIG_SETPRIV=y
++CONFIG_FEATURE_SETPRIV_DUMP=y
++CONFIG_FEATURE_SETPRIV_CAPABILITIES=y
++CONFIG_FEATURE_SETPRIV_CAPABILITY_NAMES=y
++CONFIG_SETSID=y
++CONFIG_SWAPON=y
++CONFIG_FEATURE_SWAPON_DISCARD=y
++CONFIG_FEATURE_SWAPON_PRI=y
++CONFIG_SWAPOFF=y
++CONFIG_FEATURE_SWAPONOFF_LABEL=y
++CONFIG_SWITCH_ROOT=y
++# CONFIG_TASKSET is not set
++# CONFIG_FEATURE_TASKSET_FANCY is not set
++# CONFIG_FEATURE_TASKSET_CPULIST is not set
++# CONFIG_UEVENT is not set
++CONFIG_UMOUNT=y
++CONFIG_FEATURE_UMOUNT_ALL=y
++CONFIG_UNSHARE=y
++# CONFIG_WALL is not set
++
++#
++# Common options for mount/umount
++#
++CONFIG_FEATURE_MOUNT_LOOP=y
++CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
++# CONFIG_FEATURE_MTAB_SUPPORT is not set
++CONFIG_VOLUMEID=y
++
++#
++# Filesystem/Volume identification
++#
++CONFIG_FEATURE_VOLUMEID_BCACHE=y
++CONFIG_FEATURE_VOLUMEID_BTRFS=y
++CONFIG_FEATURE_VOLUMEID_CRAMFS=y
++CONFIG_FEATURE_VOLUMEID_EXFAT=y
++CONFIG_FEATURE_VOLUMEID_EXT=y
++CONFIG_FEATURE_VOLUMEID_F2FS=y
++CONFIG_FEATURE_VOLUMEID_FAT=y
++# CONFIG_FEATURE_VOLUMEID_HFS is not set
++CONFIG_FEATURE_VOLUMEID_ISO9660=y
++CONFIG_FEATURE_VOLUMEID_JFS=y
++CONFIG_FEATURE_VOLUMEID_LFS=y
++CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
++CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
++CONFIG_FEATURE_VOLUMEID_LUKS=y
++CONFIG_FEATURE_VOLUMEID_MINIX=y
++CONFIG_FEATURE_VOLUMEID_NILFS=y
++CONFIG_FEATURE_VOLUMEID_NTFS=y
++CONFIG_FEATURE_VOLUMEID_OCFS2=y
++CONFIG_FEATURE_VOLUMEID_REISERFS=y
++# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
++CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
++# CONFIG_FEATURE_VOLUMEID_SYSV is not set
++CONFIG_FEATURE_VOLUMEID_UBIFS=y
++CONFIG_FEATURE_VOLUMEID_UDF=y
++CONFIG_FEATURE_VOLUMEID_XFS=y
++
++#
++# Miscellaneous Utilities
++#
++CONFIG_ADJTIMEX=y
++CONFIG_BBCONFIG=y
++CONFIG_FEATURE_COMPRESS_BBCONFIG=y
++CONFIG_BC=y
++CONFIG_DC=y
++CONFIG_FEATURE_DC_BIG=y
++# CONFIG_FEATURE_DC_LIBM is not set
++CONFIG_FEATURE_BC_INTERACTIVE=y
++CONFIG_FEATURE_BC_LONG_OPTIONS=y
++CONFIG_BEEP=y
++CONFIG_FEATURE_BEEP_FREQ=440
++CONFIG_FEATURE_BEEP_LENGTH_MS=30
++# CONFIG_CHAT is not set
++# CONFIG_FEATURE_CHAT_NOFAIL is not set
++# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
++# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
++# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
++# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
++# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
++# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
++CONFIG_CONSPY=y
++CONFIG_CROND=y
++CONFIG_FEATURE_CROND_D=y
++CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
++CONFIG_FEATURE_CROND_SPECIAL_TIMES=y
++CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
++CONFIG_CRONTAB=y
++# CONFIG_DEVFSD is not set
++# CONFIG_DEVFSD_MODLOAD is not set
++# CONFIG_DEVFSD_FG_NP is not set
++# CONFIG_DEVFSD_VERBOSE is not set
++# CONFIG_FEATURE_DEVFS is not set
++# CONFIG_DEVMEM is not set
++CONFIG_FBSPLASH=y
++# CONFIG_FLASH_ERASEALL is not set
++# CONFIG_FLASH_LOCK is not set
++# CONFIG_FLASH_UNLOCK is not set
++# CONFIG_FLASHCP is not set
++CONFIG_HDPARM=y
++# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
++# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
++# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
++# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
++# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
++# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
++# CONFIG_HEXEDIT is not set
++# CONFIG_I2CGET is not set
++# CONFIG_I2CSET is not set
++# CONFIG_I2CDUMP is not set
++# CONFIG_I2CDETECT is not set
++# CONFIG_I2CTRANSFER is not set
++CONFIG_INOTIFYD=y
++CONFIG_LESS=y
++CONFIG_FEATURE_LESS_MAXLINES=9999999
++CONFIG_FEATURE_LESS_BRACKETS=y
++CONFIG_FEATURE_LESS_FLAGS=y
++CONFIG_FEATURE_LESS_TRUNCATE=y
++CONFIG_FEATURE_LESS_MARKS=y
++CONFIG_FEATURE_LESS_REGEXP=y
++CONFIG_FEATURE_LESS_WINCH=y
++CONFIG_FEATURE_LESS_ASK_TERMINAL=y
++CONFIG_FEATURE_LESS_DASHCMD=y
++CONFIG_FEATURE_LESS_LINENUMS=y
++CONFIG_FEATURE_LESS_RAW=y
++CONFIG_FEATURE_LESS_ENV=y
++# CONFIG_LSSCSI is not set
++# CONFIG_MAKEDEVS is not set
++# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
++# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
++# CONFIG_MAN is not set
++CONFIG_MICROCOM=y
++# CONFIG_MIM is not set
++# CONFIG_MT is not set
++CONFIG_NANDWRITE=y
++CONFIG_NANDDUMP=y
++CONFIG_PARTPROBE=y
++CONFIG_RAIDAUTORUN=y
++CONFIG_READAHEAD=y
++CONFIG_RFKILL=y
++# CONFIG_RUNLEVEL is not set
++# CONFIG_RX is not set
++# CONFIG_SETFATTR is not set
++CONFIG_SETSERIAL=y
++CONFIG_STRINGS=y
++CONFIG_TIME=y
++# CONFIG_TS is not set
++CONFIG_TTYSIZE=y
++# CONFIG_UBIATTACH is not set
++# CONFIG_UBIDETACH is not set
++# CONFIG_UBIMKVOL is not set
++# CONFIG_UBIRMVOL is not set
++# CONFIG_UBIRSVOL is not set
++# CONFIG_UBIUPDATEVOL is not set
++# CONFIG_UBIRENAME is not set
++CONFIG_VOLNAME=y
++CONFIG_WATCHDOG=y
++
++#
++# Networking Utilities
++#
++CONFIG_FEATURE_IPV6=y
++CONFIG_FEATURE_UNIX_LOCAL=y
++# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
++CONFIG_VERBOSE_RESOLUTION_ERRORS=y
++# CONFIG_FEATURE_TLS_SHA1 is not set
++CONFIG_ARP=y
++CONFIG_ARPING=y
++CONFIG_BRCTL=y
++CONFIG_FEATURE_BRCTL_FANCY=y
++CONFIG_FEATURE_BRCTL_SHOW=y
++# CONFIG_DNSD is not set
++CONFIG_ETHER_WAKE=y
++# CONFIG_FTPD is not set
++# CONFIG_FEATURE_FTPD_WRITE is not set
++# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
++# CONFIG_FEATURE_FTPD_AUTHENTICATION is not set
++# CONFIG_FTPGET is not set
++# CONFIG_FTPPUT is not set
++# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
++CONFIG_HOSTNAME=y
++CONFIG_DNSDOMAINNAME=y
++# CONFIG_HTTPD is not set
++# CONFIG_FEATURE_HTTPD_RANGES is not set
++# CONFIG_FEATURE_HTTPD_SETUID is not set
++# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
++# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
++# CONFIG_FEATURE_HTTPD_CGI is not set
++# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
++# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
++# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
++# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
++# CONFIG_FEATURE_HTTPD_PROXY is not set
++# CONFIG_FEATURE_HTTPD_GZIP is not set
++CONFIG_IFCONFIG=y
++CONFIG_FEATURE_IFCONFIG_STATUS=y
++CONFIG_FEATURE_IFCONFIG_SLIP=y
++CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
++CONFIG_FEATURE_IFCONFIG_HW=y
++CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
++CONFIG_IFENSLAVE=y
++# CONFIG_IFPLUGD is not set
++CONFIG_IFUP=y
++CONFIG_IFDOWN=y
++CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
++CONFIG_FEATURE_IFUPDOWN_IP=y
++CONFIG_FEATURE_IFUPDOWN_IPV4=y
++CONFIG_FEATURE_IFUPDOWN_IPV6=y
++# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
++CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y
++# CONFIG_INETD is not set
++# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
++# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
++# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
++# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
++# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
++# CONFIG_FEATURE_INETD_RPC is not set
++CONFIG_IP=y
++CONFIG_IPADDR=y
++CONFIG_IPLINK=y
++CONFIG_IPROUTE=y
++CONFIG_IPTUNNEL=y
++CONFIG_IPRULE=y
++CONFIG_IPNEIGH=y
++CONFIG_FEATURE_IP_ADDRESS=y
++CONFIG_FEATURE_IP_LINK=y
++CONFIG_FEATURE_IP_ROUTE=y
++CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2"
++CONFIG_FEATURE_IP_TUNNEL=y
++CONFIG_FEATURE_IP_RULE=y
++CONFIG_FEATURE_IP_NEIGH=y
++CONFIG_FEATURE_IP_RARE_PROTOCOLS=y
++CONFIG_IPCALC=y
++# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
++CONFIG_FEATURE_IPCALC_FANCY=y
++# CONFIG_FAKEIDENTD is not set
++CONFIG_NAMEIF=y
++CONFIG_FEATURE_NAMEIF_EXTENDED=y
++CONFIG_NBDCLIENT=y
++CONFIG_NC=y
++# CONFIG_NETCAT is not set
++CONFIG_NC_SERVER=y
++CONFIG_NC_EXTRA=y
++CONFIG_NC_110_COMPAT=y
++CONFIG_NETSTAT=y
++CONFIG_FEATURE_NETSTAT_WIDE=y
++CONFIG_FEATURE_NETSTAT_PRG=y
++CONFIG_NSLOOKUP=y
++CONFIG_FEATURE_NSLOOKUP_BIG=y
++CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS=y
++CONFIG_NTPD=y
++CONFIG_FEATURE_NTPD_SERVER=y
++CONFIG_FEATURE_NTPD_CONF=y
++CONFIG_FEATURE_NTP_AUTH=y
++CONFIG_PING=y
++CONFIG_PING6=y
++CONFIG_FEATURE_FANCY_PING=y
++CONFIG_PSCAN=y
++CONFIG_ROUTE=y
++CONFIG_SLATTACH=y
++# CONFIG_SSL_CLIENT is not set
++# CONFIG_TC is not set
++# CONFIG_FEATURE_TC_INGRESS is not set
++# CONFIG_TCPSVD is not set
++# CONFIG_UDPSVD is not set
++# CONFIG_TELNET is not set
++# CONFIG_FEATURE_TELNET_TTYPE is not set
++# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
++# CONFIG_FEATURE_TELNET_WIDTH is not set
++# CONFIG_TELNETD is not set
++# CONFIG_FEATURE_TELNETD_STANDALONE is not set
++# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
++# CONFIG_TFTP is not set
++# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
++# CONFIG_FEATURE_TFTP_HPA_COMPAT is not set
++# CONFIG_TFTPD is not set
++# CONFIG_FEATURE_TFTP_GET is not set
++# CONFIG_FEATURE_TFTP_PUT is not set
++# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
++# CONFIG_TFTP_DEBUG is not set
++CONFIG_TLS=y
++CONFIG_TRACEROUTE=y
++CONFIG_TRACEROUTE6=y
++CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
++CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
++CONFIG_TUNCTL=y
++CONFIG_FEATURE_TUNCTL_UG=y
++CONFIG_VCONFIG=y
++CONFIG_WGET=y
++CONFIG_FEATURE_WGET_LONG_OPTIONS=y
++CONFIG_FEATURE_WGET_STATUSBAR=y
++CONFIG_FEATURE_WGET_AUTHENTICATION=y
++CONFIG_FEATURE_WGET_TIMEOUT=y
++CONFIG_FEATURE_WGET_HTTPS=y
++# CONFIG_FEATURE_WGET_OPENSSL is not set
++CONFIG_WHOIS=y
++# CONFIG_ZCIP is not set
++# CONFIG_UDHCPD is not set
++# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
++# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
++CONFIG_DHCPD_LEASES_FILE=""
++CONFIG_DUMPLEASES=y
++# CONFIG_DHCPRELAY is not set
++CONFIG_UDHCPC=y
++CONFIG_FEATURE_UDHCPC_ARPING=y
++CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
++CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
++CONFIG_UDHCPC6=y
++CONFIG_FEATURE_UDHCPC6_RFC3646=y
++CONFIG_FEATURE_UDHCPC6_RFC4704=y
++CONFIG_FEATURE_UDHCPC6_RFC4833=y
++CONFIG_FEATURE_UDHCPC6_RFC5970=y
++
++#
++# Common options for DHCP applets
++#
++# CONFIG_FEATURE_UDHCP_PORT is not set
++CONFIG_UDHCP_DEBUG=0
++CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
++CONFIG_FEATURE_UDHCP_RFC3397=y
++CONFIG_FEATURE_UDHCP_8021Q=y
++CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R"
++
++#
++# Print Utilities
++#
++# CONFIG_LPD is not set
++# CONFIG_LPR is not set
++# CONFIG_LPQ is not set
++
++#
++# Mail Utilities
++#
++CONFIG_MAKEMIME=y
++# CONFIG_POPMAILDIR is not set
++# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
++CONFIG_REFORMIME=y
++CONFIG_FEATURE_REFORMIME_COMPAT=y
++CONFIG_SENDMAIL=y
++CONFIG_FEATURE_MIME_CHARSET="us-ascii"
++
++#
++# Process Utilities
++#
++CONFIG_FREE=y
++CONFIG_FUSER=y
++CONFIG_IOSTAT=y
++CONFIG_KILL=y
++CONFIG_KILLALL=y
++CONFIG_KILLALL5=y
++CONFIG_LSOF=y
++CONFIG_MPSTAT=y
++CONFIG_NMETER=y
++CONFIG_PGREP=y
++CONFIG_PKILL=y
++CONFIG_PIDOF=y
++CONFIG_FEATURE_PIDOF_SINGLE=y
++CONFIG_FEATURE_PIDOF_OMIT=y
++CONFIG_PMAP=y
++CONFIG_POWERTOP=y
++CONFIG_FEATURE_POWERTOP_INTERACTIVE=y
++CONFIG_PS=y
++# CONFIG_FEATURE_PS_WIDE is not set
++# CONFIG_FEATURE_PS_LONG is not set
++CONFIG_FEATURE_PS_TIME=y
++# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
++CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
++CONFIG_PSTREE=y
++CONFIG_PWDX=y
++CONFIG_SMEMCAP=y
++CONFIG_BB_SYSCTL=y
++CONFIG_TOP=y
++CONFIG_FEATURE_TOP_INTERACTIVE=y
++CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
++CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
++CONFIG_FEATURE_TOP_SMP_CPU=y
++# CONFIG_FEATURE_TOP_DECIMALS is not set
++CONFIG_FEATURE_TOP_SMP_PROCESS=y
++CONFIG_FEATURE_TOPMEM=y
++CONFIG_UPTIME=y
++# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
++CONFIG_WATCH=y
++# CONFIG_FEATURE_SHOW_THREADS is not set
++
++#
++# Runit Utilities
++#
++# CONFIG_CHPST is not set
++# CONFIG_SETUIDGID is not set
++# CONFIG_ENVUIDGID is not set
++# CONFIG_ENVDIR is not set
++# CONFIG_SOFTLIMIT is not set
++# CONFIG_RUNSV is not set
++# CONFIG_RUNSVDIR is not set
++# CONFIG_FEATURE_RUNSVDIR_LOG is not set
++# CONFIG_SV is not set
++CONFIG_SV_DEFAULT_SERVICE_DIR=""
++# CONFIG_SVC is not set
++# CONFIG_SVOK is not set
++# CONFIG_SVLOGD is not set
++# CONFIG_CHCON is not set
++# CONFIG_GETENFORCE is not set
++# CONFIG_GETSEBOOL is not set
++# CONFIG_LOAD_POLICY is not set
++# CONFIG_MATCHPATHCON is not set
++# CONFIG_RUNCON is not set
++# CONFIG_SELINUXENABLED is not set
++# CONFIG_SESTATUS is not set
++# CONFIG_SETENFORCE is not set
++# CONFIG_SETFILES is not set
++# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
++# CONFIG_RESTORECON is not set
++# CONFIG_SETSEBOOL is not set
++
++#
++# Shells
++#
++CONFIG_SH_IS_ASH=y
++# CONFIG_SH_IS_HUSH is not set
++# CONFIG_SH_IS_NONE is not set
++# CONFIG_BASH_IS_ASH is not set
++# CONFIG_BASH_IS_HUSH is not set
++CONFIG_BASH_IS_NONE=y
++CONFIG_SHELL_ASH=y
++CONFIG_ASH=y
++CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
++CONFIG_ASH_INTERNAL_GLOB=y
++CONFIG_ASH_BASH_COMPAT=y
++CONFIG_ASH_BASH_SOURCE_CURDIR=y
++CONFIG_ASH_BASH_NOT_FOUND_HOOK=y
++CONFIG_ASH_JOB_CONTROL=y
++CONFIG_ASH_ALIAS=y
++CONFIG_ASH_RANDOM_SUPPORT=y
++CONFIG_ASH_EXPAND_PRMT=y
++CONFIG_ASH_IDLE_TIMEOUT=y
++CONFIG_ASH_MAIL=y
++CONFIG_ASH_ECHO=y
++CONFIG_ASH_PRINTF=y
++CONFIG_ASH_TEST=y
++CONFIG_ASH_HELP=y
++CONFIG_ASH_GETOPTS=y
++CONFIG_ASH_CMDCMD=y
++# CONFIG_CTTYHACK is not set
++# CONFIG_HUSH is not set
++# CONFIG_SHELL_HUSH is not set
++# CONFIG_HUSH_BASH_COMPAT is not set
++# CONFIG_HUSH_BRACE_EXPANSION is not set
++# CONFIG_HUSH_LINENO_VAR is not set
++# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
++# CONFIG_HUSH_INTERACTIVE is not set
++# CONFIG_HUSH_SAVEHISTORY is not set
++# CONFIG_HUSH_JOB is not set
++# CONFIG_HUSH_TICK is not set
++# CONFIG_HUSH_IF is not set
++# CONFIG_HUSH_LOOPS is not set
++# CONFIG_HUSH_CASE is not set
++# CONFIG_HUSH_FUNCTIONS is not set
++# CONFIG_HUSH_LOCAL is not set
++# CONFIG_HUSH_RANDOM_SUPPORT is not set
++# CONFIG_HUSH_MODE_X is not set
++# CONFIG_HUSH_ECHO is not set
++# CONFIG_HUSH_PRINTF is not set
++# CONFIG_HUSH_TEST is not set
++# CONFIG_HUSH_HELP is not set
++# CONFIG_HUSH_EXPORT is not set
++# CONFIG_HUSH_EXPORT_N is not set
++# CONFIG_HUSH_READONLY is not set
++# CONFIG_HUSH_KILL is not set
++# CONFIG_HUSH_WAIT is not set
++# CONFIG_HUSH_COMMAND is not set
++# CONFIG_HUSH_TRAP is not set
++# CONFIG_HUSH_TYPE is not set
++# CONFIG_HUSH_TIMES is not set
++# CONFIG_HUSH_READ is not set
++# CONFIG_HUSH_SET is not set
++# CONFIG_HUSH_UNSET is not set
++# CONFIG_HUSH_ULIMIT is not set
++# CONFIG_HUSH_UMASK is not set
++# CONFIG_HUSH_GETOPTS is not set
++# CONFIG_HUSH_MEMLEAK is not set
++
++#
++# Options common to all shells
++#
++CONFIG_FEATURE_SH_MATH=y
++CONFIG_FEATURE_SH_MATH_64=y
++CONFIG_FEATURE_SH_MATH_BASE=y
++CONFIG_FEATURE_SH_EXTRA_QUIET=y
++# CONFIG_FEATURE_SH_STANDALONE is not set
++# CONFIG_FEATURE_SH_NOFORK is not set
++CONFIG_FEATURE_SH_READ_FRAC=y
++CONFIG_FEATURE_SH_HISTFILESIZE=y
++CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS=y
++
++#
++# System Logging Utilities
++#
++CONFIG_KLOGD=y
++
++#
++# klogd should not be used together with syslog to kernel printk buffer
++#
++CONFIG_FEATURE_KLOGD_KLOGCTL=y
++CONFIG_LOGGER=y
++CONFIG_LOGREAD=y
++CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
++CONFIG_SYSLOGD=y
++CONFIG_FEATURE_ROTATE_LOGFILE=y
++CONFIG_FEATURE_REMOTE_LOG=y
++CONFIG_FEATURE_SYSLOGD_DUP=y
++CONFIG_FEATURE_SYSLOGD_CFG=y
++# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
++CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=2048
++CONFIG_FEATURE_IPC_SYSLOG=y
++CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
++CONFIG_FEATURE_KMSG_SYSLOG=y
+diff --git a/initrd/make-initrd b/initrd/make-initrd
+index ffe3702..6439a54 100755
+--- a/initrd/make-initrd
++++ b/initrd/make-initrd
+@@ -1,6 +1,7 @@
+ #!/bin/bash
+ 
+ base="`pwd`/initrd"
++builddir="$base"/build
+ outpath="$base"/out
+ tmpdir=`mktemp -d`
+ tmpfile=`mktemp`
+@@ -8,12 +9,35 @@ initrd=$outpath/initrd
+ init="$base"/init-initrd
+ rm -rf $tmpdir
+ 
++
+ if test -z "$busybox"
+ then
+-    busybox=$(which busybox)
++    busybox_version=1.32.0
++    busybox_name=busybox-$busybox_version
++    busybox_tarball="$busybox_name".tar.bz2
++    busybox_url="https://busybox.net/downloads/""$busybox_tarball"
++    busybox_src_config="$base"/config."$ARCH"
++    busybox_image="$builddir"/"$busybox_name"/busybox
++    
++    rm -rf $outpath
++    mkdir -p $outpath
++    mkdir -p $builddir
++    
++    if [[ ! -f $builddir/$busybox_tarball ]]
++    then
++        wget -O $builddir/$busybox_tarball --tries=20 $busybox_url
++    fi
++    if [[ ! -d $builddir/$busybox_name ]]
++    then
++        tar --extract --bzip2 --touch --file="$builddir/$busybox_tarball" --directory="$builddir"
++    fi
++    cd $builddir/$busybox_name
++    cp $busybox_src_config .config
++    make -j "$(getconf _NPROCESSORS_ONLN)"
++    export busybox="$busybox_image"
+ fi
+ 
+-mkdir -p $outpath
++
+ mkdir -p $tmpdir/bin
+ mkdir -p $tmpdir/sbin
+ mkdir -p $tmpdir/etc
+-- 
+2.17.1
+
recipes-core/runx/runx/0002-don-t-call-busybox-install.patch new file +348 -0

348 lines not on this page · raw message

recipes-core/runx/runx_git.bb +24 -5
index 53c2464..48a5776 100644
@@ -14,6 +14,11 @@ SRC_URI = "\
           file://0001-make-initrd-cross-install-tweaks.patch \
           file://0001-runX-add-bounded-looping-timeout.patch \
 	  "
+
+SRC_URI += "file://0001-Add-busybox-cross-build-for-arm64.patch \
+            file://0002-don-t-call-busybox-install.patch \
+           "
+
 SRC_URI[md5sum] = "ce9b2d974d27408a61c53a30d3f98fb9"
 SRC_URI[sha256sum] = "bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491"
 
@@ -33,6 +38,7 @@ inherit kernel-arch
 # we have a busybox bbappend that makes /bin available to the
 # sysroot, and hence gets us the target binary that we need
 DEPENDS = "busybox-initrd go-build"
+DEPENDS += "resolvconf"
 
 # for the kernel build phase
 DEPENDS += "openssl-native coreutils-native util-linux-native xz-native bc-native"
@@ -42,6 +48,8 @@ RDEPENDS_${PN} += " jq bash"
 RDEPENDS_${PN} += " xen-tools-xl go-build socat daemonize"
 RDEPENDS_${PN} += " qemu-system-i386 ca-certificates qemu qemu-keymaps"
 
+RUNX_USE_INTERNAL_BUSYBOX ?= ""
+
 do_compile() {
     # we'll need this for the initrd later, so lets error if it isn't what
     # we expect (statically linked)
@@ -77,11 +85,22 @@ do_compile() {
     ${S}/kernel/make-kernel
 
     # construct the initrd
-    echo "[INFO]: runx: constructing the initrd"
-    cp ${STAGING_DIR_HOST}/bin/busybox.nosuid ${WORKDIR}/busybox
-    export QEMU_USER="`which qemu-${HOST_ARCH}` -L ${STAGING_BASELIBDIR}/.."
-    export BUSYBOX="${WORKDIR}/busybox"
-    export CROSS_COMPILE="t"
+    bbnote "runx: constructing the initrd"
+    if [ -z "${RUNX_USE_INTERNAL_BUSYBOX}" ]; then
+        bbnote "runx: using external busybox"
+        cp ${STAGING_DIR_HOST}/bin/busybox.nosuid ${WORKDIR}/busybox
+        export QEMU_USER="`which qemu-${HOST_ARCH}` -L ${STAGING_BASELIBDIR}/.."
+        export BUSYBOX="${WORKDIR}/busybox"
+        export CROSS_COMPILE="${TARGET_PREFIX}"
+    else
+        bbnote "runx: using internal busybox"
+        export CC="${CC}"
+        export LD="${LD}"
+        export CFLAGS="${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${CFLAGS}"
+        export LDFLAGS="${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH} ${LDFLAGS}"
+        export HOSTCFLAGS="${BUILD_CFLAGS} ${BUILD_LDFLAGS}"
+        export CROSS_COMPILE="${TARGET_PREFIX}"
+    fi
     ${S}/initrd/make-initrd
 }
 
Signature · 1 line
2.19.1