Merge pull request #61 from TexasInstruments/systemd_10.01.06-update

Systemd changes and 10.01.06 update
TexasInstruments · Nov 18, 2024 · 04a8cb7 · 04a8cb7
2 parents b594acf + e84a723
commit 04a8cb7
Show file tree

Hide file tree

Showing 16 changed files with 107 additions and 26 deletions.
diff --git a/configs/bdebstrap_configs/trixie/trixie-am62pxx-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-am62pxx-evm.yaml
@@ -38,8 +38,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.32-k3
-    - linux-headers-6.6.32-k3
+    - linux-image-6.6.44-k3
+    - linux-headers-6.6.44-k3
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62p-dkms
@@ -71,6 +71,8 @@ mmdebstrap:
     - parted
     - e2fsprogs
     - chromium
+    - wpasupplicant
+    - seatd
   mirrors:
     - http://deb.debian.org/debian
   setup-hooks:
@@ -107,6 +109,15 @@ mmdebstrap:
     - 'upload target/weston/weston /etc/default/weston'
     - '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
     - 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
+      # systemd-networkd Network Files
+    - 'chroot "$1" mkdir -p /etc/systemd/network/'
+    - 'upload target/systemd-networkd/10-eth.network /etc/systemd/network/10-eth.network'
+    - 'upload target/systemd-networkd/15-eth.network /etc/systemd/network/15-eth.network'
+    - 'upload target/systemd-networkd/30-wlan.network /etc/systemd/network/30-wlan.network'
+    - 'upload target/systemd-networkd/60-usb.network /etc/systemd/network/60-usb.network'
+    - 'chroot "$1" systemctl disable NetworkManager'
+      # Enable seatd service
+    - '$BDEBSTRAP_HOOKS/enable-units "$1" seatd'
       # Enable ssh to root user without password
     - 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
     - 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'

diff --git a/configs/bdebstrap_configs/trixie/trixie-am62xx-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-am62xx-evm.yaml
@@ -38,8 +38,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.32-k3
-    - linux-headers-6.6.32-k3
+    - linux-image-6.6.44-k3
+    - linux-headers-6.6.44-k3
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62-dkms
@@ -71,6 +71,8 @@ mmdebstrap:
     - parted
     - e2fsprogs
     - chromium
+    - wpasupplicant
+    - seatd
   mirrors:
     - http://deb.debian.org/debian
   setup-hooks:
@@ -107,6 +109,15 @@ mmdebstrap:
     - 'upload target/weston/weston /etc/default/weston'
     - '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
     - 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
+      # systemd-networkd Network Files
+    - 'chroot "$1" mkdir -p /etc/systemd/network/'
+    - 'upload target/systemd-networkd/10-eth.network /etc/systemd/network/10-eth.network'
+    - 'upload target/systemd-networkd/15-eth.network /etc/systemd/network/15-eth.network'
+    - 'upload target/systemd-networkd/30-wlan.network /etc/systemd/network/30-wlan.network'
+    - 'upload target/systemd-networkd/60-usb.network /etc/systemd/network/60-usb.network'
+    - 'chroot "$1" systemctl disable NetworkManager'
+      # Enable seatd service
+    - '$BDEBSTRAP_HOOKS/enable-units "$1" seatd'
       # Enable ssh to root user without password
     - 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
     - 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'

diff --git a/configs/bdebstrap_configs/trixie/trixie-am62xx-lp-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-am62xx-lp-evm.yaml
@@ -38,8 +38,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.32-k3
-    - linux-headers-6.6.32-k3
+    - linux-image-6.6.44-k3
+    - linux-headers-6.6.44-k3
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62-dkms
@@ -71,6 +71,7 @@ mmdebstrap:
     - parted
     - e2fsprogs
     - chromium
+    - seatd
   mirrors:
     - http://deb.debian.org/debian
   setup-hooks:
@@ -107,6 +108,8 @@ mmdebstrap:
     - 'upload target/weston/weston /etc/default/weston'
     - '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
     - 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
+      # Enable seatd service
+    - '$BDEBSTRAP_HOOKS/enable-units "$1" seatd'
       # Enable ssh to root user without password
     - 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
     - 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'

diff --git a/configs/bdebstrap_configs/trixie/trixie-am62xxsip-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-am62xxsip-evm.yaml
@@ -38,8 +38,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.32-k3
-    - linux-headers-6.6.32-k3
+    - linux-image-6.6.44-k3
+    - linux-headers-6.6.44-k3
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62-dkms
@@ -70,6 +70,7 @@ mmdebstrap:
     - pru-pssp
     - parted
     - e2fsprogs
