summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/btrfs-tools
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-11-15 16:46:30 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-07 06:34:51 -0800
commit62fe2aa492be75a7fb670b14895e2868cdbb64bd (patch)
tree7bf694598635318c5f9756ba2eb6b7c8ffabe030 /meta/recipes-devtools/btrfs-tools
parent3c3505d588c3e2e04dcaf633771570bad11cb2da (diff)
downloadpoky-62fe2aa492be75a7fb670b14895e2868cdbb64bd.tar.gz
btrfs-tools: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: d7696f5f89ac94b5cae13c5e07d6d4c7133c3ed9) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools')
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch17
1 files changed, 7 insertions, 10 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch
index a81900ee7e..467de32751 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch
@@ -12,19 +12,16 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12 Makefile | 2 +- 12 Makefile | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/Makefile b/Makefile 15Index: git/Makefile
16index b3e2b63..347aaf1 100644 16===================================================================
17--- a/Makefile 17--- git.orig/Makefile
18+++ b/Makefile 18+++ git/Makefile
19@@ -323,7 +323,7 @@ version.h: version.sh version.h.in configure.ac 19@@ -343,7 +343,7 @@ version.h: version.sh version.h.in confi
20 20
21 mktables: kernel-lib/mktables.c 21 mktables: kernel-lib/mktables.c
22 @echo " [CC] $@" 22 @echo " [CC] $@"
23- $(Q)$(CC) $(CFLAGS) $< -o $@ 23- $(Q)$(CC) $(CFLAGS) $< -o $@
24+ $(Q)$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ 24+ $(Q)$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
25 25
26 kernel-lib/tables.c: mktables 26 # the target can be regenerated manually using mktables, but a local copy is
27 @echo " [TABLE] $@" 27 # kept so the build process is simpler
28--
292.13.2
30