diff options
author | Kang Kai <kai.kang@windriver.com> | 2013-04-09 11:16:38 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-09 13:16:53 +0100 |
commit | 42a72b1089b9eb8000941769d3d79c8b142b1ad7 (patch) | |
tree | 421eed128a09cfe206b349e95c3e6da0822c7033 | |
parent | ce4faa00ec53df5417689065fda855c50818a990 (diff) | |
download | poky-42a72b1089b9eb8000941769d3d79c8b142b1ad7.tar.gz |
libpng12: remove prefer version and add it to lsb packagegroup
Because rename libpng_1.2.50 to libpng, remove the perfer verion from
default-versions.inc and add libpng12 to lsb packagegroup.
(From OE-Core rev: 01fa98083df0931e07e8715616dafe600258adba)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/conf/distro/include/default-versions.inc | 3 | ||||
-rw-r--r-- | meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc index 0a5b2f45f9..53ec2e7caf 100644 --- a/meta/conf/distro/include/default-versions.inc +++ b/meta/conf/distro/include/default-versions.inc | |||
@@ -9,6 +9,3 @@ PREFERRED_VERSION_python-native ?= "2.7.3" | |||
9 | 9 | ||
10 | # Force the older version of liberation-fonts until we fix the fontforge issue | 10 | # Force the older version of liberation-fonts until we fix the fontforge issue |
11 | PREFERRED_VERSION_liberation-fonts ?= "1.04" | 11 | PREFERRED_VERSION_liberation-fonts ?= "1.04" |
12 | |||
13 | # Set libpng default version for linuxstdbase | ||
14 | PREFERRED_VERSION_libpng_linuxstdbase ?= "1.2.50" | ||
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb index d692a26353..cf04f0f3b4 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | |||
@@ -161,6 +161,7 @@ RDEPENDS_packagegroup-core-lsb-core = "\ | |||
161 | ncurses \ | 161 | ncurses \ |
162 | zlib \ | 162 | zlib \ |
163 | nspr \ | 163 | nspr \ |
164 | libpng12 \ | ||
164 | " | 165 | " |
165 | 166 | ||
166 | SUMMARY_packagegroup-core-lsb-perl = "LSB Runtime Languages (Perl)" | 167 | SUMMARY_packagegroup-core-lsb-perl = "LSB Runtime Languages (Perl)" |