Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion config/DS918+/6.2.4-25556/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@
},
"bootp1_copy": {
"@@@PAT@@@/GRUB_VER": "GRUB_VER",
"@@@COMMON@@@/EFI": "EFI"
"@@@COMMON@@@/EFI/boot/SynoBootLoader.conf": "EFI/BOOT/",
"@@@COMMON@@@/EFI/boot/SynoBootLoader.efi": "EFI/BOOT/"
},
"bootp2_copy": {
"@@@PAT@@@/GRUB_VER": "GRUB_VER",
Expand Down
3 changes: 2 additions & 1 deletion config/DS918+/7.0-41890/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@
},
"bootp1_copy": {
"@@@PAT@@@/GRUB_VER": "GRUB_VER",
"@@@COMMON@@@/EFI": "EFI"
"@@@COMMON@@@/EFI/boot/SynoBootLoader.conf": "EFI/BOOT/",
"@@@COMMON@@@/EFI/boot/SynoBootLoader.efi": "EFI/BOOT/"
},
"bootp2_copy": {
"@@@PAT@@@/GRUB_VER": "GRUB_VER",
Expand Down
13 changes: 13 additions & 0 deletions config/_common/grub-template.conf
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,17 @@ set gfxmode=auto
insmod vbe
insmod vga

# UEFI
insmod efi_gop
insmod efi_uga

insmod font
if loadfont ${prefix}/unicode.pf2
then
insmod gfxterm
set gfxmode=auto
set gfxpayload=keep
terminal_output gfxterm
fi

@@@MENU_ENTRIES@@@
2 changes: 1 addition & 1 deletion config/_common/ramdisk-003-post-init-script-LOWER.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ functions or quotes in v7, to make diffing and management of these patches easie
+++ b/usr/sbin/init.post
@@ -18,5 +18,28 @@
fi
Mmount $RootDevice /tmpRoot -o barrier=1
mount $RootDevice /tmpRoot -o barrier=1

+############################################################################################
+SED_PATH='/tmpRoot/usr/bin/sed'
Expand Down
Binary file modified ext/boot-image-template.img.gz
Binary file not shown.
22 changes: 17 additions & 5 deletions ext/build-template-image.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@ The following settings were detected by ./configure for the binary release:
With stack smashing protector: No
*******************************************************

mkdir build-pc && cd build-pc
../configure --prefix=$PWD/usr -sbindir=$PWD/sbin --sysconfdir=$PWD/etc --disable-werror
make && make install
cd ..
mkdir build && cd build
../configure --prefix=$PWD/usr -sbindir=$PWD/sbin --sysconfdir=$PWD/etc --disable-werror --with-platform=efi --target=x86_64
make && make install

########################################################################################################################
### Create the image
########################################################################################################################
Expand Down Expand Up @@ -77,14 +85,18 @@ mkfs.ext2 /dev/loop8p2
########################################################################################################################
mkdir temp-mount-p1
mount /dev/loop8p1 ./temp-mount-p1
./grub-2.06/grub-install \
-d ./grub-2.06/grub-core \
--target=i386-pc --no-floppy -s \
--root-directory=$PWD/temp-mount-p1 \
./grub-2.06/build-pc/grub-install \
--target=i386-pc --recheck -s \
--boot-directory=$PWD/temp-mount-p1/boot \
/dev/loop8
# small note: --root-directory MUST be an absolute path (or it will create it in /)

./grub-2.06/build/grub-install \
--target=x86_64-efi \
--efi-directory=$PWD/temp-mount-p1 \
--removable --no-nvram -s --no-bootsector --boot-directory=$PWD/temp-mount-p1/boot
sync
umount /dev/loop8p1
losetup -d /dev/loop8

########################################################################################################################
### Pack image
Expand Down