跟进上游 Nick 更新

RikudouPatrickstar · Jul 22, 2024 · 233c883 · 233c883
1 parent 99b3dd2
commit 233c883
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 22 deletions.
diff --git a/.github/workflows/R2S-OpenWrt.yml b/.github/workflows/R2S-OpenWrt.yml
@@ -12,14 +12,14 @@ env:
   TZ: Asia/Shanghai
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - name: Maximize build space
       uses: easimon/maximize-build-space@master
       with:
-        swap-size-mb: 512
-        temp-reserve-mb: 128
-        root-reserve-mb: 3072
+        swap-size-mb: 1024
+        temp-reserve-mb: 512
+        root-reserve-mb: 4096
         remove-dotnet: 'true'
         remove-android: 'true'
         remove-haskell: 'true'
@@ -35,14 +35,11 @@ jobs:
       env:
         DEBIAN_FRONTEND: noninteractive
       run: |
-        sudo swapoff -a
-        sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /usr/local/lib/android /opt/ghc
         sudo -E apt-get -qq update
-        sudo -E apt-get -qq install aria2
-        sudo -E wget -P /usr/local/sbin/ https://github.com/HiGarfield/lede-17.01.4-Mod/raw/master/.github/backup/apt-fast
-        sudo -E chmod -R 755 /usr/local/sbin/apt-fast
-        sudo -E apt-fast -y -qq install dwarves llvm clang lldb lld build-essential rsync asciidoc binutils bzip2 gawk gettext git libncurses5-dev patch python2.7 unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs gcc-multilib p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint device-tree-compiler g++-multilib antlr3 gperf wget ccache curl swig coreutils vim nano python3 python3-dev python3-pip python3-ply python3-pyelftools lrzsz scons
-        pip3 install --user -U pylibfdt
+        sudo /bin/bash -c "$(curl -sL https://git.io/vokNn)"
+        sudo -E apt-fast -y -qq install asciidoc bash bcc bin86 binutils bison bzip2 clang-15 llvm-15 file flex g++ g++-multilib gawk gcc gcc-multilib gettext git gzip help2man intltool libboost-dev libelf-dev libncurses-dev libncurses5-dev libssl-dev libthread-queue-any-perl libusb-dev libxml-parser-perl make patch perl-modules python3-dev python3-pip python3-pyelftools python3-setuptools rsync sharutils swig time unzip util-linux wget xsltproc zlib1g-dev zip
+        sudo -E apt-fast -y -qq install dos2unix dwarves quilt
+        pip3 install --user -U pylibfdt --break-system-packages
         sudo -E apt-get -qq autoremove --purge
         sudo -E apt-get -qq clean
         sudo -E git config --global user.name 'GitHub Actions' && git config --global user.email '[email protected]'
@@ -97,6 +94,11 @@ jobs:
       run: |
         cd ./openwrt/
         /bin/bash 05_create_acl_for_luci.sh -a
+    - name: Fix Permissions
+      run: |
+        cd ./openwrt/
+        sudo -E chmod -R 755 ./08_fix_permissions.sh
+        /bin/bash 08_fix_permissions.sh
     - name: Make Config
       run: |
         cd ./openwrt/

diff --git a/.github/workflows/R4S-OpenWrt.yml b/.github/workflows/R4S-OpenWrt.yml
@@ -12,14 +12,14 @@ env:
   TZ: Asia/Shanghai
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - name: Maximize build space
       uses: easimon/maximize-build-space@master
       with:
-        swap-size-mb: 512
-        temp-reserve-mb: 128
-        root-reserve-mb: 3072
+        swap-size-mb: 1024
+        temp-reserve-mb: 512
+        root-reserve-mb: 4096
         remove-dotnet: 'true'
         remove-android: 'true'
         remove-haskell: 'true'
@@ -35,14 +35,11 @@ jobs:
       env:
         DEBIAN_FRONTEND: noninteractive
       run: |
-        sudo swapoff -a
-        sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /usr/local/lib/android /opt/ghc
         sudo -E apt-get -qq update
-        sudo -E apt-get -qq install aria2
-        sudo -E wget -P /usr/local/sbin/ https://github.com/HiGarfield/lede-17.01.4-Mod/raw/master/.github/backup/apt-fast
-        sudo -E chmod -R 755 /usr/local/sbin/apt-fast
-        sudo -E apt-fast -y -qq install dwarves llvm clang lldb lld build-essential rsync asciidoc binutils bzip2 gawk gettext git libncurses5-dev patch python2.7 unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs gcc-multilib p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint device-tree-compiler g++-multilib antlr3 gperf wget ccache curl swig coreutils vim nano python3 python3-dev python3-pip python3-ply python3-pyelftools lrzsz scons
-        pip3 install --user -U pylibfdt
+        sudo /bin/bash -c "$(curl -sL https://git.io/vokNn)"
+        sudo -E apt-fast -y -qq install asciidoc bash bcc bin86 binutils bison bzip2 clang-15 llvm-15 file flex g++ g++-multilib gawk gcc gcc-multilib gettext git gzip help2man intltool libboost-dev libelf-dev libncurses-dev libncurses5-dev libssl-dev libthread-queue-any-perl libusb-dev libxml-parser-perl make patch perl-modules python3-dev python3-pip python3-pyelftools python3-setuptools rsync sharutils swig time unzip util-linux wget xsltproc zlib1g-dev zip
+        sudo -E apt-fast -y -qq install dos2unix dwarves quilt
+        pip3 install --user -U pylibfdt --break-system-packages
         sudo -E apt-get -qq autoremove --purge
         sudo -E apt-get -qq clean
         sudo -E git config --global user.name 'GitHub Actions' && git config --global user.email '[email protected]'
@@ -97,6 +94,11 @@ jobs:
       run: |
         cd ./openwrt/
         /bin/bash 05_create_acl_for_luci.sh -a
+    - name: Fix Permissions
+      run: |
+        cd ./openwrt/
+        sudo -E chmod -R 755 ./08_fix_permissions.sh
+        /bin/bash 08_fix_permissions.sh
     - name: Make Config
       run: |
         cd ./openwrt/

diff --git a/SEED/r2s-config.seed b/SEED/r2s-config.seed
@@ -10,6 +10,7 @@ CONFIG_KERNEL_BUILD_USER="RikudouPatrickstar"
 #CONFIG_ALL_KMODS=y
 CONFIG_DEVEL=y
 # CONFIG_KERNEL_KALLSYMS is not set
+# CONFIG_KERNEL_WERROR is not set
 CONFIG_PACKAGE_r8152-firmware=y
 CONFIG_PACKAGE_trusted-firmware-a-rk3328=y
 CONFIG_TOOLCHAINOPTS=y

diff --git a/SEED/r4s-config.seed b/SEED/r4s-config.seed
@@ -10,6 +10,7 @@ CONFIG_KERNEL_BUILD_USER="RikudouPatrickstar"
 #CONFIG_ALL_KMODS=y
 CONFIG_DEVEL=y
 # CONFIG_KERNEL_KALLSYMS is not set
+# CONFIG_KERNEL_WERROR is not set
 CONFIG_PACKAGE_r8169-firmware=y
 CONFIG_PACKAGE_trusted-firmware-a-rk3399=y
 CONFIG_TOOLCHAINOPTS=y