Commit f6c58902 authored by Wade Berrier's avatar Wade Berrier
Browse files

samba.mk: 

-force some performance enhancing autoconf options
-run 'installscripts' so findsmb and smbtar are installed
-samba binaires were segfaulting with uclibc 0.9.29
 when not using: samba_cv_fpie=no.  Force it.

Config.in:
-create configure options for findsmb and smbtar

S91smb:
-create dir (/var/lock/subsys) that is referenced
 later in script
parent 56eebd08

package/samba/Config.in

+22 −0
Original line number Diff line number Diff line
@@ -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

package/samba/S91smb

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
# Make directories.

mkdir -p /var/cache/samba

mkdir -p /var/log/samba

mkdir -p /var/lock/subsys



RETVAL=0

package/samba/samba.mk

+7 −1
Original line number Diff line number Diff line
@@ -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