[haiku-commits] r40805 - in haiku/branches/features/package-management: build/jam build/scripts data/system/boot headers/os/storage src/add-ons/input_server/filters/shortcut_catcher ...

  • From: zooey@xxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 4 Mar 2011 14:36:06 +0100 (CET)

Author: zooey
Date: 2011-03-04 14:36:05 +0100 (Fri, 04 Mar 2011)
New Revision: 40805
Changeset: http://dev.haiku-os.org/changeset/40805

Modified:
   haiku/branches/features/package-management/build/jam/FloppyBootImage
   haiku/branches/features/package-management/build/jam/HaikuImage
   haiku/branches/features/package-management/build/jam/ImageRules
   haiku/branches/features/package-management/build/jam/NetBootArchive
   haiku/branches/features/package-management/build/jam/OptionalPackages
   haiku/branches/features/package-management/build/scripts/build_haiku_image
   haiku/branches/features/package-management/data/system/boot/Bootscript
   haiku/branches/features/package-management/data/system/boot/Bootscript.cd
   haiku/branches/features/package-management/data/system/boot/SetupEnvironment
   haiku/branches/features/package-management/headers/os/storage/FindDirectory.h
   
haiku/branches/features/package-management/src/add-ons/input_server/filters/shortcut_catcher/ParseCommandLine.cpp
   
haiku/branches/features/package-management/src/add-ons/kernel/debugger/hangman/hangman.c
   
haiku/branches/features/package-management/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/Driver.h
   
haiku/branches/features/package-management/src/add-ons/kernel/drivers/network/wlan/ipw2100/ipw2100.cpp
   
haiku/branches/features/package-management/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/FileSystemInitializer.cpp
   
haiku/branches/features/package-management/src/add-ons/media/plugins/ffmpeg/config.h
   
haiku/branches/features/package-management/src/apps/aboutsystem/AboutSystem.cpp
   
haiku/branches/features/package-management/src/apps/installer/InstallerWindow.cpp
   
haiku/branches/features/package-management/src/apps/processcontroller/PCWorld.cpp
   
haiku/branches/features/package-management/src/apps/processcontroller/ProcessController.cpp
   haiku/branches/features/package-management/src/bin/bash/Jamfile
   haiku/branches/features/package-management/src/bin/bash/config-top.h
   haiku/branches/features/package-management/src/bin/bash/pathnames.h
   haiku/branches/features/package-management/src/bin/finddir.c
   
haiku/branches/features/package-management/src/libs/print/libgutenprint/config.h
   
haiku/branches/features/package-management/src/preferences/joysticks/JoyWin.cpp
   haiku/branches/features/package-management/src/servers/app/Desktop.cpp
   haiku/branches/features/package-management/src/servers/registrar/TRoster.cpp
   haiku/branches/features/package-management/src/system/boot/loader/loader.cpp
   haiku/branches/features/package-management/src/system/kernel/fs/vfs_boot.cpp
   haiku/branches/features/package-management/src/system/kernel/team.cpp
   
haiku/branches/features/package-management/src/system/libroot/os/find_directory.cpp
   
haiku/branches/features/package-management/src/system/libroot/posix/time/localtime_fading_out.c
   
haiku/branches/features/package-management/src/system/libroot/posix/unistd/conf.c
   
haiku/branches/features/package-management/src/system/runtime_loader/runtime_loader.cpp
   
haiku/branches/features/package-management/src/tests/kits/translation/TranslationUtilsTest.cpp
   
haiku/branches/features/package-management/src/tests/kits/translation/TranslatorRosterTest.cpp
   
haiku/branches/features/package-management/src/tools/translation/inspector/InspectorApp.cpp
Log:
* drop 'packages/contents' from base paths again (we are back to
  using /boot/system, /boot/common and /boot/home/config
  as packagefs mount-points)

Modified: haiku/branches/features/package-management/build/jam/FloppyBootImage
===================================================================
--- haiku/branches/features/package-management/build/jam/FloppyBootImage        
2011-03-04 13:35:25 UTC (rev 40804)
+++ haiku/branches/features/package-management/build/jam/FloppyBootImage        
2011-03-04 13:36:05 UTC (rev 40805)
@@ -53,33 +53,33 @@
 
 
 # modules
-AddFilesToFloppyBootArchive system packages contents add-ons kernel 
bus_managers
+AddFilesToFloppyBootArchive system add-ons kernel bus_managers
        : $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
-AddFilesToFloppyBootArchive system packages contents add-ons kernel busses ide
+AddFilesToFloppyBootArchive system add-ons kernel busses ide
        : generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata 
it8211 ;
-AddFilesToFloppyBootArchive system packages contents add-ons kernel busses scsi
+AddFilesToFloppyBootArchive system add-ons kernel busses scsi
        : ahci ;
-AddFilesToFloppyBootArchive system packages contents add-ons kernel console
+AddFilesToFloppyBootArchive system add-ons kernel console
        : vga_text ;
-AddFilesToFloppyBootArchive system packages contents add-ons kernel 
file_systems
+AddFilesToFloppyBootArchive system add-ons kernel file_systems
        : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
-AddFilesToFloppyBootArchive system packages contents add-ons kernel generic
+AddFilesToFloppyBootArchive system add-ons kernel generic
        : $(ATA_ONLY)ata_adapter $(IDE_ONLY)ide_adapter locked_pool scsi_periph 
;
 AddFilesToFloppyBootArchive
-       system packages contents add-ons kernel partitioning_systems
+       system add-ons kernel partitioning_systems
        : intel session ;
 AddFilesToFloppyBootArchive
-       system packages contents add-ons kernel interrupt_controllers
+       system add-ons kernel interrupt_controllers
        : $(PPC_ONLY)openpic ;
 
 if $(USB_BOOT) = 1 {
        AddFilesToFloppyBootArchive
-               system packages contents add-ons kernel busses usb
+               system add-ons kernel busses usb
                : <usb>uhci <usb>ohci <usb>ehci ;
 }
 
 if $(TARGET_ARCH) = x86 {
-       AddFilesToFloppyBootArchive system packages contents add-ons kernel cpu
+       AddFilesToFloppyBootArchive system add-ons kernel cpu
                : generic_x86 ;
 }
 
@@ -94,7 +94,7 @@
 }
 
 # kernel
-AddFilesToFloppyBootArchive system packages contents
+AddFilesToFloppyBootArchive system
        : <revisioned>kernel_$(TARGET_ARCH) ;
 
 # scripts and data files
