diff --git a/makehdimage b/makehdimage
index dbe60e95d7..bdeb5ab0a0 100755
--- a/makehdimage
+++ b/makehdimage
@@ -109,12 +109,16 @@ BEOS_BIN="touch sync ln listarea listattr listsem listport \
quit open translate setvolume waitfor uname iroster keymap \
strace rmdir error"
+BEOS_APPS="MiniTerminal"
+
BEOS_SYSTEM_LIB="libbe.so libstdc++.r4.so libnet.so libmedia.so \
- libtranslation.so libbind.so libnetapi.so libsocket.so libdebug.so"
+ libtranslation.so libbind.so libnetapi.so libsocket.so libdebug.so \
+ libtextencoding.so libz.so libfreetype.so libpng.so"
BEOS_SYSTEM_SERVERS="registrar debug_server syslog_daemon media_server \
media_addon_server input_server"
+BEOS_ADD_ONS_ACCELERANTS="radeon.accelerant"
BEOS_ADD_ONS_TRANSLATORS="STXTTranslator RTF-Translator"
BEOS_ADD_ONS_MEDIA="mixer.media_addon legacy.media_addon multi_audio.media_addon"
BEOS_ADD_ONS_INPUT_DEVICES="keyboard"
@@ -125,10 +129,10 @@ jam -j$(sysinfo -cpu | head -c 2) -q rc resattr kernel boot_loader config_manage
pci isa ide scsi ide_isa bfs blkman fast_log ide_adapter locked_pool \
scsi_periph intel keyboard scsi_dsk scsi_cd \
rld.so kernel_fortune consoled \
- $BEOS_BIN $BEOS_SYSTEM_LIB $BEOS_SYSTEM_SERVERS \
- $BEOS_ADD_ONS_TRANSLATORS $BEOS_ADD_ONS_MEDIA $BEOS_ADD_ONS_INPUT_DEVICES\
+ $BEOS_BIN $BEOS_APPS $BEOS_SYSTEM_LIB $BEOS_SYSTEM_SERVERS $BEOS_ADD_ONS_ACCELERANTS \
+ $BEOS_ADD_ONS_TRANSLATORS $BEOS_ADD_ONS_MEDIA $BEOS_ADD_ONS_INPUT_DEVICES \
libnet.so dprintf null zero random ps2_hid \tty console \
- \config vga_text timezone_files keymap_files \
+ \config vga_text timezone_files keymap_files radeon.driver \
bfs_shell fs_shell_command \
|| { echo "*** Build failed!" 1>&2 ; exit 1; }
@@ -175,13 +179,16 @@ echo "Creating directory structure..."
$mkindex BEOS:APP_SIG
# needed to launch apps via signature
+$mkdir -p beos/apps
$mkdir -p beos/bin
$mkdir -p beos/etc
+$mkdir -p beos/prefs
$mkdir -p beos/system/add-ons/kernel/boot
$mkdir -p beos/system/add-ons/kernel/bus_managers
$mkdir -p beos/system/add-ons/kernel/busses/ide
$mkdir -p beos/system/add-ons/kernel/drivers/bin
$mkdir -p beos/system/add-ons/kernel/drivers/dev/disk/scsi
+$mkdir -p beos/system/add-ons/kernel/drivers/dev/graphics
$mkdir -p beos/system/add-ons/kernel/drivers/dev/input
$mkdir -p beos/system/add-ons/kernel/drivers/dev/misc
$mkdir -p beos/system/add-ons/kernel/file_systems
@@ -189,6 +196,7 @@ $mkdir -p beos/system/add-ons/kernel/console
$mkdir -p beos/system/add-ons/kernel/generic
$mkdir -p beos/system/add-ons/kernel/partitioning_systems
$mkdir -p beos/system/add-ons/Translators
+$mkdir -p beos/system/add-ons/accelerants
$mkdir -p beos/system/add-ons/media
$mkdir -p beos/system/add-ons/input_server/devices
$mkdir -p beos/system/boot
@@ -197,6 +205,7 @@ $mkdir -p beos/system/servers
$mkdir -p home/config
$mkdir -p home/config/settings/kernel/drivers
$mkdir -p var/tmp
+$mkdir -p var/log
# modules
@@ -233,7 +242,7 @@ done
cd $sourceDir/distro/${arch}.R1/beos/system/add-ons/kernel/drivers/bin
$scd ${sPrefix}$sourceDir/distro/${arch}.R1/beos/system/add-ons/kernel/drivers/bin
-for f in ps2_hid; do
+for f in ps2_hid radeon.driver; do
$cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/drivers/bin
done
@@ -285,7 +294,12 @@ $scd ${sPrefix}$sourceDir/distro/${arch}.R1/beos/bin
for f in ../apps/consoled $BEOS_BIN; do
$cp ${sPrefix}$f $targetDir/beos/bin/
done
-$cd $targetDir/beos/bin
+
+cd $sourceDir/distro/${arch}.R1/beos/apps
+$scd ${sPrefix}$sourceDir/distro/${arch}.R1/beos/apps
+for f in $BEOS_APPS; do
+ $cp ${sPrefix}$f $targetDir/beos/apps/
+done
# scripts and data files
@@ -332,7 +346,7 @@ for f in drivers/dev/dprintf drivers/dev/keyboard drivers/dev/null \
drivers/dev/misc/config drivers/dev/tty drivers/dev/zero \
drivers/dev/disk/scsi/scsi_dsk drivers/dev/disk/scsi/scsi_cd \
drivers/dev/misc/config drivers/dev/input/ps2_hid \
- drivers/dev/console; do
+ drivers/dev/console drivers/dev/graphics/radeon.driver; do
relName=$(echo $f | sed -e s@drivers/dev/@@)
linkName=bin/$(basename $f)
while [ $relName != . ]; do
@@ -346,6 +360,12 @@ done
# add-ons
echo "Copying add-ons..."
+cd $sourceDir/distro/${arch}.R1/beos/system/add-ons/accelerants
+$scd ${sPrefix}$sourceDir/distro/${arch}.R1/beos/system/add-ons/accelerants
+for f in $BEOS_ADD_ONS_ACCELERANTS; do
+ $cp ${sPrefix}$f $targetDir/beos/system/add-ons/accelerants/
+done
+
cd $sourceDir/distro/${arch}.R1/beos/system/add-ons/Translators
$scd ${sPrefix}$sourceDir/distro/${arch}.R1/beos/system/add-ons/Translators
for f in $BEOS_ADD_ONS_TRANSLATORS; do
@@ -364,6 +384,13 @@ for f in keyboard; do
$cp ${sPrefix}$f $targetDir/beos/system/add-ons/input_server/devices/
done
+# install fonts
+
+echo "Installing fonts..."
+
+cd $sourceDir/distro/${arch}.R1/beos/etc/
+$cd ${sPrefix}$sourceDir/distro/${arch}.R1/beos/etc/
+$cp -r ${sPrefix}fonts $targetDir/beos/etc/
# install MIME database
mimeDBSource=$sourceDir/src/data/beos_mime