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.
2012-09-14 21:21:04 +02:00 · 2012-09-14 21:21:04 +02:00 · 5e17d8e537
parent 6a4abb5830
commit 5e17d8e537
29 changed files with 25 additions and 16 deletions
--- 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}/"
--- a/recipes-apps/busybox/busybox_1.18.5.bbappend
+++ b/recipes-apps/busybox/busybox_1.18.5.bbappend
@ -1 +0,0 @@
-require ${PN}_sysmocom.inc
--- a/recipes-apps/busybox/busybox_1.19.4.bbappend
+++ b/recipes-apps/busybox/busybox_1.19.4.bbappend
@ -1 +0,0 @@
-require ${PN}_sysmocom.inc
--- 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"
--- a/recipes-bsp/base-files/base-files_3.0.14.bbappend
+++ b/recipes-bsp/base-files/base-files_3.0.14.bbappend
@ -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"
--- a/recipes-bsp/netbase/netbase_4.45.bbappend
+++ b/recipes-bsp/netbase/netbase_4.45.bbappend
@ -1 +0,0 @@
-require ${PN}_sysmocom.inc
--- a/recipes-bsp/netbase/netbase_5.0.bbappend
+++ b/recipes-bsp/netbase/netbase_5.0.bbappend
@ -1 +0,0 @@
-require ${PN}_sysmocom.inc
--- 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
--- a/recipes-bsp/watchdog/watchdog_5.12.bbappend
+++ b/recipes-bsp/watchdog/watchdog_5.12.bbappend
@ -1 +0,0 @@
-require ${PN}_sysmocom.inc
--- a/recipes-bsp/watchdog/watchdog_5.9.bbappend
+++ b/recipes-bsp/watchdog/watchdog_5.9.bbappend
@ -1 +0,0 @@
-require ${PN}_sysmocom.inc
--- 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

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

--- a/recipes-fixes/modutils/modutils-initscripts_sysmocom.inc
+++ 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 ."
--- a/recipes-fixes/opkg/opkg_sysmocom.inc
+++ 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
--- a/recipes-fixes/pkgconfig/pkgconfig_0.25.bbappend
+++ b/recipes-fixes/pkgconfig/pkgconfig_0.25.bbappend
@ -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 "
--- a/recipes-fixes/udev/udev_sysmocom.inc
+++ 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.*"

--- a/recipes-sysmobts/uboot/u-boot_2011.03.bbappend
+++ b/recipes-sysmobts/uboot/u-boot_2011.03.bbappend
@ -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"
--- a/yocto-edison/busybox_1.18.5.bbappend
+++ b/yocto-edison/busybox_1.18.5.bbappend
@ -0,0 +1 @@
+require recipes-apps/busybox/${PN}_sysmocom.inc
--- a/yocto-edison/netbase_4.45.bbappend
+++ b/yocto-edison/netbase_4.45.bbappend
@ -0,0 +1 @@
+require recipes-bsp/netbase/${PN}_sysmocom.inc
--- a/yocto-edison/watchdog_5.9.bbappend
+++ b/yocto-edison/watchdog_5.9.bbappend
@ -0,0 +1 @@
+require recipes-bsp/watchdog/${PN}_sysmocom.inc
--- a/yocto-master/busybox_1.19.4.bbappend
+++ b/yocto-master/busybox_1.19.4.bbappend
@ -0,0 +1 @@
+require recipes-apps/busybox/${PN}_sysmocom.inc
--- a/yocto-master/netbase_5.0.bbappend
+++ b/yocto-master/netbase_5.0.bbappend
@ -0,0 +1 @@
+require recipes-bsp/netbase/${PN}_sysmocom.inc
--- a/yocto-master/watchdog_5.12.bbappend
+++ b/yocto-master/watchdog_5.12.bbappend
@ -0,0 +1 @@
+require recipes-bsp/watchdog/${PN}_sysmocom.inc
--- a/yocto-shared/base-files_3.0.14.bbappend
+++ b/yocto-shared/base-files_3.0.14.bbappend
@ -0,0 +1 @@
+require recipes-bsp/${PN}/${PN}_sysmocom.inc
--- a/yocto-shared/modutils-initscripts.bbappend
+++ b/yocto-shared/modutils-initscripts.bbappend
@ -0,0 +1 @@
+require recipes-fixes/modutils/${PN}_sysmocom.inc
--- a/yocto-shared/opkg_svn.bbappend
+++ b/yocto-shared/opkg_svn.bbappend
@ -0,0 +1 @@
+require recipes-fixes/${PN}/${PN}_sysmocom.inc
--- a/yocto-shared/pkgconfig_0.25.bbappend
+++ b/yocto-shared/pkgconfig_0.25.bbappend
@ -0,0 +1 @@
+require recipes-fixes/${PN}/${PN}_sysmocom.inc
--- a/yocto-shared/u-boot_2011.03.bbappend
+++ b/yocto-shared/u-boot_2011.03.bbappend
@ -0,0 +1 @@
+require recipes-sysmobts/uboot/${PN}_sysmocom.inc
--- a/yocto-shared/udev_164.bbappend
+++ b/yocto-shared/udev_164.bbappend
@ -0,0 +1 @@
+require recipes-fixes/${PN}/${PN}_sysmocom.inc
				`@ -0,0 +1 @@`
				`require recipes-apps/busybox/${PN}_sysmocom.inc`
				`@ -0,0 +1 @@`
				`require recipes-bsp/netbase/${PN}_sysmocom.inc`
				`@ -0,0 +1 @@`
				`require recipes-bsp/watchdog/${PN}_sysmocom.inc`
				`@ -0,0 +1 @@`
				`require recipes-bsp/${PN}/${PN}_sysmocom.inc`
				`@ -0,0 +1 @@`
				`require recipes-fixes/modutils/${PN}_sysmocom.inc`
				`@ -0,0 +1 @@`
				`require recipes-fixes/${PN}/${PN}_sysmocom.inc`
				`@ -0,0 +1 @@`
				`require recipes-sysmobts/uboot/${PN}_sysmocom.inc`