code cleanup for INITRD variable handing

* Remove an unnecessary check
* Instead of ignoring, report the errors

(From OE-Core rev: 7afc6df6f0d0bbe0c5cb8ec021d430d6d9714941)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index 995d3e7..5107d7f 100644 (file)
--- a/meta/classes/boot-directdisk.bbclass
+++ b/meta/classes/boot-directdisk.bbclass
@@ -76,8 +76,10 @@ boot_direct_populate() {
                rm -f $dest/initrd
                for fs in ${INITRD}
                do
-                       if [ -n "${fs}" ] && [ -s "${fs}" ]; then
+                       if [ -s "${fs}" ]; then
                                cat ${fs} >> $dest/initrd
+                       else
+                               bbfatal "${fs} is invalid. initrd image creation failed."
                        fi
                done
                chmod 0644 $dest/initrd

diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 7b3ce65..859d517 100644 (file)
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -75,6 +75,8 @@ populate() {
                do
                        if [ -s "${fs}" ]; then
                                cat ${fs} >> ${DEST}/initrd
+                       else
+                               bbfatal "${fs} is invalid. initrd image creation failed."
                        fi
                done
                chmod 0644 ${DEST}/initrd