scripts/build_inf_yocto/meta-patches/src_stx/poky/0002-qemu-Replace-stime-API-with-clock_settime.patch

   1 From 0fadfed6ccd25cca0a29926d8238a2f046758499 Mon Sep 17 00:00:00 2001
   2 From: Khem Raj <raj.khem@gmail.com>
   3 Date: Sat, 21 Dec 2019 20:05:48 -0800
   4 Subject: [PATCH] qemu: Replace stime() API with clock_settime
   5
   6 (From OE-Core rev: 2cca75155baec8358939e2aae822e256bed4cfe0)
   7
   8 Signed-off-by: Khem Raj <raj.khem@gmail.com>
   9 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
  10 ---
  11  meta/recipes-devtools/qemu/qemu.inc           |  1 +
  12  ...linux-user-remove-host-stime-syscall.patch | 61 +++++++++++++++++++
  13  2 files changed, 62 insertions(+)
  14  create mode 100644 meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch
  15
  16 diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
  17 index 202134b3d8..5300e4c445 100644
  18 --- a/meta/recipes-devtools/qemu/qemu.inc
  19 +++ b/meta/recipes-devtools/qemu/qemu.inc
  20 @@ -25,6 +25,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
  21             file://0014-linux-user-fix-to-handle-variably-sized-SIOCGSTAMP-w.patch \
  22             file://0001-linux-user-assume-__NR_gettid-always-exists.patch \
  23             file://0001-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch \
  24 +           file://0011-linux-user-remove-host-stime-syscall.patch \
  25             "
  26  UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
  27
  28 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
  29 new file mode 100644
  30 index 0000000000..659e6be45d
  31 --- /dev/null
  32 +++ b/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch
  33 @@ -0,0 +1,61 @@
  34 +From 0f1f2d4596aee037d3ccbcf10592466daa54107f Mon Sep 17 00:00:00 2001
  35 +From: Laurent Vivier <laurent@vivier.eu>
  36 +Date: Tue, 12 Nov 2019 15:25:56 +0100
  37 +Subject: [PATCH] linux-user: remove host stime() syscall
  38 +
  39 +stime() has been withdrawn from glibc
  40 +(12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.")
  41 +
  42 +Implement the target stime() syscall using host
  43 +clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc.
  44 +
  45 +Tested qemu-ppc/x86_64 with:
  46 +
  47 +       #include <time.h>
  48 +       #include <stdio.h>
  49 +
  50 +       int main(void)
  51 +       {
  52 +               time_t t;
  53 +               int ret;
  54 +
  55 +               /* date -u -d"2019-11-12T15:11:00" "+%s" */
  56 +               t = 1573571460;
  57 +               ret = stime(&t);
  58 +               printf("ret %d\n", ret);
  59 +               return 0;
  60 +       }
  61 +
  62 +        # date; ./stime; date
  63 +        Tue Nov 12 14:18:32 UTC 2019
  64 +        ret 0
  65 +        Tue Nov 12 15:11:00 UTC 2019
  66 +
  67 +Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=0f1f2d4596aee037d3ccbcf10592466daa54107f]
  68 +Buglink: https://bugs.launchpad.net/qemu/+bug/1852115
  69 +Reported-by: Cole Robinson <crobinso@redhat.com>
  70 +Signed-off-by: Laurent Vivier <laurent@vivier.eu>
  71 +Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
  72 +Message-Id: <20191112142556.6335-1-laurent@vivier.eu>
  73 +---
  74 + linux-user/syscall.c | 8 +++++---
  75 + 1 file changed, 5 insertions(+), 3 deletions(-)
  76 +
  77 +--- a/linux-user/syscall.c
  78 ++++ b/linux-user/syscall.c
  79 +@@ -7651,10 +7651,12 @@ static abi_long do_syscall1(void *cpu_en
  80 + #ifdef TARGET_NR_stime /* not on alpha */
  81 +     case TARGET_NR_stime:
  82 +         {
  83 +-            time_t host_time;
  84 +-            if (get_user_sal(host_time, arg1))
  85 ++            struct timespec ts;
  86 ++            ts.tv_nsec = 0;
  87 ++            if (get_user_sal(ts.tv_sec, arg1)) {
  88 +                 return -TARGET_EFAULT;
  89 +-            return get_errno(stime(&host_time));
  90 ++            }
  91 ++            return get_errno(clock_settime(CLOCK_REALTIME, &ts));
  92 +         }
  93 + #endif
  94 + #ifdef TARGET_NR_alarm /* not on alpha */
  95 --
  96 2.39.1
  97