diff options
| -rw-r--r-- | package/samba/Config.in | 22 | ||||
| -rwxr-xr-x | package/samba/S91smb | 1 | ||||
| -rw-r--r-- | package/samba/samba.mk | 8 |
3 files changed, 30 insertions, 1 deletions
diff --git a/package/samba/Config.in b/package/samba/Config.in index 56333dc3e..cc6999b26 100644 --- a/package/samba/Config.in +++ b/package/samba/Config.in @@ -27,6 +27,18 @@ config BR2_PACKAGE_SAMBA_EVENTLOGADM help Write Eventlog records to a tdb or perform other eventlog functions +config BR2_PACKAGE_SAMBA_FINDSMB + bool "findsmb" + default y + depends on BR2_PACKAGE_SAMBA_SMBCLIENT + depends on BR2_PACKAGE_SAMBA_NMBLOOKUP + depends on BR2_PACKAGE_MICROPERL + help + Script to browse network + +comment "findsmb - disabled (requires nmblookup, smbclient and perl)" + depends on !BR2_PACKAGE_SAMBA_SMBCLIENT || !BR2_PACKAGE_SAMBA_NMBLOOKUP || !BR2_PACKAGE_MICROPERL + config BR2_PACKAGE_SAMBA_NET bool "net" default y @@ -149,6 +161,16 @@ config BR2_PACKAGE_SAMBA_SWAT help Samba Web Administration Tool +config BR2_PACKAGE_SAMBA_SMBTAR + bool "smbtar" + default y + depends on BR2_PACKAGE_SAMBA_SMBCLIENT + help + tar-like script that wraps smbclient + +comment "smbtar - disabled (requires smbclient)" + depends on !BR2_PACKAGE_SAMBA_SMBCLIENT + config BR2_PACKAGE_SAMBA_TDB bool "tdb" default y diff --git a/package/samba/S91smb b/package/samba/S91smb index 859b54008..c190771b7 100755 --- a/package/samba/S91smb +++ b/package/samba/S91smb @@ -9,6 +9,7 @@ # Make directories. mkdir -p /var/cache/samba mkdir -p /var/log/samba +mkdir -p /var/lock/subsys RETVAL=0 diff --git a/package/samba/samba.mk b/package/samba/samba.mk index bf1380a52..9ac6e1153 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -29,6 +29,10 @@ $(SAMBA_DIR)/.configured: $(SAMBA_DIR)/.unpacked samba_cv_USE_SETREUID=yes \ samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes \ samba_cv_HAVE_IFACE_IFCONF=yes \ + samba_cv_HAVE_MMAP=yes \ + samba_cv_HAVE_FCNTL_LOCK=yes \ + samba_cv_HAVE_SECURE_MKSTEMP=yes \ + samba_cv_fpie=no \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ @@ -58,6 +62,7 @@ SAMBA_TARGETS_y := SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_CIFS) += usr/sbin/mount.cifs \ usr/sbin/umount.cifs SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_EVENTLOGADM) += usr/bin/eventlogadm +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_FINDSMB) += usr/bin/findsmb SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_NET) += usr/bin/net SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_NMBD) += usr/sbin/nmbd SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_NMBLOOKUP) += usr/bin/nmblookup @@ -73,6 +78,7 @@ SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBGET) += usr/bin/smbget SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBPASSWD) += usr/bin/smbpasswd SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBSPOOL) += usr/bin/smbspool SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBSTATUS) += usr/bin/smbstatus +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBTAR) += usr/bin/smbtar SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBTREE) += usr/bin/smbtree SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SWAT) += usr/sbin/swat SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_TDB) += usr/bin/tdbbackup \ @@ -91,7 +97,7 @@ $(TARGET_DIR)/$(SAMBA_TARGET_BINARY): $(SAMBA_DIR)/$(SAMBA_BINARY) PRIVATEDIR="${TARGET_DIR}/etc/samba" \ CONFIGDIR="${TARGET_DIR}/etc/samba" \ VARDIR="${TARGET_DIR}/var/log/samba" \ - -C $(SAMBA_DIR) installservers installbin installcifsmount + -C $(SAMBA_DIR) installservers installbin installcifsmount installscripts for file in $(SAMBA_TARGETS_); do \ rm -f $(TARGET_DIR)/$$file; \ done |