mirror of
git://git.yoctoproject.org/meta-freescale.git
synced 2025-07-19 12:59:04 +02:00
qemu-qoriq: upgrade to 4.2
Signed-off-by: Ting Liu <ting.liu@nxp.com>
This commit is contained in:
parent
7fade9243a
commit
d70e4ef35a
|
@ -1,67 +0,0 @@
|
|||
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
|
||||
|
||||
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(-)
|
||||
|
||||
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
||||
index 4e97bcf1e5..ce399a55f0 100644
|
||||
--- a/linux-user/syscall.c
|
||||
+++ b/linux-user/syscall.c
|
||||
@@ -7764,10 +7764,12 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
|
||||
#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.24.0
|
||||
|
|
@ -13,10 +13,9 @@ SRC_URI = "gitsm://source.codeaurora.org/external/qoriq/qoriq-components/qemu;no
|
|||
file://powerpc_rom.bin \
|
||||
file://run-ptest \
|
||||
file://0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch \
|
||||
file://0001-linux-user-remove-host-stime-syscall.patch \
|
||||
"
|
||||
|
||||
SRCREV = "0b88a503e43ca629d6e8165638ac6b312e5c66bd"
|
||||
SRCREV = "14fda5a42df6c72e890d6a97ff88c5852172604b"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
@ -53,7 +52,7 @@ do_install_ptest() {
|
|||
}
|
||||
|
||||
PACKAGECONFIG ??= " \
|
||||
fdt sdl kvm aio libusb vhost \
|
||||
fdt sdl kvm aio libusb vhost numa \
|
||||
${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
|
||||
"
|
||||
PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm"
|
Loading…
Reference in New Issue
Block a user