Date: Tuesday, August 9, 2022 @ 17:58:16 Author: mtorromeo Revision: 1264356
upgpkg: cockpit 274.1-1: Moved cockpit-packagekit and cockpit-storaged to split packages Modified: cockpit/trunk/PKGBUILD ----------+ PKGBUILD | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-08-09 17:58:05 UTC (rev 1264355) +++ PKGBUILD 2022-08-09 17:58:16 UTC (rev 1264356) @@ -4,8 +4,8 @@ # Contributor: Anatol Pomozov <anatol.pomo...@gmail.com> pkgbase=cockpit -pkgname=(cockpit cockpit-pcp) -pkgver=273 +pkgname=(cockpit cockpit-packagekit cockpit-pcp cockpit-storaged) +pkgver=274.1 pkgrel=1 pkgdesc='A systemd web based user interface for Linux servers' arch=('x86_64') @@ -19,7 +19,7 @@ "cockpit.pam" "cockpit-ws.sysuser.conf" "cockpit-wsinstance.sysuser.conf") -sha256sums=('666ac419bfab7c7ddd612ebfb53e62edd1f7e461a121dcf6cffa6441778bf6bd' +sha256sums=('0dc8cd7243333fc9043201fcc31f68cb00d0e30fcd7f7b009acccbd03d8470c7' 'a979e236681c6a06906937cf0f012e976347af5d6d7e7ae04a11acb01cc2689d' '1ad9dad75858264778bd94799b60c651f7cc1c7f7fa1c54622174303e639287a' '46ee8ecad7bc97ba588ab9471dde76e41c00daf40658902425626c3a1938b438') @@ -59,14 +59,13 @@ libpwquality openssl kexec-tools) backup=('etc/pam.d/cockpit') optdepends=("cockpit-pcp: reading performance metrics" + "cockpit-storaged: manage storage" + "cockpit-packagekit: manage packaged" "cockpit-podman: user interface for managing podman containers" "cockpit-machines: user interface for managing virtual machines" "polkit: elevate privileges" "sudo: elevate privileges" - "udisks2: manage hard disks" - "clevis: manage disk encryption" "networkmanager: manage network connections" - "packagekit: manage packages" "sssd: authentication" "sscg: generate self-signed certificate") @@ -86,7 +85,8 @@ "$pkgdir"/usr/share/metainfo/org.cockpit-project.cockpit-{selinux,sosreport}.metainfo.xml # remove plugins packaged separately - rm -rf "$pkgdir"/usr/share/cockpit/pcp \ + 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 } @@ -105,9 +105,9 @@ } _do_package_component() { - _component="${pkgname#cockpit-}" + _component="${1:-${pkgname#cockpit-}}" - cd cockpit-$pkgver + cd "$srcdir"/cockpit-$pkgver make DESTDIR="$pkgdir"/tmp install cd "$pkgdir"/tmp @@ -120,3 +120,19 @@ rm -rf "$pkgdir"/tmp } + +package_cockpit-storaged() { + pkgdesc='Cockpit user interface for storage, using udisks' + depends=(cockpit udisks2 dbus-python) + optdepends=( + "clevis: manage disk encryption" + ) + _do_package_component +} + +package_cockpit-packagekit() { + pkgdesc='Cockpit user interface for packages' + depends=(cockpit polkit packagekit python) + _do_package_component + _do_package_component apps +}