kmodtool kmodtool,1.6,1.7

[Ville Skytta (scop)]

Author: scop

Update of /cvs/fedora/kmodtool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16825

Modified Files:
	kmodtool 
Log Message:
Recognize PAE (FC6) and largesmp (RHEL4) kernels.

sed gave me a headache, so this change also gets rid of it and uses
bash's (>= 2.x required) parameter expansion instead.  Additionally,
get_variant() is now implemented using get_verrel()'s results so things
should stay better in sync.



Index: kmodtool
===================================================================
RCS file: /cvs/fedora/kmodtool/kmodtool,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kmodtool	21 May 2006 13:24:48 -0000	1.6
+++ kmodtool	24 May 2006 17:56:49 -0000	1.7
@@ -23,9 +23,11 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+shopt -s extglob
+
 myprog="kmodtool"
-myver="0.10.9"
-knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)'
+myver="0.10.10"
+knownvariants=@(BOOT|PAE|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen[0U]?(-PAE))
 kmod_name=
 kver=
 verrel=
@@ -33,24 +35,27 @@
 
 get_verrel ()
 {
-  verrel="$(echo "${1-$(uname -r)}" | sed 's/'${knownvariants}'$//')"
+  verrel=${1:-$(uname -r)}
+  verrel=${verrel%%$knownvariants}
 }
 
 print_verrel ()
 {
-  get_verrel $@ || return $?
+  get_verrel $@
   echo "${verrel}"
 }
 
 get_variant ()
 {
-  variant="$(echo "${1-$(uname -r)}" | sed 's/^.*'${knownvariants}'$/\1/')"
-  [ "${variant}" != "${1-$(uname -r)}" ] || variant='""'
+  get_verrel $@
+  variant=${1:-$(uname -r)}
+  variant=${variant##$verrel}
+  variant=${variant:-'""'}
 }
 
 print_variant ()
 {
-  get_variant $@ || return $?
+  get_variant $@
   echo "${variant}"
 }