Browse Source

Merge pull request #11131 from Andy2244/smbd-rename_ksmbd_update-3-1-1

smbd: update to 3.1.1, rename to "ksmbd", "ksmbd-tools"
lilik-openwrt-22.03
Hannu Nyman 5 years ago
committed by GitHub
parent
commit
4599d99f56
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 153 additions and 156 deletions
  1. +9
    -9
      kernel/ksmbd/Makefile
  2. +2
    -2
      kernel/ksmbd/patches/01-keep_kmod_metadata.patch
  3. +113
    -0
      net/ksmbd-tools/Makefile
  4. +1
    -1
      net/ksmbd-tools/files/ksmbd.config
  5. +1
    -1
      net/ksmbd-tools/files/ksmbd.config.example
  6. +27
    -30
      net/ksmbd-tools/files/ksmbd.init
  7. +0
    -0
      net/ksmbd-tools/files/smb.conf.template
  8. +0
    -113
      net/smbd-tools/Makefile

kernel/smbd/Makefile → kernel/ksmbd/Makefile View File


kernel/smbd/patches/01-keep_kmod_metadata.patch → kernel/ksmbd/patches/01-keep_kmod_metadata.patch View File


+ 113
- 0
net/ksmbd-tools/Makefile View File

@ -0,0 +1,113 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ksmbd-tools
PKG_VERSION:=3.1.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/cifsd-team/$(PKG_NAME)/archive/$(PKG_VERSION)/
PKG_HASH:=7a01b327028cb52824a394dc2c4e706d15145b823fd0ff399c359f7a4c991c4a
PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_REMOVE_FILES:=autogen.sh
PKG_BUILD_DEPENDS:=glib2
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/ksmbd-tools/Default
SECTION:=net
CATEGORY:=Network
SUBMENU:=Filesystem
TITLE:=Kernel SMB
URL:=https://github.com/cifsd-team/ksmbd-tools
DEPENDS:= $(ICONV_DEPENDS) $(INTL_DEPENDS)
endef
define Package/ksmbd-tools/Default/description
Userspace tools to manage the SMB kernel fileserver (ksmbd.ko).
The config file location is /etc/ksmbd/smb.conf
endef
define Package/ksmbd-server
$(call Package/ksmbd-tools/Default)
TITLE+= server
DEPENDS+= +kmod-fs-ksmbd +libnl-core +libnl-genl
endef
define Package/ksmbd-server/description
installs: usmbd
This provides the basic fileserver service and is the minimum needed to serve 'guest only' file shares or use a existing user database file ksmbdpwd.db.
endef
define Package/ksmbd-server/config
select PACKAGE_wsdd2
endef
define Package/ksmbd-utils
$(call Package/ksmbd-tools/Default)
TITLE+= user management-util
endef
define Package/ksmbd-utils/description
installs: smbuseradd (smbshareadd)
Tool needed to create the ksmbdpwd.db, to manage per user share passwords.
NOTE: Not needed for 'guest only' shares.
endef
define Package/ksmbd-utils/config
config KSMBD_UTILS_SHAREADD
bool "Add smbshareadd util"
depends on PACKAGE_ksmbd-utils
help
Add the smbshareadd tool, to directly manipulate the /etc/ksmbd/smb.conf.
default n
endef
CONFIGURE_ARGS += \
--disable-shared \
--enable-static
CONFIGURE_VARS += GLIB_LIBS="$(STAGING_DIR)/usr/lib/libglib-2.0.a"
TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto
TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed -liconv $(if $(INTL_FULL),-lintl)
define Package/ksmbd-server/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/usmbd $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/config $(1)/etc/ksmbd $(1)/etc/init.d
$(INSTALL_CONF) ./files/ksmbd.config $(1)/etc/config/ksmbd
$(INSTALL_DATA) ./files/smb.conf.template $(1)/etc/ksmbd/
$(INSTALL_BIN) ./files/ksmbd.init $(1)/etc/init.d/ksmbd
# copy examples until we have a wiki page
$(INSTALL_DATA) ./files/ksmbd.config.example $(1)/etc/ksmbd/
$(INSTALL_DATA) $(PKG_BUILD_DIR)/Documentation/configuration.txt $(1)/etc/ksmbd/
endef
define Package/ksmbd-utils/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/smbuseradd $(1)/usr/sbin/
ifeq ($(CONFIG_KSMBD_UTILS_SHAREADD),y)
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/smbshareadd $(1)/usr/sbin/
endif
endef
define Package/ksmbd-server/conffiles
/etc/config/ksmbd
/etc/ksmbd/smb.conf.template
/etc/ksmbd/smb.conf
/etc/ksmbd/ksmbdpwd.db
endef
$(eval $(call BuildPackage,ksmbd-server))
$(eval $(call BuildPackage,ksmbd-utils))

