Add tools/calc script to update .calc files with up to date estimations on
the iso size parameters. Update .calc files with up to date estimations. Update debian-installer tasks.
This commit is contained in:
parent
f9c806ddf7
commit
1619ec160a
2
build.sh
2
build.sh
|
@ -60,6 +60,6 @@ echo " ... building the images"
|
||||||
if [ -z "$IMAGETARGET" ] ; then
|
if [ -z "$IMAGETARGET" ] ; then
|
||||||
IMAGETARGET="official_images"
|
IMAGETARGET="official_images"
|
||||||
fi
|
fi
|
||||||
make "$IMAGETARGET"
|
make $IMAGETARGET
|
||||||
|
|
||||||
make imagesums
|
make imagesums
|
||||||
|
|
|
@ -49,6 +49,8 @@ debian-cd (2.2.20) UNRELEASED; urgency=low
|
||||||
- Try to fix powerpc DVD builds via -hfs-parms MAX_XTCSIZE.
|
- Try to fix powerpc DVD builds via -hfs-parms MAX_XTCSIZE.
|
||||||
- Add prep powerpc support.
|
- Add prep powerpc support.
|
||||||
- Update debian-installer tasks.
|
- Update debian-installer tasks.
|
||||||
|
- Add tools/calc script to update .calc files with up to date
|
||||||
|
estimations on the iso size parameters.
|
||||||
* Thiemo Seufer
|
* Thiemo Seufer
|
||||||
- Add arcboot to the mips tasks/base-sarge list, like it is done for
|
- Add arcboot to the mips tasks/base-sarge list, like it is done for
|
||||||
other bootloaders.
|
other bootloaders.
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -5,7 +5,7 @@
|
||||||
* This list can be generated with the command:
|
* This list can be generated with the command:
|
||||||
* ../tools/generate_di+k_list
|
* ../tools/generate_di+k_list
|
||||||
*
|
*
|
||||||
* Last update: Mon Sep 27 15:44:57 MDT 2004
|
* Last update: Wed Oct 6 05:36:00 MDT 2004
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <debian-installer>
|
#include <debian-installer>
|
||||||
|
@ -46,8 +46,6 @@ aboot-base
|
||||||
discover1
|
discover1
|
||||||
kernel-image-2.4-generic
|
kernel-image-2.4-generic
|
||||||
kernel-image-2.4-smp
|
kernel-image-2.4-smp
|
||||||
kernel-image-2.4.26-1-generic
|
|
||||||
kernel-image-2.4.26-1-smp
|
|
||||||
kernel-image-2.4.27-1-generic
|
kernel-image-2.4.27-1-generic
|
||||||
kernel-image-2.4.27-1-smp
|
kernel-image-2.4.27-1-smp
|
||||||
kernel-image-2.6-generic
|
kernel-image-2.6-generic
|
||||||
|
@ -120,10 +118,6 @@ kernel-image-2.4-sparc32
|
||||||
kernel-image-2.4-sparc32-smp
|
kernel-image-2.4-sparc32-smp
|
||||||
kernel-image-2.4-sparc64
|
kernel-image-2.4-sparc64
|
||||||
kernel-image-2.4-sparc64-smp
|
kernel-image-2.4-sparc64-smp
|
||||||
kernel-image-2.4.26-sparc32
|
|
||||||
kernel-image-2.4.26-sparc32-smp
|
|
||||||
kernel-image-2.4.26-sparc64
|
|
||||||
kernel-image-2.4.26-sparc64-smp
|
|
||||||
kernel-image-2.4.27-1-sparc32
|
kernel-image-2.4.27-1-sparc32
|
||||||
kernel-image-2.4.27-1-sparc32-smp
|
kernel-image-2.4.27-1-sparc32-smp
|
||||||
kernel-image-2.4.27-1-sparc64
|
kernel-image-2.4.27-1-sparc64
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
BOOT_SIZE_1=12
|
||||||
|
BOOT_SIZE_10=2
|
||||||
|
BOOT_SIZE_11=2
|
||||||
|
BOOT_SIZE_12=2
|
||||||
|
BOOT_SIZE_13=2
|
||||||
|
BOOT_SIZE_2=2
|
||||||
|
BOOT_SIZE_3=2
|
||||||
|
BOOT_SIZE_4=2
|
||||||
|
BOOT_SIZE_5=2
|
||||||
|
BOOT_SIZE_6=2
|
||||||
|
BOOT_SIZE_7=2
|
||||||
|
BOOT_SIZE_8=2
|
||||||
|
BOOT_SIZE_9=2
|
|
@ -0,0 +1,12 @@
|
||||||
|
BOOT_SIZE_1=17
|
||||||
|
BOOT_SIZE_10=2
|
||||||
|
BOOT_SIZE_11=2
|
||||||
|
BOOT_SIZE_12=2
|
||||||
|
BOOT_SIZE_2=2
|
||||||
|
BOOT_SIZE_3=2
|
||||||
|
BOOT_SIZE_4=2
|
||||||
|
BOOT_SIZE_5=2
|
||||||
|
BOOT_SIZE_6=2
|
||||||
|
BOOT_SIZE_7=2
|
||||||
|
BOOT_SIZE_8=2
|
||||||
|
BOOT_SIZE_9=2
|
|
@ -0,0 +1,13 @@
|
||||||
|
BOOT_SIZE_1=19
|
||||||
|
BOOT_SIZE_10=2
|
||||||
|
BOOT_SIZE_11=2
|
||||||
|
BOOT_SIZE_12=2
|
||||||
|
BOOT_SIZE_13=2
|
||||||
|
BOOT_SIZE_2=2
|
||||||
|
BOOT_SIZE_3=2
|
||||||
|
BOOT_SIZE_4=2
|
||||||
|
BOOT_SIZE_5=2
|
||||||
|
BOOT_SIZE_6=2
|
||||||
|
BOOT_SIZE_7=2
|
||||||
|
BOOT_SIZE_8=2
|
||||||
|
BOOT_SIZE_9=2
|
|
@ -0,0 +1,14 @@
|
||||||
|
BOOT_SIZE_1=27
|
||||||
|
BOOT_SIZE_10=2
|
||||||
|
BOOT_SIZE_11=2
|
||||||
|
BOOT_SIZE_12=2
|
||||||
|
BOOT_SIZE_13=2
|
||||||
|
BOOT_SIZE_14=2
|
||||||
|
BOOT_SIZE_2=4
|
||||||
|
BOOT_SIZE_3=2
|
||||||
|
BOOT_SIZE_4=2
|
||||||
|
BOOT_SIZE_5=2
|
||||||
|
BOOT_SIZE_6=2
|
||||||
|
BOOT_SIZE_7=2
|
||||||
|
BOOT_SIZE_8=2
|
||||||
|
BOOT_SIZE_9=2
|
|
@ -0,0 +1,14 @@
|
||||||
|
BOOT_SIZE_1=18
|
||||||
|
BOOT_SIZE_10=2
|
||||||
|
BOOT_SIZE_11=2
|
||||||
|
BOOT_SIZE_12=2
|
||||||
|
BOOT_SIZE_13=2
|
||||||
|
BOOT_SIZE_14=2
|
||||||
|
BOOT_SIZE_2=2
|
||||||
|
BOOT_SIZE_3=2
|
||||||
|
BOOT_SIZE_4=2
|
||||||
|
BOOT_SIZE_5=2
|
||||||
|
BOOT_SIZE_6=2
|
||||||
|
BOOT_SIZE_7=2
|
||||||
|
BOOT_SIZE_8=2
|
||||||
|
BOOT_SIZE_9=2
|
|
@ -1,6 +1,24 @@
|
||||||
SIZE_MULT_1=88
|
BOOT_SIZE_1=21
|
||||||
#BOOT_SIZE_1=36
|
SIZE_MULT_1=97
|
||||||
#BOOT_SIZE_2=40
|
BOOT_SIZE_10=2
|
||||||
#BOOT_SIZE_3=40
|
SIZE_MULT_10=97
|
||||||
#BOOT_SIZE_4=40
|
BOOT_SIZE_11=2
|
||||||
#BOOT_SIZE_5=40
|
SIZE_MULT_11=97
|
||||||
|
BOOT_SIZE_12=2
|
||||||
|
SIZE_MULT_12=97
|
||||||
|
BOOT_SIZE_2=2
|
||||||
|
SIZE_MULT_2=97
|
||||||
|
BOOT_SIZE_3=2
|
||||||
|
SIZE_MULT_3=97
|
||||||
|
BOOT_SIZE_4=2
|
||||||
|
SIZE_MULT_4=97
|
||||||
|
BOOT_SIZE_5=2
|
||||||
|
SIZE_MULT_5=97
|
||||||
|
BOOT_SIZE_6=2
|
||||||
|
SIZE_MULT_6=97
|
||||||
|
BOOT_SIZE_7=2
|
||||||
|
SIZE_MULT_7=97
|
||||||
|
BOOT_SIZE_8=2
|
||||||
|
SIZE_MULT_8=97
|
||||||
|
BOOT_SIZE_9=2
|
||||||
|
SIZE_MULT_9=97
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
BOOT_SIZE_1=16
|
||||||
|
BOOT_SIZE_10=2
|
||||||
|
BOOT_SIZE_11=2
|
||||||
|
BOOT_SIZE_12=2
|
||||||
|
BOOT_SIZE_2=2
|
||||||
|
BOOT_SIZE_3=2
|
||||||
|
BOOT_SIZE_4=2
|
||||||
|
BOOT_SIZE_5=2
|
||||||
|
BOOT_SIZE_6=2
|
||||||
|
BOOT_SIZE_7=2
|
||||||
|
BOOT_SIZE_8=2
|
||||||
|
BOOT_SIZE_9=2
|
|
@ -0,0 +1,12 @@
|
||||||
|
BOOT_SIZE_1=15
|
||||||
|
BOOT_SIZE_10=2
|
||||||
|
BOOT_SIZE_11=2
|
||||||
|
BOOT_SIZE_12=2
|
||||||
|
BOOT_SIZE_2=2
|
||||||
|
BOOT_SIZE_3=2
|
||||||
|
BOOT_SIZE_4=2
|
||||||
|
BOOT_SIZE_5=2
|
||||||
|
BOOT_SIZE_6=2
|
||||||
|
BOOT_SIZE_7=2
|
||||||
|
BOOT_SIZE_8=2
|
||||||
|
BOOT_SIZE_9=2
|
|
@ -1,2 +1,15 @@
|
||||||
#BOOT_SIZE_1=65
|
BOOT_SIZE_1=65
|
||||||
SIZE_MULT_1=90
|
BOOT_SIZE_10=2
|
||||||
|
BOOT_SIZE_11=2
|
||||||
|
BOOT_SIZE_12=2
|
||||||
|
BOOT_SIZE_13=2
|
||||||
|
BOOT_SIZE_14=2
|
||||||
|
BOOT_SIZE_2=2
|
||||||
|
BOOT_SIZE_3=2
|
||||||
|
BOOT_SIZE_4=2
|
||||||
|
BOOT_SIZE_5=2
|
||||||
|
BOOT_SIZE_6=2
|
||||||
|
BOOT_SIZE_7=2
|
||||||
|
BOOT_SIZE_8=2
|
||||||
|
BOOT_SIZE_9=2
|
||||||
|
SIZE_MULT_1=93
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
BOOT_SIZE_1=7
|
||||||
|
BOOT_SIZE_10=2
|
||||||
|
BOOT_SIZE_11=2
|
||||||
|
BOOT_SIZE_12=2
|
||||||
|
BOOT_SIZE_13=2
|
||||||
|
BOOT_SIZE_2=2
|
||||||
|
BOOT_SIZE_3=2
|
||||||
|
BOOT_SIZE_4=2
|
||||||
|
BOOT_SIZE_5=2
|
||||||
|
BOOT_SIZE_6=2
|
||||||
|
BOOT_SIZE_7=2
|
||||||
|
BOOT_SIZE_8=2
|
||||||
|
BOOT_SIZE_9=2
|
|
@ -1 +1,13 @@
|
||||||
BOOT_SIZE_1=10
|
BOOT_SIZE_1=14
|
||||||
|
BOOT_SIZE_10=2
|
||||||
|
BOOT_SIZE_11=2
|
||||||
|
BOOT_SIZE_12=2
|
||||||
|
BOOT_SIZE_13=2
|
||||||
|
BOOT_SIZE_2=2
|
||||||
|
BOOT_SIZE_3=2
|
||||||
|
BOOT_SIZE_4=2
|
||||||
|
BOOT_SIZE_5=2
|
||||||
|
BOOT_SIZE_6=2
|
||||||
|
BOOT_SIZE_7=2
|
||||||
|
BOOT_SIZE_8=2
|
||||||
|
BOOT_SIZE_9=2
|
||||||
|
|
|
@ -0,0 +1,41 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# This script tries to get good estimations into the .calc files at
|
||||||
|
# boot/$CODENAME/boot-$ARCH.calc, so you can use it whenever you want to
|
||||||
|
# update these .calc files with more recent estimations.
|
||||||
|
|
||||||
|
# It uses info taken from the temporary dir of a previous build for $ARCH,
|
||||||
|
# $CODENAME. This doesn't need to be a full build, you can get the needed
|
||||||
|
# stuff by running a build.sh with something like:
|
||||||
|
# IMAGETARGET="ok bootable upgrade bin-infos bin-list"
|
||||||
|
|
||||||
|
# Temporary directory of the previous build.
|
||||||
|
BDIR="$TDIR/$CODENAME-$ARCH"
|
||||||
|
|
||||||
|
#Get info from older build if it exists
|
||||||
|
if [ -d "$BDIR" ];
|
||||||
|
then
|
||||||
|
echo Estimated sizes:
|
||||||
|
rm -f "boot/$CODENAME/boot-$ARCH.calc"
|
||||||
|
for i in `du -sm "$BDIR"/CD[0123456789]* |
|
||||||
|
sed -n 's/^\([0-9]\+\).*CD\([0-9]\+\)/\2=\1/p'`
|
||||||
|
do
|
||||||
|
#space used by boot images in megs (this has an error of up to a mega)
|
||||||
|
if [ -d "$BDIR/boot${i%=*}" ]
|
||||||
|
then
|
||||||
|
imgdu=`du -sm "$BDIR/boot${i%=*}" |
|
||||||
|
sed -n 's/^\([0-9]\+\).*/\1/p'`
|
||||||
|
else
|
||||||
|
imgdu=1
|
||||||
|
fi
|
||||||
|
#add it all up and write it to the .calc file
|
||||||
|
echo BOOT_SIZE_${i%=*}=${i#*=}+$imgdu
|
||||||
|
echo BOOT_SIZE_${i%=*}=$((${i#*=}+$imgdu)) >> "boot/$CODENAME/boot-$ARCH.calc"
|
||||||
|
case "$ARCH" in
|
||||||
|
m68k) echo SIZE_MULT_${i%=*}=97 >> "boot/$CODENAME/boot-$ARCH.calc";;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
case "$ARCH" in
|
||||||
|
powerpc) echo SIZE_MULT_1=93 >> "boot/$CODENAME/boot-$ARCH.calc";;
|
||||||
|
esac
|
Loading…
Reference in New Issue