MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

xen, xen-tools: Update git recipe revision for gcc 13 compatibility

Browse Source 
Adds an update for the python/pygrub environment patch for the current
Xen 4.18 development tree.

Signed-off-by: Christopher Clark <christopher.w.clark@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Christopher Clark 2023-05-27 13:47:53 -07:00 committed by Bruce Ashfield
parent b6214f2445
commit d9dc99282f
3 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch Normal file
View File

@ -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)

7
recipes-extended/xen/xen-tools_git.bb
View File

@ -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_REL ?= "4.18"
XEN_BRANCH ?= "master" XEN_BRANCH ?= "master"
SRC_URI = " \ SRC_URI = " \
git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \ 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" LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"

4
recipes-extended/xen/xen_git.bb
View File

@ -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_REL ?= "4.18"
XEN_BRANCH ?= "master" XEN_BRANCH ?= "master"