Merge commit 'ebf4952e889c88853813c5f6ae1bbd50accc2683' into dora

This commit is contained in:
Holger Hans Peter Freyther 2015-12-26 19:03:25 +01:00
commit 904f600a85
13 changed files with 58 additions and 13 deletions

View File

@ -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'''

View File

@ -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)]}"

View File

@ -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)]}"

View File

@ -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`"

View File

@ -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 \

View File

@ -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)

View File

@ -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"

View File

@ -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"

View File

@ -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*"

View File

@ -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"

View File

@ -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"

View File

@ -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 \
"