summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2013-05-14 13:37:41 -0400
committerBill Peck <bpeck@redhat.com>2013-05-14 13:37:41 -0400
commitb3af8def8f0b226ea8ada0b7e1acbf6955569600 (patch)
treee7c278d8c7fc8fe1f45127b30b911bdc91e873db /kernel
parent4e6ae7aabc53dada0f532d71f54a5ae505c6988d (diff)
downloadtests-b3af8def8f0b226ea8ada0b7e1acbf6955569600.tar.gz
tests-b3af8def8f0b226ea8ada0b7e1acbf6955569600.tar.xz
tests-b3af8def8f0b226ea8ada0b7e1acbf6955569600.zip
Updated kernelinstall using kernel/include
Diffstat (limited to 'kernel')
-rw-r--r--kernel/kernelinstall/Makefile2
-rwxr-xr-xkernel/kernelinstall/runtest.sh14
2 files changed, 6 insertions, 10 deletions
diff --git a/kernel/kernelinstall/Makefile b/kernel/kernelinstall/Makefile
index 540c9d9..5cc7139 100644
--- a/kernel/kernelinstall/Makefile
+++ b/kernel/kernelinstall/Makefile
@@ -49,5 +49,5 @@ $(METADATA):
@echo "Requires: iproute ethtool" >> $(METADATA)
@echo "RunFor: kernel" >> $(METADATA)
@echo "RunFor: kernel-headers" >> $(METADATA)
- @echo "RepoRequires: kernel/include" >> $(METADATA)
+ @echo "RhtsRequires: test(/kernel/include)" >> $(METADATA)
@echo "License: GPL" >> $(METADATA)
diff --git a/kernel/kernelinstall/runtest.sh b/kernel/kernelinstall/runtest.sh
index 6c962e4..346f3b6 100755
--- a/kernel/kernelinstall/runtest.sh
+++ b/kernel/kernelinstall/runtest.sh
@@ -303,12 +303,13 @@ function SelectKernel ()
# if it is MRG-2.x RHEL6
if $(rpm -qf /etc/redhat-release | grep -q "redhat-release-server-6"); then
if [ "${KVER::2}" = "3." ]; then
+ ZZZ=${EXTRA:3}
if [ "${KVER::3}" = "3.0" ]; then
# MRG-2.1
- EXTRA=$(echo $EXTRA | awk -F- '{print $2}')
+ EXTRA=$ZZZ
else
# MRG-2.2 or newer
- EXTRA=".x86_64.$EXTRA"
+ EXTRA=".x86_64.$ZZZ"
fi
else
# MRG-2.0
@@ -570,13 +571,8 @@ function CheckKernel ()
# if it is MRG-2.x RHEL6
if $(rpm -qf /etc/redhat-release | grep -q "redhat-release-server-6"); then
if [ "${KVER::2}" = "3." ]; then
- if [ "${KVER::3}" = "3.0" ]; then
- # MRG-2.1
- KVAR=$(echo $KVAR | awk -F- '{print $2}')
- else
- # MRG-2.2 or newer
- KVAR=".x86_64.$KVAR"
- fi
+ # MRG-2.1 or newer
+ KVAR="${KVAR:3}"
else
# MRG-2.0
KVAR=$(echo $KVAR | awk -F- '{print $1 $2}')