* [PATCH 1/6] task-base, task-poky-basic, task-poky: Remove hard-coded references to dropbear
2011-03-11 0:59 [PATCH 0/6] Set ssh server using IMAGE_FEATURES Scott Garman
@ 2011-03-11 0:59 ` Scott Garman
2011-03-11 0:59 ` [PATCH 2/6] openssh: allow the openssh meta package to be empty Scott Garman
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Scott Garman @ 2011-03-11 0:59 UTC (permalink / raw)
To: poky
From: Scott Garman <scott.a.garman@intel.com>
This is the first step in refactoring the SSH server selection to
be done in IMAGE_FEATURES instead of as hardcoded in these tasks.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
meta/recipes-core/tasks/task-base.bb | 8 +-------
meta/recipes-extended/tasks/task-poky-basic.bb | 3 +--
meta/recipes-sato/tasks/task-poky.bb | 3 +--
3 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
index d613bb2..138e617 100644
--- a/meta/recipes-core/tasks/task-base.bb
+++ b/meta/recipes-core/tasks/task-base.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/p
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r69"
+PR = "r70"
inherit task
@@ -60,11 +60,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24", "linux-hotplug","",d)} "
#
-# dropbear, openssh or none
-#
-DISTRO_SSH_DAEMON ?= "dropbear"
-
-#
# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others
#
PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} "
@@ -81,7 +76,6 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
RDEPENDS_task-base = "\
task-distro-base \
task-machine-base \
- ${DISTRO_SSH_DAEMON} \
${HOTPLUG} \
\
${@base_contains('MACHINE_FEATURES', 'kernel26','task-base-kernel26','task-base-kernel24',d)} \
diff --git a/meta/recipes-extended/tasks/task-poky-basic.bb b/meta/recipes-extended/tasks/task-poky-basic.bb
index d7beafe..3d313f0 100644
--- a/meta/recipes-extended/tasks/task-poky-basic.bb
+++ b/meta/recipes-extended/tasks/task-poky-basic.bb
@@ -3,7 +3,7 @@
#
DESCRIPTION = "Create Basic Image Tasks"
-PR = "r2"
+PR = "r3"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -55,7 +55,6 @@ RDEPENDS_task-poky-basic = "\
RDEPENDS_task-poky-base-utils = "\
busybox \
- dropbear \
"
RDEPENDS_task-poky-basic-libs = "\
diff --git a/meta/recipes-sato/tasks/task-poky.bb b/meta/recipes-sato/tasks/task-poky.bb
index cfcbacb..72d4d0d 100644
--- a/meta/recipes-sato/tasks/task-poky.bb
+++ b/meta/recipes-sato/tasks/task-poky.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Tasks for OpenedHand Poky"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r33"
+PR = "r34"
PACKAGES = "\
task-poky-apps-console \
@@ -37,7 +37,6 @@ FILEMANAGER_mips ?= ""
RDEPENDS_task-poky-apps-console = "\
avahi-daemon \
- dropbear \
dbus \
portmap \
${SPLASH}"
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/6] openssh: allow the openssh meta package to be empty
2011-03-11 0:59 [PATCH 0/6] Set ssh server using IMAGE_FEATURES Scott Garman
2011-03-11 0:59 ` [PATCH 1/6] task-base, task-poky-basic, task-poky: Remove hard-coded references to dropbear Scott Garman
@ 2011-03-11 0:59 ` Scott Garman
2011-03-11 0:59 ` [PATCH 3/6] task-poky-ssh.bb: new task for ssh services Scott Garman
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Scott Garman @ 2011-03-11 0:59 UTC (permalink / raw)
To: poky
From: Scott Garman <scott.a.garman@intel.com>
This allows the openssh meta-package to be used in the
poky-ssh task. Otherwise there will be no package named
openssh to install during image creation.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
meta/recipes-connectivity/openssh/openssh_5.6p1.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-connectivity/openssh/openssh_5.6p1.bb b/meta/recipes-connectivity/openssh/openssh_5.6p1.bb
index be9ae09..d93a773 100644
--- a/meta/recipes-connectivity/openssh/openssh_5.6p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_5.6p1.bb
@@ -7,7 +7,7 @@ SECTION = "console/network"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENCE;md5=7ae09218173be1643c998a4b71027f9b"
-PR = "r0"
+PR = "r1"
DEPENDS = "zlib openssl"
DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
@@ -67,6 +67,8 @@ do_install_append () {
rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var
}
+ALLOW_EMPTY_${PN} = "1"
+
PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server"
FILES_${PN}-scp = "${bindir}/scp.${PN}"
FILES_${PN}-ssh = "${bindir}/ssh.${PN} ${sysconfdir}/ssh/ssh_config"
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/6] task-poky-ssh.bb: new task for ssh services
2011-03-11 0:59 [PATCH 0/6] Set ssh server using IMAGE_FEATURES Scott Garman
2011-03-11 0:59 ` [PATCH 1/6] task-base, task-poky-basic, task-poky: Remove hard-coded references to dropbear Scott Garman
2011-03-11 0:59 ` [PATCH 2/6] openssh: allow the openssh meta package to be empty Scott Garman
@ 2011-03-11 0:59 ` Scott Garman
2011-03-11 0:59 ` [PATCH 4/6] poky-image.bbclass: add ssh-server as an IMAGE_FEATURES option Scott Garman
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Scott Garman @ 2011-03-11 0:59 UTC (permalink / raw)
To: poky
From: Scott Garman <scott.a.garman@intel.com>
This task can then be used in image recipes to include a
configurable ssh server. Currently dropbear and openssh
are supported.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
meta/recipes-core/tasks/task-poky-ssh.bb | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-core/tasks/task-poky-ssh.bb
diff --git a/meta/recipes-core/tasks/task-poky-ssh.bb b/meta/recipes-core/tasks/task-poky-ssh.bb
new file mode 100644
index 0000000..37a0241
--- /dev/null
+++ b/meta/recipes-core/tasks/task-poky-ssh.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "SSH tasks for Poky"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+PR = "r0"
+
+PACKAGES = "\
+ task-poky-ssh-server \
+ task-poky-ssh-server-dbg \
+ task-poky-ssh-server-dev \
+ "
+
+ALLOW_EMPTY = "1"
+
+# Default to dropbear for historical reasons
+IMAGE_SSH_PROVIDER ?= "dropbear"
+
+RDEPENDS_task-poky-ssh-server = "${IMAGE_SSH_PROVIDER}"
+
+RDEPENDS_task-poky-ssh-server-dbg = "${IMAGE_SSH_PROVIDER}-dbg"
+
+RDEPENDS_task-poky-ssh-server-dev = "${IMAGE_SSH_PROVIDER}-dev"
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 4/6] poky-image.bbclass: add ssh-server as an IMAGE_FEATURES option
2011-03-11 0:59 [PATCH 0/6] Set ssh server using IMAGE_FEATURES Scott Garman
` (2 preceding siblings ...)
2011-03-11 0:59 ` [PATCH 3/6] task-poky-ssh.bb: new task for ssh services Scott Garman
@ 2011-03-11 0:59 ` Scott Garman
2011-03-11 0:59 ` [PATCH 5/6] poky-image-sato.bb: add ssh-server to IMAGE_FEATURES Scott Garman
2011-03-11 0:59 ` [PATCH 6/6] poky-image-lsb: " Scott Garman
5 siblings, 0 replies; 7+ messages in thread
From: Scott Garman @ 2011-03-11 0:59 UTC (permalink / raw)
To: poky
From: Scott Garman <scott.a.garman@intel.com>
Images which want to include an ssh server can then add
ssh-server to their IMAGE_FEATURES.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
meta/classes/poky-image.bbclass | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/meta/classes/poky-image.bbclass b/meta/classes/poky-image.bbclass
index 225584b..896ef94 100644
--- a/meta/classes/poky-image.bbclass
+++ b/meta/classes/poky-image.bbclass
@@ -24,6 +24,7 @@ LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
# - tools-profile - profiling tools
# - tools-testapps - tools usable to make some device tests
# - nfs-server - NFS server (exports / over NFS to everybody)
+# - ssh-server - SSH server (dropbear vs. openssh)
# - dev-pkgs - development packages
# - dbg-pkgs - debug packages
#
@@ -79,9 +80,12 @@ POKY_BASE_INSTALL = '\
\
${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \
${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-poky-nfs-server-dbg", "",d)} \
- \
${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-poky-nfs-server-dev", "",d)} \
\
+ ${@base_contains("IMAGE_FEATURES", "ssh-server", "task-poky-ssh-server", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", ["ssh-server", "dbg-pkgs"], "task-poky-ssh-server-dbg", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", ["ssh-server", "dev-pkgs"], "task-poky-ssh-server-dev", "",d)} \
+ \
${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \
${@base_contains("IMAGE_FEATURES", "qt4-pkgs", "task-poky-qt-demos", "",d)} \
${POKY_EXTRA_INSTALL} \
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 5/6] poky-image-sato.bb: add ssh-server to IMAGE_FEATURES
2011-03-11 0:59 [PATCH 0/6] Set ssh server using IMAGE_FEATURES Scott Garman
` (3 preceding siblings ...)
2011-03-11 0:59 ` [PATCH 4/6] poky-image.bbclass: add ssh-server as an IMAGE_FEATURES option Scott Garman
@ 2011-03-11 0:59 ` Scott Garman
2011-03-11 0:59 ` [PATCH 6/6] poky-image-lsb: " Scott Garman
5 siblings, 0 replies; 7+ messages in thread
From: Scott Garman @ 2011-03-11 0:59 UTC (permalink / raw)
To: poky
From: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
meta/recipes-sato/images/poky-image-sato-dev.bb | 2 +-
meta/recipes-sato/images/poky-image-sato-sdk.bb | 2 +-
meta/recipes-sato/images/poky-image-sato.bb | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-sato/images/poky-image-sato-dev.bb b/meta/recipes-sato/images/poky-image-sato-dev.bb
index 429095e..71d44e2 100644
--- a/meta/recipes-sato/images/poky-image-sato-dev.bb
+++ b/meta/recipes-sato/images/poky-image-sato-dev.bb
@@ -2,7 +2,7 @@
# Copyright (C) 2007 OpenedHand Ltd.
#
-IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs"
+IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs ssh-server"
LICENSE = "MIT"
diff --git a/meta/recipes-sato/images/poky-image-sato-sdk.bb b/meta/recipes-sato/images/poky-image-sato-sdk.bb
index 9f8eef9..7ee2f95 100644
--- a/meta/recipes-sato/images/poky-image-sato-sdk.bb
+++ b/meta/recipes-sato/images/poky-image-sato-sdk.bb
@@ -2,7 +2,7 @@
# Copyright (C) 2007 OpenedHand Ltd.
#
-IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug tools-profile tools-sdk dev-pkgs qt4-pkgs"
+IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug tools-profile tools-sdk dev-pkgs qt4-pkgs ssh-server"
LICENSE = "MIT"
diff --git a/meta/recipes-sato/images/poky-image-sato.bb b/meta/recipes-sato/images/poky-image-sato.bb
index 35d1a53..31f74b1 100644
--- a/meta/recipes-sato/images/poky-image-sato.bb
+++ b/meta/recipes-sato/images/poky-image-sato.bb
@@ -2,7 +2,7 @@
# Copyright (C) 2007 OpenedHand Ltd.
#
-IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
+IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} ssh-server"
LICENSE = "MIT"
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 6/6] poky-image-lsb: add ssh-server to IMAGE_FEATURES
2011-03-11 0:59 [PATCH 0/6] Set ssh server using IMAGE_FEATURES Scott Garman
` (4 preceding siblings ...)
2011-03-11 0:59 ` [PATCH 5/6] poky-image-sato.bb: add ssh-server to IMAGE_FEATURES Scott Garman
@ 2011-03-11 0:59 ` Scott Garman
5 siblings, 0 replies; 7+ messages in thread
From: Scott Garman @ 2011-03-11 0:59 UTC (permalink / raw)
To: poky
From: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
meta/recipes-extended/images/poky-image-lsb-dev.bb | 2 +-
meta/recipes-extended/images/poky-image-lsb-sdk.bb | 2 +-
meta/recipes-extended/images/poky-image-lsb.bb | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/images/poky-image-lsb-dev.bb b/meta/recipes-extended/images/poky-image-lsb-dev.bb
index d490ee5..35b80a3 100644
--- a/meta/recipes-extended/images/poky-image-lsb-dev.bb
+++ b/meta/recipes-extended/images/poky-image-lsb-dev.bb
@@ -1,4 +1,4 @@
-IMAGE_FEATURES += "apps-console-core dev-pkgs "
+IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server"
IMAGE_INSTALL = "\
${POKY_BASE_INSTALL} \
diff --git a/meta/recipes-extended/images/poky-image-lsb-sdk.bb b/meta/recipes-extended/images/poky-image-lsb-sdk.bb
index 184b5d7..0b1e1e9 100644
--- a/meta/recipes-extended/images/poky-image-lsb-sdk.bb
+++ b/meta/recipes-extended/images/poky-image-lsb-sdk.bb
@@ -1,4 +1,4 @@
-IMAGE_FEATURES += "apps-console-core tools-debug tools-profile tools-sdk dev-pkgs"
+IMAGE_FEATURES += "apps-console-core tools-debug tools-profile tools-sdk dev-pkgs ssh-server"
IMAGE_INSTALL = "\
${POKY_BASE_INSTALL} \
diff --git a/meta/recipes-extended/images/poky-image-lsb.bb b/meta/recipes-extended/images/poky-image-lsb.bb
index 8424d91..096fed4 100644
--- a/meta/recipes-extended/images/poky-image-lsb.bb
+++ b/meta/recipes-extended/images/poky-image-lsb.bb
@@ -1,4 +1,4 @@
-IMAGE_FEATURES += "apps-console-core "
+IMAGE_FEATURES += "apps-console-core ssh-server"
IMAGE_INSTALL = "\
${POKY_BASE_INSTALL} \
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread