From 28bcb5f43d90ed6c24a164055c43b4ff9a95b4bc Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 19 Jul 2015 22:07:40 +0200 Subject: [PATCH 1/7] rtl8169-eeprom: Assume that automake is not used or broken It looks like a classic src != build dir issue of the utility breaking the build on Yocto-Master. Try to fix that. ERROR: Function failed: do_install (log file is located at /home/builder/jenkins/workspace/Yocto-Master/label/OE/build/tmp/work/armv5e-poky-linux-gnueabi/rtl8169-eeprom/v0.0.1+gitAUTOINC+e62e515ce3-r0/temp/log.do_install.2455) ERROR: Logfile of failure stored in: /home/builder/jenkins/workspace/Yocto-Master/label/OE/build/tmp/work/armv5e-poky-linux-gnueabi/rtl8169-eeprom/v0.0.1+gitAUTOINC+e62e515ce3-r0/temp/log.do_install.2455 Log data follows: | DEBUG: SITE files ['endian-little', 'bit-32', 'arm-common', 'arm-32', 'common-linux', 'common-glibc', 'arm-linux', 'arm-linux-gnueabi', 'common'] | DEBUG: Executing shell function do_install | install: cannot stat `/home/builder/jenkins/workspace/Yocto-Master/label/OE/build/tmp/work/armv5e-poky-linux-gnueabi/rtl8169-eeprom/v0.0.1+gitAUTOINC+e62e515ce3-r0/git/rtl8168-eeprom': No such file or directory | WARNING: /home/builder/jenkins/workspace/Yocto-Master/label/OE/build/tmp/work/armv5e-poky-linux-gnueabi/rtl8169-eeprom/v0.0.1+gitAUTOINC+e62e515ce3-r0/temp/run.do_install.2455:1 exit 1 from | install -m 0755 /home/builder/jenkins/workspace/Yocto- --- recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb b/recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb index 3dad8d51a4..a6a6feb81a 100644 --- a/recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb +++ b/recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb @@ -12,6 +12,7 @@ PR = "r0" S = "${WORKDIR}/git" inherit autotools pkgconfig +B = "${S}" CFLAGS += "" LDFLAGS += "" From bdfd0f736dbdf1f97f6552dfddb7f0e721298d1d Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 23 Jul 2015 15:31:57 +0200 Subject: [PATCH 2/7] init-ifupdown: remove iridium "weak" route. Remove post-up entries from iridium interface config for weak ping route to ortelius, now set by sob-idu-linkmon itself. --- .../init-ifupdown/init-ifupdown-master/sysmocom-idu/interfaces | 1 - recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces | 1 - 2 files changed, 2 deletions(-) diff --git a/recipes-bsp/init-ifupdown/init-ifupdown-master/sysmocom-idu/interfaces b/recipes-bsp/init-ifupdown/init-ifupdown-master/sysmocom-idu/interfaces index 89adfc180d..bddcaaa267 100644 --- a/recipes-bsp/init-ifupdown/init-ifupdown-master/sysmocom-idu/interfaces +++ b/recipes-bsp/init-ifupdown/init-ifupdown-master/sysmocom-idu/interfaces @@ -27,7 +27,6 @@ iface eth0.2000 inet static netmask 255.255.255.0 network 192.168.0.0 post-up ip r add 10.6.1.0/24 via 192.168.0.1 - post-up ip r add 5.9.81.48/32 via 192.168.0.1 metric 110 # VLAN 2001: Reserved for a future C-Band satellite modem # attached to port 8 of the IES-3080 diff --git a/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces index 89adfc180d..bddcaaa267 100644 --- a/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces +++ b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces @@ -27,7 +27,6 @@ iface eth0.2000 inet static netmask 255.255.255.0 network 192.168.0.0 post-up ip r add 10.6.1.0/24 via 192.168.0.1 - post-up ip r add 5.9.81.48/32 via 192.168.0.1 metric 110 # VLAN 2001: Reserved for a future C-Band satellite modem # attached to port 8 of the IES-3080 From ea8c1346e567ae22533a93bd2275cbdf1eeee783 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 23 Jul 2015 15:35:54 +0200 Subject: [PATCH 3/7] busybox-udhcpc simple.script: whitespace. Will edit the file in next commit, first fixing indenting to not mess up the diff. --- recipes-core/busybox/files/simple.script | 58 ++++++++++++------------ 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/recipes-core/busybox/files/simple.script b/recipes-core/busybox/files/simple.script index d8c375ad44..399951cca2 100644 --- a/recipes-core/busybox/files/simple.script +++ b/recipes-core/busybox/files/simple.script @@ -30,46 +30,46 @@ case "$1" in /sbin/resolvconf -d "${interface}.udhcpc" fi if ! root_is_nfs ; then - if [ $have_bin_ip -eq 1 ]; then - ip addr flush dev $interface - ip link set dev $interface up - else - /sbin/ifconfig $interface 0.0.0.0 - fi + if [ $have_bin_ip -eq 1 ]; then + ip addr flush dev $interface + ip link set dev $interface up + else + /sbin/ifconfig $interface 0.0.0.0 + fi fi ;; renew|bound) - if [ $have_bin_ip -eq 1 ]; then - ip addr add dev $interface local $ip/$mask $BROADCAST - else - /sbin/ifconfig $interface $ip $BROADCAST $NETMASK - fi + if [ $have_bin_ip -eq 1 ]; then + ip addr add dev $interface local $ip/$mask $BROADCAST + else + /sbin/ifconfig $interface $ip $BROADCAST $NETMASK + fi if [ -n "$router" ] ; then if ! root_is_nfs ; then - if [ $have_bin_ip -eq 1 ]; then - while ip route del default dev $interface 2>/dev/null ; do - : - done - else - while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do - : - done - fi + if [ $have_bin_ip -eq 1 ]; then + while ip route del default dev $interface 2>/dev/null ; do + : + done + else + while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do + : + done + fi fi metric=10 for i in $router ; do - if [ $have_bin_ip -eq 1 ]; then - ip route add default via $i metric $metric - else - route add default gw $i dev $interface metric $metric 2>/dev/null - fi - metric=$(($metric + 1)) + if [ $have_bin_ip -eq 1 ]; then + ip route add default via $i metric $metric + else + route add default gw $i dev $interface metric $metric 2>/dev/null + fi + metric=$(($metric + 1)) done fi - if [ "$STATIC_DNS" != "yes" ]; then + if [ "$STATIC_DNS" != "yes" ]; then # Update resolver configuration file R="" [ -n "$domain" ] && R="domain $domain @@ -85,8 +85,10 @@ case "$1" in else echo -n "$R" > "$RESOLV_CONF" fi - fi + fi ;; esac exit 0 + +# vim: tabstop=8 shiftwidth=8 noexpandtab From 1411cacbce807f2712c4d70b9f1026f585a40fbf Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 23 Jul 2015 15:40:59 +0200 Subject: [PATCH 4/7] busybox-udhcpc: add option to skip default route. The IDU requires that udhcpc does neither touch resolv.conf nor install a default route. Add a flag to switch off default route installation, the resolv.conf part is already switch-off-able. --- recipes-core/busybox/busybox_sysmocom.inc | 2 +- recipes-core/busybox/files/simple.script | 3 ++- recipes-core/busybox/files/udhcpc.default | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/recipes-core/busybox/busybox_sysmocom.inc b/recipes-core/busybox/busybox_sysmocom.inc index 9be36e29c8..621ca4884f 100644 --- a/recipes-core/busybox/busybox_sysmocom.inc +++ b/recipes-core/busybox/busybox_sysmocom.inc @@ -1,6 +1,6 @@ SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" FILESEXTRAPATHS_prepend := "${SYSMOCOM}/busybox-${SYSMOCOM_ORIG_PV}:${SYSMOCOM}/files:" -PRINC = "28" +PRINC = "29" SRC_URI += "file://udhcpc-ntp.sh \ file://udhcpc-ntp.default \ diff --git a/recipes-core/busybox/files/simple.script b/recipes-core/busybox/files/simple.script index 399951cca2..af0f01e9b7 100644 --- a/recipes-core/busybox/files/simple.script +++ b/recipes-core/busybox/files/simple.script @@ -1,6 +1,7 @@ #!/bin/sh # udhcpc script edited by Tim Riker +# Added INSTALL_DEFAULT_ROUTE flag, by [ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 @@ -46,7 +47,7 @@ case "$1" in /sbin/ifconfig $interface $ip $BROADCAST $NETMASK fi - if [ -n "$router" ] ; then + if [ -n "$router" -a "$INSTALL_DEFAULT_ROUTE" != "no" ] ; then if ! root_is_nfs ; then if [ $have_bin_ip -eq 1 ]; then while ip route del default dev $interface 2>/dev/null ; do diff --git a/recipes-core/busybox/files/udhcpc.default b/recipes-core/busybox/files/udhcpc.default index 4b04b5d1cb..84bbbae692 100644 --- a/recipes-core/busybox/files/udhcpc.default +++ b/recipes-core/busybox/files/udhcpc.default @@ -1,2 +1,5 @@ # Uncomment the following line, if udhcpc should not touch /etc/resolv.conf -# STATIC_DNS="yes" +#STATIC_DNS="yes" + +# Uncomment the following line if udhcpc should not install a default route +#INSTALL_DEFAULT_ROUTE="no" From 8e46fae730d18a5a885a178a812ea49a93bd4f59 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 23 Jul 2015 15:45:42 +0200 Subject: [PATCH 5/7] busybox-udhcpc: udhcpc.default file for IDU. Hopefully, this installs a different /etc/default/udhcpc file on sysmocom-idu machines. Not sure if adding a machine subdir suffices. The idea is that the machine-specific subdir symocom-idu should replace the udhcpc.default file used for the idu packages, only, which has both resolv.conf mods and default route disabled by default. --- recipes-core/busybox/busybox_sysmocom.inc | 2 +- recipes-core/busybox/sysmocom-idu/udhcpc.default | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 recipes-core/busybox/sysmocom-idu/udhcpc.default diff --git a/recipes-core/busybox/busybox_sysmocom.inc b/recipes-core/busybox/busybox_sysmocom.inc index 621ca4884f..90f3e13b48 100644 --- a/recipes-core/busybox/busybox_sysmocom.inc +++ b/recipes-core/busybox/busybox_sysmocom.inc @@ -1,6 +1,6 @@ SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" FILESEXTRAPATHS_prepend := "${SYSMOCOM}/busybox-${SYSMOCOM_ORIG_PV}:${SYSMOCOM}/files:" -PRINC = "29" +PRINC = "30" SRC_URI += "file://udhcpc-ntp.sh \ file://udhcpc-ntp.default \ diff --git a/recipes-core/busybox/sysmocom-idu/udhcpc.default b/recipes-core/busybox/sysmocom-idu/udhcpc.default new file mode 100644 index 0000000000..295e16c802 --- /dev/null +++ b/recipes-core/busybox/sysmocom-idu/udhcpc.default @@ -0,0 +1,5 @@ +# Uncomment the following line, if udhcpc should not touch /etc/resolv.conf +STATIC_DNS="yes" + +# Uncomment the following line if udhcpc should not install a default route +INSTALL_DEFAULT_ROUTE="no" From bfac671c1c662a8797c59c204db2d18ce021e145 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 23 Jul 2015 15:55:35 +0200 Subject: [PATCH 6/7] Revert "busybox-udhcpc simple.script: whitespace." This reverts commit ea8c1346e567ae22533a93bd2275cbdf1eeee783, to facilitate diffing. --- recipes-core/busybox/files/simple.script | 58 ++++++++++++------------ 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/recipes-core/busybox/files/simple.script b/recipes-core/busybox/files/simple.script index af0f01e9b7..3e1eba81f0 100644 --- a/recipes-core/busybox/files/simple.script +++ b/recipes-core/busybox/files/simple.script @@ -31,46 +31,46 @@ case "$1" in /sbin/resolvconf -d "${interface}.udhcpc" fi if ! root_is_nfs ; then - if [ $have_bin_ip -eq 1 ]; then - ip addr flush dev $interface - ip link set dev $interface up - else - /sbin/ifconfig $interface 0.0.0.0 - fi + if [ $have_bin_ip -eq 1 ]; then + ip addr flush dev $interface + ip link set dev $interface up + else + /sbin/ifconfig $interface 0.0.0.0 + fi fi ;; renew|bound) - if [ $have_bin_ip -eq 1 ]; then - ip addr add dev $interface local $ip/$mask $BROADCAST - else - /sbin/ifconfig $interface $ip $BROADCAST $NETMASK - fi + if [ $have_bin_ip -eq 1 ]; then + ip addr add dev $interface local $ip/$mask $BROADCAST + else + /sbin/ifconfig $interface $ip $BROADCAST $NETMASK + fi if [ -n "$router" -a "$INSTALL_DEFAULT_ROUTE" != "no" ] ; then if ! root_is_nfs ; then - if [ $have_bin_ip -eq 1 ]; then - while ip route del default dev $interface 2>/dev/null ; do - : - done - else - while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do - : - done - fi + if [ $have_bin_ip -eq 1 ]; then + while ip route del default dev $interface 2>/dev/null ; do + : + done + else + while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do + : + done + fi fi metric=10 for i in $router ; do - if [ $have_bin_ip -eq 1 ]; then - ip route add default via $i metric $metric - else - route add default gw $i dev $interface metric $metric 2>/dev/null - fi - metric=$(($metric + 1)) + if [ $have_bin_ip -eq 1 ]; then + ip route add default via $i metric $metric + else + route add default gw $i dev $interface metric $metric 2>/dev/null + fi + metric=$(($metric + 1)) done fi - if [ "$STATIC_DNS" != "yes" ]; then + if [ "$STATIC_DNS" != "yes" ]; then # Update resolver configuration file R="" [ -n "$domain" ] && R="domain $domain @@ -86,10 +86,8 @@ case "$1" in else echo -n "$R" > "$RESOLV_CONF" fi - fi + fi ;; esac exit 0 - -# vim: tabstop=8 shiftwidth=8 noexpandtab From 33995b24737535a751326d4711330a9f96760cac Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 23 Jul 2015 16:00:42 +0200 Subject: [PATCH 7/7] busybox-udhcpc: move sysmocom-idu dir. The proper place apparently is below files/, not next to it. --- recipes-core/busybox/{ => files}/sysmocom-idu/udhcpc.default | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename recipes-core/busybox/{ => files}/sysmocom-idu/udhcpc.default (100%) diff --git a/recipes-core/busybox/sysmocom-idu/udhcpc.default b/recipes-core/busybox/files/sysmocom-idu/udhcpc.default similarity index 100% rename from recipes-core/busybox/sysmocom-idu/udhcpc.default rename to recipes-core/busybox/files/sysmocom-idu/udhcpc.default