@@ -107,19 +107,19 @@
 
 if $(NET_BOOT) = 1 {
        # add-ons
-       AddFilesToFloppyBootArchive system packages contents add-ons kernel 
network
+       AddFilesToFloppyBootArchive system add-ons kernel network
                : stack socket ;
        AddFilesToFloppyBootArchive
-               system packages contents add-ons kernel network devices
+               system add-ons kernel network devices
                : $(SYSTEM_NETWORK_DEVICES) ;
        AddFilesToFloppyBootArchive
-               system packages contents add-ons kernel network 
datalink_protocols
+               system add-ons kernel network datalink_protocols
                : $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
        AddFilesToFloppyBootArchive
-               system packages contents add-ons kernel network ppp
+               system add-ons kernel network ppp
                : $(SYSTEM_NETWORK_PPP) ;
        AddFilesToFloppyBootArchive
-               system packages contents add-ons kernel network protocols
+               system add-ons kernel network protocols
                : $(SYSTEM_NETWORK_PROTOCOLS) ;
 }
 

Modified: haiku/branches/features/package-management/build/jam/HaikuImage
===================================================================
--- haiku/branches/features/package-management/build/jam/HaikuImage     
2011-03-04 13:35:25 UTC (rev 40804)
+++ haiku/branches/features/package-management/build/jam/HaikuImage     
2011-03-04 13:36:05 UTC (rev 40805)
@@ -208,44 +208,44 @@
 
 
 # modules
-AddFilesToHaikuImage system packages contents add-ons kernel bus_managers
+AddFilesToHaikuImage system add-ons kernel bus_managers
        : $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
-AddFilesToHaikuImage system packages contents add-ons kernel busses agp_gart
+AddFilesToHaikuImage system add-ons kernel busses agp_gart
        : $(X86_ONLY)<agp_gart>intel ;
 
 if $(HAIKU_ATA_STACK) = 1 {
-       AddFilesToHaikuImage system packages contents add-ons kernel busses ata
+       AddFilesToHaikuImage system add-ons kernel busses ata
                : generic_ide_pci it8211 legacy_sata silicon_image_3112
                        $(X86_ONLY)ide_isa ;
 } else {
-       AddFilesToHaikuImage system packages contents add-ons kernel busses ide
+       AddFilesToHaikuImage system add-ons kernel busses ide
                : generic_ide_pci it8211 legacy_sata silicon_image_3112
                        $(X86_ONLY)ide_isa ;
 }
 
-AddFilesToHaikuImage system packages contents add-ons kernel busses scsi
+AddFilesToHaikuImage system add-ons kernel busses scsi
        : ahci ;
-AddFilesToHaikuImage system packages contents add-ons kernel busses usb
+AddFilesToHaikuImage system add-ons kernel busses usb
        : <usb>uhci <usb>ohci <usb>ehci ;
-AddFilesToHaikuImage system packages contents add-ons kernel console
+AddFilesToHaikuImage system add-ons kernel console
        : vga_text ;
-AddFilesToHaikuImage system packages contents add-ons kernel debugger
+AddFilesToHaikuImage system add-ons kernel debugger
        : <kdebug>demangle $(X86_ONLY)<kdebug>disasm
          <kdebug>invalidate_on_exit <kdebug>usb_keyboard <kdebug>run_on_exit ;
-AddFilesToHaikuImage system packages contents add-ons kernel file_systems
+AddFilesToHaikuImage system add-ons kernel file_systems
        : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
-AddFilesToHaikuImage system packages contents add-ons kernel generic
+AddFilesToHaikuImage system add-ons kernel generic
        : $(ATA_ONLY)ata_adapter dpc $(IDE_ONLY)ide_adapter locked_pool mpu401
                scsi_periph ;
 AddFilesToHaikuImage
-       system packages contents add-ons kernel partitioning_systems
+       system add-ons kernel partitioning_systems
        : amiga_rdb apple efi_gpt intel session ;
 AddFilesToHaikuImage
-       system packages contents add-ons kernel interrupt_controllers
+       system add-ons kernel interrupt_controllers
        : $(PPC_ONLY)openpic ;
 
 if $(TARGET_ARCH) = x86 {
-       AddFilesToHaikuImage system packages contents add-ons kernel cpu
+       AddFilesToHaikuImage system add-ons kernel cpu
                : generic_x86 ;
 }
 
@@ -274,11 +274,11 @@
 #AddDriversToHaikuImage power          : $(SYSTEM_ADD_ONS_DRIVERS_POWER) ;
 
 # kernel
-AddFilesToHaikuImage system packages contents
+AddFilesToHaikuImage system
        : <revisioned>kernel_$(TARGET_ARCH) ;
 
 # libs
-AddLibrariesToHaikuImage system packages contents lib
+AddLibrariesToHaikuImage system lib
        : $(SYSTEM_LIBS) $(PRIVATE_SYSTEM_LIBS) ;
 
 # libnetwork.so replaces quite a few libraries
@@ -288,11 +288,11 @@
 if $(HAIKU_GCC_VERSION[1]) = 2 {
        local lib ;
        for lib in $(SYSTEM_LIBS_LIBNETWORK_ALIASES) {
-               AddSymlinkToHaikuImage system packages contents lib
+               AddSymlinkToHaikuImage system lib
                        : libnetwork.so : $(lib) ;
        }
 
-       AddSymlinkToHaikuImage system packages contents lib : libbnetapi.so
+       AddSymlinkToHaikuImage system lib : libbnetapi.so
                : libnetapi.so ;
 }
 
@@ -304,7 +304,7 @@
 if $(TARGET_ARCH) = x86 {
        local lib ;
        for lib in $(SYSTEM_LIBS_LIBGL_ALIASES) {
-               AddSymlinkToHaikuImage system packages contents lib
+               AddSymlinkToHaikuImage system lib
                        : libGL.so : $(lib) ;
        }
 }
@@ -316,38 +316,38 @@
 ;
 
 # servers
-AddFilesToHaikuImage system packages contents servers : $(SYSTEM_SERVERS) ;
+AddFilesToHaikuImage system servers : $(SYSTEM_SERVERS) ;
 
 # apps
-AddFilesToHaikuImage system packages contents          : runtime_loader ;
-AddFilesToHaikuImage system packages contents          : Deskbar Tracker ;
-AddFilesToHaikuImage system packages contents bin      : $(SYSTEM_BIN) 
consoled ;
-AddFilesToHaikuImage system packages contents apps     : $(SYSTEM_APPS) ;
-AddFilesToHaikuImage system packages contents preferences
+AddFilesToHaikuImage system            : runtime_loader ;
+AddFilesToHaikuImage system            : Deskbar Tracker ;
+AddFilesToHaikuImage system bin        : $(SYSTEM_BIN) consoled ;
+AddFilesToHaikuImage system apps       : $(SYSTEM_APPS) ;
+AddFilesToHaikuImage system preferences
        : $(SYSTEM_PREFERENCES) ;
-AddFilesToHaikuImage system packages contents demos : $(SYSTEM_DEMOS) ;
+AddFilesToHaikuImage system demos : $(SYSTEM_DEMOS) ;
 
 SEARCH on which = [ FDirName $(HAIKU_TOP) data bin ] ;
