From 6ce877b18eb58c2044983acbc6200ba8ba2906af Mon Sep 17 00:00:00 2001 From: kiddin9 <48883331+kiddin9@users.noreply.github.com> Date: Fri, 20 May 2022 12:28:14 +0800 Subject: [PATCH] update --- .github/workflows/Openwrt-AutoBuild.yml | 31 ++++++++++++++++------ .github/workflows/repo-dispatcher.yml | 6 ----- devices/armvirt_64/.config | 2 -- devices/common/.config | 1 - devices/common/diy.sh | 23 +++++++++++----- devices/common/patches/disable-antfs.patch | 24 ----------------- devices/common/patches/targets.patch | 2 +- devices/ipq807x/.config | 2 ++ devices/ipq807x/diy.sh | 4 +-- devices/x86_64/.config | 2 +- devices/x86_64/diy.sh | 2 +- 11 files changed, 46 insertions(+), 53 deletions(-) delete mode 100644 devices/common/patches/disable-antfs.patch diff --git a/.github/workflows/Openwrt-AutoBuild.yml b/.github/workflows/Openwrt-AutoBuild.yml index bd82d1cc92f4..37b8f1a83a15 100644 --- a/.github/workflows/Openwrt-AutoBuild.yml +++ b/.github/workflows/Openwrt-AutoBuild.yml @@ -120,6 +120,24 @@ jobs: -H "Authorization: Bearer ${{ secrets.REPO_TOKEN }}" \ -X POST -d '{ "query": "query {repository(owner: \"openwrt\", name: \"openwrt\") {refs(refPrefix: \"refs/tags/\", last: 4, orderBy: {field: TAG_COMMIT_DATE, direction: ASC}) {edges {node {name}}}}}"}' https://api.github.com/graphql) | jq -r '.data.repository.refs.edges[].node.name' | grep v22 | tail -n 1 | sed -e 's/v//')" git clone $REPO_URL -b v$REPO_BRANCH openwrt + if [[ "${{ contains(github.event.action, 'nosdk') }}" != "true" ]]; then + cd openwrt + if [[ ${{matrix.target}} == "x86_64" ]]; then + curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/targets/x86/64/openwrt-sdk-x86-64_gcc-11.2.0_musl.Linux-x86_64.tar.xz || true + elif [[ ${{matrix.target}} == "rockchip_armv8" ]]; then + curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/targets/rockchip/armv8/openwrt-sdk-rockchip-armv8_gcc-11.2.0_musl.Linux-x86_64.tar.xz || true + elif [[ ${{matrix.target}} == "bcm27xx_bcm2711" ]]; then + curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/targets/bcm27xx/bcm2711/openwrt-sdk-bcm27xx-bcm2711_gcc-11.2.0_musl.Linux-x86_64.tar.xz || true + elif [[ ${{matrix.target}} == "armvirt_64" ]]; then + curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/targets/armvirt/64/openwrt-sdk-armvirt-64_gcc-11.2.0_musl.Linux-x86_64.tar.xz || true + elif [[ ${{matrix.target}} == "ramips_mt7621" ]]; then + curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/targets/ramips/mt7621/openwrt-sdk-ramips-mt7621_gcc-11.2.0_musl.Linux-x86_64.tar.xz || true + elif [[ ${{matrix.target}} == "mediatek_mt7622" ]]; then + curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/targets/mediatek/mt7622/openwrt-sdk-mediatek-mt7622_gcc-11.2.0_musl.Linux-x86_64.tar.xz || true + elif [[ ${{matrix.target}} == "ipq807x" ]]; then + curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/targets/ipq807x/generic/openwrt-sdk-ipq807x-generic_gcc-11.2.0_musl.Linux-x86_64.tar.xz || true + fi + fi ln -sf /workdir/openwrt $GITHUB_WORKSPACE/openwrt echo "REPO_BRANCH=$REPO_BRANCH" >> $GITHUB_ENV echo "$REPO_BRANCH" @@ -179,24 +197,22 @@ jobs: make download -j$(($(nproc)+1)) & sleep 5 - - name: Cache - if: contains(github.event.action, 'nocache') != 'true' - run: | - curl -fL -m 60 -o openwrt/cache.tar.gz https://op.supes.top/releases/targets/cache.tar.gz || true - - name: Compile the firmware id: compile run: | cd openwrt echo -e "$(($(nproc)+1)) thread compile" make -j$(($(nproc)+1)) || (curl -k --data chat_id="${{ env.TELEGRAM_CHAT_ID }}" --data "text=❌ OpenWrt ${{ env.VERSION }} ${{matrix.target}} 编译失败 😂" "https://api.telegram.org/bot${{ env.TELEGRAM_TOKEN }}/sendMessage" ; make -j1 V=s) - echo "::set-output name=status::success" + sed -i "s/# CONFIG_IB is not set/CONFIG_IB=y/" .config + make defconfig + make target/imagebuilder/compile -j$(($(nproc)+1)) - name: Check space usage run: df -hT - name: Organize files id: organize + continue-on-error: true run: | shopt -s extglob mkdir -p firmware/${{matrix.target}} @@ -208,7 +224,6 @@ jobs: mkdir packages cp -rf ${{ env.KERNEL }}/Packages* packages/ cd - - tar -zcf openwrt/bin/targets/cache.tar.gz build_dir/host* build_dir/tool* staging_dir/host* staging_dir/tool* rename -v "s/openwrt-/${{ env.VERSION }}-openwrt-/" ./firmware/*/* || true rename -v "s/friendlyarm_//" ./firmware/*/*gz || true rename -v "s/embedfire_//" ./firmware/*/*gz || true @@ -272,7 +287,7 @@ jobs: with: name: ${{ env.VERSION }}_${{matrix.target}} path: | - openwrt/bin/targets + openwrt/bin/targets/ - name: Upload firmware to cowtransfer if: env.UPLOAD_FIRMWARE_TO_COWTRANSFER == 'true' diff --git a/.github/workflows/repo-dispatcher.yml b/.github/workflows/repo-dispatcher.yml index c0efec55672d..cda53c053253 100644 --- a/.github/workflows/repo-dispatcher.yml +++ b/.github/workflows/repo-dispatcher.yml @@ -29,12 +29,6 @@ jobs: build: runs-on: Ubuntu-20.04 steps: - - name: cancel running workflows - uses: styfle/cancel-workflow-action@main - with: - workflow_id: Openwrt-AutoBuild.yml,repo-dispatcher.yml - access_token: ${{ github.token }} - - name: Checkout uses: actions/checkout@main diff --git a/devices/armvirt_64/.config b/devices/armvirt_64/.config index a87960bfec2b..e4b34602912a 100644 --- a/devices/armvirt_64/.config +++ b/devices/armvirt_64/.config @@ -7,5 +7,3 @@ CONFIG_PACKAGE_kmod-brcmfmac=y CONFIG_BRCMFMAC_SDIO=y CONFIG_TESTING_KERNEL=y - -CONFIG_JSON_OVERVIEW_IMAGE_INFO=n \ No newline at end of file diff --git a/devices/common/.config b/devices/common/.config index 427c4836ee0f..4cc4f8926786 100644 --- a/devices/common/.config +++ b/devices/common/.config @@ -20,7 +20,6 @@ CONFIG_PACKAGE_kmod-usb-serial-xr_usb_serial_common=n CONFIG_SDK=y -CONFIG_IB=y CONFIG_IB_STANDALONE=y CONFIG_JSON_OVERVIEW_IMAGE_INFO=y diff --git a/devices/common/diy.sh b/devices/common/diy.sh index e849b6ec9289..2cbf44992999 100644 --- a/devices/common/diy.sh +++ b/devices/common/diy.sh @@ -28,7 +28,7 @@ sed -i '/ refresh_config();/d' scripts/feeds sed -i '$a src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master' feeds.conf.default } -rm -rf package/{base-files,network/config/firewall,network/config/firewall4,network/services/dnsmasq,network/services/ppp,system/opkg,libs/mbedtls} +rm -rf package/{base-files,network/config/firewall,network/config/firewall4,network/services/dnsmasq,network/services/ppp,system/opkg,libs/mbedtls,firmware/wireless-regdb} ./scripts/feeds update -a ./scripts/feeds install -a -p kiddin9 @@ -36,11 +36,10 @@ rm -rf package/{base-files,network/config/firewall,network/config/firewall4,netw cd feeds/kiddin9; git pull; cd - mv -f feeds/kiddin9/r81* tmp/ - +svn export --force https://github.com/openwrt/packages/trunk/kernel feeds/packages/kernel sed -i "s/192.168.1/10.0.0/" package/feeds/kiddin9/base-files/files/bin/config_generate rm -f package/feeds/packages/libpfring; svn export https://github.com/openwrt/packages/trunk/libs/libpfring package/feeds/kiddin9/libpfring rm -f package/feeds/packages/xtables-addons; svn export https://github.com/openwrt/packages/trunk/net/xtables-addons package/feeds/kiddin9/xtables-addons -curl -sfL https://raw.githubusercontent.com/coolsnowwolf/packages/master/libs/xr_usb_serial_common/patches/0001-fix-build-with-kernel-5.15.patch -o package/feeds/packages/xr_usb_serial_common/patches/0001-fix-build-with-kernel-5.15.patch ( svn export --force https://github.com/coolsnowwolf/lede/trunk/tools/upx tools/upx @@ -74,9 +73,19 @@ sed -i \ package/feeds/kiddin9/*/Makefile ( -if [ -f cache.tar.gz ]; then - tar -zxf cache.tar.gz - rm -f cache.tar.gz - find build_dir/{host*,toolchain-*} -name .built* -exec touch {} \;; touch staging_dir/{host*,toolchain-*}/stamp/.* +if [ -f sdk.tar.xz ]; then + sed -i 's,$(STAGING_DIR_HOST)/bin/upx,upx,' package/feeds/kiddin9/*/Makefile + mkdir sdk + tar -xJf sdk.tar.xz -C sdk + cp -rf sdk/*/staging_dir/* ./staging_dir/ + rm -rf sdk.tar.xz sdk + rm -rf `find "staging_dir/host/" -maxdepth 2 -name 'libelf*'` || true + sed -i '/\(tools\|toolchain\)\/Makefile/d' Makefile + if [ -f /usr/bin/python ]; then + ln -sf /usr/bin/python staging_dir/host/bin/python + else + ln -sf /usr/bin/python3 staging_dir/host/bin/python + fi + ln -sf /usr/bin/python3 staging_dir/host/bin/python3 fi ) & diff --git a/devices/common/patches/disable-antfs.patch b/devices/common/patches/disable-antfs.patch deleted file mode 100644 index 20cec3bd2bbb..000000000000 --- a/devices/common/patches/disable-antfs.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/package/feeds/packages/antfs/Makefile -+++ b/package/feeds/packages/antfs/Makefile -@@ -20,7 +20,7 @@ define KernelPackage/fs-antfs - TITLE:=AVM NTFS Read/Write Driver - FILES:=$(PKG_BUILD_DIR)/antfs.ko - AUTOLOAD:=$(call AutoLoad,30,antfs,1) -- DEPENDS:=+kmod-nls-base -+ DEPENDS:=@!LINUX_5_15 +kmod-nls-base - endef - - define KernelPackage/fs-antfs/description -diff --git a/utils/antfs-mount/Makefile b/utils/antfs-mount/Makefile -index 48ffc6f1cc..a9ee67dd2c 100644 ---- a/package/feeds/packages/antfs-mount/Makefile -+++ b/package/feeds/packages/antfs-mount/Makefile -@@ -11,7 +11,7 @@ define Package/antfs-mount - SUBMENU:=Filesystem - TITLE:=NTFS mount script for AVM NTFS driver - PKGARCH:=all -- DEPENDS:=+kmod-fs-antfs -+ DEPENDS:=@!LINUX_5_15 +kmod-fs-antfs - endef - - define Build/Configure diff --git a/devices/common/patches/targets.patch b/devices/common/patches/targets.patch index b01466dc9d9e..cf76136898ab 100644 --- a/devices/common/patches/targets.patch +++ b/devices/common/patches/targets.patch @@ -10,7 +10,7 @@ - kmod-nft-offload \ + dnsmasq-full \ + firewall \ -+ nftables iptables-legacy ip6tables-legacy \ ++ nftables iptables-legacy ip6tables-legacy ipset kmod-ipt-nat6 \ + kmod-ipt-offload \ odhcp6c \ odhcpd-ipv6only \ diff --git a/devices/ipq807x/.config b/devices/ipq807x/.config index 2468986e0a91..7bd4d389b675 100644 --- a/devices/ipq807x/.config +++ b/devices/ipq807x/.config @@ -9,6 +9,8 @@ CONFIG_TARGET_DEVICE_ipq807x_generic_DEVICE_xiaomi_ax9000=y CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_SHORTCUT_FE_DRV=n CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_SHORTCUT_FE=y +CONFIG_ALL_KMODS=y + CONFIG_PACKAGE_kmod-qca-mcs=n CONFIG_PACKAGE_kmod-qca-nss-drv-qdisc=n CONFIG_PACKAGE_kmod-qca-nss-ecm=n diff --git a/devices/ipq807x/diy.sh b/devices/ipq807x/diy.sh index 79d2531a7fa5..de99f9b8b647 100644 --- a/devices/ipq807x/diy.sh +++ b/devices/ipq807x/diy.sh @@ -2,14 +2,14 @@ shopt -s extglob -rm -rf package/boot/uboot-envtools package/firmware/ipq-wifi package/firmware/ath11k* package/qca package/qat package/kernel/mac80211 +rm -rf package/boot/uboot-envtools package/firmware/ipq-wifi package/firmware/ath11k* package/qca package/qat package/kernel svn export https://github.com/Boos4721/openwrt/trunk/package/boot/uboot-envtools package/boot/uboot-envtools svn export https://github.com/Boos4721/openwrt/trunk/package/firmware/ipq-wifi package/firmware/ipq-wifi svn export https://github.com/Boos4721/openwrt/trunk/package/firmware/ath11k-board package/firmware/ath11k-board svn export https://github.com/Boos4721/openwrt/trunk/package/firmware/ath11k-firmware package/firmware/ath11k-firmware svn export https://github.com/Boos4721/openwrt/trunk/package/qca package/qca svn export https://github.com/Boos4721/openwrt/trunk/package/qat package/qat -svn export https://github.com/Boos4721/openwrt/trunk/package/kernel/mac80211 package/kernel/mac80211 +svn export https://github.com/Boos4721/openwrt/trunk/package/kernel package/kernel rm -rf target/linux/ipq807x/!(patches-5.15) svn co https://github.com/Boos4721/openwrt/trunk/target/linux/ipq807x target/linux/ipq807x diff --git a/devices/x86_64/.config b/devices/x86_64/.config index c25825f1a615..864f03cd7c81 100644 --- a/devices/x86_64/.config +++ b/devices/x86_64/.config @@ -8,6 +8,6 @@ CONFIG_GRUB_EFI_IMAGES=y CONFIG_VMDK_IMAGES=n # 其他需要安装的软件包: -CONFIG_PACKAGE_kmod-r8168=n +#CONFIG_PACKAGE_kmod-r8168=n CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=n diff --git a/devices/x86_64/diy.sh b/devices/x86_64/diy.sh index 7385c24b7b76..51d77d821376 100644 --- a/devices/x86_64/diy.sh +++ b/devices/x86_64/diy.sh @@ -6,7 +6,7 @@ rm -rf target/linux/x86/patches-5.15/.svn sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-x86 lm-sensors-detect kmod-r8125 kmod-vmxnet3 kmod-igc kmod-drm-i915 kmod-mlx4-core kmod-usb2 kmod-usb3 fdisk/' target/linux/x86/Makefile mv -f tmp/r81* feeds/kiddin9/ -#sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/64.mk +sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/64.mk echo ' CONFIG_CRYPTO_CHACHA20_X86_64=y