Revert "Use my sort patch instead", fix BLS ostree detection

This reverts commit 93004a8494,
because it broke Rawhide. It also tries to fixes BLS ostree
detection to work in chroots (e.g. during installation) by also
checking for /ostree/repo.

0033-Use-rpm-s-sort-for-grub2-mkconfig.patch

@@ -0,0 +1,475 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Robert Marshall <rmarshall@redhat.com>
+Date: Mon, 16 Mar 2015 14:14:19 -0400
+Subject: [PATCH] Use rpm's sort for grub2-mkconfig
+
+Add an option for rpm-based systems to use the rpm-sort library to sort
+kernels.  This avoids problems due to discrepancies between `sort -V`
+and rpm.
+
+Signed-off-by: Robert Marshall <rmarshall@redhat.com>
+[pjones: fix --enable-rpm-sort configure option]
+Signed-off-by: Peter Jones <pjones@redhat.com>
+[thierry.vignaud: fix build with rpm-4.16]
+Signed-off-by: Thierry Vignaud <thierry.vignaud@gmail.com>
+[tim: fix disabling grub-rpm-sort by ./configure]
+Signed-off-by: Tim Landscheidt <tim@tim-landscheidt.de>
+[javierm: don't check for rpmvercmp in librpm]
+Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
+[rharwood: commit message]
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+---
+ configure.ac              |  37 ++++++
+ Makefile.util.def         |  17 +++
+ util/grub-rpm-sort.c      | 281 ++++++++++++++++++++++++++++++++++++++++++++++
+ util/grub-mkconfig_lib.in |  11 +-
+ util/grub-rpm-sort.8      |  12 ++
+ 5 files changed, 357 insertions(+), 1 deletion(-)
+ create mode 100644 util/grub-rpm-sort.c
+ create mode 100644 util/grub-rpm-sort.8
+
+diff --git a/configure.ac b/configure.ac
+index bec8535af70..643a13f9147 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath])
+ grub_TRANSFORM([grub-mkrescue])
+ grub_TRANSFORM([grub-probe])
+ grub_TRANSFORM([grub-reboot])
++grub_TRANSFORM([grub-rpm-sort])
+ grub_TRANSFORM([grub-script-check])
+ grub_TRANSFORM([grub-set-default])
+ grub_TRANSFORM([grub-sparc64-setup])
+@@ -95,6 +96,7 @@ grub_TRANSFORM([grub-mkrescue.1])
+ grub_TRANSFORM([grub-mkstandalone.3])
+ grub_TRANSFORM([grub-ofpathname.3])
+ grub_TRANSFORM([grub-probe.3])
++grub_TRANSFORM([grub-rpm-sort.8])
+ grub_TRANSFORM([grub-reboot.3])
+ grub_TRANSFORM([grub-render-label.3])
+ grub_TRANSFORM([grub-script-check.3])
+@@ -1860,6 +1862,35 @@ fi
+ 
+ AC_SUBST([LIBDEVMAPPER])
+ 
++AC_ARG_ENABLE([rpm-sort],
++              [AS_HELP_STRING([--enable-rpm-sort],
++                              [enable native rpm sorting of kernels in grub (default=guessed)])])
++if test x"$enable_rpm_sort" = xno ; then
++  rpm_sort_excuse="explicitly disabled"
++else
++  enable_rpm_sort=yes
++fi
++
++if test x"$rpm_sort_excuse" = x ; then
++  # Check for rpmlib header.
++  AC_CHECK_HEADER([rpm/rpmlib.h], [],
++               [rpm_sort_excuse="need rpm/rpmlib header"])
++fi
++
++if test x"$rpm_sort_excuse" = x ; then
++  # Check for rpmio library.
++  AC_CHECK_LIB([rpmio], [rpmvercmp], [],
++               [rpm_sort_excuse="rpmio missing rpmvercmp"])
++fi
++
++if test x"$rpm_sort_excuse" = x ; then
++   LIBRPM="-lrpmio";
++   AC_DEFINE([HAVE_RPMIO], [1],
++             [Define to 1 if you have the rpmio library.])
++fi
++
++AC_SUBST([LIBRPM])
++
+ LIBGEOM=
+ if test x$host_kernel = xkfreebsd; then
+   AC_CHECK_LIB([geom], [geom_gettree], [],
+@@ -2047,6 +2078,7 @@ AM_CONDITIONAL([COND_GRUB_EMU_SDL], [test x$enable_grub_emu_sdl = xyes])
+ AM_CONDITIONAL([COND_GRUB_EMU_PCI], [test x$enable_grub_emu_pci = xyes])
+ AM_CONDITIONAL([COND_GRUB_MKFONT], [test x$enable_grub_mkfont = xyes])
+ AM_CONDITIONAL([COND_GRUB_MOUNT], [test x$enable_grub_mount = xyes])
++AM_CONDITIONAL([COND_GRUB_RPM_SORT], [test x$enable_rpm_sort = xyes])
+ AM_CONDITIONAL([COND_HAVE_FONT_SOURCE], [test x$FONT_SOURCE != x])
+ if test x$FONT_SOURCE != x ; then
+    HAVE_FONT_SOURCE=1
+@@ -2168,6 +2200,11 @@ echo grub-mount: Yes
+ else
+ echo grub-mount: No "($grub_mount_excuse)"
+ fi
++if [ x"$rpm_sort_excuse" = x ]; then
++echo grub-rpm-sort: Yes
++else
++echo grub-rpm-sort: No "($rpm_sort_excuse)"
++fi
+ if [ x"$starfield_excuse" = x ]; then
+ echo starfield theme: Yes
+ echo With DejaVuSans font from $DJVU_FONT_SOURCE
+diff --git a/Makefile.util.def b/Makefile.util.def
+index 2c9b283a230..bc10cc79722 100644
+--- a/Makefile.util.def
++++ b/Makefile.util.def
+@@ -703,6 +703,23 @@ program = {
+   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+ };
+ 
++program = {
++  name = grub-rpm-sort;
++  mansection = 8;
++  installdir = sbin;
++
++  common = grub-core/kern/emu/misc.c;
++  common = grub-core/kern/emu/argp_common.c;
++  common = grub-core/osdep/init.c;
++  common = util/misc.c;
++  common = util/grub-rpm-sort.c;
++
++  ldadd = libgrubkern.a;
++  ldadd = grub-core/lib/gnulib/libgnu.a;
++  ldadd = '$(LIBDEVMAPPER) $(LIBRPM)';
++  condition = COND_GRUB_RPM_SORT;
++};
++
+ script = {
+   name = grub-mkconfig;
+   common = util/grub-mkconfig.in;
+diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c
+new file mode 100644
+index 00000000000..f33bd1ed568
+--- /dev/null
++++ b/util/grub-rpm-sort.c
+@@ -0,0 +1,281 @@
++#include <config.h>
++#include <grub/types.h>
++#include <grub/util/misc.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <errno.h>
++#include <assert.h>
++#include <argp.h>
++#include <rpm/rpmlib.h>
++
++static size_t
++read_file (const char *input, char **ret)
++{
++  FILE *in;
++  size_t s;
++  size_t sz = 2048;
++  size_t offset = 0;
++  char *text;
++
++  if (!strcmp(input, "-"))
++    in = stdin;
++  else
++    in = grub_util_fopen(input, "r");
++
++  text = xmalloc (sz);
++
++  if (!in)
++    grub_util_error (_("cannot open `%s': %s"), input, strerror (errno));
++
++  while ((s = fread (text + offset, 1, sz - offset, in)) != 0)
++    {
++      offset += s;
++      if (sz - offset == 0)
++	{
++	  sz += 2048;
++	  text = xrealloc (text, sz);
++	}
++    }
++
++  text[offset] = '\0';
++  *ret = text;
++
++  if (in != stdin)
++    fclose(in);
++
++  return offset + 1;
++}
++
++/* returns name/version/release */
++/* NULL string pointer returned if nothing found */
++static void
++split_package_string (char *package_string, char **name,
++                     char **version, char **release)
++{
++  char *package_version, *package_release;
++
++  /* Release */
++  package_release = strrchr (package_string, '-');
++
++  if (package_release != NULL)
++      *package_release++ = '\0';
++
++  *release = package_release;
++
++  /* Version */
++  package_version = strrchr(package_string, '-');
++
++  if (package_version != NULL)
++      *package_version++ = '\0';
++
++  *version = package_version;
++  /* Name */
++  *name = package_string;
++
++  /* Bubble up non-null values from release to name */
++  if (*name == NULL)
++    {
++      *name = (*version == NULL ? *release : *version);
++      *version = *release;
++      *release = NULL;
++    }
++  if (*version == NULL)
++    {
++      *version = *release;
++      *release = NULL;
++    }
++}
++
++/*
++ * package name-version-release comparator for qsort
++ * expects p, q which are pointers to character strings (char *)
++ * which will not be altered in this function
++ */
++static int
++package_version_compare (const void *p, const void *q)
++{
++  char *local_p, *local_q;
++  char *lhs_name, *lhs_version, *lhs_release;
++  char *rhs_name, *rhs_version, *rhs_release;
++  int vercmpflag = 0;
++
++  local_p = alloca (strlen (*(char * const *)p) + 1);
++  local_q = alloca (strlen (*(char * const *)q) + 1);
++
++  /* make sure these allocated */
++  assert (local_p);
++  assert (local_q);
++
++  strcpy (local_p, *(char * const *)p);
++  strcpy (local_q, *(char * const *)q);
++
++  split_package_string (local_p, &lhs_name, &lhs_version, &lhs_release);
++  split_package_string (local_q, &rhs_name, &rhs_version, &rhs_release);
++
++  /* Check Name and return if unequal */
++  vercmpflag = rpmvercmp ((lhs_name == NULL ? "" : lhs_name),
++                          (rhs_name == NULL ? "" : rhs_name));
++  if (vercmpflag != 0)
++    return vercmpflag;
++
++  /* Check version and return if unequal */
++  vercmpflag = rpmvercmp ((lhs_version == NULL ? "" : lhs_version),
++                          (rhs_version == NULL ? "" : rhs_version));
++  if (vercmpflag != 0)
++    return vercmpflag;
++
++  /* Check release and return the version compare value */
++  vercmpflag = rpmvercmp ((lhs_release == NULL ? "" : lhs_release),
++                          (rhs_release == NULL ? "" : rhs_release));
++
++  return vercmpflag;
++}
++
++static void
++add_input (const char *filename, char ***package_names, size_t *n_package_names)
++{
++  char *orig_input_buffer = NULL;
++  char *input_buffer;
++  char *position_of_newline;
++  char **names = *package_names;
++  char **new_names = NULL;
++  size_t n_names = *n_package_names;
++
++  if (!*package_names)
++    new_names = names = xmalloc (sizeof (char *) * 2);
++
++  if (read_file (filename, &orig_input_buffer) < 2)
++    {
++      if (new_names)
++	free (new_names);
++      if (orig_input_buffer)
++	free (orig_input_buffer);
++      return;
++    }
++
++  input_buffer = orig_input_buffer;
++  while (input_buffer && *input_buffer &&
++	 (position_of_newline = strchrnul (input_buffer, '\n')))
++    {
++      size_t sz = position_of_newline - input_buffer;
++      char *new;
++
++      if (sz == 0)
++	{
++	  input_buffer = position_of_newline + 1;
++	  continue;
++	}
++
++      new = xmalloc (sz+1);
++      strncpy (new, input_buffer, sz);
++      new[sz] = '\0';
++
++      names = xrealloc (names, sizeof (char *) * (n_names + 1));
++      names[n_names] = new;
++      n_names++;
++
++      /* move buffer ahead to next line */
++      input_buffer = position_of_newline + 1;
++      if (*position_of_newline == '\0')
++	input_buffer = NULL;
++    }
++
++  free (orig_input_buffer);
++
++  *package_names = names;
++  *n_package_names = n_names;
++}
++
++static char *
++help_filter (int key, const char *text, void *input __attribute__ ((unused)))
++{
++  return (char *)text;
++}
++
++static struct argp_option options[] = {
++  { 0, }
++};
++
++struct arguments
++{
++  size_t ninputs;
++  size_t input_max;
++  char **inputs;
++};
++
++static error_t
++argp_parser (int key, char *arg, struct argp_state *state)
++{
++  struct arguments *arguments = state->input;
++  switch (key)
++    {
++    case ARGP_KEY_ARG:
++      assert (arguments->ninputs < arguments->input_max);
++      arguments->inputs[arguments->ninputs++] = xstrdup (arg);
++      break;
++    default:
++      return ARGP_ERR_UNKNOWN;
++    }
++  return 0;
++}
++
++static struct argp argp = {
++  options, argp_parser, N_("[INPUT_FILES]"),
++  N_("Sort a list of strings in RPM version sort order."),
++  NULL, help_filter, NULL
++};
++
++int
++main (int argc, char *argv[])
++{
++  struct arguments arguments;
++  char **package_names = NULL;
++  size_t n_package_names = 0;
++  int i;
++
++  grub_util_host_init (&argc, &argv);
++
++  memset (&arguments, 0, sizeof (struct arguments));
++  arguments.input_max = argc+1;
++  arguments.inputs = xmalloc ((arguments.input_max + 1)
++			      * sizeof (arguments.inputs[0]));
++  memset (arguments.inputs, 0, (arguments.input_max + 1)
++	  * sizeof (arguments.inputs[0]));
++
++  /* Parse our arguments */
++  if (argp_parse (&argp, argc, argv, 0, 0, &arguments) != 0)
++    grub_util_error ("%s", _("Error in parsing command line arguments\n"));
++
++  /* If there's no inputs in argv, add one for stdin */
++  if (!arguments.ninputs)
++    {
++      arguments.ninputs = 1;
++      arguments.inputs[0] = xmalloc (2);
++      strcpy(arguments.inputs[0], "-");
++    }
++
++  for (i = 0; i < arguments.ninputs; i++)
++    add_input(arguments.inputs[i], &package_names, &n_package_names);
++
++  if (package_names == NULL || n_package_names < 1)
++    grub_util_error ("%s", _("Invalid input\n"));
++
++  qsort (package_names, n_package_names, sizeof (char *),
++	 package_version_compare);
++
++  /* send sorted list to stdout */
++  for (i = 0; i < n_package_names; i++)
++    {
++      fprintf (stdout, "%s\n", package_names[i]);
++      free (package_names[i]);
++    }
++
++  free (package_names);
++  for (i = 0; i < arguments.ninputs; i++)
++    free (arguments.inputs[i]);
++
++  free (arguments.inputs);
++
++  return 0;
++}
+diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
+index 0f6505bf3b6..42c2ea9ba50 100644
+--- a/util/grub-mkconfig_lib.in
++++ b/util/grub-mkconfig_lib.in
+@@ -33,6 +33,9 @@ fi
+ if test "x$grub_mkrelpath" = x; then
+   grub_mkrelpath="${bindir}/@grub_mkrelpath@"
+ fi
++if test "x$grub_rpm_sort" = x; then
++  grub_rpm_sort="${sbindir}/@grub_rpm_sort@"
++fi
+ 
+ if command -v gettext >/dev/null; then
+   :
+@@ -218,6 +221,12 @@ version_sort ()
+    esac
+ }
+ 
++if [ "x$grub_rpm_sort" != x -a -x "$grub_rpm_sort" ]; then
++  kernel_sort="$grub_rpm_sort"
++else
++  kernel_sort=version_sort
++fi
++
+ version_test_numeric ()
+ {
+   version_test_numeric_a="$1"
+@@ -234,7 +243,7 @@ version_test_numeric ()
+     version_test_numeric_a="$version_test_numeric_b"
+     version_test_numeric_b="$version_test_numeric_c"
+   fi
+-  if (echo "$version_test_numeric_a" ; echo "$version_test_numeric_b") | version_sort | head -n 1 | grep -qx "$version_test_numeric_b" ; then
++  if (echo "$version_test_numeric_a" ; echo "$version_test_numeric_b") | "$kernel_sort" | head -n 1 | grep -qx "$version_test_numeric_b" ; then
+     return 0
+   else
+     return 1
+diff --git a/util/grub-rpm-sort.8 b/util/grub-rpm-sort.8
+new file mode 100644
+index 00000000000..8ce21488448
+--- /dev/null
++++ b/util/grub-rpm-sort.8
+@@ -0,0 +1,12 @@
++.TH GRUB-RPM-SORT 8 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-rpm-sort\fR \(em Sort input according to RPM version compare.
++
++.SH SYNOPSIS
++\fBgrub-rpm-sort\fR [OPTIONS].
++
++.SH DESCRIPTION
++You should not normally run this program directly.  Use grub-mkconfig instead.
++
++.SH SEE ALSO
++.BR "info grub"

0035-Add-friendly-grub2-password-config-tool-985962.patch

@@ -27,7 +27,7 @@ Andy Lutomirski <luto@kernel.org>
  create mode 100644 util/grub.d/01_users.in
 
 diff --git a/configure.ac b/configure.ac
-index bec8535af70..22d289eacb9 100644
+index 643a13f9147..25e1abb59b9 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath])
@@ -35,11 +35,11 @@ index bec8535af70..22d289eacb9 100644
  grub_TRANSFORM([grub-probe])
  grub_TRANSFORM([grub-reboot])
 +grub_TRANSFORM([grub-set-password])
+ grub_TRANSFORM([grub-rpm-sort])
  grub_TRANSFORM([grub-script-check])
  grub_TRANSFORM([grub-set-default])
- grub_TRANSFORM([grub-sparc64-setup])
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 2c9b283a230..4ee22c5daad 100644
+index bc10cc79722..8ca4c14f0b9 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -452,6 +452,12 @@ script = {
@@ -55,7 +55,7 @@ index 2c9b283a230..4ee22c5daad 100644
  script = {
    name = '10_windows';
    common = util/grub.d/10_windows.in;
-@@ -724,6 +730,13 @@ script = {
+@@ -741,6 +747,13 @@ script = {
    installdir = sbin;
  };
  

0038-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch

@@ -23,7 +23,7 @@ Resolves: rhbz#1226325
  create mode 100644 util/grub-get-kernel-settings.in
 
 diff --git a/configure.ac b/configure.ac
-index 22d289eacb9..c02898b7568 100644
+index 25e1abb59b9..58e57a745fa 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -65,6 +65,7 @@ grub_TRANSFORM([grub-install])
@@ -34,7 +34,7 @@ index 22d289eacb9..c02898b7568 100644
  grub_TRANSFORM([grub-glue-efi])
  grub_TRANSFORM([grub-mklayout])
  grub_TRANSFORM([grub-mkpasswd-pbkdf2])
-@@ -81,6 +82,7 @@ grub_TRANSFORM([grub-file])
+@@ -82,6 +83,7 @@ grub_TRANSFORM([grub-file])
  grub_TRANSFORM([grub-bios-setup.3])
  grub_TRANSFORM([grub-editenv.1])
  grub_TRANSFORM([grub-fstest.3])
@@ -43,10 +43,10 @@ index 22d289eacb9..c02898b7568 100644
  grub_TRANSFORM([grub-install.1])
  grub_TRANSFORM([grub-kbdcomp.3])
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 4ee22c5daad..18a92427767 100644
+index 8ca4c14f0b9..43a1c7453b1 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -716,6 +716,13 @@ script = {
+@@ -733,6 +733,13 @@ script = {
    installdir = sbin;
  };
  

0041-Fix-up-some-man-pages-rpmdiff-noticed.patch

@@ -13,10 +13,10 @@ Subject: [PATCH] Fix up some man pages rpmdiff noticed.
  create mode 100644 util/grub-syslinux2cfg.1
 
 diff --git a/configure.ac b/configure.ac
-index c02898b7568..24f3be54bca 100644
+index 58e57a745fa..a0030632220 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -86,6 +86,7 @@ grub_TRANSFORM([grub-get-kernel-settings.3])
+@@ -87,6 +87,7 @@ grub_TRANSFORM([grub-get-kernel-settings.3])
  grub_TRANSFORM([grub-glue-efi.3])
  grub_TRANSFORM([grub-install.1])
  grub_TRANSFORM([grub-kbdcomp.3])
@@ -24,7 +24,7 @@ index c02898b7568..24f3be54bca 100644
  grub_TRANSFORM([grub-menulst2cfg.1])
  grub_TRANSFORM([grub-mkconfig.1])
  grub_TRANSFORM([grub-mkfont.3])
-@@ -103,6 +104,7 @@ grub_TRANSFORM([grub-render-label.3])
+@@ -105,6 +106,7 @@ grub_TRANSFORM([grub-render-label.3])
  grub_TRANSFORM([grub-script-check.3])
  grub_TRANSFORM([grub-set-default.1])
  grub_TRANSFORM([grub-sparc64-setup.3])

0048-grub2-btrfs-05-grub2-mkconfig.patch

@@ -27,10 +27,10 @@ index 005f093809b..535c0f02499 100644
  if test "x${grub_cfg}" != "x"; then
    rm -f "${grub_cfg}.new"
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 0f6505bf3b6..5e96f6cc5d2 100644
+index 42c2ea9ba50..fafeac95061 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
-@@ -49,7 +49,11 @@ grub_warn ()
+@@ -52,7 +52,11 @@ grub_warn ()
  
  make_system_path_relative_to_its_root ()
  {

0061-Add-BLS-support-to-grub-mkconfig.patch

@@ -89,7 +89,7 @@ index 535c0f02499..f55339a3f64 100644
  if test "x${grub_cfg}" != "x"; then
    rm -f "${grub_cfg}.new"
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 5e96f6cc5d2..301d8a8a1e4 100644
+index fafeac95061..d8bb4069360 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
 @@ -30,6 +30,9 @@ fi
@@ -102,7 +102,7 @@ index 5e96f6cc5d2..301d8a8a1e4 100644
  if test "x$grub_mkrelpath" = x; then
    grub_mkrelpath="${bindir}/@grub_mkrelpath@"
  fi
-@@ -122,8 +125,19 @@ EOF
+@@ -125,8 +128,19 @@ EOF
    fi
  }
  
@@ -122,7 +122,7 @@ index 5e96f6cc5d2..301d8a8a1e4 100644
    old_ifs="$IFS"
    IFS='
  '
-@@ -158,18 +172,18 @@ prepare_grub_to_access_device ()
+@@ -161,18 +175,18 @@ prepare_grub_to_access_device ()
    # otherwise set root as per value in device.map.
    fs_hint="`"${grub_probe}" --device $@ --target=compatibility_hint`"
    if [ "x$fs_hint" != x ]; then

0064-Add-grub2-switch-to-blscfg.patch

@@ -20,10 +20,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  create mode 100644 util/grub-switch-to-blscfg.in
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 18a92427767..88f55e35c47 100644
+index 43a1c7453b1..a90879fa9ba 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -1348,6 +1348,13 @@ program = {
+@@ -1365,6 +1365,13 @@ program = {
    ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
  };
  
@@ -420,7 +420,7 @@ index 9fcd77cacc3..81f35a2f3f0 100644
  get_sorted_bls()
  {
 -    if ! [ -d "${blsdir}" ]; then
-+    if ! [ -d "${blsdir}" ] || [ -f /run/ostree-booted ]; then
++    if ! [ -d "${blsdir}" ] || [ -f /run/ostree-booted ] || [ -d /ostree/repo ]]; then
          return
      fi
  

0065-make-better-backtraces.patch

@@ -38,7 +38,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  delete mode 100644 grub-core/lib/i386/backtrace.c
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 88f55e35c47..bda9fd12111 100644
+index a90879fa9ba..48512bc6311 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -51,6 +51,12 @@ library = {

0068-Make-it-possible-to-enabled-build-id-sha1.patch

@@ -10,10 +10,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 27 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 24f3be54bca..a4ca2ec542e 100644
+index a0030632220..b50fb2e9897 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1468,7 +1468,15 @@ grub_PROG_TARGET_CC
+@@ -1470,7 +1470,15 @@ grub_PROG_TARGET_CC
  if test "x$TARGET_APPLE_LINKER" != x1 ; then
  grub_PROG_OBJCOPY_ABSOLUTE
  fi

0085-Add-auto-hide-menu-support.patch

@@ -49,7 +49,7 @@ Changes in v2:
  create mode 100644 util/grub.d/01_menu_auto_hide.in
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index bda9fd12111..cb8e3c3270d 100644
+index 48512bc6311..314e6f2acf8 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -458,6 +458,12 @@ script = {

0086-Add-grub-set-bootflag-utility.patch

@@ -48,10 +48,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  create mode 100644 util/grub-set-bootflag.1
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index cb8e3c3270d..d066652e9bb 100644
+index 314e6f2acf8..0b85a7fce4a 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -1429,3 +1429,10 @@ program = {
+@@ -1446,3 +1446,10 @@ program = {
    ldadd = grub-core/lib/gnulib/libgnu.a;
    ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
  };

0092-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch

@@ -17,10 +17,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  3 files changed, 64 insertions(+), 16 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index a4ca2ec542e..f685f300327 100644
+index b50fb2e9897..b27573b3de5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -875,11 +875,23 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$p
+@@ -877,11 +877,23 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$p
    TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow"
  fi
  
@@ -45,7 +45,7 @@ index a4ca2ec542e..f685f300327 100644
    AC_CACHE_CHECK([for options to get soft-float], grub_cv_target_cc_soft_float, [
      grub_cv_target_cc_soft_float=no
      if test "x$target_cpu" = xarm64; then
-@@ -1980,6 +1992,41 @@ HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_builddir)/include"
+@@ -2011,6 +2023,41 @@ HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_builddir)/include"
  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_srcdir)/include"
  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_builddir)/include"
  

0095-Disable-non-wordsize-allocations-on-arm.patch

@@ -9,10 +9,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 20 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index f685f300327..8fd57b709ff 100644
+index b27573b3de5..bb4e05ceef3 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1286,6 +1286,26 @@ if test "x$target_cpu" = xarm; then
+@@ -1288,6 +1288,26 @@ if test "x$target_cpu" = xarm; then
      done
    ])
  

0099-Add-a-version-command.patch

@@ -17,10 +17,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  create mode 100644 grub-core/commands/version.c
 
 diff --git a/configure.ac b/configure.ac
-index 8fd57b709ff..31a08ff9b8e 100644
+index bb4e05ceef3..59ccda24475 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -310,6 +310,19 @@ AC_SUBST(target_cpu)
+@@ -312,6 +312,19 @@ AC_SUBST(target_cpu)
  AC_SUBST(platform)
  
  # Define default variables

0103-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch

@@ -14,8 +14,9 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  util/grub-menulst2cfg.c           |  2 +-
  util/grub-mkfont.c                | 13 +++++++------
  util/grub-probe.c                 |  2 +-
+ util/grub-rpm-sort.c              |  2 +-
  util/setup.c                      |  2 +-
- 10 files changed, 17 insertions(+), 16 deletions(-)
+ 11 files changed, 18 insertions(+), 17 deletions(-)
 
 diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
 index eeea092752d..f08a1bb8415 100644
@@ -184,6 +185,19 @@ index c08e46bbb40..c6fac732b40 100644
  
  	for (i = PRINT_FS; i < ARRAY_SIZE (targets); i++)
  	  if (strcmp (arg, targets[i]) == 0)
+diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c
+index f33bd1ed568..8345944105f 100644
+--- a/util/grub-rpm-sort.c
++++ b/util/grub-rpm-sort.c
+@@ -232,7 +232,7 @@ main (int argc, char *argv[])
+   struct arguments arguments;
+   char **package_names = NULL;
+   size_t n_package_names = 0;
+-  int i;
++  unsigned int i;
+ 
+   grub_util_host_init (&argc, &argv);
+ 
 diff --git a/util/setup.c b/util/setup.c
 index da5f2c07f50..8b22bb8ccac 100644
 --- a/util/setup.c

0104-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch

@@ -11,10 +11,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 31a08ff9b8e..efc871a6732 100644
+index 59ccda24475..6eb297fdbf6 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1478,11 +1478,11 @@ fi
+@@ -1480,11 +1480,11 @@ fi
  # Set them to their new values for the tests below.
  CC="$TARGET_CC"
  if test x"$platform" = xemu ; then
@@ -29,7 +29,7 @@ index 31a08ff9b8e..efc871a6732 100644
  fi
  CPPFLAGS="$TARGET_CPPFLAGS"
  
-@@ -2016,6 +2016,14 @@ if test x"$enable_werror" != xno ; then
+@@ -2047,6 +2047,14 @@ if test x"$enable_werror" != xno ; then
    HOST_CFLAGS="$HOST_CFLAGS -Werror"
  fi
  

0110-Do-not-allow-stack-trampolines-anywhere.patch

@@ -10,10 +10,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index efc871a6732..b45ddb2292f 100644
+index 6eb297fdbf6..c6bd965f1f9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2024,6 +2024,9 @@ if test x"$enable_wextra" != xno ; then
+@@ -2055,6 +2055,9 @@ if test x"$enable_wextra" != xno ; then
    HOST_CFLAGS="$HOST_CFLAGS -Wextra"
  fi
  

0111-Reimplement-boot_counter.patch

@@ -23,7 +23,7 @@ Signed-off-by: Christian Glombek <lorbus@fedoraproject.org>
  create mode 100644 util/grub.d/01_fallback_counting.in
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index d066652e9bb..e10fe766d1d 100644
+index 0b85a7fce4a..27a13bc734e 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -458,6 +458,12 @@ script = {

0117-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch

@@ -21,7 +21,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  rename util/grub.d/{01_menu_auto_hide.in => 12_menu_auto_hide.in} (58%)
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index e10fe766d1d..b4ce5383b76 100644
+index 27a13bc734e..2e6ad979c3e 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -459,14 +459,14 @@ script = {