Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--PKGBUILD44
-rw-r--r--PKGBUILDs/archinstall-bin/PKGBUILD39
-rw-r--r--PKGBUILDs/archinstall/PKGBUILD30
-rw-r--r--PKGBUILDs/python-archinstall/PKGBUILD40
-rw-r--r--setup.cfg6
5 files changed, 3 insertions, 156 deletions
diff --git a/PKGBUILD b/PKGBUILD
deleted file mode 100644
index 77e6b512..00000000
--- a/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Anton Hvornum <anton@hvornum.se>
-# Contributor: Giancarlo Razzolini <grazzolini@archlinux.org>
-# Contributor: demostanis worlds <demostanis@protonmail.com>
-
-pkgbase=archinstall-git
-pkgname=('archinstall-git' 'python-archinstall-git')
-pkgver=$(git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
-pkgrel=1
-pkgdesc="Just another guided/automated Arch Linux installer with a twist"
-arch=('any')
-url="https://github.com/archlinux/archinstall"
-license=('GPL')
-depends=('python')
-makedepends=('python-setuptools')
-
-build() {
- cd "$startdir"
-
- python setup.py build
-}
-
-
-package_archinstall-git() {
- depends=('python-archinstall-git')
- conflicts=('archinstall')
- cd "$startdir"
-
- mkdir -p "${pkgdir}/usr/bin"
-
- # Install a guided profile
- cat - > "${pkgdir}/usr/bin/archinstall" <<EOF
-#!/bin/sh
-python -m archinstall $@
-EOF
-
- chmod +x "${pkgdir}/usr/bin/archinstall"
-}
-
-package_python-archinstall-git() {
- conflicts=('python-archinstall')
- cd "$startdir"
-
- python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
-}
diff --git a/PKGBUILDs/archinstall-bin/PKGBUILD b/PKGBUILDs/archinstall-bin/PKGBUILD
deleted file mode 100644
index 25d4b15d..00000000
--- a/PKGBUILDs/archinstall-bin/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Anton Hvornum anton@hvornum.se
-# Contributor: Anton Hvornum anton@hvornum.se
-
-pkgname="archinstall-bin"
-pkgver="2.1.3"
-pkgdesc="Installs a pre-built binary of ${pkgname}"
-pkgrel=1
-url="https://github.com/archlinux/archinstall"
-license=('GPLv3')
-provides=("${pkgname}")
-arch=('x86_64')
-source=("${pkgname}-v${pkgver}-x86_64.tar.gz::https://github.com/archlinux/archinstall/archive/v$pkgver.tar.gz")
-#depends=('python>=3.8')
-makedepends=('python>=3.8' 'nuitka')
-optdepends=('pyttsx3: Adds text-to-speach support for log/screen output.')
-sha256sums=('53c00f7e7ad245cd2cbbf041b5a735df2fc29454c24b1d369f678cc0610b7cea')
-
-build() {
- cd "${pkgname}-${pkgver}"
-
- nuitka3 --standalone --show-progress archinstall
- cp -r examples/ archinstall.dist/
-}
-
-package() {
- echo "${srcdir}"
- cd "${pkgname}-${pkgver}"
-
- mkdir -p "${pkgdir}/var/lib/archinstall/"
- mkdir -p "${pkgdir}/usr/bin"
-
- mv archinstall.dist/* "${pkgdir}/var/lib/archinstall/"
-
- echo '#!/bin/bash' > "${pkgdir}/usr/bin/archinstall-bin"
- echo '(cd /var/lib/archinstall && exec ./archinstall)' >> "${pkgdir}/usr/bin/archinstall-bin"
-
- chmod +x "${pkgdir}/var/lib/archinstall/archinstall"
- chmod +x "${pkgdir}/usr/bin/archinstall-bin"
-}
diff --git a/PKGBUILDs/archinstall/PKGBUILD b/PKGBUILDs/archinstall/PKGBUILD
deleted file mode 100644
index 7b1c4947..00000000
--- a/PKGBUILDs/archinstall/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Anton Hvornum <anton@hvornum.se>
-# Contributor: demostanis worlds <demostanis@protonmail.com>
-
-pkgname="archinstall"
-pkgver="2.1.3"
-pkgdesc="Installs launcher scripts for archinstall"
-pkgrel=1
-url="https://github.com/archlinux/archinstall"
-license=('GPLv3')
-provides=("${pkgname}")
-arch=('x86_64')
-source=("${pkgname}-v${pkgver}-x86_64.tar.gz::https://github.com/archlinux/archinstall/archive/v$pkgver.tar.gz")
-depends=('python-archinstall')
-sha256sums=('53c00f7e7ad245cd2cbbf041b5a735df2fc29454c24b1d369f678cc0610b7cea')
-
-package() {
- mkdir -p "${pkgdir}/usr/bin"
-
- # Install a guided profile
- cat - > "${pkgdir}/usr/bin/archinstall" <<EOF
-#!/bin/sh
-
-python -m archinstall $@
-EOF
-
- chmod +x "${pkgdir}/usr/bin/archinstall"
-}
-
-# vim:ft=sh
-
diff --git a/PKGBUILDs/python-archinstall/PKGBUILD b/PKGBUILDs/python-archinstall/PKGBUILD
deleted file mode 100644
index 1c3876f5..00000000
--- a/PKGBUILDs/python-archinstall/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Anton Hvornum <anton@hvornum.se>
-# Contributor: demostanis worlds <demostanis@protonmail.com>
-
-pkgname="python-archinstall"
-pkgver="2.1.3"
-pkgdesc="Installs ${pkgname} as a python library."
-pkgrel=1
-url="https://github.com/archlinux/archinstall"
-source=("${pkgname}-v${pkgver}-x86_64.tar.gz::https://github.com/archlinux/archinstall/archive/v$pkgver.tar.gz")
-license=('GPLv3')
-provides=("${pkgname}")
-arch=('x86_64')
-depends=('python>=3.8')
-makedepends=('python-setuptools')
-optdepends=('pyttsx3: Adds text-to-speech support for log/screen output.')
-sha256sums=('53c00f7e7ad245cd2cbbf041b5a735df2fc29454c24b1d369f678cc0610b7cea')
-
-build() {
- cd "archinstall-${pkgver}"
-
- python setup.py build
-
- # Build man pages
- cd docs
- make man
-}
-
-package() {
- cd "archinstall-${pkgver}"
-
- python setup.py install \
- --prefix=/usr \
- --root="${pkgdir}" \
- --optimize=1
-
- install -Dm644 docs/_build/man/archinstall.1 "${pkgdir}"/usr/share/man/man1/archinstall.1
-}
-
-# vim:ft=sh
-
diff --git a/setup.cfg b/setup.cfg
index 3190791e..e5d79ef3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,10 +14,10 @@ project_urls =
Documentation = https://archinstall.readthedocs.io/
classifers =
Programming Language :: Python :: 3
- Programming Language :: Python :: 3.8
+ Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
- License :: OSI Approved :: GNU General Public License v3 (GPLv3)
- Operating System :: POSIX :: Linux
+ License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+ Operating System :: POSIX :: Linux
[options]
packages = find: