build_rootfs.sh: Switch away from cloud kernel
The cloud kernel is just a subset of the full Debian kernel with some
drivers removed, but on a physical server we need some of those drivers,
so rather than have two configs, let's just use the full kernel.
The NVIDIA driver is bumped again because of a compilation issue with
the Linux 6.0 kernel currently in bullseye backports.
Change-Id: I9c6027a50aa18eddf1207d6d3d12684a86f66fc0
diff --git a/net/test/rootfs/bullseye-server.sh b/net/test/rootfs/bullseye-server.sh
index af11768..1e0ebca 100755
--- a/net/test/rootfs/bullseye-server.sh
+++ b/net/test/rootfs/bullseye-server.sh
@@ -39,7 +39,7 @@
setup_cuttlefish_user
# Get kernel and QEMU from backports
-for package in linux-image-cloud-${arch} qemu-system-arm qemu-system-x86; do
+for package in linux-image-${arch} qemu-system-arm qemu-system-x86; do
apt-get install -y -t bullseye-backports ${package}
done
@@ -47,9 +47,9 @@
# Using "Depends:" is more reliable than "Version:", because it works for
# backported ("bpo") kernels as well. NOTE: "Package" can be used instead
-# if we don't install the metapackage ("linux-image-cloud-${arch}") but a
+# if we don't install the metapackage ("linux-image-${arch}") but a
# specific version in the future
-kmodver=$(dpkg -s linux-image-cloud-${arch} | grep ^Depends: | \
+kmodver=$(dpkg -s linux-image-${arch} | grep ^Depends: | \
cut -d: -f2 | cut -d" " -f2 | sed 's/linux-image-//')
# Install headers from backports, to match the linux-image (removed below)
@@ -58,7 +58,7 @@
# Dependencies for nvidia-installer (removed below)
apt-get install -y dkms libglvnd-dev libc6-dev pkg-config
-nvidia_version=515.65.01
+nvidia_version=525.60.13
wget -q https://us.download.nvidia.com/tesla/${nvidia_version}/NVIDIA-Linux-${nvidia_arch}-${nvidia_version}.run
chmod a+x NVIDIA-Linux-${nvidia_arch}-${nvidia_version}.run
./NVIDIA-Linux-${nvidia_arch}-${nvidia_version}.run -x
