Skip to content

Commit

Permalink
upgrade to ubuntu 22.04 -- jammy jellyfish
Browse files Browse the repository at this point in the history
* create_rootfs script now expects a repo/arch strcuture e.g. home/ubuntu_packages/armhf
  • Loading branch information
skalade committed Sep 28, 2022
1 parent f8381e6 commit f2bb52e
Show file tree
Hide file tree
Showing 58 changed files with 451 additions and 484 deletions.
10 changes: 5 additions & 5 deletions sdbuild/scripts/create_rootfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ set -e

target=$1
SRCDIR=$2
ARCH=$3

fss="proc dev sys"
echo $QEMU_EXE
Expand All @@ -14,6 +15,7 @@ multistrap_opt=

if [ -n "$PYNQ_UBUNTU_REPO" ]; then
tmpfile=$(mktemp)
export PYNQ_UBUNTU_REPO=$(echo ${PYNQ_UBUNTU_REPO} | sed 's\jammy\jammy/$(ARCH)\')
sed -e "s;source=.*;source=${PYNQ_UBUNTU_REPO};" $multistrap_conf > $tmpfile
mkdir -p $target/etc/apt/apt.conf.d/
echo 'Acquire::AllowInsecureRepositories "1";' > $target/etc/apt/apt.conf.d/allowinsecure
Expand All @@ -29,12 +31,10 @@ $dry_run sudo -E multistrap -f $multistrap_conf -d $target $multistrap_opt
sudo chroot / chmod a+w $target

cat - > $target/postinst1.sh <<EOT
/var/lib/dpkg/info/dash.preinst install
set -x
export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true
export LC_ALL=C LANGUAGE=C LANG=C
rm -f /var/run/reboot-required
/var/lib/dpkg/info/dash.preinst install
rm -f /var/run/reboot-required
dpkg --configure -a
exit 0
EOT
Expand Down Expand Up @@ -78,8 +78,8 @@ EOT

if [ -n "$PYNQ_UBUNTU_REPO" ]; then
cat - >> $target/postinst2.sh <<EOT
echo "deb http://ports.ubuntu.com/ubuntu-ports focal main universe" > /etc/apt/sources.list.d/multistrap-focal.list
echo "deb-src http://ports.ubuntu.com/ubuntu-ports focal main universe" >> /etc/apt/sources.list.d/multistrap-focal.list
echo "deb http://ports.ubuntu.com/ubuntu-ports jammy main universe" > /etc/apt/sources.list.d/multistrap-jammy.list
echo "deb-src http://ports.ubuntu.com/ubuntu-ports jammy main universe" >> /etc/apt/sources.list.d/multistrap-jammy.list
EOT
fi

Expand Down
5 changes: 0 additions & 5 deletions sdbuild/ubuntu/focal/aarch64/config

This file was deleted.

11 changes: 0 additions & 11 deletions sdbuild/ubuntu/focal/aarch64/patch/etc/default/motd-news.diff

This file was deleted.

9 changes: 0 additions & 9 deletions sdbuild/ubuntu/focal/aarch64/patch/etc/environment.diff

This file was deleted.

6 changes: 0 additions & 6 deletions sdbuild/ubuntu/focal/aarch64/patch/etc/issue.diff

This file was deleted.

5 changes: 0 additions & 5 deletions sdbuild/ubuntu/focal/aarch64/patch/etc/issue.net.diff

This file was deleted.

12 changes: 0 additions & 12 deletions sdbuild/ubuntu/focal/aarch64/patch/etc/lsb-release.diff

This file was deleted.

This file was deleted.

111 changes: 0 additions & 111 deletions sdbuild/ubuntu/focal/aarch64/patch/etc/update-motd.d/50-motd-news.diff

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions sdbuild/ubuntu/focal/arm/config

This file was deleted.

11 changes: 0 additions & 11 deletions sdbuild/ubuntu/focal/arm/patch/etc/default/motd-news.diff

This file was deleted.

9 changes: 0 additions & 9 deletions sdbuild/ubuntu/focal/arm/patch/etc/environment.diff

This file was deleted.

6 changes: 0 additions & 6 deletions sdbuild/ubuntu/focal/arm/patch/etc/issue.diff

This file was deleted.

5 changes: 0 additions & 5 deletions sdbuild/ubuntu/focal/arm/patch/etc/issue.net.diff

This file was deleted.

12 changes: 0 additions & 12 deletions sdbuild/ubuntu/focal/arm/patch/etc/lsb-release.diff

This file was deleted.

12 changes: 0 additions & 12 deletions sdbuild/ubuntu/focal/arm/patch/etc/update-motd.d/10-help-text.diff

This file was deleted.

Loading

0 comments on commit f2bb52e

Please sign in to comment.