1 files changed, 12 insertions, 14 deletions
diff --git a/recipes-containers/criu/files/0005-pycriu-skip-dependency-check-during-build.patch b/recipes-containers/criu/files/0005-pycriu-skip-dependency-check-during-build.patch
index 88872911..77c6c3e6 100644
--- a/recipes-containers/criu/files/0005-pycriu-skip-dependency-check-during-build.patch
+++ b/recipes-containers/criu/files/0005-pycriu-skip-dependency-check-during-build.patch
@@ -12,21 +12,19 @@ Signed-off-by: Tim Orling <tim.orling@konsulko.com>
 lib/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/lib/Makefile b/lib/Makefile
+Index: git/lib/Makefile
-index b5f147482..e3faa7a06 100644
+===================================================================
--- a/lib/Makefile
+--- git.orig/lib/Makefile
-+++ b/lib/Makefile
+++ git/lib/Makefile
-@@ -66,11 +66,11 @@ ifeq ($(PIP_BREAK_SYSTEM_PACKAGES),0)
+@@ -59,9 +59,9 @@
-        $(E) "  Consider using PIP_BREAK_SYSTEM_PACKAGES=1 make install"
+        $(Q) install -m 644 lib/c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
- else
+ ifeq ($(SKIP_PIP_INSTALL),0)
-        $(E) "  INSTALL " pycriu
-       $(Q) $(PYTHON) -m build --no-isolation --wheel --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)
-+       $(Q) $(PYTHON) -m build --no-isolation --wheel --skip-dependency-check --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)
 +       $(Q) $(PYTHON) -m build --no-isolation --wheel --skip-dependency-check --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)
        $(E) "  INSTALL " pycriu
-        #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)
- 
+       $(Q) $(PYTHON) -m build --no-isolation --wheel --skip-dependency-check --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)
+ else
+        $(E) " SKIP INSTALL pycriu"
+ endif

diff --git a/recipes-containers/criu/files/0005-pycriu-skip-dependency-check-during-build.patch b/recipes-containers/criu/files/0005-pycriu-skip-dependency-check-during-build.patch index 88872911..77c6c3e6 100644 --- a/recipes-containers/criu/files/0005-pycriu-skip-dependency-check-during-build.patch +++ b/recipes-containers/criu/files/0005-pycriu-skip-dependency-check-during-build.patch
@@ -12,21 +12,19 @@ Signed-off-by: Tim Orling <tim.orling@konsulko.com>
12	lib/Makefile \| 4 ++--	12	lib/Makefile \| 4 ++--
13	1 file changed, 2 insertions(+), 2 deletions(-)	13	1 file changed, 2 insertions(+), 2 deletions(-)
14		14
15	diff --git a/lib/Makefile b/lib/Makefile	15	Index: git/lib/Makefile
16	index b5f147482..e3faa7a06 100644	16	===================================================================
17	--- a/lib/Makefile	17	--- git.orig/lib/Makefile
18	+++ b/lib/Makefile	18	+++ git/lib/Makefile
19	@@ -66,11 +66,11 @@ ifeq ($(PIP_BREAK_SYSTEM_PACKAGES),0)	19	@@ -59,9 +59,9 @@
20	$(E) " Consider using PIP_BREAK_SYSTEM_PACKAGES=1 make install"	20	$(Q) install -m 644 lib/c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
21	else	21	ifeq ($(SKIP_PIP_INSTALL),0)
22	$(E) " INSTALL " pycriu
23	- $(Q) $(PYTHON) -m build --no-isolation --wheel --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)
24	+ $(Q) $(PYTHON) -m build --no-isolation --wheel --skip-dependency-check --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)
25	endif
26	else
27	$(E) " BUILD " pycriu	22	$(E) " BUILD " pycriu
28	- $(Q) $(PYTHON) -m build --no-isolation --wheel --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)	23	- $(Q) $(PYTHON) -m build --no-isolation --wheel --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)
29	+ $(Q) $(PYTHON) -m build --no-isolation --wheel --skip-dependency-check --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)	24	+ $(Q) $(PYTHON) -m build --no-isolation --wheel --skip-dependency-check --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)
30	$(E) " INSTALL " pycriu	25	$(E) " INSTALL " pycriu
31	#nativepython3 -m installer ${INSTALL_WHEEL_COMPILE_BYTECODE} --interpreter "${USRBINPATH}/env ${PEP517_INSTALL_PYTHON}" --destdir=${D} ${PEP517_WHEEL_PATH}/*.whl	26	- $(Q) $(PYTHON) -m build --no-isolation --wheel --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)
32		27	+ $(Q) $(PYTHON) -m build --no-isolation --wheel --skip-dependency-check --outdir $(PEP517_WHEEL_PATH) $(PEP517_SOURCE_PATH) $(PEP517_BUILD_OPTS)
		28	else
		29	$(E) " SKIP INSTALL pycriu"
		30	endif