[ethtool] update to 3.14

diff --git a/meta-openvuplus/recipes-extended/ethtool/ethtool/vuplus.patch b/meta-openvuplus/recipes-extended/ethtool/ethtool/vuplus.patch
index a5fc603..6c922c9 100644 (file)
--- a/meta-openvuplus/recipes-extended/ethtool/ethtool/vuplus.patch
+++ b/meta-openvuplus/recipes-extended/ethtool/ethtool/vuplus.patch
@@ -1,21 +1,20 @@
-Index: ethtool-4/ethtool.c
-===================================================================
---- ethtool-4/ethtool.c        (revision 3)
-+++ ethtool-4/ethtool.c        (working copy)
-@@ -1578,6 +1578,27 @@
+diff --git a/ethtool.c b/ethtool.c
+index acac32a..a47daaa 100644
+--- a/ethtool.c
++++ b/ethtool.c
+@@ -2253,6 +2253,25 @@ static int do_gset(struct cmd_context *ctx)
        } else if (errno != EOPNOTSUPP) {
                perror("Cannot get link status");
        }
-+#if 1         /*      ikseong - check running flags   */
-+      else
-+      {
-+              if(ioctl(fd, SIOCGIFFLAGS, ifr) < 0)
++      else{
++              err = send_ioctl(ctx, &edata);
++              if (err < 0)
 +              {
 +                      fprintf(stdout,"SIOCGIFFLAGS error \n");
 +              }
 +              else
 +              {
-+                      if((ifr->ifr_flags & IFF_RUNNING))
++                      if((ctx->ifr.ifr_flags & IFF_RUNNING))
 +                      {
 +                              fprintf(stdout, "       Link detected: yes\n");
 +                      }
@@ -23,10 +22,9 @@ Index: ethtool-4/ethtool.c
 +                      {
 +                              fprintf(stdout, "       Link detected: no\n");
 +                      }
-+                      allfail=0;
++                      allfail = 0;
 +              }
 +      }
-+#endif
-
+ 
        if (allfail) {
                fprintf(stdout, "No data available\n");

diff --git a/meta-openvuplus/recipes-extended/ethtool/ethtool_2.6.36.bbappend b/meta-openvuplus/recipes-extended/ethtool/ethtool_2.6.36.bbappend
deleted file mode 100644 (file)
index 69823b3..0000000
--- a/meta-openvuplus/recipes-extended/ethtool/ethtool_2.6.36.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-PRINC = "1"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI_append = " file://vuplus.patch"
-
-SRC_URI[md5sum] = "3b2322695e9ee7bf447ebcdb85f93e83"
-SRC_URI[sha256sum] = "639622180fe48dc7bb117ffbf263395d7ae47aac9819b8d9f83ff053ecf17bdd"
-
-inherit autotools

diff --git a/meta-openvuplus/recipes-extended/ethtool/ethtool_3.14.bbappend b/meta-openvuplus/recipes-extended/ethtool/ethtool_3.14.bbappend
new file mode 100644 (file)
index 0000000..4019644
--- /dev/null
+++ b/meta-openvuplus/recipes-extended/ethtool/ethtool_3.14.bbappend
@@ -0,0 +1,7 @@
+PR .= "-vuplus0"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append = " file://vuplus.patch"
+
+inherit autotools