From 1394710d9149eead00792404868377be5bd182d1 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 2 Dec 2015 21:13:53 +0100 Subject: [PATCH 1/8] busybox: Catch up with master again --- yocto-master/{busybox_1.23.2.bbappend => busybox_1.24.1.bbappend} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename yocto-master/{busybox_1.23.2.bbappend => busybox_1.24.1.bbappend} (100%) diff --git a/yocto-master/busybox_1.23.2.bbappend b/yocto-master/busybox_1.24.1.bbappend similarity index 100% rename from yocto-master/busybox_1.23.2.bbappend rename to yocto-master/busybox_1.24.1.bbappend From bbfabee7c1955a19a04040630a1b95fe33f477ef Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 3 Dec 2015 17:24:44 +0100 Subject: [PATCH 2/8] iproute2: Disable arpd differently on newer releases It is checking for the berkeley db in some way but let's make sure that between our current release and the next one we have the same functionality. --- .../iproute2-4.3.0/disable_arpd_in_misc.patch | 17 +++++++++++++++++ recipes-fixes/iproute2/iproute2_sysmocom.inc | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 recipes-fixes/iproute2/files/iproute2-4.3.0/disable_arpd_in_misc.patch diff --git a/recipes-fixes/iproute2/files/iproute2-4.3.0/disable_arpd_in_misc.patch b/recipes-fixes/iproute2/files/iproute2-4.3.0/disable_arpd_in_misc.patch new file mode 100644 index 0000000000..8f2ea781a9 --- /dev/null +++ b/recipes-fixes/iproute2/files/iproute2-4.3.0/disable_arpd_in_misc.patch @@ -0,0 +1,17 @@ +Index: iproute2-4.3.0/misc/Makefile +=================================================================== +--- iproute2-4.3.0.orig/misc/Makefile 2015-12-03 17:17:49.164492802 +0100 ++++ iproute2-4.3.0/misc/Makefile 2015-12-03 17:18:39.368493469 +0100 +@@ -5,9 +5,9 @@ + + include ../Config + +-ifeq ($(HAVE_BERKELEY_DB),y) +- TARGETS += arpd +-endif ++#ifeq ($(HAVE_BERKELEY_DB),y) ++# TARGETS += arpd ++#endif + + ifeq ($(HAVE_SELINUX),y) + LDLIBS += $(shell pkg-config --libs libselinux) diff --git a/recipes-fixes/iproute2/iproute2_sysmocom.inc b/recipes-fixes/iproute2/iproute2_sysmocom.inc index ceab02b645..a5b3531472 100644 --- a/recipes-fixes/iproute2/iproute2_sysmocom.inc +++ b/recipes-fixes/iproute2/iproute2_sysmocom.inc @@ -1,5 +1,5 @@ THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" -FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:" +FILESPATH =. "${@base_set_filespath(["${THISDIR}/files/${PN}-${PV}"], d)}:${@base_set_filespath(["${THISDIR}/files"], d)}:" PRINC="2" From 3b80fa69e82a25408b29b1ff48643b57961cfcc1 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 7 Dec 2015 13:24:21 +0100 Subject: [PATCH 3/8] osmo-bts: Upgrade to latest pre l1sap release, upgrade firmware Upgrade the superfemto firmware to version 5.1 and upgrade the osmo-bts to the latest release before the l1sap changes. --- .../femtobts-api/femtobts-api_git.bb | 2 +- .../firmware/sysmobts-firmware_5.1.bb | 18 ++++++++++++++++++ recipes-sysmobts/osmo-bts/osmo-bts_git.bb | 8 ++++---- 3 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 recipes-sysmobts/firmware/sysmobts-firmware_5.1.bb diff --git a/recipes-sysmobts/femtobts-api/femtobts-api_git.bb b/recipes-sysmobts/femtobts-api/femtobts-api_git.bb index e316ff9b97..6ed3133365 100644 --- a/recipes-sysmobts/femtobts-api/femtobts-api_git.bb +++ b/recipes-sysmobts/femtobts-api/femtobts-api_git.bb @@ -4,7 +4,7 @@ LICENSE = "CLOSED" SRC_URI = "git://git.sysmocom.de/sysmo-bts/layer1-api.git;protocol=git;branch=master" SRCREV = "84e0cf46511f256ef84c0211f3f39a642acceb33" -SRCREV_sysmobts-v2 = "84e0cf46511f256ef84c0211f3f39a642acceb33" +SRCREV_sysmobts-v2 = "7f0d5697b85340877b127a25e0c8f2a5f5fe66d7" PV = "${SRCREV}+git${SRCPV}" PR = "r5" S = "${WORKDIR}/git" diff --git a/recipes-sysmobts/firmware/sysmobts-firmware_5.1.bb b/recipes-sysmobts/firmware/sysmobts-firmware_5.1.bb new file mode 100644 index 0000000000..c3ed32afa7 --- /dev/null +++ b/recipes-sysmobts/firmware/sysmobts-firmware_5.1.bb @@ -0,0 +1,18 @@ +COMPATIBLE_MACHINE = "(sysmobts-v2)" +PACKAGE_ARCH = "sysmobts-v2" +FIRMWARE-VERSION = "superfemto_v${PV}" +PR = "r1.${INC_PR}" + +SRC_URI[md5sum] = "21890090cbc5d5ed6661533835c38a8e" +SRC_URI[sha256sum] = "4eea3eb892103d2a73b944b4deb32a1d87859415c51b1fef776f15ff413d58b2" + +require ${PN}.inc + +do_install() { + install -d ${D}/lib/firmware/ + + install -m 0666 ${S}/Image/Dsp/superfemto.out ${D}/lib/firmware/sysmobts-v2.out + install -m 0666 ${S}/Image/Fpga/superfemto.bit ${D}/lib/firmware/sysmobts-v2.bit +} + +FILES_${PN} = "/lib/firmware/sysmobts-v2*" diff --git a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb index e5a6659639..9b833a34bb 100644 --- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb +++ b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb @@ -2,9 +2,9 @@ DESCRIPTION = "sysmocom OsmoBTS" LICENSE = "AGPLv3" LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" -SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=master;name=osmobts;destsuffix=git \ +SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=sysmocom/0.3.5-stable;name=osmobts;destsuffix=git \ git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc" -SRCREV_osmobts = "f869a95f3b81d281405e3fc3026e1d0d53174082" +SRCREV_osmobts = "dce6c09b30dd709467216d325bf38845a98fe75b" SRCREV_openbsc = "57ee78078905c7499bd4e6857f8981d22badfcac" PV = "0.4.3+git${SRCPV}" PR = "r18.${META_TELEPHONY_OSMO_INC}" @@ -12,8 +12,8 @@ S = "${WORKDIR}/git" SRCREV_FORMAT = "openbsc-rosmobts" DEPENDS = "libosmocore libosmo-abis femtobts-api gpsd" -RDEPENDS_${PN} += "coreutils sysmobts-firmware (>= 3.11)" -RCONFLICTS_${PN} = "sysmobts-firmware (< 3.11)" +RDEPENDS_${PN} += "coreutils sysmobts-firmware (>= 5.1)" +RCONFLICTS_${PN} = "sysmobts-firmware (< 5.1)" EXTRA_OECONF += "--enable-sysmocom-bts" From dc69479f0f2eefdd06265571a5527b3f96730e7f Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 15 Dec 2015 10:59:25 +0100 Subject: [PATCH 4/8] sysmocom-backup: Fix creating of back-ups for external files * The file we install is called default.files and not *.backup * Spotted by Lazlo while creating a backup on the latest system --- recipes-apps/sysmocom-backup/files/sysmocom-backup | 2 +- recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-apps/sysmocom-backup/files/sysmocom-backup b/recipes-apps/sysmocom-backup/files/sysmocom-backup index 42151822c1..d4e60e4fda 100755 --- a/recipes-apps/sysmocom-backup/files/sysmocom-backup +++ b/recipes-apps/sysmocom-backup/files/sysmocom-backup @@ -7,7 +7,7 @@ FILES="etc/sysmocom/backup.d" # Pick some extra files if [ -e /etc/sysmocom/backup.d/ ]; then - for extra in `ls /etc/sysmocom/backup.d/*.backup`; + for extra in `ls /etc/sysmocom/backup.d/*.files`; do echo "Add extras from $extra." FILES="$FILES `cat $extra`" diff --git a/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb b/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb index fd705450e6..a606ae0092 100644 --- a/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb +++ b/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "sysmocom config backup and restore scripts" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r12" +PR = "r13" SRC_URI = " \ file://sysmocom-backup \ From 45bc37acf6db0d5d3a2d16b63ccf87d0886db264 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 19 Dec 2015 16:21:49 +0100 Subject: [PATCH 5/8] idu/bsc: libx11-trim is dead for a long time use libx11-diet Yocto master now fails because our preferred provider does not exist anymore and no other provider is picked. --- conf/machine/sysmocom-bsc.conf | 2 +- conf/machine/sysmocom-idu.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/sysmocom-bsc.conf b/conf/machine/sysmocom-bsc.conf index 65bc535484..7d5601a27a 100644 --- a/conf/machine/sysmocom-bsc.conf +++ b/conf/machine/sysmocom-bsc.conf @@ -5,7 +5,7 @@ TARGET_ARCH = "i586" PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" PREFERRED_PROVIDER_virtual/kernel = "${@['linux-sysmocom', 'linux']['1.1' in d.getVar('DISTRO_VERSION', True)]}" diff --git a/conf/machine/sysmocom-idu.conf b/conf/machine/sysmocom-idu.conf index 72628ac525..5827bc7484 100644 --- a/conf/machine/sysmocom-idu.conf +++ b/conf/machine/sysmocom-idu.conf @@ -7,7 +7,7 @@ require conf/machine/include/genericx86-common.inc PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" PREFERRED_PROVIDER_virtual/kernel = "${@['linux-sysmocom', 'linux']['1.1' in d.getVar('DISTRO_VERSION', True)]}" From 9241e2bdc5c6464768ae52e872e7b558657586a9 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 20 Dec 2015 17:57:42 +0100 Subject: [PATCH 6/8] systemd: It keeps growing, try to cut it back a bit more It gains more features and the binary size has grown in a significant manner. Disable some features not disabled by the default OE build. --- yocto-master/systemd_%.bbappend | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/yocto-master/systemd_%.bbappend b/yocto-master/systemd_%.bbappend index 9e035919af..8a4c64ceaa 100644 --- a/yocto-master/systemd_%.bbappend +++ b/yocto-master/systemd_%.bbappend @@ -1 +1,9 @@ require recipes-fixes/${PN}/${PN}_sysmocom.inc + +EXTRA_OECONF_append = " \ + --disable-smack --disable-libcurl --disable-backlight --disable-vconsole \ + --disable-hibernate --disable-kdbus --disable-seccomp --disable-gcrypt \ + --disable-importd --disable-coredump --disable-hwdb --disable-libidn \ + --disable-libiptc --disable-bootchart --disable-logind --disable-apparmor \ + --disable-selinux --disable-quotacheck --disable-polkit \ +" From 6fd05a1e3f9eb7569bf69553d794cf64849f15c7 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 20 Dec 2015 19:03:15 +0100 Subject: [PATCH 7/8] sysmocom-archiver: Attempt to fix issue with linux-firmware Exception: OSError: [Errno 36] File name too long: '/home/oebuilds/jenkins/workspace/Yocto-Master/label/OE/build/tmp/deploy/sources/allarch-poky-linux/Firmware-AbilisFirmware-agereFirmware-amd-ucodeFirmware-atheros_firmwareFirmware-broadcom_bcm43xxFirmware-ca0132Firmware-chelsio_firmwareFirmware-cw1200Firmware-dib0700Firmware-ene_firmwareFirmware-fw_sst_0f28Firmware-go7007Firmware-i2400mFirmware-ibt_firmwareFirmware-it913xFirmware-iwlwifi_firmwareFirmware-IntcSST2Firmware-MarvellFirmware-mwl8335Firmware-myri10ge_firmwareFirmware-OLPCFirmware-phanfwFirmware-qat_dh895xcc_firmwareFirmware-qla2xxxFirmware-r8a779x_usb3Firmware-radeonFirmware-ralink_a_mediatek_company_firmwareFirmware-ralink-firmwareFirmware-rtlwifi_firmwareFirmware-tda7706-firmwareFirmware-ti-connectivityFirmware-ueagle-atm4-firmwareFirmware-via_vt6656Firmware-wl1251Firmware-xc4000Firmware-xc5000Firmware-xc5000cFirmware-sianoFirmware-qualcommAthos_ar3kFirmware-qualcommAthos_ath10k' --- classes/sysmocom-archiver.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/sysmocom-archiver.bbclass b/classes/sysmocom-archiver.bbclass index 1510e8784c..3bc84b01a2 100644 --- a/classes/sysmocom-archiver.bbclass +++ b/classes/sysmocom-archiver.bbclass @@ -250,7 +250,9 @@ def get_licenses(d): clean_licenses += x if '|' in clean_licenses: clean_licenses = clean_licenses.replace('|','') - return clean_licenses + # linux-firmware has many many licenses, leading to too long path + # so let's truncate it at 200... + return clean_licenses[0:200] def move_tarball_deploy(d,tarball_list): '''move tarball in location to ${DEPLOY_DIR}/sources''' From ebf4952e889c88853813c5f6ae1bbd50accc2683 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 26 Dec 2015 18:55:27 +0100 Subject: [PATCH 8/8] osmo-pcu: Upgrade to jerlbeck/master Big amount of changes for EDGE support without supporting it yet. See if it still works at 32C3. --- 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 b0a43a7181..b805e92f3a 100644 --- a/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb +++ b/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb @@ -2,8 +2,8 @@ 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=master" -SRCREV = "7c8d39a67b7568cda38829c774ea541250f3142f" +SRC_URI = "git://git.osmocom.org/osmo-pcu.git;protocol=git;branch=jerlbeck/master" +SRCREV = "6e75bc7fe304eec274f6e485a8b23a164fd4e28e" PV = "0.4+git${SRCPV}" PR = "r4.${META_TELEPHONY_OSMO_INC}" S = "${WORKDIR}/git"