build-debian: Do an upgrade after debootstrap 2nd stage

This commit is contained in:
Johan Gunnarsson 2019-03-17 16:23:40 +01:00
parent 82c90dad16
commit 35ded09286
1 changed files with 11 additions and 8 deletions

View File

@ -46,6 +46,14 @@ openssh-server \
# Randomly generated root password # Randomly generated root password
PASSWORD=$(pwgen -B -A 8 1) PASSWORD=$(pwgen -B -A 8 1)
# Write apt sources config
cat <<- EOF > debian/tmp/sources.list
deb http://deb.debian.org/debian ${DIST} main
deb-src http://deb.debian.org/debian ${DIST} main
deb http://security.debian.org/debian-security ${DIST}/updates main
deb-src http://security.debian.org/debian-security ${DIST}/updates main
EOF
cp -rv --preserve=mode ../pre-2nd-stage-files/* debian cp -rv --preserve=mode ../pre-2nd-stage-files/* debian
# Copy ARM emulation stuff # Copy ARM emulation stuff
@ -54,6 +62,9 @@ cp /usr/bin/qemu-*-static debian/usr/bin
# Build a Debian root filesystem (second stage) # Build a Debian root filesystem (second stage)
chroot debian sh -e <<- EOF chroot debian sh -e <<- EOF
/debootstrap/debootstrap --second-stage /debootstrap/debootstrap --second-stage
mv /tmp/sources.list /etc/apt/sources.list
/usr/bin/apt-get update
/usr/bin/apt-get -y upgrade
/usr/bin/apt-get clean /usr/bin/apt-get clean
/bin/rm -rf /var/lib/apt/lists/* /bin/rm -rf /var/lib/apt/lists/*
/bin/rm -f /var/log/*.log /bin/rm -f /var/log/*.log
@ -66,14 +77,6 @@ rm debian/usr/bin/qemu-*-static
cp -rv --preserve=mode ../post-2nd-stage-files/* debian cp -rv --preserve=mode ../post-2nd-stage-files/* debian
# Write apt sources config
cat <<- EOF > debian/etc/apt/sources.list
deb http://deb.debian.org/debian ${DIST} main
deb-src http://deb.debian.org/debian ${DIST} main
deb http://security.debian.org/debian-security ${DIST}/updates main
deb-src http://security.debian.org/debian-security ${DIST}/updates main
EOF
# Make a ext4 filesystem of this and put it into the image # Make a ext4 filesystem of this and put it into the image
rm -f ext4.img rm -f ext4.img
fallocate -l 900MiB ext4.img fallocate -l 900MiB ext4.img