* [DistroKit] [PATCH v1 2/4] v7a_noneon: barebox-at91: build out of three
2022-04-07 10:53 [DistroKit] [PATCH v1 1/4] v7a: barebox-stm32mp: build out of three Oleksij Rempel
@ 2022-04-07 10:53 ` Oleksij Rempel
2022-04-07 19:18 ` Robert Schwebel
2022-04-07 10:53 ` [DistroKit] [PATCH v1 3/4] v7a: " Oleksij Rempel
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Oleksij Rempel @ 2022-04-07 10:53 UTC (permalink / raw)
To: distrokit; +Cc: Oleksij Rempel
Sync barebox-at91 make file with other make variants and enable build
out of three, to avoid build conflicts if local_src is used
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
.../rules/barebox-at91.make | 36 ++++++++++---------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/configs/platform-v7a_noneon/rules/barebox-at91.make b/configs/platform-v7a_noneon/rules/barebox-at91.make
index 1079b28..66d951e 100644
--- a/configs/platform-v7a_noneon/rules/barebox-at91.make
+++ b/configs/platform-v7a_noneon/rules/barebox-at91.make
@@ -14,41 +14,43 @@ PACKAGES-$(PTXCONF_BAREBOX_AT91) += barebox-at91
#
# Paths and names
#
-BAREBOX_AT91_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON)
+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)
-BAREBOX_AT91_CONFIG := $(call ptx/in-platformconfigdir, barebox-at91.config)
-BAREBOX_AT91_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
-BAREBOX_AT91_LICENSE := GPL-2.0
+BAREBOX_AT91 := barebox-at91-$(BAREBOX_AT91_VERSION)
+BAREBOX_AT91_SUFFIX := tar.bz2
BAREBOX_AT91_URL := $(call barebox-url, BAREBOX_AT91)
-BAREBOX_AT91_SOURCE := $(SRCDIR)/$(BAREBOX_AT91).$(BAREBOX_AT91_SUFFIX)
+BAREBOX_AT91_PATCHES := barebox-$(BAREBOX_AT91_VERSION)
+BAREBOX_AT91_SOURCE := $(SRCDIR)/$(BAREBOX_AT91_PATCHES).$(BAREBOX_AT91_SUFFIX)
+BAREBOX_AT91_DIR := $(BUILDDIR)/$(BAREBOX_AT91)
+BAREBOX_AT91_BUILD_DIR := $(BAREBOX_AT91_DIR)-build
+BAREBOX_AT91_CONFIG := $(call ptx/in-platformconfigdir, barebox-at91.config)
+BAREBOX_AT91_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
+BAREBOX_AT91_LICENSE := GPL-2.0-only
+BAREBOX_AT91_BUILD_OOT := KEEP
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
+# use host pkg-config for host tools
+BAREBOX_AT91_PATH := PATH=$(HOST_PATH)
+
BAREBOX_AT91_WRAPPER_BLACKLIST := \
- TARGET_HARDEN_RELRO \
- TARGET_HARDEN_BINDNOW \
- TARGET_HARDEN_PIE \
- TARGET_DEBUG \
- TARGET_BUILD_ID
+ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
-BAREBOX_AT91_CONF_ENV := KCONFIG_NOTIMESTAMP=1
BAREBOX_AT91_CONF_OPT := \
+ -C $(BAREBOX_AT91_DIR) \
+ O=$(BAREBOX_AT91_BUILD_DIR) \
BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
$(call barebox-opts, BAREBOX_AT91)
-BAREBOX_AT91_MAKE_ENV := $(BAREBOX_AT91_CONF_ENV)
BAREBOX_AT91_MAKE_OPT := $(BAREBOX_AT91_CONF_OPT)
BAREBOX_AT91_IMAGES := \
images/barebox-microchip-ksz9477-evb.img \
images/barebox-microchip-ksz9477-evb-xload-mmc.img
-BAREBOX_AT91_IMAGES := $(addprefix $(BAREBOX_AT91_DIR)/,$(BAREBOX_AT91_IMAGES))
+BAREBOX_AT91_IMAGES := $(addprefix $(BAREBOX_AT91_BUILD_DIR)/,$(BAREBOX_AT91_IMAGES))
ifdef PTXCONF_BAREBOX_AT91
$(BAREBOX_AT91_CONFIG):
@@ -96,7 +98,7 @@ $(STATEDIR)/barebox-at91.clean:
@$(call targetinfo)
@$(call clean_pkg, BAREBOX_AT91)
@$(foreach image, $(BAREBOX_AT91_IMAGES), \
- rm -fv $(IMAGEDIR)/$(notdir $(image))-at91;)
+ rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
--
2.30.2
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [DistroKit] [PATCH v1 2/4] v7a_noneon: barebox-at91: build out of three
2022-04-07 10:53 ` [DistroKit] [PATCH v1 2/4] v7a_noneon: barebox-at91: " Oleksij Rempel
@ 2022-04-07 19:18 ` Robert Schwebel
0 siblings, 0 replies; 8+ messages in thread
From: Robert Schwebel @ 2022-04-07 19:18 UTC (permalink / raw)
To: Oleksij Rempel; +Cc: distrokit
On Thu, Apr 07, 2022 at 12:53:50PM +0200, Oleksij Rempel wrote:
> Sync barebox-at91 make file with other make variants and enable build
> out of three, to avoid build conflicts if local_src is used
>
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
> .../rules/barebox-at91.make | 36 ++++++++++---------
> 1 file changed, 19 insertions(+), 17 deletions(-)
Applied to next.
rsc
--
Pengutronix e.K. | Dipl.-Ing. Robert Schwebel |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread
* [DistroKit] [PATCH v1 3/4] v7a: barebox-at91: build out of three
2022-04-07 10:53 [DistroKit] [PATCH v1 1/4] v7a: barebox-stm32mp: build out of three Oleksij Rempel
2022-04-07 10:53 ` [DistroKit] [PATCH v1 2/4] v7a_noneon: barebox-at91: " Oleksij Rempel
@ 2022-04-07 10:53 ` Oleksij Rempel
2022-04-07 19:19 ` Robert Schwebel
2022-04-07 10:53 ` [DistroKit] [PATCH v1 4/4] v7a_noneon: barebox-vexpress/common: run oldconfig Oleksij Rempel
2022-04-07 19:18 ` [DistroKit] [PATCH v1 1/4] v7a: barebox-stm32mp: build out of three Robert Schwebel
3 siblings, 1 reply; 8+ messages in thread
From: Oleksij Rempel @ 2022-04-07 10:53 UTC (permalink / raw)
To: distrokit; +Cc: Oleksij Rempel
Sync barebox-at91 make file with other make variants and enable build
out of three, to avoid build conflicts if local_src is used
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
configs/platform-v7a/rules/barebox-at91.make | 36 +++++++++++---------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/configs/platform-v7a/rules/barebox-at91.make b/configs/platform-v7a/rules/barebox-at91.make
index 8bb8b1d..5199ab6 100644
--- a/configs/platform-v7a/rules/barebox-at91.make
+++ b/configs/platform-v7a/rules/barebox-at91.make
@@ -14,34 +14,36 @@ PACKAGES-$(PTXCONF_BAREBOX_AT91) += barebox-at91
#
# Paths and names
#
-BAREBOX_AT91_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON)
+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)
-BAREBOX_AT91_CONFIG := $(call ptx/in-platformconfigdir, barebox-at91.config)
-BAREBOX_AT91_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
-BAREBOX_AT91_LICENSE := GPL-2.0
+BAREBOX_AT91 := barebox-at91-$(BAREBOX_AT91_VERSION)
+BAREBOX_AT91_SUFFIX := tar.bz2
BAREBOX_AT91_URL := $(call barebox-url, BAREBOX_AT91)
-BAREBOX_AT91_SOURCE := $(SRCDIR)/$(BAREBOX_AT91).$(BAREBOX_AT91_SUFFIX)
+BAREBOX_AT91_PATCHES := barebox-$(BAREBOX_AT91_VERSION)
+BAREBOX_AT91_SOURCE := $(SRCDIR)/$(BAREBOX_AT91_PATCHES).$(BAREBOX_AT91_SUFFIX)
+BAREBOX_AT91_DIR := $(BUILDDIR)/$(BAREBOX_AT91)
+BAREBOX_AT91_BUILD_DIR := $(BAREBOX_AT91_DIR)-build
+BAREBOX_AT91_CONFIG := $(call ptx/in-platformconfigdir, barebox-at91.config)
+BAREBOX_AT91_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
+BAREBOX_AT91_LICENSE := GPL-2.0-only
+BAREBOX_AT91_BUILD_OOT := KEEP
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
+# use host pkg-config for host tools
+BAREBOX_AT91_PATH := PATH=$(HOST_PATH)
+
BAREBOX_AT91_WRAPPER_BLACKLIST := \
- TARGET_HARDEN_RELRO \
- TARGET_HARDEN_BINDNOW \
- TARGET_HARDEN_PIE \
- TARGET_DEBUG \
- TARGET_BUILD_ID
+ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
-BAREBOX_AT91_CONF_ENV := KCONFIG_NOTIMESTAMP=1
BAREBOX_AT91_CONF_OPT := \
+ -C $(BAREBOX_AT91_DIR) \
+ O=$(BAREBOX_AT91_BUILD_DIR) \
BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
$(call barebox-opts, BAREBOX_AT91)
-BAREBOX_AT91_MAKE_ENV := $(BAREBOX_AT91_CONF_ENV)
BAREBOX_AT91_MAKE_OPT := $(BAREBOX_AT91_CONF_OPT)
BAREBOX_AT91_IMAGES := \
@@ -50,7 +52,7 @@ BAREBOX_AT91_IMAGES := \
images/barebox-groboards-sama5d27-giantboard.img \
images/barebox-groboards-sama5d27-giantboard-xload-mmc.img
-BAREBOX_AT91_IMAGES := $(addprefix $(BAREBOX_AT91_DIR)/,$(BAREBOX_AT91_IMAGES))
+BAREBOX_AT91_IMAGES := $(addprefix $(BAREBOX_AT91_BUILD_DIR)/,$(BAREBOX_AT91_IMAGES))
ifdef PTXCONF_BAREBOX_AT91
$(BAREBOX_AT91_CONFIG):
@@ -98,7 +100,7 @@ $(STATEDIR)/barebox-at91.clean:
@$(call targetinfo)
@$(call clean_pkg, BAREBOX_AT91)
@$(foreach image, $(BAREBOX_AT91_IMAGES), \
- rm -fv $(IMAGEDIR)/$(notdir $(image))-at91;)
+ rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
--
2.30.2
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [DistroKit] [PATCH v1 3/4] v7a: barebox-at91: build out of three
2022-04-07 10:53 ` [DistroKit] [PATCH v1 3/4] v7a: " Oleksij Rempel
@ 2022-04-07 19:19 ` Robert Schwebel
0 siblings, 0 replies; 8+ messages in thread
From: Robert Schwebel @ 2022-04-07 19:19 UTC (permalink / raw)
To: Oleksij Rempel; +Cc: distrokit
On Thu, Apr 07, 2022 at 12:53:51PM +0200, Oleksij Rempel wrote:
> Sync barebox-at91 make file with other make variants and enable build
> out of three, to avoid build conflicts if local_src is used
>
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
> configs/platform-v7a/rules/barebox-at91.make | 36 +++++++++++---------
> 1 file changed, 19 insertions(+), 17 deletions(-)
Applied to next.
rsc
--
Pengutronix e.K. | Dipl.-Ing. Robert Schwebel |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread
* [DistroKit] [PATCH v1 4/4] v7a_noneon: barebox-vexpress/common: run oldconfig
2022-04-07 10:53 [DistroKit] [PATCH v1 1/4] v7a: barebox-stm32mp: build out of three Oleksij Rempel
2022-04-07 10:53 ` [DistroKit] [PATCH v1 2/4] v7a_noneon: barebox-at91: " Oleksij Rempel
2022-04-07 10:53 ` [DistroKit] [PATCH v1 3/4] v7a: " Oleksij Rempel
@ 2022-04-07 10:53 ` Oleksij Rempel
2022-04-07 19:19 ` Robert Schwebel
2022-04-07 19:18 ` [DistroKit] [PATCH v1 1/4] v7a: barebox-stm32mp: build out of three Robert Schwebel
3 siblings, 1 reply; 8+ messages in thread
From: Oleksij Rempel @ 2022-04-07 10:53 UTC (permalink / raw)
To: distrokit; +Cc: Oleksij Rempel
Update config files by running oldconfig
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
configs/platform-v7a_noneon/barebox-vexpress.config | 2 +-
configs/platform-v7a_noneon/barebox-vexpress.config.diff | 2 +-
configs/platform-v7a_noneon/barebox.config | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configs/platform-v7a_noneon/barebox-vexpress.config b/configs/platform-v7a_noneon/barebox-vexpress.config
index bedcda7..c51ef58 100644
--- a/configs/platform-v7a_noneon/barebox-vexpress.config
+++ b/configs/platform-v7a_noneon/barebox-vexpress.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2021.08.0 Configuration
+# Barebox/arm 2021.10.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
diff --git a/configs/platform-v7a_noneon/barebox-vexpress.config.diff b/configs/platform-v7a_noneon/barebox-vexpress.config.diff
index 4ca912e..d22b1bb 100644
--- a/configs/platform-v7a_noneon/barebox-vexpress.config.diff
+++ b/configs/platform-v7a_noneon/barebox-vexpress.config.diff
@@ -1,4 +1,4 @@
-65719ca0e82fb5940a2621b62f242422
+a075fef9bba4830bbb5803f301aa5334
CONFIG_AMBA_SP804=y
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_VEXPRESS=y
diff --git a/configs/platform-v7a_noneon/barebox.config b/configs/platform-v7a_noneon/barebox.config
index 18e97f2..1880572 100644
--- a/configs/platform-v7a_noneon/barebox.config
+++ b/configs/platform-v7a_noneon/barebox.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2021.08.0 Configuration
+# Barebox/arm 2021.10.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
--
2.30.2
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [DistroKit] [PATCH v1 4/4] v7a_noneon: barebox-vexpress/common: run oldconfig
2022-04-07 10:53 ` [DistroKit] [PATCH v1 4/4] v7a_noneon: barebox-vexpress/common: run oldconfig Oleksij Rempel
@ 2022-04-07 19:19 ` Robert Schwebel
0 siblings, 0 replies; 8+ messages in thread
From: Robert Schwebel @ 2022-04-07 19:19 UTC (permalink / raw)
To: Oleksij Rempel; +Cc: distrokit
On Thu, Apr 07, 2022 at 12:53:52PM +0200, Oleksij Rempel wrote:
> Update config files by running oldconfig
>
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
> configs/platform-v7a_noneon/barebox-vexpress.config | 2 +-
> configs/platform-v7a_noneon/barebox-vexpress.config.diff | 2 +-
> configs/platform-v7a_noneon/barebox.config | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
Applied to next.
rsc
--
Pengutronix e.K. | Dipl.-Ing. Robert Schwebel |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [DistroKit] [PATCH v1 1/4] v7a: barebox-stm32mp: build out of three
2022-04-07 10:53 [DistroKit] [PATCH v1 1/4] v7a: barebox-stm32mp: build out of three Oleksij Rempel
` (2 preceding siblings ...)
2022-04-07 10:53 ` [DistroKit] [PATCH v1 4/4] v7a_noneon: barebox-vexpress/common: run oldconfig Oleksij Rempel
@ 2022-04-07 19:18 ` Robert Schwebel
3 siblings, 0 replies; 8+ messages in thread
From: Robert Schwebel @ 2022-04-07 19:18 UTC (permalink / raw)
To: Oleksij Rempel; +Cc: distrokit
On Thu, Apr 07, 2022 at 12:53:49PM +0200, Oleksij Rempel wrote:
> Sync barebox-stm32mp make file with other make variants and enable build
> out of three, to avoid build conflicts if local_src is used.
>
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
> .../platform-v7a/rules/barebox-stm32mp.make | 24 +++++++++----------
> 1 file changed, 12 insertions(+), 12 deletions(-)
Applied to next.
rsc
--
Pengutronix e.K. | Dipl.-Ing. Robert Schwebel |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread