diff options
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/qemu-7.0.0/0001-common-user-Only-compile-the-common-user-code-if-hav.patch | 32 | ||||
| -rw-r--r-- | patches/qemu-7.1.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch (renamed from patches/qemu-7.0.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch) | 0 | ||||
| -rw-r--r-- | patches/qemu-7.1.0/0101-let-ninja-use-the-jobserver.patch (renamed from patches/qemu-7.0.0/0101-let-ninja-use-the-jobserver.patch) | 4 | ||||
| -rw-r--r-- | patches/qemu-7.1.0/series (renamed from patches/qemu-7.0.0/series) | 3 |
4 files changed, 3 insertions, 36 deletions
diff --git a/patches/qemu-7.0.0/0001-common-user-Only-compile-the-common-user-code-if-hav.patch b/patches/qemu-7.0.0/0001-common-user-Only-compile-the-common-user-code-if-hav.patch deleted file mode 100644 index 50e73f714..000000000 --- a/patches/qemu-7.0.0/0001-common-user-Only-compile-the-common-user-code-if-hav.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Thomas Huth <thuth@redhat.com> -Date: Wed, 22 Jun 2022 16:03:28 +0200 -Subject: [PATCH] common-user: Only compile the common user code if have_user - is set - -There is no need to waste cycles here if we only compile the system -binaries or tools. Additionally, this change is even a hard requirement -for building the tools on systems that do not have an entry in the -common-user/host/ folder (since common-user/meson.build is trying -to add such a path via the include_directories() command). - -Reported-by: Michael Tokarev <mjt@tls.msk.ru> -Signed-off-by: Thomas Huth <thuth@redhat.com> -Reviewed-by: Zhang Chen <chen.zhang@intel.com> -Message-Id: <20220622140328.383961-1-thuth@redhat.com> -Signed-off-by: Laurent Vivier <laurent@vivier.eu> ---- - common-user/meson.build | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/common-user/meson.build b/common-user/meson.build -index 26212dda5c7a..ac9de5b9e3f5 100644 ---- a/common-user/meson.build -+++ b/common-user/meson.build -@@ -1,3 +1,7 @@ -+if not have_user -+ subdir_done() -+endif -+ - common_user_inc += include_directories('host/' / host_arch) - - user_ss.add(files( diff --git a/patches/qemu-7.0.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch b/patches/qemu-7.1.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch index 6299ba1f6..6299ba1f6 100644 --- a/patches/qemu-7.0.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch +++ b/patches/qemu-7.1.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch diff --git a/patches/qemu-7.0.0/0101-let-ninja-use-the-jobserver.patch b/patches/qemu-7.1.0/0101-let-ninja-use-the-jobserver.patch index 14559418f..d54558a93 100644 --- a/patches/qemu-7.0.0/0101-let-ninja-use-the-jobserver.patch +++ b/patches/qemu-7.1.0/0101-let-ninja-use-the-jobserver.patch @@ -20,6 +20,6 @@ index e5fd1ebdf619..23128172d02a 100644 NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \ - $(filter-out -j, $(lastword -j1 $(filter -l% -j%, $(MAKEFLAGS)))) \ + $(filter-out -j, $(lastword $(filter -l% -j%, $(MAKEFLAGS)))) \ - + -d keepdepfile ninja-cmd-goals = $(or $(MAKECMDGOALS), all) - ninja-cmd-goals += $(foreach t, $(.check.build-suites), $(.check-$t.deps)) + ninja-cmd-goals += $(foreach g, $(MAKECMDGOALS), $(.ninja-goals.$g)))) diff --git a/patches/qemu-7.0.0/series b/patches/qemu-7.1.0/series index 4b1e373cf..ec7952135 100644 --- a/patches/qemu-7.0.0/series +++ b/patches/qemu-7.1.0/series @@ -1,8 +1,7 @@ # generated by git-ptx-patches #tag:base --start-number 1 #tag:upstream --start-number 1 -0001-common-user-Only-compile-the-common-user-code-if-hav.patch #tag:ptxdist --start-number 100 0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch 0101-let-ninja-use-the-jobserver.patch -# c72c8a5f60a89d87f9a2f2626984b5e1 - git-ptx-patches magic +# d0eda0596eed74d4819c34cafa02bf39 - git-ptx-patches magic |