From 09d432ba314e799648d8012d2a4d2f23930ec5e5 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Thu, 2 Jul 2020 14:35:44 +0800 Subject: [PATCH 1/8] squashfs: make mkfs with multi-cpus speedup --- include/image.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/image.mk b/include/image.mk index fd04d4020b..c0d0b61479 100644 --- a/include/image.mk +++ b/include/image.mk @@ -238,7 +238,7 @@ define Image/mkfs/squashfs $(STAGING_DIR_HOST)/bin/mksquashfs4 $(call mkfs_target_dir,$(1)) $@ \ -nopad -noappend -root-owned \ -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) \ - -processors 1 + -processors $(shell nproc) endef # $(1): board name From 47b81244ad3b5d503d590af5acc2b545922954a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=BF=E8=8F=8C=E2=80=A2=E6=9C=AA=E9=9C=9C?= <799620521@qq.com> Date: Thu, 2 Jul 2020 16:08:44 +0800 Subject: [PATCH 2/8] linux-firmware: intel: Downgrade wifi firmware version for k4.19 --- package/firmware/linux-firmware/intel.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/firmware/linux-firmware/intel.mk b/package/firmware/linux-firmware/intel.mk index 923701c703..401ab1aa7e 100644 --- a/package/firmware/linux-firmware/intel.mk +++ b/package/firmware/linux-firmware/intel.mk @@ -73,7 +73,7 @@ $(eval $(call BuildPackage,iwlwifi-firmware-iwl3160)) Package/iwlwifi-firmware-iwl3168 = $(call Package/firmware-default,Intel Wireless 3168 firmware) define Package/iwlwifi-firmware-iwl3168/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-3168-29.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-3168-27.ucode $(1)/lib/firmware endef $(eval $(call BuildPackage,iwlwifi-firmware-iwl3168)) @@ -157,14 +157,14 @@ $(eval $(call BuildPackage,iwlwifi-firmware-iwl8265)) Package/iwlwifi-firmware-iwl9000 = $(call Package/firmware-default,Intel Wireless 9000 firmware) define Package/iwlwifi-firmware-iwl9000/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-9000-pu-b0-jf-b0-46.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-9000-pu-b0-jf-b0-38.ucode $(1)/lib/firmware endef $(eval $(call BuildPackage,iwlwifi-firmware-iwl9000)) Package/iwlwifi-firmware-iwl9260 = $(call Package/firmware-default,Intel Wireless 9260 firmware) define Package/iwlwifi-firmware-iwl9260/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-9260-th-b0-jf-b0-46.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-9260-th-b0-jf-b0-38.ucode $(1)/lib/firmware endef $(eval $(call BuildPackage,iwlwifi-firmware-iwl9260)) From 919a46c8ddcdb7b8da5f30722d87809e5f7f734e Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Thu, 2 Jul 2020 16:35:09 +0800 Subject: [PATCH 3/8] ksmbd: bump version and update luci --- package/lean/ksmbd-tools/Makefile | 8 ++++---- package/lean/ksmbd-tools/files/ksmbd.config | 8 ++++++-- package/lean/ksmbd/Makefile | 6 +++--- .../ksmbd/patches/01-keep_kmod_metadata.patch | 5 +++-- package/lean/luci-app-cifsd/Makefile | 2 +- .../luci-app-cifsd/luasrc/controller/cifsd.lua | 2 +- .../luci-app-cifsd/luasrc/model/cbi/cifsd.lua | 13 ++++++++++--- package/lean/luci-app-cifsd/po/zh-cn/cifsd.po | 16 +++++++++++----- 8 files changed, 39 insertions(+), 21 deletions(-) diff --git a/package/lean/ksmbd-tools/Makefile b/package/lean/ksmbd-tools/Makefile index 87a0b0e97a..734dcc6ba5 100644 --- a/package/lean/ksmbd-tools/Makefile +++ b/package/lean/ksmbd-tools/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ksmbd-tools -PKG_VERSION:=3.2.3 -PKG_RELEASE:=1 +PKG_VERSION:=3.2.6 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/cifsd-team/cifsd-tools/archive/$(PKG_VERSION)/ -PKG_HASH:=d5e56b38f858736849aefd55cfbffe31ae3d4f39a13689aecb3e896f3b048866 +PKG_SOURCE_URL:=https://codeload.github.com/cifsd-team/ksmbd-tools/tar.gz/$(PKG_VERSION)? +PKG_HASH:=595029adb899fd8b4c49bea75bce4e3c3466811ef7089b2a55960174e720d919 PKG_MAINTAINER:=Andy Walsh PKG_LICENSE:=GPL-2.0-or-later diff --git a/package/lean/ksmbd-tools/files/ksmbd.config b/package/lean/ksmbd-tools/files/ksmbd.config index 52c65185cf..13591c98f0 100644 --- a/package/lean/ksmbd-tools/files/ksmbd.config +++ b/package/lean/ksmbd-tools/files/ksmbd.config @@ -1,3 +1,7 @@ + config globals - option 'workgroup' 'WORKGROUP' - option 'description' 'Ksmbd on OpenWrt' + option workgroup 'WORKGROUP' + option description 'OpenWrt' + option name 'OpenWrt' + option autoshare '0' + diff --git a/package/lean/ksmbd/Makefile b/package/lean/ksmbd/Makefile index 6403732392..c67c29c4e3 100644 --- a/package/lean/ksmbd/Makefile +++ b/package/lean/ksmbd/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ksmbd -PKG_VERSION:=3.1.6 +PKG_VERSION:=3.2.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/cifsd-team/cifsd/archive/$(PKG_VERSION)/ -PKG_HASH:=09c1eb39d9dcc9baf6bc9c5a2b91bcea377352bfc507ebdd10a370fffa7c31b4 +PKG_SOURCE_URL:=https://codeload.github.com/cifsd-team/cifsd/tar.gz/$(PKG_VERSION)? +PKG_HASH:=16ad304c09d5f04ddbe99d21ca9df8a9a6d8e35b21ff0e205f212f8c545b979b PKG_MAINTAINER:=Andy Walsh PKG_LICENSE:=GPL-2.0-or-later diff --git a/package/lean/ksmbd/patches/01-keep_kmod_metadata.patch b/package/lean/ksmbd/patches/01-keep_kmod_metadata.patch index 9fc547f2a6..a705529935 100644 --- a/package/lean/ksmbd/patches/01-keep_kmod_metadata.patch +++ b/package/lean/ksmbd/patches/01-keep_kmod_metadata.patch @@ -1,5 +1,5 @@ ---- a/glob.h 2019-12-08 -+++ b/glob.h 2019-12-08 +--- a/glob.h ++++ b/glob.h @@ -7,6 +7,8 @@ #ifndef __KSMBD_GLOB_H #define __KSMBD_GLOB_H @@ -8,3 +8,4 @@ + #include #include + diff --git a/package/lean/luci-app-cifsd/Makefile b/package/lean/luci-app-cifsd/Makefile index 26347d6ca4..4f5faa6da8 100644 --- a/package/lean/luci-app-cifsd/Makefile +++ b/package/lean/luci-app-cifsd/Makefile @@ -7,7 +7,7 @@ LUCI_DEPENDS:=+ksmbd-server LUCI_PKGARCH:=all PKG_NAME:=luci-app-cifsd PKG_VERSION:=1 -PKG_RELEASE:=7 +PKG_RELEASE:=12 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-cifsd/luasrc/controller/cifsd.lua b/package/lean/luci-app-cifsd/luasrc/controller/cifsd.lua index 7719be2745..a0a59dfe15 100644 --- a/package/lean/luci-app-cifsd/luasrc/controller/cifsd.lua +++ b/package/lean/luci-app-cifsd/luasrc/controller/cifsd.lua @@ -11,7 +11,7 @@ function index() local page - page = entry({"admin", "nas", "cifsd"}, cbi("cifsd"), _("Network Shares (CIFSD)")) + page = entry({"admin", "nas", "cifsd"}, cbi("cifsd"), _("Network Shares")) page.dependent = true end diff --git a/package/lean/luci-app-cifsd/luasrc/model/cbi/cifsd.lua b/package/lean/luci-app-cifsd/luasrc/model/cbi/cifsd.lua index 6b2d886c09..d907ac7873 100644 --- a/package/lean/luci-app-cifsd/luasrc/model/cbi/cifsd.lua +++ b/package/lean/luci-app-cifsd/luasrc/model/cbi/cifsd.lua @@ -1,6 +1,6 @@ -- Licensed to the public under the Apache License 2.0. -m = Map("ksmbd", translate("Network Shares (CIFSD)")) +m = Map("ksmbd", translate("Network Shares")) s = m:section(TypedSection, "globals", translate("CIFSD is an opensource In-kernel SMB1/2/3 server")) s.anonymous = true @@ -8,11 +8,18 @@ s.anonymous = true s:tab("general", translate("General Settings")) s:tab("template", translate("Edit Template")) +s:taboption("general", Value, "name", translate("Hostname")) + s:taboption("general", Value, "description", translate("Description")) o = s:taboption("general", Value, "workgroup", translate("Workgroup")) o.placeholder = 'WORKGROUP' +a = s:taboption("general", Flag, "autoshare", translate("Auto Share"), + translate("Auto share local disk which connected")) +a.rmempty = false +a.default = "0" + tmpl = s:taboption("template", Value, "_tmpl", translate("Edit the template that is used for generating the cifsd configuration."), translate("This is the content of the file '/etc/ksmbd/smb.conf.template' from which your cifsd configuration will be generated. \ @@ -68,9 +75,9 @@ go.enabled = "yes" go.disabled = "no" go.default = "yes" -io = s:option(Flag, "inherit_owner", translate("Inherit owner")) +-- io = s:option(Flag, "inherit_owner", translate("Inherit owner")) -hd = s:option(Flag, "hide_dot_files", translate("Hide dot files")) +-- hd = s:option(Flag, "hide_dot_files", translate("Hide dot files")) cm = s:option(Value, "create_mask", translate("Create mask"), translate("Mask for new files")) diff --git a/package/lean/luci-app-cifsd/po/zh-cn/cifsd.po b/package/lean/luci-app-cifsd/po/zh-cn/cifsd.po index e552e418a9..d9f38a7cf9 100644 --- a/package/lean/luci-app-cifsd/po/zh-cn/cifsd.po +++ b/package/lean/luci-app-cifsd/po/zh-cn/cifsd.po @@ -46,7 +46,7 @@ msgstr "编辑用来生成 cifsd 设置的模板。" #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:67 msgid "Force Root" -msgstr "强制 Root" +msgstr "使用 Root" #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:21 msgid "General Settings" @@ -102,18 +102,18 @@ msgid "" "('|') should not be changed. They get their values from the 'General " "Settings' tab." msgstr "" -"这是将从其上生成 cifsd 配置的文件“/etc/ksmbd/smb.conf.template”的内容。由管道" +"这是将从其上生成 Ksmbd 配置的文件“/etc/ksmbd/smb.conf.template”的内容。由管道" "符（“|”）包围的值不应更改。它们将从“常规设置”标签中获取其值。" #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:27 msgid "Workgroup" msgstr "工作组" -msgid "Network Shares (CIFSD)" -msgstr "网络共享 (CIFSD 内核)" +msgid "Network Shares" +msgstr "网络共享" msgid "CIFSD is an opensource In-kernel SMB1/2/3 server" -msgstr "CIFSD 是一个开源的 Linux 内核级 SMB1/2/3 高性能文件共享服务器" +msgstr "Ksmbd 是一个开源的 Linux 内核级 SMB1/2/3 高性能文件共享服务器" msgid "Browseable" msgstr "可浏览" @@ -126,3 +126,9 @@ msgstr "新建文件掩码" msgid "Mask for new directories" msgstr "新建文件夹掩码" + +msgid "Auto Share" +msgstr "自动共享" + +msgid "Auto share local disk which connected" +msgstr "自动匿名共享路由器所连接的硬盘" From 82d03e87a03f84cec41e287a765ae1eb44240bd4 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Thu, 2 Jul 2020 16:36:37 +0800 Subject: [PATCH 4/8] ksmbd: replace samba in ipq40xx and x86 --- target/linux/ipq40xx/Makefile | 2 +- target/linux/x86/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/ipq40xx/Makefile b/target/linux/ipq40xx/Makefile index d2696b771c..f8e750cd4f 100644 --- a/target/linux/ipq40xx/Makefile +++ b/target/linux/ipq40xx/Makefile @@ -19,7 +19,7 @@ DEFAULT_PACKAGES += \ kmod-leds-gpio kmod-gpio-button-hotplug swconfig \ kmod-ath10k wpad-openssl \ kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019 \ - automount autosamba luci-app-ipsec-vpnd luci-app-unblockmusic luci-app-cpufreq luci-app-zerotier luci-app-xlnetacc \ + automount luci-app-cifsd luci-app-ipsec-vpnd luci-app-unblockmusic luci-app-cpufreq luci-app-zerotier luci-app-xlnetacc \ htop fdisk e2fsprogs ethtool $(eval $(call BuildTarget)) diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index b95965f37d..6125f5240d 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += partx-utils mkf2fs fdisk e2fsprogs wpad kmod-usb-hid kmod-mmc-spi kmod-sdhci \ kmod-ath5k kmod-ath9k kmod-ath9k-htc kmod-ath10k kmod-rt2800-usb kmod-e1000e kmod-igb kmod-igbvf kmod-ixgbe kmod-pcnet32 kmod-tulip kmod-vmxnet3 kmod-i40e kmod-i40evf kmod-r8125 kmod-8139cp kmod-8139too kmod-fs-f2fs \ -htop lm-sensors autocore automount autosamba luci-app-ipsec-vpnd luci-proto-bonding luci-app-unblockmusic luci-app-zerotier luci-app-xlnetacc ddns-scripts_aliyun ddns-scripts_dnspod ca-certificates \ +htop lm-sensors autocore automount luci-app-cifsd luci-app-ipsec-vpnd luci-proto-bonding luci-app-unblockmusic luci-app-zerotier luci-app-xlnetacc ddns-scripts_aliyun ddns-scripts_dnspod ca-certificates \ ath10k-firmware-qca988x ath10k-firmware-qca9888 ath10k-firmware-qca9984 brcmfmac-firmware-43602a1-pcie \ kmod-sound-hda-core kmod-sound-hda-codec-realtek kmod-sound-hda-codec-via kmod-sound-via82xx kmod-sound-hda-intel kmod-sound-hda-codec-hdmi kmod-sound-i8x0 kmod-usb-audio \ kmod-usb-net kmod-usb-net-asix kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8150 kmod-usb-net-rtl8152 kmod-r8168 kmod-mlx4-core kmod-mlx5-core kmod-drm-amdgpu From a15e62191a3b066e1dcfe2b99933a2e4f260705e Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Thu, 2 Jul 2020 17:01:41 +0800 Subject: [PATCH 5/8] wol: add package --- package/lean/wol/Makefile | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 package/lean/wol/Makefile diff --git a/package/lean/wol/Makefile b/package/lean/wol/Makefile new file mode 100644 index 0000000000..7375b66c40 --- /dev/null +++ b/package/lean/wol/Makefile @@ -0,0 +1,50 @@ +# +# Copyright (C) 2007-2011 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=wol +PKG_VERSION:=0.7.1 +PKG_RELEASE:=3 + +PKG_SOURCE_URL:=@SF/ahh +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_MD5SUM:=c2fa9d7e771134ac8c89d56b8197d4ca + +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/wol + SECTION:=net + CATEGORY:=Network + TITLE:=Wake On LAN client + URL:=http://ahh.sourceforge.net/wol/ +endef + +define Package/wol/description + wol implements Wake On LAN functionality in a small program. + It wakes up hardware that is Magic Packet compliant. +endef + +CONFIGURE_VARS += \ + ac_cv_func_malloc_0_nonnull=yes \ + ac_cv_func_realloc_0_nonnull=yes \ + ac_cv_func_mmap_fixed_mapped=yes \ + jm_cv_func_working_malloc=yes \ + ac_cv_func_alloca_works=yes \ + +define Package/wol/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/bin/ +endef + +define Package/wol/conffiles +/etc/config/wol +endef + +$(eval $(call BuildPackage,wol)) \ No newline at end of file From 790ae11ef853796ecaefbfacc7c4931af609720b Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Thu, 2 Jul 2020 17:52:08 +0800 Subject: [PATCH 6/8] luci-theme-netgear: revert link --- .../luci-theme-netgear/luasrc/view/themes/netgear/header.htm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lean/luci-theme-netgear/luasrc/view/themes/netgear/header.htm b/package/lean/luci-theme-netgear/luasrc/view/themes/netgear/header.htm index 9610187264..57051a4ce4 100755 --- a/package/lean/luci-theme-netgear/luasrc/view/themes/netgear/header.htm +++ b/package/lean/luci-theme-netgear/luasrc/view/themes/netgear/header.htm @@ -175,7 +175,7 @@ end %> <% if ucichanges > 0 then %> - "><%:Unsaved Changes%>: <%=ucichanges%> + "><%=translate('Unsaved Changes')%>: <%=ucichanges%> <% end %>