From: Michael Olbrich <m.olbrich@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Michael Olbrich <m.olbrich@pengutronix.de>
Subject: [DistroKit] [PATCH 09/14] barebox-common: sync with latest barebox template
Date: Tue, 29 Oct 2019 12:28:56 +0100 [thread overview]
Message-ID: <20191029112901.3380-10-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20191029112901.3380-1-m.olbrich@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
.../platform-v7a/rules/barebox-common.make | 53 ++++++++++---------
1 file changed, 28 insertions(+), 25 deletions(-)
diff --git a/configs/platform-v7a/rules/barebox-common.make b/configs/platform-v7a/rules/barebox-common.make
index 84df4fe63d03..8f7c52fd4c1d 100644
--- a/configs/platform-v7a/rules/barebox-common.make
+++ b/configs/platform-v7a/rules/barebox-common.make
@@ -9,22 +9,23 @@
#
# We provide this package
#
-EXTRA_PACKAGES-$(PTXCONF_BAREBOX_COMMON) += barebox-common
+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 := barebox-common-$(BAREBOX_COMMON_VERSION)
-BAREBOX_COMMON_SUFFIX := tar.bz2
-BAREBOX_COMMON_URL := $(call barebox-url, BAREBOX_COMMON)
-BAREBOX_COMMON_SOURCE := $(SRCDIR)/barebox-$(BAREBOX_COMMON_VERSION).$(BAREBOX_COMMON_SUFFIX)
-BAREBOX_COMMON_DIR := $(BUILDDIR)/$(BAREBOX_COMMON)
-BAREBOX_COMMON_LICENSE := GPL-2.0-only
-BAREBOX_COMMON_DEVPKG := NO
-
-BAREBOX_COMMON_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
+BAREBOX_COMMON_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
+BAREBOX_COMMON_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
+BAREBOX_COMMON := barebox-common-$(BAREBOX_COMMON_VERSION)
+BAREBOX_COMMON_SUFFIX := tar.bz2
+BAREBOX_COMMON_URL := $(call barebox-url, BAREBOX_COMMON)
+BAREBOX_COMMON_PATCHES := barebox-$(BAREBOX_COMMON_VERSION)
+BAREBOX_COMMON_SOURCE := $(SRCDIR)/$(BAREBOX_COMMON_PATCHES).$(BAREBOX_COMMON_SUFFIX)
+BAREBOX_COMMON_DIR := $(BUILDDIR)/$(BAREBOX_COMMON)
+BAREBOX_COMMON_BUILD_DIR := $(BAREBOX_COMMON_DIR)-build
+BAREBOX_COMMON_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
+BAREBOX_COMMON_LICENSE := GPL-2.0-only
+BAREBOX_COMMON_BUILD_OOT := KEEP
# ----------------------------------------------------------------------------
# Prepare
@@ -33,15 +34,25 @@ BAREBOX_COMMON_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
# use host pkg-config for host tools
BAREBOX_COMMON_PATH := PATH=$(HOST_PATH)
-BAREBOX_COMMON_CONF_OPT := $(call barebox-opts)
+BAREBOX_COMMON_CONF_OPT := \
+ -C $(BAREBOX_COMMON_DIR) \
+ O=$(BAREBOX_COMMON_BUILD_DIR) \
+ $(call barebox-opts, BAREBOX_COMMON)
+
BAREBOX_COMMON_MAKE_OPT := $(BAREBOX_COMMON_CONF_OPT)
BAREBOX_COMMON_TAGS_OPT := TAGS tags cscope
-$(STATEDIR)/barebox-common.prepare:
- @$(call targetinfo)
- @$(call world/prepare, BAREBOX_COMMON)
- @$(call touch)
+ifdef PTXCONF_BAREBOX_COMMON
+$(BAREBOX_COMMON_CONFIG):
+ @echo
+ @echo "****************************************************************************"
+ @echo " Please generate a bareboxconfig with 'ptxdist menuconfig barebox-common'"
+ @echo "****************************************************************************"
+ @echo
+ @echo
+ @exit 1
+endif
# ----------------------------------------------------------------------------
# Compile
@@ -59,14 +70,6 @@ $(STATEDIR)/barebox-common.install:
@$(call targetinfo)
@$(call touch)
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-common.targetinstall:
- @$(call targetinfo)
- @$(call touch)
-
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
# ----------------------------------------------------------------------------
--
2.20.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
next prev parent reply other threads:[~2019-10-29 11:28 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-29 11:28 [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 01/14] v7a: barebox-common: modify oldconfig to affect all bareboxes Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 02/14] v7a: barebox-common: add clean target that affects " Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 03/14] v7a: barebox: version bump 2019.08.1 → 2019.10.0 Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 04/14] barebox-vexpress: sync with latest barebox template Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 05/14] barebox-mx6: " Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 06/14] barebox-rpi2: " Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 07/14] barebox-am335x-mlo: " Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 08/14] barebox-am335x: " Michael Olbrich
2019-10-29 11:28 ` Michael Olbrich [this message]
2019-10-29 11:28 ` [DistroKit] [PATCH 10/14] barebox-vexpress: remove installed files Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 11/14] barebox-rpi2: don't add a suffix to the images Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 12/14] barebox-am335x-mlo: actually remove images during 'clean' Michael Olbrich
2019-10-29 11:29 ` [DistroKit] [PATCH 13/14] barebox-am335x: " Michael Olbrich
2019-10-29 11:29 ` [DistroKit] [PATCH 14/14] barebox-mx6: " Michael Olbrich
2019-10-29 15:42 ` [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Robert Schwebel
2019-11-02 9:15 ` Robert Schwebel
2019-11-04 10:09 ` Roland Hieber
2019-11-04 13:18 ` Rouven Czerwinski
2019-11-04 21:16 ` Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191029112901.3380-10-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=distrokit@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox