diff options
| -rw-r--r-- | meta/classes/rootfs_deb.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass index 75933883b9..55dad6679a 100644 --- a/meta/classes/rootfs_deb.bbclass +++ b/meta/classes/rootfs_deb.bbclass | |||
| @@ -58,12 +58,12 @@ fakeroot rootfs_deb_do_rootfs () { | |||
| 58 | if [ ! -z "${LINGUAS_INSTALL}" ]; then | 58 | if [ ! -z "${LINGUAS_INSTALL}" ]; then |
| 59 | apt-get install glibc-localedata-i18n --force-yes --allow-unauthenticated | 59 | apt-get install glibc-localedata-i18n --force-yes --allow-unauthenticated |
| 60 | if [ $? -ne 0 ]; then | 60 | if [ $? -ne 0 ]; then |
| 61 | exit $? | 61 | exit 1 |
| 62 | fi | 62 | fi |
| 63 | for i in ${LINGUAS_INSTALL}; do | 63 | for i in ${LINGUAS_INSTALL}; do |
| 64 | apt-get install $i --force-yes --allow-unauthenticated | 64 | apt-get install $i --force-yes --allow-unauthenticated |
| 65 | if [ $? -ne 0 ]; then | 65 | if [ $? -ne 0 ]; then |
| 66 | exit $? | 66 | exit 1 |
| 67 | fi | 67 | fi |
| 68 | done | 68 | done |
| 69 | fi | 69 | fi |
| @@ -71,7 +71,7 @@ fakeroot rootfs_deb_do_rootfs () { | |||
| 71 | if [ ! -z "${PACKAGE_INSTALL}" ]; then | 71 | if [ ! -z "${PACKAGE_INSTALL}" ]; then |
| 72 | for i in ${PACKAGE_INSTALL}; do | 72 | for i in ${PACKAGE_INSTALL}; do |
| 73 | apt-get install $i --force-yes --allow-unauthenticated | 73 | apt-get install $i --force-yes --allow-unauthenticated |
| 74 | if [ $? -eq 1 ]; then | 74 | if [ $? -ne 0 ]; then |
| 75 | exit 1 | 75 | exit 1 |
| 76 | fi | 76 | fi |
| 77 | find ${IMAGE_ROOTFS} -name \*.dpkg-new | for i in `cat`; do | 77 | find ${IMAGE_ROOTFS} -name \*.dpkg-new | for i in `cat`; do |
| @@ -131,7 +131,7 @@ rootfs_deb_log_check() { | |||
| 131 | echo -e "log_check: Matched keyword: [$keyword_die]\n" | 131 | echo -e "log_check: Matched keyword: [$keyword_die]\n" |
| 132 | echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die" | 132 | echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die" |
| 133 | echo "" | 133 | echo "" |
| 134 | do_exit=1 | 134 | do_exit=1 |
| 135 | fi | 135 | fi |
| 136 | done | 136 | done |
| 137 | test "$do_exit" = 1 && exit 1 | 137 | test "$do_exit" = 1 && exit 1 |
