OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 2 Rev 3
Line 7... Line 7...
7   7  
Line 8... Line 8...
8 include $(TOPDIR)/rules.mk 8 include $(TOPDIR)/rules.mk
9   9  
10 PKG_NAME:=samba 10 PKG_NAME:=samba
Line 11... Line 11...
11 PKG_VERSION:=3.6.25 11 PKG_VERSION:=3.6.25
12 PKG_RELEASE:=14 12 PKG_RELEASE:=10
13   13  
14 PKG_SOURCE_URL:=https://download.samba.org/pub/samba \ 14 PKG_SOURCE_URL:=https://download.samba.org/pub/samba \
Line 43... Line 43...
43 DEPENDS:=+USE_GLIBC:librt $(ICONV_DEPENDS) 43 DEPENDS:=+USE_GLIBC:librt $(ICONV_DEPENDS)
44 endef 44 endef
Line 45... Line 45...
45   45  
46 define Package/samba36-hotplug 46 define Package/samba36-hotplug
47 $(call Package/samba/Default) 47 $(call Package/samba/Default)
48 TITLE+= hotplug script for auto sharing 48 TITLE+= hotplug
49 DEPENDS:=+blockd 49 DEPENDS:=+block-mount
Line 50... Line 50...
50 endef 50 endef
51   51  
52 define Package/samba36-client 52 define Package/samba36-client
Line 83... Line 83...
83 ac_cv_search_getxattr=no \ 83 ac_cv_search_getxattr=no \
84 ac_cv_file__proc_sys_kernel_core_pattern=yes \ 84 ac_cv_file__proc_sys_kernel_core_pattern=yes \
85 libreplace_cv_HAVE_C99_VSNPRINTF=yes \ 85 libreplace_cv_HAVE_C99_VSNPRINTF=yes \
86 libreplace_cv_HAVE_GETADDRINFO=yes \ 86 libreplace_cv_HAVE_GETADDRINFO=yes \
87 libreplace_cv_HAVE_IFACE_IFCONF=yes \ 87 libreplace_cv_HAVE_IFACE_IFCONF=yes \
88 $(if $(CONFIG_IPV6),,libreplace_cv_HAVE_IPV6=no libreplace_cv_HAVE_IPV6_V6ONLY=no) \ -  
89 LINUX_LFS_SUPPORT=yes \ 88 LINUX_LFS_SUPPORT=yes \
90 samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \ 89 samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
91 samba_cv_HAVE_GETTIMEOFDAY_TZ=yes \ 90 samba_cv_HAVE_GETTIMEOFDAY_TZ=yes \
92 samba_cv_HAVE_IFACE_IFCONF=yes \ 91 samba_cv_HAVE_IFACE_IFCONF=yes \
93 samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes \ 92 samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes \
Line 107... Line 106...
107 --exec-prefix=/usr \ 106 --exec-prefix=/usr \
108 --prefix=/ \ 107 --prefix=/ \
109 --disable-avahi \ 108 --disable-avahi \
110 --disable-cups \ 109 --disable-cups \
111 --disable-external-libtalloc \ 110 --disable-external-libtalloc \
112 --disable-external-libtdb \ -  
113 --disable-external-libtevent \ -  
114 --disable-pie \ 111 --disable-pie \
115 --disable-relro \ 112 --disable-relro \
116 --disable-static \ 113 --disable-static \
117 --disable-swat \ 114 --disable-swat \
118 --disable-shared-libs \ 115 --disable-shared-libs \
Line 153... Line 150...
153   150  
154 define Package/samba36-server/install 151 define Package/samba36-server/install
155 $(INSTALL_DIR) $(1)/etc/config 152 $(INSTALL_DIR) $(1)/etc/config
156 $(INSTALL_CONF) ./files/samba.config $(1)/etc/config/samba 153 $(INSTALL_CONF) ./files/samba.config $(1)/etc/config/samba
157 $(INSTALL_DIR) $(1)/etc/samba 154 $(INSTALL_DIR) $(1)/etc/samba
158 $(INSTALL_CONF) ./files/smb.conf.template $(1)/etc/samba 155 $(INSTALL_DATA) ./files/smb.conf.template $(1)/etc/samba
159 $(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/lowcase.dat $(1)/etc/samba 156 $(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/lowcase.dat $(1)/etc/samba
160 $(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/upcase.dat $(1)/etc/samba 157 $(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/upcase.dat $(1)/etc/samba
161 $(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/valid.dat $(1)/etc/samba 158 $(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/valid.dat $(1)/etc/samba
162 $(INSTALL_DIR) $(1)/etc/init.d 159 $(INSTALL_DIR) $(1)/etc/init.d
Line 167... Line 164...
167 $(LN) samba_multicall $(1)/usr/sbin/nmbd 164 $(LN) samba_multicall $(1)/usr/sbin/nmbd
168 $(LN) samba_multicall $(1)/usr/sbin/smbpasswd 165 $(LN) samba_multicall $(1)/usr/sbin/smbpasswd
169 endef 166 endef
Line 170... Line 167...
170   167  
-   168 define Package/samba36-hotplug/install
-   169 $(INSTALL_DIR) $(1)/lib/samba
171 define Package/samba36-hotplug/install 170 $(INSTALL_DATA) ./files/lib/samba.sh $(1)/lib/samba/samba.sh
172 $(INSTALL_DIR) $(1)/etc/hotplug.d/mount 171 $(INSTALL_DIR) $(1)/etc/hotplug.d/block
173 $(INSTALL_CONF) ./files/samba.hotplug $(1)/etc/hotplug.d/mount/60-samba 172 $(INSTALL_DATA) ./files/samba.hotplug $(1)/etc/hotplug.d/block/60-samba
Line 174... Line 173...
174 endef 173 endef
175   174  
176 define Package/samba36-client/install 175 define Package/samba36-client/install