From 97ba83f17ab1410a66620809fdf05cd7bb69a5ab Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 4 Sep 2012 14:11:51 +0200 Subject: [PATCH 1/5] busybox: Target both edison and HEAD in this overlay One needs to use BBMASK or delete depending on the targeted OE-Core/Poky version. --- recipes-apps/busybox/busybox_1.18.5.bbappend | 20 +------------------- recipes-apps/busybox/busybox_1.19.4.bbappend | 1 + recipes-apps/busybox/busybox_sysmocom.inc | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 recipes-apps/busybox/busybox_1.19.4.bbappend create mode 100644 recipes-apps/busybox/busybox_sysmocom.inc diff --git a/recipes-apps/busybox/busybox_1.18.5.bbappend b/recipes-apps/busybox/busybox_1.18.5.bbappend index 9b1f78a42c..4b70c908f2 100644 --- a/recipes-apps/busybox/busybox_1.18.5.bbappend +++ b/recipes-apps/busybox/busybox_1.18.5.bbappend @@ -1,19 +1 @@ -SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" -FILESEXTRAPATHS_prepend := "${SYSMOCOM}/files:" -PRINC = "6" - -SRC_URI += "file://busybox-ifplugd.sh \ - file://ifplugd.sh" - -PACKAGES =+ "${PN}-ifplugd" - -FILES_${PN}-ifplugd = "${sysconfdir}/ifplugd.sh ${sysconfdir}/init.d/busybox-ifplugd.sh" - -INITSCRIPT_PACKAGES += "${PN}-ifplugd" -INITSCRIPT_NAME = "busybox-ifplugd.sh" - - -do_install_append() { - install -m 0755 ${WORKDIR}/ifplugd.sh ${D}${sysconfdir}/ - install -m 0755 ${WORKDIR}/busybox-ifplugd.sh ${D}${sysconfdir}/init.d/ -} +require ${PN}_sysmocom.inc diff --git a/recipes-apps/busybox/busybox_1.19.4.bbappend b/recipes-apps/busybox/busybox_1.19.4.bbappend new file mode 100644 index 0000000000..4b70c908f2 --- /dev/null +++ b/recipes-apps/busybox/busybox_1.19.4.bbappend @@ -0,0 +1 @@ +require ${PN}_sysmocom.inc diff --git a/recipes-apps/busybox/busybox_sysmocom.inc b/recipes-apps/busybox/busybox_sysmocom.inc new file mode 100644 index 0000000000..9b1f78a42c --- /dev/null +++ b/recipes-apps/busybox/busybox_sysmocom.inc @@ -0,0 +1,19 @@ +SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +FILESEXTRAPATHS_prepend := "${SYSMOCOM}/files:" +PRINC = "6" + +SRC_URI += "file://busybox-ifplugd.sh \ + file://ifplugd.sh" + +PACKAGES =+ "${PN}-ifplugd" + +FILES_${PN}-ifplugd = "${sysconfdir}/ifplugd.sh ${sysconfdir}/init.d/busybox-ifplugd.sh" + +INITSCRIPT_PACKAGES += "${PN}-ifplugd" +INITSCRIPT_NAME = "busybox-ifplugd.sh" + + +do_install_append() { + install -m 0755 ${WORKDIR}/ifplugd.sh ${D}${sysconfdir}/ + install -m 0755 ${WORKDIR}/busybox-ifplugd.sh ${D}${sysconfdir}/init.d/ +} From 4f78b6ef7897fd302aaf53d57dca968b43f03b46 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 4 Sep 2012 14:12:38 +0200 Subject: [PATCH 2/5] netbase: Target both edison and HEAD in this overlay One needs to use BBMASK or delete depending on the targeted OE-Core/Poky version. --- .../{netbase-4.45 => netbase}/sysmobts-v1/interfaces | 0 .../{netbase-4.45 => netbase}/sysmobts-v2/interfaces | 0 .../{netbase-4.45 => netbase}/sysmocom-bsc/interfaces | 0 recipes-bsp/netbase/netbase_4.45.bbappend | 8 +------- recipes-bsp/netbase/netbase_5.0.bbappend | 1 + recipes-bsp/netbase/netbase_sysmocom.inc | 7 +++++++ 6 files changed, 9 insertions(+), 7 deletions(-) rename recipes-bsp/netbase/{netbase-4.45 => netbase}/sysmobts-v1/interfaces (100%) rename recipes-bsp/netbase/{netbase-4.45 => netbase}/sysmobts-v2/interfaces (100%) rename recipes-bsp/netbase/{netbase-4.45 => netbase}/sysmocom-bsc/interfaces (100%) create mode 100644 recipes-bsp/netbase/netbase_5.0.bbappend create mode 100644 recipes-bsp/netbase/netbase_sysmocom.inc diff --git a/recipes-bsp/netbase/netbase-4.45/sysmobts-v1/interfaces b/recipes-bsp/netbase/netbase/sysmobts-v1/interfaces similarity index 100% rename from recipes-bsp/netbase/netbase-4.45/sysmobts-v1/interfaces rename to recipes-bsp/netbase/netbase/sysmobts-v1/interfaces diff --git a/recipes-bsp/netbase/netbase-4.45/sysmobts-v2/interfaces b/recipes-bsp/netbase/netbase/sysmobts-v2/interfaces similarity index 100% rename from recipes-bsp/netbase/netbase-4.45/sysmobts-v2/interfaces rename to recipes-bsp/netbase/netbase/sysmobts-v2/interfaces diff --git a/recipes-bsp/netbase/netbase-4.45/sysmocom-bsc/interfaces b/recipes-bsp/netbase/netbase/sysmocom-bsc/interfaces similarity index 100% rename from recipes-bsp/netbase/netbase-4.45/sysmocom-bsc/interfaces rename to recipes-bsp/netbase/netbase/sysmocom-bsc/interfaces diff --git a/recipes-bsp/netbase/netbase_4.45.bbappend b/recipes-bsp/netbase/netbase_4.45.bbappend index 127d8dcced..4b70c908f2 100644 --- a/recipes-bsp/netbase/netbase_4.45.bbappend +++ b/recipes-bsp/netbase/netbase_4.45.bbappend @@ -1,7 +1 @@ -SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" -FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:" -PRINC = "16" - - -# bug in poky meta/classes/base.bbclass -PACKAGE_ARCH = "${MACHINE_ARCH}" +require ${PN}_sysmocom.inc diff --git a/recipes-bsp/netbase/netbase_5.0.bbappend b/recipes-bsp/netbase/netbase_5.0.bbappend new file mode 100644 index 0000000000..4b70c908f2 --- /dev/null +++ b/recipes-bsp/netbase/netbase_5.0.bbappend @@ -0,0 +1 @@ +require ${PN}_sysmocom.inc diff --git a/recipes-bsp/netbase/netbase_sysmocom.inc b/recipes-bsp/netbase/netbase_sysmocom.inc new file mode 100644 index 0000000000..b6f5a5fca2 --- /dev/null +++ b/recipes-bsp/netbase/netbase_sysmocom.inc @@ -0,0 +1,7 @@ +SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}:" +PRINC = "16" + + +# bug in poky meta/classes/base.bbclass +PACKAGE_ARCH = "${MACHINE_ARCH}" From b8b0dff3d4e5ea5a4153374f1adda1166c6e314a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 4 Sep 2012 14:13:26 +0200 Subject: [PATCH 3/5] watchdog: Target both edison and HEAD in this overlay One needs to use BBMASK or delete depending on the targeted OE-Core/Poky version. --- .../watchdog/{watchdog-5.9 => watchdog}/init | 0 .../sysmobts-v1/watchdog.conf | 0 .../sysmobts-v2/watchdog.conf | 0 recipes-bsp/watchdog/watchdog_5.12.bbappend | 1 + recipes-bsp/watchdog/watchdog_5.9.bbappend | 26 +------------------ recipes-bsp/watchdog/watchdog_sysmocom.inc | 25 ++++++++++++++++++ 6 files changed, 27 insertions(+), 25 deletions(-) rename recipes-bsp/watchdog/{watchdog-5.9 => watchdog}/init (100%) rename recipes-bsp/watchdog/{watchdog-5.9 => watchdog}/sysmobts-v1/watchdog.conf (100%) rename recipes-bsp/watchdog/{watchdog-5.9 => watchdog}/sysmobts-v2/watchdog.conf (100%) create mode 100644 recipes-bsp/watchdog/watchdog_5.12.bbappend create mode 100644 recipes-bsp/watchdog/watchdog_sysmocom.inc diff --git a/recipes-bsp/watchdog/watchdog-5.9/init b/recipes-bsp/watchdog/watchdog/init similarity index 100% rename from recipes-bsp/watchdog/watchdog-5.9/init rename to recipes-bsp/watchdog/watchdog/init diff --git a/recipes-bsp/watchdog/watchdog-5.9/sysmobts-v1/watchdog.conf b/recipes-bsp/watchdog/watchdog/sysmobts-v1/watchdog.conf similarity index 100% rename from recipes-bsp/watchdog/watchdog-5.9/sysmobts-v1/watchdog.conf rename to recipes-bsp/watchdog/watchdog/sysmobts-v1/watchdog.conf diff --git a/recipes-bsp/watchdog/watchdog-5.9/sysmobts-v2/watchdog.conf b/recipes-bsp/watchdog/watchdog/sysmobts-v2/watchdog.conf similarity index 100% rename from recipes-bsp/watchdog/watchdog-5.9/sysmobts-v2/watchdog.conf rename to recipes-bsp/watchdog/watchdog/sysmobts-v2/watchdog.conf diff --git a/recipes-bsp/watchdog/watchdog_5.12.bbappend b/recipes-bsp/watchdog/watchdog_5.12.bbappend new file mode 100644 index 0000000000..4b70c908f2 --- /dev/null +++ b/recipes-bsp/watchdog/watchdog_5.12.bbappend @@ -0,0 +1 @@ +require ${PN}_sysmocom.inc diff --git a/recipes-bsp/watchdog/watchdog_5.9.bbappend b/recipes-bsp/watchdog/watchdog_5.9.bbappend index 906deade47..4b70c908f2 100644 --- a/recipes-bsp/watchdog/watchdog_5.9.bbappend +++ b/recipes-bsp/watchdog/watchdog_5.9.bbappend @@ -1,25 +1 @@ -SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" -FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:" -PRINC = "6" - -inherit update-rc.d - -SRC_URI_append_sysmobts-v1 = " file://watchdog.conf file://init" -SRC_URI_append_sysmobts-v2 = " file://watchdog.conf file://init" - -do_install_append() { - - if [ -e ${WORKDIR}/watchdog.conf ]; then - install -D -m 0644 ${WORKDIR}/watchdog.conf ${D}/${sysconfdir}/ - fi - - install -D -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/watchdog -} - -CONFFILES_${PN} = "${sysconfdir}/watchdog.conf" -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "watchdog" -INITSCRIPT_PARAMS_${PN} = "start 06 S ." - -# bug in poky meta/classes/base.bbclass? -PACKAGE_ARCH = "${MACHINE_ARCH}" +require ${PN}_sysmocom.inc diff --git a/recipes-bsp/watchdog/watchdog_sysmocom.inc b/recipes-bsp/watchdog/watchdog_sysmocom.inc new file mode 100644 index 0000000000..dcfbdb6bdc --- /dev/null +++ b/recipes-bsp/watchdog/watchdog_sysmocom.inc @@ -0,0 +1,25 @@ +SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}" +PRINC = "6" + +inherit update-rc.d + +SRC_URI_append_sysmobts-v1 = " file://watchdog.conf file://init" +SRC_URI_append_sysmobts-v2 = " file://watchdog.conf file://init" + +do_install_append() { + + if [ -e ${WORKDIR}/watchdog.conf ]; then + install -D -m 0644 ${WORKDIR}/watchdog.conf ${D}/${sysconfdir}/ + fi + + install -D -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/watchdog +} + +CONFFILES_${PN} = "${sysconfdir}/watchdog.conf" +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME_${PN} = "watchdog" +INITSCRIPT_PARAMS_${PN} = "start 06 S ." + +# bug in poky meta/classes/base.bbclass? +PACKAGE_ARCH = "${MACHINE_ARCH}" From 6a4abb58304520ac28f3f21982397370503e6687 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 4 Sep 2012 14:14:00 +0200 Subject: [PATCH 4/5] lmsensors-apps: Package the *.a into a new -staticdev package --- recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb b/recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb index 2227816576..7aadb383ab 100644 --- a/recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb +++ b/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" From dabdc1f5d22a74cfd678f8e3650b6bae42e329dd Mon Sep 17 00:00:00 2001 From: Jan Luebbe Date: Fri, 14 Sep 2012 21:21:04 +0200 Subject: [PATCH 5/5] Attempt to target multiple versions of Poky at the same time The idea is that the basic extension resides inside the the normal recipe directories. Depending on the version of poky the bbappends need to be included. Appends applying to all versions will be put into the shared folder, specific ones into the specific directory. Once a bbappend can not be shared anymore it needs to be copied. --- conf/layer.conf | 3 +++ recipes-apps/busybox/busybox_1.18.5.bbappend | 1 - recipes-apps/busybox/busybox_1.19.4.bbappend | 1 - recipes-apps/busybox/busybox_sysmocom.inc | 2 +- .../{base-files_3.0.14.bbappend => base-files_sysmocom.inc} | 2 +- recipes-bsp/netbase/netbase_4.45.bbappend | 1 - recipes-bsp/netbase/netbase_5.0.bbappend | 1 - recipes-bsp/netbase/netbase_sysmocom.inc | 2 +- recipes-bsp/watchdog/watchdog_5.12.bbappend | 1 - recipes-bsp/watchdog/watchdog_5.9.bbappend | 1 - recipes-bsp/watchdog/watchdog_sysmocom.inc | 2 +- recipes-extra/gnupg/gnupg_2.0.19.bb | 2 +- ...-initscripts.bbappend => modutils-initscripts_sysmocom.inc} | 2 +- recipes-fixes/opkg/{opkg_svn.bbappend => opkg_sysmocom.inc} | 2 +- .../{pkgconfig_0.25.bbappend => pkgconfig_sysmocom.inc} | 2 +- recipes-fixes/udev/{udev_164.bbappend => udev_sysmocom.inc} | 2 +- .../uboot/{u-boot_2011.03.bbappend => u-boot_sysmocom.inc} | 2 +- yocto-edison/busybox_1.18.5.bbappend | 1 + yocto-edison/netbase_4.45.bbappend | 1 + yocto-edison/watchdog_5.9.bbappend | 1 + yocto-master/busybox_1.19.4.bbappend | 1 + yocto-master/netbase_5.0.bbappend | 1 + yocto-master/watchdog_5.12.bbappend | 1 + yocto-shared/base-files_3.0.14.bbappend | 1 + yocto-shared/modutils-initscripts.bbappend | 1 + yocto-shared/opkg_svn.bbappend | 1 + yocto-shared/pkgconfig_0.25.bbappend | 1 + yocto-shared/u-boot_2011.03.bbappend | 1 + 28 files changed, 24 insertions(+), 16 deletions(-) delete mode 100644 recipes-apps/busybox/busybox_1.18.5.bbappend delete mode 100644 recipes-apps/busybox/busybox_1.19.4.bbappend rename recipes-bsp/base-files/{base-files_3.0.14.bbappend => base-files_sysmocom.inc} (92%) delete mode 100644 recipes-bsp/netbase/netbase_4.45.bbappend delete mode 100644 recipes-bsp/netbase/netbase_5.0.bbappend delete mode 100644 recipes-bsp/watchdog/watchdog_5.12.bbappend delete mode 100644 recipes-bsp/watchdog/watchdog_5.9.bbappend rename recipes-fixes/modutils/{modutils-initscripts.bbappend => modutils-initscripts_sysmocom.inc} (85%) rename recipes-fixes/opkg/{opkg_svn.bbappend => opkg_sysmocom.inc} (96%) rename recipes-fixes/pkgconfig/{pkgconfig_0.25.bbappend => pkgconfig_sysmocom.inc} (94%) rename recipes-fixes/udev/{udev_164.bbappend => udev_sysmocom.inc} (98%) rename recipes-sysmobts/uboot/{u-boot_2011.03.bbappend => u-boot_sysmocom.inc} (98%) create mode 100644 yocto-edison/busybox_1.18.5.bbappend create mode 100644 yocto-edison/netbase_4.45.bbappend create mode 100644 yocto-edison/watchdog_5.9.bbappend create mode 100644 yocto-master/busybox_1.19.4.bbappend create mode 100644 yocto-master/netbase_5.0.bbappend create mode 100644 yocto-master/watchdog_5.12.bbappend create mode 100644 yocto-shared/base-files_3.0.14.bbappend create mode 100644 yocto-shared/modutils-initscripts.bbappend create mode 100644 yocto-shared/opkg_svn.bbappend create mode 100644 yocto-shared/pkgconfig_0.25.bbappend create mode 100644 yocto-shared/u-boot_2011.03.bbappend diff --git a/conf/layer.conf b/conf/layer.conf index 7fcac9b049..4a820bf2b5 100644 --- a/conf/layer.conf +++ b/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}/" diff --git a/recipes-apps/busybox/busybox_1.18.5.bbappend b/recipes-apps/busybox/busybox_1.18.5.bbappend deleted file mode 100644 index 4b70c908f2..0000000000 --- a/recipes-apps/busybox/busybox_1.18.5.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${PN}_sysmocom.inc diff --git a/recipes-apps/busybox/busybox_1.19.4.bbappend b/recipes-apps/busybox/busybox_1.19.4.bbappend deleted file mode 100644 index 4b70c908f2..0000000000 --- a/recipes-apps/busybox/busybox_1.19.4.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${PN}_sysmocom.inc diff --git a/recipes-apps/busybox/busybox_sysmocom.inc b/recipes-apps/busybox/busybox_sysmocom.inc index 9b1f78a42c..4f0c2aa2d6 100644 --- a/recipes-apps/busybox/busybox_sysmocom.inc +++ b/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" diff --git a/recipes-bsp/base-files/base-files_3.0.14.bbappend b/recipes-bsp/base-files/base-files_sysmocom.inc similarity index 92% rename from recipes-bsp/base-files/base-files_3.0.14.bbappend rename to recipes-bsp/base-files/base-files_sysmocom.inc index 53c41f4601..0dea48ba1f 100644 --- a/recipes-bsp/base-files/base-files_3.0.14.bbappend +++ b/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" diff --git a/recipes-bsp/netbase/netbase_4.45.bbappend b/recipes-bsp/netbase/netbase_4.45.bbappend deleted file mode 100644 index 4b70c908f2..0000000000 --- a/recipes-bsp/netbase/netbase_4.45.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${PN}_sysmocom.inc diff --git a/recipes-bsp/netbase/netbase_5.0.bbappend b/recipes-bsp/netbase/netbase_5.0.bbappend deleted file mode 100644 index 4b70c908f2..0000000000 --- a/recipes-bsp/netbase/netbase_5.0.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${PN}_sysmocom.inc diff --git a/recipes-bsp/netbase/netbase_sysmocom.inc b/recipes-bsp/netbase/netbase_sysmocom.inc index b6f5a5fca2..77a15d3ff2 100644 --- a/recipes-bsp/netbase/netbase_sysmocom.inc +++ b/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}:${SYSMOCOM}/${PN}:" -PRINC = "16" +PRINC = "17" # bug in poky meta/classes/base.bbclass diff --git a/recipes-bsp/watchdog/watchdog_5.12.bbappend b/recipes-bsp/watchdog/watchdog_5.12.bbappend deleted file mode 100644 index 4b70c908f2..0000000000 --- a/recipes-bsp/watchdog/watchdog_5.12.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${PN}_sysmocom.inc diff --git a/recipes-bsp/watchdog/watchdog_5.9.bbappend b/recipes-bsp/watchdog/watchdog_5.9.bbappend deleted file mode 100644 index 4b70c908f2..0000000000 --- a/recipes-bsp/watchdog/watchdog_5.9.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${PN}_sysmocom.inc diff --git a/recipes-bsp/watchdog/watchdog_sysmocom.inc b/recipes-bsp/watchdog/watchdog_sysmocom.inc index dcfbdb6bdc..1362ddd019 100644 --- a/recipes-bsp/watchdog/watchdog_sysmocom.inc +++ b/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}:${SYSMOCOM}/${PN}" -PRINC = "6" +PRINC = "7" inherit update-rc.d diff --git a/recipes-extra/gnupg/gnupg_2.0.19.bb b/recipes-extra/gnupg/gnupg_2.0.19.bb index 996a8e80dc..841397f460 100644 --- a/recipes-extra/gnupg/gnupg_2.0.19.bb +++ b/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 diff --git a/recipes-fixes/modutils/modutils-initscripts.bbappend b/recipes-fixes/modutils/modutils-initscripts_sysmocom.inc similarity index 85% rename from recipes-fixes/modutils/modutils-initscripts.bbappend rename to recipes-fixes/modutils/modutils-initscripts_sysmocom.inc index efaf3dde00..855d3b8a30 100644 --- a/recipes-fixes/modutils/modutils-initscripts.bbappend +++ b/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 ." diff --git a/recipes-fixes/opkg/opkg_svn.bbappend b/recipes-fixes/opkg/opkg_sysmocom.inc similarity index 96% rename from recipes-fixes/opkg/opkg_svn.bbappend rename to recipes-fixes/opkg/opkg_sysmocom.inc index eccc8062a1..82cd23f2f5 100644 --- a/recipes-fixes/opkg/opkg_svn.bbappend +++ b/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 diff --git a/recipes-fixes/pkgconfig/pkgconfig_0.25.bbappend b/recipes-fixes/pkgconfig/pkgconfig_sysmocom.inc similarity index 94% rename from recipes-fixes/pkgconfig/pkgconfig_0.25.bbappend rename to recipes-fixes/pkgconfig/pkgconfig_sysmocom.inc index d3fb34ebb7..afb832858e 100644 --- a/recipes-fixes/pkgconfig/pkgconfig_0.25.bbappend +++ b/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 " diff --git a/recipes-fixes/udev/udev_164.bbappend b/recipes-fixes/udev/udev_sysmocom.inc similarity index 98% rename from recipes-fixes/udev/udev_164.bbappend rename to recipes-fixes/udev/udev_sysmocom.inc index f048347434..57e5285480 100644 --- a/recipes-fixes/udev/udev_164.bbappend +++ b/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.*" diff --git a/recipes-sysmobts/uboot/u-boot_2011.03.bbappend b/recipes-sysmobts/uboot/u-boot_sysmocom.inc similarity index 98% rename from recipes-sysmobts/uboot/u-boot_2011.03.bbappend rename to recipes-sysmobts/uboot/u-boot_sysmocom.inc index 7153cbb81a..d243177df6 100644 --- a/recipes-sysmobts/uboot/u-boot_2011.03.bbappend +++ b/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" diff --git a/yocto-edison/busybox_1.18.5.bbappend b/yocto-edison/busybox_1.18.5.bbappend new file mode 100644 index 0000000000..ead80563a3 --- /dev/null +++ b/yocto-edison/busybox_1.18.5.bbappend @@ -0,0 +1 @@ +require recipes-apps/busybox/${PN}_sysmocom.inc diff --git a/yocto-edison/netbase_4.45.bbappend b/yocto-edison/netbase_4.45.bbappend new file mode 100644 index 0000000000..5e3605ffef --- /dev/null +++ b/yocto-edison/netbase_4.45.bbappend @@ -0,0 +1 @@ +require recipes-bsp/netbase/${PN}_sysmocom.inc diff --git a/yocto-edison/watchdog_5.9.bbappend b/yocto-edison/watchdog_5.9.bbappend new file mode 100644 index 0000000000..57590dbf4a --- /dev/null +++ b/yocto-edison/watchdog_5.9.bbappend @@ -0,0 +1 @@ +require recipes-bsp/watchdog/${PN}_sysmocom.inc diff --git a/yocto-master/busybox_1.19.4.bbappend b/yocto-master/busybox_1.19.4.bbappend new file mode 100644 index 0000000000..ead80563a3 --- /dev/null +++ b/yocto-master/busybox_1.19.4.bbappend @@ -0,0 +1 @@ +require recipes-apps/busybox/${PN}_sysmocom.inc diff --git a/yocto-master/netbase_5.0.bbappend b/yocto-master/netbase_5.0.bbappend new file mode 100644 index 0000000000..5e3605ffef --- /dev/null +++ b/yocto-master/netbase_5.0.bbappend @@ -0,0 +1 @@ +require recipes-bsp/netbase/${PN}_sysmocom.inc diff --git a/yocto-master/watchdog_5.12.bbappend b/yocto-master/watchdog_5.12.bbappend new file mode 100644 index 0000000000..57590dbf4a --- /dev/null +++ b/yocto-master/watchdog_5.12.bbappend @@ -0,0 +1 @@ +require recipes-bsp/watchdog/${PN}_sysmocom.inc diff --git a/yocto-shared/base-files_3.0.14.bbappend b/yocto-shared/base-files_3.0.14.bbappend new file mode 100644 index 0000000000..9a509c69ba --- /dev/null +++ b/yocto-shared/base-files_3.0.14.bbappend @@ -0,0 +1 @@ +require recipes-bsp/base-files/${PN}_sysmocom.inc diff --git a/yocto-shared/modutils-initscripts.bbappend b/yocto-shared/modutils-initscripts.bbappend new file mode 100644 index 0000000000..7e157d09f0 --- /dev/null +++ b/yocto-shared/modutils-initscripts.bbappend @@ -0,0 +1 @@ +require recipes-fixes/modutils/${PN}_sysmocom.inc diff --git a/yocto-shared/opkg_svn.bbappend b/yocto-shared/opkg_svn.bbappend new file mode 100644 index 0000000000..99db212286 --- /dev/null +++ b/yocto-shared/opkg_svn.bbappend @@ -0,0 +1 @@ +require recipes-fixes/opkg/${PN}_sysmocom.inc diff --git a/yocto-shared/pkgconfig_0.25.bbappend b/yocto-shared/pkgconfig_0.25.bbappend new file mode 100644 index 0000000000..af4afa8552 --- /dev/null +++ b/yocto-shared/pkgconfig_0.25.bbappend @@ -0,0 +1 @@ +require recipes-fixes/pkgconfig/${PN}_sysmocom.inc diff --git a/yocto-shared/u-boot_2011.03.bbappend b/yocto-shared/u-boot_2011.03.bbappend new file mode 100644 index 0000000000..34003acec4 --- /dev/null +++ b/yocto-shared/u-boot_2011.03.bbappend @@ -0,0 +1 @@ +require recipes-sysmobts/uboot/${PN}_sysmocom.inc