From 075d9fe65394c9248eb7de17d1a230e648f9a8ac Mon Sep 17 00:00:00 2001 From: langfingaz Date: Sun, 2 May 2021 21:58:11 +0200 Subject: [PATCH] mkinitcpio with lz4 compression; cleanup --- pkg/de-p1st-base-efi/PKGBUILD | 8 +++-- pkg/de-p1st-mkinitcpio/.install | 15 ++++++++++ pkg/de-p1st-mkinitcpio/PKGBUILD | 30 +++++++++++++++++++ .../mkinitcpio.conf.holoscript | 5 ++++ pkg/de-p1st-nano/.install | 20 ------------- pkg/de-p1st-networkmanager/.install | 25 ---------------- pkg/de-p1st-pacman-mirrorlist/.install | 20 ------------- pkg/de-p1st-pacman/.install | 20 ------------- pkg/de-p1st-smartcard/.install | 20 ------------- pkg/de-p1st-systemd/.install | 25 ---------------- prototype/proto-holo-and-systemd.install | 20 ------------- prototype/proto-holo.install | 20 ------------- prototype/proto-systemctl.install | 25 ---------------- 13 files changed, 55 insertions(+), 198 deletions(-) create mode 100644 pkg/de-p1st-mkinitcpio/.install create mode 100644 pkg/de-p1st-mkinitcpio/PKGBUILD create mode 100644 pkg/de-p1st-mkinitcpio/mkinitcpio.conf.holoscript diff --git a/pkg/de-p1st-base-efi/PKGBUILD b/pkg/de-p1st-base-efi/PKGBUILD index 96c8bfb..0573da6 100644 --- a/pkg/de-p1st-base-efi/PKGBUILD +++ b/pkg/de-p1st-base-efi/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=base-efi _reponame=arch pkgname="de-p1st-$_pkgname" -pkgver=0.1.2 +pkgver=0.1.3 pkgrel=1 pkgdesc="base packages for headless Arch installation" arch=('any') @@ -10,8 +10,10 @@ url="https://codeberg.org/privacy1st/${_reponame}" license=('MIT') groups=() - -depends=('base' 'meta-group-base-devel' 'linux-firmware' 'man-db' 'man-pages' 'de-p1st-nano') +# lz4 enabled mkinitcpio +depends=('de-p1st-mkinitcpio') +# basic stuff +depends+=('base' 'meta-group-base-devel' 'linux-firmware' 'man-db' 'man-pages' 'de-p1st-nano') # filesystems: luks, btrfs, ext4, f2fs depends+=('lvm2' 'btrfs-progs' 'e2fsprogs' 'f2fs-tools') # filesystems: exfat support diff --git a/pkg/de-p1st-mkinitcpio/.install b/pkg/de-p1st-mkinitcpio/.install new file mode 100644 index 0000000..b754ef5 --- /dev/null +++ b/pkg/de-p1st-mkinitcpio/.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-mkinitcpio/PKGBUILD b/pkg/de-p1st-mkinitcpio/PKGBUILD new file mode 100644 index 0000000..2884eda --- /dev/null +++ b/pkg/de-p1st-mkinitcpio/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Daniel Langbein +_pkgname=mkinitcpio +_reponame=arch +pkgname="de-p1st-$_pkgname" +pkgver=0.0.1 +pkgrel=1 +pkgdesc="mkinitcpio with lz4 compression" +arch=('any') +url="https://codeberg.org/privacy1st/${_reponame}" +license=('MIT') +groups=() +depends=('mkinitcpio' 'holo') +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 mkinitcpio.conf.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/mkinitcpio.conf.holoscript +} diff --git a/pkg/de-p1st-mkinitcpio/mkinitcpio.conf.holoscript b/pkg/de-p1st-mkinitcpio/mkinitcpio.conf.holoscript new file mode 100644 index 0000000..5e064c5 --- /dev/null +++ b/pkg/de-p1st-mkinitcpio/mkinitcpio.conf.holoscript @@ -0,0 +1,5 @@ +#!/bin/sh +# stdin: default config +# stdout: modified config +cat +echo 'COMPRESSION="lz4"' diff --git a/pkg/de-p1st-nano/.install b/pkg/de-p1st-nano/.install index 8ef8a94..b754ef5 100644 --- a/pkg/de-p1st-nano/.install +++ b/pkg/de-p1st-nano/.install @@ -1,34 +1,14 @@ -# This is a default template for a post-install scriptlet. -# Uncomment only required functions and remove any functions -# you don't need (and this header). - -## arg 1: the new package version -#pre_install() { - # do something here -#} - ## arg 1: the new package version post_install() { holo apply } -## arg 1: the new package version -## arg 2: the old package version -#pre_upgrade() { - # do something here -#} - ## arg 1: the new package version ## arg 2: the old package version post_upgrade() { holo apply } -## arg 1: the old package version -#pre_remove() { - # do something here -#} - ## arg 1: the old package version post_remove() { holo apply diff --git a/pkg/de-p1st-networkmanager/.install b/pkg/de-p1st-networkmanager/.install index 24823e5..21cb3d8 100644 --- a/pkg/de-p1st-networkmanager/.install +++ b/pkg/de-p1st-networkmanager/.install @@ -1,35 +1,10 @@ -# This is a default template for a post-install scriptlet. -# Uncomment only required functions and remove any functions -# you don't need (and this header). - -## arg 1: the new package version -#pre_install() { - # do something here -#} - ## arg 1: the new package version post_install() { systemctl preset-all } -## arg 1: the new package version -## arg 2: the old package version -#pre_upgrade() { - # do something here -#} - ## arg 1: the new package version ## arg 2: the old package version post_upgrade() { systemctl preset-all } - -## arg 1: the old package version -#pre_remove() { - # do something here -#} - -## arg 1: the old package version -# post_remove() { - # do something here -# } diff --git a/pkg/de-p1st-pacman-mirrorlist/.install b/pkg/de-p1st-pacman-mirrorlist/.install index 8ef8a94..b754ef5 100644 --- a/pkg/de-p1st-pacman-mirrorlist/.install +++ b/pkg/de-p1st-pacman-mirrorlist/.install @@ -1,34 +1,14 @@ -# This is a default template for a post-install scriptlet. -# Uncomment only required functions and remove any functions -# you don't need (and this header). - -## arg 1: the new package version -#pre_install() { - # do something here -#} - ## arg 1: the new package version post_install() { holo apply } -## arg 1: the new package version -## arg 2: the old package version -#pre_upgrade() { - # do something here -#} - ## arg 1: the new package version ## arg 2: the old package version post_upgrade() { holo apply } -## arg 1: the old package version -#pre_remove() { - # do something here -#} - ## arg 1: the old package version post_remove() { holo apply diff --git a/pkg/de-p1st-pacman/.install b/pkg/de-p1st-pacman/.install index 8ef8a94..b754ef5 100644 --- a/pkg/de-p1st-pacman/.install +++ b/pkg/de-p1st-pacman/.install @@ -1,34 +1,14 @@ -# This is a default template for a post-install scriptlet. -# Uncomment only required functions and remove any functions -# you don't need (and this header). - -## arg 1: the new package version -#pre_install() { - # do something here -#} - ## arg 1: the new package version post_install() { holo apply } -## arg 1: the new package version -## arg 2: the old package version -#pre_upgrade() { - # do something here -#} - ## arg 1: the new package version ## arg 2: the old package version post_upgrade() { holo apply } -## arg 1: the old package version -#pre_remove() { - # do something here -#} - ## arg 1: the old package version post_remove() { holo apply diff --git a/pkg/de-p1st-smartcard/.install b/pkg/de-p1st-smartcard/.install index 6c51fc5..215ed0f 100644 --- a/pkg/de-p1st-smartcard/.install +++ b/pkg/de-p1st-smartcard/.install @@ -1,24 +1,9 @@ -# This is a default template for a post-install scriptlet. -# Uncomment only required functions and remove any functions -# you don't need (and this header). - -## arg 1: the new package version -#pre_install() { - # do something here -#} - ## arg 1: the new package version post_install() { holo apply systemctl preset-all } -## arg 1: the new package version -## arg 2: the old package version -#pre_upgrade() { - # do something here -#} - ## arg 1: the new package version ## arg 2: the old package version post_upgrade() { @@ -26,11 +11,6 @@ post_upgrade() { systemctl preset-all } -## arg 1: the old package version -#pre_remove() { - # do something here -#} - ## arg 1: the old package version post_remove() { holo apply diff --git a/pkg/de-p1st-systemd/.install b/pkg/de-p1st-systemd/.install index 24823e5..21cb3d8 100644 --- a/pkg/de-p1st-systemd/.install +++ b/pkg/de-p1st-systemd/.install @@ -1,35 +1,10 @@ -# This is a default template for a post-install scriptlet. -# Uncomment only required functions and remove any functions -# you don't need (and this header). - -## arg 1: the new package version -#pre_install() { - # do something here -#} - ## arg 1: the new package version post_install() { systemctl preset-all } -## arg 1: the new package version -## arg 2: the old package version -#pre_upgrade() { - # do something here -#} - ## arg 1: the new package version ## arg 2: the old package version post_upgrade() { systemctl preset-all } - -## arg 1: the old package version -#pre_remove() { - # do something here -#} - -## arg 1: the old package version -# post_remove() { - # do something here -# } diff --git a/prototype/proto-holo-and-systemd.install b/prototype/proto-holo-and-systemd.install index 6c51fc5..215ed0f 100644 --- a/prototype/proto-holo-and-systemd.install +++ b/prototype/proto-holo-and-systemd.install @@ -1,24 +1,9 @@ -# This is a default template for a post-install scriptlet. -# Uncomment only required functions and remove any functions -# you don't need (and this header). - -## arg 1: the new package version -#pre_install() { - # do something here -#} - ## arg 1: the new package version post_install() { holo apply systemctl preset-all } -## arg 1: the new package version -## arg 2: the old package version -#pre_upgrade() { - # do something here -#} - ## arg 1: the new package version ## arg 2: the old package version post_upgrade() { @@ -26,11 +11,6 @@ post_upgrade() { systemctl preset-all } -## arg 1: the old package version -#pre_remove() { - # do something here -#} - ## arg 1: the old package version post_remove() { holo apply diff --git a/prototype/proto-holo.install b/prototype/proto-holo.install index 8ef8a94..b754ef5 100644 --- a/prototype/proto-holo.install +++ b/prototype/proto-holo.install @@ -1,34 +1,14 @@ -# This is a default template for a post-install scriptlet. -# Uncomment only required functions and remove any functions -# you don't need (and this header). - -## arg 1: the new package version -#pre_install() { - # do something here -#} - ## arg 1: the new package version post_install() { holo apply } -## arg 1: the new package version -## arg 2: the old package version -#pre_upgrade() { - # do something here -#} - ## arg 1: the new package version ## arg 2: the old package version post_upgrade() { holo apply } -## arg 1: the old package version -#pre_remove() { - # do something here -#} - ## arg 1: the old package version post_remove() { holo apply diff --git a/prototype/proto-systemctl.install b/prototype/proto-systemctl.install index 24823e5..21cb3d8 100644 --- a/prototype/proto-systemctl.install +++ b/prototype/proto-systemctl.install @@ -1,35 +1,10 @@ -# This is a default template for a post-install scriptlet. -# Uncomment only required functions and remove any functions -# you don't need (and this header). - -## arg 1: the new package version -#pre_install() { - # do something here -#} - ## arg 1: the new package version post_install() { systemctl preset-all } -## arg 1: the new package version -## arg 2: the old package version -#pre_upgrade() { - # do something here -#} - ## arg 1: the new package version ## arg 2: the old package version post_upgrade() { systemctl preset-all } - -## arg 1: the old package version -#pre_remove() { - # do something here -#} - -## arg 1: the old package version -# post_remove() { - # do something here -# }