-AddFilesToHaikuImage system packages contents bin      : which ;
+AddFilesToHaikuImage system bin        : which ;
 SEARCH on installoptionalpackage = [ FDirName $(HAIKU_TOP) data bin ] ;
-AddFilesToHaikuImage system packages contents bin      : 
installoptionalpackage ;
+AddFilesToHaikuImage system bin        : installoptionalpackage ;
 SEARCH on install-wifi-firmwares.sh = [ FDirName $(HAIKU_TOP) data bin ] ;
-AddFilesToHaikuImage system packages contents bin
+AddFilesToHaikuImage system bin
        : install-wifi-firmwares.sh ;
 
 # Add the files to be used by installoptionalpackage.
-AddDirectoryToHaikuImage common packages contents data optional-packages ;
+AddDirectoryToHaikuImage common data optional-packages ;
 local optional-pkg-files = OptionalBuildFeatures OptionalPackageDependencies
        OptionalPackages OptionalLibPackages ;
 for name in $(optional-pkg-files) {
        local file = [ FDirName $(HAIKU_TOP) build jam $(name) ] ;
-       AddFilesToHaikuImage common packages contents data optional-packages
+       AddFilesToHaikuImage common data optional-packages
                : $(file) ;
 }
 AddInstalledPackagesFileToHaikuImage ;
 
-AddSymlinkToHaikuImage system packages contents bin : bash : sh ;
-AddSymlinkToHaikuImage system packages contents bin : trash : untrash ;
+AddSymlinkToHaikuImage system bin : bash : sh ;
+AddSymlinkToHaikuImage system bin : trash : untrash ;
 
 AddSymlinkToHaikuImage home Desktop : /boot/home : Home ;
 
@@ -366,7 +366,7 @@
 local linkTarget ;
 for linkTarget in $(DESKBAR_APPLICATIONS) {
        AddSymlinkToHaikuImage home config be Applications
-               : /boot/system/packages/contents/apps/$(linkTarget) : 
$(linkTarget) ;
+               : /boot/system/apps/$(linkTarget) : $(linkTarget) ;
 }
 
 # Deskbar Desktop applets links
@@ -376,7 +376,7 @@
 ;
 for linkTarget in $(DESKBAR_DESKTOP_APPLETS) {
        AddSymlinkToHaikuImage home config be Desktop\ applets
-               : /boot/system/packages/contents/apps/$(linkTarget) : 
$(linkTarget) ;
+               : /boot/system/apps/$(linkTarget) : $(linkTarget) ;
 }
 
 # Deskbar Preferences links
@@ -384,7 +384,7 @@
 DESKBAR_PREFERENCES = $(SYSTEM_PREFERENCES:B) ;
 for linkTarget in $(DESKBAR_PREFERENCES) {
        AddSymlinkToHaikuImage home config be Preferences
-               : /boot/system/packages/contents/preferences/$(linkTarget)
+               : /boot/system/preferences/$(linkTarget)
                : $(linkTarget) ;
 }
 
@@ -392,25 +392,25 @@
 AddDirectoryToHaikuImage home config be Demos ;
 for linkTarget in $(SYSTEM_DEMOS) {
        AddSymlinkToHaikuImage home config be Demos
-               : /boot/system/packages/contents/demos/$(linkTarget) : 
$(linkTarget) ;
+               : /boot/system/demos/$(linkTarget) : $(linkTarget) ;
 }
 
-AddSymlinkToHaikuImage system packages contents bin : bzip2 : bunzip2 ;
-AddSymlinkToHaikuImage system packages contents bin : less : more ;
-AddSymlinkToHaikuImage system packages contents bin : gzip : gunzip ;
-AddSymlinkToHaikuImage system packages contents bin : gzip : zcat ;
-AddSymlinkToHaikuImage system packages contents bin : zdiff : zcmp ;
-AddSymlinkToHaikuImage system packages contents bin : unzip : zipinfo ;
-AddSymlinkToHaikuImage system packages contents bin : gawk : awk ;
-AddSymlinkToHaikuImage system packages contents bin : grep : egrep ;
-AddSymlinkToHaikuImage system packages contents bin : grep : fgrep ;
+AddSymlinkToHaikuImage system bin : bzip2 : bunzip2 ;
+AddSymlinkToHaikuImage system bin : less : more ;
+AddSymlinkToHaikuImage system bin : gzip : gunzip ;
+AddSymlinkToHaikuImage system bin : gzip : zcat ;
+AddSymlinkToHaikuImage system bin : zdiff : zcmp ;
+AddSymlinkToHaikuImage system bin : unzip : zipinfo ;
+AddSymlinkToHaikuImage system bin : gawk : awk ;
+AddSymlinkToHaikuImage system bin : grep : egrep ;
+AddSymlinkToHaikuImage system bin : grep : fgrep ;
 
 
 # scripts and data files
 local bootScripts = Bootscript Bootscript.cd SetupEnvironment Netscript
        InstallerInitScript InstallerFinishScript ;
 SEARCH on $(bootScripts) = [ FDirName $(HAIKU_TOP) data system boot ] ;
-AddFilesToHaikuImage system packages contents boot : $(bootScripts) ;
+AddFilesToHaikuImage system boot : $(bootScripts) ;
 
 local userBootScripts = UserBootscript UserSetupEnvironment.sample ;
 SEARCH on $(userBootScripts) = [ FDirName $(HAIKU_TOP) data config boot ] ;
@@ -423,9 +423,9 @@
        $(HAIKU_INCLUDE_TRADEMARKS)"HAIKU logo - white on blue - big.png"
        $(HAIKU_INCLUDE_TRADEMARKS)"HAIKU logo - white on blue - normal.png" ;
 SEARCH on $(logoArtwork) = [ FDirName $(HAIKU_TOP) data artwork ] ;
-AddFilesToHaikuImage system packages contents data artwork : $(logoArtwork) ;
+AddFilesToHaikuImage system data artwork : $(logoArtwork) ;
 
-AddDirectoryToHaikuImage system packages contents data sounds ;
+AddDirectoryToHaikuImage system data sounds ;
 
 # Add mail provider infos.
 AddFilesToHaikuImage home config settings Mail ProviderInfo :
@@ -436,7 +436,7 @@
 spellFiles = $(spellFiles:G=spell) ;
 SEARCH on $(spellFiles)
        = [ FDirName $(HAIKU_TOP) src apps mail ] ;
-AddFilesToHaikuImage system packages contents data spell_check word_dictionary
+AddFilesToHaikuImage system data spell_check word_dictionary
        : $(spellFiles) ;
 
 local etcFiles = inputrc profile ;
@@ -448,47 +448,47 @@
 local dataFiles = teapot.data ;
 dataFiles = $(dataFiles:G=data) ;
 SEARCH on $(dataFiles) = [ FDirName $(HAIKU_TOP) data system data ] ;
