mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
meta: cleanup d.getVar(var, 1)
(From OE-Core rev: 79fe476be233015c1c90e9c3fb4572267b5551d1) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
32b8267203
commit
b8e2bab119
|
@ -127,9 +127,9 @@ PACKAGES_DYNAMIC += "^kernel-firmware-.*"
|
||||||
export OS = "${TARGET_OS}"
|
export OS = "${TARGET_OS}"
|
||||||
export CROSS_COMPILE = "${TARGET_PREFIX}"
|
export CROSS_COMPILE = "${TARGET_PREFIX}"
|
||||||
|
|
||||||
KERNEL_PRIORITY ?= "${@int(d.getVar('PV',1).split('-')[0].split('+')[0].split('.')[0]) * 10000 + \
|
KERNEL_PRIORITY ?= "${@int(d.getVar('PV', True).split('-')[0].split('+')[0].split('.')[0]) * 10000 + \
|
||||||
int(d.getVar('PV',1).split('-')[0].split('+')[0].split('.')[1]) * 100 + \
|
int(d.getVar('PV', True).split('-')[0].split('+')[0].split('.')[1]) * 100 + \
|
||||||
int(d.getVar('PV',1).split('-')[0].split('+')[0].split('.')[-1])}"
|
int(d.getVar('PV', True).split('-')[0].split('+')[0].split('.')[-1])}"
|
||||||
|
|
||||||
KERNEL_RELEASE ?= "${KERNEL_VERSION}"
|
KERNEL_RELEASE ?= "${KERNEL_VERSION}"
|
||||||
|
|
||||||
|
@ -140,7 +140,7 @@ KERNEL_IMAGEDEST = "boot"
|
||||||
#
|
#
|
||||||
# configuration
|
# configuration
|
||||||
#
|
#
|
||||||
export CMDLINE_CONSOLE = "console=${@d.getVar("KERNEL_CONSOLE",1) or "ttyS0"}"
|
export CMDLINE_CONSOLE = "console=${@d.getVar("KERNEL_CONSOLE", True) or "ttyS0"}"
|
||||||
|
|
||||||
KERNEL_VERSION = "${@get_kernelversion_headers('${B}')}"
|
KERNEL_VERSION = "${@get_kernelversion_headers('${B}')}"
|
||||||
|
|
||||||
|
|
|
@ -245,7 +245,7 @@ python do_package_ipk () {
|
||||||
|
|
||||||
os.chdir(basedir)
|
os.chdir(basedir)
|
||||||
ret = subprocess.call("PATH=\"%s\" %s %s %s" % (localdata.getVar("PATH", True),
|
ret = subprocess.call("PATH=\"%s\" %s %s %s" % (localdata.getVar("PATH", True),
|
||||||
d.getVar("OPKGBUILDCMD",1), pkg, pkgoutdir), shell=True)
|
d.getVar("OPKGBUILDCMD", True), pkg, pkgoutdir), shell=True)
|
||||||
if ret != 0:
|
if ret != 0:
|
||||||
bb.utils.unlockfile(lf)
|
bb.utils.unlockfile(lf)
|
||||||
raise bb.build.FuncFailed("opkg-build execution failed")
|
raise bb.build.FuncFailed("opkg-build execution failed")
|
||||||
|
|
|
@ -23,13 +23,13 @@ def ifelse(condition, iftrue = True, iffalse = False):
|
||||||
return iffalse
|
return iffalse
|
||||||
|
|
||||||
def conditional(variable, checkvalue, truevalue, falsevalue, d):
|
def conditional(variable, checkvalue, truevalue, falsevalue, d):
|
||||||
if d.getVar(variable,1) == checkvalue:
|
if d.getVar(variable, True) == checkvalue:
|
||||||
return truevalue
|
return truevalue
|
||||||
else:
|
else:
|
||||||
return falsevalue
|
return falsevalue
|
||||||
|
|
||||||
def less_or_equal(variable, checkvalue, truevalue, falsevalue, d):
|
def less_or_equal(variable, checkvalue, truevalue, falsevalue, d):
|
||||||
if float(d.getVar(variable,1)) <= float(checkvalue):
|
if float(d.getVar(variable, True)) <= float(checkvalue):
|
||||||
return truevalue
|
return truevalue
|
||||||
else:
|
else:
|
||||||
return falsevalue
|
return falsevalue
|
||||||
|
|
|
@ -17,7 +17,7 @@ python do_install () {
|
||||||
}
|
}
|
||||||
|
|
||||||
python do_install_config () {
|
python do_install_config () {
|
||||||
indir = os.path.dirname(d.getVar('FILE',1))
|
indir = os.path.dirname(d.getVar('FILE', True))
|
||||||
infile = open(oe.path.join(indir, 'files', 'apt.conf'), 'r')
|
infile = open(oe.path.join(indir, 'files', 'apt.conf'), 'r')
|
||||||
data = infile.read()
|
data = infile.read()
|
||||||
infile.close()
|
infile.close()
|
||||||
|
|
|
@ -9,7 +9,7 @@ LICENSE = "BSD"
|
||||||
LIC_FILES_CHKSUM = "file://Copyright.txt;md5=052f86c15bbde68af55c7f7b340ab639 \
|
LIC_FILES_CHKSUM = "file://Copyright.txt;md5=052f86c15bbde68af55c7f7b340ab639 \
|
||||||
file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2"
|
file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2"
|
||||||
|
|
||||||
CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}"
|
CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV', True).split('.')[0:2])}"
|
||||||
|
|
||||||
SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
|
SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
|
||||||
file://support-oe-qt4-tools-names.patch \
|
file://support-oe-qt4-tools-names.patch \
|
||||||
|
|
|
@ -32,7 +32,7 @@ EXTRA_OECONF += "--disable-gconf --disable-qconf"
|
||||||
|
|
||||||
# Some packages have the version preceeding the .so instead properly
|
# Some packages have the version preceeding the .so instead properly
|
||||||
# versioned .so.<version>, so we need to reorder and repackage.
|
# versioned .so.<version>, so we need to reorder and repackage.
|
||||||
SOLIBS = "-${@d.getVar('PV',1)[:-2]}.so"
|
SOLIBS = "-${@d.getVar('PV', True)[:-2]}.so"
|
||||||
FILES_SOLIBSDEV = "${libdir}/libkconfig-parser.so"
|
FILES_SOLIBSDEV = "${libdir}/libkconfig-parser.so"
|
||||||
|
|
||||||
BBCLASSEXTEND = "native"
|
BBCLASSEXTEND = "native"
|
||||||
|
|
|
@ -11,7 +11,7 @@ HOMEPAGE = "http://vala-project.org"
|
||||||
LICENSE = "LGPLv2.1"
|
LICENSE = "LGPLv2.1"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
|
||||||
|
|
||||||
SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
|
SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split('.')[1]}"
|
||||||
|
|
||||||
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz"
|
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz"
|
||||||
inherit autotools pkgconfig upstream-version-is-even
|
inherit autotools pkgconfig upstream-version-is-even
|
||||||
|
|
|
@ -7,8 +7,8 @@ HOMEPAGE = "http://www.boost.org/"
|
||||||
LICENSE = "BSL-1.0 & MIT & Python-2.0"
|
LICENSE = "BSL-1.0 & MIT & Python-2.0"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
|
LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
|
||||||
|
|
||||||
BOOST_VER = "${@"_".join(d.getVar("PV",1).split("."))}"
|
BOOST_VER = "${@"_".join(d.getVar("PV", True).split("."))}"
|
||||||
BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}"
|
BOOST_MAJ = "${@"_".join(d.getVar("PV", True).split(".")[0:2])}"
|
||||||
BOOST_P = "boost_${BOOST_VER}"
|
BOOST_P = "boost_${BOOST_VER}"
|
||||||
|
|
||||||
SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2"
|
SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user