pkg: Move versions to dedicated line

Makefiles don't do comments, so these were forwarded into the variable. *Most* users would expand the arguments to a shell where it'd be ignored, but not all of them. Contributes-To: https://github.com/RIOT-OS/RIOT/pull/18489 (This is also where the one version that is added here was removed).
2024-12-29 04:50:03 +01:00 · 2022-08-21 18:22:49 +02:00 · 2022-08-21 18:22:49 +02:00 · feff412bcc
commit feff412bcc
parent 6988db6dbe
26 changed files with 79 additions and 39 deletions
--- a/cpu/stm32/Makefile.cmsis
+++ b/cpu/stm32/Makefile.cmsis
@ -3,21 +3,36 @@ PKG_NAME=stm32cmsis
 # The package URL depends on the family of the target STM32
 PKG_URL=https://github.com/STMicroelectronics/cmsis_device_$(CPU_FAM)

-PKG_VERSION_f0=8b86197c7ab77ad029c34dc73cf6d4a1e12327d8  # v2.3.6
-PKG_VERSION_f1=71ad5b3bf5cbb4d35cf8c8726c1b343871f0df0a  # v4.3.3
-PKG_VERSION_f2=694c49f696d359f57f23153ab7acf3ac1a43f663  # v2.2.5
-PKG_VERSION_f3=167eefd811de90a58c41e0a32071cdfecede389a  # v2.3.6
-PKG_VERSION_f4=6fe2c1f498feda34ee422720ff8b3bd1b4656145  # v2.6.7
-PKG_VERSION_f7=0abe04b1c85a848f1cec8dd4b2893dc8e3f07757  # v1.2.6
-PKG_VERSION_g0=051d85f2f5a9b5d67d2fbb4e97861b2e8ec1ef89  # v1.4.1
-PKG_VERSION_g4=3a3a8909720e37bece786f6011ba865951b369c8  # v1.2.1
-PKG_VERSION_l0=532d96973e7b2ae5546a2c88cb216429f74f5f5d  # v1.9.2
-PKG_VERSION_l1=1827333a7f7822282a6a46e4169596b5fb58cf61  # v2.3.2
-PKG_VERSION_l4=26ed4846f831f730d852507e178061053e522daf  # v1.7.1
-PKG_VERSION_l5=fcf61cd086e02c7a1cf7535ffe30622d1f5d36aa  # v1.0.4
-PKG_VERSION_u5=147947d99f50554101d2a339ad19c2972c3ff161  # v1.0.1
-PKG_VERSION_wb=3a801574163338b562f56e7eb503a955818f1a56  # v1.9.0
-PKG_VERSION_wl=7bf548678b1132d829072ce86443c8036d538460  # v1.1.0
+# v2.3.6
+PKG_VERSION_f0=8b86197c7ab77ad029c34dc73cf6d4a1e12327d8
+# v4.3.3
+PKG_VERSION_f1=71ad5b3bf5cbb4d35cf8c8726c1b343871f0df0a
+# v2.2.5
+PKG_VERSION_f2=694c49f696d359f57f23153ab7acf3ac1a43f663
+# v2.3.6
+PKG_VERSION_f3=167eefd811de90a58c41e0a32071cdfecede389a
+# v2.6.7
+PKG_VERSION_f4=6fe2c1f498feda34ee422720ff8b3bd1b4656145
+# v1.2.6
+PKG_VERSION_f7=0abe04b1c85a848f1cec8dd4b2893dc8e3f07757
+# v1.4.1
+PKG_VERSION_g0=051d85f2f5a9b5d67d2fbb4e97861b2e8ec1ef89
+# v1.2.1
+PKG_VERSION_g4=3a3a8909720e37bece786f6011ba865951b369c8
+# v1.9.2
+PKG_VERSION_l0=532d96973e7b2ae5546a2c88cb216429f74f5f5d
+# v2.3.2
+PKG_VERSION_l1=1827333a7f7822282a6a46e4169596b5fb58cf61
+# v1.7.1
+PKG_VERSION_l4=26ed4846f831f730d852507e178061053e522daf
+# v1.0.4
+PKG_VERSION_l5=fcf61cd086e02c7a1cf7535ffe30622d1f5d36aa
+# v1.0.1
+PKG_VERSION_u5=147947d99f50554101d2a339ad19c2972c3ff161
+# v1.9.0
+PKG_VERSION_wb=3a801574163338b562f56e7eb503a955818f1a56
+# v1.1.0
+PKG_VERSION_wl=7bf548678b1132d829072ce86443c8036d538460

 PKG_VERSION=$(PKG_VERSION_$(CPU_FAM))
 PKG_LICENSE=Apache-2