-AddFilesToHaikuImage system packages contents data : $(dataFiles) ;
+AddFilesToHaikuImage system data : $(dataFiles) ;
 
 local fortuneFiles = [ Glob $(HAIKU_TOP)/data/system/data/fortunes
        : [a-zA-Z0-9]* ] ;
 fortuneFiles = $(fortuneFiles:G=data!fortunes) ;
-AddFilesToHaikuImage system packages contents data fortunes : $(fortuneFiles) ;
+AddFilesToHaikuImage system data fortunes : $(fortuneFiles) ;
 
 local fontDir = [ FDirName $(HAIKU_TOP) data system data fonts ] ;
 local psFonts = [ Glob $(fontDir)/psfonts : *.afm *.pfb ] ;
 local ttFonts = [ Glob $(fontDir)/ttfonts : *.ttf ] ;
-AddFilesToHaikuImage system packages contents data fonts psfonts : $(psFonts) ;
-AddFilesToHaikuImage system packages contents data fonts ttfonts : $(ttFonts) ;
+AddFilesToHaikuImage system data fonts psfonts : $(psFonts) ;
+AddFilesToHaikuImage system data fonts ttfonts : $(ttFonts) ;
 
 local cannaDir = [ FDirName $(HAIKU_TOP) data system data Canna ] ;
 local cannaDefault = [ Glob $(cannaDir)/default : *.canna *.gz ] ;
 local cannaDic = [ Glob $(cannaDir)/dic : *.cbp ] ;
 local cannaDicCanna = [ Glob $(cannaDir)/dic/canna
        : *.cld *.ctd *.cbd *.dir ] ;
-AddFilesToHaikuImage system packages contents data Canna default
+AddFilesToHaikuImage system data Canna default
        : $(cannaDefault) ;
-AddFilesToHaikuImage system packages contents data Canna dic : $(cannaDic) ;
-AddFilesToHaikuImage system packages contents data Canna dic canna
+AddFilesToHaikuImage system data Canna dic : $(cannaDic) ;
+AddFilesToHaikuImage system data Canna dic canna
        : $(cannaDicCanna) ;
-AddDirectoryToHaikuImage system packages contents data Canna dic group ;
-AddDirectoryToHaikuImage system packages contents data Canna dic user ;
+AddDirectoryToHaikuImage system data Canna dic group ;
+AddDirectoryToHaikuImage system data Canna dic user ;
 
 local keymapFiles = [ Glob [ FDirName $(HAIKU_TOP) src data keymaps ]
        : *.keymap ] ;
 keymapFiles = $(keymapFiles:BG=keymap) ;
-AddFilesToHaikuImage system packages contents data Keymaps : $(keymapFiles) ;
-AddSymlinkToHaikuImage system packages contents data Keymaps : Swedish
+AddFilesToHaikuImage system data Keymaps : $(keymapFiles) ;
+AddSymlinkToHaikuImage system data Keymaps : Swedish
        : Finnish ;
-AddSymlinkToHaikuImage system packages contents data Keymaps : Slovene
+AddSymlinkToHaikuImage system data Keymaps : Slovene
        : Croatian ;
-AddSymlinkToHaikuImage system packages contents data Keymaps : US-International
+AddSymlinkToHaikuImage system data Keymaps : US-International
        : Brazilian ;
 
 local keyboardLayoutsDir
        = [ FDirName $(HAIKU_TOP) data system data KeyboardLayouts ] ;
 local keyboardLayouts = [ Glob $(keyboardLayoutsDir) : [^.]* ] ;
-AddFilesToHaikuImage system packages contents data KeyboardLayouts
+AddFilesToHaikuImage system data KeyboardLayouts
        : $(keyboardLayouts) ;
 
 local driverSettingsFiles = <driver-settings>kernel ;
@@ -509,7 +509,7 @@
        = [ FDirName $(HAIKU_TOP) data common boot post_install ] ;
 SEARCH on <post-install>fresh_install
        = [ FDirName $(HAIKU_TOP) data common settings ] ;
-AddFilesToHaikuImage common packages contents boot post_install
+AddFilesToHaikuImage common boot post_install
        : $(postInstallFiles) ;
 AddFilesToHaikuImage common settings : <post-install>fresh_install ;
 
@@ -531,100 +531,100 @@
 ;
 
 # add-ons
-AddFilesToHaikuImage system packages contents add-ons accelerants
+AddFilesToHaikuImage system add-ons accelerants
        : $(SYSTEM_ADD_ONS_ACCELERANTS) ;
-AddFilesToHaikuImage system packages contents add-ons opengl
+AddFilesToHaikuImage system add-ons opengl
        : Mesa\ Software\ Renderer ;
-AddFilesToHaikuImage system packages contents add-ons Translators
+AddFilesToHaikuImage system add-ons Translators
        : $(SYSTEM_ADD_ONS_TRANSLATORS) ;
-AddFilesToHaikuImage system packages contents add-ons locale catalogs
+AddFilesToHaikuImage system add-ons locale catalogs
        : $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
-AddFilesToHaikuImage system packages contents add-ons locale catalogs
+AddFilesToHaikuImage system add-ons locale catalogs
        : $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
 AddFilesToHaikuImage
-       system packages contents add-ons mail_daemon inbound_protocols
+       system add-ons mail_daemon inbound_protocols
        : POP3 IMAP ;
 AddFilesToHaikuImage
-       system packages contents add-ons mail_daemon outbound_protocols : SMTP ;
+       system add-ons mail_daemon outbound_protocols : SMTP ;
 AddFilesToHaikuImage
-       system packages contents add-ons mail_daemon inbound_filters
+       system add-ons mail_daemon inbound_filters
        : MatchHeader SpamFilter NewMailNotification ;
 AddFilesToHaikuImage
-       system packages contents add-ons mail_daemon outbound_filters
+       system add-ons mail_daemon outbound_filters
        : Fortune ;
-AddFilesToHaikuImage system packages contents add-ons media
+AddFilesToHaikuImage system add-ons media
        : $(SYSTEM_ADD_ONS_MEDIA) ;
-AddFilesToHaikuImage system packages contents add-ons media plugins
+AddFilesToHaikuImage system add-ons media plugins
        : $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ;
-AddFilesToHaikuImage system packages contents add-ons Tracker
+AddFilesToHaikuImage system add-ons Tracker
        : FileType-F Mark\ as… Mark\ as\ Read-R Open\ Target\ Folder-O
        Open\ Terminal-T ZipOMatic-Z ;
