diff options
Diffstat (limited to 'package/ltp/patches')
| -rw-r--r-- | package/ltp/patches/patch-runltp | 19 | ||||
| -rw-r--r-- | package/ltp/patches/patch-ver_linux | 46 |
2 files changed, 46 insertions, 19 deletions
diff --git a/package/ltp/patches/patch-runltp b/package/ltp/patches/patch-runltp index fa159a07b..569d93ee8 100644 --- a/package/ltp/patches/patch-runltp +++ b/package/ltp/patches/patch-runltp @@ -1,5 +1,5 @@ --- ltp-full-20140422.orig/runltp 2014-04-23 10:37:31.000000000 +0200 -+++ ltp-full-20140422/runltp 2014-07-07 22:30:06.069956961 +0200 ++++ ltp-full-20140422/runltp 2014-07-10 23:23:28.476220215 +0200 @@ -77,7 +77,7 @@ setup() exit 1 } @@ -9,3 +9,20 @@ export PATH="${PATH}:${LTPROOT}/testcases/bin" export LTP_DEV="" +@@ -671,11 +671,11 @@ main() + fi + + # check for required users and groups +- ${LTPROOT}/IDcheck.sh || \ +- { +- echo "WARNING: required users and groups not present" +- echo "WARNING: some test cases may fail" +- } ++ #${LTPROOT}/IDcheck.sh || \ ++ #{ ++ # echo "WARNING: required users and groups not present" ++ # echo "WARNING: some test cases may fail" ++ #} + + # display versions of installed software + [ -z "$QUIET_MODE" ] && \ diff --git a/package/ltp/patches/patch-ver_linux b/package/ltp/patches/patch-ver_linux index 69d23bd24..f1856a367 100644 --- a/package/ltp/patches/patch-ver_linux +++ b/package/ltp/patches/patch-ver_linux @@ -1,23 +1,33 @@ --- ltp-full-20140422.orig/ver_linux 2014-04-23 10:37:00.000000000 +0200 -+++ ltp-full-20140422/ver_linux 2014-07-07 22:31:57.942795517 +0200 -@@ -18,62 +18,23 @@ fi ++++ ltp-full-20140422/ver_linux 2014-07-10 23:24:06.016401603 +0200 +@@ -5,9 +5,6 @@ + # differ on your system. + # + PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH +-echo 'If some fields are empty or look unusual you may have an old version.' +-echo 'Compare to the current minimal requirements in Documentation/Changes.' +-echo ' ' + + cat /etc/*release 2> /dev/null + if [ $? = 1 ]; then +@@ -18,62 +15,7 @@ fi uname -a echo ' ' -echo "Gnu C " `gcc --version 2>/dev/null | head -n 1` - - make --version 2>&1 | awk -F, '{print $1}' | awk \ - '/GNU Make/{print "Gnu make ",$NF}' - - ld -v 2>&1 | awk -F\) '{print $1}' | awk \ - '/BFD/{print "binutils ",$NF}' - +-make --version 2>&1 | awk -F, '{print $1}' | awk \ +- '/GNU Make/{print "Gnu make ",$NF}' +- +-ld -v 2>&1 | awk -F\) '{print $1}' | awk \ +- '/BFD/{print "binutils ",$NF}' +- -fdformat --version 2>&1 | awk -F\- '{print "util-linux ", $NF}' - - mount --version 2>&1 | awk -F\- '{print "mount ", $NF}' - - insmod -V 2>&1 | awk 'NR==1 {print "modutils ",$NF}' - +-mount --version 2>&1 | awk -F\- '{print "mount ", $NF}' +- +-insmod -V 2>&1 | awk 'NR==1 {print "modutils ",$NF}' +- -tune2fs 2>&1 | grep "^tune2fs" | sed 's/,//' | awk \ -'NR==1 {print "e2fsprogs ", $2}' - @@ -45,12 +55,12 @@ - -ps --version 2>&1 | awk 'NR==1{print "Procps ", $NF}' - - ifconfig --version 2>&1 | grep tools | awk \ - 'NR==1{print "Net-tools ", $NF}' - - ip -V 2>&1 | awk \ - 'NR==1{print "iproute2 ", $NF}' - +-ifconfig --version 2>&1 | grep tools | awk \ +-'NR==1{print "Net-tools ", $NF}' +- +-ip -V 2>&1 | awk \ +-'NR==1{print "iproute2 ", $NF}' +- -# Kbd needs 'loadkeys -h', -loadkeys -h 2>&1 | awk \ -'(NR==1 && ($3 !~ /option/)) {print "Kbd ", $3}' |