--- a/pkg/cn-cbor/Makefile
+++ b/pkg/cn-cbor/Makefile
@ -1,6 +1,7 @@
 PKG_NAME=cn-cbor
 PKG_URL=https://github.com/jimsch/cn-cbor
-PKG_VERSION=821797f9421c04dc783561dc465066857839e108 # 1.0.0
+# 1.0.0
+PKG_VERSION=821797f9421c04dc783561dc465066857839e108
 PKG_LICENSE=MIT

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/corejson/Makefile
+++ b/pkg/corejson/Makefile
@ -1,6 +1,7 @@
 PKG_NAME=corejson
 PKG_URL=https://github.com/FreeRTOS/coreJSON
-PKG_VERSION=caf540ccdb98e8f96a6f557075cb607288384938  # v3.0.2
+# v3.0.2
+PKG_VERSION=caf540ccdb98e8f96a6f557075cb607288384938
 PKG_LICENSE=MIT

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/driver_atwinc15x0/Makefile
+++ b/pkg/driver_atwinc15x0/Makefile
@ -1,6 +1,7 @@
 PKG_NAME=driver_atwinc15x0
 PKG_URL=https://github.com/arduino-libraries/WiFi101
-PKG_VERSION=0cbee7f6a64a1260b8751d993b75c101ec3084c2 # 1.6.1
+# 1.6.1
+PKG_VERSION=0cbee7f6a64a1260b8751d993b75c101ec3084c2
 PKG_LICENSE=LGPL-2.1

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/elk/Makefile
+++ b/pkg/elk/Makefile
@ -1,6 +1,7 @@
 PKG_NAME=elk
 PKG_URL=https://github.com/cesanta/elk
-PKG_VERSION=1eab37bd9041d93a0bdfcd4335b2dcdba1076c67  # 2.1.0
+# 2.1.0
+PKG_VERSION=1eab37bd9041d93a0bdfcd4335b2dcdba1076c67
 PKG_LICENSE=GPLv2

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/emlearn/Makefile
+++ b/pkg/emlearn/Makefile
@ -1,6 +1,7 @@
 PKG_NAME=emlearn
 PKG_URL=https://github.com/emlearn/emlearn
-PKG_VERSION=d8cffb6cdd5619eb26d01287f07a530128958b60 # 0.12
+# 0.12
+PKG_VERSION=d8cffb6cdd5619eb26d01287f07a530128958b60
 PKG_LICENSE=MIT

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/etl/Makefile
+++ b/pkg/etl/Makefile
@ -1,6 +1,7 @@
 PKG_NAME=etl
 PKG_URL=https://github.com/ETLCPP/etl
-PKG_VERSION=734df1a3725f9eeab3048a2a18cb84e3a82fbd8f # v20.24.1
+# v20.24.1
+PKG_VERSION=734df1a3725f9eeab3048a2a18cb84e3a82fbd8f
 PKG_LICENSE=MIT

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/fatfs/Makefile
+++ b/pkg/fatfs/Makefile
@ -2,7 +2,8 @@ PKG_NAME=fatfs
 # upstream server is very unreliable, instead host the extracted
 # .zip file on GitHub and apply only the upstream patches
 PKG_URL=https://github.com/RIOT-OS/FatFS
-PKG_VERSION=246c97b1eb7f1900eb00d5ed7e3bf4cdb4558039 # r0.14b
+# r0.14b
+PKG_VERSION=246c97b1eb7f1900eb00d5ed7e3bf4cdb4558039
 PKG_LICENSE=BSD-1-Clause

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/fff/Makefile
+++ b/pkg/fff/Makefile
@ -1,6 +1,7 @@
 PKG_NAME=fff
 PKG_URL=https://github.com/meekrosoft/fff
-PKG_VERSION=7e09f07e5b262b1cc826189dc5057379e40ce886 # v1.1
+# v1.1
+PKG_VERSION=7e09f07e5b262b1cc826189dc5057379e40ce886
 PKG_LICENSE=MIT

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/flatbuffers/Makefile
+++ b/pkg/flatbuffers/Makefile
@ -1,6 +1,7 @@
 PKG_NAME=flatbuffers
 PKG_URL=https://github.com/google/flatbuffers
