From d0536847885e79c9770861f34e47ba7cb3bdf0c0 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 4 Oct 2018 12:27:54 +0200 Subject: [PATCH] fix archlinux build (and removed i686 support) --- software/build-scripts/PKGBUILD.arch | 5 ++-- software/build-scripts/build-archlinux.sh | 29 ++++++----------------- 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/software/build-scripts/PKGBUILD.arch b/software/build-scripts/PKGBUILD.arch index 6f73584..08bd565 100644 --- a/software/build-scripts/PKGBUILD.arch +++ b/software/build-scripts/PKGBUILD.arch @@ -3,12 +3,13 @@ _pkgname=infnoise pkgname=${_pkgname} -pkgdesc='Infinite Noise TRNG - The world's easiest TRNG to get right' +pkgver=0.2.6.r86.g453234b +pkgdesc="Infinite Noise TRNG - The world's easiest TRNG to get right" license=('custom:Unlicense') url='https://github.com/13-37-org/infnoise' depends=('libftdi-compat') makedepends=("git") -source=('git+https://github.com/13-37-org/infnoise.git') +source=('git+https://github.com/13-37-org/infnoise') sha256sums=("SKIP") install='INSTALL' diff --git a/software/build-scripts/build-archlinux.sh b/software/build-scripts/build-archlinux.sh index a19d0d8..13f80ee 100755 --- a/software/build-scripts/build-archlinux.sh +++ b/software/build-scripts/build-archlinux.sh @@ -9,18 +9,17 @@ if [ $VERSION == $PKGREL ]; then # this is a release PKGREL=0 fi +SIGNPACKAGE=1 -SIGNPACKAGE=true while test $# -gt 0 do case "$1" in - --notsigned) SIGNPACKAGE=false + --notsigned) SIGNPACKAGE=0 ;; esac shift done - # x86_64 mkdir -p x86_64 cd x86_64 @@ -29,26 +28,12 @@ cp ../build-scripts/PKGBUILD.arch PKGBUILD cp ../build-scripts/INSTALL.arch INSTALL sed -i "s|.*source.*=.*(.*).*|source=('git+$GITREPO')|g" PKGBUILD -echo "pkgver=$VERSION.$PKGREL" >> PKGBUILD +#echo "pkgver=$VERSION.$PKGREL" >> PKGBUILD echo "pkgrel=1" >> PKGBUILD echo "arch=('x86_64')" >> PKGBUILD -if [ "$SIGNPACKAGE" == true ]; then - makepkg -f --sign --key 975DC25C4E730A3C -else - makepkg -f +makepkg -f + +if [ $SIGNPACKAGE -eq 1 ]; then + PKGEXT='.pkg.tar.xz' makepkg --packagelist | xargs -L1 gpg --sign fi - -cd .. - -# x86 -mkdir -p x86 -cd x86 - -cp ../build-scripts/PKGBUILD.arch PKGBUILD -cp ../build-scripts/INSTALL.arch INSTALL - -echo "pkgver=$VERSION.$PKGREL" >> PKGBUILD -echo "pkgrel=1" >> PKGBUILD -echo "arch=('i686')" >> PKGBUILD -makechrootpkg -r /x86 -U jenkins -- --sign --key 975DC25C4E730A3C