From 1e2ecae72ce69e5823d6f80da14b95b9fe778d33 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 22 Dec 2014 15:14:18 +0100 Subject: [PATCH 1/8] linux-sysmocom: Force building a new kernel after the last commit After the defconfig was changed we should build a new kernel. Bump the PR to force a build. --- 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 cc81563a0e..ef45848325 100644 --- a/recipes-bsp/linux/linux-sysmocom_3.2.bb +++ b/recipes-bsp/linux/linux-sysmocom_3.2.bb @@ -19,7 +19,7 @@ SRCREV_sysmocom-odu = "20547dac08c962e43a64ef5d4f182b20b2edd172" BRANCH_sysmocom-odu = "sob-odu/linux-3.2.63" LINUX_VERSION_sysmocom-odu = "3.2.63" -PR = "r38" +PR = "r39" PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=${BRANCH} \ From 5c2c0db8421fd4c2f4e6918404fe32121dcc67a7 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 22 Dec 2014 15:19:06 +0100 Subject: [PATCH 2/8] sdk: Put gpsd-dev into the sdk as well This will pull ncurses and python into the SDK as well but for the sysmobts-mgr we need to use libgps and don't have much of an option. --- .../packagegroup-core-standalone-osmo-sdk-target.bbappend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yocto-shared/packagegroup-core-standalone-osmo-sdk-target.bbappend b/yocto-shared/packagegroup-core-standalone-osmo-sdk-target.bbappend index 446a22e2d0..c898c51b90 100644 --- a/yocto-shared/packagegroup-core-standalone-osmo-sdk-target.bbappend +++ b/yocto-shared/packagegroup-core-standalone-osmo-sdk-target.bbappend @@ -1,3 +1,3 @@ -SDK-OSMO_append = "femtobts-api-dev" +SDK-OSMO_append = "femtobts-api-dev gpsd-dev" -PRINC = "1" +PRINC = "2" From 8f84c9539d2cc66c9796e3ffc458c30aa3e9a166 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 25 Dec 2014 09:51:14 +0100 Subject: [PATCH 3/8] barebox: Add a git revision to the recipe as well Make sure that the source version changes so new code is being fetched. This should fix the build breakaage for the ODU build. --- recipes-sysmobts/barebox/barebox.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-sysmobts/barebox/barebox.inc b/recipes-sysmobts/barebox/barebox.inc index 417bc730d1..0fe33e2461 100644 --- a/recipes-sysmobts/barebox/barebox.inc +++ b/recipes-sysmobts/barebox/barebox.inc @@ -9,6 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=057bf9e50e1ca857d0eb97bfe4ba8e5d" PACKAGE_ARCH = "${MACHINE_ARCH}" +PV = "201407+git${SRCPV}" + inherit kernel-arch EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" From 015f7bc6e87ccc4eaacbef1092f4bceea6c9c390 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 25 Dec 2014 14:09:29 +0100 Subject: [PATCH 4/8] linux-sysmocom: Catch-up with poky master OE-Core seems to unpack the kernel sources into another directory now (e.g. to share the sources with builds for modules). Use the kernel.bbclass kernel_do_configure and copy the .config to the build directory. The kernel is now built in a dedicated build directory. --- recipes-bsp/linux/linux-sysmocom_git.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb index 3101ecb46e..51896603c9 100644 --- a/recipes-bsp/linux/linux-sysmocom_git.bb +++ b/recipes-bsp/linux/linux-sysmocom_git.bb @@ -34,9 +34,8 @@ FILES_kernel-image_sysmobts-v1 = "" require linux-tools.inc -do_configure() { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config - oe_runmake oldconfig +do_configure_prepend() { + install -m 0644 ${WORKDIR}/defconfig ${B}/.config } # autoload defaults (alphabetically sorted) From 09899de8b9aa3d8d12320af5ad34c97c53c1615a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 25 Dec 2014 18:04:27 +0100 Subject: [PATCH 5/8] osmo-pcu: Update with the TBF changes of Daniel We really want to test it on the 31C3. Update it. --- recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb b/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb index f3ba7972ca..1194749f83 100644 --- a/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb +++ b/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://git.osmocom.org/osmo-pcu.git;protocol=git;branch=master" -SRCREV = "f3405e5b0342362d5d592f013014847a4dc135d8" +SRCREV = "49f26bf6e8285cd99f7e5d71d9f902f10b9212a1" PV = "0.4+git${SRCPV}" PR = "r2.${META_TELEPHONY_OSMO_INC}" S = "${WORKDIR}/git" From 17eb891cc163a66ddc60a38c7b851ae16cfe13eb Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 25 Dec 2014 18:10:55 +0100 Subject: [PATCH 6/8] osmo-bts: Upgrade osmo-bts to latest master We want to have the sysmobts-mgr that will do temperature management and protect us from overheating. --- recipes-sysmobts/osmo-bts/osmo-bts_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb index 94c2d3c879..8136e90442 100644 --- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb +++ b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=master;name=osmobts;destsuffix=git \ git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc" -SRCREV_osmobts = "04585dd90a1439e256d54affe4ccea113455cbe7" +SRCREV_osmobts = "c265bef48c414ca6c135f803c0c5dfdecbeece72" SRCREV_openbsc = "a4faeb1a79eac3c8d333ded27600228cc5e3a71b" PV = "0.4.3+git${SRCPV}" PR = "r15.${META_TELEPHONY_OSMO_INC}" From 7d7622db400ffac0522fc9ac380f86951017dad0 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 26 Dec 2014 12:20:07 +0100 Subject: [PATCH 7/8] linux-sysmocom: Support ${S} != ${B} builds of yocto master Go back to have our own do_configure. The kernel.bbclass would execute "oldnoconfig" where we simply executed "oldconfig". Keep on using our old way (for the legacy of it). E.g. with the question how we ended up having SMP enabled in the BSC build this might be the answer. --- recipes-bsp/linux/linux-sysmocom_3.2.bb | 4 ++-- recipes-bsp/linux/linux-sysmocom_git.bb | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/recipes-bsp/linux/linux-sysmocom_3.2.bb b/recipes-bsp/linux/linux-sysmocom_3.2.bb index ef45848325..7883cc8b85 100644 --- a/recipes-bsp/linux/linux-sysmocom_3.2.bb +++ b/recipes-bsp/linux/linux-sysmocom_3.2.bb @@ -36,8 +36,8 @@ FILES_kernel-image_sysmobts-v1 = "" require linux-tools.inc do_configure() { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config - oe_runmake oldconfig + install -m 0644 ${WORKDIR}/defconfig ${B}/.config + oe_runmake -C ${S} O=${B} oldconfig } # autoload defaults (alphabetically sorted) diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb index 51896603c9..7649db1f33 100644 --- a/recipes-bsp/linux/linux-sysmocom_git.bb +++ b/recipes-bsp/linux/linux-sysmocom_git.bb @@ -15,7 +15,7 @@ BTS_FIRMWARE_NAME_sysmobts-v2 = "sysmobts-v2" SRCREV = "9610e792ffde7fb2599d19ca6d2a03230f2043c6" -PR = "r38" +PR = "r39" PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=linux-3.10.50 \ @@ -34,8 +34,9 @@ FILES_kernel-image_sysmobts-v1 = "" require linux-tools.inc -do_configure_prepend() { +do_configure() { install -m 0644 ${WORKDIR}/defconfig ${B}/.config + oe_runmake -C ${S} O=${B} oldconfig } # autoload defaults (alphabetically sorted) From 5fd8dab863e731de073ee215a1db0affdb31f892 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 26 Dec 2014 16:29:16 +0100 Subject: [PATCH 8/8] osmo-bts: Build a WIP commit for the 31C3 field trial Allow to set a unit-id from the eeprom. This way we have a single config that still identifies a unit uniquely to the NITB. --- recipes-sysmobts/osmo-bts/osmo-bts_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb index 8136e90442..f3382a104f 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=shared/31c3;name=osmobts;destsuffix=git \ git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc" -SRCREV_osmobts = "c265bef48c414ca6c135f803c0c5dfdecbeece72" +SRCREV_osmobts = "5a906c7b725af6d73d5b38f666833d1e56c3a673" SRCREV_openbsc = "a4faeb1a79eac3c8d333ded27600228cc5e3a71b" PV = "0.4.3+git${SRCPV}" PR = "r15.${META_TELEPHONY_OSMO_INC}"