-AddSymlinkToHaikuImage system packages contents add-ons Tracker
-       : /boot/system/packages/contents/preferences/Backgrounds : Background-B 
;
-AddSymlinkToHaikuImage system packages contents add-ons Tracker
-       : /boot/system/packages/contents/apps/TextSearch : TextSearch-G ;
-AddSymlinkToHaikuImage system packages contents add-ons Tracker
-       : /boot/system/packages/contents/apps/DiskUsage : DiskUsage-I ;
-AddFilesToHaikuImage system packages contents add-ons input_server devices
+AddSymlinkToHaikuImage system add-ons Tracker
+       : /boot/system/preferences/Backgrounds : Background-B ;
+AddSymlinkToHaikuImage system add-ons Tracker
+       : /boot/system/apps/TextSearch : TextSearch-G ;
+AddSymlinkToHaikuImage system add-ons Tracker
+       : /boot/system/apps/DiskUsage : DiskUsage-I ;
+AddFilesToHaikuImage system add-ons input_server devices
        : <input>keyboard <input>mouse <input>wacom ;
-AddFilesToHaikuImage system packages contents add-ons input_server filters
+AddFilesToHaikuImage system add-ons input_server filters
        : screen_saver shortcut_catcher ;
-AddFilesToHaikuImage system packages contents add-ons kernel network
+AddFilesToHaikuImage system add-ons kernel network
        : <net>notifications stack ;
-AddFilesToHaikuImage system packages contents add-ons kernel network devices
+AddFilesToHaikuImage system add-ons kernel network devices
        : $(SYSTEM_NETWORK_DEVICES) ;
 AddFilesToHaikuImage
-       system packages contents add-ons kernel network datalink_protocols
+       system add-ons kernel network datalink_protocols
        : $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
-AddFilesToHaikuImage system packages contents add-ons kernel network ppp
+AddFilesToHaikuImage system add-ons kernel network ppp
        : $(SYSTEM_NETWORK_PPP) ;
-AddFilesToHaikuImage system packages contents add-ons kernel network protocols
+AddFilesToHaikuImage system add-ons kernel network protocols
        : $(SYSTEM_NETWORK_PROTOCOLS) ;
-AddFilesToHaikuImage system packages contents add-ons Print
+AddFilesToHaikuImage system add-ons Print
        : $(SYSTEM_ADD_ONS_PRINT) ;
-AddFilesToHaikuImage system packages contents add-ons Print transport
+AddFilesToHaikuImage system add-ons Print transport
        : $(SYSTEM_ADD_ONS_PRINT_TRANSPORT) ;
-AddFilesToHaikuImage system packages contents add-ons Screen\ Savers
+AddFilesToHaikuImage system add-ons Screen\ Savers
        : $(SYSTEM_ADD_ONS_SCREENSAVERS) ;
 
-AddFilesToHaikuImage system packages contents add-ons disk_systems
+AddFilesToHaikuImage system add-ons disk_systems
        : <disk_system>intel <disk_system>bfs ;
 
 # decorators
-AddDirectoryToHaikuImage home config packages contents add-ons decorators ;
-AddFilesToHaikuImage home config packages contents add-ons decorators :
+AddDirectoryToHaikuImage home config add-ons decorators ;
+AddFilesToHaikuImage home config add-ons decorators :
        MacDecorator WinDecorator ClassicBe SATDecorator ;
 
 # create directories that will remain empty
-AddDirectoryToHaikuImage common packages contents bin ;
-AddDirectoryToHaikuImage common packages contents include ;
-AddDirectoryToHaikuImage common packages contents lib ;
+AddDirectoryToHaikuImage common bin ;
+AddDirectoryToHaikuImage common include ;
+AddDirectoryToHaikuImage common lib ;
 AddDirectoryToHaikuImage home Desktop ;
-AddDirectoryToHaikuImage home config packages contents bin ;
-AddDirectoryToHaikuImage home config packages contents lib ;
+AddDirectoryToHaikuImage home config bin ;
+AddDirectoryToHaikuImage home config lib ;
 AddDirectoryToHaikuImage home mail ;
 AddDirectoryToHaikuImage common var empty ;
 AddDirectoryToHaikuImage common var log ;
 AddDirectoryToHaikuImage common cache tmp ;
 
 AddDirectoryToHaikuImage
-       home config packages contents add-ons kernel drivers bin ;
+       home config add-ons kernel drivers bin ;
 AddDirectoryToHaikuImage
-       home config packages contents add-ons kernel drivers dev ;
+       home config add-ons kernel drivers dev ;
 AddDirectoryToHaikuImage
-       home config packages contents add-ons input_server devices ;
+       home config add-ons input_server devices ;
 AddDirectoryToHaikuImage
-       home config packages contents add-ons input_server filters ;
+       home config add-ons input_server filters ;
 AddDirectoryToHaikuImage
-       home config packages contents add-ons input_server methods ;
+       home config add-ons input_server methods ;
 AddDirectoryToHaikuImage
-       home config packages contents add-ons media plugins ;
-AddDirectoryToHaikuImage home config packages contents add-ons Tracker ;
-AddDirectoryToHaikuImage home config packages contents add-ons Print ;
-AddDirectoryToHaikuImage home config packages contents add-ons Screen\ Savers ;
-AddDirectoryToHaikuImage home config packages contents add-ons Translators ;
-AddDirectoryToHaikuImage system packages contents data synth ;
-AddDirectoryToHaikuImage system packages contents add-ons input_server methods 
;
+       home config add-ons media plugins ;
+AddDirectoryToHaikuImage home config add-ons Tracker ;
+AddDirectoryToHaikuImage home config add-ons Print ;
+AddDirectoryToHaikuImage home config add-ons Screen\ Savers ;
+AddDirectoryToHaikuImage home config add-ons Translators ;
+AddDirectoryToHaikuImage system data synth ;
+AddDirectoryToHaikuImage system add-ons input_server methods ;
 
 # optional
 AddFilesToHaikuImage optional system add-ons input_server methods : canna ;
@@ -636,12 +636,12 @@
        : home-config-settings-printers-save-as-pdf.rdef ;
 
 # PDF Writer enconding files
-CopyDirectoryToHaikuImage system packages contents data
+CopyDirectoryToHaikuImage system data
        : [ FDirName $(HAIKU_TOP) src add-ons print drivers pdf encoding ]
        : "PDF Writer" : -x .svn -x Jamfile ;
 
 # Gutenprint data files
-CopyDirectoryToHaikuImage common packages contents data
+CopyDirectoryToHaikuImage common data
        : [ FDirName $(HAIKU_TOP) src libs print libgutenprint src xml ]
        : gutenprint : -x .svn -x *.c -x Makefile.am -x Makefile.in ;
 
@@ -651,17 +651,17 @@
        : dvb : -x .svn -x Jamfile ;
 
 # licenses
-CopyDirectoryToHaikuImage system packages contents data
+CopyDirectoryToHaikuImage system data
        : [ FDirName $(HAIKU_TOP) data system data licenses ]
        : licenses : -x .svn ;
 
 # Copy documentation as per DiskUsage's license requirement.
