* [Buildroot] [PATCH 1 of 2] check-deprecated-variable: move from pkg-generic.mk to pkg-utils.mk
@ 2014-10-05 7:58 Thomas De Schampheleire
2014-10-05 7:58 ` [Buildroot] [PATCH 2 of 2] check-deprecated-variable: move call to respective infra where appropriate Thomas De Schampheleire
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Thomas De Schampheleire @ 2014-10-05 7:58 UTC (permalink / raw)
To: buildroot
Suggested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
package/pkg-generic.mk | 15 ---------------
package/pkg-utils.mk | 9 +++++++++
2 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -264,21 +264,6 @@
endef
################################################################################
-# check-deprecated-variable -- throw an error on deprecated variables
-#
-# argument 1 is the deprecated variable
-# argument 2 is the new variable to use
-#
-# example:
-# $(eval $(call check-deprecated-variable,FOO_MAKE_OPT,FOO_MAKE_OPTS))
-################################################################################
-define check-deprecated-variable
-ifneq ($$(origin $(1)),undefined)
-$$(error Package error: use $(2) instead of $(1). Please fix your .mk file)
-endif
-endef
-
-################################################################################
# inner-generic-package -- generates the make targets needed to build a
# generic package
#
diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -88,6 +88,15 @@
endef
+# check-deprecated-variable -- throw an error on deprecated variables
+# example:
+# $(eval $(call check-deprecated-variable,FOO_MAKE_OPT,FOO_MAKE_OPTS))
+define check-deprecated-variable # (deprecated var, new var)
+ifneq ($$(origin $(1)),undefined)
+$$(error Package error: use $(2) instead of $(1). Please fix your .mk file)
+endif
+endef
+
#
# legal-info helper functions
#
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2 of 2] check-deprecated-variable: move call to respective infra where appropriate
2014-10-05 7:58 [Buildroot] [PATCH 1 of 2] check-deprecated-variable: move from pkg-generic.mk to pkg-utils.mk Thomas De Schampheleire
@ 2014-10-05 7:58 ` Thomas De Schampheleire
2014-10-05 8:15 ` Yann E. MORIN
2014-10-05 11:39 ` Thomas Petazzoni
2014-10-05 8:13 ` [Buildroot] [PATCH 1 of 2] check-deprecated-variable: move from pkg-generic.mk to pkg-utils.mk Yann E. MORIN
2014-10-05 11:39 ` Thomas Petazzoni
2 siblings, 2 replies; 6+ messages in thread
From: Thomas De Schampheleire @ 2014-10-05 7:58 UTC (permalink / raw)
To: buildroot
Move the checks for AUTORECONF_OPT, GETTEXTIZE_OPT to pkg-autotools.mk,
and for KCONFIG_OPT to pkg-kconfig.mk.
The other checks are used by several infras and are therefore better placed
in pkg-generic.mk.
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -103,6 +103,10 @@
$(2)_AUTORECONF_OPTS ?= $$($(3)_AUTORECONF_OPTS)
endif
+# These options have been renamed from _OPT to _OPTS in 2014.11
+$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS))
+
$(2)_CONF_ENV ?=
$(2)_CONF_OPTS ?=
$(2)_MAKE_ENV ?=
@@ -111,7 +115,6 @@
$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install
$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
-
#
# Configure step. Only define it if not already defined by the package
# .mk file. And take care of the differences between host and target
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -708,11 +708,8 @@
$(eval $(call check-deprecated-variable,$(2)_INSTALL_TARGET_OPT,$(2)_INSTALL_TARGET_OPTS))
$(eval $(call check-deprecated-variable,$(2)_INSTALL_STAGING_OPT,$(2)_INSTALL_STAGING_OPTS))
$(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_OPTS))
-$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS))
$(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS))
$(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS))
-$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS))
-$(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS))
TARGETS += $(1)
diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk
--- a/package/pkg-kconfig.mk
+++ b/package/pkg-kconfig.mk
@@ -36,6 +36,9 @@
$(2)_KCONFIG_OPTS ?=
$(2)_KCONFIG_FIXUP_CMDS ?=
+# This option has been renamed from _OPT to _OPTS in 2014.11
+$(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS))
+
# FOO_KCONFIG_FILE is required
ifndef $(2)_KCONFIG_FILE
$$(error Internal error: no value specified for $(2)_KCONFIG_FILE)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1 of 2] check-deprecated-variable: move from pkg-generic.mk to pkg-utils.mk
2014-10-05 7:58 [Buildroot] [PATCH 1 of 2] check-deprecated-variable: move from pkg-generic.mk to pkg-utils.mk Thomas De Schampheleire
2014-10-05 7:58 ` [Buildroot] [PATCH 2 of 2] check-deprecated-variable: move call to respective infra where appropriate Thomas De Schampheleire
@ 2014-10-05 8:13 ` Yann E. MORIN
2014-10-05 11:39 ` Thomas Petazzoni
2 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2014-10-05 8:13 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-10-05 09:58 +0200, Thomas De Schampheleire spake thusly:
> Suggested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/pkg-generic.mk | 15 ---------------
> package/pkg-utils.mk | 9 +++++++++
> 2 files changed, 9 insertions(+), 15 deletions(-)
>
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -264,21 +264,6 @@
> endef
>
> ################################################################################
> -# check-deprecated-variable -- throw an error on deprecated variables
> -#
> -# argument 1 is the deprecated variable
> -# argument 2 is the new variable to use
> -#
> -# example:
> -# $(eval $(call check-deprecated-variable,FOO_MAKE_OPT,FOO_MAKE_OPTS))
> -################################################################################
> -define check-deprecated-variable
> -ifneq ($$(origin $(1)),undefined)
> -$$(error Package error: use $(2) instead of $(1). Please fix your .mk file)
> -endif
> -endef
> -
> -################################################################################
> # inner-generic-package -- generates the make targets needed to build a
> # generic package
> #
> diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
> --- a/package/pkg-utils.mk
> +++ b/package/pkg-utils.mk
> @@ -88,6 +88,15 @@
>
> endef
>
> +# check-deprecated-variable -- throw an error on deprecated variables
> +# example:
> +# $(eval $(call check-deprecated-variable,FOO_MAKE_OPT,FOO_MAKE_OPTS))
> +define check-deprecated-variable # (deprecated var, new var)
> +ifneq ($$(origin $(1)),undefined)
> +$$(error Package error: use $(2) instead of $(1). Please fix your .mk file)
> +endif
> +endef
> +
> #
> # legal-info helper functions
> #
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2 of 2] check-deprecated-variable: move call to respective infra where appropriate
2014-10-05 7:58 ` [Buildroot] [PATCH 2 of 2] check-deprecated-variable: move call to respective infra where appropriate Thomas De Schampheleire
@ 2014-10-05 8:15 ` Yann E. MORIN
2014-10-05 11:39 ` Thomas Petazzoni
1 sibling, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2014-10-05 8:15 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-10-05 09:58 +0200, Thomas De Schampheleire spake thusly:
> Move the checks for AUTORECONF_OPT, GETTEXTIZE_OPT to pkg-autotools.mk,
> and for KCONFIG_OPT to pkg-kconfig.mk.
>
> The other checks are used by several infras and are therefore better placed
> in pkg-generic.mk.
Missing SoB line. ;-)
Anyway, as sseen on IRC: we keep all checks in one place, but add a
comment explaining why.
Regards,
Yann E. MORIN.
> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
> --- a/package/pkg-autotools.mk
> +++ b/package/pkg-autotools.mk
> @@ -103,6 +103,10 @@
> $(2)_AUTORECONF_OPTS ?= $$($(3)_AUTORECONF_OPTS)
> endif
>
> +# These options have been renamed from _OPT to _OPTS in 2014.11
> +$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS))
> +$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS))
> +
> $(2)_CONF_ENV ?=
> $(2)_CONF_OPTS ?=
> $(2)_MAKE_ENV ?=
> @@ -111,7 +115,6 @@
> $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install
> $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
>
> -
> #
> # Configure step. Only define it if not already defined by the package
> # .mk file. And take care of the differences between host and target
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -708,11 +708,8 @@
> $(eval $(call check-deprecated-variable,$(2)_INSTALL_TARGET_OPT,$(2)_INSTALL_TARGET_OPTS))
> $(eval $(call check-deprecated-variable,$(2)_INSTALL_STAGING_OPT,$(2)_INSTALL_STAGING_OPTS))
> $(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_OPTS))
> -$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS))
> $(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS))
> $(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS))
> -$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS))
> -$(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS))
>
> TARGETS += $(1)
>
> diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk
> --- a/package/pkg-kconfig.mk
> +++ b/package/pkg-kconfig.mk
> @@ -36,6 +36,9 @@
> $(2)_KCONFIG_OPTS ?=
> $(2)_KCONFIG_FIXUP_CMDS ?=
>
> +# This option has been renamed from _OPT to _OPTS in 2014.11
> +$(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS))
> +
> # FOO_KCONFIG_FILE is required
> ifndef $(2)_KCONFIG_FILE
> $$(error Internal error: no value specified for $(2)_KCONFIG_FILE)
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1 of 2] check-deprecated-variable: move from pkg-generic.mk to pkg-utils.mk
2014-10-05 7:58 [Buildroot] [PATCH 1 of 2] check-deprecated-variable: move from pkg-generic.mk to pkg-utils.mk Thomas De Schampheleire
2014-10-05 7:58 ` [Buildroot] [PATCH 2 of 2] check-deprecated-variable: move call to respective infra where appropriate Thomas De Schampheleire
2014-10-05 8:13 ` [Buildroot] [PATCH 1 of 2] check-deprecated-variable: move from pkg-generic.mk to pkg-utils.mk Yann E. MORIN
@ 2014-10-05 11:39 ` Thomas Petazzoni
2 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2014-10-05 11:39 UTC (permalink / raw)
To: buildroot
Dear Thomas De Schampheleire,
On Sun, 05 Oct 2014 09:58:31 +0200, Thomas De Schampheleire wrote:
> Suggested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>
> ---
> package/pkg-generic.mk | 15 ---------------
> package/pkg-utils.mk | 9 +++++++++
> 2 files changed, 9 insertions(+), 15 deletions(-)
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2 of 2] check-deprecated-variable: move call to respective infra where appropriate
2014-10-05 7:58 ` [Buildroot] [PATCH 2 of 2] check-deprecated-variable: move call to respective infra where appropriate Thomas De Schampheleire
2014-10-05 8:15 ` Yann E. MORIN
@ 2014-10-05 11:39 ` Thomas Petazzoni
1 sibling, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2014-10-05 11:39 UTC (permalink / raw)
To: buildroot
Dear Thomas De Schampheleire,
On Sun, 05 Oct 2014 09:58:32 +0200, Thomas De Schampheleire wrote:
> Move the checks for AUTORECONF_OPT, GETTEXTIZE_OPT to pkg-autotools.mk,
> and for KCONFIG_OPT to pkg-kconfig.mk.
>
> The other checks are used by several infras and are therefore better placed
> in pkg-generic.mk.
As per the discussion with Yann, I've rejected this patch.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-10-05 11:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-05 7:58 [Buildroot] [PATCH 1 of 2] check-deprecated-variable: move from pkg-generic.mk to pkg-utils.mk Thomas De Schampheleire
2014-10-05 7:58 ` [Buildroot] [PATCH 2 of 2] check-deprecated-variable: move call to respective infra where appropriate Thomas De Schampheleire
2014-10-05 8:15 ` Yann E. MORIN
2014-10-05 11:39 ` Thomas Petazzoni
2014-10-05 8:13 ` [Buildroot] [PATCH 1 of 2] check-deprecated-variable: move from pkg-generic.mk to pkg-utils.mk Yann E. MORIN
2014-10-05 11:39 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox