Skip to contentSkip to conversation

Consolidated Pull Request

PATCH In review Saul Wold 2 participants 14 messages Mar 11, 2011

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

cover Consolidated Pull Request

From: Saul Wold <[email protected]>

Richard,

This contains the openssh/drop IMAGE_FEATURE Code, along changes for RPM rootfs generation and a Kernel Update

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: distro/oe-core
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=distro/oe-core

Thanks,
Saul Wold <[email protected]>
---

Bruce Ashfield (1):
linux-yocto: update to 2.6.37.3

Mark Hatle (3):
package.bbclass: Change the debug directory to avoid conflicts
package_rpm: Fix rootfs generation
gcc-runtime: Fix dbg files

Paul Eggleton (1):
gst-plugins-good: remove dependency on hal

Scott Garman (7):
task-base, task-poky-basic, task-poky: Remove hard-coded references
to dropbear
openssh: allow the openssh meta package to be empty task-poky-ssh.bb: new task for ssh services poky-image.bbclass: add ssh-server as an IMAGE_FEATURES option poky-image.bbclass: add ssh-server to SATO_IMAGE_FEATURES
poky-image-lsb: add ssh-server to IMAGE_FEATURES
poky-image-basic: add ssh-server to IMAGE_FEATURES

 meta/classes/package.bbclass                       |   10 ++++++-
 meta/classes/package_rpm.bbclass                   |    8 +++++-
 meta/classes/poky-image.bbclass                    |    8 +++++-
 .../conf/distro/include/poky-default-revisions.inc |   24 ++++++++++----------
 meta/recipes-connectivity/openssh/openssh_5.6p1.bb |    4 ++-
 meta/recipes-core/tasks/task-base.bb               |    8 +-----
 meta/recipes-core/tasks/task-poky-ssh.bb           |   22 ++++++++++++++++++
 meta/recipes-devtools/gcc/gcc-package-runtime.inc  |    5 ++++
 meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb     |    2 +-
 meta/recipes-extended/images/poky-image-basic.bb   |    4 ++-
 meta/recipes-extended/images/poky-image-lsb-dev.bb |    4 ++-
 meta/recipes-extended/images/poky-image-lsb-sdk.bb |    4 ++-
 meta/recipes-extended/images/poky-image-lsb.bb     |    4 ++-
 meta/recipes-extended/tasks/task-poky-basic.bb     |    4 +--
 .../gstreamer/gst-plugins-good_0.10.26.bb          |    4 +-
 meta/recipes-multimedia/gstreamer/gst-plugins.inc  |    2 +-
 meta/recipes-sato/tasks/task-poky.bb               |    3 +-
 17 files changed, 82 insertions(+), 38 deletions(-)
 create mode 100644 meta/recipes-core/tasks/task-poky-ssh.bb
author
#1 lore raw

PATCH 1/12 gst-plugins-good: remove dependency on hal

From: Paul Eggleton <[email protected]>

Quoted 7 lines · On Tuesday 08 March 2011 18:55:44 Richard Purdie wrote:
Quoted 4 lines

Saul Wold (3):
gst-plugins: Added hal to DEPENDS
attr: Added ncurses to depends
lsb-live image: add lsb-live and lsb-sdk-live image types

Merged. I'd like to drop the hal dependency if someone can send me a patch which disables it and everything works.

Patch attached to do this (against oe-core) .

Cheers,
Paul

From d6f52ebf89e8413f8e24bbc9ab58a0d0e5c45c09 Mon Sep 17 00:00:00 2001
From: Paul Eggleton <[email protected]>
Date: Wed, 9 Mar 2011 01:21:25 +0000
Subject: [PATCH] gst-plugins-good: remove dependency on hal

Disable hal usage at configure time to avoid dependency on hal (which is deprecated). Only affects "halelements" which is of no use without hal.

