1 files changed, 6 insertions, 1 deletions

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index e5e76ef278..526c3aecb1 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -216,12 +216,17 @@ package_update_index_ipk () {
                 packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/$arch"
         done
 
+        found=0
         for pkgdir in $packagedirs; do
                 if [ -e $pkgdir/ ]; then
+                        found=1
                         touch $pkgdir/Packages
                         flock $pkgdir/Packages.flock -c "opkg-make-index -r $pkgdir/Packages -p $pkgdir/Packages -m $pkgdir/"
                 fi
         done
+        if [ "$found" != "1" ]; then
+                bbfatal "There are no packages in ${DEPLOY_DIR_IPK}!"
+        fi
 }
 
 #
@@ -483,6 +488,6 @@ do_package_write_ipk[cleandirs] = "${PKGWRITEDIRIPK}"
 do_package_write_ipk[umask] = "022"
 addtask package_write_ipk before do_package_write after do_packagedata do_package
 
-PACKAGEINDEXES += "package_update_index_ipk;"
+PACKAGEINDEXES += "[ ! -e ${DEPLOY_DIR_IPK} ] || package_update_index_ipk;"
 PACKAGEINDEXDEPS += "opkg-utils-native:do_populate_sysroot"
 PACKAGEINDEXDEPS += "opkg-native:do_populate_sysroot"