!92 chore: support building without network
From: @weidongkl Reviewed-by: @snoweay Signed-off-by: @snoweay
This commit is contained in:
commit
494fd8aa67
57
0003-chore-support-building-without-network.patch
Normal file
57
0003-chore-support-building-without-network.patch
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
From 8b4b9f9020658554562665f78e019b897ff80647 Mon Sep 17 00:00:00 2001
|
||||||
|
From: weidongkl <weidong@uniontech.com>
|
||||||
|
Date: Thu, 5 Dec 2024 10:56:26 +0800
|
||||||
|
Subject: [PATCH] chore: support building without network
|
||||||
|
|
||||||
|
Signed-off-by: weidongkl <weidong@uniontech.com>
|
||||||
|
---
|
||||||
|
crit/Makefile | 8 ++++++--
|
||||||
|
lib/Makefile | 5 ++---
|
||||||
|
2 files changed, 8 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/crit/Makefile b/crit/Makefile
|
||||||
|
index 9a856db..34f1359 100644
|
||||||
|
--- a/crit/Makefile
|
||||||
|
+++ b/crit/Makefile
|
||||||
|
@@ -16,11 +16,15 @@ ifeq ($(PIP_BREAK_SYSTEM_PACKAGES),0)
|
||||||
|
$(E) " Consider using PIP_BREAK_SYSTEM_PACKAGES=1 make install"
|
||||||
|
else
|
||||||
|
$(E) " INSTALL " crit
|
||||||
|
- $(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./crit
|
||||||
|
+ #$(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./crit
|
||||||
|
+ $(Q) cd crit;$(PYTHON) setup.py install --root $(DESTDIR)
|
||||||
|
+
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
$(E) " INSTALL " crit
|
||||||
|
- $(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./crit
|
||||||
|
+ #$(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./crit
|
||||||
|
+ $(Q) cd crit;$(PYTHON) setup.py install --root $(DESTDIR)
|
||||||
|
+
|
||||||
|
endif
|
||||||
|
.PHONY: install
|
||||||
|
|
||||||
|
diff --git a/lib/Makefile b/lib/Makefile
|
||||||
|
index ae371e7..7fdd5b8 100644
|
||||||
|
--- a/lib/Makefile
|
||||||
|
+++ b/lib/Makefile
|
||||||
|
@@ -60,14 +60,13 @@ install: lib-c lib-a lib-py lib/c/criu.pc.in
|
||||||
|
ifeq ($(PYTHON_EXTERNALLY_MANAGED),1)
|
||||||
|
ifeq ($(PIP_BREAK_SYSTEM_PACKAGES),0)
|
||||||
|
$(E) " SKIP INSTALL pycriu: Externally managed python environment (See PEP 668 for more information)"
|
||||||
|
- $(E) " Consider using PIP_BREAK_SYSTEM_PACKAGES=1 make install"
|
||||||
|
else
|
||||||
|
$(E) " INSTALL " pycriu
|
||||||
|
- $(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./lib
|
||||||
|
+ $(Q) cd lib;$(PYTHON) setup.py install --root $(DESTDIR)
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
$(E) " INSTALL " pycriu
|
||||||
|
- $(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./lib
|
||||||
|
+ $(Q) cd lib;$(PYTHON) setup.py install --root $(DESTDIR)
|
||||||
|
endif
|
||||||
|
.PHONY: install
|
||||||
|
|
||||||
|
--
|
||||||
|
2.46.0
|
||||||
|
|
||||||
10
criu.spec
10
criu.spec
@ -1,6 +1,6 @@
|
|||||||
Name: criu
|
Name: criu
|
||||||
Version: 3.19
|
Version: 3.19
|
||||||
Release: 1
|
Release: 2
|
||||||
Provides: crtools = %{version}-%{release}
|
Provides: crtools = %{version}-%{release}
|
||||||
Obsoletes: crtools <= 1.0-2
|
Obsoletes: crtools <= 1.0-2
|
||||||
Summary: A tool of Checkpoint/Restore in User-space
|
Summary: A tool of Checkpoint/Restore in User-space
|
||||||
@ -17,6 +17,7 @@ Provides: %{name}-libs = %{version}-%{release}
|
|||||||
Obsoletes: %{name}-libs < %{version}-%{release}
|
Obsoletes: %{name}-libs < %{version}-%{release}
|
||||||
|
|
||||||
Patch1: 0001-criu-dump-and-restore-cpu-affinity-of-each-thread.patch
|
Patch1: 0001-criu-dump-and-restore-cpu-affinity-of-each-thread.patch
|
||||||
|
Patch2: 0003-chore-support-building-without-network.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Checkpoint/Restore in Userspace(CRIU),is a software tool for the linux operating system.
|
Checkpoint/Restore in Userspace(CRIU),is a software tool for the linux operating system.
|
||||||
@ -86,11 +87,11 @@ chmod 0755 %{buildroot}/run/%{name}/
|
|||||||
%exclude %{_libdir}/libcriu.a
|
%exclude %{_libdir}/libcriu.a
|
||||||
|
|
||||||
%files -n python3-criu
|
%files -n python3-criu
|
||||||
%{python3_sitelib}/{pycriu*/*,*egg-info}
|
%{python3_sitelib}/{pycriu,pycriu-*egg-info}
|
||||||
|
|
||||||
%files -n crit
|
%files -n crit
|
||||||
%{_bindir}/crit
|
%{_bindir}/crit
|
||||||
%{python3_sitelib}/crit-%{version}.dist-info/
|
%{python3_sitelib}/crit-%{version}-*egg-info/
|
||||||
%{python3_sitelib}/crit
|
%{python3_sitelib}/crit
|
||||||
|
|
||||||
%files -n criu-ns
|
%files -n criu-ns
|
||||||
@ -102,6 +103,9 @@ chmod 0755 %{buildroot}/run/%{name}/
|
|||||||
%doc %{_mandir}/man1/{compel.1*,crit.1*,criu-ns.1*,criu-amdgpu-plugin.1*}
|
%doc %{_mandir}/man1/{compel.1*,crit.1*,criu-ns.1*,criu-amdgpu-plugin.1*}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Dec 05 2024 weidongkl <weidong@uniontech.com> - 3.19-2
|
||||||
|
- chore: support building without network
|
||||||
|
|
||||||
* Thu Apr 25 2024 snoweay <snoweay@163.com> - 3.19-1
|
* Thu Apr 25 2024 snoweay <snoweay@163.com> - 3.19-1
|
||||||
- update to version 3.19 from criu.org
|
- update to version 3.19 from criu.org
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user