linter: Don't try to lint firmware files

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/libpakfire/file.c b/src/libpakfire/file.c
index b26242ae9bf010546ff9475ec336b9c1e176a784..9f590f76aa9945509d6e1bc64ed7612f137b6f38 100644 (file)
--- a/src/libpakfire/file.c
+++ b/src/libpakfire/file.c
@@ -1407,9 +1407,6 @@ static const struct pattern {
        { "**.la", PAKFIRE_FILE_LIBTOOL_ARCHIVE },
        { "**.pm", PAKFIRE_FILE_PERL },
        { "**.pc", PAKFIRE_FILE_PKGCONFIG },
-       { "/usr/lib/firmware/**", PAKFIRE_FILE_FIRMWARE },
-       { "/usr/lib/grub/**", PAKFIRE_FILE_FIRMWARE },
-       { "/usr/lib/valgrind/*", PAKFIRE_FILE_FIRMWARE },
        { "/usr/lib*/ld-*.so*", PAKFIRE_FILE_RUNTIME_LINKER },
        { NULL },
 };
@@ -2718,10 +2715,6 @@ int pakfire_file_check(struct pakfire_file* file, int* issues) {
                if (r)
                        return r;
 
-               // Do not perform the following checks on firmware
-               if (pakfire_file_matches_class(file, PAKFIRE_FILE_FIRMWARE))
-                       goto DONE;
-
                // Run these checks only for ELF files
                if (pakfire_file_matches_class(file, PAKFIRE_FILE_ELF)) {
                        switch (pakfire_file_get_elf_type(file)) {

diff --git a/src/libpakfire/include/pakfire/file.h b/src/libpakfire/include/pakfire/file.h
index d60b8f2592c2329c56cb5073d9c930dca4493eb3..66f15c9208e841783ae1efdf91cea8967ac68eb1 100644 (file)
--- a/src/libpakfire/include/pakfire/file.h
+++ b/src/libpakfire/include/pakfire/file.h
@@ -128,7 +128,6 @@ enum pakfire_file_classes {
        PAKFIRE_FILE_PERL            = (1 << 10),
        PAKFIRE_FILE_STATIC_LIBRARY  = (1 << 11),
        PAKFIRE_FILE_LIBTOOL_ARCHIVE = (1 << 12),
-       PAKFIRE_FILE_FIRMWARE        = (1 << 13),
        PAKFIRE_FILE_RUNTIME_LINKER  = (1 << 14),
 };
 

diff --git a/src/libpakfire/linter-file.c b/src/libpakfire/linter-file.c
index cbd908153af299e1046cea7a2cc3b363d6640676..5b4fe29bd5cdae15180b18ceb119671051b993d0 100644 (file)
--- a/src/libpakfire/linter-file.c
+++ b/src/libpakfire/linter-file.c
@@ -367,6 +367,18 @@ static int pakfire_linter_file_check_ssp(struct pakfire_linter_file* lfile) {
 int pakfire_linter_file_lint(struct pakfire_linter_file* lfile) {
        int r = 0;
 
+       // Skip firmware files
+       if (pakfire_file_matches(lfile->file, "/usr/lib/firmware/**"))
+               return 0;
+
+       // Skip GRUB files
+       else if (pakfire_file_matches(lfile->file, "/usr/lib/grub/**"))
+               return 0;
+
+       // Skip valgrind files
+       else if (pakfire_file_matches(lfile->file, "/usr/lib/valgrind/*"))
+               return 0;
+
        // ELF Checks
        if (pakfire_linter_file_is_elf(lfile)) {
                // Check PIE