[oe-commits] org.oe.dev merge of '398bc51e114a5414e2a0ed00059e3e98a2c10bba'

[lenehan commit]

merge of '398bc51e114a5414e2a0ed00059e3e98a2c10bba'
     and '5422e2398ee185cee0c5489c142e459d793486a3'

Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: 1400bcc94161f278ffef24927913738f7baefb58
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1400bcc94161f278ffef24927913738f7baefb58
Files:
1
packages/clamav/clamav_0.91.1.bb
packages/clamsmtp/clamsmtp_1.8.bb
packages/havp/havp_0.86.bb
packages/p3scan/p3scan_2.9.05d.bb
conf/machine/davinci-dvevm.conf
Diffs:

#
# mt diff -r398bc51e114a5414e2a0ed00059e3e98a2c10bba -r1400bcc94161f278ffef24927913738f7baefb58
#
# 
# 
# add_file "packages/clamav/clamav_0.91.1.bb"
#  content [7c3791a3534fbc04fac0dbd2e2bee620df48358f]
# 
# patch "packages/clamsmtp/clamsmtp_1.8.bb"
#  from [42f32e0aadc99b67383ae08e64c6e0f10d01fc20]
#    to [04779b98e5b7d98deae388246ed78966062c2a04]
# 
# patch "packages/havp/havp_0.86.bb"
#  from [905e48c82366ed6ea1ebfa7d823f681af1bfe796]
#    to [2b23274d5d114b2808ea2e7aa80d8bf51a223def]
# 
# patch "packages/p3scan/p3scan_2.9.05d.bb"
#  from [d16800fce7f242b13af682bd3f5659d757ceb2a8]
#    to [9368c7b776b2c76b34ee17ddc5cf39cdcd4f8bcf]
# 
============================================================
--- packages/clamav/clamav_0.91.1.bb	7c3791a3534fbc04fac0dbd2e2bee620df48358f
+++ packages/clamav/clamav_0.91.1.bb	7c3791a3534fbc04fac0dbd2e2bee620df48358f
@@ -0,0 +1,5 @@
+DEFAULT_PREFERENCE = "-1"
+
+require clamav.inc
+
+PR = "r0"
============================================================
--- packages/clamsmtp/clamsmtp_1.8.bb	42f32e0aadc99b67383ae08e64c6e0f10d01fc20
+++ packages/clamsmtp/clamsmtp_1.8.bb	04779b98e5b7d98deae388246ed78966062c2a04
@@ -8,7 +8,7 @@ RDEPENDS_${PN} = "clamav-daemon"
 LICENSE = "BSD"
 DEPENDS = "clamav"
 RDEPENDS_${PN} = "clamav-daemon"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://memberwebs.com/nielsen/software/clamsmtp/clamsmtp-${PV}.tar.gz \
            file://update-config.patch;patch=1 \
============================================================
--- packages/havp/havp_0.86.bb	905e48c82366ed6ea1ebfa7d823f681af1bfe796
+++ packages/havp/havp_0.86.bb	2b23274d5d114b2808ea2e7aa80d8bf51a223def
@@ -1,5 +1,5 @@ require havp.inc
 require havp.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI_append += " file://reconfigure.patch;patch=1"
============================================================
--- packages/p3scan/p3scan_2.9.05d.bb	d16800fce7f242b13af682bd3f5659d757ceb2a8
+++ packages/p3scan/p3scan_2.9.05d.bb	9368c7b776b2c76b34ee17ddc5cf39cdcd4f8bcf
@@ -6,7 +6,7 @@ RDEPENDS_${PN} = "${PN}-templates-en"
 LICENSE = "GPLv2"
 DEPENDS = "gmp bzip2 zlib clamav openssl"
 RDEPENDS_${PN} = "${PN}-templates-en"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/p3scan/p3scan-2.9.05d.tar.gz \
            file://libtool-fix.patch;patch=1 \


#
# mt diff -r5422e2398ee185cee0c5489c142e459d793486a3 -r1400bcc94161f278ffef24927913738f7baefb58
#
# 
# 
# patch "conf/machine/davinci-dvevm.conf"
#  from [e9f21b6a37024cda89bab889af2959652df27a9e]
#    to [ad3f1d36c3ae769c5772533d8f1a3c8a48db13e4]
# 
============================================================
--- conf/machine/davinci-dvevm.conf	e9f21b6a37024cda89bab889af2959652df27a9e
+++ conf/machine/davinci-dvevm.conf	ad3f1d36c3ae769c5772533d8f1a3c8a48db13e4
@@ -12,7 +12,7 @@ PREFERRED_VERSION_u-boot = "git"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 PREFERRED_VERSION_u-boot = "git"
-UBOOT_MACHINE = "davinci_dvevm"
+UBOOT_MACHINE = "davinci_dvevm_config"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"