[arch-commits] Commit in lxd/repos/community-x86_64 (8 files)

Morten Linderud foxboron at archlinux.org
Mon Aug 3 13:56:51 UTC 2020


    Date: Monday, August 3, 2020 @ 13:56:50
  Author: foxboron
Revision: 668347

archrelease: copy trunk to community-x86_64

Added:
  lxd/repos/community-x86_64/PKGBUILD
    (from rev 668346, lxd/trunk/PKGBUILD)
  lxd/repos/community-x86_64/lxd.service
    (from rev 668346, lxd/trunk/lxd.service)
  lxd/repos/community-x86_64/lxd.socket
    (from rev 668346, lxd/trunk/lxd.socket)
  lxd/repos/community-x86_64/lxd.sysusers
    (from rev 668346, lxd/trunk/lxd.sysusers)
Deleted:
  lxd/repos/community-x86_64/PKGBUILD
  lxd/repos/community-x86_64/lxd.service
  lxd/repos/community-x86_64/lxd.socket
  lxd/repos/community-x86_64/lxd.sysusers

--------------+
 PKGBUILD     |  181 +++++++++++++++++++++++++++++----------------------------
 lxd.service  |   46 +++++++-------
 lxd.socket   |   22 +++---
 lxd.sysusers |    2 
 4 files changed, 128 insertions(+), 123 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-03 13:56:19 UTC (rev 668346)
