Massimiliano Torromeo pushed to branch main at Arch Linux / Packaging /
Packages / cockpit
Commits:
d9c787f2 by Massimiliano Torromeo at 2024-10-10T20:23:05+02:00
upgpkg: 326-2
- - - - -
2 changed files:
- .SRCINFO
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = cockpit
pkgdesc = A systemd web based user interface for Linux servers
pkgver = 326
- pkgrel = 1
+ pkgrel = 2
url = https://cockpit-project.org/
arch = x86_64
license = LGPL-2.1-or-later
@@ -44,16 +44,18 @@ pkgname = cockpit
depends = kexec-tools
depends = python
depends = gobject-introspection-runtime
- optdepends = cockpit-pcp: reading performance metrics
optdepends = cockpit-storaged: manage storage
optdepends = cockpit-packagekit: manage packaged
optdepends = cockpit-podman: user interface for managing podman
containers
optdepends = cockpit-machines: user interface for managing virtual
machines
+ optdepends = pcp: reading performance metrics
optdepends = polkit: elevate privileges
optdepends = sudo: elevate privileges
optdepends = networkmanager: manage network connections
optdepends = sssd: authentication
optdepends = sscg: generate self-signed certificate
+ provides = cockpit-pcp
+ replaces = cockpit-pcp
backup = etc/pam.d/cockpit
backup = etc/cockpit/disallowed-users
@@ -64,11 +66,6 @@ pkgname = cockpit-packagekit
depends = packagekit
depends = python
-pkgname = cockpit-pcp
- pkgdesc = Cockpit support for reading PCP metrics and loading PCP
archives
- depends = cockpit
- depends = pcp
-
pkgname = cockpit-storaged
pkgdesc = Cockpit user interface for storage, using udisks
depends = cockpit
=====================================
PKGBUILD
=====================================
@@ -4,9 +4,9 @@
# Contributor: Anatol Pomozov <[email protected]>
pkgbase=cockpit
-pkgname=(cockpit cockpit-packagekit cockpit-pcp cockpit-storaged)
+pkgname=(cockpit cockpit-packagekit cockpit-storaged)
pkgver=326
-pkgrel=1
+pkgrel=2
pkgdesc='A systemd web based user interface for Linux servers'
arch=('x86_64')
url='https://cockpit-project.org/'
@@ -55,12 +55,14 @@ build() {
package_cockpit() {
depends=(krb5 libssh json-glib glib-networking libpwquality systemd
openssl kexec-tools python gobject-introspection-runtime)
+ provides=(cockpit-pcp)
+ replaces=(cockpit-pcp)
backup=('etc/pam.d/cockpit' 'etc/cockpit/disallowed-users')
- optdepends=("cockpit-pcp: reading performance metrics"
- "cockpit-storaged: manage storage"
+ optdepends=("cockpit-storaged: manage storage"
"cockpit-packagekit: manage packaged"
"cockpit-podman: user interface for managing podman containers"
"cockpit-machines: user interface for managing virtual machines"
+ "pcp: reading performance metrics"
"polkit: elevate privileges"
"sudo: elevate privileges"
"networkmanager: manage network connections"
@@ -83,29 +85,14 @@ package_cockpit() {
"$pkgdir"/usr/share/metainfo/org.cockpit-project.cockpit-{selinux,sosreport}.metainfo.xml
# remove plugins packaged separately
- rm -rf "$pkgdir"/usr/share/cockpit/{apps,packagekit,pcp,storaged} \
-
"$pkgdir"/usr/share/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml \
- "$pkgdir"/usr/lib/cockpit/cockpit-pcp \
- "$pkgdir"/var/lib/pcp
+ rm -rf "$pkgdir"/usr/share/cockpit/{apps,packagekit,storaged} \
+
"$pkgdir"/usr/share/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml
# Disallow root login by default
printf "# List of users which are not allowed to login to Cockpit\nroot\n" >
"$pkgdir"/etc/cockpit/disallowed-users
chmod 644 "$pkgdir"/etc/cockpit/disallowed-users
}
-package_cockpit-pcp() {
- pkgdesc='Cockpit support for reading PCP metrics and loading PCP archives'
- depends=(cockpit pcp)
-
- cd cockpit-$pkgver
- make DESTDIR="$pkgdir"/tmp install
-
- cd "$pkgdir"/tmp
- bsdtar -cf - usr/share/cockpit/pcp usr/lib/cockpit/cockpit-pcp var/lib/pcp \
- | bsdtar -xf - -C "$pkgdir"
- rm -rf "$pkgdir"/tmp
-}
-
_do_package_component() {
_component="${1:-${pkgname#cockpit-}}"
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/cockpit/-/commit/d9c787f2e9c1f1b97d94165784a86186bea8e34b
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/cockpit/-/commit/d9c787f2e9c1f1b97d94165784a86186bea8e34b
You're receiving this email because of your account on gitlab.archlinux.org.