-CopyDirectoryToHaikuImage system packages contents documentation
+CopyDirectoryToHaikuImage system documentation
        : [ FDirName $(HAIKU_TOP) docs apps diskusage ]
        : diskusage : -x .svn ;
 
 # Copy documentation as per PDFlib Lite's license requirement.
-CopyDirectoryToHaikuImage system packages contents documentation
+CopyDirectoryToHaikuImage system documentation
        : [ FDirName $(HAIKU_TOP) src libs pdflib doc ]
        : pdflib : -x .svn ;
 

Modified: haiku/branches/features/package-management/build/jam/ImageRules
===================================================================
--- haiku/branches/features/package-management/build/jam/ImageRules     
2011-03-04 13:35:25 UTC (rev 40804)
+++ haiku/branches/features/package-management/build/jam/ImageRules     
2011-03-04 13:36:05 UTC (rev 40805)
@@ -196,7 +196,7 @@
                        local signature
                                = [ on $(target) return 
$(HAIKU_CATALOG_SIGNATURE) ] ;
                        AddFilesToHaikuImage
-                               system packages contents data locale catalogs 
$(signature)
+                               system data locale catalogs $(signature)
                                : $(catalogs) ;
                }
        }
@@ -301,11 +301,11 @@
 {
        # AddDriversToContainer <container> : <relative directory> : <targets> ;
        #
-       local directoryTokens = system packages contents add-ons kernel drivers 
dev
+       local directoryTokens = system add-ons kernel drivers dev
                $(relativeDirectoryTokens) ;
 
        AddFilesToContainer $(container)
-               : system packages contents add-ons kernel drivers bin
+               : system add-ons kernel drivers bin
                : $(targets) ;
 
        # If the image shall only be updated, we don't add any symlinks.
@@ -334,7 +334,7 @@
 {
        # AddNewDriversToContainer <container> : <directory> : <targets> ;
        #
-       local directoryTokens = system packages contents add-ons kernel drivers
+       local directoryTokens = system add-ons kernel drivers
                $(relativeDirectoryTokens) ;
 
        AddFilesToContainer $(container) : $(directoryTokens)
@@ -371,7 +371,7 @@
                local linkTarget = [ FDirName /boot $(installDir:G=) $(name) ] ;
 
                AddSymlinkToContainer $(container)
-                       : system packages contents add-ons kernel boot
+                       : system add-ons kernel boot
                        : $(linkTarget) : $(name) ;
        }
 }
@@ -716,7 +716,7 @@
        # AddHeaderDirectoryToHaikuImage <dirTokens> : [ <dirName> ]
        #       : <alwaysUpdate> ;
 
-       CopyDirectoryToHaikuImage system packages contents develop headers
+       CopyDirectoryToHaikuImage system develop headers
                : [ FDirName $(HAIKU_TOP) headers $(dirTokens) ]
                : $(dirName) : -x .svn : $(alwaysUpdate) ;
 }
@@ -729,7 +729,7 @@
        local firmwareArchive = [ FDirName
                $(HAIKU_TOP) data system data firmware $(driver) $(archive) ] ;
 
-       local dirTokens = system packages contents data firmware $(driver) ;
+       local dirTokens = system data firmware $(driver) ;
        if $(extract) = true || $(extract) = 1 {
                ExtractArchiveToHaikuImage $(dirTokens) : $(firmwareArchive) :
                        : $(package) ;
@@ -927,7 +927,7 @@
                Always $(file) ;
                MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
                BuildHaikuImageExpanderRules $(file) ;
-               AddFilesToHaikuImage common packages contents data : $(file) ;
+               AddFilesToHaikuImage common data : $(file) ;
        }
 
        HAIKU_IMAGE_EXPANDER_RULES_ENTRIES on $(file) = $(allEntries) ;
@@ -960,7 +960,7 @@
        Always $(file) ;
        MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
        BuildHaikuImageInstalledPackagesFile $(file) ;
-       AddFilesToHaikuImage common packages contents data optional-packages
+       AddFilesToHaikuImage common data optional-packages
                : $(file) ;
 }
 
@@ -988,7 +988,7 @@
                name = ;
        }
 
-       AddFilesToHaikuImage system packages contents data licenses : $(file)
+       AddFilesToHaikuImage system data licenses : $(file)
                : $(name) ;
 }
 

Modified: haiku/branches/features/package-management/build/jam/NetBootArchive
===================================================================
--- haiku/branches/features/package-management/build/jam/NetBootArchive 
2011-03-04 13:35:25 UTC (rev 40804)
+++ haiku/branches/features/package-management/build/jam/NetBootArchive 
2011-03-04 13:36:05 UTC (rev 40805)
@@ -42,29 +42,29 @@
 
 
 # modules
-AddFilesToNetBootArchive system packages contents add-ons kernel bus_managers
+AddFilesToNetBootArchive system add-ons kernel bus_managers
        : $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
-AddFilesToNetBootArchive system packages contents add-ons kernel busses 
agp_gart
+AddFilesToNetBootArchive system add-ons kernel busses agp_gart
        : $(X86_ONLY)<agp_gart>intel ;
-AddFilesToNetBootArchive system packages contents add-ons kernel busses ide
+AddFilesToNetBootArchive system add-ons kernel busses ide
        : generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 ;
-AddFilesToNetBootArchive system packages contents add-ons kernel busses scsi
+AddFilesToNetBootArchive system add-ons kernel busses scsi
        : ahci ;
-AddFilesToNetBootArchive system packages contents add-ons kernel console
+AddFilesToNetBootArchive system add-ons kernel console
        : vga_text ;
-AddFilesToNetBootArchive system packages contents add-ons kernel file_systems
+AddFilesToNetBootArchive system add-ons kernel file_systems
        : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
-AddFilesToNetBootArchive system packages contents add-ons kernel generic
+AddFilesToNetBootArchive system add-ons kernel generic
        : $(IDE_ONLY)ide_adapter $(ATA_ONLY)ata_adapter locked_pool scsi_periph 
;
 AddFilesToNetBootArchive
-       system packages contents add-ons kernel partitioning_systems
+       system add-ons kernel partitioning_systems
        : intel session ;
 AddFilesToNetBootArchive
-       system packages contents add-ons kernel interrupt_controllers
+       system add-ons kernel interrupt_controllers
        : $(PPC_ONLY)openpic ;
 
 if $(TARGET_ARCH) = x86 {
-       AddFilesToNetBootArchive system packages contents add-ons kernel cpu
+       AddFilesToNetBootArchive system add-ons kernel cpu
                : generic_x86 ;
 }
 
@@ -75,7 +75,7 @@
 AddDriversToNetBootArchive net : $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
 
 # kernel
