meta-patch: fix qemu build failure

Issue-ID: INF-411

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: Ia2d08d2928523a721a42420499eecbff4c365f73

diff --git a/scripts/build_inf_yocto/build_inf_yocto.sh b/scripts/build_inf_yocto/build_inf_yocto.sh
index 74c6d0c..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 () {

diff --git a/scripts/build_inf_yocto/meta-patches/src_stx/poky/0002-qemu-Replace-stime-API-with-clock_settime.patch b/scripts/build_inf_yocto/meta-patches/src_stx/poky/0002-qemu-Replace-stime-API-with-clock_settime.patch
new file mode 100644 (file)
index 0000000..5dca776
--- /dev/null
+++ b/scripts/build_inf_yocto/meta-patches/src_stx/poky/0002-qemu-Replace-stime-API-with-clock_settime.patch
@@ -0,0 +1,97 @@
+From 0fadfed6ccd25cca0a29926d8238a2f046758499 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 21 Dec 2019 20:05:48 -0800
+Subject: [PATCH] qemu: Replace stime() API with clock_settime
+
+(From OE-Core rev: 2cca75155baec8358939e2aae822e256bed4cfe0)
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+---
+ meta/recipes-devtools/qemu/qemu.inc           |  1 +
+ ...linux-user-remove-host-stime-syscall.patch | 61 +++++++++++++++++++
+ 2 files changed, 62 insertions(+)
+ create mode 100644 meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch
+
+diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
+index 202134b3d8..5300e4c445 100644
+--- a/meta/recipes-devtools/qemu/qemu.inc
++++ b/meta/recipes-devtools/qemu/qemu.inc
+@@ -25,6 +25,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
+            file://0014-linux-user-fix-to-handle-variably-sized-SIOCGSTAMP-w.patch \
+            file://0001-linux-user-assume-__NR_gettid-always-exists.patch \
+            file://0001-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch \
++           file://0011-linux-user-remove-host-stime-syscall.patch \
+            "
+ UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
+ 
+diff --git a/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch b/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch
+new file mode 100644
+index 0000000000..659e6be45d
+--- /dev/null
++++ b/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch
+@@ -0,0 +1,61 @@
++From 0f1f2d4596aee037d3ccbcf10592466daa54107f Mon Sep 17 00:00:00 2001
++From: Laurent Vivier <laurent@vivier.eu>
++Date: Tue, 12 Nov 2019 15:25:56 +0100
++Subject: [PATCH] linux-user: remove host stime() syscall
++
++stime() has been withdrawn from glibc
++(12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.")
++
++Implement the target stime() syscall using host
++clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc.
++
++Tested qemu-ppc/x86_64 with:
++
++      #include <time.h>
++      #include <stdio.h>
++
++      int main(void)
++      {
++              time_t t;
++              int ret;
++
++              /* date -u -d"2019-11-12T15:11:00" "+%s" */
++              t = 1573571460;
++              ret = stime(&t);
++              printf("ret %d\n", ret);
++              return 0;
++      }
++
++        # date; ./stime; date
++        Tue Nov 12 14:18:32 UTC 2019
++        ret 0
++        Tue Nov 12 15:11:00 UTC 2019
++
++Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=0f1f2d4596aee037d3ccbcf10592466daa54107f]
++Buglink: https://bugs.launchpad.net/qemu/+bug/1852115
++Reported-by: Cole Robinson <crobinso@redhat.com>
++Signed-off-by: Laurent Vivier <laurent@vivier.eu>
++Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
++Message-Id: <20191112142556.6335-1-laurent@vivier.eu>
++---
++ linux-user/syscall.c | 8 +++++---
++ 1 file changed, 5 insertions(+), 3 deletions(-)
++
++--- a/linux-user/syscall.c
+++++ b/linux-user/syscall.c
++@@ -7651,10 +7651,12 @@ static abi_long do_syscall1(void *cpu_en
++ #ifdef TARGET_NR_stime /* not on alpha */
++     case TARGET_NR_stime:
++         {
++-            time_t host_time;
++-            if (get_user_sal(host_time, arg1))
+++            struct timespec ts;
+++            ts.tv_nsec = 0;
+++            if (get_user_sal(ts.tv_sec, arg1)) {
++                 return -TARGET_EFAULT;
++-            return get_errno(stime(&host_time));
+++            }
+++            return get_errno(clock_settime(CLOCK_REALTIME, &ts));
++         }
++ #endif
++ #ifdef TARGET_NR_alarm /* not on alpha */
+-- 
+2.39.1
+