Merge pull request #1 from psiegl/master

Update support for ArchLinux

software/build-scripts/PKGBUILD.arch

@@ -15,9 +15,11 @@ build() {
 
 package() {
   install -Dvm755 "${srcdir}/infnoise/software/infnoise" "${pkgdir}/usr/bin/infnoise"
+  install -Dvm644 "${srcdir}/infnoise/software/libinfnoise.a" "${pkgdir}/usr/lib/libinfnoise.a"
+  install -Dvm755 "${srcdir}/infnoise/software/libinfnoise.so" "${pkgdir}/usr/lib/libinfnoise.so"
   install -Dvm644 "${srcdir}/infnoise/software/init_scripts/75-infnoise.rules" "${pkgdir}/etc/udev/rules.d/75-infnoise.rules"
   install -Dvm644 "${srcdir}/infnoise/software/init_scripts/infnoise.conf.systemd" "${pkgdir}/etc/infnoise.conf"
-  install -Dvm644 "${srcdir}/infnoise/software/init_scripts/infnoise.service.bin" "${pkgdir}/lib/systemd/system/infnoise.service"
+  install -Dvm644 "${srcdir}/infnoise/software/init_scripts/infnoise.service.bin" "${pkgdir}/usr/lib/systemd/system/infnoise.service"
 }
 
 

software/build-scripts/build-archlinux.sh

@@ -3,29 +3,49 @@
 VERSION=`git --no-pager describe --tags --always | cut -d'-' -f1`
 PKGREL=`git --no-pager describe --tags --always | cut -d'-' -f2`
 
+GITREPO=`git config --get remote.origin.url`
+
 if [ $VERSION == $PKGREL ]; then # this is a release
 	PKGREL=0
 fi
 
+
+SIGNPACKAGE=true
+while test $# -gt 0
+do
+    case "$1" in
+        --notsigned) SIGNPACKAGE=false
+            ;;
+    esac
+    shift
+done
+
+
 # x86_64
 mkdir -p x86_64
 cd x86_64
 
-cp ../build-scripts/PKGBUILD.arch PKGBUILD
-cp ../build-scripts/INSTALL.arch INSTALL
-echo "pkgver=$VERSION" >> PKGBUILD
-echo "pkgrel=$PKGREL" >> PKGBUILD
+cp ../PKGBUILD.arch PKGBUILD
+cp ../INSTALL.arch INSTALL
+sed -i "s|.*source.*=.*(.*).*|source=('git+$GITREPO')|g" PKGBUILD
+echo "pkgver=$VERSION.$PKGREL" >> PKGBUILD
+echo "pkgrel=1" >> PKGBUILD
 echo "arch=('x86_64')" >> PKGBUILD
 ls -lah
+if [ "$SIGNPACKAGE" = true ]; then
   makepkg -f --sign --key 975DC25C4E730A3C
+else
+  makepkg -f
+fi
 cd ..
 
-# x86_64
+# x86
 mkdir -p x86
 cd x86
-cp ../build-scripts/PKGBUILD.arch PKGBUILD
-cp ../build-scripts/INSTALL.arch INSTALL
-echo "pkgver=$VERSION" >> PKGBUILD
-echo "pkgrel=$PKGREL" >> PKGBUILD
+
+cp ../PKGBUILD.arch PKGBUILD
+cp ../INSTALL.arch INSTALL
+echo "pkgver=$VERSION.$PKGREL" >> PKGBUILD
+echo "pkgrel=1" >> PKGBUILD
 echo "arch=('i686')" >> PKGBUILD
 makechrootpkg -r /x86 -U jenkins -- --sign --key 975DC25C4E730A3C

software/infnoise.c

@@ -10,8 +10,8 @@
 #include <unistd.h>
 #include <string.h>
 #include <time.h>
-
-#include <ftdi.h>
+#include <sys/types.h>
+#include <ftdi.h> // requires <sys/types.h>
 #include "infnoise.h"
 #include "libinfnoise.h"
 #include "libinfnoise_private.h"

software/infnoise.h

@@ -1,6 +1,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/types.h>
+#include <linux/limits.h>
 #include <ftdi.h>
 
 // Structure for parsed command line options

software/libinfnoise.c

@@ -13,6 +13,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <time.h>
+#include <sys/types.h>
 #include <ftdi.h>
 #include "libinfnoise_private.h"
 #include "libinfnoise.h"

software/libinfnoise.h

@@ -1,6 +1,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/types.h>
+#include <linux/limits.h>
 #include <ftdi.h>
 #include <time.h>
 

software/libinfnoise_private.h

@@ -1,6 +1,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/types.h>
+#include <linux/limits.h>
 #include <ftdi.h>
 #include <time.h>