* [PATCH V2 0/2] remaining ssh IMAGE_FEATURE fixings
@ 2012-07-03 4:43 Lianhao Lu
2012-07-03 4:43 ` [PATCH V2 1/2] task-core-tools-debug: Added openssh-sftp-server Lianhao Lu
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Lianhao Lu @ 2012-07-03 4:43 UTC (permalink / raw)
To: openembedded-core
V2:
Please ignore the previous wrong patch set.
These are the remaining patches to fix the bug [YOCTO #2605]
It adds the "openssh-sftp-server" into the task-core-debug-tools so any image built with image feature "tools-debug" allow the user to use sftp.
It processes conflicting IMAGE_FEATURES, i.e. ssh-server-dropbear and ssh-server-openssh.
The following changes since commit 64422f7c5da160050a5454817c8fa9d070104b34:
Richard Purdie (1):
package.bbclass: Add missing PKGR, PKGV, PKGE and ALTERNATIVE variables from PACKAGEVARS
are available in the git repository at:
git://git.pokylinux.org/poky-contrib llu/ssh
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=llu/ssh
Lianhao Lu (2):
task-core-tools-debug: Added openssh-sftp-server.
image/core-image: Handle conflicting IMAGE_FEATURES.
meta/classes/core-image.bbclass | 11 ++++++++++-
meta/classes/image.bbclass | 17 +++++++++++++++++
meta/recipes-core/tasks/task-core-tools-debug.bb | 3 +++
meta/recipes-sato/images/core-image-sato-sdk.bb | 2 ++
4 files changed, 32 insertions(+), 1 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH V2 1/2] task-core-tools-debug: Added openssh-sftp-server. 2012-07-03 4:43 [PATCH V2 0/2] remaining ssh IMAGE_FEATURE fixings Lianhao Lu @ 2012-07-03 4:43 ` Lianhao Lu 2012-07-03 4:43 ` [PATCH V2 2/2] image/core-image: Handle conflicting IMAGE_FEATURES Lianhao Lu 2012-07-03 17:29 ` [PATCH V2 0/2] remaining ssh IMAGE_FEATURE fixings Saul Wold 2 siblings, 0 replies; 4+ messages in thread From: Lianhao Lu @ 2012-07-03 4:43 UTC (permalink / raw) To: openembedded-core [YOCTO #2605]. Added openssh-sftp-server to the tools-debug IMAGE_FEATURE. Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> --- meta/recipes-core/tasks/task-core-tools-debug.bb | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/meta/recipes-core/tasks/task-core-tools-debug.bb b/meta/recipes-core/tasks/task-core-tools-debug.bb index 1dddbb8..b7eff21 100644 --- a/meta/recipes-core/tasks/task-core-tools-debug.bb +++ b/meta/recipes-core/tasks/task-core-tools-debug.bb @@ -13,6 +13,8 @@ PACKAGES = "\ ${PN}-dev \ " +PR = "r1" + PACKAGE_ARCH = "${MACHINE_ARCH}" ALLOW_EMPTY = "1" @@ -24,6 +26,7 @@ RDEPENDS_${PN} = "\ gdb \ gdbserver \ tcf-agent \ + openssh-sftp-server \ rsync \ strace \ ${MTRACE} \ -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH V2 2/2] image/core-image: Handle conflicting IMAGE_FEATURES. 2012-07-03 4:43 [PATCH V2 0/2] remaining ssh IMAGE_FEATURE fixings Lianhao Lu 2012-07-03 4:43 ` [PATCH V2 1/2] task-core-tools-debug: Added openssh-sftp-server Lianhao Lu @ 2012-07-03 4:43 ` Lianhao Lu 2012-07-03 17:29 ` [PATCH V2 0/2] remaining ssh IMAGE_FEATURE fixings Saul Wold 2 siblings, 0 replies; 4+ messages in thread From: Lianhao Lu @ 2012-07-03 4:43 UTC (permalink / raw) To: openembedded-core IMAGE_FEATURES such as 'ssh-server-dropbear' and 'ssh-server-openssh' can't be both enabled. User can use the following variables to define the relationship of image features: IMAGE_FEATURES_REPLACES_foo = "bar" means including image feature "foo" would replace the image feature "bar". IMAGE_FEATURES_CONFLICTS_foo = "bar" means including both image features "foo" and "bar" would cause an parsing error. Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> --- meta/classes/core-image.bbclass | 11 ++++++++++- meta/classes/image.bbclass | 17 +++++++++++++++++ meta/recipes-sato/images/core-image-sato-sdk.bb | 2 ++ 3 files changed, 29 insertions(+), 1 deletions(-) diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index 25f5c5a..6b207d7 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -47,6 +47,14 @@ PACKAGE_GROUP_ssh-server-openssh = "task-core-ssh-openssh" PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}" PACKAGE_GROUP_qt4-pkgs = "task-core-qt-demos" + +# IMAGE_FEAETURES_REPLACES_foo = 'bar1 bar2' +# Including image feature foo would replace the image features bar1 and bar2 +IMAGE_FEATURES_REPLACES_ssh-server-openssh = "ssh-server-dropbear" + +# IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2' +# An error exception would be raised if both image features foo and bar1(or bar2) are included + CORE_IMAGE_BASE_INSTALL = '\ task-core-boot \ task-base-extended \ @@ -60,7 +68,8 @@ IMAGE_INSTALL ?= "${CORE_IMAGE_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" +SSHSERVER_IMAGE_FEATURES ??= "ssh-server-dropbear" +SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ${SSHSERVER_IMAGE_FEATURES}" inherit image diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 7e4bb69..2da3d2e 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -89,6 +89,23 @@ python () { deps += " %s:do_populate_sysroot" % dep d.appendVarFlag('do_build', 'depends', deps) + #process IMAGE_FEATURES, we must do this before runtime_mapping_rename + #Check for replaces image features + features = set(oe.data.typed_value('IMAGE_FEATURES', d)) + remain_features = features.copy() + for feature in features: + replaces = set((d.getVar("IMAGE_FEATURES_REPLACES_%s" % feature, True) or "").split()) + remain_features -= replaces + + #Check for conflict image features + for feature in remain_features: + conflicts = set((d.getVar("IMAGE_FEATURES_CONFLICTS_%s" % feature, True) or "").split()) + temp = conflicts & remain_features + if temp: + bb.fatal("%s contains conflicting IMAGE_FEATURES %s %s" % (d.getVar('PN', True), feature, ' '.join(list(temp)))) + + d.setVar('IMAGE_FEATURES', ' '.join(list(remain_features))) + # If we don't do this we try and run the mapping hooks while parsing which is slow # bitbake should really provide something to let us know this... if d.getVar('BB_WORKERCONTEXT', True) is not None: diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb index eed1698..5bb9469 100644 --- a/meta/recipes-sato/images/core-image-sato-sdk.bb +++ b/meta/recipes-sato/images/core-image-sato-sdk.bb @@ -8,6 +8,8 @@ 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" +SSHSERVER_IMAGE_FEATURES = "ssh-server-openssh" + LICENSE = "MIT" inherit core-image -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH V2 0/2] remaining ssh IMAGE_FEATURE fixings 2012-07-03 4:43 [PATCH V2 0/2] remaining ssh IMAGE_FEATURE fixings Lianhao Lu 2012-07-03 4:43 ` [PATCH V2 1/2] task-core-tools-debug: Added openssh-sftp-server Lianhao Lu 2012-07-03 4:43 ` [PATCH V2 2/2] image/core-image: Handle conflicting IMAGE_FEATURES Lianhao Lu @ 2012-07-03 17:29 ` Saul Wold 2 siblings, 0 replies; 4+ messages in thread From: Saul Wold @ 2012-07-03 17:29 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On 07/02/2012 09:43 PM, Lianhao Lu wrote: > V2: > Please ignore the previous wrong patch set. > > These are the remaining patches to fix the bug [YOCTO #2605] > > It adds the "openssh-sftp-server" into the task-core-debug-tools so any image built with image feature "tools-debug" allow the user to use sftp. > > It processes conflicting IMAGE_FEATURES, i.e. ssh-server-dropbear and ssh-server-openssh. > > The following changes since commit 64422f7c5da160050a5454817c8fa9d070104b34: > Richard Purdie (1): > package.bbclass: Add missing PKGR, PKGV, PKGE and ALTERNATIVE variables from PACKAGEVARS > > are available in the git repository at: > > git://git.pokylinux.org/poky-contrib llu/ssh > http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=llu/ssh > > Lianhao Lu (2): > task-core-tools-debug: Added openssh-sftp-server. > image/core-image: Handle conflicting IMAGE_FEATURES. > > meta/classes/core-image.bbclass | 11 ++++++++++- > meta/classes/image.bbclass | 17 +++++++++++++++++ > meta/recipes-core/tasks/task-core-tools-debug.bb | 3 +++ > meta/recipes-sato/images/core-image-sato-sdk.bb | 2 ++ > 4 files changed, 32 insertions(+), 1 deletions(-) > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > > Merged into OE-Core Thanks Sau! ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-07-03 17:40 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-07-03 4:43 [PATCH V2 0/2] remaining ssh IMAGE_FEATURE fixings Lianhao Lu 2012-07-03 4:43 ` [PATCH V2 1/2] task-core-tools-debug: Added openssh-sftp-server Lianhao Lu 2012-07-03 4:43 ` [PATCH V2 2/2] image/core-image: Handle conflicting IMAGE_FEATURES Lianhao Lu 2012-07-03 17:29 ` [PATCH V2 0/2] remaining ssh IMAGE_FEATURE fixings Saul Wold
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.