From: Carsten Haitzler carsten.haitzler@arm.com
Debian now properly mounts boot and root so you have access to boot files too at runtime.
CI passes except for FVP - but CI is yet again broken and no-op CI runs fail the same way
https://git.morello-project.org/carhai01/morello-rootfs-images/-/pipelines/1...
Carsten Haitzler (2): morello: Filesystem: Make fs labels with prefix MRLO- mounting morello: fstab: mount root and boot by label
context/build_debian_image.sh | 3 +++ context/make_image.sh | 2 +- scripts/build-morello-image.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-)
From: Carsten Haitzler carsten.haitzler@arm.com
Use fs labels for later mounting by label in fstab
Signed-off-by: Carsten Haitzler carsten.haitzler@arm.com --- context/make_image.sh | 2 +- scripts/build-morello-image.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/context/make_image.sh b/context/make_image.sh index 14e2558..78df00a 100644 --- a/context/make_image.sh +++ b/context/make_image.sh @@ -30,7 +30,7 @@ mv /morello_sw/debian_bullseye/morello-sdk /morello_sw/stage2 dd if=/dev/zero of=morello-debian.img bs=1024K count=4096
__loop_device=$(losetup -f --show morello-debian.img) -mkfs.ext4 $__loop_device +mkfs.ext4 -L MRLO-ROOT $__loop_device mkdir mnt_point mount $__loop_device ./mnt_point
diff --git a/scripts/build-morello-image.sh b/scripts/build-morello-image.sh index bf8f987..2f51d9f 100755 --- a/scripts/build-morello-image.sh +++ b/scripts/build-morello-image.sh @@ -19,7 +19,7 @@ build_morello_image() { "$MORELLO_HOME/scripts/tools/mk-part-fat" \ -o "$MORELLO_GEN/bsp/$PLATFORM/morello.esp.img" \ -s "AUTO" \ - -l "ESP" \ + -l "MRLO-ESP" \ "$MORELLO_GEN/bsp/firmware/$PLATFORM/grub.efi" "/EFI/BOOT/BOOTAA64.EFI" \ "$MORELLO_GEN/bsp/firmware/$PLATFORM/grub_$PLATFORM.cfg" "/grub/grub.cfg" \ "$MORELLO_GEN/dts/arm/morello-$PLATFORM.dtb" "/morello.dtb" \
From: Carsten Haitzler carsten.haitzler@arm.com
Mount by given label in debian rootfs
Signed-off-by: Carsten Haitzler carsten.haitzler@arm.com --- context/build_debian_image.sh | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/context/build_debian_image.sh b/context/build_debian_image.sh index a0137ae..da0a803 100755 --- a/context/build_debian_image.sh +++ b/context/build_debian_image.sh @@ -61,6 +61,9 @@ echo 'root:morello' | chpasswd
# Enable /dev/shm (required to build EDK2) echo -e "none /dev/shm tmpfs rw,nosuid,nodev,noexec 0 0" >> /etc/fstab +# Mount root and boot +echo -e "LABEL=MRLO-ROOT / ext4 rw,noatime 0 0" >> /etc/fstab +echo -e "LABEL=MRLO-ESP /boot vfat rw 0 0" >> /etc/fstab mount /dev/shm
# Enable network
And of course if you don't actually use gitlab and MR's and have to do all the patch generating by hand every time and hunt down the right url for the right patch and have to send CI links you end up sending the wrong one from the wrong tab.
https://git.morello-project.org/carhai01/morello-rootfs-images/-/pipelines/1...
On 5/3/23 11:53, carsten.haitzler@foss.arm.com wrote:
From: Carsten Haitzler carsten.haitzler@arm.com
Debian now properly mounts boot and root so you have access to boot files too at runtime.
CI passes except for FVP - but CI is yet again broken and no-op CI runs fail the same way
https://git.morello-project.org/carhai01/morello-rootfs-images/-/pipelines/1...
Carsten Haitzler (2): morello: Filesystem: Make fs labels with prefix MRLO- mounting morello: fstab: mount root and boot by label
context/build_debian_image.sh | 3 +++ context/make_image.sh | 2 +- scripts/build-morello-image.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-)
CI now works:
https://git.morello-project.org/carhai01/morello-rootfs-images/-/pipelines/1...
On 5/3/23 11:53, carsten.haitzler@foss.arm.com wrote:
From: Carsten Haitzler carsten.haitzler@arm.com
Debian now properly mounts boot and root so you have access to boot files too at runtime.
CI passes except for FVP - but CI is yet again broken and no-op CI runs fail the same way
https://git.morello-project.org/carhai01/morello-rootfs-images/-/pipelines/1...
Carsten Haitzler (2): morello: Filesystem: Make fs labels with prefix MRLO- mounting morello: fstab: mount root and boot by label
context/build_debian_image.sh | 3 +++ context/make_image.sh | 2 +- scripts/build-morello-image.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-)
Hi Carsten,
On 5/10/23 11:07, Carsten Haitzler wrote:
CI now works:
https://git.morello-project.org/carhai01/morello-rootfs-images/-/pipelines/1...
Thank you for the notification.
Vincenzo
On 5/3/23 11:53, carsten.haitzler@foss.arm.com wrote:
From: Carsten Haitzler carsten.haitzler@arm.com
Debian now properly mounts boot and root so you have access to boot files too at runtime.
CI passes except for FVP - but CI is yet again broken and no-op CI runs fail the same way
https://git.morello-project.org/carhai01/morello-rootfs-images/-/pipelines/1...
Carsten Haitzler (2): morello: Filesystem: Make fs labels with prefix MRLO- mounting morello: fstab: mount root and boot by label
context/build_debian_image.sh | 3 +++ context/make_image.sh | 2 +- scripts/build-morello-image.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-)
linux-morello-distros mailing list -- linux-morello-distros@op-lists.linaro.org To unsubscribe send an email to linux-morello-distros-leave@op-lists.linaro.org
linux-morello-distros@op-lists.linaro.org
-
Carsten Haitzler -
carsten.haitzler＠foss.arm.com
-
Vincenzo Frascino