github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 09:16:29 +00:00
Code Issues Projects Releases Wiki Activity

remove linuxefi grub EFI handover to normal linux loading

Browse Source 
Signed-off-by: Avi Deitcher <avi@deitcher.net>
This commit is contained in:
Avi Deitcher 2024-08-29 17:29:47 +03:00
parent 6979859e76
commit ba25e59640
11 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cmd/linuxkit/moby/build/images.yaml
View File

@ -1,12 +1,12 @@
iso: linuxkit/mkimage-iso:08d19f8acf285bdce65dd4aea24f01d8adbedfbc iso: linuxkit/mkimage-iso:08d19f8acf285bdce65dd4aea24f01d8adbedfbc
iso-bios: linuxkit/mkimage-iso-bios:96d5dac296345c308b8ad9e6cae7467e76ba8fd1 iso-bios: linuxkit/mkimage-iso-bios:96d5dac296345c308b8ad9e6cae7467e76ba8fd1
iso-efi: linuxkit/mkimage-iso-efi:cf2a3ff1dacfcacfb1f165abc210d9e33dc9d161 iso-efi: linuxkit/mkimage-iso-efi:8b538605a581db7523c021bf92a715d2054f609e
iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:a9e61bc810ae9928bab92f41f6e810e5b4f6183a iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:d390030aae1069f3142523e9f433aad946838911
raw-bios: linuxkit/mkimage-raw-bios:4c21d66c81fd3641c62b9e80ddf5494000a1a442 raw-bios: linuxkit/mkimage-raw-bios:4c21d66c81fd3641c62b9e80ddf5494000a1a442
raw-efi: linuxkit/mkimage-raw-efi:df0979572e8d0251a5cf55b6f73131868d036bb4 raw-efi: linuxkit/mkimage-raw-efi:14b66a308b2047c59b0fe7c43996f73c653a9fcd
squashfs: linuxkit/mkimage-squashfs:a61fd76227ab4998d6c1ba17229cd8bd749e8f13 squashfs: linuxkit/mkimage-squashfs:a61fd76227ab4998d6c1ba17229cd8bd749e8f13
gcp: linuxkit/mkimage-gcp:035c2c2b4b958060c0b6bdd41d9cbc886a335098 gcp: linuxkit/mkimage-gcp:035c2c2b4b958060c0b6bdd41d9cbc886a335098
qcow2-efi: linuxkit/mkimage-qcow2-efi:98a6e3e7b6eed965f879cd77c009c7c404d4457d qcow2-efi: linuxkit/mkimage-qcow2-efi:8b76f4118e6640db6f39196dc365529f401e7670
vhd: linuxkit/mkimage-vhd:91bcc7a6475f46a3d5d84cf6161f07c583dd9c21 vhd: linuxkit/mkimage-vhd:91bcc7a6475f46a3d5d84cf6161f07c583dd9c21
dynamic-vhd: linuxkit/mkimage-dynamic-vhd:b755f8ff82c8631d18decaebb09867e7b88c2533 dynamic-vhd: linuxkit/mkimage-dynamic-vhd:b755f8ff82c8631d18decaebb09867e7b88c2533
vmdk: linuxkit/mkimage-vmdk:20a370a55bd8d58c2ae9d634c297a955bb006efd vmdk: linuxkit/mkimage-vmdk:20a370a55bd8d58c2ae9d634c297a955bb006efd

2
tools/grub-dev/Dockerfile
View File

@ -40,7 +40,7 @@ RUN make -j "$(getconf _NPROCESSORS_ONLN)"
RUN make install RUN make install
RUN case $(uname -m) in \ RUN case $(uname -m) in \
x86_64) \ x86_64) \
./grub-mkimage -O x86_64-efi -d /grub-lib/grub/x86_64-efi -o /grub-lib/BOOTX64.EFI -p /EFI/BOOT ${GRUB_MODULES} linuxefi; \ ./grub-mkimage -O x86_64-efi -d /grub-lib/grub/x86_64-efi -o /grub-lib/BOOTX64.EFI -p /EFI/BOOT ${GRUB_MODULES}; \
;; \ ;; \
aarch64) \ aarch64) \
./grub-mkimage -O arm64-efi -d /grub-lib/grub/arm64-efi -o /grub-lib/BOOTAA64.EFI -p /EFI/BOOT ${GRUB_MODULES}; \ ./grub-mkimage -O arm64-efi -d /grub-lib/grub/arm64-efi -o /grub-lib/BOOTAA64.EFI -p /EFI/BOOT ${GRUB_MODULES}; \

4
tools/grub/Dockerfile
View File

@ -1,6 +1,6 @@
# this is really hard to build. Do not change this version unless you must # this is really hard to build. Do not change this version unless you must
FROM --platform=linux/amd64 linuxkit/grub-dev:e94da02aac3a39fec34047051a40d367e61cd0a0 AS grub-build-amd64 FROM --platform=linux/amd64 linuxkit/grub-dev:854df7920df18567e23940a1f9cf573980dcfe9b AS grub-build-amd64
FROM --platform=linux/arm64 linuxkit/grub-dev:e94da02aac3a39fec34047051a40d367e61cd0a0 AS grub-build-arm64 FROM --platform=linux/arm64 linuxkit/grub-dev:854df7920df18567e23940a1f9cf573980dcfe9b AS grub-build-arm64
FROM scratch FROM scratch
ENTRYPOINT [] ENTRYPOINT []

2
tools/mkimage-iso-efi-initrd/Dockerfile
View File

@ -1,4 +1,4 @@
FROM linuxkit/grub:292deb743d85eb79cbd5b163841db8ccd2500677 AS grub FROM linuxkit/grub:9b36ab2ca67e9cdc2faf008278cc4bb8f981350b AS grub
FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e AS mirror FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e AS mirror
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/

