Merge branch 'sbwml:master' into master

pmkol · Apr 16, 2024 · c5a6d67 · c5a6d67
2 parents 65bd91f + e1f635f
commit c5a6d67
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/openwrt/23-config-common b/openwrt/23-config-common
@@ -290,6 +290,7 @@ CONFIG_PACKAGE_coreutils-nproc=y
 CONFIG_PACKAGE_coreutils-rm=y
 CONFIG_PACKAGE_coreutils-sha1sum=y
 CONFIG_PACKAGE_coreutils-sha512sum=y
+CONFIG_PACKAGE_coreutils-sleep=y
 CONFIG_PACKAGE_coreutils-timeout=y
 CONFIG_PACKAGE_coreutils-truncate=y
 

diff --git a/openwrt/scripts/02-prepare_package.sh b/openwrt/scripts/02-prepare_package.sh
@@ -60,6 +60,8 @@ sed -i 's/#directory mask/directory mask/g' feeds/packages/net/samba4/files/smb.
 sed -i 's/0666/0644/g;s/0744/0755/g;s/0777/0755/g' feeds/luci/applications/luci-app-samba4/htdocs/luci-static/resources/view/samba4.js
 sed -i 's/0666/0644/g;s/0777/0755/g' feeds/packages/net/samba4/files/samba.config
 sed -i 's/0666/0644/g;s/0777/0755/g' feeds/packages/net/samba4/files/smb.conf.template
+# rk3568 bind cpus
+[ "$platform" = "rk3568" ] && sed -i 's#/usr/sbin/smbd#/usr/bin/taskset -c 0-1 /usr/sbin/smbd#' feeds/packages/net/samba4/files/samba.init
 
 # autoCore
 git clone https://$github/sbwml/autocore-arm -b openwrt-23.05 package/new/autocore