[oe-commits] org.oe.dreambox samba: fix smb.conf installation

[tmbinc commit]

samba: fix smb.conf installation

Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: 5f6adad92c5a608f8389b41aaf63e1107cc69d38
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5f6adad92c5a608f8389b41aaf63e1107cc69d38
Files:
1
packages/samba/samba.inc
packages/samba/samba_3.0.23c.bb
Diffs:

#
# mt diff -r20b54a43482088ec42a3b83bff8fb89cd91dfdab -r5f6adad92c5a608f8389b41aaf63e1107cc69d38
#
# 
# 
# patch "packages/samba/samba.inc"
#  from [9c8544646fa83960e906c2b1067b6408fbb42f61]
#    to [f363353cf20013d8ccb2316aa3c91b7415520dca]
# 
# patch "packages/samba/samba_3.0.23c.bb"
#  from [4c6114130e3fe4e142a04b456480677d066e8b45]
#    to [0171702e5b9a74fc81a34263091a4d67038c2cfb]
# 
============================================================
--- packages/samba/samba.inc	9c8544646fa83960e906c2b1067b6408fbb42f61
+++ packages/samba/samba.inc	f363353cf20013d8ccb2316aa3c91b7415520dca
@@ -1,7 +1,8 @@ LICENSE = "GPL"
 SECTION = "console/network"
 DEPENDS = readline
 LICENSE = "GPL"
-MAINTAINER = "Oyvind Repvik <nail at nslu2-linux.org>"
+#MAINTAINER = "Oyvind Repvik <nail at nslu2-linux.org>"
+# opendreambox modifications by Felix Domke <tmbinc at elitedvb.net>
 
 PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc sambaserver sambamount"
 FILES_cifs = "${bindir}/mount.cifs"
@@ -14,6 +15,8 @@ FILES_sambaserver_append_opendreambox = 
 FILES_sambaserver_append_opendreambox = " /etc/samba/smb.conf /etc/samba/private \
 	/etc/network/if-up.d/01samba-start /etc/network/if-down.d/01samba-kill"
 
+SRC_URI_append_opendreambox = "file://smb.conf file://01samba-kill file://01samba-start"
+
 inherit autotools
 
 EXTRA_OECONF='--disable-cups --with-readline=${STAGING_LIBDIR}/.. \
@@ -40,16 +43,16 @@ do_install_prepend_opendreambox() {
 }
 
 do_install_prepend_opendreambox() {
-	install -c -m 644 ${FILESDIR}/smb.conf ../examples/smb.conf.default
+	install -c -m 644 ${WORKDIR}/smb.conf ../examples/smb.conf.default
 }
 
 do_install_append_opendreambox() {
 	install -d ${D}/etc/samba
 	install -d ${D}/etc/samba/private
 	install -d ${D}/etc/network/if-down.d
-	install -m 0755 ${FILESDIR}/01samba-kill ${D}/etc/network/if-down.d
+	install -m 0755 ${WORKDIR}/01samba-kill ${D}/etc/network/if-down.d
 	install -d ${D}/etc/network/if-up.d
-	install -m 0755 ${FILESDIR}/01samba-start ${D}/etc/network/if-up.d
+	install -m 0755 ${WORKDIR}/01samba-start ${D}/etc/network/if-up.d
 }
 
 do_stage() {
============================================================
--- packages/samba/samba_3.0.23c.bb	4c6114130e3fe4e142a04b456480677d066e8b45
+++ packages/samba/samba_3.0.23c.bb	0171702e5b9a74fc81a34263091a4d67038c2cfb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r4"
 
 SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
 	   file://configure.patch;patch=1 \
@@ -17,7 +17,7 @@ INITSCRIPT_PARAMS = "defaults"
 # 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_sambaserver = "${sysconfdir}/samba/smb.conf"
 
 # The file system settings --foodir=dirfoo and overridden unconditionally
 # in the samba config by --with-foodir=dirfoo - even if the --with is not