Rename poky-lsb override to linuxstdbase
(From OE-Core rev: 73a227a738da17229baac142ccd889c7929402ba) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
aec20af824
commit
fc2cee5cc6
|
@ -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 ; "
|
|
|
@ -160,7 +160,7 @@ do_install_append_netbook-pro () {
|
||||||
mkdir -p ${D}/initrd
|
mkdir -p ${D}/initrd
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install_append_poky-lsb() {
|
do_install_append_linuxstdbase() {
|
||||||
for d in ${dirs3755}; do
|
for d in ${dirs3755}; do
|
||||||
install -m 0755 -d ${D}$d
|
install -m 0755 -d ${D}$d
|
||||||
done
|
done
|
||||||
|
|
|
@ -29,7 +29,7 @@ S = "${WORKDIR}/glib-${PV}"
|
||||||
|
|
||||||
EXTRA_OECONF = "--disable-debug --enable-included-printf=no"
|
EXTRA_OECONF = "--disable-debug --enable-included-printf=no"
|
||||||
EXTRA_OECONF_virtclass-native = ""
|
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} = "${libdir}/lib*${SOLIBS}"
|
||||||
FILES_${PN}-dev += "${libdir}/glib-2.0/include"
|
FILES_${PN}-dev += "${libdir}/glib-2.0/include"
|
||||||
|
|
|
@ -6,4 +6,4 @@ IMAGE_FEATURES += "apps-console-core"
|
||||||
|
|
||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
|
|
||||||
inherit poky-image
|
inherit core-image
|
||||||
|
|
|
@ -6,4 +6,4 @@ IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES}"
|
||||||
|
|
||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
|
|
||||||
inherit poky-image
|
inherit core-image
|
||||||
|
|
|
@ -9,7 +9,7 @@ IMAGE_LINGUAS = " "
|
||||||
|
|
||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
|
|
||||||
inherit poky-image
|
inherit core-image
|
||||||
|
|
||||||
# remove not needed ipkg informations
|
# remove not needed ipkg informations
|
||||||
ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; "
|
ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; "
|
||||||
|
|
|
@ -7,4 +7,4 @@ IMAGE_LINGUAS = ""
|
||||||
|
|
||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
|
|
||||||
inherit poky-image
|
inherit core-image
|
||||||
|
|
|
@ -7,7 +7,7 @@ IMAGE_LINGUAS = " "
|
||||||
|
|
||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
|
|
||||||
inherit poky-image
|
inherit core-image
|
||||||
|
|
||||||
# remove not needed ipkg informations
|
# remove not needed ipkg informations
|
||||||
ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; "
|
ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; "
|
||||||
|
|
|
@ -46,7 +46,7 @@ FILES_jpeg-tools = "${bindir}/*"
|
||||||
|
|
||||||
BBCLASSEXTEND = "native"
|
BBCLASSEXTEND = "native"
|
||||||
|
|
||||||
pkg_postinst_${PN}_poky-lsb () {
|
pkg_postinst_${PN}_linuxstdbase () {
|
||||||
if [ "$D" = "" ]; then
|
if [ "$D" = "" ]; then
|
||||||
if [ ! -e ${libdir}/libjpeg.so.62 ]; then
|
if [ ! -e ${libdir}/libjpeg.so.62 ]; then
|
||||||
JPEG=`find ${libdir} -type f -name libjpeg.so.\*.\*.\*`
|
JPEG=`find ${libdir} -type f -name libjpeg.so.\*.\*.\*`
|
||||||
|
|
|
@ -21,7 +21,7 @@ inherit autotools pkgconfig binconfig
|
||||||
|
|
||||||
EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"
|
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_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
|
# required for pythong binding
|
||||||
export HOST_SYS
|
export HOST_SYS
|
||||||
|
|
|
@ -9,4 +9,4 @@ SRC_URI_append = "file://fortran-cross-compile-hack.patch"
|
||||||
ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
|
ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
|
||||||
|
|
||||||
EXTRA_OECONF += "--disable-libunwind-exceptions"
|
EXTRA_OECONF += "--disable-libunwind-exceptions"
|
||||||
EXTRA_OECONF_append_poky-lsb = " --enable-clocale=gnu"
|
EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu"
|
||||||
|
|
|
@ -22,7 +22,7 @@ EXTRA_OECONF = "\
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
"
|
"
|
||||||
|
|
||||||
EXTRA_OECONF_poky-lsb = "\
|
EXTRA_OECONF_linuxstdbase = "\
|
||||||
--with-threads \
|
--with-threads \
|
||||||
--with-pymalloc \
|
--with-pymalloc \
|
||||||
--with-cyclic-gc \
|
--with-cyclic-gc \
|
||||||
|
|
|
@ -5,7 +5,7 @@ PR = "${INC_PR}.1"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6"
|
LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6"
|
||||||
|
|
||||||
DISTRO_SRC_URI ?= "file://sitecustomize.py"
|
DISTRO_SRC_URI ?= "file://sitecustomize.py"
|
||||||
DISTRO_SRC_URI_poky-lsb = ""
|
DISTRO_SRC_URI_linuxstdbase = ""
|
||||||
SRC_URI = "\
|
SRC_URI = "\
|
||||||
http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
|
http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
|
||||||
file://01-use-proper-tools-for-cross-build.patch \
|
file://01-use-proper-tools-for-cross-build.patch \
|
||||||
|
|
|
@ -7,4 +7,4 @@ IMAGE_INSTALL = "\
|
||||||
|
|
||||||
# ${POKY_BASE_INSTALL}
|
# ${POKY_BASE_INSTALL}
|
||||||
|
|
||||||
inherit poky-image
|
inherit core-image
|
||||||
|
|
|
@ -6,4 +6,4 @@ IMAGE_INSTALL = "\
|
||||||
task-core-lsb \
|
task-core-lsb \
|
||||||
"
|
"
|
||||||
|
|
||||||
inherit poky-image
|
inherit core-image
|
||||||
|
|
|
@ -6,4 +6,4 @@ IMAGE_INSTALL = "\
|
||||||
task-core-lsb \
|
task-core-lsb \
|
||||||
"
|
"
|
||||||
|
|
||||||
inherit poky-image
|
inherit core-image
|
||||||
|
|
|
@ -6,4 +6,4 @@ IMAGE_INSTALL = "\
|
||||||
task-core-lsb \
|
task-core-lsb \
|
||||||
"
|
"
|
||||||
|
|
||||||
inherit poky-image
|
inherit core-image
|
||||||
|
|
|
@ -8,4 +8,4 @@ IMAGE_INSTALL = "\
|
||||||
task-core-clutter-tests \
|
task-core-clutter-tests \
|
||||||
task-core-clutter-apps"
|
task-core-clutter-apps"
|
||||||
|
|
||||||
inherit poky-image
|
inherit core-image
|
||||||
|
|
|
@ -7,7 +7,7 @@ QT_ARCH := "${@qt_arch(d)}"
|
||||||
QT_ENDIAN = "${@qt_endian(d)}"
|
QT_ENDIAN = "${@qt_endian(d)}"
|
||||||
|
|
||||||
QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm"
|
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 \
|
QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
|
||||||
-shared -no-nas-sound -no-nis \
|
-shared -no-nas-sound -no-nis \
|
||||||
|
|
|
@ -6,4 +6,4 @@ IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs"
|
||||||
|
|
||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
|
|
||||||
inherit poky-image
|
inherit core-image
|
||||||
|
|
|
@ -6,4 +6,4 @@ IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug tools-pr
|
||||||
|
|
||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
|
|
||||||
inherit poky-image
|
inherit core-image
|
||||||
|
|
|
@ -6,4 +6,4 @@ IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
|
||||||
|
|
||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
|
|
||||||
inherit poky-image
|
inherit core-image
|
||||||
|
|
Loading…
Reference in New Issue