From 1f87162b0babf681b4986ded41499950d9b849af Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 31 Mar 2015 17:40:21 +0200 Subject: [PATCH] layerconf: changes to let the layer build on dora and master * removes the components for dizzy, we will skip it * simplify the mapping from DISTRO_NUMBER to DISTRO_NAME * remove watchdog.bbappend for master --- classes/sysmocom-archiver.bbclass | 47 ++++++++++++++----- conf/layer.conf | 2 +- conf/machine/include/sysmobts.inc | 2 +- yocto-dizzy/init-ifupdown_1.0.bbappend | 1 - yocto-dizzy/pkgconfig_0.28.bbappend | 1 - yocto-dizzy/udev_182.bbappend | 1 - yocto-dizzy/update-rc.d_0.7.bbappend | 1 - yocto-dizzy/watchdog_5.14.bbappend | 1 - yocto-master/busybox_1.21.1.bbappend | 4 -- .../busybox_1.23.1.bbappend | 0 .../core-image-minimal-initramfs.bbappend | 0 .../cronie_%.bbappend | 0 yocto-master/dbus_1.6.10.bbappend | 1 - .../dbus_1.8.10.bbappend | 0 yocto-master/dropbear_2013.58.bbappend | 1 - yocto-master/init-ifupdown_1.0.bbappend | 2 +- .../initramfs-live-install_1.0.bbappend | 0 .../opkg_0.2.4.bbappend | 0 .../packagegroup-core-boot.bbappend | 0 .../systemd-compat-units.bbappend | 0 yocto-master/systemd_204.bbappend | 1 - .../systemd_219.bbappend | 0 .../u-boot_2015.01.bbappend | 0 yocto-master/watchdog_5.13.bbappend | 1 - 24 files changed, 39 insertions(+), 27 deletions(-) delete mode 100644 yocto-dizzy/init-ifupdown_1.0.bbappend delete mode 100644 yocto-dizzy/pkgconfig_0.28.bbappend delete mode 100644 yocto-dizzy/udev_182.bbappend delete mode 100644 yocto-dizzy/update-rc.d_0.7.bbappend delete mode 100644 yocto-dizzy/watchdog_5.14.bbappend delete mode 100644 yocto-master/busybox_1.21.1.bbappend rename {yocto-dizzy => yocto-master}/busybox_1.23.1.bbappend (100%) rename {yocto-dizzy => yocto-master}/core-image-minimal-initramfs.bbappend (100%) rename {yocto-dizzy => yocto-master}/cronie_%.bbappend (100%) delete mode 100644 yocto-master/dbus_1.6.10.bbappend rename {yocto-dizzy => yocto-master}/dbus_1.8.10.bbappend (100%) delete mode 100644 yocto-master/dropbear_2013.58.bbappend rename {yocto-dizzy => yocto-master}/initramfs-live-install_1.0.bbappend (100%) rename {yocto-dizzy => yocto-master}/opkg_0.2.4.bbappend (100%) rename {yocto-dizzy => yocto-master}/packagegroup-core-boot.bbappend (100%) rename {yocto-dizzy => yocto-master}/systemd-compat-units.bbappend (100%) delete mode 100644 yocto-master/systemd_204.bbappend rename {yocto-dizzy => yocto-master}/systemd_219.bbappend (100%) rename {yocto-dizzy => yocto-master}/u-boot_2015.01.bbappend (100%) delete mode 100644 yocto-master/watchdog_5.13.bbappend diff --git a/classes/sysmocom-archiver.bbclass b/classes/sysmocom-archiver.bbclass index b63e73e..1510e87 100644 --- a/classes/sysmocom-archiver.bbclass +++ b/classes/sysmocom-archiver.bbclass @@ -20,8 +20,14 @@ def get_bb_inc(d): bbdir = os.path.dirname(bbfile) script_logs = os.path.join(work_dir,'script-logs') bb_inc = os.path.join(script_logs,'bb_inc') - bb.mkdirhier(script_logs) - bb.mkdirhier(bb_inc) + try: + bb.mkdirhier(script_logs) + except: + bb.utils.mkdirhier(script_logs) + try: + bb.mkdirhier(bb_inc) + except: + bb.utils.mkdirhier(bb_inc) def find_file(dir,file): for root, dirs, files in os.walk(dir): @@ -49,7 +55,10 @@ def get_bb_inc(d): shutil.copy(bbincfile,bb_inc) try: - bb.mkdirhier(os.path.join(script_logs,'temp')) + try: + bb.mkdirhier(os.path.join(script_logs,'temp')) + except: + bb.utils.mkdirhier(os.path.join(script_logs,'temp')) oe.path.copytree(os.path.join(work_dir,'temp'), os.path.join(script_logs,'temp')) except (IOError,AttributeError): pass @@ -65,8 +74,10 @@ def get_series(d): s = d.getVar('S',True) dest = os.path.join(work_dir, pf + '-series') shutil.rmtree(dest, ignore_errors=True) - bb.mkdirhier(dest) - + try: + bb.mkdirhier(dest) + except: + bb.utils.mkdirhier(dest) src_uri = d.getVar('SRC_URI', True).split() fetch = bb.fetch2.Fetch(src_uri, d) locals = (fetch.localpath(url) for url in fetch.urls) @@ -82,7 +93,10 @@ def get_series(d): shutil.copy(patch,dest) except IOError: if os.path.isdir(patch): - bb.mkdirhier(os.path.join(dest,patch)) + try: + bb.mkdirhier(os.path.join(dest,patch)) + except: + bb.utils.mkdirhier(os.path.join(dest,patch)) oe.path.copytree(patch, os.path.join(dest,patch)) return dest @@ -96,8 +110,10 @@ def get_applying_patches(d): work_dir = d.getVar('WORKDIR', True) dest = os.path.join(work_dir, pf + '-patches') shutil.rmtree(dest, ignore_errors=True) - bb.mkdirhier(dest) - + try: + bb.mkdirhier(dest) + except: + bb.utils.mkdirhier(dest) patches = src_patches(d) for patch in patches: @@ -248,7 +264,10 @@ def move_tarball_deploy(d,tarball_list): work_dir = d.getVar('WORKDIR',True) tar_sources = d.getVar('DEPLOY_DIR', True) + '/sources/' + target_sys + '/' + licenses + '/' + pf if not os.path.exists(tar_sources): - bb.mkdirhier(tar_sources) + try: + bb.mkdirhier(tar_sources) + except: + bb.utils.mkdirhier(tar_sources) for source in tarball_list: if source: if os.path.exists(os.path.join(tar_sources, source)): @@ -345,7 +364,10 @@ def dumpdata(d): licenses = get_licenses(d) dumpdir = d.getVar('DEPLOY_DIR', True) + '/sources/' + target_sys + '/' + licenses + '/' + pf if not os.path.exists(dumpdir): - bb.mkdirhier(dumpdir) + try: + bb.mkdirhier(dumpdir) + except: + bb.utils.mkdirhier(dumpdir) dumpfile = os.path.join(dumpdir, bb.data.expand("${P}-${PR}.showdata.dump",d)) @@ -381,7 +403,10 @@ def create_diff_gz(d): distro = d.getVar('DISTRO',True) dest = s + '/' + distro + '/files' if not os.path.exists(dest): - bb.mkdirhier(dest) + try: + bb.mkdirhier(dest) + except: + bb.utils.mkdirhier(dest) for i in os.listdir(os.getcwd()): if os.path.isfile(i): try: diff --git a/conf/layer.conf b/conf/layer.conf index d219085..b79b034 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,7 +9,7 @@ BBFILES += "${LAYERDIR}/yocto-shared/*.bbappend" BBFILES += "${BBFILES_SYSMOCOM_BSP}" # selects specific distro or master when DISTRO_VERSION contains snapshot -BBFILES_SYSMOCOM_BSP = "${LAYERDIR}/yocto-${@ [dict([('1.5', 'dora'), ('1.7', 'dizzy')])[d.getVar('DISTRO_VERSION', True)[0:3]], 'master']['snapshot' in d.getVar('DISTRO_VERSION', True)]}/*.bbappend" +BBFILES_SYSMOCOM_BSP = "${LAYERDIR}/yocto-${@dict([('1.5', 'dora')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'master')}/*.bbappend" BBFILE_COLLECTIONS += "sysmocom-bsp" BBFILE_PATTERN_sysmocom-bsp := "^${LAYERDIR}/" diff --git a/conf/machine/include/sysmobts.inc b/conf/machine/include/sysmobts.inc index 49bd228..1dbbdc4 100644 --- a/conf/machine/include/sysmobts.inc +++ b/conf/machine/include/sysmobts.inc @@ -1,7 +1,7 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom" -PREFERRED_VERSION_linux-sysmocom = "${@ dict([('1.7', '3.10.50+git%'), ('1.5','3.10.50+git%'), ('1.1.2','')])[d.getVar('DISTRO_VERSION', True)[0:3]]}" +PREFERRED_VERSION_linux-sysmocom = "3.10.50+git%" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" PREFERRED_VERSION_u-boot = "git" diff --git a/yocto-dizzy/init-ifupdown_1.0.bbappend b/yocto-dizzy/init-ifupdown_1.0.bbappend deleted file mode 100644 index 5e3605f..0000000 --- a/yocto-dizzy/init-ifupdown_1.0.bbappend +++ /dev/null @@ -1 +0,0 @@ -require recipes-bsp/netbase/${PN}_sysmocom.inc diff --git a/yocto-dizzy/pkgconfig_0.28.bbappend b/yocto-dizzy/pkgconfig_0.28.bbappend deleted file mode 100644 index 9e03591..0000000 --- a/yocto-dizzy/pkgconfig_0.28.bbappend +++ /dev/null @@ -1 +0,0 @@ -require recipes-fixes/${PN}/${PN}_sysmocom.inc diff --git a/yocto-dizzy/udev_182.bbappend b/yocto-dizzy/udev_182.bbappend deleted file mode 100644 index 9e03591..0000000 --- a/yocto-dizzy/udev_182.bbappend +++ /dev/null @@ -1 +0,0 @@ -require recipes-fixes/${PN}/${PN}_sysmocom.inc diff --git a/yocto-dizzy/update-rc.d_0.7.bbappend b/yocto-dizzy/update-rc.d_0.7.bbappend deleted file mode 100644 index ec787dc..0000000 --- a/yocto-dizzy/update-rc.d_0.7.bbappend +++ /dev/null @@ -1 +0,0 @@ -require recipes-fixes/${PN}/${PN}_angstrom.inc diff --git a/yocto-dizzy/watchdog_5.14.bbappend b/yocto-dizzy/watchdog_5.14.bbappend deleted file mode 100644 index 57590db..0000000 --- a/yocto-dizzy/watchdog_5.14.bbappend +++ /dev/null @@ -1 +0,0 @@ -require recipes-bsp/watchdog/${PN}_sysmocom.inc diff --git a/yocto-master/busybox_1.21.1.bbappend b/yocto-master/busybox_1.21.1.bbappend deleted file mode 100644 index 641aeb3..0000000 --- a/yocto-master/busybox_1.21.1.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -# PN/PV are wrong inside the .inc file with 1.19.1 -SYSMOCOM_ORIG_PV := "${PV}" -require recipes-core/busybox/${PN}_sysmocom.inc -require recipes-core/busybox/${PN}_sysmocom_systemd.inc diff --git a/yocto-dizzy/busybox_1.23.1.bbappend b/yocto-master/busybox_1.23.1.bbappend similarity index 100% rename from yocto-dizzy/busybox_1.23.1.bbappend rename to yocto-master/busybox_1.23.1.bbappend diff --git a/yocto-dizzy/core-image-minimal-initramfs.bbappend b/yocto-master/core-image-minimal-initramfs.bbappend similarity index 100% rename from yocto-dizzy/core-image-minimal-initramfs.bbappend rename to yocto-master/core-image-minimal-initramfs.bbappend diff --git a/yocto-dizzy/cronie_%.bbappend b/yocto-master/cronie_%.bbappend similarity index 100% rename from yocto-dizzy/cronie_%.bbappend rename to yocto-master/cronie_%.bbappend diff --git a/yocto-master/dbus_1.6.10.bbappend b/yocto-master/dbus_1.6.10.bbappend deleted file mode 100644 index 0ada2aa..0000000 --- a/yocto-master/dbus_1.6.10.bbappend +++ /dev/null @@ -1 +0,0 @@ -require recipes-fixes/${PN}/${PN}_sysmocom_systemd.inc diff --git a/yocto-dizzy/dbus_1.8.10.bbappend b/yocto-master/dbus_1.8.10.bbappend similarity index 100% rename from yocto-dizzy/dbus_1.8.10.bbappend rename to yocto-master/dbus_1.8.10.bbappend diff --git a/yocto-master/dropbear_2013.58.bbappend b/yocto-master/dropbear_2013.58.bbappend deleted file mode 100644 index a3a97a3..0000000 --- a/yocto-master/dropbear_2013.58.bbappend +++ /dev/null @@ -1 +0,0 @@ -require recipes-fixes/dropbear/${PN}_sysmocom.inc diff --git a/yocto-master/init-ifupdown_1.0.bbappend b/yocto-master/init-ifupdown_1.0.bbappend index 5e3605f..486a6a7 100644 --- a/yocto-master/init-ifupdown_1.0.bbappend +++ b/yocto-master/init-ifupdown_1.0.bbappend @@ -1 +1 @@ -require recipes-bsp/netbase/${PN}_sysmocom.inc +require recipes-bsp/init-ifupdown/${PN}_sysmocom.inc diff --git a/yocto-dizzy/initramfs-live-install_1.0.bbappend b/yocto-master/initramfs-live-install_1.0.bbappend similarity index 100% rename from yocto-dizzy/initramfs-live-install_1.0.bbappend rename to yocto-master/initramfs-live-install_1.0.bbappend diff --git a/yocto-dizzy/opkg_0.2.4.bbappend b/yocto-master/opkg_0.2.4.bbappend similarity index 100% rename from yocto-dizzy/opkg_0.2.4.bbappend rename to yocto-master/opkg_0.2.4.bbappend diff --git a/yocto-dizzy/packagegroup-core-boot.bbappend b/yocto-master/packagegroup-core-boot.bbappend similarity index 100% rename from yocto-dizzy/packagegroup-core-boot.bbappend rename to yocto-master/packagegroup-core-boot.bbappend diff --git a/yocto-dizzy/systemd-compat-units.bbappend b/yocto-master/systemd-compat-units.bbappend similarity index 100% rename from yocto-dizzy/systemd-compat-units.bbappend rename to yocto-master/systemd-compat-units.bbappend diff --git a/yocto-master/systemd_204.bbappend b/yocto-master/systemd_204.bbappend deleted file mode 100644 index 9e03591..0000000 --- a/yocto-master/systemd_204.bbappend +++ /dev/null @@ -1 +0,0 @@ -require recipes-fixes/${PN}/${PN}_sysmocom.inc diff --git a/yocto-dizzy/systemd_219.bbappend b/yocto-master/systemd_219.bbappend similarity index 100% rename from yocto-dizzy/systemd_219.bbappend rename to yocto-master/systemd_219.bbappend diff --git a/yocto-dizzy/u-boot_2015.01.bbappend b/yocto-master/u-boot_2015.01.bbappend similarity index 100% rename from yocto-dizzy/u-boot_2015.01.bbappend rename to yocto-master/u-boot_2015.01.bbappend diff --git a/yocto-master/watchdog_5.13.bbappend b/yocto-master/watchdog_5.13.bbappend deleted file mode 100644 index 57590db..0000000 --- a/yocto-master/watchdog_5.13.bbappend +++ /dev/null @@ -1 +0,0 @@ -require recipes-bsp/watchdog/${PN}_sysmocom.inc