[arch-commits] Commit in cni-plugins/trunk (PKGBUILD)

[David Runge]

    Date: Sunday, February 20, 2022 @ 11:20:34
  Author: dvzrv
Revision: 1135253

upgpkg: cni-plugins 1.0.1-2: Rebuild to add provides array.

As netavark is now in the repositories, we have two providers of container-network-stack,
so we add container-network-stack to provides.
Disable LTO, as the plugins seem not compatible with it:
https://github.com/containernetworking/plugins/issues/706 
Update the info around why we install to /opt/cni/bin as well.
Remove unneeded explicit installation of /opt/cni/bin.
Update maintainer info.

Modified:
  cni-plugins/trunk/PKGBUILD

----------+
 PKGBUILD |   23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-20 10:50:45 UTC (rev 1135252)
+++ PKGBUILD	2022-02-20 11:20:34 UTC (rev 1135253)
@@ -1,10 +1,10 @@
 # Maintainer: Morten Linderud <foxboron at archlinux.org>
+# Maintainer: David Runge <dvzrv at archlinux.org>
 # Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: David Runge <dvzrv at archlinux.org>
 
 pkgname=cni-plugins
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Some standard networking plugins, maintained by the CNI team'
 arch=(x86_64)
 url="https://github.com/containernetworking/plugins"
@@ -11,8 +11,10 @@
 license=(Apache)
 depends=(glibc)
 makedepends=(go)
-options=('emptydirs')
-source=($pkgname-$pkgver.tar.gz::$url/archive/v${pkgver}.tar.gz)
+provides=(container-network-stack)
+# unable to build with LTO: https://github.com/containernetworking/plugins/issues/706
+options=(!lto)
+source=($pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz)
 sha512sums=('01edfb3d3c9cf34da7c97a255c9396d49b2b73a11352526d4dd7dfaa0b63e93b09261aa5f68a36f3dcf3d31c0ffd48070717abcd8a65ddb563e3402350f20352')
 b2sums=('b77a4612c5ec4dbd18a63dda33cc7d826a302c1f354c56253c768f36ea102fc5a53d15a85ac98d7249a1e03152f400c68c7479700f02476bd55876b5b00f7616')
 
@@ -29,14 +31,11 @@
 package() {
   cd plugins-$pkgver
   install -vDm755 bin/* -t "$pkgdir/usr/lib/cni/"
-  install -vdm755 "${pkgdir}/etc/cni/net.d/"
+  # some applications would build their own versions of CNI plugins in
+  # /opt/cni/bin if they are not found (as non-symlink files), so we have to
+  # install them twice... ;_;
+  install -vDm755 bin/* -t "$pkgdir/opt/cni/bin/"
+  install -vdm755 "$pkgdir/etc/cni/net.d/"
   install -vDm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
-  install -dm755 "$pkgdir/opt/cni/bin"
-
   install -vDm644 plugins/ipam/dhcp/systemd/* -t "$pkgdir/usr/lib/systemd/system/"
-
-  # Some CNI stuff would build their binaries into /usr/lib/cni with the
-  # old approach. This is unfortunate so we'll just symlink each binary
-  # instead.
-  install -vDm755 bin/* -t "$pkgdir/opt/cni/bin/"
 }