PR#876: ELN: Import missing shared/general and shared/createiso. Move Fedora specific configuration to fedora/override.conf. - pungi-fedora

Jan Kaluza • 3 years ago

d3985bf

eln.conf

file modified

		`@@ -8,12 +8,14 @@`
		`# For any change which should happen only for Fedora ELN, edit the`
		`# "fedora/override.conf" configuration file.`

		`+ from shared/general import *`
		`from shared/multilib import *`
		`from shared/additional_and_filter_packages import *`
		`from shared/runroot import *`
		`from shared/pkgset import *`
		`from shared/gather import *`
		`from shared/createrepo import *`
		`+ from shared/createiso import *`
		`from shared/buildinstall import *`
		`from shared/lookaside import *`
		`from fedora/variables import *`

fedora/override.conf

file modified

+16

		`@@ -80,4 +80,20 @@`
		`("CRB", "AppStream"),`
		`]`

		`+`
		`+ # TODO: There is no "fus" in Fedora. For now use "deps".`
		`+ gather_method = {`
		`+ # Anything that is not AppStream or CRB should use the old depsolver`
		`+ "^(?!(AppStream\|CRB)).*$": {`
		`+ "comps": "deps",`
		`+ },`
		`+ # TODO: There is no "fus" in Fedora. For now use "deps".`
		`+ "^(AppStream\|CRB)$": {`
		`+ "comps": "deps",`
		`+ },`
		`+ }`
		`+`
		`+ # No product_id for Fedora.`
		`+ product_id_allow_missing = False`
		`+`
		`variants_file = "variants.xml"`

file modified

-2

		`@@ -1,5 +1,3 @@`
		`- filter_system_release_packages = False`
		`-`
		`filter_packages = [`
		`("^.*$", {`
		`"*": [`

shared/gather.conf

file modified

+1 -4

		`@@ -6,10 +6,7 @@`
		`"^(?!(AppStream\|CRB)).*$": {`
		`"comps": "deps",`
		`},`
		`- # TODO: There is no "fus" in Fedora. For now use "deps".`
		`- "^(AppStream\|CRB)$": {`
		`- "comps": "deps",`
		`- },`
		`+ "^(AppStream\|CRB)$": "hybrid",`
		`}`

		`hashed_directories = False`