summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/samba/Makefile8
-rw-r--r--target/linux/config/Config.in.fs1
2 files changed, 4 insertions, 5 deletions
diff --git a/package/samba/Makefile b/package/samba/Makefile
index a8e4c407f..059b85efa 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= samba
-PKG_VERSION:= 3.6.23
-PKG_RELEASE:= 6
-PKG_MD5SUM:= 2f7aee1dc5d31aefcb364600915b31dc
+PKG_VERSION:= 3.6.24
+PKG_RELEASE:= 1
+PKG_MD5SUM:= d98425c0c2b73e08f048d31ffc727fb0
PKG_DESCR:= smb file and print server
PKG_SECTION:= net/fs
PKG_BUILDDEP:= gettext-tiny util-linux popt
@@ -14,8 +14,6 @@ PKG_DEPENDS:= samba-lib libuuid libpopt
PKG_URL:= http://www.samba.org/
PKG_SITES:= http://samba.org/samba/ftp/stable/
-PKG_CFLINE_SAMBA:= select ADK_KERNEL_INOTIFY_USER
-
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= SAMBA SAMBA_CLIENT SAMBA_PASSWD SAMBA_LIB
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index ce7eb660a..7a7a88ed5 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -293,6 +293,7 @@ config ADK_KERNEL_INOTIFY_USER
prompt "Inotify support for userspace"
boolean
depends on ADK_KERNEL_INOTIFY
+ default m if ADK_PACKAGE_SAMBA
default n
help
Say Y here to enable inotify support for userspace, including the