diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /poky/meta/recipes-core/busybox/files | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-core/busybox/files')
-rw-r--r-- | poky/meta/recipes-core/busybox/files/inittab | 12 | ||||
-rw-r--r-- | poky/meta/recipes-core/busybox/files/run-ptest | 2 | ||||
-rw-r--r-- | poky/meta/recipes-core/busybox/files/simple.script | 4 |
3 files changed, 11 insertions, 7 deletions
diff --git a/poky/meta/recipes-core/busybox/files/inittab b/poky/meta/recipes-core/busybox/files/inittab index 2bc831c7c..e8ec2ab68 100644 --- a/poky/meta/recipes-core/busybox/files/inittab +++ b/poky/meta/recipes-core/busybox/files/inittab @@ -8,11 +8,17 @@ ::sysinit:/bin/mkdir -p /dev/pts ::sysinit:/bin/mount -t devpts devpts /dev/pts ::sysinit:/bin/mount -a - +::sysinit:/sbin/swapon -a +null::sysinit:/bin/ln -sf /proc/self/fd /dev/fd +null::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin +null::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout +null::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr +# set hostname +null::sysinit:/bin/busybox hostname -F /etc/hostname ::sysinit:/etc/init.d/rcS # Stuff to do before rebooting -::ctrlaltdel:/sbin/reboot +#::ctrlaltdel:/sbin/reboot ::shutdown:/etc/init.d/rcK ::shutdown:/sbin/swapoff -a ::shutdown:/bin/umount -a -r @@ -20,5 +26,3 @@ # Stuff to do when restarting the init process ::restart:/sbin/init -# set hostname -null::sysinit:/bin/busybox hostname -F /etc/hostname diff --git a/poky/meta/recipes-core/busybox/files/run-ptest b/poky/meta/recipes-core/busybox/files/run-ptest index b19e5b534..76873c9de 100644 --- a/poky/meta/recipes-core/busybox/files/run-ptest +++ b/poky/meta/recipes-core/busybox/files/run-ptest @@ -6,4 +6,4 @@ export PATH=$bindir/bin:$PATH export SKIP_KNOWN_BUGS=1 cd testsuite || exit 1 -./runtest -v | sed -r 's/^(SKIPPED|UNTESTED):/SKIP:/' +LANG=C.UTF-8 ./runtest -v | sed -r 's/^(SKIPPED|UNTESTED):/SKIP:/' diff --git a/poky/meta/recipes-core/busybox/files/simple.script b/poky/meta/recipes-core/busybox/files/simple.script index 6ed029352..013440574 100644 --- a/poky/meta/recipes-core/busybox/files/simple.script +++ b/poky/meta/recipes-core/busybox/files/simple.script @@ -28,7 +28,7 @@ case "$1" in fi if ! root_is_nfs ; then if [ $have_bin_ip -eq 1 ]; then - /SBIN_DIR/ip addr flush dev $interface + /SBIN_DIR/ip -4 addr flush dev $interface /SBIN_DIR/ip link set dev $interface up else /SBIN_DIR/ifconfig $interface 0.0.0.0 @@ -59,7 +59,7 @@ case "$1" in metric=10 for i in $router ; do if [ $have_bin_ip -eq 1 ]; then - /SBIN_DIR/ip route add default via $i metric $metric + /SBIN_DIR/ip route add default via $i metric $metric dev $interface else /SBIN_DIR/route add default gw $i dev $interface metric $metric 2>/dev/null fi |