From e0bf4c7fea46da1976226947325560b207ad3654 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 10 Jul 2012 00:17:15 +0200 Subject: [PATCH 1/7] sysmobts-calib: Build, package and make sure it is installed Install the sysmobts calibration utility. task-sysmocom-bts is installed on every bts and will now pull in the calibration utility. The sysmobts screen needs to be stopped before this application can run. --- recipes-apps/tasks/task-sysmocom-bts.bb | 3 ++- recipes-sysmobts/osmo-bts/osmo-bts_git.bb | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/recipes-apps/tasks/task-sysmocom-bts.bb b/recipes-apps/tasks/task-sysmocom-bts.bb index 9863ff1156..246bd6c2d4 100644 --- a/recipes-apps/tasks/task-sysmocom-bts.bb +++ b/recipes-apps/tasks/task-sysmocom-bts.bb @@ -4,12 +4,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" DEPENDS = "virtual/kernel" ALLOW_EMPTY = "1" -PR = "r11" +PR = "r12" # TODO: re-add femtobts-calib after it went through the API migration RDEPENDS_task-sysmocom-bts = "\ osmo-bts \ osmo-bts-remote \ + sysmobts-calib \ lmsensors-scripts \ " diff --git a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb index df080643e1..1fcff2338a 100644 --- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb +++ b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb @@ -7,7 +7,7 @@ SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=master;name=os SRCREV_osmobts = "b19592f7134baeae1541e55b6efead887739291d" SRCREV_openbsc = "019f913ca383bda9256e273c06327041b1761330" PV = "0.0+git${SRCPV}" -PR = "r20" +PR = "r21" S = "${WORKDIR}/git" SRCREV_FORMAT = "openbsc-rosmobts" @@ -26,6 +26,11 @@ do_configure_prepend() { ln -sf ../openbsc openbsc } +do_compile_append() { + cd ${S}/contrib/sysmobts-calib/ + oe_runmake +} + do_install_append() { install -d ${D}${sysconfdir}/osmocom install -m 0660 ${S}/doc/examples/osmo-bts.cfg ${D}${sysconfdir}/osmocom @@ -33,6 +38,8 @@ do_install_append() { install -m 0644 ${S}/contrib/screenrc-sysmobts ${D}${sysconfdir}/osmocom/ install -d ${D}${sysconfdir}/init.d install -m 0755 ${S}/contrib/sysmobts.init ${D}${sysconfdir}/init.d/sysmobts + + install -m 0755 ${S}/contrib/sysmobts-calib/sysmobts-calib ${D}${bindir}/ } CONFFILES_${PN} = "${sysconfdir}/osmocom/osmo-bts.cfg" @@ -40,6 +47,7 @@ INITSCRIPT_PACKAGES = "${PN}" INITSCRIPT_NAME_${PN} = "sysmobts" INITSCRIPT_PARAMS_${PN} = "defaults 30 30" -PACKAGES =+ "osmo-bts-remote" +PACKAGES =+ "osmo-bts-remote sysmobts-calib" FILES_osmo-bts-remote = " ${bindir}/sysmobts-remote " +FILES_sysmobts-calib = " ${bindir}/sysmobts-calib " From e2ab56be8fde00721d721bdfbee343070f7a2f7d Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 11 Jul 2012 07:33:19 +0200 Subject: [PATCH 2/7] ubl: Initialize the UART0/UART1 on the sysmobts-v2 This is fixing the early printf inside u-boot. --- 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 8ba7ac798d..ded4b7a9c6 100644 --- a/recipes-sysmobts/ubl/ubl_git.bb +++ b/recipes-sysmobts/ubl/ubl_git.bb @@ -7,7 +7,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://ubl.c;beginline=1;endline=22;md5=806283bb3c475d9082e41f09020373ff" SRC_URI = "git://git@git.sysmocom.de/sysmo-bts/ubl;protocol=ssh;branch=master" -SRCREV = "8bb73db43ad50db13ebb44aa28ea75ceda57ba52" +SRCREV = "a36a9de3ef4e333b8d82e713231054b978edcb04" PV = "v0.2.11+git${SRCPV}" PR = "r2" S = "${WORKDIR}/git" From d838ac6e80c988b490243d8fd9fb706062ba218c Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 11 Jul 2012 08:58:56 +0200 Subject: [PATCH 3/7] ubl/dvnixload: Update both ubl and dvnixload for recovery The UBL allows to interrupt the NAND boot mode and switch to the UART mode for recovery. Everyone with physical access will be able to interrupt the boot. --- recipes-sysmobts/dvnixload/dvnixload_0.2.6.bb | 2 +- recipes-sysmobts/ubl/ubl_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-sysmobts/dvnixload/dvnixload_0.2.6.bb b/recipes-sysmobts/dvnixload/dvnixload_0.2.6.bb index b35f08b746..fde18020e7 100644 --- a/recipes-sysmobts/dvnixload/dvnixload_0.2.6.bb +++ b/recipes-sysmobts/dvnixload/dvnixload_0.2.6.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.hugovil.com/en/dvnixload/" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=20;md5=f2b40a2eb5162af4c3cb20428e72f921" -SRCREV = "2fa58b6e4059e43062c74e7078766993bf57896c" +SRCREV = "7d96e789af6c1191eb48225b407c907e39393eee" SRC_URI = "git://git@git.sysmocom.de/sysmo-bts/dvnixload;protocol=ssh;branch=master" PV = "v0.2.6+git${SRCPV}" PR = "r1" diff --git a/recipes-sysmobts/ubl/ubl_git.bb b/recipes-sysmobts/ubl/ubl_git.bb index ded4b7a9c6..3b20758605 100644 --- a/recipes-sysmobts/ubl/ubl_git.bb +++ b/recipes-sysmobts/ubl/ubl_git.bb @@ -7,7 +7,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://ubl.c;beginline=1;endline=22;md5=806283bb3c475d9082e41f09020373ff" SRC_URI = "git://git@git.sysmocom.de/sysmo-bts/ubl;protocol=ssh;branch=master" -SRCREV = "a36a9de3ef4e333b8d82e713231054b978edcb04" +SRCREV = "d04f24974a5b1e24cb9414ebc2e84a91848982c4" PV = "v0.2.11+git${SRCPV}" PR = "r2" S = "${WORKDIR}/git" From 9416f178b111a9569760055f9ae5731b78ac73f8 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 11 Jul 2012 14:26:51 +0200 Subject: [PATCH 4/7] dvnixload: Deal with UBL being gone but U-Boot is present. Upgrade the dvnixload to a version that will always flash the UBL payload to the device. --- recipes-sysmobts/dvnixload/dvnixload_0.2.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-sysmobts/dvnixload/dvnixload_0.2.6.bb b/recipes-sysmobts/dvnixload/dvnixload_0.2.6.bb index fde18020e7..cd2cfce156 100644 --- a/recipes-sysmobts/dvnixload/dvnixload_0.2.6.bb +++ b/recipes-sysmobts/dvnixload/dvnixload_0.2.6.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.hugovil.com/en/dvnixload/" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=20;md5=f2b40a2eb5162af4c3cb20428e72f921" -SRCREV = "7d96e789af6c1191eb48225b407c907e39393eee" +SRCREV = "354c2e5665e760bf1765a79aa4b83a70954e87e4" SRC_URI = "git://git@git.sysmocom.de/sysmo-bts/dvnixload;protocol=ssh;branch=master" PV = "v0.2.6+git${SRCPV}" PR = "r1" From 21c475ae4ad2f418bdc03ac0a2ca6d3f8a98d73f Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 21 Jul 2012 18:39:19 +0800 Subject: [PATCH 5/7] gnupg/libksba: Add gnupg/libksba from openembedded-contrib for debootstrap --- recipes-extra/gnupg/gnupg_2.0.19.bb | 29 ++++++++++++++++++++++++++ recipes-extra/libksba/libksba_1.2.0.bb | 14 +++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 recipes-extra/gnupg/gnupg_2.0.19.bb create mode 100644 recipes-extra/libksba/libksba_1.2.0.bb diff --git a/recipes-extra/gnupg/gnupg_2.0.19.bb b/recipes-extra/gnupg/gnupg_2.0.19.bb new file mode 100644 index 0000000000..996a8e80dc --- /dev/null +++ b/recipes-extra/gnupg/gnupg_2.0.19.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "GNU privacy guard - a free PGP replacement (new v2.x)" +HOMEPAGE = "http://www.gnupg.org/" +LICENSE = "GPLv3 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ + file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6" + +DEPENDS = "${PTH} libassuan libksba zlib bzip2 readline libgcrypt" +PTH = "pth" +PTH_libc-uclibc = "npth" +PR = "r4" + +inherit autotools gettext + +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2" + +SRC_URI[md5sum] = "6a8589381ca1b0c1a921e9955f42b016" +SRC_URI[sha256sum] = "efa23a8a925adb51c7d3b708c25b6d000300f5ce37de9bdec6453be7b419c622" + +EXTRA_OECONF = "--disable-ldap \ + --disable-ccid-driver \ + --without-libcurl \ + --with-zlib=${STAGING_LIBDIR}/.. \ + --with-bzip2=${STAGING_LIBDIR}/.. \ + --with-readline=${STAGING_LIBDIR}/.. \ + " + +do_install_append() { + ln -sf gpg2 ${D}${bindir}/gpg +} diff --git a/recipes-extra/libksba/libksba_1.2.0.bb b/recipes-extra/libksba/libksba_1.2.0.bb new file mode 100644 index 0000000000..dd8d88f49d --- /dev/null +++ b/recipes-extra/libksba/libksba_1.2.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Libksba provides an easy API to create and parse X.509 and CMS related objects." +HOMEPAGE = "http://www.gnupg.org/related_software/libksba/" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" +PR = "r1" + +DEPENDS = "libgpg-error" + +inherit autotools binconfig + +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2" + +SRC_URI[md5sum] = "e797f370b69b4dc776499d6a071ae137" +SRC_URI[sha256sum] = "09afce65b03d027cbec10d21464f4f651cdfd269e38b404f83e48d3e2a3c934b" From 9f0744ce761d5445f806bb019200ee41b5d551b1 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 22 Jul 2012 00:09:15 +0800 Subject: [PATCH 6/7] debootstrap: Add a version of debootstrap to bootstrap debian images --- .../debootstrap/debootstrap_1.0.42.bb | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 recipes-extra/debootstrap/debootstrap_1.0.42.bb diff --git a/recipes-extra/debootstrap/debootstrap_1.0.42.bb b/recipes-extra/debootstrap/debootstrap_1.0.42.bb new file mode 100644 index 0000000000..4f524dc586 --- /dev/null +++ b/recipes-extra/debootstrap/debootstrap_1.0.42.bb @@ -0,0 +1,22 @@ + +SUMMARY = "Debian bootstrap" +DESCRIPTION = "This install debootstrap to bootstrap debian distributions" +HOMEPAGE = "http://packages.debian.org/source/sid/debootstrap" +SECTION = "extra" +LICENSE="MIT" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=1e68ced6e1689d4cd9dac75ff5225608" + +SRC_URI = "${DEBIAN_MIRROR}/main/d/debootstrap/debootstrap_${PV}.tar.gz" +PR = "r5" +RDEPENDS = "wget gnupg coreutils" + +inherit autotools + +# Skip compiling as we will require fakeroot +fakeroot do_compile() { + base_do_compile +} + +do_install() { + autotools_do_install +} From 4e2ab7017f80c42a2b112693fa589ac29cee405d Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 15 Aug 2012 08:18:53 +0200 Subject: [PATCH 7/7] misc: Move from SSH to Git protocol for the sysmocom source --- recipes-bsp/linux/linux-sysmocom_git.bb | 2 +- recipes-sysmobts/femtobts-api/femtobts-api_git.bb | 2 +- recipes-sysmobts/firmware/sysmobts-firmware_git.bb | 2 +- recipes-sysmobts/uboot/u-boot_2011.03.bbappend | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb index a05bbef949..ac205e8f23 100644 --- a/recipes-bsp/linux/linux-sysmocom_git.bb +++ b/recipes-bsp/linux/linux-sysmocom_git.bb @@ -15,7 +15,7 @@ SRCREV = "561f53aa574a18a061c5130e0be0f3622ddbc037" PR = "r23" PV = "${LINUX_VERSION}+git${SRCPV}" -SRC_URI = "git://git@git.sysmocom.de/sysmo-bts/linux.git;protocol=ssh;branch=v3.2 \ +SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=v3.2 \ file://mISDN_loop.patch;patch=1 \ file://defconfig" S = "${WORKDIR}/git" diff --git a/recipes-sysmobts/femtobts-api/femtobts-api_git.bb b/recipes-sysmobts/femtobts-api/femtobts-api_git.bb index d7773860fc..9006c1dbdf 100644 --- a/recipes-sysmobts/femtobts-api/femtobts-api_git.bb +++ b/recipes-sysmobts/femtobts-api/femtobts-api_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "sysmocom FemtoBTS API headers" SECTION = "kernel" LICENSE = "CLOSED" -SRC_URI = "git://git@git.sysmocom.de/sysmo-bts/femtobts-firmware.git;protocol=ssh;branch=master" +SRC_URI = "git://git.sysmocom.de/sysmo-bts/femtobts-firmware.git;protocol=git;branch=master" SRCREV = "6656cf9df31adb0d5514689db6f00119c237dea0" PV = "2.4+git${SRCPV}" PR = "r6" diff --git a/recipes-sysmobts/firmware/sysmobts-firmware_git.bb b/recipes-sysmobts/firmware/sysmobts-firmware_git.bb index a00b4a3efa..3f400ef204 100644 --- a/recipes-sysmobts/firmware/sysmobts-firmware_git.bb +++ b/recipes-sysmobts/firmware/sysmobts-firmware_git.bb @@ -3,7 +3,7 @@ SECTION = "kernel" LICENSE = "CLOSED" -SRC_URI = "git://git@git.sysmocom.de/sysmo-bts/femtobts-firmware;protocol=ssh;branch=master" +SRC_URI = "git://git.sysmocom.de/sysmo-bts/femtobts-firmware;protocol=git;branch=master" SRCREV = "6656cf9df31adb0d5514689db6f00119c237dea0" S = "${WORKDIR}/git" diff --git a/recipes-sysmobts/uboot/u-boot_2011.03.bbappend b/recipes-sysmobts/uboot/u-boot_2011.03.bbappend index d05f8e2edd..1cf3777174 100644 --- a/recipes-sysmobts/uboot/u-boot_2011.03.bbappend +++ b/recipes-sysmobts/uboot/u-boot_2011.03.bbappend @@ -1,4 +1,4 @@ -SRC_URI = "git://git@git.sysmocom.de/sysmo-bts/u-boot;branch=v2011.12;protocol=ssh" +SRC_URI = "git://git.sysmocom.de/sysmo-bts/u-boot;branch=v2011.12;protocol=git" SRCREV = "e77802c0b8b818f502189f24e15f3ca47f1fa344" PV = "v2011.12+git${SRCPV}" S = "${WORKDIR}/git"