5 files changed, 6 insertions, 11 deletions
diff --git a/meta-agl-core/recipes-devtools/cmake/cmake_aglcore.inc b/meta-agl-core/recipes-devtools/cmake/cmake_aglcore.inc
deleted file mode 100644
index 2de1e6836..000000000
--- a/meta-agl-core/recipes-devtools/cmake/cmake_aglcore.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/files"
-
-SRC_URI_append_class-nativesdk = " \
-    file://environment.d-cmake-agl.sh \
-"
-
-do_install_append_class-nativesdk() {
-    install -m 644 ${WORKDIR}/environment.d-cmake-agl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/cmake-agl.sh
-}
diff --git a/meta-agl-core/recipes-devtools/cmake/files/environment.d-cmake-agl.sh b/meta-agl-core/recipes-devtools/cmake/files/environment.d-cmake-agl.sh
deleted file mode 100644
index 64b6cf3c6..000000000
--- a/meta-agl-core/recipes-devtools/cmake/files/environment.d-cmake-agl.sh
+++ /dev/null
@@ -1 +0,0 @@
-export OE_CMAKE_TOOLCHAIN_FILE="$OECORE_NATIVE_SYSROOT/usr/share/cmake/OEToolchainConfig.cmake"
diff --git a/meta-agl-core/recipes-devtools/gdb/gdb_aglcore.inc b/meta-agl-core/recipes-devtools/gdb/gdb_aglcore.inc
index 7cba933af..213542ec5 100644
--- a/meta-agl-core/recipes-devtools/gdb/gdb_aglcore.inc
+++ b/meta-agl-core/recipes-devtools/gdb/gdb_aglcore.inc
@@ -1 +1 @@
-PACKAGECONFIG_remove = "readline"
+PACKAGECONFIG:remove = "readline"
diff --git a/meta-agl-core/recipes-devtools/cmake/cmake_%.bbappend b/meta-agl-core/recipes-devtools/qemu/qemu_%.bbappend
index 980783236..980783236 100644
--- a/meta-agl-core/recipes-devtools/cmake/cmake_%.bbappend
+++ b/meta-agl-core/recipes-devtools/qemu/qemu_%.bbappend
diff --git a/meta-agl-core/recipes-devtools/qemu/qemu_aglcore.inc b/meta-agl-core/recipes-devtools/qemu/qemu_aglcore.inc
new file mode 100644
index 000000000..77d461a7f
--- /dev/null
+++ b/meta-agl-core/recipes-devtools/qemu/qemu_aglcore.inc
@@ -0,0 +1,5 @@
+PACKAGECONFIG:append = " \
+    aio \
+    libusb \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \
+"