From 22bee795341b712938b144e482d2b193ebbfd622 Mon Sep 17 00:00:00 2001
From: Christian Helmuth <christian.helmuth@genode-labs.com>
Date: Thu, 25 May 2023 08:16:15 +0200
Subject: [PATCH] port/metadata: improve info for multi-source ports

Now, ./tool/ports/metadata dde_linux produces the following output.

  PORT:     dde_linux
  LICENSE:  GPLv2
  VERSION:  individual (see sources)
  SOURCE:   https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.3.tar.xz VERSION 4.4.3 (lxip)
  SOURCE:   https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.3.tar.xz VERSION 4.16.3 (fec)
  SOURCE:   https://github.com/cproc/dwc_otg.git git r5 (dwc_otg_host)
  SOURCE:   https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.3.tar.xz VERSION 4.16.3 (usb_host)
  SOURCE:   https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.3.tar.xz VERSION 4.16.3 (usb_hid)
  SOURCE:   https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.3.tar.xz VERSION 4.16.3 (usb_modem)
  SOURCE:   https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.3.tar.xz VERSION 4.16.3 (usb_net)

Issue #4685
---
 repos/dde_bsd/ports/dde_bsd.hash          |  2 +-
 repos/dde_bsd/ports/dde_bsd.port          |  6 ++--
 repos/dde_linux/ports/dde_linux.hash      |  2 +-
 repos/dde_linux/ports/dde_linux.port      | 38 +++++++++++------------
 repos/dde_linux/ports/linux-firmware.hash |  2 +-
 repos/dde_linux/ports/linux-firmware.port |  6 ++--
 tool/ports/mk/metadata_single_port.mk     |  4 +--
 7 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/repos/dde_bsd/ports/dde_bsd.hash b/repos/dde_bsd/ports/dde_bsd.hash
index be05365055..5226149bb2 100644
--- a/repos/dde_bsd/ports/dde_bsd.hash
+++ b/repos/dde_bsd/ports/dde_bsd.hash
@@ -1 +1 @@
-c84599f4ae0aebf2bb6e82151fa629867a3b07c0
+23a28150a282dd2d9f28e36264f1df5b0699ff6b
diff --git a/repos/dde_bsd/ports/dde_bsd.port b/repos/dde_bsd/ports/dde_bsd.port
index 6739434b26..4e45a44e98 100644
--- a/repos/dde_bsd/ports/dde_bsd.port
+++ b/repos/dde_bsd/ports/dde_bsd.port
@@ -1,14 +1,14 @@
 LICENSE   := BSD
-VERSION   := 1
+VERSION   := individual (see sources)
 DOWNLOADS := audio.archive
 
 #
 # Audio drivers from OpenBSD 7.3
 #
 SRC_DIR_AUDIO  := src/lib/audio
-VERSION_AUDIO  := 7.3
+VERSION(audio) := 7.3
 BASE_URL       := https://cdn.openbsd.org/pub/OpenBSD
-URL(audio)     := $(BASE_URL)/$(VERSION_AUDIO)/sys.tar.gz
+URL(audio)     := $(BASE_URL)/${VERSION(audio)}/sys.tar.gz
 SHA(audio)     := bb0dfa11584d68464b3f788e43655f6454bb3ecba8ad5500377630bcf23570ec
 DIR(audio)     := $(SRC_DIR_AUDIO)
 TAR_OPT(audio) := --strip-components=1 --files-from $(REP_DIR)/audio.list
diff --git a/repos/dde_linux/ports/dde_linux.hash b/repos/dde_linux/ports/dde_linux.hash
index 0c4ce7250a..52a31439b5 100644
--- a/repos/dde_linux/ports/dde_linux.hash
+++ b/repos/dde_linux/ports/dde_linux.hash
@@ -1 +1 @@
-503582cb329201899f651e5f4af15ab84325ac6d
+7bf3bf76c9c7c9efdef30f0be5e10b16143dbf95
diff --git a/repos/dde_linux/ports/dde_linux.port b/repos/dde_linux/ports/dde_linux.port
index 67edb1314e..1375fb7487 100644
--- a/repos/dde_linux/ports/dde_linux.port
+++ b/repos/dde_linux/ports/dde_linux.port
@@ -1,5 +1,5 @@
 LICENSE     := GPLv2
-VERSION     := 2
+VERSION     := individual (see sources)
 DOWNLOADS   := lxip.archive \
                fec.archive \
                usb_host.archive dwc_otg_host.git usb_hid.archive \
@@ -25,35 +25,35 @@ usb_host.archive: dwc_otg_host.git
 # USB host controller
 #
 SRC_DIR_USB_HOST  := src/drivers/usb_host
