From c9da6c1e1a0de52b949c8beafa0525df636024b9 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 7 Oct 2014 21:18:38 +0200 Subject: [PATCH 1/7] linux-sysmocom: Fix pinmux on the ODU kernel --- recipes-bsp/linux/linux-sysmocom_3.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/linux/linux-sysmocom_3.2.bb b/recipes-bsp/linux/linux-sysmocom_3.2.bb index f51aeca868..50c57e3a67 100644 --- a/recipes-bsp/linux/linux-sysmocom_3.2.bb +++ b/recipes-bsp/linux/linux-sysmocom_3.2.bb @@ -14,7 +14,7 @@ BTS_FIRMWARE_NAME_sysmobts-2050 = "sysmobts-v2" SRCREV = "bcc4fa827be7f59486ff305d664b42a142025f9b" # odu handling. -SRCREV_sysmocom-odu = "6e6273dd4e6c29f9ed23e898393a3ab89647ef15" +SRCREV_sysmocom-odu = "3ce596259b407fce669ccfc5db3ee2826e924f29" LINUX_VERSION_sysmocom-odu = "3.2.63" PR = "r35" From 35ec4c11d9a948e854cdc84ebb4bc566068af7c6 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 7 Oct 2014 21:21:10 +0200 Subject: [PATCH 2/7] task-sysmocom-feed: Provide a real "ip" as well --- recipes-apps/tasks/task-sysmocom-feed.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-apps/tasks/task-sysmocom-feed.bb b/recipes-apps/tasks/task-sysmocom-feed.bb index 00e3bd450c..ae0dc4187c 100644 --- a/recipes-apps/tasks/task-sysmocom-feed.bb +++ b/recipes-apps/tasks/task-sysmocom-feed.bb @@ -3,11 +3,11 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" ALLOW_EMPTY_${PN} = "1" -PR = "r11" +PR = "r12" RDEPENDS_${PN} = "\ task-sysmocom-tools \ task-sysmocom-debug \ minicom vlan patch procps psmisc \ ppp rsync sed usbutils openvpn iperf \ - lcr cronie" + lcr cronie iproute2" From be040d7322f1b1c1799595de3a27d5d4cdcafc2b Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 7 Oct 2014 21:30:22 +0200 Subject: [PATCH 3/7] linux-sysmocom: Fix the building of the kernel (or hope I do) --- recipes-bsp/linux/linux-sysmocom_3.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/linux/linux-sysmocom_3.2.bb b/recipes-bsp/linux/linux-sysmocom_3.2.bb index 50c57e3a67..c6205b3de8 100644 --- a/recipes-bsp/linux/linux-sysmocom_3.2.bb +++ b/recipes-bsp/linux/linux-sysmocom_3.2.bb @@ -14,7 +14,7 @@ BTS_FIRMWARE_NAME_sysmobts-2050 = "sysmobts-v2" SRCREV = "bcc4fa827be7f59486ff305d664b42a142025f9b" # odu handling. -SRCREV_sysmocom-odu = "3ce596259b407fce669ccfc5db3ee2826e924f29" +SRCREV_sysmocom-odu = "f3f101de1ae8dd606e0b33c9dfa49a5b7a4642b1" LINUX_VERSION_sysmocom-odu = "3.2.63" PR = "r35" From 39a927390d6d63fc1117f5fa7499565962fd2c07 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 14 Oct 2014 11:44:15 +0200 Subject: [PATCH 4/7] linux-sysmocom: Enable netfilter and advanced routing for the odu Allow to use netfilter on the ODU. --- .../linux/files/sysmocom-odu/defconfig | 77 +++++++++++++++++-- recipes-bsp/linux/linux-sysmocom_3.2.bb | 2 +- 2 files changed, 71 insertions(+), 8 deletions(-) diff --git a/recipes-bsp/linux/files/sysmocom-odu/defconfig b/recipes-bsp/linux/files/sysmocom-odu/defconfig index ec141c2660..ec5cc394c2 100644 --- a/recipes-bsp/linux/files/sysmocom-odu/defconfig +++ b/recipes-bsp/linux/files/sysmocom-odu/defconfig @@ -76,6 +76,7 @@ CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y @@ -87,13 +88,75 @@ CONFIG_IP_PNP_RARP=y # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_NETFILTER=y -CONFIG_NF_CONNTRACK=y -CONFIG_NF_CONNTRACK_IPV4=y -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_TARGET_LOG=y -CONFIG_NF_NAT=y -CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_NF_CONNTRACK=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_CPU=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_OSF=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_SECURITY=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m CONFIG_CAN=y CONFIG_CAN_RAW=y CONFIG_CAN_BCM=y diff --git a/recipes-bsp/linux/linux-sysmocom_3.2.bb b/recipes-bsp/linux/linux-sysmocom_3.2.bb index c6205b3de8..85fd061ef4 100644 --- a/recipes-bsp/linux/linux-sysmocom_3.2.bb +++ b/recipes-bsp/linux/linux-sysmocom_3.2.bb @@ -17,7 +17,7 @@ SRCREV = "bcc4fa827be7f59486ff305d664b42a142025f9b" SRCREV_sysmocom-odu = "f3f101de1ae8dd606e0b33c9dfa49a5b7a4642b1" LINUX_VERSION_sysmocom-odu = "3.2.63" -PR = "r35" +PR = "r36" PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=v3.2 \ From 286c8a1166659bf6c5fd0cdd097e10b1468112c9 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 17 Oct 2014 19:58:53 +0200 Subject: [PATCH 5/7] busybox: Make sure we keep re-trying to obtain a lease CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS was set to '-n' which means "Exit with failure if lease cannot be immediately negotiated." What we'd rather want is for udhcpc to continue to run until a lease can finally obtain. Otherwise we have a race condition in case the DHCP server is not reachable for a few seconds during system boot, and end up having a system that is permanently without an IP address. This fixes ORT#639 --- recipes-core/busybox/busybox-1.21.1/defconfig | 2 +- recipes-core/busybox/busybox-1.22.1/defconfig | 2 +- recipes-core/busybox/busybox_sysmocom.inc | 2 +- recipes-core/busybox/files/defconfig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-core/busybox/busybox-1.21.1/defconfig b/recipes-core/busybox/busybox-1.21.1/defconfig index ea4226e0f2..f8cf66652d 100644 --- a/recipes-core/busybox/busybox-1.21.1/defconfig +++ b/recipes-core/busybox/busybox-1.21.1/defconfig @@ -854,7 +854,7 @@ CONFIG_UDHCP_DEBUG=0 # CONFIG_FEATURE_UDHCP_8021Q is not set CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b" # CONFIG_UDPSVD is not set # CONFIG_VCONFIG is not set CONFIG_WGET=y diff --git a/recipes-core/busybox/busybox-1.22.1/defconfig b/recipes-core/busybox/busybox-1.22.1/defconfig index 684dc02b6d..4bef60ab24 100644 --- a/recipes-core/busybox/busybox-1.22.1/defconfig +++ b/recipes-core/busybox/busybox-1.22.1/defconfig @@ -854,7 +854,7 @@ CONFIG_UDHCP_DEBUG=0 # CONFIG_FEATURE_UDHCP_8021Q is not set CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b" # CONFIG_UDPSVD is not set # CONFIG_VCONFIG is not set CONFIG_WGET=y diff --git a/recipes-core/busybox/busybox_sysmocom.inc b/recipes-core/busybox/busybox_sysmocom.inc index 270a788b63..a3b9c967e6 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 = "21" +PRINC = "22" SRC_URI += "file://busybox-ifplugd.sh \ file://ifplugd.sh" diff --git a/recipes-core/busybox/files/defconfig b/recipes-core/busybox/files/defconfig index 7669558cc1..cfc02e7cab 100644 --- a/recipes-core/busybox/files/defconfig +++ b/recipes-core/busybox/files/defconfig @@ -776,7 +776,7 @@ CONFIG_UDHCP_DEBUG=0 # CONFIG_FEATURE_UDHCP_RFC3397 is not set CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b" # CONFIG_VCONFIG is not set CONFIG_WGET=y CONFIG_FEATURE_WGET_STATUSBAR=y From 0f9508c9240bb685f8c587a6d22735e281d2acbc Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 24 Oct 2014 15:05:06 +0200 Subject: [PATCH 6/7] linux for ODU: Enable second I2C bus on UEXT connector .. which is needed for the light sensor daughterboard. --- recipes-bsp/linux/linux-sysmocom_3.2.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/linux/linux-sysmocom_3.2.bb b/recipes-bsp/linux/linux-sysmocom_3.2.bb index 85fd061ef4..b5eaf16f07 100644 --- a/recipes-bsp/linux/linux-sysmocom_3.2.bb +++ b/recipes-bsp/linux/linux-sysmocom_3.2.bb @@ -14,10 +14,10 @@ BTS_FIRMWARE_NAME_sysmobts-2050 = "sysmobts-v2" SRCREV = "bcc4fa827be7f59486ff305d664b42a142025f9b" # odu handling. -SRCREV_sysmocom-odu = "f3f101de1ae8dd606e0b33c9dfa49a5b7a4642b1" +SRCREV_sysmocom-odu = "aadf22be50ac2abb2a9437b9ad3bba4ccdca540b" LINUX_VERSION_sysmocom-odu = "3.2.63" -PR = "r36" +PR = "r37" PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=v3.2 \ From 0fe05716831f895f45f4e22ac911ec1d50744b6d Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 24 Oct 2014 20:01:30 +0200 Subject: [PATCH 7/7] misc-images: Remove images we are rarely/not using The concept of directdisk image is overhauled as we are now having a initramfs that can flash the next image through USB. The dedicated E1/IP images are rarely to never used and did probably bit-rot. For the next time we provide such a system we can simply (write a script to) install the additional feed. --- .../images/sysmocom-bsc-e1-image-directdisk.bb | 13 ------------- recipes-apps/images/sysmocom-bsc-e1-image.bb | 10 ---------- .../images/sysmocom-bsc-ip-image-directdisk.bb | 10 ---------- recipes-apps/images/sysmocom-bsc-ip-image.bb | 7 ------- 4 files changed, 40 deletions(-) delete mode 100644 recipes-apps/images/sysmocom-bsc-e1-image-directdisk.bb delete mode 100644 recipes-apps/images/sysmocom-bsc-e1-image.bb delete mode 100644 recipes-apps/images/sysmocom-bsc-ip-image-directdisk.bb delete mode 100644 recipes-apps/images/sysmocom-bsc-ip-image.bb diff --git a/recipes-apps/images/sysmocom-bsc-e1-image-directdisk.bb b/recipes-apps/images/sysmocom-bsc-e1-image-directdisk.bb deleted file mode 100644 index 4ae1318c69..0000000000 --- a/recipes-apps/images/sysmocom-bsc-e1-image-directdisk.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "sysmocom BSC/E1 image" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -LICENSE = "MIT" - -inherit boot-directdisk - - -ROOTFS = "${DEPLOY_DIR_IMAGE}/sysmocom-bsc-e1-image-${MACHINE}.ext3" -do_bootdirectdisk[depends] += "sysmocom-bsc-e1-image:do_rootfs" - - diff --git a/recipes-apps/images/sysmocom-bsc-e1-image.bb b/recipes-apps/images/sysmocom-bsc-e1-image.bb deleted file mode 100644 index f3491eaf6c..0000000000 --- a/recipes-apps/images/sysmocom-bsc-e1-image.bb +++ /dev/null @@ -1,10 +0,0 @@ -IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} task-osmocom task-sysmocom \ - task-sysmocom-debug task-sysmocom-tools task-sysmocom-e1 task-gprscore \ - e2fsprogs-mke2fs e2fsprogs-tune2fs e2fsprogs-e2fsck e2fsprogs-fsck \ - kernel-module-nls-iso8859-1 kernel-module-nls-cp437" -IMAGE_LINGUAS = " " -LICENSE = "MIT" - -inherit core-image - -IMAGE_ROOTFS_SIZE = "524288" diff --git a/recipes-apps/images/sysmocom-bsc-ip-image-directdisk.bb b/recipes-apps/images/sysmocom-bsc-ip-image-directdisk.bb deleted file mode 100644 index cd80ae671c..0000000000 --- a/recipes-apps/images/sysmocom-bsc-ip-image-directdisk.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "sysmocom BSC/IP image" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -LICENSE = "MIT" - -inherit boot-directdisk - -ROOTFS = "${DEPLOY_DIR_IMAGE}/sysmocom-bsc-ip-image-${MACHINE}.ext4" -do_bootdirectdisk[depends] += "sysmocom-bsc-ip-image:do_rootfs" diff --git a/recipes-apps/images/sysmocom-bsc-ip-image.bb b/recipes-apps/images/sysmocom-bsc-ip-image.bb deleted file mode 100644 index c52f824dac..0000000000 --- a/recipes-apps/images/sysmocom-bsc-ip-image.bb +++ /dev/null @@ -1,7 +0,0 @@ -IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} task-osmocom task-sysmocom task-sysmocom-debug task-sysmocom-tools task-gprscore sysmocom-udhcpd-config busybox-udhcpd" -IMAGE_LINGUAS = " " -LICENSE = "MIT" - -inherit core-image - -IMAGE_ROOTFS_SIZE = "262144"