From faef09195941731ef59c5c5dd85e895930fb649d Mon Sep 17 00:00:00 2001 From: Evgenii Alekseev Date: Thu, 31 Oct 2024 16:23:36 +0200 Subject: [PATCH] add metapackage --- .github/workflows/setup.sh | 2 +- docs/faq/general.rst | 2 +- docs/setup.rst | 2 +- package/archlinux/PKGBUILD | 14 ++++++++++---- package/archlinux/ahriman.install | 1 + subpackages.py | 2 +- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/workflows/setup.sh b/.github/workflows/setup.sh index 83259f0b..1d16d87f 100755 --- a/.github/workflows/setup.sh +++ b/.github/workflows/setup.sh @@ -31,7 +31,7 @@ mv "dist/ahriman-$PKGVER.tar.gz" package/archlinux chmod +777 package/archlinux # because fuck you that's why cd package/archlinux sudo -u nobody -- makepkg -cf --skipchecksums --noconfirm -sudo -u nobody -- makepkg --packagelist | grep "ahriman-$PKGVER" | pacman -U --noconfirm --nodeps - +sudo -u nobody -- makepkg --packagelist | grep "ahriman-core-$PKGVER" | pacman -U --noconfirm --nodeps - if [[ -z $MINIMAL_INSTALL ]]; then sudo -u nobody -- makepkg --packagelist | grep "ahriman-triggers-$PKGVER" | pacman -U --noconfirm --nodeps - sudo -u nobody -- makepkg --packagelist | grep "ahriman-web-$PKGVER" | pacman -U --noconfirm --nodeps - diff --git a/docs/faq/general.rst b/docs/faq/general.rst index d54583ea..c087855e 100644 --- a/docs/faq/general.rst +++ b/docs/faq/general.rst @@ -13,7 +13,7 @@ TL;DR .. code-block:: shell - yay -S ahriman + yay -S ahriman-core ahriman -a x86_64 -r aur service-setup --packager "ahriman bot " systemctl enable --now ahriman@x86_64-aur.timer diff --git a/docs/setup.rst b/docs/setup.rst index fce136dd..240ec674 100644 --- a/docs/setup.rst +++ b/docs/setup.rst @@ -2,7 +2,7 @@ Initial setup ============= #. - Install package as usual. + Install package(s) as usual. At least, ``ahriman-core`` package is required; other features can be installed separately. Alternatively, it is possible to install meta-package, which includes everything. #. Change settings if required, see :doc:`configuration reference ` for more details. #. diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index 1a9a0331..303a2479 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Evgeniy Alekseev pkgbase='ahriman' -pkgname=('ahriman' 'ahriman-triggers' 'ahriman-web') +pkgname=('ahriman' 'ahriman-core' 'ahriman-triggers' 'ahriman-web') pkgver=2.15.2 pkgrel=1 pkgdesc="ArcH linux ReposItory MANager" @@ -22,6 +22,12 @@ build() { package_ahriman() { pkgname='ahriman' + pkgdesc="ArcH linux ReposItory MANager (meta package)" + depends=("$pkgbase-core=$pkgver" "$pkgbase-triggers=$pkgver" "$pkgbase-web=$pkgver") +} + +package_ahriman-core() { + pkgname='ahriman-core' optdepends=('ahriman-triggers: additional extensions for the application' 'ahriman-web: web server' 'python-boto3: sync to s3' @@ -31,7 +37,7 @@ package_ahriman() { 'python-jinja: html report generation' 'python-systemd: journal support' 'rsync: sync by using rsync') - install="$pkgname.install" + install="$pkgbase.install" backup=('etc/ahriman.ini' 'etc/ahriman.ini.d/logging.ini') @@ -51,7 +57,7 @@ package_ahriman() { package_ahriman-triggers() { pkgname='ahriman-triggers' pkgdesc="ArcH linux ReposItory MANager, additional extensions" - depends=("$pkgbase=$pkgver") + depends=("$pkgbase-core=$pkgver") backup=('etc/ahriman.ini.d/00-triggers.ini') cd "$pkgbase-$pkgver" @@ -65,7 +71,7 @@ package_ahriman-triggers() { package_ahriman-web() { pkgname='ahriman-web' pkgdesc="ArcH linux ReposItory MANager, web server" - depends=("$pkgbase=$pkgver" 'python-aiohttp-apispec>=3.0.0' 'python-aiohttp-cors' 'python-aiohttp-jinja2') + depends=("$pkgbase-core=$pkgver" 'python-aiohttp-apispec>=3.0.0' 'python-aiohttp-cors' 'python-aiohttp-jinja2') optdepends=('python-aioauth-client: OAuth2 authorization support' 'python-aiohttp-security: authorization support' 'python-aiohttp-session: authorization support' diff --git a/package/archlinux/ahriman.install b/package/archlinux/ahriman.install index da9a0d70..09bfb517 100644 --- a/package/archlinux/ahriman.install +++ b/package/archlinux/ahriman.install @@ -2,6 +2,7 @@ post_upgrade() { local breakpoints=( 2.9.0-1 2.12.0-1 + 2.16.0-1 ) for v in "${breakpoints[@]}"; do diff --git a/subpackages.py b/subpackages.py index 69b05190..2c9b4c83 100644 --- a/subpackages.py +++ b/subpackages.py @@ -28,7 +28,7 @@ from pathlib import Path prefix = Path(sys.prefix).relative_to("/") site_packages = Path(site.getsitepackages()[0]).relative_to("/") SUBPACKAGES = { - "ahriman": [ + "ahriman-core": [ prefix / "bin", prefix / "lib" / "systemd", prefix / "share",