mod grub

.github/workflows/grub.yml

@@ -0,0 +1,62 @@
+#
+# Copyright (C) 2022 Ing <https://github.com/wjz304>
+# 
+# This is free software, licensed under the MIT License.
+# See /LICENSE for more information.
+#
+
+name: Grub
+
+on:
+  workflow_dispatch:
+    inputs:
+      push: 
+        description: 'push'
+        default: false
+        type: boolean
+jobs:
+  grub:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@main
+
+      - name: Initialization environment
+        run : |
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.name "github-actions[bot]"
+          sudo timedatectl set-timezone "Asia/Shanghai"
+          
+          sudo apt update
+          sudo apt install -y build-essential bison flex dosfstools
+
+      - name: Make Grub
+        run: |
+          . scripts/grub.sh "grub-2.06" "i386-pc i386-efi x86_64-efi"
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: grub
+          path: |
+            grub.img.gz
+
+      - name: Check and Push
+        if: success() && inputs.push == true
+        run: |
+          if [ -f "grub.img.gz" ]; then
+            echo "Copy img ..."
+            mv -f grub.img.gz files/board/arpl/grub.img.gz 
+        
+            echo "Git push ..."
+            git pull
+            status=$(git status -s | grep -E 'grub.img.gz' | awk '{printf " %s", $2}')
+            if [ -n "${status}" ]; then
+              git add ${status}
+              git commit -m "update $(date +%Y-%m-%d" "%H:%M:%S)"
+              git push -f
+            fi
+          else
+            echo "No change ..."
+          fi
+

files/board/arpl/make-img.sh

@@ -14,24 +14,14 @@ IMAGE_FILE="${MY_ROOT}/arpl.img"
 BOARD_PATH="${CONFIG_DIR}/board/arpl"
 
 echo "Creating image file"
-# Create image zeroed
-dd if="/dev/zero" of="${IMAGE_FILE}" bs=1M count=1024 conv=sync 2>/dev/null
-# Copy grub stage1 to image
-dd if="${BOARD_PATH}/grub.bin" of="${IMAGE_FILE}" conv=notrunc,sync 2>/dev/null
-# Create partitions on image
-echo -e "n\np\n\n\n+50M\na\nt\n\n0b\nn\np\n\n\n+50M\nn\np\n\n\n\nw" | fdisk "${IMAGE_FILE}" >/dev/null
-
-# Force umount, ignore errors
-sudo umount "${BINARIES_DIR}/p1" 2>/dev/null || true
-sudo umount "${BINARIES_DIR}/p3" 2>/dev/null || true
-# Force unsetup of loop device
+# unzip base image
+gzip -dc "${BOARD_PATH}/grub.img.gz" > "${IMAGE_FILE}"
+# fdisk
+fdisk -l "${IMAGE_FILE}"
+# Find idle of loop device
 LOOPX=`sudo losetup -f`
 # Setup the ${LOOPX} loop device
 sudo losetup -P "${LOOPX}" "${IMAGE_FILE}"
-# Format partitions
-sudo mkdosfs -F32 -n ARPL1 "${LOOPX}p1" >/dev/null 2>&1
-sudo mkfs.ext2 -F -L ARPL2 "${LOOPX}p2" >/dev/null 2>&1
-sudo mkfs.ext4 -F -L ARPL3 "${LOOPX}p3" >/dev/null 2>&1
 
 echo "Mounting image file"
 mkdir -p "${BINARIES_DIR}/p1"

files/board/arpl/overlayfs/opt/arpl/include/consts.sh

@@ -9,7 +9,7 @@ RAMDISK_PATH="${TMP_PATH}/ramdisk"
 LOG_FILE="${TMP_PATH}/log.txt"
 
 USER_CONFIG_FILE="${BOOTLOADER_PATH}/user-config.yml"
-GRUB_PATH="${BOOTLOADER_PATH}/grub"
+GRUB_PATH="${BOOTLOADER_PATH}/boot/grub"
 
 ORI_ZIMAGE_FILE="${SLPART_PATH}/zImage"
 ORI_RDGZ_FILE="${SLPART_PATH}/rd.gz"

files/board/arpl/overlayfs/usr/sbin/arpl-reboot.sh

@@ -8,5 +8,5 @@ function use() {
 [ -z "${1}" ] && use
 [ "${1}" != "junior" -a "${1}" != "config" ] && use
 echo "Rebooting to ${1} mode"
-grub-editenv /mnt/p1/grub/grubenv set next_entry="${1}"
+grub-editenv /mnt/p1/boot/grub/grubenv set next_entry="${1}"
 reboot