buildroot/package/pkg-utils.mk, branch 2016.08

core/pkg-utils: add macro to escape-and-printf

2016-06-07T20:20:53+00:00

In some cases we need to escape make variables and pass them to printf(1). This is the case in our fs infra, where we want to shoe-horn the commands to generate the filesystems in the fakeroot script, or the devices, permissions and users tables to their respective files. We currently do so by replacing $(sep) with the literal '\n' but that's not enough. This does not protect against strings with an embedded '%' or a backslash. Add a new macro that properly escapes a string and calls printf(1), so that we get the expected output. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni

pkg-utils: mask tput failure for non-interactive sessions

2016-02-21T17:30:09+00:00

When invoking a build from a non-interactive session (for example, a Jenkins build), there is no terminal session to modify. When preparing variables to track the bold and boldoff mode sequences, the `tput` command will always fail as there is no terminal to query. The following change masks the error message when `tput` fails; leaving the TERM_BOLD and TERM_RESET variables empty. Signed-off-by: James Knight Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni

pkg-generic: support for lzma archives

2015-06-21T07:47:12+00:00

Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni

pkg-generic: substitute colon and space out of PKG_VERSION

2015-04-25T08:30:52+00:00

Using a colon or a space in a make target doesn't work, so they have to be filtered out of the PKG_VERSION variable just like the / currently already is. This will be needed for date-based CVS versions. Add a helper macro 'sanitize' in pkg-utils.mk to implement this. This also moves the strip to the inner level for the target branch. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Fabio Porcedda Cc: Yann E. MORIN Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni

pkg-utils: update comments after renaming of package infra macros

2015-04-13T20:25:45+00:00

The package infrastructure macros have a long time ago been renamed from GENTARGETS, AUTOTARGETS to generic-package and autotools-package. However, one comment in pkg-utils.mk keeps a reference to these *TARGETS macros. This commit updates this comment to match the new name of these macros. Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN"

pkg-utils: describe the case conversion macros in more detail.

2014-10-16T17:04:18+00:00

After the refactoring of the case conversion macros in dd5e620ac, the macro became even harder to understand. Improve this explanation a little so future generations can make sense of what we're doing here. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Thomas De Schampheleire Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni

.mk files: bulk aligment and whitespace cleanup of assignments

2014-10-07T13:00:28+00:00

The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^$[A-Z0-9a-z_]\+$\s*$[?:+]\?=$\s*$#\1 \2#' -e 's#^$[A-Z0-9a-z_]\+$\s*$[?:+]\?=$\s*$[^\\]\+$$#\1 \2 \3#' -e 's#^$[A-Z0-9a-z_]\+$\s*$[?:+]\?=$\s*$[^\\ \t]\+\s*\\$\s*$#\1 \2 \3#' -e 's#^$[A-Z0-9a-z_]\+$\s*$[?:+]\?=$$\s*\\$#\1 \2\3#' Brief explanation of this command: ^$[A-Z0-9a-z_]\+$ a regular variable at the beginning of the line $[?:+]\?=$ any assignment character =, :=, ?=, += $[^\\]\+$ any string not containing a line continuation $[^\\ \t]\+\s*\\$ string, optional whitespace, followed by a line continuation character $\s*\\$ optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire Cc: Yann E. Morin Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard

check-deprecated-variable: move from pkg-generic.mk to pkg-utils.mk

2014-10-05T11:38:06+00:00

Suggested-by: Thomas Petazzoni Signed-off-by: Thomas De Schampheleire Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni

pkg-utils: qstrip MESSAGE

2014-09-29T06:40:32+00:00

Currently, the MESSAGE macro double-quotes the message. But a few call sites also double-quote the message, resulting in a borked call to echo, like: $(call MESSAGE,"user text") would expand to: echo "Leading text "user message" trailign text" Just use qstrip on the user message, so we get protected from either a comma in the user text (so make does not interpret it), or a semi-colon (so the shell does not interpret it.) Signed-off-by: "Yann E. MORIN" Cc: Peter Korsgaard Cc: Thomas De Schampheleire Signed-off-by: Peter Korsgaard

legal-info: Add site to legal info manifest

2014-07-23T21:36:43+00:00

I would like to propose adding the site to the legal-info manifest files. This gives a little more information on where the sources came from without adding much overhead. Please note that is is only for packages where the source is not local or set with OVERRIDE_SRCDIR. Signed-off-by: Clayton Shotwell Reviewed-by: "Yann E. MORIN" Tested-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni