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:
@@ -317,6 +317,10 @@ AddFilesToHaikuImage system bin : installoptionalpackage ;
|
|||||||
SEARCH on install-wifi-firmwares.sh = [ FDirName $(HAIKU_TOP) data bin ] ;
|
SEARCH on install-wifi-firmwares.sh = [ FDirName $(HAIKU_TOP) data bin ] ;
|
||||||
AddFilesToHaikuImage system bin : install-wifi-firmwares.sh ;
|
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 : bash : sh ;
|
||||||
AddSymlinkToHaikuImage system bin : trash : untrash ;
|
AddSymlinkToHaikuImage system bin : trash : untrash ;
|
||||||
|
|
||||||
|
|||||||
@@ -926,6 +926,22 @@ rule AddExpanderRuleToHaikuImage mimetype : extension : list : extract
|
|||||||
: $(entry) ;
|
: $(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
|
rule AddOptionalPackageDescriptionToHaikuImage file : searchPath
|
||||||
{
|
{
|
||||||
if $(searchPath) {
|
if $(searchPath) {
|
||||||
|
|||||||
Reference in New Issue
Block a user