diff options
| author | git user | 2024-04-16 11:47:36 +0200 |
|---|---|---|
| committer | git user | 2024-04-16 11:47:36 +0200 |
| commit | 0cab5088f52198c59674a121830f9b9dd9e85b9e (patch) | |
| tree | 2b7d319176b6ba4b3b429af45beb149c9c77bf7d | |
| parent | dd59becca1acb3656aaaaee0c11eccd623ba2237 (diff) | |
| download | aur-uqmi-git.tar.gz | |
Fixed the `sbin` intallation destination patch; upstream version bump.
| -rw-r--r-- | .SRCINFO | 11 | ||||
| -rw-r--r-- | 001-sbin-fix.patch | 10 | ||||
| -rw-r--r-- | PKGBUILD | 23 |
3 files changed, 24 insertions, 20 deletions
@@ -1,7 +1,7 @@ pkgbase = uqmi-git pkgdesc = OpenWrt QMI modem utility - pkgver = r131.c3488b8 - pkgrel = 1 + pkgver = r151.e7207be + pkgrel = 2 url = https://git.openwrt.org/project/uqmi.git arch = i686 arch = x86_64 @@ -10,20 +10,21 @@ pkgbase = uqmi-git arch = armv7 arch = armv8 arch = aarch64 - license = GPL2 + license = GPL-2.0-or-later makedepends = git makedepends = cmake makedepends = gcc makedepends = make makedepends = patch makedepends = pkg-config + depends = glibc depends = json-c depends = libubox - provides = uqmi=r131.c3488b8 + provides = uqmi=r151.e7207be conflicts = uqmi source = uqmi::git+git://git.openwrt.org/project/uqmi.git source = 001-sbin-fix.patch sha256sums = SKIP - sha256sums = 1f0b8f7c17c8bc3cd099e27573839cb6ef105ed97dda81d808eb899c33e883c8 + sha256sums = 9ca8dc8eff58f6c01029a1f663bf232f10b48ca078f6c325236042fa13f7dac5 pkgname = uqmi-git diff --git a/001-sbin-fix.patch b/001-sbin-fix.patch index 8a5703673ed8..eeb7bb2fefe4 100644 --- a/001-sbin-fix.patch +++ b/001-sbin-fix.patch @@ -1,8 +1,6 @@ -diff -U1 -ra uqmi.orig/CMakeLists.txt uqmi/CMakeLists.txt ---- uqmi.orig/CMakeLists.txt 2018-02-09 23:03:34.772414540 +0100 -+++ uqmi/CMakeLists.txt 2018-02-09 23:04:28.329744981 +0100 -@@ -69,3 +69,3 @@ - INSTALL(TARGETS uqmi +diff -rU0 uqmi.orig/uqmi/CMakeLists.txt uqmi/uqmi/CMakeLists.txt +--- uqmi.orig/uqmi/CMakeLists.txt 2024-04-16 11:44:11.916600137 +0200 ++++ uqmi/uqmi/CMakeLists.txt 2024-04-16 11:44:29.516599879 +0200 +@@ -12 +12 @@ - RUNTIME DESTINATION sbin + RUNTIME DESTINATION bin - ) @@ -4,13 +4,14 @@ _pkgname=uqmi pkgname="${_pkgname}-git" _gitname="${_pkgname}" -pkgver=r131.c3488b8 -pkgrel=1 +pkgver=r151.e7207be +pkgrel=2 pkgdesc='OpenWrt QMI modem utility' url='https://git.openwrt.org/project/uqmi.git' arch=('i686' 'x86_64' 'armv5te' 'armv6' 'armv7' 'armv8' 'aarch64') -license=('GPL2') +license=('GPL-2.0-or-later') depends=( + 'glibc' 'json-c' 'libubox' ) @@ -30,7 +31,7 @@ source=( ) sha256sums=( 'SKIP' - '1f0b8f7c17c8bc3cd099e27573839cb6ef105ed97dda81d808eb899c33e883c8' + '9ca8dc8eff58f6c01029a1f663bf232f10b48ca078f6c325236042fa13f7dac5' ) pkgver() { @@ -41,22 +42,26 @@ pkgver() { prepare() { cd "$srcdir/$_gitname" patch -p1 -i "$srcdir/001-sbin-fix.patch" + + git log > git.log } build() { - cd "$srcdir/$_gitname" + cd "$srcdir" _CFLAGSADDITIONS+=" -Wno-dangling-pointer" CFLAGS+="${_CFLAGSADDITIONS}" CXXFLAGS+="${_CFLAGSADDITIONS}" export CFLAGS export CXXFLAGS - cmake CMakeLists.txt \ + cmake -S "${_gitname}" -B build \ -DCMAKE_INSTALL_PREFIX=/usr - make + make -C build } package() { - cd "$srcdir/$_gitname" - make DESTDIR="$pkgdir" install + cd "$srcdir" + make -C build DESTDIR="$pkgdir" install + + install -Dvm644 -t "${pkgdir}/usr/share/doc/${_pkgname}" "${_gitname}/git.log" } |