From fc2cee5cc6299a5592af598c23a13f93bab1e5c8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 20 Apr 2011 23:53:12 +0100 Subject: Rename poky-lsb override to linuxstdbase (From OE-Core rev: 73a227a738da17229baac142ccd889c7929402ba) Signed-off-by: Richard Purdie --- meta/classes/poky-image.bbclass | 110 --------------------- meta/recipes-core/base-files/base-files_3.0.14.bb | 2 +- meta/recipes-core/glib-2.0/glib.inc | 2 +- meta/recipes-core/images/core-image-base.bb | 2 +- meta/recipes-core/images/core-image-core.bb | 2 +- meta/recipes-core/images/core-image-minimal-dev.bb | 2 +- .../images/core-image-minimal-initramfs.bb | 2 +- meta/recipes-core/images/core-image-minimal.bb | 2 +- meta/recipes-core/jpeg/jpeg_8b.bb | 2 +- meta/recipes-core/libxml/libxml2.inc | 2 +- meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb | 2 +- meta/recipes-devtools/python/python.inc | 2 +- meta/recipes-devtools/python/python_2.6.6.bb | 2 +- meta/recipes-extended/images/core-image-basic.bb | 2 +- meta/recipes-extended/images/core-image-lsb-dev.bb | 2 +- meta/recipes-extended/images/core-image-lsb-sdk.bb | 2 +- meta/recipes-extended/images/core-image-lsb.bb | 2 +- meta/recipes-graphics/images/core-image-clutter.bb | 2 +- meta/recipes-qt/qt4/qt4.inc | 2 +- meta/recipes-sato/images/core-image-sato-dev.bb | 2 +- meta/recipes-sato/images/core-image-sato-sdk.bb | 2 +- meta/recipes-sato/images/core-image-sato.bb | 2 +- 22 files changed, 21 insertions(+), 131 deletions(-) delete mode 100644 meta/classes/poky-image.bbclass (limited to 'meta') 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 @@ -# Common for Poky images -# -# Copyright (C) 2007 OpenedHand LTD - -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -# IMAGE_FEATURES control content of images built with Poky. -# -# By default we install task-core-boot and task-base packages - this gives us -# working (console only) rootfs. -# -# Available IMAGE_FEATURES: -# -# - apps-console-core -# - x11-base - X11 server + minimal desktop -# - x11-sato - OpenedHand Sato environment -# - x11-netbook - Metacity based environment for netbooks -# - apps-x11-core - X Terminal, file manager, file editor -# - apps-x11-games -# - apps-x11-pimlico - OpenedHand Pimlico apps -# - tools-sdk - SDK -# - tools-debug - debugging tools -# - tools-profile - profiling tools -# - tools-testapps - tools usable to make some device tests -# - nfs-server - NFS server (exports / over NFS to everybody) -# - ssh-server-dropbear - SSH server (dropbear) -# - ssh-server-openssh - SSH server (openssh) -# - dev-pkgs - development packages -# - dbg-pkgs - debug packages -# - -POKY_BASE_INSTALL = '\ - task-core-boot \ - task-base-extended \ - ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-core-boot-dbg task-base-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-core-boot-dev task-base-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "apps-console-core", "task-core-apps-console", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dbg-pkgs"], "task-core-apps-console-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dev-pkgs"], "task-core-apps-console-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "x11-base", "task-core-x11-base", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["x11-base", "dbg-pkgs"], "task-core-x11-base-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["x11-base", "dev-pkgs"], "task-core-x11-base-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "x11-sato", "task-core-x11-sato", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dbg-pkgs"], "task-core-x11-sato-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dev-pkgs"], "task-core-x11-sato-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "x11-netbook", "task-core-x11-netbook", "", d)} \ - ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dbg-pkgs"], "task-core-x11-netbook-dbg", "", d)} \ - ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dev-pkgs"], "task-core-x11-netbook-dev", "", d)} \ - ${@base_contains("IMAGE_FEATURES", "apps-x11-core", "task-core-apps-x11-core", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dbg-pkgs"], "task-core-apps-x11-core-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dev-pkgs"], "task-core-apps-x11-core-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "apps-x11-games", "task-core-apps-x11-games", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dbg-pkgs"], "task-core-apps-x11-games-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dev-pkgs"], "task-core-apps-x11-games-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "apps-x11-pimlico", "task-core-apps-x11-pimlico", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dbg-pkgs"], "task-core-apps-x11-pimlico-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dev-pkgs"], "task-core-apps-x11-pimlico-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "tools-debug", "task-core-tools-debug", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dbg-pkgs"], "task-core-tools-debug-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dev-pkgs"], "task-core-tools-debug-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "tools-profile", "task-core-tools-profile", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dbg-pkgs"], "task-core-tools-profile-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dev-pkgs"], "task-core-tools-profile-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "tools-testapps", "task-core-tools-testapps", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dbg-pkgs"], "task-core-tools-testapps-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dev-pkgs"], "task-core-tools-testapps-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "tools-sdk", "task-core-sdk task-core-standalone-sdk-target", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dbg-pkgs"], "task-core-sdk-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dev-pkgs"], "task-core-sdk-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-core-nfs-server", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-core-nfs-server-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-core-nfs-server-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "ssh-server-dropbear", "task-core-ssh-dropbear", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dbg-pkgs"], "task-core-ssh-dropbear-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dev-pkgs"], "task-core-ssh-dropbear-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "ssh-server-openssh", "task-core-ssh-openssh", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dbg-pkgs"], "task-core-ssh-openssh-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dev-pkgs"], "task-core-ssh-openssh-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \ - ${@base_contains("IMAGE_FEATURES", "qt4-pkgs", "task-core-qt-demos", "",d)} \ - ${POKY_EXTRA_INSTALL} \ - ' - -POKY_EXTRA_INSTALL ?= "" - -IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}" - -X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management" -ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games apps-x11-pimlico package-management" -SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ssh-server-dropbear" - -inherit image - -# Create /etc/timestamp during image construction to give a reasonably sane default time setting -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 () { mkdir -p ${D}/initrd } -do_install_append_poky-lsb() { +do_install_append_linuxstdbase() { for d in ${dirs3755}; do install -m 0755 -d ${D}$d 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}" EXTRA_OECONF = "--disable-debug --enable-included-printf=no" EXTRA_OECONF_virtclass-native = "" -EXTRA_OECONF_poky-lsb = "--enable-included-printf=no" +EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no" FILES_${PN} = "${libdir}/lib*${SOLIBS}" 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" LICENSE = "MIT" -inherit poky-image +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}" LICENSE = "MIT" -inherit poky-image +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 = " " LICENSE = "MIT" -inherit poky-image +inherit core-image # remove not needed ipkg informations 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 = "" LICENSE = "MIT" -inherit poky-image +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 = " " LICENSE = "MIT" -inherit poky-image +inherit core-image # remove not needed ipkg informations 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}/*" BBCLASSEXTEND = "native" -pkg_postinst_${PN}_poky-lsb () { +pkg_postinst_${PN}_linuxstdbase () { if [ "$D" = "" ]; then if [ ! -e ${libdir}/libjpeg.so.62 ]; then 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 EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n" EXTRA_OECONF_virtclass-native = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n" -EXTRA_OECONF_poky-lsb = "--without-python --with-debug --with-legacy --with-catalog --with-docbook --with-c14n" +EXTRA_OECONF_linuxstdbase = "--without-python --with-debug --with-legacy --with-catalog --with-docbook --with-c14n" # required for pythong binding 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" ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}" EXTRA_OECONF += "--disable-libunwind-exceptions" -EXTRA_OECONF_append_poky-lsb = " --enable-clocale=gnu" +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 = "\ --enable-shared \ " -EXTRA_OECONF_poky-lsb = "\ +EXTRA_OECONF_linuxstdbase = "\ --with-threads \ --with-pymalloc \ --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" LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6" DISTRO_SRC_URI ?= "file://sitecustomize.py" -DISTRO_SRC_URI_poky-lsb = "" +DISTRO_SRC_URI_linuxstdbase = "" SRC_URI = "\ http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ 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 = "\ # ${POKY_BASE_INSTALL} -inherit poky-image +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 = "\ task-core-lsb \ " -inherit poky-image +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 = "\ task-core-lsb \ " -inherit poky-image +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 = "\ task-core-lsb \ " -inherit poky-image +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 = "\ task-core-clutter-tests \ task-core-clutter-apps" -inherit poky-image +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)}" QT_ENDIAN = "${@qt_endian(d)}" QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm" -QT_DISTRO_FLAGS_poky-lsb = "-sm" +QT_DISTRO_FLAGS_linuxstdbase = "-sm" QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \ -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" LICENSE = "MIT" -inherit poky-image +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 LICENSE = "MIT" -inherit poky-image +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}" LICENSE = "MIT" -inherit poky-image +inherit core-image -- cgit v1.2.3-54-g00ecf