From d1b543d41f402b27c58a415da256662ff4c61f8a Mon Sep 17 00:00:00 2001 From: Alexander Dahl Date: Tue, 13 Jul 2021 13:52:18 +0200 Subject: barebox: Use ptx/config-version and ptx/config-md5 This is possible since ptxdist-2021.03.0 introduced in DistroKit with ee0945e61587 ("ptxdist: migrate to 2021.03.0"). Signed-off-by: Alexander Dahl Reviewed-by: Roland Hieber Link: https://lore.pengutronix.de/20210713115218.16671-1-ada@thorsis.com Signed-off-by: Robert Schwebel --- configs/platform-mips/rules/barebox-ar9331.make | 4 ++-- configs/platform-mips/rules/barebox-common.make | 4 ++-- configs/platform-mips/rules/barebox-malta.make | 4 ++-- configs/platform-v7a/rules/barebox-am335x-mlo.make | 4 ++-- configs/platform-v7a/rules/barebox-am335x.make | 4 ++-- configs/platform-v7a/rules/barebox-at91.make | 4 ++-- configs/platform-v7a/rules/barebox-common.make | 4 ++-- configs/platform-v7a/rules/barebox-mx6.make | 4 ++-- configs/platform-v7a/rules/barebox-rpi2.make | 4 ++-- configs/platform-v7a/rules/barebox-stm32mp.make | 4 ++-- configs/platform-v7a/rules/barebox-vexpress.make | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/configs/platform-mips/rules/barebox-ar9331.make b/configs/platform-mips/rules/barebox-ar9331.make index eb28369..3cc9495 100644 --- a/configs/platform-mips/rules/barebox-ar9331.make +++ b/configs/platform-mips/rules/barebox-ar9331.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_BAREBOX_AR9331) += barebox-ar9331 # # Paths and names # -BAREBOX_AR9331_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION)) -BAREBOX_AR9331_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5)) +BAREBOX_AR9331_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) +BAREBOX_AR9331_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON) BAREBOX_AR9331 := barebox-ar9331-$(BAREBOX_AR9331_VERSION) BAREBOX_AR9331_SUFFIX := tar.bz2 BAREBOX_AR9331_URL := $(call barebox-url, BAREBOX_AR9331) diff --git a/configs/platform-mips/rules/barebox-common.make b/configs/platform-mips/rules/barebox-common.make index d0caead..4411dbe 100644 --- a/configs/platform-mips/rules/barebox-common.make +++ b/configs/platform-mips/rules/barebox-common.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BAREBOX_COMMON) += barebox-common # # Paths and names # -BAREBOX_COMMON_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION)) -BAREBOX_COMMON_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5)) +BAREBOX_COMMON_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) +BAREBOX_COMMON_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON) BAREBOX_COMMON := barebox-common-$(BAREBOX_COMMON_VERSION) BAREBOX_COMMON_SUFFIX := tar.bz2 BAREBOX_COMMON_URL := $(call barebox-url, BAREBOX_COMMON) diff --git a/configs/platform-mips/rules/barebox-malta.make b/configs/platform-mips/rules/barebox-malta.make index d9a63fa..31b0b06 100644 --- a/configs/platform-mips/rules/barebox-malta.make +++ b/configs/platform-mips/rules/barebox-malta.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_BAREBOX_MALTA) += barebox-malta # # Paths and names # -BAREBOX_MALTA_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION)) -BAREBOX_MALTA_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5)) +BAREBOX_MALTA_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) +BAREBOX_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON) BAREBOX_MALTA := barebox-malta-$(BAREBOX_MALTA_VERSION) BAREBOX_MALTA_SUFFIX := tar.bz2 BAREBOX_MALTA_URL := $(call barebox-url, BAREBOX_MALTA) diff --git a/configs/platform-v7a/rules/barebox-am335x-mlo.make b/configs/platform-v7a/rules/barebox-am335x-mlo.make index 96b76da..b6d7746 100644 --- a/configs/platform-v7a/rules/barebox-am335x-mlo.make +++ b/configs/platform-v7a/rules/barebox-am335x-mlo.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BAREBOX_AM335X_MLO) += barebox-am335x-mlo # # Paths and names # -BAREBOX_AM335X_MLO_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION)) -BAREBOX_AM335X_MLO_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5)) +BAREBOX_AM335X_MLO_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) +BAREBOX_AM335X_MLO_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON) BAREBOX_AM335X_MLO := barebox-am335x-mlo-$(BAREBOX_AM335X_MLO_VERSION) BAREBOX_AM335X_MLO_SUFFIX := tar.bz2 BAREBOX_AM335X_MLO_URL := $(call barebox-url, BAREBOX_AM335X_MLO) diff --git a/configs/platform-v7a/rules/barebox-am335x.make b/configs/platform-v7a/rules/barebox-am335x.make index 4a8dec0..fc84548 100644 --- a/configs/platform-v7a/rules/barebox-am335x.make +++ b/configs/platform-v7a/rules/barebox-am335x.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BAREBOX_AM335X) += barebox-am335x # # Paths and names # -BAREBOX_AM335X_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION)) -BAREBOX_AM335X_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5)) +BAREBOX_AM335X_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) +BAREBOX_AM335X_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON) BAREBOX_AM335X := barebox-am335x-$(BAREBOX_AM335X_VERSION) BAREBOX_AM335X_SUFFIX := tar.bz2 BAREBOX_AM335X_URL := $(call barebox-url, BAREBOX_AM335X) diff --git a/configs/platform-v7a/rules/barebox-at91.make b/configs/platform-v7a/rules/barebox-at91.make index a55382a..8bb8b1d 100644 --- a/configs/platform-v7a/rules/barebox-at91.make +++ b/configs/platform-v7a/rules/barebox-at91.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BAREBOX_AT91) += barebox-at91 # # Paths and names # -BAREBOX_AT91_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION)) -BAREBOX_AT91_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5)) +BAREBOX_AT91_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) +BAREBOX_AT91_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON) BAREBOX_AT91 := barebox-$(BAREBOX_AT91_VERSION) BAREBOX_AT91_SUFFIX := tar.bz2 BAREBOX_AT91_DIR := $(BUILDDIR)/barebox-at91-$(BAREBOX_AT91_VERSION) diff --git a/configs/platform-v7a/rules/barebox-common.make b/configs/platform-v7a/rules/barebox-common.make index d0caead..4411dbe 100644 --- a/configs/platform-v7a/rules/barebox-common.make +++ b/configs/platform-v7a/rules/barebox-common.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BAREBOX_COMMON) += barebox-common # # Paths and names # -BAREBOX_COMMON_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION)) -BAREBOX_COMMON_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5)) +BAREBOX_COMMON_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) +BAREBOX_COMMON_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON) BAREBOX_COMMON := barebox-common-$(BAREBOX_COMMON_VERSION) BAREBOX_COMMON_SUFFIX := tar.bz2 BAREBOX_COMMON_URL := $(call barebox-url, BAREBOX_COMMON) diff --git a/configs/platform-v7a/rules/barebox-mx6.make b/configs/platform-v7a/rules/barebox-mx6.make index c16cc69..338134a 100644 --- a/configs/platform-v7a/rules/barebox-mx6.make +++ b/configs/platform-v7a/rules/barebox-mx6.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BAREBOX_MX6) += barebox-mx6 # # Paths and names # -BAREBOX_MX6_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION)) -BAREBOX_MX6_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5)) +BAREBOX_MX6_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) +BAREBOX_MX6_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON) BAREBOX_MX6 := barebox-mx6-$(BAREBOX_MX6_VERSION) BAREBOX_MX6_SUFFIX := tar.bz2 BAREBOX_MX6_URL := $(call barebox-url, BAREBOX_MX6) diff --git a/configs/platform-v7a/rules/barebox-rpi2.make b/configs/platform-v7a/rules/barebox-rpi2.make index 26ad980..17f7a33 100644 --- a/configs/platform-v7a/rules/barebox-rpi2.make +++ b/configs/platform-v7a/rules/barebox-rpi2.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BAREBOX_RPI2) += barebox-rpi2 # # Paths and names # -BAREBOX_RPI2_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION)) -BAREBOX_RPI2_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5)) +BAREBOX_RPI2_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) +BAREBOX_RPI2_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON) BAREBOX_RPI2 := barebox-rpi2-$(BAREBOX_RPI2_VERSION) BAREBOX_RPI2_SUFFIX := tar.bz2 BAREBOX_RPI2_URL := $(call barebox-url, BAREBOX_RPI2) diff --git a/configs/platform-v7a/rules/barebox-stm32mp.make b/configs/platform-v7a/rules/barebox-stm32mp.make index 9f59e32..093063a 100644 --- a/configs/platform-v7a/rules/barebox-stm32mp.make +++ b/configs/platform-v7a/rules/barebox-stm32mp.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BAREBOX_STM32MP) += barebox-stm32mp # # Paths and names # -BAREBOX_STM32MP_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION)) -BAREBOX_STM32MP_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5)) +BAREBOX_STM32MP_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) +BAREBOX_STM32MP_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON) BAREBOX_STM32MP := barebox-$(BAREBOX_STM32MP_VERSION) BAREBOX_STM32MP_SUFFIX := tar.bz2 BAREBOX_STM32MP_DIR := $(BUILDDIR)/barebox-stm32mp-$(BAREBOX_STM32MP_VERSION) diff --git a/configs/platform-v7a/rules/barebox-vexpress.make b/configs/platform-v7a/rules/barebox-vexpress.make index 5c17394..fe16cc5 100644 --- a/configs/platform-v7a/rules/barebox-vexpress.make +++ b/configs/platform-v7a/rules/barebox-vexpress.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BAREBOX_VEXPRESS) += barebox-vexpress # # Paths and names # -BAREBOX_VEXPRESS_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION)) -BAREBOX_VEXPRESS_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5)) +BAREBOX_VEXPRESS_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) +BAREBOX_VEXPRESS_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON) BAREBOX_VEXPRESS := barebox-vexpress-$(BAREBOX_VEXPRESS_VERSION) BAREBOX_VEXPRESS_SUFFIX := tar.bz2 BAREBOX_VEXPRESS_URL := $(call barebox-url, BAREBOX_VEXPRESS) -- cgit v1.2.3