|
@@ -28,9 +28,9 @@ FETCHCOMMAND = ""
|
|
|
FETCHCOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} co ${CVSCOOPTS} ${CVSMODULE}"
|
|
|
FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}"
|
|
|
FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
|
|
|
-FILESDIR = "${@bb.utils.which(bb.data.getVar('FILESPATH', d, 1), '.')}"
|
|
|
+FILESDIR = "${@bb.utils.which(d.getVar('FILESPATH', 1), '.')}"
|
|
|
FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
|
|
|
-FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}"
|
|
|
+FILE_DIRNAME = "${@os.path.dirname(d.getVar('FILE'))}"
|
|
|
GITDIR = "${DL_DIR}/git"
|
|
|
IMAGE_CMD = "_NO_DEFINED_IMAGE_TYPES_"
|
|
|
IMAGE_ROOTFS = "${TMPDIR}/rootfs"
|
|
@@ -40,10 +40,10 @@ OVERRIDES = "local:${MACHINE}:${TARGET_OS}:${TARGET_ARCH}"
|
|
|
P = "${PN}-${PV}"
|
|
|
PERSISTENT_DIR = "${TMPDIR}/cache"
|
|
|
PF = "${PN}-${PV}-${PR}"
|
|
|
-PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}"
|
|
|
-PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}"
|
|
|
+PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[0] or 'defaultpkgname'}"
|
|
|
+PR = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[2] or 'r0'}"
|
|
|
PROVIDES = ""
|
|
|
-PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}"
|
|
|
+PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[1] or '1.0'}"
|
|
|
RESUMECOMMAND = ""
|
|
|
RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
|
|
|
S = "${WORKDIR}/${P}"
|