| Submitter | Robert P. J. Day |
|---|---|
| Date | July 9, 2012, 5:12 p.m. |
| Message ID | <alpine.DEB.2.02.1207091310550.23920@oneiric> |
| Download | mbox | patch |
| Permalink | /patch/31569/ |
| State | New |
| Headers | show |
Comments
On 07/09/2012 10:12 AM, Robert P. J. Day wrote: > > Replace the usage of EXTRA_IMAGE_FEATURES in a small number of .bb > files with IMAGE_FEATURES, and leave the use of EXTRA_IMAGE_FEATURES > for developers in their local.conf files, to avoid the possibility of > undesirable side effects. > > Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> > > --- > > i *think* this should do it ... > > diff --git a/meta/recipes-extended/images/core-image-lsb-sdk.bb b/meta/recipes-extended/images/core-image-lsb-sdk.bb > index 047d66b..7601410 100644 > --- a/meta/recipes-extended/images/core-image-lsb-sdk.bb > +++ b/meta/recipes-extended/images/core-image-lsb-sdk.bb > @@ -2,8 +2,8 @@ DESCRIPTION = "Basic image without X support suitable for Linux Standard Base \ > (LSB) implementations. It includes the full meta-toolchain, plus development \ > headers and libraries to form a standalone SDK." > > -IMAGE_FEATURES += "apps-console-core tools-sdk dev-pkgs ssh-server-openssh" > -EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks" > +IMAGE_FEATURES += "apps-console-core tools-sdk dev-pkgs ssh-server-openssh \ > + tools-debug tools-profile tools-testapps debug-tweaks" > > > IMAGE_INSTALL = "\ > diff --git a/meta/recipes-rt/images/core-image-rt-sdk.bb b/meta/recipes-rt/images/core-image-rt-sdk.bb > index 29512e3..e89b574 100644 > --- a/meta/recipes-rt/images/core-image-rt-sdk.bb > +++ b/meta/recipes-rt/images/core-image-rt-sdk.bb > @@ -8,8 +8,7 @@ tools for real-time use. It includes the full meta-toolchain, development \ > headers and libraries to form a standalone SDK." > DEPENDS = "linux-yocto-rt" > > -IMAGE_FEATURES += "dev-pkgs tools-sdk" > -EXTRA_IMAGE_FEATURES += "tools-debug tools-profile tools-testapps debug-tweaks" > +IMAGE_FEATURES += "dev-pkgs tools-sdk tools-debug tools-profile tools-testapps debug-tweaks" > > IMAGE_INSTALL += "rt-tests kernel-dev" > > diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb > index 39742ef..733ef7f 100644 > --- a/meta/recipes-sato/images/core-image-sato-sdk.bb > +++ b/meta/recipes-sato/images/core-image-sato-sdk.bb > @@ -5,8 +5,8 @@ DESCRIPTION = "Image with Sato support that includes everything within \ > core-image-sato plus meta-toolchain, development headers and libraries to \ > form a standalone SDK." > > -IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs tools-sdk qt4-pkgs" > -EXTRA_IMAGE_FEATURES += "tools-debug tools-profile tools-testapps debug-tweaks" > +IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs tools-sdk qt4-pkgs \ > + tools-debug tools-profile tools-testapps debug-tweaks" > > SSHSERVER_IMAGE_FEATURES = "ssh-server-openssh" > > Merged into OE-Core Thanks Sau!
Patch
diff --git a/meta/recipes-extended/images/core-image-lsb-sdk.bb b/meta/recipes-extended/images/core-image-lsb-sdk.bb index 047d66b..7601410 100644 --- a/meta/recipes-extended/images/core-image-lsb-sdk.bb +++ b/meta/recipes-extended/images/core-image-lsb-sdk.bb @@ -2,8 +2,8 @@ DESCRIPTION = "Basic image without X support suitable for Linux Standard Base \ (LSB) implementations. It includes the full meta-toolchain, plus development \ headers and libraries to form a standalone SDK." -IMAGE_FEATURES += "apps-console-core tools-sdk dev-pkgs ssh-server-openssh" -EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks" +IMAGE_FEATURES += "apps-console-core tools-sdk dev-pkgs ssh-server-openssh \ + tools-debug tools-profile tools-testapps debug-tweaks" IMAGE_INSTALL = "\ diff --git a/meta/recipes-rt/images/core-image-rt-sdk.bb b/meta/recipes-rt/images/core-image-rt-sdk.bb index 29512e3..e89b574 100644 --- a/meta/recipes-rt/images/core-image-rt-sdk.bb +++ b/meta/recipes-rt/images/core-image-rt-sdk.bb @@ -8,8 +8,7 @@ tools for real-time use. It includes the full meta-toolchain, development \ headers and libraries to form a standalone SDK." DEPENDS = "linux-yocto-rt" -IMAGE_FEATURES += "dev-pkgs tools-sdk" -EXTRA_IMAGE_FEATURES += "tools-debug tools-profile tools-testapps debug-tweaks" +IMAGE_FEATURES += "dev-pkgs tools-sdk tools-debug tools-profile tools-testapps debug-tweaks" IMAGE_INSTALL += "rt-tests kernel-dev" diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb index 39742ef..733ef7f 100644 --- a/meta/recipes-sato/images/core-image-sato-sdk.bb +++ b/meta/recipes-sato/images/core-image-sato-sdk.bb @@ -5,8 +5,8 @@ DESCRIPTION = "Image with Sato support that includes everything within \ core-image-sato plus meta-toolchain, development headers and libraries to \ form a standalone SDK." -IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs tools-sdk qt4-pkgs" -EXTRA_IMAGE_FEATURES += "tools-debug tools-profile tools-testapps debug-tweaks" +IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs tools-sdk qt4-pkgs \ + tools-debug tools-profile tools-testapps debug-tweaks" SSHSERVER_IMAGE_FEATURES = "ssh-server-openssh"
Replace the usage of EXTRA_IMAGE_FEATURES in a small number of .bb files with IMAGE_FEATURES, and leave the use of EXTRA_IMAGE_FEATURES for developers in their local.conf files, to avoid the possibility of undesirable side effects. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> --- i *think* this should do it ...