Merge commit '970fe3d755034e53878e8ec2041417f4e400124e' into dora
This commit is contained in:
commit
2c7144acfe
|
@ -1,6 +1,6 @@
|
||||||
require barebox.inc
|
require barebox.inc
|
||||||
|
|
||||||
SRCREV = "cb9695a3ead9d62ad1d339409c7b15255d3b10ed"
|
SRCREV = "8d95a37caebcfae91146ee4794bbb8f4c31e4b32"
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
git://git.sysmocom.de/barebox.git;branch=v2015.06 \
|
git://git.sysmocom.de/barebox.git;branch=v2015.06 \
|
||||||
file://defconfig \
|
file://defconfig \
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
require barebox.inc
|
require barebox.inc
|
||||||
|
|
||||||
SRCREV = "cb9695a3ead9d62ad1d339409c7b15255d3b10ed"
|
SRCREV = "8d95a37caebcfae91146ee4794bbb8f4c31e4b32"
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
git://git.sysmocom.de/barebox.git;branch=v2015.06 \
|
git://git.sysmocom.de/barebox.git;branch=v2015.06 \
|
||||||
file://defconfig \
|
file://defconfig \
|
||||||
|
|
|
@ -2,7 +2,7 @@ require barebox.inc
|
||||||
|
|
||||||
RDEPENDS_${PN} += "${PN}-mlo"
|
RDEPENDS_${PN} += "${PN}-mlo"
|
||||||
|
|
||||||
SRCREV = "cb9695a3ead9d62ad1d339409c7b15255d3b10ed"
|
SRCREV = "8d95a37caebcfae91146ee4794bbb8f4c31e4b32"
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
git://git.sysmocom.de/barebox.git;branch=v2015.06 \
|
git://git.sysmocom.de/barebox.git;branch=v2015.06 \
|
||||||
file://defconfig \
|
file://defconfig \
|
||||||
|
|
|
@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
|
||||||
|
|
||||||
inherit sysmocom-module
|
inherit sysmocom-module
|
||||||
|
|
||||||
PR = "r1"
|
PR = "r2"
|
||||||
|
|
||||||
SRC_URI = "http://www.kernel.org/pub/linux/kernel/projects/backports/stable/v3.18.1/backports-3.18.1-1.tar.xz \
|
SRC_URI = "http://www.kernel.org/pub/linux/kernel/projects/backports/stable/v3.18.1/backports-3.18.1-1.tar.xz \
|
||||||
file://dont-export-clk_enable-twice.patch \
|
file://dont-export-clk_enable-twice.patch \
|
||||||
|
|
|
@ -0,0 +1,22 @@
|
||||||
|
SUMMARY = "small utility to set configuration of USB2514 hub chip on the sysmo-odu"
|
||||||
|
HOMEPAGE = ""
|
||||||
|
LICENSE = "MIT"
|
||||||
|
LIC_FILES_CHKSUM = "file://LICENSE;md5=e6868d1ce8f058ecc5658ecebb086636"
|
||||||
|
|
||||||
|
SRCREV = "1103417819fe855d8d0d3e6a277870679ad01bd2"
|
||||||
|
SRC_URI = "git://github.com/mlaurijsse/linux-mpu9150.git"
|
||||||
|
|
||||||
|
PV = "v0.0+git${SRCPV}"
|
||||||
|
PR = "r1a"
|
||||||
|
|
||||||
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
|
do_compile() {
|
||||||
|
oe_runmake -f Makefile-native
|
||||||
|
}
|
||||||
|
|
||||||
|
do_install() {
|
||||||
|
install -d ${D}${bindir}/
|
||||||
|
install -m 0755 ${S}/imu ${D}${bindir}/mpu9150-imu
|
||||||
|
install -m 0755 ${S}/imucal ${D}${bindir}/mpu9150-imu-cal
|
||||||
|
}
|
|
@ -7,10 +7,10 @@ LINUX_VERSION_EXTENSION ?= "-sysmocom-${LINUX_KERNEL_TYPE}"
|
||||||
# ATTENTION: Update linux-backports PR on version change. In Dora the
|
# ATTENTION: Update linux-backports PR on version change. In Dora the
|
||||||
# reverse dependency tracking for the kernel doesn't appear to work. So
|
# reverse dependency tracking for the kernel doesn't appear to work. So
|
||||||
# please bump the PR on version changes!
|
# please bump the PR on version changes!
|
||||||
SRCREV = "d1a5b8e2ddc3a74c6d81d85a106cb0c33cd7688b"
|
SRCREV = "d33286eda98596983abf9bd6420741fdfedd192f"
|
||||||
BRANCH = "sob-odu/linux-3.2.69"
|
BRANCH = "sob-odu/linux-3.2.69"
|
||||||
|
|
||||||
PR = "r42"
|
PR = "r43"
|
||||||
PV = "${LINUX_VERSION}+git${SRCPV}"
|
PV = "${LINUX_VERSION}+git${SRCPV}"
|
||||||
|
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
|
|
|
@ -6,6 +6,8 @@ After=network.target
|
||||||
Type=forking
|
Type=forking
|
||||||
PIDFile=/run/ntpd.pid
|
PIDFile=/run/ntpd.pid
|
||||||
ExecStart=/usr/sbin/ntpd -u ntp:ntp -p /run/ntpd.pid -g
|
ExecStart=/usr/sbin/ntpd -u ntp:ntp -p /run/ntpd.pid -g
|
||||||
|
Restart=always
|
||||||
|
RestartSec=2
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
|
|
@ -97,7 +97,7 @@ do_install_append() {
|
||||||
install -m 0644 ${WORKDIR}/ntpd.list ${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list
|
install -m 0644 ${WORKDIR}/ntpd.list ${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list
|
||||||
}
|
}
|
||||||
|
|
||||||
PACKAGES += "ntpdate sntp ${PN}-tickadj ${PN}-utils"
|
PACKAGES += "ntpdate sntp ${PN}-tickadj ${PN}-utils ${PN}-perl"
|
||||||
# NOTE: you don't need ntpdate, use "ntpd -q -g -x"
|
# NOTE: you don't need ntpdate, use "ntpd -q -g -x"
|
||||||
|
|
||||||
# ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms
|
# ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms
|
||||||
|
@ -128,8 +128,9 @@ FILES_${PN} = "${sbindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd
|
||||||
${systemd_unitdir}/ntp-units.d/60-ntpd.list \
|
${systemd_unitdir}/ntp-units.d/60-ntpd.list \
|
||||||
"
|
"
|
||||||
FILES_${PN}-tickadj = "${sbindir}/tickadj"
|
FILES_${PN}-tickadj = "${sbindir}/tickadj"
|
||||||
FILES_${PN}-utils = "${sbindir} ${datadir}/ntp/lib"
|
FILES_${PN}-utils = "${sbindir}/ntptime ${sbindir}/ntpq"
|
||||||
RDEPENDS_${PN}-utils += "perl"
|
FILES_${PN}-perl = "${sbindir} ${datadir}/ntp/lib"
|
||||||
|
RDEPENDS_${PN}-perl += "perl"
|
||||||
FILES_ntpdate = "${sbindir}/ntpdate \
|
FILES_ntpdate = "${sbindir}/ntpdate \
|
||||||
${sysconfdir}/network/if-up.d/ntpdate-sync \
|
${sysconfdir}/network/if-up.d/ntpdate-sync \
|
||||||
${bindir}/ntpdate-sync \
|
${bindir}/ntpdate-sync \
|
||||||
|
|
Loading…
Reference in New Issue