From 2a17ba983330cf8c511b9b1fa0329acaa2631c7c Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Mon, 27 Feb 2023 23:51:22 +0100 Subject: Replacing flit (#1655) * Replacing flit * Removed python-flit as a dependency * Removed note about flit * Removed flit references in pyproject.toml --- PKGBUILD | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'PKGBUILD') diff --git a/PKGBUILD b/PKGBUILD index d8e89ae2..70b18d00 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ arch=(any) url="https://github.com/archlinux/archinstall" license=(GPL3) depends=(python) -makedepends=(python-build python-installer python-flit python-setuptools python-sphinx python-wheel) +makedepends=(python-build python-installer python-setuptools python-sphinx python-wheel) provides=(python-archinstall) conflicts=(python-archinstall) replaces=(python-archinstall) @@ -29,7 +29,6 @@ validpgpkeys=('256F73CEEFC6705C6BBAB20E5FBBB32941E3740A') # Anton Hvornum (Torxe prepare() { cd $pkgname-$pkgver # use real directories for examples and profiles, as symlinks do not work - # with flit or setuptools PEP517 backends rm -fv $pkgname/{examples,profiles} mv -v examples profiles $pkgname/ } -- cgit v1.2.3-70-g09d2 From 4429b3897c016a71e8be4e40e68d4d12b377b72a Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Wed, 29 Mar 2023 15:30:11 +0200 Subject: Updated PKGBUILD with a pkgver, depends and hashsums (#1696) * Fixing some values that trigger issues in PKGBUILD * license dynamic * Updated PKGBUILD to contain a pkgver() as well as update hashsums and added systemd as depends --- PKGBUILD | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'PKGBUILD') diff --git a/PKGBUILD b/PKGBUILD index 70b18d00..108fa56e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,14 +4,13 @@ # Contributor: demostanis worlds pkgname=archinstall -pkgver=2.5.0 -#pkgver=$(git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g') +#pkgver=2.5.4 pkgrel=1 pkgdesc="Just another guided/automated Arch Linux installer with a twist" arch=(any) url="https://github.com/archlinux/archinstall" license=(GPL3) -depends=(python) +depends=(python systemd) makedepends=(python-build python-installer python-setuptools python-sphinx python-wheel) provides=(python-archinstall) conflicts=(python-archinstall) @@ -20,12 +19,17 @@ source=( $pkgname-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz $pkgname-$pkgver.tar.gz.sig::$url/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz.sig ) -sha512sums=('9516719c4e4fe0423224a35b4846cf5c8daeb931cff6fed588957840edc5774e9c6fe18619d2356a6d76681ae3216ba19f5d0f0bd89c6301b4ff9b128d037d13' +sha512sums=('3bfdd2b33ef3a784bd6c847afce75b0d5c1997f8374db5f75adc6fe9e35ab135e7cdb2fdcef01999fcb6c03ed80159f02d3da560d28e8da8fe17043f4cdac108' 'SKIP') -b2sums=('a29ae767756f74ce296d53e31bb8376cfa7db19a53b8c3997b2d8747a60842ba88e8b18c505bc56a36d685f73f7a6d9e53adff17953c8a4ebaabc67c6db8e583' +b2sums=('87c3ad807e87d834d59210cb28d14c93acabe8996bcc7407866307f9cdddf4e233a35c96e99e02aebbbb95548bdfa125772fb4703bf0152227e4163cd621860a' 'SKIP') validpgpkeys=('256F73CEEFC6705C6BBAB20E5FBBB32941E3740A') # Anton Hvornum (Torxed) +pkgver() { + cd $pkgname-$pkgver + git describe --long --abbrev=7 | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' | grep -o -E '[0-9.]{5}' +} + prepare() { cd $pkgname-$pkgver # use real directories for examples and profiles, as symlinks do not work @@ -43,4 +47,4 @@ package() { cd "$pkgname-$pkgver" python -m installer --destdir="$pkgdir" dist/*.whl install -vDm 644 docs/_build/man/archinstall.1 -t "$pkgdir/usr/share/man/man1/" -} \ No newline at end of file +} -- cgit v1.2.3-70-g09d2 From 4f539a193146b67e122d30732294df44eb826f13 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Wed, 29 Mar 2023 15:41:55 +0200 Subject: Added missing pkgver definition (#1697) --- PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'PKGBUILD') diff --git a/PKGBUILD b/PKGBUILD index 108fa56e..c5fcd038 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: demostanis worlds pkgname=archinstall -#pkgver=2.5.4 +pkgver=2.5.4 pkgrel=1 pkgdesc="Just another guided/automated Arch Linux installer with a twist" arch=(any) @@ -13,7 +13,7 @@ license=(GPL3) depends=(python systemd) makedepends=(python-build python-installer python-setuptools python-sphinx python-wheel) provides=(python-archinstall) -conflicts=(python-archinstall) +conflicts=(python-archinstall archinstall-git) replaces=(python-archinstall) source=( $pkgname-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz -- cgit v1.2.3-70-g09d2 From 9efbe9e6e8e77eb1f08e5557ed9f2a6750af14ce Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Fri, 31 Mar 2023 11:13:59 +0200 Subject: Improved PKGBUILD and correctly identify __version__ without git (#1709) --- PKGBUILD | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) (limited to 'PKGBUILD') diff --git a/PKGBUILD b/PKGBUILD index c5fcd038..42fccfc3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,28 +10,42 @@ pkgdesc="Just another guided/automated Arch Linux installer with a twist" arch=(any) url="https://github.com/archlinux/archinstall" license=(GPL3) -depends=(python systemd) -makedepends=(python-build python-installer python-setuptools python-sphinx python-wheel) -provides=(python-archinstall) +depends=( + 'python' + 'systemd' +) +makedepends=( + 'python-setuptools' + 'python-sphinx' + 'python-build' + 'python-installer' + 'python-wheel' +) +optdepends=( + 'python-systemd: Adds journald logging' +) +provides=(python-archinstall archinstall) conflicts=(python-archinstall archinstall-git) -replaces=(python-archinstall) +replaces=(python-archinstall archinstall-git) source=( $pkgname-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz $pkgname-$pkgver.tar.gz.sig::$url/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz.sig ) -sha512sums=('3bfdd2b33ef3a784bd6c847afce75b0d5c1997f8374db5f75adc6fe9e35ab135e7cdb2fdcef01999fcb6c03ed80159f02d3da560d28e8da8fe17043f4cdac108' +sha512sums=('64cb3593c5091b3885ad14ef073cfab31090b4f9bcb4405b18cf9b19adb5ca42255ba8891ec62e21f92d59872541ef6d94f186fb05c625822af63525441e08d9' 'SKIP') -b2sums=('87c3ad807e87d834d59210cb28d14c93acabe8996bcc7407866307f9cdddf4e233a35c96e99e02aebbbb95548bdfa125772fb4703bf0152227e4163cd621860a' +b2sums=('9c0ec0871841804377ba8310dc744711adcec4eed7319a8d89d684af8e7b822bb9d47540b00f4d746a9fcd7b9ea1b9e07bac773e6c28fabc760e4df38b16748b' 'SKIP') validpgpkeys=('256F73CEEFC6705C6BBAB20E5FBBB32941E3740A') # Anton Hvornum (Torxed) pkgver() { cd $pkgname-$pkgver - git describe --long --abbrev=7 | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' | grep -o -E '[0-9.]{5}' + + cat archinstall/__init__.py | grep '^__version__' | grep -o -E '[0-9.]{5}' } prepare() { cd $pkgname-$pkgver + # use real directories for examples and profiles, as symlinks do not work rm -fv $pkgname/{examples,profiles} mv -v examples profiles $pkgname/ @@ -39,12 +53,14 @@ prepare() { build() { cd $pkgname-$pkgver + python -m build --wheel --no-isolation PYTHONDONTWRITEBYTECODE=1 make man -C docs } package() { cd "$pkgname-$pkgver" + python -m installer --destdir="$pkgdir" dist/*.whl install -vDm 644 docs/_build/man/archinstall.1 -t "$pkgdir/usr/share/man/man1/" } -- cgit v1.2.3-70-g09d2 From 1c6b0bae73a02fb91b1670e8527ff2dfb6dc3071 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Fri, 31 Mar 2023 11:29:07 +0200 Subject: Replaced double-grep with awk (#1710) --- PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'PKGBUILD') diff --git a/PKGBUILD b/PKGBUILD index 42fccfc3..08c2001b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -39,8 +39,8 @@ validpgpkeys=('256F73CEEFC6705C6BBAB20E5FBBB32941E3740A') # Anton Hvornum (Torxe pkgver() { cd $pkgname-$pkgver - - cat archinstall/__init__.py | grep '^__version__' | grep -o -E '[0-9.]{5}' + + awk '$1 ~ /^__version__/ {gsub("\"", ""); print $3}' archinstall/__init__.py } prepare() { -- cgit v1.2.3-70-g09d2