Fix build and update version.

3 files changed, 63 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 26f318443587..d1cc8edbd52a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = hackrf-git
 	pkgdesc = Driver for HackRF, allowing general purpose software defined radio (SDR).
-	pkgver = r2105.b02a8f2
+	pkgver = v2018.01.1.r335.g509c8f4
 	pkgrel = 1
 	url = https://github.com/mossmann/hackrf
 	arch = i686
diff --git a/.gitignore b/.gitignore
index cae0e475d021..8712bee933ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ src
 pkg
 hackrf-git
 *pkg.tar.xz
+tags
diff --git a/PKGBUILD b/PKGBUILD
index 5131fa033cb9..7762b1bf844c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Tony Lambiris <tony@criticalstack.com>
 
 pkgname=hackrf-git
-pkgver=r2105.b02a8f2
+pkgver=v2018.01.1.r335.g509c8f4
 pkgrel=1
 pkgdesc="Driver for HackRF, allowing general purpose software defined radio (SDR)."
 arch=('i686' 'x86_64')
@@ -13,67 +13,81 @@ conflicts=('hackrf')
 provides=('hackrf')
 source=("$pkgname::git+https://github.com/mossmann/hackrf" 'hackrf.conf')
 sha256sums=('SKIP'
-		'8246a539049ec2bd6226337d8d9b4f48bd503d77de13408a5751d2a60dc76965')
+            '8246a539049ec2bd6226337d8d9b4f48bd503d77de13408a5751d2a60dc76965')
 
 pkgver() {
 	cd "$srcdir/$pkgname"
-		printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+
+	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-	cd "$srcdir/$pkgname/host"
-# FS#41895
-		sed -i 's|MODE.*$|TAG+="uaccess"|' libhackrf/53-hackrf.rules*
+	cd "$srcdir/$pkgname"
+
+	git submodule update --init --recursive
+
+	# FS#41895
+	sed -i 's|MODE.*$|TAG+="uaccess"|' host/libhackrf/53-hackrf.rules*
 }
 
 build() {
 	cd "$srcdir/$pkgname"
-		git submodule update --init --recursive
 
-		cd "$srcdir/$pkgname/host"
-		mkdir -p build
-		cd build
-		cmake -DCMAKE_INSTALL_PREFIX=/usr ../
+	mkdir -p host/build
+	pushd host/build
+	cmake .. \
+		-DCMAKE_C_FLAGS="-Os -g -Wall -Wextra -fno-common" \
+		-DCMAKE_CXX_FLAGS="-Os -g -Wall -Wextra -fno-common" \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_VERBOSE_MAKEFILE=OFF
+	make
+	popd
+
+	mkdir -p firmware-bin
+	cp -fv firmware/cpld/sgpio_if/default.xsvf firmware-bin/hackrf_cpld_default.xsvf
+
+	cd firmware
+	make -C libopencm3
+
+	for board in HACKRF_ONE JAWBREAKER RAD1O; do
+		msg "Building firmware for ${board}"
+
+		mkdir -p "build-${board,,}"
+		pushd "build-${board,,}"
+
+		cmake .. \
+			-DCMAKE_C_FLAGS="-Os -g -Wall -Wextra -fno-common" \
+			-DCMAKE_CXX_FLAGS="-Os -g -Wall -Wextra -fno-common" \
+			-DCMAKE_INSTALL_PREFIX=/usr \
+			-DCMAKE_VERBOSE_MAKEFILE=OFF \
+			-DBOARD="${board}"
 		make
 
-		cd "$srcdir/$pkgname/firmware"
-		make -C libopencm3
-
-		mkdir -p "$srcdir/$pkgname/firmware-bin"
-		cp -f "cpld/sgpio_if/default.xsvf" \
-		"$srcdir/$pkgname/firmware-bin/hackrf_cpld_default.xsvf"
-
-		for board in {HACKRF_ONE,JAWBREAKER,RAD1O}; do
-			msg "Building firmware for $board"
-				mkdir -p "build-$board"
-				pushd "build-$board"
-
-				cmake \
-				-DCMAKE_C_FLAGS="-Os -g -Wall -Wextra -fno-common" \
-				-DBOARD="$board" -DCMAKE_INSTALL_PREFIX=/usr ../
-				make
-
-				[ $board = "HACKRF_ONE" ] && board=ONE
-				mv -f hackrf_usb/hackrf_usb.dfu \
-					"$srcdir/$pkgname/firmware-bin/hackrf_${board,,}_usb_ram.dfu"
-					mv -f hackrf_usb/hackrf_usb.bin \
-					"$srcdir/$pkgname/firmware-bin/hackrf_${board,,}_usb_rom_to_ram.bin"
-					popd
-					done
+		[ $board = "HACKRF_ONE" ] && board="ONE"
+		mv -f hackrf_usb/hackrf_usb.dfu \
+			"$srcdir/$pkgname/firmware-bin/hackrf_${board,,}_usb_ram.dfu"
+		mv -f hackrf_usb/hackrf_usb.bin \
+			"$srcdir/$pkgname/firmware-bin/hackrf_${board,,}_usb_rom_to_ram.bin"
+		popd
+	done
 }
 
 package() {
 	cd "$srcdir/$pkgname"
-		pushd host/build
-		make DESTDIR="$pkgdir" install
-		popd
-		pushd host/libhackrf
-		install -vD -m644 53-hackrf.rules "$pkgdir/usr/lib/udev/rules.d/53-hackrf.rules"
-		popd
-		pushd firmware-bin
-		for i in *.{bin,dfu,xsvf}; do
-			install -vDm644 "$i" "$pkgdir/usr/share/hackrf/$i"
-				done
-				popd
-				install -Dm644 "$srcdir/hackrf.conf" "$pkgdir/etc/modprobe.d/hackrf.conf"
+
+	pushd host/build
+	make DESTDIR="$pkgdir" install
+	popd
+
+	pushd host/libhackrf
+	install -vD -m644 53-hackrf.rules "$pkgdir/usr/lib/udev/rules.d/53-hackrf.rules"
+	popd
+
+	pushd firmware-bin
+	for i in *.{bin,dfu,xsvf}; do
+		install -vDm644 "$i" "$pkgdir/usr/share/hackrf/$i"
+	done
+	popd
+
+	install -Dm644 "$srcdir/hackrf.conf" "$pkgdir/etc/modprobe.d/hackrf.conf"
 }