From 83b9750b4a32a3dcb2050f0b35991cd40c1d6412 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 9 Jun 2012 09:08:05 +0200 Subject: [PATCH] base-files: improved vkpurge to detect obsoletes kernel-snapshot pkgs. --- srcpkgs/base-files/files/vkpurge | 11 +++++------ srcpkgs/base-files/template | 6 +++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/srcpkgs/base-files/files/vkpurge b/srcpkgs/base-files/files/vkpurge index 351e73c53d7..3887fde8009 100644 --- a/srcpkgs/base-files/files/vkpurge +++ b/srcpkgs/base-files/files/vkpurge @@ -23,15 +23,14 @@ _EOF list_kernels() { - local k kpkg installed kver kvertmp skip _f + local k kpkg installed kver skip _f - for k in /boot/initramfs-*.img; do + for k in /lib/modules/*; do _f=$(basename $k) - kver=$(xbps-uhelper getpkgversion ${_f}) - kvertmp=$(xbps-uhelper getpkgversion ${_f}|sed -e 's|-rc|rc|') + kver=$(echo ${_f}|sed -e 's|-rc|rc|') for kpkg in kernel kernel-snapshot; do installed=$(xbps-uhelper -r / version $kpkg) - if [ "$installed" = "${kvertmp%.img}" ]; then + if [ "$installed" = "${kver}" ]; then skip=1 break fi @@ -40,7 +39,7 @@ list_kernels() unset skip continue fi - echo "${kver%.img}" + echo "${kver}" done } diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template index ca4326b0b52..7e9356edd04 100644 --- a/srcpkgs/base-files/template +++ b/srcpkgs/base-files/template @@ -1,10 +1,10 @@ # Template file for 'base-files' pkgname=base-files -version=0.64 +version=0.65 +revision=1 noarch=yes bootstrap=yes fulldepends="base-directories xbps-triggers" -revision=1 short_desc="Void GNU/Linux base system files" maintainer="Juan RP " homepage="http://code.google.com/p/xbps" @@ -43,7 +43,7 @@ do_install() { usb-load-ehci-first.conf vinstall ${FILESDIR}/blacklist.conf 644 etc/modprobe.d - # Install comman licenses, from Debian. + # Install common licenses, from Debian. vmkdir usr/share/licenses install -m644 ${FILESDIR}/licenses/* ${DESTDIR}/usr/share/licenses