ci: update and fix file permissions

The find syntax was wrong, not matching any file, hence the few unwanted execute bits were not removed. Do not create tmpfs and do not enforce bournce shell. Both has no real performance benefit on GitHub Actions hosted runners. deb: remove unnecessary package fields u-boot env: fix default device tree for StarFive change Signed-off-by: MichaIng <[email protected]>
MichaIng · May 18, 2024 · 82a2f97 · 82a2f97
1 parent 589064b
commit 82a2f97
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,19 +4,14 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 permissions: {}
-defaults:
-  run:
-    shell: sh
 jobs:
   build:
     # https://github.com/actions/virtual-environments
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       CROSS_COMPILE: 'riscv64-linux-gnu-'
       ARCH: 'riscv'
     steps:
-    - name: Setup tmpfs
-      run: sudo mount -t tmpfs -o "noatime,lazytime,uid=$(id -u),size=3G" tmpfs "$GITHUB_WORKSPACE"
     - uses: actions/checkout@v4
     - name: Install build dependencies
       run: |
@@ -35,7 +30,7 @@ jobs:
         make modules_install INSTALL_MOD_PATH='linux-image-visionfive2'
         rm linux-image-visionfive2/lib/modules/*/build linux-image-visionfive2/lib/modules/*/source
         # WiFi/BT firmware: https://github.com/starfive-tech/buildroot/blob/JH7110_VisionFive2_devel/package/starfive/starfive-firmware/starfive-firmware.mk
-        curl -fLO https://github.com/starfive-tech/buildroot/archive/JH7110_VisionFive2_devel.tar.gz
+        curl -fLO 'https://github.com/starfive-tech/buildroot/archive/JH7110_VisionFive2_devel.tar.gz'
         tar xf JH7110_VisionFive2_devel.tar.gz
         rm JH7110_VisionFive2_devel.tar.gz
         mkdir -p linux-image-visionfive2/lib/firmware
@@ -49,7 +44,7 @@ jobs:
         cp IMG_GPU-xorg/usr/local/lib/dri/starfive_dri.so linux-image-visionfive2/usr/lib/riscv64-linux-gnu/dri/
         rm -R IMG_GPU-xorg
         # Permissions
-        find linux-image-visionfive2 -type f \( -path linux-image-visionfive2/DEBIAN -prune \) -exec chmod 0644 {} +
+        find linux-image-visionfive2 ! \( -path linux-image-visionfive2/DEBIAN -prune \) -type f -exec chmod 0644 {} +
         find linux-image-visionfive2 -type d -exec chmod 0755 {} +
     - name: Build package
       run: |

diff --git a/linux-image-visionfive2/DEBIAN/control b/linux-image-visionfive2/DEBIAN/control
@@ -3,11 +3,8 @@ Version: VERSION
 Architecture: riscv64
 Maintainer: MichaIng <[email protected]>
 Date: DATE
-Standards-Version: 4.6.2.0
 Installed-Size: SIZE
 Section: kernel
 Priority: optional
 Homepage: https://github.com/MichaIng/linux
-Vcs-Git: https://github.com/MichaIng/linux.git
-Vcs-Browser: https://github.com/MichaIng/linux
 Description: Linux kernel for RISC-V StarFive VisionFive 2
diff --git a/linux-image-visionfive2/etc/u-boot-initial-env b/linux-image-visionfive2/etc/u-boot-initial-env
@@ -13,7 +13,7 @@ boot_prefixes=/ /boot/
 bootenv=uEnv.txt
 boot_scripts=boot.scr.uimg boot.scr
 efi_dtb_prefixes=/ /dtb/ /dtb/current/
-fdtfile=starfive/jh7110-visionfive-v2.dtb
+fdtfile=starfive/jh7110-starfive-visionfive-2-v1.3b.dtb
 ipaddr=192.168.120.230
 
 preboot=run chipa_set_uboot