X-Git-Url: https://git.tld-linux.org/?p=packages%2Fgrub2.git;a=blobdiff_plain;f=add-vlan-tag-support.patch;h=42fde72d5470789780ded2d09ce4a4d738973db1;hp=c45473eb42d9d110781946d238cc6572a9f4c536;hb=f95a1ca1ec8ddd7b01b033fd552bc7619faed11e;hpb=3a8be31c695692a1764fe639ae96595d0effa6b0

diff --git a/add-vlan-tag-support.patch b/add-vlan-tag-support.patch
index c45473e..42fde72 100644
--- a/add-vlan-tag-support.patch
+++ b/add-vlan-tag-support.patch
@@ -1,7 +1,7 @@
-diff -dur grub-2.00.git20131218.orig/grub-core/kern/ieee1275/init.c grub-2.00.git20131218/grub-core/kern/ieee1275/init.c
---- grub-2.00.git20131218.orig/grub-core/kern/ieee1275/init.c	2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/grub-core/kern/ieee1275/init.c	2013-12-18 14:39:17.000000000 +0100
-@@ -118,6 +118,7 @@
+diff -urNp grub-2.02-rc1.orig/grub-core/kern/ieee1275/init.c grub-2.02-rc1/grub-core/kern/ieee1275/init.c
+--- grub-2.02-rc1.orig/grub-core/kern/ieee1275/init.c	2017-02-08 15:06:05.420317447 +0000
++++ grub-2.02-rc1/grub-core/kern/ieee1275/init.c	2017-02-08 15:06:17.784317308 +0000
+@@ -125,6 +125,7 @@ grub_machine_get_bootlocation (char **de
        char *dev, *canon;
        char *ptr;
        dev = grub_ieee1275_get_aliasdevname (bootpath);
@@ -9,10 +9,9 @@ diff -dur grub-2.00.git20131218.orig/grub-core/kern/ieee1275/init.c grub-2.00.gi
        canon = grub_ieee1275_canonicalise_devname (dev);
        ptr = canon + grub_strlen (canon) - 1;
        while (ptr > canon && (*ptr == ',' || *ptr == ':'))
-Only in grub-2.00.git20131218/grub-core/kern/ieee1275: init.c.orig
-diff -dur grub-2.00.git20131218.orig/grub-core/kern/ieee1275/openfw.c grub-2.00.git20131218/grub-core/kern/ieee1275/openfw.c
---- grub-2.00.git20131218.orig/grub-core/kern/ieee1275/openfw.c	2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/grub-core/kern/ieee1275/openfw.c	2013-12-18 14:39:17.000000000 +0100
+diff -urNp grub-2.02-rc1.orig/grub-core/kern/ieee1275/openfw.c grub-2.02-rc1/grub-core/kern/ieee1275/openfw.c
+--- grub-2.02-rc1.orig/grub-core/kern/ieee1275/openfw.c	2017-02-08 15:06:05.420317447 +0000
++++ grub-2.02-rc1/grub-core/kern/ieee1275/openfw.c	2017-02-08 15:06:17.785317308 +0000
 @@ -23,6 +23,7 @@
  #include <grub/mm.h>
  #include <grub/ieee1275/ieee1275.h>
@@ -21,7 +20,7 @@ diff -dur grub-2.00.git20131218.orig/grub-core/kern/ieee1275/openfw.c grub-2.00.
  
  enum grub_ieee1275_parse_type
  {
-@@ -451,6 +452,35 @@
+@@ -451,6 +452,35 @@ fail:
    return ret;
  }
  
@@ -57,10 +56,9 @@ diff -dur grub-2.00.git20131218.orig/grub-core/kern/ieee1275/openfw.c grub-2.00.
  char *
  grub_ieee1275_get_device_type (const char *path)
  {
-Only in grub-2.00.git20131218/grub-core/kern/ieee1275: openfw.c.orig
-diff -dur grub-2.00.git20131218.orig/grub-core/net/ethernet.c grub-2.00.git20131218/grub-core/net/ethernet.c
---- grub-2.00.git20131218.orig/grub-core/net/ethernet.c	2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/grub-core/net/ethernet.c	2013-12-18 14:39:17.000000000 +0100
+diff -urNp grub-2.02-rc1.orig/grub-core/net/ethernet.c grub-2.02-rc1/grub-core/net/ethernet.c
+--- grub-2.02-rc1.orig/grub-core/net/ethernet.c	2017-02-08 15:06:05.433317447 +0000
++++ grub-2.02-rc1/grub-core/net/ethernet.c	2017-02-08 15:06:17.785317308 +0000
 @@ -23,6 +23,7 @@
  #include <grub/net/arp.h>
  #include <grub/net/netbuff.h>
@@ -69,7 +67,7 @@ diff -dur grub-2.00.git20131218.orig/grub-core/net/ethernet.c grub-2.00.git20131
  #include <grub/time.h>
  #include <grub/net/arp.h>
  
-@@ -56,10 +57,19 @@
+@@ -56,10 +57,19 @@ send_ethernet_packet (struct grub_net_ne
  {
    struct etherhdr *eth;
    grub_err_t err;
@@ -91,7 +89,7 @@ diff -dur grub-2.00.git20131218.orig/grub-core/net/ethernet.c grub-2.00.git20131
    if (err)
      return err;
    eth = (struct etherhdr *) nb->data;
-@@ -76,6 +86,19 @@
+@@ -76,6 +86,19 @@ send_ethernet_packet (struct grub_net_ne
  	return err;
        inf->card->opened = 1;
      }
@@ -111,7 +109,7 @@ diff -dur grub-2.00.git20131218.orig/grub-core/net/ethernet.c grub-2.00.git20131
    return inf->card->driver->send (inf->card, nb);
  }
  
-@@ -90,10 +113,23 @@
+@@ -90,10 +113,23 @@ grub_net_recv_ethernet_packet (struct gr
    grub_net_link_level_address_t hwaddress;
    grub_net_link_level_address_t src_hwaddress;
    grub_err_t err;
@@ -136,10 +134,10 @@ diff -dur grub-2.00.git20131218.orig/grub-core/net/ethernet.c grub-2.00.git20131
    if (err)
      return err;
  
-diff -dur grub-2.00.git20131218.orig/include/grub/ieee1275/ieee1275.h grub-2.00.git20131218/include/grub/ieee1275/ieee1275.h
---- grub-2.00.git20131218.orig/include/grub/ieee1275/ieee1275.h	2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/include/grub/ieee1275/ieee1275.h	2013-12-18 14:40:11.000000000 +0100
-@@ -226,6 +226,7 @@
+diff -urNp grub-2.02-rc1.orig/include/grub/ieee1275/ieee1275.h grub-2.02-rc1/include/grub/ieee1275/ieee1275.h
+--- grub-2.02-rc1.orig/include/grub/ieee1275/ieee1275.h	2017-02-08 15:06:05.445317447 +0000
++++ grub-2.02-rc1/include/grub/ieee1275/ieee1275.h	2017-02-08 15:06:17.787317308 +0000
+@@ -227,6 +227,7 @@ char *EXPORT_FUNC(grub_ieee1275_get_alia
  char *EXPORT_FUNC(grub_ieee1275_canonicalise_devname) (const char *path);
  char *EXPORT_FUNC(grub_ieee1275_get_device_type) (const char *path);
  char *EXPORT_FUNC(grub_ieee1275_get_devname) (const char *path);
@@ -147,14 +145,13 @@ diff -dur grub-2.00.git20131218.orig/include/grub/ieee1275/ieee1275.h grub-2.00.
  
  void EXPORT_FUNC(grub_ieee1275_devalias_init_iterator) (struct grub_ieee1275_devalias *alias);
  void EXPORT_FUNC(grub_ieee1275_devalias_free) (struct grub_ieee1275_devalias *alias);
-diff -dur grub-2.00.git20131218.orig/include/grub/net.h grub-2.00.git20131218/include/grub/net.h
---- grub-2.00.git20131218.orig/include/grub/net.h	2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/include/grub/net.h	2013-12-18 14:39:18.000000000 +0100
-@@ -533,4 +533,6 @@
- #define GRUB_NET_TRIES 40
+diff -urNp grub-2.02-rc1.orig/include/grub/net.h grub-2.02-rc1/include/grub/net.h
+--- grub-2.02-rc1.orig/include/grub/net.h	2017-02-08 15:06:05.446317447 +0000
++++ grub-2.02-rc1/include/grub/net.h	2017-02-08 15:06:17.788317308 +0000
+@@ -561,4 +561,6 @@ extern char *grub_net_default_server;
  #define GRUB_NET_INTERVAL 400
+ #define GRUB_NET_INTERVAL_ADDITION 20
  
 +#define VLANTAG_IDENTIFIER 0x8100
 +
  #endif /* ! GRUB_NET_HEADER */
-Only in grub-2.00.git20131218/include/grub: net.h.orig