Date: Tuesday, May 16, 2023 @ 08:55:27
Author: grawlinson
Revision: 1461943
upgpkg: criu 3.18-1; new upstream release
Added:
criu/trunk/no-amdgpu-manpage.patch
criu/trunk/no-python-pip.patch
criu/trunk/no-recompile-on-install.patch
Modified:
criu/trunk/PKGBUILD
-------------------------------+
PKGBUILD | 57 ++++++++++++++++++++++++++++++++--------
no-amdgpu-manpage.patch | 10 +++++++
no-python-pip.patch | 13 +++++++++
no-recompile-on-install.patch | 21 ++++++++++++++
4 files changed, 91 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-05-16 08:54:42 UTC (rev 1461942)
+++ PKGBUILD 2023-05-16 08:55:27 UTC (rev 1461943)
@@ -3,8 +3,8 @@
# Contributor: aksr <aksr at t-com dot me>
pkgname=criu
-pkgver=3.17.1
-pkgrel=2
+pkgver=3.18
+pkgrel=1
pkgdesc='Utilities to checkpoint and restore processes in userspace'
arch=('x86_64')
url='https://criu.org'
@@ -22,11 +22,26 @@
'git'
'xmlto'
'asciidoc'
+ 'python-build'
+ 'python-installer'
+ 'python-setuptools'
+ 'python-wheel'
)
+# can't run tests due to privilege escalation
+# https://github.com/checkpoint-restore/criu/issues/434
+checkdepends=('libaio' 'python-yaml')
options=('!buildflags' '!lto')
-_commit='d46f40f4ff0c724e0b9f0f8a2e8c043806897e94'
-source=("$pkgname::git+https://github.com/checkpoint-restore/criu#commit=$_commit";)
-b2sums=('SKIP')
+_commit='4c1a2ac41bb80843c927d2fde8f2ff4186f8d278'
+source=(
+ "$pkgname::git+https://github.com/checkpoint-restore/criu#commit=$_commit";
+ 'no-python-pip.patch'
+ 'no-recompile-on-install.patch'
+ 'no-amdgpu-manpage.patch'
+)
+b2sums=('SKIP'
+
'd83da0ce0222c1aea1fc0c97bbf8a40f3cd5a6b5d55ee973b64f97bd9769df265b148e89cee8ee6564f065adc00552b511904f322555ac659b735933d42a9a64'
+
'e4b7c4831fa513d602c73e377847705240a6a42ee1986effd10a589784bd0ad818032ff8283c1f9fd17cb7ddf3204e4a932796a1df816afc30a0e594c92b50f6'
+
'9c713724e8f6b062f7a09e34555d31e5aa0315db6308b7527835484eaad8dbf5deac5c66521bf5a819462d5f38c64f6602ba421f7bbb73180a3b05189816c8f6')
pkgver() {
cd "$pkgname"
@@ -37,11 +52,14 @@
prepare() {
cd "$pkgname"
- # FS#78218 - [criu] FTBFS with glibc 2.36+
- git cherry-pick --no-commit \
- 1e6e826ffb7ac05f33fa123051c2fc2ddf0f68ea \
- 4c86d6a7d54abb64fc5a15131f3351224e8c071b \
- 517c0947050e63aac72f63a3bf373d76264723b9
+ # do not invoke pip
+ patch -p1 -i "$srcdir/no-python-pip.patch"
+
+ # prevent recompilation with `make install`
+ patch -p1 -i "$srcdir/no-recompile-on-install.patch"
+
+ # do not install amdgpu_plugin manpage
+ patch -p1 -i "$srcdir/no-amdgpu-manpage.patch"
}
build() {
@@ -48,11 +66,30 @@
cd "$pkgname"
make
+
+
+ # build python wheel
+ cd crit
+
+ export CRIU_VERSION_MAJOR="${pkgver%%.*}"
+ export CRIU_VERSION_MINOR="${pkgver##*.}"
+
+ python -m build --wheel --no-isolation
}
+#check() {
+# cd "$pkgname"
+#
+# make test
+#}
+
package() {
cd "$pkgname"
+ # install python wheel
+ python -m installer --destdir="$pkgdir" crit/dist/*.whl
+
+ # rest of the application
make \
DESTDIR="$pkgdir" \
PREFIX=/usr \
Added: no-amdgpu-manpage.patch
===================================================================
--- no-amdgpu-manpage.patch (rev 0)
+++ no-amdgpu-manpage.patch 2023-05-16 08:55:27 UTC (rev 1461943)
@@ -0,0 +1,10 @@
+--- a/Documentation/Makefile
++++ b/Documentation/Makefile
+@@ -16,7 +16,6 @@ ifeq ($(PYTHON),python3)
+ SRC1 += criu-ns.txt
+ endif
+ SRC1 += compel.txt
+-SRC1 += amdgpu_plugin.txt
+ SRC8 += criu.txt
+ SRC := $(SRC1) $(SRC8)
+ XMLS := $(patsubst %.txt,%.xml,$(SRC))
Added: no-python-pip.patch
===================================================================
--- no-python-pip.patch (rev 0)
+++ no-python-pip.patch 2023-05-16 08:55:27 UTC (rev 1461943)
@@ -0,0 +1,13 @@
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -54,10 +54,6 @@ install: lib-c lib-a lib-py crit/crit lib/c/criu.pc.in
+ $(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
+ $(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
+ $(Q) install -m 644 lib/c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
+-ifeq ($(PYTHON),python3)
+- $(E) " INSTALL " crit
+- $(Q) $(PYTHON) -m pip install --upgrade --force-reinstall
--prefix=$(DESTDIR)$(PREFIX) ./crit
+-endif
+ .PHONY: install
+
+ uninstall:
Added: no-recompile-on-install.patch
===================================================================
--- no-recompile-on-install.patch (rev 0)
+++ no-recompile-on-install.patch 2023-05-16 08:55:27 UTC (rev 1461943)
@@ -0,0 +1,21 @@
+--- a/Makefile.install
++++ b/Makefile.install
+@@ -33,15 +33,15 @@ install-man:
+ $(Q) $(MAKE) -C Documentation install
+ .PHONY: install-man
+
+-install-lib: lib
++install-lib:
+ $(Q) $(MAKE) $(build)=lib install
+ .PHONY: install-lib
+
+-install-criu: criu
++install-criu:
+ $(Q) $(MAKE) $(build)=criu install
+ .PHONY: install-criu
+
+-install-amdgpu_plugin: amdgpu_plugin
++install-amdgpu_plugin:
+ $(Q) $(MAKE) -C plugins/amdgpu install
+ .PHONY: install-amdgpu_plugin
+
