mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-07 05:10:20 +00:00
net-snmp: add ptest package
Issue: TA79430
- Change to use append for PACKAGES so that:
* ptest package is added from ptest bbcalss
* the PN is back, allow empty and add rdepends on net-snmp-client
in case the user try to add net-snmp to the image
- Add a patch to fix the output format for ptest
- Add run-ptest
- Add rdepends on perl for ptest
(LOCAL REV: NOT UPSTREAM) -- Sent to meta-networking on 20150114
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
committed by
Joe MacDonald
parent
ebdd38e7f7
commit
5eec0615e5
+37
@@ -0,0 +1,37 @@
|
|||||||
|
From 4bb4024b395f19d36ab3569e2773ea80d8cc5261 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jackie Huang <jackie.huang@windriver.com>
|
||||||
|
Date: Wed, 14 Jan 2015 15:10:06 +0800
|
||||||
|
Subject: [PATCH] testing: add the output format for ptest
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [OE specific]
|
||||||
|
|
||||||
|
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
||||||
|
---
|
||||||
|
testing/RUNTESTS | 4 ++++
|
||||||
|
1 files changed, 4 insertions(+), 0 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/testing/RUNTESTS b/testing/RUNTESTS
|
||||||
|
index e11c969..fb90f76 100755
|
||||||
|
--- a/testing/RUNTESTS
|
||||||
|
+++ b/testing/RUNTESTS
|
||||||
|
@@ -25,13 +25,17 @@ failed_count=0
|
||||||
|
rm -f failed_tests
|
||||||
|
for i in "${srcdir}"/testing/fulltests/default/T*$1*; do
|
||||||
|
echo "RUNNING $i"
|
||||||
|
+ test_name=`basename $i`
|
||||||
|
${srcdir}/testing/fulltests/support/simple_run $i
|
||||||
|
if [ $? = 0 ]; then
|
||||||
|
+ echo "PASS: $test_name"
|
||||||
|
success_count=`expr $success_count + 1`
|
||||||
|
else
|
||||||
|
+ echo "FAIL: $test_name"
|
||||||
|
failed_count=`expr $failed_count + 1`
|
||||||
|
echo "$i" >> failed_tests
|
||||||
|
fi
|
||||||
|
+ echo
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ -f failed_tests ]; then
|
||||||
|
--
|
||||||
|
1.7.1
|
||||||
|
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
cd testing
|
||||||
|
./RUNTESTS
|
||||||
@@ -17,6 +17,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.zip \
|
|||||||
file://ifmib.patch \
|
file://ifmib.patch \
|
||||||
file://net-snmp-add-knob-whether-nlist.h-are-checked.patch \
|
file://net-snmp-add-knob-whether-nlist.h-are-checked.patch \
|
||||||
file://fix-libtool-finish.patch \
|
file://fix-libtool-finish.patch \
|
||||||
|
file://net-snmp-testing-add-the-output-format-for-ptest.patch \
|
||||||
|
file://run-ptest \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "a2c83518648b0f2a5d378625e45c0e18"
|
SRC_URI[md5sum] = "a2c83518648b0f2a5d378625e45c0e18"
|
||||||
@@ -71,6 +73,24 @@ do_install_append() {
|
|||||||
install -m 0644 ${WORKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system
|
install -m 0644 ${WORKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system
|
||||||
}
|
}
|
||||||
|
|
||||||
|
do_install_ptest() {
|
||||||
|
install -d ${D}${PTEST_PATH}
|
||||||
|
for i in ${S}/dist ${S}/include ${B}/include ${S}/mibs ${S}/configure \
|
||||||
|
${B}/net-snmp-config ${S}/testing; do
|
||||||
|
if [ -e "$i" ]; then
|
||||||
|
cp -a "$i" ${D}${PTEST_PATH}
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
echo `autoconf -V|awk '/autoconf/{print $NF}'` > ${D}${PTEST_PATH}/dist/autoconf-version
|
||||||
|
|
||||||
|
rmdlist="${D}${PTEST_PATH}/dist/net-snmp-solaris-build"
|
||||||
|
for i in $rmdlist; do
|
||||||
|
if [ -d "$i" ]; then
|
||||||
|
rm -rf "$i"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
SYSROOT_PREPROCESS_FUNCS += "net_snmp_sysroot_preprocess"
|
SYSROOT_PREPROCESS_FUNCS += "net_snmp_sysroot_preprocess"
|
||||||
|
|
||||||
net_snmp_sysroot_preprocess () {
|
net_snmp_sysroot_preprocess () {
|
||||||
@@ -80,9 +100,9 @@ net_snmp_sysroot_preprocess () {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-dev ${PN}-staticdev ${PN}-static ${PN}-libs \
|
PACKAGES += "${PN}-libs ${PN}-mibs ${PN}-server ${PN}-client ${PN}-server-snmpd ${PN}-server-snmptrapd"
|
||||||
${PN}-mibs ${PN}-server ${PN}-client ${PN}-server-snmpd ${PN}-server-snmptrapd"
|
|
||||||
|
|
||||||
|
ALLOW_EMPTY_${PN} = "1"
|
||||||
ALLOW_EMPTY_${PN}-server = "1"
|
ALLOW_EMPTY_${PN}-server = "1"
|
||||||
|
|
||||||
FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}"
|
FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}"
|
||||||
@@ -98,6 +118,7 @@ FILES_${PN}-server-snmptrapd = "${sbindir}/snmptrapd \
|
|||||||
${systemd_unitdir}/system/snmptrapd.service \
|
${systemd_unitdir}/system/snmptrapd.service \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
FILES_${PN} = ""
|
||||||
FILES_${PN}-client = "${bindir}/* ${datadir}/snmp/"
|
FILES_${PN}-client = "${bindir}/* ${datadir}/snmp/"
|
||||||
FILES_${PN}-dbg += "${libdir}/.debug/ ${sbindir}/.debug/ ${bindir}/.debug/"
|
FILES_${PN}-dbg += "${libdir}/.debug/ ${sbindir}/.debug/ ${bindir}/.debug/"
|
||||||
FILES_${PN}-dev += "${bindir}/mib2c ${bindir}/mib2c-update"
|
FILES_${PN}-dev += "${bindir}/mib2c ${bindir}/mib2c-update"
|
||||||
@@ -117,10 +138,18 @@ SYSTEMD_PACKAGES = "${PN}-server-snmpd \
|
|||||||
SYSTEMD_SERVICE_${PN}-server-snmpd = "snmpd.service"
|
SYSTEMD_SERVICE_${PN}-server-snmpd = "snmpd.service"
|
||||||
SYSTEMD_SERVICE_${PN}-server-snmptrapd = "snmptrapd.service"
|
SYSTEMD_SERVICE_${PN}-server-snmptrapd = "snmptrapd.service"
|
||||||
|
|
||||||
|
RDEPENDS_${PN} += "net-snmp-client"
|
||||||
RDEPENDS_${PN}-server-snmpd += "net-snmp-mibs"
|
RDEPENDS_${PN}-server-snmpd += "net-snmp-mibs"
|
||||||
RDEPENDS_${PN}-server-snmptrapd += "net-snmp-server-snmpd"
|
RDEPENDS_${PN}-server-snmptrapd += "net-snmp-server-snmpd"
|
||||||
RDEPENDS_${PN}-server += "net-snmp-server-snmpd net-snmp-server-snmptrapd"
|
RDEPENDS_${PN}-server += "net-snmp-server-snmpd net-snmp-server-snmptrapd"
|
||||||
RDEPENDS_${PN}-client += "net-snmp-mibs"
|
RDEPENDS_${PN}-client += "net-snmp-mibs"
|
||||||
|
RDEPENDS_${PN}-ptest += "perl \
|
||||||
|
perl-module-test \
|
||||||
|
perl-module-file-basename \
|
||||||
|
perl-module-getopt-long \
|
||||||
|
perl-module-file-temp \
|
||||||
|
perl-module-data-dumper \
|
||||||
|
"
|
||||||
RDEPENDS_${PN}-dev = "net-snmp-client (= ${EXTENDPKGV}) net-snmp-server (= ${EXTENDPKGV})"
|
RDEPENDS_${PN}-dev = "net-snmp-client (= ${EXTENDPKGV}) net-snmp-server (= ${EXTENDPKGV})"
|
||||||
RRECOMMENDS_${PN}-dbg = "net-snmp-client (= ${EXTENDPKGV}) net-snmp-server (= ${EXTENDPKGV})"
|
RRECOMMENDS_${PN}-dbg = "net-snmp-client (= ${EXTENDPKGV}) net-snmp-server (= ${EXTENDPKGV})"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user