net/smbd-tools/files/smbd.config → net/ksmbd-tools/files/ksmbd.config View File


net/smbd-tools/files/smbd.config.example → net/ksmbd-tools/files/ksmbd.config.example View File


net/smbd-tools/files/smbd.init → net/ksmbd-tools/files/ksmbd.init View File


net/smbd-tools/files/smb.conf.template → net/ksmbd-tools/files/smb.conf.template View File


+ 0
- 113
net/smbd-tools/Makefile View File

@ -1,113 +0,0 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=smbd-tools
PKG_VERSION:=3.0.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/cifsd-team/$(PKG_NAME)/archive/$(PKG_VERSION)/
PKG_HASH:=29f85de8b39608d28ec406c8b557264e004f5dce9b307a37f8324508cdea6217
PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_REMOVE_FILES:=autogen.sh
PKG_BUILD_DEPENDS:=glib2
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/smbd-tools/Default
SECTION:=net
CATEGORY:=Network
SUBMENU:=Filesystem
TITLE:=Kernel SMB
URL:=https://github.com/cifsd-team/smbd-tools
DEPENDS:= +glib2 $(ICONV_DEPENDS) $(INTL_DEPENDS)
endef
define Package/smbd-tools/Default/description
Userspace tools for the SMB kernel fileserver (smbd.ko).
The config file location is /etc/smbd/smb.conf
endef
define Package/smbd-server
$(call Package/smbd-tools/Default)
TITLE+= server
DEPENDS+= +kmod-fs-smbd +libnl-core +libnl-genl
endef
define Package/smbd-server/description
installs: usmbd
This provides the basic fileserver service and is the minimum needed to serve 'guest only' file shares or use a existing smbdpwd.db.
endef
define Package/smbd-server/config
select PACKAGE_wsdd2
endef
define Package/smbd-utils
$(call Package/smbd-tools/Default)
TITLE+= user management-util
endef
define Package/smbd-utils/description
installs: smbuseradd (smbshareadd)
Tool needed to create the smbdpwd.db, to manage per user share passwords.
NOTE: Not needed for 'guest only' shares.
endef
define Package/smbd-utils/config
config SMBD_UTILS_SHAREADD
bool "Add smbshareadd util"
depends on PACKAGE_smbd-utils
help
Add the smbshareadd tool, to directly manipulate the /etc/smbd/smb.conf.
default n
endef
CONFIGURE_ARGS += \
--disable-shared \
--enable-static
# CONFIGURE_VARS += GLIB_LIBS="$(STAGING_DIR)/usr/lib/libglib-2.0.a"
TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto
TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed -liconv $(if $(INTL_FULL),-lintl)
define Package/smbd-server/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/usmbd $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/config $(1)/etc/smbd $(1)/etc/init.d
$(INSTALL_CONF) ./files/smbd.config $(1)/etc/config/smbd
$(INSTALL_DATA) ./files/smb.conf.template $(1)/etc/smbd/
$(INSTALL_BIN) ./files/smbd.init $(1)/etc/init.d/smbd
# copy examples until we have a wiki page
$(INSTALL_DATA) ./files/smbd.config.example $(1)/etc/smbd/
$(INSTALL_DATA) $(PKG_BUILD_DIR)/Documentation/configuration.txt $(1)/etc/smbd/
endef
define Package/smbd-utils/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/smbuseradd $(1)/usr/sbin/
ifeq ($(CONFIG_SMBD_UTILS_SHAREADD),y)
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/smbshareadd $(1)/usr/sbin/
endif
endef
define Package/smbd-server/conffiles
/etc/config/smbd
/etc/smbd/smb.conf.template
/etc/smbd/smb.conf
/etc/smbd/smbdpwd.db
endef
$(eval $(call BuildPackage,smbd-server))
$(eval $(call BuildPackage,smbd-utils))

Loading…
Cancel
Save