diff options
author | Darren Hart <dvhart@linux.intel.com> | 2011-01-11 12:38:11 -0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-01-12 00:55:48 -0800 |
commit | deca05d27b2a31359701b03541be73a047e5d197 (patch) | |
tree | a1fd3bad1d64aa90182f51edb81ebf4527e84523 | |
parent | cebc043e2eb5e380cd5704fc44bf7ea0936ae415 (diff) | |
download | poky-deca05d27b2a31359701b03541be73a047e5d197.tar.gz |
trace-cmd: Bump SRCREV and recipe PV and PR values.
Upgrade to 6c696cec3f264a9399241b6e648f58bc97117d49 which
includes fixes to the Makefile to allow for user override of
CC and AR via the environment as well as python SWIG wrapper
fixes.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Bruce Ashfield <bruce.ashfield@windriver.com>
CC: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r-- | meta/conf/distro/include/poky-default-revisions.inc | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/trace-cmd/kernelshark_git.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/trace-cmd/trace-cmd_git.bb | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc index e094109756..a41ca39404 100644 --- a/meta/conf/distro/include/poky-default-revisions.inc +++ b/meta/conf/distro/include/poky-default-revisions.inc | |||
@@ -167,7 +167,7 @@ SRCREV_pn-swabber-native ??= "a0792390c5d6d5a5bade7ab155c80eef3f30fa52" | |||
167 | SRCREV_pn-sysprof ??= "38a6af1f0a45e528fd2842983da71e0f23c70d6a" | 167 | SRCREV_pn-sysprof ??= "38a6af1f0a45e528fd2842983da71e0f23c70d6a" |
168 | SRCREV_pn-table ??= "4b267533ce16656cba4104fc39dc12709c1bdddf" | 168 | SRCREV_pn-table ??= "4b267533ce16656cba4104fc39dc12709c1bdddf" |
169 | SRCREV_pn-tasks ??= "ea52d46d691c5fce4473ea4e24a35411381f3a65" | 169 | SRCREV_pn-tasks ??= "ea52d46d691c5fce4473ea4e24a35411381f3a65" |
170 | TRACECMDREV ?= "0d252224626bd6926324f023a65f20c165232891" | 170 | TRACECMDREV ?= "6c696cec3f264a9399241b6e648f58bc97117d49" |
171 | SRCREV_pn-trace-cmd ??= ${TRACECMDREV} | 171 | SRCREV_pn-trace-cmd ??= ${TRACECMDREV} |
172 | SRCREV_pn-kernelshark ??= ${TRACECMDREV} | 172 | SRCREV_pn-kernelshark ??= ${TRACECMDREV} |
173 | SRCREV_pn-tidy ??= "e25416e1293e1074bfa6727c80527dcff5b1f3cb" | 173 | SRCREV_pn-tidy ??= "e25416e1293e1074bfa6727c80527dcff5b1f3cb" |
diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_git.bb b/meta/recipes-kernel/trace-cmd/kernelshark_git.bb index ddf7c1ef73..bfe7d997f4 100644 --- a/meta/recipes-kernel/trace-cmd/kernelshark_git.bb +++ b/meta/recipes-kernel/trace-cmd/kernelshark_git.bb | |||
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | |||
4 | file://kernel-shark.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e" | 4 | file://kernel-shark.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e" |
5 | 5 | ||
6 | PR = r0 | 6 | PR = r0 |
7 | PV = "1.0.4+git${SRCPV}" | 7 | PV = "1.0.5+git${SRCPV}" |
8 | 8 | ||
9 | DEPENDS = "gtk+" | 9 | DEPENDS = "gtk+" |
10 | RDEPENDS_${PN} = "trace-cmd" | 10 | RDEPENDS_${PN} = "trace-cmd" |
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb index bc03b0c8ca..8fe62d4f35 100644 --- a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb +++ b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb | |||
@@ -3,16 +3,16 @@ LICENSE = "GPLv2" | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ |
4 | file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e" | 4 | file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e" |
5 | 5 | ||
6 | PR = r2 | 6 | PR = r0 |
7 | PV = "1.0.4+git${SRCPV}" | 7 | PV = "1.0.5+git${SRCPV}" |
8 | 8 | ||
9 | inherit pkgconfig | 9 | inherit pkgconfig |
10 | 10 | ||
11 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git" | 11 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git" |
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
14 | EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}'" | 14 | EXTRA_OEMAKE = "'prefix=${prefix}'" |
15 | 15 | ||
16 | do_install() { | 16 | do_install() { |
17 | oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}" install | 17 | oe_runmake prefix="${prefix}" DESTDIR="${D}" install |
18 | } | 18 | } |