[oe] [meta-oe][PATCH v2 7/7] samba: upgrade to 4.1.12

[Bian, Naimeng]

> -----Original Message-----
> From: openembedded-devel-bounces at lists.openembedded.org
> [mailto:openembedded-devel-bounces at lists.openembedded.org] On Behalf Of
> Martin Jansa
> Sent: Thursday, June 18, 2015 4:37 AM
> To: openembedded-devel at lists.openembedded.org
> Subject: Re: [oe] [meta-oe][PATCH v2 7/7] samba: upgrade to 4.1.12
> 
> On Wed, Jun 17, 2015 at 03:49:13PM +0800, Bian Naimeng wrote:
> > Signed-off-by: Bian Naimeng <biannm at cn.fujitsu.com>
> >
> > git send-email will catch error as below
> >  fatal: 0002-samba-upgrade-to-4.1.12.patch: 965: patch contains a line
> > longer than 998 characters
> >
> > So, please get patch from
> > https://github.com/bendaaron/meta-oe-dev/commit/47678ed346a1ce347a6470
> > 5c76df09d4fa537b0e
> 
> I've cherry-picked first 6 patches from here, but this last one fails to apply,
> because you're removing samba 3.6.24, but in master we have 3.6.25 since this
> commit merged more than month ago:
> 
> commit 9ac5713b2fcb5ce03693edd40636d8fce3e014d0
> Author:     Roy Li <rongqing.li at windriver.com>
> AuthorDate: Wed Apr 29 17:25:02 2015 +0800
> Commit:     Martin Jansa <Martin.Jansa at gmail.com>
> CommitDate: Mon May 11 10:27:28 2015 +0200
> 
>     samba: upgrade to 3.6.25
> 
> Also this patch only removes 3.6.24, but doesn't add 4.1.12.
> 
> Please rebase to latest master and fix the last commit.
> 

Thank you very much.

Please cherry-pick the new one from here
https://github.com/bendaaron/meta-oe-dev/commit/299fc6d67c6e755450c3a1e8cf0ba046eb7fa8b7

Thanks
 Bian

> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com