summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2013-01-18 13:41:49 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-28 12:29:30 +0000
commitb71a16e8ac18b5633ac3a52c60ad78dde37ede7b (patch)
tree27ec630d13eb281206ba3d2c6765f648e7cf0061 /meta
parent52268c7599a3df7c06a88cd6ca5e1fdbfc386125 (diff)
downloadpoky-b71a16e8ac18b5633ac3a52c60ad78dde37ede7b.tar.gz
package.bbclass: remove RRECOMMENDS on base packages for locale packages
As long as we support only one locale package per recipe this leads to unwanted packages in images. This patch was motivated by samba (meta-oe): only wanting libsmbclient one gets full samba server into the image. For my standard image the follwing package were removed by this patch: -acl_2.2.51-r3_armv7a-vfp-neon.ipk -alsa-states_0.2.0-r3_armv7a-vfp-neon.ipk -alsa-utils_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-aconnect_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-alsaconf_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-alsactl_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-alsaloop_1.0.25-r3_armv7a-vfp-neon.ipk alsa-utils-alsamixer_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-alsaucm_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-amixer_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-aplay_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-aseqdump_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-aseqnet_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-iecset_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-midi_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-speakertest_1.0.25-r3_armv7a-vfp-neon.ipk -attr_2.4.46-r4_armv7a-vfp-neon.ipk -avahi_0.6.31-r7.1_armv7a-vfp-neon.ipk -gtk-engines_2.20.2-r3_armv7a-vfp-neon.ipk -pulseaudio_2.1-r15_armv7a-vfp-neon.ipk -samba_3.6.8-r6_armv7a-vfp-neon.ipk -vte_0.28.2-r5_armv7a-vfp-neon.ipk -xz_5.1.2alpha-r0_armv7a-vfp-neon.ipk Strange effect: For samba buildhistory's depends.dot says: -samba -> libc6; -samba -> libgcc1; -samba -> libreadline6; -samba -> libtalloc2; -samba -> libtdb1; -samba -> libwbclient0; -samba -> libz1; -samba -> update_rc_d; -samba_locale_de -> samba [style=dotted]; samba_locale_de -> virtual_locale_de [style=dotted]; -samba_locale_fr -> samba [style=dotted]; -samba_locale_fr -> samba [style=dotted]; This is conflicts to buildhistory's result on samba package not mentioning any changes for samba package. (From OE-Core rev: 50354ebece43a6c13f9ca592e7d230765a26fdf8) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package.bbclass3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index e8d7aefd86..71c6179477 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -453,13 +453,12 @@ python package_do_split_locales() {
453 description = d.getVar('DESCRIPTION', True) or "" 453 description = d.getVar('DESCRIPTION', True) or ""
454 locale_section = d.getVar('LOCALE_SECTION', True) 454 locale_section = d.getVar('LOCALE_SECTION', True)
455 mlprefix = d.getVar('MLPREFIX', True) or "" 455 mlprefix = d.getVar('MLPREFIX', True) or ""
456 pndep = base_contains('PACKAGES', pn, '%s ' % pn, '', d)
457 for l in sorted(locales): 456 for l in sorted(locales):
458 ln = legitimize_package_name(l) 457 ln = legitimize_package_name(l)
459 pkg = pn + '-locale-' + ln 458 pkg = pn + '-locale-' + ln
460 packages.append(pkg) 459 packages.append(pkg)
461 d.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l)) 460 d.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l))
462 d.setVar('RRECOMMENDS_' + pkg, '%s%svirtual-locale-%s' % (pndep, mlprefix, ln)) 461 d.setVar('RRECOMMENDS_' + pkg, '%svirtual-locale-%s' % (mlprefix, ln))
463 d.setVar('RPROVIDES_' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln)) 462 d.setVar('RPROVIDES_' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln))
464 d.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l)) 463 d.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l))
465 d.setVar('DESCRIPTION_' + pkg, '%s This package contains language translation files for the %s locale.' % (description, l)) 464 d.setVar('DESCRIPTION_' + pkg, '%s This package contains language translation files for the %s locale.' % (description, l))