Record the installed optional packages to common/data/InstalledPackages.

This will be utilized by installoptionalpackage, to determine which packages
are already installed in the system and thus should not prevent the
installation of other packages.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37239 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia 2010-06-23 21:27:45 +00:00
parent 052ef89f0f
commit 4676058003
2 changed files with 20 additions and 0 deletions

View File

@ -317,6 +317,10 @@ AddFilesToHaikuImage system bin : installoptionalpackage ;
SEARCH on install-wifi-firmwares.sh = [ FDirName $(HAIKU_TOP) data bin ] ;
AddFilesToHaikuImage system bin : install-wifi-firmwares.sh ;
# Record the installed optional packages. To be used by installoptionalpackage.
AddDirectoryToHaikuImage common data optional-packages ;
AddInstalledPackagesFileToHaikuImage ;
AddSymlinkToHaikuImage system bin : bash : sh ;
AddSymlinkToHaikuImage system bin : trash : untrash ;

View File

@ -926,6 +926,22 @@ rule AddExpanderRuleToHaikuImage mimetype : extension : list : extract
: $(entry) ;
}
rule AddInstalledPackagesFileToHaikuImage
{
#AddInstalledPackagesFileToHaikuImage
local file = <haiku-image>InstalledPackages ;
Always $(file) ;
MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
BuildHaikuImageInstalledPackagesFile $(file) ;
AddFilesToHaikuImage common data : $(file) ;
}
actions BuildHaikuImageInstalledPackagesFile
{
echo -e "$(HAIKU_ADDED_OPTIONAL_PACKAGES)" | tr '\ ' '\n' > $(1)
}
rule AddOptionalPackageDescriptionToHaikuImage file : searchPath
{
if $(searchPath) {