jeka/openwrt-xiaomi
1
0
Fork 0
mirror of https://github.com/openwrt-xiaomi/builder.git synced 2026-01-02 20:13:37 +05:00
Code Issues Packages Projects Releases Wiki Activity

xmake: Fix install fantastic packages keys and src

Browse Source
This commit is contained in:
remittor
2026-01-01 21:12:16 +03:00
parent eb978ba58e
commit e57e548f61
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/build.yml vendored
View File

@@ -199,7 +199,8 @@ jobs:
- name: Init builder - name: Init builder
run: | run: |
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/master/keys/apksign/20241123170031.pub
wget https://fantastic-packages.github.io/releases/25.12/20241123170031.pub
- name: Cache downloads (dl) - name: Cache downloads (dl)
if: false if: false

37
xmake.sh
View File

@@ -282,28 +282,29 @@ function build_target {
echo "Patch '$(basename $incfn)' result: OK" echo "Patch '$(basename $incfn)' result: OK"
done done
OPKG_DIR=$XDIR/files/etc/opkg APK_DIR=$XDIR/files/etc/apk
if [ -d $OPKG_DIR ]; then if [ -d $APK_DIR ]; then
rm -rf $OPKG_DIR rm -rf $APK_DIR
fi fi
FANT_PKG_KEY=$XDIR/53FF2B6672243D28.pub FANT_PKG_KEY=$XDIR/20241123170031.pub
if [ -f $FANT_PKG_KEY ]; then if [ -f $FANT_PKG_KEY ]; then
OPKG_SRC_DIR=$XDIR/package/system/opkg/files APK_SRC_DIR=$XDIR/package/system/apk/files
OPKG_KEYS_DIR=$OPKG_DIR/keys APK_KEYS_DIR=$APK_DIR/keys
mkdir -p $OPKG_KEYS_DIR mkdir -p $APK_KEYS_DIR
cp $FANT_PKG_KEY $OPKG_KEYS_DIR/53ff2b6672243d28 cp $FANT_PKG_KEY $APK_KEYS_DIR/fantastic-packages-20241123170031.pem
OPKG_CFEED_FN=$OPKG_DIR/customfeeds.conf APK_CFEED_FN=$APK_DIR/repositories.d/customfeeds.list
cp $OPKG_SRC_DIR/customfeeds.conf $OPKG_CFEED_FN mkdir -p $APK_DIR/repositories.d
PKG_LINK="https://fantastic-packages.github.io/packages/releases/<<VER>>/packages/<<ARCH>>" cp $APK_SRC_DIR/customfeeds.list $APK_CFEED_FN
echo "" >> $OPKG_CFEED_FN PKG_LINK="https://fantastic-packages.github.io/releases/<<VER>>/packages/<<ARCH>>"
echo "src/gz fantastic_packages_luci $PKG_LINK/luci" >> $OPKG_CFEED_FN echo "" >> $APK_CFEED_FN
echo "src/gz fantastic_packages_packages $PKG_LINK/packages" >> $OPKG_CFEED_FN echo "$PKG_LINK/luci/packages.adb" >> $APK_CFEED_FN
echo "src/gz fantastic_packages_special $PKG_LINK/special" >> $OPKG_CFEED_FN echo "$PKG_LINK/packages/packages.adb" >> $APK_CFEED_FN
echo "$PKG_LINK/special/packages.adb" >> $APK_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>>/25.12/g" $APK_CFEED_FN
sed -i "s/<<ARCH>>/$TARGET_ARCH_PACKAGES/g" $OPKG_CFEED_FN sed -i "s/<<ARCH>>/$TARGET_ARCH_PACKAGES/g" $APK_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/releases]"
fi fi
SYSCTLCONF_FN=$XDIR/files/etc/sysctl.conf SYSCTLCONF_FN=$XDIR/files/etc/sysctl.conf