diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/samba/files/config-h.patch (renamed from packages/samba/samba-3.2.7/config-h.patch) | 0 | ||||
-rw-r--r-- | packages/samba/files/configure-3.2.7.patch (renamed from packages/samba/samba-3.2.7/configure.patch) | 0 | ||||
-rw-r--r-- | packages/samba/files/mtab.patch (renamed from packages/samba/samba-3.2.7/mtab.patch) | 0 | ||||
-rw-r--r-- | packages/samba/samba-basic.inc | 22 | ||||
-rw-r--r-- | packages/samba/samba.inc | 24 | ||||
-rw-r--r-- | packages/samba/samba_3.0.23c.bb | 10 | ||||
-rw-r--r-- | packages/samba/samba_3.0.34.bb | 11 | ||||
-rw-r--r-- | packages/samba/samba_3.2.7.bb | 15 |
8 files changed, 47 insertions, 35 deletions
diff --git a/packages/samba/samba-3.2.7/config-h.patch b/packages/samba/files/config-h.patch index eeb22684ee..eeb22684ee 100644 --- a/packages/samba/samba-3.2.7/config-h.patch +++ b/packages/samba/files/config-h.patch diff --git a/packages/samba/samba-3.2.7/configure.patch b/packages/samba/files/configure-3.2.7.patch index 94d684813e..94d684813e 100644 --- a/packages/samba/samba-3.2.7/configure.patch +++ b/packages/samba/files/configure-3.2.7.patch diff --git a/packages/samba/samba-3.2.7/mtab.patch b/packages/samba/files/mtab.patch index 2ee8ba0941..2ee8ba0941 100644 --- a/packages/samba/samba-3.2.7/mtab.patch +++ b/packages/samba/files/mtab.patch diff --git a/packages/samba/samba-basic.inc b/packages/samba/samba-basic.inc new file mode 100644 index 0000000000..391bbb4127 --- /dev/null +++ b/packages/samba/samba-basic.inc @@ -0,0 +1,22 @@ +SRC_URI += "file://config-lfs.patch;patch=1 \ + file://quota.patch;patch=1;pnum=0 \ + " + +PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc smbfs smbfs-doc swat" + +RCONFLICTS_${PN} = "samba-ads" +RCONFLICTS_libsmbclient = "libsmbclient-ads" +RCONFLICTS_libsmbclient-dev = "libsmbclient-ads-dev" +RCONFLICTS_cifs = "cifs-ads" +RCONFLICTS_cifs-doc = "cifs-ads-doc" +RCONFLICTS_smbfs = "smbfs-ads" +RCONFLICTS_smbfs-doc = "smbfs-ads-doc" +RCONFLICTS_swat = "swat-ads" + +FILES_cifs = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs" +FILES_cifs-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8" +FILES_libsmbclient = "${libdir}/libsmbclient.so.*" +FILES_libsmbclient-dev = "${libdir}/libsmbclient.so ${includedir}" +FILES_smbfs = "${bindir}/smbmount ${bindir}/smbumount ${bindir}/smbmnt ${base_sbindir}/mount.smbfs ${base_sbindir}/mount.smb" +FILES_smbfs-doc = "${mandir}/man8/smbmount.8 ${mandir}/man8/smbumount.8 ${mandir}/man8/smbmnt.8" +FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg" diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc index 85ac612de6..de93712132 100644 --- a/packages/samba/samba.inc +++ b/packages/samba/samba.inc @@ -3,16 +3,19 @@ LICENSE = "GPL" DEPENDS = "readline virtual/libiconv" SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ - file://configure.patch;patch=1 \ - file://config-lfs.patch;patch=1 \ - file://quota.patch;patch=1;pnum=0 \ file://smb.conf \ - file://init" + file://init \ + " S = "${WORKDIR}/samba-${PV}/source" inherit autotools update-rc.d +FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat \ + ${libdir}/auth/*.so ${libdir}/security/*.so" +FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so ${libdir}/charset/.debug/*.so \ + ${libdir}/auth/.debug/*.so ${libdir}/security/.debug/*.so" + # The file system settings --foodir=dirfoo and overridden unconditionally # in the samba config by --with-foodir=dirfoo - even if the --with is not # specified! Fix that here. Set the privatedir to /etc/samba/private. @@ -38,19 +41,6 @@ INITSCRIPT_NAME = "samba" INITSCRIPT_PARAMS = "defaults" CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf" -PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc smbfs smbfs-doc swat" -FILES_cifs = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs" -FILES_cifs-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8" -FILES_libsmbclient = "${libdir}/libsmbclient.so.*" -FILES_libsmbclient-dev = "${libdir}/libsmbclient.so ${includedir}" -FILES_smbfs = "${bindir}/smbmount ${bindir}/smbumount ${bindir}/smbmnt ${base_sbindir}/mount.smbfs ${base_sbindir}/mount.smb" -FILES_smbfs-doc = "${mandir}/man8/smbmount.8 ${mandir}/man8/smbumount.8 ${mandir}/man8/smbmnt.8" -FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg" -FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat \ - ${libdir}/auth/*.so ${libdir}/security/*.so" -FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so ${libdir}/charset/.debug/*.so \ - ${libdir}/auth/.debug/*.so ${libdir}/security/.debug/*.so" - do_configure_prepend () { ./script/mkversion.sh if [ ! -e acinclude.m4 ]; then diff --git a/packages/samba/samba_3.0.23c.bb b/packages/samba/samba_3.0.23c.bb index 3a2cfd30aa..a10c605edd 100644 --- a/packages/samba/samba_3.0.23c.bb +++ b/packages/samba/samba_3.0.23c.bb @@ -1,13 +1,13 @@ require samba.inc +require samba-basic.inc -PR = "r4" +SRC_URI += "file://configure.patch;patch=1 \ + file://cifs.patch;patch=1" -SRC_URI += "file://cifs.patch;patch=1 \ - " +PR = "r5" EXTRA_OECONF += "\ - --without-ads \ - " + --without-ads" do_compile () { oe_runmake proto_exists diff --git a/packages/samba/samba_3.0.34.bb b/packages/samba/samba_3.0.34.bb index ecd11badcc..c0e6def424 100644 --- a/packages/samba/samba_3.0.34.bb +++ b/packages/samba/samba_3.0.34.bb @@ -1,11 +1,12 @@ require samba.inc +require samba-basic.inc -PR = "r2" +SRC_URI += "file://configure.patch;patch=1 \ + " +SRC_URI_append_linux-uclibc = "file://uclibc-strlcpy-strlcat.patch;patch=1" +SRC_URI_append_linux-uclibcgnueabi = "file://uclibc-strlcpy-strlcat.patch;patch=1" -SRC_URI_append_linux-uclibc = " \ - file://uclibc-strlcpy-strlcat.patch;patch=1" -SRC_URI_append_linux-uclibcgnueabi = " \ - file://uclibc-strlcpy-strlcat.patch;patch=1" +PR = "r3" EXTRA_OECONF += "\ --without-ads \ diff --git a/packages/samba/samba_3.2.7.bb b/packages/samba/samba_3.2.7.bb index 3653a5dfe3..cde2a8f88f 100644 --- a/packages/samba/samba_3.2.7.bb +++ b/packages/samba/samba_3.2.7.bb @@ -1,25 +1,24 @@ require samba.inc +require samba-basic.inc -PR = "r1" -DEPENDS += " openldap krb5" -SRC_URI += "file://config-h.patch;patch=1 \ +SRC_URI += "file://configure-3.2.7.patch;patch=1 \ + file://config-h.patch;patch=1 \ file://mtab.patch;patch=1 \ " +PR = "r2" + EXTRA_OECONF += "\ SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \ linux_getgrouplist_ok=no \ samba_cv_HAVE_BROKEN_GETGROUPS=no \ samba_cv_HAVE_FTRUNCATE_EXTEND=yes \ - ac_cv_path_KRB5CONFIG=${STAGING_BINDIR_CROSS}/krb5-config \ samba_cv_have_setresuid=yes \ samba_cv_have_setresgid=yes \ samba_cv_HAVE_WRFILE_KEYTAB=yes \ - smb_krb5_cv_enctype_to_string_takes_krb5_context_arg=yes \ - smb_krb5_cv_enctype_to_string_takes_size_t_arg=yes \ - --with-krb5=${STAGING_LIBDIR} \ - --with-ads \ + --without-ads \ + --without-winbind \ " do_configure() { |