diff --git a/pkg/de-p1st-installer/PKGBUILD b/pkg/de-p1st-installer/PKGBUILD index ae8422a..0cb6c61 100644 --- a/pkg/de-p1st-installer/PKGBUILD +++ b/pkg/de-p1st-installer/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=installer _reponame=arch pkgname="de-p1st-$_pkgname" -pkgver=0.0.4 +pkgver=0.0.5 pkgrel=1 pkgdesc="Bash script to install Arch Linux" arch=('any') diff --git a/pkg/de-p1st-installer/de-p1st-installer.sh b/pkg/de-p1st-installer/de-p1st-installer.sh index c2c2adf..b44dcf3 100755 --- a/pkg/de-p1st-installer/de-p1st-installer.sh +++ b/pkg/de-p1st-installer/de-p1st-installer.sh @@ -136,7 +136,7 @@ function run_pacstrap() { # BIOS_TYPE echo "Running pacstrap ..." - PKGS=() + PKGS=("${ADDITIONAL_PKGS[@]}") case "${BIOS_TYPE}" in uefi) diff --git a/pkg/de-p1st-installer/installer.cfg b/pkg/de-p1st-installer/installer.cfg index 1e4bf63..b677858 100644 --- a/pkg/de-p1st-installer/installer.cfg +++ b/pkg/de-p1st-installer/installer.cfg @@ -28,6 +28,6 @@ BIOS_TYPE=uefi LEAVE_MOUNTED=1 PACSTRAP_INTERACTIVE=1 - -# TODO: additional pacman packages, e.g. -# ADD_PKGS=('de-p1st-kernel-default' 'de-p1st-ucode-amd') \ No newline at end of file +# Additional pacman packages, e.g. to specify the preferred providers and avoid questions during pacstrap +ADDITIONAL_PKGS=('initramfs' 'de-p1st-kernel-lts' 'de-p1st-ucode-placeholder') +# TODO: add initramfs to depends of base-efi? \ No newline at end of file diff --git a/pkg/de-p1st-makepkg/.install b/pkg/de-p1st-makepkg/.install new file mode 100644 index 0000000..b754ef5 --- /dev/null +++ b/pkg/de-p1st-makepkg/.install @@ -0,0 +1,15 @@ +## arg 1: the new package version +post_install() { + holo apply +} + +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + holo apply +} + +## arg 1: the old package version +post_remove() { + holo apply +} diff --git a/pkg/de-p1st-makepkg/PKGBUILD b/pkg/de-p1st-makepkg/PKGBUILD new file mode 100644 index 0000000..41d1c42 --- /dev/null +++ b/pkg/de-p1st-makepkg/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Daniel Langbein +_pkgname=makepkg +_reponame=arch +pkgname="de-p1st-$_pkgname" +pkgver=0.0.1 +pkgrel=1 +pkgdesc="Personalized makepkg.conf" +arch=('any') +url="https://codeberg.org/privacy1st/${_reponame}" +license=('MIT') +groups=() +depends=('pacman' 'holo') # /etc/makepkg.conf belongs to pacman +makedepends=('git') +optdepends=() +provides=() +conflicts=() +replaces=() +backup=() +options=() +install='.install' +changelog= +source=("git+${url}.git") +noextract=() +sha256sums=('SKIP') + +package() { + cd "${_reponame}/pkg/${pkgname}" + + install -Dm0544 makepkg.conf.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/makepkg.conf.holoscript +} diff --git a/pkg/de-p1st-makepkg/makepkg.conf.holoscript b/pkg/de-p1st-makepkg/makepkg.conf.holoscript new file mode 100644 index 0000000..e6d70ac --- /dev/null +++ b/pkg/de-p1st-makepkg/makepkg.conf.holoscript @@ -0,0 +1,5 @@ +#!/bin/sh +# stdin: default config +# stdout: modified config + +sed 's|^#PACKAGER=.*$|PACKAGER="Daniel Langbein "|'