X-Git-Url: https://git.tld-linux.org/?p=packages%2Fgrub2.git;a=blobdiff_plain;f=add-vlan-tag-support.patch;h=543fc3d0ba17b05b20fbdffee714be7a6db566ea;hp=c45473eb42d9d110781946d238cc6572a9f4c536;hb=ccc85a859731b664685ffc8639c32cf586f5f3c6;hpb=8b86dadf5ba706a8bc5d4bb58355b5b23f823225

diff --git a/add-vlan-tag-support.patch b/add-vlan-tag-support.patch
index c45473e..543fc3d 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 -ur grub-2.02-beta3.orig/grub-core/kern/ieee1275/init.c grub-2.02-beta3/grub-core/kern/ieee1275/init.c
+--- grub-2.02-beta3.orig/grub-core/kern/ieee1275/init.c	2016-02-28 02:07:41.000000000 +0000
++++ grub-2.02-beta3/grub-core/kern/ieee1275/init.c	2016-03-21 07:51:44.364768000 +0000
+@@ -125,6 +125,7 @@
        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 -ur grub-2.02-beta3.orig/grub-core/kern/ieee1275/openfw.c grub-2.02-beta3/grub-core/kern/ieee1275/openfw.c
+--- grub-2.02-beta3.orig/grub-core/kern/ieee1275/openfw.c	2016-02-28 02:07:41.000000000 +0000
++++ grub-2.02-beta3/grub-core/kern/ieee1275/openfw.c	2016-03-21 07:51:44.365768000 +0000
 @@ -23,6 +23,7 @@
  #include <grub/mm.h>
  #include <grub/ieee1275/ieee1275.h>
@@ -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 -ur grub-2.02-beta3.orig/grub-core/net/ethernet.c grub-2.02-beta3/grub-core/net/ethernet.c
+--- grub-2.02-beta3.orig/grub-core/net/ethernet.c	2016-02-28 02:07:41.000000000 +0000
++++ grub-2.02-beta3/grub-core/net/ethernet.c	2016-03-21 07:51:44.366768000 +0000
 @@ -23,6 +23,7 @@
  #include <grub/net/arp.h>
  #include <grub/net/netbuff.h>
@@ -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 -ur grub-2.02-beta3.orig/include/grub/ieee1275/ieee1275.h grub-2.02-beta3/include/grub/ieee1275/ieee1275.h
+--- grub-2.02-beta3.orig/include/grub/ieee1275/ieee1275.h	2016-02-28 02:07:41.000000000 +0000
++++ grub-2.02-beta3/include/grub/ieee1275/ieee1275.h	2016-03-21 07:51:44.366768000 +0000
+@@ -227,6 +227,7 @@
  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 -ur grub-2.02-beta3.orig/include/grub/net.h grub-2.02-beta3/include/grub/net.h
+--- grub-2.02-beta3.orig/include/grub/net.h	2016-02-28 02:07:41.000000000 +0000
++++ grub-2.02-beta3/include/grub/net.h	2016-03-21 07:51:44.367768000 +0000
+@@ -561,4 +561,6 @@
  #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