meta-patch: fix qemu build failure

[pti/rtp.git] / scripts / build_inf_yocto / build_inf_yocto.sh

diff --git a/scripts/build_inf_yocto/build_inf_yocto.sh b/scripts/build_inf_yocto/build_inf_yocto.sh
index cb87767..634f84d 100755 (executable)
--- a/scripts/build_inf_yocto/build_inf_yocto.sh
+++ b/scripts/build_inf_yocto/build_inf_yocto.sh
@@ -351,23 +351,23 @@ prepare_src () {
 
 # Not any meta-patch is needed for the time being, but new ones may be needed and added
 # sometime in the future, so just leave these code commented out here.
-#    # Apply meta patches
-#    for l in $(ls -1 ${SRC_META_PATCHES}); do
-#        msg_step="Apply meta patches for ${l}"
-#        echo_step_start
-#        cd ${SRC_LAYER_DIR}/${l}
-#
-#        # backup current branch
-#        local_branch=$(git rev-parse --abbrev-ref HEAD)
-#        git branch -m "${local_branch}_${TIMESTAMP}"
-#        git checkout -b ${local_branch} ${local_branch##*-}
-#
-#        for p in $(ls -1 ${SRC_META_PATCHES}/${l}); do
-#            echo_info "Apllying patch: ${SRC_META_PATCHES}/${l}/${p}"
-#            git am ${SRC_META_PATCHES}/${l}/${p}
-#        done
-#        echo_step_end
-#    done
+    # Apply meta patches
+    for l in $(ls -1 ${SRC_META_PATCHES}); do
+        msg_step="Apply meta patches for ${l}"
+        echo_step_start
+        cd ${SRC_LAYER_DIR}/${l}
+
+        # backup current branch
+        local_branch=$(git rev-parse --abbrev-ref HEAD)
+        git branch -m "${local_branch}_${TIMESTAMP}"
+        git checkout -b ${local_branch} ${local_branch##*-}
+
+        for p in $(ls -1 ${SRC_META_PATCHES}/${l}); do
+            echo_info "Apllying patch: ${SRC_META_PATCHES}/${l}/${p}"
+            git am ${SRC_META_PATCHES}/${l}/${p}
+        done
+        echo_step_end
+    done
 }
 
 add_layer_stx_build () {
@@ -466,7 +466,7 @@ build_stx_image () {
 
     RUN_CMD="bitbake ${DRYRUN} ${IMG_STX}"
     echo_cmd "Build the ${IMG_STX} image"
-    bitbake ${DRYRUN} ${IMG_STX} 2>&1|tee logs/bitbake_${IMG_STX}_${TIMESTAMP}.log
+    bitbake -k ${DRYRUN} ${IMG_STX} 2>&1|tee logs/bitbake_${IMG_STX}_${TIMESTAMP}.log
 
     echo_step_end
 
@@ -550,7 +550,7 @@ build_anaconda_image () {
     fi
     RUN_CMD="bitbake ${DRYRUN} ${IMG_ANACONDA}"
     echo_cmd "Build the ${IMG_ANACONDA} image"
-    bitbake ${DRYRUN} ${IMG_ANACONDA} 2>&1|tee logs/bitbake_${IMG_ANACONDA}_${TIMESTAMP}.log
+    bitbake -k ${DRYRUN} ${IMG_ANACONDA} 2>&1|tee logs/bitbake_${IMG_ANACONDA}_${TIMESTAMP}.log
 
     if [ -z "${DRYRUN}" ]; then
         cp -Pf ${ISO_ANACONDA} ${ISO_INF}