[2011-1 PATCH 0/2] Edison/2011-1 fixes

[2011-1 PATCH 0/2] Edison/2011-1 fixes

[Joshua Lock]

A couple of minor patches. The first enables ghostscript-native to build on
more recent Debian based systems. The second fixes the timeout of the SSH and
SCP automated sanity checks.

Regards,
Joshua

The following changes since commit ab2a4591c4c3926a960f18fa7e848f5d41255e14:

  populate_sdk_ipk.bbclass: Ensure the correct environment is setup for postinstalls (2012-05-21 22:14:59 -0700)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib josh/edison
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/edison

Richard Purdie (1):
  ghostscript-native: Ensure the sys/time/h fix is applied for native
    builds

Yi Zhao (1):
  scripts/qemuimage-testlib: fix typos

 meta/recipes-extended/ghostscript/ghostscript_9.02.bb |    1 +
 scripts/qemuimage-testlib                             |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

-- 
1.7.10.2

[2011-1 PATCH 1/2] ghostscript-native: Ensure the sys/time/h fix is applied for native builds

[Joshua Lock]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

On my system, the sys/time.h header is in a subdir off /usr/include
which causes a build failure. Apply the target CFLAGS fix to native
builds as well to address this.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-extended/ghostscript/ghostscript_9.02.bb |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.02.bb b/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
index 9b21c66..99c4f5c 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
@@ -40,6 +40,7 @@ EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-j
 # http://bugs.ghostscript.com/show_bug.cgi?id=692443
 # http://bugs.ghostscript.com/show_bug.cgi?id=692426
 CFLAGS += "-DHAVE_SYS_TIME_H=1"
+BUILD_CFLAGS += "-DHAVE_SYS_TIME_H=1"
 
 inherit autotools
 
-- 
1.7.10.2

[2011-1 PATCH 2/2] scripts/qemuimage-testlib: fix typos

[Joshua Lock]

From: Yi Zhao <yi.zhao@windriver.com>

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 scripts/qemuimage-testlib |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index 6a1b900..f52ac7b 100644
--- a/scripts/qemuimage-testlib
+++ b/scripts/qemuimage-testlib
@@ -83,7 +83,7 @@ Test_SCP()
 	local src=$2
 	local des=$3
 	local tmpfile=`mktemp`
-	local timeout=60
+	local time_out=60
 	local ret=0
 
 	# We use expect to interactive with target by ssh
@@ -109,7 +109,7 @@ Test_SSH()
 	shift
 	local command=$@
 	local tmpfile=`mktemp`
-	local timeout=60
+	local time_out=60
 	local ret=0
 	local exp_cmd=`cat << EOF
 eval spawn ssh -o UserKnownHostsFile=$tmpfile root@$ip_addr "$command"
-- 
1.7.10.2

Re: [2011-1 PATCH 2/2] scripts/qemuimage-testlib: fix typos

[Richard Purdie]

On Wed, 2012-06-13 at 09:31 -0700, Joshua Lock wrote:
> From: Yi Zhao <yi.zhao@windriver.com>
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> Signed-off-by: Joshua Lock <josh@linux.intel.com>
> ---
>  scripts/qemuimage-testlib |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Merged into 2011-1 and poky/edison along with 1/1.

Cheers,

Richard