From 00578db05d2befe424204b835350d4a2e05cd40c Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 3 Nov 2014 08:35:44 +0100 Subject: [PATCH 01/13] ubl: Make sure we pass in the real compiler Starting with gcc-4.9.1 we will need to pass the --sysroot variable as otherwise the "stdint.h" of glibc will not be found. --- recipes-sysmobts/ubl/ubl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-sysmobts/ubl/ubl_git.bb b/recipes-sysmobts/ubl/ubl_git.bb index 7163d481f1..a876323a24 100644 --- a/recipes-sysmobts/ubl/ubl_git.bb +++ b/recipes-sysmobts/ubl/ubl_git.bb @@ -27,7 +27,7 @@ do_compile() { unset LDFLAGS unset CFLAGS unset CPPFLAGS - oe_runmake BOARD=${BOARD_NAME} + oe_runmake BOARD=${BOARD_NAME} CC="$CC" } do_deploy() { From 8800a441a152fa242e1a8a91256f75afca741b60 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 4 Nov 2014 17:16:26 +0100 Subject: [PATCH 02/13] sysmocom-udhcpd-config: add systemd startup file Fixes: SYS#735 --- .../files/sysmocom-bsc/udhcpd.service | 9 +++++++++ .../sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb | 10 ++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.service diff --git a/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.service b/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.service new file mode 100644 index 0000000000..6b92866e96 --- /dev/null +++ b/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.service @@ -0,0 +1,9 @@ +[Unit] +Description=UDHCPD + +[Service] +Type=simple +ExecStart=/usr/sbin/udhcpd -fS /etc/udhcpd.conf + +[Install] +WantedBy=multi-user.target diff --git a/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb b/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb index 2e3425e6de..c246a3c274 100644 --- a/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb +++ b/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb @@ -3,12 +3,18 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -SRC_URI = "file://udhcpd.conf" -PR = "r3" +SRC_URI = "file://udhcpd.conf \ + file://udhcpd.service \ + " +PR = "r4" CONFFILES_${PN} = "${sysconfdir}/udhcpd.conf" +FILES_${PN} += "${systemd_unitdir}" do_install() { install -d ${D}${sysconfdir} install -m 0644 ${WORKDIR}/udhcpd.conf ${D}${sysconfdir}/ + install -d ${D}${systemd_unitdir}/system/multi-user.target.wants/ + install -m 0644 /${WORKDIR}/udhcpd.service ${D}${systemd_unitdir}/system/ + ln -sf ../udhcpd.service ${D}${systemd_unitdir}/system/multi-user.target.wants/ } From 4fb99f81c4d592c7797e12e6cf1166da2fa4fcbc Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 4 Nov 2014 19:05:28 +0100 Subject: [PATCH 03/13] sysmocom-udhcpd-config: fix network mask * the entry "option subnet" takes the subnet mask not the subnet address, while the busybox dhcp-client was fine with it, the isc-dhcp-client complained with Error: an inet prefix is expected rather than "10.23.24.113/10.23.24.0". --- .../sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.conf | 2 +- recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.conf b/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.conf index d6a9334f8f..e29a77d56f 100644 --- a/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.conf +++ b/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.conf @@ -3,7 +3,7 @@ end 10.23.24.254 interface eth1 -option subnet 10.23.24.0 option router 10.23.24.1 +option subnet 255.255.255.0 option broadcast 10.23.24.255 option dns 8.8.8.8 diff --git a/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb b/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb index c246a3c274..11bb6e190e 100644 --- a/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb +++ b/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 SRC_URI = "file://udhcpd.conf \ file://udhcpd.service \ " -PR = "r4" +PR = "r5" CONFFILES_${PN} = "${sysconfdir}/udhcpd.conf" FILES_${PN} += "${systemd_unitdir}" From 3e709b24b68f44a68b0fcc38350eade88adb9046 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 8 Nov 2014 14:23:34 +0100 Subject: [PATCH 04/13] interfaces: Remove eth1 configuration from the file While the phytec devboard has multiple external ethernet interfaces the odu has only one to the outside. Remove it from the config. Fixes: ORT#653 --- recipes-bsp/netbase/netbase/sysmocom-odu/interfaces | 8 +------- recipes-bsp/netbase/netbase_sysmocom.inc | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/recipes-bsp/netbase/netbase/sysmocom-odu/interfaces b/recipes-bsp/netbase/netbase/sysmocom-odu/interfaces index d37e3ff897..d1b9f45f3f 100644 --- a/recipes-bsp/netbase/netbase/sysmocom-odu/interfaces +++ b/recipes-bsp/netbase/netbase/sysmocom-odu/interfaces @@ -1,6 +1,6 @@ # /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) -auto lo eth0 eth1 +auto lo eth0 # The loopback interface iface lo inet loopback @@ -8,9 +8,3 @@ iface lo inet loopback # eth0 iface eth0 inet dhcp -# eth1 -iface eth1 inet static - address 192.168.4.11 - netmask 255.255.255.0 - - diff --git a/recipes-bsp/netbase/netbase_sysmocom.inc b/recipes-bsp/netbase/netbase_sysmocom.inc index bd2aa4bb68..100ccb7252 100644 --- a/recipes-bsp/netbase/netbase_sysmocom.inc +++ b/recipes-bsp/netbase/netbase_sysmocom.inc @@ -1,6 +1,6 @@ SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}:" -PRINC = "18" +PRINC = "19" # bug in poky meta/classes/base.bbclass From da06a847b588b405136f379ddcd37ae7ac48a4ff Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 2 Nov 2014 09:40:15 +0100 Subject: [PATCH 05/13] misc: poky/LICENSE has changed.. reference a hopefully more stable file Only reference the COPYING.MIT as it is unlikely to change in the next upgrade. --- recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb | 2 +- recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb | 2 +- recipes-apps/tasks/task-gprscore.bb | 2 +- recipes-apps/tasks/task-sysmocom-bts.bb | 2 +- recipes-apps/tasks/task-sysmocom-debug.bb | 2 +- recipes-apps/tasks/task-sysmocom-e1.bb | 2 +- recipes-apps/tasks/task-sysmocom-feed.bb | 2 +- recipes-apps/tasks/task-sysmocom-tools.bb | 2 +- recipes-apps/tasks/task-sysmocom.bb | 2 +- recipes-bsp/early-date/early-date_1.bb | 2 +- recipes-config/openggsn-config/gprs-routing_0.1.bb | 2 +- recipes-config/openggsn-config/sysmocom-ggsn-config_0.1.bb | 2 +- .../sysmocom-openvpn-config/sysmocom-openvpn-config_1.bb | 2 +- recipes-extra/ca-certificates/ca-cacert-rootcert.bb | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb b/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb index 130fcb67cb..cc02e02b41 100644 --- a/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb +++ b/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "sysmocom config backup and restore scripts" LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PR = "r12" SRC_URI = "file://sysmocom-backup file://sysmocom-restore" diff --git a/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb b/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb index 11bb6e190e..3e787feb43 100644 --- a/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb +++ b/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Task for sysmocom external tools" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ +LIC_FILES_CHKSUM = " \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SRC_URI = "file://udhcpd.conf \ diff --git a/recipes-apps/tasks/task-gprscore.bb b/recipes-apps/tasks/task-gprscore.bb index fd13ae8240..d455fe406d 100644 --- a/recipes-apps/tasks/task-gprscore.bb +++ b/recipes-apps/tasks/task-gprscore.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Task for GPRS core network" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ +LIC_FILES_CHKSUM = " \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" DEPENDS = "virtual/kernel" ALLOW_EMPTY_${PN} = "1" diff --git a/recipes-apps/tasks/task-sysmocom-bts.bb b/recipes-apps/tasks/task-sysmocom-bts.bb index a3095639a6..73a1d93499 100644 --- a/recipes-apps/tasks/task-sysmocom-bts.bb +++ b/recipes-apps/tasks/task-sysmocom-bts.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Task for sysmoBTS" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ +LIC_FILES_CHKSUM = " \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" DEPENDS = "virtual/kernel" ALLOW_EMPTY_${PN} = "1" diff --git a/recipes-apps/tasks/task-sysmocom-debug.bb b/recipes-apps/tasks/task-sysmocom-debug.bb index c1a7ecd042..274955804a 100644 --- a/recipes-apps/tasks/task-sysmocom-debug.bb +++ b/recipes-apps/tasks/task-sysmocom-debug.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Task for sysmocom development/debugging" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ +LIC_FILES_CHKSUM = " \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" DEPENDS = "virtual/kernel" ALLOW_EMPTY_${PN} = "1" diff --git a/recipes-apps/tasks/task-sysmocom-e1.bb b/recipes-apps/tasks/task-sysmocom-e1.bb index 998824e56c..f451ed1f07 100644 --- a/recipes-apps/tasks/task-sysmocom-e1.bb +++ b/recipes-apps/tasks/task-sysmocom-e1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Task for E1 based sysmocom" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ +LIC_FILES_CHKSUM = " \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" ALLOW_EMPTY_${PN} = "1" PR = "r2" diff --git a/recipes-apps/tasks/task-sysmocom-feed.bb b/recipes-apps/tasks/task-sysmocom-feed.bb index 859dc0e768..978e5d7e58 100644 --- a/recipes-apps/tasks/task-sysmocom-feed.bb +++ b/recipes-apps/tasks/task-sysmocom-feed.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Package to force building everything we want to provide" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ +LIC_FILES_CHKSUM = " \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" ALLOW_EMPTY_${PN} = "1" PR = "r13" diff --git a/recipes-apps/tasks/task-sysmocom-tools.bb b/recipes-apps/tasks/task-sysmocom-tools.bb index 7026a7b745..e808390cd4 100644 --- a/recipes-apps/tasks/task-sysmocom-tools.bb +++ b/recipes-apps/tasks/task-sysmocom-tools.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Task for sysmocom external tools" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ +LIC_FILES_CHKSUM = " \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" ALLOW_EMPTY_${PN} = "1" PR = "r7" diff --git a/recipes-apps/tasks/task-sysmocom.bb b/recipes-apps/tasks/task-sysmocom.bb index 4f79e54f12..21cb55f363 100644 --- a/recipes-apps/tasks/task-sysmocom.bb +++ b/recipes-apps/tasks/task-sysmocom.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Task for sysmocom" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ +LIC_FILES_CHKSUM = " \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" DEPENDS = "virtual/kernel" ALLOW_EMPTY_${PN} = "1" diff --git a/recipes-bsp/early-date/early-date_1.bb b/recipes-bsp/early-date/early-date_1.bb index a1b22d8ab5..831e73e710 100644 --- a/recipes-bsp/early-date/early-date_1.bb +++ b/recipes-bsp/early-date/early-date_1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Set an early date on RTC less systems" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SRC_URI = "\ file://early-date \ diff --git a/recipes-config/openggsn-config/gprs-routing_0.1.bb b/recipes-config/openggsn-config/gprs-routing_0.1.bb index df053bc065..2d468e7898 100644 --- a/recipes-config/openggsn-config/gprs-routing_0.1.bb +++ b/recipes-config/openggsn-config/gprs-routing_0.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "OpenGGSN GPRS routing to the real world" RDEPENDS_${PN} = "iptables kernel-module-ipt-masquerade" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SRC_URI = "file://gprs_routing" diff --git a/recipes-config/openggsn-config/sysmocom-ggsn-config_0.1.bb b/recipes-config/openggsn-config/sysmocom-ggsn-config_0.1.bb index 637719cf3e..8996ce88fe 100644 --- a/recipes-config/openggsn-config/sysmocom-ggsn-config_0.1.bb +++ b/recipes-config/openggsn-config/sysmocom-ggsn-config_0.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenGGSN config by sysmocom" SRC_URI = "file://ggsn.conf" LICENSE = "closed" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" do_install() { install -d ${D}${sysconfdir} diff --git a/recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config_1.bb b/recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config_1.bb index 733d99b797..3673b68b49 100644 --- a/recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config_1.bb +++ b/recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config_1.bb @@ -2,7 +2,7 @@ HOMEPAGE = "http://www.sysmocom.de" RDEPENDS_${PN} = "openvpn" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SRC_URI = "file://sysmocom-vpn.conf" PR = "r3" diff --git a/recipes-extra/ca-certificates/ca-cacert-rootcert.bb b/recipes-extra/ca-certificates/ca-cacert-rootcert.bb index 8793c81ea0..271b43c296 100644 --- a/recipes-extra/ca-certificates/ca-cacert-rootcert.bb +++ b/recipes-extra/ca-certificates/ca-cacert-rootcert.bb @@ -2,7 +2,7 @@ CRIPTION = "CACert Root and Class3 PKI" HOMEPAGE = "http://www.cacert.org/index.php?id=3" SECTION = "misc" LICENSE = "RDL-COD14" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PR = "r6" SRC_URI = "file://root.crt file://class3.crt" From 240b08dde9c263c0ca21b1f8974672205af1b64e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 2 Nov 2014 09:24:10 +0100 Subject: [PATCH 06/13] tcpdump: Upgrade to version 4.6.1 to fix cross-builds Poky dizzy is more strict with -I/usr/include and the old tcpdump could pick-up "/usr/bin/pcap-config" from the host and fail. Just upgrade to a newer version of tcpdump and be done with it. --- .../0001-minimal-IEEE802.15.4-allowed.patch | 22 -------- .../tcpdump/tcpdump-4.1.1/ipv6-cross.patch | 41 --------------- .../tcpdump_configure_no_-O2.patch | 42 --------------- .../tcpdump/tcpdump-4.6.1/add-ptest.patch | 38 ++++++++++++++ .../configure.patch | 0 recipes-extra/tcpdump/tcpdump-4.6.1/run-ptest | 5 ++ .../tcpdump-configure-dlpi.patch | 31 +++++++++++ .../tcpdump-cross-getaddrinfo.patch | 23 +++++++++ .../unnecessary-to-check-libpcap.patch | 33 ++++++++++++ recipes-extra/tcpdump/tcpdump_4.1.1.bb | 41 --------------- recipes-extra/tcpdump/tcpdump_4.6.1.bb | 51 +++++++++++++++++++ 11 files changed, 181 insertions(+), 146 deletions(-) delete mode 100644 recipes-extra/tcpdump/tcpdump-4.1.1/0001-minimal-IEEE802.15.4-allowed.patch delete mode 100644 recipes-extra/tcpdump/tcpdump-4.1.1/ipv6-cross.patch delete mode 100644 recipes-extra/tcpdump/tcpdump-4.1.1/tcpdump_configure_no_-O2.patch create mode 100644 recipes-extra/tcpdump/tcpdump-4.6.1/add-ptest.patch rename recipes-extra/tcpdump/{tcpdump-4.1.1 => tcpdump-4.6.1}/configure.patch (100%) create mode 100644 recipes-extra/tcpdump/tcpdump-4.6.1/run-ptest create mode 100644 recipes-extra/tcpdump/tcpdump-4.6.1/tcpdump-configure-dlpi.patch create mode 100644 recipes-extra/tcpdump/tcpdump-4.6.1/tcpdump-cross-getaddrinfo.patch create mode 100644 recipes-extra/tcpdump/tcpdump-4.6.1/unnecessary-to-check-libpcap.patch delete mode 100644 recipes-extra/tcpdump/tcpdump_4.1.1.bb create mode 100644 recipes-extra/tcpdump/tcpdump_4.6.1.bb diff --git a/recipes-extra/tcpdump/tcpdump-4.1.1/0001-minimal-IEEE802.15.4-allowed.patch b/recipes-extra/tcpdump/tcpdump-4.1.1/0001-minimal-IEEE802.15.4-allowed.patch deleted file mode 100644 index 9d3d60d4d7..0000000000 --- a/recipes-extra/tcpdump/tcpdump-4.1.1/0001-minimal-IEEE802.15.4-allowed.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Sergey Lapin -Date: Wed, 28 Jan 2009 16:34:15 +0300 -Subject: [PATCH] minimal IEEE802.15.4 allowed - ---- - tcpdump.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/tcpdump.c b/tcpdump.c -index 06683af..fbc944c 100644 ---- a/tcpdump.c -+++ b/tcpdump.c -@@ -282,6 +282,9 @@ static struct printer printers[] = { - #ifdef DLT_MFR - { mfr_if_print, DLT_MFR }, - #endif -+#ifdef DLT_IEEE802_15_4 -+ { raw_if_print, DLT_IEEE802_15_4 }, -+#endif - #if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H) - { bt_if_print, DLT_BLUETOOTH_HCI_H4_WITH_PHDR}, - #endif diff --git a/recipes-extra/tcpdump/tcpdump-4.1.1/ipv6-cross.patch b/recipes-extra/tcpdump/tcpdump-4.1.1/ipv6-cross.patch deleted file mode 100644 index 7eba2c5a6d..0000000000 --- a/recipes-extra/tcpdump/tcpdump-4.1.1/ipv6-cross.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- - configure.in | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/configure.in b/configure.in -index eb3e5e8..11257c9 100644 ---- a/configure.in -+++ b/configure.in -@@ -181,8 +181,9 @@ yes) AC_MSG_RESULT(yes) - ipv6=no - ;; - esac ], -- -- AC_TRY_RUN([ /* AF_INET6 available check */ -+[ -+ if test x"$cross_compiling" != "xyes"; then -+ AC_TRY_RUN([ /* AF_INET6 avalable check */ - #include - #include - main() -@@ -201,7 +202,10 @@ main() - ipv6=no], - [ AC_MSG_RESULT(no) - ipv6=no] --)) -+ ) -+else -+ AC_MSG_FAILURE([Unable to check for ipv6 when crosscompiling, please specify.]) -+fi]) - - ipv6type=unknown - ipv6lib=none -@@ -316,7 +320,7 @@ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then - fi - - --if test "$ipv6" = "yes"; then -+if test x"$cross_compiling" != "xyes" -a "$ipv6" = "yes"; then - # - # XXX - on Tru64 UNIX 5.1, there is no "getaddrinfo()" - # function in libc; there are "ngetaddrinfo()" and diff --git a/recipes-extra/tcpdump/tcpdump-4.1.1/tcpdump_configure_no_-O2.patch b/recipes-extra/tcpdump/tcpdump-4.1.1/tcpdump_configure_no_-O2.patch deleted file mode 100644 index 7929da5b1f..0000000000 --- a/recipes-extra/tcpdump/tcpdump-4.1.1/tcpdump_configure_no_-O2.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- - configure | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index cb51d19..73d51af 100755 ---- a/configure -+++ b/configure -@@ -2691,13 +2691,13 @@ if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then -- CFLAGS="-g -O2" -+ CFLAGS="-g" - else - CFLAGS="-g" - fi - else - if test "$GCC" = yes; then -- CFLAGS="-O2" -+ CFLAGS="" - else - CFLAGS= - fi -@@ -2830,7 +2830,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "$GCC" = yes ; then - if test "$SHLICC2" = yes ; then - ac_cv_lbl_gcc_vers=2 -- V_CCOPT="-O2" -+ V_CCOPT="" - else - { echo "$as_me:$LINENO: checking gcc version" >&5 - echo $ECHO_N "checking gcc version... $ECHO_C" >&6; } -@@ -2847,7 +2847,7 @@ fi - { echo "$as_me:$LINENO: result: $ac_cv_lbl_gcc_vers" >&5 - echo "${ECHO_T}$ac_cv_lbl_gcc_vers" >&6; } - if test $ac_cv_lbl_gcc_vers -gt 1 ; then -- V_CCOPT="-O2" -+ V_CCOPT="" - fi - fi - else diff --git a/recipes-extra/tcpdump/tcpdump-4.6.1/add-ptest.patch b/recipes-extra/tcpdump/tcpdump-4.6.1/add-ptest.patch new file mode 100644 index 0000000000..358f6050f6 --- /dev/null +++ b/recipes-extra/tcpdump/tcpdump-4.6.1/add-ptest.patch @@ -0,0 +1,38 @@ +From 7b259580800e259d232229dc89f97058b56e2fe8 Mon Sep 17 00:00:00 2001 +From: "Hongjun.Yang" +Date: Wed, 22 Oct 2014 10:02:48 +0800 +Subject: [PATCH] Add ptest for tcpdump + +Upstream-Status: Pending + +Signed-off-by: Hongjun.Yang +--- + Makefile.in | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 8c35a45..4fb8ae6 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -428,9 +428,17 @@ distclean: + tests/failure-outputs.txt + rm -rf autom4te.cache tests/DIFF tests/NEW + +-check: tcpdump ++buildtest-TESTS: tcpdump ++ ++runtest-PTEST: + (cd tests && ./TESTrun.sh) + ++install-ptest: ++ cp -r tests $(DESTDIR) ++ cp -r config.h $(DESTDIR) ++ install -m 0755 Makefile $(DESTDIR) ++ ln -sf /usr/sbin/tcpdump $(DESTDIR)/tcpdump ++ + tags: $(TAGFILES) + ctags -wtd $(TAGFILES) + +-- +1.9.1 + diff --git a/recipes-extra/tcpdump/tcpdump-4.1.1/configure.patch b/recipes-extra/tcpdump/tcpdump-4.6.1/configure.patch similarity index 100% rename from recipes-extra/tcpdump/tcpdump-4.1.1/configure.patch rename to recipes-extra/tcpdump/tcpdump-4.6.1/configure.patch diff --git a/recipes-extra/tcpdump/tcpdump-4.6.1/run-ptest b/recipes-extra/tcpdump/tcpdump-4.6.1/run-ptest new file mode 100644 index 0000000000..c03a8b8ef3 --- /dev/null +++ b/recipes-extra/tcpdump/tcpdump-4.6.1/run-ptest @@ -0,0 +1,5 @@ +#!/bin/sh +make -k runtest-PTEST | sed -e '/: passed/ s/^/PASS: /g' \ + -e '/: failed/ s/^/FAIL: /g' \ + -e 's/: passed//g' \ + -e 's/: failed//g' diff --git a/recipes-extra/tcpdump/tcpdump-4.6.1/tcpdump-configure-dlpi.patch b/recipes-extra/tcpdump/tcpdump-4.6.1/tcpdump-configure-dlpi.patch new file mode 100644 index 0000000000..50e2d54399 --- /dev/null +++ b/recipes-extra/tcpdump/tcpdump-4.6.1/tcpdump-configure-dlpi.patch @@ -0,0 +1,31 @@ +[PATCH] tcpdump: cross-compiling not check dlpi. + +For cross-compiling on Linux platforms, we do not need to check libdlpi +since it is only placed on Solaris. +Also, checking libdlpi in native /lib would cause do_qa_configure fail. + +Upstream-Status: Pending. + +Signed-off-by: Xin Ouyang +--- + configure.in | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index 7f9591c..ca277c0 100644 +--- a/configure.in ++++ b/configure.in +@@ -716,7 +716,9 @@ don't.]) + fi + + # libdlpi is needed for Solaris 11 and later. +-AC_CHECK_LIB(dlpi, dlpi_walk, LIBS="$LIBS -ldlpi" LDFLAGS="-L/lib $LDFLAGS", ,-L/lib) ++if test "$cross_compiling" != yes; then ++ AC_CHECK_LIB(dlpi, dlpi_walk, LIBS="$LIBS -ldlpi" LDFLAGS="-L/lib $LDFLAGS", ,-L/lib) ++fi + + dnl portability macros for getaddrinfo/getnameinfo + dnl +-- +1.7.5.4 + diff --git a/recipes-extra/tcpdump/tcpdump-4.6.1/tcpdump-cross-getaddrinfo.patch b/recipes-extra/tcpdump/tcpdump-4.6.1/tcpdump-cross-getaddrinfo.patch new file mode 100644 index 0000000000..b414b72e9d --- /dev/null +++ b/recipes-extra/tcpdump/tcpdump-4.6.1/tcpdump-cross-getaddrinfo.patch @@ -0,0 +1,23 @@ +Fix getaddinfo check when cross compiling + +Upstream-Status: Pending. + +AC_TRY_RUN defaults to td_cv_buggygetaddrinfo=yes when +cross-compiling. So this change indicates that we +are cross-compiling. + +Signed-of-by: Aws Ismail + +diff --git a/configure.in b/configure.in +index ca277c0..283035e 100644 +--- a/configure.in ++++ b/configure.in +@@ -434,7 +434,7 @@ main() + ], + td_cv_buggygetaddrinfo=no, + td_cv_buggygetaddrinfo=yes, +- td_cv_buggygetaddrinfo=yes)]) ++ td_cv_buggygetaddrinfo=cross)]) + if test "$td_cv_buggygetaddrinfo" = no; then + AC_MSG_RESULT(good) + else diff --git a/recipes-extra/tcpdump/tcpdump-4.6.1/unnecessary-to-check-libpcap.patch b/recipes-extra/tcpdump/tcpdump-4.6.1/unnecessary-to-check-libpcap.patch new file mode 100644 index 0000000000..d7a3ac23b1 --- /dev/null +++ b/recipes-extra/tcpdump/tcpdump-4.6.1/unnecessary-to-check-libpcap.patch @@ -0,0 +1,33 @@ +unnecessary to check libpcap + +Upstream-Status: Pending + +since the check of libpcap did not consider the cross-compile, lead to the +below error: + This autoconf log indicates errors, it looked at host include and/or + library paths while determining system capabilities. + +In fact, the libpcap has been added into the tcpdump's DEPENDS, not need to +check if libpcap existed. + +Signed-off-by: Roy Li +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 06fade1..9125de7 100644 +--- a/configure.in ++++ b/configure.in +@@ -567,7 +567,7 @@ AC_SEARCH_LIBS(getrpcbynumber, nsl, + dnl AC_CHECK_LIB(z, uncompress) + dnl AC_CHECK_HEADERS(zlib.h) + +-AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) ++#AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) + + # + # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate +-- +1.7.9.5 + diff --git a/recipes-extra/tcpdump/tcpdump_4.1.1.bb b/recipes-extra/tcpdump/tcpdump_4.1.1.bb deleted file mode 100644 index 9fd0ac04bf..0000000000 --- a/recipes-extra/tcpdump/tcpdump_4.1.1.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "A sophisticated network protocol analyzer" -HOMEPAGE = "http://www.tcpdump.org/" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867" -SECTION = "console/network" -DEPENDS = "libpcap" -PR = "r1" - -SRC_URI = " \ - http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \ - file://tcpdump_configure_no_-O2.patch \ - file://0001-minimal-IEEE802.15.4-allowed.patch \ - file://ipv6-cross.patch \ - file://configure.patch \ -" - -inherit autotools -# ac_cv_linux_vers=${ac_cv_linux_vers=2} - -EXTRA_OECONF = "--without-crypto \ - ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6', '--disable-ipv6', d)}" - -do_configure() { - # AC_CHECK_LIB(dlpi.. was looking to host /lib - sed -i 's:-L/lib:-L${STAGING_LIBDIR}:g' ./configure.in - - gnu-configize - autoconf - oe_runconf - sed -i 's:/usr/lib:${STAGING_LIBDIR}:' ./Makefile - sed -i 's:/usr/include:${STAGING_INCDIR}:' ./Makefile -} - -do_install_append() { - # tcpdump 4.0.0 installs a copy to /usr/sbin/tcpdump.4.0.0 - rm -f ${D}${sbindir}/tcpdump.${PV} -} - -SRC_URI[md5sum] = "d0dd58bbd6cd36795e05c6f1f74420b0" -SRC_URI[sha256sum] = "e6cd4bbd61ec7adbb61ba8352c4b4734f67b8caaa845d88cb826bc0b9f1e7f0a" - diff --git a/recipes-extra/tcpdump/tcpdump_4.6.1.bb b/recipes-extra/tcpdump/tcpdump_4.6.1.bb new file mode 100644 index 0000000000..1fdaf308d8 --- /dev/null +++ b/recipes-extra/tcpdump/tcpdump_4.6.1.bb @@ -0,0 +1,51 @@ +SUMMARY = "A sophisticated network protocol analyzer" +HOMEPAGE = "http://www.tcpdump.org/" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867" +SECTION = "console/network" +DEPENDS = "libpcap" + +SRC_URI = " \ + http://www.tcpdump.org/release/${BP}.tar.gz \ + file://configure.patch \ + file://unnecessary-to-check-libpcap.patch \ + file://tcpdump-configure-dlpi.patch \ + file://tcpdump-cross-getaddrinfo.patch \ + file://add-ptest.patch \ + file://run-ptest \ +" +SRC_URI[md5sum] = "dab267ec30216a069747d10314079ec7" +SRC_URI[sha256sum] = "4c88c2a9aeb4047074f344fc9b2b6577b219972d359e192f6d12ccf983a13fd7" +export LIBS=" -lpcap" + +inherit autotools-brokensep ptest +CACHED_CONFIGUREVARS = "ac_cv_linux_vers=${ac_cv_linux_vers=2}" + +PACKAGECONFIG ??= "openssl ipv6" +PACKAGECONFIG[openssl] = "--with-crypto=yes, --without-openssl --without-crypto, openssl" +PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6," + +EXTRA_AUTORECONF += " -I m4" + +do_configure_prepend() { + mkdir -p ${S}/m4 + if [ -f aclocal.m4 ]; then + mv aclocal.m4 ${S}/m4 + fi + # AC_CHECK_LIB(dlpi.. was looking to host /lib + sed -i 's:-L/lib::g' ./configure.in +} +do_configure_append() { + sed -i 's:-L/usr/lib::' ./Makefile + sed -i 's:-Wl,-rpath,${STAGING_LIBDIR}::' ./Makefile + sed -i 's:-I/usr/include::' ./Makefile +} + +do_install_append() { + # tcpdump 4.0.0 installs a copy to /usr/sbin/tcpdump.4.0.0 + rm -f ${D}${sbindir}/tcpdump.${PV} +} + +do_compile_ptest() { + oe_runmake buildtest-TESTS +} From 0755723dd8ee2c1ce1d3880d734603850719aaf5 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 3 Nov 2014 08:35:44 +0100 Subject: [PATCH 07/13] sysmobts-firmware: When fetching using http include needed checksum When using HTTP to fetch the firmware we need to have a checksum in our recipe. Add it. --- recipes-sysmobts/firmware/sysmobts-firmware_3.11.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-sysmobts/firmware/sysmobts-firmware_3.11.bb b/recipes-sysmobts/firmware/sysmobts-firmware_3.11.bb index 5ee257df75..aab425a27b 100644 --- a/recipes-sysmobts/firmware/sysmobts-firmware_3.11.bb +++ b/recipes-sysmobts/firmware/sysmobts-firmware_3.11.bb @@ -3,6 +3,9 @@ PACKAGE_ARCH = "sysmobts-v2" FIRMWARE-VERSION = "superfemto_v${PV}" PR = "r1.${INC_PR}" +SRC_URI[md5sum] = "69993545decb8bdf39fa4dd9e5103ef9" +SRC_URI[sha256sum] = "8b2b19475a298299ef2de1061940ac690c447fa7b5d22b4fdb9dfd62bdc3c4a8" + require ${PN}.inc do_install() { From 2e2d464894ae123b2a6e5cde47acff6a05e0e028 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 8 Nov 2014 19:55:22 +0100 Subject: [PATCH 08/13] tcpdump: Speculative fix for dora In dora there is no autotools-brokensep bbclass. So let's just set the build directory to the source directory ourselves. I have not built the package for dora though/ --- recipes-extra/tcpdump/tcpdump_4.6.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-extra/tcpdump/tcpdump_4.6.1.bb b/recipes-extra/tcpdump/tcpdump_4.6.1.bb index 1fdaf308d8..8065a37d91 100644 --- a/recipes-extra/tcpdump/tcpdump_4.6.1.bb +++ b/recipes-extra/tcpdump/tcpdump_4.6.1.bb @@ -18,7 +18,8 @@ SRC_URI[md5sum] = "dab267ec30216a069747d10314079ec7" SRC_URI[sha256sum] = "4c88c2a9aeb4047074f344fc9b2b6577b219972d359e192f6d12ccf983a13fd7" export LIBS=" -lpcap" -inherit autotools-brokensep ptest +inherit autotools ptest +B = "${S}" CACHED_CONFIGUREVARS = "ac_cv_linux_vers=${ac_cv_linux_vers=2}" PACKAGECONFIG ??= "openssl ipv6" From 050a39766e2c54dafff7efd20a09a250b1c09c91 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 9 Nov 2014 02:34:51 +0100 Subject: [PATCH 09/13] sbts2050-util: Add checksum in case it is fetched through http --- recipes-sysmobts/sbts2050-util/sbts2050-util_2.3.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-sysmobts/sbts2050-util/sbts2050-util_2.3.bb b/recipes-sysmobts/sbts2050-util/sbts2050-util_2.3.bb index d5d7d255e0..fcc3de0646 100644 --- a/recipes-sysmobts/sbts2050-util/sbts2050-util_2.3.bb +++ b/recipes-sysmobts/sbts2050-util/sbts2050-util_2.3.bb @@ -1,6 +1,9 @@ FIRMWARE-VERSION = "${PV}" PR = "r2.${INC_PR}" +SRC_URI[md5sum] = "c7b75b5ebc5bb1185afd2880444b10dd" +SRC_URI[sha256sum] = "c1e9817a4f7163396ee00577877bcb61bab9fbb252947ea05a43ea872d53d515" + require ${PN}.inc do_install() { From c5a267a946e8b23f6603b514a2f7463350fed90e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 1 Nov 2014 14:48:37 +0100 Subject: [PATCH 10/13] systemd: Make it work for dora and master systemd-compat-units does not install any files anymore and the machineid and other scripts are gone. We want to continue to install the alignment file though. This has not been tested on dora systemd yet. --- recipes-fixes/systemd/systemd-compat-units_dora.inc | 6 ++++++ recipes-fixes/systemd/systemd-compat-units_sysmocom.inc | 7 +++---- recipes-fixes/systemd/systemd_sysmocom-206.inc | 3 +++ recipes-fixes/systemd/systemd_sysmocom.inc | 3 +-- yocto-dora/systemd-compat-units.bbappend | 1 + yocto-dora/systemd_206.bbappend | 1 + 6 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 recipes-fixes/systemd/systemd-compat-units_dora.inc create mode 100644 recipes-fixes/systemd/systemd_sysmocom-206.inc diff --git a/recipes-fixes/systemd/systemd-compat-units_dora.inc b/recipes-fixes/systemd/systemd-compat-units_dora.inc new file mode 100644 index 0000000000..9cc0c9e635 --- /dev/null +++ b/recipes-fixes/systemd/systemd-compat-units_dora.inc @@ -0,0 +1,6 @@ +# In dora a SRC_URI = "file://*.service" is done and that doesn't work +# when playing with the FILESPATH +SRC_URI = "\ + file://machineid.service \ + file://run-postinsts.service \ + " diff --git a/recipes-fixes/systemd/systemd-compat-units_sysmocom.inc b/recipes-fixes/systemd/systemd-compat-units_sysmocom.inc index b8e86feb29..3f4a08a714 100644 --- a/recipes-fixes/systemd/systemd-compat-units_sysmocom.inc +++ b/recipes-fixes/systemd/systemd-compat-units_sysmocom.inc @@ -5,11 +5,8 @@ SYSTEMD_DISABLED_SYSV_SERVICES_remove = "networking" S_THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" FILESPATH =. "${@base_set_filespath(["${S_THISDIR}/${PN}"], d)}:" -SRC_URI = "\ - file://machineid.service \ - file://run-postinsts.service \ - file://alignment.service" +SRC_URI += "file://alignment.service" do_install_append() { install -d ${D}${systemd_unitdir}/system/basic.target.wants @@ -19,3 +16,5 @@ do_install_append() { ln -sf ../alignment.service ${D}${systemd_unitdir}/system/basic.target.wants/ ln -sf ../alignment.service ${D}${systemd_unitdir}/system/sysinit.target.wants/ } + +FILES_${PN} = "${systemd_unitdir}/system ${bindir}" diff --git a/recipes-fixes/systemd/systemd_sysmocom-206.inc b/recipes-fixes/systemd/systemd_sysmocom-206.inc new file mode 100644 index 0000000000..c60cb95e91 --- /dev/null +++ b/recipes-fixes/systemd/systemd_sysmocom-206.inc @@ -0,0 +1,3 @@ +SRC_URI += " \ + file://0001-RFC-fsck-Allow-to-specify-the-fsck-repair-option-in-.patch \ + " diff --git a/recipes-fixes/systemd/systemd_sysmocom.inc b/recipes-fixes/systemd/systemd_sysmocom.inc index 817a60f3f5..ba573c7839 100644 --- a/recipes-fixes/systemd/systemd_sysmocom.inc +++ b/recipes-fixes/systemd/systemd_sysmocom.inc @@ -1,11 +1,10 @@ S_THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" FILESPATH =. "${@base_set_filespath(["${S_THISDIR}/${PN}"], d)}:" -PRINC="23" +PRINC="24" SRC_URI += "file://journald.conf \ file://0001-Feature-switch-ListenDatagram-from-run-systemd-journ.patch \ - file://0001-RFC-fsck-Allow-to-specify-the-fsck-repair-option-in-.patch \ " SRC_URI_append_sysmobts-v1 = " file://system.conf" diff --git a/yocto-dora/systemd-compat-units.bbappend b/yocto-dora/systemd-compat-units.bbappend index d76e8d1973..b2b70a8392 100644 --- a/yocto-dora/systemd-compat-units.bbappend +++ b/yocto-dora/systemd-compat-units.bbappend @@ -1,2 +1,3 @@ +require recipes-fixes/systemd/${PN}_dora.inc require recipes-fixes/systemd/${PN}_sysmocom.inc diff --git a/yocto-dora/systemd_206.bbappend b/yocto-dora/systemd_206.bbappend index 9e035919af..b5369a77c6 100644 --- a/yocto-dora/systemd_206.bbappend +++ b/yocto-dora/systemd_206.bbappend @@ -1 +1,2 @@ +require recipes-fixes/${PN}/${PN}_sysmocom-${PV}.inc require recipes-fixes/${PN}/${PN}_sysmocom.inc From 380d53ece834e4f8356b47b6e1195f85e7c43c50 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 1 Nov 2014 15:09:19 +0100 Subject: [PATCH 11/13] systemd: DISTRO_FEATURES_INITMAN is gone in master The DISTRO_FEATURES_INITMAN variable has been removed, use VIRTUAL-RUNTIME_init_manager which is still present. We have already defined the later in our poky builds --- conf/machine/include/sysmobts.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/include/sysmobts.inc b/conf/machine/include/sysmobts.inc index 94be7ef3d9..8edf51e515 100644 --- a/conf/machine/include/sysmobts.inc +++ b/conf/machine/include/sysmobts.inc @@ -20,7 +20,7 @@ MACHINE_FEATURES = "kernel26 serial" MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\ busybox-ifplugd \ - ${@['watchdog', ''][d.getVar('DISTRO_FEATURES_INITMAN', True) == 'systemd']} \ + ${@['watchdog', ''][d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd']} \ kernel \ kernel-module-davinci-wdt \ kernel-module-dspdl \ @@ -38,7 +38,7 @@ IMAGE_FSTYPES ?= "tar.bz2 cpio.gz ubifs ubi jffs2" MACHINE_EXTRA_RDEPENDS = "\ task-sysmocom-bts \ sysmobts-firmware \ - ${@['watchdog', ''][d.getVar('DISTRO_FEATURES_INITMAN', True) == 'systemd']} \ + ${@['watchdog', ''][d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd']} \ " #MACHINE_EXTRA_RRECOMMENDS = "dsplink-module" From d75837883d5f4f612c1fa7e1642233cc5cad268e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 2 Nov 2014 13:13:19 +0100 Subject: [PATCH 12/13] busybox: Only apply the patch on busybox 1.21 The ifplugd patch was backported and doesn't need to be applied on later versions. --- recipes-core/busybox/busybox_sysmocom_1.21.1.inc | 2 ++ recipes-core/busybox/busybox_sysmocom_systemd.inc | 2 -- yocto-dora/busybox_1.21.1.bbappend | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 recipes-core/busybox/busybox_sysmocom_1.21.1.inc diff --git a/recipes-core/busybox/busybox_sysmocom_1.21.1.inc b/recipes-core/busybox/busybox_sysmocom_1.21.1.inc new file mode 100644 index 0000000000..130fab6976 --- /dev/null +++ b/recipes-core/busybox/busybox_sysmocom_1.21.1.inc @@ -0,0 +1,2 @@ +SRC_URI += "file://ifplugd-use-a-larger-netlink-buffer.patch" +PRINC := "${@int(PRINC) + 1}" diff --git a/recipes-core/busybox/busybox_sysmocom_systemd.inc b/recipes-core/busybox/busybox_sysmocom_systemd.inc index 19739f5a15..58b268226b 100644 --- a/recipes-core/busybox/busybox_sysmocom_systemd.inc +++ b/recipes-core/busybox/busybox_sysmocom_systemd.inc @@ -2,5 +2,3 @@ SYSMOCOM_D := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-systemd:${SYSMOCOM_D}/${PN}:" PRINC := "${@int(PRINC) + 3}" - -SRC_URI += "file://ifplugd-use-a-larger-netlink-buffer.patch" diff --git a/yocto-dora/busybox_1.21.1.bbappend b/yocto-dora/busybox_1.21.1.bbappend index 641aeb3c75..0c0790f242 100644 --- a/yocto-dora/busybox_1.21.1.bbappend +++ b/yocto-dora/busybox_1.21.1.bbappend @@ -2,3 +2,4 @@ SYSMOCOM_ORIG_PV := "${PV}" require recipes-core/busybox/${PN}_sysmocom.inc require recipes-core/busybox/${PN}_sysmocom_systemd.inc +require recipes-core/busybox/${PN}_sysmocom_1.21.1.inc From 338900b6303993c42d6bf4831c361db831e34eeb Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 9 Nov 2014 14:34:42 +0100 Subject: [PATCH 13/13] sysmobts: Reduce the number of images we build We need a jffs2/ubi depending on the age of the hardware and maybe a tar.bz2 so we can easily inspect an image without playing with mtdram. We almost never need a ubifs and certainly not a cpio. --- conf/machine/include/sysmobts.inc | 2 -- conf/machine/sysmobts-v1.conf | 1 + conf/machine/sysmobts-v2.conf | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/include/sysmobts.inc b/conf/machine/include/sysmobts.inc index 8edf51e515..4de200d05d 100644 --- a/conf/machine/include/sysmobts.inc +++ b/conf/machine/include/sysmobts.inc @@ -33,8 +33,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\ kernel-module-nls-utf8 \ kernel-module-rtfifo " -IMAGE_FSTYPES ?= "tar.bz2 cpio.gz ubifs ubi jffs2" - MACHINE_EXTRA_RDEPENDS = "\ task-sysmocom-bts \ sysmobts-firmware \ diff --git a/conf/machine/sysmobts-v1.conf b/conf/machine/sysmobts-v1.conf index 08ebe78897..aa5edb00e3 100644 --- a/conf/machine/sysmobts-v1.conf +++ b/conf/machine/sysmobts-v1.conf @@ -10,5 +10,6 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 -- MKUBIFS_ARGS = "-m 2048 -e 129024 -c 400" UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" +IMAGE_FSTYPES ?= "tar.bz2 jffs2" require conf/machine/include/sysmobts.inc diff --git a/conf/machine/sysmobts-v2.conf b/conf/machine/sysmobts-v2.conf index 586a44c5b0..4c35310882 100644 --- a/conf/machine/sysmobts-v2.conf +++ b/conf/machine/sysmobts-v2.conf @@ -11,4 +11,5 @@ MKUBIFS_ARGS ?= "-m 2048 -e 129024 -c 999" UBINIZE_ARGS ?= "-m 2048 -p 128KiB -s 512" +IMAGE_FSTYPES ?= "tar.bz2 ubi" require conf/machine/include/sysmobts.inc