Attachment 8652 Details for Bug 12361 – skip kernel-firmware-nonfree too when considering real kernels

[patch] skip kernel-firmware-nonfree too when considering real kernels

0001-skip-kernel-firmware-nonfree-too.patch (text/plain), 1.02 KB, created by Thierry Vignaud on 2016-11-12 09:01:28 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2016-11-12 09:01:28 CET

Size: 1.02 KB

patch

obsolete

>From 68826e572b15ef73197f30648a9d5162bc646c1d 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] skip kernel-firmware-nonfree too
>
>...when considering real kernels
>
>Thus preventing kernel-firmware-nonfree being falsely detected as an orphan.
>
>(due to it not being skipped when creating the list of kernels)
>---
> urpm/orphans.pm | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>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.10.2
>

From 68826e572b15ef73197f30648a9d5162bc646c1d 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] skip kernel-firmware-nonfree too

...when considering real kernels

Thus preventing kernel-firmware-nonfree being falsely detected as an orphan.

(due to it not being skipped when creating the list of kernels)
---
 urpm/orphans.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.10.2

Actions: View | Diff

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