Fixes [YOCTO #810] and reverts changes from c6b0c5720fa.

Signed-off-by Paul Eggleton <[email protected]>
Signed-off-by Saul Wold <[email protected]>
---
 .../gstreamer/gst-plugins-good_0.10.26.bb          |    4 ++--
 meta/recipes-multimedia/gstreamer/gst-plugins.inc  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.26.bb +2 -2
index 78b24fe..ac47ecf 100644
@@ -7,11 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
 
 DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \
 	    speex"
-PR = "r0"
+PR = "r1"
 
 inherit gettext
 
-EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --without-check"
+EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal --without-check"
 
 do_configure_prepend() {
 	# This m4 file contains nastiness which conflicts with libtool 2.2.2
meta/recipes-multimedia/gstreamer/gst-plugins.inc +1 -1
index d1abd36..4edca95 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "http://gstreamer.freedesktop.org/"
 BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer"
 SECTION = "multimedia"
 PRIORITY = "optional"
-DEPENDS = "gstreamer hal"
+DEPENDS = "gstreamer"
 
 inherit autotools pkgconfig
Signature · 1 line
1.7.1.1
author
#2 lore raw

PATCH 2/12 linux-yocto: update to 2.6.37.3

In reply to Saul Wold

From: Bruce Ashfield <[email protected]>

The 2.6.37.3 -stable update is available and can safely be merged into the linux-yocto BSPs. This updated the SRCREVs of the BSP branches to their new values.

Signed-off-by Bruce Ashfield <[email protected]>
---
 .../conf/distro/include/poky-default-revisions.inc |   24 ++++++++++----------
 1 files changed, 12 insertions(+), 12 deletions(-)
meta/conf/distro/include/poky-default-revisions.inc +12 -12
index aee1749..c08545c 100644
@@ -98,19 +98,19 @@ SRCREV_machine_pn-linux-yocto-stable_beagleboard ?= "ef7f944e773950d4016b7643f9e
 SRCREV_machine_pn-linux-yocto-stable ?= "72ca49ab08b8eb475cec82a10049503602325791"
 SRCREV_meta_pn-linux-yocto-stable ?= "e1f85a470934a0cf6abde5d95533e74501822c6b"
 # development SRCREVs
-SRCREV_machine_pn-linux-yocto_qemuarm ?= "dd15f43fe3d4820ce112501c1a790c9bc12cfd0b"
-SRCREV_machine_pn-linux-yocto_qemumips ?= "76f30ca447fd0f06e76d0cb4935b016a1440e23e"
-SRCREV_machine_pn-linux-yocto_qemuppc ?= "b318cc6df4a439dc2b547f8eb841ff1ede69419b"
-SRCREV_machine_pn-linux-yocto_qemux86 ?= "37e8651b5df243aca2388867212c06338159df4e"
-SRCREV_machine_pn-linux-yocto_qemux86-64 ?= "2b412826bbeb4a16abe2ea74f2456ab880c6e3c1"
-SRCREV_machine_pn-linux-yocto_emenlow ?= "db6fc8c0d3d7f3e474e6c6b95138123911311942"
-SRCREV_machine_pn-linux-yocto_atom-pc ?= "2b412826bbeb4a16abe2ea74f2456ab880c6e3c1"
-SRCREV_machine_pn-linux-yocto_routerstationpro ?= "17dedeb17887eb398743b04615302b61bd95ffdd"
-SRCREV_machine_pn-linux-yocto_mpc8315e-rdb ?= "6117f19403ccd5c288ce553def432925296a28b7"
-SRCREV_machine_pn-linux-yocto_beagleboard ?= "2b412826bbeb4a16abe2ea74f2456ab880c6e3c1"
-SRCREV_machine_pn-linux-yocto ?= "2b412826bbeb4a16abe2ea74f2456ab880c6e3c1"
+SRCREV_machine_pn-linux-yocto_qemuarm ?= "233213a1e09eae3de7047ff406b156608788ec17"
+SRCREV_machine_pn-linux-yocto_qemumips ?= "54bb956f70349923af29f28a4f9471f5658e1787"
+SRCREV_machine_pn-linux-yocto_qemuppc ?= "6f21e2e83dc93e108183256f3efebb63a6a11b6d"
+SRCREV_machine_pn-linux-yocto_qemux86 ?= "c75cbd202d8abb0b5f316f934f5d33c17ff6d3c3"
+SRCREV_machine_pn-linux-yocto_qemux86-64 ?= "2b2ef940457f0bb40e0fb76937c921c2962364ca"
+SRCREV_machine_pn-linux-yocto_emenlow ?= "f296e59556bdd738eaea8e34606f068dddb8610f"
+SRCREV_machine_pn-linux-yocto_atom-pc ?= "2b2ef940457f0bb40e0fb76937c921c2962364ca"
+SRCREV_machine_pn-linux-yocto_routerstationpro ?= "530ca3030e15a5d829e804a58e4e449db82f9b4a"
+SRCREV_machine_pn-linux-yocto_mpc8315e-rdb ?= "e14870b99caa29b6e9d98a3e7d5337b0c63cc264"
+SRCREV_machine_pn-linux-yocto_beagleboard ?= "2b2ef940457f0bb40e0fb76937c921c2962364ca"
+SRCREV_machine_pn-linux-yocto ?= "2b2ef940457f0bb40e0fb76937c921c2962364ca"
 SRCREV_meta_pn-linux-yocto ?= "212cae404e57ff9dc58c808035770d51325c3512"
-SRCREV_pn-linux-libc-headers-yocto ??= "2b412826bbeb4a16abe2ea74f2456ab880c6e3c1"
+SRCREV_pn-linux-libc-headers-yocto ??= "2b2ef940457f0bb40e0fb76937c921c2962364ca"
 SRCREV_pn-matchbox-config-gtk ??= "3ed74dfb7c57be088a5ab36e446c0ccde9fa1028"
 SRCREV_pn-matchbox-desktop-sato ??= "76"
 SRCREV_pn-matchbox-desktop ??= "af7ed6775487380be73160aa0298bf6019765fad"
Signature · 1 line
1.7.1.1
author
#3 lore raw

PATCH 3/12 package.bbclass: Change the debug directory to avoid conflicts

In reply to Saul Wold

From: Mark Hatle <[email protected]>

The debug directory before was below ${WORKDIR}. Unfortunately if something was based on a git tree, it meant that "git" was the directory name being preserved for usr/src/debug usage. The patch moves to using "${WORKDIR}/.." as the base, to ensure that the WORKDIR naming is used in usr/src/debug.

Signed-off-by Mark Hatle <[email protected]>
---
 meta/classes/package.bbclass |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
meta/classes/package.bbclass +8 -2
index 137de09..a7a5894 100644
@@ -180,6 +180,7 @@ def splitfile(file, debugfile, debugsrcdir, d):
     objcopy = bb.data.getVar("OBJCOPY", d, True)
     debugedit = bb.data.expand("${STAGING_LIBDIR_NATIVE}/rpm/bin/debugedit", d)
     workdir = bb.data.expand("${WORKDIR}", d)
+    workparentdir = os.path.dirname(workdir)
     sourcefile = bb.data.expand("${WORKDIR}/debugsources.list", d)
 
     # We ignore kernel modules, we don't generate debug info files.

@@ -194,7 +195,7 @@ def splitfile(file, debugfile, debugsrcdir, d):
 
     # We need to extract the debug src information here...
     if debugsrcdir:
-	os.system("%s'%s' -b '%s' -d '%s' -i -l '%s' '%s'" % (pathprefix, debugedit, workdir, debugsrcdir, sourcefile, file))
+	os.system("%s'%s' -b '%s' -d '%s' -i -l '%s' '%s'" % (pathprefix, debugedit, workparentdir, debugsrcdir, sourcefile, file))
 
     bb.mkdirhier(os.path.dirname(debugfile))
 

@@ -222,15 +223,20 @@ def splitfile2(debugsrcdir, d):
     objcopy = bb.data.getVar("OBJCOPY", d, True)
     debugedit = bb.data.expand("${STAGING_LIBDIR_NATIVE}/rpm/bin/debugedit", d)
     workdir = bb.data.expand("${WORKDIR}", d)
+    workparentdir = os.path.dirname(workdir)
+    workbasedir = os.path.basename(workdir)
     sourcefile = bb.data.expand("${WORKDIR}/debugsources.list", d)
 
     if debugsrcdir:
        bb.mkdirhier("%s%s" % (dvar, debugsrcdir))
 
        processdebugsrc =  "LC_ALL=C ; sort -z -u '%s' | egrep -v -z '(<internal>|<built-in>)$' | "
+       # We need to ignore files that are not actually ours
+       # we do this by only paying attention to items from this package
+       processdebugsrc += "egrep -z '%s' | "
        processdebugsrc += "(cd '%s' ; cpio -pd0mL '%s%s' 2>/dev/null)"
 
-       os.system(processdebugsrc % (sourcefile, workdir, dvar, debugsrcdir))
+       os.system(processdebugsrc % (sourcefile, workbasedir, workparentdir, dvar, debugsrcdir))
 
        # The copy by cpio may have resulted in some empty directories!  Remove these
        for root, dirs, files in os.walk("%s%s" % (dvar, debugsrcdir)):
Signature · 1 line
1.7.1.1
author
#4 lore raw

PATCH 4/12 package_rpm: Fix rootfs generation

In reply to Saul Wold

From: Mark Hatle <[email protected]>

[YOCTO #797]

During rootfs generation, if other RPM packages are being wrtten this could cause a failure during the solvedb generation. We add a shared lock around the RPM package building. This will allow multiple RPM packages to continue to be written at the same time, but prevent rootfs generation and RPM package generation at the same time.

Signed-off-by Mark Hatle <[email protected]>
---
 meta/classes/package_rpm.bbclass |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
meta/classes/package_rpm.bbclass +7 -1
index 60127d2..4647116 100644
@@ -777,10 +777,16 @@ python do_package_rpm () {
 	cmd = cmd + " --define 'debug_package %{nil}'"
 	cmd = cmd + " -bb " + outspecfile
 
-	# Build the spec file!
+	# Take a shared lock, we can write multiple packages at the same time...
+	# but we need to stop the rootfs/solver from running while we do...
+	lf = bb.utils.lockfile(bb.data.expand("${DEPLOY_DIR_RPM}/rpm.lock", d), True)
+
+	# Build the rpm package!
 	bb.data.setVar('BUILDSPEC', cmd + "\n", d)
 	bb.data.setVarFlag('BUILDSPEC', 'func', '1', d)
 	bb.build.exec_func('BUILDSPEC', d)
+
+	bb.utils.unlockfile(lf)
 }
 
 python () {
Signature · 1 line
1.7.1.1
author
#5 lore raw

PATCH 5/12 gcc-runtime: Fix dbg files

In reply to Saul Wold

From: Mark Hatle <[email protected]>

In order to debug certain C++ items, you need the helper python components. These components should live in the -dbg package, ensure they are added to the recipe.

Signed-off-by Mark Hatle <[email protected]>
---
 meta/recipes-devtools/gcc/gcc-package-runtime.inc |    5 +++++
 meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb    |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)
meta/recipes-devtools/gcc/gcc-package-runtime.inc +5 -0
index 04c70c0..51483f9 100644
@@ -15,6 +15,11 @@ PACKAGES = "\
 # The base package doesn't exist, so we clear the recommends.
 RRECOMMENDS_${PN}-dbg = ""
 
+# include python debugging scripts
+FILES_${PN}-dbg += "\
+  ${libdir}/libstdc++.so.*-gdb.py \
+  ${datadir}/gcc-${PV}/python/libstdcxx"
+
 FILES_libg2c = "${target_libdir}/libg2c.so.*"
 FILES_libg2c-dev = "\
   ${libdir}/libg2c.so \
meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb +1 -1
index c1e680d..9eb658b 100644
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r4"
 
 require gcc-${PV}.inc
 require gcc-configure-runtime.inc
Signature · 1 line
1.7.1.1
author
#6 lore raw

PATCH 6/12 task-base, task-poky-basic, task-poky: Remove hard-coded references to dropbear

In reply to Saul Wold

From: Scott Garman <[email protected]>

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 <[email protected]>
---
 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(-)
meta/recipes-core/tasks/task-base.bb +1 -7
index d613bb2..138e617 100644
@@ -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)} \
meta/recipes-extended/tasks/task-poky-basic.bb +1 -2
index d7beafe..3d313f0 100644
@@ -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 = "\
meta/recipes-sato/tasks/task-poky.bb +1 -2
index cfcbacb..72d4d0d 100644
@@ -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}"
Signature · 1 line
1.7.1.1
author
#7 lore raw

