rpms/grub2
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
89b6faf012
grub2/0152-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch

60 lines
2.0 KiB
Diff
Raw Normal View History

Some more bug fixes and just some general hygiene. Add 2 conditions to boot-success timer and service: Don't run it for system users Resolves: rhbz#1592201 Don't run it when pkexec isn't available Resolves: rhbz#1619445 Use -Wsign-compare -Wconversion -Wextra in the build. Related: rhbz#1624532 Related: rhbz#1626844 Signed-off-by: Peter Jones <pjones@redhat.com>
2018-09-12 14:34:10 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Update to grub 2.04 This change updates grub to the 2.04 release. The new release changed how grub is built, so the bootstrap and bootstrap.conf files have to be added to the dist-git. Also, the gitignore file changed so it has to be updated. Since the patches have been forward ported to 2.04, there's no need for a logic to maintain a patch with the delta between the release and the grub master branch. So the release-to-master.patch is dropped and no longer is updated by the do-rebase script. Also since gnulib isn't part of the grub repository anymore and cloned by the boostrap tool, a gnulib tarball is included as other source file and copied before calling the bootstrap tool. That way grub can be built even in builders that only have access to the sources lookaside cache. Resolves: rhbz#1727279 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2019-08-15 06:01:31 +00:00
Date: Thu, 11 Jul 2019 18:20:37 +0200
Some more bug fixes and just some general hygiene. Add 2 conditions to boot-success timer and service: Don't run it for system users Resolves: rhbz#1592201 Don't run it when pkexec isn't available Resolves: rhbz#1619445 Use -Wsign-compare -Wconversion -Wextra in the build. Related: rhbz#1624532 Related: rhbz#1626844 Signed-off-by: Peter Jones <pjones@redhat.com>
2018-09-12 14:34:10 +00:00
Subject: [PATCH] Don't use -Wno-sign-compare -Wno-conversion -Wno-error, do
use -Wextra.
Signed-off-by: Peter Jones <pjones@redhat.com>
---
configure.ac | 14 +++++++++++---
conf/Makefile.common | 2 +-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
Update to grub 2.04 This change updates grub to the 2.04 release. The new release changed how grub is built, so the bootstrap and bootstrap.conf files have to be added to the dist-git. Also, the gitignore file changed so it has to be updated. Since the patches have been forward ported to 2.04, there's no need for a logic to maintain a patch with the delta between the release and the grub master branch. So the release-to-master.patch is dropped and no longer is updated by the do-rebase script. Also since gnulib isn't part of the grub repository anymore and cloned by the boostrap tool, a gnulib tarball is included as other source file and copied before calling the bootstrap tool. That way grub can be built even in builders that only have access to the sources lookaside cache. Resolves: rhbz#1727279 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2019-08-15 06:01:31 +00:00
index bca7c2818af..38d978bd650 100644
Some more bug fixes and just some general hygiene. Add 2 conditions to boot-success timer and service: Don't run it for system users Resolves: rhbz#1592201 Don't run it when pkexec isn't available Resolves: rhbz#1619445 Use -Wsign-compare -Wconversion -Wextra in the build. Related: rhbz#1624532 Related: rhbz#1626844 Signed-off-by: Peter Jones <pjones@redhat.com>
2018-09-12 14:34:10 +00:00
--- a/configure.ac
+++ b/configure.ac
Update to grub 2.04 This change updates grub to the 2.04 release. The new release changed how grub is built, so the bootstrap and bootstrap.conf files have to be added to the dist-git. Also, the gitignore file changed so it has to be updated. Since the patches have been forward ported to 2.04, there's no need for a logic to maintain a patch with the delta between the release and the grub master branch. So the release-to-master.patch is dropped and no longer is updated by the do-rebase script. Also since gnulib isn't part of the grub repository anymore and cloned by the boostrap tool, a gnulib tarball is included as other source file and copied before calling the bootstrap tool. That way grub can be built even in builders that only have access to the sources lookaside cache. Resolves: rhbz#1727279 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2019-08-15 06:01:31 +00:00
@@ -1424,11 +1424,11 @@ fi
Some more bug fixes and just some general hygiene. Add 2 conditions to boot-success timer and service: Don't run it for system users Resolves: rhbz#1592201 Don't run it when pkexec isn't available Resolves: rhbz#1619445 Use -Wsign-compare -Wconversion -Wextra in the build. Related: rhbz#1624532 Related: rhbz#1626844 Signed-off-by: Peter Jones <pjones@redhat.com>
2018-09-12 14:34:10 +00:00
# Set them to their new values for the tests below.
CC="$TARGET_CC"
if test x"$platform" = xemu ; then
-CFLAGS="$TARGET_CFLAGS -Wno-error"
+CFLAGS="$TARGET_CFLAGS"
elif test "x$TARGET_APPLE_LINKER" = x1 ; then
-CFLAGS="$TARGET_CFLAGS -nostdlib -static -Wno-error"
+CFLAGS="$TARGET_CFLAGS -nostdlib -static"
else
-CFLAGS="$TARGET_CFLAGS -nostdlib -Wno-error"
+CFLAGS="$TARGET_CFLAGS -nostdlib"
fi
CPPFLAGS="$TARGET_CPPFLAGS"
Update to grub 2.04 This change updates grub to the 2.04 release. The new release changed how grub is built, so the bootstrap and bootstrap.conf files have to be added to the dist-git. Also, the gitignore file changed so it has to be updated. Since the patches have been forward ported to 2.04, there's no need for a logic to maintain a patch with the delta between the release and the grub master branch. So the release-to-master.patch is dropped and no longer is updated by the do-rebase script. Also since gnulib isn't part of the grub repository anymore and cloned by the boostrap tool, a gnulib tarball is included as other source file and copied before calling the bootstrap tool. That way grub can be built even in builders that only have access to the sources lookaside cache. Resolves: rhbz#1727279 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2019-08-15 06:01:31 +00:00
@@ -1987,6 +1987,14 @@ if test x"$enable_werror" != xno ; then
Some more bug fixes and just some general hygiene. Add 2 conditions to boot-success timer and service: Don't run it for system users Resolves: rhbz#1592201 Don't run it when pkexec isn't available Resolves: rhbz#1619445 Use -Wsign-compare -Wconversion -Wextra in the build. Related: rhbz#1624532 Related: rhbz#1626844 Signed-off-by: Peter Jones <pjones@redhat.com>
2018-09-12 14:34:10 +00:00
HOST_CFLAGS="$HOST_CFLAGS -Werror"
fi
+AC_ARG_ENABLE([wextra],
+ [AS_HELP_STRING([--disable-wextra],
+ [do not use -Wextra when building GRUB])])
+if test x"$enable_wextra" != xno ; then
+ TARGET_CFLAGS="$TARGET_CFLAGS -Wextra"
+ HOST_CFLAGS="$HOST_CFLAGS -Wextra"
+fi
+
TARGET_CPP="$TARGET_CC -E"
TARGET_CCAS=$TARGET_CC
diff --git a/conf/Makefile.common b/conf/Makefile.common
Update to grub 2.04 This change updates grub to the 2.04 release. The new release changed how grub is built, so the bootstrap and bootstrap.conf files have to be added to the dist-git. Also, the gitignore file changed so it has to be updated. Since the patches have been forward ported to 2.04, there's no need for a logic to maintain a patch with the delta between the release and the grub master branch. So the release-to-master.patch is dropped and no longer is updated by the do-rebase script. Also since gnulib isn't part of the grub repository anymore and cloned by the boostrap tool, a gnulib tarball is included as other source file and copied before calling the bootstrap tool. That way grub can be built even in builders that only have access to the sources lookaside cache. Resolves: rhbz#1727279 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2019-08-15 06:01:31 +00:00
index bbf33b0bc4a..b867691f125 100644
Some more bug fixes and just some general hygiene. Add 2 conditions to boot-success timer and service: Don't run it for system users Resolves: rhbz#1592201 Don't run it when pkexec isn't available Resolves: rhbz#1619445 Use -Wsign-compare -Wconversion -Wextra in the build. Related: rhbz#1624532 Related: rhbz#1626844 Signed-off-by: Peter Jones <pjones@redhat.com>
2018-09-12 14:34:10 +00:00
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -66,7 +66,7 @@ grubconfdir = $(sysconfdir)/grub.d
platformdir = $(pkglibdir)/$(target_cpu)-$(platform)
starfielddir = $(pkgdatadir)/themes/starfield
-CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Wno-conversion
+CFLAGS_GNULIB = -Wno-undef -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code
Update to grub 2.04 This change updates grub to the 2.04 release. The new release changed how grub is built, so the bootstrap and bootstrap.conf files have to be added to the dist-git. Also, the gitignore file changed so it has to be updated. Since the patches have been forward ported to 2.04, there's no need for a logic to maintain a patch with the delta between the release and the grub master branch. So the release-to-master.patch is dropped and no longer is updated by the do-rebase script. Also since gnulib isn't part of the grub repository anymore and cloned by the boostrap tool, a gnulib tarball is included as other source file and copied before calling the bootstrap tool. That way grub can be built even in builders that only have access to the sources lookaside cache. Resolves: rhbz#1727279 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2019-08-15 06:01:31 +00:00
CPPFLAGS_GNULIB = -I$(top_builddir)/grub-core/lib/gnulib -I$(top_srcdir)/grub-core/lib/gnulib
Some more bug fixes and just some general hygiene. Add 2 conditions to boot-success timer and service: Don't run it for system users Resolves: rhbz#1592201 Don't run it when pkexec isn't available Resolves: rhbz#1619445 Use -Wsign-compare -Wconversion -Wextra in the build. Related: rhbz#1624532 Related: rhbz#1626844 Signed-off-by: Peter Jones <pjones@redhat.com>
2018-09-12 14:34:10 +00:00
CFLAGS_POSIX = -fno-builtin
Reference in New Issue Copy Permalink