diff options
| author |   Changhyeok Bae <changhyeok.bae@gmail.com> | 2020-08-19 16:49:43 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-20 15:28:57 +0100 |
| commit | bc037110fc53b34db7073b7c17fd715b30651a9e (patch) | |
| tree | 6932a34e5aa80fb181752fb0d357f3a07f9638d9 /meta/recipes-extended | |
| parent | a38527357f4255f0f4cf888f640f38f2ef5942e0 (diff) | |
| download | openembedded-core-bc037110fc53b34db7073b7c17fd715b30651a9e.tar.gz | |
ethtool: upgrade 5.7 -> 5.8
test-features is only generated without netlink configuration.
Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
| -rw-r--r-- | meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch | 6 | ||||
| -rw-r--r-- | meta/recipes-extended/ethtool/ethtool_5.8.bb (renamed from meta/recipes-extended/ethtool/ethtool_5.7.bb) | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index 8ecfde1417..75a3841f2d 100644 --- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -1,4 +1,4 @@ -From 1c6c017e56ec536f5cceacdb02092777d390debb Mon Sep 17 00:00:00 2001 +From afecc8791f904dc1893858d68a642b491356c74b Mon Sep 17 00:00:00 2001 From: Tudor Florea <tudor.florea@enea.com> Date: Wed, 28 May 2014 18:59:54 +0200 Subject: [PATCH] ethtool: use serial-tests config needed by ptest. @@ -15,11 +15,11 @@ Upstream-Status: Inappropriate 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 1169b7f..ed82524 100644 +index 19223f7..8a58d15 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(ethtool, 5.7, netdev@vger.kernel.org) + AC_INIT(ethtool, 5.8, netdev@vger.kernel.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu subdir-objects]) diff --git a/meta/recipes-extended/ethtool/ethtool_5.7.bb b/meta/recipes-extended/ethtool/ethtool_5.8.bb index d9fc30cb55..0403f0e3a9 100644 --- a/meta/recipes-extended/ethtool/ethtool_5.7.bb +++ b/meta/recipes-extended/ethtool/ethtool_5.8.bb @@ -11,7 +11,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://avoid_parallel_tests.patch \ " -SRC_URI[sha256sum] = "c2e16f8bf510c5822f8e25061c2533972308a421767c54abcacb1038b08bb782" +SRC_URI[sha256sum] = "91e8bbda48a7fd5d374efacca542364ceb3a6c1f286f024b64ec40ccc799e125" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" @@ -29,7 +29,9 @@ do_compile_ptest() { do_install_ptest () { cp ${B}/Makefile ${D}${PTEST_PATH} install ${B}/test-cmdline ${D}${PTEST_PATH} - install ${B}/test-features ${D}${PTEST_PATH} + if ${@bb.utils.contains('PACKAGECONFIG', 'netlink', 'false', 'true', d)}; then + install ${B}/test-features ${D}${PTEST_PATH} + fi install ${B}/ethtool ${D}${PTEST_PATH}/ethtool sed -i 's/^Makefile/_Makefile/' ${D}${PTEST_PATH}/Makefile } |