package: fix cifsd

.github/workflows/lo-test.yml

@@ -61,9 +61,7 @@ jobs:
       - name: Custom configure file
         run: |
           cd ~/lede
-          rm -f .config*
           cat $GITHUB_WORKSPACE/$DEVICE.config.seed > .config
-          cat .config
 
       - name: Compile firmware
         run: |
@@ -79,11 +77,13 @@ jobs:
           rm -rf build_dir staging_dir; mv sdk/*/build_dir ./ && rsync -a --ignore-existing sdk/*/staging_dir/ ./staging_dir/
           rm -rf sdk
           fi
-          ln -sf /usr/bin/upx-ucl staging_dir/host/bin/upx
+          #ln -sf /usr/bin/upx-ucl staging_dir/host/bin/upx
+          rm staging_dir/host/bin/upx
           sed -i '/\(tools\|toolchain\)\/Makefile/d' Makefile
           echo -e '# CONFIG_SIGNED_PACKAGES is not set\n' >> .config
+          find . -name Makefile | xargs -n1 grep -l '(STAGING_DIR_HOST)/bin/upx ' | xargs -n1 sed -i '/upx/d'
 
-          make defconfig && cat .config
+          make defconfig
 
           while true; do make download -j && break || true; done
           while true; do make package/download -j && break || true; done

merge_packages.sh

@@ -1,3 +1,5 @@
 git clone --depth=1 https://github.com/destan19/OpenAppFilter.git && rm -r package/OpenAppFilter && mv OpenAppFilter package/
 git clone --depth=1 -b 18.06 https://github.com/jerrykuku/luci-theme-argon.git && rm -r package/lean/luci-theme-argon && mv luci-theme-argon package/lean/
 svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-cifsd && rm -r package/lean/luci-app-ksmbd && mv luci-app-cifsd package/lean/
+svn co https://github.com/coolsnowwolf/packages/trunk/kernel/ksmbd && rm -r package/feeds/packages/ksmbd && mv ksmbd package/feeds/packages/
+svn co https://github.com/coolsnowwolf/packages/trunk/net/ksmbd-tools && rm -r package/feeds/packages/ksmbd-tools && mv ksmbd-tools package/feeds/packages/