diff options
author | Koen Kooi <koen@openembedded.org> | 2007-08-08 06:20:51 +0000 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2007-08-08 06:20:51 +0000 |
commit | bf0561f41898b938a6f772a4006a113bbf51393a (patch) | |
tree | 6c7b66e58faf7d7c5424c719dbf126b60886168f /classes/rootfs_deb.bbclass | |
parent | cd2d22bec1fb2d5bb2d64af90dc93f0efa939be4 (diff) | |
parent | 8e0edca59aa429e14f33632942ce2743dfff62ce (diff) |
merge of '2c0fad768939f606b65e1c9b4e1220f0209883f7'
and 'c441a97d0a545c68ad7de39b4729d857ef08723c'
Diffstat (limited to 'classes/rootfs_deb.bbclass')
-rw-r--r-- | classes/rootfs_deb.bbclass | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass index f444541509..67fa661308 100644 --- a/classes/rootfs_deb.bbclass +++ b/classes/rootfs_deb.bbclass @@ -1,3 +1,6 @@ +# +# Copyright 2006-2007 Openedhand Ltd. +# do_rootfs[depends] += "dpkg-native:do_populate_staging apt-native:do_populate_staging" @@ -52,21 +55,21 @@ fakeroot rootfs_deb_do_rootfs () { } if [ ! -z "${LINGUAS_INSTALL}" ]; then - apt-get install glibc-localedata-i18n - if [ $? -eq 1 ]; then - exit 1 + apt-get install glibc-localedata-i18n --force-yes --allow-unauthenticated + if [ $? -ne 0 ]; then + exit $? fi for i in ${LINGUAS_INSTALL}; do - apt-get install $i - if [ $? -eq 1 ]; then - exit 1 + apt-get install $i --force-yes --allow-unauthenticated + if [ $? -ne 0 ]; then + exit $? fi done fi if [ ! -z "${PACKAGE_INSTALL}" ]; then for i in ${PACKAGE_INSTALL}; do - apt-get install $i + apt-get install $i --force-yes --allow-unauthenticated if [ $? -eq 1 ]; then exit 1 fi @@ -134,3 +137,7 @@ rootfs_deb_log_check() { true } +remove_packaging_data_files() { + rm -rf ${IMAGE_ROOTFS}/usr/lib/ipkg/ + rm -rf ${IMAGE_ROOTFS}/usr/dpkg/ +} |