From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Michael Olbrich Date: Mon, 4 Nov 2019 22:21:40 +0100 Message-Id: <20191104212147.22470-10-m.olbrich@pengutronix.de> In-Reply-To: <20191104212147.22470-1-m.olbrich@pengutronix.de> References: <20191104212147.22470-1-m.olbrich@pengutronix.de> MIME-Version: 1.0 Subject: [DistroKit] [PATCH v2 09/16] barebox-common: sync with latest barebox template List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: distrokit-bounces@pengutronix.de Sender: "DistroKit" To: distrokit@pengutronix.de Cc: Michael Olbrich Signed-off-by: Michael Olbrich --- .../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