salfter/infnoise
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from psiegl/master

Browse Source 
Update support for ArchLinux
This commit is contained in:
Manuel Domke
2018-07-08 00:59:25 +02:00
committed by GitHub
parent eb95e4c3c5 b07ff84315
commit 379c40f367
7 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
software/build-scripts/PKGBUILD.arch
View File

@@ -15,9 +15,11 @@ build() {
package() { package() {
install -Dvm755 "${srcdir}/infnoise/software/infnoise" "${pkgdir}/usr/bin/infnoise" 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/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.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"
} }

40
software/build-scripts/build-archlinux.sh
View File

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

4
software/infnoise.c
View File

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

1
software/infnoise.h
View File

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

1
software/libinfnoise.c
View File

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

1
software/libinfnoise.h
View File

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

1
software/libinfnoise_private.h
View File

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