diff --git a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-feed.bb b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-feed.bb index d659bc6b95..6edc6024c5 100644 --- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-feed.bb +++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-feed.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = " \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" ALLOW_EMPTY_${PN} = "1" -PR = "r16" +PR = "r17" RDEPENDS_${PN} = "\ task-sysmocom-tools \ @@ -11,4 +11,5 @@ RDEPENDS_${PN} = "\ minicom vlan patch procps psmisc \ ppp rsync sed usbutils openvpn iperf \ lcr cronie iproute2 i2c-tools cu \ - python-pyserial python-pexpect bridge-utils" + python-pyserial python-pexpect bridge-utils \ + pciutils nfacct" diff --git a/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmocom-odu/defconfig b/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmocom-odu/defconfig index f06028a3de..90a5b3daa0 100644 --- a/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmocom-odu/defconfig +++ b/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmocom-odu/defconfig @@ -122,6 +122,7 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m CONFIG_NETFILTER_XT_MATCH_MAC=m CONFIG_NETFILTER_XT_MATCH_MARK=m CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_NFACCT=m CONFIG_NETFILTER_XT_MATCH_OSF=m CONFIG_NETFILTER_XT_MATCH_OWNER=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 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 fd7ccbf991..6ae731cfc8 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 @@ -15,7 +15,7 @@ SRCREV = "bcc4fa827be7f59486ff305d664b42a142025f9b" # odu handling. BRANCH="v3.2" -SRCREV_sysmocom-odu = "20547dac08c962e43a64ef5d4f182b20b2edd172" +SRCREV_sysmocom-odu = "dcaeb640fca7524f70f155fd573b72a245a9161e" BRANCH_sysmocom-odu = "sob-odu/linux-3.2.63" LINUX_VERSION_sysmocom-odu = "3.2.63" diff --git a/meta-sysmocom-bsp/recipes-bsp/ntp/files/sob-odu/ntp.conf b/meta-sysmocom-bsp/recipes-bsp/ntp/files/sob-odu/ntp.conf new file mode 100644 index 0000000000..e344078c9d --- /dev/null +++ b/meta-sysmocom-bsp/recipes-bsp/ntp/files/sob-odu/ntp.conf @@ -0,0 +1,19 @@ +# This is the most basic ntp configuration file +# The driftfile must remain in a place specific to this +# machine - it records the machine specific clock error +driftfile /etc/ntp.drift +# This obtains a random server which will be close +# (in IP terms) to the machine. Add other servers +# as required, or change this. +server pool.ntp.org +# Using local hardware clock as fallback +# Disable this when using ntpd -q -g -x as ntpdate or it will sync to itself +server 127.127.1.0 +fudge 127.127.1.0 stratum 14 + +server 127.127.28.0 +fudge 127.127.28.0 refid GPS + +# Defining a default security setting, allowing queries but declining +# pretty much everything else +restrict default limited kod nomodify notrap nopeer diff --git a/meta-sysmocom-bsp/recipes-bsp/ntp/ntp_4.2.6p3.bb b/meta-sysmocom-bsp/recipes-bsp/ntp/ntp_4.2.6p3.bb index 487a28c475..fd2fab578d 100644 --- a/meta-sysmocom-bsp/recipes-bsp/ntp/ntp_4.2.6p3.bb +++ b/meta-sysmocom-bsp/recipes-bsp/ntp/ntp_4.2.6p3.bb @@ -1,11 +1,6 @@ require ntp.inc -PR = "r5" - -#inherit systemd - -#SYSTEMD_PACKAGES = "${PN}-systemd" -#SYSTEMD_SERVICE_${PN}-systemd = "ntpd.service" +PR = "r6" SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \ file://tickadj.c.patch \ @@ -29,21 +24,32 @@ do_install_append() { install -d ${D}/${sysconfdir}/network/if-up.d install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/network/if-up.d - #install -d ${D}${systemd_unitdir}/system - #install -m 0644 ${WORKDIR}/ntpdate.service ${D}${systemd_unitdir}/system/ - #install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_unitdir}/system/ + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/ntpdate.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_unitdir}/system/ + + install -d ${D}${systemd_unitdir}/system/multi-user.target.wants/ + ln -sf ../ntpd.service ${D}${systemd_unitdir}/system/multi-user.target.wants/ } -#PACKAGES =+ "${PN}-systemd" +FILES_${PN}-bin = "${bindir}/ntp-wait \ + ${bindir}/ntpdc \ + ${bindir}/ntpq \ + ${bindir}/ntptime \ + ${bindir}/ntptrace" -#FILES_${PN}-systemd = "${systemd_unitdir}/system/" -#RDEPENDS_${PN}-systemd = "${PN}" +FILES_${PN} = "${bindir}/ntpd \ + ${sysconfdir}/ntp.conf \ + ${sysconfdir}/init.d/ntpd \ + ${systemd_unitdir}/system/ntpd.service \ + ${systemd_unitdir}/system/multi-user.target.wants/ntpd.service" -FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/ntptime ${bindir}/ntptrace" -FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd" FILES_${PN}-tickadj = "${bindir}/tickadj" FILES_ntp-utils = "${bindir}/*" -FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/network/if-up.d/ntpdate" +FILES_ntpdate = "${bindir}/ntpdate \ + ${sysconfdir}/network/if-up.d/ntpdate \ + ${systemd_unitdir}/system/ntpdate.service \ + ${systemd_unitdir}/system/multi-user.target.wants/ntpdate.service" # ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms # with wonky clocks (e.g. OpenSlug) @@ -60,4 +66,3 @@ else fi fi } - diff --git a/meta-sysmocom-bsp/recipes-core/busybox/files/sysmocom-idu/simple.script b/meta-sysmocom-bsp/recipes-core/busybox/files/sysmocom-idu/simple.script index 3e304b9b39..cb9d3d4f0c 100644 --- a/meta-sysmocom-bsp/recipes-core/busybox/files/sysmocom-idu/simple.script +++ b/meta-sysmocom-bsp/recipes-core/busybox/files/sysmocom-idu/simple.script @@ -44,7 +44,7 @@ case "$1" in if [ -n "$router" ] ; then if ! root_is_nfs ; then if [ $have_bin_ip -eq 1 ]; then - while ip route del default 2>/dev/null ; do + while ip route del default dev $interface 2>/dev/null ; do : done else diff --git a/meta-sysmocom-bsp/recipes-devtools/i2c-tools/i2c-tools_3.1.1.bb b/meta-sysmocom-bsp/recipes-devtools/i2c-tools/i2c-tools_3.1.1.bb index 3a87534203..5bac6796eb 100644 --- a/meta-sysmocom-bsp/recipes-devtools/i2c-tools/i2c-tools_3.1.1.bb +++ b/meta-sysmocom-bsp/recipes-devtools/i2c-tools/i2c-tools_3.1.1.bb @@ -9,15 +9,14 @@ SRC_URI = "http://dl.lm-sensors.org/i2c-tools/releases/${BP}.tar.bz2 \ SRC_URI[md5sum] = "0fdbff53ebd0b8d9249256d6c56480b1" SRC_URI[sha256sum] = "14d4d7d60d1c12e43f2befe239c682a5c44c27682f153d4b58c1e392d2db1700" -inherit autotools - do_compile_prepend() { cp ${WORKDIR}/Module.mk ${S}/eepromer/ sed -i 's#/usr/local#${exec_prefix}#' ${S}/Makefile echo "include eepromer/Module.mk" >> ${S}/Makefile } -do_install_append() { +do_install() { + oe_runmake 'DESTDIR=${D}' install install -d ${D}${includedir}/linux install -m 0644 include/linux/i2c-dev.h ${D}${includedir}/linux/i2c-dev-user.h rm -f ${D}${includedir}/linux/i2c-dev.h diff --git a/meta-sysmocom-bsp/recipes-extra/ca-certificates/ca-certificates_20120623.bb b/meta-sysmocom-bsp/recipes-extra/ca-certificates/ca-certificates_20120623.bb index 66150f07b9..63fd8cb58b 100644 --- a/meta-sysmocom-bsp/recipes-extra/ca-certificates/ca-certificates_20120623.bb +++ b/meta-sysmocom-bsp/recipes-extra/ca-certificates/ca-certificates_20120623.bb @@ -10,13 +10,15 @@ SRC_URI = "${DEBIAN_MIRROR}/main/c/ca-certificates/ca-certificates_${PV}.tar.gz SRC_URI[md5sum] = "5105d4cc086f0d4ecf7bf2e4c4667289" SRC_URI[sha256sum] = "878cd1130ba056fe5f96decde7e5fc1b71d35eb8565a1515744912e100731ee9" -inherit autotools allarch +inherit allarch do_install_prepend() { mkdir -p ${D}/usr/share/ca-certificates mkdir -p ${D}/usr/sbin mkdir -p ${D}/etc/ssl/certs mkdir -p ${D}/etc/ca-certificates/update.d + + oe_runmake 'DESTDIR=${D}' install } do_install_append() { @@ -40,3 +42,5 @@ ${sbindir}/update-ca-certificates } CONFFILES_${PN} = "/etc/ca-certificates.conf" + +DEFAULT_PREFERENCE = "-1" diff --git a/meta-sysmocom-bsp/recipes-extra/libmnl/libmnl_1.0.3.bb b/meta-sysmocom-bsp/recipes-extra/libmnl/libmnl_1.0.3.bb new file mode 100644 index 0000000000..74f9096603 --- /dev/null +++ b/meta-sysmocom-bsp/recipes-extra/libmnl/libmnl_1.0.3.bb @@ -0,0 +1,12 @@ +SUMMARY = "Minimalistic user-space Netlink utility library" +DESCRIPTION = "Minimalistic user-space library oriented to Netlink developers, providing \ + functions for common tasks in parsing, validating, and constructing both the Netlink header and TLVs." +HOMEPAGE = "http://www.netfilter.org/projects/libmnl/index.html" +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "http://www.netfilter.org/projects/libmnl/files/libmnl-${PV}.tar.bz2;name=tar" +SRC_URI[tar.md5sum] = "7d95fc3bea3365bc03c48e484224f65f" +SRC_URI[tar.sha256sum] = "6f14336e9acdbc62c2dc71bbb59ce162e54e9af5c80153e92476c5443fe784de" + +inherit autotools pkgconfig diff --git a/meta-sysmocom-bsp/recipes-extra/libnetfilter-acct/libnetfilter-acct_1.0.2.bb b/meta-sysmocom-bsp/recipes-extra/libnetfilter-acct/libnetfilter-acct_1.0.2.bb new file mode 100644 index 0000000000..72eddb04b8 --- /dev/null +++ b/meta-sysmocom-bsp/recipes-extra/libnetfilter-acct/libnetfilter-acct_1.0.2.bb @@ -0,0 +1,13 @@ +SUMMARY = "libnetfilter_acct is the userspace library providing interface to extended accounting infrastructure." +HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_acct/index.html" +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "libmnl" + +S = "${WORKDIR}/libnetfilter_acct-${PV}" +SRC_URI = "http://www.netfilter.org/projects/libnetfilter_acct/files/libnetfilter_acct-${PV}.tar.bz2;name=tar" +SRC_URI[tar.md5sum] = "2118d9514c079839ebd9cb3144ad2ad7" +SRC_URI[tar.sha256sum] = "0128f19c3419fbd84f7e6d46b13a33ef7bda9b9f5e493bc5ae1882d087514b71" + +inherit autotools pkgconfig diff --git a/meta-sysmocom-bsp/recipes-extra/nfacct/nfacct_1.0.1.bb b/meta-sysmocom-bsp/recipes-extra/nfacct/nfacct_1.0.1.bb new file mode 100644 index 0000000000..f56e49be2c --- /dev/null +++ b/meta-sysmocom-bsp/recipes-extra/nfacct/nfacct_1.0.1.bb @@ -0,0 +1,12 @@ +SUMMARY = "nfacct is the command line tool to create/retrieve/delete accounting objects" +HOMEPAGE = "http://www.netfilter.org/projects/nfacct/downloads.html" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" + +DEPENDS = "libmnl libnetfilter-acct" + +SRC_URI = "http://www.netfilter.org/projects/${PN}/files/${PN}-${PV}.tar.bz2;name=tar" +SRC_URI[tar.md5sum] = "992e863409d144350dbc8f0554a0f478" +SRC_URI[tar.sha256sum] = "81ef261616f313372a957431d17c5a0334984f06ceea190cf390479bf043e7c4" + +inherit autotools pkgconfig 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 9a2eafedde..eb0473bb41 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 @@ -25,7 +25,7 @@ inherit femtobts_api CPPFLAGS += " ${BTS_HW_VERSION} " do_configure_prepend() { - ln -sf ../openbsc openbsc + ln -sf ../openbsc openbsc || true } do_compile_append_sysmobts-v2() {