Merge pull request #3391 from SUSE/revert_fips_pattern

dirkmueller · web-flow · commit dbe614531c6b · 2026-01-29T16:59:22.000+01:00
Revert the recent addition of patterns-base-fips temporarily
diff --git a/src/bci_build/package/basecontainers.py b/src/bci_build/package/basecontainers.py
@@ -34,7 +34,6 @@ def _get_micro_package_list(os_version: OsVersion) -> list[Package]:
             # ca-certificates-mozilla-prebuilt requires /bin/cp, which is otherwise not resolved…
             "coreutils",
         )
-        + (("patterns-base-fips",) if os_version.is_sle15 else ())
         + os_version.eula_package_names
         + os_version.release_package_names
     ]
@@ -334,10 +333,7 @@ def _get_fips_base_kwargs(os_version: OsVersion) -> dict:
 def _get_minimal_kwargs(os_version: OsVersion):
     package_list = [
         Package(name, pkg_type=PackageType.DELETE)
-        for name in sorted(
-            ["grep", "diffutils", "info", "fillup", "libzio1"]
-            + (["patterns-base-fips"] if os_version.is_sle15 else [])
-        )
+        for name in sorted(["grep", "diffutils", "info", "fillup", "libzio1"])
     ]
     # the last user of libpcre1 on SP6 is grep which we deinstall above
     if os_version in (OsVersion.SP6,):

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ def _get_micro_package_list(os_version: OsVersion) -> list[Package]:`
`34`	`34`	`# ca-certificates-mozilla-prebuilt requires /bin/cp, which is otherwise not resolved…`
`35`	`35`	`"coreutils",`
`36`	`36`	`)`
`37`		`- + (("patterns-base-fips",) if os_version.is_sle15 else ())`
`38`	`37`	`+ os_version.eula_package_names`
`39`	`38`	`+ os_version.release_package_names`
`40`	`39`	`]`
`@@ -334,10 +333,7 @@ def _get_fips_base_kwargs(os_version: OsVersion) -> dict:`
`334`	`333`	`def _get_minimal_kwargs(os_version: OsVersion):`
`335`	`334`	`package_list = [`
`336`	`335`	`Package(name, pkg_type=PackageType.DELETE)`
`337`		`- for name in sorted(`
`338`		`- ["grep", "diffutils", "info", "fillup", "libzio1"]`
`339`		`- + (["patterns-base-fips"] if os_version.is_sle15 else [])`
`340`		`- )`
	`336`	`+ for name in sorted(["grep", "diffutils", "info", "fillup", "libzio1"])`
`341`	`337`	`]`
`342`	`338`	`# the last user of libpcre1 on SP6 is grep which we deinstall above`
`343`	`339`	`if os_version in (OsVersion.SP6,):`