i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sorry for not committing the patches earlier, my dsl went down. :-(

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14010 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Andrew Bachmann
2005-08-20 23:02:08 +00:00
parent 8ca264f509
commit 6aa55e57d8
1 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makehdimage
+55 -54
View File
@@ -7,7 +7,7 @@
# #
# If you don't specify the image, $sourceDir/haiku.image will be used. In # If you don't specify the image, $sourceDir/haiku.image will be used. In
# the current default configuration, you have to start this script in the # the current default configuration, you have to start this script in the
# "current" directory of the Haiku tree. A 60 MB image will be created there. # "current" directory of the Haiku tree. A 80 MB image will be created there.
# #
# If you specify a target directory, no image is going to be created at # If you specify a target directory, no image is going to be created at
# all. # all.
@@ -94,10 +94,11 @@ else
fi fi
# paths of helper commands # paths of helper commands
rc=$sourceDir/objects/${arch}.${type}.haiku/tools/rc/rc subpath=${arch}.${type}.haiku
resattr=$sourceDir/objects/${arch}.${type}.haiku/tools/resattr/resattr rc=$sourceDir/objects/${subpath}/tools/rc/rc
fsShellCommand=$sourceDir/objects/${arch}.${type}.haiku/tests/add-ons/kernel/file_systems/fs_shell/fs_shell_command resattr=$sourceDir/objects/${subpath}/tools/resattr/resattr
bfsShell=$sourceDir/objects/${arch}.${type}.haiku/tests/add-ons/kernel/file_systems/bfs/bfs_shell/bfs_shell fsShellCommand=$sourceDir/objects/${subpath}/tests/add-ons/kernel/file_systems/fs_shell/fs_shell_command
bfsShell=$sourceDir/objects/${subpath}/tests/add-ons/kernel/file_systems/bfs/bfs_shell/bfs_shell
export TARGET_PLATFORM=haiku export TARGET_PLATFORM=haiku
@@ -268,8 +269,8 @@ $mkdir -p var/log
echo "Installing kernel modules..." echo "Installing kernel modules..."
cd $sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/kernel cd $sourceDir/distro/${subpath}/beos/system/add-ons/kernel
$scd ${sPrefix}$sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/kernel $scd ${sPrefix}$sourceDir/distro/${subpath}/beos/system/add-ons/kernel
for f in $BEOS_ADD_ONS_BUS_MANAGERS; do for f in $BEOS_ADD_ONS_BUS_MANAGERS; do
$cp ${sPrefix}bus_managers/$f $targetDir/beos/system/add-ons/kernel/bus_managers/$f $cp ${sPrefix}bus_managers/$f $targetDir/beos/system/add-ons/kernel/bus_managers/$f
@@ -286,16 +287,16 @@ for f in drivers/dev/disk/scsi/scsi_dsk drivers/dev/disk/scsi/scsi_cd; do
$cp ${sPrefix}$name $targetDir/beos/system/add-ons/kernel/$name $cp ${sPrefix}$name $targetDir/beos/system/add-ons/kernel/$name
done done
cd $sourceDir/objects/${arch}.${type}.haiku/add-ons/kernel cd $sourceDir/objects/${subpath}/add-ons/kernel
$scd ${sPrefix}$sourceDir/objects/${arch}.${type}.haiku/add-ons/kernel $scd ${sPrefix}$sourceDir/objects/${subpath}/add-ons/kernel
# drivers # drivers
for f in drivers/arch/${arch}/keyboard/keyboard; do for f in drivers/arch/${arch}/keyboard/keyboard; do
$cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/drivers/bin $cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/drivers/bin
done done
cd $sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/kernel/drivers/bin cd $sourceDir/distro/${subpath}/beos/system/add-ons/kernel/drivers/bin
$scd ${sPrefix}$sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/kernel/drivers/bin $scd ${sPrefix}$sourceDir/distro/${subpath}/beos/system/add-ons/kernel/drivers/bin
for f in $BEOS_ADD_ONS_DRIVERS_AUDIO; do for f in $BEOS_ADD_ONS_DRIVERS_AUDIO; do
$cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/drivers/bin $cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/drivers/bin
done done
@@ -309,8 +310,8 @@ for f in ps2_hid; do
$cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/drivers/bin $cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/drivers/bin
done done
cd $sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/kernel/drivers/dev cd $sourceDir/distro/${subpath}/beos/system/add-ons/kernel/drivers/dev
$scd ${sPrefix}$sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/kernel/drivers/dev $scd ${sPrefix}$sourceDir/distro/${subpath}/beos/system/add-ons/kernel/drivers/dev
for f in misc/config console tty random dprintf null zero; do for f in misc/config console tty random dprintf null zero; do
$cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/drivers/bin $cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/drivers/bin
done done
@@ -318,26 +319,26 @@ done
# kernel # kernel
echo "Installing kernel..." echo "Installing kernel..."
$cp ${sPrefix}$sourceDir/objects/${arch}.${type}.haiku/system/kernel_${arch} $targetDir/beos/system/ $cp ${sPrefix}$sourceDir/objects/${subpath}/system/kernel_${arch} $targetDir/beos/system/
# libs # libs
echo "Installing libraries..." echo "Installing libraries..."
cd $sourceDir/distro/${arch}.${type}.haiku/beos/system/lib cd $sourceDir/distro/${subpath}/beos/system/lib
$scd ${sPrefix}$sourceDir/distro/${arch}.${type}.haiku/beos/system/lib $scd ${sPrefix}$sourceDir/distro/${subpath}/beos/system/lib
for f in $BEOS_SYSTEM_LIB; do for f in $BEOS_SYSTEM_LIB; do
$cp ${sPrefix}$f $targetDir/beos/system/lib/ $cp ${sPrefix}$f $targetDir/beos/system/lib/
done done
cd $sourceDir/objects/${arch}.${type}.haiku/system/ cd $sourceDir/objects/${subpath}/system/
$scd ${sPrefix}$sourceDir/objects/${arch}.${type}.haiku/system/ $scd ${sPrefix}$sourceDir/objects/${subpath}/system/
$cp ${sPrefix}runtime_loader/rld.so ${sPrefix}libroot.so $targetDir/beos/system/lib/ $cp ${sPrefix}runtime_loader/rld.so ${sPrefix}libroot.so $targetDir/beos/system/lib/
# servers # servers
echo "Installing servers..." echo "Installing servers..."
cd $sourceDir/distro/${arch}.${type}.haiku/beos/system/servers cd $sourceDir/distro/${subpath}/beos/system/servers
$scd ${sPrefix}$sourceDir/distro/${arch}.${type}.haiku/beos/system/servers $scd ${sPrefix}$sourceDir/distro/${subpath}/beos/system/servers
for f in $BEOS_SYSTEM_SERVERS; do for f in $BEOS_SYSTEM_SERVERS; do
$cp ${sPrefix}$f $targetDir/beos/system/servers/ $cp ${sPrefix}$f $targetDir/beos/system/servers/
done done
@@ -346,33 +347,33 @@ done
# apps # apps
echo "Installing apps..." echo "Installing apps..."
cd $sourceDir/objects/${arch}.${type}.haiku/tests/kernel/boot_floppy cd $sourceDir/objects/${subpath}/tests/kernel/boot_floppy
$scd ${sPrefix}$sourceDir/objects/${arch}.${type}.haiku/tests/kernel/boot_floppy $scd ${sPrefix}$sourceDir/objects/${subpath}/tests/kernel/boot_floppy
for f in fortune; do for f in fortune; do
$cp ${sPrefix}kernel_$f $targetDir/beos/bin/$f $cp ${sPrefix}kernel_$f $targetDir/beos/bin/$f
done done
cd $sourceDir/distro/${arch}.${type}.haiku/beos/bin cd $sourceDir/distro/${subpath}/beos/bin
$scd ${sPrefix}$sourceDir/distro/${arch}.${type}.haiku/beos/bin $scd ${sPrefix}$sourceDir/distro/${subpath}/beos/bin
for f in ../apps/consoled $BEOS_BIN route; do for f in ../apps/consoled $BEOS_BIN route; do
$cp ${sPrefix}$f $targetDir/beos/bin/ $cp ${sPrefix}$f $targetDir/beos/bin/
done done
cd $sourceDir/distro/${arch}.${type}.haiku/beos/apps cd $sourceDir/distro/${subpath}/beos/apps
$scd ${sPrefix}$sourceDir/distro/${arch}.${type}.haiku/beos/apps $scd ${sPrefix}$sourceDir/distro/${subpath}/beos/apps
for f in $BEOS_APPS; do for f in $BEOS_APPS; do
$cp ${sPrefix}$f $targetDir/beos/apps/ $cp ${sPrefix}$f $targetDir/beos/apps/
done done
cd $sourceDir/distro/${arch}.${type}.haiku/beos/preferences cd $sourceDir/distro/${subpath}/beos/preferences
$scd ${sPrefix}$sourceDir/distro/${arch}.${type}.haiku/beos/preferences $scd ${sPrefix}$sourceDir/distro/${subpath}/beos/preferences
for f in $BEOS_PREFERENCES; do for f in $BEOS_PREFERENCES; do
$cp ${sPrefix}$f $targetDir/beos/preferences/ $cp ${sPrefix}$f $targetDir/beos/preferences/
done done
cd $sourceDir/distro/${arch}.${type}.haiku/beos/system cd $sourceDir/distro/${subpath}/beos/system
$scd ${sPrefix}$sourceDir/distro/${arch}.${type}.haiku/beos/system $scd ${sPrefix}$sourceDir/distro/${subpath}/beos/system
for f in Deskbar Tracker; do for f in Deskbar Tracker; do
$cp ${sPrefix}$f $targetDir/beos/system/ $cp ${sPrefix}$f $targetDir/beos/system/
done done
@@ -394,7 +395,7 @@ if [ -e /boot/beos/etc/fonts/ttfonts/Swiss721.ttf ]; then
fi fi
#$cp -r ${sPrefix}data/etc/KanBe $targetDir/beos/etc/ #$cp -r ${sPrefix}data/etc/KanBe $targetDir/beos/etc/
$cp ${sPrefix}src/tests/kernel/boot_floppy/fortune/fortunes $targetDir/beos/etc/ $cp ${sPrefix}src/tests/kernel/boot_floppy/fortune/fortunes $targetDir/beos/etc/
$cp -r ${sPrefix}distro/${arch}.${type}.haiku/beos/etc $targetDir/beos/ $cp -r ${sPrefix}distro/${subpath}/beos/etc $targetDir/beos/
$cp ${sPrefix}data/settings/kernel/drivers/kernel \ $cp ${sPrefix}data/settings/kernel/drivers/kernel \
$targetDir/home/config/settings/kernel/drivers/ $targetDir/home/config/settings/kernel/drivers/
@@ -405,17 +406,17 @@ fi
$ln -sf /boot/beos/etc/timezones/Europe/Paris \ $ln -sf /boot/beos/etc/timezones/Europe/Paris \
$targetDir/home/config/settings/timezone $targetDir/home/config/settings/timezone
$cp ${sPrefix}distro/${arch}.${type}.haiku/beos/etc/Keymap/US-International \ $cp ${sPrefix}distro/${subpath}/beos/etc/Keymap/US-International \
$targetDir/home/config/settings/Key_map $targetDir/home/config/settings/Key_map
# boot loader # boot loader
echo "Installing boot loader..." echo "Installing boot loader..."
cd $sourceDir/objects/${arch}.${type}.haiku/system/ cd $sourceDir/objects/${subpath}/system/
rm -f zbeos rm -f zbeos
objcopy -O binary boot_loader zbeos objcopy -O binary boot_loader zbeos
$cd $targetDir/beos/system $cd $targetDir/beos/system
$cp ${sPrefix}$sourceDir/objects/${arch}.${type}.haiku/system/zbeos . $cp ${sPrefix}$sourceDir/objects/${subpath}/system/zbeos .
# boot module links # boot module links
@@ -460,63 +461,63 @@ done
# add-ons # add-ons
echo "Copying add-ons..." echo "Copying add-ons..."
cd $sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/accelerants cd $sourceDir/distro/${subpath}/beos/system/add-ons/accelerants
$scd ${sPrefix}$sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/accelerants $scd ${sPrefix}$sourceDir/distro/${subpath}/beos/system/add-ons/accelerants
for f in $BEOS_ADD_ONS_ACCELERANTS; do for f in $BEOS_ADD_ONS_ACCELERANTS; do
$cp ${sPrefix}$f $targetDir/beos/system/add-ons/accelerants/ $cp ${sPrefix}$f $targetDir/beos/system/add-ons/accelerants/
done done
cd $sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/Translators cd $sourceDir/distro/${subpath}/beos/system/add-ons/Translators
$scd ${sPrefix}$sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/Translators $scd ${sPrefix}$sourceDir/distro/${subpath}/beos/system/add-ons/Translators
for f in $BEOS_ADD_ONS_TRANSLATORS; do for f in $BEOS_ADD_ONS_TRANSLATORS; do
$cp ${sPrefix}$f $targetDir/beos/system/add-ons/Translators/ $cp ${sPrefix}$f $targetDir/beos/system/add-ons/Translators/
done done
cd $sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/media cd $sourceDir/distro/${subpath}/beos/system/add-ons/media
$scd ${sPrefix}$sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/media $scd ${sPrefix}$sourceDir/distro/${subpath}/beos/system/add-ons/media
for f in $BEOS_ADD_ONS_MEDIA; do for f in $BEOS_ADD_ONS_MEDIA; do
$cp ${sPrefix}$f $targetDir/beos/system/add-ons/media/ $cp ${sPrefix}$f $targetDir/beos/system/add-ons/media/
done done
cd $sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/media/plugins cd $sourceDir/distro/${subpath}/beos/system/add-ons/media/plugins
$scd ${sPrefix}$sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/media/plugins $scd ${sPrefix}$sourceDir/distro/${subpath}/beos/system/add-ons/media/plugins
for f in $BEOS_ADD_ONS_MEDIA_PLUGINS; do for f in $BEOS_ADD_ONS_MEDIA_PLUGINS; do
$cp ${sPrefix}$f $targetDir/beos/system/add-ons/media/plugins/ $cp ${sPrefix}$f $targetDir/beos/system/add-ons/media/plugins/
done done
cd $sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/input_server/ cd $sourceDir/distro/${subpath}/beos/system/add-ons/input_server/
$cd ${sPrefix}$sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/input_server/ $cd ${sPrefix}$sourceDir/distro/${subpath}/beos/system/add-ons/input_server/
for f in devices/keyboard devices/mouse filters/screen_saver methods/canna; do for f in devices/keyboard devices/mouse filters/screen_saver methods/canna; do
$cp ${sPrefix}$f $targetDir/beos/system/add-ons/input_server/$(dirname $f)/ $cp ${sPrefix}$f $targetDir/beos/system/add-ons/input_server/$(dirname $f)/
done done
# network add-ons # network add-ons
cd $sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/kernel/obos_network cd $sourceDir/distro/${subpath}/beos/system/add-ons/kernel/obos_network
$scd ${sPrefix}$sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/kernel/obos_network $scd ${sPrefix}$sourceDir/distro/${subpath}/beos/system/add-ons/kernel/obos_network
for f in $BEOS_NETWORK_CORE; do for f in $BEOS_NETWORK_CORE; do
$cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/network $cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/network
done done
cd $sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/kernel/obos_network/interfaces cd $sourceDir/distro/${subpath}/beos/system/add-ons/kernel/obos_network/interfaces
$scd ${sPrefix}$sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/kernel/obos_network/interfaces $scd ${sPrefix}$sourceDir/distro/${subpath}/beos/system/add-ons/kernel/obos_network/interfaces
for f in $BEOS_NETWORK_INTERFACES; do for f in $BEOS_NETWORK_INTERFACES; do
$cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/network/interfaces $cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/network/interfaces
done done
cd $sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/kernel/obos_network/ppp cd $sourceDir/distro/${subpath}/beos/system/add-ons/kernel/obos_network/ppp
$scd ${sPrefix}$sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/kernel/obos_network/ppp $scd ${sPrefix}$sourceDir/distro/${subpath}/beos/system/add-ons/kernel/obos_network/ppp
for f in $BEOS_NETWORK_PPP; do for f in $BEOS_NETWORK_PPP; do
$cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/network/ppp $cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/network/ppp
done done
cd $sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/kernel/obos_network/protocols cd $sourceDir/distro/${subpath}/beos/system/add-ons/kernel/obos_network/protocols
$scd ${sPrefix}$sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/kernel/obos_network/protocols $scd ${sPrefix}$sourceDir/distro/${subpath}/beos/system/add-ons/kernel/obos_network/protocols
for f in $BEOS_NETWORK_PROTOCOLS; do for f in $BEOS_NETWORK_PROTOCOLS; do
$cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/network/protocols $cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/network/protocols
done done
cd $sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/Screen\ Savers cd $sourceDir/distro/${subpath}/beos/system/add-ons/Screen\ Savers
$scd ${sPrefix}$sourceDir/distro/${arch}.${type}.haiku/beos/system/add-ons/Screen\ Savers $scd ${sPrefix}$sourceDir/distro/${subpath}/beos/system/add-ons/Screen\ Savers
for f in $BEOS_ADD_ONS_SCREENSAVERS; do for f in $BEOS_ADD_ONS_SCREENSAVERS; do
$cp ${sPrefix}$f $targetDir/beos/system/add-ons/Screen\ Savers $cp ${sPrefix}$f $targetDir/beos/system/add-ons/Screen\ Savers
done done