-AddFilesToNetBootArchive system packages contents
+AddFilesToNetBootArchive system
        : <revisioned>kernel_$(TARGET_ARCH) ;
 
 # scripts and data files
@@ -87,17 +87,17 @@
        : $(driverSettingsFiles) ;
 
 # add-ons
-AddFilesToNetBootArchive system packages contents add-ons kernel network
+AddFilesToNetBootArchive system add-ons kernel network
        : <net>notifications stack ;
-AddFilesToNetBootArchive system packages contents add-ons kernel network 
devices
+AddFilesToNetBootArchive system add-ons kernel network devices
        : $(SYSTEM_NETWORK_DEVICES) ;
 AddFilesToNetBootArchive
-       system packages contents add-ons kernel network datalink_protocols
+       system add-ons kernel network datalink_protocols
        : $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
-AddFilesToNetBootArchive system packages contents add-ons kernel network ppp
+AddFilesToNetBootArchive system add-ons kernel network ppp
        : $(SYSTEM_NETWORK_PPP) ;
 AddFilesToNetBootArchive
-       system packages contents add-ons kernel network protocols
+       system add-ons kernel network protocols
        : $(SYSTEM_NETWORK_PROTOCOLS) ;
 
 # boot module links

Modified: haiku/branches/features/package-management/build/jam/OptionalPackages
===================================================================
--- haiku/branches/features/package-management/build/jam/OptionalPackages       
2011-03-04 13:35:25 UTC (rev 40804)
+++ haiku/branches/features/package-management/build/jam/OptionalPackages       
2011-03-04 13:36:05 UTC (rev 40805)
@@ -209,10 +209,10 @@
 if [ IsOptionalHaikuImagePackageAdded BeBook ] {
        InstallOptionalHaikuImagePackage bebook_20081026.zip
                : $(baseURL)/bebook_20081026.zip
-               : system packages contents documentation
+               : system documentation
        ;
        AddSymlinkToHaikuImage home Desktop
-               : /boot/system/packages/contents/documentation/bebook/index.html
+               : /boot/system/documentation/bebook/index.html
                : BeBook ;
 }
 
@@ -242,12 +242,12 @@
                Echo "No optional package BeOSCompatibility available for gcc4" 
;
        } else {
                Echo "Warning: Adding BeOS compatibility symlinks. This will go 
away. Please fix your apps!" ;
-               AddSymlinkToHaikuImage beos : ../system/packages/contents/apps ;
-               AddSymlinkToHaikuImage beos : ../system/packages/contents/bin ;
+               AddSymlinkToHaikuImage beos : ../system/apps ;
+               AddSymlinkToHaikuImage beos : ../system/bin ;
                AddSymlinkToHaikuImage beos
-                       : ../system/packages/contents/documentation ;
+                       : ../system/documentation ;
                AddSymlinkToHaikuImage beos : ../common/settings/etc ;
-               AddSymlinkToHaikuImage beos : 
../system/packages/contents/preferences ;
+               AddSymlinkToHaikuImage beos : ../system/preferences ;
                AddSymlinkToHaikuImage beos : ../system ;
                AddDirectoryToHaikuImage var ;
                AddSymlinkToHaikuImage var : /boot/common/var/log ;
@@ -270,10 +270,10 @@
                ;
                AddSymlinkToHaikuImage home config be Applications
                        : /boot/apps/BePDF/BePDF ;
-               AddSymlinkToHaikuImage common packages contents data licenses
+               AddSymlinkToHaikuImage common data licenses
                        : "/boot/apps/BePDF/license/locale DevKit/Open Tracker 
License"
                        : "Open Tracker" ;
-               AddSymlinkToHaikuImage common packages contents data licenses
+               AddSymlinkToHaikuImage common data licenses
                        : "/boot/apps/BePDF/license/locale DevKit/LICENSE"
                        : "48HRS Public License" ;
                InstallSourceArchive bepdf-1.1.1b3-2010-05-05.tar.xz
@@ -314,14 +314,14 @@
 if [ IsOptionalHaikuImagePackageAdded Bluetooth ] {
        local bluetoothDrivers = h2generic ;
        AddDriversToHaikuImage bluetooth : $(bluetoothDrivers) ;
-       AddFilesToHaikuImage system packages contents servers : 
bluetooth_server ;
-       AddFilesToHaikuImage system packages contents lib : libbluetooth.so ;
+       AddFilesToHaikuImage system servers : bluetooth_server ;
+       AddFilesToHaikuImage system lib : libbluetooth.so ;
        AddFilesToHaikuImage
-               system packages contents add-ons kernel network protocols : 
l2cap ;
-       AddFilesToHaikuImage system packages contents add-ons kernel bluetooth
+               system add-ons kernel network protocols : l2cap ;
+       AddFilesToHaikuImage system add-ons kernel bluetooth
                : btCoreData hci ;
-       AddFilesToHaikuImage system packages contents preferences : Bluetooth ;
-       AddFilesToHaikuImage system packages contents bin
+       AddFilesToHaikuImage system preferences : Bluetooth ;
+       AddFilesToHaikuImage system bin
                : bt_dev_info bt_discovery ;
        AddSymlinkToHaikuImage home config be Preferences
                : /boot/system/preferences/Bluetooth ;
@@ -329,8 +329,8 @@
                && $(HAIKU_GCC_VERSION[1]) in 2 4 {
                local arch = $(TARGET_ARCH) ;
                local abi = gcc$(HAIKU_GCC_VERSION[1]) ;
-               AddSymlinkToHaikuImage system packages contents develop lib
-                       : /system/packages/contents/lib libbluetooth.so ;
+               AddSymlinkToHaikuImage system develop lib
+                       : /system/lib libbluetooth.so ;
        }
 }
 
@@ -557,7 +557,7 @@
 
                # TODO: remove this when we have a mechanism to switch gcc via 
PATH
                AddSymlinkToHaikuImage common settings develop tools
-                       : 
/boot/common/packages/contents/develop/tools/gcc-2.95.3-110225
+                       : /boot/common/develop/tools/gcc-2.95.3-110225
                        : current ;
        }
 
@@ -620,8 +620,8 @@
                InstallOptionalHaikuImagePackage
                        jamvm-1.5.4-x86-gcc4-2011-02-13.zip
                        : $(baseURL)/jamvm-1.5.4-x86-gcc4-2011-02-13.zip ;
-               AddSymlinkToHaikuImage common packages contents bin
-                       : /boot/common/packages/contents/bin/jamvm : java ;
+               AddSymlinkToHaikuImage common bin
+                       : /boot/common/bin/jamvm : java ;
                InstallOptionalHaikuImagePackage
                        ecj-3.6.2-haiku-2011-02-26.zip
                        : $(baseURL)/ecj-3.6.2-haiku-2011-02-26.zip ;
@@ -639,7 +639,7 @@
        }
 
        local arch = $(TARGET_ARCH) ;
