On Thu, Jun 18, 2015 at 12:59:35AM +0000, Bian, Naimeng wrote: > > > > -----Original Message----- > > From: [email protected] > > [mailto:[email protected]] On Behalf Of > > Martin Jansa > > Sent: Thursday, June 18, 2015 4:37 AM > > To: [email protected] > > 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 <[email protected]> > > > > > > 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 <[email protected]> > > AuthorDate: Wed Apr 29 17:25:02 2015 +0800 > > Commit: Martin Jansa <[email protected]> > > 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, it applies and builds now.
Last remaining issue is smbnetfs failing to build with samba 4:
| arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mthumb-interwork
--sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm
-DHAVE_CONFIG_H -I.
-I/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/smbnetfs/git-r0/git/src
-O2 -pipe -g -feliminate-unused-debug-types -Wall -W -D_REENTRANT
-D_GNU_SOURCE -DFUSE_USE_VERSION=26 -D_FILE_OFFSET_BITS=64
-I/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm/usr/include/fuse
-c -o samba.o
/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/smbnetfs/git-r0/git/src/samba.c
|
/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/smbnetfs/git-r0/git/src/smb_conn_srv.c:12:26:
fatal error: libsmbclient.h: No such file or directory
| #include <libsmbclient.h>
| ^
| compilation terminated.
| make[2]: *** [smb_conn_srv.o] Error 1
| make[2]: *** Waiting for unfinished jobs....
| make[2]: Leaving directory
`/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/smbnetfs/git-r0/build/src'
| make[1]: *** [all] Error 2
| make[1]: Leaving directory
`/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/smbnetfs/git-r0/build/src'
| make: *** [all-recursive] Error 1
| ERROR: oe_runmake failed
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_compile (log file is located at
/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/smbnetfs/git-r0/temp/log.do_compile.11885)
NOTE: recipe smbnetfs-git-r0: task do_compile: Failed
ERROR: Task 13830
(/home/jenkins/oe/world/shr-core/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb,
do_compile) failed with exit code '1'
Can you check it?
--
Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
