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

Added more things to x86_64 image.

Browse Source 
Some preference apps, mount_server and AboutSystem. Removed the check
for x86_64 in the boot script, the normal path through the script will
work now. Also removed a temporary hack to workaround AboutSystem not
being there in build_haiku_image.
This commit is contained in:
Alex Smith
2012-08-10 09:32:54 +01:00
parent e963289800
commit 5084d0d451
18 changed files with 54 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/Haiku64Image
+23 -8
View File
@@ -27,16 +27,20 @@ SYSTEM_BIN = "[" addattr base64 basename bash beep cal cat catattr chgrp chmod
<bin>install isvolume join kernel_debugger kill less lessecho lesskey link
linkcatkeys listdev ln locale locate logger logname ls md5sum mkdir mkfifo
mktemp mount mountvolume mv nl nohup nproc od paste patch pathchk pr
printenv printf ps ptx pwd readlink rm rmattr rmdir safemode sdiff seq
sha1sum shred shuf sleep sort split stat strace stty su sum sync sysinfo
tac tail tee test timeout touch tr true truncate tsort tty unexpand uname
uniq unlink unmount unzip <bin>updatedb waitfor wc whoami xargs xres yes
zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit zmore znew
printenv printf ps ptx pwd readlink ReadOnlyBootPrompt rm rmattr rmdir
safemode sdiff seq sha1sum shred shuf sleep sort split stat strace stty su
sum sync sysinfo tac tail tee test timeout touch tr true truncate tsort tty
unexpand uname uniq unlink unmount unzip <bin>updatedb waitfor wc whoami
xargs xres yes zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote
zipsplit zmore znew
;
SYSTEM_APPS = Terminal ;
SYSTEM_APPS = AboutSystem Terminal ;
SYSTEM_PREFERENCES = ;
SYSTEM_PREFERENCES = Appearance Backgrounds <preference>Deskbar FileTypes
Keyboard Keymap Locale Mouse Notifications Screen Time Touchpad
<preference>Tracker
;
SYSTEM_DEMOS = ;
@@ -49,7 +53,9 @@ SYSTEM_LIBS = libbe.so libbnetapi.so libdebug.so libnetwork.so
PRIVATE_SYSTEM_LIBS = ;
SYSTEM_SERVERS = app_server debug_server input_server registrar syslog_daemon ;
SYSTEM_SERVERS = app_server debug_server input_server mount_server
notification_server registrar syslog_daemon
;
SYSTEM_ADD_ONS_ACCELERANTS = vesa.accelerant ;
@@ -153,6 +159,15 @@ for linkTarget in $(DESKBAR_APPLICATIONS) {
: /boot/system/apps/$(linkTarget) : $(linkTarget) ;
}
# Deskbar Preferences links
AddDirectoryToHaikuImage home config settings deskbar Preferences ;
DESKBAR_PREFERENCES = $(SYSTEM_PREFERENCES:B) ;
for linkTarget in $(DESKBAR_PREFERENCES) {
AddSymlinkToHaikuImage home config settings deskbar Preferences
: /boot/system/preferences/$(linkTarget)
: $(linkTarget) ;
}
AddSymlinkToHaikuImage system bin : less : more ;
AddSymlinkToHaikuImage system bin : gzip : gunzip ;
AddSymlinkToHaikuImage system bin : gzip : zcat ;
build/scripts/build_haiku_image
-3
View File
@@ -329,8 +329,6 @@ fi # ! updateOnly
# add the concatenated copyrights as an attribute to AboutSystem
if [ ! $updateOnly ]; then
# TODO x86_64: temporary hack, AboutSystem doesn't exist yet.
if [ -f $outputDir/objects/haiku/*/*/apps/aboutsystem/AboutSystem ]; then
if [ -f $copyrightsFile ]; then
copyrightAttrs=$tmpDir/copyrightAttrs
$rmAttrs -f $copyrightAttrs
@@ -339,7 +337,6 @@ if [ -f $outputDir/objects/haiku/*/*/apps/aboutsystem/AboutSystem ]; then
$copyAttrs ${sPrefix}$copyrightAttrs ${tPrefix}system/apps/AboutSystem
fi
fi
fi
if [ $isCD ]; then
# generate the attribute stores