diff --git a/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_3.2.bb b/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_3.2.bb index cc81563a0e..7883cc8b85 100644 --- a/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_3.2.bb +++ b/meta-sysmocom-bsp/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} \ @@ -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/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_git.bb b/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_git.bb index 3101ecb46e..7649db1f33 100644 --- a/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_git.bb +++ b/meta-sysmocom-bsp/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 \ @@ -35,8 +35,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/meta-sysmocom-bsp/recipes-sysmobts/barebox/barebox.inc b/meta-sysmocom-bsp/recipes-sysmobts/barebox/barebox.inc index 417bc730d1..0fe33e2461 100644 --- a/meta-sysmocom-bsp/recipes-sysmobts/barebox/barebox.inc +++ b/meta-sysmocom-bsp/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}" diff --git a/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb index 94c2d3c879..f3382a104f 100644 --- a/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb +++ b/meta-sysmocom-bsp/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 = "04585dd90a1439e256d54affe4ccea113455cbe7" +SRCREV_osmobts = "5a906c7b725af6d73d5b38f666833d1e56c3a673" SRCREV_openbsc = "a4faeb1a79eac3c8d333ded27600228cc5e3a71b" PV = "0.4.3+git${SRCPV}" PR = "r15.${META_TELEPHONY_OSMO_INC}" diff --git a/meta-sysmocom-bsp/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb b/meta-sysmocom-bsp/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb index f3ba7972ca..1194749f83 100644 --- a/meta-sysmocom-bsp/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb +++ b/meta-sysmocom-bsp/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" diff --git a/meta-sysmocom-bsp/yocto-shared/packagegroup-core-standalone-osmo-sdk-target.bbappend b/meta-sysmocom-bsp/yocto-shared/packagegroup-core-standalone-osmo-sdk-target.bbappend index 446a22e2d0..c898c51b90 100644 --- a/meta-sysmocom-bsp/yocto-shared/packagegroup-core-standalone-osmo-sdk-target.bbappend +++ b/meta-sysmocom-bsp/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"