debian-cd

Merge ~lool/debian-cd/+git/tegra-jammy-live-server:tegra-jammy-live-server into ~ubuntu-cdimage/debian-cd/+git/ubuntu:main

  1. Git
  2. lp:~lool/debian-cd/+git/tegra-jammy-live-server
  3. tegra-jammy-live-server
  4. Merge into main
Proposed by Loïc Minier
Status: Merged
Merged at revision: c65b1578eb0327408cded5344527095903fcdac9
Proposed branch: ~lool/debian-cd/+git/tegra-jammy-live-server:tegra-jammy-live-server
Merge into: ~ubuntu-cdimage/debian-cd/+git/ubuntu:main
Diff against target: 58 lines (+20/-10)
2 files modified
tools/boot/jammy/boot-arm64 (+10/-5)
tools/boot/lunar/boot-arm64 (+10/-5)
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+441127@code.launchpad.net

Commit message

Add support for jammy live Ubuntu Server images for arm64+tegra

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

Please also patch lunar/boot-arm64 so this doesn't potentially get lost for 24.04

review: Needs Fixing
Revision history for this message
Steve Langasek (vorlon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/tools/boot/jammy/boot-arm64 b/tools/boot/jammy/boot-arm64
index 8f107be..fd7fbbe 100755
--- a/tools/boot/jammy/boot-arm64
+++ b/tools/boot/jammy/boot-arm64
@@ -15,14 +15,19 @@ cd $CDDIR/..
1515
16> $N.mkisofs_opts16> $N.mkisofs_opts
1717
18FLAVOUR=generic
19if [ "$SUBARCH" = "tegra" ]; then
20 FLAVOUR=nvidia-tegra
21fi
22
18# rename kernel+initrd23# rename kernel+initrd
19mv $CDDIR/casper/filesystem.kernel-generic $CDDIR/casper/vmlinuz24mv $CDDIR/casper/filesystem.kernel-$FLAVOUR $CDDIR/casper/vmlinuz
20mv $CDDIR/casper/filesystem.initrd-generic $CDDIR/casper/initrd25mv $CDDIR/casper/filesystem.initrd-$FLAVOUR $CDDIR/casper/initrd
21HWE=26HWE=
22if [ -e $CDDIR/casper/filesystem.kernel-generic-hwe ]; then27if [ -e $CDDIR/casper/filesystem.kernel-$FLAVOUR-hwe ]; then
23 HWE="true"28 HWE="true"
24 mv $CDDIR/casper/filesystem.kernel-generic-hwe $CDDIR/casper/hwe-vmlinuz29 mv $CDDIR/casper/filesystem.kernel-$FLAVOUR-hwe $CDDIR/casper/hwe-vmlinuz
25 mv $CDDIR/casper/filesystem.initrd-generic-hwe $CDDIR/casper/hwe-initrd30 mv $CDDIR/casper/filesystem.initrd-$FLAVOUR-hwe $CDDIR/casper/hwe-initrd
26fi31fi
2732
28# download, extract and include cd-boot-images33# download, extract and include cd-boot-images
diff --git a/tools/boot/lunar/boot-arm64 b/tools/boot/lunar/boot-arm64
index 8f107be..fd7fbbe 100755
--- a/tools/boot/lunar/boot-arm64
+++ b/tools/boot/lunar/boot-arm64
@@ -15,14 +15,19 @@ cd $CDDIR/..
1515
16> $N.mkisofs_opts16> $N.mkisofs_opts
1717
18FLAVOUR=generic
19if [ "$SUBARCH" = "tegra" ]; then
20 FLAVOUR=nvidia-tegra
21fi
22
18# rename kernel+initrd23# rename kernel+initrd
19mv $CDDIR/casper/filesystem.kernel-generic $CDDIR/casper/vmlinuz24mv $CDDIR/casper/filesystem.kernel-$FLAVOUR $CDDIR/casper/vmlinuz
20mv $CDDIR/casper/filesystem.initrd-generic $CDDIR/casper/initrd25mv $CDDIR/casper/filesystem.initrd-$FLAVOUR $CDDIR/casper/initrd
21HWE=26HWE=
22if [ -e $CDDIR/casper/filesystem.kernel-generic-hwe ]; then27if [ -e $CDDIR/casper/filesystem.kernel-$FLAVOUR-hwe ]; then
23 HWE="true"28 HWE="true"
24 mv $CDDIR/casper/filesystem.kernel-generic-hwe $CDDIR/casper/hwe-vmlinuz29 mv $CDDIR/casper/filesystem.kernel-$FLAVOUR-hwe $CDDIR/casper/hwe-vmlinuz
25 mv $CDDIR/casper/filesystem.initrd-generic-hwe $CDDIR/casper/hwe-initrd30 mv $CDDIR/casper/filesystem.initrd-$FLAVOUR-hwe $CDDIR/casper/hwe-initrd
26fi31fi
2732
28# download, extract and include cd-boot-images33# download, extract and include cd-boot-images

Subscribers

People subscribed via source and target branches