1 files changed, 22 insertions, 40 deletions
diff --git a/recipes-containers/criu/files/0003-crit-pycriu-build-and-install-wheels.patch b/recipes-containers/criu/files/0003-crit-pycriu-build-and-install-wheels.patch
index 0796bb24..c9c4b9b9 100644
--- a/recipes-containers/criu/files/0003-crit-pycriu-build-and-install-wheels.patch
+++ b/recipes-containers/criu/files/0003-crit-pycriu-build-and-install-wheels.patch
@@ -15,38 +15,26 @@ Signed-off-by: Tim Orling <tim.orling@konsulko.com>
 lib/Makefile  | 11 +++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)
-diff --git a/crit/Makefile b/crit/Makefile
+Index: git/crit/Makefile
-index 9a856db6d..9b36f4be1 100644
+===================================================================
--- a/crit/Makefile
+--- git.orig/crit/Makefile
-+++ b/crit/Makefile
+++ git/crit/Makefile
-@@ -1,5 +1,7 @@
+@@ -8,8 +8,10 @@
- PYTHON_EXTERNALLY_MANAGED := $(shell $(PYTHON) -c 'import os, sysconfig; print(int(os.path.isfile(os.path.join(sysconfig.get_path("stdlib"), "EXTERNALLY-MANAGED"))))')
- PIP_BREAK_SYSTEM_PACKAGES := 0
-+PEP517_SOURCE_PATH := ./crit
-+PEP517_BUILD_OPTS :=
- 
- VERSION_FILE := $(if $(obj),$(addprefix $(obj)/,crit/version.py),crit/version.py)
 
-@@ -16,11 +18,13 @@ ifeq ($(PIP_BREAK_SYSTEM_PACKAGES),0)
+ install: ${VERSION_FILE}
-        $(E) "  Consider using PIP_BREAK_SYSTEM_PACKAGES=1 make install"
+ ifeq ($(SKIP_PIP_INSTALL),0)
- else
-        $(E) "  INSTALL " crit
-       $(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./crit
-+       $(Q) $(PYTHON) -m build --no-isolation --wheel --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)
- endif
- else
 +       $(E) "  BUILD " crit
 +       $(Q) $(PYTHON) -m build --no-isolation --wheel --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)
        $(E) "  INSTALL " crit
-       $(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./crit
+-       $(Q) $(PYTHON) -m pip install $(PIPFLAGS) --prefix=$(DESTDIR)$(PREFIX) ./crit
 +       $(Q) $(PYTHON) -m installer $(INSTALL_WHEEL_COMPILE_BYTECODE) --interpreter "$(USRBINPATH)/env $(PEP517_INSTALL_PYTHON)" --destdir=$(DESTDIR) $(PEP517_WHEEL_PATH)/crit-*.whl
+ else
+        $(E) " SKIP INSTALL crit"
 endif
- .PHONY: install
+Index: git/lib/Makefile
- 
+===================================================================
-diff --git a/lib/Makefile b/lib/Makefile
+--- git.orig/lib/Makefile
-index ae371e78e..b5f147482 100644
+++ git/lib/Makefile
--- a/lib/Makefile
-+++ b/lib/Makefile
 @@ -1,6 +1,9 @@
 CRIU_SO                        := libcriu.so
 CRIU_A                 := libcriu.a
@@ -57,21 +45,15 @@ index ae371e78e..b5f147482 100644
 
 all-y  += lib-c lib-a lib-py
 
-@@ -63,11 +66,15 @@ ifeq ($(PIP_BREAK_SYSTEM_PACKAGES),0)
+@@ -55,8 +58,10 @@
-        $(E) "  Consider using PIP_BREAK_SYSTEM_PACKAGES=1 make install"
+        $(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)/criu/),' lib/c/criu.pc.in > lib/c/criu.pc
- else
+        $(Q) install -m 644 lib/c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
-        $(E) "  INSTALL " pycriu
+ ifeq ($(SKIP_PIP_INSTALL),0)
-       $(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./lib
-+       $(Q) $(PYTHON) -m build --no-isolation --wheel --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)
- endif
- else
 +       $(E) "  BUILD " pycriu
 +       $(Q) $(PYTHON) -m build --no-isolation --wheel --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)
        $(E) "  INSTALL " pycriu