PATCH 7/12 openssh: allow the openssh meta package to be empty

In reply to Saul Wold

From: Scott Garman <[email protected]>

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 <[email protected]>
---
 meta/recipes-connectivity/openssh/openssh_5.6p1.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
meta/recipes-connectivity/openssh/openssh_5.6p1.bb +3 -1
index be9ae09..d93a773 100644
@@ -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"
Signature · 1 line
1.7.1.1
author
#8 lore raw

PATCH 8/12 task-poky-ssh.bb: new task for ssh services

In reply to Saul Wold

From: Scott Garman <[email protected]>

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 <[email protected]>
---
 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
meta/recipes-core/tasks/task-poky-ssh.bb new file +22 -0
new file mode 100644
index 0000000..37a0241
@@ -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"
Signature · 1 line
1.7.1.1
author
#9 lore raw

PATCH 9/12 poky-image.bbclass: add ssh-server as an IMAGE_FEATURES option

In reply to Saul Wold

From: Scott Garman <[email protected]>

Images which want to include an ssh server can then add ssh-server to their IMAGE_FEATURES.

Signed-off-by Scott Garman <[email protected]>
---
 meta/classes/poky-image.bbclass |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
meta/classes/poky-image.bbclass +5 -1
index 225584b..896ef94 100644
@@ -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} \
Signature · 1 line
1.7.1.1
author
#10 lore raw

