diff options
| author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2016-01-27 18:23:31 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-29 17:03:53 +0000 |
| commit | 3ac0416f40b2d7cd4d02ccb4c11302ebe9f1c411 (patch) | |
| tree | 9fe556ede5a9f8fece9e2fd3c07a22d6a4c6a608 /meta-yocto | |
| parent | d61d290ad7e2f1d3e15261468f9be0961c3b6a25 (diff) | |
| download | poky-3ac0416f40b2d7cd4d02ccb4c11302ebe9f1c411.tar.gz | |
local.conf.sample.extended: Update the info about BBMASK
Update the info about BBMASK to reflect that it can now contain
multiple regular expressions.
Also correct a misspelled PREFERRED_VERSION in a comment.
(From meta-yocto rev: c8eeb105fdb677cc6a93f7800b6c78a52b359bd3)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto')
| -rw-r--r-- | meta-yocto/conf/local.conf.sample.extended | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-yocto/conf/local.conf.sample.extended b/meta-yocto/conf/local.conf.sample.extended index 925270b011..521cdcbb78 100644 --- a/meta-yocto/conf/local.conf.sample.extended +++ b/meta-yocto/conf/local.conf.sample.extended | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # BBMASK is a regular expression that can be used to tell BitBake to ignore | 1 | # BBMASK contains regular expressions that can be used to tell BitBake to ignore |
| 2 | # certain recipes. | 2 | # certain recipes. |
| 3 | #BBMASK = "" | 3 | #BBMASK = "" |
| 4 | 4 | ||
| @@ -375,7 +375,7 @@ | |||
| 375 | # | 375 | # |
| 376 | # Currently the rootfs_rpm code has a hard depends on rpmresolve:do_populate_sysroot, | 376 | # Currently the rootfs_rpm code has a hard depends on rpmresolve:do_populate_sysroot, |
| 377 | # when using rpm4 the rpmresolve code will not compile due to a missing header file. | 377 | # when using rpm4 the rpmresolve code will not compile due to a missing header file. |
| 378 | # That dependency needs to be removed when using RPM4, also the PREFRRED_VERSION needs | 378 | # That dependency needs to be removed when using RPM4, also the PREFERRED_VERSION needs |
| 379 | # to be set. This example shows how to enable rpm4 | 379 | # to be set. This example shows how to enable rpm4 |
| 380 | # PREFERRED_VERSION_rpm = "4.11.2" | 380 | # PREFERRED_VERSION_rpm = "4.11.2" |
| 381 | # PREFERRED_VERSION_rpm-native = "4.11.2" | 381 | # PREFERRED_VERSION_rpm-native = "4.11.2" |