+    - seatd
   mirrors:
     - http://deb.debian.org/debian
   setup-hooks:
@@ -106,6 +107,8 @@ mmdebstrap:
     - 'upload target/weston/weston /etc/default/weston'
     - '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
     - 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
+      # Enable seatd service
+    - '$BDEBSTRAP_HOOKS/enable-units "$1" seatd'
       # Enable ssh to root user without password
     - 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
     - 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'

diff --git a/configs/bdebstrap_configs/trixie/trixie-am64xx-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-am64xx-evm.yaml
@@ -31,8 +31,8 @@ mmdebstrap:
     - vim
     - k3conf
     - weston
-    - linux-image-6.6.32-k3
-    - linux-headers-6.6.32-k3
+    - linux-image-6.6.44-k3
+    - linux-headers-6.6.44-k3
     - linux-libc-dev
     - cryptodev-linux-dkms
     - firmware-ti-ipc-am64

diff --git a/configs/bdebstrap_configs/trixie/trixie-rt-am62pxx-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-rt-am62pxx-evm.yaml
@@ -38,8 +38,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.32-k3-rt
-    - linux-headers-6.6.32-k3-rt
+    - linux-image-6.6.44-k3-rt
+    - linux-headers-6.6.44-k3-rt
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62p-dkms
@@ -71,6 +71,8 @@ mmdebstrap:
     - parted
     - e2fsprogs
     - chromium
+    - wpasupplicant
+    - seatd
   mirrors:
     - http://deb.debian.org/debian
   setup-hooks:
@@ -107,6 +109,15 @@ mmdebstrap:
     - 'upload target/weston/weston /etc/default/weston'
     - '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
     - 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
+      # systemd-networkd Network Files
+    - 'chroot "$1" mkdir -p /etc/systemd/network/'
+    - 'upload target/systemd-networkd/10-eth.network /etc/systemd/network/10-eth.network'
+    - 'upload target/systemd-networkd/15-eth.network /etc/systemd/network/15-eth.network'
+    - 'upload target/systemd-networkd/30-wlan.network /etc/systemd/network/30-wlan.network'
+    - 'upload target/systemd-networkd/60-usb.network /etc/systemd/network/60-usb.network'
+    - 'chroot "$1" systemctl disable NetworkManager'
+      # Enable seatd service
+    - '$BDEBSTRAP_HOOKS/enable-units "$1" seatd'
       # Enable ssh to root user without password
     - 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
     - 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'

diff --git a/configs/bdebstrap_configs/trixie/trixie-rt-am62xx-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-rt-am62xx-evm.yaml
@@ -38,8 +38,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.32-k3-rt
-    - linux-headers-6.6.32-k3-rt
+    - linux-image-6.6.44-k3-rt
+    - linux-headers-6.6.44-k3-rt
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62-dkms
@@ -71,6 +71,8 @@ mmdebstrap:
     - parted
     - e2fsprogs
     - chromium
+    - wpasupplicant
+    - seatd
   mirrors:
     - http://deb.debian.org/debian
   setup-hooks:
@@ -107,6 +109,15 @@ mmdebstrap:
     - 'upload target/weston/weston /etc/default/weston'
     - '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
     - 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
+      # systemd-networkd Network Files
+    - 'chroot "$1" mkdir -p /etc/systemd/network/'
+    - 'upload target/systemd-networkd/10-eth.network /etc/systemd/network/10-eth.network'
+    - 'upload target/systemd-networkd/15-eth.network /etc/systemd/network/15-eth.network'
+    - 'upload target/systemd-networkd/30-wlan.network /etc/systemd/network/30-wlan.network'
+    - 'upload target/systemd-networkd/60-usb.network /etc/systemd/network/60-usb.network'
+    - 'chroot "$1" systemctl disable NetworkManager'
+      # Enable seatd service
+    - '$BDEBSTRAP_HOOKS/enable-units "$1" seatd'
       # Enable ssh to root user without password
     - 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
     - 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'

diff --git a/configs/bdebstrap_configs/trixie/trixie-rt-am62xx-lp-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-rt-am62xx-lp-evm.yaml
@@ -38,8 +38,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.32-k3-rt
-    - linux-headers-6.6.32-k3-rt
+    - linux-image-6.6.44-k3-rt
+    - linux-headers-6.6.44-k3-rt
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62-dkms
@@ -71,6 +71,7 @@ mmdebstrap:
     - parted
     - e2fsprogs
     - chromium
