mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 13:29:49 +00:00
classes,recipes: Replace POKY_* with CORE_IMAGE_*
(From OE-Core rev: b14a92f4450bb08b9f11d3fd7a99155315527cdd) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -47,18 +47,18 @@ PACKAGE_GROUP_ssh-server-openssh = "task-core-ssh-openssh"
|
|||||||
PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}"
|
PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}"
|
||||||
PACKAGE_GROUP_qt4-pkgs = "task-core-qt-demos"
|
PACKAGE_GROUP_qt4-pkgs = "task-core-qt-demos"
|
||||||
|
|
||||||
POKY_BASE_INSTALL = '\
|
CORE_IMAGE_BASE_INSTALL = '\
|
||||||
task-core-boot \
|
task-core-boot \
|
||||||
task-base-extended \
|
task-base-extended \
|
||||||
\
|
\
|
||||||
${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \
|
${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \
|
||||||
\
|
\
|
||||||
${POKY_EXTRA_INSTALL} \
|
${CORE_IMAGE_EXTRA_INSTALL} \
|
||||||
'
|
'
|
||||||
|
|
||||||
POKY_EXTRA_INSTALL ?= ""
|
CORE_IMAGE_EXTRA_INSTALL ?= ""
|
||||||
|
|
||||||
IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}"
|
IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}"
|
||||||
|
|
||||||
X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management"
|
X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management"
|
||||||
ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games apps-x11-pimlico package-management"
|
ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games apps-x11-pimlico package-management"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
DESCRIPTION = "A small image just capable of allowing a device to boot."
|
DESCRIPTION = "A small image just capable of allowing a device to boot."
|
||||||
|
|
||||||
IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${POKY_EXTRA_INSTALL}"
|
IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}"
|
||||||
|
|
||||||
IMAGE_LINGUAS = " "
|
IMAGE_LINGUAS = " "
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted"
|
IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted"
|
||||||
|
|
||||||
POKY_EXTRA_INSTALL = "\
|
CORE_IMAGE_EXTRA_INSTALL = "\
|
||||||
task-self-hosted \
|
task-self-hosted \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,6 @@ IMAGE_INSTALL = "\
|
|||||||
task-core-basic \
|
task-core-basic \
|
||||||
"
|
"
|
||||||
|
|
||||||
# ${POKY_BASE_INSTALL}
|
# ${CORE_IMAGE_BASE_INSTALL}
|
||||||
|
|
||||||
inherit core-image
|
inherit core-image
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ standalone SDK."
|
|||||||
IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh"
|
IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh"
|
||||||
|
|
||||||
IMAGE_INSTALL = "\
|
IMAGE_INSTALL = "\
|
||||||
${POKY_BASE_INSTALL} \
|
${CORE_IMAGE_BASE_INSTALL} \
|
||||||
task-core-basic \
|
task-core-basic \
|
||||||
task-core-lsb \
|
task-core-lsb \
|
||||||
"
|
"
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks"
|
|||||||
|
|
||||||
|
|
||||||
IMAGE_INSTALL = "\
|
IMAGE_INSTALL = "\
|
||||||
${POKY_BASE_INSTALL} \
|
${CORE_IMAGE_BASE_INSTALL} \
|
||||||
task-core-basic \
|
task-core-basic \
|
||||||
task-core-lsb \
|
task-core-lsb \
|
||||||
"
|
"
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ conform to Linux Standard Base (LSB)."
|
|||||||
IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
|
IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
|
||||||
|
|
||||||
IMAGE_INSTALL = "\
|
IMAGE_INSTALL = "\
|
||||||
${POKY_BASE_INSTALL} \
|
${CORE_IMAGE_BASE_INSTALL} \
|
||||||
task-core-basic \
|
task-core-basic \
|
||||||
task-core-lsb \
|
task-core-lsb \
|
||||||
"
|
"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
|
|||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
|
|
||||||
IMAGE_INSTALL = "\
|
IMAGE_INSTALL = "\
|
||||||
${POKY_BASE_INSTALL} \
|
${CORE_IMAGE_BASE_INSTALL} \
|
||||||
task-core-clutter-core \
|
task-core-clutter-core \
|
||||||
task-core-clutter-tests \
|
task-core-clutter-tests \
|
||||||
task-core-clutter-apps"
|
task-core-clutter-apps"
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ RDEPENDS_${PN} += " \
|
|||||||
inherit core-image
|
inherit core-image
|
||||||
|
|
||||||
IMAGE_INSTALL += "\
|
IMAGE_INSTALL += "\
|
||||||
${POKY_BASE_INSTALL} \
|
${CORE_IMAGE_BASE_INSTALL} \
|
||||||
task-core-basic \
|
task-core-basic \
|
||||||
module-init-tools \
|
module-init-tools \
|
||||||
task-core-gtk-directfb-base \
|
task-core-gtk-directfb-base \
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ RDEPENDS_${PN} += " \
|
|||||||
"
|
"
|
||||||
|
|
||||||
IMAGE_INSTALL += "\
|
IMAGE_INSTALL += "\
|
||||||
${POKY_BASE_INSTALL} \
|
${CORE_IMAGE_BASE_INSTALL} \
|
||||||
module-init-tools \
|
module-init-tools \
|
||||||
task-qt4e-base \
|
task-qt4e-base \
|
||||||
"
|
"
|
||||||
|
|||||||
Reference in New Issue
Block a user