archr/Arch-R
0
0
Fork 0
mirror of https://github.com/archr-linux/Arch-R.git synced 2026-03-31 14:41:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "grub: move files to /boot/grub"

Browse Source 
This reverts commit 132329ace3.
This commit is contained in:
Philippe Simons
2025-11-05 23:37:45 +01:00
parent 21583f7732
commit c7a94296a2
6 changed files with 37 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
distributions/ROCKNIX/config/functions
View File

@@ -283,7 +283,7 @@ function savedefault {
set timeout_style=menu
set lang=en_US
loadfont /boot/grub/dejavu-mono.pf2
loadfont /EFI/BOOT/dejavu-mono.pf2
set rotation=270
set gfxmode=auto
insmod efi_gop
@@ -302,7 +302,7 @@ menuentry '${FULL}' \$menuentry_id_option '${SHORT}' {
savedefault
search --set -f /KERNEL
linux /KERNEL boot=LABEL=${DISTRO_BOOTLABEL} disk=LABEL=${DISTRO_DISKLABEL} grub_portable ${EXTRA_CMDLINE}
devicetree /boot/grub/${DTB}.dtb
devicetree /${DTB}.dtb
}
EOF
done
@@ -314,7 +314,7 @@ EOF
menuentry '${FULL} RECOVERY' \$menuentry_id_option '${SHORT}-recovery' {
search --set -f /KERNEL
linux /KERNEL boot=LABEL=${DISTRO_BOOTLABEL} disk=LABEL=${DISTRO_DISKLABEL} grub_portable ${EXTRA_CMDLINE} recovery
devicetree /boot/grub/${DTB}.dtb
devicetree /${DTB}.dtb
}
EOF
done

18
projects/ROCKNIX/devices/SDM845/bootloader/update.sh
View File

@@ -17,8 +17,8 @@ fi
mount -o remount,rw $BOOT_ROOT
echo "Updating device trees..."
for dtb in $SYSTEM_ROOT/usr/share/bootloader/boot/grub/*.dtb; do
cp -p $dtb $BOOT_ROOT/boot/grub
for dtb in $SYSTEM_ROOT/usr/share/bootloader/*.dtb; do
cp -p $dtb $BOOT_ROOT
done
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/bootaa64.efi" ]; then
@@ -26,20 +26,20 @@ if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/bootaa64.efi" ]; then
cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/bootaa64.efi $BOOT_ROOT/EFI/BOOT
fi
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/boot/grub/grub.cfg" ]; then
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grub.cfg" ]; then
echo "Updating grub.cfg..."
cp -p $SYSTEM_ROOT/usr/share/bootloader/boot/grub/grub.cfg $BOOT_ROOT/boot/grub
cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grub.cfg $BOOT_ROOT/EFI/BOOT
fi
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/boot/grub/dejavu-mono.pf2" ]; then
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/dejavu-mono.pf2" ]; then
echo "Updating dejavu-mono.pf2..."
cp -p $SYSTEM_ROOT/usr/share/bootloader/boot/grub/dejavu-mono.pf2 $BOOT_ROOT/boot/grub
cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/dejavu-mono.pf2 $BOOT_ROOT/EFI/BOOT
fi
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/boot/grub/grubenv" ]; then
if [ ! -f "$BOOT_ROOT/boot/grub/grubenv" ]; then
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grubenv" ]; then
if [ ! -f "$BOOT_ROOT/efi/boot/grubenv" ]; then
echo "Installing grubenv..."
cp -p $SYSTEM_ROOT/usr/share/bootloader/boot/grub/grubenv $BOOT_ROOT/boot/grub
cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grubenv $BOOT_ROOT/EFI/BOOT
fi
fi

18
projects/ROCKNIX/devices/SM8250/bootloader/update.sh
View File

@@ -17,8 +17,8 @@ fi
mount -o remount,rw $BOOT_ROOT
echo "Updating device trees..."
for dtb in $SYSTEM_ROOT/usr/share/bootloader/boot/grub/*.dtb; do
cp -p $dtb $BOOT_ROOT/boot/grub
for dtb in $SYSTEM_ROOT/usr/share/bootloader/*.dtb; do
cp -p $dtb $BOOT_ROOT
done
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/bootaa64.efi" ]; then
@@ -26,20 +26,20 @@ if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/bootaa64.efi" ]; then
cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/bootaa64.efi $BOOT_ROOT/EFI/BOOT
fi
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/boot/grub/grub.cfg" ]; then
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grub.cfg" ]; then
echo "Updating grub.cfg..."
cp -p $SYSTEM_ROOT/usr/share/bootloader/boot/grub/grub.cfg $BOOT_ROOT/boot/grub
cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grub.cfg $BOOT_ROOT/EFI/BOOT
fi
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/boot/grub/dejavu-mono.pf2" ]; then
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/dejavu-mono.pf2" ]; then
echo "Updating dejavu-mono.pf2..."
cp -p $SYSTEM_ROOT/usr/share/bootloader/boot/grub/dejavu-mono.pf2 $BOOT_ROOT/boot/grub
cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/dejavu-mono.pf2 $BOOT_ROOT/EFI/BOOT
fi
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/boot/grub/grubenv" ]; then
if [ ! -f "$BOOT_ROOT/boot/grub/grubenv" ]; then
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grubenv" ]; then
if [ ! -f "$BOOT_ROOT/efi/boot/grubenv" ]; then
echo "Installing grubenv..."
cp -p $SYSTEM_ROOT/usr/share/bootloader/boot/grub/grubenv $BOOT_ROOT/boot/grub
cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grubenv $BOOT_ROOT/EFI/BOOT
fi
fi

18
projects/ROCKNIX/devices/SM8550/bootloader/update.sh
View File

@@ -17,8 +17,8 @@ fi
mount -o remount,rw $BOOT_ROOT
echo "Updating device trees..."
for dtb in $SYSTEM_ROOT/usr/share/bootloader/boot/grub/*.dtb; do
cp -p $dtb $BOOT_ROOT/boot/grub
for dtb in $SYSTEM_ROOT/usr/share/bootloader/*.dtb; do
cp -p $dtb $BOOT_ROOT
done
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/bootaa64.efi" ]; then
@@ -26,20 +26,20 @@ if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/bootaa64.efi" ]; then
cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/bootaa64.efi $BOOT_ROOT/EFI/BOOT
fi
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/boot/grub/grub.cfg" ]; then
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grub.cfg" ]; then
echo "Updating grub.cfg..."
cp -p $SYSTEM_ROOT/usr/share/bootloader/boot/grub/grub.cfg $BOOT_ROOT/boot/grub
cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grub.cfg $BOOT_ROOT/EFI/BOOT
fi
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/boot/grub/dejavu-mono.pf2" ]; then
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/dejavu-mono.pf2" ]; then
echo "Updating dejavu-mono.pf2..."
cp -p $SYSTEM_ROOT/usr/share/bootloader/boot/grub/dejavu-mono.pf2 $BOOT_ROOT/boot/grub
cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/dejavu-mono.pf2 $BOOT_ROOT/EFI/BOOT
fi
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/boot/grub/grubenv" ]; then
if [ ! -f "$BOOT_ROOT/boot/grub/grubenv" ]; then
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grubenv" ]; then
if [ ! -f "$BOOT_ROOT/efi/boot/grubenv" ]; then
echo "Installing grubenv..."
cp -p $SYSTEM_ROOT/usr/share/bootloader/boot/grub/grubenv $BOOT_ROOT/boot/grub
cp -p $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/grubenv $BOOT_ROOT/EFI/BOOT
fi
fi

16
projects/ROCKNIX/packages/linux/package.mk
View File

@@ -326,26 +326,18 @@ makeinstall_target() {
rm -f ${INSTALL}/$(get_kernel_overlay_dir)/lib/modules/*/build
rm -f ${INSTALL}/$(get_kernel_overlay_dir)/lib/modules/*/source
if [ "${BOOTLOADER}" = "arm-efi" ]; then
mkdir -p ${INSTALL}/usr/share/bootloader/boot/grub
for dtb in arch/${TARGET_KERNEL_ARCH}/boot/dts/**/*.dtb; do
if [ -f ${dtb} ]; then
cp -v ${dtb} ${INSTALL}/usr/share/bootloader/boot/grub
fi
done
fi
if [ "${BOOTLOADER}" = "u-boot" ]; then
if [ "${BOOTLOADER}" = "u-boot" -o "${BOOTLOADER}" = "arm-efi" ]; then
mkdir -p ${INSTALL}/usr/share/bootloader
for dtb in arch/${TARGET_KERNEL_ARCH}/boot/dts/**/*.dtb; do
for dtb in arch/${TARGET_KERNEL_ARCH}/boot/dts/*.dtb arch/${TARGET_KERNEL_ARCH}/boot/dts/*/*.dtb; do
if [ -f ${dtb} ]; then
if [ "${DEVICE}" = "H700" -o "${DEVICE}" = "RK3326" -o "${DEVICE}" = "RK3399" -o "${DEVICE}" = "RK3566" -o "${DEVICE}" = "RK3588" ]; then
mkdir -p ${INSTALL}/usr/share/bootloader/device_trees
cp -v ${dtb} ${INSTALL}/usr/share/bootloader/device_trees
else
cp -v ${dtb} ${INSTALL}/usr/share/bootloader
fi
fi
done
fi
makeinstall_host
}

