From 5c7b5a2654ca200f65050e0f2e2c16ea3c466af1 Mon Sep 17 00:00:00 2001 From: suyuan168 <175338101@qq.com> Date: Wed, 29 Jun 2022 16:05:46 +0800 Subject: [PATCH] Update build.sh --- build.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 51dc3ea8..378ca1c8 100755 --- a/build.sh +++ b/build.sh @@ -98,7 +98,7 @@ if [ "$OMR_OPENWRT" = "default" ]; then _get_repo feeds/${OMR_KERNEL}/packages https://github.com/openwrt/packages "93aca6dfbe894217435e4623bc48489ab9695cd1" _get_repo feeds/${OMR_KERNEL}/luci https://github.com/openwrt/luci "9139ad468599b586dbd7ca48fe5a149c95f28800" else - _get_repo "$OMR_TARGET/${OMR_KERNEL}/source" https://github.com/openwrt/openwrt "cb1dc49c18e54fde6f8892d728c043b93dc995c3" + _get_repo "$OMR_TARGET/${OMR_KERNEL}/source" https://github.com/openwrt/openwrt "9d06e5a7735508d793c3a125f9f7d623671e29e4" _get_repo feeds/${OMR_KERNEL}/packages https://github.com/openwrt/packages "b4043d92257505526a5b8ceac94f9f28f887abbd" _get_repo feeds/${OMR_KERNEL}/luci https://github.com/openwrt/luci "111c551cdb8d14e8e5ef7c7a66ffdceb6d3cbb55" fi @@ -135,6 +135,16 @@ rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/files" "$OMR_TARGET/${OMR_KERNEL}/sourc rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/target/linux/mediatek/patches-5.4" rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/package/boot/uboot-mediatek" rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/package/boot/arm-trusted-firmware-mediatek" +rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/tools/firmware-utils" +if [ "$OMR_TARGET" != "rutx" ]; then + # There is many customization to support rutx and this seems to break other ipq40xx, so dirty workaround for now + mv "$OMR_TARGET/${OMR_KERNEL}/source/target/linux/ipq40xx" "$OMR_TARGET/${OMR_KERNEL}/source/target/linux/ipq40xx.old" + cp -rf root/* "$OMR_TARGET/${OMR_KERNEL}/source" + rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/target/linux/ipq40xx" + mv "$OMR_TARGET/${OMR_KERNEL}/source/target/linux/ipq40xx.old" "$OMR_TARGET/${OMR_KERNEL}/source/target/linux/ipq40xx" +else + cp -rf root/* "$OMR_TARGET/${OMR_KERNEL}/source" +fi cat >> "$OMR_TARGET/${OMR_KERNEL}/source/package/base-files/files/etc/banner" <> "$OMR_TARGET/${OMR_KERNEL}/source/package/base-files/files/etc/banner" << VERSION: $(git -C "$OMR_FEED" tag --sort=committerdate | tail -1) TARGET: $OMR_TARGET ARCH: $OMR_REAL_TARGET + + BUILD DATE: $(date -u) ----------------------------------------------------- EOF