Enable graphical installer for arm64
Shift the extra_image helper function from boot-x86 to common.sh to help. Call extra_image with || true for now on boot-arm64 so we don't fail builds straight away. Remove that || true later once we're happy things work.
This commit is contained in:
parent
772a0df3ea
commit
fdf9f6739f
|
@ -12,6 +12,8 @@ debian-cd (3.1.29) UNRELEASED; urgency=medium
|
|||
fingerprints in ARCHIVE_EXTRA_KEYS
|
||||
* Exclude lilo-installer (and elilo-installer) for all arches, not
|
||||
just amd64. This was an oversight before.
|
||||
* Enable graphical installer for arm64 too, now that d-i builds
|
||||
should include it too.
|
||||
|
||||
-- Raphaël Hertzog <raphael@offensive-security.com> Thu, 13 Feb 2020 15:07:42 +0100
|
||||
|
||||
|
|
|
@ -73,6 +73,10 @@ mkdir -p $CDDIR/$INSTALLDIR
|
|||
cp -lf cdrom/vmlinuz $CDDIR/$INSTALLDIR/
|
||||
cp -lf cdrom/initrd.gz $CDDIR/$INSTALLDIR/
|
||||
|
||||
# Try to add graphical installer build too
|
||||
extra_image gtk/vmlinuz "../vmlinuz" || true
|
||||
extra_image gtk/initrd.gz "../initrd.gz" || true
|
||||
|
||||
# Boot setup including config and help files comes from d-i.
|
||||
mkdir -pv $PWD/boot$N
|
||||
cat cdrom/debian-cd_info.tar.gz | (cd boot$N/; tar zx)
|
||||
|
|
|
@ -137,32 +137,6 @@ if [ "$N" = "1" ]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
extra_image () {
|
||||
image=$1
|
||||
doppelgangers="$2"
|
||||
dir=$(dirname "$image")
|
||||
|
||||
mkdir -p $CDDIR/$INSTALLDIR/$dir
|
||||
if [ ! -e $CDDIR/$INSTALLDIR/"$image" ] ; then
|
||||
if [ ! "$DI_WWW_HOME" ] ; then
|
||||
if [ ! "$DI_DIR" ] ; then
|
||||
DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
|
||||
fi
|
||||
cp "$DI_DIR/cdrom/$image" $CDDIR/$INSTALLDIR/"$image"
|
||||
else
|
||||
$WGET "$DI_WWW_HOME/cdrom/$image" -O $CDDIR/$INSTALLDIR/"$image"
|
||||
fi
|
||||
fi
|
||||
for doppelganger in $doppelgangers ; do
|
||||
if [ -f "$CDDIR/$INSTALLDIR/$dir/$doppelganger" ] &&
|
||||
cmp -s $CDDIR/$INSTALLDIR/"$image" $CDDIR/$INSTALLDIR/"$dir"/"$doppelganger" ; then
|
||||
echo " $image identical to $doppelganger. Linking"
|
||||
ln -nf $CDDIR/$INSTALLDIR/"$dir"/"$doppelganger" $CDDIR/$INSTALLDIR/"$image"
|
||||
break
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
case "$DESKTOP" in
|
||||
$UNSPEC_DESKTOP_DEFAULT)
|
||||
# default from tasksel
|
||||
|
|
|
@ -196,3 +196,29 @@ calculate_efi_image_size() {
|
|||
|
||||
echo $blocks
|
||||
}
|
||||
|
||||
extra_image () {
|
||||
image=$1
|
||||
doppelgangers="$2"
|
||||
dir=$(dirname "$image")
|
||||
|
||||
mkdir -p $CDDIR/$INSTALLDIR/$dir
|
||||
if [ ! -e $CDDIR/$INSTALLDIR/"$image" ] ; then
|
||||
if [ ! "$DI_WWW_HOME" ] ; then
|
||||
if [ ! "$DI_DIR" ] ; then
|
||||
DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
|
||||
fi
|
||||
cp "$DI_DIR/cdrom/$image" $CDDIR/$INSTALLDIR/"$image"
|
||||
else
|
||||
$WGET "$DI_WWW_HOME/cdrom/$image" -O $CDDIR/$INSTALLDIR/"$image"
|
||||
fi
|
||||
fi
|
||||
for doppelganger in $doppelgangers ; do
|
||||
if [ -f "$CDDIR/$INSTALLDIR/$dir/$doppelganger" ] &&
|
||||
cmp -s $CDDIR/$INSTALLDIR/"$image" $CDDIR/$INSTALLDIR/"$dir"/"$doppelganger" ; then
|
||||
echo " $image identical to $doppelganger. Linking"
|
||||
ln -nf $CDDIR/$INSTALLDIR/"$dir"/"$doppelganger" $CDDIR/$INSTALLDIR/"$image"
|
||||
break
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue