From 4e85129a7d47baf3e32b815cbc277bff84e085a0 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 24 Jul 2013 17:26:08 +0100 Subject: classes/rootfs_rpm: implement BAD_RECOMMENDATIONS for RPM Add support for the BAD_RECOMMENDATIONS variable that can be used to prevent specific packages from being installed via an RRECOMMENDS relationship when using the RPM backend. (Previously this functionality was only available when using ipk packaging.) In the process this moves the defaulting of BAD_RECOMMENDATIONS (as empty) to bitbake.conf since it is no longer specific to the ipk backend, as well as unifying some of the code that creates the configuration for smart for use on the host and target. Fixes [YOCTO #3916]. Signed-off-by: Paul Eggleton Signed-off-by: Saul Wold --- meta/classes/package_rpm.bbclass | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'meta/classes/package_rpm.bbclass') diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 1537079bb0..324d83f751 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -224,6 +224,14 @@ translate_oe_to_smart() { export pkgs_to_install } +package_write_smart_config() { + # Write common configuration for host and target usage + smart --data-dir=$1/var/lib/smart config --set rpm-nolinktos=1 + smart --data-dir=$1/var/lib/smart config --set rpm-noparentdirs=1 + for i in ${BAD_RECOMMENDATIONS}; do + smart --data-dir=$1/var/lib/smart flag --set ignore-recommends $i + done +} # # Install a bunch of packages using rpm. @@ -345,10 +353,9 @@ EOF rm -rf ${target_rootfs}/var/lib/smart smart --data-dir=${target_rootfs}/var/lib/smart config --set rpm-root=${target_rootfs} smart --data-dir=${target_rootfs}/var/lib/smart config --set rpm-dbpath=${rpmlibdir} - smart --data-dir=${target_rootfs}/var/lib/smart config --set rpm-nolinktos=1 - smart --data-dir=${target_rootfs}/var/lib/smart config --set rpm-noparentdirs=1 smart --data-dir=${target_rootfs}/var/lib/smart config --set rpm-extra-macros._var=${localstatedir} smart --data-dir=${target_rootfs}/var/lib/smart config --set rpm-extra-macros._tmppath=/install/tmp + package_write_smart_config ${target_rootfs} # Optional debugging #smart --data-dir=${target_rootfs}/var/lib/smart config --set rpm-log-level=debug #smart --data-dir=${target_rootfs}/var/lib/smart config --set rpm-log-file=/tmp/smart-debug-logfile -- cgit 1.2.3-korg