-       local developDirTokens = system packages contents develop ;
+       local developDirTokens = system develop ;
 
        # glue code
        AddFilesToHaikuImage $(developDirTokens) lib :
@@ -655,18 +655,18 @@
 
        # additional libraries
        local developmentLibs = <revisioned>libroot_debug.so ;
-       AddFilesToHaikuImage system packages contents lib : $(developmentLibs) ;
+       AddFilesToHaikuImage system lib : $(developmentLibs) ;
 
        # library symlinks
        local lib ;
        for lib in $(SYSTEM_LIBS) $(SYSTEM_LIBS_LIBGL_ALIASES) 
$(developmentLibs) {
                AddSymlinkToHaikuImage $(developDirTokens) lib
-                       : /system/packages/contents/lib $(lib:BS) ;
+                       : /system/lib $(lib:BS) ;
                local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) 
] ;
                if $(abiVersion) {
                        local abiVersionedLib = $(lib:BS).$(abiVersion) ;
                        AddSymlinkToHaikuImage $(developDirTokens) lib
-                               : /system/packages/contents/lib 
$(abiVersionedLib) ;
+                               : /system/lib $(abiVersionedLib) ;
                }
        }
 
@@ -682,7 +682,7 @@
        # scripts: cc and c++ wrapper, freetype-config, setgcc
        local scripts = cc c++ freetype-config setgcc ;
        SEARCH on $(scripts) = [ FDirName $(HAIKU_TOP) data bin ] ;
-       AddFilesToHaikuImage system packages contents bin : $(scripts) ;
+       AddFilesToHaikuImage system bin : $(scripts) ;
 
        # skeleton makefile and makefile-engine
        local makefileEngineFiles =
@@ -691,7 +691,7 @@
        ;
        SEARCH on $(makefileEngineFiles)
                = [ FDirName $(HAIKU_TOP) data develop ] ;
-       AddFilesToHaikuImage common packages contents develop etc
+       AddFilesToHaikuImage common develop etc
                : $(makefileEngineFiles) ;
 
        # headers
@@ -871,12 +871,12 @@
                        # unzip gcc2
                        InstallOptionalHaikuImagePackage 
$(HAIKU_ICU_GCC_2_PACKAGE)
                                : $(baseURL)/$(HAIKU_ICU_GCC_2_PACKAGE)
-                               : system packages contents lib ;
+                               : system lib ;
                } else {
                        # unzip gcc4
                        InstallOptionalHaikuImagePackage 
$(HAIKU_ICU_GCC_4_PACKAGE)
                                : $(baseURL)/$(HAIKU_ICU_GCC_4_PACKAGE)
-                               : system packages contents lib ;
+                               : system lib ;
                }
        }
 }
@@ -894,7 +894,7 @@
                abiVersionedLib = $(abiVersionedLib:G=) ;
                local lib = $(abiVersionedLib:B) ;
                AddSymlinkToHaikuImage develop abi $(arch) $(abi) lib
-                       : /system/packages/contents/lib $(abiVersionedLib) ;
+                       : /system/lib $(abiVersionedLib) ;
                AddSymlinkToHaikuImage develop abi $(arch) $(abi) lib
                        : $(abiVersionedLib) : $(lib) ;
        }
@@ -912,7 +912,7 @@
                        :
                ;
                AddSymlinkToHaikuImage home config be Desktop\ applets
-                       : /boot/common/packages/contents/bin/KeymapSwitcher ;
+                       : /boot/common/bin/KeymapSwitcher ;
        } else {
                InstallOptionalHaikuImagePackage
                        KeymapSwitcher-1.2.6-x86-gcc2-2011-03-01.zip
@@ -920,7 +920,7 @@
                        :
                ;
                AddSymlinkToHaikuImage home config be Desktop\ applets
-                       : /boot/common/packages/contents/bin/KeymapSwitcher ;
+                       : /boot/common/bin/KeymapSwitcher ;
        }
 }
 
@@ -1161,17 +1161,17 @@
 # NetFS network file system
 if [ IsOptionalHaikuImagePackageAdded NetFS ] {
        # userlandfs module
-       AddFilesToHaikuImage home config packages contents add-ons userlandfs
+       AddFilesToHaikuImage home config add-ons userlandfs
                : netfs ;
 
        # servers
-       AddFilesToHaikuImage system packages contents servers : netfs_server ;
-       AddFilesToHaikuImage system packages contents servers
+       AddFilesToHaikuImage system servers : netfs_server ;
+       AddFilesToHaikuImage system servers
                : authentication_server ;
 
        # tools
-       AddFilesToHaikuImage system packages contents bin : netfs_config ;
-       AddFilesToHaikuImage system packages contents bin : netfs_server_prefs ;
+       AddFilesToHaikuImage system bin : netfs_config ;
+       AddFilesToHaikuImage system bin : netfs_server_prefs ;
 
        #example settings for netfs_server
        local netfsServerSettingsFiles = <driver-settings>netfs-server ;
@@ -1327,7 +1327,7 @@
 
                AddSymlinkToHaikuImage home config be Applications
                        : /boot/apps/Paladin/Paladin ;
-               AddSymlinkToHaikuImage common packages contents bin
+               AddSymlinkToHaikuImage common bin
                        : /boot/apps/Paladin/Paladin ;
        }
 }
@@ -1370,7 +1370,7 @@
 
                AddSymlinkToHaikuImage home config be Applications
                        : /boot/apps/Pe/Pe ;
-               AddSymlinkToHaikuImage common packages contents bin
+               AddSymlinkToHaikuImage common bin
                        : /boot/apps/Pe/lpe ;
        }
 }
@@ -1588,11 +1588,11 @@
        local abi = gcc$(HAIKU_GCC_VERSION[1]) ;
 
        # kernel module
-       AddFilesToHaikuImage system packages contents add-ons kernel 
file_systems
+       AddFilesToHaikuImage system add-ons kernel file_systems
                : userlandfs ;
 
        # server
-       AddFilesToHaikuImage system packages contents servers : 
userlandfs_server ;
+       AddFilesToHaikuImage system servers : userlandfs_server ;
 
        # libs
        local userlandfsLibs =
@@ -1600,7 +1600,7 @@
                libuserlandfs_haiku_kernel.so
                libuserlandfs_fuse.so
        ;
-       AddFilesToHaikuImage system packages contents lib : $(userlandfsLibs) ;
+       AddFilesToHaikuImage system lib : $(userlandfsLibs) ;
 
        # development goodies
        if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] {
@@ -1613,7 +1613,7 @@

[... truncated: 920 lines follow ...]

Other related posts:

  • » [haiku-commits] r40805 - in haiku/branches/features/package-management: build/jam build/scripts data/system/boot headers/os/storage src/add-ons/input_server/filters/shortcut_catcher ... - zooey