8
tools/mkimage-iso-efi-initrd/make-efi-initrd
View File

@ -7,13 +7,9 @@ ARCH=${TARGETARCH:-`uname -m`}
case $ARCH in case $ARCH in
x86_64) x86_64)
BOOTFILE=BOOTX64.EFI BOOTFILE=BOOTX64.EFI
LINUX_ENTRY=linuxefi
INITRD_ENTRY=initrdefi
;; ;;
aarch64) aarch64)
BOOTFILE=BOOTAA64.EFI BOOTFILE=BOOTAA64.EFI
LINUX_ENTRY=linux
INITRD_ENTRY=initrd
;; ;;
esac esac
@ -35,8 +31,8 @@ cp /usr/local/share/$BOOTFILE .
CFG="set timeout=0 CFG="set timeout=0
set gfxpayload=text set gfxpayload=text
menuentry 'LinuxKit ISO Image' { menuentry 'LinuxKit ISO Image' {
$LINUX_ENTRY /kernel ${CMDLINE} text linux /kernel ${CMDLINE} text
$INITRD_ENTRY /initrd.img initrd /initrd.img
} }
" "

2
tools/mkimage-iso-efi/Dockerfile
View File

@ -1,4 +1,4 @@
FROM linuxkit/grub:292deb743d85eb79cbd5b163841db8ccd2500677 AS grub FROM linuxkit/grub:9b36ab2ca67e9cdc2faf008278cc4bb8f981350b AS grub
FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e AS mirror FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e AS mirror
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/

4
tools/mkimage-iso-efi/make-efi
View File

@ -8,12 +8,10 @@ case $ARCH in
x86_64) x86_64)
BOOTFILE=BOOTX64.EFI BOOTFILE=BOOTX64.EFI
ROOTDEV=/dev/sr0 ROOTDEV=/dev/sr0
LINUX_ENTRY=linuxefi
;; ;;
aarch64) aarch64)
BOOTFILE=BOOTAA64.EFI BOOTFILE=BOOTAA64.EFI
ROOTDEV=/dev/vda ROOTDEV=/dev/vda
LINUX_ENTRY=linux
;; ;;
esac esac
@ -38,7 +36,7 @@ cp /usr/local/share/$BOOTFILE .
CFG="set timeout=0 CFG="set timeout=0
set gfxpayload=text set gfxpayload=text
menuentry 'LinuxKit ISO Image' { menuentry 'LinuxKit ISO Image' {
$LINUX_ENTRY /boot/kernel ${CMDLINE} text linux /boot/kernel ${CMDLINE} text
} }
" "

2
tools/mkimage-qcow2-efi/Dockerfile
View File

@ -1,4 +1,4 @@
FROM linuxkit/grub:292deb743d85eb79cbd5b163841db8ccd2500677 AS grub FROM linuxkit/grub:9b36ab2ca67e9cdc2faf008278cc4bb8f981350b AS grub
FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e AS mirror FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e AS mirror
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/

8
tools/mkimage-qcow2-efi/make-efi
View File

@ -19,13 +19,9 @@ ARCH=${TARGETARCH:-`uname -m`}
case $ARCH in case $ARCH in
x86_64) x86_64)
BOOTFILE=BOOTX64.EFI BOOTFILE=BOOTX64.EFI
LINUX_ENTRY=linuxefi
INITRD_ENTRY=initrdefi
;; ;;
aarch64) aarch64)
BOOTFILE=BOOTAA64.EFI BOOTFILE=BOOTAA64.EFI
LINUX_ENTRY=linux
INITRD_ENTRY=initrd
;; ;;
esac esac
@ -54,8 +50,8 @@ cat >> EFI/BOOT/grub.cfg <<EOF
set timeout=0 set timeout=0
set gfxpayload=text set gfxpayload=text
menuentry 'LinuxKit ISO Image' { menuentry 'LinuxKit ISO Image' {
$LINUX_ENTRY /kernel ${CMDLINE} text linux /kernel ${CMDLINE} text
$INITRD_ENTRY /initrd.img initrd /initrd.img
} }
EOF EOF

2
tools/mkimage-raw-efi/Dockerfile
View File

@ -1,4 +1,4 @@
FROM linuxkit/grub:292deb743d85eb79cbd5b163841db8ccd2500677 AS grub FROM linuxkit/grub:9b36ab2ca67e9cdc2faf008278cc4bb8f981350b AS grub
FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e AS mirror FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e AS mirror
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/

8
tools/mkimage-raw-efi/make-efi
View File

@ -19,13 +19,9 @@ ARCH=${TARGETARCH:-`uname -m`}
case $ARCH in case $ARCH in
x86_64) x86_64)
BOOTFILE=BOOTX64.EFI BOOTFILE=BOOTX64.EFI
LINUX_ENTRY=linuxefi
INITRD_ENTRY=initrdefi
;; ;;
aarch64) aarch64)
BOOTFILE=BOOTAA64.EFI BOOTFILE=BOOTAA64.EFI
LINUX_ENTRY=linux
INITRD_ENTRY=initrd
;; ;;
esac esac
@ -54,8 +50,8 @@ cat >> EFI/BOOT/grub.cfg <<EOF
set timeout=0 set timeout=0
set gfxpayload=text set gfxpayload=text
menuentry 'LinuxKit ISO Image' { menuentry 'LinuxKit ISO Image' {
$LINUX_ENTRY /kernel ${CMDLINE} text linux /kernel ${CMDLINE} text
$INITRD_ENTRY /initrd.img initrd /initrd.img
} }
EOF EOF