[oe-commits] org.oe.dev merge of '12e8362ccf0740454595721a242cfb8e867eb512'

[khem commit]

merge of '12e8362ccf0740454595721a242cfb8e867eb512'
     and 'e7f394edea22558fdbcb02929f1540784a5265f2'

Author: khem at openembedded.org
Branch: org.openembedded.dev
Revision: 85df87032f0b80f3ca014d4a9e315e959a97e102
ViewMTN: http://monotone.openembedded.org/revision/info/85df87032f0b80f3ca014d4a9e315e959a97e102
Files:
1
packages/samba/samba.inc
packages/samba/samba_3.0.23c.bb
packages/uclibc/uclibc_0.9.29.bb
Diffs:

#
# mt diff -r12e8362ccf0740454595721a242cfb8e867eb512 -r85df87032f0b80f3ca014d4a9e315e959a97e102
#
#
#
# patch "packages/samba/samba.inc"
#  from [77999b13a6dc8e6af6540bfe9a51f2ac9c11d3b9]
#    to [2733fe1160140df3eac405b0a2d0ef3abcfde776]
# 
# patch "packages/samba/samba_3.0.23c.bb"
#  from [cbb50ee71590ebe4810837194adc5397eb68d774]
#    to [0445d1c01df2f38163f4f8df96337c75a306fe62]
#
============================================================
--- packages/samba/samba.inc	77999b13a6dc8e6af6540bfe9a51f2ac9c11d3b9
+++ packages/samba/samba.inc	2733fe1160140df3eac405b0a2d0ef3abcfde776
@@ -3,8 +3,8 @@ SRC_URI = "http://samba.org/samba/ftp/st
 DEPENDS = "readline virtual/libiconv"
 
 SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
-           file://configure.patch;patch=1 \
-           file://cifs.patch;patch=1"
+           file://configure.patch;patch=1"
+
 S = "${WORKDIR}/samba-${PV}/source"
 
 inherit autotools
============================================================
--- packages/samba/samba_3.0.23c.bb	cbb50ee71590ebe4810837194adc5397eb68d774
+++ packages/samba/samba_3.0.23c.bb	0445d1c01df2f38163f4f8df96337c75a306fe62
@@ -6,6 +6,7 @@ SRC_URI += "file://config-lfs.patch;patc
 SRC_URI += "file://config-lfs.patch;patch=1 \
 	   file://init \
            file://quota.patch;patch=1;pnum=0 \
+	   file://cifs.patch;patch=1 \
 	   "
 
 INITSCRIPT_NAME = "samba"


#
# mt diff -re7f394edea22558fdbcb02929f1540784a5265f2 -r85df87032f0b80f3ca014d4a9e315e959a97e102
#
#
#
# patch "packages/uclibc/uclibc_0.9.29.bb"
#  from [e355b83dfb3404619c5918177caab9fec0b976b4]
#    to [20484e607048882b6c6824d43715499bc4fdf917]
#
============================================================
--- packages/uclibc/uclibc_0.9.29.bb	e355b83dfb3404619c5918177caab9fec0b976b4
+++ packages/uclibc/uclibc_0.9.29.bb	20484e607048882b6c6824d43715499bc4fdf917
@@ -7,7 +7,7 @@ UCLIBC_BASE ?= "0.9.29"
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.29"
-PR = "r20"
+PR = "r21"
 DEFAULT_PREFERENCE = "1"
 
 require uclibc.inc
@@ -29,6 +29,7 @@ SRC_URI += "file://uClibc.machine file:/
             file://uClibc-0.9.29-avr32-bzero.patch;patch=1 \
 	    file://uClibc-0.9.29-nonposix_bashisms.patch;patch=1 \
             file://arm_fix_alignment.patch;patch=1 \
+	    file://uclibc-arm-ftruncate64.patch;patch=1 \
            "
 
 #recent versions uclibc require real kernel headers