infra: fix dollar signs; remove some undefined versions
PATCH 1/1 infra: fix dollar signs; remove some undefined versions
Hi,
This patch series fixes the double sign problem in the inner-xxx-targets (see description in the patch itself), and makes the following semi-related changes:
- convert toolchain and toolchain-buildroot package to virtual-package
- change toolchain-external package to have a virtual version
- change makedevs and mkpasswd to have a 'buildroot' version
The changes are related in the sense that the double dollar signs were needed to correctly implement the subsequent patches.
Best regards,
Thomas
PATCH 1/1 infra: consistently use double dollar signs inside inner-xxx-targets
The inner-xxx-targets in the buildroot package infrastructures are evaluated using $(eval) which causes variable references to be a bit different than in regular make code. As we want most references to be expanded only at the time of the $(eval) we should not use standard references $(VAR) but rather use double dollar signs $$(VAR). This includes function references like $(call), $(subst), etc. The only exception is the reference to numbered variables, which are paremeters to the inner block:
$(1), $(2), etc.
This patch introduces consistent usage of double-dollar signs throughout the different inner-xxx-targets blocks.
In some cases, this would potentially cause circular references, in particular when the value of HOST_FOO_VAR would be obtained from the corresponding FOO_VAR if HOST_FOO_VAR is not defined. In these cases, an immediate assignment using := is necessary instead of a deferred assignment. using =.
When such a circular assignment occurs in a variable defined with '?=', a special construction is necessary, as make does not have a corresponding '?:=' assignment. As 'FOO ?= bar' is equivalent to
ifeq ($(origin FOO),undefined)
FOO = bar
endif
we can replace such constructions with
ifeq ($$(origin FOO),undefined)
FOO := bar
endif
Benefits of these changes are:
- behavior of variables is now again as expected. For example, setting $(2)_VERSION = virtual in pkg-virtual.mk will effectively work, while originally it would cause very odd results.
- The output of 'make printvars' is now much more useful. This target shows the value of all variables, and the expression that led to that value. However, if the expression was coming from an inner-xxx-targets block, and was using single dollar signs, it would show in printvars as VAR = value (value)
while if double dollar signs are used, it would effectively look like
VAR = value (actual expression)
as is intended.
This improvement is for example effective for FOO_DL_VERSION, FOO_RAWNAME, FOO_SITE_METHOD and FOO_MAKE.
The correctness of this patch can be verified by comparing 'make printvars' before and after applying this patch.
--- package/pkg-autotools.mk | 26 ++++++++------ package/pkg-cmake.mk | 28 ++++++++------- package/pkg-generic.mk | 86 ++++++++++++++++++++++++----------------------- package/pkg-luarocks.mk | 10 ++-- package/pkg-perl.mk | 44 ++++++++++++------------ package/pkg-python.mk | 30 ++++++++------- package/pkg-virtual.mk | 12 +++-- 7 files changed, 124 insertions(+), 112 deletions(-)
Note: in addition to using 'make printvars' to verify this patch, a 'make randpackageconfig' was performed successfully.
package/pkg-autotools.mk +15 -11
@@ -65,7 +65,7 @@ define inner-autotools-package ifndef $(2)_LIBTOOL_PATCH ifdef $(3)_LIBTOOL_PATCH - $(2)_LIBTOOL_PATCH = $($(3)_LIBTOOL_PATCH) + $(2)_LIBTOOL_PATCH = $$($(3)_LIBTOOL_PATCH) else $(2)_LIBTOOL_PATCH ?= YES endif
@@ -73,25 +73,28 @@ endif ifndef $(2)_MAKE ifdef $(3)_MAKE - $(2)_MAKE = $($(3)_MAKE) + $(2)_MAKE = $$($(3)_MAKE) else - $(2)_MAKE ?= $(MAKE) + $(2)_MAKE ?= $$(MAKE) endif endif ifndef $(2)_AUTORECONF ifdef $(3)_AUTORECONF - $(2)_AUTORECONF = $($(3)_AUTORECONF) + $(2)_AUTORECONF = $$($(3)_AUTORECONF) else $(2)_AUTORECONF ?= NO endif endif +ifeq ($$(origin $(2)_AUTORECONF_OPT),undefined) + $(2)_AUTORECONF_OPT := $$($(3)_AUTORECONF_OPT) +endif + $(2)_CONF_ENV ?= $(2)_CONF_OPT ?= $(2)_MAKE_ENV ?= $(2)_MAKE_OPT ?= -$(2)_AUTORECONF_OPT ?= $($(3)_AUTORECONF_OPT) $(2)_INSTALL_OPT ?= install $(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install $(2)_INSTALL_TARGET_OPT ?= DESTDIR=$$(TARGET_DIR) install
@@ -201,7 +204,7 @@ endif # define AUTORECONF_HOOK @$$(call MESSAGE,"Autoreconfiguring") - $(Q)cd $$($$(PKG)_SRCDIR) && $(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT) + $(Q)cd $$($$(PKG)_SRCDIR) && $$(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT) $(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \ for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \ ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \
@@ -220,10 +223,11 @@ endef # This must be repeated from inner-generic-package, otherwise we get an empty # _DEPENDENCIES if _AUTORECONF is YES. Also filter the result of _AUTORECONF # away from the non-host rule -$(2)_DEPENDENCIES ?= $(filter-out host-automake host-autoconf host-libtool \ +ifeq ($$(origin $(2)_DEPENDENCIES),undefined) +$(2)_DEPENDENCIES := $$(filter-out host-automake host-autoconf host-libtool \ host-toolchain $(1),\ - $(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))) - + $$(patsubst host-host-%,host-%,$$(addprefix host-,$$($(3)_DEPENDENCIES)))) +endif ifeq ($$($(2)_AUTORECONF),YES) $(2)_PRE_CONFIGURE_HOOKS += AUTORECONF_HOOK
@@ -263,9 +267,9 @@ endif ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_SRCDIR) - for i in $$$$(find $(STAGING_DIR)/usr/lib* -name "*.la"); do \ + for i in $$$$(find $$(STAGING_DIR)/usr/lib* -name "*.la"); do \ cp -f $$$$i $$$$i~; \ - $$(SED) "s:\(['= ]\)/usr:\\1$(STAGING_DIR)/usr:g" $$$$i; \ + $$(SED) "s:\(['= ]\)/usr:\\1$$(STAGING_DIR)/usr:g" $$$$i; \ done endef endif
package/pkg-cmake.mk +15 -13
@@ -38,14 +38,14 @@ define inner-cmake-package $(2)_CONF_ENV ?= $(2)_CONF_OPT ?= -$(2)_MAKE ?= $(MAKE) +$(2)_MAKE ?= $$(MAKE) $(2)_MAKE_ENV ?= $(2)_MAKE_OPT ?= $(2)_INSTALL_HOST_OPT ?= install $(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install $(2)_INSTALL_TARGET_OPT ?= DESTDIR=$$(TARGET_DIR) install -$(2)_SRCDIR = $$($(2)_DIR)/$($(2)_SUBDIR) +$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR) $(2)_BUILDDIR = $$($(2)_SRCDIR) #
@@ -60,12 +60,12 @@ ifeq ($(4),target) define $(2)_CONFIGURE_CMDS (cd $$($$(PKG)_BUILDDIR) && \ rm -f CMakeCache.txt && \ - PATH=$(BR_PATH) \ - $$($$(PKG)_CONF_ENV) $(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \ + PATH=$$(BR_PATH) \ + $$($$(PKG)_CONF_ENV) $$(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_COLOR_MAKEFILE=OFF \ - -DBUILD_SHARED_LIBS=$(if $(BR2_PREFER_STATIC_LIB),OFF,ON) \ + -DBUILD_SHARED_LIBS=$$(if $$(BR2_PREFER_STATIC_LIB),OFF,ON) \ $$($$(PKG)_CONF_OPT) \ ) endef
@@ -75,8 +75,8 @@ else define $(2)_CONFIGURE_CMDS (cd $$($$(PKG)_BUILDDIR) && \ rm -f CMakeCache.txt && \ - PATH=$(BR_PATH) \ - $(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \ + PATH=$$(BR_PATH) \ + $$(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \ -DCMAKE_INSTALL_SO_NO_EXE=0 \ -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \
@@ -91,7 +91,9 @@ endif # This must be repeated from inner-generic-package, otherwise we only get # host-cmake in _DEPENDENCIES because of the following line -$(2)_DEPENDENCIES ?= $(filter-out host-toolchain $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))) +ifeq ($$(origin $(2)_DEPENDENCIES),undefined) +$(2)_DEPENDENCIES := $$(filter-out host-toolchain $(1),$$(patsubst host-host-%,host-%,$$(addprefix host-,$$($(3)_DEPENDENCIES)))) +endif $(2)_DEPENDENCIES += host-cmake
@@ -102,11 +104,11 @@ endif ifndef $(2)_BUILD_CMDS ifeq ($(4),target) define $(2)_BUILD_CMDS - $(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_BUILDDIR) endef else define $(2)_BUILD_CMDS - $(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_BUILDDIR) endef endif endif
@@ -117,7 +119,7 @@ endif # ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS - $(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) $$($$(PKG)_INSTALL_HOST_OPT) -C $$($$(PKG)_BUILDDIR) + $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) $$($$(PKG)_INSTALL_HOST_OPT) -C $$($$(PKG)_BUILDDIR) endef endif
@@ -127,7 +129,7 @@ endif # ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_BUILDDIR) endef endif
@@ -137,7 +139,7 @@ endif # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) $$($$(PKG)_INSTALL_TARGET_OPT) -C $$($$(PKG)_BUILDDIR) + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) $$($$(PKG)_INSTALL_TARGET_OPT) -C $$($$(PKG)_BUILDDIR) endef endif
package/pkg-generic.mk +44 -42
220 lines not on this page · raw message
package/pkg-luarocks.mk +5 -5
@@ -34,10 +34,10 @@ define inner-luarocks-package $(2)_BUILD_OPT ?= -$(2)_SUBDIR ?= $(1)-$(shell echo "$($(3)_VERSION)" | sed -e "s/-[0-9]$$//") -$(2)_ROCKSPEC ?= $(1)-$($(3)_VERSION).rockspec -$(2)_SOURCE ?= $(1)-$($(3)_VERSION).src.rock -$(2)_SITE ?= $(call qstrip,$(BR2_LUAROCKS_MIRROR)) +$(2)_SUBDIR ?= $(1)-$$(shell echo "$$($(3)_VERSION)" | sed -e "s/-[0-9]$$$$//") +$(2)_ROCKSPEC ?= $(1)-$$($(3)_VERSION).rockspec +$(2)_SOURCE ?= $(1)-$$($(3)_VERSION).src.rock +$(2)_SITE ?= $$(call qstrip,$$(BR2_LUAROCKS_MIRROR)) # Since we do not support host-luarocks-package, we know this is # a target package, and can just add the required dependencies
@@ -49,7 +49,7 @@ define inner-luarocks-package ifndef $(2)_EXTRACT_CMDS define $(2)_EXTRACT_CMDS cd $$($(2)_DIR)/.. && \ - $$(LUAROCKS_RUN) unpack --force $(DL_DIR)/$$($(2)_SOURCE) + $$(LUAROCKS_RUN) unpack --force $$(DL_DIR)/$$($(2)_SOURCE) endef endif
package/pkg-perl.mk +22 -22
86 lines not on this page · raw message
package/pkg-python.mk +16 -14
@@ -82,7 +82,7 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT = define inner-python-package -$(2)_SRCDIR = $$($(2)_DIR)/$($(2)_SUBDIR) +$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR) $(2)_BUILDDIR = $$($(2)_SRCDIR) $(2)_ENV ?=
@@ -91,7 +91,7 @@ define inner-python-package ifndef $(2)_SETUP_TYPE ifdef $(3)_SETUP_TYPE - $(2)_SETUP_TYPE = $($(3)_SETUP_TYPE) + $(2)_SETUP_TYPE = $$($(3)_SETUP_TYPE) else $$(error "$(2)_SETUP_TYPE must be set") endif
@@ -138,7 +138,9 @@ endif # depending on the package characteristics, and shouldn't be derived # automatically from the dependencies of the corresponding target # package. -$(2)_DEPENDENCIES ?= $(filter-out host-python host-python3 host-python-setuptools host-toolchain $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))) +ifeq ($$(origin $(2)_DEPENDENCIES),undefined) +$(2)_DEPENDENCIES := $$(filter-out host-python host-python3 host-python-setuptools host-toolchain $(1),$$(patsubst host-host-%,host-%,$$(addprefix host-,$$($(3)_DEPENDENCIES)))) +endif # Target packages need both the python interpreter on the target (for # runtime) and the python interpreter on the host (for
@@ -155,19 +157,19 @@ endif # - otherwise, we depend on the one requested by *_NEEDS_HOST_PYTHON. # ifeq ($(4),target) -$(2)_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) +$(2)_DEPENDENCIES += $$(if $$(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) else -ifeq ($($(2)_NEEDS_HOST_PYTHON),) -$(2)_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) +ifeq ($$($(2)_NEEDS_HOST_PYTHON),) +$(2)_DEPENDENCIES += $$(if $$(BR2_PACKAGE_PYTHON3),host-python3,host-python) else -ifeq ($($(2)_NEEDS_HOST_PYTHON),python2) +ifeq ($$($(2)_NEEDS_HOST_PYTHON),python2) $(2)_DEPENDENCIES += host-python -else ifeq ($($(2)_NEEDS_HOST_PYTHON),python3) +else ifeq ($$($(2)_NEEDS_HOST_PYTHON),python3) $(2)_DEPENDENCIES += host-python3 else -$$(error Incorrect value '$($(2)_NEEDS_HOST_PYTHON)' for $(2)_NEEDS_HOST_PYTHON) +$$(error Incorrect value '$$($(2)_NEEDS_HOST_PYTHON)' for $(2)_NEEDS_HOST_PYTHON) endif -endif # ($($(2)_NEEDS_HOST_PYTHON),) +endif # ($$($(2)_NEEDS_HOST_PYTHON),) endif # ($(4),target) # Setuptools based packages will need host-python-setuptools (both
@@ -196,12 +198,12 @@ endif # - otherwise, we use the one requested by *_NEEDS_HOST_PYTHON. # ifeq ($(4),target) -$(2)_PYTHON_INTERPRETER = $(HOST_DIR)/usr/bin/python +$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/usr/bin/python else -ifeq ($($(2)_NEEDS_HOST_PYTHON),) -$(2)_PYTHON_INTERPRETER = $(HOST_DIR)/usr/bin/python +ifeq ($$($(2)_NEEDS_HOST_PYTHON),) +$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/usr/bin/python else -$(2)_PYTHON_INTERPRETER = $(HOST_DIR)/usr/bin/$($(2)_NEEDS_HOST_PYTHON) +$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/usr/bin/$$($(2)_NEEDS_HOST_PYTHON) endif endif
package/pkg-virtual.mk +7 -5
@@ -35,8 +35,8 @@ define inner-virtual-package # Ensure the virtual package has an implementation defined. -ifeq ($(BR2_PACKAGE_HAS_$(2)),y) -ifeq ($(call qstrip,$(BR2_PACKAGE_PROVIDES_$(2))),) +ifeq ($$(BR2_PACKAGE_HAS_$(2)),y) +ifeq ($$(call qstrip,$$(BR2_PACKAGE_PROVIDES_$(2))),) $$(error No implementation selected for virtual package $(1). Configuration error) endif endif
@@ -50,11 +50,13 @@ HOST_$(3)_VERSION = virtual # This must be repeated from inner-generic-package, otherwise we get an empty # _DEPENDENCIES -$(2)_DEPENDENCIES ?= $(filter-out host-toolchain $(1),\ - $(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))) +ifeq ($$(origin $(2)_DEPENDENCIES),undefined) +$(2)_DEPENDENCIES := $$(filter-out host-toolchain $(1),\ + $$(patsubst host-host-%,host-%,$$(addprefix host-,$$($(3)_DEPENDENCIES)))) +endif # Add dependency against the provider -$(2)_DEPENDENCIES += $(call qstrip,$(BR2_PACKAGE_PROVIDES_$(2))) +$(2)_DEPENDENCIES += $$(call qstrip,$$(BR2_PACKAGE_PROVIDES_$(2))) # Call the generic package infrastructure to generate the necessary # make targets
PATCH 1/1 infra: consistently use double dollar signs inside inner-xxx-targets
Thomas, All,
On 2014-05-11 17:38 +0200, Thomas De Schampheleire spake thusly:
Quoted 11 lines
The inner-xxx-targets in the buildroot package infrastructures are evaluated using $(eval) which causes variable references to be a bit different than in regular make code. As we want most references to be expanded only at the time of the $(eval) we should not use standard references $(VAR) but rather use double dollar signs $$(VAR). This includes function references like $(call), $(subst), etc. The only exception is the reference to numbered variables, which are paremeters to the inner block:
$(1), $(2), etc.This patch introduces consistent usage of double-dollar signs throughout the different inner-xxx-targets blocks.
[--SNIP--]
package/pkg-autotools.mk
Quoted 3 lines
package/pkg-autotools.mk +0
-0
Did you forget that one, or did you leave it out on purpose:
46: AUTOCONF_AC_CHECK_FILE_VAL = ac_cv_file_$(subst -,_,$(subst /,_,$(subst .,_,$(1))))
[--SNIP--]
package/pkg-autotools.mk endif · line 207
Quoted 6 lines
package/pkg-autotools.mk +1
-1@@ -201,7 +204,7 @@ endif # define AUTORECONF_HOOK @$$(call MESSAGE,"Autoreconfiguring") - $(Q)cd $$($$(PKG)_SRCDIR) && $(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT) + $(Q)cd $$($$(PKG)_SRCDIR) && $$(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT)
You left out the $(Q) as-is. Although I agreee it's not very important and would still work (heck it already work as-is), I think we should cahnge it, for consistency sake, no?
[--SNIP--]
I see you have not changed anything in pkg-download.mk. Do you thinks there is nothing worth changing in there?
I'm especialy thinking about these functions:
{DOWNLOAD,SOURCE_CHECK,SHOW_EXTERNAL_DEPS}_{GIT,BZR,CVS,SVN,SCP,HG,WGET,LOCALFILES}as well as: DOWNLOAD and DOWNLOAD_INNER
[--SNIP--]
package/pkg-generic.mk
Quoted 3 lines
package/pkg-generic.mk +0
-0
You've left out the hook functions:
step_start
step_end
step_user
and potentially:
step_time
package/pkg-generic.mk endif · line 554
Quoted 7 lines
package/pkg-generic.mk +1
-1@@ -548,7 +550,7 @@ endif $$($(2)_TARGET_RSYNC_SOURCE): SRCDIR=$$($(2)_OVERRIDE_SRCDIR) $$($(2)_TARGET_RSYNC_SOURCE): PKG=$(2) $$($(2)_TARGET_PATCH): PKG=$(2) -$$($(2)_TARGET_PATCH): RAWNAME=$(patsubst host-%,%,$(1)) +$$($(2)_TARGET_PATCH): RAWNAME=$$(patsubst host-%,%,$(1)) $$($(2)_TARGET_PATCH): PKGDIR=$(pkgdir)
Why not change the call to pkgdir ?
package/pkg-generic.mk endif · line 564
Quoted 8 lines
package/pkg-generic.mk +1
-1$$($(2)_TARGET_EXTRACT): PKG=$(2) $$($(2)_TARGET_SOURCE): PKG=$(2)@@ -559,9 +561,9 @@ endif # kernel case, the bootloaders case, and the normal packages case. ifeq ($(1),linux) $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL -else ifneq ($(filter boot/%,$(pkgdir)),) +else ifneq ($$(filter boot/%,$(pkgdir)),)
Ditto pkgdir.
package/pkg-generic.mk endif · line 566
Quoted 3 lines
package/pkg-generic.mk +1
-1$(2)_KCONFIG_VAR = BR2_TARGET_$(2) -else ifneq ($(filter toolchain/%,$(pkgdir)),) +else ifneq ($$(filter toolchain/%,$(pkgdir)),)
Ditto pkgdir.
[--SNIP--]
No change required in pkg-utils.mk either?
For example, caseconvert-helper is $(eval)-ed.
Also, in none of the xxx-package or host-xxx-package macros, you did double-$ the calls to pkgname or UPPERACSE. Is that a missing piece, or is taht on purpose?
Note: all my questions are just to make sure we did not miss anything. I'm genuinely asking if it is needed or not. This is a complex topic, and I'm unsure we've covered all the bases here. Maybe I'm just being a bit over-paranoid... ;-)
And, thank you for looking into this horrid mess that are Makefile functions! ;-)
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 infra: consistently use double dollar signs inside inner-xxx-targets
Hi Yann,
First of all: thanks a lot for the review!
Quoted 14 lines · Yann E. MORIN
Thomas, All,
On 2014-05-11 17:38 +0200, Thomas De Schampheleire spake thusly:
Quoted 11 lines
The inner-xxx-targets in the buildroot package infrastructures are evaluated using $(eval) which causes variable references to be a bit different than in regular make code. As we want most references to be expanded only at the time of the $(eval) we should not use standard references $(VAR) but rather use double dollar signs $$(VAR). This includes function references like $(call), $(subst), etc. The only exception is the reference to numbered variables, which are paremeters to the inner block:
$(1), $(2), etc.This patch introduces consistent usage of double-dollar signs throughout the different inner-xxx-targets blocks.
Quoted 8 lines
[--SNIP--]
package/pkg-autotools.mk
Quoted 3 lines
package/pkg-autotools.mk +0
-0Did you forget that one, or did you leave it out on purpose:
46:
AUTOCONF_AC_CHECK_FILE_VAL= ac_cv_file_$(subst -,_,$(subst /,_,$(subst .,_,$(1))))
This is not inside inner-xxx-targets. Moreover, it is used with $(call), not $(eval) so there is no need for the double dollar signs.
Quoted 12 lines
[--SNIP--]
package/pkg-autotools.mk endif · line 207
Quoted 6 lines
package/pkg-autotools.mk +1
-1@@ -201,7 +204,7 @@ endif # define AUTORECONF_HOOK @$$(call MESSAGE,"Autoreconfiguring") - $(Q)cd $$($$(PKG)_SRCDIR) && $(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT) + $(Q)cd $$($$(PKG)_SRCDIR) && $$(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT)You left out the $(Q) as-is. Although I agreee it's not very important and would still work (heck it already work as-is), I think we should cahnge it, for consistency sake, no?
Yes, I will change it to avoid any confusion about the rules.
Quoted 11 lines
[--SNIP--]
I see you have not changed anything in pkg-download.mk. Do you thinks there is nothing worth changing in there?
I'm especialy thinking about these functions:
{DOWNLOAD,SOURCE_CHECK,SHOW_EXTERNAL_DEPS}_{GIT,BZR,CVS,SVN,SCP,HG,WGET,LOCALFILES}as well as: DOWNLOAD and
DOWNLOAD_INNER
These functions are not eval'ed but call'ed. According to me, the double dollars are not correct there.
Following your comment, I searched for the use of eval throughout buildroot (filtering out the already known cases of generic, cmake, autotools etc., and found following addition references:
docs/manual/manual.mk (GENDOC)fs/* (ROOTFS_TARGET)package/pkg-utils.mk (caseconvert-helper)
I will update these blocks too in v2.
Quoted 11 lines
[--SNIP--]
package/pkg-generic.mk
Quoted 3 lines
package/pkg-generic.mk +0
-0You've left out the hook functions:
step_start
step_end
step_user
Quoted 2 lines
and potentially:
step_time
These are all called using $(call) from a place that is outside of inner-xxx-targets.
As far as I understand, double dollar signs are not needed (and will not work) here.
For example, adding following line in step_start:
@echo Step start $(1) TOPDIR=$(TOPDIR) TOPDIR2=$$(TOPDIR)
will cause TOPDIR2 to be passed to the shell as $(TOPDIR) which gives:
/bin/bash: TOPDIR: command not found
Step start configure TOPDIR=/home/tdescham/repo/contrib/buildroot-misc TOPDIR2=
Quoted 10 lines
package/pkg-generic.mk endif · line 554
Quoted 8 lines
package/pkg-generic.mk +1
-1@@ -548,7 +550,7 @@ endif $$($(2)_TARGET_RSYNC_SOURCE): SRCDIR=$$($(2)_OVERRIDE_SRCDIR) $$($(2)_TARGET_RSYNC_SOURCE): PKG=$(2) $$($(2)_TARGET_PATCH): PKG=$(2) -$$($(2)_TARGET_PATCH): RAWNAME=$(patsubst host-%,%,$(1)) +$$($(2)_TARGET_PATCH): RAWNAME=$$(patsubst host-%,%,$(1)) $$($(2)_TARGET_PATCH): PKGDIR=$(pkgdir)Why not change the call to pkgdir ?
Because it does not work for pkgdir nor pkgname. These have to have a single dollar sign.
I should update the comment in the next patch to reflect this.
Quoted 18 lines
package/pkg-generic.mk endif · line 564
Quoted 9 lines
package/pkg-generic.mk +1
-1$$($(2)_TARGET_EXTRACT): PKG=$(2) $$($(2)_TARGET_SOURCE): PKG=$(2)@@ -559,9 +561,9 @@ endif # kernel case, the bootloaders case, and the normal packages case. ifeq ($(1),linux) $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL -else ifneq ($(filter boot/%,$(pkgdir)),) +else ifneq ($$(filter boot/%,$(pkgdir)),)Ditto pkgdir.
package/pkg-generic.mk endif · line 566
Quoted 3 lines
package/pkg-generic.mk +1
-1$(2)_KCONFIG_VAR = BR2_TARGET_$(2) -else ifneq ($(filter toolchain/%,$(pkgdir)),) +else ifneq ($$(filter toolchain/%,$(pkgdir)),)Ditto pkgdir.
Quoted 5 lines
[--SNIP--]
No change required in pkg-utils.mk either?
For example, caseconvert-helper is $(eval)-ed.
True, I will fix in v2.
The other places in pkg-utils are not eval'ed.
Quoted 4 lines
Also, in none of the xxx-package or host-xxx-package macros, you did double-$ the calls to pkgname or UPPERACSE. Is that a missing piece, or is taht on purpose?
I should indeed add double dollars on the uppercase call, but not on pkgname as that doesn't work.
Quoted 5 lines
Note: all my questions are just to make sure we did not miss anything. I'm genuinely asking if it is needed or not. This is a complex topic, and I'm unsure we've covered all the bases here. Maybe I'm just being a bit over-paranoid... ;-)
Not at all. Your questions are all valid and very useful! This is exactly what code review is for...
Quoted 3 lines
And, thank you for looking into this horrid mess that are
Makefilefunctions! ;-)
Once and then never again ;-)
Best regards,
Thomas
PATCH 1/1 infra: add comment describing single/double dollar-sign rules
In reply to Thomas De SchampheleireAs the rules with respect to variable and function references and the need for single or double dollar signs are not trivial, add a comment in pkg-generic.mk describing them.
--- package/pkg-generic.mk | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-)
package/pkg-generic.mk +13 -0
@@ -250,6 +250,19 @@ endif # argument 3 is the uppercase package name, without the HOST_ prefix # for host packages # argument 4 is the type (target or host) +# +# Note about variable and function references: inside all blocks that are +# evaluated with $(eval), which includes all 'inner-xxx-package' blocks, +# specific rules apply with respect to variable and function references. +# Numbered variables (parameters to the block) can be referenced with a single +# dollar sign: $(1), $(2), $(3), etc. All other variables should be referenced +# with a double dollar sign: $$(TARGET_DIR), $$($(2)_VERSION), etc. Also all +# make functions should be referenced with a double dollar sign: $$(subst), +# $$(call), $$(filter-out), etc. +# These rules ensure that these variables and functions are only expanded during +# the $(eval) step, and not earlier. Otherwise, unintuitive and undesired +# behavior occurs with respect to these variables and functions. +# ################################################################################ define inner-generic-package
PATCH 1/1 infra: add comment describing single/double dollar-sign rules
Thomas, All,
On 2014-05-11 17:38 +0200, Thomas De Schampheleire spake thusly:
Quoted 14 lines
As the rules with respect to variable and function references and the need for single or double dollar signs are not trivial, add a comment in pkg-generic.mk describing them.
Signed-off-by Thomas De Schampheleire <[email protected]>--- package/pkg-generic.mk | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-)
package/pkg-generic.mk endif · line 255
Quoted 6 lines
package/pkg-generic.mk +3
-0@@ -250,6 +250,19 @@ endif # argument 3 is the uppercase package name, without the HOST_ prefix # for host packages # argument 4 is the type (target or host) +# +# Note about variable and function references: inside all blocks that are +# evaluated with $(eval), which includes all 'inner-xxx-package' blocks,
Here I'd say something like:
... evaluated with $(eval) [either directly or indirectly], ...
We want these rules to apply even to functions called from inside an evaluated function, right?
Regards,
Yann E. MORIN.
Quoted 13 lines
package/pkg-generic.mk +10
-0+# specific rules apply with respect to variable and function references. +# Numbered variables (parameters to the block) can be referenced with a single +# dollar sign: $(1), $(2), $(3), etc. All other variables should be referenced +# with a double dollar sign: $$(TARGET_DIR), $$($(2)_VERSION), etc. Also all +# make functions should be referenced with a double dollar sign: $$(subst), +# $$(call), $$(filter-out), etc. +# These rules ensure that these variables and functions are only expanded during +# the $(eval) step, and not earlier. Otherwise, unintuitive and undesired +# behavior occurs with respect to these variables and functions. +# ################################################################################ define inner-generic-package
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 infra: add comment describing single/double dollar-sign rules
Hi Yann,
Quoted 26 lines · Yann E. MORIN
Thomas, All,
On 2014-05-11 17:38 +0200, Thomas De Schampheleire spake thusly:
Quoted 14 lines
As the rules with respect to variable and function references and the need for single or double dollar signs are not trivial, add a comment in pkg-generic.mk describing them.
Signed-off-by Thomas De Schampheleire <[email protected]>--- package/pkg-generic.mk | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-)package/pkg-generic.mk endif · line 255
Quoted 6 lines
package/pkg-generic.mk +3
-0@@ -250,6 +250,19 @@ endif # argument 3 is the uppercase package name, without the HOST_ prefix # for host packages # argument 4 is the type (target or host) +# +# Note about variable and function references: inside all blocks that are +# evaluated with $(eval), which includes all 'inner-xxx-package' blocks,Here I'd say something like:
Quoted 5 lines
... evaluated with $(eval) [either directly or indirectly], ...We want these rules to apply even to functions called from inside an evaluated function, right?
No, I don't think this is true. The big problem is that most functions can be called both within as outside of an evaluated block. When it is not evaluated, then the double dollar signs cause incorrect behavior.
Take the following test program (which you can play with to test out different combinations)
FOO = bar
func = something-$(FOO)-$(1)
define block
????????X = $(1)
????????Y = $$(FOO)
target:
????????@echo X=$$(X) Y=$$(Y) Z=$(call func,else)
endef
all:
????????@echo Z=$(call func,else)
$(eval $(call block,hello))
If you change 'func' to use $$(FOO) instead of $(FOO), then the 'all' target will have output/bin/sh: 1: FOO: not found
Z=something--else
instead of
Z=something-bar-else
Best regards,
Thomas
PATCH 1/1 pkg-virtual: simplify definition of FOO_VERSION to 'virtual'
In reply to Thomas De SchampheleireAs mentioned in the e-mail accompanying the introduction of the pkg-virtual infrastructure [1], the definition of FOO_VERSION is 'strange'.
After the cleanup of single/double dollar signs in inner-generic-package, the special construction in pkg-virtual is no longer needed and can be simplified.
[1] http://lists.busybox.net/pipermail/buildroot/2014-April/093670.html
--- package/pkg-virtual.mk | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
package/pkg-virtual.mk +1 -2
@@ -45,8 +45,7 @@ endif $(2)_SOURCE = # Fake a version string, so it looks nicer in the build log -$(3)_VERSION = virtual -HOST_$(3)_VERSION = virtual +$(2)_VERSION = virtual # This must be repeated from inner-generic-package, otherwise we get an empty # _DEPENDENCIES
PATCH 1/1 pkg-virtual: simplify definition of FOO_VERSION to 'virtual'
Thomas, All,
On 2014-05-11 17:38 +0200, Thomas De Schampheleire spake thusly:
Quoted 8 lines
As mentioned in the e-mail accompanying the introduction of the pkg-virtual infrastructure [1], the definition of
FOO_VERSIONis 'strange'.After the cleanup of single/double dollar signs in inner-generic-package, the special construction in pkg-virtual is no longer needed and can be simplified.
Signed-off-by Thomas De Schampheleire <[email protected]>
Provided the preceding patches are applied (as-is or after being reworked, of course):
Regards,
Yann E. MORIN.
Quoted 19 lines
[1] http://lists.busybox.net/pipermail/buildroot/2014-April/093670.html
--- package/pkg-virtual.mk | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)package/pkg-virtual.mk +1
-2@@ -45,8 +45,7 @@ endif $(2)_SOURCE = # Fake a version string, so it looks nicer in the build log -$(3)_VERSION = virtual -HOST_$(3)_VERSION = virtual +$(2)_VERSION = virtual # This must be repeated from inner-generic-package, otherwise we get an empty # _DEPENDENCIES
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 toolchain/toolchain-buildroot: migrate to virtual package infrastructure
In reply to Thomas De SchampheleireThis patch migrates the toolchain and toolchain-buildroot packages to the virtual package infrastructure, causing the log messages to change from:
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
toolchain undefined Downloading
toolchain undefined Extracting
...
to
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
toolchain virtual Downloading
toolchain virtual Extracting
...
and similar for 'toolchain-buildroot', simply because it looks nicer.
At the same time, the directory names also become toolchain-virtual, toolchain-buildroot-virtual instead of the corresponding 'undefined' variants.
---
v2:
- use virtual-package infrastructure instead of explicitly defining VERSION
- exclude toolchain-external from this patch
toolchain/toolchain-buildroot/toolchain-buildroot.mk | 4 +--- toolchain/toolchain/toolchain.mk | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)
toolchain/toolchain-buildroot/toolchain-buildroot.mk +1 -3
@@ -4,8 +4,6 @@ # ################################################################################ -TOOLCHAIN_BUILDROOT_SOURCE = - BR_LIBC = $(call qstrip,$(BR2_TOOLCHAIN_BUILDROOT_LIBC)) # Triggering the build of the host-gcc-final will automatically do the
@@ -16,4 +14,4 @@ TOOLCHAIN_BUILDROOT_DEPENDENCIES = host- TOOLCHAIN_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO -$(eval $(generic-package)) +$(eval $(virtual-package))
toolchain/toolchain/toolchain.mk +1 -3
@@ -4,8 +4,6 @@ # ################################################################################ -TOOLCHAIN_SOURCE = - ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) TOOLCHAIN_DEPENDENCIES += toolchain-buildroot else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
@@ -14,6 +12,6 @@ endif TOOLCHAIN_ADD_TOOLCHAIN_DEPENDENCY = NO -$(eval $(generic-package)) +$(eval $(virtual-package)) toolchain: $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake
PATCH 1/1 toolchain/toolchain-buildroot: migrate to virtual package infrastructure
On 2014-05-11 17:38 +0200, Thomas De Schampheleire spake thusly:
Quoted 2 lines
This patch migrates the toolchain and toolchain-buildroot packages to the virtual package infrastructure,
For a true conversion to the virtual package infra, it should have been using these variables:
BR2_$(PACKAGE)_HAS_TOOLCHAIN
BR2_$(PACKAGE)_PROVIDES_TOOLCHAINBut I guess in this case it is a bit far-fetched and over-reaching...
graph-depends is still happy, so am I. ;-)
Quoted 12 lines
causing the log messages to change from:
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
toolchain undefined Downloading
toolchain undefined Extracting...
to
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
toolchain virtual Downloading
toolchain virtual Extracting...
Quoted 7 lines
and similar for 'toolchain-buildroot', simply because it looks nicer.
At the same time, the directory names also become toolchain-virtual, toolchain-buildroot-virtual instead of the corresponding 'undefined' variants.
Signed-off-by Thomas De Schampheleire <[email protected]>
AS previously, when the prior preceding patches have been applied (or reworked):
Regards,
Yann E. MORIN.
Quoted 47 lines
---
v2:
- use virtual-package infrastructure instead of explicitly defining VERSION
- exclude toolchain-external from this patchtoolchain/toolchain-buildroot/toolchain-buildroot.mk | 4 +--- toolchain/toolchain/toolchain.mk | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)toolchain/toolchain-buildroot/toolchain-buildroot.mk +1
-3@@ -4,8 +4,6 @@ # ################################################################################ -TOOLCHAIN_BUILDROOT_SOURCE = - BR_LIBC = $(call qstrip,$(BR2_TOOLCHAIN_BUILDROOT_LIBC)) # Triggering the build of the host-gcc-final will automatically do the@@ -16,4 +14,4 @@ TOOLCHAIN_BUILDROOT_DEPENDENCIES = host- TOOLCHAIN_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO -$(eval $(generic-package)) +$(eval $(virtual-package))toolchain/toolchain/toolchain.mk +1
-3@@ -4,8 +4,6 @@ # ################################################################################ -TOOLCHAIN_SOURCE = - ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) TOOLCHAIN_DEPENDENCIES += toolchain-buildroot else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)@@ -14,6 +12,6 @@ endif TOOLCHAIN_ADD_TOOLCHAIN_DEPENDENCY = NO -$(eval $(generic-package)) +$(eval $(virtual-package)) toolchain: $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 toolchain-external: change version from 'undefined' to 'virtual'
In reply to Thomas De SchampheleireThe toolchain-external package displays the version 'undefined' in the build messages and the directory in output/build, which is not very nice. This patch sets the version to 'virtual', in analogy to the toolchain and toolchain-buildroot packages (which use the virtual-package infrastructure).
Although toolchain-external is not strictly a virtual package, since it uses the generic-package infrastructure, it can be considered as a virtual package in the sense that it does not have a fixed version or source (they depend on the selected external toolchain).
--- toolchain/toolchain-external/toolchain-external.mk | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
toolchain/toolchain-external/toolchain-external.mk +2 -0
@@ -410,6 +410,8 @@ TOOLCHAIN_EXTERNAL_SITE = TOOLCHAIN_EXTERNAL_SOURCE = endif +TOOLCHAIN_EXTERNAL_VERSION = virtual + TOOLCHAIN_EXTERNAL_ADD_TOOLCHAIN_DEPENDENCY = NO TOOLCHAIN_EXTERNAL_INSTALL_STAGING = YES
PATCH 1/1 toolchain-external: change version from 'undefined' to 'virtual'
Thomas, All,
On 2014-05-11 17:38 +0200, Thomas De Schampheleire spake thusly:
Quoted 11 lines
The toolchain-external package displays the version 'undefined' in the build messages and the directory in output/build, which is not very nice. This patch sets the version to 'virtual', in analogy to the toolchain and toolchain-buildroot packages (which use the virtual-package infrastructure).
Although toolchain-external is not strictly a virtual package, since it uses the generic-package infrastructure, it can be considered as a virtual package in the sense that it does not have a fixed version or source (they depend on the selected external toolchain).
Signed-off-by Thomas De Schampheleire <[email protected]>
Regards,
Yann E. MORIN.
Quoted 16 lines
--- toolchain/toolchain-external/toolchain-external.mk | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)toolchain/toolchain-external/toolchain-external.mk +2
-0@@ -410,6 +410,8 @@ TOOLCHAIN_EXTERNAL_SITE = TOOLCHAIN_EXTERNAL_SOURCE = endif +TOOLCHAIN_EXTERNAL_VERSION = virtual + TOOLCHAIN_EXTERNAL_ADD_TOOLCHAIN_DEPENDENCY = NO TOOLCHAIN_EXTERNAL_INSTALL_STAGING = YES
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 makedevs: change version from 'undefined' to 'buildroot-$(BR2_VERSION)'
In reply to Thomas De SchampheleireThe sources of the makedevs package are shipped with Buildroot, rather than downloaded from an external location. As a result, no explicit version is defined, causing build messages and build directory to show 'undefined' as version.
This patch sets the version for makedevs to 'buildroot-$(BR2_VERSION), which would for example expand to 'buildroot-2014.05'.
--- package/makedevs/makedevs.mk | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
package/makedevs/makedevs.mk +2 -0
@@ -8,6 +8,8 @@ MAKEDEVS_SOURCE = HOST_MAKEDEVS_SOURCE = +MAKEDEVS_VERSION = buildroot-$(BR2_VERSION) + define MAKEDEVS_BUILD_CMDS $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ package/makedevs/makedevs.c -o $(@D)/makedevs
PATCH 1/1 makedevs: change version from 'undefined' to 'buildroot-$(BR2_VERSION)'
Thomas, All,
On 2014-05-11 17:38 +0200, Thomas De Schampheleire spake thusly:
Quoted 9 lines
The sources of the makedevs package are shipped with Buildroot, rather than downloaded from an external location. As a result, no explicit version is defined, causing build messages and build directory to show 'undefined' as version.
This patch sets the version for makedevs to 'buildroot-$(BR2_VERSION), which would for example expand to 'buildroot-2014.05'.
Signed-off-by Thomas De Schampheleire <[email protected]>
Regards,
Yann E. MORIN.
Quoted 16 lines
--- package/makedevs/makedevs.mk | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)package/makedevs/makedevs.mk +2
-0@@ -8,6 +8,8 @@ MAKEDEVS_SOURCE = HOST_MAKEDEVS_SOURCE = +MAKEDEVS_VERSION = buildroot-$(BR2_VERSION) + define MAKEDEVS_BUILD_CMDS $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ package/makedevs/makedevs.c -o $(@D)/makedevs
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 mkpasswd: change version from 'undefined' to 'buildroot-$(BR2_VERSION)'
In reply to Thomas De SchampheleireThe sources of the mkpasswd package are shipped with Buildroot, rather than downloaded from an external location. As a result, no explicit version is defined, causing build messages and build directory to show 'undefined' as version.
This patch sets the version for mkpasswd to 'buildroot-$(BR2_VERSION), which would for example expand to 'buildroot-2014.05'.
--- package/mkpasswd/mkpasswd.mk | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
package/mkpasswd/mkpasswd.mk +2 -0
@@ -10,6 +10,8 @@ HOST_MKPASSWD_SOURCE = HOST_MKPASSWD_LICENSE = GPLv2+ +HOST_MKPASSWD_VERSION = buildroot-$(BR2_VERSION) + define HOST_MKPASSWD_BUILD_CMDS $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \ package/mkpasswd/mkpasswd.c package/mkpasswd/utils.c \
PATCH 1/1 mkpasswd: change version from 'undefined' to 'buildroot-$(BR2_VERSION)'
Thomas, All,
On 2014-05-11 17:38 +0200, Thomas De Schampheleire spake thusly:
Quoted 9 lines
The sources of the mkpasswd package are shipped with Buildroot, rather than downloaded from an external location. As a result, no explicit version is defined, causing build messages and build directory to show 'undefined' as version.
This patch sets the version for mkpasswd to 'buildroot-$(BR2_VERSION), which would for example expand to 'buildroot-2014.05'.
Signed-off-by Thomas De Schampheleire <[email protected]>
Regards,
Yann E. MORIN.
Quoted 16 lines
--- package/mkpasswd/mkpasswd.mk | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)package/mkpasswd/mkpasswd.mk +2
-0@@ -10,6 +10,8 @@ HOST_MKPASSWD_SOURCE = HOST_MKPASSWD_LICENSE = GPLv2+ +HOST_MKPASSWD_VERSION = buildroot-$(BR2_VERSION) + define HOST_MKPASSWD_BUILD_CMDS $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \ package/mkpasswd/mkpasswd.c package/mkpasswd/utils.c \
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'