diff options
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 4 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch2/git.py | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch | 62 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu_3.0.0.bb | 1 |
4 files changed, 69 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 03e56471d8..bb83462461 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -1028,7 +1028,7 @@ def try_mirror_url(fetch, origud, ud, ld, check = False): | |||
1028 | raise | 1028 | raise |
1029 | 1029 | ||
1030 | except IOError as e: | 1030 | except IOError as e: |
1031 | if e.errno in [os.errno.ESTALE]: | 1031 | if e.errno in [errno.ESTALE]: |
1032 | logger.warning("Stale Error Observed %s." % ud.url) | 1032 | logger.warning("Stale Error Observed %s." % ud.url) |
1033 | return False | 1033 | return False |
1034 | raise | 1034 | raise |
@@ -1717,7 +1717,7 @@ class Fetch(object): | |||
1717 | update_stamp(ud, self.d) | 1717 | update_stamp(ud, self.d) |
1718 | 1718 | ||
1719 | except IOError as e: | 1719 | except IOError as e: |
1720 | if e.errno in [os.errno.ESTALE]: | 1720 | if e.errno in [errno.ESTALE]: |
1721 | logger.error("Stale Error Observed %s." % u) | 1721 | logger.error("Stale Error Observed %s." % u) |
1722 | raise ChecksumError("Stale Error Detected") | 1722 | raise ChecksumError("Stale Error Detected") |
1723 | 1723 | ||
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py index b5d6f99de2..0f215de644 100644 --- a/bitbake/lib/bb/fetch2/git.py +++ b/bitbake/lib/bb/fetch2/git.py | |||
@@ -152,6 +152,10 @@ class Git(FetchMethod): | |||
152 | ud.proto = 'file' | 152 | ud.proto = 'file' |
153 | else: | 153 | else: |
154 | ud.proto = "git" | 154 | ud.proto = "git" |
155 | if ud.host == "github.com" and ud.proto == "git": | ||
156 | # github stopped supporting git protocol | ||
157 | # https://github.blog/2021-09-01-improving-git-protocol-security-github/#no-more-unauthenticated-git | ||
158 | ud.proto = "https" | ||
155 | 159 | ||
156 | if not ud.proto in ('git', 'file', 'ssh', 'http', 'https', 'rsync'): | 160 | if not ud.proto in ('git', 'file', 'ssh', 'http', 'https', 'rsync'): |
157 | raise bb.fetch2.ParameterError("Invalid protocol type", ud.url) | 161 | raise bb.fetch2.ParameterError("Invalid protocol type", ud.url) |
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..618ebcdc81 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch | |||
@@ -0,0 +1,62 @@ | |||
1 | From 0f1f2d4596aee037d3ccbcf10592466daa54107f Mon Sep 17 00:00:00 2001 | ||
2 | From: Laurent Vivier <laurent@vivier.eu> | ||
3 | Date: Tue, 12 Nov 2019 15:25:56 +0100 | ||
4 | Subject: [PATCH] linux-user: remove host stime() syscall | ||
5 | |||
6 | stime() has been withdrawn from glibc | ||
7 | (12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.") | ||
8 | |||
9 | Implement the target stime() syscall using host | ||
10 | clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc. | ||
11 | |||
12 | Tested qemu-ppc/x86_64 with: | ||
13 | |||
14 | #include <time.h> | ||
15 | #include <stdio.h> | ||
16 | |||
17 | int main(void) | ||
18 | { | ||
19 | time_t t; | ||
20 | int ret; | ||
21 | |||
22 | /* date -u -d"2019-11-12T15:11:00" "+%s" */ | ||
23 | t = 1573571460; | ||
24 | ret = stime(&t); | ||
25 | printf("ret %d\n", ret); | ||
26 | return 0; | ||
27 | } | ||
28 | |||
29 | # date; ./stime; date | ||
30 | Tue Nov 12 14:18:32 UTC 2019 | ||
31 | ret 0 | ||
32 | Tue Nov 12 15:11:00 UTC 2019 | ||
33 | |||
34 | Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=0f1f2d4596aee037d3ccbcf10592466daa54107f] | ||
35 | Buglink: https://bugs.launchpad.net/qemu/+bug/1852115 | ||
36 | Reported-by: Cole Robinson <crobinso@redhat.com> | ||
37 | Signed-off-by: Laurent Vivier <laurent@vivier.eu> | ||
38 | Reviewed-by: Peter Maydell <peter.maydell@linaro.org> | ||
39 | Message-Id: <20191112142556.6335-1-laurent@vivier.eu> | ||
40 | --- | ||
41 | linux-user/syscall.c | 8 +++++--- | ||
42 | 1 file changed, 5 insertions(+), 3 deletions(-) | ||
43 | |||
44 | Index: qemu-3.0.0/linux-user/syscall.c | ||
45 | =================================================================== | ||
46 | --- qemu-3.0.0.orig/linux-user/syscall.c | ||
47 | +++ qemu-3.0.0/linux-user/syscall.c | ||
48 | @@ -8520,10 +8520,11 @@ abi_long do_syscall(void *cpu_env, int n | ||
49 | #ifdef TARGET_NR_stime /* not on alpha */ | ||
50 | case TARGET_NR_stime: | ||
51 | { | ||
52 | - time_t host_time; | ||
53 | - if (get_user_sal(host_time, arg1)) | ||
54 | + struct timespec ts; | ||
55 | + ts.tv_nsec = 0; | ||
56 | + if (get_user_sal(ts.tv_sec, arg1)) | ||
57 | goto efault; | ||
58 | - ret = get_errno(stime(&host_time)); | ||
59 | + ret = get_errno(clock_settime(CLOCK_REALTIME, &ts)); | ||
60 | } | ||
61 | break; | ||
62 | #endif | ||
diff --git a/meta/recipes-devtools/qemu/qemu_3.0.0.bb b/meta/recipes-devtools/qemu/qemu_3.0.0.bb index e483acab55..1daee7211f 100644 --- a/meta/recipes-devtools/qemu/qemu_3.0.0.bb +++ b/meta/recipes-devtools/qemu/qemu_3.0.0.bb | |||
@@ -42,6 +42,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ | |||
42 | file://CVE-2019-8934.patch \ | 42 | file://CVE-2019-8934.patch \ |
43 | file://0001-linux-user-assume-__NR_gettid-always-exists.patch \ | 43 | file://0001-linux-user-assume-__NR_gettid-always-exists.patch \ |
44 | file://0001-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch \ | 44 | file://0001-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch \ |
45 | file://0011-linux-user-remove-host-stime-syscall.patch \ | ||
45 | " | 46 | " |
46 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" | 47 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" |
47 | 48 | ||