diff --git a/main/uuu/APKBUILD b/main/uuu/APKBUILD deleted file mode 100644 index 290cb80a0..000000000 --- a/main/uuu/APKBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Maintainer: Clayton Craft -pkgname=uuu -pkgver=1.3 -pkgrel=2 -_commit="8bb3f0169778e5ae9ed498ba5652d65eccc77cff" -pkgdesc="Purism fork of the Universal Update Utility: Freescale/NXP I.MX Chip image deploy tools" -url="https://source.puri.sm/Librem5/mfgtools" -arch="x86_64" -license="BSD-3-Clause" -depends="libusb-compat" -makedepends="cmake libzip-dev libusb-dev bzip2-dev" -source="https://source.puri.sm/Librem5/mfgtools/-/archive/$_commit/uuu-$_commit.tar.gz - ignore-git-version.patch" -options="!check" -builddir="$srcdir/mfgtools-$_commit" - -build() { - cmake -B build \ - -DCMAKE_BUILD_TYPE=None \ - -DCMAKE_INSTALL_PREFIX=/usr - - mkdir -p build/libuuu/gen - echo "#define GIT_VERSION \"lib$pkgver\"" > build/libuuu/gen/gitversion.h.tmp - - make -C build -} - -package() { - echo "#define GIT_VERSION \"lib$pkgver\"" > build/libuuu/gen/gitversion.h.tmp - - make DESTDIR="$pkgdir" -C build install -} - -sha512sums="f3c004d4e712123d3c2ae2e4a08e3dfd64ed9b065edb05aa0e4d7c6a5d9b1b6ea7d5190b6709c522ba7a5a3e9c978aefc3865a2e16c5696b8024a9584e3ab2a5 uuu-8bb3f0169778e5ae9ed498ba5652d65eccc77cff.tar.gz -fd9c8c09eab958ba997bd94a6b4e08920f4f587d2d42106e383a5421f063360d9da138cf07f36231147636dbcde3d20f1225f8a01058f654d099418133546b50 ignore-git-version.patch" diff --git a/main/uuu/ignore-git-version.patch b/main/uuu/ignore-git-version.patch deleted file mode 100644 index 3feeb0c96..000000000 --- a/main/uuu/ignore-git-version.patch +++ /dev/null @@ -1,26 +0,0 @@ -Since the package build happens in the pmaports git repo, this check doesn't give the correct result and we should disable it. - -This is not an upstreamable fix as it just removes the check rather than replacing it with something more proper. - -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