meta: remove True option to getVar calls

getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace. Search made with the following regex: getVar ?\(( ?[^,()]*), True\) (From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
author: Joshua Lock <joshua.g.lock@intel.com> 2016-12-14 21:13:04 +0000
committer: Richard Purdie <richard.purdie@linuxfoundation.org> 2016-12-16 10:23:23 +0000
commit: c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch)
tree: a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/recipes-devtools/rpm
parent: d5e67725ac11e3296cad104470931ffa16824b90 (diff)
download: poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz
1 files changed, 30 insertions, 30 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
index 182818ee09..3df4d1ff1d 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
@@ -626,13 +626,13 @@ def multilib_rpmmacros(d):
    localdata.delVar('TOOLCHAIN_OPTIONS')
    # Set 'localdata' values to be consistent with 'd' values.
-    distromacrodirVal = d.getVar('distromacrodir', True)
+    distromacrodirVal = d.getVar('distromacrodir')
-    workdirVal = d.getVar('WORKDIR', True)
+    workdirVal = d.getVar('WORKDIR')
-    dval = d.getVar('D', True)
+    dval = d.getVar('D')
    ret = gen_arch_macro(localdata)
-    variants = d.getVar("MULTILIB_VARIANTS", True) or ""
+    variants = d.getVar("MULTILIB_VARIANTS") or ""
    for item in variants.split():
        # Load overrides from 'd' to avoid having to reset the value...
        localdata = d.createCopy()
@@ -656,17 +656,17 @@ def gen_arch_macro(d):
    val += "\n"
    val += "# Toolchain configuration\n"
    val += "%TOOLCHAIN_OPTIONS  %{nil}\n"
-    val += "%__ar               ${@d.getVar('AR', True).replace('$','%')}\n"
+    val += "%__ar               ${@d.getVar('AR').replace('$','%')}\n"
-    val += "%__as               ${@d.getVar('AS', True).replace('$','%')}\n"
+    val += "%__as               ${@d.getVar('AS').replace('$','%')}\n"
-    val += "%__cc               ${@d.getVar('CC', True).replace('$','%')}\n"
+    val += "%__cc               ${@d.getVar('CC').replace('$','%')}\n"
-    val += "%__cpp              ${@d.getVar('CPP', True).replace('$','%')}\n"
+    val += "%__cpp              ${@d.getVar('CPP').replace('$','%')}\n"
-    val += "%__cxx              ${@d.getVar('CXX', True).replace('$','%')}\n"
+    val += "%__cxx              ${@d.getVar('CXX').replace('$','%')}\n"
-    val += "%__ld               ${@d.getVar('LD', True).replace('$','%')}\n"
+    val += "%__ld               ${@d.getVar('LD').replace('$','%')}\n"
-    val += "%__nm               ${@d.getVar('NM', True).replace('$','%')}\n"
+    val += "%__nm               ${@d.getVar('NM').replace('$','%')}\n"
-    val += "%__objcopy          ${@d.getVar('OBJCOPY', True).replace('$','%')}\n"
+    val += "%__objcopy          ${@d.getVar('OBJCOPY').replace('$','%')}\n"
-    val += "%__objdump          ${@d.getVar('OBJDUMP', True).replace('$','%')}\n"
+    val += "%__objdump          ${@d.getVar('OBJDUMP').replace('$','%')}\n"
-    val += "%__ranlib           ${@d.getVar('RANLIB', True).replace('$','%')}\n"
+    val += "%__ranlib           ${@d.getVar('RANLIB').replace('$','%')}\n"
-    val += "%__strip            ${@d.getVar('STRIP', True).replace('$','%')}\n"
+    val += "%__strip            ${@d.getVar('STRIP').replace('$','%')}\n"
    val += "EOF\n"
    val += "\n"
    return d.expand(val)
@@ -674,30 +674,30 @@ def gen_arch_macro(d):
 add_native_wrapper() {
        create_wrapper ${D}/${bindir}/rpm \
-                RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \
+                RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \
-                RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/rpm} \
+                RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir'), d.getVar('bindir'))}/rpm} \
-                RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/locale
+                RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}/locale
        create_wrapper ${D}/${bindir}/rpm2cpio \
-                RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \
+                RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \
-                RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/rpm} \
+                RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir'), d.getVar('bindir'))}/rpm} \
-                RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/locale
+                RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}/locale
        create_wrapper ${D}/${bindir}/rpmbuild \
-                RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \
+                RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \
-                RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/rpm} \
+                RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir'), d.getVar('bindir'))}/rpm} \
-                RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/locale
+                RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}/locale
        create_wrapper ${D}/${bindir}/rpmconstant \
-                RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \
+                RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \
-                RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/rpm} \
+                RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir'), d.getVar('bindir'))}/rpm} \
-                RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/locale
+                RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}/locale
        for rpm_binary in ${D}/${libdir}/rpm/bin/rpm* ${D}/${libdir}/rpm/bin/debugedit; do
                create_wrapper $rpm_binary \
-                        RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \
+                        RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \
-                        RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/rpm} \
+                        RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir'), d.getVar('bindir'))}/rpm} \
-                        RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/locale
+                        RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}/locale
        done
 }
author	Joshua Lock <joshua.g.lock@intel.com>	2016-12-14 21:13:04 +0000
committer	Richard Purdie <richard.purdie@linuxfoundation.org>	2016-12-16 10:23:23 +0000
commit	c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch)
tree	a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/recipes-devtools/rpm
parent	d5e67725ac11e3296cad104470931ffa16824b90 (diff)
download	poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz

diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb index 182818ee09..3df4d1ff1d 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
@@ -626,13 +626,13 @@ def multilib_rpmmacros(d):
626	localdata.delVar('TOOLCHAIN_OPTIONS')	626	localdata.delVar('TOOLCHAIN_OPTIONS')
627		627
628	# Set 'localdata' values to be consistent with 'd' values.	628	# Set 'localdata' values to be consistent with 'd' values.
629	distromacrodirVal = d.getVar('distromacrodir', True)	629	distromacrodirVal = d.getVar('distromacrodir')
630	workdirVal = d.getVar('WORKDIR', True)	630	workdirVal = d.getVar('WORKDIR')
631	dval = d.getVar('D', True)	631	dval = d.getVar('D')
632		632
633	ret = gen_arch_macro(localdata)	633	ret = gen_arch_macro(localdata)
634		634
635	variants = d.getVar("MULTILIB_VARIANTS", True) or ""	635	variants = d.getVar("MULTILIB_VARIANTS") or ""
636	for item in variants.split():	636	for item in variants.split():
637	# Load overrides from 'd' to avoid having to reset the value...	637	# Load overrides from 'd' to avoid having to reset the value...
638	localdata = d.createCopy()	638	localdata = d.createCopy()
@@ -656,17 +656,17 @@ def gen_arch_macro(d):
656	val += "\n"	656	val += "\n"
657	val += "# Toolchain configuration\n"	657	val += "# Toolchain configuration\n"
658	val += "%TOOLCHAIN_OPTIONS %{nil}\n"	658	val += "%TOOLCHAIN_OPTIONS %{nil}\n"
659	val += "%__ar ${@d.getVar('AR', True).replace('$','%')}\n"	659	val += "%__ar ${@d.getVar('AR').replace('$','%')}\n"
660	val += "%__as ${@d.getVar('AS', True).replace('$','%')}\n"	660	val += "%__as ${@d.getVar('AS').replace('$','%')}\n"
661	val += "%__cc ${@d.getVar('CC', True).replace('$','%')}\n"	661	val += "%__cc ${@d.getVar('CC').replace('$','%')}\n"
662	val += "%__cpp ${@d.getVar('CPP', True).replace('$','%')}\n"	662	val += "%__cpp ${@d.getVar('CPP').replace('$','%')}\n"
663	val += "%__cxx ${@d.getVar('CXX', True).replace('$','%')}\n"	663	val += "%__cxx ${@d.getVar('CXX').replace('$','%')}\n"
664	val += "%__ld ${@d.getVar('LD', True).replace('$','%')}\n"	664	val += "%__ld ${@d.getVar('LD').replace('$','%')}\n"
665	val += "%__nm ${@d.getVar('NM', True).replace('$','%')}\n"	665	val += "%__nm ${@d.getVar('NM').replace('$','%')}\n"
666	val += "%__objcopy ${@d.getVar('OBJCOPY', True).replace('$','%')}\n"	666	val += "%__objcopy ${@d.getVar('OBJCOPY').replace('$','%')}\n"
667	val += "%__objdump ${@d.getVar('OBJDUMP', True).replace('$','%')}\n"	667	val += "%__objdump ${@d.getVar('OBJDUMP').replace('$','%')}\n"
668	val += "%__ranlib ${@d.getVar('RANLIB', True).replace('$','%')}\n"	668	val += "%__ranlib ${@d.getVar('RANLIB').replace('$','%')}\n"
669	val += "%__strip ${@d.getVar('STRIP', True).replace('$','%')}\n"	669	val += "%__strip ${@d.getVar('STRIP').replace('$','%')}\n"
670	val += "EOF\n"	670	val += "EOF\n"
671	val += "\n"	671	val += "\n"
672	return d.expand(val)	672	return d.expand(val)
@@ -674,30 +674,30 @@ def gen_arch_macro(d):
674		674
675	add_native_wrapper() {	675	add_native_wrapper() {
676	create_wrapper ${D}/${bindir}/rpm \	676	create_wrapper ${D}/${bindir}/rpm \
677	RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \	677	RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \
678	RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/rpm} \	678	RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir'), d.getVar('bindir'))}/rpm} \
679	RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/locale	679	RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}/locale
680		680
681	create_wrapper ${D}/${bindir}/rpm2cpio \	681	create_wrapper ${D}/${bindir}/rpm2cpio \
682	RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \	682	RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \
683	RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/rpm} \	683	RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir'), d.getVar('bindir'))}/rpm} \
684	RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/locale	684	RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}/locale
685		685
686	create_wrapper ${D}/${bindir}/rpmbuild \	686	create_wrapper ${D}/${bindir}/rpmbuild \
687	RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \	687	RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \
688	RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/rpm} \	688	RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir'), d.getVar('bindir'))}/rpm} \
689	RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/locale	689	RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}/locale
690		690
691	create_wrapper ${D}/${bindir}/rpmconstant \	691	create_wrapper ${D}/${bindir}/rpmconstant \
692	RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \	692	RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \
693	RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/rpm} \	693	RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir'), d.getVar('bindir'))}/rpm} \
694	RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/locale	694	RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}/locale
695		695
696	for rpm_binary in ${D}/${libdir}/rpm/bin/rpm* ${D}/${libdir}/rpm/bin/debugedit; do	696	for rpm_binary in ${D}/${libdir}/rpm/bin/rpm* ${D}/${libdir}/rpm/bin/debugedit; do
697	create_wrapper $rpm_binary \	697	create_wrapper $rpm_binary \
698	RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \	698	RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \
699	RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/rpm} \	699	RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir'), d.getVar('bindir'))}/rpm} \
700	RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/locale	700	RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}/locale
701	done	701	done
702	}	702	}
703		703