Skip to content

Commit

Permalink
codestreams: Make set_archs to choose the correct archs per codestream
Browse files Browse the repository at this point in the history
Signed-off-by: Marcos Paulo de Souza <[email protected]>
  • Loading branch information
marcosps committed Jan 17, 2025
1 parent 26b1d21 commit 7cb4518
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
12 changes: 10 additions & 2 deletions klpbuild/codestream.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,18 @@ def get_repo(self):

return f"{repo}_Products_SLERT_Update"

def set_archs(self):
# RT is supported only on x86_64 at the moment
if self.rt:
self.archs = ["x86_64"]

def set_archs(self, archs):
self.archs = archs
# MICRO 6.0 doest support ppc64le
elif "6.0" in self.name():
self.archs = ["x86_64", "s390x"]

# We support all architecture for all other codestreams
else:
self.archs = ["x86_64", "s390x", "ppc64le"]

def set_files(self, files):
self.files = files
Expand Down
8 changes: 1 addition & 7 deletions klpbuild/ksrc.py
Original file line number Diff line number Diff line change
Expand Up @@ -484,13 +484,7 @@ def scan(self, cve, conf, no_check):
unaffected_cs.append(cs)
continue

# Set supported archs for the codestream
# RT is supported only on x86_64 at the moment
archs = ["x86_64"]
if not cs.rt:
archs.extend(["ppc64le", "s390x"])

cs.set_archs(archs)
cs.set_archs()

if conf and not cs.get_boot_file("config").exists():
data_missing.append(cs)
Expand Down

0 comments on commit 7cb4518

Please sign in to comment.