From 0eff5d875fa3be9c61d2bcb8aa4faaba3eaee79c Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Mon, 18 Jul 2022 20:23:12 +0200 Subject: [PATCH] add PKGBUILD prototype with subpackages; fix de-p1st-grub --- pkg/de-p1st-base/PKGBUILD | 29 +++++++++---------- pkg/de-p1st-grub/PKGBUILD | 2 +- pkg/de-p1st-grub/README.md | 2 ++ pkg/de-p1st-grub/grub.holoscript | 2 +- pkg/de-p1st-locale/README.md | 3 -- .../{redshift.md => README.md} | 4 +-- pkg/de-p1st-repo/README.md | 10 +++---- pkg/de-p1st-sddm-theme-nordic/README.md | 2 +- pkg/de-p1st-theme/README.md | 2 +- pkg/de-p1st-xfce4/PKGBUILD | 8 ++--- prototype/proto-subpackages.PKGBUILD | 23 +++++++++++++++ 11 files changed, 54 insertions(+), 33 deletions(-) rename pkg/de-p1st-redshift/{redshift.md => README.md} (98%) create mode 100644 prototype/proto-subpackages.PKGBUILD diff --git a/pkg/de-p1st-base/PKGBUILD b/pkg/de-p1st-base/PKGBUILD index bf76beb..33c9521 100644 --- a/pkg/de-p1st-base/PKGBUILD +++ b/pkg/de-p1st-base/PKGBUILD @@ -3,28 +3,28 @@ _pkgname=base _reponame=arch pkgname="de-p1st-$_pkgname" pkgver=0.2.1 -pkgrel=1 -pkgdesc="base meta package for headless Arch installation on EFI system" +pkgrel=2 +pkgdesc="Base meta package for headless Arch Linux installation on EFI system" arch=('any') url="https://codeberg.org/privacy1st/${_reponame}" license=('MIT') depends=() -# Kernel + Headers +# Kernel and headers depends=('de-p1st-kernel') # lz4 enabled mkinitcpio depends+=('de-p1st-mkinitcpio') -# basic stuff +# Basic stuff depends+=('base' 'base-devel-meta' 'linux-firmware' 'man-db' 'man-pages' 'de-p1st-nano') # CPU vendor specific microcode depends+=('de-p1st-ucode') -# filesystems: luks, btrfs, ext4, f2fs +# Filesystems: luks, btrfs, ext4, f2fs depends+=('lvm2' 'btrfs-progs' 'e2fsprogs' 'f2fs-tools') -# filesystems: exfat support +# Filesystems: exfat support depends+=('fuse-exfat' 'exfat-utils') -# filesystems: ntfs write support +# Filesystems: ntfs write support depends+=('ntfs-3g') -# bootmanager +# Bootmanager depends+=('de-p1st-grub' 'efibootmgr') # systemd with time synchronization and journal size limit depends+=('de-p1st-systemd') @@ -36,18 +36,17 @@ depends+=('de-p1st-makepkg') depends+=('de-p1st-sudo') # shell depends+=('zsh' 'zsh-completions' 'grml-zsh-config') -# virtual console keyboard config +# Virtual console keyboard config depends+=('de-p1st-keyboard') -# locale and timezone +# Locale and timezone depends+=('de-p1st-locale') -# networking +# Networking depends+=('de-p1st-networkmanager' 'de-p1st-dns') -# gnupg +# GnuPG depends+=('de-p1st-gnupg') -# pam configuration +# PAM configuration depends+=('de-p1st-pam') - -# task manager +# Taskmanager depends+=('de-p1st-htop') diff --git a/pkg/de-p1st-grub/PKGBUILD b/pkg/de-p1st-grub/PKGBUILD index 9558aac..c4d1a94 100644 --- a/pkg/de-p1st-grub/PKGBUILD +++ b/pkg/de-p1st-grub/PKGBUILD @@ -3,7 +3,7 @@ _pkgname=grub _reponame=arch pkgname="de-p1st-$_pkgname" pkgver=0.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="grub with configuration" arch=('any') url="https://codeberg.org/privacy1st/${_reponame}" diff --git a/pkg/de-p1st-grub/README.md b/pkg/de-p1st-grub/README.md index 79a758f..c1b9bb1 100644 --- a/pkg/de-p1st-grub/README.md +++ b/pkg/de-p1st-grub/README.md @@ -1,5 +1,7 @@ # grub +TODO: `grub-mkconfig -o /boot/grub/grub.cfg` + ## efi setup See [/etc/grub.d/40_efi_setup](40_efi_setup) diff --git a/pkg/de-p1st-grub/grub.holoscript b/pkg/de-p1st-grub/grub.holoscript index 74ec1d6..867cb8d 100644 --- a/pkg/de-p1st-grub/grub.holoscript +++ b/pkg/de-p1st-grub/grub.holoscript @@ -6,6 +6,6 @@ set -e # 1) and 2) remember last selected entry; 3) disable submenu sed ' s|^GRUB_DEFAULT=0$|GRUB_DEFAULT=saved|; - s|^#GRUB_SAVEDEFAULT="true"$|#GRUB_SAVEDEFAULT="true"|; + s|^#GRUB_SAVEDEFAULT=true$|GRUB_SAVEDEFAULT=true|; s|^#GRUB_DISABLE_SUBMENU=y$|GRUB_DISABLE_SUBMENU=y|; ' diff --git a/pkg/de-p1st-locale/README.md b/pkg/de-p1st-locale/README.md index 8947006..69e80b7 100644 --- a/pkg/de-p1st-locale/README.md +++ b/pkg/de-p1st-locale/README.md @@ -1,8 +1,5 @@ # locale -**Note**: One may need to delete `/etc/locale.conf` -and `/etc/localtime` before installing this pkg! - ## locale.conf * Archwiki: [Locale](https://wiki.archlinux.org/index.php/Locale) diff --git a/pkg/de-p1st-redshift/redshift.md b/pkg/de-p1st-redshift/README.md similarity index 98% rename from pkg/de-p1st-redshift/redshift.md rename to pkg/de-p1st-redshift/README.md index 61a8564..ca5d604 100644 --- a/pkg/de-p1st-redshift/redshift.md +++ b/pkg/de-p1st-redshift/README.md @@ -1,6 +1,6 @@ # redsihft -``` +```shell sudo pacman -S --needed redshift ``` @@ -19,7 +19,7 @@ Config file: Linux/macOS: `~/.config/redshift/redshift.conf` or `${XDG_CONFIG_HOME}/redshift/redshift.conf` (if `XDG_CONFIG_HOME` is defined). -``` +```shell mkdir -p ~/.config/redshift cat << 'EOF' > ~/.config/redshift/redshift.conf diff --git a/pkg/de-p1st-repo/README.md b/pkg/de-p1st-repo/README.md index 7e35632..5d2ced7 100644 --- a/pkg/de-p1st-repo/README.md +++ b/pkg/de-p1st-repo/README.md @@ -1,4 +1,4 @@ -# Arch repository manager +# Arch Linux repository manager Special thanks to nachoparker for his article: @@ -13,7 +13,7 @@ Adjust [/etc/de-p1st-repo/arch-repo.conf](arch-repo.cfg) according to your needs Run a webserver on the server to serve static content: -* https://hub.docker.com/_/nginx/ -> Hosting some simple static content +* [https://hub.docker.com/_/nginx/]() -> Hosting some simple static content * `sudo docker run --name arch-repo -v /mnt/data/live/arch-repo:/usr/share/nginx/html:ro -d nginx` Add the newly created mirror to your `/etc/pacman.conf`: @@ -37,10 +37,10 @@ arch-repo-vercmp Then build those packages locally and push changes to remote repository ```shell -# build on local machine in clean chroot or with AUR helper, e.g. -aur sync -c SOME_AUR_PACKAGE +# Build on local machine in clean chroot (or with an AUR helper), e.g. +makepkg -fCcsr -# push new packages to remote repository +# Push new packages to remote repository arch-repo-push-new ``` diff --git a/pkg/de-p1st-sddm-theme-nordic/README.md b/pkg/de-p1st-sddm-theme-nordic/README.md index f8b78f0..5feb5d3 100644 --- a/pkg/de-p1st-sddm-theme-nordic/README.md +++ b/pkg/de-p1st-sddm-theme-nordic/README.md @@ -1,4 +1,4 @@ -# sddm themes +# SDDM themes * https://www.opendesktop.org/browse/cat/101/page/2/ord/rating/ * https://aur.archlinux.org/packages/?O=0&SeB=nd&K=sddm+theme&outdated=&SB=p&SO=d&PP=50&do_Search=Go diff --git a/pkg/de-p1st-theme/README.md b/pkg/de-p1st-theme/README.md index c06bd7c..036ae66 100644 --- a/pkg/de-p1st-theme/README.md +++ b/pkg/de-p1st-theme/README.md @@ -11,7 +11,7 @@ If using XFCE4 or Gnome this is the default theme. No action required. ## qt5 ```shell -aur sync -c adwaita-qt +sudo pacman -S --needed adwaita-qt5 ``` Enable via env variable. diff --git a/pkg/de-p1st-xfce4/PKGBUILD b/pkg/de-p1st-xfce4/PKGBUILD index 074907a..b97b188 100644 --- a/pkg/de-p1st-xfce4/PKGBUILD +++ b/pkg/de-p1st-xfce4/PKGBUILD @@ -79,7 +79,7 @@ depends+=(python-nautilus) # e.g. Nextcloud integration depends+=(nautilus-terminal) # open/close terminal in current folder with `F4` depends+=(libnotify cmark-gfm de-p1st-image-width-limit wkhtmltopdf) # md-to-pdf script depends on these packages -# compression/archiving +# Compression/Archiving # -> https://docs.xfce.org/xfce/thunar/archive#supported_archive_managers # # Option1: thunar and xarchiver @@ -94,7 +94,7 @@ depends+=(file-roller) # ============== audio ============== # pulseaudio - base depends+=('pulseaudio' 'pulseaudio-alsa' 'pavucontrol') -# pulseaudio - xfce4 +# pulseaudio - Xfce4 depends+=('xfce4-pulseaudio-plugin') # sound theme depends+=('libcanberra' 'libcanberra-pulse') @@ -123,8 +123,8 @@ optdepends=() optdepends+=('seahorse: Manage the contents of GNOME Keyring; manage GPG keys') optdepends+=('seahorse-nautilus: PGP encryption and signing for nautilus') -# `Ctrl` + `Ctrl` shortcut to toggle between layouts: -# Keyboard > Layout > Change layout option > Both Ctrl together +# `win` + `space` shortcut to toggle between layouts: +# Keyboard > Layout > Change layout option > `win` + `space` optdepends+=('xfce4-xkb-plugin: Panel plugin to toggle between keyboard layouts') build() { diff --git a/prototype/proto-subpackages.PKGBUILD b/prototype/proto-subpackages.PKGBUILD new file mode 100644 index 0000000..9a2ca64 --- /dev/null +++ b/prototype/proto-subpackages.PKGBUILD @@ -0,0 +1,23 @@ +# Maintainer: Daniel Langbein +pkgbase="de-p1st-subpackage-test" +pkgname=("${pkgbase}1" "${pkgbase}2") +pkgver=0.0.1 +pkgrel=1 +pkgdesc="for testing purposes only" +arch=('any') +license=('MIT') +depends=('git') + +package_de-p1st-subpackage-test1 () { + pkgdesc="for testing purposes only (1)" + depends=("nano") + # pkgver can not be set inside a package function + # pkgrel can not be set inside a package function +} + +package_de-p1st-subpackage-test2 () { + pkgdesc="for testing purposes only (2)" + depends=("vim") + # pkgver can not be set inside a package function + # pkgrel can not be set inside a package function +}