Hello community,
here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Tue Sep 20 12:58:48 CEST 2011.
--------
--- mkinitrd/mkinitrd.changes 2011-08-30 14:14:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2011-09-20
10:43:42.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Sep 20 08:41:54 UTC 2011 - mma...@suse.cz
+
+- purge-kernels: Also handle kernel-source packages (bnc#718753).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkinitrd.spec ++++++
--- /var/tmp/diff_new_pack.TA97IP/_old 2011-09-20 12:58:43.000000000 +0200
+++ /var/tmp/diff_new_pack.TA97IP/_new 2011-09-20 12:58:43.000000000 +0200
@@ -31,7 +31,7 @@
%endif
AutoReqProv: on
Version: 2.7.0
-Release: 29
+Release: 3
Conflicts: udev < 118
Requires: dhcpcd
PreReq: %fillup_prereq
++++++ mkinitrd.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-08-30 14:12:52.000000000 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-09-20 10:42:20.000000000 +0200
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Tue Sep 20 08:41:54 UTC 2011 - mma...@suse.cz
+
+- purge-kernels: Also handle kernel-source packages (bnc#718753).
+
+-------------------------------------------------------------------
Tue Aug 30 12:12:03 UTC 2011 - co...@suse.de
- Fix mkinitrd -d <rootdev> (bnc#714650).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.0/sbin/purge-kernels
new/mkinitrd-2.7.0/sbin/purge-kernels
--- old/mkinitrd-2.7.0/sbin/purge-kernels 2011-08-30 14:12:52.000000000
+0200
+++ new/mkinitrd-2.7.0/sbin/purge-kernels 2011-09-20 10:42:20.000000000
+0200
@@ -71,11 +71,13 @@
($flavor = $name) =~ s/.*-kmp-//;
$table = \%kmps;
}
- $flavor =~ s/-.*//; # XXX: No dashes in flavor names
- if ($flavor eq "devel") {
- # kernel-devel is a subpackage of kernel-source
- $flavor = "source";
+ # Put all subpackages into the same group, except for
+ # kernel-source-{vanilla,rt}, which are packages on their own
+ if ($flavor !~ /^source/) {
+ $flavor =~ s/-.*//; # XXX: No dashes in flavor names
}
+ # kernel-devel is a subpackage of kernel-source
+ $flavor =~ s/^devel/source/;
$table->{"$arch/$flavor"} ||= {};
$table->{"$arch/$flavor"}{$vr} ||= [];
push(@{$table->{"$arch/$flavor"}{$vr}}, "$name-$vr.$arch");
@@ -130,23 +132,21 @@
sub list_old_packages {
my ($flavor) = @_;
- # ignore kernel-source for now
- return if $flavor =~ /\/source$/;
-
+ my $is_source = $flavor =~ /\/source/;
my $kernels = $kernels{$flavor};
my @versions = sort_versions(keys(%$kernels));
my %idx = (
oldest => 0,
latest => scalar(@versions) - 1,
);
- if ($want_running && $running_flavor eq $flavor) {
+ if ($want_running && ($running_flavor eq $flavor || $is_source)) {
for (my $i = scalar(@versions) - 1; $i >= 0; $i--) {
if (version_match($running_version, $versions[$i])) {
$idx{running} = $i;
last;
}
}
- if (!exists($idx{running})) {
+ if (!exists($idx{running}) && !$is_source) {
print STDERR "$0: Running kernel
$running_version-$running_flavor not installed.\n";
print "NOT removing any packages for flavor $flavor.\n";
return;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
