1 files changed, 6 insertions, 8 deletions

diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 4ba9d87..4a8f73b 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -56,9 +56,6 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio sysvinit"
 
 FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache"
 
-# backport from oe/krogoth, needed by meta-qt5
-PACKAGECONFIG_CONFARGS += "${EXTRA_OECONF}"
-
 # use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10
 DISTRO_FEATURES += "gstreamer"
 
@@ -71,10 +68,6 @@ PREFERRED_PROVIDER_udev-utils ?= "systemd"
 PREFERRED_PROVIDER_jpeg ?= "libjpeg-turbo"
 PREFERRED_PROVIDER_jpeg-native ?= "libjpeg-turbo-native"
 
-MACHINE_EXTRA_INSTALL ?= ""
-MACHINE_EXTRA_INSTALL_SDK ?= ""
-MACHINE_EXTRA_INSTALL_SDK_HOST ?= ""
-
 # Override mkspec for mingw build
 OE_QMAKE_PLATFORM_NATIVE_mingw32 = "win32-g++-oe"
 OE_QMAKE_PLATFORM_mingw32 = "win32-g++-oe"
@@ -84,9 +77,14 @@ QT_MODULE_BRANCH_PARAM = "nobranch=1"
 
 PACKAGE_EXCLUDE_COMPLEMENTARY ?= "qtquickcompiler"
 
-IMAGE_FSTYPES = "tar.gz conf"
+IMAGE_FSTYPES = "conf"
 IMAGE_CLASSES += "image_types_sdcard deploy-conf"
 
+QBSP_IMAGE_CONTENT ?= "\
+    ${IMAGE_LINK_NAME}.img \
+    ${IMAGE_LINK_NAME}.conf \
+    "
+
 LICENSE_CREATE_PACKAGE = "1"
 COPY_LIC_MANIFEST = "1"