| Summary: | [PATCH] Samba package | ||
|---|---|---|---|
| Product: | buildroot | Reporter: | rvpaasen <rvpaasen> |
| Component: | Outdated package | Assignee: | unassigned |
| Status: | RESOLVED FIXED | ||
| Severity: | enhancement | CC: | buildroot |
| Priority: | P5 | ||
| Version: | unspecified | ||
| Target Milestone: | --- | ||
| Hardware: | PC | ||
| OS: | Linux | ||
| Host: | Target: | ||
| Build: | |||
| Attachments: | samba package | ||
I tried to apply this patch to an uptodate git clone, but the patch did not apply: error: patch failed: package/samba/Config.in:8 error: package/samba/Config.in: patch does not apply error: patch failed: package/samba/samba.mk:3 error: package/samba/samba.mk: patch does not apply I created the patch with 'git diff package/samba'. Could you try using 'patch'? Here patching succeeds: mmnet@Wodan:[buildroot]:~/broot/buildroot.git$ rm -rf package/samba mmnet@Wodan:[buildroot]:~/broot/buildroot.git$ git pull Already up-to-date. mmnet@Wodan:[buildroot]:~/broot/buildroot.git$ git checkout package/samba mmnet@Wodan:[buildroot]:~/broot/buildroot.git$ ls package/samba/ Config.in samba-add-check-for-__use_bsd.patch samba-fix-client-mtab.patch samba-getgrouplist.patch samba-remove-legacy-index.patch S91smb samba-do-not-check-glibc-version.patch samba-fix-mount.cifs.patch samba.mk simple.conf mmnet@Wodan:[buildroot]:~/broot/buildroot.git$ patch -p1 < ../buildroot-samba.patch patching file package/samba/Config.in patching file package/samba/samba.mk mmnet@Wodan:[buildroot]:~/broot/buildroot.git$ Perhaps I did something wrong, trying again now ... I am sorry, I did apply the patch in the wrong branch. Running a rebuild now, will report back later... The build completed successfully here. But I found that the libsmbclient.h header is not installed, even if BR2_PACKAGE_SAMBA_LIBSMBCLIENT is selected. I am testing a patch now to fix this... The header is installed correctly in staging_dir, but for whatever reason, it is not being picked up later by the gvfs configure script: checking libsmbclient.h usability... no checking libsmbclient.h presence... no checking for libsmbclient.h... no checking for Samba 3.0 libraries... no Unfortunately I only have access to the build log right now, which makes it somewhat difficult to investigate this in more detail. Looking at build logs from before the samba update, it appears that this problem has existed before, but got unnoticed so far. So the problem is more likely in the gvfs package and not related to this patch. So this change looks good from my point. For your convenience I will send a git formatted patch to the list. While trying to find the cause of the gvfs problem, I attempted to build the updated samba package on my Debian sid system. This unveiled a problem in your patch. Your patch adds a SAMBA_HOOK_POST_EXTRACT hook that calls the autogen.sh script. This will regenerate the configure script (among other things). Depending on the version of autoconf that is being called by autogen.sh, the resulting configure script will differ. On my system this causes the samba-do-not-check-glibc-version.patch to fail. If I remove the SAMBA_HOOK_POST_EXTRACT hook entirely, everything works just fine. So it appears this is not needed at all? I used an Ubuntu 9.04 system to build. The autogen.sh script was also called before configuring the package by the previous samba.mk and since it didn't break the build (on my system), I kept the call in place. The package also builds without calling autogen.sh so it's probably best to remove it. The gvfs patches that I just sent to the mailing-list fix the problem described in comment #6. It was indeed unrelated to your patch. I've also sent an updated patch for samba to the mailing-list that has the uclibc dependency and the call to autogen.sh dropped. Committed, thanks! |
Created attachment 701 [details] samba package Hi, I have updated the samba package to the new makefile format. I also updated to samba version 3.3.8 (latest 3.3.x version). Patch is attached and to be aplied to the current git. Richard.