Browse Source

Build bigger images if we have freetype

K. Lange 2 years ago
parent
commit
fd6a513614
3 changed files with 18 additions and 2 deletions
  1. 6 0
      .gitignore
  2. 3 1
      util/calc-size.sh
  3. 9 1
      util/mkdisk.sh

+ 6 - 0
.gitignore

@@ -27,3 +27,9 @@
 /base/usr/python
 /base/usr/bin/*
 /base/usr/lib/*
+
+# Freetype
+/base/usr/include/freetype2
+/base/usr/include/ft2build.h
+/base/usr/share/aclocal
+/base/usr/share/fonts

+ 3 - 1
util/calc-size.sh

@@ -2,7 +2,9 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-if [ -e "$DIR/../base/usr/python" ]; then
+if [ -e "$DIR/../base/usr/share/fonts" ]; then
+  echo 20000
+elif [ -e "$DIR/../base/usr/python" ]; then
   echo 11000
 else
   echo 4096

+ 9 - 1
util/mkdisk.sh

@@ -1,13 +1,21 @@
 #!/bin/bash
 
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
 OUT=$1
 IN=$2
 
 OUTDIR=`dirname $1`
 
+if [ -e "$DIR/../base/usr/share/fonts" ]; then
+    SIZE=128
+else
+    SIZE=64
+fi
+
 rm -f $OUT
 mkdir -p cdrom
-fallocate -l 64M $OUT || dd if=/dev/zero bs=1M count=64 of=$OUT
+fallocate -l ${SIZE}M $OUT || dd if=/dev/zero bs=1M count=${SIZE} of=$OUT
 mkfs.fat -s 1 -S 2048 $OUT
 
 #echo "Turning $IN into $OUT"