diff --git a/build_all.sh b/build_all.sh index 4dc195f7..e1488fa2 100755 --- a/build_all.sh +++ b/build_all.sh @@ -37,9 +37,15 @@ do if [ "$ARCH" = "i386" ]; then export OUT="$TMP_OUT/$ARCH"; mkdir -p $OUT make bin-official_images + echo Generating MD5Sums of the images + make imagesums + echo Generating list files for images + make pi-makelist export OUT="$TMP_OUT/src"; mkdir -p $OUT make src-official_images + echo Generating MD5Sums of the images + make imagesums else export OUT=$TMP_OUT/$ARCH; mkdir -p $OUT make bin-official_images @@ -50,9 +56,10 @@ do make installtools make bin-images fi + echo Generating MD5Sums of the images + make imagesums + echo Generating list files for images + make pi-makelist fi echo "--------------- `date` ---------------" done - -make imagesums -make pi-makelist diff --git a/tools/add-bin-doc b/tools/add-bin-doc index 60b7a97a..3a18fe5f 100755 --- a/tools/add-bin-doc +++ b/tools/add-bin-doc @@ -7,14 +7,17 @@ BDIR=$TDIR/$CODENAME-$ARCH ADIR=$APTTMP/$CODENAME-$ARCH SDIR=$TDIR/$CODENAME-src -$BASEDIR/tools/add_files $BDIR/$DISK $MIRROR doc - for i in $BDIR/*.packages; do dir=${i%%.packages} dir=${dir##$BDIR/} dir=$BDIR/CD$dir cp -df $MIRROR/README* $dir/ + if [ -f $dir/doc/dedication-$DEBVERSION.txt ]; then + mv $dir/doc/dedication-$DEBVERSION.txt $dir/dedication.txt + ln -s ../dedication.txt $dir/doc/dedication-$DEBVERSION.txt + fi + rm -f $dir/README $dir/README.1ST \ $dir/README.CD-manufacture $dir/README.multicd \ $dir/README.pgp ; \ diff --git a/tools/boot/potato/boot-i386.calc b/tools/boot/potato/boot-i386.calc new file mode 100644 index 00000000..d950e814 --- /dev/null +++ b/tools/boot/potato/boot-i386.calc @@ -0,0 +1,5 @@ +BOOT_SIZE_1=15 + +BOOT_SIZE_2=0 + +BOOT_SIZE_3=0 diff --git a/tools/boot/potato/boot-powerpc.calc b/tools/boot/potato/boot-powerpc.calc index da125244..f16a7732 100644 --- a/tools/boot/potato/boot-powerpc.calc +++ b/tools/boot/potato/boot-powerpc.calc @@ -1,4 +1,4 @@ -BOOT_SIZE_1=45 +BOOT_SIZE_1=120 BOOT_SIZE_2=20