forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

main/uuu: fix linting issues (!872)

Browse source 
[ci:ignore-count]
[ci:skip-vercheck]
This commit is contained in:
Bart Ribbers 2020-01-06 11:12:10 +01:00
parent 807389d178
commit 26cfbcc4c9
No known key found for this signature in database
GPG key ID: 699D16185DAFAE61
2 changed files with 42 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
main/uuu/APKBUILD
View file

@ -1,29 +1,36 @@
# Contributor: Clayton Craft <clayton@craftyguy.net>
# Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=uuu pkgname=uuu
pkgver=1.3 pkgver=1.3
pkgrel=0 pkgrel=1
_commit="8bb3f0169778e5ae9ed498ba5652d65eccc77cff"
pkgdesc="Purism fork of the Universal Update Utility: Freescale/NXP I.MX Chip image deploy tools" pkgdesc="Purism fork of the Universal Update Utility: Freescale/NXP I.MX Chip image deploy tools"
url="https://source.puri.sm/Librem5/mfgtools" url="https://source.puri.sm/Librem5/mfgtools"
arch="x86_64" arch="x86_64"
license="BSD" license="BSD-3-Clause"
depends="libusb-compat" depends="libusb-compat"
makedepends="libzip-dev libusb-compat-dev libusb-dev bzip2-dev cmake" makedepends="cmake libzip-dev libusb-dev bzip2-dev"
_commit="8bb3f0169778e5ae9ed498ba5652d65eccc77cff" source="$pkgname-$_commit.tar.gz::https://source.puri.sm/Librem5/mfgtools/-/archive/$_commit.tar.gz
source="$pkgname-$_commit.tar.gz::https://source.puri.sm/Librem5/mfgtools/-/archive/${_commit}.tar.gz" ignore-git-version.patch"
options="!check" options="!check"
builddir="$srcdir/mfgtools-$_commit"
builddir="$srcdir"/mfgtools-"$_commit"
build() { build() {
cd "$builddir" cmake \
cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=/usr
mkdir -p "$builddir"/libuuu/gen mkdir -p "$builddir"/libuuu/gen
echo "#define GIT_VERSION \"lib${pkgver}\"" > "$builddir"/libuuu/gen/gitversion.h.tmp echo "#define GIT_VERSION \"lib$pkgver\"" > "$builddir"/libuuu/gen/gitversion.h.tmp
make make
} }
package() { package() {
cd "$builddir" echo "#define GIT_VERSION \"lib$pkgver\"" > "$builddir"/libuuu/gen/gitversion.h.tmp
echo "#define GIT_VERSION \"lib${pkgver}\"" > "$builddir"/libuuu/gen/gitversion.h.tmp
make PREFIX=/usr DESTDIR="$pkgdir"/ install make DESTDIR="$pkgdir" install
} }
sha512sums="f3c004d4e712123d3c2ae2e4a08e3dfd64ed9b065edb05aa0e4d7c6a5d9b1b6ea7d5190b6709c522ba7a5a3e9c978aefc3865a2e16c5696b8024a9584e3ab2a5 uuu-8bb3f0169778e5ae9ed498ba5652d65eccc77cff.tar.gz" sha512sums="f3c004d4e712123d3c2ae2e4a08e3dfd64ed9b065edb05aa0e4d7c6a5d9b1b6ea7d5190b6709c522ba7a5a3e9c978aefc3865a2e16c5696b8024a9584e3ab2a5 uuu-8bb3f0169778e5ae9ed498ba5652d65eccc77cff.tar.gz
b6ab9acadd46360fca1944b3abe93c3eafdafd3343e32350fed47426c7858b59bb49554deb6c8e249984878276a9f288546702267f4dc3774918dfdf2a61ed83 ignore-git-version.patch"

22
main/uuu/ignore-git-version.patch Normal file
View file

@ -0,0 +1,22 @@
diff --git a/libuuu/gen_ver.sh b/libuuu/gen_ver.sh
index d4e8c1ba..8f416322 100755
--- a/libuuu/gen_ver.sh
+++ b/libuuu/gen_ver.sh
@@ -13,10 +13,10 @@ else
fi
# Test if we are in a repo
-if [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ];
-then
- #echo "In a repo"
- # Get the version of the last commit of the repo
- version=`git describe --tags --long`
- echo "#define GIT_VERSION \"lib$version\"" > $file_to_write
-fi
+#if [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ];
+#then
+# #echo "In a repo"
+# # Get the version of the last commit of the repo
+# version=`git describe --tags --long`
+# echo "#define GIT_VERSION \"lib$version\"" > $file_to_write
+#fi