Merge remote-tracking branch 'upstream/master'

pmkol · Sep 8, 2024 · cbffbe1 · cbffbe1
2 parents 4f6b2b8 + a6339a3
commit cbffbe1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/openwrt/scripts/02-prepare_package.sh b/openwrt/scripts/02-prepare_package.sh
@@ -52,6 +52,9 @@ curl -s https://$mirror/openwrt/patch/luci/applications/002-luci-app-frpc-add-en
 # samba4 - bump version
 rm -rf feeds/packages/net/samba4
 git clone https://$github/sbwml/feeds_packages_net_samba4 feeds/packages/net/samba4
+# liburing - 2.7 (samba-4.21.0)
+rm -rf feeds/packages/libs/liburing
+git clone https://$github/sbwml/feeds_packages_libs_liburing feeds/packages/libs/liburing
 # enable multi-channel
 sed -i '/workgroup/a \\n\t## enable multi-channel' feeds/packages/net/samba4/files/smb.conf.template
 sed -i '/enable multi-channel/a \\tserver multi channel support = yes' feeds/packages/net/samba4/files/smb.conf.template

diff --git a/tags/kernel-6.6 b/tags/kernel-6.6
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.6 = .49
-LINUX_KERNEL_HASH-6.6.49 = 2c56dac2b70859c16b4ef651befb0d28c227498bd3eee08e8a45a357f22dd3b7
+LINUX_VERSION-6.6 = .50
+LINUX_KERNEL_HASH-6.6.50 = c065e36daf28210060c91a37ef3e92ac5814784e634577e04e406297ead2e86e