+    - seatd
   mirrors:
     - http://deb.debian.org/debian
   setup-hooks:
@@ -107,6 +108,8 @@ mmdebstrap:
     - 'upload target/weston/weston /etc/default/weston'
     - '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
     - 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
+      # Enable seatd service
+    - '$BDEBSTRAP_HOOKS/enable-units "$1" seatd'
       # Enable ssh to root user without password
     - 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
     - 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'

diff --git a/configs/bdebstrap_configs/trixie/trixie-rt-am62xxsip-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-rt-am62xxsip-evm.yaml
@@ -38,8 +38,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.32-k3-rt
-    - linux-headers-6.6.32-k3-rt
+    - linux-image-6.6.44-k3-rt
+    - linux-headers-6.6.44-k3-rt
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62-dkms
@@ -70,6 +70,7 @@ mmdebstrap:
     - pru-pssp
     - parted
     - e2fsprogs
+    - seatd
   mirrors:
     - http://deb.debian.org/debian
   setup-hooks:
@@ -106,6 +107,8 @@ mmdebstrap:
     - 'upload target/weston/weston /etc/default/weston'
     - '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
     - 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
+      # Enable seatd service
+    - '$BDEBSTRAP_HOOKS/enable-units "$1" seatd'
       # Enable ssh to root user without password
     - 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
     - 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'

diff --git a/configs/bdebstrap_configs/trixie/trixie-rt-am64xx-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-rt-am64xx-evm.yaml
@@ -31,8 +31,8 @@ mmdebstrap:
     - vim
     - k3conf
     - weston
-    - linux-image-6.6.32-k3-rt
-    - linux-headers-6.6.32-k3-rt
+    - linux-image-6.6.44-k3-rt
+    - linux-headers-6.6.44-k3-rt
     - linux-libc-dev
     - cryptodev-linux-dkms
     - firmware-ti-ipc-am64

diff --git a/configs/bsp_sources.toml b/configs/bsp_sources.toml
@@ -1,16 +1,16 @@
 # BSP selection based on variant of filesystem
 [trixie]
-    bsp_version = "10.00.07"
+    bsp_version = "10.01.06"
 
 [bookworm]
     bsp_version = "09.02.00.010"
 
 # BSP Configurations
-[10.00.07]
-    atf_srcrev = "00f1ec6b8740ccd403e641131e294aabacf2a48b"
-    optee_srcrev = "12d7c4ee4642d2d761e39fbcf21a06fb77141dea"
-    uboot_srcrev = "10.00.07"
-    linux_fw_srcrev = "10.00.07"
+[10.01.06]
+    atf_srcrev = "58b25570c9ef91753b14c2103f45f4be9dddb696"
+    optee_srcrev = "8f645256efc0dc66bd5c118778b0b50c44469ae1"
+    uboot_srcrev = "10.01.06"
+    linux_fw_srcrev = "10.01.06"
 
 [09.02.00.010]
     atf_srcrev = "00f1ec6b8740ccd403e641131e294aabacf2a48b"

diff --git a/configs/machines/10.00.07.toml → configs/machines/10.01.06.toml b/configs/machines/10.00.07.toml → configs/machines/10.01.06.toml
diff --git a/target/systemd-networkd/10-eth.network b/target/systemd-networkd/10-eth.network
@@ -0,0 +1,6 @@
+[Match]
+Name=eth0
+KernelCommandLine=!root=/dev/nfs
+
+[Network]
+DHCP=yes
diff --git a/target/systemd-networkd/15-eth.network b/target/systemd-networkd/15-eth.network
@@ -0,0 +1,9 @@
+[Match]
+Name=eth*
+KernelCommandLine=!root=/dev/nfs
+
+[Link]
+RequiredForOnline=no
+
+[Network]
+DHCP=yes
diff --git a/target/systemd-networkd/30-wlan.network b/target/systemd-networkd/30-wlan.network
@@ -0,0 +1,5 @@
+[Match]
+Name=wlan*
+
+[Network]
+DHCP=yes
diff --git a/target/systemd-networkd/60-usb.network b/target/systemd-networkd/60-usb.network
@@ -0,0 +1,5 @@
+[Match]
+Name=usb*
+
+[Network]
+DHCP=yes