-       $(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./lib
+-       $(Q) $(PYTHON) -m pip install $(PIPFLAGS) --prefix=$(DESTDIR)$(PREFIX) ./lib
-+       #nativepython3 -m installer ${INSTALL_WHEEL_COMPILE_BYTECODE} --interpreter "${USRBINPATH}/env ${PEP517_INSTALL_PYTHON}" --destdir=${D} ${PEP517_WHEEL_PATH}/*.whl
+       $(Q) $(PYTHON) -m build --no-isolation --wheel --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)
-+
+ else
-+       $(Q) $(PYTHON) -m installer $(INSTALL_WHEEL_COMPILE_BYTECODE) --interpreter "$(USRBINPATH)/env $(PEP517_INSTALL_PYTHON)" --destdir=$(DESTDIR) $(PEP517_WHEEL_PATH)/pycriu-*.whl
+        $(E) " SKIP INSTALL pycriu"
 endif
- .PHONY: install
-

diff --git a/recipes-containers/criu/files/0003-crit-pycriu-build-and-install-wheels.patch b/recipes-containers/criu/files/0003-crit-pycriu-build-and-install-wheels.patch index 0796bb24..c9c4b9b9 100644 --- a/recipes-containers/criu/files/0003-crit-pycriu-build-and-install-wheels.patch +++ b/recipes-containers/criu/files/0003-crit-pycriu-build-and-install-wheels.patch
@@ -15,38 +15,26 @@ Signed-off-by: Tim Orling <tim.orling@konsulko.com>
15	lib/Makefile \| 11 +++++++++--	15	lib/Makefile \| 11 +++++++++--
16	2 files changed, 15 insertions(+), 4 deletions(-)	16	2 files changed, 15 insertions(+), 4 deletions(-)
17		17
18	diff --git a/crit/Makefile b/crit/Makefile	18	Index: git/crit/Makefile
19	index 9a856db6d..9b36f4be1 100644	19	===================================================================
20	--- a/crit/Makefile	20	--- git.orig/crit/Makefile
21	+++ b/crit/Makefile	21	+++ git/crit/Makefile
22	@@ -1,5 +1,7 @@	22	@@ -8,8 +8,10 @@
23	PYTHON_EXTERNALLY_MANAGED := $(shell $(PYTHON) -c 'import os, sysconfig; print(int(os.path.isfile(os.path.join(sysconfig.get_path("stdlib"), "EXTERNALLY-MANAGED"))))')
24	PIP_BREAK_SYSTEM_PACKAGES := 0
25	+PEP517_SOURCE_PATH := ./crit
26	+PEP517_BUILD_OPTS :=
27
28	VERSION_FILE := $(if $(obj),$(addprefix $(obj)/,crit/version.py),crit/version.py)
29		23
30	@@ -16,11 +18,13 @@ ifeq ($(PIP_BREAK_SYSTEM_PACKAGES),0)	24	install: ${VERSION_FILE}
31	$(E) " Consider using PIP_BREAK_SYSTEM_PACKAGES=1 make install"	25	ifeq ($(SKIP_PIP_INSTALL),0)
32	else
33	$(E) " INSTALL " crit
34	- $(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./crit
35	+ $(Q) $(PYTHON) -m build --no-isolation --wheel --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)
36	endif
37	else
38	+ $(E) " BUILD " crit	26	+ $(E) " BUILD " crit
39	+ $(Q) $(PYTHON) -m build --no-isolation --wheel --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)	27	+ $(Q) $(PYTHON) -m build --no-isolation --wheel --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)
40	$(E) " INSTALL " crit	28	$(E) " INSTALL " crit
41	- $(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./crit	29	- $(Q) $(PYTHON) -m pip install $(PIPFLAGS) --prefix=$(DESTDIR)$(PREFIX) ./crit
42	+ $(Q) $(PYTHON) -m installer $(INSTALL_WHEEL_COMPILE_BYTECODE) --interpreter "$(USRBINPATH)/env $(PEP517_INSTALL_PYTHON)" --destdir=$(DESTDIR) $(PEP517_WHEEL_PATH)/crit-*.whl	30	+ $(Q) $(PYTHON) -m installer $(INSTALL_WHEEL_COMPILE_BYTECODE) --interpreter "$(USRBINPATH)/env $(PEP517_INSTALL_PYTHON)" --destdir=$(DESTDIR) $(PEP517_WHEEL_PATH)/crit-*.whl
		31	else
		32	$(E) " SKIP INSTALL crit"
43	endif	33	endif
44	.PHONY: install	34	Index: git/lib/Makefile
45		35	===================================================================
46	diff --git a/lib/Makefile b/lib/Makefile	36	--- git.orig/lib/Makefile
47	index ae371e78e..b5f147482 100644	37	+++ git/lib/Makefile
48	--- a/lib/Makefile
49	+++ b/lib/Makefile
50	@@ -1,6 +1,9 @@	38	@@ -1,6 +1,9 @@
51	CRIU_SO := libcriu.so	39	CRIU_SO := libcriu.so
52	CRIU_A := libcriu.a	40	CRIU_A := libcriu.a
@@ -57,21 +45,15 @@ index ae371e78e..b5f147482 100644
57		45
58	all-y += lib-c lib-a lib-py	46	all-y += lib-c lib-a lib-py
59		47
60	@@ -63,11 +66,15 @@ ifeq ($(PIP_BREAK_SYSTEM_PACKAGES),0)	48	@@ -55,8 +58,10 @@
61	$(E) " Consider using PIP_BREAK_SYSTEM_PACKAGES=1 make install"	49	$(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)/criu/),' lib/c/criu.pc.in > lib/c/criu.pc
62	else	50	$(Q) install -m 644 lib/c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
63	$(E) " INSTALL " pycriu	51	ifeq ($(SKIP_PIP_INSTALL),0)
64	- $(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./lib
65	+ $(Q) $(PYTHON) -m build --no-isolation --wheel --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)
66	endif
67	else
68	+ $(E) " BUILD " pycriu	52	+ $(E) " BUILD " pycriu
69	+ $(Q) $(PYTHON) -m build --no-isolation --wheel --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)	53	+ $(Q) $(PYTHON) -m build --no-isolation --wheel --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)
70	$(E) " INSTALL " pycriu	54	$(E) " INSTALL " pycriu
71	- $(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./lib	55	- $(Q) $(PYTHON) -m pip install $(PIPFLAGS) --prefix=$(DESTDIR)$(PREFIX) ./lib
72	+ #nativepython3 -m installer ${INSTALL_WHEEL_COMPILE_BYTECODE} --interpreter "${USRBINPATH}/env ${PEP517_INSTALL_PYTHON}" --destdir=${D} ${PEP517_WHEEL_PATH}/*.whl	56	+ $(Q) $(PYTHON) -m build --no-isolation --wheel --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)
73	+	57	else
74	+ $(Q) $(PYTHON) -m installer $(INSTALL_WHEEL_COMPILE_BYTECODE) --interpreter "$(USRBINPATH)/env $(PEP517_INSTALL_PYTHON)" --destdir=$(DESTDIR) $(PEP517_WHEEL_PATH)/pycriu-*.whl	58	$(E) " SKIP INSTALL pycriu"
75	endif	59	endif
76	.PHONY: install
77