diff options
author | Yevhen Kyriukha <kirgene@gmail.com> | 2013-08-04 19:00:11 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-06 12:39:57 +0100 |
commit | 3b0be885c48b748c3f0531fa5b73f229453f6814 (patch) | |
tree | 7a5252c0af545573a9782d2da23427bf6171b2d9 /meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_race_condition_with_multithreaded_make.patch | |
parent | 63017172dadb62d8baea9b6c6a22de9d1860cccf (diff) | |
download | poky-3b0be885c48b748c3f0531fa5b73f229453f6814.tar.gz |
btrfs-tools: upgrade to upstream revision.
Two patches were removed because changes that they provide are already exist.
(From OE-Core rev: 6de68622c0658e1bba509c66c137eb419cdbdabf)
Signed-off-by: Yevhen Kyriukha <kirgene@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_race_condition_with_multithreaded_make.patch')
-rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_race_condition_with_multithreaded_make.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_race_condition_with_multithreaded_make.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_race_condition_with_multithreaded_make.patch deleted file mode 100644 index 40175b8ffa..0000000000 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_race_condition_with_multithreaded_make.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Fix makefile for multithreaded (make -j ) building. | ||
4 | |||
5 | btrfsctl.c | ||
6 | | i586-poky-linux-gcc -m32 -march=i586 --sysroot=/intel/poky/builds/world/tmp/sysroots/qemux86 -Wp,-MMD,./.btrfsctl.o.d,-MT,btrfsctl.o -Wall -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -O2 -pipe -g -feliminate-unused-debug-types -c btrfsctl.c | ||
7 | | btrfsctl.c:37:21: fatal error: version.h: No such file or directory | ||
8 | | compilation terminated. | ||
9 | | btrfslabel.c:40:21: fatal error: version.h: No such file or directory | ||
10 | | compilation terminated. | ||
11 | |||
12 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
13 | 2012/01/02 | ||
14 | |||
15 | Index: git/Makefile | ||
16 | =================================================================== | ||
17 | --- git.orig/Makefile | ||
18 | +++ git/Makefile | ||
19 | @@ -26,14 +26,13 @@ else | ||
20 | check = ls | ||
21 | endif | ||
22 | |||
23 | -.c.o: | ||
24 | +%.o: %.c version.h | ||
25 | $(check) $< | ||
26 | $(CC) $(DEPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c $< | ||
27 | |||
28 | +all: $(progs) manpages | ||
29 | |||
30 | -all: version $(progs) manpages | ||
31 | - | ||
32 | -version: | ||
33 | +version.h: version.sh | ||
34 | bash version.sh | ||
35 | |||
36 | btrfs: $(objects) btrfs.o btrfs_cmds.o scrub.o | ||