3 files changed, 46 insertions, 6 deletions
diff --git a/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch
new file mode 100644
index 00000000..3c7a97db
--- /dev/null
+++ b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch
@@ -0,0 +1,41 @@
+diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
+index 4963bc89c6..c1c05eb421 100644
+--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
+@@ -13,14 +13,14 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLA
+ all: build
+ .PHONY: build
+ build:
+-       $(setup.py) build
+       $(setup.py) build $(DISTUTILS_BUILD_ARGS)
+ 
+ .PHONY: install
+ install: all
+        $(INSTALL_DIR) $(DESTDIR)/$(bindir)
+        $(INSTALL_DIR) $(DESTDIR)/$(LIBEXEC_BIN)
+        $(setup.py) install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
+-               --root="$(DESTDIR)" --force
+               --root="$(DESTDIR)" --force  $(DISTUTILS_INSTALL_ARGS)
+        $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(LIBEXEC_BIN)/pygrub
+        set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \
+                     "`readlink -f $(DESTDIR)/$(bindir)`" != \
+diff --git a/tools/python/Makefile b/tools/python/Makefile
+index 437431c48e..0a99c2067e 100644
+--- a/tools/python/Makefile
+++ b/tools/python/Makefile
+@@ -16,13 +16,13 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLA
+ 
+ .PHONY: build
+ build:
+-       $(setup.py) build
+       $(setup.py) build $(DISTUTILS_BUILD_ARGS)
+ 
+ .PHONY: install
+ install:
+        $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
+        $(setup.py) install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
+-               --root="$(DESTDIR)" --force
+               --root="$(DESTDIR)" --force $(DISTUTILS_INSTALL_ARGS)
+        $(INSTALL_PYTHON_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN)
+        $(INSTALL_PYTHON_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN)
+ 
diff --git a/recipes-extended/xen/xen-tools_git.bb b/recipes-extended/xen/xen-tools_git.bb
index 7557081f..a71157a4 100644
--- a/recipes-extended/xen/xen-tools_git.bb
+++ b/recipes-extended/xen/xen-tools_git.bb
@@ -1,13 +1,12 @@
-# master status on 2022-12-29
+# master status on 2023-05-26
-SRCREV ?= "7eef80e06ed2282bbcec3619d860c6aacb0515d8"
+SRCREV ?= "380c6c170393c48852d4f2b1ea97125a399cfc61"
 XEN_REL ?= "4.18"
 XEN_BRANCH ?= "master"
 SRC_URI = " \
    git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
-    file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \
+    file://0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch \
-    file://0001-tools-xenstore-xenstored_control.c-correctly-print-t.patch \
    "
 LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/xen_git.bb
index 99490061..7ed89771 100644
--- a/recipes-extended/xen/xen_git.bb
+++ b/recipes-extended/xen/xen_git.bb
@@ -1,5 +1,5 @@
-# master status on 2022-12-29
+# master status on 2023-05-26
-SRCREV ?= "e4a5fb9227889bec99ab212b839680f4d5b51e60"
+SRCREV ?= "380c6c170393c48852d4f2b1ea97125a399cfc61"
 XEN_REL ?= "4.18"
 XEN_BRANCH ?= "master"

diff --git a/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch new file mode 100644 index 00000000..3c7a97db --- /dev/null +++ b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch
@@ -0,0 +1,41 @@
		1	diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
		2	index 4963bc89c6..c1c05eb421 100644
		3	--- a/tools/pygrub/Makefile
		4	+++ b/tools/pygrub/Makefile
		5	@@ -13,14 +13,14 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLA
		6	all: build
		7	.PHONY: build
		8	build:
		9	- $(setup.py) build
		10	+ $(setup.py) build $(DISTUTILS_BUILD_ARGS)
		11
		12	.PHONY: install
		13	install: all
		14	$(INSTALL_DIR) $(DESTDIR)/$(bindir)
		15	$(INSTALL_DIR) $(DESTDIR)/$(LIBEXEC_BIN)
		16	$(setup.py) install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
		17	- --root="$(DESTDIR)" --force
		18	+ --root="$(DESTDIR)" --force $(DISTUTILS_INSTALL_ARGS)
		19	$(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(LIBEXEC_BIN)/pygrub
		20	set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \
		21	"`readlink -f $(DESTDIR)/$(bindir)`" != \
		22	diff --git a/tools/python/Makefile b/tools/python/Makefile
		23	index 437431c48e..0a99c2067e 100644
		24	--- a/tools/python/Makefile
		25	+++ b/tools/python/Makefile
		26	@@ -16,13 +16,13 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLA
		27
		28	.PHONY: build
		29	build:
		30	- $(setup.py) build
		31	+ $(setup.py) build $(DISTUTILS_BUILD_ARGS)
		32
		33	.PHONY: install
		34	install:
		35	$(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
		36	$(setup.py) install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
		37	- --root="$(DESTDIR)" --force
		38	+ --root="$(DESTDIR)" --force $(DISTUTILS_INSTALL_ARGS)
		39	$(INSTALL_PYTHON_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN)
		40	$(INSTALL_PYTHON_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN)
		41


diff --git a/recipes-extended/xen/xen-tools_git.bb b/recipes-extended/xen/xen-tools_git.bb index 7557081f..a71157a4 100644 --- a/recipes-extended/xen/xen-tools_git.bb +++ b/recipes-extended/xen/xen-tools_git.bb
@@ -1,13 +1,12 @@
1	# master status on 2022-12-29	1	# master status on 2023-05-26
2	SRCREV ?= "7eef80e06ed2282bbcec3619d860c6aacb0515d8"	2	SRCREV ?= "380c6c170393c48852d4f2b1ea97125a399cfc61"
3		3
4	XEN_REL ?= "4.18"	4	XEN_REL ?= "4.18"
5	XEN_BRANCH ?= "master"	5	XEN_BRANCH ?= "master"
6		6
7	SRC_URI = " \	7	SRC_URI = " \
8	git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \	8	git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
9	file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \	9	file://0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch \
10	file://0001-tools-xenstore-xenstored_control.c-correctly-print-t.patch \
11	"	10	"
12		11
13	LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"	12	LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"


diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/xen_git.bb index 99490061..7ed89771 100644 --- a/recipes-extended/xen/xen_git.bb +++ b/recipes-extended/xen/xen_git.bb
@@ -1,5 +1,5 @@
1	# master status on 2022-12-29	1	# master status on 2023-05-26
2	SRCREV ?= "e4a5fb9227889bec99ab212b839680f4d5b51e60"	2	SRCREV ?= "380c6c170393c48852d4f2b1ea97125a399cfc61"
3		3
4	XEN_REL ?= "4.18"	4	XEN_REL ?= "4.18"
5	XEN_BRANCH ?= "master"	5	XEN_BRANCH ?= "master"