'100-musl-compat.patch' does not seem to be required anymore. '210-fix_serial_rtscts.patchi' is superseeded by: http://git.savannah.gnu.org/cgit/grub.git/commit/?id=bac5d1a64ab4191058a8fd4c05f6b3b339e249e7 Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>master
parent
77812cdfec
commit
65c8f2890c
@ -1,26 +0,0 @@ |
||||
--- a/grub-core/osdep/unix/hostdisk.c
|
||||
+++ b/grub-core/osdep/unix/hostdisk.c
|
||||
@@ -48,11 +48,10 @@
|
||||
#ifdef __linux__
|
||||
# include <sys/ioctl.h> /* ioctl */
|
||||
# include <sys/mount.h>
|
||||
-# if !defined(__GLIBC__) || \
|
||||
- ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1)))
|
||||
+# if defined(__UCLIBC__)
|
||||
/* Maybe libc doesn't have large file support. */
|
||||
# include <linux/unistd.h> /* _llseek */
|
||||
-# endif /* (GLIBC < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR < 1)) */
|
||||
+# endif /* __UCLIBC__ */
|
||||
#endif /* __linux__ */
|
||||
|
||||
grub_uint64_t
|
||||
@@ -79,8 +78,7 @@ grub_util_get_fd_size (grub_util_fd_t fd
|
||||
return st.st_size;
|
||||
}
|
||||
|
||||
-#if defined(__linux__) && (!defined(__GLIBC__) || \
|
||||
- ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1))))
|
||||
+#if defined(__linux__) && defined(__UCLIBC__)
|
||||
/* Maybe libc doesn't have large file support. */
|
||||
int
|
||||
grub_util_fd_seek (grub_util_fd_t fd, grub_uint64_t off)
|
@ -1,14 +0,0 @@ |
||||
--- a/grub-core/term/serial.c
|
||||
+++ b/grub-core/term/serial.c
|
||||
@@ -241,9 +241,9 @@ grub_cmd_serial (grub_extcmd_context_t c
|
||||
|
||||
if (state[OPTION_RTSCTS].set)
|
||||
{
|
||||
- if (grub_strcmp (state[OPTION_PARITY].arg, "on") == 0)
|
||||
+ if (grub_strcmp (state[OPTION_RTSCTS].arg, "on") == 0)
|
||||
config.rtscts = 1;
|
||||
- if (grub_strcmp (state[OPTION_PARITY].arg, "off") == 0)
|
||||
+ else if (grub_strcmp (state[OPTION_RTSCTS].arg, "off") == 0)
|
||||
config.rtscts = 0;
|
||||
else
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT,
|
Loading…
Reference in new issue