Date: Saturday, May 7, 2022 @ 05:14:27 Author: grawlinson Revision: 1196121
upgpkg: criu 3.17-1 * New upstream release. * Switch source to git commit from github tarball. * Fix failing `make install` due to unused functionality. Added: criu/trunk/fix-amdgpu-install.patch Modified: criu/trunk/PKGBUILD --------------------------+ PKGBUILD | 63 ++++++++++++++++++++++++++++++++++----------- fix-amdgpu-install.patch | 22 +++++++++++++++ 2 files changed, 70 insertions(+), 15 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-05-07 04:49:13 UTC (rev 1196120) +++ PKGBUILD 2022-05-07 05:14:27 UTC (rev 1196121) @@ -3,27 +3,58 @@ # Contributor: aksr <aksr at t-com dot me> pkgname=criu -pkgver=3.16.1 -pkgrel=4 -pkgdesc="Utilities to checkpoint and restore processes in userspace" -url="http://criu.org" +pkgver=3.17 +pkgrel=1 +pkgdesc='Utilities to checkpoint and restore processes in userspace' +arch=('x86_64') +url='https://criu.org' license=('GPL2') -arch=('x86_64') -source=("$pkgname-$pkgver.tar.gz::https://github.com/checkpoint-restore/criu/archive/v$pkgver.tar.gz") -depends=('libbsd' 'libnet' 'libnl' 'protobuf-c' 'python-protobuf' 'gnutls' 'nftables') -makedepends=('xmlto' 'asciidoc') +depends=( + 'libbsd' + 'libnet' + 'libnl' + 'protobuf-c' + 'python-protobuf' + 'gnutls' + 'nftables' +) +makedepends=( + 'git' + 'xmlto' + 'asciidoc' +) options=('!buildflags' '!lto') -sha512sums=('a558af41f1927a1b1d87f8d11163a5f3d2e4f83a74aba00619b45a6d464d5477a6a0aac3c1b9d9a17e3343a4bf21a3fd6b279b51fa0c347c86c307381a4d0739') -b2sums=('45aa87ee00a18b91474e767dc0326cce6c0942af7771a0c5536751361c171c86ba2065c54587e82b51fd6d7ab116e659324369955086c5237cd7fd26b60d6ce6') +_commit='4f8f295e57e68740699479d12c1ad251e6dd859f' +source=( + "$pkgname::git+https://github.com/checkpoint-restore/criu#commit=$_commit" + 'fix-amdgpu-install.patch' +) +b2sums=('SKIP' + '4d5e7ed02257757f57c0f5c965ebbf3bf0ca5db85d15ac983b861aac8024513ff6f8f9b971bc4c9c0cbd26ee2797116dc3aacc7acf7e7fd04a0eeb7015dc2e83') +pkgver() { + cd "$pkgname" + + git describe --tags | sed 's/^v//' +} + +prepare() { + cd "$pkgname" + + patch -p1 -i ../fix-amdgpu-install.patch +} + build() { - cd "$pkgname-$pkgver" + cd "$pkgname" + make } package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" \ + cd "$pkgname" + + make \ + DESTDIR="$pkgdir" \ PREFIX=/usr \ SBINDIR=/usr/bin \ LIBDIR=/usr/lib \ @@ -30,6 +61,8 @@ LIBEXECDIR=/usr/lib \ install - # remove empty directory - rmdir "$pkgdir/usr/include/compel/common/asm" + # remove empty directories + rm -rf \ + "$pkgdir/usr/include/compel/common/asm" \ + "$pkgdir/var" } Added: fix-amdgpu-install.patch =================================================================== --- fix-amdgpu-install.patch (rev 0) +++ fix-amdgpu-install.patch 2022-05-07 05:14:27 UTC (rev 1196121) @@ -0,0 +1,22 @@ +--- a/plugins/amdgpu/Makefile ++++ b/plugins/amdgpu/Makefile +@@ -50,16 +50,16 @@ clean: amdgpu_plugin_clean amdgpu_plugin_test_clean + mrproper: clean + + install: +- $(Q) mkdir -p $(PLUGINDIR) ++ $(Q) mkdir -p $(DESTDIR)$(PLUGINDIR) + ifeq ($(CONFIG_AMDGPU),y) + $(E) " INSTALL " $(PLUGIN_NAME) +- $(Q) install -m 644 $(PLUGIN_SOBJ) $(PLUGINDIR) ++ $(Q) install -m 644 $(PLUGIN_SOBJ) $(DESTDIR)$(PLUGINDIR) + endif + .PHONY: install + + uninstall: + ifeq ($(CONFIG_AMDGPU),y) + $(E) " UNINSTALL" $(PLUGIN_NAME) +- $(Q) $(RM) $(PLUGINDIR)/$(PLUGIN_SOBJ) ++ $(Q) $(RM) $(DESTDIR)$(PLUGINDIR)/$(PLUGIN_SOBJ) + endif + .PHONY: uninstall