diff options
| author |   Mark Hatle <mark.hatle@windriver.com> | 2013-08-12 19:47:11 -0500 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2013-08-22 09:15:33 -0700 |
| commit | 42b115b6d65c8205acb77b96db481f3e5172266b (patch) | |
| tree | 422a33b14c9aff03bf1674daf006ecc29557d609 /meta/classes/package_deb.bbclass | |
| parent | 2db14eaa0fcc080bc20fa9da985ffc05c3b21e2a (diff) | |
| download | openembedded-core-42b115b6d65c8205acb77b96db481f3e5172266b.tar.gz | |
package_deb: Add support for NO_RECOMMENDATIONS and PACKAGE_EXCLUDE
Add support for NO_RECOMMENDATIONS and PACKAGE_EXCLUDE. Also add a
warning that ensures users know that BAD_RECOMMENDATIONS support is
not implemented in the debian package/rootfs classes.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes/package_deb.bbclass')
| -rw-r--r-- | meta/classes/package_deb.bbclass | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 4980555764..068c11a535 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -12,6 +12,8 @@ PKGWRITEDIRDEB = "${WORKDIR}/deploy-debs" APTCONF_TARGET = "${WORKDIR}" +APT_ARGS = "${@['', '--no-install-recommends'][d.getVar("NO_RECOMMENDATIONS", True) == "1"]}" + # # Update the Packages index files in ${DEPLOY_DIR_DEB} # @@ -83,6 +85,13 @@ package_install_internal_deb () { priority=$(expr $priority + 5) done + for pkg in ${PACKAGE_EXCLUDE}; do + (echo "Package: $pkg" + echo "Pin: release *" + echo "Pin-Priority: -1" + echo) >> ${APTCONF_TARGET}/apt/preferences + done + tac ${APTCONF_TARGET}/apt/sources.list.rev > ${APTCONF_TARGET}/apt/sources.list # The params in deb package control don't allow character `_', so @@ -105,7 +114,7 @@ package_install_internal_deb () { if [ ! -z "${package_linguas}" ]; then for i in ${package_linguas}; do - apt-get install $i --force-yes --allow-unauthenticated + apt-get ${APT_ARGS} install $i --force-yes --allow-unauthenticated if [ $? -ne 0 ]; then exit 1 fi @@ -114,13 +123,13 @@ package_install_internal_deb () { # normal install if [ ! -z "${package_to_install}" ]; then - apt-get install ${package_to_install} --force-yes --allow-unauthenticated + apt-get ${APT_ARGS} install ${package_to_install} --force-yes --allow-unauthenticated if [ $? -ne 0 ]; then exit 1 fi # Attempt to correct the probable broken dependencies in place. - apt-get -f install + apt-get ${APT_ARGS} -f install if [ $? -ne 0 ]; then exit 1 fi @@ -129,7 +138,7 @@ package_install_internal_deb () { rm -f `dirname ${BB_LOGFILE}`/log.do_${task}-attemptonly.${PID} if [ ! -z "${package_attemptonly}" ]; then for i in ${package_attemptonly}; do - apt-get install $i --force-yes --allow-unauthenticated >> `dirname ${BB_LOGFILE}`/log.do_${task}-attemptonly.${PID} 2>&1 || true + apt-get ${APT_ARGS} install $i --force-yes --allow-unauthenticated >> `dirname ${BB_LOGFILE}`/log.do_${task}-attemptonly.${PID} 2>&1 || true done fi |