From: Paul Spooren <mail@aparcar.org>
Date: Wed, 9 Feb 2022 17:48:01 +0000 (+0100)
Subject: adb: use semantic versioning
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=47ad0bedba26fc7b7a9d6b54992053708ccf88da;p=openwrt%2Fstaging%2Faparcar.git

adb: use semantic versioning

Required by becoming an APK package.

Signed-off-by: Paul Spooren <mail@aparcar.org>
---

diff --git a/package/utils/adb/Makefile b/package/utils/adb/Makefile
index 0482a40da1..850370ad53 100644
--- a/package/utils/adb/Makefile
+++ b/package/utils/adb/Makefile
@@ -2,14 +2,15 @@ include $(TOPDIR)/rules.mk
 #Based on adb package from AUR https://aur.archlinux.org/packages/adb/ , reused Makefile
 
 PKG_NAME:=adb
-PKG_VERSION:=android.5.0.2_r1
+PKG_VERSION:=5.0.2
+PKG_PATCHVER:=1
 PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://android.googlesource.com/platform/system/core
 PKG_SOURCE_VERSION:=6fe92d1a3fb17545d82d020a3c995f32e6b71f9d
 PKG_MIRROR_HASH:=a9b4b86602dfc0d4fc9e1d0f78dc83e648a931fb04f5a4be9b1f0054a8cebf7e
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-android.$(PKG_SOURCE_VERSION)-r$(PKG_PATCHVER)
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.xz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 PKG_MAINTAINER:=Henryk Heisig <hyniu@o2.pl>