From: Jan Stancek <jstancek@xxxxxxxxxx>
redhat: fix def_variants.yaml check
Both .rhel and .fedora versions may not be present, as it depends
on INCLUDE_RHEL_FILES/INCLUDE_FEDORA_FILES variables. So only
check configs we find after copy.
Fixes: 6488ae05fa0e ("redhat: sanity check yaml files")
Signed-off-by: Jan Stancek <jstancek@xxxxxxxxxx>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -719,8 +719,7 @@ sources-rh: $(TARBALL) $(KABI_TARBALL) $(KABIDW_TARBALL) generate-testpatch-tmp
@find $(SOURCES)/ -name "*.yaml" -o -name "*.yaml.fedora" -o -name "*.yaml.rhel" | \
xargs -i{} $(REDHAT)/scripts/yamlsanity.py {}
@echo Sanity checking filtermods configs
- @$(REDHAT)/scripts/filtermods.py -q sort -c $(SOURCES)/def_variants.yaml.fedora -d /dev/null
- @$(REDHAT)/scripts/filtermods.py -q sort -c $(SOURCES)/def_variants.yaml.rhel -d /dev/null
+ @ls -1 -B $(SOURCES)/def_variants.yaml.* | xargs -i{} sh -c "$(REDHAT)/scripts/filtermods.py -q sort -c {} -d /dev/null"
dist-sources: dist-kabi dist-kabi-dup sources-rh
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3059
--
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