-VERSION_USB_HOST  := 4.16.3
-URL(usb_host)     := https://www.kernel.org/pub/linux/kernel/v4.x/linux-$(VERSION_USB_HOST).tar.xz
+VERSION(usb_host) := 4.16.3
+URL(usb_host)     := https://www.kernel.org/pub/linux/kernel/v4.x/linux-${VERSION(usb_host)}.tar.xz
 SHA(usb_host)     := 0d6971a81da97e38b974c5eba31a74803bfe41aabc46d406c3acda56306c81a3
 DIR(usb_host)     := $(SRC_DIR_USB_HOST)
-TAR_OPT(usb_host) := --strip-components=1 --files-from - < <(sed 's/-x.x.x/-$(VERSION_USB_HOST)/g' $(REP_DIR)/usb_host.list)
+TAR_OPT(usb_host) := --strip-components=1 --files-from - < <(sed 's/-x.x.x/-${VERSION(usb_host)}/g' $(REP_DIR)/usb_host.list)
 HASH_INPUT        += $(REP_DIR)/usb_host.list
 
 SRC_DIR_USB_HID  := src/drivers/usb_hid
-VERSION_USB_HID  := 4.16.3
-URL(usb_hid)     := https://www.kernel.org/pub/linux/kernel/v4.x/linux-$(VERSION_USB_HID).tar.xz
+VERSION(usb_hid) := 4.16.3
+URL(usb_hid)     := https://www.kernel.org/pub/linux/kernel/v4.x/linux-${VERSION(usb_hid)}.tar.xz
 SHA(usb_hid)     := 0d6971a81da97e38b974c5eba31a74803bfe41aabc46d406c3acda56306c81a3
 DIR(usb_hid)     := $(SRC_DIR_USB_HID)
-TAR_OPT(usb_hid) := --strip-components=1 --files-from - < <(sed 's/-x.x.x/-$(VERSION_USB_HID)/g' $(REP_DIR)/usb_hid.list)
+TAR_OPT(usb_hid) := --strip-components=1 --files-from - < <(sed 's/-x.x.x/-${VERSION(usb_hid)}/g' $(REP_DIR)/usb_hid.list)
 HASH_INPUT       += $(REP_DIR)/usb_hid.list
 
 SRC_DIR_USB_NET  := src/drivers/usb_net
-VERSION_USB_NET  := 4.16.3
-URL(usb_net)     := https://www.kernel.org/pub/linux/kernel/v4.x/linux-$(VERSION_USB_NET).tar.xz
+VERSION(usb_net) := 4.16.3
+URL(usb_net)     := https://www.kernel.org/pub/linux/kernel/v4.x/linux-${VERSION(usb_net)}.tar.xz
 SHA(usb_net)     := 0d6971a81da97e38b974c5eba31a74803bfe41aabc46d406c3acda56306c81a3
 DIR(usb_net)     := $(SRC_DIR_USB_NET)
-TAR_OPT(usb_net) := --strip-components=1 --files-from - < <(sed 's/-x.x.x/-$(VERSION_USB_NET)/g' $(REP_DIR)/usb_net.list)
+TAR_OPT(usb_net) := --strip-components=1 --files-from - < <(sed 's/-x.x.x/-${VERSION(usb_net)}/g' $(REP_DIR)/usb_net.list)
 HASH_INPUT       += $(REP_DIR)/usb_net.list
 
 SRC_DIR_USB_MODEM  := src/drivers/usb_modem
-VERSION_USB_MODEM  := 4.16.3
-URL(usb_modem)     := https://www.kernel.org/pub/linux/kernel/v4.x/linux-$(VERSION_USB_MODEM).tar.xz
+VERSION(usb_modem) := 4.16.3
+URL(usb_modem)     := https://www.kernel.org/pub/linux/kernel/v4.x/linux-${VERSION(usb_modem)}.tar.xz
 SHA(usb_modem)     := 0d6971a81da97e38b974c5eba31a74803bfe41aabc46d406c3acda56306c81a3
 DIR(usb_modem)     := $(SRC_DIR_USB_MODEM)
-TAR_OPT(usb_modem) := --strip-components=1 --files-from - < <(sed 's/-x.x.x/-$(VERSION_USB_NET)/g' $(REP_DIR)/usb_modem.list)
+TAR_OPT(usb_modem) := --strip-components=1 --files-from - < <(sed 's/-x.x.x/-${VERSION(usb_modem)}/g' $(REP_DIR)/usb_modem.list)
 HASH_INPUT         += $(REP_DIR)/usb_modem.list
 
 #
@@ -68,22 +68,22 @@ DIR(dwc_otg_host) := $(SRC_DIR_USB_HOST)/drivers/usb/host
 # IP stack sources
 #
 SRC_DIR_LXIP  := src/lib/lxip