-PKG_VERSION=a9a295fecf3fbd5a4f571f53b01f63202a3e2113  # v2.0.0
+# v2.0.0
+PKG_VERSION=a9a295fecf3fbd5a4f571f53b01f63202a3e2113
 PKG_LICENSE=Apache2.0

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/jerryscript/Makefile
+++ b/pkg/jerryscript/Makefile
@ -1,6 +1,7 @@
 PKG_NAME=jerryscript
 PKG_URL=https://github.com/jerryscript-project/jerryscript.git
-PKG_VERSION=8ba0d1b6ee5a065a42f3b306771ad8e3c0d819bc  # 2.4.0
+# 2.4.0
+PKG_VERSION=8ba0d1b6ee5a065a42f3b306771ad8e3c0d819bc
 PKG_LICENSE=Apache-2.0

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/libb2/Makefile
+++ b/pkg/libb2/Makefile
@ -1,6 +1,7 @@
 PKG_NAME    = libb2
 PKG_URL     = https://github.com/BLAKE2/libb2
-PKG_VERSION = 2c5142f12a2cd52f3ee0a43e50a3a76f75badf85 # v0.98.1
+# v0.98.1
+PKG_VERSION = 2c5142f12a2cd52f3ee0a43e50a3a76f75badf85
 PKG_LICENSE = CC0-1.0

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/lv_drivers/Makefile
+++ b/pkg/lv_drivers/Makefile
@ -1,6 +1,7 @@
 PKG_NAME=lv_drivers
 PKG_URL=https://github.com/lvgl/lv_drivers.git
-PKG_VERSION=49c4b178494625efefb07891d1c8b9c13914edff # 8.2.0
+# 8.2.0
+PKG_VERSION=49c4b178494625efefb07891d1c8b9c13914edff
 PKG_LICENSE=MIT

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/lvgl/Makefile
+++ b/pkg/lvgl/Makefile
@ -1,5 +1,6 @@
 PKG_NAME=lvgl
 PKG_URL=https://github.com/littlevgl/lvgl
+# v8.3.1
 PKG_VERSION=9024b72b4853e1e7ac29a42e54b7a10d3c4f3b20
 PKG_LICENSE=MIT

--- a/pkg/lz4/Makefile
+++ b/pkg/lz4/Makefile
@ -1,6 +1,7 @@
 PKG_NAME=lz4
 PKG_URL=https://github.com/lz4/lz4
-PKG_VERSION=d44371841a2f1728a3f36839fd4b7e872d0927d3  # v1.9.3
+# v1.9.3
+PKG_VERSION=d44371841a2f1728a3f36839fd4b7e872d0927d3
 PKG_LICENSE=BSD

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/mbedtls/Makefile
+++ b/pkg/mbedtls/Makefile
@ -1,6 +1,7 @@
 PKG_NAME=mbedtls
 PKG_URL=https://github.com/ARMmbed/mbedtls.git
-PKG_VERSION=8b3f26a5ac38d4fdccbc5c5366229f3e01dafcc0  # v2.28.0
+# v2.28.0
+PKG_VERSION=8b3f26a5ac38d4fdccbc5c5366229f3e01dafcc0
 PKG_LICENSE=Apache-2.0

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/monocypher/Makefile
+++ b/pkg/monocypher/Makefile
@ -1,6 +1,7 @@
 PKG_NAME=monocypher
 PKG_URL=https://github.com/LoupVaillant/Monocypher
-PKG_VERSION=baca5d31259c598540e4d1284bc8d8f793abf83a # v3.1.2
+# v3.1.2
+PKG_VERSION=baca5d31259c598540e4d1284bc8d8f793abf83a
 PKG_LICENSE=CC-0

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/nanopb/Makefile
+++ b/pkg/nanopb/Makefile
@ -1,6 +1,7 @@
 PKG_NAME=nanopb
 PKG_URL=https://github.com/nanopb/nanopb
