git://git.onelab.eu
/
bootcd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6931f06
)
Revert "previous commit requires lots of changes in other modules so introduce a...
author
S.Çağlar Onur
<caglar@cs.princeton.edu>
Tue, 25 Jan 2011 15:55:04 +0000
(10:55 -0500)
committer
S.Çağlar Onur
<caglar@cs.princeton.edu>
Tue, 25 Jan 2011 15:55:04 +0000
(10:55 -0500)
This reverts commit
9fad43f5f4984e781b9ea37360759f3648e770a2
.
kvariant.sh
patch
|
blob
|
history
diff --git
a/kvariant.sh
b/kvariant.sh
index
adb8087
..
2613fa9
100755
(executable)
--- a/
kvariant.sh
+++ b/
kvariant.sh
@@
-49,6
+49,9
@@
set -e
variant=$1; shift
[[ -z "$@" ]] && usage
kernelrpm_url=$1; shift
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)
[[ -n "$@" ]] && usage
basedir=$(cd -P $(dirname $0); pwd)
@@
-73,8
+76,7
@@
kernelrpm=$variant_path/$(basename $kernelrpm_url)
getrpm $kernelrpm_url $kernelrpm
checkrpm $kernelrpm
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
extrarpm=$variant_path/$(basename $extrarpm_url)
getrpm $extrarpm_url $extrarpm
checkrpm $extrarpm