From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2F5C7158094 for ; Wed, 6 Jul 2022 17:55:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE837E0A43; Wed, 6 Jul 2022 17:55:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A6791E0A02 for ; Wed, 6 Jul 2022 17:55:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B49C7341600 for ; Wed, 6 Jul 2022 17:55:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 136A14ED for ; Wed, 6 Jul 2022 17:55:40 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1657130133.e45a57f08893a593681571c93af8e4f68b6dc97c.flow@gentoo> Subject: [gentoo-commits] proj/xen-gentoo-patches:4.15 commit in: / X-VCS-Repository: proj/xen-gentoo-patches X-VCS-Files: xen-tools-4-qemu-fix-po-collision.patch xen-tools-4.16.0-qemu-bridge.patch X-VCS-Directories: / X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: e45a57f08893a593681571c93af8e4f68b6dc97c X-VCS-Branch: 4.15 Date: Wed, 6 Jul 2022 17:55:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 04722ca6-a806-42b6-af6b-bdc67a98cf50 X-Archives-Hash: fe28840b29a3dab387b15672ca3cc740 commit: e45a57f08893a593681571c93af8e4f68b6dc97c Author: Florian Schmaus gentoo org> AuthorDate: Wed Jul 6 17:55:33 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Wed Jul 6 17:55:33 2022 +0000 URL: https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/commit/?id=e45a57f0 Gentoo specific patches for 4.15.3 (or later) Signed-off-by: Florian Schmaus gentoo.org> xen-tools-4-qemu-fix-po-collision.patch | 26 +++++++++++++ xen-tools-4.16.0-qemu-bridge.patch | 69 --------------------------------- 2 files changed, 26 insertions(+), 69 deletions(-) diff --git a/xen-tools-4-qemu-fix-po-collision.patch b/xen-tools-4-qemu-fix-po-collision.patch new file mode 100644 index 0000000..9304768 --- /dev/null +++ b/xen-tools-4-qemu-fix-po-collision.patch @@ -0,0 +1,26 @@ +diff --git a/tools/qemu-xen/po/Makefile b/tools/qemu-xen/po/Makefile +index 705166e..2e7cdcb 100644 +--- a/tools/qemu-xen/po/Makefile ++++ b/tools/qemu-xen/po/Makefile +@@ -30,7 +30,7 @@ install: $(OBJS) + for obj in $(OBJS); do \ + base=`basename $$obj .mo`; \ + $(INSTALL) -d $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES; \ +- $(INSTALL) -m644 $$obj $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES/qemu.mo; \ ++ $(INSTALL) -m644 $$obj $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES/xenqemu.mo; \ + done + + %.mo: %.po +diff --git a/tools/qemu-xen/ui/gtk.c b/tools/qemu-xen/ui/gtk.c +index c38146f..d3c331b 100644 +--- a/tools/qemu-xen/ui/gtk.c ++++ b/tools/qemu-xen/ui/gtk.c +@@ -31,7 +31,7 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +-#define GETTEXT_PACKAGE "qemu" ++#define GETTEXT_PACKAGE "xenqemu" + #define LOCALEDIR "po" + + #include "qemu-common.h" diff --git a/xen-tools-4.16.0-qemu-bridge.patch b/xen-tools-4.16.0-qemu-bridge.patch deleted file mode 100644 index 886be18..0000000 --- a/xen-tools-4.16.0-qemu-bridge.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/tools/qemu-xen/include/net/net.h b/tools/qemu-xen/include/net/net.h -index 5d150808..1de01433 100644 ---- a/tools/qemu-xen/include/net/net.h -+++ b/tools/qemu-xen/include/net/net.h -@@ -221,7 +221,7 @@ NetClientState *net_hub_port_find(int hub_id); - - #define DEFAULT_NETWORK_SCRIPT CONFIG_SYSCONFDIR "/qemu-ifup" - #define DEFAULT_NETWORK_DOWN_SCRIPT CONFIG_SYSCONFDIR "/qemu-ifdown" --#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper" -+#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/xen-bridge-helper" - #define DEFAULT_BRIDGE_INTERFACE "br0" - - void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd); -diff --git a/tools/qemu-xen/meson.build b/tools/qemu-xen/meson.build -index b3e7ec0e..9cd36a43 100644 ---- a/tools/qemu-xen/meson.build -+++ b/tools/qemu-xen/meson.build -@@ -2759,7 +2759,7 @@ if have_tools - endif - - if targetos == 'linux' -- executable('qemu-bridge-helper', files('qemu-bridge-helper.c'), -+ executable('xen-bridge-helper', files('xen-bridge-helper.c'), - dependencies: [qemuutil, libcap_ng], - install: true, - install_dir: get_option('libexecdir')) -diff --git a/tools/qemu-xen/qemu-bridge-helper.c b/tools/qemu-xen/qemu-bridge-helper.c -index a26e1663..8abc0e74 100644 ---- a/tools/qemu-xen/qemu-bridge-helper.c -+++ b/tools/qemu-xen/qemu-bridge-helper.c -@@ -68,7 +68,7 @@ typedef QSIMPLEQ_HEAD(ACLList, ACLRule) ACLList; - static void usage(void) - { - fprintf(stderr, -- "Usage: qemu-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n"); -+ "Usage: xen-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n"); - } - - static int parse_acl_file(const char *filename, ACLList *acl_list) -diff --git a/tools/qemu-xen/qemu-options.hx b/tools/qemu-xen/qemu-options.hx -index 83aa59a9..87a898bd 100644 ---- a/tools/qemu-xen/qemu-options.hx -+++ b/tools/qemu-xen/qemu-options.hx -@@ -2910,7 +2910,7 @@ SRST - If running QEMU as an unprivileged user, use the network helper - to configure the TAP interface and attach it to the bridge. - The default network helper executable is -- ``/path/to/qemu-bridge-helper`` and the default bridge device is -+ ``/path/to/xen-bridge-helper`` and the default bridge device is - ``br0``. - - ``fd``\ =h can be used to specify the handle of an already opened -@@ -2936,14 +2936,14 @@ SRST - #launch a QEMU instance with the default network helper to - #connect a TAP device to bridge br0 - |qemu_system| linux.img -device virtio-net-pci,netdev=n1 \\ -- -netdev tap,id=n1,"helper=/path/to/qemu-bridge-helper" -+ -netdev tap,id=n1,"helper=/path/to/xen-bridge-helper" - - ``-netdev bridge,id=id[,br=bridge][,helper=helper]`` - Connect a host TAP network interface to a host bridge device. - - Use the network helper helper to configure the TAP interface and - attach it to the bridge. The default network helper executable is -- ``/path/to/qemu-bridge-helper`` and the default bridge device is -+ ``/path/to/xen-bridge-helper`` and the default bridge device is - ``br0``. - - Examples: From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B9FB7158094 for ; Wed, 6 Jul 2022 17:55:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA16CE0A02; Wed, 6 Jul 2022 17:55:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B2DC6E0A43 for ; Wed, 6 Jul 2022 17:55:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9CAD43415FE for ; Wed, 6 Jul 2022 17:55:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 279C751C for ; Wed, 6 Jul 2022 17:55:40 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1657130133.e45a57f08893a593681571c93af8e4f68b6dc97c.flow@gentoo> Subject: [gentoo-commits] proj/xen-gentoo-patches:4.15.3-gentoo-patchset-0 commit in: / X-VCS-Repository: proj/xen-gentoo-patches X-VCS-Files: xen-tools-4-qemu-fix-po-collision.patch xen-tools-4.16.0-qemu-bridge.patch X-VCS-Directories: / X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: e45a57f08893a593681571c93af8e4f68b6dc97c X-VCS-Branch: 4.15.3-gentoo-patchset-0 Date: Wed, 6 Jul 2022 17:55:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a25f64cd-3241-43f5-a416-934fdcb9923d X-Archives-Hash: 2dc8e0c792e3d478577407c9f7a3ed6c Message-ID: <20220706175540.Zo3ubYXVHj3Wn3iwIixo9bq6HpO4Naru2BAbC1V9BHE@z> commit: e45a57f08893a593681571c93af8e4f68b6dc97c Author: Florian Schmaus gentoo org> AuthorDate: Wed Jul 6 17:55:33 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Wed Jul 6 17:55:33 2022 +0000 URL: https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/commit/?id=e45a57f0 Gentoo specific patches for 4.15.3 (or later) Signed-off-by: Florian Schmaus gentoo.org> xen-tools-4-qemu-fix-po-collision.patch | 26 +++++++++++++ xen-tools-4.16.0-qemu-bridge.patch | 69 --------------------------------- 2 files changed, 26 insertions(+), 69 deletions(-) diff --git a/xen-tools-4-qemu-fix-po-collision.patch b/xen-tools-4-qemu-fix-po-collision.patch new file mode 100644 index 0000000..9304768 --- /dev/null +++ b/xen-tools-4-qemu-fix-po-collision.patch @@ -0,0 +1,26 @@ +diff --git a/tools/qemu-xen/po/Makefile b/tools/qemu-xen/po/Makefile +index 705166e..2e7cdcb 100644 +--- a/tools/qemu-xen/po/Makefile ++++ b/tools/qemu-xen/po/Makefile +@@ -30,7 +30,7 @@ install: $(OBJS) + for obj in $(OBJS); do \ + base=`basename $$obj .mo`; \ + $(INSTALL) -d $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES; \ +- $(INSTALL) -m644 $$obj $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES/qemu.mo; \ ++ $(INSTALL) -m644 $$obj $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES/xenqemu.mo; \ + done + + %.mo: %.po +diff --git a/tools/qemu-xen/ui/gtk.c b/tools/qemu-xen/ui/gtk.c +index c38146f..d3c331b 100644 +--- a/tools/qemu-xen/ui/gtk.c ++++ b/tools/qemu-xen/ui/gtk.c +@@ -31,7 +31,7 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +-#define GETTEXT_PACKAGE "qemu" ++#define GETTEXT_PACKAGE "xenqemu" + #define LOCALEDIR "po" + + #include "qemu-common.h" diff --git a/xen-tools-4.16.0-qemu-bridge.patch b/xen-tools-4.16.0-qemu-bridge.patch deleted file mode 100644 index 886be18..0000000 --- a/xen-tools-4.16.0-qemu-bridge.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/tools/qemu-xen/include/net/net.h b/tools/qemu-xen/include/net/net.h -index 5d150808..1de01433 100644 ---- a/tools/qemu-xen/include/net/net.h -+++ b/tools/qemu-xen/include/net/net.h -@@ -221,7 +221,7 @@ NetClientState *net_hub_port_find(int hub_id); - - #define DEFAULT_NETWORK_SCRIPT CONFIG_SYSCONFDIR "/qemu-ifup" - #define DEFAULT_NETWORK_DOWN_SCRIPT CONFIG_SYSCONFDIR "/qemu-ifdown" --#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper" -+#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/xen-bridge-helper" - #define DEFAULT_BRIDGE_INTERFACE "br0" - - void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd); -diff --git a/tools/qemu-xen/meson.build b/tools/qemu-xen/meson.build -index b3e7ec0e..9cd36a43 100644 ---- a/tools/qemu-xen/meson.build -+++ b/tools/qemu-xen/meson.build -@@ -2759,7 +2759,7 @@ if have_tools - endif - - if targetos == 'linux' -- executable('qemu-bridge-helper', files('qemu-bridge-helper.c'), -+ executable('xen-bridge-helper', files('xen-bridge-helper.c'), - dependencies: [qemuutil, libcap_ng], - install: true, - install_dir: get_option('libexecdir')) -diff --git a/tools/qemu-xen/qemu-bridge-helper.c b/tools/qemu-xen/qemu-bridge-helper.c -index a26e1663..8abc0e74 100644 ---- a/tools/qemu-xen/qemu-bridge-helper.c -+++ b/tools/qemu-xen/qemu-bridge-helper.c -@@ -68,7 +68,7 @@ typedef QSIMPLEQ_HEAD(ACLList, ACLRule) ACLList; - static void usage(void) - { - fprintf(stderr, -- "Usage: qemu-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n"); -+ "Usage: xen-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n"); - } - - static int parse_acl_file(const char *filename, ACLList *acl_list) -diff --git a/tools/qemu-xen/qemu-options.hx b/tools/qemu-xen/qemu-options.hx -index 83aa59a9..87a898bd 100644 ---- a/tools/qemu-xen/qemu-options.hx -+++ b/tools/qemu-xen/qemu-options.hx -@@ -2910,7 +2910,7 @@ SRST - If running QEMU as an unprivileged user, use the network helper - to configure the TAP interface and attach it to the bridge. - The default network helper executable is -- ``/path/to/qemu-bridge-helper`` and the default bridge device is -+ ``/path/to/xen-bridge-helper`` and the default bridge device is - ``br0``. - - ``fd``\ =h can be used to specify the handle of an already opened -@@ -2936,14 +2936,14 @@ SRST - #launch a QEMU instance with the default network helper to - #connect a TAP device to bridge br0 - |qemu_system| linux.img -device virtio-net-pci,netdev=n1 \\ -- -netdev tap,id=n1,"helper=/path/to/qemu-bridge-helper" -+ -netdev tap,id=n1,"helper=/path/to/xen-bridge-helper" - - ``-netdev bridge,id=id[,br=bridge][,helper=helper]`` - Connect a host TAP network interface to a host bridge device. - - Use the network helper helper to configure the TAP interface and - attach it to the bridge. The default network helper executable is -- ``/path/to/qemu-bridge-helper`` and the default bridge device is -+ ``/path/to/xen-bridge-helper`` and the default bridge device is - ``br0``. - - Examples: