* [gentoo-commits] proj/xen-gentoo-patches:4.15 commit in: /
@ 2022-07-06 18:37 Florian Schmaus
0 siblings, 0 replies; 3+ messages in thread
From: Florian Schmaus @ 2022-07-06 18:37 UTC (permalink / raw
To: gentoo-commits
commit: f3b3d8e3ea5e5c5bce0d87def9f731fd4ca37787
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 6 18:36:15 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Jul 6 18:36:15 2022 +0000
URL: https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/commit/?id=f3b3d8e3
Gentoo specific patches for 4.15.3 (or later)
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
xen-tools-4.16.0-xenstat.patch | 51 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/xen-tools-4.16.0-xenstat.patch b/xen-tools-4.16.0-xenstat.patch
new file mode 100644
index 0000000..c47b3dc
--- /dev/null
+++ b/xen-tools-4.16.0-xenstat.patch
@@ -0,0 +1,51 @@
+diff --git a/tools/libs/stat/Makefile b/tools/libs/stat/Makefile
+index c99508ae..b54b700c 100644
+--- a/tools/libs/stat/Makefile
++++ b/tools/libs/stat/Makefile
+@@ -51,23 +51,23 @@ install-bindings: install-perl-bindings install-python-bindings
+ .PHONY: uninstall-bindings
+ uninstall-bindings: uninstall-perl-bindings uninstall-python-bindings
+
+-$(BINDINGS): $(SHLIB) $(SHLIB_LINKS) include/xenstat.h
++$(BINDINGS): $(SHLIB) $(SHLIB_LINKS) ../../include/xenstat.h
+
+-SWIG_FLAGS=-module xenstat -Iinclude -I.
++SWIG_FLAGS=-module xenstat -Iinclude -I. -I../../include/
+
+ # Python bindings
+-PYTHON_VERSION=$(PYTHON:python%=%)
+-PYTHON_FLAGS=-I/usr/include/python$(PYTHON_VERSION) -lpython$(PYTHON_VERSION)
++PYTHON_FLAGS=`$(PYTHON) -c 'import distutils.sysconfig; print("-I" + distutils.sysconfig.get_python_inc(True) + " " + distutils.sysconfig.get_config_var("BLDLIBRARY"))'`
++PYTHON_FLAGS+=-Wno-error=missing-prototypes -fPIC -lxenstat
+ $(PYMOD): $(PYSRC)
+ $(PYSRC): bindings/swig/xenstat.i
+ swig -python $(SWIG_FLAGS) -outdir $(@D) -o $(PYSRC) $<
+
+ $(PYLIB): $(PYSRC)
+- $(CC) $(CFLAGS) $(LDFLAGS) $(PYTHON_FLAGS) $(SHLIB_LDFLAGS) -lxenstat -o $@ $< $(APPEND_LDFLAGS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(PYTHON_FLAGS) $(SHLIB_LDFLAGS) -o $@ $< $(SHLIB) $(LDLIBS-y) $(APPEND_LDFLAGS)
+
+ python-bindings: $(PYLIB) $(PYMOD)
+
+-pythonlibdir=$(prefix)/lib/python$(PYTHON_VERSION)/site-packages
++pythonlibdir=`$(PYTHON) -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())'`
+ install-python-bindings: $(PYLIB) $(PYMOD)
+ $(INSTALL_PROG) $(PYLIB) $(DESTDIR)$(pythonlibdir)/_xenstat.so
+ $(INSTALL_PROG) $(PYMOD) $(DESTDIR)$(pythonlibdir)/xenstat.py
+@@ -91,13 +91,14 @@ $(PERLSRC): bindings/swig/xenstat.i
+ swig -perl $(SWIG_FLAGS) -outdir $(@D) -o $(PERLSRC) $<
+
+ $(PERLLIB): $(PERLSRC)
+- $(CC) $(CFLAGS) $(LDFLAGS) $(PERL_FLAGS) $(SHLIB_LDFLAGS) -lxenstat -o $@ $< $(APPEND_LDFLAGS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(PERL_FLAGS) $(SHLIB_LDFLAGS) -o $@ $< $(SHLIB) $(LDLIBS-y) $(APPEND_LDFLAGS)
++
+
+ .PHONY: perl-bindings
+ perl-bindings: $(PERLLIB) $(PERLMOD)
+
+ .PHONY: install-perl-bindings
+-perllibdir=$(prefix)/lib/perl5
++perllibdir=$(prefix)/$(libdir)/perl5
+ perlmoddir=$(prefix)/share/perl5
+ install-perl-bindings: $(PERLLIB) $(PERLMOD)
+ $(INSTALL_PROG) $(PERLLIB) $(DESTDIR)$(perllibdir)/xenstat.so
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/xen-gentoo-patches:4.15 commit in: /
@ 2022-07-06 18:02 Florian Schmaus
0 siblings, 0 replies; 3+ messages in thread
From: Florian Schmaus @ 2022-07-06 18:02 UTC (permalink / raw
To: gentoo-commits
commit: 99a6c694280cfc66a7f15a2668ad8784c0baacb3
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 6 18:01:46 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Jul 6 18:01:46 2022 +0000
URL: https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/commit/?id=99a6c694
Gentoo specific patches for 4.15.3 (or later)
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
xen-tools-4.16.0-xenstat.patch | 51 ------------------------------------------
1 file changed, 51 deletions(-)
diff --git a/xen-tools-4.16.0-xenstat.patch b/xen-tools-4.16.0-xenstat.patch
deleted file mode 100644
index c47b3dc..0000000
--- a/xen-tools-4.16.0-xenstat.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/tools/libs/stat/Makefile b/tools/libs/stat/Makefile
-index c99508ae..b54b700c 100644
---- a/tools/libs/stat/Makefile
-+++ b/tools/libs/stat/Makefile
-@@ -51,23 +51,23 @@ install-bindings: install-perl-bindings install-python-bindings
- .PHONY: uninstall-bindings
- uninstall-bindings: uninstall-perl-bindings uninstall-python-bindings
-
--$(BINDINGS): $(SHLIB) $(SHLIB_LINKS) include/xenstat.h
-+$(BINDINGS): $(SHLIB) $(SHLIB_LINKS) ../../include/xenstat.h
-
--SWIG_FLAGS=-module xenstat -Iinclude -I.
-+SWIG_FLAGS=-module xenstat -Iinclude -I. -I../../include/
-
- # Python bindings
--PYTHON_VERSION=$(PYTHON:python%=%)
--PYTHON_FLAGS=-I/usr/include/python$(PYTHON_VERSION) -lpython$(PYTHON_VERSION)
-+PYTHON_FLAGS=`$(PYTHON) -c 'import distutils.sysconfig; print("-I" + distutils.sysconfig.get_python_inc(True) + " " + distutils.sysconfig.get_config_var("BLDLIBRARY"))'`
-+PYTHON_FLAGS+=-Wno-error=missing-prototypes -fPIC -lxenstat
- $(PYMOD): $(PYSRC)
- $(PYSRC): bindings/swig/xenstat.i
- swig -python $(SWIG_FLAGS) -outdir $(@D) -o $(PYSRC) $<
-
- $(PYLIB): $(PYSRC)
-- $(CC) $(CFLAGS) $(LDFLAGS) $(PYTHON_FLAGS) $(SHLIB_LDFLAGS) -lxenstat -o $@ $< $(APPEND_LDFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(PYTHON_FLAGS) $(SHLIB_LDFLAGS) -o $@ $< $(SHLIB) $(LDLIBS-y) $(APPEND_LDFLAGS)
-
- python-bindings: $(PYLIB) $(PYMOD)
-
--pythonlibdir=$(prefix)/lib/python$(PYTHON_VERSION)/site-packages
-+pythonlibdir=`$(PYTHON) -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())'`
- install-python-bindings: $(PYLIB) $(PYMOD)
- $(INSTALL_PROG) $(PYLIB) $(DESTDIR)$(pythonlibdir)/_xenstat.so
- $(INSTALL_PROG) $(PYMOD) $(DESTDIR)$(pythonlibdir)/xenstat.py
-@@ -91,13 +91,14 @@ $(PERLSRC): bindings/swig/xenstat.i
- swig -perl $(SWIG_FLAGS) -outdir $(@D) -o $(PERLSRC) $<
-
- $(PERLLIB): $(PERLSRC)
-- $(CC) $(CFLAGS) $(LDFLAGS) $(PERL_FLAGS) $(SHLIB_LDFLAGS) -lxenstat -o $@ $< $(APPEND_LDFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(PERL_FLAGS) $(SHLIB_LDFLAGS) -o $@ $< $(SHLIB) $(LDLIBS-y) $(APPEND_LDFLAGS)
-+
-
- .PHONY: perl-bindings
- perl-bindings: $(PERLLIB) $(PERLMOD)
-
- .PHONY: install-perl-bindings
--perllibdir=$(prefix)/lib/perl5
-+perllibdir=$(prefix)/$(libdir)/perl5
- perlmoddir=$(prefix)/share/perl5
- install-perl-bindings: $(PERLLIB) $(PERLMOD)
- $(INSTALL_PROG) $(PERLLIB) $(DESTDIR)$(perllibdir)/xenstat.so
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/xen-gentoo-patches:4.15 commit in: /
@ 2022-07-06 17:55 Florian Schmaus
0 siblings, 0 replies; 3+ messages in thread
From: Florian Schmaus @ 2022-07-06 17:55 UTC (permalink / raw
To: gentoo-commits
commit: e45a57f08893a593681571c93af8e4f68b6dc97c
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 6 17:55:33 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> 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 <flow <AT> 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:
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-06 18:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-06 18:37 [gentoo-commits] proj/xen-gentoo-patches:4.15 commit in: / Florian Schmaus
-- strict thread matches above, loose matches on Subject: below --
2022-07-06 18:02 Florian Schmaus
2022-07-06 17:55 Florian Schmaus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox