[oe-commits] org.oe.dev merge of '02c31916f8203f8e8f2ded060c7f3756a95c9841'

[lenehan commit]

merge of '02c31916f8203f8e8f2ded060c7f3756a95c9841'
     and 'd244c282c04022fb25b4134a223c8093316ba9b2'

Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: 8ae2f68097943e0d2ab4479bb2e0e0a568de60fd
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8ae2f68097943e0d2ab4479bb2e0e0a568de60fd
Files:
1
packages/clamav/clamav_0.91.1.bb
classes/sanity.bbclass
packages/redboot-utils/fis_1.0.bb
Diffs:

#
# mt diff -r02c31916f8203f8e8f2ded060c7f3756a95c9841 -r8ae2f68097943e0d2ab4479bb2e0e0a568de60fd
#
# 
# 
# patch "packages/clamav/clamav_0.91.1.bb"
#  from [7c3791a3534fbc04fac0dbd2e2bee620df48358f]
#    to [8b79a2eecd9cb5b4ec025d27710997610b1ac8c9]
# 
============================================================
--- packages/clamav/clamav_0.91.1.bb	7c3791a3534fbc04fac0dbd2e2bee620df48358f
+++ packages/clamav/clamav_0.91.1.bb	8b79a2eecd9cb5b4ec025d27710997610b1ac8c9
@@ -1,5 +1,3 @@
-DEFAULT_PREFERENCE = "-1"
-
 require clamav.inc
 
 PR = "r0"


#
# mt diff -rd244c282c04022fb25b4134a223c8093316ba9b2 -r8ae2f68097943e0d2ab4479bb2e0e0a568de60fd
#
# 
# 
# patch "classes/sanity.bbclass"
#  from [994303fc1fb3b4f460621e0ee691d88588acaf70]
#    to [808f5e34043a37c456f2b223aace94f414b22349]
# 
# patch "packages/redboot-utils/fis_1.0.bb"
#  from [a66b4741b57f521582e2e3edd47cc42cebe7097d]
#    to [423fde1a30e871e390b48542349b88efb3a07ac9]
# 
============================================================
--- classes/sanity.bbclass	994303fc1fb3b4f460621e0ee691d88588acaf70
+++ classes/sanity.bbclass	808f5e34043a37c456f2b223aace94f414b22349
@@ -90,7 +90,7 @@ def check_sanity(e):
 	if not check_app_exists('${BUILD_PREFIX}g++', e.data):
 		missing = missing + "C++ Compiler (${BUILD_PREFIX}g++),"
 
-	required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk md5sum stty"
+	required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk md5sum"
 
 	for util in required_utilities.split():
 		if not check_app_exists( util, e.data ):
@@ -109,11 +109,6 @@ def check_sanity(e):
 	if not oes_bb_conf:
 		messages = messages + 'You do not include OpenEmbeddeds version of conf/bitbake.conf\n'
 
-     # Check if the terminal has stty +tostop
-	if "tostop" in os.popen("stty").read():
-		messages = messages + "You have tostop in your stty terminal setting. This will make BitBake hang when executing. Execute stty -tostop fix this.\n"
- 
-
 	if messages != "":
 		raise_sanity_error(messages)
 
============================================================
--- packages/redboot-utils/fis_1.0.bb	a66b4741b57f521582e2e3edd47cc42cebe7097d
+++ packages/redboot-utils/fis_1.0.bb	423fde1a30e871e390b48542349b88efb3a07ac9
@@ -1,15 +1,14 @@ DESCRIPTION = "Tool to edit the Redboot 
 DESCRIPTION = "Tool to edit the Redboot FIS partition layout from userspace"
-PR = "r3"
+PR = "r4"
 
-SRC_URI = "http://svn.chezphil.org/utils/trunk/fis.c"
+SRC_URI = "svn://svn.nslu2-linux.org/svnroot/fis;module=trunk;proto=http"
+S="${WORKDIR}/trunk"
 
-do_compile() {
-	${CC} --std=c99 -Os -W -o fis ${WORKDIR}/fis.c
-}
+export CFLAGS += "--std=c99"
 
 do_install() {
-	${STRIP} ${WORKDIR}/fis-${PV}/fis
+	${STRIP} ${S}/fis
 
 	install -d ${D}/${sbindir}
-	install -m 755 ${WORKDIR}/fis-${PV}/fis ${D}/${sbindir}
+	install -m 755 ${S}/fis ${D}/${sbindir}
 }