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
1diff --git a/tools/boot/jammy/boot-arm64 b/tools/boot/jammy/boot-arm64
2index 8f107be..fd7fbbe 100755
3--- a/tools/boot/jammy/boot-arm64
4+++ b/tools/boot/jammy/boot-arm64
5@@ -15,14 +15,19 @@ cd $CDDIR/..
6
7 > $N.mkisofs_opts
8
9+FLAVOUR=generic
10+if [ "$SUBARCH" = "tegra" ]; then
11+ FLAVOUR=nvidia-tegra
12+fi
13+
14 # rename kernel+initrd
15-mv $CDDIR/casper/filesystem.kernel-generic $CDDIR/casper/vmlinuz
16-mv $CDDIR/casper/filesystem.initrd-generic $CDDIR/casper/initrd
17+mv $CDDIR/casper/filesystem.kernel-$FLAVOUR $CDDIR/casper/vmlinuz
18+mv $CDDIR/casper/filesystem.initrd-$FLAVOUR $CDDIR/casper/initrd
19 HWE=
20-if [ -e $CDDIR/casper/filesystem.kernel-generic-hwe ]; then
21+if [ -e $CDDIR/casper/filesystem.kernel-$FLAVOUR-hwe ]; then
22 HWE="true"
23- mv $CDDIR/casper/filesystem.kernel-generic-hwe $CDDIR/casper/hwe-vmlinuz
24- mv $CDDIR/casper/filesystem.initrd-generic-hwe $CDDIR/casper/hwe-initrd
25+ mv $CDDIR/casper/filesystem.kernel-$FLAVOUR-hwe $CDDIR/casper/hwe-vmlinuz
26+ mv $CDDIR/casper/filesystem.initrd-$FLAVOUR-hwe $CDDIR/casper/hwe-initrd
27 fi
28
29 # download, extract and include cd-boot-images
30diff --git a/tools/boot/lunar/boot-arm64 b/tools/boot/lunar/boot-arm64
31index 8f107be..fd7fbbe 100755
32--- a/tools/boot/lunar/boot-arm64
33+++ b/tools/boot/lunar/boot-arm64
34@@ -15,14 +15,19 @@ cd $CDDIR/..
35
36 > $N.mkisofs_opts
37
38+FLAVOUR=generic
39+if [ "$SUBARCH" = "tegra" ]; then
40+ FLAVOUR=nvidia-tegra
41+fi
42+
43 # rename kernel+initrd
44-mv $CDDIR/casper/filesystem.kernel-generic $CDDIR/casper/vmlinuz
45-mv $CDDIR/casper/filesystem.initrd-generic $CDDIR/casper/initrd
46+mv $CDDIR/casper/filesystem.kernel-$FLAVOUR $CDDIR/casper/vmlinuz
47+mv $CDDIR/casper/filesystem.initrd-$FLAVOUR $CDDIR/casper/initrd
48 HWE=
49-if [ -e $CDDIR/casper/filesystem.kernel-generic-hwe ]; then
50+if [ -e $CDDIR/casper/filesystem.kernel-$FLAVOUR-hwe ]; then
51 HWE="true"
52- mv $CDDIR/casper/filesystem.kernel-generic-hwe $CDDIR/casper/hwe-vmlinuz
53- mv $CDDIR/casper/filesystem.initrd-generic-hwe $CDDIR/casper/hwe-initrd
54+ mv $CDDIR/casper/filesystem.kernel-$FLAVOUR-hwe $CDDIR/casper/hwe-vmlinuz
55+ mv $CDDIR/casper/filesystem.initrd-$FLAVOUR-hwe $CDDIR/casper/hwe-initrd
56 fi
57
58 # download, extract and include cd-boot-images

Subscribers

People subscribed via source and target branches