summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Mehani2019-03-21 22:05:12 +1100
committerOlivier Mehani2019-03-21 22:05:12 +1100
commitf12a81f165e9b7c129271c7e3ea2de695be31a4b (patch)
tree073cbe0d1b6e7d41f2ebc781268505316776ae4d
parenteb9e13c05b15ea7807ab058787bd152960a58589 (diff)
downloadaur-f12a81f165e9b7c129271c7e3ea2de695be31a4b.tar.gz
Fix some packaging issues
Signed-off-by: Olivier Mehani <shtrom@ssji.net>
-rw-r--r--0001-mbm_powerstate-protect-from-empty-1.patch26
-rw-r--r--PKGBUILD18
2 files changed, 40 insertions, 4 deletions
diff --git a/0001-mbm_powerstate-protect-from-empty-1.patch b/0001-mbm_powerstate-protect-from-empty-1.patch
new file mode 100644
index 000000000000..207a0ce344b9
--- /dev/null
+++ b/0001-mbm_powerstate-protect-from-empty-1.patch
@@ -0,0 +1,26 @@
+From dc12bd61a349fa9baf92637d2cc61b806674ed32 Mon Sep 17 00:00:00 2001
+From: Olivier Mehani <shtrom@ssji.net>
+Date: Thu, 21 Mar 2019 21:53:35 +1100
+Subject: [PATCH] mbm_powerstate: protect from empty $1
+
+Signed-off-by: Olivier Mehani <shtrom@ssji.net>
+---
+ utils/mbm_powerstate | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/mbm_powerstate b/utils/mbm_powerstate
+index 2c15936..857ae81 100755
+--- a/utils/mbm_powerstate
++++ b/utils/mbm_powerstate
+@@ -7,7 +7,7 @@ sleep="0"
+
+ echo "PIN = $PIN PUK = $PUK"
+
+-if [ $1 == "1" ]
++if [ "$1" == "1" ]
+ then
+ let sleep="0"
+ else
+--
+2.21.0
+
diff --git a/PKGBUILD b/PKGBUILD
index c1528fed2fca..e4df3f8b0341 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _gitname=mbm-gpsd
_ghuser=pl4nkton
pkgname="${_gitname}-${_ghuser}-git"
pkgver=r53.b3dee82
-pkgrel=1
+pkgrel=2
pkgdesc="GPS support files for Ericsson F3507g that provide an easy interface to gpsd (${_ghuser} fork with build fixes)"
arch=('i686' 'x86_64')
url="https://github.com/pl4nkton/mbm-gpsd"
@@ -15,8 +15,10 @@ depends=('networkmanager' 'network-manager-applet' 'intltool' 'gtk-doc' 'libnl1'
makedepends=('git')
provides=("${_gitname}")
conflicts=("${_gitname}")
-source=("git+https://github.com/${_ghuser}/${_gitname}.git/"
-mbm-gpsd.service
+source=(
+ "git+https://github.com/${_ghuser}/${_gitname}.git/"
+ mbm-gpsd.service
+ "0001-mbm_powerstate-protect-from-empty-1.patch"
)
pkgver() {
@@ -26,6 +28,7 @@ pkgver() {
prepare() {
cd "${srcdir}/${_gitname}"
+ patch -p1 < "${srcdir}/0001-mbm_powerstate-protect-from-empty-1.patch"
}
build() {
@@ -39,11 +42,18 @@ build() {
package() {
cd "${srcdir}/${_gitname}"
make DESTDIR="${pkgdir}" install
+
+ mkdir -p "${pkgdir}/usr/lib/udev/rules.d"
+ mv "${pkgdir}/etc/udev/rules.d/"* "${pkgdir}/usr/lib/udev/rules.d"
+ rmdir "${pkgdir}/etc/udev/rules.d"
+
mkdir -p "${pkgdir}/usr/lib/systemd/system/"
cp "${srcdir}/mbm-gpsd.service" "${pkgdir}/usr/lib/systemd/system/"
+
mv "${pkgdir}/var/run" "${pkgdir}/run"
mv "${pkgdir}/usr/sbin"/* "${pkgdir}/usr/bin/"
rmdir "${pkgdir}/var" "${pkgdir}/usr/sbin/"
}
md5sums=('SKIP'
- 'c436e8bcf6b459f8f939e434aed0b9d4')
+ 'c436e8bcf6b459f8f939e434aed0b9d4'
+ 'abfadb4be603bbcede163f95419a22d1')