[master][PATCH 1/2] bluez: use overrides instead of immediate assignment

[master][PATCH 1/2] bluez: use overrides instead of immediate assignment

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-distro/recipes-connectivity/bluez/bluez4_4.101.bbappend | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta-arago-distro/recipes-connectivity/bluez/bluez4_4.101.bbappend b/meta-arago-distro/recipes-connectivity/bluez/bluez4_4.101.bbappend
index 8cb5cfb..21d696c 100644
--- a/meta-arago-distro/recipes-connectivity/bluez/bluez4_4.101.bbappend
+++ b/meta-arago-distro/recipes-connectivity/bluez/bluez4_4.101.bbappend
@@ -1,4 +1,4 @@
-PR_append = ".arago1"
+PR_append = ".arago2"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
@@ -8,9 +8,10 @@ SRC_URI += "file://bluez4-fix-synchronization-between-bluetoothd-and-dr.patch \
 "
 # udev 150-170 provide its on hid2hci tool and udev rules for it. Therefore,
 # disabling hid2hci from bluez4.
-EXTRA_OECONF := "${@oe_filter_out('--enable-hid2hci', '${EXTRA_OECONF}', d)}"
 
-EXTRA_OECONF := "${@'${EXTRA_OECONF}'.replace('--disable-hidd', '--enable-hidd')}"
+EXTRA_OECONF_remove = "--enable-hid2hci"
+EXTRA_OECONF_remove = "--disable-hidd"
+EXTRA_OECONF_append = " --enable-hid"
 
 DEPENDS += "libsndfile1"
 
-- 
2.7.4

[master][PATCH 2/2] sourceipk: python3 fixes

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

sourceipk is still causing breakage even after parsing, so disable for now

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-distro/classes/sourceipk.bbclass                        | 6 +++---
 meta-arago-distro/conf/distro/arago.conf                           | 2 +-
 meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta-arago-distro/classes/sourceipk.bbclass b/meta-arago-distro/classes/sourceipk.bbclass
index d8da195..1e49489 100644
--- a/meta-arago-distro/classes/sourceipk.bbclass
+++ b/meta-arago-distro/classes/sourceipk.bbclass
@@ -328,9 +328,9 @@ addtask create_srcipk after do_patch before do_configure
 
 python () {
     if d.getVar('do_compileconfigs', False):
-	deps = d.getVarFlag('do_compileconfigs', 'deps') or []
-	deps.append('do_create_srcipk')
-	d.setVarFlag('do_compileconfigs', 'deps', deps)
+        deps = d.getVarFlag('do_compileconfigs', 'deps') or []
+        deps.append('do_create_srcipk')
+        d.setVarFlag('do_compileconfigs', 'deps', deps)
 }
 
 #Add source packages to list of packages OE knows about
diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index 256d904..4190aa8 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -108,7 +108,7 @@ require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
 require conf/distro/include/arago-prefs.inc
 
 # Enable generation of source packages for SDKs
-require arago-source-ipk.conf
+#require arago-source-ipk.conf
 
 # Allow branding on top of Arago Distro and Core TI-SDK
 # If ARAGO_BRAND is not set in local.conf, default to core
diff --git a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend
index 6ae4bd7..f8f3cff 100644
--- a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend
+++ b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend
@@ -2,4 +2,4 @@ MACHINE_KERNEL_PR_append = ".arago5"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
-require copy-defconfig.inc
+#require copy-defconfig.inc
-- 
2.7.4