diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-04 00:00:59 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-04 00:00:59 +0000 |
| commit | 78f5f8df30c8917900332138d6688b7470878d9e (patch) | |
| tree | 18d17a59150bf8ac0cd7aa7235c899a13e0cb153 /meta/conf | |
| parent | bb2a5c981019c80d319c6254c5994b7d158c65bd (diff) | |
| download | poky-78f5f8df30c8917900332138d6688b7470878d9e.tar.gz | |
Various fixes after recent commit breakage
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/bitbake.conf | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index d6744a487e..369b24752e 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
| @@ -219,8 +219,7 @@ FILES_${PN}-locale = "${datadir}/locale" | |||
| 219 | FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}" | 219 | FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}" |
| 220 | # FILESPATH is set in base.bbclass | 220 | # FILESPATH is set in base.bbclass |
| 221 | #FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/${BP}:${FILE_DIRNAME}/${BPN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" | 221 | #FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/${BP}:${FILE_DIRNAME}/${BPN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" |
| 222 | # Giving FILESDIR this default value is pointless as FILESPATH is always searched first - RP | 222 | FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}" |
| 223 | #FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}" | ||
| 224 | 223 | ||
| 225 | ################################################################## | 224 | ################################################################## |
| 226 | # General work and output directories for the build system. | 225 | # General work and output directories for the build system. |