debian-cd

Merge ~juergh/debian-cd/+git/ubuntu:x13s-kernel-param into ~ubuntu-cdimage/debian-cd/+git/ubuntu:main

  1. Git
  2. lp:~juergh/debian-cd/+git/ubuntu
  3. x13s-kernel-param
  4. Merge into main
Proposed by Juerg Haefliger
Status: Merged
Merged at revision: a9f9215b7d84eb759b2b965f3f325ec1c4047a63
Proposed branch: ~juergh/debian-cd/+git/ubuntu:x13s-kernel-param
Merge into: ~ubuntu-cdimage/debian-cd/+git/ubuntu:main
Diff against target: 26 lines (+2/-2)
2 files modified
tools/boot/noble/boot-arm64 (+1/-1)
tools/boot/oracular/boot-arm64 (+1/-1)
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Julian Andres Klode (community) Approve
Tobias Heider (community) Approve
Review via email: mp+467090@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tobias Heider (tobhe) :
review: Approve
Revision history for this message
Julian Andres Klode (juliank) wrote :

This looks good to me as it is isolated to the x13s build specifically, but I have no image team power.

review: Approve
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/noble/boot-arm64 b/tools/boot/noble/boot-arm64
2index fb4e0a8..9c7c471 100755
3--- a/tools/boot/noble/boot-arm64
4+++ b/tools/boot/noble/boot-arm64
5@@ -22,7 +22,7 @@ case "$SUBARCH" in
6 x13s)
7 FLAVOUR=generic
8 DTB="usr/lib/firmware/*/device-tree/qcom/sc8280xp-lenovo-thinkpad-x13s.dtb"
9- KERNEL_PARAMS="clk_ignore_unused pd_ignore_unused"
10+ KERNEL_PARAMS="clk_ignore_unused pd_ignore_unused arm64.nopauth"
11 ;;
12 largemem)
13 FLAVOUR=generic-64k
14diff --git a/tools/boot/oracular/boot-arm64 b/tools/boot/oracular/boot-arm64
15index fb4e0a8..9c7c471 100755
16--- a/tools/boot/oracular/boot-arm64
17+++ b/tools/boot/oracular/boot-arm64
18@@ -22,7 +22,7 @@ case "$SUBARCH" in
19 x13s)
20 FLAVOUR=generic
21 DTB="usr/lib/firmware/*/device-tree/qcom/sc8280xp-lenovo-thinkpad-x13s.dtb"
22- KERNEL_PARAMS="clk_ignore_unused pd_ignore_unused"
23+ KERNEL_PARAMS="clk_ignore_unused pd_ignore_unused arm64.nopauth"
24 ;;
25 largemem)
26 FLAVOUR=generic-64k

Subscribers

People subscribed via source and target branches