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

Break translators out of haiku.hpkg into a separate haiku_datatranslators.hpkg.

Browse Source 
Translators and media-plugins are the main source of dependencies in haiku.hpkg,
and thus the main source of packages being pulled into chroots, especially
HaikuPorter chroots. (FFmpeg pulls in a rather large array of sub-
dependencies, itself.) So, here we break all the translators into their
own sub-package.

For now, haiku.hpkg is declared to depend on haiku_datatranslators,
so that users will not suddenly update and have no translators.
In the future, this will be dropped.

Note that this is only done for the primary arch at present.
Secondary architecture translators remain in the main secondary package
for now.

Change-Id: Id0b352f34f7110b79ec7787792bf3ae0edab4054
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4477
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Augustin Cavalier
2021-09-30 16:38:36 +00:00
committed by waddlesplash
parent 7b1db53111
commit 63b76faeea
9 changed files with 79 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuPackages
+1
View File
@@ -2,6 +2,7 @@
# subdirectory.
local packages = [ FFilterByBuildFeatures
HaikuDevel
HaikuDataTranslators
HaikuExtras
HaikuLoader
HaikuSource
build/jam/PackageRules
+1
View File
@@ -99,6 +99,7 @@ rule PreprocessPackageOrRepositoryInfo target : source : architecture
# placeholder substitutions have been performed.
local defines = HAIKU_PACKAGING_ARCH=$(architecture)
HAIKU_PACKAGING_ARCH_$(architecture)
HAIKU_$(HAIKU_BUILD_TYPE:U)_BUILD ;
local sedReplacements = %HAIKU_PACKAGING_ARCH%,$(architecture) ;
if $(secondaryArchitecture) {
build/jam/images/HaikuImage
+1
View File
@@ -17,6 +17,7 @@ include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuPackages ] ;
AddPackageFilesToHaikuImage system packages :
haiku_loader.hpkg
haiku.hpkg
haiku_datatranslators.hpkg
haiku_$(TARGET_PACKAGING_ARCHS[2-]).hpkg
:
nameFromMetaInfo
build/jam/packages/Haiku
-2
View File
@@ -214,7 +214,6 @@ AddBootModuleSymlinksToPackage
# add-ons
AddFilesToPackage add-ons accelerants : $(SYSTEM_ADD_ONS_ACCELERANTS) ;
AddFilesToPackage add-ons Translators : $(SYSTEM_ADD_ONS_TRANSLATORS) ;
AddFilesToPackage add-ons locale catalogs : $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
AddFilesToPackage add-ons mail_daemon inbound_protocols : POP3
@@ -225,7 +224,6 @@ AddFilesToPackage add-ons mail_daemon inbound_filters
AddFilesToPackage add-ons mail_daemon outbound_filters : Fortune ;
AddFilesToPackage add-ons media : $(SYSTEM_ADD_ONS_MEDIA) ;
AddFilesToPackage add-ons media plugins : $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ;
AddFilesToPackage add-ons Network\ Settings
: IPv4Interface IPv6Interface DNSClientService Hostname FTPService SSHService
build/jam/packages/HaikuDataTranslators
+9
View File
@@ -0,0 +1,9 @@
local architecture = $(HAIKU_PACKAGING_ARCHS[1]) ;
local dataTranslatorsPackage = haiku_datatranslators.hpkg ;
HaikuPackage $(dataTranslatorsPackage) ;
AddFilesToPackage add-ons Translators : $(SYSTEM_ADD_ONS_TRANSLATORS) ;
AddFilesToPackage add-ons media plugins : $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ;
BuildHaikuPackage $(dataTranslatorsPackage) : haiku_datatranslators ;
build/jam/repositories/Haiku
+1
View File
@@ -10,6 +10,7 @@ SEARCH on $(repoInfo) = $(HAIKU_TOP)/src/data/repository_infos ;
local secondaryArchs = $(TARGET_PACKAGING_ARCHS[2-]) ;
local packages = [ FFilterByBuildFeatures
haiku
haiku_datatranslators
haiku_devel
haiku_loader