From fb365f1694f5a5c33d8e9ede3968624c646fbada Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Fri, 22 Mar 2019 18:35:45 +0200 Subject: Fix PKGBUILD --- linux/makepkg/PKGBUILD | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/linux/makepkg/PKGBUILD b/linux/makepkg/PKGBUILD index badf319..105d6f3 100644 --- a/linux/makepkg/PKGBUILD +++ b/linux/makepkg/PKGBUILD @@ -14,7 +14,7 @@ license=('GPL3') depends=('qt5-webengine>=5.11.0' 'boost-libs>=1.66.0') optdepends=('firejail: launch a sandboxed instance') -makedepends=('git' 'meson' 'pkg-config' 'python-kconfiglib' 'asciidoctor' 'openssl') +makedepends=('git' 'meson' 'boost' 'python-kconfiglib' 'openssl') # this is the central repository source=("git+https://neueland.iserlohn-fortress.net/gitea/aeon/smolbote.git" @@ -54,7 +54,7 @@ prepare() { msg2 "Keypair written to $srcdir/signing/privateKey.pem." openssl rsa -in privateKey.pem -pubout -out publicKey.pem - ./tools/hexdump.py --name='publicKey_pem' publicKey.pem $srcdir/smolbote/src/plugin/publicKey.h + python3 $srcdir/smolbote/tools/hexdump.py --name='publicKey_pem' publicKey.pem --output=$srcdir/smolbote/src/plugin/publicKey.h msg2 "Public key exported to $srcdir/signing/publicKey.pem." fi } @@ -85,7 +85,6 @@ build() { # b_lto: Use link time optimization meson --buildtype=plain --prefix=/usr/local --auto-features=disabled \ -Db_pie=true -Db_lto=true -Dcpp_link_args="-fuse-ld=gold" \ - -Dmanpage=enabled \ $srcdir/build # Run menuconfig @@ -101,10 +100,13 @@ package() { cd $srcdir/build DESTDIR="$pkgdir" ninja install + if [ -n $_signPlugins ]; then msg "Signing plugins" for so in $pkgdir/usr/local/lib/smolbote/plugins/*.so; do openssl dgst -sha256 -sign $srcdir/signing/privateKey.pem -out $so.sig $so - install -m644 $so.sig $pkgdir/usr/lib/smolbote/plugins/$so.sig + # If the sigs were in another location, use + #install -m644 -t $pkgdir/usr/local/lib/smolbote/plugins $so.sig done + fi # _signPlugins } -- cgit v1.2.1