diff options
| -rw-r--r-- | packages/samba/files/smb-essential-inactive.conf | 2 | ||||
| -rw-r--r-- | packages/samba/files/smb-essential.conf | 2 | ||||
| -rw-r--r-- | packages/samba/samba-essential_3.0.20.bb | 18 |
3 files changed, 16 insertions, 6 deletions
diff --git a/packages/samba/files/smb-essential-inactive.conf b/packages/samba/files/smb-essential-inactive.conf index c27c575d64..d42d63cb9a 100644 --- a/packages/samba/files/smb-essential-inactive.conf +++ b/packages/samba/files/smb-essential-inactive.conf @@ -1,7 +1,7 @@ [global] - workgroup = OPENZAURUS + workgroup = MYWORKGROUP server string = OpenZaurus Samba Server netbios name = %L-INACTIVE diff --git a/packages/samba/files/smb-essential.conf b/packages/samba/files/smb-essential.conf index 0dc5eb0ba5..24cb2a56cb 100644 --- a/packages/samba/files/smb-essential.conf +++ b/packages/samba/files/smb-essential.conf @@ -1,7 +1,7 @@ [global] - workgroup = OPENZAURUS + workgroup = MYWORKGROUP server string = OpenZaurus Samba Server security = user diff --git a/packages/samba/samba-essential_3.0.20.bb b/packages/samba/samba-essential_3.0.20.bb index 60e4f241d5..50d4e432e5 100644 --- a/packages/samba/samba-essential_3.0.20.bb +++ b/packages/samba/samba-essential_3.0.20.bb @@ -1,4 +1,4 @@ -PR = "r2" +PR = "r3" SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -47,13 +47,23 @@ do_install_append() { install -d "${D}${sysconfdir}/samba" install -d "${D}/usr/share/samba/help" - install ${WORKDIR}/smb-essential-inactive.conf "${D}${sysconfdir}/samba/" - install ${WORKDIR}/smb-essential.conf "${D}${sysconfdir}/samba/smb.conf" + install -m 0644 ${WORKDIR}/smb-essential-inactive.conf "${D}${sysconfdir}/samba/" + install -m 0644 ${WORKDIR}/smb-essential.conf "${D}${sysconfdir}/samba/smb.conf" - install ${WORKDIR}/Managing-Samba.txt ${D}/usr/share/samba/help + install -m 0644 ${WORKDIR}/Managing-Samba.txt ${D}/usr/share/samba/help } +do_configure_append() { + distro_up="`echo "${DISTRO}" | awk '{printf("%s\n",toupper($0))}'`" + + cat ${WORKDIR}/smb-essential-inactive.conf | sed "s/MYWORKGROUP/${distro_up}/" > ${WORKDIR}/smb-essential-inactive.conf_ + mv ${WORKDIR}/smb-essential-inactive.conf_ ${WORKDIR}/smb-essential-inactive.conf + + cat ${WORKDIR}/smb-essential.conf | sed "s/MYWORKGROUP/${distro_up}/" > ${WORKDIR}/smb-essential.conf_ + mv ${WORKDIR}/smb-essential.conf_ ${WORKDIR}/smb-essential.conf +} + FILES_${PN} = "${bindir}/smbpasswd \ ${sbindir}/nmbd \ ${sbindir}/smbd \ |