diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2011-09-18 22:35:12 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-28 14:58:49 +0100 |
commit | 7f05f9b1c6f06e219d293bbc706ec7fe09139e80 (patch) | |
tree | e8ecc9373525426ea88d9031dfb96609ac277046 /meta/recipes-kernel | |
parent | f44f9f6e167992423368fed79fd7bdb98ceb632a (diff) | |
download | poky-7f05f9b1c6f06e219d293bbc706ec7fe09139e80.tar.gz |
blktrace: update to version 1.0.3
This also removes dso_linking_change_build_fix.patch since the same
change has been made upstream.
Also removes unused SRC_URI checksums.
(From OE-Core rev: 776942858cad072facc9b5fea618ee88ff56a3a8)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/blktrace/blktrace/dso_linking_change_build_fix.patch | 26 | ||||
-rw-r--r-- | meta/recipes-kernel/blktrace/blktrace_git.bb | 12 |
2 files changed, 4 insertions, 34 deletions
diff --git a/meta/recipes-kernel/blktrace/blktrace/dso_linking_change_build_fix.patch b/meta/recipes-kernel/blktrace/blktrace/dso_linking_change_build_fix.patch deleted file mode 100644 index 5b7433900d..0000000000 --- a/meta/recipes-kernel/blktrace/blktrace/dso_linking_change_build_fix.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | after gcc linking has changed, all the libraries must be explicitely specified | ||
2 | This patch avoids this linking error: | ||
3 | |||
4 | | make[1]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/blktrace-1.0.1+git0+1e09f6e9012826fca69fa07222b7bc53c3e629ee-r1/git/btreplay'^M | ||
5 | | ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -I. -I.. -I../btt -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -UCOUNT_IOS -UDEBUG -DNDEBUG -o btreplay btreplay.o -laio -lrt^M | ||
6 | | /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: >: invalid DSO for symbol `pthread_join@@GLIBC_2.0' definition^M | ||
7 | | /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/lib/libpthread.so.0: could not read symbols: Bad value^M | ||
8 | | collect2: ld returned 1 exit status^M | ||
9 | | make[1]: *** [btreplay] Error 1 | ||
10 | |||
11 | Nitin A Kamble <nitin.a.kamble@intel.com> | ||
12 | Date: 2011/01/11 | ||
13 | |||
14 | Index: git/btreplay/Makefile | ||
15 | =================================================================== | ||
16 | --- git.orig/btreplay/Makefile | ||
17 | +++ git/btreplay/Makefile | ||
18 | @@ -11,7 +11,7 @@ XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOU | ||
19 | override CFLAGS += $(INCS) $(XCFLAGS) $(OCFLAGS) | ||
20 | |||
21 | PROGS = btrecord btreplay | ||
22 | -LIBS = -laio -lrt | ||
23 | +LIBS = -laio -lrt -lpthread | ||
24 | |||
25 | all: depend $(PROGS) | ||
26 | |||
diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb b/meta/recipes-kernel/blktrace/blktrace_git.bb index 37b7f514bc..3439a1f92c 100644 --- a/meta/recipes-kernel/blktrace/blktrace_git.bb +++ b/meta/recipes-kernel/blktrace/blktrace_git.bb | |||
@@ -4,17 +4,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" | |||
4 | 4 | ||
5 | DEPENDS = "libaio" | 5 | DEPENDS = "libaio" |
6 | 6 | ||
7 | SRCREV = "1e09f6e9012826fca69fa07222b7bc53c3e629ee" | 7 | SRCREV = "0abccbcb5d1a538028ffcb3869d646d29bf5812b" |
8 | 8 | ||
9 | PR = r2 | 9 | PR = "r3" |
10 | PV = "1.0.1+git${SRCPV}" | 10 | PV = "1.0.3+git${SRCPV}" |
11 | 11 | ||
12 | SRC_URI = "git://git.kernel.dk/blktrace.git;protocol=git \ | 12 | SRC_URI = "git://git.kernel.dk/blktrace.git;protocol=git \ |
13 | file://blktrace-makefile.patch \ | 13 | file://blktrace-makefile.patch" |
14 | file://dso_linking_change_build_fix.patch" | ||
15 | |||
16 | SRC_URI[md5sum] = "588aa9ab8a14d1766ab3f061d728ed89" | ||
17 | SRC_URI[sha256sum] = "f3cb6a3df1b3dc67369c7c4da3444a7897aa8a18e55937b368e0a6aa2f64b3aa" | ||
18 | 14 | ||
19 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
20 | 16 | ||