From 84b6e45e399e15fc3f86d25fede6abf246ecbba3 Mon Sep 17 00:00:00 2001
From: John Doe <klever1988@protonmail.com>
Date: Wed, 17 Mar 2021 17:56:34 +0800
Subject: [PATCH] build: use self-hosted package feeds

---
 .github/workflows/lo-test.yml                       |   2 +-
 .../etc/dropbear}/dropbear_ecdsa_host_key           | Bin
 .../etc/dropbear}/dropbear_ed25519_host_key         | Bin
 .../etc/dropbear}/dropbear_rsa_host_key             | Bin
 files/etc/opkg/distfeeds.conf                       |   4 ++++
 patches.sh                                          |   9 ++++-----
 6 files changed, 9 insertions(+), 6 deletions(-)
 rename {host_keys => files/etc/dropbear}/dropbear_ecdsa_host_key (100%)
 rename {host_keys => files/etc/dropbear}/dropbear_ed25519_host_key (100%)
 rename {host_keys => files/etc/dropbear}/dropbear_rsa_host_key (100%)
 create mode 100644 files/etc/opkg/distfeeds.conf

diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml
index 519c106..c3f4e02 100644
--- a/.github/workflows/lo-test.yml
+++ b/.github/workflows/lo-test.yml
@@ -200,7 +200,7 @@ jobs:
           make target/linux/compile -j$(($(nproc) + 1))
           make package/compile -j$(($(nproc) + 1)) IGNORE_ERRORS=y
           make package/index
-          sed "s/\-[a-z0-9]\{32\})/)/" bin/targets/*/*/packages/Packages bin/targets/*/*/packages/Packages.manifest
+          sed -i "s/\-[a-z0-9]\{32\})/)/" bin/targets/*/*/packages/Packages bin/targets/*/*/packages/Packages.manifest
           gzip -f bin/targets/*/*/packages/Packages
           mkdir -p ~/.ssh; echo ${{env.DEPLOY_SSHKEY}} | base64 -d > ~/.ssh/id_ed25519; chmod 600 ~/.ssh/id_ed25519
           rsync -ach --progress -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \
diff --git a/host_keys/dropbear_ecdsa_host_key b/files/etc/dropbear/dropbear_ecdsa_host_key
similarity index 100%
rename from host_keys/dropbear_ecdsa_host_key
rename to files/etc/dropbear/dropbear_ecdsa_host_key
diff --git a/host_keys/dropbear_ed25519_host_key b/files/etc/dropbear/dropbear_ed25519_host_key
similarity index 100%
rename from host_keys/dropbear_ed25519_host_key
rename to files/etc/dropbear/dropbear_ed25519_host_key
diff --git a/host_keys/dropbear_rsa_host_key b/files/etc/dropbear/dropbear_rsa_host_key
similarity index 100%
rename from host_keys/dropbear_rsa_host_key
rename to files/etc/dropbear/dropbear_rsa_host_key
diff --git a/files/etc/opkg/distfeeds.conf b/files/etc/opkg/distfeeds.conf
new file mode 100644
index 0000000..4cbd010
--- /dev/null
+++ b/files/etc/opkg/distfeeds.conf
@@ -0,0 +1,4 @@
+src/gz immortalwrt_core https://imgxxx.net/DEVICE/core/
+src/gz immortalwrt_base https://imgxxx.net/DEVICE/base/
+src/gz immortalwrt_luci https://imgxxx.net/DEVICE/luci/
+src/gz immortalwrt_packages https://imgxxx.net/DEVICE/packages/
diff --git a/patches.sh b/patches.sh
index 8768538..8f1b716 100644
--- a/patches.sh
+++ b/patches.sh
@@ -9,13 +9,12 @@ sed -i "s/option sfe_flow '1'/option sfe_flow '0'/" package/ctcgfw/luci-app-turb
 sed -i "s/option sfe_bridge '1'/option sfe_bridge '0'/" package/ctcgfw/luci-app-turboacc/root/etc/config/turboacc
 sed -i "/INCLUDE_shortcut-fe=n/d" package/ctcgfw/luci-app-turboacc/Makefile
 
-sed '/Installed-Time/a\sed "s/\-[a-z0-9]\{32\})/)/" $(1)/usr/lib/opkg/status\' include/rootfs.mk
-
+sed -i '/Installed-Time/a\sed -i "s/\\(\d\)-[a-z0-9]\{32\}/\1/" $(1)/usr/lib/opkg/status\' include/rootfs.mk
 find . -type f -name nft-qos.config | xargs sed -i "s/option limit_enable '1'/option limit_enable '0'/"
 sed -i "/\/etc\/coremark\.sh/d" package/feeds/packages/coremark/Makefile
 sed -i 's/192.168.1.1/192.168.2.1/' package/base-files/files/bin/config_generate
 
-rm -rf files && mkdir files
-mkdir -p files/etc/dropbear
-mv $GITHUB_WORKSPACE/host_keys/* files/etc/dropbear/
+rm -rf files
+mv $GITHUB_WORKSPACE/files ./
 chmod 600 files/etc/dropbear/*
+sed -i "s/DEVICE/$DEVICE/" files/etc/opkg/distfeeds.conf