diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-09 15:00:01 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-10 11:35:32 +0000 |
| commit | b22831fd63164c4db9c0b72934d7d734a6585251 (patch) | |
| tree | edb6581a041190290855bf86714430515c9f235a /meta/recipes-devtools/apt | |
| parent | 07ded02ffd37b4fe60a6210dbf56490ea306f0b6 (diff) | |
| download | openembedded-core-b22831fd63164c4db9c0b72934d7d734a6585251.tar.gz openembedded-core-b22831fd63164c4db9c0b72934d7d734a6585251.tar.bz2 openembedded-core-b22831fd63164c4db9c0b72934d7d734a6585251.zip | |
Convert to use direct access to the data store (instead of bb.data.*Var*())
This is the result of running the following over the metadata:
sed \
-e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \
-e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-i `grep -ril bb.data *`
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/apt')
| -rw-r--r-- | meta/recipes-devtools/apt/apt-native.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-devtools/apt/apt-package.inc | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-devtools/apt/apt-native.inc b/meta/recipes-devtools/apt/apt-native.inc index b16f99e93c..d4b207b986 100644 --- a/meta/recipes-devtools/apt/apt-native.inc +++ b/meta/recipes-devtools/apt/apt-native.inc @@ -13,14 +13,14 @@ python do_install () { } python do_install_config () { - indir = os.path.dirname(bb.data.getVar('FILE',d,1)) + indir = os.path.dirname(d.getVar('FILE',1)) infile = file(os.path.join(indir, 'files', 'apt.conf'), 'r') data = infile.read() infile.close() data = bb.data.expand(data, d) - outdir = os.path.join(bb.data.getVar('D', d, 1), bb.data.getVar('sysconfdir', d, 1), 'apt') + outdir = os.path.join(d.getVar('D', 1), d.getVar('sysconfdir', 1), 'apt') if not os.path.exists(outdir): os.makedirs(outdir) outpath = os.path.join(outdir, 'apt.conf.sample') diff --git a/meta/recipes-devtools/apt/apt-package.inc b/meta/recipes-devtools/apt/apt-package.inc index 2e3be3885b..dde916e3da 100644 --- a/meta/recipes-devtools/apt/apt-package.inc +++ b/meta/recipes-devtools/apt/apt-package.inc @@ -59,15 +59,15 @@ FILES_${PN} = "${bindir}/apt-cdrom ${bindir}/apt-get \ ${localstatedir} ${sysconfdir} \ ${libdir}/dpkg" FILES_${PN}-utils = "${bindir}/apt-sortpkgs ${bindir}/apt-extracttemplates" -FILES_${PN}-doc = "${@get_files_apt_doc(d, bb, bb.data.getVar('apt-manpages', d, 1))} \ +FILES_${PN}-doc = "${@get_files_apt_doc(d, bb, d.getVar('apt-manpages', 1))} \ ${docdir}/apt" -FILES_${PN}-utils-doc = "${@get_files_apt_doc(d, bb, bb.data.getVar('apt-utils-manpages', d, 1))}" +FILES_${PN}-utils-doc = "${@get_files_apt_doc(d, bb, d.getVar('apt-utils-manpages', 1))}" FILES_${PN}-dev = "${libdir}/libapt*.so ${includedir}" do_install () { set -x - ${@get_commands_apt_doc(d, bb, bb.data.getVar('apt-manpages', d, 1))} - ${@get_commands_apt_doc(d, bb, bb.data.getVar('apt-utils-manpages', d, 1))} + ${@get_commands_apt_doc(d, bb, d.getVar('apt-manpages', 1))} + ${@get_commands_apt_doc(d, bb, d.getVar('apt-utils-manpages', 1))} install -d ${D}${bindir} install -m 0755 bin/apt-cdrom ${D}${bindir}/ install -m 0755 bin/apt-get ${D}${bindir}/ |