From cfee517152207ae737f6a7164866465601ccf317 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Tue, 5 Aug 2014 21:30:50 +0200 Subject: samba: move daemons into their own package Create a package samba-base, which contains everything needed to just run the daemons (nmbd, smbd). Excerpt from buildhistory (mips32): -87280 KiB samba +13968 KiB samba-base Signed-off-by: Andreas Oberritter --- meta-oe/recipes-connectivity/samba/samba-basic.inc | 17 ++++++++++++++++- meta-oe/recipes-connectivity/samba/samba.inc | 6 +++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-connectivity/samba/samba-basic.inc b/meta-oe/recipes-connectivity/samba/samba-basic.inc index d0fa8e603e..da40ee76b7 100644 --- a/meta-oe/recipes-connectivity/samba/samba-basic.inc +++ b/meta-oe/recipes-connectivity/samba/samba-basic.inc @@ -9,7 +9,22 @@ EXTRA_OECONF += "\ --without-ldap \ --without-krb5" -PACKAGES =+ "libwbclient libwinbind libwinbind-dbg libnss-winbind winbind winbind-dbg libnetapi libtdb libsmbsharemodes libsmbclient libsmbclient-dev cifs cifs-doc swat" +PACKAGES =+ "libwbclient libwinbind libwinbind-dbg libnss-winbind winbind winbind-dbg \ + libnetapi libtdb libsmbsharemodes libsmbclient libsmbclient-dev \ + cifs cifs-doc swat ${PN}-base" + +RDEPENDS_${PN} += "${PN}-base" + +FILES_${PN}-base = "${sbindir}/nmbd \ + ${sbindir}/smbd \ + ${sysconfdir}/default \ + ${sysconfdir}/samba \ + ${sysconfdir}/init.d/samba \ + ${localstatedir}/lib/samba \ + ${localstatedir}/log/samba \ + ${localstatedir}/nmbd \ + ${localstatedir}/spool/samba \ +" FILES_winbind-dbg = "${libdir}/idmap/.debug/*.so \ ${libdir}/security/.debug/pam_winbind.so \ diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc index 50e8d91982..d13838ee4d 100644 --- a/meta-oe/recipes-connectivity/samba/samba.inc +++ b/meta-oe/recipes-connectivity/samba/samba.inc @@ -45,14 +45,14 @@ PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" PACKAGECONFIG[fam] = "--enable-fam,--disable-fam,gamin" PACKAGECONFIG[talloc] = "--enable-external-libtalloc --with-libtalloc, --disable-external-libtalloc --without-libtalloc, talloc" -INITSCRIPT_PACKAGES = "samba winbind" -INITSCRIPT_NAME_samba = "samba" +INITSCRIPT_PACKAGES = "${PN}-base winbind" +INITSCRIPT_NAME_${PN}-base = "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). INITSCRIPT_PARAMS = "defaults" -CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf" +CONFFILES_${PN}-base = "${sysconfdir}/samba/smb.conf" do_configure_prepend () { ./script/mkversion.sh -- cgit 1.2.3-korg