Merge commit '4e2ab7017f80c42a2b112693fa589ac29cee405d' into edison

2012-08-15 09:17:30 +02:00 · 2012-08-15 09:17:30 +02:00 · a641873503
parent 9805fb9f81 4e2ab7017f
commit a641873503
11 changed files with 83 additions and 9 deletions
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-bts.bb
+++ b/meta-sysmocom-bsp/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 \
    "

--- 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 @@ 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"
--- a/meta-sysmocom-bsp/recipes-extra/debootstrap/debootstrap_1.0.42.bb
+++ b/meta-sysmocom-bsp/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
+}
--- a/meta-sysmocom-bsp/recipes-extra/gnupg/gnupg_2.0.19.bb
+++ b/meta-sysmocom-bsp/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
+}
--- a/meta-sysmocom-bsp/recipes-extra/libksba/libksba_1.2.0.bb
+++ b/meta-sysmocom-bsp/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"
--- a/meta-sysmocom-bsp/recipes-sysmobts/dvnixload/dvnixload_0.2.6.bb
+++ b/meta-sysmocom-bsp/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 = "354c2e5665e760bf1765a79aa4b83a70954e87e4"
 SRC_URI = "git://git@git.sysmocom.de/sysmo-bts/dvnixload;protocol=ssh;branch=master"
 PV = "v0.2.6+git${SRCPV}"
 PR = "r1"
--- a/meta-sysmocom-bsp/recipes-sysmobts/femtobts-api/femtobts-api_git.bb
+++ b/meta-sysmocom-bsp/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"
--- a/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_git.bb
+++ b/meta-sysmocom-bsp/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"

--- a/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
+++ b/meta-sysmocom-bsp/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 "
--- a/meta-sysmocom-bsp/recipes-sysmobts/ubl/ubl_git.bb
+++ b/meta-sysmocom-bsp/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 = "d04f24974a5b1e24cb9414ebc2e84a91848982c4"
 PV = "v0.2.11+git${SRCPV}"
 PR = "r2"
 S = "${WORKDIR}/git"
--- a/meta-sysmocom-bsp/recipes-sysmobts/uboot/u-boot_2011.03.bbappend
+++ b/meta-sysmocom-bsp/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"