diff options
Diffstat (limited to 'meta-oe/recipes-connectivity/samba/samba.inc')
| -rw-r--r-- | meta-oe/recipes-connectivity/samba/samba.inc | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc index e5fa06ef63..faa2be0787 100644 --- a/meta-oe/recipes-connectivity/samba/samba.inc +++ b/meta-oe/recipes-connectivity/samba/samba.inc @@ -5,7 +5,8 @@ DEPENDS = "readline virtual/libiconv talloc" SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ file://volatiles.03_samba \ file://smb.conf \ - file://init \ + file://init.samba \ + file://init.winbind \ file://tdb.pc \ " @@ -13,11 +14,6 @@ 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" - SAMBAMMAP = "no" SAMBAMMAP_libc-glibc = "yes" @@ -41,7 +37,9 @@ EXTRA_OECONF='--disable-cups \ samba_cv_struct_timespec=yes \ libreplace_cv_HAVE_MMAP=${SAMBAMMAP}' -INITSCRIPT_NAME = "samba" +INITSCRIPT_PACKAGES = "samba winbind" +INITSCRIPT_NAME_samba = "samba" +INITSCRIPT_NAME_winbind = "winbind" # No dependencies, goes in at level 20 (NOTE: take care with the # level, later levels put the shutdown later too - see the links # in rc6.d, the shutdown must precede network shutdown). @@ -79,10 +77,27 @@ do_install_append() { ln -sf ${bindir}/smbmount ${D}${base_sbindir}/mount.smbfs fi - install -D -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba + install -D -m 755 ${WORKDIR}/init.samba ${D}${sysconfdir}/init.d/samba + install -D -m 755 ${WORKDIR}/init.winbind ${D}${sysconfdir}/init.d/winbind install -D -m 644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/volatiles.03_samba install -d ${D}/var/log/samba install -d ${D}/var/spool/samba + + # Install other stuff not installed by "make install" + install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_winbind.so ${D}${libdir}/libnss_winbind.so.2 + install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_wins.so ${D}${libdir}/libnss_wins.so.2 + } + + +pkg_postinst_winbind () { + # add wins to the list of resolvers + ns=$D${sysconfdir}/nsswitch.conf + if ! grep "hosts:.*wins" $ns > /dev/null; then + hosts="`grep '^hosts:' $ns`" + hosts=`echo "$hosts" | sed 's/\[/\\\\[/g; s/\]/\\\\]/g'` + sed -i "s/$hosts/$hosts wins/" "$ns" + fi +} |