[CI] Update workflow to build Star64 kernel package

Signed-off-by: MichaIng <[email protected]>
MichaIng · Nov 18, 2023 · 5daf528 · 5daf528
1 parent 746de58
commit 5daf528
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/visionfive2.yml b/.github/workflows/visionfive2.yml
@@ -1,4 +1,4 @@
-name: VisionFive 2 kernel build
+name: Star64 kernel build
 on: [workflow_dispatch, push]
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -26,42 +26,42 @@ jobs:
     - name: Build Linux
       run: |
         > .scmversion # Avoid Git commit version suffix
-        mv dietpi_visionfive2_defconfig arch/riscv/configs/
-        make dietpi_visionfive2_defconfig
+        mv dietpi_star64_defconfig arch/riscv/configs/
+        make dietpi_star64_defconfig
         make -j$(nproc)
-        make install INSTALL_PATH='linux-image-visionfive2/boot'
-        make dtbs_install INSTALL_DTBS_PATH='linux-image-visionfive2/usr/lib/linux-image-visionfive2'
-        find linux-image-visionfive2/usr/lib/linux-image-visionfive2 -mindepth 1 -regextype egrep \( ! -regex '.*/(starfive|vf2-overlay.*|jh7110-visionfive-v2.*\.dtb)' -o -regex '.*/jh7110-visionfive-v2-A1[01].dtb' \) -exec rm -Rf {} +
-        make modules_install INSTALL_MOD_PATH='linux-image-visionfive2'
-        rm linux-image-visionfive2/lib/modules/*/build linux-image-visionfive2/lib/modules/*/source
-        mkdir -p linux-image-visionfive2/lib/firmware
-        curl -sSfo linux-image-visionfive2/lib/firmware/ECR6600U_transport.bin 'https://raw.githubusercontent.com/starfive-tech/buildroot/JH7110_VisionFive2_devel/package/starfive/usb_wifi/ECR6600U_transport.bin'
-        find linux-image-visionfive2 -type f \( -path linux-image-visionfive2/DEBIAN -prune \) -exec chmod 0644 {} +
-        find linux-image-visionfive2 -type d -exec chmod 0755 {} +
+        make install INSTALL_PATH='linux-image-star64/boot'
+        make dtbs_install INSTALL_DTBS_PATH='linux-image-star64/usr/lib/linux-image-star64'
+        find linux-image-star64/usr/lib/linux-image-star64 -mindepth 1 ! -name 'jh7110-pine64-star64.dtb' -exec rm -Rfv {} +
+        make modules_install INSTALL_MOD_PATH='linux-image-star64'
+        rm linux-image-star64/lib/modules/*/build linux-image-star64/lib/modules/*/source
+        mkdir -p linux-image-star64/lib/firmware
+        curl -sSfo linux-image-star64/lib/firmware/ECR6600U_transport.bin 'https://raw.githubusercontent.com/starfive-tech/buildroot/JH7110_VisionFive2_devel/package/starfive/usb_wifi/ECR6600U_transport.bin'
+        find linux-image-star64 -type f \( -path linux-image-star64/DEBIAN -prune \) -exec chmod 0644 {} +
+        find linux-image-star64 -type d -exec chmod 0755 {} +
     - name: Build package
       run: |
         echo 'Obtaining kernel and package version ...'
         kernelversion=$(make kernelversion)
-        curl -fO 'https://dietpi.com/downloads/binaries/linux-image-visionfive2.deb'
-        cur_version=$(dpkg-deb -f linux-image-visionfive2.deb Version)
-        rm linux-image-visionfive2.deb
+        curl -fO 'https://dietpi.com/downloads/binaries/linux-image-star64.deb'
+        cur_version=$(dpkg-deb -f linux-image-star64.deb Version)
+        rm linux-image-star64.deb
         cur_suffix=${cur_version#*-dietpi}
         echo "Current package version is : $cur_version"
         echo "New kernel version is      : $kernelversion"
         [ "$kernelversion-dietpi$cur_suffix" = "$cur_version" ] && version="$kernelversion-dietpi$((cur_suffix+1))" || version="$kernelversion-dietpi1"
         echo "New package version will be: $version"
-        sed -i "s/VERSION/$kernelversion/g" linux-image-visionfive2/boot/extlinux/extlinux.conf linux-image-visionfive2/DEBIAN/p*
-        find linux-image-visionfive2 ! \( -path linux-image-visionfive2/DEBIAN -prune \) -type f -exec md5sum {} + | sed 's|linux-image-visionfive2/||' > linux-image-visionfive2/DEBIAN/md5sums
-        sed -i -e "s/VERSION/$version/" -e "s/DATE/$(date -u '+%a, %d %b %Y %T %z')/" -e "s/SIZE/$(du -sk 'linux-image-visionfive2' | mawk '{print $1}')/" linux-image-visionfive2/DEBIAN/control
-        sudo chown -R 0:0 linux-image-visionfive2
-        dpkg-deb -b -Zxz -z9 -Sextreme linux-image-visionfive2
-        sudo rm -R linux-image-visionfive2
+        sed -i "s/VERSION/$kernelversion/g" linux-image-star64/boot/extlinux/extlinux.conf linux-image-star64/DEBIAN/p*
+        find linux-image-star64 ! \( -path linux-image-star64/DEBIAN -prune \) -type f -exec md5sum {} + | sed 's|linux-image-star64/||' > linux-image-star64/DEBIAN/md5sums
+        sed -i -e "s/VERSION/$version/" -e "s/DATE/$(date -u '+%a, %d %b %Y %T %z')/" -e "s/SIZE/$(du -sk 'linux-image-star64' | mawk '{print $1}')/" linux-image-star64/DEBIAN/control
+        sudo chown -R 0:0 linux-image-star64
+        dpkg-deb -b -Zxz -z9 -Sextreme linux-image-star64
+        sudo rm -R linux-image-star64
     - name: Upload
       run: |
         mkdir -p ~/.ssh
         umask 377
         echo '${{ secrets.KNOWN_HOSTS }}' > ~/.ssh/known_hosts
         echo '${{ secrets.SSH_KEY }}' > ~/.ssh/id_ed25519
-        curl -T 'linux-image-visionfive2.deb' --key ~/.ssh/id_ed25519 '${{ secrets.UPLOAD_URL }}all/'
+        curl -T 'linux-image-star64.deb' --key ~/.ssh/id_ed25519 '${{ secrets.UPLOAD_URL }}all/'
         curl 'https://api.cloudflare.com/client/v4/zones/${{ secrets.CF_ZONE }}/purge_cache' -H 'Authorization: Bearer ${{ secrets.CF_TOKEN }}' -H 'Content-Type: application/json' \
-        --data '{"files":["https://dietpi.com/downloads/binaries/testing/","https://dietpi.com/downloads/binaries/testing/linux-image-visionfive2.deb"]}'
+        --data '{"files":["https://dietpi.com/downloads/binaries/testing/","https://dietpi.com/downloads/binaries/testing/linux-image-star64.deb"]}'
diff --git a/dietpi_visionfive2_defconfig → dietpi_star64_defconfig b/dietpi_visionfive2_defconfig → dietpi_star64_defconfig