From be9f65363fc0693a268730c23a96b0110767047c Mon Sep 17 00:00:00 2001 From: Sho Uemura Date: Wed, 24 Jun 2026 13:29:47 -0500 Subject: [PATCH 1/2] add ubuntu-keyring source needed when rebuilding rootfs Signed-off-by: Sho Uemura --- sdbuild/Dockerfile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sdbuild/Dockerfile b/sdbuild/Dockerfile index bcf37f7c1..c12f7dccf 100644 --- a/sdbuild/Dockerfile +++ b/sdbuild/Dockerfile @@ -13,6 +13,9 @@ SHELL ["/bin/bash", "-c"] WORKDIR /tmp +# Enable source repo for ubuntu-keyring +RUN echo "deb-src http://archive.ubuntu.com/ubuntu/ jammy main" > /etc/apt/sources.list.d/multistrap.list + # Enable i386 architecture and install core dependencies RUN dpkg --add-architecture i386 \ && apt-get update && apt-get upgrade -y \ @@ -20,6 +23,8 @@ RUN dpkg --add-architecture i386 \ # Add toolchain PPA && add-apt-repository -y ppa:ubuntu-toolchain-r/ppa \ && apt-get update \ + # Configures timezone interactively (2: Americas, 37: Central) + && echo -e '2\n37\n' | apt-get install -y tzdata \ # Install build and host packages && apt-get install -y \ bc libtool-bin gperf bison flex texi2html texinfo help2man gawk libtool \ @@ -29,9 +34,9 @@ RUN dpkg --add-architecture i386 \ libsdl1.2-dev libpixman-1-dev libc6-dev chrpath socat zlib1g-dev unzip \ rsync python3-pip gcc-multilib xterm net-tools ninja-build python3-testresources \ libncurses5-dev libncursesw5-dev vim nano tmux zip dnsutils sudo binfmt-support \ - dbus-x11 libswt-glx-gtk-4-jni libgtk2.0-0 xvfb \ - # Configures timezone interactively (2: Americas, 37: Central) - && echo -e '2\n37\n' | apt-get install -y lsb-core \ + dbus-x11 libswt-glx-gtk-4-jni libgtk2.0-0 xvfb lsb-core \ + # Install ubuntu-keyring sources needed for multistrap + && apt-get source -y ubuntu-keyring \ # Locale for Vivado && locale-gen en_US.utf8 && update-locale \ # Clean up APT @@ -94,4 +99,4 @@ USER ${USERNAME} WORKDIR /workspace ENV USERNAME=${USERNAME} -CMD /bin/bash \ No newline at end of file +CMD /bin/bash From 2aac5931d8bd70b633f9c46844ed355878481879 Mon Sep 17 00:00:00 2001 From: Sho Uemura Date: Wed, 24 Jun 2026 18:33:38 -0500 Subject: [PATCH 2/2] need to do an apt-get update in create_rootfs --- sdbuild/Dockerfile | 4 +--- sdbuild/scripts/create_rootfs.sh | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdbuild/Dockerfile b/sdbuild/Dockerfile index c12f7dccf..b1fbe5e39 100644 --- a/sdbuild/Dockerfile +++ b/sdbuild/Dockerfile @@ -13,7 +13,7 @@ SHELL ["/bin/bash", "-c"] WORKDIR /tmp -# Enable source repo for ubuntu-keyring +# Enable source repo for ubuntu-keyring (needed for rootfs multistrap) RUN echo "deb-src http://archive.ubuntu.com/ubuntu/ jammy main" > /etc/apt/sources.list.d/multistrap.list # Enable i386 architecture and install core dependencies @@ -35,8 +35,6 @@ RUN dpkg --add-architecture i386 \ rsync python3-pip gcc-multilib xterm net-tools ninja-build python3-testresources \ libncurses5-dev libncursesw5-dev vim nano tmux zip dnsutils sudo binfmt-support \ dbus-x11 libswt-glx-gtk-4-jni libgtk2.0-0 xvfb lsb-core \ - # Install ubuntu-keyring sources needed for multistrap - && apt-get source -y ubuntu-keyring \ # Locale for Vivado && locale-gen en_US.utf8 && update-locale \ # Clean up APT diff --git a/sdbuild/scripts/create_rootfs.sh b/sdbuild/scripts/create_rootfs.sh index 68e1057b3..bb4607c72 100755 --- a/sdbuild/scripts/create_rootfs.sh +++ b/sdbuild/scripts/create_rootfs.sh @@ -22,6 +22,8 @@ if [ -n "$PYNQ_UBUNTU_REPO" ]; then multistrap_conf=$tmpfile multistrap_opt=--no-auth trap "rm -f $tmpfile" EXIT +else + sudo apt-get update fi # Perform the basic bootstrapping of the image