aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2015-03-23 17:52:12 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2015-04-13 12:55:25 +0200
commitebf7b522cf297ba0cee694b4e1151cb459f4e3b5 (patch)
treef767c128b9c82ae26a9490805e4f5ff26d362da9
parentf3092a6766a3004a6fc9e2eef937a40508e97c44 (diff)
downloadmeta-openembedded-contrib-ebf7b522cf297ba0cee694b4e1151cb459f4e3b5.tar.gz
meta-openembedded-contrib-ebf7b522cf297ba0cee694b4e1151cb459f4e3b5.tar.bz2
meta-openembedded-contrib-ebf7b522cf297ba0cee694b4e1151cb459f4e3b5.zip
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 <obi@opendreambox.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-connectivity/samba/samba-basic.inc18
-rw-r--r--meta-oe/recipes-connectivity/samba/samba.inc12
2 files changed, 23 insertions, 7 deletions
diff --git a/meta-oe/recipes-connectivity/samba/samba-basic.inc b/meta-oe/recipes-connectivity/samba/samba-basic.inc
index e9f891f8c3..9393c2c126 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 libtevent 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 \
@@ -32,6 +47,7 @@ FILES_libwbclient = "${libdir}/libwbclient.so.*"
FILES_libnetapi = "${libdir}/libnetapi.so.*"
FILES_libsmbsharemodes = "${libdir}/libsmbsharemodes.so.*"
FILES_libtdb = "${libdir}/libtdb.so.*"
+FILES_libtevent = "${libdir}/libtevent.so.*"
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.*"
diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc
index abfd5ca7ba..30acaf6996 100644
--- a/meta-oe/recipes-connectivity/samba/samba.inc
+++ b/meta-oe/recipes-connectivity/samba/samba.inc
@@ -24,8 +24,8 @@ S = "${WORKDIR}/samba-${PV}/source"
inherit autotools-brokensep update-rc.d systemd
-SYSTEMD_PACKAGES = "${PN} winbind"
-SYSTEMD_SERVICE_${PN} = "nmb.service smb.service"
+SYSTEMD_PACKAGES = "${PN}-base winbind"
+SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service"
SYSTEMD_SERVICE_winbind = "winbind.service"
SYSTEMD_AUTO_ENABLE_${PN} = "disable"
SYSTEMD_AUTO_ENABLE_winbind = "disable"
@@ -63,14 +63,14 @@ PACKAGECONFIG[talloc] = "--enable-external-libtalloc --with-libtalloc, --disable
PACKAGECONFIG[valgrind] = "ac_cv_header_valgrind_valgrind_h=yes ac_cv_header_valgrind_memcheck_h=yes, \
ac_cv_header_valgrind_valgrind_h=no ac_cv_header_valgrind_memcheck_h=no, valgrind"
-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
@@ -143,7 +143,7 @@ do_install_append() {
}
DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-systemctl-native', '', d)}"
-pkg_postinst_${PN} () {
+pkg_postinst_${PN}-base () {
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd sysvinit', 'true', 'false', d)}; then
if [ -n "$D" ]; then
OPTS="--root=$D"