mirror of
https://github.com/openwrt-xiaomi/builder.git
synced 2025-12-29 01:53:38 +05:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fc2ca4f2de | ||
|
|
abdae49448 |
6
.github/workflows/build.yml
vendored
6
.github/workflows/build.yml
vendored
@@ -21,8 +21,8 @@ env:
|
|||||||
FAKE_BUILD: ${{ github.event.inputs.fake_build }}
|
FAKE_BUILD: ${{ github.event.inputs.fake_build }}
|
||||||
REPO_URL: https://github.com/openwrt-xiaomi/openwrt
|
REPO_URL: https://github.com/openwrt-xiaomi/openwrt
|
||||||
REPO_LNK: openwrt-xiaomi/openwrt
|
REPO_LNK: openwrt-xiaomi/openwrt
|
||||||
REPO_BRANCH: xq-25.12
|
REPO_BRANCH: xq-24.10
|
||||||
TAG_PREFIX: v25-
|
TAG_PREFIX: v24-
|
||||||
BUILD_ROOT: ${{ github.workspace }}/openwrt
|
BUILD_ROOT: ${{ github.workspace }}/openwrt
|
||||||
DEPENDENCIES: ${{ github.workspace }}/dependencies-ubuntu.txt
|
DEPENDENCIES: ${{ github.workspace }}/dependencies-ubuntu.txt
|
||||||
TZ: UTC
|
TZ: UTC
|
||||||
@@ -159,7 +159,7 @@ jobs:
|
|||||||
rsync -avq --exclude=".*" --exclude="$(basename $BUILD_ROOT)" $BLDROOT/ $BUILD_ROOT/
|
rsync -avq --exclude=".*" --exclude="$(basename $BUILD_ROOT)" $BLDROOT/ $BUILD_ROOT/
|
||||||
cd $BUILD_ROOT
|
cd $BUILD_ROOT
|
||||||
chmod +x *.sh
|
chmod +x *.sh
|
||||||
wget https://github.com/fantastic-packages/packages/raw/refs/heads/25.12/keys/usign/53FF2B6672243D28.pub
|
wget https://github.com/fantastic-packages/packages/raw/refs/heads/24.10/keys/usign/53FF2B6672243D28.pub
|
||||||
|
|
||||||
- name: Update OpenWrt packages
|
- name: Update OpenWrt packages
|
||||||
id: update
|
id: update
|
||||||
|
|||||||
25
xmake.sh
25
xmake.sh
@@ -144,29 +144,8 @@ function build_target {
|
|||||||
sed -i '/,\\"dns_configured\\":/i [ -z "$(which sing-box)" ] && status="not installed"' $PODKOP_SH
|
sed -i '/,\\"dns_configured\\":/i [ -z "$(which sing-box)" ] && status="not installed"' $PODKOP_SH
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DROPBEAR_DIR=$XDIR/package/network/services/dropbear
|
DROPBEAR_MK=$XDIR/package/network/services/dropbear/Makefile
|
||||||
TMP_DROPBEAR_DIR=$XDIR/_dropbear2024
|
|
||||||
if [ -f $DROPBEAR_MK ]; then
|
if [ -f $DROPBEAR_MK ]; then
|
||||||
# download dropbear 2024.86 (OpenWrt v24.10)
|
|
||||||
if [ ! -f $TMP_DROPBEAR_DIR/Makefile ]; then
|
|
||||||
rm -rf $TMP_DROPBEAR_DIR
|
|
||||||
git clone --depth 1 --filter=blob:none --sparse https://github.com/openwrt/openwrt.git $TMP_DROPBEAR_DIR && (
|
|
||||||
cd $TMP_DROPBEAR_DIR
|
|
||||||
git sparse-checkout set package/network/services/dropbear
|
|
||||||
git checkout a2f0cd35ac1d15e69f4897b35c049e175dd06825 # commit 2024-12-12 https://github.com/openwrt/openwrt/commits/openwrt-25.12/package/network/services/dropbear
|
|
||||||
mv package/network/services/dropbear/* .
|
|
||||||
)
|
|
||||||
rm -rf $TMP_DROPBEAR_DIR/package
|
|
||||||
rm -rf $TMP_DROPBEAR_DIR/.git
|
|
||||||
fi
|
|
||||||
rm -rf $DROPBEAR_DIR/files
|
|
||||||
rm -rf $DROPBEAR_DIR/patches
|
|
||||||
fi
|
|
||||||
DROPBEAR_MK=$DROPBEAR_DIR/Makefile
|
|
||||||
if [ -f $DROPBEAR_MK ]; then
|
|
||||||
# downgrade dropbear to 2024.86 (OpenWrt v24.10)
|
|
||||||
cp -a $TMP_DROPBEAR_DIR/. $DROPBEAR_DIR/
|
|
||||||
# patch: Disable MODERN and enable RSA/DH-SHA1
|
|
||||||
sed -i 's/^PKG_RELEASE:=.*/PKG_RELEASE:=0/g' $DROPBEAR_MK
|
sed -i 's/^PKG_RELEASE:=.*/PKG_RELEASE:=0/g' $DROPBEAR_MK
|
||||||
sed -i '/,CONFIG_DROPBEAR_MODERN_ONLY,/d' $DROPBEAR_MK
|
sed -i '/,CONFIG_DROPBEAR_MODERN_ONLY,/d' $DROPBEAR_MK
|
||||||
sed -i 's/\tCONFIG_DROPBEAR_MODERN_ONLY/ /g' $DROPBEAR_MK
|
sed -i 's/\tCONFIG_DROPBEAR_MODERN_ONLY/ /g' $DROPBEAR_MK
|
||||||
@@ -301,7 +280,7 @@ function build_target {
|
|||||||
echo "src/gz fantastic_packages_special $PKG_LINK/special" >> $OPKG_CFEED_FN
|
echo "src/gz fantastic_packages_special $PKG_LINK/special" >> $OPKG_CFEED_FN
|
||||||
TARGET_ARCH_PACKAGES=$( get_cfg_opt_value $CFG TARGET_ARCH_PACKAGES )
|
TARGET_ARCH_PACKAGES=$( get_cfg_opt_value $CFG TARGET_ARCH_PACKAGES )
|
||||||
[ -z "$TARGET_ARCH_PACKAGES" ] && die "Cannot find TARGET ARCH"
|
[ -z "$TARGET_ARCH_PACKAGES" ] && die "Cannot find TARGET ARCH"
|
||||||
sed -i "s/<<VER>>/25.12/g" $OPKG_CFEED_FN
|
sed -i "s/<<VER>>/24.10/g" $OPKG_CFEED_FN
|
||||||
sed -i "s/<<ARCH>>/$TARGET_ARCH_PACKAGES/g" $OPKG_CFEED_FN
|
sed -i "s/<<ARCH>>/$TARGET_ARCH_PACKAGES/g" $OPKG_CFEED_FN
|
||||||
logmsg "Added support of Fantastic packages [https://fantastic-packages.github.io/packages]"
|
logmsg "Added support of Fantastic packages [https://fantastic-packages.github.io/packages]"
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user