7
projects/ROCKNIX/packages/tools/grub/package.mk
View File

@@ -69,17 +69,16 @@ make_target() {
}
makeinstall_target() {
${PKG_BUILD}/.${HOST_NAME}/grub-mkimage -d grub-core -o bootaa64.efi -O arm64-efi -p /boot/grub \
${PKG_BUILD}/.${HOST_NAME}/grub-mkimage -d grub-core -o bootaa64.efi -O arm64-efi -p /EFI/BOOT \
boot linux ext2 fat squash4 part_msdos part_gpt normal search search_fs_file search_fs_uuid \
search_label chain reboot loadenv test gfxterm efi_gop
mkdir -p ${INSTALL}/usr/share/bootloader/boot/grub
cp -av ${PKG_DIR}/config/* ${INSTALL}/usr/share/bootloader/boot/grub
mkdir -p ${INSTALL}/usr/share/bootloader/EFI/BOOT
cp -av ${PKG_DIR}/config/* ${INSTALL}/usr/share/bootloader/EFI/BOOT
cp -av bootaa64.efi ${INSTALL}/usr/share/bootloader/EFI/BOOT
# Create grub configuration
generate_grub_cfg_body > "${INSTALL}/usr/share/bootloader/boot/grub/grub.cfg"
generate_grub_cfg_body > "${INSTALL}/usr/share/bootloader/EFI/BOOT/grub.cfg"
# Always install the update script
find_file_path bootloader/update.sh && cp -av ${FOUND_PATH} ${INSTALL}/usr/share/bootloader