diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2015-03-23 17:52:12 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-13 12:55:25 +0200 |
commit | ebf7b522cf297ba0cee694b4e1151cb459f4e3b5 (patch) | |
tree | f767c128b9c82ae26a9490805e4f5ff26d362da9 | |
parent | f3092a6766a3004a6fc9e2eef937a40508e97c44 (diff) | |
download | meta-openembedded-ebf7b522cf297ba0cee694b4e1151cb459f4e3b5.tar.gz |
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.inc | 18 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/samba/samba.inc | 12 |
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 e9f891f8c..9393c2c12 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 += "\ | |||
9 | --without-ldap \ | 9 | --without-ldap \ |
10 | --without-krb5" | 10 | --without-krb5" |
11 | 11 | ||
12 | PACKAGES =+ "libwbclient libwinbind libwinbind-dbg libnss-winbind winbind winbind-dbg libnetapi libtdb libsmbsharemodes libsmbclient libsmbclient-dev cifs cifs-doc swat" | 12 | PACKAGES =+ "libwbclient libwinbind libwinbind-dbg libnss-winbind winbind winbind-dbg \ |
13 | libnetapi libtdb libtevent libsmbsharemodes libsmbclient libsmbclient-dev \ | ||
14 | cifs cifs-doc swat ${PN}-base" | ||
15 | |||
16 | RDEPENDS_${PN} += "${PN}-base" | ||
17 | |||
18 | FILES_${PN}-base = "${sbindir}/nmbd \ | ||
19 | ${sbindir}/smbd \ | ||
20 | ${sysconfdir}/default \ | ||
21 | ${sysconfdir}/samba \ | ||
22 | ${sysconfdir}/init.d/samba \ | ||
23 | ${localstatedir}/lib/samba \ | ||
24 | ${localstatedir}/log/samba \ | ||
25 | ${localstatedir}/nmbd \ | ||
26 | ${localstatedir}/spool/samba \ | ||
27 | " | ||
13 | 28 | ||
14 | FILES_winbind-dbg = "${libdir}/idmap/.debug/*.so \ | 29 | FILES_winbind-dbg = "${libdir}/idmap/.debug/*.so \ |
15 | ${libdir}/security/.debug/pam_winbind.so \ | 30 | ${libdir}/security/.debug/pam_winbind.so \ |
@@ -32,6 +47,7 @@ FILES_libwbclient = "${libdir}/libwbclient.so.*" | |||
32 | FILES_libnetapi = "${libdir}/libnetapi.so.*" | 47 | FILES_libnetapi = "${libdir}/libnetapi.so.*" |
33 | FILES_libsmbsharemodes = "${libdir}/libsmbsharemodes.so.*" | 48 | FILES_libsmbsharemodes = "${libdir}/libsmbsharemodes.so.*" |
34 | FILES_libtdb = "${libdir}/libtdb.so.*" | 49 | FILES_libtdb = "${libdir}/libtdb.so.*" |
50 | FILES_libtevent = "${libdir}/libtevent.so.*" | ||
35 | FILES_cifs = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs" | 51 | FILES_cifs = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs" |
36 | FILES_cifs-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8" | 52 | FILES_cifs-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8" |
37 | FILES_libsmbclient = "${libdir}/libsmbclient.so.*" | 53 | FILES_libsmbclient = "${libdir}/libsmbclient.so.*" |
diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc index abfd5ca7b..30acaf699 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" | |||
24 | 24 | ||
25 | inherit autotools-brokensep update-rc.d systemd | 25 | inherit autotools-brokensep update-rc.d systemd |
26 | 26 | ||
27 | SYSTEMD_PACKAGES = "${PN} winbind" | 27 | SYSTEMD_PACKAGES = "${PN}-base winbind" |
28 | SYSTEMD_SERVICE_${PN} = "nmb.service smb.service" | 28 | SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service" |
29 | SYSTEMD_SERVICE_winbind = "winbind.service" | 29 | SYSTEMD_SERVICE_winbind = "winbind.service" |
30 | SYSTEMD_AUTO_ENABLE_${PN} = "disable" | 30 | SYSTEMD_AUTO_ENABLE_${PN} = "disable" |
31 | SYSTEMD_AUTO_ENABLE_winbind = "disable" | 31 | SYSTEMD_AUTO_ENABLE_winbind = "disable" |
@@ -63,14 +63,14 @@ PACKAGECONFIG[talloc] = "--enable-external-libtalloc --with-libtalloc, --disable | |||
63 | PACKAGECONFIG[valgrind] = "ac_cv_header_valgrind_valgrind_h=yes ac_cv_header_valgrind_memcheck_h=yes, \ | 63 | PACKAGECONFIG[valgrind] = "ac_cv_header_valgrind_valgrind_h=yes ac_cv_header_valgrind_memcheck_h=yes, \ |
64 | ac_cv_header_valgrind_valgrind_h=no ac_cv_header_valgrind_memcheck_h=no, valgrind" | 64 | ac_cv_header_valgrind_valgrind_h=no ac_cv_header_valgrind_memcheck_h=no, valgrind" |
65 | 65 | ||
66 | INITSCRIPT_PACKAGES = "samba winbind" | 66 | INITSCRIPT_PACKAGES = "${PN}-base winbind" |
67 | INITSCRIPT_NAME_samba = "samba" | 67 | INITSCRIPT_NAME_${PN}-base = "samba" |
68 | INITSCRIPT_NAME_winbind = "winbind" | 68 | INITSCRIPT_NAME_winbind = "winbind" |
69 | # No dependencies, goes in at level 20 (NOTE: take care with the | 69 | # No dependencies, goes in at level 20 (NOTE: take care with the |
70 | # level, later levels put the shutdown later too - see the links | 70 | # level, later levels put the shutdown later too - see the links |
71 | # in rc6.d, the shutdown must precede network shutdown). | 71 | # in rc6.d, the shutdown must precede network shutdown). |
72 | INITSCRIPT_PARAMS = "defaults" | 72 | INITSCRIPT_PARAMS = "defaults" |
73 | CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf" | 73 | CONFFILES_${PN}-base = "${sysconfdir}/samba/smb.conf" |
74 | 74 | ||
75 | do_configure_prepend () { | 75 | do_configure_prepend () { |
76 | ./script/mkversion.sh | 76 | ./script/mkversion.sh |
@@ -143,7 +143,7 @@ do_install_append() { | |||
143 | } | 143 | } |
144 | 144 | ||
145 | DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-systemctl-native', '', d)}" | 145 | DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-systemctl-native', '', d)}" |
146 | pkg_postinst_${PN} () { | 146 | pkg_postinst_${PN}-base () { |
147 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd sysvinit', 'true', 'false', d)}; then | 147 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd sysvinit', 'true', 'false', d)}; then |
148 | if [ -n "$D" ]; then | 148 | if [ -n "$D" ]; then |
149 | OPTS="--root=$D" | 149 | OPTS="--root=$D" |