diff options
| author | Tim 'timtim' Ellis <tim.ellis@foonas.org> | 2009-01-31 20:22:29 +0000 |
|---|---|---|
| committer | Tim 'timtim' Ellis <tim.ellis@foonas.org> | 2009-01-31 20:22:29 +0000 |
| commit | c3270e164d1964d6ef32258dcbcbceda912add07 (patch) | |
| tree | 2d060050000abf82bdaacc5d5f92048181af1aaf /packages/samba/samba.inc | |
| parent | 579a5fa166ce8915ca9e00c90a357f61771922d7 (diff) | |
samba: Rework samba in preparation for separate AD support:
- Move mtab.patch and config-h.patch to files as they will work for 3.3.0
- Remove AD support, krb5 and openldap deps from 3.2.7
- Move the non-AD samba specific stuff into its own include file
- Ensure package conflicts with samba-ads, bump PR to pick this up
Diffstat (limited to 'packages/samba/samba.inc')
| -rw-r--r-- | packages/samba/samba.inc | 24 |
1 files changed, 7 insertions, 17 deletions
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 |