From 9cef909c8226feaf9e58ef7f8ea1214c62974c71 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Mon, 6 Jul 2015 12:58:39 +0200 Subject: [PATCH 01/19] init-ifupdown: fix typo in network/interfaces --- .../init-ifupdown/init-ifupdown-master/sysmocom-idu/interfaces | 2 +- recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces | 2 +- 2 files changed, 2 insertions(+), 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 86d2c8b15c..f29c295a17 100644 --- a/recipes-bsp/init-ifupdown/init-ifupdown-master/sysmocom-idu/interfaces +++ b/recipes-bsp/init-ifupdown/init-ifupdown-master/sysmocom-idu/interfaces @@ -99,7 +99,7 @@ iface eth2.1001 inet static netmask 255.255.255.0 network 172.16.8.0 -# onboad WiFi +# onboard WiFi auto eth2.1002 iface eth2.1002 inet static address 172.16.128.1 diff --git a/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces index 86d2c8b15c..f29c295a17 100644 --- a/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces +++ b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces @@ -99,7 +99,7 @@ iface eth2.1001 inet static netmask 255.255.255.0 network 172.16.8.0 -# onboad WiFi +# onboard WiFi auto eth2.1002 iface eth2.1002 inet static address 172.16.128.1 From 209666c7dde955fe84376892c5ef2b882dfc80d4 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 9 Jul 2015 09:51:35 +0200 Subject: [PATCH 02/19] linux-sysmocom: Document upgrade issue with the kernel The reverse dependency appears broken. Add a comment to the recipes to warn us when updating. The issue does not appear to exist in master of Yocto. Related: SYS#1353 --- recipes-bsp/linux/linux-sysmocom_3.2.bb | 3 +++ recipes-bsp/linux/linux-sysmocom_git.bb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/recipes-bsp/linux/linux-sysmocom_3.2.bb b/recipes-bsp/linux/linux-sysmocom_3.2.bb index d9f11c6259..4d9faae5c5 100644 --- a/recipes-bsp/linux/linux-sysmocom_3.2.bb +++ b/recipes-bsp/linux/linux-sysmocom_3.2.bb @@ -4,6 +4,9 @@ require linux-sysmocom.inc LINUX_VERSION ?= "3.2.69" LINUX_VERSION_EXTENSION ?= "-sysmocom-${LINUX_KERNEL_TYPE}" +# ATTENTION: Update linux-backports PR on version change. In Dora the +# reverse dependency tracking for the kernel doesn't appear to work. So +# please bump the PR on version changes! SRCREV = "d1a5b8e2ddc3a74c6d81d85a106cb0c33cd7688b" BRANCH = "sob-odu/linux-3.2.69" diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb index f351bd88e1..37be276688 100644 --- a/recipes-bsp/linux/linux-sysmocom_git.bb +++ b/recipes-bsp/linux/linux-sysmocom_git.bb @@ -3,6 +3,9 @@ require linux-sysmocom.inc DEPENDS += "bc-native" +# ATTENTION: Update linux-backports PR on version change. In Dora the +# reverse dependency tracking for the kernel doesn't appear to work. So +# please bump the PR on version changes! # at versions changes do not forget to update conf/machine/include/sysmobts.inc too LINUX_VERSION ?= "3.10.80" LINUX_VERSION_EXTENSION ?= "-sysmocom-${LINUX_KERNEL_TYPE}" From de502623c148d5ad691269e33e5d3af50b2f8541 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Fri, 10 Jul 2015 19:45:25 +0200 Subject: [PATCH 03/19] rtl8169-eeprom: add recipe for rtl8169-eeprom --- .../rtl8169-eeprom/rtl8169-eeprom_git.bb | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb diff --git a/recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb b/recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb new file mode 100644 index 0000000000..1d5e3e94de --- /dev/null +++ b/recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb @@ -0,0 +1,31 @@ +SUMMARY = "small utility to configure MAC-addresses on ALIX/APU boards" +HOMEPAGE = "" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "pciutils" + +COMPATIBLE_MACHINE = "(sysmocom-bsc|sysmocom-idu|sysmocom-bsc-e1.conf)" + +SRCREV = "e62e515ce314599e48b268dac69d2f16a504264c" +SRC_URI = "git://git.sysmocom.de/rtl8168-eeprom;protocol=git;branch=master" +PV = "v0.0.1+git${SRCPV}" +PR = "r0" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +CFLAGS += "" +LDFLAGS += "" + +CFLAGS += "`pkg-config --cflags libpci`" +LDFLAGS += "`pkg-config --libs libpci`" + +do_configure() { +} + +do_install() { + install -d ${D}${sbindir}/ + install -m 0755 ${S}/rtl8168-eeprom ${D}${sbindir}/ +} + From f70f875e8369d863bde20c5413f42570fb25c794 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 11 Jul 2015 08:53:57 +0200 Subject: [PATCH 04/19] rtl8169: Fix the machine name for the E1 one --- recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb b/recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb index 1d5e3e94de..2c554e3460 100644 --- a/recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb +++ b/recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "pciutils" -COMPATIBLE_MACHINE = "(sysmocom-bsc|sysmocom-idu|sysmocom-bsc-e1.conf)" +COMPATIBLE_MACHINE = "(sysmocom-bsc|sysmocom-idu|sysmocom-bsc-e1)" SRCREV = "e62e515ce314599e48b268dac69d2f16a504264c" SRC_URI = "git://git.sysmocom.de/rtl8168-eeprom;protocol=git;branch=master" From f8535440b76413b0b0e2062589d1c71a97c3fb7c Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 11 Jul 2015 08:55:08 +0200 Subject: [PATCH 05/19] rtl8169: And kill the COMPATIBLE_MACHINE completely Yes, this does require a PCI bus and will not run on a BTS but there is no specific config file or such. --- recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb b/recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb index 2c554e3460..3dad8d51a4 100644 --- a/recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb +++ b/recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb @@ -4,8 +4,6 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "pciutils" -COMPATIBLE_MACHINE = "(sysmocom-bsc|sysmocom-idu|sysmocom-bsc-e1)" - SRCREV = "e62e515ce314599e48b268dac69d2f16a504264c" SRC_URI = "git://git.sysmocom.de/rtl8168-eeprom;protocol=git;branch=master" PV = "v0.0.1+git${SRCPV}" From e2d36a57d4acc434a55051d80216ac65b2ccea94 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 11 Jul 2015 08:56:10 +0200 Subject: [PATCH 06/19] task-sysmocom-feed: Build the new rtl8169-eeprom We want this to be installable for the IDU system and for now let's put it into the feed. --- recipes-apps/tasks/task-sysmocom-feed.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-apps/tasks/task-sysmocom-feed.bb b/recipes-apps/tasks/task-sysmocom-feed.bb index dbf1b7713f..135d08bf9a 100644 --- a/recipes-apps/tasks/task-sysmocom-feed.bb +++ b/recipes-apps/tasks/task-sysmocom-feed.bb @@ -14,5 +14,5 @@ RDEPENDS_${PN} = "\ python-pyserial python-pexpect bridge-utils \ pciutils nfacct logrotate dnsmasq ifupdown \ logrotate python-jsonrpclib python-enum iputils \ - packagegroup-sysmobts-sob \ + packagegroup-sysmobts-sob rtl8169-eeprom \ perl libdbd-sqlite-perl libdbi-perl libjson-perl" From 455820b8d3b1bde16b24f6778d07784fe4108fe2 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 12 Jul 2015 09:21:03 +0200 Subject: [PATCH 07/19] image-rauc-slot-rescue: Reduce the size of the rescue slot The system should be as small as possible and besides tools to touch flash and block files, SSHD and rauc there should be nothing else. We might continue to have opkg on it to allow updating it --- recipes-core/images/image-rauc-slot-rescue.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-core/images/image-rauc-slot-rescue.bb b/recipes-core/images/image-rauc-slot-rescue.bb index 0ab5eb0191..b81137702b 100644 --- a/recipes-core/images/image-rauc-slot-rescue.bb +++ b/recipes-core/images/image-rauc-slot-rescue.bb @@ -1,6 +1,6 @@ DESCRIPTION = "rescue initramfs" -PACKAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} task-sysmocom-debug task-sysmocom-tools rauc" +PACKAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} rauc" IMAGE_LINGUAS = "" From 870b73cb12a554d43f135c49eb67875aaeea86ed Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 12 Jul 2015 09:22:58 +0200 Subject: [PATCH 08/19] image-rauc-slot-rescue: Remove some more files from it * We never need the BTS firmware. We never want to do GSM from within rescue image * Remove various udev hardware dbs. I think we couldn't care less about identifying peripheral devices by name and such. --- recipes-core/images/image-rauc-slot-rescue.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/recipes-core/images/image-rauc-slot-rescue.bb b/recipes-core/images/image-rauc-slot-rescue.bb index b81137702b..dfd7e52b87 100644 --- a/recipes-core/images/image-rauc-slot-rescue.bb +++ b/recipes-core/images/image-rauc-slot-rescue.bb @@ -49,3 +49,15 @@ IMAGE_FSTYPES_sysmocom-idu = "cpio.xz" IMAGE_FSTYPES_sysmobts-v2 = "ubi" BAD_RECOMMENDATIONS += "busybox-syslog" + + +shrink_rescue() { + # In case of the sysmoBTS.. remove files + rm -rf ${IMAGE_ROOTFS}/lib/firmware/sysmobts* + + # Who cares about udev? + rm -rf ${IMAGE_ROOTFS}/lib/udev/hwdb.d/* + rm -rf ${IMAGE_ROOTFS}/etc/udev/hwdb.bin +} + +IMAGE_PREPROCESS_COMMAND += "shrink_rescue; " From e696c6fb6be407a444e38a875d542c255918984e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 12 Jul 2015 10:40:38 +0200 Subject: [PATCH 09/19] image-rauc-slot-rescue: Do not add e2fsprogs-fsck For the ODU/BTS we do not have ext4 and will not need to check a filesystem. Do not install these recommendations. --- recipes-core/images/image-rauc-slot-rescue.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-core/images/image-rauc-slot-rescue.bb b/recipes-core/images/image-rauc-slot-rescue.bb index dfd7e52b87..df6bcfa998 100644 --- a/recipes-core/images/image-rauc-slot-rescue.bb +++ b/recipes-core/images/image-rauc-slot-rescue.bb @@ -48,7 +48,9 @@ IMAGE_CMD_ubi () { IMAGE_FSTYPES_sysmocom-idu = "cpio.xz" IMAGE_FSTYPES_sysmobts-v2 = "ubi" -BAD_RECOMMENDATIONS += "busybox-syslog" +BAD_RECOMMENDATIONS_append = " busybox-syslog" +BAD_RECOMMENDATIONS_append_sysmobts-v2 = " e2fsprogs-e2fsck" +BAD_RECOMMENDATIONS_append_sysmocom-odu = " e2fsprogs-e2fsck" shrink_rescue() { From 9955e6aaf68c059b30768f17ba3e60dbb26bf576 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 12 Jul 2015 10:47:22 +0200 Subject: [PATCH 10/19] image-rauc-slot-rescue: Remove bts kernel modules if present In case of the sysmobts we can remove the kernel modules for the dsp communication. --- recipes-core/images/image-rauc-slot-rescue.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipes-core/images/image-rauc-slot-rescue.bb b/recipes-core/images/image-rauc-slot-rescue.bb index df6bcfa998..eaec50892f 100644 --- a/recipes-core/images/image-rauc-slot-rescue.bb +++ b/recipes-core/images/image-rauc-slot-rescue.bb @@ -56,6 +56,12 @@ BAD_RECOMMENDATIONS_append_sysmocom-odu = " e2fsprogs-e2fsck" shrink_rescue() { # In case of the sysmoBTS.. remove files rm -rf ${IMAGE_ROOTFS}/lib/firmware/sysmobts* + rm -rf ${IMAGE_ROOTFS}/lib/modules/*/kernel/drivers/staging/sysmobts/msgqueue.ko + rm -rf ${IMAGE_ROOTFS}/lib/modules/*/kernel/drivers/misc/fpgadl.ko + rm -rf ${IMAGE_ROOTFS}/lib/modules/*/kernel/drivers/staging/sysmobts/rtfifo.ko + rm -rf ${IMAGE_ROOTFS}/lib/modules/*/kernel/drivers/misc/dspdl.ko + rm -rf ${IMAGE_ROOTFS}/lib/modules/*/kernel/drivers/misc/dspdl_dm644x.ko + rm -rf ${IMAGE_ROOTFS}/lib/modules/*/kernel/drivers/misc/fpgadl_par.ko # Who cares about udev? rm -rf ${IMAGE_ROOTFS}/lib/udev/hwdb.d/* From fd44e0be4592949761e9a5b6906cd566a252ca11 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 12 Jul 2015 11:49:33 +0200 Subject: [PATCH 11/19] image-rauc-slot-rescue: Make sure dropbear is in the image too --- recipes-core/images/image-rauc-slot-rescue.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-core/images/image-rauc-slot-rescue.bb b/recipes-core/images/image-rauc-slot-rescue.bb index eaec50892f..00537cc2a8 100644 --- a/recipes-core/images/image-rauc-slot-rescue.bb +++ b/recipes-core/images/image-rauc-slot-rescue.bb @@ -1,6 +1,6 @@ DESCRIPTION = "rescue initramfs" -PACKAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} rauc" +PACKAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} rauc dropbear" IMAGE_LINGUAS = "" From 1422f63b03c5fcfa4beafb23448364b542e8bc7b Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 12 Jul 2015 11:49:17 +0200 Subject: [PATCH 12/19] autossh: Add a small ssh spawner/link tester --- recipes-apps/autossh/autossh_1.4e.bb | 18 +++++++++++++ .../files/020_use_destdir_makefile.diff | 25 +++++++++++++++++++ .../autossh/files/022_pass_ldflags.diff | 17 +++++++++++++ recipes-apps/tasks/task-sysmocom-feed.bb | 2 +- 4 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 recipes-apps/autossh/autossh_1.4e.bb create mode 100644 recipes-apps/autossh/files/020_use_destdir_makefile.diff create mode 100644 recipes-apps/autossh/files/022_pass_ldflags.diff diff --git a/recipes-apps/autossh/autossh_1.4e.bb b/recipes-apps/autossh/autossh_1.4e.bb new file mode 100644 index 0000000000..d761afcc95 --- /dev/null +++ b/recipes-apps/autossh/autossh_1.4e.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "autossh" +LICENSE = "MIT" + + +LIC_FILES_CHKSUM = "file://autossh.c;endline=22;md5=b2b08187a92c97723e1d882a9fe657ac" +SRC_URI = "http://www.harding.motd.ca/autossh/autossh-${PV}.tgz \ + file://020_use_destdir_makefile.diff \ + file://022_pass_ldflags.diff" + +SRC_URI[md5sum] = "f86684b96e99d22b2e9d35dc63b0aa29" +SRC_URI[sha256sum] = "9e8e10a59d7619176f4b986e256f776097a364d1be012781ea52e08d04679156" + +inherit autotools + + +PACKAGES += "${PN}-examples" + +FILES_${PN}-examples = "${datadir}/examples/*" diff --git a/recipes-apps/autossh/files/020_use_destdir_makefile.diff b/recipes-apps/autossh/files/020_use_destdir_makefile.diff new file mode 100644 index 0000000000..9485b6d8bc --- /dev/null +++ b/recipes-apps/autossh/files/020_use_destdir_makefile.diff @@ -0,0 +1,25 @@ +Support for $DESTDIR in the Makefile. + +From debian + +Index: autossh-1.4e/Makefile.in +=================================================================== +--- autossh-1.4e.orig/Makefile.in 2015-02-10 05:41:58.000000000 +0100 ++++ autossh-1.4e/Makefile.in 2015-07-12 11:44:41.979659656 +0200 +@@ -6,11 +6,11 @@ + + SSH= @path_ssh@ + +-prefix= @prefix@ +-exec_prefix= @exec_prefix@ +-bindir= @bindir@ +-datadir= @datadir@ +-mandir= @mandir@ ++prefix= ${DESTDIR}@prefix@ ++exec_prefix= ${DESTDIR}@exec_prefix@ ++bindir= ${DESTDIR}@bindir@ ++datadir= ${DESTDIR}@datadir@ ++mandir= ${DESTDIR}@mandir@ + + SRCDIR= @srcdir@ + VPATH= @srcdir@ diff --git a/recipes-apps/autossh/files/022_pass_ldflags.diff b/recipes-apps/autossh/files/022_pass_ldflags.diff new file mode 100644 index 0000000000..722a20a0d9 --- /dev/null +++ b/recipes-apps/autossh/files/022_pass_ldflags.diff @@ -0,0 +1,17 @@ +Description: Properly pass LDFLAGS. Fixes lintian warning hardening-no-relro +Author: Axel Beckert + +Index: autossh/Makefile.in +=================================================================== +--- autossh.orig/Makefile.in 2013-05-16 14:51:47.000000000 +0200 ++++ autossh/Makefile.in 2013-05-16 14:53:19.000000000 +0200 +@@ -31,7 +31,7 @@ + + + $(TARGET): $(OFILES) +- $(CC) $(CPPFLAGS) -o $(TARGET) $(OFILES) $(LIBS) ++ $(CC) $(CPPFLAGS) $(LDFLAGS) -o $(TARGET) $(OFILES) $(LIBS) + + clean: + - /bin/rm -f *.o *.a *.core *~ + diff --git a/recipes-apps/tasks/task-sysmocom-feed.bb b/recipes-apps/tasks/task-sysmocom-feed.bb index 135d08bf9a..d2fb9fd99b 100644 --- a/recipes-apps/tasks/task-sysmocom-feed.bb +++ b/recipes-apps/tasks/task-sysmocom-feed.bb @@ -14,5 +14,5 @@ RDEPENDS_${PN} = "\ python-pyserial python-pexpect bridge-utils \ pciutils nfacct logrotate dnsmasq ifupdown \ logrotate python-jsonrpclib python-enum iputils \ - packagegroup-sysmobts-sob rtl8169-eeprom \ + packagegroup-sysmobts-sob rtl8169-eeprom autossh \ perl libdbd-sqlite-perl libdbi-perl libjson-perl" From c09cac566d3d60cc914304aebb4dc6283d612375 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Mon, 6 Jul 2015 23:02:29 +0200 Subject: [PATCH 13/19] init-ifupdown: add IDU eth0.2002 inmarsat config --- .../init-ifupdown-master/sysmocom-idu/interfaces | 15 ++++++++++++--- .../init-ifupdown/sysmocom-idu/interfaces | 15 ++++++++++++--- 2 files changed, 24 insertions(+), 6 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 f29c295a17..2bf920bf46 100644 --- a/recipes-bsp/init-ifupdown/init-ifupdown-master/sysmocom-idu/interfaces +++ b/recipes-bsp/init-ifupdown/init-ifupdown-master/sysmocom-idu/interfaces @@ -24,10 +24,19 @@ auto eth0.2001 iface eth0.2001 inet manual # VLAN 2002: Reserved for a future Inmarsat satellite modem -# attached to port 7 of the IES-3080 +# attached to port 6 of the IES-3080 auto eth0.2002 -#iface eth0.2002 inet dhcp -iface eth0.2002 inet manual +iface eth0.2002 inet static + address 10.156.136.99 + netmask 255.255.255.224 + network 10.156.136.96 + #gateway 10.156.136.97 # no route should be installed, linkmon will do that. + # Switch off rp_filter + post-up /sbin/sysctl net.ipv4.conf.eth0/2002.rp_filter=2 + # Set a route with high metric nr so a ping -I on this iface will work: + post-up ip r add 5.9.81.48/32 via 10.156.136.97 metric 101 + # Once sob-idu-linkmon sees pings working, it will install a route + # with lower metric. # management VLAN of IES-3080 switch (172.16.2.3) auto eth0.6 diff --git a/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces index f29c295a17..2bf920bf46 100644 --- a/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces +++ b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces @@ -24,10 +24,19 @@ auto eth0.2001 iface eth0.2001 inet manual # VLAN 2002: Reserved for a future Inmarsat satellite modem -# attached to port 7 of the IES-3080 +# attached to port 6 of the IES-3080 auto eth0.2002 -#iface eth0.2002 inet dhcp -iface eth0.2002 inet manual +iface eth0.2002 inet static + address 10.156.136.99 + netmask 255.255.255.224 + network 10.156.136.96 + #gateway 10.156.136.97 # no route should be installed, linkmon will do that. + # Switch off rp_filter + post-up /sbin/sysctl net.ipv4.conf.eth0/2002.rp_filter=2 + # Set a route with high metric nr so a ping -I on this iface will work: + post-up ip r add 5.9.81.48/32 via 10.156.136.97 metric 101 + # Once sob-idu-linkmon sees pings working, it will install a route + # with lower metric. # management VLAN of IES-3080 switch (172.16.2.3) auto eth0.6 From 119a9ce8b4a5ab16285b627552b4e2346f60f94b Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Tue, 14 Jul 2015 14:23:41 +0200 Subject: [PATCH 14/19] init-ifupdown: set 'inactive' sat metrics, comment. --- .../init-ifupdown-master/sysmocom-idu/interfaces | 15 +++++++++++++-- .../init-ifupdown/sysmocom-idu/interfaces | 15 +++++++++++++-- 2 files changed, 26 insertions(+), 4 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 2bf920bf46..f7a1fcaba1 100644 --- a/recipes-bsp/init-ifupdown/init-ifupdown-master/sysmocom-idu/interfaces +++ b/recipes-bsp/init-ifupdown/init-ifupdown-master/sysmocom-idu/interfaces @@ -8,6 +8,17 @@ iface lo inet loopback # in the future we will use VLANs to use individual switch ports as # break-out interfaces. For now we simply do DHCP. +# Note: when inmarsat is available, its route should have a stronger metric +# than iridium (the route installed by linkmon). For the "inactive" routes, the +# metrics should be reversed, because iridium is more likely to be available +# than inmarsat (as an emergency/fallback measure). +# +# transport "active" metric "inactive" metric +# GSM 10 140 +# WIFI 20 130 +# Inmarsat 30 120 +# Iridium 40 110 + # VLAN 2000: The iridium openport satellite modem attached to # port 1 of the IES-3080 auto eth0.2000 @@ -16,7 +27,7 @@ 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 100 + 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 @@ -34,7 +45,7 @@ iface eth0.2002 inet static # Switch off rp_filter post-up /sbin/sysctl net.ipv4.conf.eth0/2002.rp_filter=2 # Set a route with high metric nr so a ping -I on this iface will work: - post-up ip r add 5.9.81.48/32 via 10.156.136.97 metric 101 + post-up ip r add 5.9.81.48/32 via 10.156.136.97 metric 120 # Once sob-idu-linkmon sees pings working, it will install a route # with lower metric. diff --git a/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces index 2bf920bf46..f7a1fcaba1 100644 --- a/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces +++ b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces @@ -8,6 +8,17 @@ iface lo inet loopback # in the future we will use VLANs to use individual switch ports as # break-out interfaces. For now we simply do DHCP. +# Note: when inmarsat is available, its route should have a stronger metric +# than iridium (the route installed by linkmon). For the "inactive" routes, the +# metrics should be reversed, because iridium is more likely to be available +# than inmarsat (as an emergency/fallback measure). +# +# transport "active" metric "inactive" metric +# GSM 10 140 +# WIFI 20 130 +# Inmarsat 30 120 +# Iridium 40 110 + # VLAN 2000: The iridium openport satellite modem attached to # port 1 of the IES-3080 auto eth0.2000 @@ -16,7 +27,7 @@ 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 100 + 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 @@ -34,7 +45,7 @@ iface eth0.2002 inet static # Switch off rp_filter post-up /sbin/sysctl net.ipv4.conf.eth0/2002.rp_filter=2 # Set a route with high metric nr so a ping -I on this iface will work: - post-up ip r add 5.9.81.48/32 via 10.156.136.97 metric 101 + post-up ip r add 5.9.81.48/32 via 10.156.136.97 metric 120 # Once sob-idu-linkmon sees pings working, it will install a route # with lower metric. From 0aec6171be83f94472ace6a6fba83e72d5e28c8e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 14 Jul 2015 14:47:50 +0200 Subject: [PATCH 15/19] osmo-pcu: Make sure the commit is available in a branch The builds of the stable upgrade and the Yocto-Master failed because of the commit gone missing (no remote is referencing it). I created a dummy branch to hold this commit. --- recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb b/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb index 8205a8d365..4420052e26 100644 --- a/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb +++ b/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb @@ -2,10 +2,10 @@ DESCRIPTION = "Osmocom PCU for sysmoBTS" LICENSE = "GPLv2" LIC_FILES_CHKSUM="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "git://git.osmocom.org/osmo-pcu.git;protocol=git;branch=jerlbeck/wip/pdch-alloc" +SRC_URI = "git://git.osmocom.org/osmo-pcu.git;protocol=git;branch=zecke/wip" SRCREV = "410d98e5d0c0eae76221a2d62a837b962f082506" PV = "0.4+git${SRCPV}" -PR = "r2.${META_TELEPHONY_OSMO_INC}" +PR = "r3.${META_TELEPHONY_OSMO_INC}" S = "${WORKDIR}/git" DEPENDS = "libosmocore femtobts-api osmo-bts" From 1ed5160b0dd153d9d7f1e64a0c51da7dcd98a5a2 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Fri, 17 Jul 2015 14:29:52 +0200 Subject: [PATCH 16/19] init-ifupdown: adjust comment about metrics --- .../init-ifupdown-master/sysmocom-idu/interfaces | 8 ++++---- .../init-ifupdown/init-ifupdown/sysmocom-idu/interfaces | 8 ++++---- 2 files changed, 8 insertions(+), 8 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 f7a1fcaba1..f3c8d56736 100644 --- a/recipes-bsp/init-ifupdown/init-ifupdown-master/sysmocom-idu/interfaces +++ b/recipes-bsp/init-ifupdown/init-ifupdown-master/sysmocom-idu/interfaces @@ -14,10 +14,10 @@ iface lo inet loopback # than inmarsat (as an emergency/fallback measure). # # transport "active" metric "inactive" metric -# GSM 10 140 -# WIFI 20 130 -# Inmarsat 30 120 -# Iridium 40 110 +# WIFI 10 130 +# GSM 20 140 +# Iridium 30 110 +# Inmarsat 40 120 # VLAN 2000: The iridium openport satellite modem attached to # port 1 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 f7a1fcaba1..f3c8d56736 100644 --- a/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces +++ b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces @@ -14,10 +14,10 @@ iface lo inet loopback # than inmarsat (as an emergency/fallback measure). # # transport "active" metric "inactive" metric -# GSM 10 140 -# WIFI 20 130 -# Inmarsat 30 120 -# Iridium 40 110 +# WIFI 10 130 +# GSM 20 140 +# Iridium 30 110 +# Inmarsat 40 120 # VLAN 2000: The iridium openport satellite modem attached to # port 1 of the IES-3080 From 38579ae767ff90824e2821a64ba560c30ebe1266 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Fri, 17 Jul 2015 14:32:00 +0200 Subject: [PATCH 17/19] init-ifupdown: inmarsat should be dhcp. From the obn-test config, I wrongly assumed that the inmarsat config should be static on a vessel. Instead, we need to figure out a way to use dhcp with linkmon. --- .../init-ifupdown-master/sysmocom-idu/interfaces | 12 +----------- .../init-ifupdown/sysmocom-idu/interfaces | 12 +----------- 2 files changed, 2 insertions(+), 22 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 f3c8d56736..89adfc180d 100644 --- a/recipes-bsp/init-ifupdown/init-ifupdown-master/sysmocom-idu/interfaces +++ b/recipes-bsp/init-ifupdown/init-ifupdown-master/sysmocom-idu/interfaces @@ -37,17 +37,7 @@ iface eth0.2001 inet manual # VLAN 2002: Reserved for a future Inmarsat satellite modem # attached to port 6 of the IES-3080 auto eth0.2002 -iface eth0.2002 inet static - address 10.156.136.99 - netmask 255.255.255.224 - network 10.156.136.96 - #gateway 10.156.136.97 # no route should be installed, linkmon will do that. - # Switch off rp_filter - post-up /sbin/sysctl net.ipv4.conf.eth0/2002.rp_filter=2 - # Set a route with high metric nr so a ping -I on this iface will work: - post-up ip r add 5.9.81.48/32 via 10.156.136.97 metric 120 - # Once sob-idu-linkmon sees pings working, it will install a route - # with lower metric. +iface eth0.2002 inet dhcp # management VLAN of IES-3080 switch (172.16.2.3) auto eth0.6 diff --git a/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces index f3c8d56736..89adfc180d 100644 --- a/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces +++ b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces @@ -37,17 +37,7 @@ iface eth0.2001 inet manual # VLAN 2002: Reserved for a future Inmarsat satellite modem # attached to port 6 of the IES-3080 auto eth0.2002 -iface eth0.2002 inet static - address 10.156.136.99 - netmask 255.255.255.224 - network 10.156.136.96 - #gateway 10.156.136.97 # no route should be installed, linkmon will do that. - # Switch off rp_filter - post-up /sbin/sysctl net.ipv4.conf.eth0/2002.rp_filter=2 - # Set a route with high metric nr so a ping -I on this iface will work: - post-up ip r add 5.9.81.48/32 via 10.156.136.97 metric 120 - # Once sob-idu-linkmon sees pings working, it will install a route - # with lower metric. +iface eth0.2002 inet dhcp # management VLAN of IES-3080 switch (172.16.2.3) auto eth0.6 From 2276fd4a7bc199fc71346b0e9e7a01b6b2139c66 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Wed, 8 Jul 2015 22:56:43 +0200 Subject: [PATCH 18/19] linux-backports: fix build on master * the kernel build directory was splitted and renamed on master --- classes/sysmocom-kernel-module-split.bbclass | 3 ++- .../linux-backports/linux-backports_3.18.1.1.bb | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/classes/sysmocom-kernel-module-split.bbclass b/classes/sysmocom-kernel-module-split.bbclass index 2d1075263e..e639452630 100644 --- a/classes/sysmocom-kernel-module-split.bbclass +++ b/classes/sysmocom-kernel-module-split.bbclass @@ -70,7 +70,8 @@ python split_kernel_module_packages () { m = kerverrexp.match(kernelver) if m: kernelver_stripped = m.group(1) - staging_kernel_dir = d.getVar("STAGING_KERNEL_DIR", True) + kernel_build_dir = ['STAGING_KERNEL_BUILDDIR', 'STAGING_KERNEL_DIR'][d.getVar('DISTRO_VERSION', True)[0:3] == '1.5'] + staging_kernel_dir = d.getVar(kernel_build_dir, True) system_map_file = "%s/boot/System.map-%s" % (dvar, kernelver) if not os.path.exists(system_map_file): system_map_file = "%s/System.map-%s" % (staging_kernel_dir, kernelver) diff --git a/recipes-bsp/linux-backports/linux-backports_3.18.1.1.bb b/recipes-bsp/linux-backports/linux-backports_3.18.1.1.bb index e50557ac1e..bc2a9d5cb6 100644 --- a/recipes-bsp/linux-backports/linux-backports_3.18.1.1.bb +++ b/recipes-bsp/linux-backports/linux-backports_3.18.1.1.bb @@ -16,15 +16,25 @@ SRC_URI[sha256sum] = "ff3d4d5192c4d57d7415dfcd60e02ea4fa21e0de224ae0ce2b5b9f2e9c S = "${WORKDIR}/backports-3.18.1-1" + +python __anonymous() { + if d.getVar('DISTRO_VERSION', True)[0:3] == '1.5': + d.setVar('KERNEL_BUILD_DIR', d.getVar('STAGING_KERNEL_DIR', True)) + else: + d.setVar('KERNEL_BUILD_DIR', d.getVar('STAGING_KERNEL_BUILDDIR', True)) +} + +KERNEL_BUILD_DIR = "${@d.getVar('KERNEL_BUILD_DIR', True)}" + do_configure() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC cp ${WORKDIR}/defconfig ${S}/.config - oe_runmake oldconfig KLIB_BUILD=${STAGING_KERNEL_DIR} + oe_runmake oldconfig KLIB_BUILD=${KERNEL_BUILD_DIR} } do_compile() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake KLIB_BUILD=${STAGING_KERNEL_DIR} \ + oe_runmake KLIB_BUILD=${KERNEL_BUILD_DIR} \ CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ AR="${KERNEL_AR}" \ ${MAKE_TARGETS} @@ -33,7 +43,7 @@ do_compile() { do_install() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS oe_runmake DEPMOD=echo KLIB="${D}" \ - KLIB_BUILD=${STAGING_KERNEL_DIR} \ + KLIB_BUILD=${KERNEL_BUILD_DIR} \ CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ install } From 6597f246c5afe7a180774169cff83e55277b51d8 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 19 Jul 2015 21:26:47 +0200 Subject: [PATCH 19/19] autossh: Force B=S because this is using autoconf and not automake autossh is not using automake and has a broken buildsystem. For it to build in the source directory. --- recipes-apps/autossh/autossh_1.4e.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-apps/autossh/autossh_1.4e.bb b/recipes-apps/autossh/autossh_1.4e.bb index d761afcc95..52b0529ebc 100644 --- a/recipes-apps/autossh/autossh_1.4e.bb +++ b/recipes-apps/autossh/autossh_1.4e.bb @@ -11,7 +11,7 @@ SRC_URI[md5sum] = "f86684b96e99d22b2e9d35dc63b0aa29" SRC_URI[sha256sum] = "9e8e10a59d7619176f4b986e256f776097a364d1be012781ea52e08d04679156" inherit autotools - +B = "${S}" PACKAGES += "${PN}-examples"