+++ PKGBUILD	2020-08-03 13:56:50 UTC (rev 668347)
@@ -1,88 +0,0 @@
-# Maintainer: Morten Linderud <foxboron at archlinux.org>
-# Contributor: Maikel Wever <maikelwever at gmail.com>
-# Contributor: Asterios Dimitriou <asterios at pci.gr>
-# Contributor: Benjamin Asbach <archlinux-aur.lxd at impl.it>
-# Contributer: nightuser <nightuser.android at gmail.com>
-
-pkgname=lxd
-_pkgname=lxd
-_lxd=github.com/lxc/lxd
-pkgver=4.4
-pkgrel=1
-pkgdesc="Daemon based on liblxc offering a REST API to manage containers"
-arch=('x86_64')
-url="https://linuxcontainers.org/lxd"
-license=('APACHE')
-depends=('lxc' 'lxcfs' 'squashfs-tools' 'dnsmasq' 'dqlite' 'libuv' 'sqlite-replication' 'ebtables')
-makedepends=('go' 'git' 'tcl' 'apparmor' 'libseccomp' 'systemd')
-optdepends=(
-    'lvm2: for lvm2 support'
-    'thin-provisioning-tools: for thin provisioning support'
-    'btrfs-progs: for btrfs storage driver support'
-    'ceph: for ceph storage driver support'
-    'cdrtools: VM support'
-    'qemu: VM support'
-    'ovmf: VM support'
-    'systemd-libs: unix device hotplug support'
-)
-source=("https://github.com/lxc/lxd/releases/download/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.asc}
-        "lxd.socket"
-        "lxd.service"
-        "lxd.sysusers")
-validpgpkeys=('602F567663E593BCBD14F338C638974D64792D67')
-sha256sums=('30cc4ea02ae8883900c052df017a0821003ca9b502d86e3cafce9ef2af16643a'
-            'SKIP'
-            '3a14638f8d0f9082c7214502421350e3b028db1e7f22e8c3fd35a2b1d9153ef4'
-            '102d1d54186e0fc606a58f030231d76df6bd662b16dfd8f946e1f48e2b473b54'
-            'd0184d9c4bb485e3aad0d4ac25ea7e85ac0f7ed6ddc96333e74fcd393a5b5ec4')
-
-
-prepare() {
-  mkdir -p "${srcdir}/go/src/github.com/lxc"
-  ln -rTsf "${_pkgname}" "${srcdir}/go/src/${_lxd}"
-}
-
-build() {
-  export GOPATH="${srcdir}/${pkgname}-${pkgver}/_dist"
-  cd "${GOPATH}/src/${_lxd}"
-  export GOFLAGS="-buildmode=pie -trimpath"
-  export CGO_CFLAGS="$CFLAGS -I/usr/include/sqlite-replication"
-  export CGO_LDFLAGS="$LDFLAGS -L/usr/lib/sqlite-replication -Wl,-R/usr/lib/sqlite-replication"
-  export CGO_LDFLAGS_ALLOW='-Wl,-wrap,pthread_create'
-
-  mkdir -p bin
-	go build -v -tags "netgo" -o bin/ ./lxd-p2c/...
-	go build -v -tags "agent" -o bin/ ./lxd-agent/...
-  for tool in fuidshift lxc lxc-to-lxd lxd lxd-benchmark; do
-    go build -v -tags "libsqlite3" -o bin/ ./$tool/...
-  done
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  for tool in fuidshift lxc lxc-to-lxd lxd lxd-agent lxd-benchmark lxd-p2c; do
-    install -p -Dm755 "bin/$tool" "${pkgdir}/usr/bin/$tool"
-  done
-
-  # Package license
-  install -Dm644 "COPYING"  "${pkgdir}/usr/share/licenses/${_pkgname}/LICENCE"
-
-  # systemd files
-  install -Dm644 "${srcdir}/lxd.service" "${pkgdir}/usr/lib/systemd/system/lxd.service"
-  install -Dm644 "${srcdir}/lxd.socket" "${pkgdir}/usr/lib/systemd/system/lxd.socket"
-
-  # logs
-  install -dm755 "${pkgdir}/var/log/lxd"
-
-  # documentation
-  mkdir -p "${pkgdir}/usr/share/doc/lxd"
-  install -p -Dm644 "doc/"* "${pkgdir}/usr/share/doc/lxd/"
-
-  # Bash completions
-  install -p -Dm644 "scripts/bash/lxd-client" "${pkgdir}/usr/share/bash-completion/completions/lxd"
-
-  install -Dm644 "${srcdir}/$pkgname.sysusers" "${pkgdir}/usr/lib/sysusers.d/$pkgname.conf"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: lxd/repos/community-x86_64/PKGBUILD (from rev 668346, lxd/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-08-03 13:56:50 UTC (rev 668347)
@@ -0,0 +1,93 @@
+# Maintainer: Morten Linderud <foxboron at archlinux.org>
+# Contributor: Maikel Wever <maikelwever at gmail.com>
+# Contributor: Asterios Dimitriou <asterios at pci.gr>
+# Contributor: Benjamin Asbach <archlinux-aur.lxd at impl.it>
+# Contributer: nightuser <nightuser.android at gmail.com>
+
+pkgname=lxd
+_pkgname=lxd
+_lxd=github.com/lxc/lxd
+pkgver=4.4
+pkgrel=2
+pkgdesc="Daemon based on liblxc offering a REST API to manage containers"
+arch=('x86_64')
+url="https://linuxcontainers.org/lxd"
+license=('APACHE')
+depends=('lxc' 'lxcfs' 'squashfs-tools' 'dnsmasq' 'dqlite' 'libuv' 'sqlite-replication' 'ebtables')
+makedepends=('go' 'git' 'tcl' 'apparmor' 'libseccomp' 'systemd')
+optdepends=(
+    'lvm2: for lvm2 support'
+    'thin-provisioning-tools: for thin provisioning support'
+    'btrfs-progs: for btrfs storage driver support'
+    'ceph: for ceph storage driver support'
+    'cdrtools: VM support'
+    'qemu: VM support'
+    'ovmf: VM support'
+    'systemd-libs: unix device hotplug support'
+    'apparmor: apparmor support'
+)
+source=("https://github.com/lxc/lxd/releases/download/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.asc}
+        "fix-apparmor.patch::https://github.com/lxc/lxd/commit/e88d0ea6392fb059a31faedc47c0d3fd77b5deaa.patch"
+        "lxd.socket"
+        "lxd.service"
+        "lxd.sysusers")
+validpgpkeys=('602F567663E593BCBD14F338C638974D64792D67')
+sha256sums=('30cc4ea02ae8883900c052df017a0821003ca9b502d86e3cafce9ef2af16643a'
+            'SKIP'
+            '31cc4ec2376b60611e52eaf716f5348e712b83309ce42ea0fad8227b3e3001e4'
+            '3a14638f8d0f9082c7214502421350e3b028db1e7f22e8c3fd35a2b1d9153ef4'
+            '102d1d54186e0fc606a58f030231d76df6bd662b16dfd8f946e1f48e2b473b54'
+            'd0184d9c4bb485e3aad0d4ac25ea7e85ac0f7ed6ddc96333e74fcd393a5b5ec4')
+
+
+prepare() {
+  mkdir -p "${srcdir}/go/src/github.com/lxc"
+  ln -rTsf "${_pkgname}" "${srcdir}/go/src/${_lxd}"
+  cd "${pkgname}-${pkgver}"
+  patch -Np1 < "$srcdir/fix-apparmor.patch" 
+}
+
+build() {
+  export GOPATH="${srcdir}/${pkgname}-${pkgver}/_dist"
+  cd "${GOPATH}/src/${_lxd}"
+  export GOFLAGS="-buildmode=pie -trimpath"
+  export CGO_CFLAGS="$CFLAGS -I/usr/include/sqlite-replication"
+  export CGO_LDFLAGS="$LDFLAGS -L/usr/lib/sqlite-replication -Wl,-R/usr/lib/sqlite-replication"
+  export CGO_LDFLAGS_ALLOW='-Wl,-wrap,pthread_create'
+
+  mkdir -p bin
+	go build -v -tags "netgo" -o bin/ ./lxd-p2c/...
+	go build -v -tags "agent" -o bin/ ./lxd-agent/...
+  for tool in fuidshift lxc lxc-to-lxd lxd lxd-benchmark; do
+    go build -v -tags "libsqlite3" -o bin/ ./$tool/...
+  done
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  for tool in fuidshift lxc lxc-to-lxd lxd lxd-agent lxd-benchmark lxd-p2c; do
+    install -p -Dm755 "bin/$tool" "${pkgdir}/usr/bin/$tool"
+  done
+
+  # Package license
+  install -Dm644 "COPYING"  "${pkgdir}/usr/share/licenses/${_pkgname}/LICENCE"
+
+  # systemd files
+  install -Dm644 "${srcdir}/lxd.service" "${pkgdir}/usr/lib/systemd/system/lxd.service"
+  install -Dm644 "${srcdir}/lxd.socket" "${pkgdir}/usr/lib/systemd/system/lxd.socket"
+
+  # logs
+  install -dm755 "${pkgdir}/var/log/lxd"
+
+  # documentation
+  mkdir -p "${pkgdir}/usr/share/doc/lxd"
+  install -p -Dm644 "doc/"* "${pkgdir}/usr/share/doc/lxd/"
+
+  # Bash completions
+  install -p -Dm644 "scripts/bash/lxd-client" "${pkgdir}/usr/share/bash-completion/completions/lxd"
+
+  install -Dm644 "${srcdir}/$pkgname.sysusers" "${pkgdir}/usr/lib/sysusers.d/$pkgname.conf"
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: lxd.service
===================================================================
--- lxd.service	2020-08-03 13:56:19 UTC (rev 668346)
+++ lxd.service	2020-08-03 13:56:50 UTC (rev 668347)
@@ -1,23 +0,0 @@
-[Unit]
-Description=LXD Container Hypervisor
-After=network-online.target lxcfs.service
-Requires=network-online.target lxcfs.service lxd.socket
-Documentation=man:lxd(1)
-
-[Service]
-Environment=LXD_OVMF_PATH=/usr/share/ovmf/x64
-ExecStart=/usr/bin/lxd --group=lxd --logfile=/var/log/lxd/lxd.log
-ExecStartPost=/usr/bin/lxd waitready --timeout=600
-ExecStop=/usr/bin/lxd shutdown
-TimeoutStartSec=600s
-TimeoutStopSec=30s
-Restart=on-failure
-LimitNOFILE=1048576
-LimitNPROC=infinity
-LimitCORE=infinity
-TasksMax=infinity
-Delegate=yes
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target

Copied: lxd/repos/community-x86_64/lxd.service (from rev 668346, lxd/trunk/lxd.service)
===================================================================
--- lxd.service	                        (rev 0)
+++ lxd.service	2020-08-03 13:56:50 UTC (rev 668347)
@@ -0,0 +1,23 @@
+[Unit]
+Description=LXD Container Hypervisor
+After=network-online.target lxcfs.service
+Requires=network-online.target lxcfs.service lxd.socket
+Documentation=man:lxd(1)
+
+[Service]
+Environment=LXD_OVMF_PATH=/usr/share/ovmf/x64
+ExecStart=/usr/bin/lxd --group=lxd --logfile=/var/log/lxd/lxd.log
+ExecStartPost=/usr/bin/lxd waitready --timeout=600
+ExecStop=/usr/bin/lxd shutdown
+TimeoutStartSec=600s
+TimeoutStopSec=30s
+Restart=on-failure
+LimitNOFILE=1048576
+LimitNPROC=infinity
+LimitCORE=infinity
+TasksMax=infinity
+Delegate=yes
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target

Deleted: lxd.socket
===================================================================
--- lxd.socket	2020-08-03 13:56:19 UTC (rev 668346)
+++ lxd.socket	2020-08-03 13:56:50 UTC (rev 668347)
@@ -1,11 +0,0 @@
-[Unit]
-Description=LXD - unix socket
-
-[Socket]
-ListenStream=/var/lib/lxd/unix.socket
-SocketMode=0660
-SocketGroup=lxd
-Service=lxd.service
-
-[Install]
-WantedBy=sockets.target

Copied: lxd/repos/community-x86_64/lxd.socket (from rev 668346, lxd/trunk/lxd.socket)
===================================================================
--- lxd.socket	                        (rev 0)
+++ lxd.socket	2020-08-03 13:56:50 UTC (rev 668347)
@@ -0,0 +1,11 @@
+[Unit]
+Description=LXD - unix socket
+
+[Socket]
+ListenStream=/var/lib/lxd/unix.socket
+SocketMode=0660
+SocketGroup=lxd
+Service=lxd.service
+
+[Install]
+WantedBy=sockets.target

Deleted: lxd.sysusers
===================================================================
--- lxd.sysusers	2020-08-03 13:56:19 UTC (rev 668346)
+++ lxd.sysusers	2020-08-03 13:56:50 UTC (rev 668347)
@@ -1 +0,0 @@
-g lxd - -

Copied: lxd/repos/community-x86_64/lxd.sysusers (from rev 668346, lxd/trunk/lxd.sysusers)
===================================================================
--- lxd.sysusers	                        (rev 0)
+++ lxd.sysusers	2020-08-03 13:56:50 UTC (rev 668347)
@@ -0,0 +1 @@
+g lxd - -



More information about the arch-commits mailing list