-PKG_VERSION=afc499f9a410fc9bbf6c9c48cdd8d8b199d49eb4 # 0.4.6
+# 0.4.6
+PKG_VERSION=afc499f9a410fc9bbf6c9c48cdd8d8b199d49eb4
 PKG_LICENSE=MIT

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/nrfx/Makefile
+++ b/pkg/nrfx/Makefile
@ -1,6 +1,7 @@
 PKG_NAME=nrfx
 PKG_URL=https://github.com/NordicSemiconductor/nrfx
-PKG_VERSION=3521c97df0b9549daecf867fb588f62819c317b4   # Release 2.7.0
+# Release 2.7.0
+PKG_VERSION=3521c97df0b9549daecf867fb588f62819c317b4
 PKG_LICENSE=BSD-3-Clause

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/openthread/Makefile
+++ b/pkg/openthread/Makefile
@ -1,6 +1,7 @@
 PKG_NAME=openthread
 PKG_URL=https://github.com/openthread/openthread.git
-PKG_VERSION=54b31928cf65803a9cd83c9f97061b64e465aaf7  # thread-reference-20200818
+# thread-reference-20200818
+PKG_VERSION=54b31928cf65803a9cd83c9f97061b64e465aaf7
 PKG_LICENSE=BSD-3-Clause

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/qcbor/Makefile
+++ b/pkg/qcbor/Makefile
@ -1,6 +1,7 @@
 PKG_NAME    = qcbor
 PKG_URL     = https://github.com/laurencelundblade/QCBOR
-PKG_VERSION = 7e8effa94174c33e4acaf737adf6aef16c092c49 # Commit on Mar 9, 2020
+# Commit on Mar 9, 2020
+PKG_VERSION = 7e8effa94174c33e4acaf737adf6aef16c092c49
 PKG_LICENSE = BSD-3-Clause

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/qr-code-generator/Makefile
+++ b/pkg/qr-code-generator/Makefile
@ -1,6 +1,7 @@
 PKG_NAME=qr-code-generator
 PKG_URL=https://github.com/nayuki/QR-Code-generator
-PKG_VERSION=4d13c303dc878ffae8df6d0e0a7513fe860a092c  # v1.7.0
+# v1.7.0
+PKG_VERSION=4d13c303dc878ffae8df6d0e0a7513fe860a092c
 PKG_LICENSE=MIT

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/tensorflow-lite/Makefile
+++ b/pkg/tensorflow-lite/Makefile
@ -1,6 +1,7 @@
 PKG_NAME=tensorflow-lite
 PKG_URL=https://github.com/tensorflow/tensorflow
-PKG_VERSION=d745ff2a48cebf18e847e8b602a744e97e058946 # 2.2.2
+# 2.2.2
+PKG_VERSION=d745ff2a48cebf18e847e8b602a744e97e058946
 PKG_LICENSE=Apache2.0

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/tflite-micro/Makefile
+++ b/pkg/tflite-micro/Makefile
@ -1,6 +1,7 @@
 PKG_NAME=tflite-micro
 PKG_URL=https://github.com/tensorflow/tflite-micro
-PKG_VERSION=1501b574b74fd7877aba30aa9d8b667f41b139c3  # sync from 2022.04.07
+# sync from 2022.04.07
+PKG_VERSION=1501b574b74fd7877aba30aa9d8b667f41b139c3
 PKG_LICENSE=Apache 2.0

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/uzlib/Makefile
+++ b/pkg/uzlib/Makefile
@ -1,6 +1,7 @@
 PKG_NAME=uzlib
 PKG_URL=https://github.com/pfalcon/uzlib
-PKG_VERSION=27e4f4c15ba30c2cfc89575159e8efb50f95037e  # v2.9.5
+# v2.9.5
+PKG_VERSION=27e4f4c15ba30c2cfc89575159e8efb50f95037e
 PKG_LICENSE=zlib

 include $(RIOTBASE)/pkg/pkg.mk
--- a/pkg/wolfssl/Makefile
+++ b/pkg/wolfssl/Makefile
@ -1,6 +1,7 @@
 PKG_NAME=wolfssl
 PKG_URL=https://github.com/wolfssl/wolfssl.git
-PKG_VERSION=0fa5af9929ce2ee99e8789996a3048f41a99830e # v4.5.0
+# v4.5.0
+PKG_VERSION=0fa5af9929ce2ee99e8789996a3048f41a99830e
 PKG_LICENSE=GPLv2

 include $(RIOTBASE)/pkg/pkg.mk