Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Samba Makefile to treat smbpasswd as a config file. Other minor changes. #527

Merged
merged 3 commits into from
May 1, 2016
Merged

Fix Samba Makefile to treat smbpasswd as a config file. Other minor changes. #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c382165
Fix Samba Makefile to treat smbpasswd as a config file
lantis1008 Apr 30, 2016
30907b0
Merge pull request #18 from ericpaulbishop/master
lantis1008 Apr 30, 2016
6467fa9
Bump Openwrt to fix WR841 images. Add wr1043nd v3 to build list
lantis1008 Apr 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ set_version_variables()
# set precise commit in repo to use
# you can set this to an alternate commit
# or empty to checkout latest
openwrt_commit="64e116779c0f7da6d98068b8e7c50f528c8a91f2"
openwrt_commit="eadf19c0b43d2f75f196ea8d875a08c7c348530c"
openwrt_abbrev_commit=$( echo "$openwrt_commit" | cut -b 1-7 )


Expand Down
16 changes: 11 additions & 5 deletions package/samba36/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=samba
PKG_VERSION:=3.6.25
PKG_RELEASE:=1
PKG_RELEASE:=5

PKG_SOURCE_URL:=http://ftp.samba.org/pub/samba \
http://ftp.samba.org/pub/samba/stable
Expand Down Expand Up @@ -123,9 +123,15 @@ CONFIGURE_ARGS += \

MAKE_FLAGS += DYNEXP= PICFLAG= MODULES=

define Package/samba36-server/conffiles
/etc/config/samba
/etc/samba/smb.conf.template
/etc/samba/smbpasswd
endef

define Package/samba36-server/install
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_DATA) ./files/samba.config $(1)/etc/config/samba
$(INSTALL_CONF) ./files/samba.config $(1)/etc/config/samba
$(INSTALL_DIR) $(1)/etc/samba
$(INSTALL_DATA) ./files/smb.conf.template $(1)/etc/samba
$(INSTALL_DATA) $(PKG_BUILD_DIR)/codepages/lowcase.dat $(1)/etc/samba
Expand All @@ -135,9 +141,9 @@ define Package/samba36-server/install
$(INSTALL_BIN) ./files/samba.init $(1)/etc/init.d/samba
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_BIN)/samba_multicall $(1)/usr/sbin
ln -sf samba_multicall $(1)/usr/sbin/smbd
ln -sf samba_multicall $(1)/usr/sbin/nmbd
ln -sf samba_multicall $(1)/usr/sbin/smbpasswd
$(LN) samba_multicall $(1)/usr/sbin/smbd
$(LN) samba_multicall $(1)/usr/sbin/nmbd
$(LN) samba_multicall $(1)/usr/sbin/smbpasswd
endef

define Package/samba36-client/install
Expand Down
1 change: 1 addition & 0 deletions targets/ar71xx/profiles/usb/profile_images
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
-smart-300-squashfs-
-tl-wr1043nd-v1-squashfs
-tl-wr1043nd-v2-squashfs
-tl-wr1043nd-v3-squashfs
-tl-wdr3600-v1-squashfs
-tl-wdr4300-v1-squashfs
-tl-wdr4310-v1-squashfs
Expand Down