From: Kang Kai Date: Tue, 9 Apr 2013 03:16:38 +0000 (+0800) Subject: libpng12: remove prefer version and add it to lsb packagegroup X-Git-Tag: yocto-4.0~33278 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01fa98083df0931e07e8715616dafe600258adba;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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. Signed-off-by: Kang Kai Signed-off-by: Richard Purdie --- diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc index 0a5b2f45f9e..53ec2e7caf3 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" # Force the older version of liberation-fonts until we fix the fontforge issue PREFERRED_VERSION_liberation-fonts ?= "1.04" - -# Set libpng default version for linuxstdbase -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 d692a263534..cf04f0f3b42 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 = "\ ncurses \ zlib \ nspr \ + libpng12 \ " SUMMARY_packagegroup-core-lsb-perl = "LSB Runtime Languages (Perl)"