PATCH 10/12 poky-image.bbclass: add ssh-server to SATO_IMAGE_FEATURES

In reply to Saul Wold

From: Scott Garman <[email protected]>

Signed-off-by Scott Garman <[email protected]>
---
 meta/classes/poky-image.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/classes/poky-image.bbclass +1 -1
index 896ef94..3b49c75 100644
@@ -97,7 +97,7 @@ 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"
+SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ssh-server"
 
 inherit image
Signature · 1 line
1.7.1.1
author
#11 lore raw

PATCH 11/12 poky-image-lsb: add ssh-server to IMAGE_FEATURES

In reply to Saul Wold

From: Scott Garman <[email protected]>

And set the default IMAGE_SSH_PROVIDER to openssh.

Signed-off-by Scott Garman <[email protected]>
---
 meta/recipes-extended/images/poky-image-lsb-dev.bb |    4 +++-
 meta/recipes-extended/images/poky-image-lsb-sdk.bb |    4 +++-
 meta/recipes-extended/images/poky-image-lsb.bb     |    4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)
meta/recipes-extended/images/poky-image-lsb-dev.bb +3 -1
index d490ee5..0c73ff3 100644
@@ -1,4 +1,6 @@
-IMAGE_FEATURES += "apps-console-core dev-pkgs "
+IMAGE_SSH_PROVIDER = "openssh"
+
+IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server"
 
 IMAGE_INSTALL = "\
     ${POKY_BASE_INSTALL} \
meta/recipes-extended/images/poky-image-lsb-sdk.bb +3 -1
index 184b5d7..e4634b6 100644
@@ -1,4 +1,6 @@
-IMAGE_FEATURES += "apps-console-core tools-debug tools-profile tools-sdk dev-pkgs"
+IMAGE_SSH_PROVIDER = "openssh"
+
+IMAGE_FEATURES += "apps-console-core tools-debug tools-profile tools-sdk dev-pkgs ssh-server"
 
 IMAGE_INSTALL = "\
     ${POKY_BASE_INSTALL} \
meta/recipes-extended/images/poky-image-lsb.bb +3 -1
index 8424d91..4504bb7 100644
@@ -1,4 +1,6 @@
-IMAGE_FEATURES += "apps-console-core "
+IMAGE_SSH_PROVIDER = "openssh"
+
+IMAGE_FEATURES += "apps-console-core ssh-server"
 
 IMAGE_INSTALL = "\
     ${POKY_BASE_INSTALL} \
Signature · 1 line
1.7.1.1
author
#12 lore raw

