Browse Source

Merge branch 'hfreyther/tmp' of git://git.sysmocom.de/poky/meta-sysmocom-bsp into edison

hfreyther/tmp
Holger Hans Peter Freyther 9 years ago
parent
commit
a72a9ad911
  1. 3
      meta-sysmocom-bsp/conf/layer.conf
  2. 2
      meta-sysmocom-bsp/recipes-apps/busybox/busybox_sysmocom.inc
  3. 2
      meta-sysmocom-bsp/recipes-bsp/base-files/base-files_sysmocom.inc
  4. 0
      meta-sysmocom-bsp/recipes-bsp/netbase/netbase/sysmobts-v1/interfaces
  5. 0
      meta-sysmocom-bsp/recipes-bsp/netbase/netbase/sysmobts-v2/interfaces
  6. 0
      meta-sysmocom-bsp/recipes-bsp/netbase/netbase/sysmocom-bsc/interfaces
  7. 4
      meta-sysmocom-bsp/recipes-bsp/netbase/netbase_sysmocom.inc
  8. 0
      meta-sysmocom-bsp/recipes-bsp/watchdog/watchdog/init
  9. 0
      meta-sysmocom-bsp/recipes-bsp/watchdog/watchdog/sysmobts-v1/watchdog.conf
  10. 0
      meta-sysmocom-bsp/recipes-bsp/watchdog/watchdog/sysmobts-v2/watchdog.conf
  11. 4
      meta-sysmocom-bsp/recipes-bsp/watchdog/watchdog_sysmocom.inc
  12. 2
      meta-sysmocom-bsp/recipes-extra/gnupg/gnupg_2.0.19.bb
  13. 7
      meta-sysmocom-bsp/recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb
  14. 2
      meta-sysmocom-bsp/recipes-fixes/modutils/modutils-initscripts_sysmocom.inc
  15. 2
      meta-sysmocom-bsp/recipes-fixes/opkg/opkg_sysmocom.inc
  16. 2
      meta-sysmocom-bsp/recipes-fixes/pkgconfig/pkgconfig_sysmocom.inc
  17. 2
      meta-sysmocom-bsp/recipes-fixes/udev/udev_sysmocom.inc
  18. 2
      meta-sysmocom-bsp/recipes-sysmobts/uboot/u-boot_sysmocom.inc
  19. 1
      meta-sysmocom-bsp/yocto-edison/busybox_1.18.5.bbappend
  20. 1
      meta-sysmocom-bsp/yocto-edison/netbase_4.45.bbappend
  21. 1
      meta-sysmocom-bsp/yocto-edison/watchdog_5.9.bbappend
  22. 1
      meta-sysmocom-bsp/yocto-master/busybox_1.19.4.bbappend
  23. 1
      meta-sysmocom-bsp/yocto-master/netbase_5.0.bbappend
  24. 1
      meta-sysmocom-bsp/yocto-master/watchdog_5.12.bbappend
  25. 1
      meta-sysmocom-bsp/yocto-shared/base-files_3.0.14.bbappend
  26. 1
      meta-sysmocom-bsp/yocto-shared/modutils-initscripts.bbappend
  27. 1
      meta-sysmocom-bsp/yocto-shared/opkg_svn.bbappend
  28. 1
      meta-sysmocom-bsp/yocto-shared/pkgconfig_0.25.bbappend
  29. 1
      meta-sysmocom-bsp/yocto-shared/u-boot_2011.03.bbappend

3
meta-sysmocom-bsp/conf/layer.conf

@ -3,6 +3,9 @@ BBPATH := "${BBPATH}:${LAYERDIR}"
# We have a packages directory, add to BBFILES
BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
BBFILES := "${BBFILES} ${LAYERDIR}/yocto-shared/*.bbappend"
BBFILES := "${BBFILES} ${LAYERDIR}/yocto-edison/*.bbappend"
#BBFILES := "${BBFILES} ${LAYERDIR}/yocto-master/*.bbappend"
BBFILE_COLLECTIONS += "sysmocom-bsp"
BBFILE_PATTERN_sysmocom-bsp := "^${LAYERDIR}/"

2
meta-sysmocom-bsp/recipes-apps/busybox/busybox_1.18.5.bbappend → meta-sysmocom-bsp/recipes-apps/busybox/busybox_sysmocom.inc

@ -1,6 +1,6 @@
SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
FILESEXTRAPATHS_prepend := "${SYSMOCOM}/files:"
PRINC = "6"
PRINC = "7"
SRC_URI += "file://busybox-ifplugd.sh \
file://ifplugd.sh"

2
meta-sysmocom-bsp/recipes-bsp/base-files/base-files_3.0.14.bbappend → meta-sysmocom-bsp/recipes-bsp/base-files/base-files_sysmocom.inc

@ -1,4 +1,4 @@
THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:"
PRINC="2"
PRINC="3"

0
meta-sysmocom-bsp/recipes-bsp/netbase/netbase-4.45/sysmobts-v1/interfaces → meta-sysmocom-bsp/recipes-bsp/netbase/netbase/sysmobts-v1/interfaces

0
meta-sysmocom-bsp/recipes-bsp/netbase/netbase-4.45/sysmobts-v2/interfaces → meta-sysmocom-bsp/recipes-bsp/netbase/netbase/sysmobts-v2/interfaces

0
meta-sysmocom-bsp/recipes-bsp/netbase/netbase-4.45/sysmocom-bsc/interfaces → meta-sysmocom-bsp/recipes-bsp/netbase/netbase/sysmocom-bsc/interfaces

4
meta-sysmocom-bsp/recipes-bsp/netbase/netbase_4.45.bbappend → meta-sysmocom-bsp/recipes-bsp/netbase/netbase_sysmocom.inc

@ -1,6 +1,6 @@
SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:"
PRINC = "16"
FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}:"
PRINC = "17"
# bug in poky meta/classes/base.bbclass

0
meta-sysmocom-bsp/recipes-bsp/watchdog/watchdog-5.9/init → meta-sysmocom-bsp/recipes-bsp/watchdog/watchdog/init

0
meta-sysmocom-bsp/recipes-bsp/watchdog/watchdog-5.9/sysmobts-v1/watchdog.conf → meta-sysmocom-bsp/recipes-bsp/watchdog/watchdog/sysmobts-v1/watchdog.conf

0
meta-sysmocom-bsp/recipes-bsp/watchdog/watchdog-5.9/sysmobts-v2/watchdog.conf → meta-sysmocom-bsp/recipes-bsp/watchdog/watchdog/sysmobts-v2/watchdog.conf

4
meta-sysmocom-bsp/recipes-bsp/watchdog/watchdog_5.9.bbappend → meta-sysmocom-bsp/recipes-bsp/watchdog/watchdog_sysmocom.inc

@ -1,6 +1,6 @@
SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:"
PRINC = "6"
FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}"
PRINC = "7"
inherit update-rc.d

2
meta-sysmocom-bsp/recipes-extra/gnupg/gnupg_2.0.19.bb

@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
DEPENDS = "${PTH} libassuan libksba zlib bzip2 readline libgcrypt"
PTH = "pth"
PTH_libc-uclibc = "npth"
PR = "r4"
PR = "r5"
inherit autotools gettext

7
meta-sysmocom-bsp/recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb

