fishHEADmaster

4 files changed, 244 insertions, 0 deletions

diff --git a/package/boot/grub2/patches/.svn/entries b/package/boot/grub2/patches/.svn/entries
new file mode 100644
index 0000000..aa580af
--- /dev/null
+++ b/package/boot/grub2/patches/.svn/entries
@@ -0,0 +1,130 @@
+10
+
+dir
+36060
+svn://svn.openwrt.org/openwrt/trunk/package/boot/grub2/patches
+svn://svn.openwrt.org/openwrt
+
+
+
+2012-11-26T16:03:40.540832Z
+34389
+jow
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3c298f89-4303-0410-b956-a3cf2f4a3e73
+
+200-fix-gets-removal.patch
+file
+
+
+
+
+2013-03-17T12:13:21.000000Z
+4347c13528381c1ebf68d183a9cc0165
+2012-11-26T16:03:40.540832Z
+34389
+jow
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+560
+
+200-grub_musl.patch
+file
+
+
+
+
+2013-03-17T12:13:21.000000Z
+eae2474dbd84e1bcbe72e4b91f9f79be
+2012-11-23T20:01:53.954168Z
+34306
+florian
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1059
+
+100-grub_setup_root.patch
+file
+
+
+
+
+2013-03-17T12:13:21.000000Z
+aec4834762dc8e05bb7c862cc82aab40
+2012-10-16T13:44:25.630275Z
+33781
+blogic
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2328
+
diff --git a/package/boot/grub2/patches/.svn/text-base/100-grub_setup_root.patch.svn-base b/package/boot/grub2/patches/.svn/text-base/100-grub_setup_root.patch.svn-base
new file mode 100644
index 0000000..7775b2a
--- /dev/null
+++ b/package/boot/grub2/patches/.svn/text-base/100-grub_setup_root.patch.svn-base
@@ -0,0 +1,77 @@
+--- a/util/grub-setup.c
++++ b/util/grub-setup.c
+@@ -141,12 +141,11 @@ write_rootdev (char *core_img, grub_devi
+ static void
+ setup (const char *dir,
+        const char *boot_file, const char *core_file,
+-       const char *dest, int force,
++       const char *root, const char *dest, int force,
+        int fs_probe, int allow_floppy)
+ {
+   char *boot_path, *core_path, *core_path_dev, *core_path_dev_full;
+   char *boot_img, *core_img;
+-  char *root = 0;
+   size_t boot_size, core_size;
+   grub_uint16_t core_sectors;
+   grub_device_t root_dev = 0, dest_dev, core_dev;
+@@ -253,7 +252,10 @@ setup (const char *dir,
+ 
+   core_dev = dest_dev;
+ 
+-  {
++  if (root)
++    root_dev = grub_device_open(root);
++
++  if (!root_dev) {
+     char **root_devices = grub_guess_root_devices (dir);
+     char **cur;
+     int found = 0;
+@@ -263,6 +265,8 @@ setup (const char *dir,
+ 	char *drive;
+ 	grub_device_t try_dev;
+ 
++	if (root_dev)
++	  break;
+ 	drive = grub_util_get_grub_dev (*cur);
+ 	if (!drive)
+ 	  continue;
+@@ -956,6 +960,8 @@ static struct argp_option options[] = {
+    N_("install even if problems are detected"), 0},
+   {"skip-fs-probe",'s',0,      0,
+    N_("do not probe for filesystems in DEVICE"), 0},
++  {"root-device", 'r', N_("DEVICE"), 0,
++   N_("use DEVICE as the root device"), 0},
+   {"verbose",     'v', 0,      0, N_("print verbose messages."), 0},
+   {"allow-floppy", 'a', 0,      0,
+    /* TRANSLATORS: The potential breakage isn't limited to floppies but it's
+@@ -993,6 +999,7 @@ struct arguments
+   char *core_file;
+   char *dir;
+   char *dev_map;
++  char *root_dev;
+   int  force;
+   int  fs_probe;
+   int allow_floppy;
+@@ -1040,6 +1047,13 @@ argp_parser (int key, char *arg, struct 
+         arguments->dev_map = xstrdup (arg);
+         break;
+ 
++      case 'r':
++        if (arguments->root_dev)
++          free (arguments->root_dev);
++
++        arguments->root_dev = xstrdup (arg);
++        break;
++
+       case 'f':
+         arguments->force = 1;
+         break;
+@@ -1172,7 +1186,7 @@ main (int argc, char *argv[])
+   setup (arguments.dir ? : DEFAULT_DIRECTORY,
+ 	 arguments.boot_file ? : DEFAULT_BOOT_FILE,
+ 	 arguments.core_file ? : DEFAULT_CORE_FILE,
+-	 dest_dev, arguments.force,
++	 arguments.root_dev, dest_dev, arguments.force,
+ 	 arguments.fs_probe, arguments.allow_floppy);
+ 
+   /* Free resources.  */
diff --git a/package/boot/grub2/patches/.svn/text-base/200-fix-gets-removal.patch.svn-base b/package/boot/grub2/patches/.svn/text-base/200-fix-gets-removal.patch.svn-base
new file mode 100644
index 0000000..4370fb5
--- /dev/null
+++ b/package/boot/grub2/patches/.svn/text-base/200-fix-gets-removal.patch.svn-base
@@ -0,0 +1,15 @@
+--- a/grub-core/gnulib/stdio.in.h
++++ b/grub-core/gnulib/stdio.in.h
+@@ -137,12 +137,6 @@
+                  "use gnulib module fflush for portable POSIX compliance");
+ #endif
+ 
+-/* It is very rare that the developer ever has full control of stdin,
+-   so any use of gets warrants an unconditional warning.  Assume it is
+-   always declared, since it is required by C89.  */
+-#undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+-
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
+ #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
diff --git a/package/boot/grub2/patches/.svn/text-base/200-grub_musl.patch.svn-base b/package/boot/grub2/patches/.svn/text-base/200-grub_musl.patch.svn-base
new file mode 100644
index 0000000..b1ff63a
--- /dev/null
+++ b/package/boot/grub2/patches/.svn/text-base/200-grub_musl.patch.svn-base
@@ -0,0 +1,22 @@
+diff -urN grub-2.00/build-aux/config.sub grub-2.00.new/build-aux/config.sub
+--- grub-2.00/build-aux/config.sub	2012-06-18 23:08:46.000000000 +0200
++++ grub-2.00.new/build-aux/config.sub	2012-11-22 14:12:12.190748353 +0100
+@@ -126,7 +126,8 @@
+   linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+   knetbsd*-gnu* | netbsd*-gnu* | \
+   kopensolaris*-gnu* | \
+-  storm-chaos* | os2-emx* | rtmk-nova*)
++  storm-chaos* | os2-emx* | rtmk-nova* | \
++  linux-musl*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
+@@ -1360,7 +1361,7 @@
+ 	      | -chorusos* | -chorusrdb* | -cegcc* \
+ 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -linux-android* \
+-	      | -linux-newlib* | -linux-uclibc* \
++	      | -linux-newlib* | -linux-uclibc* | -linux-musl* \
+ 	      | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \