* Re: [ptxdist] [APPLIED] host-qemu: Version bump 6.0.0 -> 6.1.0
2021-10-18 7:41 [ptxdist] [PATCH] host-qemu: Version bump 6.0.0 -> 6.1.0 Christian Melki
@ 2021-10-26 9:09 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2021-10-26 9:09 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as a24e82f64ec3fd7f008bd92521f7e8a197dd3b3c.
Michael
[sent from post-receive hook]
On Tue, 26 Oct 2021 11:09:23 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Introducing target-qemu. Rely on that for basic package definition.
> Remove corresponding lines in host-qemu.
> Remove sheepdog configuration. Driver has been removed.
>
> QEMU 6.1 changelog:
> https://wiki.qemu.org/ChangeLog/6.1
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20211018074159.3770408-1-christian.melki@t2data.com>
> [mol: update patches to new version]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/qemu-6.0.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch b/patches/qemu-6.1.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
> similarity index 91%
> rename from patches/qemu-6.0.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
> rename to patches/qemu-6.1.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
> index b4107d92ab7a..27fea636420f 100644
> --- a/patches/qemu-6.0.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
> +++ b/patches/qemu-6.1.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
> @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 1 file changed, 29 insertions(+), 15 deletions(-)
>
> diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
> -index af52c1daac85..94595b2009f8 100644
> +index 210d9e7705df..92ecfec34b1c 100644
> --- a/hw/9pfs/9p-local.c
> +++ b/hw/9pfs/9p-local.c
> -@@ -455,8 +455,7 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath *fs_path,
> +@@ -460,8 +460,7 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath *fs_path,
> {
> ssize_t tsize = -1;
>
> @@ -24,7 +24,7 @@ index af52c1daac85..94595b2009f8 100644
> int fd;
>
> fd = local_open_nofollow(fs_ctx, fs_path->data, O_RDONLY, 0);
> -@@ -468,6 +467,7 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath *fs_path,
> +@@ -473,6 +472,7 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath *fs_path,
> } while (tsize == -1 && errno == EINTR);
> close_preserve_errno(fd);
> } else if ((fs_ctx->export_flags & V9FS_SM_PASSTHROUGH) ||
> @@ -32,7 +32,7 @@ index af52c1daac85..94595b2009f8 100644
> (fs_ctx->export_flags & V9FS_SM_NONE)) {
> char *dirpath = g_path_get_dirname(fs_path->data);
> char *name = g_path_get_basename(fs_path->data);
> -@@ -479,6 +479,17 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath *fs_path,
> +@@ -484,6 +484,17 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath *fs_path,
> }
>
> tsize = readlinkat(dirfd, name, buf, bufsz);
> @@ -50,7 +50,7 @@ index af52c1daac85..94595b2009f8 100644
> close_preserve_errno(dirfd);
> out:
> g_free(name);
> -@@ -881,20 +892,23 @@ static int local_symlink(FsContext *fs_ctx, const char *oldpath,
> +@@ -886,20 +897,23 @@ static int local_symlink(FsContext *fs_ctx, const char *oldpath,
> int fd;
> ssize_t oldpath_size, write_size;
>
> diff --git a/patches/qemu-6.0.0/0002-let-ninja-use-the-jobserver.patch b/patches/qemu-6.1.0/0002-let-ninja-use-the-jobserver.patch
> similarity index 80%
> rename from patches/qemu-6.0.0/0002-let-ninja-use-the-jobserver.patch
> rename to patches/qemu-6.1.0/0002-let-ninja-use-the-jobserver.patch
> index 0ef4581ef3c2..0de2e99f3c97 100644
> --- a/patches/qemu-6.0.0/0002-let-ninja-use-the-jobserver.patch
> +++ b/patches/qemu-6.1.0/0002-let-ninja-use-the-jobserver.patch
> @@ -11,11 +11,11 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> -index bcbbec71a1cb..3868d7638e46 100644
> +index 401c623a65f8..36a0557d2aa8 100644
> --- a/Makefile
> +++ b/Makefile
> -@@ -132,7 +132,7 @@ MAKE.k = $(findstring k,$(firstword $(MAKEFLAGS)))
> - MAKE.q = $(findstring q,$(firstword $(MAKEFLAGS)))
> +@@ -136,7 +136,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out --%,$(MAKEFLAGS))))
> + MAKE.q = $(findstring q,$(firstword $(filter-out --%,$(MAKEFLAGS))))
> MAKE.nq = $(if $(word 2, $(MAKE.n) $(MAKE.q)),nq)
> NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \
> - $(filter-out -j, $(lastword -j1 $(filter -l% -j%, $(MAKEFLAGS)))) \
> diff --git a/patches/qemu-6.0.0/series b/patches/qemu-6.1.0/series
> similarity index 100%
> rename from patches/qemu-6.0.0/series
> rename to patches/qemu-6.1.0/series
> diff --git a/rules/host-qemu.make b/rules/host-qemu.make
> index 29dcd0c07040..885e76ba9e28 100644
> --- a/rules/host-qemu.make
> +++ b/rules/host-qemu.make
> @@ -13,19 +13,6 @@
> #
> HOST_PACKAGES-$(PTXCONF_HOST_QEMU) += host-qemu
>
> -#
> -# Paths and names
> -#
> -HOST_QEMU_VERSION := 6.0.0
> -HOST_QEMU_MD5 := cce185dc0119546e395909e8a71a75bb
> -HOST_QEMU := qemu-$(HOST_QEMU_VERSION)
> -HOST_QEMU_SUFFIX := tar.xz
> -HOST_QEMU_URL := https://download.qemu.org/$(HOST_QEMU).$(HOST_QEMU_SUFFIX)
> -HOST_QEMU_SOURCE := $(SRCDIR)/$(HOST_QEMU).$(HOST_QEMU_SUFFIX)
> -HOST_QEMU_DIR := $(HOST_BUILDDIR)/$(HOST_QEMU)
> -HOST_QEMU_LICENSE := GPL-2.0-only AND GPL-2.0-or-later AND MIT AND BSD-1-Clause AND BSD-2-Clause AND BSD-3-Clause
> -HOST_QEMU_BUILD_OOT := YES
> -
> # ----------------------------------------------------------------------------
> # Prepare
> # ----------------------------------------------------------------------------
> @@ -177,7 +164,6 @@ HOST_QEMU_CONF_OPT := \
> --disable-vvfat \
> --disable-qed \
> --disable-parallels \
> - --disable-sheepdog \
> --disable-crypto-afalg \
> --disable-capstone \
> --disable-debug-mutex \
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread