Bugfixes for Ubuntu 24

Author: petehayes102

docker/linux-image.sh

@@ -57,10 +57,10 @@ max_kernel_version() {
 main() {
     # arch in the rust target
     local arch="${1}" \
-        kversion=5.10.0-34
+        kversion=6.1.0-28
 
-    local debsource="deb http://http.debian.net/debian/ bullseye main"
-    debsource="${debsource}\ndeb http://security.debian.org/ bullseye-security main"
+    local debsource="deb http://http.debian.net/debian/ bookworm main"
+    debsource="${debsource}\ndeb http://security.debian.org/ bookworm-security main"
 
     local dropbear="dropbear-bin"
 
@@ -240,8 +240,8 @@ main() {
         "libgmp10:${arch}" \
         "libc6:${arch}" \
         "linux-image-${kernel}:${arch}" \
-        ncurses-base"${ncurses}" \
         "zlib1g:${arch}"
+        # "ncurses-base:all" \
 
     if [[ "${arch}" != "${dpkg_arch}" ]]; then
         apt-get -d --no-install-recommends download "${libgcc_packages[@]}"

docker/qemu.sh

@@ -19,7 +19,7 @@ build_static_libffi () {
     tar --strip-components=1 -xzf "v${version}.tar.gz"
     ./configure --prefix="$td"/lib --disable-builddir --disable-shared --enable-static
     make "-j$(nproc)"
-    install -m 644 ./.libs/libffi.a /usr/local/lib/
+    install -m 644 ./.libs/libffi.a /usr/lib/
 
     popd
 
@@ -42,7 +42,7 @@ build_static_libmount () {
     tar --strip-components=1 -xJf "util-linux-${version_spec}.tar.xz"
     ./configure --disable-shared --enable-static --without-ncurses
     make "-j$(nproc)" mount blkid
-    install -m 644 ./.libs/*.a /usr/local/lib/
+    install -m 644 ./.libs/*.a /usr/lib/
 
     popd
 
@@ -67,7 +67,7 @@ build_static_libattr() {
 
     ./configure
     make "-j$(nproc)"
-    install -m 644 ./libattr/.libs/libattr.a /usr/local/lib/
+    install -m 644 ./libattr/.libs/libattr.a /usr/lib/
 
     yum remove -y gettext
 
@@ -87,7 +87,7 @@ build_static_libcap() {
     curl --retry 3 -sSfL "https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-${version}.tar.xz" -O
     tar --strip-components=1 -xJf "libcap-${version}.tar.xz"
     make "-j$(nproc)"
-    install -m 644 libcap/libcap.a /usr/local/lib/
+    install -m 644 libcap/libcap.a /usr/lib/
 
     popd
 
@@ -106,7 +106,7 @@ build_static_pixman() {
     tar --strip-components=1 -xzf "pixman-${version}.tar.gz"
     ./configure
     make "-j$(nproc)"
-    install -m 644 ./pixman/.libs/libpixman-1.a /usr/local/lib/
+    install -m 644 ./pixman/.libs/libpixman-1.a /usr/lib/
 
     popd
 
@@ -125,7 +125,7 @@ build_static_slirp() {
     tar -xzf "libslirp-v${version}.tar.gz"
     meson setup -Ddefault_library=static libslirp-v${version} build
     ninja -C build
-    install -m 644 ./build/libslirp.a /usr/local/lib/
+    install -m 644 ./build/libslirp.a /usr/lib/
 
     popd