[neon/neon/livecd-rootfs/Neon/release] /: rebase on 25.04.88
Carlos De Maine
null at kde.org
Sat Mar 8 09:11:43 GMT 2025
Git commit a90cde343166bba33386775ceffea8c41b082dbb by Carlos De Maine.
Committed on 08/03/2025 at 09:11.
Pushed by carlosdem into branch 'Neon/release'.
rebase on 25.04.88
M +13 -0 debian/changelog
A +1 -0 live-build/apparmor/6.11/capability
A +1 -0 live-build/apparmor/6.11/caps/extended
A +1 -0 live-build/apparmor/6.11/caps/mask
A +1 -0 live-build/apparmor/6.11/dbus/mask
A +1 -0 live-build/apparmor/6.11/domain/attach_conditions/xattr
A +1 -0 live-build/apparmor/6.11/domain/change_hat
A +1 -0 live-build/apparmor/6.11/domain/change_hatv
A +1 -0 live-build/apparmor/6.11/domain/change_onexec
A +1 -0 live-build/apparmor/6.11/domain/change_profile
A +1 -0 live-build/apparmor/6.11/domain/computed_longest_left
A +1 -0 live-build/apparmor/6.11/domain/disconnected.path
A +1 -0 live-build/apparmor/6.11/domain/fix_binfmt_elf_mmap
A +1 -0 live-build/apparmor/6.11/domain/interruptible
A +1 -0 live-build/apparmor/6.11/domain/kill.signal
A +1 -0 live-build/apparmor/6.11/domain/post_nnp_subset
A +1 -0 live-build/apparmor/6.11/domain/stack
A +1 -0 live-build/apparmor/6.11/domain/unconfined_allowed_children
A +1 -0 live-build/apparmor/6.11/domain/version
A +1 -0 live-build/apparmor/6.11/file/mask
A +1 -0 live-build/apparmor/6.11/io_uring/mask
A +1 -0 live-build/apparmor/6.11/ipc/posix_mqueue
A +1 -0 live-build/apparmor/6.11/mount/mask
A +1 -0 live-build/apparmor/6.11/mount/move_mount
A +1 -0 live-build/apparmor/6.11/namespaces/mask
A +1 -0 live-build/apparmor/6.11/namespaces/pivot_root
A +1 -0 live-build/apparmor/6.11/namespaces/profile
A +1 -0 live-build/apparmor/6.11/namespaces/userns_create
A +1 -0 live-build/apparmor/6.11/network/af_mask
A +1 -0 live-build/apparmor/6.11/network/af_unix
A +1 -0 live-build/apparmor/6.11/network_v8/af_inet
A +1 -0 live-build/apparmor/6.11/network_v8/af_mask
A +1 -0 live-build/apparmor/6.11/policy/notify/user
A +1 -0 live-build/apparmor/6.11/policy/outofband
A +1 -0 live-build/apparmor/6.11/policy/permstable32
A +1 -0 live-build/apparmor/6.11/policy/permstable32_version
A +1 -0 live-build/apparmor/6.11/policy/set_load
A +1 -0 live-build/apparmor/6.11/policy/state32
A +1 -0 live-build/apparmor/6.11/policy/unconfined_restrictions/change_profile
A +1 -0 live-build/apparmor/6.11/policy/unconfined_restrictions/io_uring
A +1 -0 live-build/apparmor/6.11/policy/unconfined_restrictions/userns
A +1 -0 live-build/apparmor/6.11/policy/versions/v5
A +1 -0 live-build/apparmor/6.11/policy/versions/v6
A +1 -0 live-build/apparmor/6.11/policy/versions/v7
A +1 -0 live-build/apparmor/6.11/policy/versions/v8
A +1 -0 live-build/apparmor/6.11/policy/versions/v9
A +1 -0 live-build/apparmor/6.11/ptrace/mask
A +1 -0 live-build/apparmor/6.11/query/label/data
A +1 -0 live-build/apparmor/6.11/query/label/multi_transaction
A +1 -0 live-build/apparmor/6.11/query/label/perms
A +1 -0 live-build/apparmor/6.11/rlimit/mask
A +1 -0 live-build/apparmor/6.11/signal/mask
M +2 -1 live-build/auto/config
M +15 -53 live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary
https://invent.kde.org/neon/neon/livecd-rootfs/-/commit/a90cde343166bba33386775ceffea8c41b082dbb
diff --git a/debian/changelog b/debian/changelog
index 5cf124eb..4aa1ac5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+livecd-rootfs (25.04.88) noble; urgency=medium
+
+ * risc-v: directly copy device trees to /boot/dtb. (LP: #2092205)
+ * riscv: add SUBARCH 'jh7110'. (LP: #2099993)
+
+ -- Adriano Cordova <adriano.cordova at canonical.com> Mon, 10 Feb 2025 10:40:23 -0300
+
+livecd-rootfs (24.04.87) noble; urgency=medium
+
+ * Add 6.11 kernel apparmor features' preseeds. (LP: #2098306)
+
+ -- Thomas Bechtold <thomas.bechtold at canonical.com> Thu, 13 Feb 2025 12:22:41 +0100
+
livecd-rootfs (24.04.86) noble; urgency=medium
* Do not build HWE kernel layer on RISC-V as there is no HWE kernel there.
diff --git a/live-build/apparmor/6.11/capability b/live-build/apparmor/6.11/capability
new file mode 100644
index 00000000..96a10b97
--- /dev/null
+++ b/live-build/apparmor/6.11/capability
@@ -0,0 +1 @@
+0xffffff
diff --git a/live-build/apparmor/6.11/caps/extended b/live-build/apparmor/6.11/caps/extended
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/caps/extended
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/caps/mask b/live-build/apparmor/6.11/caps/mask
new file mode 100644
index 00000000..1bfa8eaf
--- /dev/null
+++ b/live-build/apparmor/6.11/caps/mask
@@ -0,0 +1 @@
+chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control setfcap mac_override mac_admin syslog wake_alarm block_suspend audit_read perfmon bpf checkpoint_restore
diff --git a/live-build/apparmor/6.11/dbus/mask b/live-build/apparmor/6.11/dbus/mask
new file mode 100644
index 00000000..1248078e
--- /dev/null
+++ b/live-build/apparmor/6.11/dbus/mask
@@ -0,0 +1 @@
+acquire send receive
diff --git a/live-build/apparmor/6.11/domain/attach_conditions/xattr b/live-build/apparmor/6.11/domain/attach_conditions/xattr
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/domain/attach_conditions/xattr
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/domain/change_hat b/live-build/apparmor/6.11/domain/change_hat
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/domain/change_hat
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/domain/change_hatv b/live-build/apparmor/6.11/domain/change_hatv
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/domain/change_hatv
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/domain/change_onexec b/live-build/apparmor/6.11/domain/change_onexec
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/domain/change_onexec
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/domain/change_profile b/live-build/apparmor/6.11/domain/change_profile
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/domain/change_profile
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/domain/computed_longest_left b/live-build/apparmor/6.11/domain/computed_longest_left
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/domain/computed_longest_left
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/domain/disconnected.path b/live-build/apparmor/6.11/domain/disconnected.path
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/domain/disconnected.path
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/domain/fix_binfmt_elf_mmap b/live-build/apparmor/6.11/domain/fix_binfmt_elf_mmap
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/domain/fix_binfmt_elf_mmap
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/domain/interruptible b/live-build/apparmor/6.11/domain/interruptible
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/domain/interruptible
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/domain/kill.signal b/live-build/apparmor/6.11/domain/kill.signal
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/domain/kill.signal
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/domain/post_nnp_subset b/live-build/apparmor/6.11/domain/post_nnp_subset
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/domain/post_nnp_subset
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/domain/stack b/live-build/apparmor/6.11/domain/stack
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/domain/stack
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/domain/unconfined_allowed_children b/live-build/apparmor/6.11/domain/unconfined_allowed_children
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/domain/unconfined_allowed_children
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/domain/version b/live-build/apparmor/6.11/domain/version
new file mode 100644
index 00000000..5625e59d
--- /dev/null
+++ b/live-build/apparmor/6.11/domain/version
@@ -0,0 +1 @@
+1.2
diff --git a/live-build/apparmor/6.11/file/mask b/live-build/apparmor/6.11/file/mask
new file mode 100644
index 00000000..087b6771
--- /dev/null
+++ b/live-build/apparmor/6.11/file/mask
@@ -0,0 +1 @@
+create read write exec append mmap_exec link lock
diff --git a/live-build/apparmor/6.11/io_uring/mask b/live-build/apparmor/6.11/io_uring/mask
new file mode 100644
index 00000000..feffab83
--- /dev/null
+++ b/live-build/apparmor/6.11/io_uring/mask
@@ -0,0 +1 @@
+sqpoll override_creds
diff --git a/live-build/apparmor/6.11/ipc/posix_mqueue b/live-build/apparmor/6.11/ipc/posix_mqueue
new file mode 100644
index 00000000..c20f9f93
--- /dev/null
+++ b/live-build/apparmor/6.11/ipc/posix_mqueue
@@ -0,0 +1 @@
+create read write open delete setattr getattr
diff --git a/live-build/apparmor/6.11/mount/mask b/live-build/apparmor/6.11/mount/mask
new file mode 100644
index 00000000..652c8796
--- /dev/null
+++ b/live-build/apparmor/6.11/mount/mask
@@ -0,0 +1 @@
+mount umount pivot_root
diff --git a/live-build/apparmor/6.11/mount/move_mount b/live-build/apparmor/6.11/mount/move_mount
new file mode 100644
index 00000000..9aa4e2bf
--- /dev/null
+++ b/live-build/apparmor/6.11/mount/move_mount
@@ -0,0 +1 @@
+detached
diff --git a/live-build/apparmor/6.11/namespaces/mask b/live-build/apparmor/6.11/namespaces/mask
new file mode 100644
index 00000000..b0faec29
--- /dev/null
+++ b/live-build/apparmor/6.11/namespaces/mask
@@ -0,0 +1 @@
+userns_create
diff --git a/live-build/apparmor/6.11/namespaces/pivot_root b/live-build/apparmor/6.11/namespaces/pivot_root
new file mode 100644
index 00000000..7ecb56eb
--- /dev/null
+++ b/live-build/apparmor/6.11/namespaces/pivot_root
@@ -0,0 +1 @@
+no
diff --git a/live-build/apparmor/6.11/namespaces/profile b/live-build/apparmor/6.11/namespaces/profile
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/namespaces/profile
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/namespaces/userns_create b/live-build/apparmor/6.11/namespaces/userns_create
new file mode 100644
index 00000000..64abab73
--- /dev/null
+++ b/live-build/apparmor/6.11/namespaces/userns_create
@@ -0,0 +1 @@
+pciu&
diff --git a/live-build/apparmor/6.11/network/af_mask b/live-build/apparmor/6.11/network/af_mask
new file mode 100644
index 00000000..d39f5b89
--- /dev/null
+++ b/live-build/apparmor/6.11/network/af_mask
@@ -0,0 +1 @@
+unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib mpls can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock kcm qipcrtr smc xdp mctp
diff --git a/live-build/apparmor/6.11/network/af_unix b/live-build/apparmor/6.11/network/af_unix
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/network/af_unix
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/network_v8/af_inet b/live-build/apparmor/6.11/network_v8/af_inet
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/network_v8/af_inet
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/network_v8/af_mask b/live-build/apparmor/6.11/network_v8/af_mask
new file mode 100644
index 00000000..d39f5b89
--- /dev/null
+++ b/live-build/apparmor/6.11/network_v8/af_mask
@@ -0,0 +1 @@
+unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib mpls can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock kcm qipcrtr smc xdp mctp
diff --git a/live-build/apparmor/6.11/policy/notify/user b/live-build/apparmor/6.11/policy/notify/user
new file mode 100644
index 00000000..f73f3093
--- /dev/null
+++ b/live-build/apparmor/6.11/policy/notify/user
@@ -0,0 +1 @@
+file
diff --git a/live-build/apparmor/6.11/policy/outofband b/live-build/apparmor/6.11/policy/outofband
new file mode 100644
index 00000000..2180fce5
--- /dev/null
+++ b/live-build/apparmor/6.11/policy/outofband
@@ -0,0 +1 @@
+0x000001
diff --git a/live-build/apparmor/6.11/policy/permstable32 b/live-build/apparmor/6.11/policy/permstable32
new file mode 100644
index 00000000..ee086602
--- /dev/null
+++ b/live-build/apparmor/6.11/policy/permstable32
@@ -0,0 +1 @@
+allow deny subtree cond kill complain prompt audit quiet hide xindex tag label
diff --git a/live-build/apparmor/6.11/policy/permstable32_version b/live-build/apparmor/6.11/policy/permstable32_version
new file mode 100644
index 00000000..eb8ece37
--- /dev/null
+++ b/live-build/apparmor/6.11/policy/permstable32_version
@@ -0,0 +1 @@
+0x000003
diff --git a/live-build/apparmor/6.11/policy/set_load b/live-build/apparmor/6.11/policy/set_load
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/policy/set_load
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/policy/state32 b/live-build/apparmor/6.11/policy/state32
new file mode 100644
index 00000000..2180fce5
--- /dev/null
+++ b/live-build/apparmor/6.11/policy/state32
@@ -0,0 +1 @@
+0x000001
diff --git a/live-build/apparmor/6.11/policy/unconfined_restrictions/change_profile b/live-build/apparmor/6.11/policy/unconfined_restrictions/change_profile
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/policy/unconfined_restrictions/change_profile
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/policy/unconfined_restrictions/io_uring b/live-build/apparmor/6.11/policy/unconfined_restrictions/io_uring
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/live-build/apparmor/6.11/policy/unconfined_restrictions/io_uring
@@ -0,0 +1 @@
+0
diff --git a/live-build/apparmor/6.11/policy/unconfined_restrictions/userns b/live-build/apparmor/6.11/policy/unconfined_restrictions/userns
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/live-build/apparmor/6.11/policy/unconfined_restrictions/userns
@@ -0,0 +1 @@
+1
diff --git a/live-build/apparmor/6.11/policy/versions/v5 b/live-build/apparmor/6.11/policy/versions/v5
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/policy/versions/v5
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/policy/versions/v6 b/live-build/apparmor/6.11/policy/versions/v6
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/policy/versions/v6
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/policy/versions/v7 b/live-build/apparmor/6.11/policy/versions/v7
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/policy/versions/v7
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/policy/versions/v8 b/live-build/apparmor/6.11/policy/versions/v8
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/policy/versions/v8
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/policy/versions/v9 b/live-build/apparmor/6.11/policy/versions/v9
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/policy/versions/v9
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/ptrace/mask b/live-build/apparmor/6.11/ptrace/mask
new file mode 100644
index 00000000..10fc201a
--- /dev/null
+++ b/live-build/apparmor/6.11/ptrace/mask
@@ -0,0 +1 @@
+read trace
diff --git a/live-build/apparmor/6.11/query/label/data b/live-build/apparmor/6.11/query/label/data
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/query/label/data
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/query/label/multi_transaction b/live-build/apparmor/6.11/query/label/multi_transaction
new file mode 100644
index 00000000..7cfab5b0
--- /dev/null
+++ b/live-build/apparmor/6.11/query/label/multi_transaction
@@ -0,0 +1 @@
+yes
diff --git a/live-build/apparmor/6.11/query/label/perms b/live-build/apparmor/6.11/query/label/perms
new file mode 100644
index 00000000..71685cbf
--- /dev/null
+++ b/live-build/apparmor/6.11/query/label/perms
@@ -0,0 +1 @@
+allow deny audit quiet
diff --git a/live-build/apparmor/6.11/rlimit/mask b/live-build/apparmor/6.11/rlimit/mask
new file mode 100644
index 00000000..c305a7d2
--- /dev/null
+++ b/live-build/apparmor/6.11/rlimit/mask
@@ -0,0 +1 @@
+cpu fsize data stack core rss nproc nofile memlock as locks sigpending msgqueue nice rtprio rttime
diff --git a/live-build/apparmor/6.11/signal/mask b/live-build/apparmor/6.11/signal/mask
new file mode 100644
index 00000000..9eb55a04
--- /dev/null
+++ b/live-build/apparmor/6.11/signal/mask
@@ -0,0 +1 @@
+hup int quit ill trap abrt bus fpe kill usr1 segv usr2 pipe alrm term stkflt chld cont stop stp ttin ttou urg xcpu xfsz vtalrm prof winch io pwr sys emt lost
diff --git a/live-build/auto/config b/live-build/auto/config
index 12fc6cd2..ef9586fd 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -9,7 +9,7 @@ case $ARCH:$SUBARCH in
armhf:|\
i386:|\
ppc64el:|\
- riscv64:|riscv64:generic|riscv64:icicle|riscv64:licheerv|\
+ riscv64:|riscv64:generic|riscv64:icicle|riscv64:jh7110|riscv64:licheerv|\
riscv64:milkvmars|riscv64:nezha|riscv64:pic64gx|riscv64:unmatched|\
riscv64:visionfive|riscv64:visionfive2|\
s390x:|\
@@ -396,6 +396,7 @@ fi
if [ "$IMAGEFORMAT" = "ext4" ] && [ "$PROJECT" = "ubuntu-cpc" ]; then
case $ARCH:$SUBARCH in
riscv64:icicle | \
+ riscv64:jh7110 | \
riscv64:licheerv | \
riscv64:milkvmars | \
riscv64:nezha | \
diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary
index 7e84fc4a..196a172b 100755
--- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary
@@ -133,8 +133,8 @@ create_partitions() {
--change-name=3:uEnv \
--new=1:: \
--attributes=1:set:2
- elif [ "${SUBARCH:-}" = "visionfive2" ] || [ "${SUBARCH:-}" = "milkvmars" ]; then
- # VisionFive 2, Milk-V Mars
+ elif [ "${SUBARCH:-}" = "visionfive2" ] || [ "${SUBARCH:-}" = "milkvmars" ] || [ "${SUBARCH:-}" = "jh7110" ]; then
+ # JH7110 chips: VisionFive 2, Milk-V Mars
sgdisk "${disk_image}" \
--set-alignment=4096 \
--new=13:4096:8191 \
@@ -272,49 +272,21 @@ install_grub() {
mkdir -p mountpoint/etc/default/grub.d/
cp ${my_d}/riscv64/grub/10_cmdline.cfg mountpoint/etc/default/grub.d/
echo "Installing GRUB for ${SUBARCH} board"
- mkdir -p mountpoint/etc/flash-kernel/
case "${SUBARCH}" in
"icicle")
cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/
- # flash-kernel is needed to install the dtb for update-grub: it uses the
- # /proc/device-tree/model value to pick the correct dtb and as we are in a chroot,
- # the model value is wrong and we need to use /etc/flash-kernel/machine instead.
- # This explains why we install flash-kernel here.
- chroot mountpoint bash -c "echo 'Microchip PolarFire-SoC Icicle Kit' > /etc/flash-kernel/machine"
# The real U-Boot
chroot mountpoint apt-get install -qqy u-boot-microchip
loader="${loop_device}p13"
dd if=mountpoint/usr/lib/u-boot/microchip_icicle/u-boot.payload of=$loader
;;
- "milkvmars")
- cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/
- # flash-kernel is needed to install the dtb for update-grub: it uses the
- # /proc/device-tree/model value to pick the correct dtb and as we are in a chroot,
- # the model value is wrong and we need to use /etc/flash-kernel/machine instead.
- # This explains why we install flash-kernel here.
- chroot mountpoint bash -c "echo 'Milk-V Mars' > /etc/flash-kernel/machine"
- chroot mountpoint apt-get install -qqy u-boot-starfive
- # U-Boot SPL
- loader1="${loop_device}p13"
- # Main U-Boot
- loader2="${loop_device}p2"
- dd if=mountpoint/usr/lib/u-boot/starfive_visionfive2/u-boot-spl.bin.normal.out of=$loader1
- dd if=mountpoint/usr/lib/u-boot/starfive_visionfive2/u-boot.itb of=$loader2
- ;;
"nezha"|"licheerv")
echo "Reducing initramfs size for ${SUBARCH} board"
mkdir -p mountpoint/etc/initramfs-tools/conf.d/
cp ${my_d}/riscv64/initramfs-tools/modules_list.conf mountpoint/etc/initramfs-tools/conf.d/
chroot mountpoint update-initramfs -c -v -k all
echo "Installing U-Boot for ${SUBARCH} board"
- # flash-kernel is needed to install the dtb for update-grub: it uses the
- # /proc/device-tree/model value to pick the correct dtb and as we are in a chroot,
- # the model value is wrong and we need to use /etc/flash-kernel/machine instead.
- # This explains why we install flash-kernel here.
- if [ "$SUBARCH" = "nezha" ]; then
- chroot mountpoint bash -c "echo 'Allwinner D1 Nezha' > /etc/flash-kernel/machine"
- elif [ "$SUBARCH" = "licheerv" ]; then
- chroot mountpoint bash -c "echo 'Sipeed Lichee RV Dock' > /etc/flash-kernel/machine"
+ if [ "$SUBARCH" = "licheerv" ]; then
# cryptsetup-initramfs is a large contributor of the initrd size: we have to
# remove it for the LicheeRV board, otherwise it fails to boot. cryptsetup-initramfs
# needs to embed plymouth (and then the drm/gpu stuff) for interacting with the user
@@ -330,21 +302,12 @@ install_grub() {
;;
"pic64gx")
cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/
- # flash-kernel is needed to install the dtb for update-grub: it uses the
- # /proc/device-tree/model value to pick the correct dtb and as we are in a chroot,
- # the model value is wrong and we need to use /etc/flash-kernel/machine instead.
- chroot mountpoint bash -c "echo 'Microchip PIC64GX Curiosity Kit' > /etc/flash-kernel/machine"
# u-boot-pic64gx contains the vendor U-Boot
chroot mountpoint apt-get install -qqy u-boot-pic64gx
loader="${loop_device}p13"
dd if=mountpoint/usr/lib/u-boot-pic64gx/u-boot.payload of=$loader
;;
"visionfive")
- # flash-kernel is needed to install the dtb for update-grub: it uses the
- # /proc/device-tree/model value to pick the correct dtb and as we are in a chroot,
- # the model value is wrong and we need to use /etc/flash-kernel/machine instead.
- # This explains why we install flash-kernel here.
- chroot mountpoint bash -c "echo 'StarFive VisionFive V1' > /etc/flash-kernel/machine"
# factory u-boot requires a p3 partition with /boot/uEnv.txt file
uenv_dev="${loop_device}p3"
mkfs.ext4 "${uenv_dev}"
@@ -374,13 +337,8 @@ EOF
umount "${uenv_mnt_dir}"
rmdir "${uenv_mnt_dir}"
;;
- "visionfive2")
+ "visionfive2"|"milkvmars"|"jh7110")
cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/
- # flash-kernel is needed to install the dtb for update-grub: it uses the
- # /proc/device-tree/model value to pick the correct dtb and as we are in a chroot,
- # the model value is wrong and we need to use /etc/flash-kernel/machine instead.
- # This explains why we install flash-kernel here.
- chroot mountpoint bash -c "echo 'StarFive VisionFive 2 v1.3B' > /etc/flash-kernel/machine"
chroot mountpoint apt-get install -qqy u-boot-starfive
# U-Boot SPL
loader1="${loop_device}p13"
@@ -391,7 +349,6 @@ EOF
;;
unmatched)
cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/
- chroot mountpoint bash -c "echo 'SiFive HiFive Unmatched A00' > /etc/flash-kernel/machine"
chroot mountpoint apt-get install -qqy u-boot-sifive
# U-Boot SPL
loader1="${loop_device}p13"
@@ -401,6 +358,17 @@ EOF
dd if=mountpoint/usr/lib/u-boot/sifive_unmatched/u-boot.itb of=$loader2
;;
esac
+ echo "Copying device trees"
+ kver=$(ls mountpoint/lib/modules | sort -V | tail -n 1)
+ dtb_src_dirs=(
+ "mountpoint/usr/lib/linux-image-$kver"
+ "mountpoint/lib/firmware/$kver/device-tree"
+ )
+ dtb_tgt_dir="mountpoint/boot/efi/dtb/"
+ mkdir -p "$dtb_tgt_dir"
+ for src_dir in "${dtb_src_dirs[@]}"; do
+ [ -d "$src_dir" ] && cp -r -v "$src_dir"/* "$dtb_tgt_dir" || echo "Skipping missing: $src_dir"
+ done
chroot mountpoint bash -c 'FK_FORCE=yes apt-get install -qqy grub-efi-riscv64 flash-kernel'
efi_target=riscv64-efi
# Provide end-user modifyable CIDATA
@@ -409,12 +377,6 @@ EOF
# Provide stock nocloud datasource
# Allow interactive login without a cloud datasource.
setup_cinocloud mountpoint
- # u-boot-${SUBARCH} will boot using UEFI if it does not find
- # any extlinux.conf or boot.scr: but flash-kernel will
- # install a boot.scr if it believes it did not boot in
- # EFI mode, so make sure we don't leave a boot.scr
- # behind.
- chroot mountpoint rm -f /boot/boot.scr
else
# Other images e.g. cloud images
chroot mountpoint apt-get install -qqy u-boot-menu grub-efi-riscv64
More information about the Neon-commits
mailing list