PATCH 12/12 poky-image-basic: add ssh-server to IMAGE_FEATURES

In reply to Saul Wold

From: Scott Garman <[email protected]>

And set the default IMAGE_SSH_PROVIDER to openssh.

Signed-off-by Scott Garman <[email protected]>
---
 meta/recipes-extended/images/poky-image-basic.bb |    4 +++-
 meta/recipes-extended/tasks/task-poky-basic.bb   |    1 -
 2 files changed, 3 insertions(+), 2 deletions(-)
meta/recipes-extended/images/poky-image-basic.bb +3 -1
index 537a6e4..cf9dd77 100644
@@ -1,4 +1,6 @@
-IMAGE_FEATURES += "apps-console-core "
+IMAGE_SSH_PROVIDER = "openssh"
+
+IMAGE_FEATURES += "apps-console-core ssh-server"
 
 IMAGE_INSTALL = "\
     ${POKY_BASE_INSTALL} \
meta/recipes-extended/tasks/task-poky-basic.bb +0 -1
index 3d313f0..0133bad 100644
@@ -99,7 +99,6 @@ RDEPENDS_task-poky-basic-extended = "\
     module-init-tools \
     openssl \
     "
-#    openssh
 
 RDEPENDS_task-poky-dev-utils = "\
     byacc \
Signature · 1 line
1.7.1.1
#13 lore raw
In reply to Saul Wold
Quoted 19 lines · Saul Wold

This contains the openssh/drop IMAGE_FEATURE Code, along changes for RPM rootfs generation and a Kernel Update

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: distro/oe-core
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=distro/oe-core

Bruce Ashfield (1):
linux-yocto: update to 2.6.37.3

Mark Hatle (3):
package.bbclass: Change the debug directory to avoid conflicts
package_rpm: Fix rootfs generation
gcc-runtime: Fix dbg files

Paul Eggleton (1):
gst-plugins-good: remove dependency on hal

Quoted 9 lines

Scott Garman (7):
task-base, task-poky-basic, task-poky: Remove hard-coded references
to dropbear
openssh: allow the openssh meta package to be empty task-poky-ssh.bb: new task for ssh services poky-image.bbclass: add ssh-server as an IMAGE_FEATURES option poky-image.bbclass: add ssh-server to SATO_IMAGE_FEATURES
poky-image-lsb: add ssh-server to IMAGE_FEATURES
poky-image-basic: add ssh-server to IMAGE_FEATURES

I took these with the exception of the majority of Scott's changes as we agreed there was a potential unresolved issue there.

Cheers,

Richard