Attachment 8649 Details for Bug 12361 – do not consider firmware-nonfree when looking for regular kernels

do not consider firmware-nonfree when looking for regular kernels

0001-Prevent-kernel-firmware-nonfree-being-falsely-detect.patch (text/plain), 897 bytes, created by Martin Whitaker on 2016-11-11 22:28:57 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2016-11-11 22:28:57 CET

Size: 897 bytes

patch

obsolete

From 383bfee99bd6c63b4e0d4ddad69b6faf34729199 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Fri, 11 Nov 2016 21:15:11 +0000
Subject: [PATCH] Prevent kernel-firmware-nonfree being falsely detected as an
 orphan.

(due to it not being skipped when creating the list of kernels)

diff --git a/urpm/orphans.pm b/urpm/orphans.pm
index 8ed2d3e..6d42741 100644
--- a/urpm/orphans.pm
+++ b/urpm/orphans.pm
@@ -454,7 +454,7 @@ sub _kernel_callback {
     }
 
     # only consider real kernels (and not kernel-doc and the like):
-    return if $shortname =~ /-(?:source|doc|headers|firmware(?:|-extra))$/;
+    return if $shortname =~ /-(?:source|doc|headers|firmware(?:|-extra|-nonfree))$/;
 
     # ignore requested kernels (aka that are not in /var/lib/rpm/installed-through-deps.list)
     return if !$unreq_list->{$shortname} && $shortname !~ /latest/;
-- 
2.7.4

Actions: View

Attachments on bug 12361: 8649 | 8650 | 8651 | 8652