From 6c4603dd2512294a34961f97d6c60d08aba1862b Mon Sep 17 00:00:00 2001
From: John Doe <klever1988@protonmail.com>
Date: Thu, 25 Mar 2021 08:50:22 +0800
Subject: [PATCH] build: move packages to base

---
 .github/workflows/lo-test.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml
index 0a004e2..d32e160 100644
--- a/.github/workflows/lo-test.yml
+++ b/.github/workflows/lo-test.yml
@@ -65,6 +65,17 @@ jobs:
           ./scripts/feeds install -a
           . $GITHUB_WORKSPACE/patches.sh
           . $GITHUB_WORKSPACE/merge_packages.sh
+          rm -rf package/base; mkdir -p package/base; cd ../
+          svn export https://github.com/openwrt/packages/branches/openwrt-18.06 packages
+          pushd packages
+          ls -d */ | xargs -n1 -i diff -q {} ../lede/feeds/packages/{} | grep Only | grep lede | grep -v -E lang\|devel\|ovn | awk '{print $3 $4}' | tr -d ':' | xargs -n1 -i mv {} ../lede/package/base/
+          sed -i 's/include ..\/..\//include $(TOPDIR)\/feeds\/packages\//' ../lede/package/base/*/Makefile ../lede/feeds/packages/devel/ninja/ninja-cmake.mk
+          popd
+          svn export https://github.com/openwrt/luci/branches/openwrt-18.06 luci
+          pushd luci
+          ls -d */ | xargs -n1 -i diff -q {} ../lede/feeds/luci/{} | grep Only | grep lede | grep -E applications\|themes | awk '{print $3 $4}' | tr -d ':' | xargs -n1 -i mv {} ../lede/package/base/
+          sed -i 's/include ..\/..\//include $(TOPDIR)\/feeds\/luci\//' ../lede/package/base/luci-*/Makefile
+          popd
           sed -i 's/..\/..\//$(TOPDIR)\/feeds\/packages\//' package/feeds/packages/baidupcs-web/Makefile
           sed -i 's/..\/..\//$(TOPDIR)\/feeds\/packages\//' package/feeds/packages/filebrowser/Makefile