github/kairos
7
0
Fork 0
mirror of https://github.com/kairos-io/kairos.git synced 2025-02-09 05:18:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐧 Fixes to the orin image (#1455)

Browse Source 
* 🐧 add grub2 symlink to the orin image

Signed-off-by: mudler <mudler@mocaccino.org>

* 🐛 Copy ubuntu arm artifacts into orin images

Signed-off-by: mudler <mudler@mocaccino.org>

* Update Earthfile

Co-authored-by: Mauro Morales <mauro.morales@spectrocloud.com>
Signed-off-by: Ettore Di Giacinto <mudler@users.noreply.github.com>
Signed-off-by: mudler <mudler@mocaccino.org>

* 🌱 move framework preparation to a script

Signed-off-by: mudler <mudler@mocaccino.org>

* 🌱 run dracut only when its present in the image

Signed-off-by: mudler <mudler@mocaccino.org>

* Revert "🌱 move framework preparation to a script"

This reverts commit 025ffa248434bc49baf1f91c7105e04c6d3ee0b4.

Signed-off-by: mudler <mudler@mocaccino.org>

* try to keep things on earthly

Signed-off-by: mudler <mudler@mocaccino.org>

---------

Signed-off-by: mudler <mudler@mocaccino.org>
Signed-off-by: Ettore Di Giacinto <mudler@users.noreply.github.com>
Co-authored-by: Mauro Morales <mauro.morales@spectrocloud.com>
This commit is contained in:
Ettore Di Giacinto 2023-05-26 22:06:46 +02:00 committed by GitHub
parent b374bf12f8
commit 156c79d257
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Earthfile
View File

@ -219,7 +219,7 @@ framework:
COPY overlay/files-fedora/ /framework
ELSE IF [ "$FLAVOR" = "debian" ] || [ "$FLAVOR" = "ubuntu" ] || [ "$FLAVOR" = "ubuntu-20-lts" ] || [ "$FLAVOR" = "ubuntu-22-lts" ]
COPY overlay/files-ubuntu/ /framework
ELSE IF [[ "$FLAVOR" =~ ^ubuntu-arm* ]]
ELSE IF [[ "$FLAVOR" =~ ^ubuntu-.*-lts-arm-.*$ ]]
COPY overlay/files-ubuntu-arm-rpi/ /framework
END
@ -336,15 +336,12 @@ base-image:
END
IF [[ "$FLAVOR" =~ ^alpine.* ]]
# no dracut on those flavors, do nothing
ELSE
IF [ -e "/usr/bin/dracut" ]
# Regenerate initrd if necessary
RUN --no-cache kernel=$(ls /lib/modules | head -n1) && depmod -a "${kernel}"
RUN --no-cache kernel=$(ls /lib/modules | head -n1) && dracut -f "/boot/initrd-${kernel}" "${kernel}" && ln -sf "initrd-${kernel}" /boot/initrd
END
# Set /boot/vmlinuz pointing to our kernel so kairos-agent can use it
# https://github.com/kairos-io/kairos-agent/blob/0288fb111bc568a1bfca59cb09f39302220475b6/pkg/elemental/elemental.go#L548 q
IF [ "$FLAVOR" = "fedora" ] || [ "$FLAVOR" = "rockylinux" ]

4
images/Dockerfile.ubuntu-20-lts-arm-nvidia-jetson-agx-orin
View File

@ -104,6 +104,10 @@ RUN apt-get install -y -o Dpkg::Options::="--force-overwrite" \
jetson-gpio-common \
python3-jetson-gpio
# Symlinks to make installer work
RUN ln -s /usr/sbin/grub-install /usr/sbin/grub2-install && \
ln -s /usr/bin/grub-editenv /usr/bin/grub2-editenv
# RUN rm -rf /opt/nvidia/l4t-packages
# RUN rm -rf /var/lib/apt/lists/*
# RUN useradd -ms /bin/bash jetson