From 49d1dbac52837a0c44034acc2d67a654681f0f8d Mon Sep 17 00:00:00 2001 From: Yannick Gicquel Date: Fri, 15 Jan 2016 16:55:17 +0100 Subject: [PATCH] bluez5: fix: apply patch on bluez v5.22 only Replace 'rev' directive by 'apply' and a check on 'PV' variable. Tanikawa-san observed a regression while building 'qtsystems' with previous commit: (...) Bitbake fails at qtsystems with c++ compiling errors. Option 'rev' works only when building code from a revision control system. In bluez5_5.22.bb, source code is downloaded as tarball. "fd0783c8bc524bc9b26514aad1f85814" is not SRCREV, it is md5 of tarball. (...) Change-Id: Id595d4c01912567e640d3371bbd0709e53eec748 Signed-off-by: Yannick Gicquel --- recipes-connectivity/bluez5/bluez5_%.bbappend | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-connectivity/bluez5/bluez5_%.bbappend b/recipes-connectivity/bluez5/bluez5_%.bbappend index 19ff2f2b8..59787fcec 100644 --- a/recipes-connectivity/bluez5/bluez5_%.bbappend +++ b/recipes-connectivity/bluez5/bluez5_%.bbappend @@ -1,5 +1,7 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +APPLY_v522 = "${@str('no' if '${PV}' != '5.22' else 'yes')}" + SRC_URI_append = "\ - file://0001_fix_compile_issue_when_using_in_c++.patch;rev="fd0783c8bc524bc9b26514aad1f85814" \ + file://0001_fix_compile_issue_when_using_in_c++.patch;apply=${APPLY_v522} \ " -- 2.16.6