From 0a5bb9f617dffbfddf599555cff5f5536f10b93f Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 2 Jun 2015 02:55:28 -0700 Subject: ethtool: 3.16 -> 4.0 Removed ethtool-uint.patch since it is already in the source. Signed-off-by: Robert Yang --- .../ethtool/ethtool/ethtool-uint.patch | 50 ---------------------- meta/recipes-extended/ethtool/ethtool_3.16.bb | 31 -------------- meta/recipes-extended/ethtool/ethtool_4.0.bb | 30 +++++++++++++ 3 files changed, 30 insertions(+), 81 deletions(-) delete mode 100644 meta/recipes-extended/ethtool/ethtool/ethtool-uint.patch delete mode 100644 meta/recipes-extended/ethtool/ethtool_3.16.bb create mode 100644 meta/recipes-extended/ethtool/ethtool_4.0.bb (limited to 'meta') diff --git a/meta/recipes-extended/ethtool/ethtool/ethtool-uint.patch b/meta/recipes-extended/ethtool/ethtool/ethtool-uint.patch deleted file mode 100644 index bb96a18d82..0000000000 --- a/meta/recipes-extended/ethtool/ethtool/ethtool-uint.patch +++ /dev/null @@ -1,50 +0,0 @@ -Fix build with musl by using correct uint type names. - -This patch is taken from Sabotage Linux, the license statement for patches and -build scripts in Sabotage Linux says: - - To the extent possible under law, Christian Neukirchen has waived - all copyright and related or neighboring rights to this work. - - http://creativecommons.org/publicdomain/zero/1.0/ - -Therefore this should be good to include in OpenEmbedded. - -Signed-off-by: Paul Barker - -Upstream-status: Pending - -diff -u ethtool-3.14.org/internal.h ethtool-3.14/internal.h ---- ethtool-3.14.org/internal.h -+++ ethtool-3.14/internal.h -@@ -7,6 +7,7 @@ - #include "ethtool-config.h" - #endif - #include -+#include - #include - #include - #include -@@ -17,16 +18,16 @@ - - /* ethtool.h expects these to be defined by */ - #ifndef HAVE_BE_TYPES --typedef __uint16_t __be16; --typedef __uint32_t __be32; -+typedef uint16_t __be16; -+typedef uint32_t __be32; - typedef unsigned long long __be64; - #endif - - typedef unsigned long long u64; --typedef __uint32_t u32; --typedef __uint16_t u16; --typedef __uint8_t u8; --typedef __int32_t s32; -+typedef uint32_t u32; -+typedef uint16_t u16; -+typedef uint8_t u8; -+typedef int32_t s32; - - #include "ethtool-copy.h" - #include "net_tstamp-copy.h" diff --git a/meta/recipes-extended/ethtool/ethtool_3.16.bb b/meta/recipes-extended/ethtool/ethtool_3.16.bb deleted file mode 100644 index 92a0704800..0000000000 --- a/meta/recipes-extended/ethtool/ethtool_3.16.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Display or change ethernet card settings" -DESCRIPTION = "A small utility for examining and tuning the settings of your ethernet-based network interfaces." -HOMEPAGE = "http://www.kernel.org/pub/software/network/ethtool/" -SECTION = "console/network" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216" - -SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ - file://run-ptest \ - file://avoid_parallel_tests.patch \ - file://ethtool-uint.patch \ - " - -SRC_URI[md5sum] = "3806bae34c153e2b9e2859e85c54788d" -SRC_URI[sha256sum] = "a6f1433824af7b390ed4e66dfc7cee047d6d1f56dbb8ceef9fe905d63aef5275" - -inherit autotools ptest -RDEPENDS_${PN}-ptest += "make" - -do_compile_ptest() { - oe_runmake buildtest-TESTS -} - -do_install_ptest () { - cp ${B}/Makefile ${D}${PTEST_PATH} - install ${B}/test-cmdline ${D}${PTEST_PATH} - install ${B}/test-features ${D}${PTEST_PATH} - install ${B}/ethtool ${D}${PTEST_PATH}/ethtool - sed -i 's/^Makefile/_Makefile/' ${D}${PTEST_PATH}/Makefile -} diff --git a/meta/recipes-extended/ethtool/ethtool_4.0.bb b/meta/recipes-extended/ethtool/ethtool_4.0.bb new file mode 100644 index 0000000000..13f2b1cf56 --- /dev/null +++ b/meta/recipes-extended/ethtool/ethtool_4.0.bb @@ -0,0 +1,30 @@ +SUMMARY = "Display or change ethernet card settings" +DESCRIPTION = "A small utility for examining and tuning the settings of your ethernet-based network interfaces." +HOMEPAGE = "http://www.kernel.org/pub/software/network/ethtool/" +SECTION = "console/network" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216" + +SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ + file://run-ptest \ + file://avoid_parallel_tests.patch \ + " + +SRC_URI[md5sum] = "0a1c78787c7dcf077016ed86372a472f" +SRC_URI[sha256sum] = "e200516727cc9583e8b63fd6e72f667f9ed41bb4f0577ff4803b60c64cfd1dbc" + +inherit autotools ptest +RDEPENDS_${PN}-ptest += "make" + +do_compile_ptest() { + oe_runmake buildtest-TESTS +} + +do_install_ptest () { + cp ${B}/Makefile ${D}${PTEST_PATH} + install ${B}/test-cmdline ${D}${PTEST_PATH} + install ${B}/test-features ${D}${PTEST_PATH} + install ${B}/ethtool ${D}${PTEST_PATH}/ethtool + sed -i 's/^Makefile/_Makefile/' ${D}${PTEST_PATH}/Makefile +} -- cgit 1.2.3-korg