diff options
| author | Ross Burton <ross.burton@intel.com> | 2016-07-14 10:21:51 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-20 10:24:53 +0100 |
| commit | 293d90d757d0d1e292c90cb0e9c576faf911ffcc (patch) | |
| tree | 3aff13383a1be56cc25ad582479a163bfc69cede /meta/recipes-extended/bash | |
| parent | 71794837b477a78e2f5408348e269f58f9b1ec7e (diff) | |
| download | openembedded-core-293d90d757d0d1e292c90cb0e9c576faf911ffcc.tar.gz openembedded-core-293d90d757d0d1e292c90cb0e9c576faf911ffcc.tar.bz2 openembedded-core-293d90d757d0d1e292c90cb0e9c576faf911ffcc.zip | |
bash: fix string format errors when enabling security flags
If security_flags.inc is included then bash 3.2.48 fails to build:
| ../bash-3.2.48/print_cmd.c:1152:3: error: format not a string literal and no format arguments [-Werror=format-security]
| cprintf (indentation_string);
Backport a patch from upstream to solve this.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-extended/bash')
| -rw-r--r-- | meta/recipes-extended/bash/bash-3.2.48/string-format.patch | 21 | ||||
| -rw-r--r-- | meta/recipes-extended/bash/bash_3.2.48.bb | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-extended/bash/bash-3.2.48/string-format.patch b/meta/recipes-extended/bash/bash-3.2.48/string-format.patch new file mode 100644 index 0000000000..eda39649d9 --- /dev/null +++ b/meta/recipes-extended/bash/bash-3.2.48/string-format.patch @@ -0,0 +1,21 @@ +Fix a string format warning when using security flags: + +| ../bash-3.2.48/print_cmd.c:1152:3: error: format not a string literal and no format arguments [-Werror=format-security] +| cprintf (indentation_string); + +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/print_cmd.c b/print_cmd.c +index d1dfd1a..956db53 100644 +--- a/print_cmd.c ++++ b/print_cmd.c +@@ -1149,7 +1149,7 @@ indent (amount) + for (i = 0; amount > 0; amount--) + indentation_string[i++] = ' '; + indentation_string[i] = '\0'; +- cprintf (indentation_string); ++ cprintf ("%s", indentation_string); + } + + static void diff --git a/meta/recipes-extended/bash/bash_3.2.48.bb b/meta/recipes-extended/bash/bash_3.2.48.bb index d42b292b0a..6b4028df11 100644 --- a/meta/recipes-extended/bash/bash_3.2.48.bb +++ b/meta/recipes-extended/bash/bash_3.2.48.bb @@ -20,6 +20,7 @@ SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz;name=tarball \ file://test-output.patch \ file://run-ptest \ file://dont-include-target-CFLAGS-in-host-LDFLAGS.patch \ + file://string-format.patch \ " SRC_URI[tarball.md5sum] = "338dcf975a93640bb3eaa843ca42e3f8" |