From 2c849e37d356b5a91584c2a5250e6d031d008b77 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Tue, 25 Jan 2011 10:53:23 -0500 Subject: [PATCH] Revert "previous commit requires lots of changes in other modules so introduce a quick hack for now" This reverts commit cd07242d54498d34d6747e6d0bfd8031f41f282f. --- kvariant.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kvariant.sh b/kvariant.sh index adb8087..2613fa9 100755 --- a/kvariant.sh +++ b/kvariant.sh @@ -49,6 +49,9 @@ set -e variant=$1; shift [[ -z "$@" ]] && usage kernelrpm_url=$1; shift +if [[ -n "$@" ]] ; then + extrarpm_url=$1; shift +fi [[ -n "$@" ]] && usage basedir=$(cd -P $(dirname $0); pwd) @@ -73,8 +76,7 @@ kernelrpm=$variant_path/$(basename $kernelrpm_url) getrpm $kernelrpm_url $kernelrpm checkrpm $kernelrpm -if echo ${kernelrpm} | grep -q kernel-2.6.32 ; then - extrarpm_url=`echo $kernelrpm_url | sed -e "s:kernel-2.6.32:kernel-firmware-2.6.32:g"` +if [ -n "$extrarpm_url" ] ; then extrarpm=$variant_path/$(basename $extrarpm_url) getrpm $extrarpm_url $extrarpm checkrpm $extrarpm -- 2.43.0