diff --git a/PKGBUILD b/PKGBUILD index 8d51a36..5d7000d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ pkgbase=mkessler pkgname=(mkessler-base mkessler-xmonad mkessler-x mkessler-audio mkessler-software mkessler-print mkessler-locale mkessler-desktop mkessler-devel mkessler-signing-key) -pkgver=0.6 +pkgver=0.7 pkgrel=1 pkgdesc="Base system configuration for mkessler systems" arch=('any') @@ -11,6 +11,17 @@ url="https://gitlab.com/kesslermaximilian/arch-pkgs" source=(https://mkessler-arch.maximilian-kessler.de/signing_key) b2sums=(b0e1a6bc60f99bdda99dd053ef869a9f3f899ced7a4b23db3718baaee374375ca4013ac3eab2eb3ef6d645083722f9305c484661cd1246f6ec2e3bf62dbf95a4) +package_mkessler-signing-key() { + # Install this package after pacman to ensure that its keyring is initialized + depends=(pacman) + + install=mkessler-signing-key.install + + install -d "$pkgdir"/opt + mkdir -p "$pkgdir"/opt/mkessler/signing-key + cp ${srcdir}/signing_key "$pkgdir"/opt/mkessler/signing-key/signing_key +} + package_mkessler-base() { # Base packages depends=(base linux linux-firmware man-db man-pages lvm2) @@ -26,6 +37,9 @@ package_mkessler-base() { # network depends+=(dhcpcd networkmanager) + + # install signing key + depends+=(mkessler-signing-key) } package_mkessler-xmonad() { @@ -105,9 +119,3 @@ package_mkessler-devel() { depends+=(python python-pip) } -package_mkessler-signing-key() { - # Install this package after pacman to ensure that its keyring is initialized - depends=(pacman) - - install=mkessler-signing-key.install -} diff --git a/mkessler-signing-key.install b/mkessler-signing-key.install index 548f2ae..47dd2e9 100644 --- a/mkessler-signing-key.install +++ b/mkessler-signing-key.install @@ -1,4 +1,4 @@ post_install() { - pacman-key --add signing_key + pacman-key --add /opt/mkessler/signing-key/signing_key pacman-key --lsign B419CDA93D7544F8214B3216A23D90C2433DAFBC }