From 6751f3e2129c8c1748feec416b7140def6c822c0 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 28 Mar 2017 21:02:12 +0200 Subject: [PATCH] modernize: Use d.get* instead of the bb.data.get* facade In modern Poky the facade is gone and the data dictionary needs to be accessed directly. This commit is catching up with it. It was build tested on dora as well. I have not checked if it is changing the checksums of a dora build. --- classes/sysmocom-archiver.bbclass | 10 +++++----- recipes-bsp/base-files/base-files_sysmocom.inc | 2 +- .../init-ifupdown/init-ifupdown_sysmocom-master.inc | 2 +- recipes-bsp/init-ifupdown/init-ifupdown_sysmocom.inc | 2 +- recipes-bsp/netbase/netbase_sysmocom.inc | 2 +- recipes-bsp/watchdog/watchdog_sysmocom.inc | 2 +- recipes-core/busybox/busybox_sysmocom.inc | 2 +- recipes-core/busybox/busybox_sysmocom_systemd.inc | 2 +- .../initrdscripts/initramfs-framework_sysmocom.inc | 2 +- .../initrdscripts/initramfs-live-install_sysmocom.inc | 2 +- recipes-fixes/cronie/cronie_sysmocom.inc | 2 +- recipes-fixes/dropbear/dropbear_sysmocom.inc | 2 +- recipes-fixes/initscripts/initscripts_dora.inc | 2 +- recipes-fixes/initscripts/initscripts_master.inc | 2 +- recipes-fixes/iproute2/iproute2_sysmocom.inc | 2 +- recipes-fixes/opkg/opkg_sysmocom.inc | 2 +- recipes-fixes/pkgconfig/pkgconfig_sysmocom.inc | 2 +- .../systemd/systemd-compat-units_sysmocom.inc | 2 +- recipes-fixes/systemd/systemd_sysmocom.inc | 2 +- recipes-fixes/udev/udev_sysmocom.inc | 2 +- 20 files changed, 24 insertions(+), 24 deletions(-) diff --git a/classes/sysmocom-archiver.bbclass b/classes/sysmocom-archiver.bbclass index b3ac8773cd..c31a9d4ccc 100644 --- a/classes/sysmocom-archiver.bbclass +++ b/classes/sysmocom-archiver.bbclass @@ -133,7 +133,7 @@ def not_tarball(d): workdir = d.getVar('WORKDIR',True) s = d.getVar('S',True) if 'work-shared' in s or 'task-' in workdir or 'native' in workdir: - pn = bb.data.getVar('PN', d , True) + pn = d.getVar('PN', True) if pn == 'gcc-cross': return False return True @@ -362,8 +362,8 @@ def archive_scripts_logs(d): def dumpdata(d): '''dump environment to "${P}-${PR}.showdata.dump" including all kinds of variables and functions when running a task''' - workdir = bb.data.getVar('WORKDIR', d, 1) - distro = bb.data.getVar('DISTRO', d, 1) + workdir = d.getVar('WORKDIR', 1) + distro = d.getVar('DISTRO', 1) s = d.getVar('S', True) pf = d.getVar('PF', True) target_sys = d.getVar('TARGET_SYS', True) @@ -383,8 +383,8 @@ def dumpdata(d): bb.data.emit_env(f, d, True) # emit the metadata which isnt valid shell for e in d.keys(): - if bb.data.getVarFlag(e, 'python', d): - f.write("\npython %s () {\n%s}\n" % (e, bb.data.getVar(e, d, 1))) + if d.getVarFlag(e, 'python'): + f.write("\npython %s () {\n%s}\n" % (e, d.getVar(e, 1))) f.close() def create_diff_gz(d): diff --git a/recipes-bsp/base-files/base-files_sysmocom.inc b/recipes-bsp/base-files/base-files_sysmocom.inc index 0dea48ba1f..40f47844f2 100644 --- a/recipes-bsp/base-files/base-files_sysmocom.inc +++ b/recipes-bsp/base-files/base-files_sysmocom.inc @@ -1,4 +1,4 @@ -THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}" FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:" PRINC="3" diff --git a/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom-master.inc b/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom-master.inc index f9c58ed7b3..f7de30245c 100644 --- a/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom-master.inc +++ b/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom-master.inc @@ -1,2 +1,2 @@ -SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}" FILESEXTRAPATHS_prepend := "${SYSMOCOM}/init-ifupdown-${PV}:${SYSMOCOM}/init-ifupdown-master:" diff --git a/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom.inc b/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom.inc index a36a3e819e..1daf5662ec 100644 --- a/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom.inc +++ b/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom.inc @@ -1,4 +1,4 @@ -SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}" FILESEXTRAPATHS_prepend := "${SYSMOCOM}/init-ifupdown-${PV}:${SYSMOCOM}/init-ifupdown:" PRINC = "13" diff --git a/recipes-bsp/netbase/netbase_sysmocom.inc b/recipes-bsp/netbase/netbase_sysmocom.inc index 2bdc67be9d..ba9c69bdd8 100644 --- a/recipes-bsp/netbase/netbase_sysmocom.inc +++ b/recipes-bsp/netbase/netbase_sysmocom.inc @@ -1,4 +1,4 @@ -SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}" FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}:" PRINC = "21" diff --git a/recipes-bsp/watchdog/watchdog_sysmocom.inc b/recipes-bsp/watchdog/watchdog_sysmocom.inc index b2e512c12c..0e68062b07 100644 --- a/recipes-bsp/watchdog/watchdog_sysmocom.inc +++ b/recipes-bsp/watchdog/watchdog_sysmocom.inc @@ -1,4 +1,4 @@ -SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}" FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}:" PRINC = "9" diff --git a/recipes-core/busybox/busybox_sysmocom.inc b/recipes-core/busybox/busybox_sysmocom.inc index 90f3e13b48..6050c3dfd6 100644 --- a/recipes-core/busybox/busybox_sysmocom.inc +++ b/recipes-core/busybox/busybox_sysmocom.inc @@ -1,4 +1,4 @@ -SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}" FILESEXTRAPATHS_prepend := "${SYSMOCOM}/busybox-${SYSMOCOM_ORIG_PV}:${SYSMOCOM}/files:" PRINC = "30" diff --git a/recipes-core/busybox/busybox_sysmocom_systemd.inc b/recipes-core/busybox/busybox_sysmocom_systemd.inc index 58b268226b..a61540d0bc 100644 --- a/recipes-core/busybox/busybox_sysmocom_systemd.inc +++ b/recipes-core/busybox/busybox_sysmocom_systemd.inc @@ -1,4 +1,4 @@ # Make busybox work nicely with systemd -SYSMOCOM_D := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +SYSMOCOM_D := "${@os.path.dirname(d.getVar('FILE', True))}" FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-systemd:${SYSMOCOM_D}/${PN}:" PRINC := "${@int(PRINC) + 3}" diff --git a/recipes-core/initrdscripts/initramfs-framework_sysmocom.inc b/recipes-core/initrdscripts/initramfs-framework_sysmocom.inc index 2d0b9ee2f0..3cbf83ff05 100644 --- a/recipes-core/initrdscripts/initramfs-framework_sysmocom.inc +++ b/recipes-core/initrdscripts/initramfs-framework_sysmocom.inc @@ -1,4 +1,4 @@ -THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}" FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:" PRINC="4" diff --git a/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc b/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc index d507aa3fc4..7e3d1f6885 100644 --- a/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc +++ b/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc @@ -1,4 +1,4 @@ -SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}" FILESEXTRAPATHS_prepend := "${SYSMOCOM}/files:" PRINC = "2" diff --git a/recipes-fixes/cronie/cronie_sysmocom.inc b/recipes-fixes/cronie/cronie_sysmocom.inc index 2fa6e19f04..aa9d92fe2d 100644 --- a/recipes-fixes/cronie/cronie_sysmocom.inc +++ b/recipes-fixes/cronie/cronie_sysmocom.inc @@ -1,4 +1,4 @@ -THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}" FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:" PRINC="1" diff --git a/recipes-fixes/dropbear/dropbear_sysmocom.inc b/recipes-fixes/dropbear/dropbear_sysmocom.inc index a23e4990c1..6b6fef4ee5 100644 --- a/recipes-fixes/dropbear/dropbear_sysmocom.inc +++ b/recipes-fixes/dropbear/dropbear_sysmocom.inc @@ -1,4 +1,4 @@ -THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}" FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:" PRINC="4" diff --git a/recipes-fixes/initscripts/initscripts_dora.inc b/recipes-fixes/initscripts/initscripts_dora.inc index 5e69ea209a..edb32b72fa 100644 --- a/recipes-fixes/initscripts/initscripts_dora.inc +++ b/recipes-fixes/initscripts/initscripts_dora.inc @@ -1,4 +1,4 @@ -THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}" FILESPATH =. "${@base_set_filespath(["${THISDIR}/files-dora"], d)}:" PRINC="4" diff --git a/recipes-fixes/initscripts/initscripts_master.inc b/recipes-fixes/initscripts/initscripts_master.inc index 2a4815be07..26e33471df 100644 --- a/recipes-fixes/initscripts/initscripts_master.inc +++ b/recipes-fixes/initscripts/initscripts_master.inc @@ -1,4 +1,4 @@ -THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}" FILESPATH =. "${@base_set_filespath(["${THISDIR}/files-master"], d)}:" PRINC="4" diff --git a/recipes-fixes/iproute2/iproute2_sysmocom.inc b/recipes-fixes/iproute2/iproute2_sysmocom.inc index a5b3531472..3c0855da94 100644 --- a/recipes-fixes/iproute2/iproute2_sysmocom.inc +++ b/recipes-fixes/iproute2/iproute2_sysmocom.inc @@ -1,4 +1,4 @@ -THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}" FILESPATH =. "${@base_set_filespath(["${THISDIR}/files/${PN}-${PV}"], d)}:${@base_set_filespath(["${THISDIR}/files"], d)}:" PRINC="2" diff --git a/recipes-fixes/opkg/opkg_sysmocom.inc b/recipes-fixes/opkg/opkg_sysmocom.inc index 82cd23f2f5..053de179cc 100644 --- a/recipes-fixes/opkg/opkg_sysmocom.inc +++ b/recipes-fixes/opkg/opkg_sysmocom.inc @@ -1,4 +1,4 @@ -THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}" FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}-${PV}"], d)}:" PRINC = "2" diff --git a/recipes-fixes/pkgconfig/pkgconfig_sysmocom.inc b/recipes-fixes/pkgconfig/pkgconfig_sysmocom.inc index afb832858e..dc8d381504 100644 --- a/recipes-fixes/pkgconfig/pkgconfig_sysmocom.inc +++ b/recipes-fixes/pkgconfig/pkgconfig_sysmocom.inc @@ -1,4 +1,4 @@ -THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}" FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}-${PV}"], d)}:" PRINC="2" diff --git a/recipes-fixes/systemd/systemd-compat-units_sysmocom.inc b/recipes-fixes/systemd/systemd-compat-units_sysmocom.inc index b8831d5491..5b97761c3e 100644 --- a/recipes-fixes/systemd/systemd-compat-units_sysmocom.inc +++ b/recipes-fixes/systemd/systemd-compat-units_sysmocom.inc @@ -3,7 +3,7 @@ PRINC="3" # We need networking to run as we have no native services yet SYSTEMD_DISABLED_SYSV_SERVICES_remove = "networking dnsmasq" -S_THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +S_THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}" FILESPATH =. "${@base_set_filespath(["${S_THISDIR}/${PN}"], d)}:" SRC_URI += "file://alignment.service" diff --git a/recipes-fixes/systemd/systemd_sysmocom.inc b/recipes-fixes/systemd/systemd_sysmocom.inc index f1a8a3bfcf..39b063441b 100644 --- a/recipes-fixes/systemd/systemd_sysmocom.inc +++ b/recipes-fixes/systemd/systemd_sysmocom.inc @@ -1,4 +1,4 @@ -S_THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +S_THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}" FILESPATH =. "${@base_set_filespath(["${S_THISDIR}/${PN}"], d)}:" PRINC="25" diff --git a/recipes-fixes/udev/udev_sysmocom.inc b/recipes-fixes/udev/udev_sysmocom.inc index 57e5285480..52c54b3f12 100644 --- a/recipes-fixes/udev/udev_sysmocom.inc +++ b/recipes-fixes/udev/udev_sysmocom.inc @@ -1,4 +1,4 @@ -THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}" FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}-${PV}"], d)}:" PRINC="9"