Patchwork [07/11] package_deb: Add support for NO_RECOMMENDATIONS and PACKAGE_EXCLUDE

login
register
mail settings
Submitter Mark Hatle
Date Aug. 14, 2013, 8:30 p.m.
Message ID <1376512209-11622-8-git-send-email-mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/55637/
State Accepted
Commit 388278818d2af0a2c6a687765d43f22fe6f3c407
Headers show

Comments

Mark Hatle - Aug. 14, 2013, 8:30 p.m.
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>
---
 meta/classes/package_deb.bbclass | 17 +++++++++++++----
 meta/classes/rootfs_deb.bbclass  |  8 +++++++-
 2 files changed, 20 insertions(+), 5 deletions(-)

Patch

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 4980555..068c11a 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
 
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index edd1037..dcfe786 100644
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -11,6 +11,12 @@  rootfs_deb_do_rootfs[vardepsexclude] += "BUILDNAME"
 
 do_rootfs[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
 
+python rootfs_deb_bad_recommendations() {
+    if d.getVar("BAD_RECOMMENDATIONS", True):
+	bb.warn("Debian package install does not support BAD_RECOMMENDATIONS")
+}
+do_rootfs[prefuncs] += "rootfs_deb_bad_recommendations"
+
 DEB_POSTPROCESS_COMMANDS = ""
 
 opkglibdir = "${localstatedir}/lib/opkg"
@@ -113,7 +119,7 @@  remove_packaging_data_files() {
 }
 
 rootfs_install_packages() {
-	${STAGING_BINDIR_NATIVE}/apt-get install `cat $1` --force-yes --allow-unauthenticated
+	${STAGING_BINDIR_NATIVE}/apt-get ${APT_ARGS} install `cat $1` --force-yes --allow-unauthenticated
 
 	# Mark all packages installed
 	sed -i -e "s/Status: install ok unpacked/Status: install ok installed/;" $INSTALL_ROOTFS_DEB/var/lib/dpkg/status