diff options
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 832319a5ae..0000000000 --- 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 | |||
5 | LIC_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 | |||
33 | POKY_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 | |||
99 | POKY_EXTRA_INSTALL ?= "" | ||
100 | |||
101 | IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}" | ||
102 | |||
103 | X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management" | ||
104 | ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games apps-x11-pimlico package-management" | ||
105 | SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ssh-server-dropbear" | ||
106 | |||
107 | inherit image | ||
108 | |||
109 | # Create /etc/timestamp during image construction to give a reasonably sane default time setting | ||
110 | ROOTFS_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 d8f96c0b71..857df13332 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 | ||
163 | do_install_append_poky-lsb() { | 163 | do_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 0319b9d04c..5ebff68a6f 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 | ||
30 | EXTRA_OECONF = "--disable-debug --enable-included-printf=no" | 30 | EXTRA_OECONF = "--disable-debug --enable-included-printf=no" |
31 | EXTRA_OECONF_virtclass-native = "" | 31 | EXTRA_OECONF_virtclass-native = "" |
32 | EXTRA_OECONF_poky-lsb = "--enable-included-printf=no" | 32 | EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no" |
33 | 33 | ||
34 | FILES_${PN} = "${libdir}/lib*${SOLIBS}" | 34 | FILES_${PN} = "${libdir}/lib*${SOLIBS}" |
35 | FILES_${PN}-dev += "${libdir}/glib-2.0/include" | 35 | FILES_${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 461b805b60..13a76508a0 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 | ||
7 | LICENSE = "MIT" | 7 | LICENSE = "MIT" |
8 | 8 | ||
9 | inherit poky-image | 9 | inherit core-image |
diff --git a/meta/recipes-core/images/core-image-core.bb b/meta/recipes-core/images/core-image-core.bb index c232ccdc54..57ff0850da 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 | ||
7 | LICENSE = "MIT" | 7 | LICENSE = "MIT" |
8 | 8 | ||
9 | inherit poky-image | 9 | inherit 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 248d29f031..89ec9f8833 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 | ||
10 | LICENSE = "MIT" | 10 | LICENSE = "MIT" |
11 | 11 | ||
12 | inherit poky-image | 12 | inherit core-image |
13 | 13 | ||
14 | # remove not needed ipkg informations | 14 | # remove not needed ipkg informations |
15 | ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " | 15 | ROOTFS_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 3da4a952f7..21aaa6c70e 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 | ||
8 | LICENSE = "MIT" | 8 | LICENSE = "MIT" |
9 | 9 | ||
10 | inherit poky-image | 10 | inherit core-image |
diff --git a/meta/recipes-core/images/core-image-minimal.bb b/meta/recipes-core/images/core-image-minimal.bb index 3aae04edde..aa00e67c1a 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 | ||
8 | LICENSE = "MIT" | 8 | LICENSE = "MIT" |
9 | 9 | ||
10 | inherit poky-image | 10 | inherit core-image |
11 | 11 | ||
12 | # remove not needed ipkg informations | 12 | # remove not needed ipkg informations |
13 | ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " | 13 | ROOTFS_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 78fabf1efd..93aa7be678 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 | ||
47 | BBCLASSEXTEND = "native" | 47 | BBCLASSEXTEND = "native" |
48 | 48 | ||
49 | pkg_postinst_${PN}_poky-lsb () { | 49 | pkg_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 ba6db8f2c0..d9ea816e6d 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 | ||
22 | EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n" | 22 | EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n" |
23 | EXTRA_OECONF_virtclass-native = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n" | 23 | EXTRA_OECONF_virtclass-native = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n" |
24 | EXTRA_OECONF_poky-lsb = "--without-python --with-debug --with-legacy --with-catalog --with-docbook --with-c14n" | 24 | EXTRA_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 |
27 | export HOST_SYS | 27 | export 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 189c0b8746..0a7056c228 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" | |||
9 | ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}" | 9 | ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}" |
10 | 10 | ||
11 | EXTRA_OECONF += "--disable-libunwind-exceptions" | 11 | EXTRA_OECONF += "--disable-libunwind-exceptions" |
12 | EXTRA_OECONF_append_poky-lsb = " --enable-clocale=gnu" | 12 | EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu" |
diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc index bfa0bb2b36..3de220b6a4 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 | ||
25 | EXTRA_OECONF_poky-lsb = "\ | 25 | EXTRA_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 ad0d7a956a..2939df4468 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" | |||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6" |
6 | 6 | ||
7 | DISTRO_SRC_URI ?= "file://sitecustomize.py" | 7 | DISTRO_SRC_URI ?= "file://sitecustomize.py" |
8 | DISTRO_SRC_URI_poky-lsb = "" | 8 | DISTRO_SRC_URI_linuxstdbase = "" |
9 | SRC_URI = "\ | 9 | SRC_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 86972c3660..ba71cd091e 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 | ||
10 | inherit poky-image | 10 | inherit 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 86baf23de1..9ef85ff8aa 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 | ||
9 | inherit poky-image | 9 | inherit 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 74ad1d2d8c..f6de73cdca 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 | ||
9 | inherit poky-image | 9 | inherit core-image |
diff --git a/meta/recipes-extended/images/core-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb index 63180f5613..22eb7f48e9 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 | ||
9 | inherit poky-image | 9 | inherit core-image |
diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb index 66839f4f96..7d50405617 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 | ||
11 | inherit poky-image | 11 | inherit core-image |
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index de8cb691e3..b86f89f736 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
@@ -7,7 +7,7 @@ QT_ARCH := "${@qt_arch(d)}" | |||
7 | QT_ENDIAN = "${@qt_endian(d)}" | 7 | QT_ENDIAN = "${@qt_endian(d)}" |
8 | 8 | ||
9 | QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm" | 9 | QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm" |
10 | QT_DISTRO_FLAGS_poky-lsb = "-sm" | 10 | QT_DISTRO_FLAGS_linuxstdbase = "-sm" |
11 | 11 | ||
12 | QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \ | 12 | QT_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 429095e19e..7322b4afbe 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 | ||
7 | LICENSE = "MIT" | 7 | LICENSE = "MIT" |
8 | 8 | ||
9 | inherit poky-image | 9 | inherit 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 9f8eef9a52..ee9d799c31 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 | ||
7 | LICENSE = "MIT" | 7 | LICENSE = "MIT" |
8 | 8 | ||
9 | inherit poky-image | 9 | inherit core-image |
diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb index 35d1a53c32..3465174a5b 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 | ||
7 | LICENSE = "MIT" | 7 | LICENSE = "MIT" |
8 | 8 | ||
9 | inherit poky-image | 9 | inherit core-image |