# # old_revision [a713e30a7c1eae8ab3bf00e2e3eb7f9a6ffb1e3b] # # patch "classes/rootfs_deb.bbclass" # from [707eb78db91916253acef44e2f1a8ff049193cff] # to [35e50a54b60fe0c1137ebc2a4bc1f6aa4fab25de] # ============================================================ --- classes/rootfs_deb.bbclass 707eb78db91916253acef44e2f1a8ff049193cff +++ classes/rootfs_deb.bbclass 35e50a54b60fe0c1137ebc2a4bc1f6aa4fab25de @@ -1,12 +1,14 @@ do_rootfs[depends] += "dpkg-native:do_po # # Copyright 2006-2007 Openedhand Ltd. # do_rootfs[depends] += "dpkg-native:do_populate_staging apt-native:do_populate_staging" +do_rootfs[recrdeptask] += "do_package_write_deb" fakeroot rootfs_deb_do_rootfs () { set +e - mkdir -p ${IMAGE_ROOTFS}/var/dpkg/{info,updates} + mkdir -p ${IMAGE_ROOTFS}/var/dpkg/info + mkdir -p ${IMAGE_ROOTFS}/var/dpkg/updates rm -f ${STAGING_DIR}/etc/apt/sources.list.rev rm -f ${STAGING_DIR}/etc/apt/preferences @@ -72,7 +74,7 @@ fakeroot rootfs_deb_do_rootfs () { if [ ! -z "${PACKAGE_INSTALL}" ]; then for i in ${PACKAGE_INSTALL}; do apt-get install $i --force-yes --allow-unauthenticated - if [ $? -eq 1 ]; then + if [ $? -ne 0 ]; then exit 1 fi find ${IMAGE_ROOTFS} -name \*.dpkg-new | for i in `cat`; do @@ -132,7 +134,7 @@ rootfs_deb_log_check() { echo -e "log_check: Matched keyword: [$keyword_die]\n" echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die" echo "" - do_exit=1 + do_exit=1 fi done test "$do_exit" = 1 && exit 1