@ -3,7 +3,7 @@ HOMEPAGE = "http://www.lm-sensors.org/"
DEPENDS = "sysfsutils virtual/libiconv"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
PR = "r2"
PR = "r4"
DEPENDS = "bison-native flex-native"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@ -30,7 +30,7 @@ do_install() {
mv ${D}/usr/man/* ${D}${mandir}
}
PACKAGES =+ "libsensors libsensors-dev libsensors-dbg libsensors-doc"
PACKAGES =+ "libsensors libsensors-dev libsensors-staticdev libsensors-dbg libsensors-doc"
PACKAGES =+ "lmsensors-sensors lmsensors-sensors-dbg lmsensors-sensors-doc"
PACKAGES =+ "lmsensors-scripts sensors-detect"
@ -45,5 +45,6 @@ FILES_lmsensors-sensors-dbg += "${bindir}/.debug/sensors"
FILES_lmsensors-sensors-doc = "${mandir}/man1 ${mandir}/man5"
FILES_libsensors = "${libdir}/libsensors.so.*"
FILES_libsensors-dbg += "${libdir}/.debug"
FILES_libsensors-dev = "${libdir}/libsensors.so ${libdir}/libsensors.a ${includedir}"
FILES_libsensors-dev = "${libdir}/libsensors.so ${includedir}"
FILES_libsensors-staticdev = "${libdir}/libsensors.a"
FILES_libsensors-doc = "${mandir}/man3"

2
meta-sysmocom-bsp/recipes-fixes/modutils/modutils-initscripts.bbappend → meta-sysmocom-bsp/recipes-fixes/modutils/modutils-initscripts_sysmocom.inc

@ -1,3 +1,3 @@
# Start this after udev and sysfs
PRINC = "1"
PRINC = "2"
INITSCRIPT_PARAMS = "start 5 S ."

2
meta-sysmocom-bsp/recipes-fixes/opkg/opkg_svn.bbappend → meta-sysmocom-bsp/recipes-fixes/opkg/opkg_sysmocom.inc

@ -1,7 +1,7 @@
THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}-${PV}"], d)}:"
PRINC = "1"
PRINC = "2"
do_install_append() {
# This breaks autoloading of modules as they are loaded before depmod runs

2
meta-sysmocom-bsp/recipes-fixes/pkgconfig/pkgconfig_0.25.bbappend → meta-sysmocom-bsp/recipes-fixes/pkgconfig/pkgconfig_sysmocom.inc

@ -1,6 +1,6 @@
THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}-${PV}"], d)}:"
PRINC="1"
PRINC="2"
FILES_${PN} += " ${datadir}/aclocal "

2
meta-sysmocom-bsp/recipes-fixes/udev/udev_164.bbappend → meta-sysmocom-bsp/recipes-fixes/udev/udev_sysmocom.inc

@ -1,7 +1,7 @@
THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}-${PV}"], d)}:"
PRINC="8"
PRINC="9"
FILES_libgudev = "${base_libdir}/libgudev*.so.* ${libdir}/libgudev*.so.*"
FILES_libgudev-dbg = "${base_libdir}/.debug/libgudev*.so.* ${libdir}/.debug/libgudev*.so.*"

2
meta-sysmocom-bsp/recipes-sysmobts/uboot/u-boot_2011.03.bbappend → meta-sysmocom-bsp/recipes-sysmobts/uboot/u-boot_sysmocom.inc

@ -3,7 +3,7 @@ SRCREV = "5ee9b97601d29a63f1eaa5dd7f9a393b31e67828"
PV = "v2011.12+git${SRCPV}"
S = "${WORKDIR}/git"
PRINC = "5"
PRINC = "8"
LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
file://README;beginline=1;endline=22;md5=5ba4218ac89af7846802d0348df3fb90"

1
meta-sysmocom-bsp/yocto-edison/busybox_1.18.5.bbappend

@ -0,0 +1 @@
require recipes-apps/busybox/${PN}_sysmocom.inc

1
meta-sysmocom-bsp/yocto-edison/netbase_4.45.bbappend

@ -0,0 +1 @@
require recipes-bsp/netbase/${PN}_sysmocom.inc

1
meta-sysmocom-bsp/yocto-edison/watchdog_5.9.bbappend

@ -0,0 +1 @@
require recipes-bsp/watchdog/${PN}_sysmocom.inc

1
meta-sysmocom-bsp/yocto-master/busybox_1.19.4.bbappend

@ -0,0 +1 @@
require recipes-apps/busybox/${PN}_sysmocom.inc

1
meta-sysmocom-bsp/yocto-master/netbase_5.0.bbappend

@ -0,0 +1 @@
require recipes-bsp/netbase/${PN}_sysmocom.inc

1
meta-sysmocom-bsp/yocto-master/watchdog_5.12.bbappend

@ -0,0 +1 @@
require recipes-bsp/watchdog/${PN}_sysmocom.inc

1
meta-sysmocom-bsp/yocto-shared/base-files_3.0.14.bbappend

@ -0,0 +1 @@
require recipes-bsp/base-files/${PN}_sysmocom.inc

1
meta-sysmocom-bsp/yocto-shared/modutils-initscripts.bbappend

@ -0,0 +1 @@
require recipes-fixes/modutils/${PN}_sysmocom.inc

1
meta-sysmocom-bsp/yocto-shared/opkg_svn.bbappend

@ -0,0 +1 @@
require recipes-fixes/opkg/${PN}_sysmocom.inc

1
meta-sysmocom-bsp/yocto-shared/pkgconfig_0.25.bbappend

@ -0,0 +1 @@
require recipes-fixes/pkgconfig/${PN}_sysmocom.inc

1
meta-sysmocom-bsp/yocto-shared/u-boot_2011.03.bbappend

@ -0,0 +1 @@
require recipes-sysmobts/uboot/${PN}_sysmocom.inc
Loading…
Cancel
Save