diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2016-11-30 13:04:02 +0100 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2016-12-17 10:57:41 -0500 |
commit | 8b61539ea0a32637871c735354469a6a04fa5aa3 (patch) | |
tree | e2175f3834e53004b32223f6b98aaa80c36bb8cf /meta-networking/recipes-connectivity | |
parent | 8f2c04b9a1a24a543a71878d4952ff7316550fb3 (diff) | |
download | meta-openembedded-8b61539ea0a32637871c735354469a6a04fa5aa3.tar.gz |
samba: move /etc/sysconfig to more common /etc/default, package tmpfiles.d in samba-common
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-connectivity')
-rw-r--r-- | meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb index b8d714140..76f97cf99 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | |||
@@ -109,7 +109,9 @@ do_install_append() { | |||
109 | 109 | ||
110 | install -d ${D}${systemd_system_unitdir} | 110 | install -d ${D}${systemd_system_unitdir} |
111 | install -m 0644 packaging/systemd/*.service ${D}${systemd_system_unitdir} | 111 | install -m 0644 packaging/systemd/*.service ${D}${systemd_system_unitdir} |
112 | sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' ${D}${systemd_system_unitdir}/*.service | 112 | sed -e 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' \ |
113 | -e 's,/etc/sysconfig/samba,${sysconfdir}/default/samba,' \ | ||
114 | -i ${D}${systemd_system_unitdir}/*.service | ||
113 | 115 | ||
114 | install -d ${D}${sysconfdir}/tmpfiles.d | 116 | install -d ${D}${sysconfdir}/tmpfiles.d |
115 | install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf | 117 | install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf |
@@ -134,8 +136,8 @@ do_install_append() { | |||
134 | install -m644 packaging/LSB/smb.conf ${D}${sysconfdir}/samba/smb.conf | 136 | install -m644 packaging/LSB/smb.conf ${D}${sysconfdir}/samba/smb.conf |
135 | install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/03_samba | 137 | install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/03_samba |
136 | 138 | ||
137 | install -d ${D}${sysconfdir}/sysconfig/ | 139 | install -d ${D}${sysconfdir}/default |
138 | install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/sysconfig/samba | 140 | install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/default/samba |
139 | 141 | ||
140 | # install ctdb config file and test cases | 142 | # install ctdb config file and test cases |
141 | install -D -m 0644 ${S}/ctdb/tests/onnode/nodes ${D}${sysconfdir}/ctdb/nodes | 143 | install -D -m 0644 ${S}/ctdb/tests/onnode/nodes ${D}${sysconfdir}/ctdb/nodes |
@@ -203,6 +205,7 @@ FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ | |||
203 | 205 | ||
204 | FILES_${BPN}-common = "${sysconfdir}/default \ | 206 | FILES_${BPN}-common = "${sysconfdir}/default \ |
205 | ${sysconfdir}/samba \ | 207 | ${sysconfdir}/samba \ |
208 | ${sysconfdir}/tmpfiles.d \ | ||
206 | " | 209 | " |
207 | 210 | ||
208 | FILES_${PN} += "${libdir}/vfs/*.so \ | 211 | FILES_${PN} += "${libdir}/vfs/*.so \ |