diff options
| -rw-r--r-- | classes/tinderclient.bbclass | 6 | ||||
| -rw-r--r-- | conf/bitbake.conf | 2 | ||||
| -rw-r--r-- | packages/automake/automake-native.inc | 2 | ||||
| -rw-r--r-- | packages/automake/automake-native_1.8.2.bb | 2 | ||||
| -rw-r--r-- | packages/automake/automake-native_1.8.4.bb | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index 67cd95842f..1c6a6c497f 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -221,13 +221,13 @@ def tinder_tinder_start(d): time_start = tinder_time_string() config = tinder_print_info(d) - env = tinder_print_env() + #env = tinder_print_env() time_end = tinder_time_string() output = [] output.append( "---> TINDERBOX PRINTING CONFIGURATION %(time_start)s" ) output.append( config ) - output.append( env ) + #output.append( env ) output.append( "<--- TINDERBOX FINISHED PRINTING CONFIGURATION %(time_end)s" ) output.append( "" ) return "\n".join(output) % vars() @@ -273,7 +273,7 @@ def tinder_do_tinder_report(event): if len(log_file) != 0: to_file = data.getVar('TINDER_LOG', event.data, True) - log += "\n".join(open(log_file[0], 'r').readlines()) + log += "".join(open(log_file[0], 'r').readlines()) # set the right 'HEADER'/Summary for the TinderBox if name == "TaskStarted": diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 2b5856eb29..71dc101f0f 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -72,7 +72,7 @@ DATETIME = "${DATE}${TIME}" # python-native should be here but python relies on building # its own in staging -ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native" +ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native python-native-runtime perl-native-runtime" ################################################################## # Package default variables. diff --git a/packages/automake/automake-native.inc b/packages/automake/automake-native.inc index e6d8a41b95..9e89ac8621 100644 --- a/packages/automake/automake-native.inc +++ b/packages/automake/automake-native.inc @@ -1,7 +1,7 @@ SECTION = "devel" include automake_${PV}.bb DEPENDS = "autoconf-native" -RDEPENDS_${PN} = "autoconf-native perl-native" +RDEPENDS_${PN} = "autoconf-native perl-native-runtime" inherit native diff --git a/packages/automake/automake-native_1.8.2.bb b/packages/automake/automake-native_1.8.2.bb index 6732f23713..6e36766445 100644 --- a/packages/automake/automake-native_1.8.2.bb +++ b/packages/automake/automake-native_1.8.2.bb @@ -2,7 +2,7 @@ SECTION = "devel" include automake_${PV}.bb S = "${WORKDIR}/automake-${PV}" DEPENDS = "autoconf-native" -RDEPENDS_${PN} = "autoconf-native perl-native" +RDEPENDS_${PN} = "autoconf-native perl-native-runtime" inherit native diff --git a/packages/automake/automake-native_1.8.4.bb b/packages/automake/automake-native_1.8.4.bb index 6732f23713..6e36766445 100644 --- a/packages/automake/automake-native_1.8.4.bb +++ b/packages/automake/automake-native_1.8.4.bb @@ -2,7 +2,7 @@ SECTION = "devel" include automake_${PV}.bb S = "${WORKDIR}/automake-${PV}" DEPENDS = "autoconf-native" -RDEPENDS_${PN} = "autoconf-native perl-native" +RDEPENDS_${PN} = "autoconf-native perl-native-runtime" inherit native |