samba: dont build and install nmbd, remove winbind support, add option to disable starting samba on boottime in network.conf

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-01-17 18:37:55 +01:00
parent 35267ea3c3
commit 6508661f10
4 changed files with 28 additions and 28 deletions

View File

@ -79,3 +79,5 @@
# This variable must be set if you are using a secure wireless network # This variable must be set if you are using a secure wireless network
PASSPHRASE="" PASSPHRASE=""
# start SAMBA Server (if installed) on boot (yes / no)
SAMBA_START="yes"

View File

@ -64,8 +64,8 @@ sh autogen.sh
--with-cifsumount \ --with-cifsumount \
--without-ldap \ --without-ldap \
--without-acl-support \ --without-acl-support \
--with-winbind \ --without-winbind \
--without-dnsupdate \ --with-dnsupdate \
--without-automount \ --without-automount \
--with-included-popt \ --with-included-popt \
--with-libsmbclient \ --with-libsmbclient \
@ -79,15 +79,13 @@ sh autogen.sh
make bin/libsmbclient.so make bin/libsmbclient.so
make bin/mount.cifs make bin/mount.cifs
make bin/umount.cifs make bin/umount.cifs
make bin/smbtree
if [ "$SAMBA_SERVER" = yes ]; then if [ "$SAMBA_SERVER" = yes ]; then
make bin/smbd make bin/smbd
make bin/nmbd
fi fi
mkdir -p $SYSROOT_PREFIX/usr/lib mkdir -p $SYSROOT_PREFIX/usr/lib
cp -P bin/lib*client.so* $SYSROOT_PREFIX/usr/lib cp -P bin/*.so* $SYSROOT_PREFIX/usr/lib
mkdir -p $SYSROOT_PREFIX/usr/include mkdir -p $SYSROOT_PREFIX/usr/include
cp include/libsmbclient.h $SYSROOT_PREFIX/usr/include cp include/libsmbclient.h $SYSROOT_PREFIX/usr/include

View File

@ -22,22 +22,18 @@
. config/options $1 . config/options $1
mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/source3/bin/smbtree $INSTALL/usr/bin
if [ "$NETMOUNT" = "yes" ]; then
cp $PKG_BUILD/source3/bin/mount.cifs $INSTALL/usr/bin
cp $PKG_BUILD/source3/bin/umount.cifs $INSTALL/usr/bin
fi
mkdir -p $INSTALL/usr/lib mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/source3/bin/libsmbclient.so* $INSTALL/usr/lib cp -P $PKG_BUILD/source3/bin/libsmbclient.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/source3/bin/libwbclient.so* $INSTALL/usr/lib
if [ "$NETMOUNT" = "yes" ]; then
mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/source3/bin/mount.cifs $INSTALL/usr/bin
cp $PKG_BUILD/source3/bin/umount.cifs $INSTALL/usr/bin
fi
if [ "$SAMBA_SERVER" = "yes" ]; then if [ "$SAMBA_SERVER" = "yes" ]; then
mkdir -p $INSTALL/usr/bin mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/source3/bin/smbd $INSTALL/usr/bin cp $PKG_BUILD/source3/bin/smbd $INSTALL/usr/bin
cp $PKG_BUILD/source3/bin/nmbd $INSTALL/usr/bin
mkdir -p $INSTALL/etc/samba mkdir -p $INSTALL/etc/samba
cp $PKG_DIR/config/smb.conf $INSTALL/etc/samba cp $PKG_DIR/config/smb.conf $INSTALL/etc/samba

View File

@ -23,20 +23,24 @@
# runlevels: openelec, textmode # runlevels: openelec, textmode
( (
SMB_USERCONF="/storage/.config/samba.conf" if [ -f /storage/.config/network.conf ]; then
SMB_DEFCONF="/etc/samba/smb.conf" . /storage/.config/network.conf
SMB_ARG="--daemon"
progress "Starting Samba server" if [ ! "$SAMBA_START" = "no" ]; then
if [ -f $SMB_USERCONF ]; then progress "Starting Samba server"
SMB_ARG="$SMB_ARG --configfile=$SMB_USERCONF"
else SMB_USERCONF="/storage/.config/samba.conf"
SMB_ARG="$SMB_ARG --configfile=$SMB_DEFCONF" SMB_DEFCONF="/etc/samba/smb.conf"
if [ -f $SMB_USERCONF ]; then
SMB_ARG="--configfile=$SMB_USERCONF"
else
SMB_ARG="--configfile=$SMB_DEFCONF"
fi
mkdir -p /var/log/samba
smbd --daemon $SMB_ARG > /dev/null 2>&1
fi
fi fi
mkdir -p /var/log/samba
smbd $SMB_ARG > /dev/null 2>&1
nmbd $SMB_ARG > /dev/null 2>&1
)& )&