summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-20 22:53:12 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-20 23:29:32 (GMT)
commitfc2cee5cc6299a5592af598c23a13f93bab1e5c8 (patch)
tree3add08cdba5c43517ced933880bc0752f2bf12d3
parentaec20af824a862399f91d3382a052467dba71dc5 (diff)
downloadpoky-fc2cee5cc6299a5592af598c23a13f93bab1e5c8.tar.gz
Rename poky-lsb override to linuxstdbase
(From OE-Core rev: 73a227a738da17229baac142ccd889c7929402ba) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/poky-image.bbclass110
-rw-r--r--meta/recipes-core/base-files/base-files_3.0.14.bb2
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc2
-rw-r--r--meta/recipes-core/images/core-image-base.bb2
-rw-r--r--meta/recipes-core/images/core-image-core.bb2
-rw-r--r--meta/recipes-core/images/core-image-minimal-dev.bb2
-rw-r--r--meta/recipes-core/images/core-image-minimal-initramfs.bb2
-rw-r--r--meta/recipes-core/images/core-image-minimal.bb2
-rw-r--r--meta/recipes-core/jpeg/jpeg_8b.bb2
-rw-r--r--meta/recipes-core/libxml/libxml2.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb2
-rw-r--r--meta/recipes-devtools/python/python.inc2
-rw-r--r--meta/recipes-devtools/python/python_2.6.6.bb2
-rw-r--r--meta/recipes-extended/images/core-image-basic.bb2
-rw-r--r--meta/recipes-extended/images/core-image-lsb-dev.bb2
-rw-r--r--meta/recipes-extended/images/core-image-lsb-sdk.bb2
-rw-r--r--meta/recipes-extended/images/core-image-lsb.bb2
-rw-r--r--meta/recipes-graphics/images/core-image-clutter.bb2
-rw-r--r--meta/recipes-qt/qt4/qt4.inc2
-rw-r--r--meta/recipes-sato/images/core-image-sato-dev.bb2
-rw-r--r--meta/recipes-sato/images/core-image-sato-sdk.bb2
-rw-r--r--meta/recipes-sato/images/core-image-sato.bb2
22 files changed, 21 insertions, 131 deletions
diff --git a/meta/classes/poky-image.bbclass b/meta/classes/poky-image.bbclass
deleted file mode 100644
index 832319a..0000000
--- a/meta/classes/poky-image.bbclass
+++ /dev/null
@@ -1,110 +0,0 @@
1# Common for Poky images
2#
3# Copyright (C) 2007 OpenedHand LTD
4
5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
7
8# IMAGE_FEATURES control content of images built with Poky.
9#
10# By default we install task-core-boot and task-base packages - this gives us
11# working (console only) rootfs.
12#
13# Available IMAGE_FEATURES:
14#
15# - apps-console-core
16# - x11-base - X11 server + minimal desktop
17# - x11-sato - OpenedHand Sato environment
18# - x11-netbook - Metacity based environment for netbooks
19# - apps-x11-core - X Terminal, file manager, file editor
20# - apps-x11-games
21# - apps-x11-pimlico - OpenedHand Pimlico apps
22# - tools-sdk - SDK
23# - tools-debug - debugging tools
24# - tools-profile - profiling tools
25# - tools-testapps - tools usable to make some device tests
26# - nfs-server - NFS server (exports / over NFS to everybody)
27# - ssh-server-dropbear - SSH server (dropbear)
28# - ssh-server-openssh - SSH server (openssh)
29# - dev-pkgs - development packages
30# - dbg-pkgs - debug packages
31#
32
33POKY_BASE_INSTALL = '\
34 task-core-boot \
35 task-base-extended \
36 ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-core-boot-dbg task-base-dbg", "",d)} \
37 ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-core-boot-dev task-base-dev", "",d)} \
38 \
39 ${@base_contains("IMAGE_FEATURES", "apps-console-core", "task-core-apps-console", "",d)} \
40 ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dbg-pkgs"], "task-core-apps-console-dbg", "",d)} \
41 ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dev-pkgs"], "task-core-apps-console-dev", "",d)} \
42 \
43 ${@base_contains("IMAGE_FEATURES", "x11-base", "task-core-x11-base", "",d)} \
44 ${@base_contains("IMAGE_FEATURES", ["x11-base", "dbg-pkgs"], "task-core-x11-base-dbg", "",d)} \
45 ${@base_contains("IMAGE_FEATURES", ["x11-base", "dev-pkgs"], "task-core-x11-base-dev", "",d)} \
46 \
47 ${@base_contains("IMAGE_FEATURES", "x11-sato", "task-core-x11-sato", "",d)} \
48 ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dbg-pkgs"], "task-core-x11-sato-dbg", "",d)} \
49 ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dev-pkgs"], "task-core-x11-sato-dev", "",d)} \
50 \
51 ${@base_contains("IMAGE_FEATURES", "x11-netbook", "task-core-x11-netbook", "", d)} \
52 ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dbg-pkgs"], "task-core-x11-netbook-dbg", "", d)} \
53 ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dev-pkgs"], "task-core-x11-netbook-dev", "", d)} \
54 ${@base_contains("IMAGE_FEATURES", "apps-x11-core", "task-core-apps-x11-core", "",d)} \
55 ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dbg-pkgs"], "task-core-apps-x11-core-dbg", "",d)} \
56 ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dev-pkgs"], "task-core-apps-x11-core-dev", "",d)} \
57 \
58 ${@base_contains("IMAGE_FEATURES", "apps-x11-games", "task-core-apps-x11-games", "",d)} \
59 ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dbg-pkgs"], "task-core-apps-x11-games-dbg", "",d)} \
60 ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dev-pkgs"], "task-core-apps-x11-games-dev", "",d)} \
61 \
62 ${@base_contains("IMAGE_FEATURES", "apps-x11-pimlico", "task-core-apps-x11-pimlico", "",d)} \
63 ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dbg-pkgs"], "task-core-apps-x11-pimlico-dbg", "",d)} \
64 ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dev-pkgs"], "task-core-apps-x11-pimlico-dev", "",d)} \
65 \
66 ${@base_contains("IMAGE_FEATURES", "tools-debug", "task-core-tools-debug", "",d)} \
67 ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dbg-pkgs"], "task-core-tools-debug-dbg", "",d)} \
68 ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dev-pkgs"], "task-core-tools-debug-dev", "",d)} \
69 \
70 ${@base_contains("IMAGE_FEATURES", "tools-profile", "task-core-tools-profile", "",d)} \
71 ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dbg-pkgs"], "task-core-tools-profile-dbg", "",d)} \
72 ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dev-pkgs"], "task-core-tools-profile-dev", "",d)} \
73 \
74 ${@base_contains("IMAGE_FEATURES", "tools-testapps", "task-core-tools-testapps", "",d)} \
75 ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dbg-pkgs"], "task-core-tools-testapps-dbg", "",d)} \
76 ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dev-pkgs"], "task-core-tools-testapps-dev", "",d)} \
77 \
78 ${@base_contains("IMAGE_FEATURES", "tools-sdk", "task-core-sdk task-core-standalone-sdk-target", "",d)} \
79 ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dbg-pkgs"], "task-core-sdk-dbg", "",d)} \
80 ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dev-pkgs"], "task-core-sdk-dev", "",d)} \
81 \
82 ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-core-nfs-server", "",d)} \
83 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-core-nfs-server-dbg", "",d)} \
84 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-core-nfs-server-dev", "",d)} \
85 \
86 ${@base_contains("IMAGE_FEATURES", "ssh-server-dropbear", "task-core-ssh-dropbear", "",d)} \
87 ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dbg-pkgs"], "task-core-ssh-dropbear-dbg", "",d)} \
88 ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dev-pkgs"], "task-core-ssh-dropbear-dev", "",d)} \
89 \
90 ${@base_contains("IMAGE_FEATURES", "ssh-server-openssh", "task-core-ssh-openssh", "",d)} \
91 ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dbg-pkgs"], "task-core-ssh-openssh-dbg", "",d)} \
92 ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dev-pkgs"], "task-core-ssh-openssh-dev", "",d)} \
93 \
94 ${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \
95 ${@base_contains("IMAGE_FEATURES", "qt4-pkgs", "task-core-qt-demos", "",d)} \
96 ${POKY_EXTRA_INSTALL} \
97 '
98
99POKY_EXTRA_INSTALL ?= ""
100
101IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}"
102
103X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management"
104ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games apps-x11-pimlico package-management"
105SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ssh-server-dropbear"
106
107inherit image
108
109# Create /etc/timestamp during image construction to give a reasonably sane default time setting
110ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; "
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index d8f96c0..857df13 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -160,7 +160,7 @@ do_install_append_netbook-pro () {
160 mkdir -p ${D}/initrd 160 mkdir -p ${D}/initrd
161} 161}
162 162
163do_install_append_poky-lsb() { 163do_install_append_linuxstdbase() {
164 for d in ${dirs3755}; do 164 for d in ${dirs3755}; do
165 install -m 0755 -d ${D}$d 165 install -m 0755 -d ${D}$d
166 done 166 done
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 0319b9d..5ebff68 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -29,7 +29,7 @@ S = "${WORKDIR}/glib-${PV}"
29 29
30EXTRA_OECONF = "--disable-debug --enable-included-printf=no" 30EXTRA_OECONF = "--disable-debug --enable-included-printf=no"
31EXTRA_OECONF_virtclass-native = "" 31EXTRA_OECONF_virtclass-native = ""
32EXTRA_OECONF_poky-lsb = "--enable-included-printf=no" 32EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no"
33 33
34FILES_${PN} = "${libdir}/lib*${SOLIBS}" 34FILES_${PN} = "${libdir}/lib*${SOLIBS}"
35FILES_${PN}-dev += "${libdir}/glib-2.0/include" 35FILES_${PN}-dev += "${libdir}/glib-2.0/include"
diff --git a/meta/recipes-core/images/core-image-base.bb b/meta/recipes-core/images/core-image-base.bb
index 461b805..13a7650 100644
--- a/meta/recipes-core/images/core-image-base.bb
+++ b/meta/recipes-core/images/core-image-base.bb
@@ -6,4 +6,4 @@ IMAGE_FEATURES += "apps-console-core"
6 6
7LICENSE = "MIT" 7LICENSE = "MIT"
8 8
9inherit poky-image 9inherit core-image
diff --git a/meta/recipes-core/images/core-image-core.bb b/meta/recipes-core/images/core-image-core.bb
index c232ccd..57ff085 100644
--- a/meta/recipes-core/images/core-image-core.bb
+++ b/meta/recipes-core/images/core-image-core.bb
@@ -6,4 +6,4 @@ IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES}"
6 6
7LICENSE = "MIT" 7LICENSE = "MIT"
8 8
9inherit poky-image 9inherit core-image
diff --git a/meta/recipes-core/images/core-image-minimal-dev.bb b/meta/recipes-core/images/core-image-minimal-dev.bb
index 248d29f..89ec9f8 100644
--- a/meta/recipes-core/images/core-image-minimal-dev.bb
+++ b/meta/recipes-core/images/core-image-minimal-dev.bb
@@ -9,7 +9,7 @@ IMAGE_LINGUAS = " "
9 9
10LICENSE = "MIT" 10LICENSE = "MIT"
11 11
12inherit poky-image 12inherit core-image
13 13
14# remove not needed ipkg informations 14# remove not needed ipkg informations
15ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " 15ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; "
diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb
index 3da4a95..21aaa6c 100644
--- a/meta/recipes-core/images/core-image-minimal-initramfs.bb
+++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb
@@ -7,4 +7,4 @@ IMAGE_LINGUAS = ""
7 7
8LICENSE = "MIT" 8LICENSE = "MIT"
9 9
10inherit poky-image 10inherit core-image
diff --git a/meta/recipes-core/images/core-image-minimal.bb b/meta/recipes-core/images/core-image-minimal.bb
index 3aae04e..aa00e67 100644
--- a/meta/recipes-core/images/core-image-minimal.bb
+++ b/meta/recipes-core/images/core-image-minimal.bb
@@ -7,7 +7,7 @@ IMAGE_LINGUAS = " "
7 7
8LICENSE = "MIT" 8LICENSE = "MIT"
9 9
10inherit poky-image 10inherit core-image
11 11
12# remove not needed ipkg informations 12# remove not needed ipkg informations
13ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " 13ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; "
diff --git a/meta/recipes-core/jpeg/jpeg_8b.bb b/meta/recipes-core/jpeg/jpeg_8b.bb
index 78fabf1..93aa7be 100644
--- a/meta/recipes-core/jpeg/jpeg_8b.bb
+++ b/meta/recipes-core/jpeg/jpeg_8b.bb
@@ -46,7 +46,7 @@ FILES_jpeg-tools = "${bindir}/*"
46 46
47BBCLASSEXTEND = "native" 47BBCLASSEXTEND = "native"
48 48
49pkg_postinst_${PN}_poky-lsb () { 49pkg_postinst_${PN}_linuxstdbase () {
50 if [ "$D" = "" ]; then 50 if [ "$D" = "" ]; then
51 if [ ! -e ${libdir}/libjpeg.so.62 ]; then 51 if [ ! -e ${libdir}/libjpeg.so.62 ]; then
52 JPEG=`find ${libdir} -type f -name libjpeg.so.\*.\*.\*` 52 JPEG=`find ${libdir} -type f -name libjpeg.so.\*.\*.\*`
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc
index ba6db8f..d9ea816 100644
--- a/meta/recipes-core/libxml/libxml2.inc
+++ b/meta/recipes-core/libxml/libxml2.inc
@@ -21,7 +21,7 @@ inherit autotools pkgconfig binconfig
21 21
22EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n" 22EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"
23EXTRA_OECONF_virtclass-native = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n" 23EXTRA_OECONF_virtclass-native = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n"
24EXTRA_OECONF_poky-lsb = "--without-python --with-debug --with-legacy --with-catalog --with-docbook --with-c14n" 24EXTRA_OECONF_linuxstdbase = "--without-python --with-debug --with-legacy --with-catalog --with-docbook --with-c14n"
25 25
26# required for pythong binding 26# required for pythong binding
27export HOST_SYS 27export HOST_SYS
diff --git a/meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb
index 189c0b8..0a7056c 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb
@@ -9,4 +9,4 @@ SRC_URI_append = "file://fortran-cross-compile-hack.patch"
9ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}" 9ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
10 10
11EXTRA_OECONF += "--disable-libunwind-exceptions" 11EXTRA_OECONF += "--disable-libunwind-exceptions"
12EXTRA_OECONF_append_poky-lsb = " --enable-clocale=gnu" 12EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu"
diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc
index bfa0bb2..3de220b 100644
--- a/meta/recipes-devtools/python/python.inc
+++ b/meta/recipes-devtools/python/python.inc
@@ -22,7 +22,7 @@ EXTRA_OECONF = "\
22 --enable-shared \ 22 --enable-shared \
23" 23"
24 24
25EXTRA_OECONF_poky-lsb = "\ 25EXTRA_OECONF_linuxstdbase = "\
26 --with-threads \ 26 --with-threads \
27 --with-pymalloc \ 27 --with-pymalloc \
28 --with-cyclic-gc \ 28 --with-cyclic-gc \
diff --git a/meta/recipes-devtools/python/python_2.6.6.bb b/meta/recipes-devtools/python/python_2.6.6.bb
index ad0d7a9..2939df4 100644
--- a/meta/recipes-devtools/python/python_2.6.6.bb
+++ b/meta/recipes-devtools/python/python_2.6.6.bb
@@ -5,7 +5,7 @@ PR = "${INC_PR}.1"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6"
6 6
7DISTRO_SRC_URI ?= "file://sitecustomize.py" 7DISTRO_SRC_URI ?= "file://sitecustomize.py"
8DISTRO_SRC_URI_poky-lsb = "" 8DISTRO_SRC_URI_linuxstdbase = ""
9SRC_URI = "\ 9SRC_URI = "\
10 http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ 10 http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
11 file://01-use-proper-tools-for-cross-build.patch \ 11 file://01-use-proper-tools-for-cross-build.patch \
diff --git a/meta/recipes-extended/images/core-image-basic.bb b/meta/recipes-extended/images/core-image-basic.bb
index 86972c3..ba71cd0 100644
--- a/meta/recipes-extended/images/core-image-basic.bb
+++ b/meta/recipes-extended/images/core-image-basic.bb
@@ -7,4 +7,4 @@ IMAGE_INSTALL = "\
7 7
8# ${POKY_BASE_INSTALL} 8# ${POKY_BASE_INSTALL}
9 9
10inherit poky-image 10inherit core-image
diff --git a/meta/recipes-extended/images/core-image-lsb-dev.bb b/meta/recipes-extended/images/core-image-lsb-dev.bb
index 86baf23..9ef85ff 100644
--- a/meta/recipes-extended/images/core-image-lsb-dev.bb
+++ b/meta/recipes-extended/images/core-image-lsb-dev.bb
@@ -6,4 +6,4 @@ IMAGE_INSTALL = "\
6 task-core-lsb \ 6 task-core-lsb \
7 " 7 "
8 8
9inherit poky-image 9inherit core-image
diff --git a/meta/recipes-extended/images/core-image-lsb-sdk.bb b/meta/recipes-extended/images/core-image-lsb-sdk.bb
index 74ad1d2..f6de73c 100644
--- a/meta/recipes-extended/images/core-image-lsb-sdk.bb
+++ b/meta/recipes-extended/images/core-image-lsb-sdk.bb
@@ -6,4 +6,4 @@ IMAGE_INSTALL = "\
6 task-core-lsb \ 6 task-core-lsb \
7 " 7 "
8 8
9inherit poky-image 9inherit core-image
diff --git a/meta/recipes-extended/images/core-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb
index 63180f5..22eb7f4 100644
--- a/meta/recipes-extended/images/core-image-lsb.bb
+++ b/meta/recipes-extended/images/core-image-lsb.bb
@@ -6,4 +6,4 @@ IMAGE_INSTALL = "\
6 task-core-lsb \ 6 task-core-lsb \
7 " 7 "
8 8
9inherit poky-image 9inherit core-image
diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb
index 66839f4..7d50405 100644
--- a/meta/recipes-graphics/images/core-image-clutter.bb
+++ b/meta/recipes-graphics/images/core-image-clutter.bb
@@ -8,4 +8,4 @@ IMAGE_INSTALL = "\
8 task-core-clutter-tests \ 8 task-core-clutter-tests \
9 task-core-clutter-apps" 9 task-core-clutter-apps"
10 10
11inherit poky-image 11inherit core-image
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index de8cb69..b86f89f7 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -7,7 +7,7 @@ QT_ARCH := "${@qt_arch(d)}"
7QT_ENDIAN = "${@qt_endian(d)}" 7QT_ENDIAN = "${@qt_endian(d)}"
8 8
9QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm" 9QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm"
10QT_DISTRO_FLAGS_poky-lsb = "-sm" 10QT_DISTRO_FLAGS_linuxstdbase = "-sm"
11 11
12QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \ 12QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
13 -shared -no-nas-sound -no-nis \ 13 -shared -no-nas-sound -no-nis \
diff --git a/meta/recipes-sato/images/core-image-sato-dev.bb b/meta/recipes-sato/images/core-image-sato-dev.bb
index 429095e..7322b4a 100644
--- a/meta/recipes-sato/images/core-image-sato-dev.bb
+++ b/meta/recipes-sato/images/core-image-sato-dev.bb
@@ -6,4 +6,4 @@ IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs"
6 6
7LICENSE = "MIT" 7LICENSE = "MIT"
8 8
9inherit poky-image 9inherit core-image
diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb
index 9f8eef9..ee9d799 100644
--- a/meta/recipes-sato/images/core-image-sato-sdk.bb
+++ b/meta/recipes-sato/images/core-image-sato-sdk.bb
@@ -6,4 +6,4 @@ IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug tools-pr
6 6
7LICENSE = "MIT" 7LICENSE = "MIT"
8 8
9inherit poky-image 9inherit core-image
diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb
index 35d1a53..3465174 100644
--- a/meta/recipes-sato/images/core-image-sato.bb
+++ b/meta/recipes-sato/images/core-image-sato.bb
@@ -6,4 +6,4 @@ IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
6 6
7LICENSE = "MIT" 7LICENSE = "MIT"
8 8
9inherit poky-image 9inherit core-image