sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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.

(From OE-Core rev: 42b115b6d65c8205acb77b96db481f3e5172266b)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mark Hatle 2013-08-12 19:47:11 -05:00 committed by Richard Purdie
parent dc5f6c3898
commit 388278818d
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
meta/classes/package_deb.bbclass
View File

@ -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

8
meta/classes/rootfs_deb.bbclass
View File

@ -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