-VERSION_LXIP  := 4.4.3
-URL(lxip)     := https://www.kernel.org/pub/linux/kernel/v4.x/linux-$(VERSION_LXIP).tar.xz
+VERSION(lxip) := 4.4.3
+URL(lxip)     := https://www.kernel.org/pub/linux/kernel/v4.x/linux-${VERSION(lxip)}.tar.xz
 SHA(lxip)     := 0b379cb19bbd7e38fc5a9a000ea927db55cce519a7400ec7fa705c581a6491dd
 DIR(lxip)     := $(SRC_DIR_LXIP)
-TAR_OPT(lxip) := --strip-components=1  --files-from - < <(sed 's/-x.x.x/-$(VERSION_LXIP)/g' $(REP_DIR)/lxip.list)
+TAR_OPT(lxip) := --strip-components=1  --files-from - < <(sed 's/-x.x.x/-${VERSION(lxip)}/g' $(REP_DIR)/lxip.list)
 HASH_INPUT    += $(REP_DIR)/lxip.list
 
 #
 # Freescale Ethernet controller
 #
 SRC_DIR_FEC  := src/drivers/nic/fec
-VERSION_FEC  := 4.16.3
-URL(fec)     := https://www.kernel.org/pub/linux/kernel/v4.x/linux-$(VERSION_FEC).tar.xz
+VERSION(fec) := 4.16.3
+URL(fec)     := https://www.kernel.org/pub/linux/kernel/v4.x/linux-${VERSION(fec)}.tar.xz
 SHA(fec)     := 0d6971a81da97e38b974c5eba31a74803bfe41aabc46d406c3acda56306c81a3
 DIR(fec)     := $(SRC_DIR_FEC)
-TAR_OPT(fec) := --strip-components=1  --files-from - < <(sed 's/-x.x.x/-$(VERSION_FEC)/g'     $(REP_DIR)/fec.list)
+TAR_OPT(fec) := --strip-components=1  --files-from - < <(sed 's/-x.x.x/-${VERSION(fec)}/g'     $(REP_DIR)/fec.list)
 HASH_INPUT   += $(REP_DIR)/fec.list
 
 #
diff --git a/repos/dde_linux/ports/linux-firmware.hash b/repos/dde_linux/ports/linux-firmware.hash
index 0a664a9b8c..2c678a9ef2 100644
--- a/repos/dde_linux/ports/linux-firmware.hash
+++ b/repos/dde_linux/ports/linux-firmware.hash
@@ -1 +1 @@
-f646f91ce377ea7cbd8312d6dc68681ee7d1ed0c
+6e3c66d35626a700781b70cd45f3a1095d34f212
diff --git a/repos/dde_linux/ports/linux-firmware.port b/repos/dde_linux/ports/linux-firmware.port
index b6ea7a914c..b6cb2fe190 100644
--- a/repos/dde_linux/ports/linux-firmware.port
+++ b/repos/dde_linux/ports/linux-firmware.port
@@ -1,8 +1,8 @@
-LICENSE   := mixed
-VERSION   := 1
+LICENSE   := mixed (binary)
+VERSION   := 260428bf5efb1750c2b8fd56e737abb2dfe8a010
 DOWNLOADS := fw.archive
 
-FW_REV  := 260428bf5efb1750c2b8fd56e737abb2dfe8a010
+FW_REV  := $(VERSION)
 URL(fw) := https://github.com/cnuke/dde_linux_firmware/archive/$(FW_REV).tar.gz
 SHA(fw) := 04b5de4db8df69bc99fda53b65f59b26573276b2bbbfdfbb5c648b9721668aa6
 DIR(fw) := firmware
diff --git a/tool/ports/mk/metadata_single_port.mk b/tool/ports/mk/metadata_single_port.mk
index 8a00cafa60..a2b0ff93c8 100644
--- a/tool/ports/mk/metadata_single_port.mk
+++ b/tool/ports/mk/metadata_single_port.mk
@@ -38,10 +38,10 @@ info:
 	@$(ECHO) "VERSION:  $(VERSION)"
 
 %.file:
-	@$(ECHO) "SOURCE:   $(URL($*)) ($*)"
+	@$(ECHO) "SOURCE:   $(URL($*))$(if $(VERSION($*)), VERSION $(VERSION($*)),) ($*)"
 
 %.archive:
-	@$(ECHO) "SOURCE:   $(URL($*)) ($*)"
+	@$(ECHO) "SOURCE:   $(URL($*))$(if $(VERSION($*)), VERSION $(VERSION($*)),) ($*)"
 
 %.git:
 	@$(ECHO) "SOURCE:   $(URL($*)) git $(REV($*)) ($*)"