May 2022 - Arch-excludes - Fedora Mailing-Lists

Architecture specific change in rpms/netdata.git

by githook-noreply＠fedoraproject.org

The package rpms/netdata.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/netdata.git/commit/?id=da8df30485... https://src.fedoraproject.org/cgit/rpms/netdata.git/commit/?id=65fa8eb3bb.... Change: -%ifarch x86_64 +%ifarch x86_64 Thanks. Full change: ============ commit 48dc81dfc8371692fe620208c1d430908ddb8249 Author: Didier Fabert <didier.fabert(a)gmail.com> Date: Tue May 3 17:19:27 2022 +0200 Revert stock config files to /etc/netdata, part2 diff --git a/netdata.profile b/netdata.profile new file mode 100644 index 0000000..0673b29 --- /dev/null +++ b/netdata.profile @@ -0,0 +1,5 @@ +# env vars for netdata +export NETDATA_STOCK_CONFIG_DIR="/etc/netdata/conf.d" +export NETDATA_USER_CONFIG_DIR="/etc/netdata" +export NETDATA_VARLIB_DIR="/var/lib/netdata" +export NETDATA_CACHE_DIR="/var/cache/netdata" commit da8df3048514de25d253a572ef4b05f2906ff1b9 Author: Didier Fabert <didier.fabert(a)gmail.com> Date: Tue May 3 17:12:54 2022 +0200 Revert stock config files to /etc/netdata diff --git a/netdata.spec b/netdata.spec index 5aa13e5..31434e3 100644 --- a/netdata.spec +++ b/netdata.spec @@ -41,7 +41,6 @@ ExcludeArch: s390x # Last python 2 support (el7 only) %global protobuf_cpp_ver 3.17.3 -%global stock_conf_path %{_prefix}/lib/%{name} Name: netdata Version: %{upver}%{?rcver:~%{rcver}} @@ -54,6 +53,7 @@ Source0: https://github.com/netdata/netdata/releases/download/v%{upver}%{ Source1: netdata.tmpfiles.conf Source2: netdata.init Source3: netdata.conf +Source4: netdata.profile Source5: README-packager.md # Only for el7 Source10: https://github.com/protocolbuffers/protobuf/releases/download/v%{protobuf... @@ -212,7 +212,7 @@ autoreconf -ivf --with-zlib \ --with-math \ --with-user=netdata - + %make_build %install @@ -233,18 +233,10 @@ mkdir -p %{buildroot}%{_localstatedir}/cache/%{name} mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d install -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/ install -p -m 0644 system/netdata.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -# it's better to put stock config file in a noarch pkg (like systemd) -%ifarch x86_64 -mkdir -p %{buildroot}%{stock_conf_path}/conf.d -mv %{buildroot}%{_libdir}/%{name}/conf.d/* %{buildroot}%{stock_conf_path}/conf.d -%endif - +# Conf files must be in /etc, dixit FHS and it's better in a noarch pkg +mv %{buildroot}%{_libdir}/%{name}/conf.d %{buildroot}%{_sysconfdir}/%{name}/ # Scripts must not be in /etc, /usr/libexec is a better place mv %{buildroot}%{_sysconfdir}/%{name}/edit-config %{buildroot}%{_libexecdir}/%{name}/edit-config -# Force stock config file to a noarch path (like systemd) -%ifarch x86_64 -sed -i -e '/NETDATA_STOCK_CONFIG_DIR/ s/lib64/lib/' %{buildroot}%{_libexecdir}/%{name}/edit-config -%endif # Fix EOL sed -i -e 's/\r//' %{buildroot}%{_datadir}/%{name}/web/lib/tableExport-1.6.0.min.js # Delete useless hidden dir @@ -256,6 +248,9 @@ for dir in charts.d health.d python.d statsd.d ; do mkdir -p %{buildroot}%{_sysconfdir}/%{name}/${dir} done +mkdir -p %{buildroot}%{_sysconfdir}/profile.d +install -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/netdata.sh + %check make tests @@ -265,9 +260,6 @@ getent passwd netdata > /dev/null || useradd -r -g netdata -c "NetData User" -s %post sed -i -e '/web files group/ s/root/netdata/' /etc/netdata/netdata.conf ||: -sed -i -e '/stock config directory/ s;/etc/netdata/conf.d;/usr/lib/netdata/conf.d;' /etc/netdata/netdata.conf ||: -sed -i -e '/stock health configuration directory/ s;/etc/netdata/conf.d/health.d;/usr/lib/netdata/conf.d/health.d;' /etc/netdata/netdata.conf ||: -rm -f %{_sysconfdir}/profile.d/netdata.sh ||: %systemd_post %{name}.service echo "The current config file can be downloaded with the following command" echo "curl -o /etc/netdata/netdata.conf http://localhost:19999/netdata.conf" @@ -311,13 +303,24 @@ echo "Config should be edited with %{_libexecdir}/%{name}/edit-config" %dir %{_sysconfdir}/%{name}/health.d %dir %{_sysconfdir}/%{name}/python.d %dir %{_sysconfdir}/%{name}/statsd.d -%dir %{stock_conf_path} -%{_sysconfdir}/%{name}/.install-type -%{stock_conf_path}/conf.d/* +%dir %{_sysconfdir}/%{name}/conf.d +%dir %{_sysconfdir}/%{name}/conf.d/charts.d +%dir %{_sysconfdir}/%{name}/conf.d/health.d +%dir %{_sysconfdir}/%{name}/conf.d/python.d +%dir %{_sysconfdir}/%{name}/conf.d/statsd.d +%dir %{_sysconfdir}/%{name}/conf.d/ebpf.d %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf -%config(noreplace) %{_sysconfdir}/logrotate.d/netdata +%config %{_sysconfdir}/%{name}/conf.d/*.conf +%config %{_sysconfdir}/%{name}/conf.d/charts.d/*.conf +%config %{_sysconfdir}/%{name}/conf.d/health.d/*.conf +%config %{_sysconfdir}/%{name}/conf.d/python.d/*.conf +%config %{_sysconfdir}/%{name}/conf.d/statsd.d/*.conf +%config %{_sysconfdir}/%{name}/conf.d/ebpf.d/*.conf +%config %{_sysconfdir}/logrotate.d/netdata +%config %{_sysconfdir}/profile.d/netdata.sh %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/edit-config +%{_sysconfdir}/netdata/.install-type %files data %doc README.md commit 65fa8eb3bb5e041cabbc0bd92500778f477fa7d1 Author: Didier Fabert <didier.fabert(a)gmail.com> Date: Sat Apr 30 20:36:40 2022 +0200 Update to upstream release 1.34.1 diff --git a/.gitignore b/.gitignore index f4986bc..484a2d9 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ /netdata-1.32.0.tar.gz /netdata-1.32.1.tar.gz /netdata-v1.33.1.tar.gz +/netdata-v1.34.1.tar.gz +/protobuf-cpp-3.17.3.tar.gz diff --git a/netdata-fix-shebang-1.33.1.patch b/netdata-fix-shebang-1.34.1.patch similarity index 55% rename from netdata-fix-shebang-1.33.1.patch rename to netdata-fix-shebang-1.34.1.patch index a9310e9..131f028 100644 --- a/netdata-fix-shebang-1.33.1.patch +++ b/netdata-fix-shebang-1.34.1.patch @@ -1,18 +1,9 @@ Fix shebang according to https://docs.fedoraproject.org/en-US/packaging-guidelines/#_shebang_lines -diff -rup a/backends/nc-backend.sh b/backends/nc-backend.sh ---- a/backends/nc-backend.sh 2022-02-14 18:01:12.144767227 +0100 -+++ b/backends/nc-backend.sh 2022-02-17 19:42:53.167055475 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # SPDX-License-Identifier: GPL-3.0-or-later - diff -rup a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in ---- a/claim/netdata-claim.sh.in 2022-02-14 18:01:12.148767260 +0100 -+++ b/claim/netdata-claim.sh.in 2022-02-17 19:42:53.168055480 +0100 +--- a/claim/netdata-claim.sh.in 2022-03-29 16:20:22.481318701 +0200 ++++ b/claim/netdata-claim.sh.in 2022-04-19 16:32:30.926492999 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -20,8 +11,8 @@ diff -rup a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in # real-time performance and health monitoring, done right! # (C) 2017 Costa Tsaousis <costa(a)tsaousis.gr> diff -rup a/collectors/cgroups.plugin/cgroup-name.sh b/collectors/cgroups.plugin/cgroup-name.sh ---- a/collectors/cgroups.plugin/cgroup-name.sh 2022-02-14 18:02:10.045550210 +0100 -+++ b/collectors/cgroups.plugin/cgroup-name.sh 2022-02-17 19:42:53.185055570 +0100 +--- a/collectors/cgroups.plugin/cgroup-name.sh 2022-04-18 15:12:44.868420791 +0200 ++++ b/collectors/cgroups.plugin/cgroup-name.sh 2022-04-19 16:32:30.938493060 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -29,8 +20,8 @@ diff -rup a/collectors/cgroups.plugin/cgroup-name.sh b/collectors/cgroups.plugin # netdata diff -rup a/collectors/cgroups.plugin/cgroup-name.sh.in b/collectors/cgroups.plugin/cgroup-name.sh.in ---- a/collectors/cgroups.plugin/cgroup-name.sh.in 2022-02-14 18:01:12.152767292 +0100 -+++ b/collectors/cgroups.plugin/cgroup-name.sh.in 2022-02-17 19:42:53.187055580 +0100 +--- a/collectors/cgroups.plugin/cgroup-name.sh.in 2022-03-15 13:47:55.102775668 +0100 ++++ b/collectors/cgroups.plugin/cgroup-name.sh.in 2022-04-19 16:32:30.940493071 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -38,8 +29,8 @@ diff -rup a/collectors/cgroups.plugin/cgroup-name.sh.in b/collectors/cgroups.plu # netdata diff -rup a/collectors/cgroups.plugin/cgroup-network-helper.sh b/collectors/cgroups.plugin/cgroup-network-helper.sh ---- a/collectors/cgroups.plugin/cgroup-network-helper.sh 2022-02-14 18:01:12.152767292 +0100 -+++ b/collectors/cgroups.plugin/cgroup-network-helper.sh 2022-02-17 19:42:53.183055560 +0100 +--- a/collectors/cgroups.plugin/cgroup-network-helper.sh 2022-03-15 13:47:55.102775668 +0100 ++++ b/collectors/cgroups.plugin/cgroup-network-helper.sh 2022-04-19 16:32:30.936493050 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -47,8 +38,8 @@ diff -rup a/collectors/cgroups.plugin/cgroup-network-helper.sh b/collectors/cgro # cgroup-network-helper.sh diff -rup a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh ---- a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2022-02-14 18:01:12.152767292 +0100 -+++ b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2022-02-17 19:42:53.175055517 +0100 +--- a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2021-04-30 16:00:34.262142660 +0200 ++++ b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2022-04-19 16:32:30.933493035 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -56,8 +47,8 @@ diff -rup a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh b/collectors/ch # shellcheck disable=SC2181 diff -rup a/collectors/charts.d.plugin/charts.d.plugin b/collectors/charts.d.plugin/charts.d.plugin ---- a/collectors/charts.d.plugin/charts.d.plugin 2022-02-14 18:02:10.093550803 +0100 -+++ b/collectors/charts.d.plugin/charts.d.plugin 2022-02-17 19:42:53.173055507 +0100 +--- a/collectors/charts.d.plugin/charts.d.plugin 2022-04-18 15:12:45.228420886 +0200 ++++ b/collectors/charts.d.plugin/charts.d.plugin 2022-04-19 16:32:30.931493025 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -65,8 +56,8 @@ diff -rup a/collectors/charts.d.plugin/charts.d.plugin b/collectors/charts.d.plu # netdata diff -rup a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d.plugin/charts.d.plugin.in ---- a/collectors/charts.d.plugin/charts.d.plugin.in 2022-02-14 18:01:12.156767325 +0100 -+++ b/collectors/charts.d.plugin/charts.d.plugin.in 2022-02-17 19:42:53.180055543 +0100 +--- a/collectors/charts.d.plugin/charts.d.plugin.in 2022-03-16 12:31:30.172663376 +0100 ++++ b/collectors/charts.d.plugin/charts.d.plugin.in 2022-04-19 16:32:30.935493045 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -74,8 +65,8 @@ diff -rup a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d. # netdata diff -rup a/collectors/fping.plugin/fping.plugin b/collectors/fping.plugin/fping.plugin ---- a/collectors/fping.plugin/fping.plugin 2022-02-14 18:02:10.305553425 +0100 -+++ b/collectors/fping.plugin/fping.plugin 2022-02-17 19:42:53.197055633 +0100 +--- a/collectors/fping.plugin/fping.plugin 2022-04-18 15:12:46.991754684 +0200 ++++ b/collectors/fping.plugin/fping.plugin 2022-04-19 16:32:30.949493117 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -83,8 +74,8 @@ diff -rup a/collectors/fping.plugin/fping.plugin b/collectors/fping.plugin/fping # netdata diff -rup a/collectors/fping.plugin/fping.plugin.in b/collectors/fping.plugin/fping.plugin.in ---- a/collectors/fping.plugin/fping.plugin.in 2022-02-14 18:01:12.160767358 +0100 -+++ b/collectors/fping.plugin/fping.plugin.in 2022-02-17 19:42:53.199055644 +0100 +--- a/collectors/fping.plugin/fping.plugin.in 2022-03-15 13:47:55.109442345 +0100 ++++ b/collectors/fping.plugin/fping.plugin.in 2022-04-19 16:32:30.951493127 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -92,8 +83,8 @@ diff -rup a/collectors/fping.plugin/fping.plugin.in b/collectors/fping.plugin/fp # netdata diff -rup a/collectors/ioping.plugin/ioping.plugin b/collectors/ioping.plugin/ioping.plugin ---- a/collectors/ioping.plugin/ioping.plugin 2022-02-14 18:02:10.349553970 +0100 -+++ b/collectors/ioping.plugin/ioping.plugin 2022-02-17 19:42:53.203055665 +0100 +--- a/collectors/ioping.plugin/ioping.plugin 2022-04-18 15:12:47.498421484 +0200 ++++ b/collectors/ioping.plugin/ioping.plugin 2022-04-19 16:32:30.954493142 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -101,8 +92,8 @@ diff -rup a/collectors/ioping.plugin/ioping.plugin b/collectors/ioping.plugin/io # netdata diff -rup a/collectors/ioping.plugin/ioping.plugin.in b/collectors/ioping.plugin/ioping.plugin.in ---- a/collectors/ioping.plugin/ioping.plugin.in 2022-02-14 18:01:12.164767390 +0100 -+++ b/collectors/ioping.plugin/ioping.plugin.in 2022-02-17 19:42:53.201055654 +0100 +--- a/collectors/ioping.plugin/ioping.plugin.in 2022-03-29 16:20:22.484652037 +0200 ++++ b/collectors/ioping.plugin/ioping.plugin.in 2022-04-19 16:32:30.952493132 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -110,8 +101,8 @@ diff -rup a/collectors/ioping.plugin/ioping.plugin.in b/collectors/ioping.plugin # netdata diff -rup a/collectors/node.d.plugin/node.d.plugin b/collectors/node.d.plugin/node.d.plugin ---- a/collectors/node.d.plugin/node.d.plugin 2022-02-14 18:02:10.621557334 +0100 -+++ b/collectors/node.d.plugin/node.d.plugin 2022-02-17 19:42:53.189055591 +0100 +--- a/collectors/node.d.plugin/node.d.plugin 2022-04-18 15:12:50.708422331 +0200 ++++ b/collectors/node.d.plugin/node.d.plugin 2022-04-19 16:32:30.941493076 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -119,8 +110,8 @@ diff -rup a/collectors/node.d.plugin/node.d.plugin b/collectors/node.d.plugin/no // shebang hack from: diff -rup a/collectors/node.d.plugin/node.d.plugin.in b/collectors/node.d.plugin/node.d.plugin.in ---- a/collectors/node.d.plugin/node.d.plugin.in 2022-02-14 18:01:12.164767390 +0100 -+++ b/collectors/node.d.plugin/node.d.plugin.in 2022-02-17 19:42:53.190055596 +0100 +--- a/collectors/node.d.plugin/node.d.plugin.in 2021-04-30 16:00:34.268809326 +0200 ++++ b/collectors/node.d.plugin/node.d.plugin.in 2022-04-19 16:32:30.943493086 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -128,8 +119,8 @@ diff -rup a/collectors/node.d.plugin/node.d.plugin.in b/collectors/node.d.plugin // shebang hack from: diff -rup a/collectors/python.d.plugin/python.d.plugin b/collectors/python.d.plugin/python.d.plugin ---- a/collectors/python.d.plugin/python.d.plugin 2022-02-14 18:02:10.737558769 +0100 -+++ b/collectors/python.d.plugin/python.d.plugin 2022-02-17 19:42:53.194055617 +0100 +--- a/collectors/python.d.plugin/python.d.plugin 2022-04-18 15:12:51.665089250 +0200 ++++ b/collectors/python.d.plugin/python.d.plugin 2022-04-19 16:32:30.947493106 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -137,8 +128,8 @@ diff -rup a/collectors/python.d.plugin/python.d.plugin b/collectors/python.d.plu pybinary=$(which python3 || which python || which python2) filtered=() diff -rup a/collectors/python.d.plugin/python.d.plugin.in b/collectors/python.d.plugin/python.d.plugin.in ---- a/collectors/python.d.plugin/python.d.plugin.in 2022-02-14 18:01:12.188767586 +0100 -+++ b/collectors/python.d.plugin/python.d.plugin.in 2022-02-17 19:42:53.192055607 +0100 +--- a/collectors/python.d.plugin/python.d.plugin.in 2022-03-15 13:47:55.122775699 +0100 ++++ b/collectors/python.d.plugin/python.d.plugin.in 2022-04-19 16:32:30.945493096 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -146,8 +137,8 @@ diff -rup a/collectors/python.d.plugin/python.d.plugin.in b/collectors/python.d. pybinary=$(which python3 || which python || which python2) filtered=() diff -rup a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py ---- a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2022-02-14 18:01:12.192767618 +0100 -+++ b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2022-02-17 19:42:53.329056329 +0100 +--- a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2021-04-30 16:00:34.295475990 +0200 ++++ b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2022-04-19 16:32:31.073493750 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +# @@ -155,8 +146,8 @@ diff -rup a/collectors/python.d.plugin/python_modules/third_party/boinc_client.p # # client.py - Somewhat higher-level GUI_RPC API for BOINC core client diff -rup a/collectors/tc.plugin/tc-qos-helper.sh b/collectors/tc.plugin/tc-qos-helper.sh ---- a/collectors/tc.plugin/tc-qos-helper.sh 2022-02-14 18:02:11.425567092 +0100 -+++ b/collectors/tc.plugin/tc-qos-helper.sh 2022-02-17 19:42:53.171055496 +0100 +--- a/collectors/tc.plugin/tc-qos-helper.sh 2022-04-18 15:12:58.161757637 +0200 ++++ b/collectors/tc.plugin/tc-qos-helper.sh 2022-04-19 16:32:30.930493020 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -164,8 +155,8 @@ diff -rup a/collectors/tc.plugin/tc-qos-helper.sh b/collectors/tc.plugin/tc-qos- # netdata # real-time performance and health monitoring, done right! diff -rup a/collectors/tc.plugin/tc-qos-helper.sh.in b/collectors/tc.plugin/tc-qos-helper.sh.in ---- a/collectors/tc.plugin/tc-qos-helper.sh.in 2022-02-14 18:01:12.200767684 +0100 -+++ b/collectors/tc.plugin/tc-qos-helper.sh.in 2022-02-17 19:42:53.170055491 +0100 +--- a/collectors/tc.plugin/tc-qos-helper.sh.in 2022-03-15 13:47:55.126109038 +0100 ++++ b/collectors/tc.plugin/tc-qos-helper.sh.in 2022-04-19 16:32:30.928493009 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -173,8 +164,8 @@ diff -rup a/collectors/tc.plugin/tc-qos-helper.sh.in b/collectors/tc.plugin/tc-q # netdata # real-time performance and health monitoring, done right! diff -rup a/contrib/debian/install_go.sh b/contrib/debian/install_go.sh ---- a/contrib/debian/install_go.sh 2022-02-14 18:01:12.200767684 +0100 -+++ b/contrib/debian/install_go.sh 2022-02-17 19:42:53.206055680 +0100 +--- a/contrib/debian/install_go.sh 2022-03-15 13:47:55.126109038 +0100 ++++ b/contrib/debian/install_go.sh 2022-04-19 16:32:30.957493158 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -182,26 +173,17 @@ diff -rup a/contrib/debian/install_go.sh b/contrib/debian/install_go.sh GO_PACKAGE_VERSION="$1" LIB_DIR="$2" diff -rup a/contrib/rhel/build-netdata-rpm.sh b/contrib/rhel/build-netdata-rpm.sh ---- a/contrib/rhel/build-netdata-rpm.sh 2022-02-14 18:01:12.200767684 +0100 -+++ b/contrib/rhel/build-netdata-rpm.sh 2022-02-17 19:42:53.204055670 +0100 +--- a/contrib/rhel/build-netdata-rpm.sh 2022-03-15 13:47:55.126109038 +0100 ++++ b/contrib/rhel/build-netdata-rpm.sh 2022-04-19 16:32:30.956493152 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash # docker run -it --rm centos:6.9 /bin/sh # yum -y install rpm-build redhat-rpm-config yum-utils autoconf automake curl gcc git libmnl-devel libuuid-devel make pkgconfig zlib-devel -diff -rup a/contrib/sles11/alarm-notify-basic.bash3.sh b/contrib/sles11/alarm-notify-basic.bash3.sh ---- a/contrib/sles11/alarm-notify-basic.bash3.sh 2022-02-14 18:01:12.200767684 +0100 -+++ b/contrib/sles11/alarm-notify-basic.bash3.sh 2022-02-17 19:42:53.207055686 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # basic version of netdata notifier to work with bash3 - # only mail and syslog destinations are supported, one recipient each diff -rup a/coverity-scan.sh b/coverity-scan.sh ---- a/coverity-scan.sh 2022-02-14 18:01:12.200767684 +0100 -+++ b/coverity-scan.sh 2022-02-17 19:42:53.210055702 +0100 +--- a/coverity-scan.sh 2022-04-07 16:00:35.708114383 +0200 ++++ b/coverity-scan.sh 2022-04-19 16:32:30.959493168 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -209,8 +191,8 @@ diff -rup a/coverity-scan.sh b/coverity-scan.sh # Coverity scan script # diff -rup a/cppcheck.sh b/cppcheck.sh ---- a/cppcheck.sh 2022-02-14 18:01:12.200767684 +0100 -+++ b/cppcheck.sh 2022-02-17 19:42:53.212055712 +0100 +--- a/cppcheck.sh 2018-11-02 16:10:18.078559041 +0100 ++++ b/cppcheck.sh 2022-04-19 16:32:30.961493178 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -218,8 +200,8 @@ diff -rup a/cppcheck.sh b/cppcheck.sh # echo >>/tmp/cppcheck.log "cppcheck ${*}" diff -rup a/daemon/anonymous-statistics.sh b/daemon/anonymous-statistics.sh ---- a/daemon/anonymous-statistics.sh 2022-02-14 18:02:11.469567624 +0100 -+++ b/daemon/anonymous-statistics.sh 2022-02-17 19:42:53.242055870 +0100 +--- a/daemon/anonymous-statistics.sh 2022-04-18 15:12:58.645091098 +0200 ++++ b/daemon/anonymous-statistics.sh 2022-04-19 16:32:30.989493321 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/sh @@ -227,8 +209,8 @@ diff -rup a/daemon/anonymous-statistics.sh b/daemon/anonymous-statistics.sh # Valid actions: diff -rup a/daemon/anonymous-statistics.sh.in b/daemon/anonymous-statistics.sh.in ---- a/daemon/anonymous-statistics.sh.in 2022-02-14 18:01:12.204767716 +0100 -+++ b/daemon/anonymous-statistics.sh.in 2022-02-17 19:42:53.241055865 +0100 +--- a/daemon/anonymous-statistics.sh.in 2022-03-15 13:47:55.126109038 +0100 ++++ b/daemon/anonymous-statistics.sh.in 2022-04-19 16:32:30.987493311 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/sh @@ -236,26 +218,26 @@ diff -rup a/daemon/anonymous-statistics.sh.in b/daemon/anonymous-statistics.sh.i # Valid actions: diff -rup a/daemon/get-kubernetes-labels.sh b/daemon/get-kubernetes-labels.sh ---- a/daemon/get-kubernetes-labels.sh 2022-02-14 18:02:11.473567673 +0100 -+++ b/daemon/get-kubernetes-labels.sh 2022-02-17 19:42:53.216055733 +0100 +--- a/daemon/get-kubernetes-labels.sh 2022-04-18 15:12:58.698424445 +0200 ++++ b/daemon/get-kubernetes-labels.sh 2022-04-19 16:32:30.964493193 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash - # Checks if netdata is running in a kubernetes pod and fetches that pod's labels - + # Checks if netdata is running in a kubernetes pod and fetches: + # - pod's labels diff -rup a/daemon/get-kubernetes-labels.sh.in b/daemon/get-kubernetes-labels.sh.in ---- a/daemon/get-kubernetes-labels.sh.in 2022-02-14 18:01:12.204767716 +0100 -+++ b/daemon/get-kubernetes-labels.sh.in 2022-02-17 19:42:53.214055723 +0100 +--- a/daemon/get-kubernetes-labels.sh.in 2022-04-11 14:27:01.935438827 +0200 ++++ b/daemon/get-kubernetes-labels.sh.in 2022-04-19 16:32:30.962493183 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash - # Checks if netdata is running in a kubernetes pod and fetches that pod's labels - + # Checks if netdata is running in a kubernetes pod and fetches: + # - pod's labels diff -rup a/daemon/system-info.sh b/daemon/system-info.sh ---- a/daemon/system-info.sh 2022-02-14 18:01:12.204767716 +0100 -+++ b/daemon/system-info.sh 2022-02-17 19:42:53.239055855 +0100 +--- a/daemon/system-info.sh 2022-04-07 16:00:43.864785538 +0200 ++++ b/daemon/system-info.sh 2022-04-19 16:32:30.986493306 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/sh @@ -263,8 +245,8 @@ diff -rup a/daemon/system-info.sh b/daemon/system-info.sh # ------------------------------------------------------------------------------------------------- # detect the kernel diff -rup a/diagrams/build.sh b/diagrams/build.sh ---- a/diagrams/build.sh 2022-02-14 18:01:12.260768173 +0100 -+++ b/diagrams/build.sh 2022-02-17 19:42:53.217055738 +0100 +--- a/diagrams/build.sh 2018-10-16 15:11:47.573219719 +0200 ++++ b/diagrams/build.sh 2022-04-19 16:32:30.966493204 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -272,8 +254,8 @@ diff -rup a/diagrams/build.sh b/diagrams/build.sh path=$(dirname "$0") diff -rup a/exporting/nc-exporting.sh b/exporting/nc-exporting.sh ---- a/exporting/nc-exporting.sh 2022-02-14 18:01:12.272768270 +0100 -+++ b/exporting/nc-exporting.sh 2022-02-17 19:42:53.219055749 +0100 +--- a/exporting/nc-exporting.sh 2022-03-29 16:20:22.497985377 +0200 ++++ b/exporting/nc-exporting.sh 2022-04-19 16:32:30.968493214 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -281,8 +263,8 @@ diff -rup a/exporting/nc-exporting.sh b/exporting/nc-exporting.sh # SPDX-License-Identifier: GPL-3.0-or-later diff -rup a/health/notifications/alarm-email.sh b/health/notifications/alarm-email.sh ---- a/health/notifications/alarm-email.sh 2022-02-14 18:01:12.276768303 +0100 -+++ b/health/notifications/alarm-email.sh 2022-02-17 19:42:53.220055754 +0100 +--- a/health/notifications/alarm-email.sh 2021-04-30 16:00:34.352142649 +0200 ++++ b/health/notifications/alarm-email.sh 2022-04-19 16:32:30.969493219 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -290,8 +272,8 @@ diff -rup a/health/notifications/alarm-email.sh b/health/notifications/alarm-ema # OBSOLETE - REPLACED WITH diff -rup a/health/notifications/alarm-notify.sh b/health/notifications/alarm-notify.sh ---- a/health/notifications/alarm-notify.sh 2022-02-14 18:02:12.081575024 +0100 -+++ b/health/notifications/alarm-notify.sh 2022-02-17 19:42:53.222055765 +0100 +--- a/health/notifications/alarm-notify.sh 2022-04-18 15:13:05.155092827 +0200 ++++ b/health/notifications/alarm-notify.sh 2022-04-19 16:32:30.972493234 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -299,8 +281,8 @@ diff -rup a/health/notifications/alarm-notify.sh b/health/notifications/alarm-no # netdata diff -rup a/health/notifications/alarm-notify.sh.in b/health/notifications/alarm-notify.sh.in ---- a/health/notifications/alarm-notify.sh.in 2022-02-14 18:01:12.280768336 +0100 -+++ b/health/notifications/alarm-notify.sh.in 2022-02-17 19:42:53.224055775 +0100 +--- a/health/notifications/alarm-notify.sh.in 2022-03-15 13:47:55.189442468 +0100 ++++ b/health/notifications/alarm-notify.sh.in 2022-04-19 16:32:30.974493244 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -308,8 +290,8 @@ diff -rup a/health/notifications/alarm-notify.sh.in b/health/notifications/alarm # netdata diff -rup a/health/notifications/alarm-test.sh b/health/notifications/alarm-test.sh ---- a/health/notifications/alarm-test.sh 2022-02-14 18:01:12.280768336 +0100 -+++ b/health/notifications/alarm-test.sh 2022-02-17 19:42:53.226055786 +0100 +--- a/health/notifications/alarm-test.sh 2021-04-30 16:00:34.352142649 +0200 ++++ b/health/notifications/alarm-test.sh 2022-04-19 16:32:30.975493250 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -317,8 +299,8 @@ diff -rup a/health/notifications/alarm-test.sh b/health/notifications/alarm-test # netdata # real-time performance and health monitoring, done right! diff -rup a/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py b/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py ---- a/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py 2022-02-14 18:01:30.753067208 +0100 -+++ b/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py 2022-02-17 19:42:53.332056344 +0100 +--- a/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py 2021-10-27 14:02:02.010887170 +0200 ++++ b/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py 2022-04-19 16:32:31.075493761 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/python33 @@ -326,8 +308,8 @@ diff -rup a/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py b/ml/kmeans/dli # Syntax: mkdoc.py [-I<path> ..] [.. a list of header files ..] # diff -rup a/ml/kmeans/dlib/dlib/travis/build-and-test.sh b/ml/kmeans/dlib/dlib/travis/build-and-test.sh ---- a/ml/kmeans/dlib/dlib/travis/build-and-test.sh 2022-02-14 18:01:30.845068308 +0100 -+++ b/ml/kmeans/dlib/dlib/travis/build-and-test.sh 2022-02-17 19:42:53.229055802 +0100 +--- a/ml/kmeans/dlib/dlib/travis/build-and-test.sh 2021-10-27 14:02:02.070887180 +0200 ++++ b/ml/kmeans/dlib/dlib/travis/build-and-test.sh 2022-04-19 16:32:30.977493260 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -335,8 +317,8 @@ diff -rup a/ml/kmeans/dlib/dlib/travis/build-and-test.sh b/ml/kmeans/dlib/dlib/t set -eux diff -rup a/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py b/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py ---- a/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2022-02-14 18:01:30.905069026 +0100 -+++ b/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2022-02-17 19:42:53.334056355 +0100 +--- a/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2021-10-27 14:02:02.120887187 +0200 ++++ b/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2022-04-19 16:32:31.078493776 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 @@ -344,26 +326,17 @@ diff -rup a/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model # This script takes the dlib lenet model trained by the # examples/dnn_introduction_ex.cpp example program and runs it using caffe. diff -rup a/packaging/check-kernel-config.sh b/packaging/check-kernel-config.sh ---- a/packaging/check-kernel-config.sh 2022-02-14 18:01:12.292768433 +0100 -+++ b/packaging/check-kernel-config.sh 2022-02-17 19:42:53.232055817 +0100 +--- a/packaging/check-kernel-config.sh 2022-03-14 13:51:04.198273428 +0100 ++++ b/packaging/check-kernel-config.sh 2022-04-19 16:32:30.979493270 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash get_kernel_version() { r="$(uname -r | cut -f 1 -d '-')" -diff -rup a/packaging/installer/netdata-uninstaller.sh b/packaging/installer/netdata-uninstaller.sh ---- a/packaging/installer/netdata-uninstaller.sh 2022-02-14 18:01:12.292768433 +0100 -+++ b/packaging/installer/netdata-uninstaller.sh 2022-02-17 19:42:53.230055807 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # - # This is the netdata uninstaller script - # diff -rup a/system/edit-config b/system/edit-config ---- a/system/edit-config 2022-02-14 18:02:09.541543976 +0100 -+++ b/system/edit-config 2022-02-17 19:42:53.244055881 +0100 +--- a/system/edit-config 2022-04-18 15:12:42.781753576 +0200 ++++ b/system/edit-config 2022-04-19 16:32:30.991493331 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/sh @@ -371,8 +344,8 @@ diff -rup a/system/edit-config b/system/edit-config [ -f /etc/profile ] && . /etc/profile diff -rup a/system/edit-config.in b/system/edit-config.in ---- a/system/edit-config.in 2022-02-14 18:01:12.300768498 +0100 -+++ b/system/edit-config.in 2022-02-17 19:42:53.246055891 +0100 +--- a/system/edit-config.in 2022-02-25 16:31:16.975943768 +0100 ++++ b/system/edit-config.in 2022-04-19 16:32:30.992493336 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/sh @@ -380,8 +353,8 @@ diff -rup a/system/edit-config.in b/system/edit-config.in [ -f /etc/profile ] && . /etc/profile diff -rup a/system/netdata-lsb.in b/system/netdata-lsb.in ---- a/system/netdata-lsb.in 2022-02-14 18:01:12.300768498 +0100 -+++ b/system/netdata-lsb.in 2022-02-17 19:42:53.234055828 +0100 +--- a/system/netdata-lsb.in 2022-02-25 16:31:16.975943768 +0100 ++++ b/system/netdata-lsb.in 2022-04-19 16:32:30.980493275 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -389,8 +362,8 @@ diff -rup a/system/netdata-lsb.in b/system/netdata-lsb.in # Netdata LSB start script # diff -rup a/tests/health_mgmtapi/health-cmdapi-test.sh b/tests/health_mgmtapi/health-cmdapi-test.sh ---- a/tests/health_mgmtapi/health-cmdapi-test.sh 2022-02-14 18:02:09.601544718 +0100 -+++ b/tests/health_mgmtapi/health-cmdapi-test.sh 2022-02-17 19:42:53.236055839 +0100 +--- a/tests/health_mgmtapi/health-cmdapi-test.sh 2022-04-18 15:12:42.991753631 +0200 ++++ b/tests/health_mgmtapi/health-cmdapi-test.sh 2022-04-19 16:32:30.982493285 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -398,8 +371,8 @@ diff -rup a/tests/health_mgmtapi/health-cmdapi-test.sh b/tests/health_mgmtapi/he NETDATA_VARLIB_DIR="/var/lib/netdata" diff -rup a/tests/health_mgmtapi/health-cmdapi-test.sh.in b/tests/health_mgmtapi/health-cmdapi-test.sh.in ---- a/tests/health_mgmtapi/health-cmdapi-test.sh.in 2022-02-14 18:01:12.300768498 +0100 -+++ b/tests/health_mgmtapi/health-cmdapi-test.sh.in 2022-02-17 19:42:53.237055844 +0100 +--- a/tests/health_mgmtapi/health-cmdapi-test.sh.in 2022-02-25 16:31:16.979277102 +0100 ++++ b/tests/health_mgmtapi/health-cmdapi-test.sh.in 2022-04-19 16:32:30.984493296 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash diff --git a/netdata-remove-fonts-1.33.1.patch b/netdata-remove-fonts-1.34.1.patch similarity index 89% rename from netdata-remove-fonts-1.33.1.patch rename to netdata-remove-fonts-1.34.1.patch index 5fc0c07..2b20739 100644 --- a/netdata-remove-fonts-1.33.1.patch +++ b/netdata-remove-fonts-1.34.1.patch @@ -1,9 +1,9 @@ diff -rup a/web/gui/dashboard/Makefile.am b/web/gui/dashboard/Makefile.am ---- a/web/gui/dashboard/Makefile.am 2022-02-14 17:58:30.000000000 +0100 -+++ b/web/gui/dashboard/Makefile.am 2022-02-16 19:17:22.648816557 +0100 +--- a/web/gui/dashboard/Makefile.am 2022-04-14 13:22:42.927570498 +0200 ++++ b/web/gui/dashboard/Makefile.am 2022-04-19 22:57:25.589407143 +0200 @@ -163,36 +163,3 @@ dist_webstaticjs_DATA = \ - static/js/runtime-main.ec4d2459.js \ - static/js/runtime-main.ec4d2459.js.map \ + static/js/runtime-main.b352aa47.js \ + static/js/runtime-main.b352aa47.js.map \ $(NULL) - -webstaticmediadir=$(webdir)/static/media diff --git a/netdata.profile b/netdata.profile deleted file mode 100644 index 0673b29..0000000 --- a/netdata.profile +++ /dev/null @@ -1,5 +0,0 @@ -# env vars for netdata -export NETDATA_STOCK_CONFIG_DIR="/etc/netdata/conf.d" -export NETDATA_USER_CONFIG_DIR="/etc/netdata" -export NETDATA_VARLIB_DIR="/var/lib/netdata" -export NETDATA_CACHE_DIR="/var/cache/netdata" diff --git a/netdata.spec b/netdata.spec index bf78f37..5aa13e5 100644 --- a/netdata.spec +++ b/netdata.spec @@ -17,6 +17,13 @@ ExcludeArch: s390x %bcond_without cups %endif +# Because protobuf is too old in el7 +%if 0%{?rhel} && 0%{?rhel} == 7 +%bcond_without bundled_protobuf +%else +%bcond_with bundled_protobuf +%endif + %if 0%{?rhel} && 0%{?rhel} <= 7 # This is temporary and should eventually be resolved. This bypasses # the default rhel __os_install_post which throws a python compile @@ -28,12 +35,17 @@ ExcludeArch: s390x %global _hardened_build 1 # Build release candidate -%global upver 1.33.1 +%global upver 1.34.1 #global rcver rc0 +# Last python 2 support (el7 only) +%global protobuf_cpp_ver 3.17.3 + +%global stock_conf_path %{_prefix}/lib/%{name} + Name: netdata Version: %{upver}%{?rcver:~%{rcver}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Real-time performance monitoring # For a breakdown of the licensing, see LICENSE-REDISTRIBUTED.md License: GPLv3 and GPLv3+ and ASL 2.0 and CC-BY and MIT and WTFPL @@ -42,12 +54,13 @@ Source0: https://github.com/netdata/netdata/releases/download/v%{upver}%{ Source1: netdata.tmpfiles.conf Source2: netdata.init Source3: netdata.conf -Source4: netdata.profile Source5: README-packager.md -Patch0: netdata-fix-shebang-1.33.1.patch +# Only for el7 +Source10: https://github.com/protocolbuffers/protobuf/releases/download/v%{protobuf... +Patch0: netdata-fix-shebang-1.34.1.patch %if 0%{?fedora} # Remove embedded font -Patch10: netdata-remove-fonts-1.33.1.patch +Patch10: netdata-remove-fonts-1.34.1.patch %endif BuildRequires: zlib-devel @@ -104,6 +117,7 @@ BuildRequires: python3 BuildRequires: python2 %endif + Requires: nodejs Requires: curl Requires: nc @@ -162,8 +176,27 @@ freeipmi plugin for netdata rm -rf web/fonts web/gui/dashboard/static/media %endif cp %{SOURCE5} . +### BEGIN netdata cloud +%if %{with bundled_protobuf} +mkdir -p externaldeps/protobuf +tar -xzf %{SOURCE10} -C externaldeps/protobuf +%endif +### END netdata cloud %build +### BEGIN netdata cloud +%if %{with bundled_protobuf} +pushd externaldeps/protobuf/protobuf-%{protobuf_cpp_ver} +%configure \ + --disable-shared \ + --without-zlib \ + --disable-dependency-tracking \ + --with-pic +CFLAGS="${CFLAGS} -fPIC" %make_build +popd +cp -a externaldeps/protobuf/protobuf-%{protobuf_cpp_ver}/src externaldeps/protobuf +%endif +### END netdata cloud autoreconf -ivf %configure \ --enable-plugin-freeipmi \ @@ -172,11 +205,14 @@ autoreconf -ivf %endif %if %{with cups} --enable-plugin-cups \ +%endif +%if %{with bundled_protobuf} + --with-bundled-protobuf \ %endif --with-zlib \ --with-math \ --with-user=netdata - + %make_build %install @@ -197,10 +233,18 @@ mkdir -p %{buildroot}%{_localstatedir}/cache/%{name} mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d install -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/ install -p -m 0644 system/netdata.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -# Conf files must be in /etc, dixit FHS and it's better in a noarch pkg -mv %{buildroot}%{_libdir}/%{name}/conf.d %{buildroot}%{_sysconfdir}/%{name}/ -# Scripts must not be in /etc +# it's better to put stock config file in a noarch pkg (like systemd) +%ifarch x86_64 +mkdir -p %{buildroot}%{stock_conf_path}/conf.d +mv %{buildroot}%{_libdir}/%{name}/conf.d/* %{buildroot}%{stock_conf_path}/conf.d +%endif + +# Scripts must not be in /etc, /usr/libexec is a better place mv %{buildroot}%{_sysconfdir}/%{name}/edit-config %{buildroot}%{_libexecdir}/%{name}/edit-config +# Force stock config file to a noarch path (like systemd) +%ifarch x86_64 +sed -i -e '/NETDATA_STOCK_CONFIG_DIR/ s/lib64/lib/' %{buildroot}%{_libexecdir}/%{name}/edit-config +%endif # Fix EOL sed -i -e 's/\r//' %{buildroot}%{_datadir}/%{name}/web/lib/tableExport-1.6.0.min.js # Delete useless hidden dir @@ -212,10 +256,6 @@ for dir in charts.d health.d python.d statsd.d ; do mkdir -p %{buildroot}%{_sysconfdir}/%{name}/${dir} done -mkdir -p %{buildroot}%{_sysconfdir}/profile.d -install -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/netdata.sh -rm -f %{buildroot}%{_sysconfdir}/netdata/.install-type - %check make tests @@ -225,6 +265,9 @@ getent passwd netdata > /dev/null || useradd -r -g netdata -c "NetData User" -s %post sed -i -e '/web files group/ s/root/netdata/' /etc/netdata/netdata.conf ||: +sed -i -e '/stock config directory/ s;/etc/netdata/conf.d;/usr/lib/netdata/conf.d;' /etc/netdata/netdata.conf ||: +sed -i -e '/stock health configuration directory/ s;/etc/netdata/conf.d/health.d;/usr/lib/netdata/conf.d/health.d;' /etc/netdata/netdata.conf ||: +rm -f %{_sysconfdir}/profile.d/netdata.sh ||: %systemd_post %{name}.service echo "The current config file can be downloaded with the following command" echo "curl -o /etc/netdata/netdata.conf http://localhost:19999/netdata.conf" @@ -268,21 +311,11 @@ echo "Config should be edited with %{_libexecdir}/%{name}/edit-config" %dir %{_sysconfdir}/%{name}/health.d %dir %{_sysconfdir}/%{name}/python.d %dir %{_sysconfdir}/%{name}/statsd.d -%dir %{_sysconfdir}/%{name}/conf.d -%dir %{_sysconfdir}/%{name}/conf.d/charts.d -%dir %{_sysconfdir}/%{name}/conf.d/health.d -%dir %{_sysconfdir}/%{name}/conf.d/python.d -%dir %{_sysconfdir}/%{name}/conf.d/statsd.d -%dir %{_sysconfdir}/%{name}/conf.d/ebpf.d -%config %{_sysconfdir}/%{name}/%{name}.conf -%config %{_sysconfdir}/%{name}/conf.d/*.conf -%config %{_sysconfdir}/%{name}/conf.d/charts.d/*.conf -%config %{_sysconfdir}/%{name}/conf.d/health.d/*.conf -%config %{_sysconfdir}/%{name}/conf.d/python.d/*.conf -%config %{_sysconfdir}/%{name}/conf.d/statsd.d/*.conf -%config %{_sysconfdir}/%{name}/conf.d/ebpf.d/*.conf -%config %{_sysconfdir}/logrotate.d/netdata -%config %{_sysconfdir}/profile.d/netdata.sh +%dir %{stock_conf_path} +%{_sysconfdir}/%{name}/.install-type +%{stock_conf_path}/conf.d/* +%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/netdata %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/edit-config @@ -299,6 +332,11 @@ echo "Config should be edited with %{_libexecdir}/%{name}/edit-config" %caps(cap_setuid=ep) %attr(4750,root,netdata) %{_libexecdir}/%{name}/plugins.d/freeipmi.plugin %changelog +* Sat Apr 30 2022 Didier Fabert <didier.fabert(a)gmail.com> 1.34.1-1 +- Update from upstream +- Move stock config files in /usr/lib/netdata/conf.d +- Use embedded protobuf-cpp for el7 + * Sun Feb 20 2022 Didier Fabert <didier.fabert(a)gmail.com> 1.33.1-2 - Fix el9 buildreq condition for autogen diff --git a/sources b/sources index 36b7805..87c918f 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (netdata-v1.33.1.tar.gz) = f6586426bd0fe1ac3d903ec279b27177b1d232f5ca1fc28b01f052a5f2f57846d2d6369c9d5a1872fb97e31f86f1f7a11c600beda590447f9ca30c93e7ac262c +SHA512 (netdata-v1.34.1.tar.gz) = 777b0f4efa0b64dd150a097cb2ec1c3155506ada9c1e5289b6acda5e34c9262f796795608b52e70c9310a5cbda03c0568e1391c6861c7f3ea84aa9ca84ed9a0c +SHA512 (protobuf-cpp-3.17.3.tar.gz) = efad397f5cdda6639d5e9980fe6eeadc1ef768bf1d96b1e528a1d7ba1d81ceb49e22cbd78d9b4ab3518236055140568342ff138204b4a47234fb2957a89d2db8

2 years

1
0
0 / 0

Architecture specific change in rpms/netdata.git

by githook-noreply＠fedoraproject.org

The package rpms/netdata.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/netdata.git/commit/?id=da8df30485... https://src.fedoraproject.org/cgit/rpms/netdata.git/commit/?id=65fa8eb3bb.... Change: -%ifarch x86_64 +%ifarch x86_64 Thanks. Full change: ============ commit 48dc81dfc8371692fe620208c1d430908ddb8249 Author: Didier Fabert <didier.fabert(a)gmail.com> Date: Tue May 3 17:19:27 2022 +0200 Revert stock config files to /etc/netdata, part2 diff --git a/netdata.profile b/netdata.profile new file mode 100644 index 0000000..0673b29 --- /dev/null +++ b/netdata.profile @@ -0,0 +1,5 @@ +# env vars for netdata +export NETDATA_STOCK_CONFIG_DIR="/etc/netdata/conf.d" +export NETDATA_USER_CONFIG_DIR="/etc/netdata" +export NETDATA_VARLIB_DIR="/var/lib/netdata" +export NETDATA_CACHE_DIR="/var/cache/netdata" commit da8df3048514de25d253a572ef4b05f2906ff1b9 Author: Didier Fabert <didier.fabert(a)gmail.com> Date: Tue May 3 17:12:54 2022 +0200 Revert stock config files to /etc/netdata diff --git a/netdata.spec b/netdata.spec index 5aa13e5..31434e3 100644 --- a/netdata.spec +++ b/netdata.spec @@ -41,7 +41,6 @@ ExcludeArch: s390x # Last python 2 support (el7 only) %global protobuf_cpp_ver 3.17.3 -%global stock_conf_path %{_prefix}/lib/%{name} Name: netdata Version: %{upver}%{?rcver:~%{rcver}} @@ -54,6 +53,7 @@ Source0: https://github.com/netdata/netdata/releases/download/v%{upver}%{ Source1: netdata.tmpfiles.conf Source2: netdata.init Source3: netdata.conf +Source4: netdata.profile Source5: README-packager.md # Only for el7 Source10: https://github.com/protocolbuffers/protobuf/releases/download/v%{protobuf... @@ -212,7 +212,7 @@ autoreconf -ivf --with-zlib \ --with-math \ --with-user=netdata - + %make_build %install @@ -233,18 +233,10 @@ mkdir -p %{buildroot}%{_localstatedir}/cache/%{name} mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d install -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/ install -p -m 0644 system/netdata.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -# it's better to put stock config file in a noarch pkg (like systemd) -%ifarch x86_64 -mkdir -p %{buildroot}%{stock_conf_path}/conf.d -mv %{buildroot}%{_libdir}/%{name}/conf.d/* %{buildroot}%{stock_conf_path}/conf.d -%endif - +# Conf files must be in /etc, dixit FHS and it's better in a noarch pkg +mv %{buildroot}%{_libdir}/%{name}/conf.d %{buildroot}%{_sysconfdir}/%{name}/ # Scripts must not be in /etc, /usr/libexec is a better place mv %{buildroot}%{_sysconfdir}/%{name}/edit-config %{buildroot}%{_libexecdir}/%{name}/edit-config -# Force stock config file to a noarch path (like systemd) -%ifarch x86_64 -sed -i -e '/NETDATA_STOCK_CONFIG_DIR/ s/lib64/lib/' %{buildroot}%{_libexecdir}/%{name}/edit-config -%endif # Fix EOL sed -i -e 's/\r//' %{buildroot}%{_datadir}/%{name}/web/lib/tableExport-1.6.0.min.js # Delete useless hidden dir @@ -256,6 +248,9 @@ for dir in charts.d health.d python.d statsd.d ; do mkdir -p %{buildroot}%{_sysconfdir}/%{name}/${dir} done +mkdir -p %{buildroot}%{_sysconfdir}/profile.d +install -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/netdata.sh + %check make tests @@ -265,9 +260,6 @@ getent passwd netdata > /dev/null || useradd -r -g netdata -c "NetData User" -s %post sed -i -e '/web files group/ s/root/netdata/' /etc/netdata/netdata.conf ||: -sed -i -e '/stock config directory/ s;/etc/netdata/conf.d;/usr/lib/netdata/conf.d;' /etc/netdata/netdata.conf ||: -sed -i -e '/stock health configuration directory/ s;/etc/netdata/conf.d/health.d;/usr/lib/netdata/conf.d/health.d;' /etc/netdata/netdata.conf ||: -rm -f %{_sysconfdir}/profile.d/netdata.sh ||: %systemd_post %{name}.service echo "The current config file can be downloaded with the following command" echo "curl -o /etc/netdata/netdata.conf http://localhost:19999/netdata.conf" @@ -311,13 +303,24 @@ echo "Config should be edited with %{_libexecdir}/%{name}/edit-config" %dir %{_sysconfdir}/%{name}/health.d %dir %{_sysconfdir}/%{name}/python.d %dir %{_sysconfdir}/%{name}/statsd.d -%dir %{stock_conf_path} -%{_sysconfdir}/%{name}/.install-type -%{stock_conf_path}/conf.d/* +%dir %{_sysconfdir}/%{name}/conf.d +%dir %{_sysconfdir}/%{name}/conf.d/charts.d +%dir %{_sysconfdir}/%{name}/conf.d/health.d +%dir %{_sysconfdir}/%{name}/conf.d/python.d +%dir %{_sysconfdir}/%{name}/conf.d/statsd.d +%dir %{_sysconfdir}/%{name}/conf.d/ebpf.d %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf -%config(noreplace) %{_sysconfdir}/logrotate.d/netdata +%config %{_sysconfdir}/%{name}/conf.d/*.conf +%config %{_sysconfdir}/%{name}/conf.d/charts.d/*.conf +%config %{_sysconfdir}/%{name}/conf.d/health.d/*.conf +%config %{_sysconfdir}/%{name}/conf.d/python.d/*.conf +%config %{_sysconfdir}/%{name}/conf.d/statsd.d/*.conf +%config %{_sysconfdir}/%{name}/conf.d/ebpf.d/*.conf +%config %{_sysconfdir}/logrotate.d/netdata +%config %{_sysconfdir}/profile.d/netdata.sh %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/edit-config +%{_sysconfdir}/netdata/.install-type %files data %doc README.md commit 65fa8eb3bb5e041cabbc0bd92500778f477fa7d1 Author: Didier Fabert <didier.fabert(a)gmail.com> Date: Sat Apr 30 20:36:40 2022 +0200 Update to upstream release 1.34.1 diff --git a/.gitignore b/.gitignore index f4986bc..484a2d9 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ /netdata-1.32.0.tar.gz /netdata-1.32.1.tar.gz /netdata-v1.33.1.tar.gz +/netdata-v1.34.1.tar.gz +/protobuf-cpp-3.17.3.tar.gz diff --git a/netdata-fix-shebang-1.33.1.patch b/netdata-fix-shebang-1.34.1.patch similarity index 55% rename from netdata-fix-shebang-1.33.1.patch rename to netdata-fix-shebang-1.34.1.patch index a9310e9..131f028 100644 --- a/netdata-fix-shebang-1.33.1.patch +++ b/netdata-fix-shebang-1.34.1.patch @@ -1,18 +1,9 @@ Fix shebang according to https://docs.fedoraproject.org/en-US/packaging-guidelines/#_shebang_lines -diff -rup a/backends/nc-backend.sh b/backends/nc-backend.sh ---- a/backends/nc-backend.sh 2022-02-14 18:01:12.144767227 +0100 -+++ b/backends/nc-backend.sh 2022-02-17 19:42:53.167055475 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # SPDX-License-Identifier: GPL-3.0-or-later - diff -rup a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in ---- a/claim/netdata-claim.sh.in 2022-02-14 18:01:12.148767260 +0100 -+++ b/claim/netdata-claim.sh.in 2022-02-17 19:42:53.168055480 +0100 +--- a/claim/netdata-claim.sh.in 2022-03-29 16:20:22.481318701 +0200 ++++ b/claim/netdata-claim.sh.in 2022-04-19 16:32:30.926492999 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -20,8 +11,8 @@ diff -rup a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in # real-time performance and health monitoring, done right! # (C) 2017 Costa Tsaousis <costa(a)tsaousis.gr> diff -rup a/collectors/cgroups.plugin/cgroup-name.sh b/collectors/cgroups.plugin/cgroup-name.sh ---- a/collectors/cgroups.plugin/cgroup-name.sh 2022-02-14 18:02:10.045550210 +0100 -+++ b/collectors/cgroups.plugin/cgroup-name.sh 2022-02-17 19:42:53.185055570 +0100 +--- a/collectors/cgroups.plugin/cgroup-name.sh 2022-04-18 15:12:44.868420791 +0200 ++++ b/collectors/cgroups.plugin/cgroup-name.sh 2022-04-19 16:32:30.938493060 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -29,8 +20,8 @@ diff -rup a/collectors/cgroups.plugin/cgroup-name.sh b/collectors/cgroups.plugin # netdata diff -rup a/collectors/cgroups.plugin/cgroup-name.sh.in b/collectors/cgroups.plugin/cgroup-name.sh.in ---- a/collectors/cgroups.plugin/cgroup-name.sh.in 2022-02-14 18:01:12.152767292 +0100 -+++ b/collectors/cgroups.plugin/cgroup-name.sh.in 2022-02-17 19:42:53.187055580 +0100 +--- a/collectors/cgroups.plugin/cgroup-name.sh.in 2022-03-15 13:47:55.102775668 +0100 ++++ b/collectors/cgroups.plugin/cgroup-name.sh.in 2022-04-19 16:32:30.940493071 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -38,8 +29,8 @@ diff -rup a/collectors/cgroups.plugin/cgroup-name.sh.in b/collectors/cgroups.plu # netdata diff -rup a/collectors/cgroups.plugin/cgroup-network-helper.sh b/collectors/cgroups.plugin/cgroup-network-helper.sh ---- a/collectors/cgroups.plugin/cgroup-network-helper.sh 2022-02-14 18:01:12.152767292 +0100 -+++ b/collectors/cgroups.plugin/cgroup-network-helper.sh 2022-02-17 19:42:53.183055560 +0100 +--- a/collectors/cgroups.plugin/cgroup-network-helper.sh 2022-03-15 13:47:55.102775668 +0100 ++++ b/collectors/cgroups.plugin/cgroup-network-helper.sh 2022-04-19 16:32:30.936493050 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -47,8 +38,8 @@ diff -rup a/collectors/cgroups.plugin/cgroup-network-helper.sh b/collectors/cgro # cgroup-network-helper.sh diff -rup a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh ---- a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2022-02-14 18:01:12.152767292 +0100 -+++ b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2022-02-17 19:42:53.175055517 +0100 +--- a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2021-04-30 16:00:34.262142660 +0200 ++++ b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2022-04-19 16:32:30.933493035 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -56,8 +47,8 @@ diff -rup a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh b/collectors/ch # shellcheck disable=SC2181 diff -rup a/collectors/charts.d.plugin/charts.d.plugin b/collectors/charts.d.plugin/charts.d.plugin ---- a/collectors/charts.d.plugin/charts.d.plugin 2022-02-14 18:02:10.093550803 +0100 -+++ b/collectors/charts.d.plugin/charts.d.plugin 2022-02-17 19:42:53.173055507 +0100 +--- a/collectors/charts.d.plugin/charts.d.plugin 2022-04-18 15:12:45.228420886 +0200 ++++ b/collectors/charts.d.plugin/charts.d.plugin 2022-04-19 16:32:30.931493025 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -65,8 +56,8 @@ diff -rup a/collectors/charts.d.plugin/charts.d.plugin b/collectors/charts.d.plu # netdata diff -rup a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d.plugin/charts.d.plugin.in ---- a/collectors/charts.d.plugin/charts.d.plugin.in 2022-02-14 18:01:12.156767325 +0100 -+++ b/collectors/charts.d.plugin/charts.d.plugin.in 2022-02-17 19:42:53.180055543 +0100 +--- a/collectors/charts.d.plugin/charts.d.plugin.in 2022-03-16 12:31:30.172663376 +0100 ++++ b/collectors/charts.d.plugin/charts.d.plugin.in 2022-04-19 16:32:30.935493045 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -74,8 +65,8 @@ diff -rup a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d. # netdata diff -rup a/collectors/fping.plugin/fping.plugin b/collectors/fping.plugin/fping.plugin ---- a/collectors/fping.plugin/fping.plugin 2022-02-14 18:02:10.305553425 +0100 -+++ b/collectors/fping.plugin/fping.plugin 2022-02-17 19:42:53.197055633 +0100 +--- a/collectors/fping.plugin/fping.plugin 2022-04-18 15:12:46.991754684 +0200 ++++ b/collectors/fping.plugin/fping.plugin 2022-04-19 16:32:30.949493117 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -83,8 +74,8 @@ diff -rup a/collectors/fping.plugin/fping.plugin b/collectors/fping.plugin/fping # netdata diff -rup a/collectors/fping.plugin/fping.plugin.in b/collectors/fping.plugin/fping.plugin.in ---- a/collectors/fping.plugin/fping.plugin.in 2022-02-14 18:01:12.160767358 +0100 -+++ b/collectors/fping.plugin/fping.plugin.in 2022-02-17 19:42:53.199055644 +0100 +--- a/collectors/fping.plugin/fping.plugin.in 2022-03-15 13:47:55.109442345 +0100 ++++ b/collectors/fping.plugin/fping.plugin.in 2022-04-19 16:32:30.951493127 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -92,8 +83,8 @@ diff -rup a/collectors/fping.plugin/fping.plugin.in b/collectors/fping.plugin/fp # netdata diff -rup a/collectors/ioping.plugin/ioping.plugin b/collectors/ioping.plugin/ioping.plugin ---- a/collectors/ioping.plugin/ioping.plugin 2022-02-14 18:02:10.349553970 +0100 -+++ b/collectors/ioping.plugin/ioping.plugin 2022-02-17 19:42:53.203055665 +0100 +--- a/collectors/ioping.plugin/ioping.plugin 2022-04-18 15:12:47.498421484 +0200 ++++ b/collectors/ioping.plugin/ioping.plugin 2022-04-19 16:32:30.954493142 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -101,8 +92,8 @@ diff -rup a/collectors/ioping.plugin/ioping.plugin b/collectors/ioping.plugin/io # netdata diff -rup a/collectors/ioping.plugin/ioping.plugin.in b/collectors/ioping.plugin/ioping.plugin.in ---- a/collectors/ioping.plugin/ioping.plugin.in 2022-02-14 18:01:12.164767390 +0100 -+++ b/collectors/ioping.plugin/ioping.plugin.in 2022-02-17 19:42:53.201055654 +0100 +--- a/collectors/ioping.plugin/ioping.plugin.in 2022-03-29 16:20:22.484652037 +0200 ++++ b/collectors/ioping.plugin/ioping.plugin.in 2022-04-19 16:32:30.952493132 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -110,8 +101,8 @@ diff -rup a/collectors/ioping.plugin/ioping.plugin.in b/collectors/ioping.plugin # netdata diff -rup a/collectors/node.d.plugin/node.d.plugin b/collectors/node.d.plugin/node.d.plugin ---- a/collectors/node.d.plugin/node.d.plugin 2022-02-14 18:02:10.621557334 +0100 -+++ b/collectors/node.d.plugin/node.d.plugin 2022-02-17 19:42:53.189055591 +0100 +--- a/collectors/node.d.plugin/node.d.plugin 2022-04-18 15:12:50.708422331 +0200 ++++ b/collectors/node.d.plugin/node.d.plugin 2022-04-19 16:32:30.941493076 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -119,8 +110,8 @@ diff -rup a/collectors/node.d.plugin/node.d.plugin b/collectors/node.d.plugin/no // shebang hack from: diff -rup a/collectors/node.d.plugin/node.d.plugin.in b/collectors/node.d.plugin/node.d.plugin.in ---- a/collectors/node.d.plugin/node.d.plugin.in 2022-02-14 18:01:12.164767390 +0100 -+++ b/collectors/node.d.plugin/node.d.plugin.in 2022-02-17 19:42:53.190055596 +0100 +--- a/collectors/node.d.plugin/node.d.plugin.in 2021-04-30 16:00:34.268809326 +0200 ++++ b/collectors/node.d.plugin/node.d.plugin.in 2022-04-19 16:32:30.943493086 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -128,8 +119,8 @@ diff -rup a/collectors/node.d.plugin/node.d.plugin.in b/collectors/node.d.plugin // shebang hack from: diff -rup a/collectors/python.d.plugin/python.d.plugin b/collectors/python.d.plugin/python.d.plugin ---- a/collectors/python.d.plugin/python.d.plugin 2022-02-14 18:02:10.737558769 +0100 -+++ b/collectors/python.d.plugin/python.d.plugin 2022-02-17 19:42:53.194055617 +0100 +--- a/collectors/python.d.plugin/python.d.plugin 2022-04-18 15:12:51.665089250 +0200 ++++ b/collectors/python.d.plugin/python.d.plugin 2022-04-19 16:32:30.947493106 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -137,8 +128,8 @@ diff -rup a/collectors/python.d.plugin/python.d.plugin b/collectors/python.d.plu pybinary=$(which python3 || which python || which python2) filtered=() diff -rup a/collectors/python.d.plugin/python.d.plugin.in b/collectors/python.d.plugin/python.d.plugin.in ---- a/collectors/python.d.plugin/python.d.plugin.in 2022-02-14 18:01:12.188767586 +0100 -+++ b/collectors/python.d.plugin/python.d.plugin.in 2022-02-17 19:42:53.192055607 +0100 +--- a/collectors/python.d.plugin/python.d.plugin.in 2022-03-15 13:47:55.122775699 +0100 ++++ b/collectors/python.d.plugin/python.d.plugin.in 2022-04-19 16:32:30.945493096 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -146,8 +137,8 @@ diff -rup a/collectors/python.d.plugin/python.d.plugin.in b/collectors/python.d. pybinary=$(which python3 || which python || which python2) filtered=() diff -rup a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py ---- a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2022-02-14 18:01:12.192767618 +0100 -+++ b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2022-02-17 19:42:53.329056329 +0100 +--- a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2021-04-30 16:00:34.295475990 +0200 ++++ b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2022-04-19 16:32:31.073493750 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +# @@ -155,8 +146,8 @@ diff -rup a/collectors/python.d.plugin/python_modules/third_party/boinc_client.p # # client.py - Somewhat higher-level GUI_RPC API for BOINC core client diff -rup a/collectors/tc.plugin/tc-qos-helper.sh b/collectors/tc.plugin/tc-qos-helper.sh ---- a/collectors/tc.plugin/tc-qos-helper.sh 2022-02-14 18:02:11.425567092 +0100 -+++ b/collectors/tc.plugin/tc-qos-helper.sh 2022-02-17 19:42:53.171055496 +0100 +--- a/collectors/tc.plugin/tc-qos-helper.sh 2022-04-18 15:12:58.161757637 +0200 ++++ b/collectors/tc.plugin/tc-qos-helper.sh 2022-04-19 16:32:30.930493020 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -164,8 +155,8 @@ diff -rup a/collectors/tc.plugin/tc-qos-helper.sh b/collectors/tc.plugin/tc-qos- # netdata # real-time performance and health monitoring, done right! diff -rup a/collectors/tc.plugin/tc-qos-helper.sh.in b/collectors/tc.plugin/tc-qos-helper.sh.in ---- a/collectors/tc.plugin/tc-qos-helper.sh.in 2022-02-14 18:01:12.200767684 +0100 -+++ b/collectors/tc.plugin/tc-qos-helper.sh.in 2022-02-17 19:42:53.170055491 +0100 +--- a/collectors/tc.plugin/tc-qos-helper.sh.in 2022-03-15 13:47:55.126109038 +0100 ++++ b/collectors/tc.plugin/tc-qos-helper.sh.in 2022-04-19 16:32:30.928493009 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -173,8 +164,8 @@ diff -rup a/collectors/tc.plugin/tc-qos-helper.sh.in b/collectors/tc.plugin/tc-q # netdata # real-time performance and health monitoring, done right! diff -rup a/contrib/debian/install_go.sh b/contrib/debian/install_go.sh ---- a/contrib/debian/install_go.sh 2022-02-14 18:01:12.200767684 +0100 -+++ b/contrib/debian/install_go.sh 2022-02-17 19:42:53.206055680 +0100 +--- a/contrib/debian/install_go.sh 2022-03-15 13:47:55.126109038 +0100 ++++ b/contrib/debian/install_go.sh 2022-04-19 16:32:30.957493158 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -182,26 +173,17 @@ diff -rup a/contrib/debian/install_go.sh b/contrib/debian/install_go.sh GO_PACKAGE_VERSION="$1" LIB_DIR="$2" diff -rup a/contrib/rhel/build-netdata-rpm.sh b/contrib/rhel/build-netdata-rpm.sh ---- a/contrib/rhel/build-netdata-rpm.sh 2022-02-14 18:01:12.200767684 +0100 -+++ b/contrib/rhel/build-netdata-rpm.sh 2022-02-17 19:42:53.204055670 +0100 +--- a/contrib/rhel/build-netdata-rpm.sh 2022-03-15 13:47:55.126109038 +0100 ++++ b/contrib/rhel/build-netdata-rpm.sh 2022-04-19 16:32:30.956493152 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash # docker run -it --rm centos:6.9 /bin/sh # yum -y install rpm-build redhat-rpm-config yum-utils autoconf automake curl gcc git libmnl-devel libuuid-devel make pkgconfig zlib-devel -diff -rup a/contrib/sles11/alarm-notify-basic.bash3.sh b/contrib/sles11/alarm-notify-basic.bash3.sh ---- a/contrib/sles11/alarm-notify-basic.bash3.sh 2022-02-14 18:01:12.200767684 +0100 -+++ b/contrib/sles11/alarm-notify-basic.bash3.sh 2022-02-17 19:42:53.207055686 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # basic version of netdata notifier to work with bash3 - # only mail and syslog destinations are supported, one recipient each diff -rup a/coverity-scan.sh b/coverity-scan.sh ---- a/coverity-scan.sh 2022-02-14 18:01:12.200767684 +0100 -+++ b/coverity-scan.sh 2022-02-17 19:42:53.210055702 +0100 +--- a/coverity-scan.sh 2022-04-07 16:00:35.708114383 +0200 ++++ b/coverity-scan.sh 2022-04-19 16:32:30.959493168 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -209,8 +191,8 @@ diff -rup a/coverity-scan.sh b/coverity-scan.sh # Coverity scan script # diff -rup a/cppcheck.sh b/cppcheck.sh ---- a/cppcheck.sh 2022-02-14 18:01:12.200767684 +0100 -+++ b/cppcheck.sh 2022-02-17 19:42:53.212055712 +0100 +--- a/cppcheck.sh 2018-11-02 16:10:18.078559041 +0100 ++++ b/cppcheck.sh 2022-04-19 16:32:30.961493178 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -218,8 +200,8 @@ diff -rup a/cppcheck.sh b/cppcheck.sh # echo >>/tmp/cppcheck.log "cppcheck ${*}" diff -rup a/daemon/anonymous-statistics.sh b/daemon/anonymous-statistics.sh ---- a/daemon/anonymous-statistics.sh 2022-02-14 18:02:11.469567624 +0100 -+++ b/daemon/anonymous-statistics.sh 2022-02-17 19:42:53.242055870 +0100 +--- a/daemon/anonymous-statistics.sh 2022-04-18 15:12:58.645091098 +0200 ++++ b/daemon/anonymous-statistics.sh 2022-04-19 16:32:30.989493321 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/sh @@ -227,8 +209,8 @@ diff -rup a/daemon/anonymous-statistics.sh b/daemon/anonymous-statistics.sh # Valid actions: diff -rup a/daemon/anonymous-statistics.sh.in b/daemon/anonymous-statistics.sh.in ---- a/daemon/anonymous-statistics.sh.in 2022-02-14 18:01:12.204767716 +0100 -+++ b/daemon/anonymous-statistics.sh.in 2022-02-17 19:42:53.241055865 +0100 +--- a/daemon/anonymous-statistics.sh.in 2022-03-15 13:47:55.126109038 +0100 ++++ b/daemon/anonymous-statistics.sh.in 2022-04-19 16:32:30.987493311 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/sh @@ -236,26 +218,26 @@ diff -rup a/daemon/anonymous-statistics.sh.in b/daemon/anonymous-statistics.sh.i # Valid actions: diff -rup a/daemon/get-kubernetes-labels.sh b/daemon/get-kubernetes-labels.sh ---- a/daemon/get-kubernetes-labels.sh 2022-02-14 18:02:11.473567673 +0100 -+++ b/daemon/get-kubernetes-labels.sh 2022-02-17 19:42:53.216055733 +0100 +--- a/daemon/get-kubernetes-labels.sh 2022-04-18 15:12:58.698424445 +0200 ++++ b/daemon/get-kubernetes-labels.sh 2022-04-19 16:32:30.964493193 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash - # Checks if netdata is running in a kubernetes pod and fetches that pod's labels - + # Checks if netdata is running in a kubernetes pod and fetches: + # - pod's labels diff -rup a/daemon/get-kubernetes-labels.sh.in b/daemon/get-kubernetes-labels.sh.in ---- a/daemon/get-kubernetes-labels.sh.in 2022-02-14 18:01:12.204767716 +0100 -+++ b/daemon/get-kubernetes-labels.sh.in 2022-02-17 19:42:53.214055723 +0100 +--- a/daemon/get-kubernetes-labels.sh.in 2022-04-11 14:27:01.935438827 +0200 ++++ b/daemon/get-kubernetes-labels.sh.in 2022-04-19 16:32:30.962493183 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash - # Checks if netdata is running in a kubernetes pod and fetches that pod's labels - + # Checks if netdata is running in a kubernetes pod and fetches: + # - pod's labels diff -rup a/daemon/system-info.sh b/daemon/system-info.sh ---- a/daemon/system-info.sh 2022-02-14 18:01:12.204767716 +0100 -+++ b/daemon/system-info.sh 2022-02-17 19:42:53.239055855 +0100 +--- a/daemon/system-info.sh 2022-04-07 16:00:43.864785538 +0200 ++++ b/daemon/system-info.sh 2022-04-19 16:32:30.986493306 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/sh @@ -263,8 +245,8 @@ diff -rup a/daemon/system-info.sh b/daemon/system-info.sh # ------------------------------------------------------------------------------------------------- # detect the kernel diff -rup a/diagrams/build.sh b/diagrams/build.sh ---- a/diagrams/build.sh 2022-02-14 18:01:12.260768173 +0100 -+++ b/diagrams/build.sh 2022-02-17 19:42:53.217055738 +0100 +--- a/diagrams/build.sh 2018-10-16 15:11:47.573219719 +0200 ++++ b/diagrams/build.sh 2022-04-19 16:32:30.966493204 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -272,8 +254,8 @@ diff -rup a/diagrams/build.sh b/diagrams/build.sh path=$(dirname "$0") diff -rup a/exporting/nc-exporting.sh b/exporting/nc-exporting.sh ---- a/exporting/nc-exporting.sh 2022-02-14 18:01:12.272768270 +0100 -+++ b/exporting/nc-exporting.sh 2022-02-17 19:42:53.219055749 +0100 +--- a/exporting/nc-exporting.sh 2022-03-29 16:20:22.497985377 +0200 ++++ b/exporting/nc-exporting.sh 2022-04-19 16:32:30.968493214 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -281,8 +263,8 @@ diff -rup a/exporting/nc-exporting.sh b/exporting/nc-exporting.sh # SPDX-License-Identifier: GPL-3.0-or-later diff -rup a/health/notifications/alarm-email.sh b/health/notifications/alarm-email.sh ---- a/health/notifications/alarm-email.sh 2022-02-14 18:01:12.276768303 +0100 -+++ b/health/notifications/alarm-email.sh 2022-02-17 19:42:53.220055754 +0100 +--- a/health/notifications/alarm-email.sh 2021-04-30 16:00:34.352142649 +0200 ++++ b/health/notifications/alarm-email.sh 2022-04-19 16:32:30.969493219 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -290,8 +272,8 @@ diff -rup a/health/notifications/alarm-email.sh b/health/notifications/alarm-ema # OBSOLETE - REPLACED WITH diff -rup a/health/notifications/alarm-notify.sh b/health/notifications/alarm-notify.sh ---- a/health/notifications/alarm-notify.sh 2022-02-14 18:02:12.081575024 +0100 -+++ b/health/notifications/alarm-notify.sh 2022-02-17 19:42:53.222055765 +0100 +--- a/health/notifications/alarm-notify.sh 2022-04-18 15:13:05.155092827 +0200 ++++ b/health/notifications/alarm-notify.sh 2022-04-19 16:32:30.972493234 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -299,8 +281,8 @@ diff -rup a/health/notifications/alarm-notify.sh b/health/notifications/alarm-no # netdata diff -rup a/health/notifications/alarm-notify.sh.in b/health/notifications/alarm-notify.sh.in ---- a/health/notifications/alarm-notify.sh.in 2022-02-14 18:01:12.280768336 +0100 -+++ b/health/notifications/alarm-notify.sh.in 2022-02-17 19:42:53.224055775 +0100 +--- a/health/notifications/alarm-notify.sh.in 2022-03-15 13:47:55.189442468 +0100 ++++ b/health/notifications/alarm-notify.sh.in 2022-04-19 16:32:30.974493244 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -308,8 +290,8 @@ diff -rup a/health/notifications/alarm-notify.sh.in b/health/notifications/alarm # netdata diff -rup a/health/notifications/alarm-test.sh b/health/notifications/alarm-test.sh ---- a/health/notifications/alarm-test.sh 2022-02-14 18:01:12.280768336 +0100 -+++ b/health/notifications/alarm-test.sh 2022-02-17 19:42:53.226055786 +0100 +--- a/health/notifications/alarm-test.sh 2021-04-30 16:00:34.352142649 +0200 ++++ b/health/notifications/alarm-test.sh 2022-04-19 16:32:30.975493250 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -317,8 +299,8 @@ diff -rup a/health/notifications/alarm-test.sh b/health/notifications/alarm-test # netdata # real-time performance and health monitoring, done right! diff -rup a/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py b/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py ---- a/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py 2022-02-14 18:01:30.753067208 +0100 -+++ b/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py 2022-02-17 19:42:53.332056344 +0100 +--- a/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py 2021-10-27 14:02:02.010887170 +0200 ++++ b/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py 2022-04-19 16:32:31.075493761 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/python33 @@ -326,8 +308,8 @@ diff -rup a/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py b/ml/kmeans/dli # Syntax: mkdoc.py [-I<path> ..] [.. a list of header files ..] # diff -rup a/ml/kmeans/dlib/dlib/travis/build-and-test.sh b/ml/kmeans/dlib/dlib/travis/build-and-test.sh ---- a/ml/kmeans/dlib/dlib/travis/build-and-test.sh 2022-02-14 18:01:30.845068308 +0100 -+++ b/ml/kmeans/dlib/dlib/travis/build-and-test.sh 2022-02-17 19:42:53.229055802 +0100 +--- a/ml/kmeans/dlib/dlib/travis/build-and-test.sh 2021-10-27 14:02:02.070887180 +0200 ++++ b/ml/kmeans/dlib/dlib/travis/build-and-test.sh 2022-04-19 16:32:30.977493260 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -335,8 +317,8 @@ diff -rup a/ml/kmeans/dlib/dlib/travis/build-and-test.sh b/ml/kmeans/dlib/dlib/t set -eux diff -rup a/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py b/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py ---- a/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2022-02-14 18:01:30.905069026 +0100 -+++ b/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2022-02-17 19:42:53.334056355 +0100 +--- a/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2021-10-27 14:02:02.120887187 +0200 ++++ b/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2022-04-19 16:32:31.078493776 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 @@ -344,26 +326,17 @@ diff -rup a/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model # This script takes the dlib lenet model trained by the # examples/dnn_introduction_ex.cpp example program and runs it using caffe. diff -rup a/packaging/check-kernel-config.sh b/packaging/check-kernel-config.sh ---- a/packaging/check-kernel-config.sh 2022-02-14 18:01:12.292768433 +0100 -+++ b/packaging/check-kernel-config.sh 2022-02-17 19:42:53.232055817 +0100 +--- a/packaging/check-kernel-config.sh 2022-03-14 13:51:04.198273428 +0100 ++++ b/packaging/check-kernel-config.sh 2022-04-19 16:32:30.979493270 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash get_kernel_version() { r="$(uname -r | cut -f 1 -d '-')" -diff -rup a/packaging/installer/netdata-uninstaller.sh b/packaging/installer/netdata-uninstaller.sh ---- a/packaging/installer/netdata-uninstaller.sh 2022-02-14 18:01:12.292768433 +0100 -+++ b/packaging/installer/netdata-uninstaller.sh 2022-02-17 19:42:53.230055807 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # - # This is the netdata uninstaller script - # diff -rup a/system/edit-config b/system/edit-config ---- a/system/edit-config 2022-02-14 18:02:09.541543976 +0100 -+++ b/system/edit-config 2022-02-17 19:42:53.244055881 +0100 +--- a/system/edit-config 2022-04-18 15:12:42.781753576 +0200 ++++ b/system/edit-config 2022-04-19 16:32:30.991493331 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/sh @@ -371,8 +344,8 @@ diff -rup a/system/edit-config b/system/edit-config [ -f /etc/profile ] && . /etc/profile diff -rup a/system/edit-config.in b/system/edit-config.in ---- a/system/edit-config.in 2022-02-14 18:01:12.300768498 +0100 -+++ b/system/edit-config.in 2022-02-17 19:42:53.246055891 +0100 +--- a/system/edit-config.in 2022-02-25 16:31:16.975943768 +0100 ++++ b/system/edit-config.in 2022-04-19 16:32:30.992493336 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/sh @@ -380,8 +353,8 @@ diff -rup a/system/edit-config.in b/system/edit-config.in [ -f /etc/profile ] && . /etc/profile diff -rup a/system/netdata-lsb.in b/system/netdata-lsb.in ---- a/system/netdata-lsb.in 2022-02-14 18:01:12.300768498 +0100 -+++ b/system/netdata-lsb.in 2022-02-17 19:42:53.234055828 +0100 +--- a/system/netdata-lsb.in 2022-02-25 16:31:16.975943768 +0100 ++++ b/system/netdata-lsb.in 2022-04-19 16:32:30.980493275 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -389,8 +362,8 @@ diff -rup a/system/netdata-lsb.in b/system/netdata-lsb.in # Netdata LSB start script # diff -rup a/tests/health_mgmtapi/health-cmdapi-test.sh b/tests/health_mgmtapi/health-cmdapi-test.sh ---- a/tests/health_mgmtapi/health-cmdapi-test.sh 2022-02-14 18:02:09.601544718 +0100 -+++ b/tests/health_mgmtapi/health-cmdapi-test.sh 2022-02-17 19:42:53.236055839 +0100 +--- a/tests/health_mgmtapi/health-cmdapi-test.sh 2022-04-18 15:12:42.991753631 +0200 ++++ b/tests/health_mgmtapi/health-cmdapi-test.sh 2022-04-19 16:32:30.982493285 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -398,8 +371,8 @@ diff -rup a/tests/health_mgmtapi/health-cmdapi-test.sh b/tests/health_mgmtapi/he NETDATA_VARLIB_DIR="/var/lib/netdata" diff -rup a/tests/health_mgmtapi/health-cmdapi-test.sh.in b/tests/health_mgmtapi/health-cmdapi-test.sh.in ---- a/tests/health_mgmtapi/health-cmdapi-test.sh.in 2022-02-14 18:01:12.300768498 +0100 -+++ b/tests/health_mgmtapi/health-cmdapi-test.sh.in 2022-02-17 19:42:53.237055844 +0100 +--- a/tests/health_mgmtapi/health-cmdapi-test.sh.in 2022-02-25 16:31:16.979277102 +0100 ++++ b/tests/health_mgmtapi/health-cmdapi-test.sh.in 2022-04-19 16:32:30.984493296 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash diff --git a/netdata-remove-fonts-1.33.1.patch b/netdata-remove-fonts-1.34.1.patch similarity index 89% rename from netdata-remove-fonts-1.33.1.patch rename to netdata-remove-fonts-1.34.1.patch index 5fc0c07..2b20739 100644 --- a/netdata-remove-fonts-1.33.1.patch +++ b/netdata-remove-fonts-1.34.1.patch @@ -1,9 +1,9 @@ diff -rup a/web/gui/dashboard/Makefile.am b/web/gui/dashboard/Makefile.am ---- a/web/gui/dashboard/Makefile.am 2022-02-14 17:58:30.000000000 +0100 -+++ b/web/gui/dashboard/Makefile.am 2022-02-16 19:17:22.648816557 +0100 +--- a/web/gui/dashboard/Makefile.am 2022-04-14 13:22:42.927570498 +0200 ++++ b/web/gui/dashboard/Makefile.am 2022-04-19 22:57:25.589407143 +0200 @@ -163,36 +163,3 @@ dist_webstaticjs_DATA = \ - static/js/runtime-main.ec4d2459.js \ - static/js/runtime-main.ec4d2459.js.map \ + static/js/runtime-main.b352aa47.js \ + static/js/runtime-main.b352aa47.js.map \ $(NULL) - -webstaticmediadir=$(webdir)/static/media diff --git a/netdata.profile b/netdata.profile deleted file mode 100644 index 0673b29..0000000 --- a/netdata.profile +++ /dev/null @@ -1,5 +0,0 @@ -# env vars for netdata -export NETDATA_STOCK_CONFIG_DIR="/etc/netdata/conf.d" -export NETDATA_USER_CONFIG_DIR="/etc/netdata" -export NETDATA_VARLIB_DIR="/var/lib/netdata" -export NETDATA_CACHE_DIR="/var/cache/netdata" diff --git a/netdata.spec b/netdata.spec index bf78f37..5aa13e5 100644 --- a/netdata.spec +++ b/netdata.spec @@ -17,6 +17,13 @@ ExcludeArch: s390x %bcond_without cups %endif +# Because protobuf is too old in el7 +%if 0%{?rhel} && 0%{?rhel} == 7 +%bcond_without bundled_protobuf +%else +%bcond_with bundled_protobuf +%endif + %if 0%{?rhel} && 0%{?rhel} <= 7 # This is temporary and should eventually be resolved. This bypasses # the default rhel __os_install_post which throws a python compile @@ -28,12 +35,17 @@ ExcludeArch: s390x %global _hardened_build 1 # Build release candidate -%global upver 1.33.1 +%global upver 1.34.1 #global rcver rc0 +# Last python 2 support (el7 only) +%global protobuf_cpp_ver 3.17.3 + +%global stock_conf_path %{_prefix}/lib/%{name} + Name: netdata Version: %{upver}%{?rcver:~%{rcver}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Real-time performance monitoring # For a breakdown of the licensing, see LICENSE-REDISTRIBUTED.md License: GPLv3 and GPLv3+ and ASL 2.0 and CC-BY and MIT and WTFPL @@ -42,12 +54,13 @@ Source0: https://github.com/netdata/netdata/releases/download/v%{upver}%{ Source1: netdata.tmpfiles.conf Source2: netdata.init Source3: netdata.conf -Source4: netdata.profile Source5: README-packager.md -Patch0: netdata-fix-shebang-1.33.1.patch +# Only for el7 +Source10: https://github.com/protocolbuffers/protobuf/releases/download/v%{protobuf... +Patch0: netdata-fix-shebang-1.34.1.patch %if 0%{?fedora} # Remove embedded font -Patch10: netdata-remove-fonts-1.33.1.patch +Patch10: netdata-remove-fonts-1.34.1.patch %endif BuildRequires: zlib-devel @@ -104,6 +117,7 @@ BuildRequires: python3 BuildRequires: python2 %endif + Requires: nodejs Requires: curl Requires: nc @@ -162,8 +176,27 @@ freeipmi plugin for netdata rm -rf web/fonts web/gui/dashboard/static/media %endif cp %{SOURCE5} . +### BEGIN netdata cloud +%if %{with bundled_protobuf} +mkdir -p externaldeps/protobuf +tar -xzf %{SOURCE10} -C externaldeps/protobuf +%endif +### END netdata cloud %build +### BEGIN netdata cloud +%if %{with bundled_protobuf} +pushd externaldeps/protobuf/protobuf-%{protobuf_cpp_ver} +%configure \ + --disable-shared \ + --without-zlib \ + --disable-dependency-tracking \ + --with-pic +CFLAGS="${CFLAGS} -fPIC" %make_build +popd +cp -a externaldeps/protobuf/protobuf-%{protobuf_cpp_ver}/src externaldeps/protobuf +%endif +### END netdata cloud autoreconf -ivf %configure \ --enable-plugin-freeipmi \ @@ -172,11 +205,14 @@ autoreconf -ivf %endif %if %{with cups} --enable-plugin-cups \ +%endif +%if %{with bundled_protobuf} + --with-bundled-protobuf \ %endif --with-zlib \ --with-math \ --with-user=netdata - + %make_build %install @@ -197,10 +233,18 @@ mkdir -p %{buildroot}%{_localstatedir}/cache/%{name} mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d install -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/ install -p -m 0644 system/netdata.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -# Conf files must be in /etc, dixit FHS and it's better in a noarch pkg -mv %{buildroot}%{_libdir}/%{name}/conf.d %{buildroot}%{_sysconfdir}/%{name}/ -# Scripts must not be in /etc +# it's better to put stock config file in a noarch pkg (like systemd) +%ifarch x86_64 +mkdir -p %{buildroot}%{stock_conf_path}/conf.d +mv %{buildroot}%{_libdir}/%{name}/conf.d/* %{buildroot}%{stock_conf_path}/conf.d +%endif + +# Scripts must not be in /etc, /usr/libexec is a better place mv %{buildroot}%{_sysconfdir}/%{name}/edit-config %{buildroot}%{_libexecdir}/%{name}/edit-config +# Force stock config file to a noarch path (like systemd) +%ifarch x86_64 +sed -i -e '/NETDATA_STOCK_CONFIG_DIR/ s/lib64/lib/' %{buildroot}%{_libexecdir}/%{name}/edit-config +%endif # Fix EOL sed -i -e 's/\r//' %{buildroot}%{_datadir}/%{name}/web/lib/tableExport-1.6.0.min.js # Delete useless hidden dir @@ -212,10 +256,6 @@ for dir in charts.d health.d python.d statsd.d ; do mkdir -p %{buildroot}%{_sysconfdir}/%{name}/${dir} done -mkdir -p %{buildroot}%{_sysconfdir}/profile.d -install -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/netdata.sh -rm -f %{buildroot}%{_sysconfdir}/netdata/.install-type - %check make tests @@ -225,6 +265,9 @@ getent passwd netdata > /dev/null || useradd -r -g netdata -c "NetData User" -s %post sed -i -e '/web files group/ s/root/netdata/' /etc/netdata/netdata.conf ||: +sed -i -e '/stock config directory/ s;/etc/netdata/conf.d;/usr/lib/netdata/conf.d;' /etc/netdata/netdata.conf ||: +sed -i -e '/stock health configuration directory/ s;/etc/netdata/conf.d/health.d;/usr/lib/netdata/conf.d/health.d;' /etc/netdata/netdata.conf ||: +rm -f %{_sysconfdir}/profile.d/netdata.sh ||: %systemd_post %{name}.service echo "The current config file can be downloaded with the following command" echo "curl -o /etc/netdata/netdata.conf http://localhost:19999/netdata.conf" @@ -268,21 +311,11 @@ echo "Config should be edited with %{_libexecdir}/%{name}/edit-config" %dir %{_sysconfdir}/%{name}/health.d %dir %{_sysconfdir}/%{name}/python.d %dir %{_sysconfdir}/%{name}/statsd.d -%dir %{_sysconfdir}/%{name}/conf.d -%dir %{_sysconfdir}/%{name}/conf.d/charts.d -%dir %{_sysconfdir}/%{name}/conf.d/health.d -%dir %{_sysconfdir}/%{name}/conf.d/python.d -%dir %{_sysconfdir}/%{name}/conf.d/statsd.d -%dir %{_sysconfdir}/%{name}/conf.d/ebpf.d -%config %{_sysconfdir}/%{name}/%{name}.conf -%config %{_sysconfdir}/%{name}/conf.d/*.conf -%config %{_sysconfdir}/%{name}/conf.d/charts.d/*.conf -%config %{_sysconfdir}/%{name}/conf.d/health.d/*.conf -%config %{_sysconfdir}/%{name}/conf.d/python.d/*.conf -%config %{_sysconfdir}/%{name}/conf.d/statsd.d/*.conf -%config %{_sysconfdir}/%{name}/conf.d/ebpf.d/*.conf -%config %{_sysconfdir}/logrotate.d/netdata -%config %{_sysconfdir}/profile.d/netdata.sh +%dir %{stock_conf_path} +%{_sysconfdir}/%{name}/.install-type +%{stock_conf_path}/conf.d/* +%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/netdata %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/edit-config @@ -299,6 +332,11 @@ echo "Config should be edited with %{_libexecdir}/%{name}/edit-config" %caps(cap_setuid=ep) %attr(4750,root,netdata) %{_libexecdir}/%{name}/plugins.d/freeipmi.plugin %changelog +* Sat Apr 30 2022 Didier Fabert <didier.fabert(a)gmail.com> 1.34.1-1 +- Update from upstream +- Move stock config files in /usr/lib/netdata/conf.d +- Use embedded protobuf-cpp for el7 + * Sun Feb 20 2022 Didier Fabert <didier.fabert(a)gmail.com> 1.33.1-2 - Fix el9 buildreq condition for autogen diff --git a/sources b/sources index 36b7805..87c918f 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (netdata-v1.33.1.tar.gz) = f6586426bd0fe1ac3d903ec279b27177b1d232f5ca1fc28b01f052a5f2f57846d2d6369c9d5a1872fb97e31f86f1f7a11c600beda590447f9ca30c93e7ac262c +SHA512 (netdata-v1.34.1.tar.gz) = 777b0f4efa0b64dd150a097cb2ec1c3155506ada9c1e5289b6acda5e34c9262f796795608b52e70c9310a5cbda03c0568e1391c6861c7f3ea84aa9ca84ed9a0c +SHA512 (protobuf-cpp-3.17.3.tar.gz) = efad397f5cdda6639d5e9980fe6eeadc1ef768bf1d96b1e528a1d7ba1d81ceb49e22cbd78d9b4ab3518236055140568342ff138204b4a47234fb2957a89d2db8

2 years

1
0
0 / 0

Architecture specific change in rpms/netdata.git

by githook-noreply＠fedoraproject.org

The package rpms/netdata.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/netdata.git/commit/?id=da8df30485... https://src.fedoraproject.org/cgit/rpms/netdata.git/commit/?id=65fa8eb3bb.... Change: -%ifarch x86_64 +%ifarch x86_64 Thanks. Full change: ============ commit 48dc81dfc8371692fe620208c1d430908ddb8249 Author: Didier Fabert <didier.fabert(a)gmail.com> Date: Tue May 3 17:19:27 2022 +0200 Revert stock config files to /etc/netdata, part2 diff --git a/netdata.profile b/netdata.profile new file mode 100644 index 0000000..0673b29 --- /dev/null +++ b/netdata.profile @@ -0,0 +1,5 @@ +# env vars for netdata +export NETDATA_STOCK_CONFIG_DIR="/etc/netdata/conf.d" +export NETDATA_USER_CONFIG_DIR="/etc/netdata" +export NETDATA_VARLIB_DIR="/var/lib/netdata" +export NETDATA_CACHE_DIR="/var/cache/netdata" commit da8df3048514de25d253a572ef4b05f2906ff1b9 Author: Didier Fabert <didier.fabert(a)gmail.com> Date: Tue May 3 17:12:54 2022 +0200 Revert stock config files to /etc/netdata diff --git a/netdata.spec b/netdata.spec index 5aa13e5..31434e3 100644 --- a/netdata.spec +++ b/netdata.spec @@ -41,7 +41,6 @@ ExcludeArch: s390x # Last python 2 support (el7 only) %global protobuf_cpp_ver 3.17.3 -%global stock_conf_path %{_prefix}/lib/%{name} Name: netdata Version: %{upver}%{?rcver:~%{rcver}} @@ -54,6 +53,7 @@ Source0: https://github.com/netdata/netdata/releases/download/v%{upver}%{ Source1: netdata.tmpfiles.conf Source2: netdata.init Source3: netdata.conf +Source4: netdata.profile Source5: README-packager.md # Only for el7 Source10: https://github.com/protocolbuffers/protobuf/releases/download/v%{protobuf... @@ -212,7 +212,7 @@ autoreconf -ivf --with-zlib \ --with-math \ --with-user=netdata - + %make_build %install @@ -233,18 +233,10 @@ mkdir -p %{buildroot}%{_localstatedir}/cache/%{name} mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d install -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/ install -p -m 0644 system/netdata.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -# it's better to put stock config file in a noarch pkg (like systemd) -%ifarch x86_64 -mkdir -p %{buildroot}%{stock_conf_path}/conf.d -mv %{buildroot}%{_libdir}/%{name}/conf.d/* %{buildroot}%{stock_conf_path}/conf.d -%endif - +# Conf files must be in /etc, dixit FHS and it's better in a noarch pkg +mv %{buildroot}%{_libdir}/%{name}/conf.d %{buildroot}%{_sysconfdir}/%{name}/ # Scripts must not be in /etc, /usr/libexec is a better place mv %{buildroot}%{_sysconfdir}/%{name}/edit-config %{buildroot}%{_libexecdir}/%{name}/edit-config -# Force stock config file to a noarch path (like systemd) -%ifarch x86_64 -sed -i -e '/NETDATA_STOCK_CONFIG_DIR/ s/lib64/lib/' %{buildroot}%{_libexecdir}/%{name}/edit-config -%endif # Fix EOL sed -i -e 's/\r//' %{buildroot}%{_datadir}/%{name}/web/lib/tableExport-1.6.0.min.js # Delete useless hidden dir @@ -256,6 +248,9 @@ for dir in charts.d health.d python.d statsd.d ; do mkdir -p %{buildroot}%{_sysconfdir}/%{name}/${dir} done +mkdir -p %{buildroot}%{_sysconfdir}/profile.d +install -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/netdata.sh + %check make tests @@ -265,9 +260,6 @@ getent passwd netdata > /dev/null || useradd -r -g netdata -c "NetData User" -s %post sed -i -e '/web files group/ s/root/netdata/' /etc/netdata/netdata.conf ||: -sed -i -e '/stock config directory/ s;/etc/netdata/conf.d;/usr/lib/netdata/conf.d;' /etc/netdata/netdata.conf ||: -sed -i -e '/stock health configuration directory/ s;/etc/netdata/conf.d/health.d;/usr/lib/netdata/conf.d/health.d;' /etc/netdata/netdata.conf ||: -rm -f %{_sysconfdir}/profile.d/netdata.sh ||: %systemd_post %{name}.service echo "The current config file can be downloaded with the following command" echo "curl -o /etc/netdata/netdata.conf http://localhost:19999/netdata.conf" @@ -311,13 +303,24 @@ echo "Config should be edited with %{_libexecdir}/%{name}/edit-config" %dir %{_sysconfdir}/%{name}/health.d %dir %{_sysconfdir}/%{name}/python.d %dir %{_sysconfdir}/%{name}/statsd.d -%dir %{stock_conf_path} -%{_sysconfdir}/%{name}/.install-type -%{stock_conf_path}/conf.d/* +%dir %{_sysconfdir}/%{name}/conf.d +%dir %{_sysconfdir}/%{name}/conf.d/charts.d +%dir %{_sysconfdir}/%{name}/conf.d/health.d +%dir %{_sysconfdir}/%{name}/conf.d/python.d +%dir %{_sysconfdir}/%{name}/conf.d/statsd.d +%dir %{_sysconfdir}/%{name}/conf.d/ebpf.d %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf -%config(noreplace) %{_sysconfdir}/logrotate.d/netdata +%config %{_sysconfdir}/%{name}/conf.d/*.conf +%config %{_sysconfdir}/%{name}/conf.d/charts.d/*.conf +%config %{_sysconfdir}/%{name}/conf.d/health.d/*.conf +%config %{_sysconfdir}/%{name}/conf.d/python.d/*.conf +%config %{_sysconfdir}/%{name}/conf.d/statsd.d/*.conf +%config %{_sysconfdir}/%{name}/conf.d/ebpf.d/*.conf +%config %{_sysconfdir}/logrotate.d/netdata +%config %{_sysconfdir}/profile.d/netdata.sh %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/edit-config +%{_sysconfdir}/netdata/.install-type %files data %doc README.md commit 65fa8eb3bb5e041cabbc0bd92500778f477fa7d1 Author: Didier Fabert <didier.fabert(a)gmail.com> Date: Sat Apr 30 20:36:40 2022 +0200 Update to upstream release 1.34.1 diff --git a/.gitignore b/.gitignore index f4986bc..484a2d9 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ /netdata-1.32.0.tar.gz /netdata-1.32.1.tar.gz /netdata-v1.33.1.tar.gz +/netdata-v1.34.1.tar.gz +/protobuf-cpp-3.17.3.tar.gz diff --git a/netdata-fix-shebang-1.33.1.patch b/netdata-fix-shebang-1.34.1.patch similarity index 55% rename from netdata-fix-shebang-1.33.1.patch rename to netdata-fix-shebang-1.34.1.patch index a9310e9..131f028 100644 --- a/netdata-fix-shebang-1.33.1.patch +++ b/netdata-fix-shebang-1.34.1.patch @@ -1,18 +1,9 @@ Fix shebang according to https://docs.fedoraproject.org/en-US/packaging-guidelines/#_shebang_lines -diff -rup a/backends/nc-backend.sh b/backends/nc-backend.sh ---- a/backends/nc-backend.sh 2022-02-14 18:01:12.144767227 +0100 -+++ b/backends/nc-backend.sh 2022-02-17 19:42:53.167055475 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # SPDX-License-Identifier: GPL-3.0-or-later - diff -rup a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in ---- a/claim/netdata-claim.sh.in 2022-02-14 18:01:12.148767260 +0100 -+++ b/claim/netdata-claim.sh.in 2022-02-17 19:42:53.168055480 +0100 +--- a/claim/netdata-claim.sh.in 2022-03-29 16:20:22.481318701 +0200 ++++ b/claim/netdata-claim.sh.in 2022-04-19 16:32:30.926492999 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -20,8 +11,8 @@ diff -rup a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in # real-time performance and health monitoring, done right! # (C) 2017 Costa Tsaousis <costa(a)tsaousis.gr> diff -rup a/collectors/cgroups.plugin/cgroup-name.sh b/collectors/cgroups.plugin/cgroup-name.sh ---- a/collectors/cgroups.plugin/cgroup-name.sh 2022-02-14 18:02:10.045550210 +0100 -+++ b/collectors/cgroups.plugin/cgroup-name.sh 2022-02-17 19:42:53.185055570 +0100 +--- a/collectors/cgroups.plugin/cgroup-name.sh 2022-04-18 15:12:44.868420791 +0200 ++++ b/collectors/cgroups.plugin/cgroup-name.sh 2022-04-19 16:32:30.938493060 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -29,8 +20,8 @@ diff -rup a/collectors/cgroups.plugin/cgroup-name.sh b/collectors/cgroups.plugin # netdata diff -rup a/collectors/cgroups.plugin/cgroup-name.sh.in b/collectors/cgroups.plugin/cgroup-name.sh.in ---- a/collectors/cgroups.plugin/cgroup-name.sh.in 2022-02-14 18:01:12.152767292 +0100 -+++ b/collectors/cgroups.plugin/cgroup-name.sh.in 2022-02-17 19:42:53.187055580 +0100 +--- a/collectors/cgroups.plugin/cgroup-name.sh.in 2022-03-15 13:47:55.102775668 +0100 ++++ b/collectors/cgroups.plugin/cgroup-name.sh.in 2022-04-19 16:32:30.940493071 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -38,8 +29,8 @@ diff -rup a/collectors/cgroups.plugin/cgroup-name.sh.in b/collectors/cgroups.plu # netdata diff -rup a/collectors/cgroups.plugin/cgroup-network-helper.sh b/collectors/cgroups.plugin/cgroup-network-helper.sh ---- a/collectors/cgroups.plugin/cgroup-network-helper.sh 2022-02-14 18:01:12.152767292 +0100 -+++ b/collectors/cgroups.plugin/cgroup-network-helper.sh 2022-02-17 19:42:53.183055560 +0100 +--- a/collectors/cgroups.plugin/cgroup-network-helper.sh 2022-03-15 13:47:55.102775668 +0100 ++++ b/collectors/cgroups.plugin/cgroup-network-helper.sh 2022-04-19 16:32:30.936493050 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -47,8 +38,8 @@ diff -rup a/collectors/cgroups.plugin/cgroup-network-helper.sh b/collectors/cgro # cgroup-network-helper.sh diff -rup a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh ---- a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2022-02-14 18:01:12.152767292 +0100 -+++ b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2022-02-17 19:42:53.175055517 +0100 +--- a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2021-04-30 16:00:34.262142660 +0200 ++++ b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2022-04-19 16:32:30.933493035 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -56,8 +47,8 @@ diff -rup a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh b/collectors/ch # shellcheck disable=SC2181 diff -rup a/collectors/charts.d.plugin/charts.d.plugin b/collectors/charts.d.plugin/charts.d.plugin ---- a/collectors/charts.d.plugin/charts.d.plugin 2022-02-14 18:02:10.093550803 +0100 -+++ b/collectors/charts.d.plugin/charts.d.plugin 2022-02-17 19:42:53.173055507 +0100 +--- a/collectors/charts.d.plugin/charts.d.plugin 2022-04-18 15:12:45.228420886 +0200 ++++ b/collectors/charts.d.plugin/charts.d.plugin 2022-04-19 16:32:30.931493025 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -65,8 +56,8 @@ diff -rup a/collectors/charts.d.plugin/charts.d.plugin b/collectors/charts.d.plu # netdata diff -rup a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d.plugin/charts.d.plugin.in ---- a/collectors/charts.d.plugin/charts.d.plugin.in 2022-02-14 18:01:12.156767325 +0100 -+++ b/collectors/charts.d.plugin/charts.d.plugin.in 2022-02-17 19:42:53.180055543 +0100 +--- a/collectors/charts.d.plugin/charts.d.plugin.in 2022-03-16 12:31:30.172663376 +0100 ++++ b/collectors/charts.d.plugin/charts.d.plugin.in 2022-04-19 16:32:30.935493045 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -74,8 +65,8 @@ diff -rup a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d. # netdata diff -rup a/collectors/fping.plugin/fping.plugin b/collectors/fping.plugin/fping.plugin ---- a/collectors/fping.plugin/fping.plugin 2022-02-14 18:02:10.305553425 +0100 -+++ b/collectors/fping.plugin/fping.plugin 2022-02-17 19:42:53.197055633 +0100 +--- a/collectors/fping.plugin/fping.plugin 2022-04-18 15:12:46.991754684 +0200 ++++ b/collectors/fping.plugin/fping.plugin 2022-04-19 16:32:30.949493117 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -83,8 +74,8 @@ diff -rup a/collectors/fping.plugin/fping.plugin b/collectors/fping.plugin/fping # netdata diff -rup a/collectors/fping.plugin/fping.plugin.in b/collectors/fping.plugin/fping.plugin.in ---- a/collectors/fping.plugin/fping.plugin.in 2022-02-14 18:01:12.160767358 +0100 -+++ b/collectors/fping.plugin/fping.plugin.in 2022-02-17 19:42:53.199055644 +0100 +--- a/collectors/fping.plugin/fping.plugin.in 2022-03-15 13:47:55.109442345 +0100 ++++ b/collectors/fping.plugin/fping.plugin.in 2022-04-19 16:32:30.951493127 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -92,8 +83,8 @@ diff -rup a/collectors/fping.plugin/fping.plugin.in b/collectors/fping.plugin/fp # netdata diff -rup a/collectors/ioping.plugin/ioping.plugin b/collectors/ioping.plugin/ioping.plugin ---- a/collectors/ioping.plugin/ioping.plugin 2022-02-14 18:02:10.349553970 +0100 -+++ b/collectors/ioping.plugin/ioping.plugin 2022-02-17 19:42:53.203055665 +0100 +--- a/collectors/ioping.plugin/ioping.plugin 2022-04-18 15:12:47.498421484 +0200 ++++ b/collectors/ioping.plugin/ioping.plugin 2022-04-19 16:32:30.954493142 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -101,8 +92,8 @@ diff -rup a/collectors/ioping.plugin/ioping.plugin b/collectors/ioping.plugin/io # netdata diff -rup a/collectors/ioping.plugin/ioping.plugin.in b/collectors/ioping.plugin/ioping.plugin.in ---- a/collectors/ioping.plugin/ioping.plugin.in 2022-02-14 18:01:12.164767390 +0100 -+++ b/collectors/ioping.plugin/ioping.plugin.in 2022-02-17 19:42:53.201055654 +0100 +--- a/collectors/ioping.plugin/ioping.plugin.in 2022-03-29 16:20:22.484652037 +0200 ++++ b/collectors/ioping.plugin/ioping.plugin.in 2022-04-19 16:32:30.952493132 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -110,8 +101,8 @@ diff -rup a/collectors/ioping.plugin/ioping.plugin.in b/collectors/ioping.plugin # netdata diff -rup a/collectors/node.d.plugin/node.d.plugin b/collectors/node.d.plugin/node.d.plugin ---- a/collectors/node.d.plugin/node.d.plugin 2022-02-14 18:02:10.621557334 +0100 -+++ b/collectors/node.d.plugin/node.d.plugin 2022-02-17 19:42:53.189055591 +0100 +--- a/collectors/node.d.plugin/node.d.plugin 2022-04-18 15:12:50.708422331 +0200 ++++ b/collectors/node.d.plugin/node.d.plugin 2022-04-19 16:32:30.941493076 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -119,8 +110,8 @@ diff -rup a/collectors/node.d.plugin/node.d.plugin b/collectors/node.d.plugin/no // shebang hack from: diff -rup a/collectors/node.d.plugin/node.d.plugin.in b/collectors/node.d.plugin/node.d.plugin.in ---- a/collectors/node.d.plugin/node.d.plugin.in 2022-02-14 18:01:12.164767390 +0100 -+++ b/collectors/node.d.plugin/node.d.plugin.in 2022-02-17 19:42:53.190055596 +0100 +--- a/collectors/node.d.plugin/node.d.plugin.in 2021-04-30 16:00:34.268809326 +0200 ++++ b/collectors/node.d.plugin/node.d.plugin.in 2022-04-19 16:32:30.943493086 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -128,8 +119,8 @@ diff -rup a/collectors/node.d.plugin/node.d.plugin.in b/collectors/node.d.plugin // shebang hack from: diff -rup a/collectors/python.d.plugin/python.d.plugin b/collectors/python.d.plugin/python.d.plugin ---- a/collectors/python.d.plugin/python.d.plugin 2022-02-14 18:02:10.737558769 +0100 -+++ b/collectors/python.d.plugin/python.d.plugin 2022-02-17 19:42:53.194055617 +0100 +--- a/collectors/python.d.plugin/python.d.plugin 2022-04-18 15:12:51.665089250 +0200 ++++ b/collectors/python.d.plugin/python.d.plugin 2022-04-19 16:32:30.947493106 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -137,8 +128,8 @@ diff -rup a/collectors/python.d.plugin/python.d.plugin b/collectors/python.d.plu pybinary=$(which python3 || which python || which python2) filtered=() diff -rup a/collectors/python.d.plugin/python.d.plugin.in b/collectors/python.d.plugin/python.d.plugin.in ---- a/collectors/python.d.plugin/python.d.plugin.in 2022-02-14 18:01:12.188767586 +0100 -+++ b/collectors/python.d.plugin/python.d.plugin.in 2022-02-17 19:42:53.192055607 +0100 +--- a/collectors/python.d.plugin/python.d.plugin.in 2022-03-15 13:47:55.122775699 +0100 ++++ b/collectors/python.d.plugin/python.d.plugin.in 2022-04-19 16:32:30.945493096 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -146,8 +137,8 @@ diff -rup a/collectors/python.d.plugin/python.d.plugin.in b/collectors/python.d. pybinary=$(which python3 || which python || which python2) filtered=() diff -rup a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py ---- a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2022-02-14 18:01:12.192767618 +0100 -+++ b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2022-02-17 19:42:53.329056329 +0100 +--- a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2021-04-30 16:00:34.295475990 +0200 ++++ b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2022-04-19 16:32:31.073493750 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +# @@ -155,8 +146,8 @@ diff -rup a/collectors/python.d.plugin/python_modules/third_party/boinc_client.p # # client.py - Somewhat higher-level GUI_RPC API for BOINC core client diff -rup a/collectors/tc.plugin/tc-qos-helper.sh b/collectors/tc.plugin/tc-qos-helper.sh ---- a/collectors/tc.plugin/tc-qos-helper.sh 2022-02-14 18:02:11.425567092 +0100 -+++ b/collectors/tc.plugin/tc-qos-helper.sh 2022-02-17 19:42:53.171055496 +0100 +--- a/collectors/tc.plugin/tc-qos-helper.sh 2022-04-18 15:12:58.161757637 +0200 ++++ b/collectors/tc.plugin/tc-qos-helper.sh 2022-04-19 16:32:30.930493020 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -164,8 +155,8 @@ diff -rup a/collectors/tc.plugin/tc-qos-helper.sh b/collectors/tc.plugin/tc-qos- # netdata # real-time performance and health monitoring, done right! diff -rup a/collectors/tc.plugin/tc-qos-helper.sh.in b/collectors/tc.plugin/tc-qos-helper.sh.in ---- a/collectors/tc.plugin/tc-qos-helper.sh.in 2022-02-14 18:01:12.200767684 +0100 -+++ b/collectors/tc.plugin/tc-qos-helper.sh.in 2022-02-17 19:42:53.170055491 +0100 +--- a/collectors/tc.plugin/tc-qos-helper.sh.in 2022-03-15 13:47:55.126109038 +0100 ++++ b/collectors/tc.plugin/tc-qos-helper.sh.in 2022-04-19 16:32:30.928493009 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -173,8 +164,8 @@ diff -rup a/collectors/tc.plugin/tc-qos-helper.sh.in b/collectors/tc.plugin/tc-q # netdata # real-time performance and health monitoring, done right! diff -rup a/contrib/debian/install_go.sh b/contrib/debian/install_go.sh ---- a/contrib/debian/install_go.sh 2022-02-14 18:01:12.200767684 +0100 -+++ b/contrib/debian/install_go.sh 2022-02-17 19:42:53.206055680 +0100 +--- a/contrib/debian/install_go.sh 2022-03-15 13:47:55.126109038 +0100 ++++ b/contrib/debian/install_go.sh 2022-04-19 16:32:30.957493158 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -182,26 +173,17 @@ diff -rup a/contrib/debian/install_go.sh b/contrib/debian/install_go.sh GO_PACKAGE_VERSION="$1" LIB_DIR="$2" diff -rup a/contrib/rhel/build-netdata-rpm.sh b/contrib/rhel/build-netdata-rpm.sh ---- a/contrib/rhel/build-netdata-rpm.sh 2022-02-14 18:01:12.200767684 +0100 -+++ b/contrib/rhel/build-netdata-rpm.sh 2022-02-17 19:42:53.204055670 +0100 +--- a/contrib/rhel/build-netdata-rpm.sh 2022-03-15 13:47:55.126109038 +0100 ++++ b/contrib/rhel/build-netdata-rpm.sh 2022-04-19 16:32:30.956493152 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash # docker run -it --rm centos:6.9 /bin/sh # yum -y install rpm-build redhat-rpm-config yum-utils autoconf automake curl gcc git libmnl-devel libuuid-devel make pkgconfig zlib-devel -diff -rup a/contrib/sles11/alarm-notify-basic.bash3.sh b/contrib/sles11/alarm-notify-basic.bash3.sh ---- a/contrib/sles11/alarm-notify-basic.bash3.sh 2022-02-14 18:01:12.200767684 +0100 -+++ b/contrib/sles11/alarm-notify-basic.bash3.sh 2022-02-17 19:42:53.207055686 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # basic version of netdata notifier to work with bash3 - # only mail and syslog destinations are supported, one recipient each diff -rup a/coverity-scan.sh b/coverity-scan.sh ---- a/coverity-scan.sh 2022-02-14 18:01:12.200767684 +0100 -+++ b/coverity-scan.sh 2022-02-17 19:42:53.210055702 +0100 +--- a/coverity-scan.sh 2022-04-07 16:00:35.708114383 +0200 ++++ b/coverity-scan.sh 2022-04-19 16:32:30.959493168 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -209,8 +191,8 @@ diff -rup a/coverity-scan.sh b/coverity-scan.sh # Coverity scan script # diff -rup a/cppcheck.sh b/cppcheck.sh ---- a/cppcheck.sh 2022-02-14 18:01:12.200767684 +0100 -+++ b/cppcheck.sh 2022-02-17 19:42:53.212055712 +0100 +--- a/cppcheck.sh 2018-11-02 16:10:18.078559041 +0100 ++++ b/cppcheck.sh 2022-04-19 16:32:30.961493178 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -218,8 +200,8 @@ diff -rup a/cppcheck.sh b/cppcheck.sh # echo >>/tmp/cppcheck.log "cppcheck ${*}" diff -rup a/daemon/anonymous-statistics.sh b/daemon/anonymous-statistics.sh ---- a/daemon/anonymous-statistics.sh 2022-02-14 18:02:11.469567624 +0100 -+++ b/daemon/anonymous-statistics.sh 2022-02-17 19:42:53.242055870 +0100 +--- a/daemon/anonymous-statistics.sh 2022-04-18 15:12:58.645091098 +0200 ++++ b/daemon/anonymous-statistics.sh 2022-04-19 16:32:30.989493321 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/sh @@ -227,8 +209,8 @@ diff -rup a/daemon/anonymous-statistics.sh b/daemon/anonymous-statistics.sh # Valid actions: diff -rup a/daemon/anonymous-statistics.sh.in b/daemon/anonymous-statistics.sh.in ---- a/daemon/anonymous-statistics.sh.in 2022-02-14 18:01:12.204767716 +0100 -+++ b/daemon/anonymous-statistics.sh.in 2022-02-17 19:42:53.241055865 +0100 +--- a/daemon/anonymous-statistics.sh.in 2022-03-15 13:47:55.126109038 +0100 ++++ b/daemon/anonymous-statistics.sh.in 2022-04-19 16:32:30.987493311 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/sh @@ -236,26 +218,26 @@ diff -rup a/daemon/anonymous-statistics.sh.in b/daemon/anonymous-statistics.sh.i # Valid actions: diff -rup a/daemon/get-kubernetes-labels.sh b/daemon/get-kubernetes-labels.sh ---- a/daemon/get-kubernetes-labels.sh 2022-02-14 18:02:11.473567673 +0100 -+++ b/daemon/get-kubernetes-labels.sh 2022-02-17 19:42:53.216055733 +0100 +--- a/daemon/get-kubernetes-labels.sh 2022-04-18 15:12:58.698424445 +0200 ++++ b/daemon/get-kubernetes-labels.sh 2022-04-19 16:32:30.964493193 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash - # Checks if netdata is running in a kubernetes pod and fetches that pod's labels - + # Checks if netdata is running in a kubernetes pod and fetches: + # - pod's labels diff -rup a/daemon/get-kubernetes-labels.sh.in b/daemon/get-kubernetes-labels.sh.in ---- a/daemon/get-kubernetes-labels.sh.in 2022-02-14 18:01:12.204767716 +0100 -+++ b/daemon/get-kubernetes-labels.sh.in 2022-02-17 19:42:53.214055723 +0100 +--- a/daemon/get-kubernetes-labels.sh.in 2022-04-11 14:27:01.935438827 +0200 ++++ b/daemon/get-kubernetes-labels.sh.in 2022-04-19 16:32:30.962493183 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash - # Checks if netdata is running in a kubernetes pod and fetches that pod's labels - + # Checks if netdata is running in a kubernetes pod and fetches: + # - pod's labels diff -rup a/daemon/system-info.sh b/daemon/system-info.sh ---- a/daemon/system-info.sh 2022-02-14 18:01:12.204767716 +0100 -+++ b/daemon/system-info.sh 2022-02-17 19:42:53.239055855 +0100 +--- a/daemon/system-info.sh 2022-04-07 16:00:43.864785538 +0200 ++++ b/daemon/system-info.sh 2022-04-19 16:32:30.986493306 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/sh @@ -263,8 +245,8 @@ diff -rup a/daemon/system-info.sh b/daemon/system-info.sh # ------------------------------------------------------------------------------------------------- # detect the kernel diff -rup a/diagrams/build.sh b/diagrams/build.sh ---- a/diagrams/build.sh 2022-02-14 18:01:12.260768173 +0100 -+++ b/diagrams/build.sh 2022-02-17 19:42:53.217055738 +0100 +--- a/diagrams/build.sh 2018-10-16 15:11:47.573219719 +0200 ++++ b/diagrams/build.sh 2022-04-19 16:32:30.966493204 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -272,8 +254,8 @@ diff -rup a/diagrams/build.sh b/diagrams/build.sh path=$(dirname "$0") diff -rup a/exporting/nc-exporting.sh b/exporting/nc-exporting.sh ---- a/exporting/nc-exporting.sh 2022-02-14 18:01:12.272768270 +0100 -+++ b/exporting/nc-exporting.sh 2022-02-17 19:42:53.219055749 +0100 +--- a/exporting/nc-exporting.sh 2022-03-29 16:20:22.497985377 +0200 ++++ b/exporting/nc-exporting.sh 2022-04-19 16:32:30.968493214 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -281,8 +263,8 @@ diff -rup a/exporting/nc-exporting.sh b/exporting/nc-exporting.sh # SPDX-License-Identifier: GPL-3.0-or-later diff -rup a/health/notifications/alarm-email.sh b/health/notifications/alarm-email.sh ---- a/health/notifications/alarm-email.sh 2022-02-14 18:01:12.276768303 +0100 -+++ b/health/notifications/alarm-email.sh 2022-02-17 19:42:53.220055754 +0100 +--- a/health/notifications/alarm-email.sh 2021-04-30 16:00:34.352142649 +0200 ++++ b/health/notifications/alarm-email.sh 2022-04-19 16:32:30.969493219 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -290,8 +272,8 @@ diff -rup a/health/notifications/alarm-email.sh b/health/notifications/alarm-ema # OBSOLETE - REPLACED WITH diff -rup a/health/notifications/alarm-notify.sh b/health/notifications/alarm-notify.sh ---- a/health/notifications/alarm-notify.sh 2022-02-14 18:02:12.081575024 +0100 -+++ b/health/notifications/alarm-notify.sh 2022-02-17 19:42:53.222055765 +0100 +--- a/health/notifications/alarm-notify.sh 2022-04-18 15:13:05.155092827 +0200 ++++ b/health/notifications/alarm-notify.sh 2022-04-19 16:32:30.972493234 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -299,8 +281,8 @@ diff -rup a/health/notifications/alarm-notify.sh b/health/notifications/alarm-no # netdata diff -rup a/health/notifications/alarm-notify.sh.in b/health/notifications/alarm-notify.sh.in ---- a/health/notifications/alarm-notify.sh.in 2022-02-14 18:01:12.280768336 +0100 -+++ b/health/notifications/alarm-notify.sh.in 2022-02-17 19:42:53.224055775 +0100 +--- a/health/notifications/alarm-notify.sh.in 2022-03-15 13:47:55.189442468 +0100 ++++ b/health/notifications/alarm-notify.sh.in 2022-04-19 16:32:30.974493244 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -308,8 +290,8 @@ diff -rup a/health/notifications/alarm-notify.sh.in b/health/notifications/alarm # netdata diff -rup a/health/notifications/alarm-test.sh b/health/notifications/alarm-test.sh ---- a/health/notifications/alarm-test.sh 2022-02-14 18:01:12.280768336 +0100 -+++ b/health/notifications/alarm-test.sh 2022-02-17 19:42:53.226055786 +0100 +--- a/health/notifications/alarm-test.sh 2021-04-30 16:00:34.352142649 +0200 ++++ b/health/notifications/alarm-test.sh 2022-04-19 16:32:30.975493250 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -317,8 +299,8 @@ diff -rup a/health/notifications/alarm-test.sh b/health/notifications/alarm-test # netdata # real-time performance and health monitoring, done right! diff -rup a/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py b/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py ---- a/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py 2022-02-14 18:01:30.753067208 +0100 -+++ b/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py 2022-02-17 19:42:53.332056344 +0100 +--- a/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py 2021-10-27 14:02:02.010887170 +0200 ++++ b/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py 2022-04-19 16:32:31.075493761 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/python33 @@ -326,8 +308,8 @@ diff -rup a/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py b/ml/kmeans/dli # Syntax: mkdoc.py [-I<path> ..] [.. a list of header files ..] # diff -rup a/ml/kmeans/dlib/dlib/travis/build-and-test.sh b/ml/kmeans/dlib/dlib/travis/build-and-test.sh ---- a/ml/kmeans/dlib/dlib/travis/build-and-test.sh 2022-02-14 18:01:30.845068308 +0100 -+++ b/ml/kmeans/dlib/dlib/travis/build-and-test.sh 2022-02-17 19:42:53.229055802 +0100 +--- a/ml/kmeans/dlib/dlib/travis/build-and-test.sh 2021-10-27 14:02:02.070887180 +0200 ++++ b/ml/kmeans/dlib/dlib/travis/build-and-test.sh 2022-04-19 16:32:30.977493260 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -335,8 +317,8 @@ diff -rup a/ml/kmeans/dlib/dlib/travis/build-and-test.sh b/ml/kmeans/dlib/dlib/t set -eux diff -rup a/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py b/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py ---- a/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2022-02-14 18:01:30.905069026 +0100 -+++ b/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2022-02-17 19:42:53.334056355 +0100 +--- a/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2021-10-27 14:02:02.120887187 +0200 ++++ b/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2022-04-19 16:32:31.078493776 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 @@ -344,26 +326,17 @@ diff -rup a/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model # This script takes the dlib lenet model trained by the # examples/dnn_introduction_ex.cpp example program and runs it using caffe. diff -rup a/packaging/check-kernel-config.sh b/packaging/check-kernel-config.sh ---- a/packaging/check-kernel-config.sh 2022-02-14 18:01:12.292768433 +0100 -+++ b/packaging/check-kernel-config.sh 2022-02-17 19:42:53.232055817 +0100 +--- a/packaging/check-kernel-config.sh 2022-03-14 13:51:04.198273428 +0100 ++++ b/packaging/check-kernel-config.sh 2022-04-19 16:32:30.979493270 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash get_kernel_version() { r="$(uname -r | cut -f 1 -d '-')" -diff -rup a/packaging/installer/netdata-uninstaller.sh b/packaging/installer/netdata-uninstaller.sh ---- a/packaging/installer/netdata-uninstaller.sh 2022-02-14 18:01:12.292768433 +0100 -+++ b/packaging/installer/netdata-uninstaller.sh 2022-02-17 19:42:53.230055807 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # - # This is the netdata uninstaller script - # diff -rup a/system/edit-config b/system/edit-config ---- a/system/edit-config 2022-02-14 18:02:09.541543976 +0100 -+++ b/system/edit-config 2022-02-17 19:42:53.244055881 +0100 +--- a/system/edit-config 2022-04-18 15:12:42.781753576 +0200 ++++ b/system/edit-config 2022-04-19 16:32:30.991493331 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/sh @@ -371,8 +344,8 @@ diff -rup a/system/edit-config b/system/edit-config [ -f /etc/profile ] && . /etc/profile diff -rup a/system/edit-config.in b/system/edit-config.in ---- a/system/edit-config.in 2022-02-14 18:01:12.300768498 +0100 -+++ b/system/edit-config.in 2022-02-17 19:42:53.246055891 +0100 +--- a/system/edit-config.in 2022-02-25 16:31:16.975943768 +0100 ++++ b/system/edit-config.in 2022-04-19 16:32:30.992493336 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/sh @@ -380,8 +353,8 @@ diff -rup a/system/edit-config.in b/system/edit-config.in [ -f /etc/profile ] && . /etc/profile diff -rup a/system/netdata-lsb.in b/system/netdata-lsb.in ---- a/system/netdata-lsb.in 2022-02-14 18:01:12.300768498 +0100 -+++ b/system/netdata-lsb.in 2022-02-17 19:42:53.234055828 +0100 +--- a/system/netdata-lsb.in 2022-02-25 16:31:16.975943768 +0100 ++++ b/system/netdata-lsb.in 2022-04-19 16:32:30.980493275 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -389,8 +362,8 @@ diff -rup a/system/netdata-lsb.in b/system/netdata-lsb.in # Netdata LSB start script # diff -rup a/tests/health_mgmtapi/health-cmdapi-test.sh b/tests/health_mgmtapi/health-cmdapi-test.sh ---- a/tests/health_mgmtapi/health-cmdapi-test.sh 2022-02-14 18:02:09.601544718 +0100 -+++ b/tests/health_mgmtapi/health-cmdapi-test.sh 2022-02-17 19:42:53.236055839 +0100 +--- a/tests/health_mgmtapi/health-cmdapi-test.sh 2022-04-18 15:12:42.991753631 +0200 ++++ b/tests/health_mgmtapi/health-cmdapi-test.sh 2022-04-19 16:32:30.982493285 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -398,8 +371,8 @@ diff -rup a/tests/health_mgmtapi/health-cmdapi-test.sh b/tests/health_mgmtapi/he NETDATA_VARLIB_DIR="/var/lib/netdata" diff -rup a/tests/health_mgmtapi/health-cmdapi-test.sh.in b/tests/health_mgmtapi/health-cmdapi-test.sh.in ---- a/tests/health_mgmtapi/health-cmdapi-test.sh.in 2022-02-14 18:01:12.300768498 +0100 -+++ b/tests/health_mgmtapi/health-cmdapi-test.sh.in 2022-02-17 19:42:53.237055844 +0100 +--- a/tests/health_mgmtapi/health-cmdapi-test.sh.in 2022-02-25 16:31:16.979277102 +0100 ++++ b/tests/health_mgmtapi/health-cmdapi-test.sh.in 2022-04-19 16:32:30.984493296 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash diff --git a/netdata-remove-fonts-1.33.1.patch b/netdata-remove-fonts-1.34.1.patch similarity index 89% rename from netdata-remove-fonts-1.33.1.patch rename to netdata-remove-fonts-1.34.1.patch index 5fc0c07..2b20739 100644 --- a/netdata-remove-fonts-1.33.1.patch +++ b/netdata-remove-fonts-1.34.1.patch @@ -1,9 +1,9 @@ diff -rup a/web/gui/dashboard/Makefile.am b/web/gui/dashboard/Makefile.am ---- a/web/gui/dashboard/Makefile.am 2022-02-14 17:58:30.000000000 +0100 -+++ b/web/gui/dashboard/Makefile.am 2022-02-16 19:17:22.648816557 +0100 +--- a/web/gui/dashboard/Makefile.am 2022-04-14 13:22:42.927570498 +0200 ++++ b/web/gui/dashboard/Makefile.am 2022-04-19 22:57:25.589407143 +0200 @@ -163,36 +163,3 @@ dist_webstaticjs_DATA = \ - static/js/runtime-main.ec4d2459.js \ - static/js/runtime-main.ec4d2459.js.map \ + static/js/runtime-main.b352aa47.js \ + static/js/runtime-main.b352aa47.js.map \ $(NULL) - -webstaticmediadir=$(webdir)/static/media diff --git a/netdata.profile b/netdata.profile deleted file mode 100644 index 0673b29..0000000 --- a/netdata.profile +++ /dev/null @@ -1,5 +0,0 @@ -# env vars for netdata -export NETDATA_STOCK_CONFIG_DIR="/etc/netdata/conf.d" -export NETDATA_USER_CONFIG_DIR="/etc/netdata" -export NETDATA_VARLIB_DIR="/var/lib/netdata" -export NETDATA_CACHE_DIR="/var/cache/netdata" diff --git a/netdata.spec b/netdata.spec index bf78f37..5aa13e5 100644 --- a/netdata.spec +++ b/netdata.spec @@ -17,6 +17,13 @@ ExcludeArch: s390x %bcond_without cups %endif +# Because protobuf is too old in el7 +%if 0%{?rhel} && 0%{?rhel} == 7 +%bcond_without bundled_protobuf +%else +%bcond_with bundled_protobuf +%endif + %if 0%{?rhel} && 0%{?rhel} <= 7 # This is temporary and should eventually be resolved. This bypasses # the default rhel __os_install_post which throws a python compile @@ -28,12 +35,17 @@ ExcludeArch: s390x %global _hardened_build 1 # Build release candidate -%global upver 1.33.1 +%global upver 1.34.1 #global rcver rc0 +# Last python 2 support (el7 only) +%global protobuf_cpp_ver 3.17.3 + +%global stock_conf_path %{_prefix}/lib/%{name} + Name: netdata Version: %{upver}%{?rcver:~%{rcver}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Real-time performance monitoring # For a breakdown of the licensing, see LICENSE-REDISTRIBUTED.md License: GPLv3 and GPLv3+ and ASL 2.0 and CC-BY and MIT and WTFPL @@ -42,12 +54,13 @@ Source0: https://github.com/netdata/netdata/releases/download/v%{upver}%{ Source1: netdata.tmpfiles.conf Source2: netdata.init Source3: netdata.conf -Source4: netdata.profile Source5: README-packager.md -Patch0: netdata-fix-shebang-1.33.1.patch +# Only for el7 +Source10: https://github.com/protocolbuffers/protobuf/releases/download/v%{protobuf... +Patch0: netdata-fix-shebang-1.34.1.patch %if 0%{?fedora} # Remove embedded font -Patch10: netdata-remove-fonts-1.33.1.patch +Patch10: netdata-remove-fonts-1.34.1.patch %endif BuildRequires: zlib-devel @@ -104,6 +117,7 @@ BuildRequires: python3 BuildRequires: python2 %endif + Requires: nodejs Requires: curl Requires: nc @@ -162,8 +176,27 @@ freeipmi plugin for netdata rm -rf web/fonts web/gui/dashboard/static/media %endif cp %{SOURCE5} . +### BEGIN netdata cloud +%if %{with bundled_protobuf} +mkdir -p externaldeps/protobuf +tar -xzf %{SOURCE10} -C externaldeps/protobuf +%endif +### END netdata cloud %build +### BEGIN netdata cloud +%if %{with bundled_protobuf} +pushd externaldeps/protobuf/protobuf-%{protobuf_cpp_ver} +%configure \ + --disable-shared \ + --without-zlib \ + --disable-dependency-tracking \ + --with-pic +CFLAGS="${CFLAGS} -fPIC" %make_build +popd +cp -a externaldeps/protobuf/protobuf-%{protobuf_cpp_ver}/src externaldeps/protobuf +%endif +### END netdata cloud autoreconf -ivf %configure \ --enable-plugin-freeipmi \ @@ -172,11 +205,14 @@ autoreconf -ivf %endif %if %{with cups} --enable-plugin-cups \ +%endif +%if %{with bundled_protobuf} + --with-bundled-protobuf \ %endif --with-zlib \ --with-math \ --with-user=netdata - + %make_build %install @@ -197,10 +233,18 @@ mkdir -p %{buildroot}%{_localstatedir}/cache/%{name} mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d install -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/ install -p -m 0644 system/netdata.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -# Conf files must be in /etc, dixit FHS and it's better in a noarch pkg -mv %{buildroot}%{_libdir}/%{name}/conf.d %{buildroot}%{_sysconfdir}/%{name}/ -# Scripts must not be in /etc +# it's better to put stock config file in a noarch pkg (like systemd) +%ifarch x86_64 +mkdir -p %{buildroot}%{stock_conf_path}/conf.d +mv %{buildroot}%{_libdir}/%{name}/conf.d/* %{buildroot}%{stock_conf_path}/conf.d +%endif + +# Scripts must not be in /etc, /usr/libexec is a better place mv %{buildroot}%{_sysconfdir}/%{name}/edit-config %{buildroot}%{_libexecdir}/%{name}/edit-config +# Force stock config file to a noarch path (like systemd) +%ifarch x86_64 +sed -i -e '/NETDATA_STOCK_CONFIG_DIR/ s/lib64/lib/' %{buildroot}%{_libexecdir}/%{name}/edit-config +%endif # Fix EOL sed -i -e 's/\r//' %{buildroot}%{_datadir}/%{name}/web/lib/tableExport-1.6.0.min.js # Delete useless hidden dir @@ -212,10 +256,6 @@ for dir in charts.d health.d python.d statsd.d ; do mkdir -p %{buildroot}%{_sysconfdir}/%{name}/${dir} done -mkdir -p %{buildroot}%{_sysconfdir}/profile.d -install -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/netdata.sh -rm -f %{buildroot}%{_sysconfdir}/netdata/.install-type - %check make tests @@ -225,6 +265,9 @@ getent passwd netdata > /dev/null || useradd -r -g netdata -c "NetData User" -s %post sed -i -e '/web files group/ s/root/netdata/' /etc/netdata/netdata.conf ||: +sed -i -e '/stock config directory/ s;/etc/netdata/conf.d;/usr/lib/netdata/conf.d;' /etc/netdata/netdata.conf ||: +sed -i -e '/stock health configuration directory/ s;/etc/netdata/conf.d/health.d;/usr/lib/netdata/conf.d/health.d;' /etc/netdata/netdata.conf ||: +rm -f %{_sysconfdir}/profile.d/netdata.sh ||: %systemd_post %{name}.service echo "The current config file can be downloaded with the following command" echo "curl -o /etc/netdata/netdata.conf http://localhost:19999/netdata.conf" @@ -268,21 +311,11 @@ echo "Config should be edited with %{_libexecdir}/%{name}/edit-config" %dir %{_sysconfdir}/%{name}/health.d %dir %{_sysconfdir}/%{name}/python.d %dir %{_sysconfdir}/%{name}/statsd.d -%dir %{_sysconfdir}/%{name}/conf.d -%dir %{_sysconfdir}/%{name}/conf.d/charts.d -%dir %{_sysconfdir}/%{name}/conf.d/health.d -%dir %{_sysconfdir}/%{name}/conf.d/python.d -%dir %{_sysconfdir}/%{name}/conf.d/statsd.d -%dir %{_sysconfdir}/%{name}/conf.d/ebpf.d -%config %{_sysconfdir}/%{name}/%{name}.conf -%config %{_sysconfdir}/%{name}/conf.d/*.conf -%config %{_sysconfdir}/%{name}/conf.d/charts.d/*.conf -%config %{_sysconfdir}/%{name}/conf.d/health.d/*.conf -%config %{_sysconfdir}/%{name}/conf.d/python.d/*.conf -%config %{_sysconfdir}/%{name}/conf.d/statsd.d/*.conf -%config %{_sysconfdir}/%{name}/conf.d/ebpf.d/*.conf -%config %{_sysconfdir}/logrotate.d/netdata -%config %{_sysconfdir}/profile.d/netdata.sh +%dir %{stock_conf_path} +%{_sysconfdir}/%{name}/.install-type +%{stock_conf_path}/conf.d/* +%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/netdata %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/edit-config @@ -299,6 +332,11 @@ echo "Config should be edited with %{_libexecdir}/%{name}/edit-config" %caps(cap_setuid=ep) %attr(4750,root,netdata) %{_libexecdir}/%{name}/plugins.d/freeipmi.plugin %changelog +* Sat Apr 30 2022 Didier Fabert <didier.fabert(a)gmail.com> 1.34.1-1 +- Update from upstream +- Move stock config files in /usr/lib/netdata/conf.d +- Use embedded protobuf-cpp for el7 + * Sun Feb 20 2022 Didier Fabert <didier.fabert(a)gmail.com> 1.33.1-2 - Fix el9 buildreq condition for autogen diff --git a/sources b/sources index 36b7805..87c918f 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (netdata-v1.33.1.tar.gz) = f6586426bd0fe1ac3d903ec279b27177b1d232f5ca1fc28b01f052a5f2f57846d2d6369c9d5a1872fb97e31f86f1f7a11c600beda590447f9ca30c93e7ac262c +SHA512 (netdata-v1.34.1.tar.gz) = 777b0f4efa0b64dd150a097cb2ec1c3155506ada9c1e5289b6acda5e34c9262f796795608b52e70c9310a5cbda03c0568e1391c6861c7f3ea84aa9ca84ed9a0c +SHA512 (protobuf-cpp-3.17.3.tar.gz) = efad397f5cdda6639d5e9980fe6eeadc1ef768bf1d96b1e528a1d7ba1d81ceb49e22cbd78d9b4ab3518236055140568342ff138204b4a47234fb2957a89d2db8

2 years

1
0
0 / 0

Architecture specific change in rpms/python-aws-sam-translator.git

by githook-noreply＠fedoraproject.org

The package rpms/python-aws-sam-translator.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/python-aws-sam-translator.git/com.... Change: +%ifarch %{ix86} %{arm32} Thanks. Full change: ============ commit 69085dc25397bb5bda7ad33bca85c35b47168575 Author: Benjamin A. Beasley <code(a)musicinmybrain.net> Date: Tue May 3 09:23:45 2022 -0400 Work around a failing test on 32-bit builders diff --git a/python-aws-sam-translator.spec b/python-aws-sam-translator.spec index 404bc11..a04570c 100644 --- a/python-aws-sam-translator.spec +++ b/python-aws-sam-translator.spec @@ -23,7 +23,9 @@ Source0: %{url}/archive/v%{version}/serverless-application-model-%{versio # do this with sed in %%prep. Patch0: %{url}/pull/2184.patch -BuildArch: noarch +# The base package is arched because we conditionalize tests; the binary +# packages are all noarch, and there is no compiled code. +%global debug_package %{nil} BuildRequires: python3-devel @@ -46,12 +48,16 @@ serverless applications.} %package -n python3-aws-sam-translator Summary: %{summary} +BuildArch: noarch + %description -n python3-aws-sam-translator %{common_description} %package doc Summary: Documentation for aws-sam-translator +BuildArch: noarch + %description doc %{common_description} @@ -95,9 +101,16 @@ sphinx-build -b latex docs %{_vpath_builddir}/_latex %check +%ifarch %{ix86} %{arm32} +# This test only has an expected value for 64-bit platforms. Since we no longer +# need to support 32-bit platforms, we don’t bother trying to fix it: +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +# https://fedoraproject.org/wiki/Changes/RetireARMv7 +k="${k-}${k+ and }not (TestPy27UniStr and test_py27_hash)" +%endif # See Makefile target “test”. We cannot run the interaction tests because they # interact with AWS. -%pytest +%pytest -k "${k-}" %files -n python3-aws-sam-translator -f %{pyproject_files}

2 years

1
0
0 / 0

Architecture specific change in rpms/python-aws-sam-translator.git

by githook-noreply＠fedoraproject.org

The package rpms/python-aws-sam-translator.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/python-aws-sam-translator.git/com.... Change: +%ifarch %{ix86} %{arm32} Thanks. Full change: ============ commit e2cffd47313397154c661d220162f51fb9d91d5a Author: Benjamin A. Beasley <code(a)musicinmybrain.net> Date: Tue May 3 09:23:45 2022 -0400 Work around a failing test on 32-bit builders diff --git a/python-aws-sam-translator.spec b/python-aws-sam-translator.spec index ec5766a..cef5db3 100644 --- a/python-aws-sam-translator.spec +++ b/python-aws-sam-translator.spec @@ -15,7 +15,9 @@ URL: https://github.com/aws/serverless-application-model # and tests. Source0: %{url}/archive/v%{version}/serverless-application-model-%{version}.tar.gz -BuildArch: noarch +# The base package is arched because we conditionalize tests; the binary +# packages are all noarch, and there is no compiled code. +%global debug_package %{nil} BuildRequires: python3-devel @@ -38,12 +40,16 @@ serverless applications.} %package -n python3-aws-sam-translator Summary: %{summary} +BuildArch: noarch + %description -n python3-aws-sam-translator %{common_description} %package doc Summary: Documentation for aws-sam-translator +BuildArch: noarch + %description doc %{common_description} @@ -87,9 +93,16 @@ sphinx-build -b latex docs %{_vpath_builddir}/_latex %check +%ifarch %{ix86} %{arm32} +# This test only has an expected value for 64-bit platforms. Since we no longer +# need to support 32-bit platforms, we don’t bother trying to fix it: +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +# https://fedoraproject.org/wiki/Changes/RetireARMv7 +k="${k-}${k+ and }not (TestPy27UniStr and test_py27_hash)" +%endif # See Makefile target “test”. We cannot run the interaction tests because they # interact with AWS. -%pytest +%pytest -k "${k-}" %files -n python3-aws-sam-translator -f %{pyproject_files}

2 years

1
0
0 / 0

Architecture specific change in rpms/rust-lexopt.git

by githook-noreply＠fedoraproject.org

The package rpms/rust-lexopt.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-lexopt.git/commit/?id=7298fc.... Change: +ExclusiveArch: %{rust_arches} Thanks. Full change: ============ commit 7298fc53a64492f503d4a52a7fc9ffa9cdb5ede3 Author: Jan Staněk <jstanek(a)redhat.com> Date: Tue May 3 12:22:47 2022 +0200 Initial import (fedora#2067182) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7cbc358 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/lexopt-0.2.0.crate diff --git a/rust-lexopt.spec b/rust-lexopt.spec new file mode 100644 index 0000000..fb30c6c --- /dev/null +++ b/rust-lexopt.spec @@ -0,0 +1,73 @@ +# Generated by rust2rpm 21 +%bcond_without check +%global debug_package %{nil} + +%global crate lexopt + +Name: rust-%{crate} +Version: 0.2.0 +Release: %autorelease +Summary: Minimalist pedantic command line parser + +# Upstream license specification: MIT +License: MIT +URL: https://crates.io/crates/lexopt +Source: %{crates_source} + +ExclusiveArch: %{rust_arches} + +BuildRequires: rust-packaging >= 21 + +%global _description %{expand: +Minimalist pedantic command line parser.} + +%description %{_description} + +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel %{_description} + +This package contains library source intended for building other packages which +use the "%{crate}" crate. + +%files devel +%license %{crate_instdir}/LICENSE +%doc %{crate_instdir}/CHANGELOG.md +%doc %{crate_instdir}/DESIGN.md +%doc %{crate_instdir}/README.md +%{crate_instdir}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description} + +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{crate_instdir}/Cargo.toml + +%prep +%autosetup -n %{crate}-%{version_no_tilde} -p1 +%cargo_prep + +%generate_buildrequires +%cargo_generate_buildrequires + +%build +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%changelog +%autochangelog diff --git a/sources b/sources new file mode 100644 index 0000000..f88b5aa --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (lexopt-0.2.0.crate) = 21bddf7206080093511afbb361e39d1fc0964ac28bf75f67c7261aefc9e2358041468ce363a665d474ea3c6abfb1b8fbc3fe3dfcb033b125575414b2fff7daaa

2 years

1
0
0 / 0

Architecture specific change in rpms/rust-lexopt.git

by githook-noreply＠fedoraproject.org

The package rpms/rust-lexopt.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-lexopt.git/commit/?id=7298fc.... Change: +ExclusiveArch: %{rust_arches} Thanks. Full change: ============ commit 7298fc53a64492f503d4a52a7fc9ffa9cdb5ede3 Author: Jan Staněk <jstanek(a)redhat.com> Date: Tue May 3 12:22:47 2022 +0200 Initial import (fedora#2067182) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7cbc358 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/lexopt-0.2.0.crate diff --git a/rust-lexopt.spec b/rust-lexopt.spec new file mode 100644 index 0000000..fb30c6c --- /dev/null +++ b/rust-lexopt.spec @@ -0,0 +1,73 @@ +# Generated by rust2rpm 21 +%bcond_without check +%global debug_package %{nil} + +%global crate lexopt + +Name: rust-%{crate} +Version: 0.2.0 +Release: %autorelease +Summary: Minimalist pedantic command line parser + +# Upstream license specification: MIT +License: MIT +URL: https://crates.io/crates/lexopt +Source: %{crates_source} + +ExclusiveArch: %{rust_arches} + +BuildRequires: rust-packaging >= 21 + +%global _description %{expand: +Minimalist pedantic command line parser.} + +%description %{_description} + +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel %{_description} + +This package contains library source intended for building other packages which +use the "%{crate}" crate. + +%files devel +%license %{crate_instdir}/LICENSE +%doc %{crate_instdir}/CHANGELOG.md +%doc %{crate_instdir}/DESIGN.md +%doc %{crate_instdir}/README.md +%{crate_instdir}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description} + +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{crate_instdir}/Cargo.toml + +%prep +%autosetup -n %{crate}-%{version_no_tilde} -p1 +%cargo_prep + +%generate_buildrequires +%cargo_generate_buildrequires + +%build +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%changelog +%autochangelog diff --git a/sources b/sources new file mode 100644 index 0000000..f88b5aa --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (lexopt-0.2.0.crate) = 21bddf7206080093511afbb361e39d1fc0964ac28bf75f67c7261aefc9e2358041468ce363a665d474ea3c6abfb1b8fbc3fe3dfcb033b125575414b2fff7daaa

2 years

1
0
0 / 0

Architecture specific change in rpms/rust-yansi.git

by githook-noreply＠fedoraproject.org

The package rpms/rust-yansi.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-yansi.git/commit/?id=853b32f.... Change: +ExclusiveArch: %{rust_arches} Thanks. Full change: ============ commit 853b32fed957d2b494177aa0686ff5740cb14448 Author: laiot <carmelo.sarta.main(a)gmail.com> Date: Mon May 2 17:37:13 2022 +0200 add sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..81f810f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/yansi-0.5.1.crate diff --git a/rust-yansi.spec b/rust-yansi.spec new file mode 100644 index 0000000..e62f823 --- /dev/null +++ b/rust-yansi.spec @@ -0,0 +1,72 @@ +# Generated by rust2rpm 21 +%bcond_without check +%global debug_package %{nil} + +%global crate yansi + +Name: rust-%{crate} +Version: 0.5.1 +Release: %autorelease +Summary: Dead simple ANSI terminal color painting library + +# Upstream license specification: MIT/Apache-2.0 +License: MIT or ASL 2.0 +URL: https://crates.io/crates/yansi +Source: %{crates_source} + +ExclusiveArch: %{rust_arches} + +BuildRequires: rust-packaging >= 21 + +%global _description %{expand: +Dead simple ANSI terminal color painting library.} + +%description %{_description} + +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel %{_description} + +This package contains library source intended for building other packages which +use the "%{crate}" crate. + +%files devel +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/README.md +%{crate_instdir}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description} + +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{crate_instdir}/Cargo.toml + +%prep +%autosetup -n %{crate}-%{version_no_tilde} -p1 +%cargo_prep + +%generate_buildrequires +%cargo_generate_buildrequires + +%build +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%changelog +%autochangelog diff --git a/sources b/sources new file mode 100644 index 0000000..b04c31a --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (yansi-0.5.1.crate) = 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2

2 years

1
0
0 / 0

[Report] Packages Restricting Arches

by root

New package excluding arches (2) ============================ - rust-integer-encoding ExclusiveArch: %{rust_arches} - rust-yansi ExclusiveArch: %{rust_arches} Package no longer excluding arches (9) ================================== - rust-cssparser-macros - rust-delta_e - rust-dns-parser - rust-dtoa-short - rust-enum_primitive - rust-errln - rust-euclid - rust-extend - rust-extprim_literals_macros List of packages currently excluding arches (2355) =========================================== - 0ad ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le - 90-Second-Portraits ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le - GoldenCheetah ExclusiveArch: %{qt5_qtwebengine_arches} - GtkAda ExclusiveArch: %{GPRbuild_arches} - GtkAda3 ExclusiveArch: %{GPRbuild_arches} - OpenColorIO ExclusiveArch: x86_64 ppc64le - OpenImageIO ExclusiveArch: x86_64 ppc64le - OpenMolcas ExclusiveArch: x86_64 aarch64 ppc64le s390x - PragmARC ExclusiveArch: %{GPRbuild_arches} - R-V8 ExclusiveArch: %{nodejs_arches} - RdRand ExclusiveArch: %{ix86} x86_64 - RediSearch ExclusiveArch: x86_64 - SLOF ExclusiveArch: ppc64le - YafaRay ExclusiveArch: %{ix86} x86_64 - aardvark-dns ExclusiveArch: %{rust_arches} - aboot ExclusiveArch: alpha - accel-config ExclusiveArch: %{ix86} x86_64 - acpid ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 - ahven ExclusiveArch: %{GPRbuild_arches} - algobox ExclusiveArch: %{qt5_qtwebengine_arches} - alleyoop ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} aarch64 - american-fuzzy-lop ExclusiveArch: %{ix86} x86_64 s390x - anet ExclusiveArch: %{GPRbuild_arches} - anki ExclusiveArch: %{qt5_qtwebengine_arches} noarch - apmd ExclusiveArch: %{ix86} - appstream-generator ExclusiveArch: %{ldc_arches} - arm-trusted-firmware ExclusiveArch: aarch64 - aunit ExclusiveArch: %GPRbuild_arches - avgtime ExclusiveArch: %{ldc_arches} - aws ExclusiveArch: %GPRbuild_arches - bcal ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x - bcc ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl - bcm283x-firmware ExclusiveArch: %{arm} aarch64 - berusky2 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips} - biosdevname ExclusiveArch: %{ix86} x86_64 - blender ExclusiveArch: x86_64 aarch64 ppc64le s390x - bless ExclusiveArch: %mono_arches - bpftrace ExclusiveArch: x86_64 %{power64} aarch64 s390x - calamares ExclusiveArch: %{ix86} x86_64 aarch64 - calibre ExclusiveArch: %{qt5_qtwebengine_arches} - ccdciel ExclusiveArch: %{fpc_arches} - cdcollect ExclusiveArch: %{mono_arches} - ceph ExclusiveArch: x86_64 aarch64 ppc64le s390x - chromium ExclusiveArch: x86_64 i686 ExclusiveArch: x86_64 aarch64 ExclusiveArch: x86_64 i686 aarch64 - cjdns ExclusiveArch: %{nodejs_arches} - clevis-pin-tpm2 ExclusiveArch: %{rust_arches} - cmospwd ExclusiveArch: %{ix86} x86_64 - cmrt ExclusiveArch: %{ix86} x86_64 ia64 - coffee-script ExclusiveArch: %{nodejs_arches} noarch - colorful ExclusiveArch: %{fpc_arches} - cpu-x ExclusiveArch: i686 x86_64 - cpufetch ExclusiveArch: %{arm} aarch64 x86_64 ppc ppc64 ppc64le - cpuid ExclusiveArch: %{ix86} x86_64 - cqrlog ExclusiveArch: %{fpc_arches} - crash ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le - crash-gcore-command ExclusiveArch: aarch64 ppc64le x86_64 - crash-trace-command ExclusiveArch: aarch64 ppc64le s390x x86_64 - cri-o ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - cri-tools ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - criu ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x - cryptlib ExclusiveArch: x86_64 aarch64 ppc64le - cryptobone ExclusiveArch: x86_64 ppc64le aarch64 - csslint ExclusiveArch: %{nodejs_arches} noarch - daq ExclusiveArch: x86_64 aarch64 - dbus-parsec ExclusiveArch: %{rust_arches} - dbus-sharp ExclusiveArch: %mono_arches - dbus-sharp-glib ExclusiveArch: %mono_arches - dbxtool ExclusiveArch: i386 x86_64 aarch64 - deepin-daemon ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - deepin-desktop-schemas ExclusiveArch: %{go_arches} - dlm ExclusiveArch: i686 x86_64 - dmidecode ExclusiveArch: %{ix86} x86_64 ia64 aarch64 - dmtcp ExclusiveArch: x86_64 - docker-distribution ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - dolphin-emu ExclusiveArch: x86_64 aarch64 - dotnet-build-reference-packages ExclusiveArch: aarch64 x86_64 ExclusiveArch: x86_64 - dotnet3.1 ExclusiveArch: aarch64 x86_64 ExclusiveArch: x86_64 - dotnet6.0 ExclusiveArch: aarch64 x86_64 s390x ExclusiveArch: x86_64 - doublecmd ExclusiveArch: %{ix86} x86_64 - dpdk ExclusiveArch: x86_64 i686 aarch64 ppc64le - dub ExclusiveArch: %{ldc_arches} - dxvk-native ExclusiveArch: %{ix86} x86_64 - dyninst ExclusiveArch: %{ix86} x86_64 ppc64le aarch64 - e3 ExclusiveArch: %{ix86} x86_64 - eclipse-swt ExclusiveArch: s390x x86_64 aarch64 ppc64le - edk2 ExclusiveArch: x86_64 %{arm} aarch64 ExclusiveArch: x86_64 aarch64 - efibootmgr ExclusiveArch: %{efi} - efifs ExclusiveArch: %{efi} - efitools ExclusiveArch: %{efi} - efivar ExclusiveArch: %{efi} - elk ExclusiveArch: x86_64 %{ix86} ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64} - emacs-slime ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64 - enki ExclusiveArch: %{qt5_qtwebengine_arches} noarch - envytools ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - eric ExclusiveArch: %{qt5_qtwebengine_arches} noarch - eth-tools ExclusiveArch: x86_64 - fcitx-libpinyin ExclusiveArch: %{qt5_qtwebengine_arches} - fedora-dockerfiles ExclusiveArch: %{go_arches} - fes ExclusiveArch: %{ix86} x86_64 - florist ExclusiveArch: %{GPRbuild_arches} - fluent-bit ExclusiveArch: x86_64 aarch64 - fpc ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le - frescobaldi ExclusiveArch: %{qt5_qtwebengine_arches} - frysk ExclusiveArch: %{ix86} x86_64 ppc64 - fwts ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64} - fwupd-efi ExclusiveArch: x86_64 aarch64 - ga ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le - gbrainy ExclusiveArch: %mono_arches - gdb-exploitable ExclusiveArch: x86_64 i386 ExclusiveArch: x86_64 noarch - gearhead1 ExclusiveArch: %{fpc_arches} - ghdl ExclusiveArch: %{GNAT_arches} - ghostwriter ExclusiveArch: %{qt5_qtwebengine_arches} - gio-sharp ExclusiveArch: %mono_arches - gir-to-d ExclusiveArch: %{ldc_arches} - git-octopus ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - gitqlient ExclusiveArch: %{qt5_qtwebengine_arches} - giver ExclusiveArch: %{mono_arches} - gkeyfile-sharp ExclusiveArch: %mono_arches - glibc32 ExclusiveArch: x86_64 - glibd ExclusiveArch: %{ldc_arches} - gmqcc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - gnatcoll ExclusiveArch: %{GPRbuild_arches} - gnatcoll-bindings ExclusiveArch: %{GPRbuild_arches} - gnatcoll-db ExclusiveArch: %{GPRbuild_arches} - gnome-boxes ExclusiveArch: x86_64 - gnome-desktop-sharp ExclusiveArch: %mono_arches - gnome-do ExclusiveArch: %mono_arches - gnome-keyring-sharp ExclusiveArch: %mono_arches - gnome-rdp ExclusiveArch: %{mono_arches} - gnome-sharp ExclusiveArch: %mono_arches - gnome-subtitles ExclusiveArch: %mono_arches - gnu-efi ExclusiveArch: %{efi} - go-bindata ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - go-compilers ExclusiveArch: %{go_arches} - go-rpm-macros ExclusiveArch: %{golang_arches} %{gccgo_arches} - godep ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang ExclusiveArch: %{golang_arches} - gomtree ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - gotun ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} ExclusiveArch: x86_64 - goverlay ExclusiveArch: %{fpc_arches} - gprbuild ExclusiveArch: %{GPRbuild_arches} %{bootstrap_arch} - gprolog ExclusiveArch: x86_64 %{ix86} ppc alpha aarch64 - grafana ExclusiveArch: %{grafana_arches} - grafana-pcp ExclusiveArch: %{grafanapcp_arches} - gtk-sharp-beans ExclusiveArch: %mono_arches - gtk-sharp2 ExclusiveArch: %mono_arches - gtk-sharp3 ExclusiveArch: %{mono_arches} - gtkd ExclusiveArch: %{ldc_arches} - gudev-sharp ExclusiveArch: %mono_arches - guestfs-tools ExclusiveArch: %{kernel_arches} - hedgewars ExclusiveArch: %{fpc_arches} - hsakmt ExclusiveArch: x86_64 aarch64 ppc64le - hyena ExclusiveArch: %{mono_arches} - hyperscan ExclusiveArch: x86_64 - hyperv-daemons ExclusiveArch: i686 x86_64 - i3status-rs ExclusiveArch: %{rust_arches} - icaro ExclusiveArch: %{ix86} x86_64 noarch - imvirt ExclusiveArch: %{ix86} x86_64 ia64 - indistarter ExclusiveArch: %{fpc_arches} - infinipath-psm ExclusiveArch: x86_64 - intel-cm-compiler ExclusiveArch: i686 x86_64 - intel-cmt-cat ExclusiveArch: x86_64 i686 i586 ExclusiveArch: x86_64 i686 i586 - intel-compute-runtime ExclusiveArch: x86_64 - intel-gmmlib ExclusiveArch: x86_64 i686 - intel-igc ExclusiveArch: x86_64 i686 - intel-ipp-crypto-mb ExclusiveArch: x86_64 ExclusiveArch: x86_64 - intel-ipsec-mb ExclusiveArch: x86_64 ExclusiveArch: x86_64 - intel-mediasdk ExclusiveArch: x86_64 - intel-undervolt ExclusiveArch: i386 x86_64 - ioport ExclusiveArch: %{ix86} x86_64 - ipmctl ExclusiveArch: x86_64 - ispc ExclusiveArch: x86_64 aarch64 - iucode-tool ExclusiveArch: %{ix86} x86_64 - iyfct ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le - java-1.8.0-openjdk-aarch32 ExclusiveArch: %{arm} - jigawatts ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x - kchmviewer ExclusiveArch: %{qt5_qtwebengine_arches} - kernel ExclusiveArch: noarch x86_64 s390x %{arm} aarch64 ppc64le ExclusiveArch: noarch i386 i686 x86_64 s390x %{arm} aarch64 ppc64le - keylime-agent-rust ExclusiveArch: %{rust_arches} - keyring-ima-signer ExclusiveArch: %{rust_arches} - kf5-akonadi-search ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-audiocd-kio ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-kalarmcal ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-kblog ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-kcalendarcore ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-kcalendarutils ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-kitinerary ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-ktnef ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-libkdcraw ExclusiveArch: x86_64 ppc64le %{arm} - kicad ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le - kiwix-desktop ExclusiveArch: %{qt5_qtwebengine_arches} - klee ExclusiveArch: x86_64 - knot-resolver ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - knotes ExclusiveArch: x86_64 %{arm} - kompose ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x - kubernetes ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm} - lazarus ExclusiveArch: %{fpc_arches} - lazpaint ExclusiveArch: %{fpc_arches} - ldc ExclusiveArch: %{ldc_arches} - libbsr ExclusiveArch: %{power64} - libclc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x - libcxl ExclusiveArch: %{power64} - libdfp ExclusiveArch: ppc ppc64 ppc64le s390 s390x x86_64 - libdispatch ExclusiveArch: x86_64 aarch64 - libguestfs ExclusiveArch: %{kernel_arches} - libica ExclusiveArch: s390 s390x - libipt ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 - libkgapi ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - libnxz ExclusiveArch: ppc64le - libocxl ExclusiveArch: ppc64le - libpmemobj-cpp ExclusiveArch: x86_64 ppc64le - libpsm2 ExclusiveArch: x86_64 - libquentier ExclusiveArch: %{qt5_qtwebengine_arches} - libretro-desmume2015 ExclusiveArch: i686 x86_64 - librtas ExclusiveArch: %{power64} - libservicelog ExclusiveArch: ppc %{power64} - libsmbios ExclusiveArch: x86_64 %{ix86} - libunwind ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64 - libva-intel-hybrid-driver ExclusiveArch: %{ix86} x86_64 ia64 - libvma ExclusiveArch: x86_64 ppc64le ppc64 aarch64 - libvmi ExclusiveArch: x86_64 - libvpd ExclusiveArch: %{power64} - libxsmm ExclusiveArch: x86_64 - libzdnn ExclusiveArch: s390x - libzfcphbaapi ExclusiveArch: s390 s390x - lightdm ExclusiveArch: x86_64 ppc64le - llhttp ExclusiveArch: %{nodejs_arches} - log4net ExclusiveArch: %mono_arches - lrmi ExclusiveArch: %{ix86} - lsvpd ExclusiveArch: %{power64} - luajit ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 - luxcorerender ExclusiveArch: x86_64 - mactel-boot ExclusiveArch: x86_64 - manifest-tool ExclusiveArch: x86_64 aarch64 ppc64le s390x - marked ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - matreshka ExclusiveArch: %GPRbuild_arches - maui-mauikit ExclusiveArch: %{ix86} s390x aarch64 x86_64 - maxima ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9 ExclusiveArch: %{ix86} x86_64 ppc sparcv9 - mbpfan ExclusiveArch: x86_64 - mcelog ExclusiveArch: i686 x86_64 - mdevctl ExclusiveArch: %{rust_arches} - mediaconch ExclusiveArch: %{qt5_qtwebengine_arches} - mellowplayer ExclusiveArch: %{qt5_qtwebengine_arches} - memkind ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 - memtest86+ ExclusiveArch: %{ix86} x86_64 - mesos ExclusiveArch: x86_64 - microcode_ctl ExclusiveArch: %{ix86} x86_64 - micropython ExclusiveArch: %{arm} %{ix86} x86_64 - mine_detector ExclusiveArch: %{GPRbuild_arches} - minetest ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 - mingw-libidn2 ExclusiveArch: %{ix86} x86_64 %{arm} - mingw-wine-gecko ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - mirrorlist-server ExclusiveArch: %{rust_arches} - mkbootdisk ExclusiveArch: %{ix86} sparc sparc64 x86_64 - mod_mono ExclusiveArch: %mono_arches - module-build-service ExclusiveArch: %{ix86} x86_64 noarch - mokutil ExclusiveArch: %{ix86} x86_64 aarch64 %{arm} - mold ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 riscv64 - mono ExclusiveArch: %mono_arches - mono-addins ExclusiveArch: %mono_arches - mono-basic ExclusiveArch: %{mono_arches} - mono-bouncycastle ExclusiveArch: %mono_arches - mono-cecil ExclusiveArch: %mono_arches - mono-cecil-flowanalysis ExclusiveArch: %mono_arches - mono-reflection ExclusiveArch: %mono_arches - mono-tools ExclusiveArch: %mono_arches - mono-zeroconf ExclusiveArch: %mono_arches - monobristol ExclusiveArch: %{mono_arches} - monodevelop ExclusiveArch: %mono_arches - monodevelop-debugger-gdb ExclusiveArch: %{mono_arches} - monosim ExclusiveArch: %mono_arches - mrrescue ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le - msr-tools ExclusiveArch: %{ix86} x86_64 - mustache-d ExclusiveArch: %{ldc_arches} - mysql-connector-net ExclusiveArch: %{mono_arches} - naev ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 - nant ExclusiveArch: %mono_arches - nativejit ExclusiveArch: x86_64 - nbc ExclusiveArch: %{fpc_arches} - nbdkit ExclusiveArch: x86_64 - ndesk-dbus ExclusiveArch: %{mono_arches} - ndesk-dbus-glib ExclusiveArch: %{mono_arches} - netavark ExclusiveArch: %{rust_arches} - newtonsoft-json ExclusiveArch: %{mono_arches} - nispor ExclusiveArch: %{rust_arches} - nodejs ExclusiveArch: %{nodejs_arches} - nodejs-acorn-object-spread ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-backbone ExclusiveArch: %{nodejs_arches} noarch - nodejs-bash-language-server ExclusiveArch: %{nodejs_arches} noarch - nodejs-buble ExclusiveArch: %{nodejs_arches} noarch - nodejs-colors ExclusiveArch: %{nodejs_arches} noarch - nodejs-generic-pool ExclusiveArch: %{nodejs_arches} noarch - nodejs-less ExclusiveArch: %{nodejs_arches} noarch - nodejs-linefix ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nodemon ExclusiveArch: %{nodejs_arches} noarch - nodejs-packaging ExclusiveArch: %{nodejs_arches} noarch - nodejs-replace-require-self ExclusiveArch: %{nodejs_arches} noarch - nodejs-supervisor ExclusiveArch: %{nodejs_arches} noarch - nodejs-tape ExclusiveArch: %{nodejs_arches} noarch - nodejs-typescript ExclusiveArch: %{nodejs_arches} noarch - nodejs-underscore ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - notify-sharp ExclusiveArch: %{mono_arches} - notify-sharp3 ExclusiveArch: %{mono_arches} - nuget ExclusiveArch: %{mono_arches} - numatop ExclusiveArch: x86_64 ppc64le - nunit ExclusiveArch: %{mono_arches} - nunit2 ExclusiveArch: %{mono_arches} - nvml ExclusiveArch: x86_64 ppc64le - nwchem ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le - obs-service-rust2rpm ExclusiveArch: %{rust_arches} noarch - oci-seccomp-bpf-hook ExclusiveArch: x86_64 %%{power64} aarch64 s390x armv7hl - oci-umount ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - oidn ExclusiveArch: x86_64 - olpc-kbdshim ExclusiveArch: %{ix86} %{arm} - olpc-utils ExclusiveArch: %{ix86} %{arm} - oneVPL ExclusiveArch: x86_64 - oneVPL-intel-gpu ExclusiveArch: x86_64 - onednn ExclusiveArch: x86_64 aarch64 ppc64le s390x - onedrive ExclusiveArch: %{ldc_arches} - opae ExclusiveArch: x86_64 - opal-prd ExclusiveArch: ppc64le - open-vm-tools ExclusiveArch: x86_64 ExclusiveArch: %{ix86} x86_64 aarch64 - openblas ExclusiveArch: %{openblas_arches} - openjfx ExclusiveArch: x86_64 - openjfx8 ExclusiveArch: x86_64 - openlibm ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64} - openms ExclusiveArch: %{qt5_qtwebengine_arches} - openni ExclusiveArch: %{ix86} x86_64 %{arm} - openni-primesense ExclusiveArch: %{ix86} x86_64 %{arm} - openshadinglanguage ExclusiveArch: x86_64 aarch64 ppc64le s390x - openssl-ibmca ExclusiveArch: s390 s390x - origin ExclusiveArch: %{go_arches} ExclusiveArch: x86_64 aarch64 ppc64le s390x - orion ExclusiveArch: %{qt5_qtwebengine_arches} - orthorobot ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le - pacemaker ExclusiveArch: aarch64 i686 ppc64le s390x x86_64 %{arm} ExclusiveArch: aarch64 i686 ppc64le s390x x86_64 - paflib ExclusiveArch: ppc %{power64} - parsec ExclusiveArch: %{rust_arches} - parsec-tool ExclusiveArch: %{rust_arches} - pasdoc ExclusiveArch: %{fpc_arches} - pcc ExclusiveArch: %{ix86} x86_64 - pcm ExclusiveArch: %{ix86} x86_64 - pcmciautils ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm} - pdbg ExclusiveArch: ppc64le - pdfmod ExclusiveArch: %mono_arches - perl-Dumbbench ExclusiveArch: %{ix86} x86_64 noarch - perl-Parse-DMIDecode ExclusiveArch: %{ix86} x86_64 ia64 aarch64 - pesign ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm} - pesign-test-app ExclusiveArch: x86_64 - pinta ExclusiveArch: %mono_arches - pioneer ExclusiveArch: %{ix86} x86_64 - playonlinux ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - pmdk-convert ExclusiveArch: x86_64 - pmemkv ExclusiveArch: x86_64 - podman ExclusiveArch: %{golang_arches} - poppler-sharp ExclusiveArch: %mono_arches - popub ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - powerpc-utils ExclusiveArch: ppc %{power64} - ppc64-diag ExclusiveArch: ppc %{power64} - pveclib ExclusiveArch: ppc %{power64} - pvs-sbcl ExclusiveArch: %{ix86} x86_64 ppc sparcv9 - pyqtwebengine ExclusiveArch: %{qt5_qtwebengine_arches} - python-cryptography ExclusiveArch: %{rust_arches} - python-etcd ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - python-healpy ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x - python-javabridge ExclusiveArch: i686 x86_64 - python-openoffice ExclusiveArch: noarch x86_64 - python-pymoc ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x - python-setuptools-rust ExclusiveArch: %{rust_arches} - q4wine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - qatzip ExclusiveArch: x86_64 - qcint ExclusiveArch: x86_64 - qclib ExclusiveArch: s390 s390x - qemu-sanity-check ExclusiveArch: %{kernel_arches} - qevercloud ExclusiveArch: %{qt5_qtwebengine_arches} - qmapshack ExclusiveArch: %{qt5_qtwebengine_arches} - qt4pas ExclusiveArch: %{fpc_arches} - qt5-qtwebengine ExclusiveArch: %{qt5_qtwebengine_arches} - quantum-espresso ExclusiveArch: x86_64 %{ix86} aarch64 %{power64} - quentier ExclusiveArch: %{qt5_qtwebengine_arches} - rear ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64 - reg ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - renderdoc ExclusiveArch: x86_64 - reptyr ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - rescene ExclusiveArch: %{mono_arches} - restool ExclusiveArch: aarch64 - restsharp ExclusiveArch: %{mono_arches} - rhythmbox-alternative-toolbar ExclusiveArch: %{ix86} %{arm} x86_64 ppc64 ppc64le - rocm-compilersupport ExclusiveArch: x86_64 aarch64 ppc64le - rocm-device-libs ExclusiveArch: x86_64 aarch64 ppc64le - rocm-runtime ExclusiveArch: x86_64 aarch64 ppc64le - rocminfo ExclusiveArch: x86_64 aarch64 ppc64le - rpm-ostree ExclusiveArch: %{rust_arches} - rr ExclusiveArch: %{ix86} x86_64 aarch64 - rssguard ExclusiveArch: %{qt5_qtwebengine_arches} - rubygem-childprocess ExclusiveArch: %{ix86} x86_64 noarch - runc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le %{mips} s390x - rust ExclusiveArch: %{rust_arches} - rust-Inflector ExclusiveArch: %{rust_arches} - rust-abomonation ExclusiveArch: %{rust_arches} - rust-actix ExclusiveArch: %{rust_arches} - rust-actix-codec ExclusiveArch: %{rust_arches} - rust-actix-connect ExclusiveArch: %{rust_arches} - rust-actix-http ExclusiveArch: %{rust_arches} - rust-actix-macros ExclusiveArch: %{rust_arches} - rust-actix-macros0.1 ExclusiveArch: %{rust_arches} - rust-actix-router ExclusiveArch: %{rust_arches} - rust-actix-rt ExclusiveArch: %{rust_arches} - rust-actix-rt1 ExclusiveArch: %{rust_arches} - rust-actix-server ExclusiveArch: %{rust_arches} - rust-actix-service ExclusiveArch: %{rust_arches} - rust-actix-testing ExclusiveArch: %{rust_arches} - rust-actix-threadpool ExclusiveArch: %{rust_arches} - rust-actix-tls ExclusiveArch: %{rust_arches} - rust-actix-utils ExclusiveArch: %{rust_arches} - rust-actix-web ExclusiveArch: %{rust_arches} - rust-actix-web-codegen ExclusiveArch: %{rust_arches} - rust-actix0.10 ExclusiveArch: %{rust_arches} - rust-actix_derive ExclusiveArch: %{rust_arches} - rust-actix_derive0.5 ExclusiveArch: %{rust_arches} - rust-addr2line ExclusiveArch: %{rust_arches} - rust-adler ExclusiveArch: %{rust_arches} - rust-adler32 ExclusiveArch: %{rust_arches} - rust-aead ExclusiveArch: %{rust_arches} - rust-aes ExclusiveArch: %{rust_arches} - rust-aes-gcm ExclusiveArch: %{rust_arches} - rust-aes0.7 ExclusiveArch: %{rust_arches} - rust-afterburn ExclusiveArch: %{rust_arches} - rust-ahash ExclusiveArch: %{rust_arches} - rust-ahash0.4 ExclusiveArch: %{rust_arches} - rust-aho-corasick ExclusiveArch: %{rust_arches} - rust-alacritty ExclusiveArch: %{rust_arches} - rust-alacritty_config_derive ExclusiveArch: %{rust_arches} - rust-alacritty_terminal ExclusiveArch: %{rust_arches} - rust-alga ExclusiveArch: %{rust_arches} - rust-alga_derive ExclusiveArch: %{rust_arches} - rust-aliasable ExclusiveArch: %{rust_arches} - rust-alloc-no-stdlib ExclusiveArch: %{rust_arches} - rust-alloc-stdlib ExclusiveArch: %{rust_arches} - rust-ambient-authority ExclusiveArch: %{rust_arches} - rust-ammonia ExclusiveArch: %{rust_arches} - rust-ansi_colours ExclusiveArch: %{rust_arches} - rust-ansi_term ExclusiveArch: %{rust_arches} - rust-ansi_term0.11 ExclusiveArch: %{rust_arches} - rust-antidote ExclusiveArch: %{rust_arches} - rust-anyhow ExclusiveArch: %{rust_arches} - rust-aom-sys ExclusiveArch: %{rust_arches} - rust-app_dirs ExclusiveArch: %{rust_arches} - rust-approx ExclusiveArch: %{rust_arches} - rust-ar ExclusiveArch: %{rust_arches} - rust-arbitrary ExclusiveArch: %{rust_arches} - rust-arbitrary0.4 ExclusiveArch: %{rust_arches} - rust-arc-swap ExclusiveArch: %{rust_arches} - rust-arf-strings ExclusiveArch: %{rust_arches} - rust-arg_enum_proc_macro ExclusiveArch: %{rust_arches} - rust-argh ExclusiveArch: %{rust_arches} - rust-argh_derive ExclusiveArch: %{rust_arches} - rust-argh_shared ExclusiveArch: %{rust_arches} - rust-argparse ExclusiveArch: %{rust_arches} - rust-array-init ExclusiveArch: %{rust_arches} - rust-arrayref ExclusiveArch: %{rust_arches} - rust-arrayvec ExclusiveArch: %{rust_arches} - rust-arrayvec0.5 ExclusiveArch: %{rust_arches} - rust-ascii ExclusiveArch: %{rust_arches} - rust-ascii-canvas ExclusiveArch: %{rust_arches} - rust-askalono ExclusiveArch: %{rust_arches} - rust-askalono-cli ExclusiveArch: %{rust_arches} - rust-askama ExclusiveArch: %{rust_arches} - rust-askama_derive ExclusiveArch: %{rust_arches} - rust-askama_escape ExclusiveArch: %{rust_arches} - rust-askama_shared ExclusiveArch: %{rust_arches} - rust-asn1 ExclusiveArch: %{rust_arches} - rust-asn1_derive ExclusiveArch: %{rust_arches} - rust-assert-impl ExclusiveArch: %{rust_arches} - rust-assert-json-diff ExclusiveArch: %{rust_arches} - rust-assert_approx_eq ExclusiveArch: %{rust_arches} - rust-assert_cli ExclusiveArch: %{rust_arches} - rust-assert_cmd ExclusiveArch: %{rust_arches} - rust-assert_fs ExclusiveArch: %{rust_arches} - rust-assert_matches ExclusiveArch: %{rust_arches} - rust-async-attributes ExclusiveArch: %{rust_arches} - rust-async-channel ExclusiveArch: %{rust_arches} - rust-async-compression ExclusiveArch: %{rust_arches} - rust-async-executor ExclusiveArch: %{rust_arches} - rust-async-global-executor ExclusiveArch: %{rust_arches} - rust-async-io ExclusiveArch: %{rust_arches} - rust-async-lock ExclusiveArch: %{rust_arches} - rust-async-mutex ExclusiveArch: %{rust_arches} - rust-async-process ExclusiveArch: %{rust_arches} - rust-async-std ExclusiveArch: %{rust_arches} - rust-async-stream ExclusiveArch: %{rust_arches} - rust-async-stream-impl ExclusiveArch: %{rust_arches} - rust-async-task ExclusiveArch: %{rust_arches} - rust-async-trait ExclusiveArch: %{rust_arches} - rust-asyncgit ExclusiveArch: %{rust_arches} - rust-atk ExclusiveArch: %{rust_arches} - rust-atk-sys ExclusiveArch: %{rust_arches} - rust-atom ExclusiveArch: %{rust_arches} - rust-atomic ExclusiveArch: %{rust_arches} - rust-atomic-traits ExclusiveArch: %{rust_arches} - rust-atomic-waker ExclusiveArch: %{rust_arches} - rust-atty ExclusiveArch: %{rust_arches} - rust-autocfg ExclusiveArch: %{rust_arches} - rust-automod ExclusiveArch: %{rust_arches} - rust-av-metrics ExclusiveArch: %{rust_arches} - rust-average ExclusiveArch: %{rust_arches} - rust-awc ExclusiveArch: %{rust_arches} - rust-aws-nitro-enclaves-cose ExclusiveArch: %{rust_arches} - rust-az ExclusiveArch: %{rust_arches} - rust-backtrace ExclusiveArch: %{rust_arches} - rust-base100 ExclusiveArch: %{rust_arches} - rust-base64 ExclusiveArch: %{rust_arches} - rust-base64-0.10 ExclusiveArch: %{rust_arches} - rust-base64-0.11 ExclusiveArch: %{rust_arches} - rust-base64_0.12 ExclusiveArch: %{rust_arches} - rust-base64ct ExclusiveArch: %{rust_arches} - rust-bat ExclusiveArch: %{rust_arches} - rust-beef ExclusiveArch: %{rust_arches} - rust-below ExclusiveArch: %{rust_arches} - rust-below-common ExclusiveArch: %{rust_arches} - rust-below-config ExclusiveArch: %{rust_arches} - rust-below-dump ExclusiveArch: %{rust_arches} - rust-below-model ExclusiveArch: %{rust_arches} - rust-below-render ExclusiveArch: %{rust_arches} - rust-below-store ExclusiveArch: %{rust_arches} - rust-below-view ExclusiveArch: %{rust_arches} - rust-below_derive ExclusiveArch: %{rust_arches} - rust-bencher ExclusiveArch: %{rust_arches} - rust-benfred-read-process-memory ExclusiveArch: %{rust_arches} - rust-bigdecimal ExclusiveArch: %{rust_arches} - rust-bincode ExclusiveArch: %{rust_arches} - rust-bincode0.8 ExclusiveArch: %{rust_arches} - rust-bindgen ExclusiveArch: %{rust_arches} - rust-binfarce ExclusiveArch: %{rust_arches} - rust-bit-set ExclusiveArch: %{rust_arches} - rust-bit-vec ExclusiveArch: %{rust_arches} - rust-bitfield ExclusiveArch: %{rust_arches} - rust-bitflags ExclusiveArch: %{rust_arches} - rust-bitmaps ExclusiveArch: %{rust_arches} - rust-bitstream-io ExclusiveArch: %{rust_arches} - rust-bitvec ExclusiveArch: %{rust_arches} - rust-blake2 ExclusiveArch: %{rust_arches} - rust-blobby ExclusiveArch: %{rust_arches} - rust-blobby0.1 ExclusiveArch: %{rust_arches} - rust-block-buffer ExclusiveArch: %{rust_arches} - rust-block-buffer0.9 ExclusiveArch: %{rust_arches} - rust-block-modes ExclusiveArch: %{rust_arches} - rust-block-padding ExclusiveArch: %{rust_arches} - rust-block-padding0.2 ExclusiveArch: %{rust_arches} - rust-blocking ExclusiveArch: %{rust_arches} - rust-blsctl ExclusiveArch: %{rust_arches} - rust-bodhi ExclusiveArch: %{rust_arches} - rust-bodhi-cli ExclusiveArch: %{rust_arches} - rust-bootupd ExclusiveArch: x86_64 aarch64 - rust-box_drawing ExclusiveArch: %{rust_arches} - rust-boxfnonce ExclusiveArch: %{rust_arches} - rust-brotli ExclusiveArch: %{rust_arches} - rust-brotli-decompressor ExclusiveArch: %{rust_arches} - rust-brotli-sys ExclusiveArch: %{rust_arches} - rust-brotli2 ExclusiveArch: %{rust_arches} - rust-bstr ExclusiveArch: %{rust_arches} - rust-btrd ExclusiveArch: %{rust_arches} - rust-buf_redux ExclusiveArch: %{rust_arches} - rust-buffered-reader ExclusiveArch: %{rust_arches} - rust-bufstream ExclusiveArch: %{rust_arches} - rust-bugreport ExclusiveArch: %{rust_arches} - rust-bumpalo ExclusiveArch: %{rust_arches} - rust-byte-unit ExclusiveArch: %{rust_arches} - rust-byte-unit3 ExclusiveArch: %{rust_arches} - rust-bytecheck ExclusiveArch: %{rust_arches} - rust-bytecheck_derive ExclusiveArch: %{rust_arches} - rust-bytecount ExclusiveArch: %{rust_arches} - rust-bytelines ExclusiveArch: %{rust_arches} - rust-bytemuck ExclusiveArch: %{rust_arches} - rust-bytemuck_derive ExclusiveArch: %{rust_arches} - rust-byteorder ExclusiveArch: %{rust_arches} - rust-bytes ExclusiveArch: %{rust_arches} - rust-bytes-cast ExclusiveArch: %{rust_arches} - rust-bytes-cast-derive ExclusiveArch: %{rust_arches} - rust-bytes0.4 ExclusiveArch: %{rust_arches} - rust-bytes0.5 ExclusiveArch: %{rust_arches} - rust-bytesize ExclusiveArch: %{rust_arches} - rust-bytestring ExclusiveArch: %{rust_arches} - rust-bzip2 ExclusiveArch: %{rust_arches} - rust-bzip2-sys ExclusiveArch: %{rust_arches} - rust-cache-padded ExclusiveArch: %{rust_arches} - rust-cairo-rs ExclusiveArch: %{rust_arches} - rust-cairo-sys-rs ExclusiveArch: %{rust_arches} - rust-calloop ExclusiveArch: %{rust_arches} - rust-camino ExclusiveArch: %{rust_arches} - rust-cap-async-std ExclusiveArch: %{rust_arches} - rust-cap-fs-ext ExclusiveArch: %{rust_arches} - rust-cap-primitives ExclusiveArch: %{rust_arches} - rust-cap-rand ExclusiveArch: %{rust_arches} - rust-cap-std ExclusiveArch: %{rust_arches} - rust-cap-tempfile ExclusiveArch: %{rust_arches} - rust-cap-time-ext ExclusiveArch: %{rust_arches} - rust-capng ExclusiveArch: %{rust_arches} - rust-capnp ExclusiveArch: %{rust_arches} - rust-capnp-futures ExclusiveArch: %{rust_arches} - rust-capnp-rpc ExclusiveArch: %{rust_arches} - rust-caps ExclusiveArch: %{rust_arches} - rust-cargo ExclusiveArch: %{rust_arches} - rust-cargo-bloat ExclusiveArch: %{rust_arches} - rust-cargo-c ExclusiveArch: %{rust_arches} - rust-cargo-edit ExclusiveArch: %{rust_arches} - rust-cargo-husky ExclusiveArch: %{rust_arches} - rust-cargo-insta ExclusiveArch: %{rust_arches} - rust-cargo-platform ExclusiveArch: %{rust_arches} - rust-cargo-readme ExclusiveArch: %{rust_arches} - rust-cargo-util ExclusiveArch: %{rust_arches} - rust-cargo_metadata ExclusiveArch: %{rust_arches} - rust-cascade ExclusiveArch: %{rust_arches} - rust-case ExclusiveArch: %{rust_arches} - rust-cassowary ExclusiveArch: %{rust_arches} - rust-cast ExclusiveArch: %{rust_arches} - rust-cbindgen ExclusiveArch: %{rust_arches} - rust-cc ExclusiveArch: %{rust_arches} - rust-cedarwood ExclusiveArch: %{rust_arches} - rust-cexpr ExclusiveArch: %{rust_arches} - rust-cfb ExclusiveArch: %{rust_arches} - rust-cfg-expr ExclusiveArch: %{rust_arches} - rust-cfg-if ExclusiveArch: %{rust_arches} - rust-cfg-if0.1 ExclusiveArch: %{rust_arches} - rust-cgroupfs ExclusiveArch: %{rust_arches} - rust-chainerror ExclusiveArch: %{rust_arches} - rust-charset ExclusiveArch: %{rust_arches} - rust-chbs ExclusiveArch: %{rust_arches} - rust-checked_int_cast ExclusiveArch: %{rust_arches} - rust-choosier ExclusiveArch: %{rust_arches} - rust-chrono ExclusiveArch: %{rust_arches} - rust-chrono-humanize ExclusiveArch: %{rust_arches} - rust-chrono-tz ExclusiveArch: %{rust_arches} - rust-chunked_transfer ExclusiveArch: %{rust_arches} - rust-cipher ExclusiveArch: %{rust_arches} - rust-cipher0.3 ExclusiveArch: %{rust_arches} - rust-clang-ast ExclusiveArch: %{rust_arches} - rust-clang-sys ExclusiveArch: %{rust_arches} - rust-clap ExclusiveArch: %{rust_arches} - rust-clap-verbosity-flag ExclusiveArch: %{rust_arches} - rust-clap2 ExclusiveArch: %{rust_arches} - rust-clap_complete ExclusiveArch: %{rust_arches} - rust-clap_complete_fig ExclusiveArch: %{rust_arches} - rust-clap_derive ExclusiveArch: %{rust_arches} - rust-clap_generate ExclusiveArch: %{rust_arches} - rust-clap_generate_fig ExclusiveArch: %{rust_arches} - rust-clicolors-control ExclusiveArch: %{rust_arches} - rust-clircle ExclusiveArch: %{rust_arches} - rust-cmake ExclusiveArch: %{rust_arches} - rust-codespan-reporting ExclusiveArch: %{rust_arches} - rust-codicon ExclusiveArch: %{rust_arches} - rust-color-backtrace ExclusiveArch: %{rust_arches} - rust-color_quant ExclusiveArch: %{rust_arches} - rust-colored ExclusiveArch: %{rust_arches} - rust-colored1 ExclusiveArch: %{rust_arches} - rust-colored_json ExclusiveArch: %{rust_arches} - rust-colorful ExclusiveArch: %{rust_arches} - rust-combine ExclusiveArch: %{rust_arches} - rust-comfy-table ExclusiveArch: %{rust_arches} - rust-common-path ExclusiveArch: %{rust_arches} - rust-compiletest_rs ExclusiveArch: %{rust_arches} - rust-compress-tools ExclusiveArch: %{rust_arches} - rust-comrak ExclusiveArch: %{rust_arches} - rust-concurrent-queue ExclusiveArch: %{rust_arches} - rust-configparser ExclusiveArch: %{rust_arches} - rust-confy ExclusiveArch: %{rust_arches} - rust-conhash ExclusiveArch: %{rust_arches} - rust-console ExclusiveArch: %{rust_arches} - rust-console0.11 ExclusiveArch: %{rust_arches} - rust-console0.12 ExclusiveArch: %{rust_arches} - rust-console0.13 ExclusiveArch: %{rust_arches} - rust-console0.14 ExclusiveArch: %{rust_arches} - rust-console0.9 ExclusiveArch: %{rust_arches} - rust-console_error_panic_hook ExclusiveArch: %{rust_arches} - rust-const-cstr ExclusiveArch: %{rust_arches} - rust-const-oid ExclusiveArch: %{rust_arches} - rust-const-random ExclusiveArch: %{rust_arches} - rust-const-random-macro ExclusiveArch: %{rust_arches} - rust-const_fn ExclusiveArch: %{rust_arches} - rust-constant_time_eq ExclusiveArch: %{rust_arches} - rust-content_inspector ExclusiveArch: %{rust_arches} - rust-conv ExclusiveArch: %{rust_arches} - rust-convert_case ExclusiveArch: %{rust_arches} - rust-cookie ExclusiveArch: %{rust_arches} - rust-cookie-factory ExclusiveArch: %{rust_arches} - rust-cookie0.14 ExclusiveArch: %{rust_arches} - rust-cookie_store ExclusiveArch: %{rust_arches} - rust-cookie_store0.12 ExclusiveArch: %{rust_arches} - rust-coolor ExclusiveArch: %{rust_arches} - rust-copydeps ExclusiveArch: %{rust_arches} - rust-copyless ExclusiveArch: %{rust_arches} - rust-copypasta ExclusiveArch: %{rust_arches} - rust-cordic ExclusiveArch: %{rust_arches} - rust-coreos-installer ExclusiveArch: %{rust_arches} - rust-count-zeroes ExclusiveArch: %{rust_arches} - rust-counted-array ExclusiveArch: %{rust_arches} - rust-cpio ExclusiveArch: %{rust_arches} - rust-cpp_demangle ExclusiveArch: %{rust_arches} - rust-cpufeatures ExclusiveArch: %{rust_arches} - rust-cpython ExclusiveArch: %{rust_arches} - rust-cranelift-bforest ExclusiveArch: %{rust_arches} - rust-cranelift-codegen ExclusiveArch: x86_64 aarch64 s390x - rust-cranelift-codegen-meta ExclusiveArch: %{rust_arches} - rust-cranelift-codegen-shared ExclusiveArch: %{rust_arches} - rust-cranelift-entity ExclusiveArch: %{rust_arches} - rust-cranelift-frontend ExclusiveArch: x86_64 aarch64 s390x - rust-cranelift-native ExclusiveArch: x86_64 aarch64 s390x - rust-cranelift-wasm ExclusiveArch: x86_64 aarch64 s390x - rust-crates-io ExclusiveArch: %{rust_arches} - rust-crc ExclusiveArch: %{rust_arches} - rust-crc-catalog ExclusiveArch: %{rust_arches} - rust-crc32fast ExclusiveArch: %{rust_arches} - rust-criterion ExclusiveArch: %{rust_arches} - rust-criterion-plot ExclusiveArch: %{rust_arches} - rust-crossbeam ExclusiveArch: %{rust_arches} - rust-crossbeam-channel ExclusiveArch: %{rust_arches} - rust-crossbeam-channel0.4 ExclusiveArch: %{rust_arches} - rust-crossbeam-deque ExclusiveArch: %{rust_arches} - rust-crossbeam-deque0.7 ExclusiveArch: %{rust_arches} - rust-crossbeam-epoch ExclusiveArch: %{rust_arches} - rust-crossbeam-epoch0.8 ExclusiveArch: %{rust_arches} - rust-crossbeam-queue ExclusiveArch: %{rust_arches} - rust-crossbeam-queue0.2 ExclusiveArch: %{rust_arches} - rust-crossbeam-utils ExclusiveArch: %{rust_arches} - rust-crossbeam-utils0.7 ExclusiveArch: %{rust_arches} - rust-crossbeam0.7 ExclusiveArch: %{rust_arches} - rust-crossfont ExclusiveArch: %{rust_arches} - rust-crossterm ExclusiveArch: %{rust_arches} - rust-crossterm0.17 ExclusiveArch: %{rust_arches} - rust-crossterm0.19 ExclusiveArch: %{rust_arches} - rust-crosstermion ExclusiveArch: %{rust_arches} - rust-crunchy ExclusiveArch: %{rust_arches} - rust-crypto-bigint ExclusiveArch: %{rust_arches} - rust-crypto-common ExclusiveArch: %{rust_arches} - rust-crypto-hash ExclusiveArch: %{rust_arches} - rust-crypto-mac ExclusiveArch: %{rust_arches} - rust-cryptoki ExclusiveArch: %{rust_arches} - rust-cryptoki-sys ExclusiveArch: %{rust_arches} - rust-cstr_core ExclusiveArch: %{rust_arches} - rust-csv ExclusiveArch: %{rust_arches} - rust-csv-core ExclusiveArch: %{rust_arches} - rust-ct-logs ExclusiveArch: %{rust_arches} - rust-ctor ExclusiveArch: %{rust_arches} - rust-ctr ExclusiveArch: %{rust_arches} - rust-ctr0.8 ExclusiveArch: %{rust_arches} - rust-ctrlc ExclusiveArch: %{rust_arches} - rust-cty ExclusiveArch: %{rust_arches} - rust-curl ExclusiveArch: %{rust_arches} - rust-curl-sys ExclusiveArch: %{rust_arches} - rust-cursive ExclusiveArch: %{rust_arches} - rust-cursive-tabs ExclusiveArch: %{rust_arches} - rust-cursive_buffered_backend ExclusiveArch: %{rust_arches} - rust-cursive_core ExclusiveArch: %{rust_arches} - rust-curve25519-dalek ExclusiveArch: %{rust_arches} - rust-custom_derive ExclusiveArch: %{rust_arches} - rust-custom_error ExclusiveArch: %{rust_arches} - rust-cxx ExclusiveArch: %{rust_arches} - rust-cxx-build ExclusiveArch: %{rust_arches} - rust-cxx-gen ExclusiveArch: %{rust_arches} - rust-cxxbridge-flags ExclusiveArch: %{rust_arches} - rust-cxxbridge-macro ExclusiveArch: %{rust_arches} - rust-darling ExclusiveArch: %{rust_arches} - rust-darling0.12 ExclusiveArch: %{rust_arches} - rust-darling_core ExclusiveArch: %{rust_arches} - rust-darling_core0.12 ExclusiveArch: %{rust_arches} - rust-darling_macro ExclusiveArch: %{rust_arches} - rust-darling_macro0.12 ExclusiveArch: %{rust_arches} - rust-dashmap ExclusiveArch: %{rust_arches} - rust-data-encoding ExclusiveArch: %{rust_arches} - rust-data-url ExclusiveArch: %{rust_arches} - rust-datetime ExclusiveArch: %{rust_arches} - rust-dav1d-sys ExclusiveArch: %{rust_arches} - rust-dbus ExclusiveArch: %{rust_arches} - rust-dbus-codegen ExclusiveArch: %{rust_arches} - rust-dbus-crossroads ExclusiveArch: %{rust_arches} - rust-dbus-tokio ExclusiveArch: %{rust_arches} - rust-dbus-tree ExclusiveArch: %{rust_arches} - rust-dbus0.8 ExclusiveArch: %{rust_arches} - rust-decimal ExclusiveArch: %{rust_arches} - rust-defer-drop ExclusiveArch: %{rust_arches} - rust-deflate ExclusiveArch: %{rust_arches} - rust-deflate0.8 ExclusiveArch: %{rust_arches} - rust-defmac ExclusiveArch: %{rust_arches} - rust-der ExclusiveArch: %{rust_arches} - rust-der_derive ExclusiveArch: %{rust_arches} - rust-derivative ExclusiveArch: %{rust_arches} - rust-derive-new ExclusiveArch: %{rust_arches} - rust-derive_arbitrary ExclusiveArch: %{rust_arches} - rust-derive_arbitrary0.4 ExclusiveArch: %{rust_arches} - rust-derive_builder ExclusiveArch: %{rust_arches} - rust-derive_builder0.9 ExclusiveArch: %{rust_arches} - rust-derive_builder_core ExclusiveArch: %{rust_arches} - rust-derive_builder_core0.9 ExclusiveArch: %{rust_arches} - rust-derive_builder_macro ExclusiveArch: %{rust_arches} - rust-derive_more ExclusiveArch: %{rust_arches} - rust-des ExclusiveArch: %{rust_arches} - rust-des0.7 ExclusiveArch: %{rust_arches} - rust-desed ExclusiveArch: %{rust_arches} - rust-deunicode ExclusiveArch: %{rust_arches} - rust-devicemapper ExclusiveArch: %{rust_arches} - rust-devicemapper-sys ExclusiveArch: %{rust_arches} - rust-dialoguer ExclusiveArch: %{rust_arches} - rust-diesel ExclusiveArch: %{rust_arches} - rust-diesel_derives ExclusiveArch: %{rust_arches} - rust-diff ExclusiveArch: %{rust_arches} - rust-difference ExclusiveArch: %{rust_arches} - rust-difflib ExclusiveArch: %{rust_arches} - rust-digest ExclusiveArch: %{rust_arches} - rust-digest0.9 ExclusiveArch: %{rust_arches} - rust-directories ExclusiveArch: %{rust_arches} - rust-directories-next ExclusiveArch: %{rust_arches} - rust-dirs ExclusiveArch: %{rust_arches} - rust-dirs-next ExclusiveArch: %{rust_arches} - rust-dirs-sys ExclusiveArch: %{rust_arches} - rust-dirs-sys-next ExclusiveArch: %{rust_arches} - rust-dirs2 ExclusiveArch: %{rust_arches} - rust-dirs3 ExclusiveArch: %{rust_arches} - rust-diskonaut ExclusiveArch: %{rust_arches} - rust-displaydoc ExclusiveArch: %{rust_arches} - rust-dissimilar ExclusiveArch: %{rust_arches} - rust-dlib ExclusiveArch: %{rust_arches} - rust-dlv-list ExclusiveArch: %{rust_arches} - rust-dns-lookup ExclusiveArch: %{rust_arches} - rust-doc-comment ExclusiveArch: %{rust_arches} - rust-docmatic ExclusiveArch: %{rust_arches} - rust-docopt ExclusiveArch: %{rust_arches} - rust-dotenv ExclusiveArch: %{rust_arches} - rust-downcast ExclusiveArch: %{rust_arches} - rust-downcast-rs ExclusiveArch: %{rust_arches} - rust-drg ExclusiveArch: %{rust_arches} - rust-dtoa ExclusiveArch: %{rust_arches} - rust-dua-cli ExclusiveArch: %{rust_arches} - rust-duct ExclusiveArch: %{rust_arches} - rust-dummy ExclusiveArch: %{rust_arches} - rust-dunce ExclusiveArch: %{rust_arches} - rust-dutree ExclusiveArch: %{rust_arches} - rust-dyn-clone ExclusiveArch: %{rust_arches} - rust-easy-cast ExclusiveArch: %{rust_arches} - rust-easy-parallel ExclusiveArch: %{rust_arches} - rust-edit ExclusiveArch: %{rust_arches} - rust-edit-distance ExclusiveArch: %{rust_arches} - rust-either ExclusiveArch: %{rust_arches} - rust-elasticlunr-rs ExclusiveArch: %{rust_arches} - rust-elf ExclusiveArch: %{rust_arches} - rust-elfcat ExclusiveArch: %{rust_arches} - rust-ena ExclusiveArch: %{rust_arches} - rust-encode_unicode ExclusiveArch: %{rust_arches} - rust-encoding ExclusiveArch: %{rust_arches} - rust-encoding-index-japanese ExclusiveArch: %{rust_arches} - rust-encoding-index-korean ExclusiveArch: %{rust_arches} - rust-encoding-index-simpchinese ExclusiveArch: %{rust_arches} - rust-encoding-index-singlebyte ExclusiveArch: %{rust_arches} - rust-encoding-index-tradchinese ExclusiveArch: %{rust_arches} - rust-encoding_index_tests ExclusiveArch: %{rust_arches} - rust-encoding_rs ExclusiveArch: %{rust_arches} - rust-encoding_rs_io ExclusiveArch: %{rust_arches} - rust-endian-type ExclusiveArch: %{rust_arches} - rust-enquote ExclusiveArch: %{rust_arches} - rust-entities ExclusiveArch: %{rust_arches} - rust-enum-as-inner ExclusiveArch: %{rust_arches} - rust-enum-iterator ExclusiveArch: %{rust_arches} - rust-enum-iterator-derive ExclusiveArch: %{rust_arches} - rust-enum-map ExclusiveArch: %{rust_arches} - rust-enum-map-derive ExclusiveArch: %{rust_arches} - rust-enumflags2 ExclusiveArch: %{rust_arches} - rust-enumflags2_0.6 ExclusiveArch: %{rust_arches} - rust-enumflags2_derive ExclusiveArch: %{rust_arches} - rust-enumflags2_derive0.6 ExclusiveArch: %{rust_arches} - rust-enumset ExclusiveArch: %{rust_arches} - rust-enumset_derive ExclusiveArch: %{rust_arches} - rust-env_logger ExclusiveArch: %{rust_arches} - rust-env_logger0.4 ExclusiveArch: %{rust_arches} - rust-env_logger0.5 ExclusiveArch: %{rust_arches} - rust-env_logger0.6 ExclusiveArch: %{rust_arches} - rust-env_logger0.7 ExclusiveArch: %{rust_arches} - rust-env_logger0.8 ExclusiveArch: %{rust_arches} - rust-env_proxy ExclusiveArch: %{rust_arches} - rust-environment ExclusiveArch: %{rust_arches} - rust-envsubst ExclusiveArch: %{rust_arches} - rust-epoll ExclusiveArch: %{rust_arches} - rust-erased-serde ExclusiveArch: %{rust_arches} - rust-err-derive ExclusiveArch: %{rust_arches} - rust-errno ExclusiveArch: %{rust_arches} - rust-error-chain ExclusiveArch: %{rust_arches} - rust-escargot ExclusiveArch: %{rust_arches} - rust-ethtool ExclusiveArch: %{rust_arches} - rust-event-listener ExclusiveArch: %{rust_arches} - rust-exa ExclusiveArch: %{rust_arches} - rust-executable-path ExclusiveArch: %{rust_arches} - rust-exitcode ExclusiveArch: %{rust_arches} - rust-exitfailure ExclusiveArch: %{rust_arches} - rust-expat-sys ExclusiveArch: %{rust_arches} - rust-extprim ExclusiveArch: %{rust_arches} - rust-eyre ExclusiveArch: %{rust_arches} - rust-faccess ExclusiveArch: %{rust_arches} - rust-fail ExclusiveArch: %{rust_arches} - rust-failure ExclusiveArch: %{rust_arches} - rust-failure-tools ExclusiveArch: %{rust_arches} - rust-failure_derive ExclusiveArch: %{rust_arches} - rust-fake ExclusiveArch: %{rust_arches} - rust-fake-simd ExclusiveArch: %{rust_arches} - rust-fallible-iterator ExclusiveArch: %{rust_arches} - rust-fallible-streaming-iterator ExclusiveArch: %{rust_arches} - rust-fancy-regex ExclusiveArch: %{rust_arches} - rust-fastrand ExclusiveArch: %{rust_arches} - rust-fatfs ExclusiveArch: %{rust_arches} - rust-fb_procfs ExclusiveArch: %{rust_arches} - rust-fbthrift_codegen_includer_proc_macro ExclusiveArch: %{rust_arches} - rust-fd-find ExclusiveArch: %{rust_arches} - rust-fd-lock ExclusiveArch: %{rust_arches} - rust-fdlimit ExclusiveArch: %{rust_arches} - rust-fedora ExclusiveArch: %{rust_arches} - rust-fedora-coreos-pinger ExclusiveArch: %{rust_arches} - rust-fedora-update-feedback ExclusiveArch: %{rust_arches} - rust-femme ExclusiveArch: %{rust_arches} - rust-fern ExclusiveArch: %{rust_arches} - rust-ffsend ExclusiveArch: %{rust_arches} - rust-ffsend-api ExclusiveArch: %{rust_arches} - rust-field-offset ExclusiveArch: %{rust_arches} - rust-file-per-thread-logger ExclusiveArch: %{rust_arches} - rust-filedescriptor ExclusiveArch: %{rust_arches} - rust-filesize ExclusiveArch: %{rust_arches} - rust-filetime ExclusiveArch: %{rust_arches} - rust-filetreelist ExclusiveArch: %{rust_arches} - rust-find-crate ExclusiveArch: %{rust_arches} - rust-findshlibs ExclusiveArch: %{rust_arches} - rust-fixed ExclusiveArch: %{rust_arches} - rust-fixedbitset ExclusiveArch: %{rust_arches} - rust-flate2 ExclusiveArch: %{rust_arches} - rust-float-cmp ExclusiveArch: %{rust_arches} - rust-float-ord ExclusiveArch: %{rust_arches} - rust-fluent ExclusiveArch: %{rust_arches} - rust-fluent-bundle ExclusiveArch: %{rust_arches} - rust-fluent-langneg ExclusiveArch: %{rust_arches} - rust-fluent-syntax ExclusiveArch: %{rust_arches} - rust-fn-error-context ExclusiveArch: %{rust_arches} - rust-fnv ExclusiveArch: %{rust_arches} - rust-font-kit ExclusiveArch: %{rust_arches} - rust-foreign-types ExclusiveArch: %{rust_arches} - rust-foreign-types-macros ExclusiveArch: %{rust_arches} - rust-foreign-types-shared ExclusiveArch: %{rust_arches} - rust-foreign-types-shared0.1 ExclusiveArch: %{rust_arches} - rust-foreign-types0.3 ExclusiveArch: %{rust_arches} - rust-form_urlencoded ExclusiveArch: %{rust_arches} - rust-format-bytes ExclusiveArch: %{rust_arches} - rust-format-bytes-macros ExclusiveArch: %{rust_arches} - rust-fragile ExclusiveArch: %{rust_arches} - rust-freetype ExclusiveArch: %{rust_arches} - rust-freetype-rs ExclusiveArch: %{rust_arches} - rust-freetype-sys ExclusiveArch: %{rust_arches} - rust-fs-err ExclusiveArch: %{rust_arches} - rust-fs-set-times ExclusiveArch: %{rust_arches} - rust-fs2 ExclusiveArch: %{rust_arches} - rust-fs_extra ExclusiveArch: %{rust_arches} - rust-fscommon ExclusiveArch: %{rust_arches} - rust-fslock ExclusiveArch: %{rust_arches} - rust-funty ExclusiveArch: %{rust_arches} - rust-futf ExclusiveArch: %{rust_arches} - rust-futures ExclusiveArch: %{rust_arches} - rust-futures-channel ExclusiveArch: %{rust_arches} - rust-futures-core ExclusiveArch: %{rust_arches} - rust-futures-cpupool ExclusiveArch: %{rust_arches} - rust-futures-executor ExclusiveArch: %{rust_arches} - rust-futures-io ExclusiveArch: %{rust_arches} - rust-futures-lite ExclusiveArch: %{rust_arches} - rust-futures-macro ExclusiveArch: %{rust_arches} - rust-futures-sink ExclusiveArch: %{rust_arches} - rust-futures-task ExclusiveArch: %{rust_arches} - rust-futures-test ExclusiveArch: %{rust_arches} - rust-futures-timer ExclusiveArch: %{rust_arches} - rust-futures-util ExclusiveArch: %{rust_arches} - rust-futures0.1 ExclusiveArch: %{rust_arches} - rust-fuzzy-matcher ExclusiveArch: %{rust_arches} - rust-fxhash ExclusiveArch: %{rust_arches} - rust-gdk ExclusiveArch: %{rust_arches} - rust-gdk-pixbuf ExclusiveArch: %{rust_arches} - rust-gdk-pixbuf-sys ExclusiveArch: %{rust_arches} - rust-gdk-sys ExclusiveArch: %{rust_arches} - rust-gdk4 ExclusiveArch: %{rust_arches} - rust-gdk4-sys ExclusiveArch: %{rust_arches} - rust-generic-array ExclusiveArch: %{rust_arches} - rust-generic-array0.12 ExclusiveArch: %{rust_arches} - rust-genetlink ExclusiveArch: %{rust_arches} - rust-getch ExclusiveArch: %{rust_arches} - rust-gethostname ExclusiveArch: %{rust_arches} - rust-getopts ExclusiveArch: %{rust_arches} - rust-getrandom ExclusiveArch: %{rust_arches} - rust-getrandom0.1 ExclusiveArch: %{rust_arches} - rust-getset ExclusiveArch: %{rust_arches} - rust-gettext-rs ExclusiveArch: %{rust_arches} - rust-gettext-sys ExclusiveArch: %{rust_arches} - rust-gh-emoji ExclusiveArch: %{rust_arches} - rust-ghash ExclusiveArch: %{rust_arches} - rust-ghost ExclusiveArch: %{rust_arches} - rust-gif ExclusiveArch: %{rust_arches} - rust-gimli ExclusiveArch: %{rust_arches} - rust-gio ExclusiveArch: %{rust_arches} - rust-gio-sys ExclusiveArch: %{rust_arches} - rust-gir-format-check ExclusiveArch: %{rust_arches} - rust-git-delta ExclusiveArch: %{rust_arches} - rust-git-version ExclusiveArch: %{rust_arches} - rust-git-version-macro ExclusiveArch: %{rust_arches} - rust-git2 ExclusiveArch: %{rust_arches} - rust-git2-curl ExclusiveArch: %{rust_arches} - rust-gitui ExclusiveArch: %{rust_arches} - rust-gl_generator ExclusiveArch: %{rust_arches} - rust-glam ExclusiveArch: %{rust_arches} - rust-glib ExclusiveArch: %{rust_arches} - rust-glib-macros ExclusiveArch: %{rust_arches} - rust-glib-sys ExclusiveArch: %{rust_arches} - rust-glob ExclusiveArch: %{rust_arches} - rust-globset ExclusiveArch: %{rust_arches} - rust-globwalk ExclusiveArch: %{rust_arches} - rust-glutin ExclusiveArch: %{rust_arches} - rust-glutin_egl_sys ExclusiveArch: %{rust_arches} - rust-glutin_glx_sys ExclusiveArch: %{rust_arches} - rust-gobject-sys ExclusiveArch: %{rust_arches} - rust-goblin ExclusiveArch: %{rust_arches} - rust-gptman ExclusiveArch: %{rust_arches} - rust-graphene-rs ExclusiveArch: %{rust_arches} - rust-graphene-sys ExclusiveArch: %{rust_arches} - rust-greetd_ipc ExclusiveArch: %{rust_arches} - rust-grep ExclusiveArch: %{rust_arches} - rust-grep-cli ExclusiveArch: %{rust_arches} - rust-grep-matcher ExclusiveArch: %{rust_arches} - rust-grep-pcre2 ExclusiveArch: %{rust_arches} - rust-grep-printer ExclusiveArch: %{rust_arches} - rust-grep-regex ExclusiveArch: %{rust_arches} - rust-grep-searcher ExclusiveArch: %{rust_arches} - rust-groupable ExclusiveArch: %{rust_arches} - rust-gsk4 ExclusiveArch: %{rust_arches} - rust-gsk4-sys ExclusiveArch: %{rust_arches} - rust-gstreamer ExclusiveArch: %{rust_arches} - rust-gstreamer-audio ExclusiveArch: %{rust_arches} - rust-gstreamer-audio-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-base ExclusiveArch: %{rust_arches} - rust-gstreamer-base-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-editing-services ExclusiveArch: %{rust_arches} - rust-gstreamer-editing-services-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-pbutils ExclusiveArch: %{rust_arches} - rust-gstreamer-pbutils-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-player ExclusiveArch: %{rust_arches} - rust-gstreamer-player-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-video ExclusiveArch: %{rust_arches} - rust-gstreamer-video-sys ExclusiveArch: %{rust_arches} - rust-gtk ExclusiveArch: %{rust_arches} - rust-gtk-sys ExclusiveArch: %{rust_arches} - rust-gtk3-macros ExclusiveArch: %{rust_arches} - rust-gtk4 ExclusiveArch: %{rust_arches} - rust-gtk4-macros ExclusiveArch: %{rust_arches} - rust-gtk4-sys ExclusiveArch: %{rust_arches} - rust-gzip-header ExclusiveArch: %{rust_arches} - rust-h2 ExclusiveArch: %{rust_arches} - rust-h2_0.2 ExclusiveArch: %{rust_arches} - rust-half ExclusiveArch: %{rust_arches} - rust-hamcrest2 ExclusiveArch: %{rust_arches} - rust-handlebars ExclusiveArch: %{rust_arches} - rust-hashbrown ExclusiveArch: %{rust_arches} - rust-hashbrown0.9 ExclusiveArch: %{rust_arches} - rust-hashlink ExclusiveArch: %{rust_arches} - rust-headers ExclusiveArch: %{rust_arches} - rust-headers-core ExclusiveArch: %{rust_arches} - rust-headers-derive ExclusiveArch: %{rust_arches} - rust-heapsize ExclusiveArch: %{rust_arches} - rust-heatseeker ExclusiveArch: %{rust_arches} - rust-heck ExclusiveArch: %{rust_arches} - rust-heck0.3 ExclusiveArch: %{rust_arches} - rust-helvum ExclusiveArch: %{rust_arches} - rust-hex ExclusiveArch: %{rust_arches} - rust-hex-literal ExclusiveArch: %{rust_arches} - rust-hex-literal-impl ExclusiveArch: %{rust_arches} - rust-hex-literal0.2 ExclusiveArch: %{rust_arches} - rust-hexyl ExclusiveArch: %{rust_arches} - rust-hidapi ExclusiveArch: %{rust_arches} - rust-hkdf ExclusiveArch: %{rust_arches} - rust-hkdf0.11 ExclusiveArch: %{rust_arches} - rust-hmac ExclusiveArch: %{rust_arches} - rust-hmac0.11 ExclusiveArch: %{rust_arches} - rust-home ExclusiveArch: %{rust_arches} - rust-horrorshow ExclusiveArch: %{rust_arches} - rust-hostname ExclusiveArch: %{rust_arches} - rust-hostname-validator ExclusiveArch: %{rust_arches} - rust-html-escape ExclusiveArch: %{rust_arches} - rust-html2pango ExclusiveArch: %{rust_arches} - rust-html5ever ExclusiveArch: %{rust_arches} - rust-http ExclusiveArch: %{rust_arches} - rust-http-body ExclusiveArch: %{rust_arches} - rust-http-body0.3 ExclusiveArch: %{rust_arches} - rust-http0.1 ExclusiveArch: %{rust_arches} - rust-httparse ExclusiveArch: %{rust_arches} - rust-httpdate ExclusiveArch: %{rust_arches} - rust-human-panic ExclusiveArch: %{rust_arches} - rust-human-sort ExclusiveArch: %{rust_arches} - rust-humansize ExclusiveArch: %{rust_arches} - rust-humantime ExclusiveArch: %{rust_arches} - rust-humantime-serde ExclusiveArch: %{rust_arches} - rust-humantime1 ExclusiveArch: %{rust_arches} - rust-hyper ExclusiveArch: %{rust_arches} - rust-hyper-native-tls ExclusiveArch: %{rust_arches} - rust-hyper-rustls ExclusiveArch: %{rust_arches} - rust-hyper-staticfile ExclusiveArch: %{rust_arches} - rust-hyper-tls ExclusiveArch: %{rust_arches} - rust-hyper-tls0.4 ExclusiveArch: %{rust_arches} - rust-hyper0.10 ExclusiveArch: %{rust_arches} - rust-hyper0.13 ExclusiveArch: %{rust_arches} - rust-hyperfine ExclusiveArch: %{rust_arches} - rust-i18n-config ExclusiveArch: %{rust_arches} - rust-i18n-embed ExclusiveArch: %{rust_arches} - rust-i18n-embed-fl ExclusiveArch: %{rust_arches} - rust-i18n-embed-impl ExclusiveArch: %{rust_arches} - rust-i3ipc ExclusiveArch: %{rust_arches} - rust-iai ExclusiveArch: %{rust_arches} - rust-id-arena ExclusiveArch: %{rust_arches} - rust-ident_case ExclusiveArch: %{rust_arches} - rust-idna ExclusiveArch: %{rust_arches} - rust-idna0.1 ExclusiveArch: %{rust_arches} - rust-ifcfg-devname ExclusiveArch: %{rust_arches} - rust-ignition-config ExclusiveArch: %{rust_arches} - rust-ignore ExclusiveArch: %{rust_arches} - rust-im-rc ExclusiveArch: %{rust_arches} - rust-image ExclusiveArch: %{rust_arches} - rust-image-roll ExclusiveArch: %{rust_arches} - rust-imgref ExclusiveArch: %{rust_arches} - rust-indenter ExclusiveArch: %{rust_arches} - rust-indexmap ExclusiveArch: %{rust_arches} - rust-indicatif ExclusiveArch: %{rust_arches} - rust-indicatif0.15 ExclusiveArch: %{rust_arches} - rust-indoc ExclusiveArch: %{rust_arches} - rust-infer ExclusiveArch: %{rust_arches} - rust-inferno ExclusiveArch: %{rust_arches} - rust-inflate ExclusiveArch: %{rust_arches} - rust-inotify ExclusiveArch: %{rust_arches} - rust-inotify-sys ExclusiveArch: %{rust_arches} - rust-inout ExclusiveArch: %{rust_arches} - rust-input_buffer ExclusiveArch: %{rust_arches} - rust-insta ExclusiveArch: %{rust_arches} - rust-instant ExclusiveArch: %{rust_arches} - rust-integer-encoding ExclusiveArch: %{rust_arches} - rust-interpolate_name ExclusiveArch: %{rust_arches} - rust-intervaltree ExclusiveArch: %{rust_arches} - rust-intl-memoizer ExclusiveArch: %{rust_arches} - rust-intl_pluralrules ExclusiveArch: %{rust_arches} - rust-invalidstring ExclusiveArch: %{rust_arches} - rust-inventory ExclusiveArch: %{rust_arches} - rust-inventory-impl ExclusiveArch: %{rust_arches} - rust-inventory0.1 ExclusiveArch: %{rust_arches} - rust-io-extras ExclusiveArch: %{rust_arches} - rust-io-lifetimes ExclusiveArch: %{rust_arches} - rust-ioctl-rs ExclusiveArch: %{rust_arches} - rust-iocuddle ExclusiveArch: %{rust_arches} - rust-iovec ExclusiveArch: %{rust_arches} - rust-ipnet ExclusiveArch: %{rust_arches} - rust-ipnetwork ExclusiveArch: %{rust_arches} - rust-ipnetwork0.17 ExclusiveArch: %{rust_arches} - rust-iptables ExclusiveArch: %{rust_arches} - rust-iron ExclusiveArch: %{rust_arches} - rust-is_ci ExclusiveArch: %{rust_arches} - rust-is_debug ExclusiveArch: %{rust_arches} - rust-iso8601 ExclusiveArch: %{rust_arches} - rust-iter-read ExclusiveArch: %{rust_arches} - rust-itertools ExclusiveArch: %{rust_arches} - rust-itertools-num ExclusiveArch: %{rust_arches} - rust-itertools0.8 ExclusiveArch: %{rust_arches} - rust-itertools0.9 ExclusiveArch: %{rust_arches} - rust-itoa ExclusiveArch: %{rust_arches} - rust-itoa0.4 ExclusiveArch: %{rust_arches} - rust-ivf ExclusiveArch: %{rust_arches} - rust-jieba-rs ExclusiveArch: %{rust_arches} - rust-jobserver ExclusiveArch: %{rust_arches} - rust-josekit ExclusiveArch: %{rust_arches} - rust-jpeg-decoder ExclusiveArch: %{rust_arches} - rust-jql ExclusiveArch: %{rust_arches} - rust-js-sys ExclusiveArch: %{rust_arches} - rust-js_int ExclusiveArch: %{rust_arches} - rust-json ExclusiveArch: %{rust_arches} - rust-json_value_merge ExclusiveArch: %{rust_arches} - rust-just ExclusiveArch: %{rust_arches} - rust-jwalk ExclusiveArch: %{rust_arches} - rust-k9 ExclusiveArch: %{rust_arches} - rust-keccak ExclusiveArch: %{rust_arches} - rust-khronos_api ExclusiveArch: %{rust_arches} - rust-kstring ExclusiveArch: %{rust_arches} - rust-kv-log-macro ExclusiveArch: %{rust_arches} - rust-lab ExclusiveArch: %{rust_arches} - rust-lalrpop ExclusiveArch: %{rust_arches} - rust-lalrpop-util ExclusiveArch: %{rust_arches} - rust-language-tags ExclusiveArch: %{rust_arches} - rust-lazy-init ExclusiveArch: %{rust_arches} - rust-lazy_static ExclusiveArch: %{rust_arches} - rust-lazycell ExclusiveArch: %{rust_arches} - rust-leb128 ExclusiveArch: %{rust_arches} - rust-lexical-core ExclusiveArch: %{rust_arches} - rust-lexiclean ExclusiveArch: %{rust_arches} - rust-libblkid-rs ExclusiveArch: %{rust_arches} - rust-libblkid-rs-sys ExclusiveArch: %{rust_arches} - rust-libbpf-cargo ExclusiveArch: %{rust_arches} - rust-libbpf-rs ExclusiveArch: %{rust_arches} - rust-libbpf-sys ExclusiveArch: %{rust_arches} - rust-libc ExclusiveArch: %{rust_arches} - rust-libcryptsetup-rs ExclusiveArch: %{rust_arches} - rust-libcryptsetup-rs-sys ExclusiveArch: %{rust_arches} - rust-libdbus-sys ExclusiveArch: %{rust_arches} - rust-libflate ExclusiveArch: %{rust_arches} - rust-libflate_lz77 ExclusiveArch: %{rust_arches} - rust-libgit2-sys ExclusiveArch: %{rust_arches} - rust-libhandy ExclusiveArch: %{rust_arches} - rust-libhandy-sys ExclusiveArch: %{rust_arches} - rust-libloading ExclusiveArch: %{rust_arches} - rust-libloading0.6 ExclusiveArch: %{rust_arches} - rust-libm ExclusiveArch: %{rust_arches} - rust-libmount ExclusiveArch: %{rust_arches} - rust-libnotcurses-sys ExclusiveArch: %{rust_arches} - rust-liboverdrop ExclusiveArch: %{rust_arches} - rust-libpulse-binding ExclusiveArch: %{rust_arches} - rust-libpulse-sys ExclusiveArch: %{rust_arches} - rust-libseccomp-sys ExclusiveArch: %{rust_arches} - rust-libslirp ExclusiveArch: %{rust_arches} - rust-libslirp-sys ExclusiveArch: %{rust_arches} - rust-libspa ExclusiveArch: %{rust_arches} - rust-libspa-sys ExclusiveArch: %{rust_arches} - rust-libsqlite3-sys ExclusiveArch: %{rust_arches} - rust-libssh2-sys ExclusiveArch: %{rust_arches} - rust-libsystemd ExclusiveArch: %{rust_arches} - rust-libudev ExclusiveArch: %{rust_arches} - rust-libudev-sys ExclusiveArch: %{rust_arches} - rust-libxml ExclusiveArch: %{rust_arches} - rust-libz-sys ExclusiveArch: %{rust_arches} - rust-line-wrap ExclusiveArch: %{rust_arches} - rust-link-cplusplus ExclusiveArch: %{rust_arches} - rust-linked-hash-map ExclusiveArch: %{rust_arches} - rust-linkify ExclusiveArch: %{rust_arches} - rust-linreg ExclusiveArch: %{rust_arches} - rust-linux-raw-sys ExclusiveArch: %{rust_arches} - rust-linux_proc ExclusiveArch: %{rust_arches} - rust-lipsum ExclusiveArch: %{rust_arches} - rust-listenfd ExclusiveArch: %{rust_arches} - rust-lmdb ExclusiveArch: %{rust_arches} - rust-lmdb-sys ExclusiveArch: %{rust_arches} - rust-locale ExclusiveArch: %{rust_arches} - rust-locale_config ExclusiveArch: %{rust_arches} - rust-lock_api ExclusiveArch: %{rust_arches} - rust-lockfree ExclusiveArch: %{rust_arches} - rust-log ExclusiveArch: %{rust_arches} - rust-log-mdc ExclusiveArch: %{rust_arches} - rust-log-panics ExclusiveArch: %{rust_arches} - rust-log0.3 ExclusiveArch: %{rust_arches} - rust-log4rs ExclusiveArch: %{rust_arches} - rust-loggerv ExclusiveArch: %{rust_arches} - rust-loopdev ExclusiveArch: %{rust_arches} - rust-lru-cache ExclusiveArch: %{rust_arches} - rust-lscolors ExclusiveArch: %{rust_arches} - rust-lsd ExclusiveArch: %{rust_arches} - rust-lzma-sys ExclusiveArch: %{rust_arches} - rust-lzw ExclusiveArch: %{rust_arches} - rust-mac ExclusiveArch: %{rust_arches} - rust-mac_address ExclusiveArch: %{rust_arches} - rust-macro-attr ExclusiveArch: %{rust_arches} - rust-madvr_parse ExclusiveArch: %{rust_arches} - rust-maildir ExclusiveArch: %{rust_arches} - rust-mailparse ExclusiveArch: %{rust_arches} - rust-man ExclusiveArch: %{rust_arches} - rust-maplit ExclusiveArch: %{rust_arches} - rust-markup5ever ExclusiveArch: %{rust_arches} - rust-markup5ever_rcdom ExclusiveArch: %{rust_arches} - rust-match_cfg ExclusiveArch: %{rust_arches} - rust-matches ExclusiveArch: %{rust_arches} - rust-matrixcompare ExclusiveArch: %{rust_arches} - rust-matrixcompare-core ExclusiveArch: %{rust_arches} - rust-matrixcompare-mock ExclusiveArch: %{rust_arches} - rust-matrixmultiply ExclusiveArch: %{rust_arches} - rust-maxminddb ExclusiveArch: %{rust_arches} - rust-maybe-owned ExclusiveArch: %{rust_arches} - rust-maybe-uninit ExclusiveArch: %{rust_arches} - rust-mbox ExclusiveArch: %{rust_arches} - rust-mbrman ExclusiveArch: %{rust_arches} - rust-md-5 ExclusiveArch: %{rust_arches} - rust-md-5_0.9 ExclusiveArch: %{rust_arches} - rust-md5 ExclusiveArch: %{rust_arches} - rust-mdl ExclusiveArch: %{rust_arches} - rust-memchr ExclusiveArch: %{rust_arches} - rust-memfd ExclusiveArch: %{rust_arches} - rust-memmap ExclusiveArch: %{rust_arches} - rust-memmap2 ExclusiveArch: %{rust_arches} - rust-memmap2_0.3 ExclusiveArch: %{rust_arches} - rust-memmem ExclusiveArch: %{rust_arches} - rust-memoffset ExclusiveArch: %{rust_arches} - rust-memoffset0.5 ExclusiveArch: %{rust_arches} - rust-memsec ExclusiveArch: %{rust_arches} - rust-micro-timer ExclusiveArch: %{rust_arches} - rust-micro-timer-macros ExclusiveArch: %{rust_arches} - rust-miette ExclusiveArch: %{rust_arches} - rust-miette-derive ExclusiveArch: %{rust_arches} - rust-mime ExclusiveArch: %{rust_arches} - rust-mime0.2 ExclusiveArch: %{rust_arches} - rust-mime_guess ExclusiveArch: %{rust_arches} - rust-mime_guess1 ExclusiveArch: %{rust_arches} - rust-minify-html ExclusiveArch: %{rust_arches} - rust-minimad ExclusiveArch: %{rust_arches} - rust-minimal-lexical ExclusiveArch: %{rust_arches} - rust-miniz-sys ExclusiveArch: %{rust_arches} - rust-miniz_oxide ExclusiveArch: %{rust_arches} - rust-miniz_oxide0.3 ExclusiveArch: %{rust_arches} - rust-miniz_oxide_c_api ExclusiveArch: %{rust_arches} - rust-mint ExclusiveArch: %{rust_arches} - rust-mio ExclusiveArch: %{rust_arches} - rust-mio-extras ExclusiveArch: %{rust_arches} - rust-mio-uds ExclusiveArch: %{rust_arches} - rust-mio0.6 ExclusiveArch: %{rust_arches} - rust-mio0.7 ExclusiveArch: %{rust_arches} - rust-mktemp ExclusiveArch: %{rust_arches} - rust-mnt ExclusiveArch: %{rust_arches} - rust-mockall ExclusiveArch: %{rust_arches} - rust-mockall_derive ExclusiveArch: %{rust_arches} - rust-mockall_double ExclusiveArch: %{rust_arches} - rust-mockito ExclusiveArch: %{rust_arches} - rust-modifier ExclusiveArch: %{rust_arches} - rust-more-asserts ExclusiveArch: %{rust_arches} - rust-muldiv ExclusiveArch: %{rust_arches} - rust-multimap ExclusiveArch: %{rust_arches} - rust-multipart ExclusiveArch: %{rust_arches} - rust-mustache ExclusiveArch: %{rust_arches} - rust-nalgebra ExclusiveArch: %{rust_arches} - rust-nalgebra-macros ExclusiveArch: %{rust_arches} - rust-nasm-rs ExclusiveArch: %{rust_arches} - rust-native-tls ExclusiveArch: %{rust_arches} - rust-natord ExclusiveArch: %{rust_arches} - rust-navi ExclusiveArch: %{rust_arches} - rust-nb-connect ExclusiveArch: %{rust_arches} - rust-ncurses ExclusiveArch: %{rust_arches} - rust-net2 ExclusiveArch: %{rust_arches} - rust-netlink-packet-core ExclusiveArch: %{rust_arches} - rust-netlink-packet-generic ExclusiveArch: %{rust_arches} - rust-netlink-packet-route ExclusiveArch: %{rust_arches} - rust-netlink-packet-utils ExclusiveArch: %{rust_arches} - rust-netlink-proto ExclusiveArch: %{rust_arches} - rust-netlink-sys ExclusiveArch: %{rust_arches} - rust-netmap_sys ExclusiveArch: %{rust_arches} - rust-nettle ExclusiveArch: %{rust_arches} - rust-nettle-sys ExclusiveArch: %{rust_arches} - rust-new_debug_unreachable ExclusiveArch: %{rust_arches} - rust-newtype_derive ExclusiveArch: %{rust_arches} - rust-nibble_vec ExclusiveArch: %{rust_arches} - rust-nix ExclusiveArch: %{rust_arches} - rust-nix0.14 ExclusiveArch: %{rust_arches} - rust-nix0.17 ExclusiveArch: %{rust_arches} - rust-nix0.18 ExclusiveArch: %{rust_arches} - rust-nix0.20 ExclusiveArch: %{rust_arches} - rust-nix0.22 ExclusiveArch: %{rust_arches} - rust-no-panic ExclusiveArch: %{rust_arches} - rust-nodrop ExclusiveArch: %{rust_arches} - rust-nohash-hasher ExclusiveArch: %{rust_arches} - rust-nom ExclusiveArch: %{rust_arches} - rust-nom4 ExclusiveArch: %{rust_arches} - rust-nom5 ExclusiveArch: %{rust_arches} - rust-noop_proc_macro ExclusiveArch: %{rust_arches} - rust-normalize-line-endings ExclusiveArch: %{rust_arches} - rust-notify ExclusiveArch: %{rust_arches} - rust-notify-rust ExclusiveArch: %{rust_arches} - rust-nu-ansi-term ExclusiveArch: %{rust_arches} - rust-nu-engine ExclusiveArch: %{rust_arches} - rust-nu-glob ExclusiveArch: %{rust_arches} - rust-nu-json ExclusiveArch: %{rust_arches} - rust-nu-parser ExclusiveArch: %{rust_arches} - rust-nu-path ExclusiveArch: %{rust_arches} - rust-nu-protocol ExclusiveArch: %{rust_arches} - rust-nu-utils ExclusiveArch: %{rust_arches} - rust-num ExclusiveArch: %{rust_arches} - rust-num-bigint ExclusiveArch: %{rust_arches} - rust-num-bigint-dig ExclusiveArch: %{rust_arches} - rust-num-bigint0.3 ExclusiveArch: %{rust_arches} - rust-num-complex ExclusiveArch: %{rust_arches} - rust-num-complex0.3 ExclusiveArch: %{rust_arches} - rust-num-derive ExclusiveArch: %{rust_arches} - rust-num-format ExclusiveArch: %{rust_arches} - rust-num-integer ExclusiveArch: %{rust_arches} - rust-num-iter ExclusiveArch: %{rust_arches} - rust-num-rational ExclusiveArch: %{rust_arches} - rust-num-rational0.3 ExclusiveArch: %{rust_arches} - rust-num-traits ExclusiveArch: %{rust_arches} - rust-num-traits0.1 ExclusiveArch: %{rust_arches} - rust-num0.3 ExclusiveArch: %{rust_arches} - rust-num_cpus ExclusiveArch: %{rust_arches} - rust-num_enum ExclusiveArch: %{rust_arches} - rust-num_enum_derive ExclusiveArch: %{rust_arches} - rust-number_prefix ExclusiveArch: %{rust_arches} - rust-numtoa ExclusiveArch: %{rust_arches} - rust-oauth2 ExclusiveArch: %{rust_arches} - rust-object ExclusiveArch: %{rust_arches} - rust-odds ExclusiveArch: %{rust_arches} - rust-oid ExclusiveArch: %{rust_arches} - rust-once_cell ExclusiveArch: %{rust_arches} - rust-onig ExclusiveArch: %{rust_arches} - rust-onig_sys ExclusiveArch: %{rust_arches} - rust-oorandom ExclusiveArch: %{rust_arches} - rust-opaque-debug ExclusiveArch: %{rust_arches} - rust-open ExclusiveArch: %{rust_arches} - rust-open1 ExclusiveArch: %{rust_arches} - rust-openat ExclusiveArch: %{rust_arches} - rust-openat-ext ExclusiveArch: %{rust_arches} - rust-opener ExclusiveArch: %{rust_arches} - rust-openssh-keys ExclusiveArch: %{rust_arches} - rust-openssl ExclusiveArch: %{rust_arches} - rust-openssl-probe ExclusiveArch: %{rust_arches} - rust-openssl-sys ExclusiveArch: %{rust_arches} - rust-option-operations ExclusiveArch: %{rust_arches} - rust-ord_subset ExclusiveArch: %{rust_arches} - rust-ordered-float ExclusiveArch: %{rust_arches} - rust-ordered-multimap ExclusiveArch: %{rust_arches} - rust-os-release ExclusiveArch: %{rust_arches} - rust-os_info ExclusiveArch: %{rust_arches} - rust-os_pipe ExclusiveArch: %{rust_arches} - rust-os_pipe0.9 ExclusiveArch: %{rust_arches} - rust-os_str_bytes ExclusiveArch: %{rust_arches} - rust-os_type ExclusiveArch: %{rust_arches} - rust-osmesa-sys ExclusiveArch: %{rust_arches} - rust-osstrtools ExclusiveArch: %{rust_arches} - rust-ouroboros ExclusiveArch: %{rust_arches} - rust-ouroboros_macro ExclusiveArch: %{rust_arches} - rust-overload ExclusiveArch: %{rust_arches} - rust-owned-alloc ExclusiveArch: %{rust_arches} - rust-owning_ref ExclusiveArch: %{rust_arches} - rust-owo-colors ExclusiveArch: %{rust_arches} - rust-packaging ExclusiveArch: %{rust_arches} - rust-pad ExclusiveArch: %{rust_arches} - rust-page_size ExclusiveArch: %{rust_arches} - rust-pager ExclusiveArch: %{rust_arches} - rust-palette ExclusiveArch: %{rust_arches} - rust-palette_derive ExclusiveArch: %{rust_arches} - rust-pam ExclusiveArch: %{rust_arches} - rust-pam-sys ExclusiveArch: %{rust_arches} - rust-pancurses ExclusiveArch: %{rust_arches} - rust-pango ExclusiveArch: %{rust_arches} - rust-pango-sys ExclusiveArch: %{rust_arches} - rust-pangocairo ExclusiveArch: %{rust_arches} - rust-pangocairo-sys ExclusiveArch: %{rust_arches} - rust-paris ExclusiveArch: %{rust_arches} - rust-parity-wasm ExclusiveArch: %{rust_arches} - rust-parking ExclusiveArch: %{rust_arches} - rust-parking_lot ExclusiveArch: %{rust_arches} - rust-parking_lot0.11 ExclusiveArch: %{rust_arches} - rust-parking_lot_core ExclusiveArch: %{rust_arches} - rust-parking_lot_core0.8 ExclusiveArch: %{rust_arches} - rust-parse-zoneinfo ExclusiveArch: %{rust_arches} - rust-parse_cfg ExclusiveArch: %{rust_arches} - rust-parsec-client ExclusiveArch: %{rust_arches} - rust-parsec-interface ExclusiveArch: %{rust_arches} - rust-partial-io ExclusiveArch: %{rust_arches} - rust-partition-identity ExclusiveArch: %{rust_arches} - rust-password-hash ExclusiveArch: %{rust_arches} - rust-paste ExclusiveArch: %{rust_arches} - rust-path-absolutize ExclusiveArch: %{rust_arches} - rust-path-dedot ExclusiveArch: %{rust_arches} - rust-path-slash ExclusiveArch: %{rust_arches} - rust-pathdiff ExclusiveArch: %{rust_arches} - rust-pathfinder_geometry ExclusiveArch: %{rust_arches} - rust-pathfinder_simd ExclusiveArch: %{rust_arches} - rust-pbkdf2 ExclusiveArch: %{rust_arches} - rust-pbr ExclusiveArch: %{rust_arches} - rust-pcap ExclusiveArch: %{rust_arches} - rust-pcre2 ExclusiveArch: %{rust_arches} - rust-pcre2-sys ExclusiveArch: %{rust_arches} - rust-peeking_take_while ExclusiveArch: %{rust_arches} - rust-peg ExclusiveArch: %{rust_arches} - rust-peg-macros ExclusiveArch: %{rust_arches} - rust-peg-runtime ExclusiveArch: %{rust_arches} - rust-peg0.5 ExclusiveArch: %{rust_arches} - rust-pem ExclusiveArch: %{rust_arches} - rust-pem-rfc7468 ExclusiveArch: %{rust_arches} - rust-pem0.8 ExclusiveArch: %{rust_arches} - rust-percent-encoding ExclusiveArch: %{rust_arches} - rust-percent-encoding1 ExclusiveArch: %{rust_arches} - rust-peresil ExclusiveArch: %{rust_arches} - rust-permutate ExclusiveArch: %{rust_arches} - rust-permutohedron ExclusiveArch: %{rust_arches} - rust-pest ExclusiveArch: %{rust_arches} - rust-pest_derive ExclusiveArch: %{rust_arches} - rust-pest_generator ExclusiveArch: %{rust_arches} - rust-pest_meta ExclusiveArch: %{rust_arches} - rust-petgraph ExclusiveArch: %{rust_arches} - rust-phf ExclusiveArch: %{rust_arches} - rust-phf0.7 ExclusiveArch: %{rust_arches} - rust-phf0.8 ExclusiveArch: %{rust_arches} - rust-phf_codegen ExclusiveArch: %{rust_arches} - rust-phf_codegen0.7 ExclusiveArch: %{rust_arches} - rust-phf_generator ExclusiveArch: %{rust_arches} - rust-phf_generator0.7 ExclusiveArch: %{rust_arches} - rust-phf_generator0.8 ExclusiveArch: %{rust_arches} - rust-phf_macros ExclusiveArch: %{rust_arches} - rust-phf_macros0.7 ExclusiveArch: %{rust_arches} - rust-phf_macros0.8 ExclusiveArch: %{rust_arches} - rust-phf_shared ExclusiveArch: %{rust_arches} - rust-phf_shared0.7 ExclusiveArch: %{rust_arches} - rust-phf_shared0.8 ExclusiveArch: %{rust_arches} - rust-picky-asn1 ExclusiveArch: %{rust_arches} - rust-picky-asn1-der ExclusiveArch: %{rust_arches} - rust-picky-asn1-x509 ExclusiveArch: %{rust_arches} - rust-pico-args ExclusiveArch: %{rust_arches} - rust-pid ExclusiveArch: %{rust_arches} - rust-pin-project ExclusiveArch: %{rust_arches} - rust-pin-project-internal ExclusiveArch: %{rust_arches} - rust-pin-project-internal0.4 ExclusiveArch: %{rust_arches} - rust-pin-project-lite ExclusiveArch: %{rust_arches} - rust-pin-project-lite0.1 ExclusiveArch: %{rust_arches} - rust-pin-project0.4 ExclusiveArch: %{rust_arches} - rust-pin-utils ExclusiveArch: %{rust_arches} - rust-pipe ExclusiveArch: %{rust_arches} - rust-piper ExclusiveArch: %{rust_arches} - rust-pipewire ExclusiveArch: %{rust_arches} - rust-pipewire-sys ExclusiveArch: %{rust_arches} - rust-pkcs1 ExclusiveArch: %{rust_arches} - rust-pkcs11 ExclusiveArch: %{rust_arches} - rust-pkcs5 ExclusiveArch: %{rust_arches} - rust-pkcs8 ExclusiveArch: %{rust_arches} - rust-pkg-config ExclusiveArch: %{rust_arches} - rust-plain ExclusiveArch: %{rust_arches} - rust-pleaser ExclusiveArch: %{rust_arches} - rust-plist ExclusiveArch: %{rust_arches} - rust-plotlib ExclusiveArch: %{rust_arches} - rust-plotters ExclusiveArch: %{rust_arches} - rust-plotters-backend ExclusiveArch: %{rust_arches} - rust-plotters-bitmap ExclusiveArch: %{rust_arches} - rust-plotters-svg ExclusiveArch: %{rust_arches} - rust-plugin ExclusiveArch: %{rust_arches} - rust-pnet_base ExclusiveArch: %{rust_arches} - rust-pnet_datalink ExclusiveArch: %{rust_arches} - rust-pnet_sys ExclusiveArch: %{rust_arches} - rust-png ExclusiveArch: %{rust_arches} - rust-png0.16 ExclusiveArch: %{rust_arches} - rust-podio ExclusiveArch: %{rust_arches} - rust-polling ExclusiveArch: %{rust_arches} - rust-polyval ExclusiveArch: %{rust_arches} - rust-pom ExclusiveArch: %{rust_arches} - rust-pommes ExclusiveArch: %{rust_arches} - rust-ppv-lite86 ExclusiveArch: %{rust_arches} - rust-pq-sys ExclusiveArch: %{rust_arches} - rust-precomputed-hash ExclusiveArch: %{rust_arches} - rust-predicates ExclusiveArch: %{rust_arches} - rust-predicates-core ExclusiveArch: %{rust_arches} - rust-predicates-tree ExclusiveArch: %{rust_arches} - rust-predicates1 ExclusiveArch: %{rust_arches} - rust-pretty ExclusiveArch: %{rust_arches} - rust-pretty-git-prompt ExclusiveArch: %{rust_arches} - rust-pretty-hex ExclusiveArch: %{rust_arches} - rust-pretty_assertions ExclusiveArch: %{rust_arches} - rust-pretty_assertions0.6 ExclusiveArch: %{rust_arches} - rust-pretty_assertions0.7 ExclusiveArch: %{rust_arches} - rust-pretty_env_logger ExclusiveArch: %{rust_arches} - rust-prettytable-rs ExclusiveArch: %{rust_arches} - rust-proc-macro-crate ExclusiveArch: %{rust_arches} - rust-proc-macro-crate0.1 ExclusiveArch: %{rust_arches} - rust-proc-macro-error ExclusiveArch: %{rust_arches} - rust-proc-macro-error-attr ExclusiveArch: %{rust_arches} - rust-proc-macro-hack ExclusiveArch: %{rust_arches} - rust-proc-macro2 ExclusiveArch: %{rust_arches} - rust-proc-macro2-0.4 ExclusiveArch: %{rust_arches} - rust-proc-maps ExclusiveArch: %{rust_arches} - rust-proc-mounts ExclusiveArch: %{rust_arches} - rust-proc-quote-impl ExclusiveArch: %{rust_arches} - rust-procedural-masquerade ExclusiveArch: %{rust_arches} - rust-process_control ExclusiveArch: %{rust_arches} - rust-process_path ExclusiveArch: %{rust_arches} - rust-procfs ExclusiveArch: %{rust_arches} - rust-procs ExclusiveArch: %{rust_arches} - rust-progress-streams ExclusiveArch: %{rust_arches} - rust-prometheus ExclusiveArch: %{rust_arches} - rust-proptest ExclusiveArch: %{rust_arches} - rust-proptest-derive ExclusiveArch: %{rust_arches} - rust-proptest0.10 ExclusiveArch: %{rust_arches} - rust-prost ExclusiveArch: %{rust_arches} - rust-prost-build ExclusiveArch: %{rust_arches} - rust-prost-derive ExclusiveArch: %{rust_arches} - rust-prost-types ExclusiveArch: %{rust_arches} - rust-protobuf ExclusiveArch: %{rust_arches} - rust-protobuf-codegen ExclusiveArch: %{rust_arches} - rust-protobuf-codegen-pure ExclusiveArch: %{rust_arches} - rust-protoc ExclusiveArch: %{rust_arches} - rust-protoc-rust ExclusiveArch: %{rust_arches} - rust-psa-crypto ExclusiveArch: %{rust_arches} - rust-psa-crypto-sys ExclusiveArch: %{rust_arches} - rust-psl-types ExclusiveArch: %{rust_arches} - rust-psm ExclusiveArch: %{rust_arches} - rust-ptr_meta ExclusiveArch: %{rust_arches} - rust-ptr_meta_derive ExclusiveArch: %{rust_arches} - rust-publicsuffix ExclusiveArch: %{rust_arches} - rust-publicsuffix1 ExclusiveArch: %{rust_arches} - rust-pulldown-cmark ExclusiveArch: %{rust_arches} - rust-pulse ExclusiveArch: %{rust_arches} - rust-pure-rust-locales ExclusiveArch: %{rust_arches} - rust-pyo3 ExclusiveArch: %{rust_arches} - rust-pyo3-build-config ExclusiveArch: %{rust_arches} - rust-pyo3-macros ExclusiveArch: %{rust_arches} - rust-pyo3-macros-backend ExclusiveArch: %{rust_arches} - rust-python-launcher ExclusiveArch: %{rust_arches} - rust-python3-sys ExclusiveArch: %{rust_arches} - rust-qr2term ExclusiveArch: %{rust_arches} - rust-qrcode ExclusiveArch: %{rust_arches} - rust-qstring ExclusiveArch: %{rust_arches} - rust-quantiles ExclusiveArch: %{rust_arches} - rust-quick-error ExclusiveArch: %{rust_arches} - rust-quick-error1 ExclusiveArch: %{rust_arches} - rust-quick-xml ExclusiveArch: %{rust_arches} - rust-quickcheck ExclusiveArch: %{rust_arches} - rust-quickcheck0.6 ExclusiveArch: %{rust_arches} - rust-quickcheck0.9 ExclusiveArch: %{rust_arches} - rust-quickcheck_macros ExclusiveArch: %{rust_arches} - rust-quickersort ExclusiveArch: %{rust_arches} - rust-quicli ExclusiveArch: %{rust_arches} - rust-quote ExclusiveArch: %{rust_arches} - rust-quote0.3 ExclusiveArch: %{rust_arches} - rust-quote0.6 ExclusiveArch: %{rust_arches} - rust-quoted_printable ExclusiveArch: %{rust_arches} - rust-r2d2 ExclusiveArch: %{rust_arches} - rust-radium ExclusiveArch: %{rust_arches} - rust-radix_trie ExclusiveArch: %{rust_arches} - rust-rand ExclusiveArch: %{rust_arches} - rust-rand0.4 ExclusiveArch: %{rust_arches} - rust-rand0.5 ExclusiveArch: %{rust_arches} - rust-rand0.6 ExclusiveArch: %{rust_arches} - rust-rand0.7 ExclusiveArch: %{rust_arches} - rust-rand_chacha ExclusiveArch: %{rust_arches} - rust-rand_chacha0.1 ExclusiveArch: %{rust_arches} - rust-rand_chacha0.2 ExclusiveArch: %{rust_arches} - rust-rand_core ExclusiveArch: %{rust_arches} - rust-rand_core0.3 ExclusiveArch: %{rust_arches} - rust-rand_core0.4 ExclusiveArch: %{rust_arches} - rust-rand_core0.5 ExclusiveArch: %{rust_arches} - rust-rand_distr ExclusiveArch: %{rust_arches} - rust-rand_hc ExclusiveArch: %{rust_arches} - rust-rand_hc0.1 ExclusiveArch: %{rust_arches} - rust-rand_isaac ExclusiveArch: %{rust_arches} - rust-rand_isaac0.1 ExclusiveArch: %{rust_arches} - rust-rand_jitter ExclusiveArch: %{rust_arches} - rust-rand_jitter0.1 ExclusiveArch: %{rust_arches} - rust-rand_os ExclusiveArch: %{rust_arches} - rust-rand_os0.1 ExclusiveArch: %{rust_arches} - rust-rand_pcg ExclusiveArch: %{rust_arches} - rust-rand_pcg0.1 ExclusiveArch: %{rust_arches} - rust-rand_pcg0.2 ExclusiveArch: %{rust_arches} - rust-rand_xorshift ExclusiveArch: %{rust_arches} - rust-rand_xorshift0.1 ExclusiveArch: %{rust_arches} - rust-rand_xorshift0.2 ExclusiveArch: %{rust_arches} - rust-rand_xoshiro ExclusiveArch: %{rust_arches} - rust-random ExclusiveArch: %{rust_arches} - rust-random-fast-rng ExclusiveArch: %{rust_arches} - rust-random-trait ExclusiveArch: %{rust_arches} - rust-randomize ExclusiveArch: %{rust_arches} - rust-rav1e ExclusiveArch: %{rust_arches} - rust-raw-window-handle ExclusiveArch: %{rust_arches} - rust-rawpointer ExclusiveArch: %{rust_arches} - rust-rawslice ExclusiveArch: %{rust_arches} - rust-rayon ExclusiveArch: %{rust_arches} - rust-rayon-core ExclusiveArch: %{rust_arches} - rust-rbspy ExclusiveArch: %{rust_arches} - rust-rbspy-ruby-structs ExclusiveArch: %{rust_arches} - rust-rbspy-testdata ExclusiveArch: %{rust_arches} - rust-rd-agent ExclusiveArch: %{rust_arches} - rust-rd-agent-intf ExclusiveArch: %{rust_arches} - rust-rd-hashd ExclusiveArch: %{rust_arches} - rust-rd-hashd-intf ExclusiveArch: %{rust_arches} - rust-rd-util ExclusiveArch: %{rust_arches} - rust-read-process-memory ExclusiveArch: %{rust_arches} - rust-read_input ExclusiveArch: %{rust_arches} - rust-readability-fork ExclusiveArch: %{rust_arches} - rust-readwrite ExclusiveArch: %{rust_arches} - rust-recycler ExclusiveArch: %{rust_arches} - rust-ref-cast ExclusiveArch: %{rust_arches} - rust-ref-cast-impl ExclusiveArch: %{rust_arches} - rust-regalloc ExclusiveArch: %{rust_arches} - rust-regex ExclusiveArch: %{rust_arches} - rust-regex-automata ExclusiveArch: %{rust_arches} - rust-regex-syntax ExclusiveArch: %{rust_arches} - rust-region ExclusiveArch: %{rust_arches} - rust-relative-path ExclusiveArch: %{rust_arches} - rust-relay ExclusiveArch: %{rust_arches} - rust-remoteprocess ExclusiveArch: %{rust_arches} - rust-remove_dir_all ExclusiveArch: %{rust_arches} - rust-rend ExclusiveArch: %{rust_arches} - rust-reqwest ExclusiveArch: %{rust_arches} - rust-reqwest0.10 ExclusiveArch: %{rust_arches} - rust-resctl-bench ExclusiveArch: %{rust_arches} - rust-resctl-bench-intf ExclusiveArch: %{rust_arches} - rust-resctl-demo ExclusiveArch: %{rust_arches} - rust-resize ExclusiveArch: %{rust_arches} - rust-resolv-conf ExclusiveArch: %{rust_arches} - rust-restson ExclusiveArch: %{rust_arches} - rust-retry ExclusiveArch: %{rust_arches} - rust-rgb ExclusiveArch: %{rust_arches} - rust-ring ExclusiveArch: %{rust_arches} - rust-ripgrep ExclusiveArch: %{rust_arches} - rust-rkyv ExclusiveArch: %{rust_arches} - rust-rkyv_derive ExclusiveArch: %{rust_arches} - rust-rle-decode-fast ExclusiveArch: %{rust_arches} - rust-rmp ExclusiveArch: %{rust_arches} - rust-rmp-serde ExclusiveArch: %{rust_arches} - rust-roff ExclusiveArch: %{rust_arches} - rust-ron ExclusiveArch: %{rust_arches} - rust-roxmltree ExclusiveArch: %{rust_arches} - rust-rpassword ExclusiveArch: %{rust_arches} - rust-rpick ExclusiveArch: %{rust_arches} - rust-rsa ExclusiveArch: %{rust_arches} - rust-rspec ExclusiveArch: %{rust_arches} - rust-rtnetlink ExclusiveArch: %{rust_arches} - rust-rusqlite ExclusiveArch: %{rust_arches} - rust-rust-embed ExclusiveArch: %{rust_arches} - rust-rust-embed-impl ExclusiveArch: %{rust_arches} - rust-rust-embed-utils ExclusiveArch: %{rust_arches} - rust-rust-ini ExclusiveArch: %{rust_arches} - rust-rust-stemmers ExclusiveArch: %{rust_arches} - rust-rust_decimal ExclusiveArch: %{rust_arches} - rust-rust_hawktracer ExclusiveArch: %{rust_arches} - rust-rust_hawktracer_normal_macro ExclusiveArch: %{rust_arches} - rust-rust_hawktracer_proc_macro ExclusiveArch: %{rust_arches} - rust-rust_hawktracer_sys ExclusiveArch: %{rust_arches} - rust-rustbus ExclusiveArch: %{rust_arches} - rust-rustbus_derive ExclusiveArch: %{rust_arches} - rust-rustc-demangle ExclusiveArch: %{rust_arches} - rust-rustc-hash ExclusiveArch: %{rust_arches} - rust-rustc-serialize ExclusiveArch: %{rust_arches} - rust-rustc-test ExclusiveArch: %{rust_arches} - rust-rustc_tools_util ExclusiveArch: %{rust_arches} - rust-rustc_version ExclusiveArch: %{rust_arches} - rust-rustc_version0.3 ExclusiveArch: %{rust_arches} - rust-rustcat ExclusiveArch: %{rust_arches} - rust-rustdoc-stripper ExclusiveArch: %{rust_arches} - rust-rustfilt ExclusiveArch: %{rust_arches} - rust-rustfix ExclusiveArch: %{rust_arches} - rust-rustio ExclusiveArch: %{rust_arches} - rust-rustix ExclusiveArch: %{rust_arches} - rust-rustls ExclusiveArch: %{rust_arches} - rust-rustls-native-certs ExclusiveArch: %{rust_arches} - rust-rustls-pemfile ExclusiveArch: %{rust_arches} - rust-rustversion ExclusiveArch: %{rust_arches} - rust-rusty-fork ExclusiveArch: %{rust_arches} - rust-rustyline ExclusiveArch: %{rust_arches} - rust-rustyline-derive ExclusiveArch: %{rust_arches} - rust-ryu ExclusiveArch: %{rust_arches} - rust-safe-transmute ExclusiveArch: %{rust_arches} - rust-safe_arch ExclusiveArch: %{rust_arches} - rust-safemem ExclusiveArch: %{rust_arches} - rust-salsa20 ExclusiveArch: %{rust_arches} - rust-same-file ExclusiveArch: %{rust_arches} - rust-sass-rs ExclusiveArch: %{rust_arches} - rust-sass-sys ExclusiveArch: %{rust_arches} - rust-scan_fmt ExclusiveArch: %{rust_arches} - rust-scheduled-thread-pool ExclusiveArch: %{rust_arches} - rust-scoped-tls ExclusiveArch: %{rust_arches} - rust-scoped-tls-hkt ExclusiveArch: %{rust_arches} - rust-scoped_threadpool ExclusiveArch: %{rust_arches} - rust-scopeguard ExclusiveArch: %{rust_arches} - rust-scopetime ExclusiveArch: %{rust_arches} - rust-scratch ExclusiveArch: %{rust_arches} - rust-scroll ExclusiveArch: %{rust_arches} - rust-scroll_derive ExclusiveArch: %{rust_arches} - rust-scrypt ExclusiveArch: %{rust_arches} - rust-sct ExclusiveArch: %{rust_arches} - rust-sd ExclusiveArch: %{rust_arches} - rust-sd-notify ExclusiveArch: %{rust_arches} - rust-seahash ExclusiveArch: %{rust_arches} - rust-seahash3 ExclusiveArch: %{rust_arches} - rust-secrecy ExclusiveArch: %{rust_arches} - rust-secret-service ExclusiveArch: %{rust_arches} - rust-self_cell ExclusiveArch: %{rust_arches} - rust-semver ExclusiveArch: %{rust_arches} - rust-semver-parser ExclusiveArch: %{rust_arches} - rust-semver-parser0.9 ExclusiveArch: %{rust_arches} - rust-semver0.11 ExclusiveArch: %{rust_arches} - rust-sequoia-autocrypt ExclusiveArch: %{rust_arches} - rust-sequoia-ipc ExclusiveArch: %{rust_arches} - rust-sequoia-keyring-linter ExclusiveArch: %{rust_arches} - rust-sequoia-net ExclusiveArch: %{rust_arches} - rust-sequoia-octopus-librnp ExclusiveArch: %{rust_arches} - rust-sequoia-openpgp ExclusiveArch: %{rust_arches} - rust-sequoia-openpgp-mt ExclusiveArch: %{rust_arches} - rust-sequoia-sop ExclusiveArch: %{rust_arches} - rust-sequoia-sq ExclusiveArch: %{rust_arches} - rust-sequoia-sqv ExclusiveArch: %{rust_arches} - rust-serde ExclusiveArch: %{rust_arches} - rust-serde-big-array ExclusiveArch: %{rust_arches} - rust-serde-pickle ExclusiveArch: %{rust_arches} - rust-serde-value ExclusiveArch: %{rust_arches} - rust-serde-xml-rs ExclusiveArch: %{rust_arches} - rust-serde_bser ExclusiveArch: %{rust_arches} - rust-serde_bytes ExclusiveArch: %{rust_arches} - rust-serde_cbor ExclusiveArch: %{rust_arches} - rust-serde_derive ExclusiveArch: %{rust_arches} - rust-serde_fmt ExclusiveArch: %{rust_arches} - rust-serde_ignored ExclusiveArch: %{rust_arches} - rust-serde_json ExclusiveArch: %{rust_arches} - rust-serde_repr ExclusiveArch: %{rust_arches} - rust-serde_stacker ExclusiveArch: %{rust_arches} - rust-serde_test ExclusiveArch: %{rust_arches} - rust-serde_url_params ExclusiveArch: %{rust_arches} - rust-serde_urlencoded ExclusiveArch: %{rust_arches} - rust-serde_with ExclusiveArch: %{rust_arches} - rust-serde_with_macros ExclusiveArch: %{rust_arches} - rust-serde_yaml ExclusiveArch: %{rust_arches} - rust-serial-core ExclusiveArch: %{rust_arches} - rust-serial_test ExclusiveArch: %{rust_arches} - rust-serial_test0.5 ExclusiveArch: %{rust_arches} - rust-serial_test_derive ExclusiveArch: %{rust_arches} - rust-serial_test_derive0.5 ExclusiveArch: %{rust_arches} - rust-servo-fontconfig ExclusiveArch: %{rust_arches} - rust-servo-fontconfig-sys ExclusiveArch: %{rust_arches} - rust-sev ExclusiveArch: %{rust_arches} - rust-sevctl ExclusiveArch: x86_64 - rust-sha-1 ExclusiveArch: %{rust_arches} - rust-sha-1_0.9 ExclusiveArch: %{rust_arches} - rust-sha1 ExclusiveArch: %{rust_arches} - rust-sha1_0.6 ExclusiveArch: %{rust_arches} - rust-sha1_smol ExclusiveArch: %{rust_arches} - rust-sha1collisiondetection ExclusiveArch: %{rust_arches} - rust-sha2 ExclusiveArch: %{rust_arches} - rust-sha2_0.9 ExclusiveArch: %{rust_arches} - rust-sha3 ExclusiveArch: %{rust_arches} - rust-sha3_0.9 ExclusiveArch: %{rust_arches} - rust-shadow-rs ExclusiveArch: %{rust_arches} - rust-shared_child ExclusiveArch: %{rust_arches} - rust-shared_library ExclusiveArch: %{rust_arches} - rust-shell-escape ExclusiveArch: %{rust_arches} - rust-shell-words ExclusiveArch: %{rust_arches} - rust-shellexpand ExclusiveArch: %{rust_arches} - rust-shellwords ExclusiveArch: %{rust_arches} - rust-shlex ExclusiveArch: %{rust_arches} - rust-signal ExclusiveArch: %{rust_arches} - rust-signal-hook ExclusiveArch: %{rust_arches} - rust-signal-hook-mio ExclusiveArch: %{rust_arches} - rust-signal-hook-registry ExclusiveArch: %{rust_arches} - rust-signal-hook0.1 ExclusiveArch: %{rust_arches} - rust-silver ExclusiveArch: %{rust_arches} - rust-simba ExclusiveArch: %{rust_arches} - rust-simd_helpers ExclusiveArch: %{rust_arches} - rust-simdutf8 ExclusiveArch: %{rust_arches} - rust-similar ExclusiveArch: %{rust_arches} - rust-similar-asserts ExclusiveArch: %{rust_arches} - rust-simple-error ExclusiveArch: %{rust_arches} - rust-simple_asn1 ExclusiveArch: %{rust_arches} - rust-simple_logger ExclusiveArch: %{rust_arches} - rust-simplelog ExclusiveArch: %{rust_arches} - rust-siphasher ExclusiveArch: %{rust_arches} - rust-size ExclusiveArch: %{rust_arches} - rust-sized-chunks ExclusiveArch: %{rust_arches} - rust-skeptic ExclusiveArch: %{rust_arches} - rust-skim ExclusiveArch: %{rust_arches} - rust-slab ExclusiveArch: %{rust_arches} - rust-slice-deque ExclusiveArch: %{rust_arches} - rust-slog ExclusiveArch: %{rust_arches} - rust-slog-async ExclusiveArch: %{rust_arches} - rust-slog-scope ExclusiveArch: %{rust_arches} - rust-slog-term ExclusiveArch: %{rust_arches} - rust-slotmap ExclusiveArch: %{rust_arches} - rust-slug ExclusiveArch: %{rust_arches} - rust-sluice ExclusiveArch: %{rust_arches} - rust-smallbitvec ExclusiveArch: %{rust_arches} - rust-smallstr ExclusiveArch: %{rust_arches} - rust-smallvec ExclusiveArch: %{rust_arches} - rust-smart-default ExclusiveArch: %{rust_arches} - rust-smawk ExclusiveArch: %{rust_arches} - rust-smithay-client-toolkit ExclusiveArch: %{rust_arches} - rust-smithay-clipboard ExclusiveArch: %{rust_arches} - rust-smol_str ExclusiveArch: %{rust_arches} - rust-snafu ExclusiveArch: %{rust_arches} - rust-snafu-derive ExclusiveArch: %{rust_arches} - rust-snake_case ExclusiveArch: %{rust_arches} - rust-socket2 ExclusiveArch: %{rust_arches} - rust-socket2_0.3 ExclusiveArch: %{rust_arches} - rust-sop ExclusiveArch: %{rust_arches} - rust-spin ExclusiveArch: %{rust_arches} - rust-spin0.5 ExclusiveArch: %{rust_arches} - rust-spin_on ExclusiveArch: %{rust_arches} - rust-spinning_top ExclusiveArch: %{rust_arches} - rust-spki ExclusiveArch: %{rust_arches} - rust-spmc ExclusiveArch: %{rust_arches} - rust-ssh-key-dir ExclusiveArch: %{rust_arches} - rust-stable_deref_trait ExclusiveArch: %{rust_arches} - rust-stacker ExclusiveArch: %{rust_arches} - rust-standback ExclusiveArch: %{rust_arches} - rust-starship ExclusiveArch: %{rust_arches} - rust-starship-battery ExclusiveArch: %{rust_arches} - rust-starship_module_config_derive ExclusiveArch: %{rust_arches} - rust-static_assertions ExclusiveArch: %{rust_arches} - rust-statistical ExclusiveArch: %{rust_arches} - rust-statrs ExclusiveArch: %{rust_arches} - rust-stb_truetype ExclusiveArch: %{rust_arches} - rust-stderrlog ExclusiveArch: %{rust_arches} - rust-str_stack ExclusiveArch: %{rust_arches} - rust-stratisd_proc_macros ExclusiveArch: %{rust_arches} - rust-streaming-stats ExclusiveArch: %{rust_arches} - rust-streebog ExclusiveArch: %{rust_arches} - rust-streebog0.9 ExclusiveArch: %{rust_arches} - rust-strict ExclusiveArch: %{rust_arches} - rust-string ExclusiveArch: %{rust_arches} - rust-string_cache ExclusiveArch: %{rust_arches} - rust-string_cache_codegen ExclusiveArch: %{rust_arches} - rust-string_cache_shared ExclusiveArch: %{rust_arches} - rust-strings ExclusiveArch: %{rust_arches} - rust-strip-ansi-escapes ExclusiveArch: %{rust_arches} - rust-strsim ExclusiveArch: %{rust_arches} - rust-structopt ExclusiveArch: %{rust_arches} - rust-structopt-derive ExclusiveArch: %{rust_arches} - rust-structopt-derive0.2 ExclusiveArch: %{rust_arches} - rust-structopt0.2 ExclusiveArch: %{rust_arches} - rust-strum ExclusiveArch: %{rust_arches} - rust-strum_macros ExclusiveArch: %{rust_arches} - rust-subprocess ExclusiveArch: %{rust_arches} - rust-subtle ExclusiveArch: %{rust_arches} - rust-sudo_plugin ExclusiveArch: %{rust_arches} - rust-sudo_plugin-sys ExclusiveArch: %{rust_arches} - rust-supports-color ExclusiveArch: %{rust_arches} - rust-supports-hyperlinks ExclusiveArch: %{rust_arches} - rust-supports-unicode ExclusiveArch: %{rust_arches} - rust-sval ExclusiveArch: %{rust_arches} - rust-sval_derive ExclusiveArch: %{rust_arches} - rust-sval_json ExclusiveArch: %{rust_arches} - rust-svg ExclusiveArch: %{rust_arches} - rust-svg_metadata ExclusiveArch: %{rust_arches} - rust-svgtypes ExclusiveArch: %{rust_arches} - rust-sxd-document ExclusiveArch: %{rust_arches} - rust-syn ExclusiveArch: %{rust_arches} - rust-syn0.15 ExclusiveArch: %{rust_arches} - rust-synom ExclusiveArch: %{rust_arches} - rust-synstructure ExclusiveArch: %{rust_arches} - rust-syntect ExclusiveArch: %{rust_arches} - rust-sys-info ExclusiveArch: %{rust_arches} - rust-sys-locale ExclusiveArch: %{rust_arches} - rust-sysctl ExclusiveArch: %{rust_arches} - rust-sysinfo ExclusiveArch: %{rust_arches} - rust-syslog ExclusiveArch: %{rust_arches} - rust-system-deps ExclusiveArch: %{rust_arches} - rust-system-interface ExclusiveArch: %{rust_arches} - rust-system76_ectool ExclusiveArch: %{rust_arches} - rust-tabular ExclusiveArch: %{rust_arches} - rust-tabwriter ExclusiveArch: %{rust_arches} - rust-take ExclusiveArch: %{rust_arches} - rust-take_mut ExclusiveArch: %{rust_arches} - rust-tap ExclusiveArch: %{rust_arches} - rust-tar ExclusiveArch: %{rust_arches} - rust-target ExclusiveArch: %{rust_arches} - rust-target-lexicon ExclusiveArch: %{rust_arches} - rust-tealdeer ExclusiveArch: %{rust_arches} - rust-teloxide ExclusiveArch: %{rust_arches} - rust-teloxide-macros ExclusiveArch: %{rust_arches} - rust-tempdir ExclusiveArch: %{rust_arches} - rust-tempfile ExclusiveArch: %{rust_arches} - rust-temporary ExclusiveArch: %{rust_arches} - rust-temptree ExclusiveArch: %{rust_arches} - rust-tendril ExclusiveArch: %{rust_arches} - rust-tera ExclusiveArch: %{rust_arches} - rust-term ExclusiveArch: %{rust_arches} - rust-term0.6 ExclusiveArch: %{rust_arches} - rust-term_grid ExclusiveArch: %{rust_arches} - rust-term_size ExclusiveArch: %{rust_arches} - rust-termbg ExclusiveArch: %{rust_arches} - rust-termcolor ExclusiveArch: %{rust_arches} - rust-terminal_size ExclusiveArch: %{rust_arches} - rust-terminfo ExclusiveArch: %{rust_arches} - rust-termion ExclusiveArch: %{rust_arches} - rust-termios ExclusiveArch: %{rust_arches} - rust-termwiz ExclusiveArch: %{rust_arches} - rust-test-assembler ExclusiveArch: %{rust_arches} - rust-test-case ExclusiveArch: %{rust_arches} - rust-tester ExclusiveArch: %{rust_arches} - rust-testing_logger ExclusiveArch: %{rust_arches} - rust-textwrap ExclusiveArch: %{rust_arches} - rust-textwrap0.11 ExclusiveArch: %{rust_arches} - rust-textwrap0.14 ExclusiveArch: %{rust_arches} - rust-thiserror ExclusiveArch: %{rust_arches} - rust-thiserror-impl ExclusiveArch: %{rust_arches} - rust-thread-id ExclusiveArch: %{rust_arches} - rust-thread-tree ExclusiveArch: %{rust_arches} - rust-thread_local ExclusiveArch: %{rust_arches} - rust-threadpool ExclusiveArch: %{rust_arches} - rust-tiff ExclusiveArch: %{rust_arches} - rust-tiger ExclusiveArch: %{rust_arches} - rust-time ExclusiveArch: %{rust_arches} - rust-time-macros ExclusiveArch: %{rust_arches} - rust-time-macros-impl ExclusiveArch: %{rust_arches} - rust-time-macros0.1 ExclusiveArch: %{rust_arches} - rust-time0.1 ExclusiveArch: %{rust_arches} - rust-time0.2 ExclusiveArch: %{rust_arches} - rust-timebomb ExclusiveArch: %{rust_arches} - rust-timer ExclusiveArch: %{rust_arches} - rust-timerfd ExclusiveArch: %{rust_arches} - rust-tiny-keccak ExclusiveArch: %{rust_arches} - rust-tiny_http ExclusiveArch: %{rust_arches} - rust-tiny_http0.6 ExclusiveArch: %{rust_arches} - rust-tinystr ExclusiveArch: %{rust_arches} - rust-tinytemplate ExclusiveArch: %{rust_arches} - rust-tinyvec ExclusiveArch: %{rust_arches} - rust-tinyvec_macros ExclusiveArch: %{rust_arches} - rust-tokei ExclusiveArch: %{rust_arches} - rust-tokio ExclusiveArch: %{rust_arches} - rust-tokio-codec ExclusiveArch: %{rust_arches} - rust-tokio-core ExclusiveArch: %{rust_arches} - rust-tokio-current-thread ExclusiveArch: %{rust_arches} - rust-tokio-executor ExclusiveArch: %{rust_arches} - rust-tokio-fs ExclusiveArch: %{rust_arches} - rust-tokio-io ExclusiveArch: %{rust_arches} - rust-tokio-macros ExclusiveArch: %{rust_arches} - rust-tokio-macros0.2 ExclusiveArch: %{rust_arches} - rust-tokio-mock-task ExclusiveArch: %{rust_arches} - rust-tokio-native-tls ExclusiveArch: %{rust_arches} - rust-tokio-openssl ExclusiveArch: %{rust_arches} - rust-tokio-openssl0.4 ExclusiveArch: %{rust_arches} - rust-tokio-reactor ExclusiveArch: %{rust_arches} - rust-tokio-rustls ExclusiveArch: %{rust_arches} - rust-tokio-socks ExclusiveArch: %{rust_arches} - rust-tokio-socks0.3 ExclusiveArch: %{rust_arches} - rust-tokio-stream ExclusiveArch: %{rust_arches} - rust-tokio-sync ExclusiveArch: %{rust_arches} - rust-tokio-tcp ExclusiveArch: %{rust_arches} - rust-tokio-test ExclusiveArch: %{rust_arches} - rust-tokio-threadpool ExclusiveArch: %{rust_arches} - rust-tokio-timer ExclusiveArch: %{rust_arches} - rust-tokio-tls ExclusiveArch: %{rust_arches} - rust-tokio-tls0.2 ExclusiveArch: %{rust_arches} - rust-tokio-tungstenite ExclusiveArch: %{rust_arches} - rust-tokio-udp ExclusiveArch: %{rust_arches} - rust-tokio-uds ExclusiveArch: %{rust_arches} - rust-tokio-util ExclusiveArch: %{rust_arches} - rust-tokio-util0.3 ExclusiveArch: %{rust_arches} - rust-tokio0.1 ExclusiveArch: %{rust_arches} - rust-tokio0.2 ExclusiveArch: %{rust_arches} - rust-toml ExclusiveArch: %{rust_arches} - rust-toml0.4 ExclusiveArch: %{rust_arches} - rust-toml_edit ExclusiveArch: %{rust_arches} - rust-tower-layer ExclusiveArch: %{rust_arches} - rust-tower-service ExclusiveArch: %{rust_arches} - rust-tower-test ExclusiveArch: %{rust_arches} - rust-tower-util ExclusiveArch: %{rust_arches} - rust-tpm2-policy ExclusiveArch: %{rust_arches} - rust-tracing ExclusiveArch: %{rust_arches} - rust-tracing-attributes ExclusiveArch: %{rust_arches} - rust-tracing-core ExclusiveArch: %{rust_arches} - rust-tracing-futures ExclusiveArch: %{rust_arches} - rust-traitobject ExclusiveArch: %{rust_arches} - rust-trash ExclusiveArch: %{rust_arches} - rust-tree-sitter ExclusiveArch: %{rust_arches} - rust-tree-sitter-cli ExclusiveArch: %{rust_arches} - rust-tree-sitter-config ExclusiveArch: %{rust_arches} - rust-tree-sitter-highlight ExclusiveArch: %{rust_arches} - rust-tree-sitter-loader ExclusiveArch: %{rust_arches} - rust-tree-sitter-tags ExclusiveArch: %{rust_arches} - rust-treebitmap ExclusiveArch: %{rust_arches} - rust-treeline ExclusiveArch: %{rust_arches} - rust-trust-dns-https ExclusiveArch: %{rust_arches} - rust-trust-dns-native-tls ExclusiveArch: %{rust_arches} - rust-trust-dns-native-tls0.19 ExclusiveArch: %{rust_arches} - rust-trust-dns-openssl ExclusiveArch: %{rust_arches} - rust-trust-dns-openssl0.19 ExclusiveArch: %{rust_arches} - rust-trust-dns-proto ExclusiveArch: %{rust_arches} - rust-trust-dns-proto0.19 ExclusiveArch: %{rust_arches} - rust-trust-dns-resolver ExclusiveArch: %{rust_arches} - rust-trust-dns-resolver0.19 ExclusiveArch: %{rust_arches} - rust-trust-dns-rustls ExclusiveArch: %{rust_arches} - rust-try-lock ExclusiveArch: %{rust_arches} - rust-trybuild ExclusiveArch: %{rust_arches} - rust-tss-esapi ExclusiveArch: %{rust_arches} - rust-tss-esapi-sys ExclusiveArch: %{rust_arches} - rust-ttf-parser ExclusiveArch: %{rust_arches} - rust-ttf-parser0.12 ExclusiveArch: %{rust_arches} - rust-tui ExclusiveArch: %{rust_arches} - rust-tui-react ExclusiveArch: %{rust_arches} - rust-tui0.11 ExclusiveArch: %{rust_arches} - rust-tui0.9 ExclusiveArch: %{rust_arches} - rust-tuikit ExclusiveArch: %{rust_arches} - rust-tungstenite ExclusiveArch: %{rust_arches} - rust-twoway ExclusiveArch: %{rust_arches} - rust-twox-hash ExclusiveArch: %{rust_arches} - rust-type-map ExclusiveArch: %{rust_arches} - rust-typeable ExclusiveArch: %{rust_arches} - rust-typed-arena ExclusiveArch: %{rust_arches} - rust-typed-arena1 ExclusiveArch: %{rust_arches} - rust-typemap ExclusiveArch: %{rust_arches} - rust-typenum ExclusiveArch: %{rust_arches} - rust-typetag ExclusiveArch: %{rust_arches} - rust-typetag-impl ExclusiveArch: %{rust_arches} - rust-tzfile ExclusiveArch: %{rust_arches} - rust-ucd-parse ExclusiveArch: %{rust_arches} - rust-ucd-trie ExclusiveArch: %{rust_arches} - rust-ucd-util ExclusiveArch: %{rust_arches} - rust-umask ExclusiveArch: %{rust_arches} - rust-uncased ExclusiveArch: %{rust_arches} - rust-unchecked-index ExclusiveArch: %{rust_arches} - rust-unescape ExclusiveArch: %{rust_arches} - rust-unic-char-property ExclusiveArch: %{rust_arches} - rust-unic-char-range ExclusiveArch: %{rust_arches} - rust-unic-common ExclusiveArch: %{rust_arches} - rust-unic-langid ExclusiveArch: %{rust_arches} - rust-unic-langid-impl ExclusiveArch: %{rust_arches} - rust-unic-langid-macros ExclusiveArch: %{rust_arches} - rust-unic-langid-macros-impl ExclusiveArch: %{rust_arches} - rust-unic-locale ExclusiveArch: %{rust_arches} - rust-unic-locale-impl ExclusiveArch: %{rust_arches} - rust-unic-locale-macros ExclusiveArch: %{rust_arches} - rust-unic-locale-macros-impl ExclusiveArch: %{rust_arches} - rust-unic-segment ExclusiveArch: %{rust_arches} - rust-unic-ucd-category ExclusiveArch: %{rust_arches} - rust-unic-ucd-common ExclusiveArch: %{rust_arches} - rust-unic-ucd-segment ExclusiveArch: %{rust_arches} - rust-unic-ucd-version ExclusiveArch: %{rust_arches} - rust-unicase ExclusiveArch: %{rust_arches} - rust-unicase1 ExclusiveArch: %{rust_arches} - rust-unicode-bidi ExclusiveArch: %{rust_arches} - rust-unicode-linebreak ExclusiveArch: %{rust_arches} - rust-unicode-normalization ExclusiveArch: %{rust_arches} - rust-unicode-segmentation ExclusiveArch: %{rust_arches} - rust-unicode-truncate ExclusiveArch: %{rust_arches} - rust-unicode-width ExclusiveArch: %{rust_arches} - rust-unicode-xid ExclusiveArch: %{rust_arches} - rust-unicode-xid0.1 ExclusiveArch: %{rust_arches} - rust-unicode_categories ExclusiveArch: %{rust_arches} - rust-unindent ExclusiveArch: %{rust_arches} - rust-universal-hash ExclusiveArch: %{rust_arches} - rust-unix_socket ExclusiveArch: %{rust_arches} - rust-unreachable ExclusiveArch: %{rust_arches} - rust-unsafe-any ExclusiveArch: %{rust_arches} - rust-untrusted ExclusiveArch: %{rust_arches} - rust-uom ExclusiveArch: %{rust_arches} - rust-url ExclusiveArch: %{rust_arches} - rust-url1 ExclusiveArch: %{rust_arches} - rust-url_serde ExclusiveArch: %{rust_arches} - rust-urlencoding ExclusiveArch: %{rust_arches} - rust-urlocator ExclusiveArch: %{rust_arches} - rust-urlshortener ExclusiveArch: %{rust_arches} - rust-userfaultfd ExclusiveArch: %{rust_arches} - rust-userfaultfd-sys ExclusiveArch: %{rust_arches} - rust-users ExclusiveArch: %{rust_arches} - rust-users0.10 ExclusiveArch: %{rust_arches} - rust-utf-8 ExclusiveArch: %{rust_arches} - rust-utf8-ranges ExclusiveArch: %{rust_arches} - rust-utf8-width ExclusiveArch: %{rust_arches} - rust-utf8parse ExclusiveArch: %{rust_arches} - rust-uuid ExclusiveArch: %{rust_arches} - rust-uuid0.7 ExclusiveArch: %{rust_arches} - rust-v_frame ExclusiveArch: %{rust_arches} - rust-value-bag ExclusiveArch: %{rust_arches} - rust-varbincode ExclusiveArch: %{rust_arches} - rust-varlink ExclusiveArch: %{rust_arches} - rust-varlink-cli ExclusiveArch: %{rust_arches} - rust-varlink_generator ExclusiveArch: %{rust_arches} - rust-varlink_parser ExclusiveArch: %{rust_arches} - rust-varlink_stdinterfaces ExclusiveArch: %{rust_arches} - rust-vcsgraph ExclusiveArch: %{rust_arches} - rust-vec_map ExclusiveArch: %{rust_arches} - rust-vergen ExclusiveArch: %{rust_arches} - rust-vergen3 ExclusiveArch: %{rust_arches} - rust-version ExclusiveArch: %{rust_arches} - rust-version-compare ExclusiveArch: %{rust_arches} - rust-version-sync ExclusiveArch: %{rust_arches} - rust-version-sync0.8 ExclusiveArch: %{rust_arches} - rust-version_check ExclusiveArch: %{rust_arches} - rust-versions ExclusiveArch: %{rust_arches} - rust-vhost ExclusiveArch: %{rust_arches} - rust-virtio-bindings ExclusiveArch: x86_64 aarch64 ppc64le - rust-virtio-queue ExclusiveArch: x86_64 aarch64 s390x - rust-vm-memory ExclusiveArch: x86_64 aarch64 ppc64le - rust-vmm-sys-util ExclusiveArch: x86_64 aarch64 ppc64le - rust-vmw_backdoor ExclusiveArch: %{rust_arches} - rust-void ExclusiveArch: %{rust_arches} - rust-vsprintf ExclusiveArch: %{rust_arches} - rust-vte ExclusiveArch: %{rust_arches} - rust-vte_generate_state_changes ExclusiveArch: %{rust_arches} - rust-vtparse ExclusiveArch: %{rust_arches} - rust-wait-timeout ExclusiveArch: %{rust_arches} - rust-waker-fn ExclusiveArch: %{rust_arches} - rust-walkdir ExclusiveArch: %{rust_arches} - rust-want ExclusiveArch: %{rust_arches} - rust-warp ExclusiveArch: %{rust_arches} - rust-wasm-bindgen ExclusiveArch: %{rust_arches} - rust-wasm-bindgen-backend ExclusiveArch: %{rust_arches} - rust-wasm-bindgen-futures ExclusiveArch: %{rust_arches} - rust-wasm-bindgen-macro ExclusiveArch: %{rust_arches} - rust-wasm-bindgen-macro-support ExclusiveArch: %{rust_arches} - rust-wasm-bindgen-shared ExclusiveArch: %{rust_arches} - rust-wasm-bindgen-test ExclusiveArch: %{rust_arches} - rust-wasm-bindgen-test-macro ExclusiveArch: %{rust_arches} - rust-wasmer_enumset ExclusiveArch: %{rust_arches} - rust-wasmer_enumset_derive ExclusiveArch: %{rust_arches} - rust-wasmparser ExclusiveArch: %{rust_arches} - rust-wasmtime ExclusiveArch: x86_64 aarch64 s390x - rust-wasmtime-cache ExclusiveArch: %{rust_arches} - rust-wasmtime-cranelift ExclusiveArch: x86_64 aarch64 s390x - rust-wasmtime-environ ExclusiveArch: %{rust_arches} - rust-wasmtime-fiber ExclusiveArch: x86_64 aarch64 s390x - rust-wasmtime-jit ExclusiveArch: x86_64 aarch64 s390x - rust-wasmtime-jit-debug ExclusiveArch: %{rust_arches} - rust-wasmtime-runtime ExclusiveArch: x86_64 aarch64 s390x - rust-wasmtime-types ExclusiveArch: %{rust_arches} - rust-wasmtime-wast ExclusiveArch: x86_64 aarch64 s390x - rust-wast ExclusiveArch: %{rust_arches} - rust-wat ExclusiveArch: %{rust_arches} - rust-watchman_client ExclusiveArch: %{rust_arches} - rust-wayland-client ExclusiveArch: %{rust_arches} - rust-wayland-commons ExclusiveArch: %{rust_arches} - rust-wayland-cursor ExclusiveArch: %{rust_arches} - rust-wayland-egl ExclusiveArch: %{rust_arches} - rust-wayland-protocols ExclusiveArch: %{rust_arches} - rust-wayland-scanner ExclusiveArch: %{rust_arches} - rust-wayland-server ExclusiveArch: %{rust_arches} - rust-wayland-sys ExclusiveArch: %{rust_arches} - rust-web-sys ExclusiveArch: %{rust_arches} - rust-webbrowser ExclusiveArch: %{rust_arches} - rust-webpki ExclusiveArch: %{rust_arches} - rust-webpki-roots ExclusiveArch: %{rust_arches} - rust-websocket ExclusiveArch: %{rust_arches} - rust-websocket-base ExclusiveArch: %{rust_arches} - rust-weezl ExclusiveArch: %{rust_arches} - rust-which ExclusiveArch: %{rust_arches} - rust-wide ExclusiveArch: %{rust_arches} - rust-wiggle ExclusiveArch: x86_64 aarch64 s390x - rust-wiggle-generate ExclusiveArch: %{rust_arches} - rust-wiggle-macro ExclusiveArch: %{rust_arches} - rust-wild ExclusiveArch: %{rust_arches} - rust-winit ExclusiveArch: %{rust_arches} - rust-witx ExclusiveArch: %{rust_arches} - rust-ws ExclusiveArch: %{rust_arches} - rust-wyz ExclusiveArch: %{rust_arches} - rust-x11 ExclusiveArch: %{rust_arches} - rust-x11-clipboard ExclusiveArch: %{rust_arches} - rust-x11-dl ExclusiveArch: %{rust_arches} - rust-xattr ExclusiveArch: %{rust_arches} - rust-xcb ExclusiveArch: %{rust_arches} - rust-xcursor ExclusiveArch: %{rust_arches} - rust-xdg ExclusiveArch: %{rust_arches} - rust-xi-unicode ExclusiveArch: %{rust_arches} - rust-xkbcommon ExclusiveArch: %{rust_arches} - rust-xml-rs ExclusiveArch: %{rust_arches} - rust-xml5ever ExclusiveArch: %{rust_arches} - rust-xmlparser ExclusiveArch: %{rust_arches} - rust-xmlwriter ExclusiveArch: %{rust_arches} - rust-xz2 ExclusiveArch: %{rust_arches} - rust-y4m ExclusiveArch: %{rust_arches} - rust-yaml-rust ExclusiveArch: %{rust_arches} - rust-yaml-rust0.3 ExclusiveArch: %{rust_arches} - rust-yansi ExclusiveArch: %{rust_arches} - rust-ybaas ExclusiveArch: %{rust_arches} - rust-yubibomb ExclusiveArch: %{rust_arches} - rust-zbase32 ExclusiveArch: %{rust_arches} - rust-zbus ExclusiveArch: %{rust_arches} - rust-zbus_macros ExclusiveArch: %{rust_arches} - rust-zeroize ExclusiveArch: %{rust_arches} - rust-zeroize_derive ExclusiveArch: %{rust_arches} - rust-zincati ExclusiveArch: %{rust_arches} - rust-zip ExclusiveArch: %{rust_arches} - rust-zmq ExclusiveArch: %{rust_arches} - rust-zmq-sys ExclusiveArch: %{rust_arches} - rust-zoneinfo_compiled ExclusiveArch: %{rust_arches} - rust-zoxide ExclusiveArch: %{rust_arches} - rust-zram-generator ExclusiveArch: %{rust_arches} - rust-zstd ExclusiveArch: %{rust_arches} - rust-zstd-safe ExclusiveArch: %{rust_arches} - rust-zstd-sys ExclusiveArch: %{rust_arches} - rust-zvariant ExclusiveArch: %{rust_arches} - rust-zvariant_derive ExclusiveArch: %{rust_arches} - s390utils ExclusiveArch: s390 s390x - safetyblanket ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le - sagemath ExclusiveArch: aarch64 x86_64 - sbcl ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64 - sbd ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le - sbsigntools ExclusiveArch: x86_64 aarch64 %{arm} %{ix86} - sdsl-lite ExclusiveArch: %{power64} x86_64 aarch64 - seabios ExclusiveArch: x86_64 - seadrive-gui ExclusiveArch: %{qt5_qtwebengine_arches} - seafile-client ExclusiveArch: %{qt5_qtwebengine_arches} - seamonkey ExclusiveArch: x86_64 - seqan3 ExclusiveArch: %{power64} x86_64 aarch64 - servicelog ExclusiveArch: ppc %{power64} - sgabios ExclusiveArch: %{ix86} x86_64 - sharpfont ExclusiveArch: %mono_arches - sharpziplib ExclusiveArch: %{mono_arches} - shim ExclusiveArch: %{efi} - shim-unsigned-aarch64 ExclusiveArch: aarch64 - shim-unsigned-x64 ExclusiveArch: x86_64 - sigul ExclusiveArch: x86_64 - skopeo ExclusiveArch: %{go_arches} - skychart ExclusiveArch: %{fpc_arches} - snapd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - soup-sharp ExclusiveArch: %{mono_arches} - sparkleshare ExclusiveArch: %{mono_arches} - spicctrl ExclusiveArch: %{ix86} x86_64 - spice ExclusiveArch: x86_64 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - springlobby ExclusiveArch: %{ix86} x86_64 - squeekboard ExclusiveArch: %{rust_arches} - startdde ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - statsd ExclusiveArch: %{nodejs_arches} noarch - stratis-cli ExclusiveArch: %{rust_arches} noarch - stratisd ExclusiveArch: %{rust_arches} ExclusiveArch: %{rust_arches} - stripesnoop ExclusiveArch: %{ix86} x86_64 - supercollider ExclusiveArch: %{qt5_qtwebengine_arches} - supermin ExclusiveArch: %{kernel_arches} - svt-av1 ExclusiveArch: x86_64 - svt-vp9 ExclusiveArch: x86_64 - swift-lang ExclusiveArch: x86_64 aarch64 - sysbench ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64le s390x - syslinux ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 - system76-keyboard-configurator ExclusiveArch: %{rust_arches} - taglib-sharp ExclusiveArch: %{mono_arches} - tarantool ExclusiveArch: %{ix86} x86_64 - tboot ExclusiveArch: %{ix86} x86_64 - tdlib ExclusiveArch: x86_64 aarch64 - templates_parser ExclusiveArch: %GPRbuild_arches - ternimal ExclusiveArch: %{rust_arches} - testcloud ExclusiveArch: %{kernel_arches} noarch - themonospot-base ExclusiveArch: %mono_arches - themonospot-console ExclusiveArch: %mono_arches - themonospot-gui-gtk ExclusiveArch: %mono_arches - themonospot-plugin-avi ExclusiveArch: %mono_arches - themonospot-plugin-mkv ExclusiveArch: %mono_arches - thermald ExclusiveArch: %{ix86} x86_64 - tilix ExclusiveArch: %{ldc_arches} - tomboy ExclusiveArch: %{mono_arches} - torbrowser-launcher ExclusiveArch: %{ix86} x86_64 - tuned-profiles-nfv-host-bin ExclusiveArch: %{ix86} x86_64 - uClibc ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} - ucx ExclusiveArch: aarch64 ppc64le x86_64 - uglify-js ExclusiveArch: %{nodejs_arches} noarch - unetbootin ExclusiveArch: %{ix86} x86_64 - ursa-major ExclusiveArch: noarch aarch64 ppc64le s390x x86_64 - usd ExclusiveArch: aarch64 x86_64 - v8-314 ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64 - valgrind ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64 - vboot-utils ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - vim-go ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}} - virt-p2v ExclusiveArch: x86_64 - virt-v2v ExclusiveArch: x86_64 - virtualbox-guest-additions ExclusiveArch: i686 x86_64 - vkd3d ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - vmaf ExclusiveArch: x86_64 - vmemcache ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 - vrq ExclusiveArch: %{ix86} x86_64 - warsow ExclusiveArch: %{ix86} x86_64 %{arm} - warsow-data ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{ix86} x86_64 %{arm} - webkit2-sharp ExclusiveArch: %mono_arches - wine ExclusiveArch: %{ix86} x86_64 aarch64 ExclusiveArch: %{ix86} - wine-dxvk ExclusiveArch: %{ix86} x86_64 - winetricks ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - wxMaxima ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9 - x2goclient ExclusiveArch: x86_64 - xe-guest-utilities-latest ExclusiveArch: %{ix86} x86_64 - xen ExclusiveArch: %{ix86} x86_64 armv7hl aarch64 - xmlada ExclusiveArch: %{GPRbuild_arches} - xorg-x11-drv-armsoc ExclusiveArch: %{arm} aarch64 - xorg-x11-drv-intel ExclusiveArch: %{ix86} x86_64 - xorg-x11-drv-openchrome ExclusiveArch: %{ix86} x86_64 - xorg-x11-drv-vesa ExclusiveArch: %{ix86} x86_64 - xorg-x11-drv-vmware ExclusiveArch: %{ix86} x86_64 ia64 - xsp ExclusiveArch: %mono_arches - yarnpkg ExclusiveArch: %{nodejs_arches} noarch - zcfan ExclusiveArch: x86_64 - zeal ExclusiveArch: %{qt5_qtwebengine_arches} - zeromq-ada ExclusiveArch: %{GPRbuild_arches} - zig ExclusiveArch: %{zig_arches} - zlib-ada ExclusiveArch: %{GPRbuild_arches} - zlib-ng ExclusiveArch: aarch64 i686 ppc64le s390x x86_64 - zola ExclusiveArch: %{rust_arches}

2 years

1
0
0 / 0

Architecture specific change in rpms/grub2.git

by githook-noreply＠fedoraproject.org

The package rpms/grub2.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/grub2.git/commit/?id=eeff7639b35c... https://src.fedoraproject.org/cgit/rpms/grub2.git/commit/?id=d171a2a95c9f... https://src.fedoraproject.org/cgit/rpms/grub2.git/commit/?id=2b909b72a431.... Change: +ExcludeArch: s390 s390x %{ix86} +ExcludeArch: s390 s390x +ExcludeArch: s390 s390x %{ix86} Thanks. Full change: ============ commit ac52d21d8ab6b10186055178ade58a6d95164d76 Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net> Date: Tue Apr 19 07:12:27 2022 +0000 Fix mkformat error from grub2-mkrescue grub2-tools-extra missing dependency on mformat (mtools). [rharwood: NVR fix, commit message] Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> diff --git a/grub2.spec b/grub2.spec index 16d5587..d8378f8 100644 --- a/grub2.spec +++ b/grub2.spec @@ -17,7 +17,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -132,6 +132,7 @@ Summary: Support tools for GRUB. Requires: gettext os-prober file Requires: grub2-tools-minimal = %{epoch}:%{version}-%{release} Requires: grub2-common = %{epoch}:%{version}-%{release} +Requires: mtools Obsoletes: grub2-tools < %{evr} %description tools-extra @@ -529,6 +530,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Tue Apr 19 2022 Dominik Mierzejewski <dominik(a)greysector.net> - 1:2.06-38 +- fix "grub2-mkrescue: error: `mformat` invocation failed" + * Mon Apr 18 2022 Robbie Harwood <rharwood(a)redhat.com> - 1:2.06-37 - Attempt to fix version display commit e622855aa21390882a7378d758aea9e1c1d0d32b Author: Robbie Harwood <rharwood(a)redhat.com> Date: Mon Apr 18 21:58:58 2022 +0000 Attempt to fix version display Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> diff --git a/0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch b/0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch index 3ddefe6..4824aa1 100644 --- a/0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch +++ b/0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch @@ -10,7 +10,7 @@ This reverts commit 722737630889607c3b5761f1f5a48f1674cd2821. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in -index 5984e92d2..946224812 100644 +index 5984e92d29..9462248128 100644 --- a/util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in @@ -36,7 +36,7 @@ if ! command -v os-prober > /dev/null || ! command -v linux-boot-prober > /dev/n diff --git a/0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch b/0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch index 5429c42..05ac0f8 100644 --- a/0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch +++ b/0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch @@ -10,7 +10,7 @@ This reverts commit 54e0a1bbf1e9106901a557195bb35e5e20fb3925. 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index f8cbb8d7a..d3e879b8e 100644 +index f8cbb8d7a2..d3e879b8e5 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -140,9 +140,6 @@ GRUB_DEVICE_PARTUUID="`${grub_probe} --device ${GRUB_DEVICE} --target=partuuid 2 @@ -40,7 +40,7 @@ index f8cbb8d7a..d3e879b8e 100644 GRUB_SAVEDEFAULT \ GRUB_ENABLE_CRYPTODISK \ diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in -index 946224812..80685b15f 100644 +index 9462248128..80685b15f4 100644 --- a/util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in @@ -26,8 +26,8 @@ export TEXTDOMAINDIR="@localedir@" diff --git a/0003-Revert-templates-Disable-the-os-prober-by-default.patch b/0003-Revert-templates-Disable-the-os-prober-by-default.patch index 4e4dc55..9492795 100644 --- a/0003-Revert-templates-Disable-the-os-prober-by-default.patch +++ b/0003-Revert-templates-Disable-the-os-prober-by-default.patch @@ -10,7 +10,7 @@ This reverts commit e346414725a70e5c74ee87ca14e580c66f517666. 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/docs/grub.texi b/docs/grub.texi -index f8b4b3b21..69f08d289 100644 +index f8b4b3b21a..69f08d289f 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -1519,13 +1519,10 @@ boot sequence. If you have problems, set this option to @samp{text} and @@ -46,7 +46,7 @@ index f8b4b3b21..69f08d289 100644 First create a separate GRUB partition, big enough to hold GRUB. Some of the following entries show how to load OS installer images from this same partition, diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in -index 80685b15f..1b91c102f 100644 +index 80685b15f4..1b91c102f3 100644 --- a/util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in @@ -26,8 +26,7 @@ export TEXTDOMAINDIR="@localedir@" diff --git a/0004-Add-support-for-Linux-EFI-stub-loading.patch b/0004-Add-support-for-Linux-EFI-stub-loading.patch index bdd7dde..745973e 100644 --- a/0004-Add-support-for-Linux-EFI-stub-loading.patch +++ b/0004-Add-support-for-Linux-EFI-stub-loading.patch @@ -44,7 +44,7 @@ moves the check into grub_dl_load_file. create mode 100644 include/grub/efi/linux.h diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 8022e1c0a..45d3edaa4 100644 +index 8022e1c0a7..45d3edaa4d 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -1734,13 +1734,6 @@ module = { @@ -88,7 +88,7 @@ index 8022e1c0a..45d3edaa4 100644 module = { diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c -index 48f8a7907..b71493709 100644 +index 48f8a79073..b714937095 100644 --- a/grub-core/kern/dl.c +++ b/grub-core/kern/dl.c @@ -38,6 +38,14 @@ @@ -127,7 +127,7 @@ index 48f8a7907..b71493709 100644 file = grub_file_open (filename, GRUB_FILE_TYPE_GRUB_MODULE); diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 8cff7be02..35b8f6706 100644 +index 8cff7be028..35b8f67060 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -286,6 +286,34 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, @@ -166,7 +166,7 @@ index 8cff7be02..35b8f6706 100644 /* Search the mods section from the PE32/PE32+ image. This code uses diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c -index 9838fb2f5..f6aef0ef6 100644 +index 9838fb2f50..f6aef0ef64 100644 --- a/grub-core/kern/efi/mm.c +++ b/grub-core/kern/efi/mm.c @@ -113,6 +113,38 @@ grub_efi_drop_alloc (grub_efi_physical_address_t address, @@ -209,7 +209,7 @@ index 9838fb2f5..f6aef0ef6 100644 void * grub_efi_allocate_pages_real (grub_efi_physical_address_t address, diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c -index ef3e9f944..a312c6686 100644 +index ef3e9f9444..a312c66868 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -29,6 +29,7 @@ @@ -390,7 +390,7 @@ index ef3e9f944..a312c6686 100644 linux_args = grub_malloc (cmdline_size); if (!linux_args) diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c -index 22cc25ecc..d9b7a9ba4 100644 +index 22cc25eccd..d9b7a9ba40 100644 --- a/grub-core/loader/arm64/xen_boot.c +++ b/grub-core/loader/arm64/xen_boot.c @@ -266,7 +266,6 @@ xen_boot (void) @@ -403,7 +403,7 @@ index 22cc25ecc..d9b7a9ba4 100644 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c new file mode 100644 -index 000000000..c24202a5d +index 0000000000..c24202a5dd --- /dev/null +++ b/grub-core/loader/efi/linux.c @@ -0,0 +1,70 @@ @@ -479,7 +479,7 @@ index 000000000..c24202a5d +#pragma GCC diagnostic pop diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c new file mode 100644 -index 000000000..bb2616a80 +index 0000000000..bb2616a809 --- /dev/null +++ b/grub-core/loader/i386/efi/linux.c @@ -0,0 +1,335 @@ @@ -819,7 +819,7 @@ index 000000000..bb2616a80 + grub_unregister_command (cmd_initrdefi); +} diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c -index 2a2995201..8be4c3b3f 100644 +index 2a29952016..8be4c3b3f4 100644 --- a/grub-core/loader/i386/pc/linux.c +++ b/grub-core/loader/i386/pc/linux.c @@ -474,14 +474,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), @@ -853,7 +853,7 @@ index 2a2995201..8be4c3b3f 100644 + grub_unregister_command (cmd_initrd16); } diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h -index bcd5a7eb1..b582f67f6 100644 +index bcd5a7eb18..b582f67f66 100644 --- a/include/grub/arm/linux.h +++ b/include/grub/arm/linux.h @@ -20,6 +20,7 @@ @@ -883,7 +883,7 @@ index bcd5a7eb1..b582f67f6 100644 #if defined GRUB_MACHINE_UBOOT diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h -index 7e22b4ab6..ea030312d 100644 +index 7e22b4ab69..ea030312df 100644 --- a/include/grub/arm64/linux.h +++ b/include/grub/arm64/linux.h @@ -19,6 +19,7 @@ @@ -913,7 +913,7 @@ index 7e22b4ab6..ea030312d 100644 #endif /* ! GRUB_ARM64_LINUX_HEADER */ diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h -index 83d958f99..6295df85f 100644 +index 83d958f994..6295df85f3 100644 --- a/include/grub/efi/efi.h +++ b/include/grub/efi/efi.h @@ -47,6 +47,9 @@ EXPORT_FUNC(grub_efi_allocate_fixed) (grub_efi_physical_address_t address, @@ -946,7 +946,7 @@ index 83d958f99..6295df85f 100644 grub_addr_t grub_efi_modules_addr (void); diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h new file mode 100644 -index 000000000..d9ede3677 +index 0000000000..d9ede36773 --- /dev/null +++ b/include/grub/efi/linux.h @@ -0,0 +1,31 @@ diff --git a/0005-Rework-linux-command.patch b/0005-Rework-linux-command.patch index 6f5f879..694e423 100644 --- a/0005-Rework-linux-command.patch +++ b/0005-Rework-linux-command.patch @@ -13,7 +13,7 @@ Signed-off-by: Matthew Garrett <mjg59(a)coreos.com> 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c -index 9f74a96b1..dccf3bb30 100644 +index 9f74a96b19..dccf3bb300 100644 --- a/grub-core/loader/i386/linux.c +++ b/grub-core/loader/i386/linux.c @@ -649,13 +649,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), diff --git a/0006-Rework-linux16-command.patch b/0006-Rework-linux16-command.patch index 63b1ad3..5adaaba 100644 --- a/0006-Rework-linux16-command.patch +++ b/0006-Rework-linux16-command.patch @@ -13,7 +13,7 @@ Signed-off-by: Matthew Garrett <mjg59(a)coreos.com> 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c -index 8be4c3b3f..4b1750e36 100644 +index 8be4c3b3f4..4b1750e360 100644 --- a/grub-core/loader/i386/pc/linux.c +++ b/grub-core/loader/i386/pc/linux.c @@ -124,13 +124,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), diff --git a/0007-Add-secureboot-support-on-efi-chainloader.patch b/0007-Add-secureboot-support-on-efi-chainloader.patch index 065d506..34ead63 100644 --- a/0007-Add-secureboot-support-on-efi-chainloader.patch +++ b/0007-Add-secureboot-support-on-efi-chainloader.patch @@ -190,7 +190,7 @@ Signed-off-by: David Abdurachmanov <david.abdurachmanov(a)sifive.com> 7 files changed, 844 insertions(+), 90 deletions(-) diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 35b8f6706..4a2259aa1 100644 +index 35b8f67060..4a2259aa1c 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -296,14 +296,20 @@ grub_efi_secure_boot (void) @@ -219,7 +219,7 @@ index 35b8f6706..4a2259aa1 100644 if (*secure_boot && !*setup_mode) ret = 1; diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c -index a312c6686..04994d5c6 100644 +index a312c66868..04994d5c67 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -284,6 +284,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), @@ -241,7 +241,7 @@ index a312c6686..04994d5c6 100644 grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"), argv[0]); goto fail; diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index 2bd80f4db..e6a8d4ad0 100644 +index 2bd80f4db3..e6a8d4ad0e 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -32,6 +32,8 @@ @@ -1184,7 +1184,7 @@ index 2bd80f4db..e6a8d4ad0 100644 return grub_errno; diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c -index c24202a5d..c8ecce6df 100644 +index c24202a5dd..c8ecce6dfd 100644 --- a/grub-core/loader/efi/linux.c +++ b/grub-core/loader/efi/linux.c @@ -33,21 +33,34 @@ struct grub_efi_shim_lock @@ -1229,7 +1229,7 @@ index c24202a5d..c8ecce6df 100644 #pragma GCC diagnostic push diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index bb2616a80..6b24cbb94 100644 +index bb2616a809..6b24cbb948 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -117,6 +117,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), @@ -1297,7 +1297,7 @@ index bb2616a80..6b24cbb94 100644 grub_file_close (file); diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h -index d9ede3677..0033d9305 100644 +index d9ede36773..0033d9305a 100644 --- a/include/grub/efi/linux.h +++ b/include/grub/efi/linux.h @@ -22,7 +22,7 @@ @@ -1310,7 +1310,7 @@ index d9ede3677..0033d9305 100644 grub_err_t EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset, diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h -index 0ed8781f0..a43adf274 100644 +index 0ed8781f03..a43adf2746 100644 --- a/include/grub/efi/pe32.h +++ b/include/grub/efi/pe32.h @@ -223,7 +223,11 @@ struct grub_pe64_optional_header diff --git a/0008-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch b/0008-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch index 3f53d8b..487d5c0 100644 --- a/0008-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch +++ b/0008-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch @@ -32,7 +32,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> create mode 100644 include/grub/sparc64/linux.h diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c -index 584baec8f..7b2999b14 100644 +index 584baec8f9..7b2999b14b 100644 --- a/grub-core/commands/iorw.c +++ b/grub-core/commands/iorw.c @@ -24,6 +24,7 @@ @@ -64,7 +64,7 @@ index 584baec8f..7b2999b14 100644 grub_unregister_extcmd (cmd_read_word); grub_unregister_extcmd (cmd_read_dword); diff --git a/grub-core/commands/memrw.c b/grub-core/commands/memrw.c -index d401a6db0..39cf3a06d 100644 +index d401a6db0e..39cf3a06db 100644 --- a/grub-core/commands/memrw.c +++ b/grub-core/commands/memrw.c @@ -23,6 +23,7 @@ @@ -96,7 +96,7 @@ index d401a6db0..39cf3a06d 100644 grub_unregister_extcmd (cmd_read_word); grub_unregister_extcmd (cmd_read_dword); diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c -index b71493709..7afb9e6f7 100644 +index b714937095..7afb9e6f72 100644 --- a/grub-core/kern/dl.c +++ b/grub-core/kern/dl.c @@ -32,6 +32,7 @@ @@ -117,7 +117,7 @@ index b71493709..7afb9e6f7 100644 #if 0 /* This is an error, but grub2-mkconfig still generates a pile of diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 4a2259aa1..8cff7be02 100644 +index 4a2259aa1c..8cff7be028 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -286,40 +286,6 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, @@ -162,7 +162,7 @@ index 4a2259aa1..8cff7be02 100644 /* Search the mods section from the PE32/PE32+ image. This code uses diff --git a/grub-core/loader/efi/appleloader.c b/grub-core/loader/efi/appleloader.c -index 74888c463..585f2b573 100644 +index 74888c463b..585f2b5738 100644 --- a/grub-core/loader/efi/appleloader.c +++ b/grub-core/loader/efi/appleloader.c @@ -24,6 +24,7 @@ @@ -193,7 +193,7 @@ index 74888c463..585f2b573 100644 grub_unregister_command (cmd); } diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index e6a8d4ad0..07c493789 100644 +index e6a8d4ad0e..07c4937898 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -34,6 +34,7 @@ @@ -205,7 +205,7 @@ index e6a8d4ad0..07c493789 100644 #include <grub/i18n.h> #include <grub/net.h> diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c -index 5f3290ce1..54befc266 100644 +index 5f3290ce17..54befc2662 100644 --- a/grub-core/loader/i386/bsd.c +++ b/grub-core/loader/i386/bsd.c @@ -40,6 +40,7 @@ @@ -237,7 +237,7 @@ index 5f3290ce1..54befc266 100644 grub_unregister_extcmd (cmd_openbsd); grub_unregister_extcmd (cmd_netbsd); diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c -index dccf3bb30..4aeb0e4b9 100644 +index dccf3bb300..4aeb0e4b9a 100644 --- a/grub-core/loader/i386/linux.c +++ b/grub-core/loader/i386/linux.c @@ -37,6 +37,7 @@ @@ -269,7 +269,7 @@ index dccf3bb30..4aeb0e4b9 100644 grub_unregister_command (cmd_initrd); } diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c -index 4b1750e36..e3fa1221e 100644 +index 4b1750e360..e3fa1221e8 100644 --- a/grub-core/loader/i386/pc/linux.c +++ b/grub-core/loader/i386/pc/linux.c @@ -36,6 +36,7 @@ @@ -301,7 +301,7 @@ index 4b1750e36..e3fa1221e 100644 grub_unregister_command (cmd_linux16); grub_unregister_command (cmd_initrd); diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c -index facb13f3d..47e481f45 100644 +index facb13f3d3..47e481f457 100644 --- a/grub-core/loader/multiboot.c +++ b/grub-core/loader/multiboot.c @@ -50,6 +50,7 @@ @@ -333,7 +333,7 @@ index facb13f3d..47e481f45 100644 grub_unregister_command (cmd_module); } diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c -index 1c0cf6a43..baa54e652 100644 +index 1c0cf6a430..baa54e652a 100644 --- a/grub-core/loader/xnu.c +++ b/grub-core/loader/xnu.c @@ -35,6 +35,7 @@ @@ -365,7 +365,7 @@ index 1c0cf6a43..baa54e652 100644 grub_unregister_command (cmd_resume); #endif diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h -index 6295df85f..585fa6662 100644 +index 6295df85f3..585fa6662b 100644 --- a/include/grub/efi/efi.h +++ b/include/grub/efi/efi.h @@ -91,7 +91,6 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var, @@ -378,13 +378,13 @@ index 6295df85f..585fa6662 100644 const grub_efi_device_path_t *dp2); diff --git a/include/grub/ia64/linux.h b/include/grub/ia64/linux.h new file mode 100644 -index 000000000..e69de29bb +index 0000000000..e69de29bb2 diff --git a/include/grub/mips/linux.h b/include/grub/mips/linux.h new file mode 100644 -index 000000000..e69de29bb +index 0000000000..e69de29bb2 diff --git a/include/grub/powerpc/linux.h b/include/grub/powerpc/linux.h new file mode 100644 -index 000000000..e69de29bb +index 0000000000..e69de29bb2 diff --git a/include/grub/sparc64/linux.h b/include/grub/sparc64/linux.h new file mode 100644 -index 000000000..e69de29bb +index 0000000000..e69de29bb2 diff --git a/0009-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch b/0009-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch index dc54e2d..452f43c 100644 --- a/0009-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch +++ b/0009-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch @@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 3 files changed, 89 insertions(+), 37 deletions(-) diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c -index c8ecce6df..0622dfa48 100644 +index c8ecce6dfd..0622dfa48d 100644 --- a/grub-core/loader/efi/linux.c +++ b/grub-core/loader/efi/linux.c @@ -69,12 +69,17 @@ grub_linuxefi_secure_validate (void *data, grub_uint32_t size) @@ -37,7 +37,7 @@ index c8ecce6df..0622dfa48 100644 return GRUB_ERR_BUG; diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index 6b24cbb94..3017d0f3e 100644 +index 6b24cbb948..3017d0f3e5 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -44,14 +44,10 @@ static char *linux_cmdline; @@ -245,7 +245,7 @@ index 6b24cbb94..3017d0f3e 100644 if (kernel_mem && !loaded) grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem, diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h -index eddf9251d..25ef52c04 100644 +index eddf9251d9..25ef52c04e 100644 --- a/include/grub/i386/linux.h +++ b/include/grub/i386/linux.h @@ -138,7 +138,12 @@ struct linux_i386_kernel_header diff --git a/0010-re-write-.gitignore.patch b/0010-re-write-.gitignore.patch index af1859c..3e0b46c 100644 --- a/0010-re-write-.gitignore.patch +++ b/0010-re-write-.gitignore.patch @@ -20,7 +20,7 @@ Subject: [PATCH] re-write .gitignore create mode 100644 util/bash-completion.d/.gitignore diff --git a/.gitignore b/.gitignore -index f6a1bd051..594d0134d 100644 +index f6a1bd0517..594d0134d3 100644 --- a/.gitignore +++ b/.gitignore @@ -275,3 +275,155 @@ widthspec.bin @@ -181,7 +181,7 @@ index f6a1bd051..594d0134d 100644 +/widthspec.h diff --git a/docs/.gitignore b/docs/.gitignore new file mode 100644 -index 000000000..e1d849ef9 +index 0000000000..e1d849ef95 --- /dev/null +++ b/docs/.gitignore @@ -0,0 +1,5 @@ @@ -192,7 +192,7 @@ index 000000000..e1d849ef9 +/version*.texi diff --git a/grub-core/.gitignore b/grub-core/.gitignore new file mode 100644 -index 000000000..2acce2811 +index 0000000000..2acce28115 --- /dev/null +++ b/grub-core/.gitignore @@ -0,0 +1,16 @@ @@ -214,14 +214,14 @@ index 000000000..2acce2811 +/trigtables.c diff --git a/grub-core/lib/.gitignore b/grub-core/lib/.gitignore new file mode 100644 -index 000000000..681545914 +index 0000000000..6815459140 --- /dev/null +++ b/grub-core/lib/.gitignore @@ -0,0 +1 @@ +/libgcrypt-grub/ diff --git a/include/grub/gcrypt/.gitignore b/include/grub/gcrypt/.gitignore new file mode 100644 -index 000000000..8fbf56462 +index 0000000000..8fbf564624 --- /dev/null +++ b/include/grub/gcrypt/.gitignore @@ -0,0 +1,2 @@ @@ -229,7 +229,7 @@ index 000000000..8fbf56462 +gcrypt.h diff --git a/po/.gitignore b/po/.gitignore new file mode 100644 -index 000000000..f507e7741 +index 0000000000..f507e7741e --- /dev/null +++ b/po/.gitignore @@ -0,0 +1,5 @@ @@ -240,7 +240,7 @@ index 000000000..f507e7741 +/stamp-po diff --git a/util/bash-completion.d/.gitignore b/util/bash-completion.d/.gitignore new file mode 100644 -index 000000000..6813a527a +index 0000000000..6813a527ad --- /dev/null +++ b/util/bash-completion.d/.gitignore @@ -0,0 +1,2 @@ diff --git a/0011-IBM-client-architecture-CAS-reboot-support.patch b/0011-IBM-client-architecture-CAS-reboot-support.patch index cea157b..316b9eb 100644 --- a/0011-IBM-client-architecture-CAS-reboot-support.patch +++ b/0011-IBM-client-architecture-CAS-reboot-support.patch @@ -29,7 +29,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 4 files changed, 91 insertions(+) diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c -index 4d493ab76..3a6689abb 100644 +index 4d493ab766..3a6689abb1 100644 --- a/grub-core/kern/ieee1275/openfw.c +++ b/grub-core/kern/ieee1275/openfw.c @@ -591,3 +591,66 @@ grub_ieee1275_get_boot_dev (void) @@ -100,7 +100,7 @@ index 4d493ab76..3a6689abb 100644 + return 0; +} diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index c4ebe9e22..70614de15 100644 +index c4ebe9e22a..70614de156 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -34,6 +34,9 @@ @@ -137,7 +137,7 @@ index c4ebe9e22..70614de15 100644 grub_errno = GRUB_ERR_NONE; } diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c -index 25158407d..ad8039924 100644 +index 25158407dd..ad80399246 100644 --- a/grub-core/script/execute.c +++ b/grub-core/script/execute.c @@ -28,6 +28,9 @@ @@ -162,7 +162,7 @@ index 25158407d..ad8039924 100644 { char *line; diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h -index 73e2f4644..0a599607f 100644 +index 73e2f46447..0a599607f3 100644 --- a/include/grub/ieee1275/ieee1275.h +++ b/include/grub/ieee1275/ieee1275.h @@ -254,6 +254,8 @@ int EXPORT_FUNC(grub_ieee1275_devalias_next) (struct grub_ieee1275_devalias *ali diff --git a/0012-for-ppc-reset-console-display-attr-when-clear-screen.patch b/0012-for-ppc-reset-console-display-attr-when-clear-screen.patch index fa45929..121af84 100644 --- a/0012-for-ppc-reset-console-display-attr-when-clear-screen.patch +++ b/0012-for-ppc-reset-console-display-attr-when-clear-screen.patch @@ -17,7 +17,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c -index 85ecf06b4..05c88dcf4 100644 +index 85ecf06b4d..05c88dcf49 100644 --- a/grub-core/term/terminfo.c +++ b/grub-core/term/terminfo.c @@ -151,7 +151,7 @@ grub_terminfo_set_current (struct grub_term_output *term, diff --git a/0013-Disable-GRUB-video-support-for-IBM-power-machines.patch b/0013-Disable-GRUB-video-support-for-IBM-power-machines.patch index aebfe75..917943f 100644 --- a/0013-Disable-GRUB-video-support-for-IBM-power-machines.patch +++ b/0013-Disable-GRUB-video-support-for-IBM-power-machines.patch @@ -15,7 +15,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c -index 20cbbd761..04df9d2c6 100644 +index 20cbbd761e..04df9d2c66 100644 --- a/grub-core/kern/ieee1275/cmain.c +++ b/grub-core/kern/ieee1275/cmain.c @@ -90,7 +90,10 @@ grub_ieee1275_find_options (void) @@ -31,7 +31,7 @@ index 20cbbd761..04df9d2c6 100644 /* Old Macs have no key repeat, newer ones have fully working one. The ones inbetween when repeated key generates an escaoe sequence diff --git a/grub-core/video/ieee1275.c b/grub-core/video/ieee1275.c -index 17a3dbbb5..b8e4b3feb 100644 +index 17a3dbbb57..b8e4b3feb3 100644 --- a/grub-core/video/ieee1275.c +++ b/grub-core/video/ieee1275.c @@ -352,9 +352,12 @@ static struct grub_video_adapter grub_video_ieee1275_adapter = @@ -51,7 +51,7 @@ index 17a3dbbb5..b8e4b3feb 100644 GRUB_MOD_FINI(ieee1275_fb) diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h -index 0a599607f..b5a1d49bb 100644 +index 0a599607f3..b5a1d49bbc 100644 --- a/include/grub/ieee1275/ieee1275.h +++ b/include/grub/ieee1275/ieee1275.h @@ -148,6 +148,8 @@ enum grub_ieee1275_flag diff --git a/0014-Move-bash-completion-script-922997.patch b/0014-Move-bash-completion-script-922997.patch index ffc1685..a84d66e 100644 --- a/0014-Move-bash-completion-script-922997.patch +++ b/0014-Move-bash-completion-script-922997.patch @@ -10,7 +10,7 @@ Apparently these go in a new place now. 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 7517fc49d..8331f95b6 100644 +index 7517fc49d9..8331f95b64 100644 --- a/configure.ac +++ b/configure.ac @@ -314,6 +314,14 @@ AC_SUBST(grubdirname) @@ -39,7 +39,7 @@ index 7517fc49d..8331f95b6 100644 if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then tmp_ac_tool_prefix="$ac_tool_prefix" diff --git a/util/bash-completion.d/Makefile.am b/util/bash-completion.d/Makefile.am -index 136287cf1..61108f054 100644 +index 136287cf1b..61108f0542 100644 --- a/util/bash-completion.d/Makefile.am +++ b/util/bash-completion.d/Makefile.am @@ -6,7 +6,6 @@ EXTRA_DIST = $(bash_completion_source) diff --git a/0015-Allow-fallback-to-include-entries-by-title-not-just-.patch b/0015-Allow-fallback-to-include-entries-by-title-not-just-.patch index 3141fea..6450a54 100644 --- a/0015-Allow-fallback-to-include-entries-by-title-not-just-.patch +++ b/0015-Allow-fallback-to-include-entries-by-title-not-just-.patch @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 58 insertions(+), 27 deletions(-) diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c -index 8397886fa..d7a222e68 100644 +index 8397886fa0..d7a222e681 100644 --- a/grub-core/normal/menu.c +++ b/grub-core/normal/menu.c @@ -163,15 +163,40 @@ grub_menu_set_timeout (int timeout) diff --git a/0016-Make-exit-take-a-return-code.patch b/0016-Make-exit-take-a-return-code.patch index a538154..654ef73 100644 --- a/0016-Make-exit-take-a-return-code.patch +++ b/0016-Make-exit-take-a-return-code.patch @@ -27,7 +27,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 14 files changed, 48 insertions(+), 21 deletions(-) diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c -index fa498931e..2bd3ac76f 100644 +index fa498931ed..2bd3ac76f2 100644 --- a/grub-core/commands/minicmd.c +++ b/grub-core/commands/minicmd.c @@ -182,12 +182,24 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)), @@ -60,7 +60,7 @@ index fa498931e..2bd3ac76f 100644 } diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 8cff7be02..05d8237a9 100644 +index 8cff7be028..05d8237a9b 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -165,11 +165,16 @@ grub_reboot (void) @@ -83,7 +83,7 @@ index 8cff7be02..05d8237a9 100644 } diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c -index 425bb9603..55ea5a11c 100644 +index 425bb96034..55ea5a11cc 100644 --- a/grub-core/kern/emu/main.c +++ b/grub-core/kern/emu/main.c @@ -67,7 +67,7 @@ grub_reboot (void) @@ -96,7 +96,7 @@ index 425bb9603..55ea5a11c 100644 grub_reboot (); } diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c -index dfd8a8ec4..0ff13bcaf 100644 +index dfd8a8ec48..0ff13bcaf8 100644 --- a/grub-core/kern/emu/misc.c +++ b/grub-core/kern/emu/misc.c @@ -151,9 +151,10 @@ xasprintf (const char *fmt, ...) @@ -113,7 +113,7 @@ index dfd8a8ec4..0ff13bcaf 100644 #endif diff --git a/grub-core/kern/i386/coreboot/init.c b/grub-core/kern/i386/coreboot/init.c -index 3314f027f..36f9134b7 100644 +index 3314f027fe..36f9134b7b 100644 --- a/grub-core/kern/i386/coreboot/init.c +++ b/grub-core/kern/i386/coreboot/init.c @@ -41,7 +41,7 @@ extern grub_uint8_t _end[]; @@ -126,7 +126,7 @@ index 3314f027f..36f9134b7 100644 /* We can't use grub_fatal() in this function. This would create an infinite loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit(). */ diff --git a/grub-core/kern/i386/qemu/init.c b/grub-core/kern/i386/qemu/init.c -index 271b6fbfa..9fafe98f0 100644 +index 271b6fbfab..9fafe98f01 100644 --- a/grub-core/kern/i386/qemu/init.c +++ b/grub-core/kern/i386/qemu/init.c @@ -42,7 +42,7 @@ extern grub_uint8_t _end[]; @@ -139,7 +139,7 @@ index 271b6fbfa..9fafe98f0 100644 /* We can't use grub_fatal() in this function. This would create an infinite loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit(). */ diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c -index d483e35ee..e71d15841 100644 +index d483e35eed..e71d158416 100644 --- a/grub-core/kern/ieee1275/init.c +++ b/grub-core/kern/ieee1275/init.c @@ -71,7 +71,7 @@ grub_addr_t grub_ieee1275_original_stack; @@ -152,7 +152,7 @@ index d483e35ee..e71d15841 100644 grub_ieee1275_exit (); } diff --git a/grub-core/kern/mips/arc/init.c b/grub-core/kern/mips/arc/init.c -index 2ed3ff319..5c40c3407 100644 +index 2ed3ff3191..5c40c34078 100644 --- a/grub-core/kern/mips/arc/init.c +++ b/grub-core/kern/mips/arc/init.c @@ -276,7 +276,7 @@ grub_halt (void) @@ -165,7 +165,7 @@ index 2ed3ff319..5c40c3407 100644 GRUB_ARC_FIRMWARE_VECTOR->exit (); diff --git a/grub-core/kern/mips/loongson/init.c b/grub-core/kern/mips/loongson/init.c -index 7b96531b9..dff598ca7 100644 +index 7b96531b98..dff598ca7b 100644 --- a/grub-core/kern/mips/loongson/init.c +++ b/grub-core/kern/mips/loongson/init.c @@ -304,7 +304,7 @@ grub_halt (void) @@ -178,7 +178,7 @@ index 7b96531b9..dff598ca7 100644 grub_halt (); } diff --git a/grub-core/kern/mips/qemu_mips/init.c b/grub-core/kern/mips/qemu_mips/init.c -index be88b77d2..8b6c55ffc 100644 +index be88b77d22..8b6c55ffc0 100644 --- a/grub-core/kern/mips/qemu_mips/init.c +++ b/grub-core/kern/mips/qemu_mips/init.c @@ -75,7 +75,7 @@ grub_machine_fini (int flags __attribute__ ((unused))) @@ -191,7 +191,7 @@ index be88b77d2..8b6c55ffc 100644 grub_halt (); } diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index 3af336ee2..63b586d09 100644 +index 3af336ee22..63b586d09c 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -1209,9 +1209,18 @@ grub_abort (void) @@ -215,7 +215,7 @@ index 3af336ee2..63b586d09 100644 grub_fatal (const char *fmt, ...) { diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c -index 3e338645c..be2a5be1d 100644 +index 3e338645c5..be2a5be1d0 100644 --- a/grub-core/kern/uboot/init.c +++ b/grub-core/kern/uboot/init.c @@ -39,9 +39,9 @@ extern grub_size_t grub_total_module_size; @@ -240,7 +240,7 @@ index 3e338645c..be2a5be1d 100644 else if (ver > API_SIG_VERSION) { diff --git a/grub-core/kern/xen/init.c b/grub-core/kern/xen/init.c -index 782ca7295..708b060f3 100644 +index 782ca72952..708b060f32 100644 --- a/grub-core/kern/xen/init.c +++ b/grub-core/kern/xen/init.c @@ -584,7 +584,7 @@ grub_machine_init (void) @@ -253,7 +253,7 @@ index 782ca7295..708b060f3 100644 struct sched_shutdown arg; diff --git a/include/grub/misc.h b/include/grub/misc.h -index 7d2b55196..fd18e6320 100644 +index 7d2b551969..fd18e6320b 100644 --- a/include/grub/misc.h +++ b/include/grub/misc.h @@ -353,7 +353,7 @@ int EXPORT_FUNC(grub_vsnprintf) (char *str, grub_size_t n, const char *fmt, diff --git a/0017-Make-efi-machines-load-an-env-block-from-a-variable.patch b/0017-Make-efi-machines-load-an-env-block-from-a-variable.patch index 7e702ad..ecfab5a 100644 --- a/0017-Make-efi-machines-load-an-env-block-from-a-variable.patch +++ b/0017-Make-efi-machines-load-an-env-block-from-a-variable.patch @@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 45d3edaa4..c865a08b0 100644 +index 45d3edaa4d..c865a08b02 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -207,6 +207,7 @@ kernel = { @@ -22,7 +22,7 @@ index 45d3edaa4..c865a08b0 100644 i386_multiboot = kern/i386/pc/acpi.c; i386_coreboot = kern/acpi.c; diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c -index 7facacf09..6d39bd3ad 100644 +index 7facacf09c..6d39bd3ad2 100644 --- a/grub-core/kern/efi/init.c +++ b/grub-core/kern/efi/init.c @@ -27,8 +27,11 @@ diff --git a/0018-Migrate-PPC-from-Yaboot-to-Grub2.patch b/0018-Migrate-PPC-from-Yaboot-to-Grub2.patch index 070e4c9..1e310e9 100644 --- a/0018-Migrate-PPC-from-Yaboot-to-Grub2.patch +++ b/0018-Migrate-PPC-from-Yaboot-to-Grub2.patch @@ -15,7 +15,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> create mode 100644 util/grub.d/20_ppc_terminfo.in diff --git a/Makefile.util.def b/Makefile.util.def -index f8b356cc1..2c9b283a2 100644 +index f8b356cc1f..2c9b283a23 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -508,6 +508,13 @@ script = { @@ -34,7 +34,7 @@ index f8b356cc1..2c9b283a2 100644 common = util/grub.d/30_os-prober.in; diff --git a/util/grub.d/20_ppc_terminfo.in b/util/grub.d/20_ppc_terminfo.in new file mode 100644 -index 000000000..10d665868 +index 0000000000..10d6658682 --- /dev/null +++ b/util/grub.d/20_ppc_terminfo.in @@ -0,0 +1,114 @@ diff --git a/0019-Add-fw_path-variable-revised.patch b/0019-Add-fw_path-variable-revised.patch index a1ea381..804938b 100644 --- a/0019-Add-fw_path-variable-revised.patch +++ b/0019-Add-fw_path-variable-revised.patch @@ -17,7 +17,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c -index 73967e2f5..d1de9fa68 100644 +index 73967e2f5b..d1de9fa687 100644 --- a/grub-core/kern/main.c +++ b/grub-core/kern/main.c @@ -128,16 +128,15 @@ grub_set_prefix_and_root (void) @@ -44,7 +44,7 @@ index 73967e2f5..d1de9fa68 100644 } diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index 70614de15..62571e6df 100644 +index 70614de156..62571e6dfc 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -339,7 +339,30 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)), diff --git a/0020-Pass-x-hex-hex-straight-through-unmolested.patch b/0020-Pass-x-hex-hex-straight-through-unmolested.patch index 853fcfd..c2623ac 100644 --- a/0020-Pass-x-hex-hex-straight-through-unmolested.patch +++ b/0020-Pass-x-hex-hex-straight-through-unmolested.patch @@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 3 files changed, 75 insertions(+), 9 deletions(-) diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c -index cc3290311..8f67a4be7 100644 +index cc3290311f..8f67a4be7f 100644 --- a/grub-core/commands/wildcard.c +++ b/grub-core/commands/wildcard.c @@ -488,6 +488,12 @@ check_file (const char *dir, const char *basename) @@ -47,7 +47,7 @@ index cc3290311..8f67a4be7 100644 *optr++ = iptr[1]; iptr += 2; diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c -index ed0b149dc..8e2294d8f 100644 +index ed0b149dca..8e2294d8ff 100644 --- a/grub-core/lib/cmdline.c +++ b/grub-core/lib/cmdline.c @@ -20,6 +20,12 @@ @@ -97,7 +97,7 @@ index ed0b149dc..8e2294d8f 100644 *buf++ = *c; diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c -index ad8039924..0c6dd9c52 100644 +index ad80399246..0c6dd9c520 100644 --- a/grub-core/script/execute.c +++ b/grub-core/script/execute.c @@ -56,6 +56,12 @@ static struct grub_script_scope *scope = 0; diff --git a/0021-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch b/0021-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch index 78ba64a..c452b5f 100644 --- a/0021-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch +++ b/0021-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch @@ -28,7 +28,7 @@ Signed-off-by: Will Thompson <wjt(a)endlessm.com> create mode 100644 grub-core/commands/loadenv.h diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index c865a08b0..c15e91943 100644 +index c865a08b02..c15e91943b 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -814,6 +814,16 @@ module = { @@ -58,7 +58,7 @@ index c865a08b0..c15e91943 100644 diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c new file mode 100644 -index 000000000..e907a6a5d +index 0000000000..e907a6a5d2 --- /dev/null +++ b/grub-core/commands/blscfg.c @@ -0,0 +1,1177 @@ @@ -1240,7 +1240,7 @@ index 000000000..e907a6a5d + grub_unregister_extcmd (oldcmd); +} diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c -index cc5971f4d..782761c31 100644 +index cc5971f4db..782761c31a 100644 --- a/grub-core/commands/legacycfg.c +++ b/grub-core/commands/legacycfg.c @@ -143,7 +143,7 @@ legacy_file (const char *filename) @@ -1263,7 +1263,7 @@ index cc5971f4d..782761c31 100644 } diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c -index 3fd664aac..163b9a090 100644 +index 3fd664aac3..163b9a0904 100644 --- a/grub-core/commands/loadenv.c +++ b/grub-core/commands/loadenv.c @@ -28,6 +28,8 @@ @@ -1358,7 +1358,7 @@ index 3fd664aac..163b9a090 100644 grub_cmd_load_env (grub_extcmd_context_t ctxt, int argc, char **args) { diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c -index 720e6d8ea..b194123eb 100644 +index 720e6d8ea3..b194123eb6 100644 --- a/grub-core/commands/menuentry.c +++ b/grub-core/commands/menuentry.c @@ -78,7 +78,7 @@ grub_normal_add_menu_entry (int argc, const char **args, @@ -1430,7 +1430,7 @@ index 720e6d8ea..b194123eb 100644 src[len - 1] = ch; args[argc - 1] = src; diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index 62571e6df..7ca2e5400 100644 +index 62571e6dfc..7ca2e5400b 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -21,6 +21,7 @@ @@ -1455,7 +1455,7 @@ index 62571e6df..7ca2e5400 100644 grub_free ((void *) entry->title); diff --git a/grub-core/commands/loadenv.h b/grub-core/commands/loadenv.h new file mode 100644 -index 000000000..952f46121 +index 0000000000..952f46121b --- /dev/null +++ b/grub-core/commands/loadenv.h @@ -0,0 +1,93 @@ @@ -1553,7 +1553,7 @@ index 000000000..952f46121 + return 0; +} diff --git a/include/grub/compiler.h b/include/grub/compiler.h -index 8f3be3ae7..ebafec689 100644 +index 8f3be3ae70..ebafec6895 100644 --- a/include/grub/compiler.h +++ b/include/grub/compiler.h @@ -56,4 +56,6 @@ @@ -1564,7 +1564,7 @@ index 8f3be3ae7..ebafec689 100644 + #endif /* ! GRUB_COMPILER_HEADER */ diff --git a/include/grub/menu.h b/include/grub/menu.h -index ee2b5e910..0acdc2aa6 100644 +index ee2b5e9104..0acdc2aa6b 100644 --- a/include/grub/menu.h +++ b/include/grub/menu.h @@ -20,6 +20,16 @@ @@ -1595,7 +1595,7 @@ index ee2b5e910..0acdc2aa6 100644 typedef struct grub_menu_entry *grub_menu_entry_t; diff --git a/include/grub/normal.h b/include/grub/normal.h -index 218cbabcc..8839ad85a 100644 +index 218cbabcca..8839ad85a1 100644 --- a/include/grub/normal.h +++ b/include/grub/normal.h @@ -145,7 +145,7 @@ grub_normal_add_menu_entry (int argc, const char **args, char **classes, diff --git a/0022-Add-devicetree-loading.patch b/0022-Add-devicetree-loading.patch index 7d9ac65..466ddba 100644 --- a/0022-Add-devicetree-loading.patch +++ b/0022-Add-devicetree-loading.patch @@ -20,7 +20,7 @@ Signed-off-by: David A. Marlin <dmarlin(a)redhat.com> 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index d3e879b8e..8ea2315eb 100644 +index d3e879b8e5..8ea2315ebc 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -248,7 +248,8 @@ export GRUB_DEFAULT \ @@ -34,7 +34,7 @@ index d3e879b8e..8ea2315eb 100644 if test "x${grub_cfg}" != "x"; then rm -f "${grub_cfg}.new" diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index e8b01c0d0..dc75a1c30 100644 +index e8b01c0d0c..dc75a1c30b 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -153,6 +153,13 @@ EOF diff --git a/0023-Enable-pager-by-default.-985860.patch b/0023-Enable-pager-by-default.-985860.patch index 24f2cbf..63cf787 100644 --- a/0023-Enable-pager-by-default.-985860.patch +++ b/0023-Enable-pager-by-default.-985860.patch @@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 2 insertions(+) diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index 93a90233e..858b526c9 100644 +index 93a90233ea..858b526c92 100644 --- a/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in @@ -43,6 +43,8 @@ if [ "x${GRUB_DEFAULT_BUTTON}" = "xsaved" ] ; then GRUB_DEFAULT_BUTTON='${saved_ diff --git a/0024-Don-t-say-GNU-Linux-in-generated-menus.patch b/0024-Don-t-say-GNU-Linux-in-generated-menus.patch index f5c783a..5b96784 100644 --- a/0024-Don-t-say-GNU-Linux-in-generated-menus.patch +++ b/0024-Don-t-say-GNU-Linux-in-generated-menus.patch @@ -3,13 +3,56 @@ From: Peter Jones <pjones(a)redhat.com> Date: Mon, 14 Mar 2011 14:27:42 -0400 Subject: [PATCH] Don't say "GNU/Linux" in generated menus. +[rharwood: say it even less] --- - util/grub.d/10_linux.in | 4 ++-- - util/grub.d/20_linux_xen.in | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) + grub-core/normal/main.c | 2 +- + tests/util/grub-shell-tester.in | 2 +- + tests/util/grub-shell.in | 2 +- + util/grub.d/10_linux.in | 4 ++-- + util/grub.d/20_linux_xen.in | 4 ++-- + 5 files changed, 7 insertions(+), 7 deletions(-) +diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c +index 7ca2e5400b..98372217ad 100644 +--- a/grub-core/normal/main.c ++++ b/grub-core/normal/main.c +@@ -218,7 +218,7 @@ grub_normal_init_page (struct grub_term_output *term, + + grub_term_cls (term); + +- msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION); ++ msg_formatted = grub_xasprintf (_("GRUB version %s"), PACKAGE_VERSION); + if (!msg_formatted) + return; + +diff --git a/tests/util/grub-shell-tester.in b/tests/util/grub-shell-tester.in +index 8a87109b15..9a4319d4f4 100644 +--- a/tests/util/grub-shell-tester.in ++++ b/tests/util/grub-shell-tester.in +@@ -56,7 +56,7 @@ for option in "$@"; do + usage + exit 0 ;; + -v | --version) +- echo "$0 (GNU GRUB ${PACKAGE_VERSION})" ++ echo "$0 (GRUB ${PACKAGE_VERSION})" + exit 0 ;; + --modules=*) + ms=`echo "$option" | sed -e 's/--modules=//'` +diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in +index 93e9f51484..ec1182bf93 100644 +--- a/tests/util/grub-shell.in ++++ b/tests/util/grub-shell.in +@@ -209,7 +209,7 @@ for option in "$@"; do + usage + exit 0 ;; + -v | --version) +- echo "$0 (GNU GRUB ${PACKAGE_VERSION})" ++ echo "$0 (GRUB ${PACKAGE_VERSION})" + exit 0 ;; + --trim) + trim=1 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index dc75a1c30..4a499c53a 100644 +index dc75a1c30b..4a499c53a6 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@" @@ -25,7 +68,7 @@ index dc75a1c30..4a499c53a 100644 fi diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in -index 3b1f47049..ada20775a 100644 +index 3b1f470492..ada20775a1 100644 --- a/util/grub.d/20_linux_xen.in +++ b/util/grub.d/20_linux_xen.in @@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@" diff --git a/0025-Add-.eh_frame-to-list-of-relocations-stripped.patch b/0025-Add-.eh_frame-to-list-of-relocations-stripped.patch index 2cdd762..0532a04 100644 --- a/0025-Add-.eh_frame-to-list-of-relocations-stripped.patch +++ b/0025-Add-.eh_frame-to-list-of-relocations-stripped.patch @@ -8,7 +8,7 @@ Subject: [PATCH] Add .eh_frame to list of relocations stripped 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/Makefile.common b/conf/Makefile.common -index 2a1a886f6..191b1a70c 100644 +index 2a1a886f6d..191b1a70c6 100644 --- a/conf/Makefile.common +++ b/conf/Makefile.common @@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding diff --git a/0026-Don-t-require-a-password-to-boot-entries-generated-b.patch b/0026-Don-t-require-a-password-to-boot-entries-generated-b.patch index 89d026f..89887c1 100644 --- a/0026-Don-t-require-a-password-to-boot-entries-generated-b.patch +++ b/0026-Don-t-require-a-password-to-boot-entries-generated-b.patch @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 4a499c53a..cf8d11869 100644 +index 4a499c53a6..cf8d118698 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -26,7 +26,7 @@ datarootdir="@datarootdir@" diff --git a/0027-use-fw_path-prefix-when-fallback-searching-for-grub-.patch b/0027-use-fw_path-prefix-when-fallback-searching-for-grub-.patch index 619cd92..1da91e1 100644 --- a/0027-use-fw_path-prefix-when-fallback-searching-for-grub-.patch +++ b/0027-use-fw_path-prefix-when-fallback-searching-for-grub-.patch @@ -17,7 +17,7 @@ Signed-off-by: Mark Salter <msalter(a)redhat.com> 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index 7ca2e5400..025775021 100644 +index 98372217ad..bf24e65713 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -347,7 +347,7 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)), diff --git a/0028-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch b/0028-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch index 54b8a05..0d77281 100644 --- a/0028-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch +++ b/0028-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch @@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 51 insertions(+), 46 deletions(-) diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index 025775021..880d0ebd4 100644 +index bf24e65713..0a99768f75 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -345,61 +345,66 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)), diff --git a/0029-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch b/0029-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch index 6ad5b7a..f22e6f9 100644 --- a/0029-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch +++ b/0029-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index cf8d11869..5f6d3c8d5 100644 +index cf8d118698..5f6d3c8d52 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -29,7 +29,8 @@ export TEXTDOMAINDIR="@localedir@" diff --git a/0030-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch b/0030-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch index 6d8d673..f4d83da 100644 --- a/0030-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch +++ b/0030-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch @@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 8 insertions(+) diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in -index 301d1ac22..0f6505bf3 100644 +index 301d1ac229..0f6505bf3b 100644 --- a/util/grub-mkconfig_lib.in +++ b/util/grub-mkconfig_lib.in @@ -253,6 +253,14 @@ version_test_gt () diff --git a/0031-Try-prefix-if-fw_path-doesn-t-work.patch b/0031-Try-prefix-if-fw_path-doesn-t-work.patch index 2abb239..a1c0d9e 100644 --- a/0031-Try-prefix-if-fw_path-doesn-t-work.patch +++ b/0031-Try-prefix-if-fw_path-doesn-t-work.patch @@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 3 files changed, 82 insertions(+), 82 deletions(-) diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c -index e71d15841..0cd2a6272 100644 +index e71d158416..0cd2a62723 100644 --- a/grub-core/kern/ieee1275/init.c +++ b/grub-core/kern/ieee1275/init.c @@ -127,23 +127,25 @@ grub_machine_get_bootlocation (char **device, char **path) @@ -56,7 +56,7 @@ index e71d15841..0cd2a6272 100644 } diff --git a/grub-core/net/net.c b/grub-core/net/net.c -index 4d3eb5c1a..0ef148f4a 100644 +index 4d3eb5c1a5..0ef148f4ad 100644 --- a/grub-core/net/net.c +++ b/grub-core/net/net.c @@ -1869,7 +1869,7 @@ grub_net_search_config_file (char *config) @@ -69,7 +69,7 @@ index 4d3eb5c1a..0ef148f4a 100644 static struct grub_preboot *fini_hnd; diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index 880d0ebd4..d5df4f815 100644 +index 0a99768f75..55558cc0b9 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -335,81 +335,79 @@ grub_enter_normal_mode (const char *config) diff --git a/0032-Use-rpm-s-sort-for-grub2-mkconfig.patch b/0032-Use-rpm-s-sort-for-grub2-mkconfig.patch index 2a1e364..9463ef8 100644 --- a/0032-Use-rpm-s-sort-for-grub2-mkconfig.patch +++ b/0032-Use-rpm-s-sort-for-grub2-mkconfig.patch @@ -29,7 +29,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> create mode 100644 docs/man/grub-rpm-sort.h2m diff --git a/configure.ac b/configure.ac -index 8331f95b6..87c8f1739 100644 +index 8331f95b64..87c8f17393 100644 --- a/configure.ac +++ b/configure.ac @@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath]) @@ -97,7 +97,7 @@ index 8331f95b6..87c8f1739 100644 echo starfield theme: Yes echo With DejaVuSans font from $DJVU_FONT_SOURCE diff --git a/Makefile.util.def b/Makefile.util.def -index 2c9b283a2..bc10cc797 100644 +index 2c9b283a23..bc10cc7972 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -703,6 +703,23 @@ program = { @@ -126,7 +126,7 @@ index 2c9b283a2..bc10cc797 100644 common = util/grub-mkconfig.in; diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c new file mode 100644 -index 000000000..f33bd1ed5 +index 0000000000..f33bd1ed56 --- /dev/null +++ b/util/grub-rpm-sort.c @@ -0,0 +1,281 @@ @@ -413,14 +413,14 @@ index 000000000..f33bd1ed5 +} diff --git a/docs/man/grub-rpm-sort.h2m b/docs/man/grub-rpm-sort.h2m new file mode 100644 -index 000000000..fe711ae10 +index 0000000000..fe711ae102 --- /dev/null +++ b/docs/man/grub-rpm-sort.h2m @@ -0,0 +1,2 @@ +[NAME] +grub-rpm-sort \- sort input according to RPM version compare diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in -index 0f6505bf3..42c2ea9ba 100644 +index 0f6505bf3b..42c2ea9ba5 100644 --- a/util/grub-mkconfig_lib.in +++ b/util/grub-mkconfig_lib.in @@ -33,6 +33,9 @@ fi diff --git a/0033-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0033-Make-grub2-mkconfig-construct-titles-that-look-like-.patch index 89a3879..db101c0 100644 --- a/0033-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +++ b/0033-Make-grub2-mkconfig-construct-titles-that-look-like-.patch @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 5f6d3c8d5..786dbabb4 100644 +index 5f6d3c8d52..786dbabb4a 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -78,6 +78,32 @@ case x"$GRUB_FS" in diff --git a/0034-Add-friendly-grub2-password-config-tool-985962.patch b/0034-Add-friendly-grub2-password-config-tool-985962.patch index 40f9738..49089f9 100644 --- a/0034-Add-friendly-grub2-password-config-tool-985962.patch +++ b/0034-Add-friendly-grub2-password-config-tool-985962.patch @@ -29,7 +29,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> create mode 100644 util/grub.d/01_users.in diff --git a/configure.ac b/configure.ac -index 87c8f1739..916bede6b 100644 +index 87c8f17393..916bede6bf 100644 --- a/configure.ac +++ b/configure.ac @@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath]) @@ -41,7 +41,7 @@ index 87c8f1739..916bede6b 100644 grub_TRANSFORM([grub-script-check]) grub_TRANSFORM([grub-set-default]) diff --git a/Makefile.util.def b/Makefile.util.def -index bc10cc797..8ca4c14f0 100644 +index bc10cc7972..8ca4c14f0b 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -452,6 +452,12 @@ script = { @@ -73,14 +73,14 @@ index bc10cc797..8ca4c14f0 100644 common = util/grub-mkconfig_lib.in; diff --git a/docs/man/grub-set-password.h2m b/docs/man/grub-set-password.h2m new file mode 100644 -index 000000000..10ee82f4d +index 0000000000..10ee82f4d5 --- /dev/null +++ b/docs/man/grub-set-password.h2m @@ -0,0 +1,2 @@ +[NAME] +grub-set-password \- generate the user.cfg file containing the hashed grub bootloader password diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 8ea2315eb..ba14cf626 100644 +index 8ea2315ebc..ba14cf6261 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -276,6 +276,8 @@ for i in "${grub_mkconfig_dir}"/* ; do @@ -94,7 +94,7 @@ index 8ea2315eb..ba14cf626 100644 echo diff --git a/util/grub-set-password.in b/util/grub-set-password.in new file mode 100644 -index 000000000..5ebf50576 +index 0000000000..5ebf50576d --- /dev/null +++ b/util/grub-set-password.in @@ -0,0 +1,128 @@ @@ -228,7 +228,7 @@ index 000000000..5ebf50576 +fi diff --git a/util/grub.d/01_users.in b/util/grub.d/01_users.in new file mode 100644 -index 000000000..db2f44bfb +index 0000000000..db2f44bfb7 --- /dev/null +++ b/util/grub.d/01_users.in @@ -0,0 +1,11 @@ diff --git a/0035-tcp-add-window-scaling-support.patch b/0035-tcp-add-window-scaling-support.patch index e19ddf8..61b5a67 100644 --- a/0035-tcp-add-window-scaling-support.patch +++ b/0035-tcp-add-window-scaling-support.patch @@ -17,7 +17,7 @@ Signed-off-by: Josef Bacik <jbacik(a)fb.com> 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/grub-core/net/tcp.c b/grub-core/net/tcp.c -index e8ad34b84..7d4b82262 100644 +index e8ad34b84d..7d4b822626 100644 --- a/grub-core/net/tcp.c +++ b/grub-core/net/tcp.c @@ -106,6 +106,18 @@ struct tcphdr diff --git a/0036-efinet-and-bootp-add-support-for-dhcpv6.patch b/0036-efinet-and-bootp-add-support-for-dhcpv6.patch index 4daf9e5..efeeee0 100644 --- a/0036-efinet-and-bootp-add-support-for-dhcpv6.patch +++ b/0036-efinet-and-bootp-add-support-for-dhcpv6.patch @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 6 files changed, 477 insertions(+), 14 deletions(-) diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c -index 6fb562702..e28fb6a09 100644 +index 6fb5627025..e28fb6a09f 100644 --- a/grub-core/net/bootp.c +++ b/grub-core/net/bootp.c @@ -902,6 +902,179 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)), @@ -198,7 +198,7 @@ index 6fb562702..e28fb6a09 100644 grub_bootp_init (void) { diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c -index 5388f952b..173fb6315 100644 +index 5388f952ba..173fb63153 100644 --- a/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c @@ -18,11 +18,14 @@ @@ -307,7 +307,7 @@ index 5388f952b..173fb6315 100644 } } diff --git a/grub-core/net/net.c b/grub-core/net/net.c -index 0ef148f4a..22f2689aa 100644 +index 0ef148f4ad..22f2689aae 100644 --- a/grub-core/net/net.c +++ b/grub-core/net/net.c @@ -960,6 +960,78 @@ grub_net_network_level_interface_register (struct grub_net_network_level_interfa @@ -390,7 +390,7 @@ index 0ef148f4a..22f2689aa 100644 grub_err_t grub_net_add_ipv4_local (struct grub_net_network_level_interface *inter, diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c -index 7f44b30f5..4ab2f5c73 100644 +index 7f44b30f52..4ab2f5c735 100644 --- a/grub-core/net/tftp.c +++ b/grub-core/net/tftp.c @@ -358,18 +358,22 @@ tftp_open (struct grub_file *file, const char *filename) @@ -417,7 +417,7 @@ index 7f44b30f5..4ab2f5c73 100644 return grub_errno; } diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h -index f1a52210c..117469450 100644 +index f1a52210c0..117469450d 100644 --- a/include/grub/efi/api.h +++ b/include/grub/efi/api.h @@ -592,10 +592,16 @@ typedef void *grub_efi_handle_t; @@ -572,7 +572,7 @@ index f1a52210c..117469450 100644 typedef struct grub_efi_pxe diff --git a/include/grub/net.h b/include/grub/net.h -index 7ae4b6bd8..8a05ec4fe 100644 +index 7ae4b6bd80..8a05ec4fe7 100644 --- a/include/grub/net.h +++ b/include/grub/net.h @@ -447,6 +447,51 @@ struct grub_net_bootp_packet diff --git a/0037-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch b/0037-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch index 80948ce..b3f5df4 100644 --- a/0037-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch +++ b/0037-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch @@ -24,7 +24,7 @@ Resolves: rhbz#1226325 create mode 100644 util/grub-get-kernel-settings.in diff --git a/configure.ac b/configure.ac -index 916bede6b..4f1676967 100644 +index 916bede6bf..4f1676967e 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,7 @@ grub_TRANSFORM([grub-install]) @@ -36,7 +36,7 @@ index 916bede6b..4f1676967 100644 grub_TRANSFORM([grub-mklayout]) grub_TRANSFORM([grub-mkpasswd-pbkdf2]) diff --git a/Makefile.util.def b/Makefile.util.def -index 8ca4c14f0..43a1c7453 100644 +index 8ca4c14f0b..43a1c7453b 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -733,6 +733,13 @@ script = { @@ -55,14 +55,14 @@ index 8ca4c14f0..43a1c7453 100644 common = util/grub-set-default.in; diff --git a/docs/man/grub-get-kernel-settings.h2m b/docs/man/grub-get-kernel-settings.h2m new file mode 100644 -index 000000000..b8051f01f +index 0000000000..b8051f01f3 --- /dev/null +++ b/docs/man/grub-get-kernel-settings.h2m @@ -0,0 +1,2 @@ +[NAME] +grub-get-kernel-settings \- Evaluate the system's kernel installation settings for use while making a grub configuration file diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completion.d/grub-completion.bash.in -index 44bf135b9..5c4acd496 100644 +index 44bf135b9f..5c4acd496d 100644 --- a/util/bash-completion.d/grub-completion.bash.in +++ b/util/bash-completion.d/grub-completion.bash.in @@ -264,6 +264,28 @@ have ${__grub_sparc64_setup_program} && \ @@ -96,7 +96,7 @@ index 44bf135b9..5c4acd496 100644 # diff --git a/util/grub-get-kernel-settings.in b/util/grub-get-kernel-settings.in new file mode 100644 -index 000000000..7e87dfccc +index 0000000000..7e87dfccc0 --- /dev/null +++ b/util/grub-get-kernel-settings.in @@ -0,0 +1,88 @@ @@ -189,7 +189,7 @@ index 000000000..7e87dfccc + echo export GRUB_UPDATE_DEFAULT_KERNEL +fi diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index ba14cf626..005f09380 100644 +index ba14cf6261..005f093809 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -45,6 +45,7 @@ grub_probe="${sbindir}/@grub_probe@" @@ -210,7 +210,7 @@ index ba14cf626..005f09380 100644 if [ -z "${GRUB_DISABLE_LINUX_UUID}" ]; then GRUB_DISABLE_LINUX_UUID="true" diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 786dbabb4..292e33332 100644 +index 786dbabb4a..292e333324 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -111,7 +111,8 @@ linux_entry () diff --git a/0038-bz1374141-fix-incorrect-mask-for-ppc64.patch b/0038-bz1374141-fix-incorrect-mask-for-ppc64.patch index feec4a6..15b2111 100644 --- a/0038-bz1374141-fix-incorrect-mask-for-ppc64.patch +++ b/0038-bz1374141-fix-incorrect-mask-for-ppc64.patch @@ -33,7 +33,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c -index ac4e62a95..3860b6f78 100644 +index ac4e62a95c..3860b6f78d 100644 --- a/grub-core/net/drivers/ieee1275/ofnet.c +++ b/grub-core/net/drivers/ieee1275/ofnet.c @@ -220,8 +220,7 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath, diff --git a/0039-Make-grub_fatal-also-backtrace.patch b/0039-Make-grub_fatal-also-backtrace.patch index ec24049..f876575 100644 --- a/0039-Make-grub_fatal-also-backtrace.patch +++ b/0039-Make-grub_fatal-also-backtrace.patch @@ -13,7 +13,7 @@ Subject: [PATCH] Make grub_fatal() also backtrace. create mode 100644 grub-core/lib/arm64/backtrace.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index c15e91943..058c88ac3 100644 +index c15e91943b..058c88ac3a 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -188,6 +188,9 @@ kernel = { @@ -27,7 +27,7 @@ index c15e91943..058c88ac3 100644 i386_xen = kern/i386/dl.c; i386_xen_pvh = kern/i386/dl.c; diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index 63b586d09..a3e215155 100644 +index 63b586d09c..a3e215155b 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -24,6 +24,7 @@ @@ -55,7 +55,7 @@ index 63b586d09..a3e215155 100644 #endif diff --git a/grub-core/lib/arm64/backtrace.c b/grub-core/lib/arm64/backtrace.c new file mode 100644 -index 000000000..1079b5380 +index 0000000000..1079b5380e --- /dev/null +++ b/grub-core/lib/arm64/backtrace.c @@ -0,0 +1,62 @@ @@ -122,7 +122,7 @@ index 000000000..1079b5380 +} + diff --git a/grub-core/lib/backtrace.c b/grub-core/lib/backtrace.c -index 825a8800e..c0ad6ab8b 100644 +index 825a8800e2..c0ad6ab8be 100644 --- a/grub-core/lib/backtrace.c +++ b/grub-core/lib/backtrace.c @@ -29,6 +29,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); @@ -142,7 +142,7 @@ index 825a8800e..c0ad6ab8b 100644 } diff --git a/grub-core/lib/i386/backtrace.c b/grub-core/lib/i386/backtrace.c -index c3e03c727..c67273db3 100644 +index c3e03c7275..c67273db3a 100644 --- a/grub-core/lib/i386/backtrace.c +++ b/grub-core/lib/i386/backtrace.c @@ -15,11 +15,23 @@ diff --git a/0040-Make-our-info-pages-say-grub2-where-appropriate.patch b/0040-Make-our-info-pages-say-grub2-where-appropriate.patch index eda8d45..afba285 100644 --- a/0040-Make-our-info-pages-say-grub2-where-appropriate.patch +++ b/0040-Make-our-info-pages-say-grub2-where-appropriate.patch @@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 171 insertions(+), 154 deletions(-) diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi -index 6c629a23e..19f708ee6 100644 +index 6c629a23e2..19f708ee66 100644 --- a/docs/grub-dev.texi +++ b/docs/grub-dev.texi @@ -1,7 +1,7 @@ @@ -35,7 +35,7 @@ index 6c629a23e..19f708ee6 100644 @setchapternewpage odd diff --git a/docs/grub.texi b/docs/grub.texi -index 69f08d289..0615d0ed9 100644 +index 69f08d289f..0615d0ed97 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -1,7 +1,7 @@ diff --git a/0041-macos-just-build-chainloader-entries-don-t-try-any-x.patch b/0041-macos-just-build-chainloader-entries-don-t-try-any-x.patch index 5610661..8d3139d 100644 --- a/0041-macos-just-build-chainloader-entries-don-t-try-any-x.patch +++ b/0041-macos-just-build-chainloader-entries-don-t-try-any-x.patch @@ -20,7 +20,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 18 insertions(+), 60 deletions(-) diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in -index 1b91c102f..4b27bd201 100644 +index 1b91c102f3..4b27bd2015 100644 --- a/util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in @@ -42,68 +42,25 @@ if [ -z "${OSPROBED}" ] ; then diff --git a/0042-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch b/0042-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch index bea6e32..57d2391 100644 --- a/0042-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch +++ b/0042-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch @@ -24,7 +24,7 @@ Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> 2 files changed, 533 insertions(+), 20 deletions(-) diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index 63203034d..f1fff7385 100644 +index 63203034df..f1fff7385b 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -38,6 +38,9 @@ @@ -690,7 +690,7 @@ index 63203034d..f1fff7385 100644 + +// vim: si et sw=2: diff --git a/include/grub/btrfs.h b/include/grub/btrfs.h -index 9d93fb6c1..234ad9767 100644 +index 9d93fb6c18..234ad97677 100644 --- a/include/grub/btrfs.h +++ b/include/grub/btrfs.h @@ -29,6 +29,7 @@ enum diff --git a/0043-export-btrfs_subvol-and-btrfs_subvolid.patch b/0043-export-btrfs_subvol-and-btrfs_subvolid.patch index 61d1699..719866e 100644 --- a/0043-export-btrfs_subvol-and-btrfs_subvolid.patch +++ b/0043-export-btrfs_subvol-and-btrfs_subvolid.patch @@ -12,7 +12,7 @@ Signed-off-by: Michael Chang <mchang(a)suse.com> 1 file changed, 2 insertions(+) diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index f1fff7385..ad1b56b71 100644 +index f1fff7385b..ad1b56b716 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -2714,6 +2714,8 @@ GRUB_MOD_INIT (btrfs) diff --git a/0044-grub2-btrfs-03-follow_default.patch b/0044-grub2-btrfs-03-follow_default.patch index f9a935e..621f029 100644 --- a/0044-grub2-btrfs-03-follow_default.patch +++ b/0044-grub2-btrfs-03-follow_default.patch @@ -10,7 +10,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 76 insertions(+), 31 deletions(-) diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index ad1b56b71..113c1f746 100644 +index ad1b56b716..113c1f746c 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -1256,6 +1256,7 @@ grub_btrfs_mount (grub_device_t dev) diff --git a/0045-grub2-btrfs-04-grub2-install.patch b/0045-grub2-btrfs-04-grub2-install.patch index 2ce64b1..6b2bc78 100644 --- a/0045-grub2-btrfs-04-grub2-install.patch +++ b/0045-grub2-btrfs-04-grub2-install.patch @@ -15,7 +15,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 6 files changed, 54 insertions(+), 2 deletions(-) diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c -index 001b818fe..caf9b1ccd 100644 +index 001b818fe5..caf9b1ccd3 100644 --- a/grub-core/osdep/linux/getroot.c +++ b/grub-core/osdep/linux/getroot.c @@ -376,6 +376,7 @@ get_btrfs_fs_prefix (const char *mount_path) @@ -40,7 +40,7 @@ index 001b818fe..caf9b1ccd 100644 else if (!retry && grub_strcmp (entries[i].fstype, "autofs") == 0) { diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c -index 7d6325138..46a881530 100644 +index 7d6325138c..46a881530c 100644 --- a/grub-core/osdep/unix/config.c +++ b/grub-core/osdep/unix/config.c @@ -82,6 +82,19 @@ grub_util_load_config (struct grub_util_config *cfg) @@ -75,7 +75,7 @@ index 7d6325138..46a881530 100644 argv[2] = script; argv[3] = '\0'; diff --git a/util/config.c b/util/config.c -index ebcdd8f5e..f044a880a 100644 +index ebcdd8f5e2..f044a880a7 100644 --- a/util/config.c +++ b/util/config.c @@ -42,6 +42,16 @@ grub_util_parse_config (FILE *f, struct grub_util_config *cfg, int simple) @@ -96,7 +96,7 @@ index ebcdd8f5e..f044a880a 100644 sizeof ("GRUB_DISTRIBUTOR=") - 1) == 0) { diff --git a/util/grub-install.c b/util/grub-install.c -index 0fbe7f78c..0f66f36d2 100644 +index 0fbe7f78c6..0f66f36d23 100644 --- a/util/grub-install.c +++ b/util/grub-install.c @@ -827,6 +827,8 @@ fill_core_services (const char *core_services) @@ -136,7 +136,7 @@ index 0fbe7f78c..0f66f36d2 100644 char *install_drive = NULL; diff --git a/util/grub-mkrelpath.c b/util/grub-mkrelpath.c -index 47a241a39..5db7a9a7d 100644 +index 47a241a391..5db7a9a7d9 100644 --- a/util/grub-mkrelpath.c +++ b/util/grub-mkrelpath.c @@ -40,9 +40,12 @@ struct arguments @@ -163,7 +163,7 @@ index 47a241a39..5db7a9a7d 100644 if (state->arg_num == 0) arguments->pathname = xstrdup (arg); diff --git a/include/grub/emu/config.h b/include/grub/emu/config.h -index 875d5896c..c9a7e5f4a 100644 +index 875d5896ce..c9a7e5f4ad 100644 --- a/include/grub/emu/config.h +++ b/include/grub/emu/config.h @@ -37,6 +37,7 @@ struct grub_util_config diff --git a/0046-grub2-btrfs-05-grub2-mkconfig.patch b/0046-grub2-btrfs-05-grub2-mkconfig.patch index 08b5224..06d15a7 100644 --- a/0046-grub2-btrfs-05-grub2-mkconfig.patch +++ b/0046-grub2-btrfs-05-grub2-mkconfig.patch @@ -13,7 +13,7 @@ Signed-off-by: Michael Chang <mchang(a)suse.com> 5 files changed, 38 insertions(+), 2 deletions(-) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 005f09380..535c0f024 100644 +index 005f093809..535c0f0249 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -252,7 +252,8 @@ export GRUB_DEFAULT \ @@ -27,7 +27,7 @@ index 005f09380..535c0f024 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 42c2ea9ba..fafeac950 100644 +index 42c2ea9ba5..fafeac9506 100644 --- a/util/grub-mkconfig_lib.in +++ b/util/grub-mkconfig_lib.in @@ -52,7 +52,11 @@ grub_warn () @@ -43,7 +43,7 @@ index 42c2ea9ba..fafeac950 100644 is_path_readable_by_grub () diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index 858b526c9..de727e6ee 100644 +index 858b526c92..de727e6ee6 100644 --- a/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in @@ -27,6 +27,14 @@ export TEXTDOMAINDIR="@localedir@" @@ -90,7 +90,7 @@ index 858b526c9..de727e6ee 100644 +EOF +fi diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 292e33332..7bb3a211a 100644 +index 292e333324..7bb3a211a7 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -66,10 +66,14 @@ fi @@ -109,7 +109,7 @@ index 292e33332..7bb3a211a 100644 xzfs) rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true` diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in -index ada20775a..e9e73b815 100644 +index ada20775a1..e9e73b815f 100644 --- a/util/grub.d/20_linux_xen.in +++ b/util/grub.d/20_linux_xen.in @@ -73,10 +73,14 @@ fi diff --git a/0047-grub2-btrfs-06-subvol-mount.patch b/0047-grub2-btrfs-06-subvol-mount.patch index d36c966..8cdf247 100644 --- a/0047-grub2-btrfs-06-subvol-mount.patch +++ b/0047-grub2-btrfs-06-subvol-mount.patch @@ -13,7 +13,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 4 files changed, 392 insertions(+), 5 deletions(-) diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index 113c1f746..d323746ec 100644 +index 113c1f746c..d323746ecf 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -41,6 +41,7 @@ @@ -279,7 +279,7 @@ index 113c1f746..d323746ec 100644 grub_cmd_btrfs_list_subvols, 0, "[-p|-n] [-o var] DEVICE", diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c -index caf9b1ccd..28790307e 100644 +index caf9b1ccd3..28790307e0 100644 --- a/grub-core/osdep/linux/getroot.c +++ b/grub-core/osdep/linux/getroot.c @@ -107,6 +107,14 @@ struct btrfs_ioctl_search_key @@ -462,7 +462,7 @@ index caf9b1ccd..28790307e 100644 grub_make_system_path_relative_to_its_root_os (const char *path) { diff --git a/util/grub-install.c b/util/grub-install.c -index 0f66f36d2..84ed6e88e 100644 +index 0f66f36d23..84ed6e88ec 100644 --- a/util/grub-install.c +++ b/util/grub-install.c @@ -1569,6 +1569,55 @@ main (int argc, char *argv[]) @@ -522,7 +522,7 @@ index 0f66f36d2..84ed6e88e 100644 const char *core_name = NULL; diff --git a/include/grub/emu/getroot.h b/include/grub/emu/getroot.h -index 73fa2d34a..9c642ae3f 100644 +index 73fa2d34ab..9c642ae3fe 100644 --- a/include/grub/emu/getroot.h +++ b/include/grub/emu/getroot.h @@ -53,6 +53,11 @@ char ** diff --git a/0048-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch b/0048-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch index 8e56f31..a5db09a 100644 --- a/0048-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch +++ b/0048-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch @@ -10,7 +10,7 @@ Ref: bsc#953538 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index d323746ec..673ded035 100644 +index d323746ecf..673ded0352 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -1260,11 +1260,41 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path) diff --git a/0049-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch b/0049-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch index 49d8972..99c106d 100644 --- a/0049-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch +++ b/0049-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch @@ -10,7 +10,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 238 insertions(+) diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index 673ded035..2b21cbaa6 100644 +index 673ded0352..2b21cbaa67 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -2887,6 +2887,238 @@ out: diff --git a/0050-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch b/0050-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch index 071fa4e..d07dd27 100644 --- a/0050-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch +++ b/0050-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch @@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h -index 585fa6662..03f9a9d01 100644 +index 585fa6662b..03f9a9d011 100644 --- a/include/grub/efi/efi.h +++ b/include/grub/efi/efi.h @@ -24,6 +24,10 @@ diff --git a/0051-Use-grub_efi_.-memory-helpers-where-reasonable.patch b/0051-Use-grub_efi_.-memory-helpers-where-reasonable.patch index 11c7c27..2a3d27b 100644 --- a/0051-Use-grub_efi_.-memory-helpers-where-reasonable.patch +++ b/0051-Use-grub_efi_.-memory-helpers-where-reasonable.patch @@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index 07c493789..89ac84cc6 100644 +index 07c4937898..89ac84cc66 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -65,7 +65,7 @@ grub_chainloader_unload (void) diff --git a/0052-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch b/0052-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch index 5afc095..f649c8c 100644 --- a/0052-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch +++ b/0052-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index 89ac84cc6..ac8dfd40c 100644 +index 89ac84cc66..ac8dfd40c6 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -810,7 +810,8 @@ handle_image (void *data, grub_efi_uint32_t datasize) @@ -26,7 +26,7 @@ index 89ac84cc6..ac8dfd40c 100644 efi_status = grub_efi_free_pool (buffer); diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h -index 117469450..996288014 100644 +index 117469450d..9962880147 100644 --- a/include/grub/efi/api.h +++ b/include/grub/efi/api.h @@ -546,7 +546,16 @@ typedef grub_uint64_t grub_efi_uint64_t; diff --git a/0053-don-t-use-int-for-efi-status.patch b/0053-don-t-use-int-for-efi-status.patch index 808823e..4d48e37 100644 --- a/0053-don-t-use-int-for-efi-status.patch +++ b/0053-don-t-use-int-for-efi-status.patch @@ -8,7 +8,7 @@ Subject: [PATCH] don't use int for efi status 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 05d8237a9..ae9885edb 100644 +index 05d8237a9b..ae9885edb8 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -167,7 +167,7 @@ grub_reboot (void) diff --git a/0054-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch b/0054-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch index ce03b0b..fb71ea5 100644 --- a/0054-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch +++ b/0054-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch @@ -8,7 +8,7 @@ Subject: [PATCH] make GRUB_MOD_INIT() declare its function prototypes. 1 file changed, 2 insertions(+) diff --git a/include/grub/dl.h b/include/grub/dl.h -index b3753c9ca..91933b85f 100644 +index b3753c9ca2..91933b85f2 100644 --- a/include/grub/dl.h +++ b/include/grub/dl.h @@ -54,6 +54,7 @@ grub_mod_fini (void) diff --git a/0055-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch b/0055-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch index 974f5eb..ae8a8c6 100644 --- a/0055-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch +++ b/0055-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch @@ -16,7 +16,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/util/grub-install.c b/util/grub-install.c -index 84ed6e88e..a2bec7446 100644 +index 84ed6e88ec..a2bec7446c 100644 --- a/util/grub-install.c +++ b/util/grub-install.c @@ -1190,18 +1190,8 @@ main (int argc, char *argv[]) diff --git a/0056-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch b/0056-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch index b9902f2..cd58ff4 100644 --- a/0056-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch +++ b/0056-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch @@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 5 insertions(+) diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in -index e9e73b815..c23b064be 100644 +index e9e73b815f..c23b064be6 100644 --- a/util/grub.d/20_linux_xen.in +++ b/util/grub.d/20_linux_xen.in @@ -153,6 +153,7 @@ linux_entry_xsm () diff --git a/0057-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch b/0057-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch index 0632696..beef0f3 100644 --- a/0057-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch +++ b/0057-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch @@ -63,7 +63,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 89 insertions(+), 20 deletions(-) diff --git a/grub-core/kern/i386/tsc_pmtimer.c b/grub-core/kern/i386/tsc_pmtimer.c -index c9c361699..ca15c3aac 100644 +index c9c3616997..ca15c3aacd 100644 --- a/grub-core/kern/i386/tsc_pmtimer.c +++ b/grub-core/kern/i386/tsc_pmtimer.c @@ -28,40 +28,101 @@ diff --git a/0058-align-struct-efi_variable-better.patch b/0058-align-struct-efi_variable-better.patch index bbadf71..361cb13 100644 --- a/0058-align-struct-efi_variable-better.patch +++ b/0058-align-struct-efi_variable-better.patch @@ -9,7 +9,7 @@ Subject: [PATCH] align struct efi_variable better... 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h -index 36d2dedf4..9d93ba88b 100644 +index 36d2dedf47..9d93ba88ba 100644 --- a/include/grub/efiemu/runtime.h +++ b/include/grub/efiemu/runtime.h @@ -33,5 +33,5 @@ struct efi_variable @@ -20,7 +20,7 @@ index 36d2dedf4..9d93ba88b 100644 +} GRUB_PACKED GRUB_ALIGNED(8); #endif /* ! GRUB_EFI_EMU_RUNTIME_HEADER */ diff --git a/include/grub/types.h b/include/grub/types.h -index 0a3ff1591..ba446d990 100644 +index 0a3ff15913..ba446d9904 100644 --- a/include/grub/types.h +++ b/include/grub/types.h @@ -29,6 +29,7 @@ diff --git a/0059-Add-BLS-support-to-grub-mkconfig.patch b/0059-Add-BLS-support-to-grub-mkconfig.patch index ba68046..4c3f56f 100644 --- a/0059-Add-BLS-support-to-grub-mkconfig.patch +++ b/0059-Add-BLS-support-to-grub-mkconfig.patch @@ -33,7 +33,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 3 files changed, 243 insertions(+), 6 deletions(-) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 535c0f024..f55339a3f 100644 +index 535c0f0249..f55339a3f6 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -50,6 +50,8 @@ grub_get_kernel_settings="${sbindir}/@grub_get_kernel_settings@" @@ -74,7 +74,7 @@ index 535c0f024..f55339a3f 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 fafeac950..d8bb40693 100644 +index fafeac9506..d8bb406936 100644 --- a/util/grub-mkconfig_lib.in +++ b/util/grub-mkconfig_lib.in @@ -30,6 +30,9 @@ fi @@ -131,7 +131,7 @@ index fafeac950..d8bb40693 100644 fi IFS="$old_ifs" diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 7bb3a211a..f1548a260 100644 +index 7bb3a211a7..f1548a2605 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -82,6 +82,218 @@ case x"$GRUB_FS" in diff --git a/0060-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch b/0060-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch index c1cdd3c..1ac900c 100644 --- a/0060-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch +++ b/0060-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch @@ -12,7 +12,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index a3e215155..c60601b69 100644 +index a3e215155b..c60601b699 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -1201,7 +1201,7 @@ static void __attribute__ ((noreturn)) diff --git a/0061-Add-linux-and-initrd-commands-for-grub-emu.patch b/0061-Add-linux-and-initrd-commands-for-grub-emu.patch index 25838e7..419fde3 100644 --- a/0061-Add-linux-and-initrd-commands-for-grub-emu.patch +++ b/0061-Add-linux-and-initrd-commands-for-grub-emu.patch @@ -21,7 +21,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> create mode 100644 grub-core/loader/emu/linux.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 058c88ac3..5354f9613 100644 +index 058c88ac3a..5354f9613d 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -1826,7 +1826,6 @@ module = { @@ -33,7 +33,7 @@ index 058c88ac3..5354f9613 100644 efi = loader/efi/linux.c; }; diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c -index 55ea5a11c..846fe9715 100644 +index 55ea5a11cc..846fe9715e 100644 --- a/grub-core/kern/emu/main.c +++ b/grub-core/kern/emu/main.c @@ -107,6 +107,7 @@ static struct argp_option options[] = { @@ -55,7 +55,7 @@ index 55ea5a11c..846fe9715 100644 case ARGP_KEY_ARG: { diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c -index 0ff13bcaf..eeea09275 100644 +index 0ff13bcaf8..eeea092752 100644 --- a/grub-core/kern/emu/misc.c +++ b/grub-core/kern/emu/misc.c @@ -39,6 +39,7 @@ @@ -103,7 +103,7 @@ index 0ff13bcaf..eeea09275 100644 +} diff --git a/grub-core/loader/emu/linux.c b/grub-core/loader/emu/linux.c new file mode 100644 -index 000000000..fda9e00d2 +index 0000000000..fda9e00d24 --- /dev/null +++ b/grub-core/loader/emu/linux.c @@ -0,0 +1,172 @@ @@ -280,7 +280,7 @@ index 000000000..fda9e00d2 + grub_unregister_command (cmd_initrd); +} diff --git a/include/grub/emu/exec.h b/include/grub/emu/exec.h -index d1073ef86..1b61b4a2e 100644 +index d1073ef86a..1b61b4a2e5 100644 --- a/include/grub/emu/exec.h +++ b/include/grub/emu/exec.h @@ -23,6 +23,8 @@ @@ -302,7 +302,7 @@ index d1073ef86..1b61b4a2e 100644 grub_util_exec_redirect (const char *const *argv, const char *stdin_file, const char *stdout_file); diff --git a/include/grub/emu/hostfile.h b/include/grub/emu/hostfile.h -index cfb1e2b56..a61568e36 100644 +index cfb1e2b566..a61568e36e 100644 --- a/include/grub/emu/hostfile.h +++ b/include/grub/emu/hostfile.h @@ -22,6 +22,7 @@ @@ -323,7 +323,7 @@ index cfb1e2b56..a61568e36 100644 char * grub_util_path_concat (size_t n, ...); diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h -index ff9c48a64..01056954b 100644 +index ff9c48a649..01056954b9 100644 --- a/include/grub/emu/misc.h +++ b/include/grub/emu/misc.h @@ -57,6 +57,9 @@ void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...) __attribute__ ((format ( @@ -337,7 +337,7 @@ index ff9c48a64..01056954b 100644 #ifdef HAVE_DEVICE_MAPPER diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am -index ee88e44e9..80e7a83ed 100644 +index ee88e44e97..80e7a83edf 100644 --- a/grub-core/Makefile.am +++ b/grub-core/Makefile.am @@ -307,6 +307,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/net.h diff --git a/0062-Add-grub2-switch-to-blscfg.patch b/0062-Add-grub2-switch-to-blscfg.patch index e353259..e3144df 100644 --- a/0062-Add-grub2-switch-to-blscfg.patch +++ b/0062-Add-grub2-switch-to-blscfg.patch @@ -20,7 +20,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> create mode 100644 util/grub-switch-to-blscfg.in diff --git a/Makefile.util.def b/Makefile.util.def -index 43a1c7453..a90879fa9 100644 +index 43a1c7453b..a90879fa9b 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -1365,6 +1365,13 @@ program = { @@ -39,14 +39,14 @@ index 43a1c7453..a90879fa9 100644 mansection = 1; diff --git a/docs/man/grub-switch-to-blscfg.h2m b/docs/man/grub-switch-to-blscfg.h2m new file mode 100644 -index 000000000..fa341426a +index 0000000000..fa341426a5 --- /dev/null +++ b/docs/man/grub-switch-to-blscfg.h2m @@ -0,0 +1,2 @@ +[NAME] +grub-switch-to-blscfg \- switch to using BLS config files diff --git a/util/grub-set-password.in b/util/grub-set-password.in -index 5ebf50576..c0b5ebbfd 100644 +index 5ebf50576d..c0b5ebbfdc 100644 --- a/util/grub-set-password.in +++ b/util/grub-set-password.in @@ -1,6 +1,6 @@ @@ -59,7 +59,7 @@ index 5ebf50576..c0b5ebbfd 100644 else diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in new file mode 100644 -index 000000000..a851424be +index 0000000000..a851424beb --- /dev/null +++ b/util/grub-switch-to-blscfg.in @@ -0,0 +1,317 @@ @@ -381,7 +381,7 @@ index 000000000..a851424be +# Bye. +exit 0 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index f1548a260..c02c1f082 100644 +index f1548a2605..c02c1f0820 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -138,7 +138,7 @@ blsdir="/boot/loader/entries" diff --git a/0063-make-better-backtraces.patch b/0063-make-better-backtraces.patch index 06a0a45..ffdb895 100644 --- a/0063-make-better-backtraces.patch +++ b/0063-make-better-backtraces.patch @@ -38,7 +38,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> delete mode 100644 grub-core/lib/i386/backtrace.c diff --git a/Makefile.util.def b/Makefile.util.def -index a90879fa9..48512bc63 100644 +index a90879fa9b..48512bc631 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -51,6 +51,12 @@ library = { @@ -55,7 +55,7 @@ index a90879fa9..48512bc63 100644 library = { diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 5354f9613..4b7c45a7b 100644 +index 5354f9613d..4b7c45a7b0 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -142,6 +142,12 @@ kernel = { @@ -103,7 +103,7 @@ diff --git a/grub-core/lib/backtrace.c b/grub-core/commands/backtrace.c similarity index 98% rename from grub-core/lib/backtrace.c rename to grub-core/commands/backtrace.c -index c0ad6ab8b..8b5ec3913 100644 +index c0ad6ab8be..8b5ec3913b 100644 --- a/grub-core/lib/backtrace.c +++ b/grub-core/commands/backtrace.c @@ -54,7 +54,7 @@ grub_cmd_backtrace (grub_command_t cmd __attribute__ ((unused)), @@ -116,7 +116,7 @@ index c0ad6ab8b..8b5ec3913 100644 } diff --git a/grub-core/gdb/cstub.c b/grub-core/gdb/cstub.c -index b64acd70f..99281472d 100644 +index b64acd70fe..99281472d3 100644 --- a/grub-core/gdb/cstub.c +++ b/grub-core/gdb/cstub.c @@ -215,7 +215,6 @@ grub_gdb_trap (int trap_no) @@ -129,7 +129,7 @@ index b64acd70f..99281472d 100644 diff --git a/grub-core/kern/arm64/backtrace.c b/grub-core/kern/arm64/backtrace.c new file mode 100644 -index 000000000..019c6fdfe +index 0000000000..019c6fdfef --- /dev/null +++ b/grub-core/kern/arm64/backtrace.c @@ -0,0 +1,94 @@ @@ -229,7 +229,7 @@ index 000000000..019c6fdfe +} diff --git a/grub-core/kern/backtrace.c b/grub-core/kern/backtrace.c new file mode 100644 -index 000000000..4a82e865c +index 0000000000..4a82e865cc --- /dev/null +++ b/grub-core/kern/backtrace.c @@ -0,0 +1,97 @@ @@ -331,7 +331,7 @@ index 000000000..4a82e865c + grub_backtrace (skip + 1); +} diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c -index 7afb9e6f7..88d207770 100644 +index 7afb9e6f72..88d2077709 100644 --- a/grub-core/kern/dl.c +++ b/grub-core/kern/dl.c @@ -124,6 +124,50 @@ grub_dl_resolve_symbol (const char *name) @@ -395,7 +395,7 @@ index 7afb9e6f7..88d207770 100644 i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize)) diff --git a/grub-core/kern/i386/backtrace.c b/grub-core/kern/i386/backtrace.c new file mode 100644 -index 000000000..2413f9a57 +index 0000000000..2413f9a57d --- /dev/null +++ b/grub-core/kern/i386/backtrace.c @@ -0,0 +1,125 @@ @@ -525,7 +525,7 @@ index 000000000..2413f9a57 +#endif +} diff --git a/grub-core/kern/i386/pc/init.c b/grub-core/kern/i386/pc/init.c -index 27bc68b8a..b51d0abfa 100644 +index 27bc68b8a5..b51d0abfa6 100644 --- a/grub-core/kern/i386/pc/init.c +++ b/grub-core/kern/i386/pc/init.c @@ -153,7 +153,7 @@ compact_mem_regions (void) @@ -547,7 +547,7 @@ index 27bc68b8a..b51d0abfa 100644 /* Initialize the console as early as possible. */ grub_console_init (); diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c -index 0cd2a6272..937c1bc44 100644 +index 0cd2a62723..937c1bc44c 100644 --- a/grub-core/kern/ieee1275/init.c +++ b/grub-core/kern/ieee1275/init.c @@ -63,7 +63,6 @@ @@ -559,7 +559,7 @@ index 0cd2a6272..937c1bc44 100644 #ifdef __sparc__ diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index c60601b69..a432a6be5 100644 +index c60601b699..a432a6be54 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -1197,15 +1197,15 @@ grub_printf_fmt_check (const char *fmt, const char *fmt_expected) @@ -593,7 +593,7 @@ index c60601b69..a432a6be5 100644 grub_vprintf (_(fmt), ap); va_end (ap); diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c -index c070afc62..d8c837757 100644 +index c070afc621..d8c8377578 100644 --- a/grub-core/kern/mm.c +++ b/grub-core/kern/mm.c @@ -97,13 +97,13 @@ get_header_from_pointer (void *ptr, grub_mm_header_t *p, grub_mm_region_t *r) @@ -615,7 +615,7 @@ index c070afc62..d8c837757 100644 diff --git a/grub-core/lib/arm64/backtrace.c b/grub-core/lib/arm64/backtrace.c deleted file mode 100644 -index 1079b5380..000000000 +index 1079b5380e..0000000000 --- a/grub-core/lib/arm64/backtrace.c +++ /dev/null @@ -1,62 +0,0 @@ @@ -683,7 +683,7 @@ index 1079b5380..000000000 - diff --git a/grub-core/lib/i386/backtrace.c b/grub-core/lib/i386/backtrace.c deleted file mode 100644 -index c67273db3..000000000 +index c67273db3a..0000000000 --- a/grub-core/lib/i386/backtrace.c +++ /dev/null @@ -1,78 +0,0 @@ @@ -766,7 +766,7 @@ index c67273db3..000000000 -} - diff --git a/include/grub/backtrace.h b/include/grub/backtrace.h -index 395519762..275cf85e2 100644 +index 395519762f..275cf85e2d 100644 --- a/include/grub/backtrace.h +++ b/include/grub/backtrace.h @@ -19,8 +19,14 @@ @@ -787,7 +787,7 @@ index 395519762..275cf85e2 100644 #endif diff --git a/include/grub/dl.h b/include/grub/dl.h -index 91933b85f..2f76e6b04 100644 +index 91933b85f2..2f76e6b043 100644 --- a/include/grub/dl.h +++ b/include/grub/dl.h @@ -259,6 +259,8 @@ grub_dl_is_persistent (grub_dl_t mod) @@ -800,7 +800,7 @@ index 91933b85f..2f76e6b04 100644 int isfunc, grub_dl_t mod); diff --git a/include/grub/kernel.h b/include/grub/kernel.h -index abbca5ea3..300a9766c 100644 +index abbca5ea33..300a9766cd 100644 --- a/include/grub/kernel.h +++ b/include/grub/kernel.h @@ -111,6 +111,9 @@ grub_addr_t grub_modules_get_end (void); @@ -814,7 +814,7 @@ index abbca5ea3..300a9766c 100644 void grub_main (void) __attribute__ ((noreturn)); diff --git a/grub-core/kern/arm/efi/startup.S b/grub-core/kern/arm/efi/startup.S -index 9f8265315..f3bc41f9d 100644 +index 9f8265315a..f3bc41f9d0 100644 --- a/grub-core/kern/arm/efi/startup.S +++ b/grub-core/kern/arm/efi/startup.S @@ -23,6 +23,8 @@ @@ -827,7 +827,7 @@ index 9f8265315..f3bc41f9d 100644 /* * EFI_SYSTEM_TABLE and EFI_HANDLE are passed in r1/r0. diff --git a/grub-core/kern/arm/startup.S b/grub-core/kern/arm/startup.S -index 3946fe8e1..5679a1d00 100644 +index 3946fe8e18..5679a1d00a 100644 --- a/grub-core/kern/arm/startup.S +++ b/grub-core/kern/arm/startup.S @@ -48,6 +48,8 @@ @@ -840,7 +840,7 @@ index 3946fe8e1..5679a1d00 100644 b codestart diff --git a/grub-core/kern/arm64/efi/startup.S b/grub-core/kern/arm64/efi/startup.S -index 666a7ee3c..41676bdb2 100644 +index 666a7ee3c9..41676bdb2b 100644 --- a/grub-core/kern/arm64/efi/startup.S +++ b/grub-core/kern/arm64/efi/startup.S @@ -19,7 +19,9 @@ @@ -854,7 +854,7 @@ index 666a7ee3c..41676bdb2 100644 /* * EFI_SYSTEM_TABLE and EFI_HANDLE are passed in x1/x0. diff --git a/grub-core/kern/i386/qemu/startup.S b/grub-core/kern/i386/qemu/startup.S -index 0d89858d9..939f182fc 100644 +index 0d89858d9b..939f182fc7 100644 --- a/grub-core/kern/i386/qemu/startup.S +++ b/grub-core/kern/i386/qemu/startup.S @@ -24,7 +24,8 @@ @@ -868,7 +868,7 @@ index 0d89858d9..939f182fc 100644 jmp codestart diff --git a/grub-core/kern/ia64/efi/startup.S b/grub-core/kern/ia64/efi/startup.S -index d75c6d7cc..8f2a593e5 100644 +index d75c6d7cc7..8f2a593e52 100644 --- a/grub-core/kern/ia64/efi/startup.S +++ b/grub-core/kern/ia64/efi/startup.S @@ -24,8 +24,9 @@ @@ -883,7 +883,7 @@ index d75c6d7cc..8f2a593e5 100644 alloc loc0=ar.pfs,2,4,0,0 mov loc1=rp diff --git a/grub-core/kern/sparc64/ieee1275/crt0.S b/grub-core/kern/sparc64/ieee1275/crt0.S -index 03b916f05..701bf63ab 100644 +index 03b916f053..701bf63abc 100644 --- a/grub-core/kern/sparc64/ieee1275/crt0.S +++ b/grub-core/kern/sparc64/ieee1275/crt0.S @@ -22,7 +22,8 @@ @@ -897,7 +897,7 @@ index 03b916f05..701bf63ab 100644 ba codestart mov %o4, %o0 diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am -index 80e7a83ed..f512573c0 100644 +index 80e7a83edf..f512573c0d 100644 --- a/grub-core/Makefile.am +++ b/grub-core/Makefile.am @@ -66,6 +66,7 @@ CLEANFILES += grub_script.yy.c grub_script.yy.h diff --git a/0064-normal-don-t-draw-our-startup-message-if-debug-is-se.patch b/0064-normal-don-t-draw-our-startup-message-if-debug-is-se.patch index d872cb8..a916299 100644 --- a/0064-normal-don-t-draw-our-startup-message-if-debug-is-se.patch +++ b/0064-normal-don-t-draw-our-startup-message-if-debug-is-se.patch @@ -8,7 +8,7 @@ Subject: [PATCH] normal: don't draw our startup message if debug is set 1 file changed, 3 insertions(+) diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index d5df4f815..1970e4816 100644 +index 55558cc0b9..af9792c963 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -430,6 +430,9 @@ grub_normal_reader_init (int nested) diff --git a/0065-Work-around-some-minor-include-path-weirdnesses.patch b/0065-Work-around-some-minor-include-path-weirdnesses.patch index 589f335..c7ae8d0 100644 --- a/0065-Work-around-some-minor-include-path-weirdnesses.patch +++ b/0065-Work-around-some-minor-include-path-weirdnesses.patch @@ -17,7 +17,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> diff --git a/include/grub/arm/efi/console.h b/include/grub/arm/efi/console.h new file mode 100644 -index 000000000..1592f6f76 +index 0000000000..1592f6f76b --- /dev/null +++ b/include/grub/arm/efi/console.h @@ -0,0 +1,24 @@ @@ -47,7 +47,7 @@ index 000000000..1592f6f76 +#endif /* ! GRUB_ARM_EFI_CONSOLE_H */ diff --git a/include/grub/arm64/efi/console.h b/include/grub/arm64/efi/console.h new file mode 100644 -index 000000000..956893393 +index 0000000000..9568933938 --- /dev/null +++ b/include/grub/arm64/efi/console.h @@ -0,0 +1,24 @@ @@ -77,7 +77,7 @@ index 000000000..956893393 +#endif /* ! GRUB_ARM64_EFI_CONSOLE_H */ diff --git a/include/grub/i386/efi/console.h b/include/grub/i386/efi/console.h new file mode 100644 -index 000000000..9231375cb +index 0000000000..9231375cb0 --- /dev/null +++ b/include/grub/i386/efi/console.h @@ -0,0 +1,24 @@ @@ -107,7 +107,7 @@ index 000000000..9231375cb +#endif /* ! GRUB_I386_EFI_CONSOLE_H */ diff --git a/include/grub/x86_64/efi/console.h b/include/grub/x86_64/efi/console.h new file mode 100644 -index 000000000..dba9d8678 +index 0000000000..dba9d8678d --- /dev/null +++ b/include/grub/x86_64/efi/console.h @@ -0,0 +1,24 @@ diff --git a/0066-Make-it-possible-to-enabled-build-id-sha1.patch b/0066-Make-it-possible-to-enabled-build-id-sha1.patch index 5088c89..592635a 100644 --- a/0066-Make-it-possible-to-enabled-build-id-sha1.patch +++ b/0066-Make-it-possible-to-enabled-build-id-sha1.patch @@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 27 insertions(+) diff --git a/configure.ac b/configure.ac -index 4f1676967..b809c0078 100644 +index 4f1676967e..b809c00784 100644 --- a/configure.ac +++ b/configure.ac @@ -1443,7 +1443,15 @@ grub_PROG_TARGET_CC @@ -30,7 +30,7 @@ index 4f1676967..b809c0078 100644 if test "$platform" != emu && test "x$TARGET_APPLE_LINKER" != x1 ; then if test ! -z "$TARGET_IMG_LDSCRIPT"; then diff --git a/acinclude.m4 b/acinclude.m4 -index 6e14bb553..21238fcfd 100644 +index 6e14bb553c..21238fcfd0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -136,6 +136,25 @@ if test "x$grub_cv_prog_ld_build_id_none" = xyes; then diff --git a/0067-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch b/0067-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch index 20f19c6..7658e9b 100644 --- a/0067-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch +++ b/0067-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch @@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 20 insertions(+) diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index a432a6be5..9a2fae639 100644 +index a432a6be54..9a2fae6398 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -191,6 +191,24 @@ grub_real_dprintf (const char *file, const int line, const char *condition, @@ -42,7 +42,7 @@ index a432a6be5..9a2fae639 100644 int diff --git a/include/grub/misc.h b/include/grub/misc.h -index fd18e6320..3adc4036e 100644 +index fd18e6320b..3adc4036e3 100644 --- a/include/grub/misc.h +++ b/include/grub/misc.h @@ -345,6 +345,8 @@ void EXPORT_FUNC(grub_real_dprintf) (const char *file, diff --git a/0068-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch b/0068-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch index 91bc557..ccf34a5 100644 --- a/0068-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch +++ b/0068-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch @@ -20,7 +20,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 4 files changed, 78 insertions(+), 4 deletions(-) diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c -index 88d207770..955725403 100644 +index 88d2077709..9557254035 100644 --- a/grub-core/kern/dl.c +++ b/grub-core/kern/dl.c @@ -501,6 +501,23 @@ grub_dl_find_section (Elf_Ehdr *e, const char *name) @@ -95,7 +95,7 @@ index 88d207770..955725403 100644 { grub_dl_unload (mod); diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index ae9885edb..d6a2fb577 100644 +index ae9885edb8..d6a2fb5778 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -296,7 +296,7 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, @@ -117,7 +117,7 @@ index ae9885edb..d6a2fb577 100644 } diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c -index 6d39bd3ad..2d12e6188 100644 +index 6d39bd3ad2..2d12e6188f 100644 --- a/grub-core/kern/efi/init.c +++ b/grub-core/kern/efi/init.c @@ -115,10 +115,33 @@ grub_efi_env_init (void) @@ -164,7 +164,7 @@ index 6d39bd3ad..2d12e6188 100644 } diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h -index 03f9a9d01..2e0691454 100644 +index 03f9a9d011..2e0691454b 100644 --- a/include/grub/efi/efi.h +++ b/include/grub/efi/efi.h @@ -138,7 +138,7 @@ grub_err_t grub_arch_efi_linux_check_image(struct linux_arch_kernel_header *lh); diff --git a/0069-Fixup-for-newer-compiler.patch b/0069-Fixup-for-newer-compiler.patch index aff1662..ed23271 100644 --- a/0069-Fixup-for-newer-compiler.patch +++ b/0069-Fixup-for-newer-compiler.patch @@ -9,7 +9,7 @@ Subject: [PATCH] Fixup for newer compiler 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index 2b21cbaa6..4cc86e9b7 100644 +index 2b21cbaa67..4cc86e9b79 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -218,7 +218,7 @@ struct grub_btrfs_inode @@ -22,7 +22,7 @@ index 2b21cbaa6..4cc86e9b7 100644 struct grub_btrfs_extent_data { diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h -index 7a93f4329..8212697bf 100644 +index 7a93f43291..8212697bf6 100644 --- a/include/grub/gpt_partition.h +++ b/include/grub/gpt_partition.h @@ -76,7 +76,7 @@ struct grub_gpt_partentry diff --git a/0070-Don-t-attempt-to-export-the-start-and-_start-symbols.patch b/0070-Don-t-attempt-to-export-the-start-and-_start-symbols.patch index 6d85ecc..9b78c00 100644 --- a/0070-Don-t-attempt-to-export-the-start-and-_start-symbols.patch +++ b/0070-Don-t-attempt-to-export-the-start-and-_start-symbols.patch @@ -26,7 +26,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 2 insertions(+) diff --git a/include/grub/kernel.h b/include/grub/kernel.h -index 300a9766c..55849777e 100644 +index 300a9766cd..55849777ea 100644 --- a/include/grub/kernel.h +++ b/include/grub/kernel.h @@ -111,8 +111,10 @@ grub_addr_t grub_modules_get_end (void); diff --git a/0071-Fixup-for-newer-compiler.patch b/0071-Fixup-for-newer-compiler.patch index f384404..167dca1 100644 --- a/0071-Fixup-for-newer-compiler.patch +++ b/0071-Fixup-for-newer-compiler.patch @@ -8,7 +8,7 @@ Subject: [PATCH] Fixup for newer compiler 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/Makefile.common b/conf/Makefile.common -index 191b1a70c..5f0ef9698 100644 +index 191b1a70c6..5f0ef96985 100644 --- a/conf/Makefile.common +++ b/conf/Makefile.common @@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding diff --git a/0072-Add-support-for-non-Ethernet-network-cards.patch b/0072-Add-support-for-non-Ethernet-network-cards.patch index e161fa0..fb44628 100644 --- a/0072-Add-support-for-non-Ethernet-network-cards.patch +++ b/0072-Add-support-for-non-Ethernet-network-cards.patch @@ -38,7 +38,7 @@ Signed-off-by: Mark Salter <msalter(a)redhat.com> 12 files changed, 219 insertions(+), 152 deletions(-) diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c -index 54306e3b1..67b409a8a 100644 +index 54306e3b16..67b409a8ac 100644 --- a/grub-core/net/arp.c +++ b/grub-core/net/arp.c @@ -31,22 +31,12 @@ enum @@ -271,7 +271,7 @@ index 54306e3b1..67b409a8a 100644 /* Change operation to REPLY and send packet */ send_ethernet_packet (inf, &nb_reply, target, GRUB_NET_ETHERTYPE_ARP); diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c -index e28fb6a09..08b6b2b5d 100644 +index e28fb6a09f..08b6b2b5d6 100644 --- a/grub-core/net/bootp.c +++ b/grub-core/net/bootp.c @@ -233,7 +233,6 @@ grub_net_configure_by_dhcp_ack (const char *name, @@ -318,7 +318,7 @@ index e28fb6a09..08b6b2b5d 100644 grub_netbuff_push (nb, sizeof (*udph)); diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c -index 173fb6315..a673bea80 100644 +index 173fb63153..a673bea807 100644 --- a/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c @@ -279,6 +279,9 @@ grub_efinet_findcards (void) @@ -346,7 +346,7 @@ index 173fb6315..a673bea80 100644 card->efi_handle = *handle; diff --git a/grub-core/net/drivers/emu/emunet.c b/grub-core/net/drivers/emu/emunet.c -index b19492086..5b6c5e16a 100644 +index b194920861..5b6c5e16a6 100644 --- a/grub-core/net/drivers/emu/emunet.c +++ b/grub-core/net/drivers/emu/emunet.c @@ -46,6 +46,7 @@ static struct grub_net_card emucard = @@ -358,7 +358,7 @@ index b19492086..5b6c5e16a 100644 }, .flags = 0 diff --git a/grub-core/net/drivers/i386/pc/pxe.c b/grub-core/net/drivers/i386/pc/pxe.c -index 3f4152d03..9f8fb4b6d 100644 +index 3f4152d036..9f8fb4b6d2 100644 --- a/grub-core/net/drivers/i386/pc/pxe.c +++ b/grub-core/net/drivers/i386/pc/pxe.c @@ -386,20 +386,21 @@ GRUB_MOD_INIT(pxe) @@ -390,7 +390,7 @@ index 3f4152d03..9f8fb4b6d 100644 grub_pxe_card.default_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET; diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c -index 3860b6f78..bcb3f9ea0 100644 +index 3860b6f78d..bcb3f9ea02 100644 --- a/grub-core/net/drivers/ieee1275/ofnet.c +++ b/grub-core/net/drivers/ieee1275/ofnet.c @@ -160,6 +160,7 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath, @@ -410,7 +410,7 @@ index 3860b6f78..bcb3f9ea0 100644 card->txbufsize = ALIGN_UP (card->mtu, 64) + 256; diff --git a/grub-core/net/drivers/uboot/ubootnet.c b/grub-core/net/drivers/uboot/ubootnet.c -index 056052e40..22ebcbf21 100644 +index 056052e40d..22ebcbf211 100644 --- a/grub-core/net/drivers/uboot/ubootnet.c +++ b/grub-core/net/drivers/uboot/ubootnet.c @@ -131,6 +131,7 @@ GRUB_MOD_INIT (ubootnet) @@ -422,7 +422,7 @@ index 056052e40..22ebcbf21 100644 card->txbufsize = ALIGN_UP (card->mtu, 64) + 256; card->txbuf = grub_zalloc (card->txbufsize); diff --git a/grub-core/net/ethernet.c b/grub-core/net/ethernet.c -index 4d7ceed6f..9aae83a5e 100644 +index 4d7ceed6f9..9aae83a5eb 100644 --- a/grub-core/net/ethernet.c +++ b/grub-core/net/ethernet.c @@ -29,13 +29,6 @@ @@ -572,7 +572,7 @@ index 4d7ceed6f..9aae83a5e 100644 { /* ARP packet. */ diff --git a/grub-core/net/icmp6.c b/grub-core/net/icmp6.c -index 2cbd95dce..56a3ec5c8 100644 +index 2cbd95dce2..56a3ec5c8e 100644 --- a/grub-core/net/icmp6.c +++ b/grub-core/net/icmp6.c @@ -231,8 +231,9 @@ grub_net_recv_icmp6_packet (struct grub_net_buff *nb, @@ -612,7 +612,7 @@ index 2cbd95dce..56a3ec5c8 100644 } if (ohdr->type == OPTION_PREFIX && ohdr->len == 4) diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c -index ea5edf8f1..a5896f6dc 100644 +index ea5edf8f1f..a5896f6dc2 100644 --- a/grub-core/net/ip.c +++ b/grub-core/net/ip.c @@ -276,8 +276,8 @@ handle_dgram (struct grub_net_buff *nb, @@ -627,7 +627,7 @@ index ea5edf8f1..a5896f6dc 100644 grub_net_process_dhcp (nb, inf); grub_netbuff_free (nb); diff --git a/grub-core/net/net.c b/grub-core/net/net.c -index 22f2689aa..a46f82362 100644 +index 22f2689aae..a46f82362e 100644 --- a/grub-core/net/net.c +++ b/grub-core/net/net.c @@ -133,8 +133,9 @@ grub_net_link_layer_resolve (struct grub_net_network_level_interface *inf, @@ -713,7 +713,7 @@ index 22f2689aa..a46f82362 100644 int diff --git a/include/grub/net.h b/include/grub/net.h -index 8a05ec4fe..af0404db7 100644 +index 8a05ec4fe7..af0404db7e 100644 --- a/include/grub/net.h +++ b/include/grub/net.h @@ -29,7 +29,8 @@ diff --git a/0073-net-read-bracketed-ipv6-addrs-and-port-numbers.patch b/0073-net-read-bracketed-ipv6-addrs-and-port-numbers.patch index 997c189..307e33c 100644 --- a/0073-net-read-bracketed-ipv6-addrs-and-port-numbers.patch +++ b/0073-net-read-bracketed-ipv6-addrs-and-port-numbers.patch @@ -18,7 +18,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 4 files changed, 109 insertions(+), 12 deletions(-) diff --git a/grub-core/net/http.c b/grub-core/net/http.c -index b616cf40b..12a2632ea 100644 +index b616cf40b1..12a2632ea5 100644 --- a/grub-core/net/http.c +++ b/grub-core/net/http.c @@ -289,7 +289,9 @@ http_receive (grub_net_tcp_socket_t sock __attribute__ ((unused)), @@ -87,7 +87,7 @@ index b616cf40b..12a2632ea 100644 file); if (!data->sock) diff --git a/grub-core/net/net.c b/grub-core/net/net.c -index a46f82362..0ce5e675e 100644 +index a46f82362e..0ce5e675ed 100644 --- a/grub-core/net/net.c +++ b/grub-core/net/net.c @@ -444,6 +444,13 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest) @@ -225,7 +225,7 @@ index a46f82362..0ce5e675e 100644 } diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c -index 4ab2f5c73..d54b13f09 100644 +index 4ab2f5c735..d54b13f09f 100644 --- a/grub-core/net/tftp.c +++ b/grub-core/net/tftp.c @@ -295,6 +295,7 @@ tftp_open (struct grub_file *file, const char *filename) @@ -257,7 +257,7 @@ index 4ab2f5c73..d54b13f09 100644 if (!data->sock) { diff --git a/include/grub/net.h b/include/grub/net.h -index af0404db7..d55d505a0 100644 +index af0404db7e..d55d505a03 100644 --- a/include/grub/net.h +++ b/include/grub/net.h @@ -273,6 +273,7 @@ typedef struct grub_net diff --git a/0074-bootp-New-net_bootp6-command.patch b/0074-bootp-New-net_bootp6-command.patch index 8307409..bef3acd 100644 --- a/0074-bootp-New-net_bootp6-command.patch +++ b/0074-bootp-New-net_bootp6-command.patch @@ -19,7 +19,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 5 files changed, 1002 insertions(+), 209 deletions(-) diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c -index 08b6b2b5d..fe93b80f1 100644 +index 08b6b2b5d6..fe93b80f1c 100644 --- a/grub-core/net/bootp.c +++ b/grub-core/net/bootp.c @@ -24,6 +24,98 @@ @@ -1136,7 +1136,7 @@ index 08b6b2b5d..fe93b80f1 100644 grub_unregister_command (cmd_bootp); grub_unregister_command (cmd_dhcp); diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c -index a673bea80..8e25680db 100644 +index a673bea807..8e25680db0 100644 --- a/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c @@ -393,9 +393,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device, @@ -1174,7 +1174,7 @@ index a673bea80..8e25680db 100644 } else diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c -index a5896f6dc..ce6bdc75c 100644 +index a5896f6dc2..ce6bdc75c6 100644 --- a/grub-core/net/ip.c +++ b/grub-core/net/ip.c @@ -239,6 +239,45 @@ handle_dgram (struct grub_net_buff *nb, @@ -1224,7 +1224,7 @@ index a5896f6dc..ce6bdc75c 100644 { const struct grub_net_bootp_packet *bootp; diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h -index 996288014..7614b58dc 100644 +index 9962880147..7614b58dca 100644 --- a/include/grub/efi/api.h +++ b/include/grub/efi/api.h @@ -1532,7 +1532,7 @@ typedef struct grub_efi_pxe_ip_filter @@ -1237,7 +1237,7 @@ index 996288014..7614b58dc 100644 } grub_efi_pxe_ip_filter_t; diff --git a/include/grub/net.h b/include/grub/net.h -index d55d505a0..543251f72 100644 +index d55d505a03..543251f727 100644 --- a/include/grub/net.h +++ b/include/grub/net.h @@ -451,50 +451,65 @@ struct grub_net_bootp_packet diff --git a/0075-efinet-UEFI-IPv6-PXE-support.patch b/0075-efinet-UEFI-IPv6-PXE-support.patch index 8f1dca6..988c178 100644 --- a/0075-efinet-UEFI-IPv6-PXE-support.patch +++ b/0075-efinet-UEFI-IPv6-PXE-support.patch @@ -15,7 +15,7 @@ Signed-off-by: Ken Lin <ken.lin(a)hpe.com> 2 files changed, 46 insertions(+), 27 deletions(-) diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c -index 8e25680db..014e5bf98 100644 +index 8e25680db0..014e5bf980 100644 --- a/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c @@ -409,6 +409,8 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device, @@ -28,7 +28,7 @@ index 8e25680db..014e5bf98 100644 else { diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h -index 7614b58dc..91ab528e4 100644 +index 7614b58dca..91ab528e4d 100644 --- a/include/grub/efi/api.h +++ b/include/grub/efi/api.h @@ -1524,31 +1524,6 @@ typedef union diff --git a/0076-grub.texi-Add-net_bootp6-doument.patch b/0076-grub.texi-Add-net_bootp6-doument.patch index d12f33e..b42e09b 100644 --- a/0076-grub.texi-Add-net_bootp6-doument.patch +++ b/0076-grub.texi-Add-net_bootp6-doument.patch @@ -12,7 +12,7 @@ Signed-off-by: Ken Lin <ken.lin(a)hpe.com> 1 file changed, 17 insertions(+) diff --git a/docs/grub.texi b/docs/grub.texi -index 0615d0ed9..04ed6ac1f 100644 +index 0615d0ed97..04ed6ac1f0 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -5487,6 +5487,7 @@ This command is only available on AArch64 systems. diff --git a/0077-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch b/0077-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch index 114f102..abff9eb 100644 --- a/0077-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch +++ b/0077-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch @@ -22,7 +22,7 @@ Signed-off-by: Ken Lin <ken.lin(a)hpe.com> 2 files changed, 56 insertions(+) diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c -index fe93b80f1..8fb8918ae 100644 +index fe93b80f1c..8fb8918ae7 100644 --- a/grub-core/net/bootp.c +++ b/grub-core/net/bootp.c @@ -20,6 +20,7 @@ @@ -95,7 +95,7 @@ index fe93b80f1..8fb8918ae 100644 if (opt && opt_len) grub_env_set_net_property (name, "extensionspath", (const char *) opt, opt_len); diff --git a/include/grub/net.h b/include/grub/net.h -index 543251f72..42af7de25 100644 +index 543251f727..42af7de250 100644 --- a/include/grub/net.h +++ b/include/grub/net.h @@ -531,6 +531,7 @@ enum diff --git a/0078-efinet-Setting-network-from-UEFI-device-path.patch b/0078-efinet-Setting-network-from-UEFI-device-path.patch index 0aef614..f4faf27 100644 --- a/0078-efinet-Setting-network-from-UEFI-device-path.patch +++ b/0078-efinet-Setting-network-from-UEFI-device-path.patch @@ -32,7 +32,7 @@ Signed-off-by: Ken Lin <ken.lin(a)hpe.com> 2 files changed, 280 insertions(+), 15 deletions(-) diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c -index 014e5bf98..8171ecaa5 100644 +index 014e5bf980..8171ecaa5e 100644 --- a/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c @@ -26,6 +26,7 @@ @@ -375,7 +375,7 @@ index 014e5bf98..8171ecaa5 100644 } } diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h -index 91ab528e4..4a51667ad 100644 +index 91ab528e4d..4a51667adb 100644 --- a/include/grub/efi/api.h +++ b/include/grub/efi/api.h @@ -864,6 +864,8 @@ struct grub_efi_ipv4_device_path diff --git a/0079-efinet-Setting-DNS-server-from-UEFI-protocol.patch b/0079-efinet-Setting-DNS-server-from-UEFI-protocol.patch index a539267..2d92ff0 100644 --- a/0079-efinet-Setting-DNS-server-from-UEFI-protocol.patch +++ b/0079-efinet-Setting-DNS-server-from-UEFI-protocol.patch @@ -33,7 +33,7 @@ Signed-off-by: Ken Lin <ken.lin(a)hpe.com> 2 files changed, 238 insertions(+) diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c -index 8171ecaa5..715a6168d 100644 +index 8171ecaa5e..715a6168d7 100644 --- a/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c @@ -33,6 +33,8 @@ GRUB_MOD_LICENSE ("GPLv3+"); @@ -242,7 +242,7 @@ index 8171ecaa5..715a6168d 100644 } diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h -index 4a51667ad..0b490195a 100644 +index 4a51667adb..0b490195ad 100644 --- a/include/grub/efi/api.h +++ b/include/grub/efi/api.h @@ -352,6 +352,15 @@ diff --git a/0080-Support-UEFI-networking-protocols.patch b/0080-Support-UEFI-networking-protocols.patch index ec8e159..740a9f8 100644 --- a/0080-Support-UEFI-networking-protocols.patch +++ b/0080-Support-UEFI-networking-protocols.patch @@ -57,7 +57,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> create mode 100644 include/grub/net/efi.h diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 4b7c45a7b..c40170f2d 100644 +index 4b7c45a7b0..c40170f2dd 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -2299,6 +2299,12 @@ module = { @@ -87,7 +87,7 @@ index 4b7c45a7b..c40170f2d 100644 module = { diff --git a/grub-core/io/bufio.c b/grub-core/io/bufio.c -index a458c3aca..163773153 100644 +index a458c3aca7..1637731535 100644 --- a/grub-core/io/bufio.c +++ b/grub-core/io/bufio.c @@ -139,7 +139,7 @@ grub_bufio_read (grub_file_t file, char *buf, grub_size_t len) @@ -100,7 +100,7 @@ index a458c3aca..163773153 100644 if (file->offset + res < next_buf) { diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index d6a2fb577..2a446f503 100644 +index d6a2fb5778..2a446f5031 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -755,7 +755,7 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp) @@ -231,7 +231,7 @@ index d6a2fb577..2a446f503 100644 grub_printf ("/UnknownMessaging(%x)", (unsigned) subtype); break; diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c -index 715a6168d..e11d759f1 100644 +index 715a6168d7..e11d759f19 100644 --- a/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c @@ -27,6 +27,7 @@ @@ -304,7 +304,7 @@ index 715a6168d..e11d759f1 100644 diff --git a/grub-core/net/efi/dhcp.c b/grub-core/net/efi/dhcp.c new file mode 100644 -index 000000000..dbef63d8c +index 0000000000..dbef63d8c0 --- /dev/null +++ b/grub-core/net/efi/dhcp.c @@ -0,0 +1,397 @@ @@ -707,7 +707,7 @@ index 000000000..dbef63d8c +grub_command_func_t grub_efi_net_bootp6 = grub_cmd_efi_bootp6; diff --git a/grub-core/net/efi/efi_netfs.c b/grub-core/net/efi/efi_netfs.c new file mode 100644 -index 000000000..ef371d885 +index 0000000000..ef371d885e --- /dev/null +++ b/grub-core/net/efi/efi_netfs.c @@ -0,0 +1,57 @@ @@ -770,7 +770,7 @@ index 000000000..ef371d885 +} diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c new file mode 100644 -index 000000000..3f61fd2fa +index 0000000000..3f61fd2fa5 --- /dev/null +++ b/grub-core/net/efi/http.c @@ -0,0 +1,419 @@ @@ -1195,7 +1195,7 @@ index 000000000..3f61fd2fa + }; diff --git a/grub-core/net/efi/ip4_config.c b/grub-core/net/efi/ip4_config.c new file mode 100644 -index 000000000..b711a5d94 +index 0000000000..b711a5d945 --- /dev/null +++ b/grub-core/net/efi/ip4_config.c @@ -0,0 +1,398 @@ @@ -1599,7 +1599,7 @@ index 000000000..b711a5d94 + }; diff --git a/grub-core/net/efi/ip6_config.c b/grub-core/net/efi/ip6_config.c new file mode 100644 -index 000000000..017c4d05b +index 0000000000..017c4d05bc --- /dev/null +++ b/grub-core/net/efi/ip6_config.c @@ -0,0 +1,422 @@ @@ -2027,7 +2027,7 @@ index 000000000..017c4d05b + }; diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c new file mode 100644 -index 000000000..86bce6535 +index 0000000000..86bce6535d --- /dev/null +++ b/grub-core/net/efi/net.c @@ -0,0 +1,1428 @@ @@ -3461,7 +3461,7 @@ index 000000000..86bce6535 +} diff --git a/grub-core/net/efi/pxe.c b/grub-core/net/efi/pxe.c new file mode 100644 -index 000000000..531949cba +index 0000000000..531949cba5 --- /dev/null +++ b/grub-core/net/efi/pxe.c @@ -0,0 +1,424 @@ @@ -3890,7 +3890,7 @@ index 000000000..531949cba + }; + diff --git a/grub-core/net/net.c b/grub-core/net/net.c -index 0ce5e675e..55aed9272 100644 +index 0ce5e675ed..55aed92722 100644 --- a/grub-core/net/net.c +++ b/grub-core/net/net.c @@ -32,6 +32,9 @@ @@ -4000,7 +4000,7 @@ index 0ce5e675e..55aed9272 100644 +#endif } diff --git a/util/grub-mknetdir.c b/util/grub-mknetdir.c -index a2461cda1..77958dd9d 100644 +index a2461cda1c..77958dd9dd 100644 --- a/util/grub-mknetdir.c +++ b/util/grub-mknetdir.c @@ -32,13 +32,15 @@ @@ -4082,7 +4082,7 @@ index a2461cda1..77958dd9d 100644 if (!grub_install_source_directory) { diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h -index 0b490195a..f431f4997 100644 +index 0b490195ad..f431f49973 100644 --- a/include/grub/efi/api.h +++ b/include/grub/efi/api.h @@ -622,6 +622,23 @@ typedef union @@ -4333,7 +4333,7 @@ index 0b490195a..f431f4997 100644 || defined(__riscv) diff --git a/include/grub/efi/dhcp.h b/include/grub/efi/dhcp.h new file mode 100644 -index 000000000..fdb88eb81 +index 0000000000..fdb88eb810 --- /dev/null +++ b/include/grub/efi/dhcp.h @@ -0,0 +1,343 @@ @@ -4682,7 +4682,7 @@ index 000000000..fdb88eb81 +#endif /* ! GRUB_EFI_DHCP_HEADER */ diff --git a/include/grub/efi/http.h b/include/grub/efi/http.h new file mode 100644 -index 000000000..c5e9a89f5 +index 0000000000..c5e9a89f50 --- /dev/null +++ b/include/grub/efi/http.h @@ -0,0 +1,215 @@ @@ -4903,7 +4903,7 @@ index 000000000..c5e9a89f5 +#endif /* !GRUB_EFI_HTTP_HEADER */ diff --git a/include/grub/net/efi.h b/include/grub/net/efi.h new file mode 100644 -index 000000000..de90d223e +index 0000000000..de90d223e8 --- /dev/null +++ b/include/grub/net/efi.h @@ -0,0 +1,144 @@ diff --git a/0081-AUDIT-0-http-boot-tracker-bug.patch b/0081-AUDIT-0-http-boot-tracker-bug.patch index d9a20a9..b487271 100644 --- a/0081-AUDIT-0-http-boot-tracker-bug.patch +++ b/0081-AUDIT-0-http-boot-tracker-bug.patch @@ -22,7 +22,7 @@ Signed-off-by: Michael Chang <mchang(a)suse.com> 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c -index 86bce6535..4bb308026 100644 +index 86bce6535d..4bb308026c 100644 --- a/grub-core/net/efi/net.c +++ b/grub-core/net/efi/net.c @@ -645,8 +645,10 @@ grub_efihttp_chunk_read (grub_file_t file, char *buf, @@ -38,7 +38,7 @@ index 86bce6535..4bb308026 100644 if (buf) { diff --git a/grub-core/net/http.c b/grub-core/net/http.c -index 12a2632ea..b52b558d6 100644 +index 12a2632ea5..b52b558d63 100644 --- a/grub-core/net/http.c +++ b/grub-core/net/http.c @@ -31,7 +31,8 @@ GRUB_MOD_LICENSE ("GPLv3+"); diff --git a/0082-grub-editenv-Add-incr-command-to-increment-integer-v.patch b/0082-grub-editenv-Add-incr-command-to-increment-integer-v.patch index b64dad2..6e2e4e2 100644 --- a/0082-grub-editenv-Add-incr-command-to-increment-integer-v.patch +++ b/0082-grub-editenv-Add-incr-command-to-increment-integer-v.patch @@ -17,7 +17,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> 1 file changed, 50 insertions(+) diff --git a/util/grub-editenv.c b/util/grub-editenv.c -index db6f187cc..948eec8a1 100644 +index db6f187cc6..948eec8a11 100644 --- a/util/grub-editenv.c +++ b/util/grub-editenv.c @@ -53,6 +53,9 @@ static struct argp_option options[] = { diff --git a/0083-Add-auto-hide-menu-support.patch b/0083-Add-auto-hide-menu-support.patch index d012255..f5aed0e 100644 --- a/0083-Add-auto-hide-menu-support.patch +++ b/0083-Add-auto-hide-menu-support.patch @@ -43,7 +43,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> create mode 100644 util/grub.d/01_menu_auto_hide.in diff --git a/Makefile.util.def b/Makefile.util.def -index 48512bc63..314e6f2ac 100644 +index 48512bc631..314e6f2acf 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -458,6 +458,12 @@ script = { @@ -61,7 +61,7 @@ index 48512bc63..314e6f2ac 100644 common = util/grub.d/01_users.in; diff --git a/util/grub.d/01_menu_auto_hide.in b/util/grub.d/01_menu_auto_hide.in new file mode 100644 -index 000000000..ad175870a +index 0000000000..ad175870a5 --- /dev/null +++ b/util/grub.d/01_menu_auto_hide.in @@ -0,0 +1,48 @@ @@ -114,7 +114,7 @@ index 000000000..ad175870a +fi +EOF diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in -index 4b27bd201..3c9431cfc 100644 +index 4b27bd2015..3c9431cfcf 100644 --- a/util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in @@ -42,6 +42,7 @@ if [ -z "${OSPROBED}" ] ; then diff --git a/0084-Add-grub-set-bootflag-utility.patch b/0084-Add-grub-set-bootflag-utility.patch index a0a6da9..4ee43cf 100644 --- a/0084-Add-grub-set-bootflag-utility.patch +++ b/0084-Add-grub-set-bootflag-utility.patch @@ -49,7 +49,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> create mode 100644 docs/man/grub-set-bootflag.h2m diff --git a/Makefile.util.def b/Makefile.util.def -index 314e6f2ac..0b85a7fce 100644 +index 314e6f2acf..0b85a7fce4 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -1446,3 +1446,10 @@ program = { @@ -65,7 +65,7 @@ index 314e6f2ac..0b85a7fce 100644 +}; diff --git a/util/grub-set-bootflag.c b/util/grub-set-bootflag.c new file mode 100644 -index 000000000..d506f7e75 +index 0000000000..d506f7e75b --- /dev/null +++ b/util/grub-set-bootflag.c @@ -0,0 +1,172 @@ @@ -242,7 +242,7 @@ index 000000000..d506f7e75 + return 0; +} diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist -index 8f1485d52..ad235de7f 100644 +index 8f1485d52a..ad235de7fc 100644 --- a/conf/Makefile.extra-dist +++ b/conf/Makefile.extra-dist @@ -15,6 +15,9 @@ EXTRA_DIST += docs/man @@ -257,7 +257,7 @@ index 8f1485d52..ad235de7f 100644 diff --git a/docs/grub-boot-success.service b/docs/grub-boot-success.service new file mode 100644 -index 000000000..80e79584c +index 0000000000..80e79584c9 --- /dev/null +++ b/docs/grub-boot-success.service @@ -0,0 +1,6 @@ @@ -269,7 +269,7 @@ index 000000000..80e79584c +ExecStart=/usr/sbin/grub2-set-bootflag boot_success diff --git a/docs/grub-boot-success.timer b/docs/grub-boot-success.timer new file mode 100644 -index 000000000..406f17200 +index 0000000000..406f172005 --- /dev/null +++ b/docs/grub-boot-success.timer @@ -0,0 +1,7 @@ @@ -282,7 +282,7 @@ index 000000000..406f17200 +OnActiveSec=2min diff --git a/docs/man/grub-set-bootflag.h2m b/docs/man/grub-set-bootflag.h2m new file mode 100644 -index 000000000..94ec0b92e +index 0000000000..94ec0b92ed --- /dev/null +++ b/docs/man/grub-set-bootflag.h2m @@ -0,0 +1,2 @@ diff --git a/0085-docs-Add-grub-boot-indeterminate.service-example.patch b/0085-docs-Add-grub-boot-indeterminate.service-example.patch index 5b8732a..96eff36 100644 --- a/0085-docs-Add-grub-boot-indeterminate.service-example.patch +++ b/0085-docs-Add-grub-boot-indeterminate.service-example.patch @@ -16,7 +16,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> diff --git a/docs/grub-boot-indeterminate.service b/docs/grub-boot-indeterminate.service new file mode 100644 -index 000000000..6c8dcb186 +index 0000000000..6c8dcb186b --- /dev/null +++ b/docs/grub-boot-indeterminate.service @@ -0,0 +1,11 @@ diff --git a/0086-gentpl-add-disable-support.patch b/0086-gentpl-add-disable-support.patch index fabba4b..3b305e6 100644 --- a/0086-gentpl-add-disable-support.patch +++ b/0086-gentpl-add-disable-support.patch @@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gentpl.py b/gentpl.py -index c86550d4f..f3c5f84f8 100644 +index c86550d4f9..f3c5f84f85 100644 --- a/gentpl.py +++ b/gentpl.py @@ -592,11 +592,21 @@ def platform_conditional(platform, closure): diff --git a/0087-gentpl-add-pc-firmware-type.patch b/0087-gentpl-add-pc-firmware-type.patch index e364787..0bfd2ea 100644 --- a/0087-gentpl-add-pc-firmware-type.patch +++ b/0087-gentpl-add-pc-firmware-type.patch @@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 1 insertion(+) diff --git a/gentpl.py b/gentpl.py -index f3c5f84f8..f09b33686 100644 +index f3c5f84f85..f09b336869 100644 --- a/gentpl.py +++ b/gentpl.py @@ -51,6 +51,7 @@ GROUPS["riscv32"] = [ "riscv32_efi" ] diff --git a/0088-efinet-also-use-the-firmware-acceleration-for-http.patch b/0088-efinet-also-use-the-firmware-acceleration-for-http.patch index 9fec27c..a3a9400 100644 --- a/0088-efinet-also-use-the-firmware-acceleration-for-http.patch +++ b/0088-efinet-also-use-the-firmware-acceleration-for-http.patch @@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c -index 4bb308026..6603cd83e 100644 +index 4bb308026c..6603cd83ed 100644 --- a/grub-core/net/efi/net.c +++ b/grub-core/net/efi/net.c @@ -1324,7 +1324,9 @@ grub_efi_net_boot_from_https (void) diff --git a/0089-efi-http-Make-root_url-reflect-the-protocol-hostname.patch b/0089-efi-http-Make-root_url-reflect-the-protocol-hostname.patch index 1af9ba0..90d9777 100644 --- a/0089-efi-http-Make-root_url-reflect-the-protocol-hostname.patch +++ b/0089-efi-http-Make-root_url-reflect-the-protocol-hostname.patch @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 19 insertions(+) diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c -index 3f61fd2fa..243acbaa3 100644 +index 3f61fd2fa5..243acbaa35 100644 --- a/grub-core/net/efi/http.c +++ b/grub-core/net/efi/http.c @@ -4,6 +4,7 @@ diff --git a/0090-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch b/0090-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch index e77a96c..a2c7136 100644 --- a/0090-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch +++ b/0090-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch @@ -17,7 +17,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 3 files changed, 64 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac -index b809c0078..b1ca89479 100644 +index b809c00784..b1ca894791 100644 --- a/configure.ac +++ b/configure.ac @@ -850,11 +850,23 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$p @@ -88,7 +88,7 @@ index b809c0078..b1ca89479 100644 GRUB_PLATFORM="${platform}" diff --git a/conf/Makefile.common b/conf/Makefile.common -index 5f0ef9698..2ff9b3935 100644 +index 5f0ef96985..2ff9b39357 100644 --- a/conf/Makefile.common +++ b/conf/Makefile.common @@ -40,24 +40,25 @@ CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1 @@ -129,7 +129,7 @@ index 5f0ef9698..2ff9b3935 100644 # Other variables diff --git a/gentpl.py b/gentpl.py -index f09b33686..0e62e1466 100644 +index f09b336869..0e62e14666 100644 --- a/gentpl.py +++ b/gentpl.py @@ -697,10 +697,10 @@ def module(defn, platform): diff --git a/0091-module-verifier-make-it-possible-to-run-checkers-on-.patch b/0091-module-verifier-make-it-possible-to-run-checkers-on-.patch index 5419b61..78c15d6 100644 --- a/0091-module-verifier-make-it-possible-to-run-checkers-on-.patch +++ b/0091-module-verifier-make-it-possible-to-run-checkers-on-.patch @@ -22,7 +22,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 3 files changed, 13 insertions(+) diff --git a/util/grub-module-verifier32.c b/util/grub-module-verifier32.c -index 257229f8f..ba7d41aaf 100644 +index 257229f8f0..ba7d41aafe 100644 --- a/util/grub-module-verifier32.c +++ b/util/grub-module-verifier32.c @@ -1,2 +1,4 @@ @@ -31,7 +31,7 @@ index 257229f8f..ba7d41aaf 100644 #include "grub-module-verifierXX.c" +#endif diff --git a/util/grub-module-verifier64.c b/util/grub-module-verifier64.c -index 4db6b4bed..fc23ef800 100644 +index 4db6b4bedd..fc23ef800b 100644 --- a/util/grub-module-verifier64.c +++ b/util/grub-module-verifier64.c @@ -1,2 +1,4 @@ @@ -40,7 +40,7 @@ index 4db6b4bed..fc23ef800 100644 #include "grub-module-verifierXX.c" +#endif diff --git a/util/grub-module-verifierXX.c b/util/grub-module-verifierXX.c -index ceb24309a..a98e2f9b1 100644 +index ceb24309ae..a98e2f9b1a 100644 --- a/util/grub-module-verifierXX.c +++ b/util/grub-module-verifierXX.c @@ -1,3 +1,12 @@ diff --git a/0092-Rework-how-the-fdt-command-builds.patch b/0092-Rework-how-the-fdt-command-builds.patch index 8cf19f0..a374f90 100644 --- a/0092-Rework-how-the-fdt-command-builds.patch +++ b/0092-Rework-how-the-fdt-command-builds.patch @@ -25,7 +25,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index c40170f2d..84a3d89de 100644 +index c40170f2dd..84a3d89de9 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -177,7 +177,6 @@ kernel = { @@ -62,7 +62,7 @@ index c40170f2d..84a3d89de 100644 }; diff --git a/grub-core/lib/fdt.c b/grub-core/lib/fdt.c -index 0d371c563..37e04bd69 100644 +index 0d371c5633..37e04bd69e 100644 --- a/grub-core/lib/fdt.c +++ b/grub-core/lib/fdt.c @@ -21,8 +21,6 @@ @@ -75,7 +75,7 @@ index 0d371c563..37e04bd69 100644 #define FDT_BEGIN_NODE 0x00000001 diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c -index c86f283d7..c572415d3 100644 +index c86f283d75..c572415d38 100644 --- a/grub-core/loader/efi/fdt.c +++ b/grub-core/loader/efi/fdt.c @@ -27,6 +27,8 @@ @@ -88,7 +88,7 @@ index c86f283d7..c572415d3 100644 static void *fdt; diff --git a/include/grub/fdt.h b/include/grub/fdt.h -index e609c7e41..3514aa4a5 100644 +index e609c7e411..3514aa4a5b 100644 --- a/include/grub/fdt.h +++ b/include/grub/fdt.h @@ -19,6 +19,9 @@ @@ -110,7 +110,7 @@ index e609c7e41..3514aa4a5 100644 + #endif /* ! GRUB_FDT_HEADER */ diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am -index f512573c0..dd49939aa 100644 +index f512573c0d..dd49939aaa 100644 --- a/grub-core/Makefile.am +++ b/grub-core/Makefile.am @@ -76,6 +76,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/sb.h diff --git a/0093-Disable-non-wordsize-allocations-on-arm.patch b/0093-Disable-non-wordsize-allocations-on-arm.patch index 60adf7e..7105c7c 100644 --- a/0093-Disable-non-wordsize-allocations-on-arm.patch +++ b/0093-Disable-non-wordsize-allocations-on-arm.patch @@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 20 insertions(+) diff --git a/configure.ac b/configure.ac -index b1ca89479..f42be6533 100644 +index b1ca894791..f42be65332 100644 --- a/configure.ac +++ b/configure.ac @@ -1261,6 +1261,26 @@ if test "x$target_cpu" = xarm; then diff --git a/0094-Prepend-prefix-when-HTTP-path-is-relative.patch b/0094-Prepend-prefix-when-HTTP-path-is-relative.patch index 787e681..30d8075 100644 --- a/0094-Prepend-prefix-when-HTTP-path-is-relative.patch +++ b/0094-Prepend-prefix-when-HTTP-path-is-relative.patch @@ -16,7 +16,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 2 files changed, 71 insertions(+), 21 deletions(-) diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c -index d1de9fa68..1c540fc8c 100644 +index d1de9fa687..1c540fc8c2 100644 --- a/grub-core/kern/main.c +++ b/grub-core/kern/main.c @@ -131,11 +131,19 @@ grub_set_prefix_and_root (void) @@ -41,7 +41,7 @@ index d1de9fa68..1c540fc8c 100644 } } diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c -index 243acbaa3..de351b2cd 100644 +index 243acbaa35..de351b2cd0 100644 --- a/grub-core/net/efi/http.c +++ b/grub-core/net/efi/http.c @@ -9,10 +9,52 @@ diff --git a/0095-Make-grub_error-more-verbose.patch b/0095-Make-grub_error-more-verbose.patch index 8ecefea..306a3d3 100644 --- a/0095-Make-grub_error-more-verbose.patch +++ b/0095-Make-grub_error-more-verbose.patch @@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/grub-core/kern/err.c b/grub-core/kern/err.c -index 53c734de7..aebfe0cf8 100644 +index 53c734de70..aebfe0cf83 100644 --- a/grub-core/kern/err.c +++ b/grub-core/kern/err.c @@ -33,15 +33,24 @@ static struct grub_error_saved grub_error_stack_items[GRUB_ERROR_STACK_SIZE]; @@ -41,7 +41,7 @@ index 53c734de7..aebfe0cf8 100644 return n; diff --git a/include/grub/err.h b/include/grub/err.h -index b08d5d0de..c0f90ef07 100644 +index b08d5d0de4..c0f90ef07c 100644 --- a/include/grub/err.h +++ b/include/grub/err.h @@ -85,8 +85,12 @@ struct grub_error_saved diff --git a/0096-Make-reset-an-alias-for-the-reboot-command.patch b/0096-Make-reset-an-alias-for-the-reboot-command.patch index f7bd855..22475d6 100644 --- a/0096-Make-reset-an-alias-for-the-reboot-command.patch +++ b/0096-Make-reset-an-alias-for-the-reboot-command.patch @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/grub-core/commands/reboot.c b/grub-core/commands/reboot.c -index 46d364c99..f5cc22836 100644 +index 46d364c99a..f5cc228363 100644 --- a/grub-core/commands/reboot.c +++ b/grub-core/commands/reboot.c @@ -32,15 +32,18 @@ grub_cmd_reboot (grub_command_t cmd __attribute__ ((unused)), diff --git a/0097-Add-a-version-command.patch b/0097-Add-a-version-command.patch index a70170f..8daad53 100644 --- a/0097-Add-a-version-command.patch +++ b/0097-Add-a-version-command.patch @@ -1,13 +1,15 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Peter Jones <pjones(a)redhat.com> Date: Tue, 11 Sep 2018 14:20:37 -0400 -Subject: [PATCH] Add a "version" command. +Subject: [PATCH] Add a "version" command -This adds a command that shows you info about grub's version, the grub target -platform, the compiler version, and if you built with +This adds a command that shows you info about grub's version, the grub +target platform, the compiler version, and if you built with --with-rpm-version=<string>, the rpm package version. Signed-off-by: Peter Jones <pjones(a)redhat.com> +[rharwood: don't say GNU, commit message cleanup] +Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> --- configure.ac | 13 ++++++++++ grub-core/Makefile.core.def | 5 ++++ @@ -17,7 +19,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> create mode 100644 grub-core/commands/version.c diff --git a/configure.ac b/configure.ac -index f42be6533..2af5f23ad 100644 +index f42be65332..2af5f23adf 100644 --- a/configure.ac +++ b/configure.ac @@ -285,6 +285,19 @@ AC_SUBST(target_cpu) @@ -41,7 +43,7 @@ index f42be6533..2af5f23ad 100644 have_with_bootdir=n AC_ARG_WITH([bootdir], diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 84a3d89de..498ca1176 100644 +index 84a3d89de9..498ca11762 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -579,6 +579,11 @@ image = { @@ -58,7 +60,7 @@ index 84a3d89de..498ca1176 100644 common = lib/disk.c; diff --git a/grub-core/commands/version.c b/grub-core/commands/version.c new file mode 100644 -index 000000000..f0966a518 +index 0000000000..de0acb07ba --- /dev/null +++ b/grub-core/commands/version.c @@ -0,0 +1,56 @@ @@ -97,7 +99,7 @@ index 000000000..f0966a518 + if (argc != 0) + return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("no arguments expected")); + -+ grub_printf (_("GNU GRUB version %s\n"), PACKAGE_VERSION); ++ grub_printf (_("GRUB version %s\n"), PACKAGE_VERSION); + grub_printf (_("Platform %s-%s\n"), GRUB_TARGET_CPU, GRUB_PLATFORM); + if (grub_strlen(GRUB_RPM_VERSION) != 0) + grub_printf (_("RPM package version %s\n"), GRUB_RPM_VERSION); @@ -119,7 +121,7 @@ index 000000000..f0966a518 + grub_unregister_command (cmd); +} diff --git a/config.h.in b/config.h.in -index 9e8f9911b..c7e316f0f 100644 +index 9e8f9911b1..c7e316f0f1 100644 --- a/config.h.in +++ b/config.h.in @@ -59,6 +59,7 @@ diff --git a/0098-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch b/0098-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch index 3283495..72c8d30 100644 --- a/0098-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch +++ b/0098-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 4 files changed, 10 insertions(+) diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c -index 032011566..7cdffe3eb 100644 +index 0320115662..7cdffe3ebd 100644 --- a/grub-core/disk/diskfilter.c +++ b/grub-core/disk/diskfilter.c @@ -188,6 +188,8 @@ scan_disk (const char *name, int accept_diskfilter) @@ -33,7 +33,7 @@ index 032011566..7cdffe3eb 100644 if (!pv->disk) return grub_errno; diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c -index f077b5f55..fe8ba6e6c 100644 +index f077b5f553..fe8ba6e6c9 100644 --- a/grub-core/disk/efi/efidisk.c +++ b/grub-core/disk/efi/efidisk.c @@ -855,6 +855,7 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle) @@ -45,7 +45,7 @@ index f077b5f55..fe8ba6e6c 100644 grub_free (dup_dp); diff --git a/grub-core/kern/device.c b/grub-core/kern/device.c -index 73b8ecc0c..f58b58c89 100644 +index 73b8ecc0c0..f58b58c89d 100644 --- a/grub-core/kern/device.c +++ b/grub-core/kern/device.c @@ -34,6 +34,7 @@ grub_device_open (const char *name) @@ -57,7 +57,7 @@ index 73b8ecc0c..f58b58c89 100644 { name = grub_env_get ("root"); diff --git a/grub-core/script/script.c b/grub-core/script/script.c -index ec4d4337c..844e8343c 100644 +index ec4d4337c6..844e8343ca 100644 --- a/grub-core/script/script.c +++ b/grub-core/script/script.c @@ -22,6 +22,11 @@ diff --git a/0099-arm-arm64-loader-Better-memory-allocation-and-error-.patch b/0099-arm-arm64-loader-Better-memory-allocation-and-error-.patch index 54e336c..57d937c 100644 --- a/0099-arm-arm64-loader-Better-memory-allocation-and-error-.patch +++ b/0099-arm-arm64-loader-Better-memory-allocation-and-error-.patch @@ -71,7 +71,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 76 insertions(+), 25 deletions(-) diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c -index f6aef0ef6..85ad4b449 100644 +index f6aef0ef64..85ad4b4494 100644 --- a/grub-core/kern/efi/mm.c +++ b/grub-core/kern/efi/mm.c @@ -154,6 +154,7 @@ grub_efi_allocate_pages_real (grub_efi_physical_address_t address, @@ -146,7 +146,7 @@ index f6aef0ef6..85ad4b449 100644 grub_free(memory_map); diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c -index 04994d5c6..70a0075ec 100644 +index 04994d5c67..70a0075ec5 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -71,20 +71,25 @@ finalize_params_linux (void) diff --git a/0100-Try-to-pick-better-locations-for-kernel-and-initrd.patch b/0100-Try-to-pick-better-locations-for-kernel-and-initrd.patch index 83fc610..4f42ea5 100644 --- a/0100-Try-to-pick-better-locations-for-kernel-and-initrd.patch +++ b/0100-Try-to-pick-better-locations-for-kernel-and-initrd.patch @@ -38,7 +38,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 8 files changed, 29 insertions(+), 12 deletions(-) diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c -index 85ad4b449..e84961d07 100644 +index 85ad4b4494..e84961d078 100644 --- a/grub-core/kern/efi/mm.c +++ b/grub-core/kern/efi/mm.c @@ -122,7 +122,7 @@ grub_efi_allocate_pages_max (grub_efi_physical_address_t max, @@ -72,7 +72,7 @@ index 85ad4b449..e84961d07 100644 #endif diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index 3017d0f3e..33e981e76 100644 +index 3017d0f3e5..33e981e76e 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -27,6 +27,7 @@ @@ -138,7 +138,7 @@ index 3017d0f3e..33e981e76 100644 { grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate kernel")); diff --git a/include/grub/arm/efi/memory.h b/include/grub/arm/efi/memory.h -index 2c64918e3..a4c2ec835 100644 +index 2c64918e3f..a4c2ec8350 100644 --- a/include/grub/arm/efi/memory.h +++ b/include/grub/arm/efi/memory.h @@ -2,5 +2,6 @@ @@ -149,7 +149,7 @@ index 2c64918e3..a4c2ec835 100644 #endif /* ! GRUB_MEMORY_CPU_HEADER */ diff --git a/include/grub/arm64/efi/memory.h b/include/grub/arm64/efi/memory.h -index c6cb32417..acb61dca4 100644 +index c6cb324171..acb61dca44 100644 --- a/include/grub/arm64/efi/memory.h +++ b/include/grub/arm64/efi/memory.h @@ -2,5 +2,6 @@ @@ -160,7 +160,7 @@ index c6cb32417..acb61dca4 100644 #endif /* ! GRUB_MEMORY_CPU_HEADER */ diff --git a/include/grub/i386/efi/memory.h b/include/grub/i386/efi/memory.h -index 2c64918e3..a4c2ec835 100644 +index 2c64918e3f..a4c2ec8350 100644 --- a/include/grub/i386/efi/memory.h +++ b/include/grub/i386/efi/memory.h @@ -2,5 +2,6 @@ @@ -171,7 +171,7 @@ index 2c64918e3..a4c2ec835 100644 #endif /* ! GRUB_MEMORY_CPU_HEADER */ diff --git a/include/grub/ia64/efi/memory.h b/include/grub/ia64/efi/memory.h -index 2c64918e3..a4c2ec835 100644 +index 2c64918e3f..a4c2ec8350 100644 --- a/include/grub/ia64/efi/memory.h +++ b/include/grub/ia64/efi/memory.h @@ -2,5 +2,6 @@ @@ -182,7 +182,7 @@ index 2c64918e3..a4c2ec835 100644 #endif /* ! GRUB_MEMORY_CPU_HEADER */ diff --git a/include/grub/riscv64/efi/memory.h b/include/grub/riscv64/efi/memory.h -index c6cb32417..acb61dca4 100644 +index c6cb324171..acb61dca44 100644 --- a/include/grub/riscv64/efi/memory.h +++ b/include/grub/riscv64/efi/memory.h @@ -2,5 +2,6 @@ @@ -193,7 +193,7 @@ index c6cb32417..acb61dca4 100644 #endif /* ! GRUB_MEMORY_CPU_HEADER */ diff --git a/include/grub/x86_64/efi/memory.h b/include/grub/x86_64/efi/memory.h -index 46e9145a3..e81cfb322 100644 +index 46e9145a30..e81cfb3221 100644 --- a/include/grub/x86_64/efi/memory.h +++ b/include/grub/x86_64/efi/memory.h @@ -2,9 +2,11 @@ diff --git a/0101-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch b/0101-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch index f060b0f..3ebf4b3 100644 --- a/0101-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch +++ b/0101-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch @@ -19,7 +19,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 11 files changed, 18 insertions(+), 17 deletions(-) diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c -index eeea09275..f08a1bb84 100644 +index eeea092752..f08a1bb841 100644 --- a/grub-core/kern/emu/misc.c +++ b/grub-core/kern/emu/misc.c @@ -189,7 +189,7 @@ grub_util_get_image_size (const char *path) @@ -32,7 +32,7 @@ index eeea09275..f08a1bb84 100644 ret = (size_t) sz; diff --git a/grub-core/lib/reed_solomon.c b/grub-core/lib/reed_solomon.c -index 467305b46..79037c093 100644 +index 467305b46a..79037c093f 100644 --- a/grub-core/lib/reed_solomon.c +++ b/grub-core/lib/reed_solomon.c @@ -157,7 +157,7 @@ static void @@ -54,7 +54,7 @@ index 467305b46..79037c093 100644 { grub_size_t ds = (s + SECTOR_SIZE - 1 - i) / SECTOR_SIZE; diff --git a/grub-core/osdep/linux/blocklist.c b/grub-core/osdep/linux/blocklist.c -index c77d6085c..42a315031 100644 +index c77d6085cc..42a315031f 100644 --- a/grub-core/osdep/linux/blocklist.c +++ b/grub-core/osdep/linux/blocklist.c @@ -109,7 +109,7 @@ grub_install_get_blocklist (grub_device_t root_dev, @@ -67,7 +67,7 @@ index c77d6085c..42a315031 100644 + fie1.fm_mapped_extents * sizeof (fie1.fm_extents[1])); diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c -index 28790307e..9f730b351 100644 +index 28790307e0..9f730b3518 100644 --- a/grub-core/osdep/linux/getroot.c +++ b/grub-core/osdep/linux/getroot.c @@ -236,7 +236,7 @@ grub_find_root_devices_from_btrfs (const char *dir) @@ -80,7 +80,7 @@ index 28790307e..9f730b351 100644 fd = open (dir, 0); diff --git a/grub-core/osdep/linux/hostdisk.c b/grub-core/osdep/linux/hostdisk.c -index da62f924e..7bc99ac1c 100644 +index da62f924e3..7bc99ac1c1 100644 --- a/grub-core/osdep/linux/hostdisk.c +++ b/grub-core/osdep/linux/hostdisk.c @@ -83,7 +83,7 @@ grub_util_get_fd_size_os (grub_util_fd_t fd, const char *name, unsigned *log_sec @@ -93,7 +93,7 @@ index da62f924e..7bc99ac1c 100644 if (log_secsize) diff --git a/util/grub-fstest.c b/util/grub-fstest.c -index 838656420..bfcef852d 100644 +index 8386564200..bfcef852d8 100644 --- a/util/grub-fstest.c +++ b/util/grub-fstest.c @@ -323,7 +323,7 @@ cmd_cmp (char *src, char *dest) @@ -106,7 +106,7 @@ index 838656420..bfcef852d 100644 fseek (ff, 0, SEEK_END); if (pre != ftell (ff)) diff --git a/util/grub-menulst2cfg.c b/util/grub-menulst2cfg.c -index a39f86939..358d60421 100644 +index a39f869394..358d604210 100644 --- a/util/grub-menulst2cfg.c +++ b/util/grub-menulst2cfg.c @@ -34,7 +34,7 @@ main (int argc, char **argv) @@ -119,7 +119,7 @@ index a39f86939..358d60421 100644 grub_util_host_init (&argc, &argv); diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c -index 0fe45a610..3e09240b9 100644 +index 0fe45a6103..3e09240b99 100644 --- a/util/grub-mkfont.c +++ b/util/grub-mkfont.c @@ -138,7 +138,8 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face, @@ -173,7 +173,7 @@ index 0fe45a610..3e09240b9 100644 add_pixel (&data, &mask, glyph->bitmap.buffer[i / 8 + j * glyph->bitmap.pitch] & diff --git a/util/grub-probe.c b/util/grub-probe.c -index c08e46bbb..c6fac732b 100644 +index c08e46bbb4..c6fac732b4 100644 --- a/util/grub-probe.c +++ b/util/grub-probe.c @@ -798,7 +798,7 @@ argp_parser (int key, char *arg, struct argp_state *state) @@ -186,7 +186,7 @@ index c08e46bbb..c6fac732b 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 f33bd1ed5..834594410 100644 +index f33bd1ed56..8345944105 100644 --- a/util/grub-rpm-sort.c +++ b/util/grub-rpm-sort.c @@ -232,7 +232,7 @@ main (int argc, char *argv[]) @@ -199,7 +199,7 @@ index f33bd1ed5..834594410 100644 grub_util_host_init (&argc, &argv); diff --git a/util/setup.c b/util/setup.c -index da5f2c07f..8b22bb8cc 100644 +index da5f2c07f5..8b22bb8cca 100644 --- a/util/setup.c +++ b/util/setup.c @@ -406,7 +406,7 @@ SETUP (const char *dir, diff --git a/0102-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch b/0102-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch index bbcefd2..6e18f66 100644 --- a/0102-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch +++ b/0102-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch @@ -11,7 +11,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index 2af5f23ad..091ab3283 100644 +index 2af5f23adf..091ab32836 100644 --- a/configure.ac +++ b/configure.ac @@ -1453,11 +1453,11 @@ fi @@ -45,7 +45,7 @@ index 2af5f23ad..091ab3283 100644 TARGET_CCAS=$TARGET_CC diff --git a/conf/Makefile.common b/conf/Makefile.common -index 2ff9b3935..35e14ff01 100644 +index 2ff9b39357..35e14ff017 100644 --- a/conf/Makefile.common +++ b/conf/Makefile.common @@ -66,7 +66,7 @@ grubconfdir = $(sysconfdir)/grub.d diff --git a/0103-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch b/0103-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch index 15f7e2c..5a9c6f2 100644 --- a/0103-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch +++ b/0103-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index 33e981e76..2f0336809 100644 +index 33e981e76e..2f0336809e 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -35,11 +35,16 @@ static grub_dl_t my_mod; diff --git a/0104-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch b/0104-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch index 56c524c..9b10d68 100644 --- a/0104-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch +++ b/0104-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch @@ -11,7 +11,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 41 insertions(+), 34 deletions(-) diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index 2f0336809..5f48fa556 100644 +index 2f0336809e..5f48fa5561 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -243,32 +243,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), diff --git a/0105-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch b/0105-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch index bba44ec..700c98b 100644 --- a/0105-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch +++ b/0105-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch @@ -11,7 +11,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 94 insertions(+), 73 deletions(-) diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index 5f48fa556..3e4f7ef39 100644 +index 5f48fa5561..3e4f7ef39f 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -47,6 +47,65 @@ static char *linux_cmdline; diff --git a/0106-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch b/0106-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch index e30c437..6ac11a1 100644 --- a/0106-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch +++ b/0106-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 65 insertions(+), 8 deletions(-) diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index 3e4f7ef39..6bc18d5ae 100644 +index 3e4f7ef39f..6bc18d5aef 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -52,13 +52,22 @@ struct allocation_choice { @@ -153,7 +153,7 @@ index 3e4f7ef39..6bc18d5ae 100644 grub_memcpy (kernel_mem, (char *)kernel + start, filelen - start); diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h -index 25ef52c04..fac22476c 100644 +index 25ef52c04e..fac22476cc 100644 --- a/include/grub/i386/linux.h +++ b/include/grub/i386/linux.h @@ -236,7 +236,11 @@ struct linux_kernel_params diff --git a/0107-Fix-getroot.c-s-trampolines.patch b/0107-Fix-getroot.c-s-trampolines.patch index dbf875c..e744b77 100644 --- a/0107-Fix-getroot.c-s-trampolines.patch +++ b/0107-Fix-getroot.c-s-trampolines.patch @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c -index 9f730b351..f0c503f43 100644 +index 9f730b3518..f0c503f43d 100644 --- a/grub-core/osdep/linux/getroot.c +++ b/grub-core/osdep/linux/getroot.c @@ -1264,22 +1264,20 @@ grub_util_get_grub_dev_os (const char *os_dev) diff --git a/0108-Do-not-allow-stack-trampolines-anywhere.patch b/0108-Do-not-allow-stack-trampolines-anywhere.patch index b05a36e..08995fc 100644 --- a/0108-Do-not-allow-stack-trampolines-anywhere.patch +++ b/0108-Do-not-allow-stack-trampolines-anywhere.patch @@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 091ab3283..de707f7e0 100644 +index 091ab32836..de707f7e0b 100644 --- a/configure.ac +++ b/configure.ac @@ -2028,6 +2028,9 @@ if test x"$enable_wextra" != xno ; then @@ -24,7 +24,7 @@ index 091ab3283..de707f7e0 100644 TARGET_CCAS=$TARGET_CC diff --git a/conf/Makefile.common b/conf/Makefile.common -index 35e14ff01..0647c53b9 100644 +index 35e14ff017..0647c53b91 100644 --- a/conf/Makefile.common +++ b/conf/Makefile.common @@ -66,7 +66,7 @@ grubconfdir = $(sysconfdir)/grub.d diff --git a/0109-Reimplement-boot_counter.patch b/0109-Reimplement-boot_counter.patch index b884f81..22bd4ef 100644 --- a/0109-Reimplement-boot_counter.patch +++ b/0109-Reimplement-boot_counter.patch @@ -23,7 +23,7 @@ Signed-off-by: Christian Glombek <lorbus(a)fedoraproject.org> create mode 100644 util/grub.d/01_fallback_counting.in diff --git a/Makefile.util.def b/Makefile.util.def -index 0b85a7fce..27a13bc73 100644 +index 0b85a7fce4..27a13bc734 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -458,6 +458,12 @@ script = { @@ -40,7 +40,7 @@ index 0b85a7fce..27a13bc73 100644 name = '01_menu_auto_hide'; common = util/grub.d/01_menu_auto_hide.in; diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 498ca1176..1e1534510 100644 +index 498ca11762..1e15345107 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -398,6 +398,11 @@ kernel = { @@ -57,7 +57,7 @@ index 498ca1176..1e1534510 100644 mansection = 1; diff --git a/grub-core/commands/increment.c b/grub-core/commands/increment.c new file mode 100644 -index 000000000..79cf13765 +index 0000000000..79cf137656 --- /dev/null +++ b/grub-core/commands/increment.c @@ -0,0 +1,105 @@ @@ -168,7 +168,7 @@ index 000000000..79cf13765 +} diff --git a/util/grub.d/01_fallback_counting.in b/util/grub.d/01_fallback_counting.in new file mode 100644 -index 000000000..be0e770ea +index 0000000000..be0e770ea8 --- /dev/null +++ b/util/grub.d/01_fallback_counting.in @@ -0,0 +1,22 @@ diff --git a/0110-Fix-menu-entry-selection-based-on-ID-and-title.patch b/0110-Fix-menu-entry-selection-based-on-ID-and-title.patch index cd9e50f..af74901 100644 --- a/0110-Fix-menu-entry-selection-based-on-ID-and-title.patch +++ b/0110-Fix-menu-entry-selection-based-on-ID-and-title.patch @@ -24,7 +24,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 71 insertions(+), 70 deletions(-) diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c -index d7a222e68..4a02aadb0 100644 +index d7a222e681..4a02aadb01 100644 --- a/grub-core/normal/menu.c +++ b/grub-core/normal/menu.c @@ -164,12 +164,12 @@ grub_menu_set_timeout (int timeout) diff --git a/0111-Make-the-menu-entry-users-option-argument-to-be-opti.patch b/0111-Make-the-menu-entry-users-option-argument-to-be-opti.patch index c2fbe65..68779eb 100644 --- a/0111-Make-the-menu-entry-users-option-argument-to-be-opti.patch +++ b/0111-Make-the-menu-entry-users-option-argument-to-be-opti.patch @@ -23,7 +23,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c -index b194123eb..b175a1b43 100644 +index b194123eb6..b175a1b43b 100644 --- a/grub-core/commands/menuentry.c +++ b/grub-core/commands/menuentry.c @@ -29,7 +29,7 @@ static const struct grub_arg_option options[] = diff --git a/0112-Add-efi-export-env-and-efi-load-env-commands.patch b/0112-Add-efi-export-env-and-efi-load-env-commands.patch index abff17c..ac02876 100644 --- a/0112-Add-efi-export-env-and-efi-load-env-commands.patch +++ b/0112-Add-efi-export-env-and-efi-load-env-commands.patch @@ -21,7 +21,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> create mode 100644 grub-core/commands/efi/env.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 1e1534510..81fc27414 100644 +index 1e15345107..81fc274148 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -820,6 +820,12 @@ module = { @@ -39,7 +39,7 @@ index 1e1534510..81fc27414 100644 efi = commands/efi/efifwsetup.c; diff --git a/grub-core/commands/efi/env.c b/grub-core/commands/efi/env.c new file mode 100644 -index 000000000..cbd13e03e +index 0000000000..cbd13e03e8 --- /dev/null +++ b/grub-core/commands/efi/env.c @@ -0,0 +1,168 @@ @@ -212,7 +212,7 @@ index 000000000..cbd13e03e + grub_unregister_command (loadenv_cmd); +} diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 2a446f503..14bc10eb5 100644 +index 2a446f5031..14bc10eb56 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -225,6 +225,9 @@ grub_efi_set_variable(const char *var, const grub_efi_guid_t *guid, @@ -226,7 +226,7 @@ index 2a446f503..14bc10eb5 100644 } diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c -index 2d12e6188..0574d8d62 100644 +index 2d12e6188f..0574d8d621 100644 --- a/grub-core/kern/efi/init.c +++ b/grub-core/kern/efi/init.c @@ -85,11 +85,6 @@ stack_protector_init (void) @@ -242,7 +242,7 @@ index 2d12e6188..0574d8d62 100644 static int set_var (const char *name, const char *value, diff --git a/grub-core/lib/envblk.c b/grub-core/lib/envblk.c -index 2e4e78b13..874506da1 100644 +index 2e4e78b132..874506da16 100644 --- a/grub-core/lib/envblk.c +++ b/grub-core/lib/envblk.c @@ -223,6 +223,49 @@ grub_envblk_delete (grub_envblk_t envblk, const char *name) @@ -296,7 +296,7 @@ index 2e4e78b13..874506da1 100644 grub_envblk_iterate (grub_envblk_t envblk, void *hook_data, diff --git a/util/grub-set-bootflag.c b/util/grub-set-bootflag.c -index d506f7e75..a6ccc1138 100644 +index d506f7e75b..a6ccc11383 100644 --- a/util/grub-set-bootflag.c +++ b/util/grub-set-bootflag.c @@ -25,6 +25,7 @@ @@ -308,7 +308,7 @@ index d506f7e75..a6ccc1138 100644 #include <errno.h> #include <stdio.h> diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h -index 2e0691454..8dfc89a33 100644 +index 2e0691454b..8dfc89a33b 100644 --- a/include/grub/efi/efi.h +++ b/include/grub/efi/efi.h @@ -24,6 +24,11 @@ @@ -324,7 +324,7 @@ index 2e0691454..8dfc89a33 100644 extern grub_efi_system_table_t *EXPORT_VAR(grub_efi_system_table); extern grub_efi_handle_t EXPORT_VAR(grub_efi_image_handle); diff --git a/include/grub/lib/envblk.h b/include/grub/lib/envblk.h -index c3e655921..ab969af24 100644 +index c3e6559217..ab969af246 100644 --- a/include/grub/lib/envblk.h +++ b/include/grub/lib/envblk.h @@ -22,6 +22,8 @@ diff --git a/0113-Make-it-possible-to-subtract-conditions-from-debug.patch b/0113-Make-it-possible-to-subtract-conditions-from-debug.patch index 53e28fd..15305f8 100644 --- a/0113-Make-it-possible-to-subtract-conditions-from-debug.patch +++ b/0113-Make-it-possible-to-subtract-conditions-from-debug.patch @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index 9a2fae639..578bf51a5 100644 +index 9a2fae6398..578bf51a5f 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -164,12 +164,24 @@ int diff --git a/0114-Export-all-variables-from-the-initial-context-when-c.patch b/0114-Export-all-variables-from-the-initial-context-when-c.patch index 554884b..214fa4f 100644 --- a/0114-Export-all-variables-from-the-initial-context-when-c.patch +++ b/0114-Export-all-variables-from-the-initial-context-when-c.patch @@ -17,7 +17,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/grub-core/normal/context.c b/grub-core/normal/context.c -index ee53d4a68..87edd254c 100644 +index ee53d4a68e..87edd254c4 100644 --- a/grub-core/normal/context.c +++ b/grub-core/normal/context.c @@ -99,7 +99,7 @@ grub_env_new_context (int export_all) @@ -30,7 +30,7 @@ index ee53d4a68..87edd254c 100644 int grub_extractor_level = 0; diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c -index 4a02aadb0..fe2e77a43 100644 +index 4a02aadb01..fe2e77a43e 100644 --- a/grub-core/normal/menu.c +++ b/grub-core/normal/menu.c @@ -375,8 +375,6 @@ grub_menu_execute_entry(grub_menu_entry_t entry, int auto_boot) diff --git a/0115-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch b/0115-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch index ad2e25f..0abe8ed 100644 --- a/0115-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch +++ b/0115-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch @@ -21,7 +21,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)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 27a13bc73..2e6ad979c 100644 +index 27a13bc734..2e6ad979c3 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -459,14 +459,14 @@ script = { @@ -60,7 +60,7 @@ diff --git a/util/grub.d/01_fallback_counting.in b/util/grub.d/08_fallback_count similarity index 65% rename from util/grub.d/01_fallback_counting.in rename to util/grub.d/08_fallback_counting.in -index be0e770ea..2e2c3ff7d 100644 +index be0e770ea8..2e2c3ff7d3 100644 --- a/util/grub.d/01_fallback_counting.in +++ b/util/grub.d/08_fallback_counting.in @@ -1,15 +1,17 @@ @@ -89,7 +89,7 @@ index be0e770ea..2e2c3ff7d 100644 set boot_counter=-1 diff --git a/util/grub.d/10_reset_boot_success.in b/util/grub.d/10_reset_boot_success.in new file mode 100644 -index 000000000..6c88d933d +index 0000000000..6c88d933dd --- /dev/null +++ b/util/grub.d/10_reset_boot_success.in @@ -0,0 +1,25 @@ @@ -122,7 +122,7 @@ diff --git a/util/grub.d/01_menu_auto_hide.in b/util/grub.d/12_menu_auto_hide.in similarity index 58% rename from util/grub.d/01_menu_auto_hide.in rename to util/grub.d/12_menu_auto_hide.in -index ad175870a..6a7c0fa0d 100644 +index ad175870a5..6a7c0fa0d4 100644 --- a/util/grub.d/01_menu_auto_hide.in +++ b/util/grub.d/12_menu_auto_hide.in @@ -1,5 +1,8 @@ diff --git a/0116-Fix-systemctl-kexec-exit-status-check.patch b/0116-Fix-systemctl-kexec-exit-status-check.patch index e10d649..567e678 100644 --- a/0116-Fix-systemctl-kexec-exit-status-check.patch +++ b/0116-Fix-systemctl-kexec-exit-status-check.patch @@ -19,7 +19,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/grub-core/loader/emu/linux.c b/grub-core/loader/emu/linux.c -index fda9e00d2..5b85b225e 100644 +index fda9e00d24..5b85b225ee 100644 --- a/grub-core/loader/emu/linux.c +++ b/grub-core/loader/emu/linux.c @@ -71,8 +71,10 @@ grub_linux_boot (void) diff --git a/0117-Print-grub-emu-linux-loader-messages-as-debug.patch b/0117-Print-grub-emu-linux-loader-messages-as-debug.patch index 5afe511..2718a70 100644 --- a/0117-Print-grub-emu-linux-loader-messages-as-debug.patch +++ b/0117-Print-grub-emu-linux-loader-messages-as-debug.patch @@ -11,7 +11,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/loader/emu/linux.c b/grub-core/loader/emu/linux.c -index 5b85b225e..22ab6af17 100644 +index 5b85b225ee..22ab6af172 100644 --- a/grub-core/loader/emu/linux.c +++ b/grub-core/loader/emu/linux.c @@ -50,7 +50,7 @@ grub_linux_boot (void) diff --git a/0118-Don-t-assume-that-boot-commands-will-only-return-on-.patch b/0118-Don-t-assume-that-boot-commands-will-only-return-on-.patch index 96e56cf..df36517 100644 --- a/0118-Don-t-assume-that-boot-commands-will-only-return-on-.patch +++ b/0118-Don-t-assume-that-boot-commands-will-only-return-on-.patch @@ -17,7 +17,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c -index fe2e77a43..ec0c92bad 100644 +index fe2e77a43e..ec0c92bade 100644 --- a/grub-core/normal/menu.c +++ b/grub-core/normal/menu.c @@ -285,7 +285,7 @@ get_and_remove_first_entry_number (grub_menu_t menu, const char *name) diff --git a/0119-grub-set-bootflag-Update-comment-about-running-as-ro.patch b/0119-grub-set-bootflag-Update-comment-about-running-as-ro.patch index 16829c7..9ffb3ae 100644 --- a/0119-grub-set-bootflag-Update-comment-about-running-as-ro.patch +++ b/0119-grub-set-bootflag-Update-comment-about-running-as-ro.patch @@ -13,7 +13,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/grub-set-bootflag.c b/util/grub-set-bootflag.c -index a6ccc1138..3eb04beb5 100644 +index a6ccc11383..3eb04beb5e 100644 --- a/util/grub-set-bootflag.c +++ b/util/grub-set-bootflag.c @@ -18,7 +18,7 @@ diff --git a/0120-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch b/0120-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch index bb611f6..11722d1 100644 --- a/0120-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch +++ b/0120-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch @@ -13,7 +13,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> 1 file changed, 78 insertions(+), 9 deletions(-) diff --git a/util/grub-set-bootflag.c b/util/grub-set-bootflag.c -index 3eb04beb5..3b4c25ca2 100644 +index 3eb04beb5e..3b4c25ca2a 100644 --- a/util/grub-set-bootflag.c +++ b/util/grub-set-bootflag.c @@ -28,7 +28,9 @@ diff --git a/0121-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch b/0121-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch index ff129c6..948ff73 100644 --- a/0121-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch +++ b/0121-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch @@ -53,7 +53,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/util/grub.d/10_reset_boot_success.in b/util/grub.d/10_reset_boot_success.in -index 6c88d933d..e73f4137b 100644 +index 6c88d933dd..e73f4137b3 100644 --- a/util/grub.d/10_reset_boot_success.in +++ b/util/grub.d/10_reset_boot_success.in @@ -6,18 +6,18 @@ diff --git a/0122-Add-start-symbol-for-RISC-V.patch b/0122-Add-start-symbol-for-RISC-V.patch index cc8aa6f..2746fa2 100644 --- a/0122-Add-start-symbol-for-RISC-V.patch +++ b/0122-Add-start-symbol-for-RISC-V.patch @@ -15,7 +15,7 @@ Signed-off-by: David Abdurachmanov <david.abdurachmanov(a)sifive.com> 1 file changed, 1 insertion(+) diff --git a/grub-core/kern/riscv/efi/startup.S b/grub-core/kern/riscv/efi/startup.S -index f2a7b2b1e..781773136 100644 +index f2a7b2b1ed..781773136e 100644 --- a/grub-core/kern/riscv/efi/startup.S +++ b/grub-core/kern/riscv/efi/startup.S @@ -29,6 +29,7 @@ diff --git a/0123-bootstrap.conf-Force-autogen.sh-to-use-python3.patch b/0123-bootstrap.conf-Force-autogen.sh-to-use-python3.patch index 873ce0c..8bfc964 100644 --- a/0123-bootstrap.conf-Force-autogen.sh-to-use-python3.patch +++ b/0123-bootstrap.conf-Force-autogen.sh-to-use-python3.patch @@ -19,7 +19,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.conf b/bootstrap.conf -index 6b043fc35..52d4af44b 100644 +index 6b043fc354..52d4af44be 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -92,7 +92,7 @@ bootstrap_post_import_hook () { diff --git a/0124-efi-http-Export-fw-http-_path-variables-to-make-them.patch b/0124-efi-http-Export-fw-http-_path-variables-to-make-them.patch index 5f9b8a8..f745782 100644 --- a/0124-efi-http-Export-fw-http-_path-variables-to-make-them.patch +++ b/0124-efi-http-Export-fw-http-_path-variables-to-make-them.patch @@ -25,7 +25,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 2 files changed, 2 insertions(+) diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c -index 1c540fc8c..b573be665 100644 +index 1c540fc8c2..b573be6650 100644 --- a/grub-core/kern/main.c +++ b/grub-core/kern/main.c @@ -143,6 +143,7 @@ grub_set_prefix_and_root (void) @@ -37,7 +37,7 @@ index 1c540fc8c..b573be665 100644 grub_free (fw_path); } diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c -index de351b2cd..755b7a6d0 100644 +index de351b2cd0..755b7a6d05 100644 --- a/grub-core/net/efi/http.c +++ b/grub-core/net/efi/http.c @@ -39,6 +39,7 @@ http_configure (struct grub_efi_net_device *dev, int prefer_ip6) diff --git a/0125-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch b/0125-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch index 69764f0..03d85c2 100644 --- a/0125-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch +++ b/0125-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch @@ -43,7 +43,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c -index 755b7a6d0..fc8cb25ae 100644 +index 755b7a6d05..fc8cb25ae0 100644 --- a/grub-core/net/efi/http.c +++ b/grub-core/net/efi/http.c @@ -158,13 +158,7 @@ efihttp_request (grub_efi_http_t *http, char *server, char *name, int use_https, diff --git a/0126-efi-net-Allow-to-specify-a-port-number-in-addresses.patch b/0126-efi-net-Allow-to-specify-a-port-number-in-addresses.patch index 9426842..8fe26cd 100644 --- a/0126-efi-net-Allow-to-specify-a-port-number-in-addresses.patch +++ b/0126-efi-net-Allow-to-specify-a-port-number-in-addresses.patch @@ -25,7 +25,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c -index 6603cd83e..84573937b 100644 +index 6603cd83ed..84573937b1 100644 --- a/grub-core/net/efi/net.c +++ b/grub-core/net/efi/net.c @@ -742,7 +742,7 @@ grub_efi_net_parse_address (const char *address, diff --git a/0127-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch b/0127-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch index 807bda4..2dc7001 100644 --- a/0127-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch +++ b/0127-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch @@ -21,7 +21,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/grub-core/net/efi/ip4_config.c b/grub-core/net/efi/ip4_config.c -index b711a5d94..313c818b1 100644 +index b711a5d945..313c818b18 100644 --- a/grub-core/net/efi/ip4_config.c +++ b/grub-core/net/efi/ip4_config.c @@ -56,9 +56,20 @@ int diff --git a/0128-efi-net-Print-a-debug-message-if-parsing-the-address.patch b/0128-efi-net-Print-a-debug-message-if-parsing-the-address.patch index 0f5ff97..da94e08 100644 --- a/0128-efi-net-Print-a-debug-message-if-parsing-the-address.patch +++ b/0128-efi-net-Print-a-debug-message-if-parsing-the-address.patch @@ -22,7 +22,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c -index 84573937b..a3f0535d4 100644 +index 84573937b1..a3f0535d43 100644 --- a/grub-core/net/efi/net.c +++ b/grub-core/net/efi/net.c @@ -778,9 +778,9 @@ grub_efi_net_parse_address (const char *address, diff --git a/0129-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch b/0129-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch index b8f4eeb..8793b0d 100644 --- a/0129-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch +++ b/0129-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch @@ -12,7 +12,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/grub-core/kern/term.c b/grub-core/kern/term.c -index 14d596498..4d61f4e97 100644 +index 14d5964983..4d61f4e979 100644 --- a/grub-core/kern/term.c +++ b/grub-core/kern/term.c @@ -144,9 +144,10 @@ grub_key_is_interrupt (int key) diff --git a/0130-efi-Set-image-base-address-before-jumping-to-the-PE-.patch b/0130-efi-Set-image-base-address-before-jumping-to-the-PE-.patch index c3d2b9b..6aa5013 100644 --- a/0130-efi-Set-image-base-address-before-jumping-to-the-PE-.patch +++ b/0130-efi-Set-image-base-address-before-jumping-to-the-PE-.patch @@ -29,7 +29,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 14 insertions(+) diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c -index 0622dfa48..e8b9ecb17 100644 +index 0622dfa48d..e8b9ecb17f 100644 --- a/grub-core/loader/efi/linux.c +++ b/grub-core/loader/efi/linux.c @@ -72,6 +72,7 @@ grub_err_t diff --git a/0131-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch b/0131-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch index 35a5a6a..d1c7b17 100644 --- a/0131-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch +++ b/0131-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch @@ -18,7 +18,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/grub-core/commands/tpm.c b/grub-core/commands/tpm.c -index 2052c36ea..e287d042e 100644 +index 2052c36eab..e287d042e6 100644 --- a/grub-core/commands/tpm.c +++ b/grub-core/commands/tpm.c @@ -42,7 +42,8 @@ grub_tpm_verify_init (grub_file_t io, diff --git a/0132-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch b/0132-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch index 420bc23..7c41e87 100644 --- a/0132-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch +++ b/0132-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch @@ -26,7 +26,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index 6bc18d5ae..15d40d6e3 100644 +index 6bc18d5aef..15d40d6e35 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -144,7 +144,7 @@ grub_linuxefi_unload (void) diff --git a/0133-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch b/0133-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch index e62feb0..7fef93e 100644 --- a/0133-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch +++ b/0133-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch @@ -20,7 +20,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/grub-core/net/http.c b/grub-core/net/http.c -index b52b558d6..7f878b561 100644 +index b52b558d63..7f878b5615 100644 --- a/grub-core/net/http.c +++ b/grub-core/net/http.c @@ -501,13 +501,20 @@ http_open (struct grub_file *file, const char *filename) diff --git a/0134-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch b/0134-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch index 956208a..f3b10c1 100644 --- a/0134-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch +++ b/0134-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch @@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 2 insertions(+) diff --git a/grub-core/commands/efi/env.c b/grub-core/commands/efi/env.c -index cbd13e03e..977edb6b0 100644 +index cbd13e03e8..977edb6b06 100644 --- a/grub-core/commands/efi/env.c +++ b/grub-core/commands/efi/env.c @@ -149,6 +149,8 @@ grub_efi_load_env(grub_command_t cmd __attribute__ ((unused)), diff --git a/0135-efi-dhcp-fix-some-allocation-error-checking.patch b/0135-efi-dhcp-fix-some-allocation-error-checking.patch index b705d12..90e7a34 100644 --- a/0135-efi-dhcp-fix-some-allocation-error-checking.patch +++ b/0135-efi-dhcp-fix-some-allocation-error-checking.patch @@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/grub-core/net/efi/dhcp.c b/grub-core/net/efi/dhcp.c -index dbef63d8c..e5c79b748 100644 +index dbef63d8c0..e5c79b748b 100644 --- a/grub-core/net/efi/dhcp.c +++ b/grub-core/net/efi/dhcp.c @@ -80,7 +80,7 @@ grub_efi_dhcp4_parse_dns (grub_efi_dhcp4_protocol_t *dhcp4, grub_efi_dhcp4_packe diff --git a/0136-efi-http-fix-some-allocation-error-checking.patch b/0136-efi-http-fix-some-allocation-error-checking.patch index 6aa40dd..149ada8 100644 --- a/0136-efi-http-fix-some-allocation-error-checking.patch +++ b/0136-efi-http-fix-some-allocation-error-checking.patch @@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c -index fc8cb25ae..26647a50f 100644 +index fc8cb25ae0..26647a50fa 100644 --- a/grub-core/net/efi/http.c +++ b/grub-core/net/efi/http.c @@ -412,8 +412,8 @@ grub_efihttp_open (struct grub_efi_net_device *dev, diff --git a/0137-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch b/0137-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch index b40c4c2..6413eb6 100644 --- a/0137-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch +++ b/0137-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch @@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/grub-core/net/efi/ip4_config.c b/grub-core/net/efi/ip4_config.c -index 313c818b1..9725e928f 100644 +index 313c818b18..9725e928f7 100644 --- a/grub-core/net/efi/ip4_config.c +++ b/grub-core/net/efi/ip4_config.c @@ -4,15 +4,20 @@ @@ -82,7 +82,7 @@ index 313c818b1..9725e928f 100644 char *subnet, *gateway, *mask; grub_uint32_t u32_subnet, u32_gateway; diff --git a/grub-core/net/efi/ip6_config.c b/grub-core/net/efi/ip6_config.c -index 017c4d05b..a46f6f9b6 100644 +index 017c4d05bc..a46f6f9b68 100644 --- a/grub-core/net/efi/ip6_config.c +++ b/grub-core/net/efi/ip6_config.c @@ -3,6 +3,7 @@ diff --git a/0138-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch b/0138-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch index e1db533..8e63d1d 100644 --- a/0138-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch +++ b/0138-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch @@ -13,7 +13,7 @@ Signed-off-by: Colin Watson <cjwatson(a)debian.org> 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index 15d40d6e3..f992ceeef 100644 +index 15d40d6e35..f992ceeef2 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -28,6 +28,8 @@ diff --git a/0139-linuxefi-fail-kernel-validation-without-shim-protoco.patch b/0139-linuxefi-fail-kernel-validation-without-shim-protoco.patch index 2b5f602..828fe16 100644 --- a/0139-linuxefi-fail-kernel-validation-without-shim-protoco.patch +++ b/0139-linuxefi-fail-kernel-validation-without-shim-protoco.patch @@ -23,7 +23,7 @@ Signed-off-by: Dimitri John Ledkov <xnox(a)ubuntu.com> 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c -index 70a0075ec..47f8cf0d8 100644 +index 70a0075ec5..47f8cf0d84 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -34,6 +34,7 @@ @@ -55,7 +55,7 @@ index 70a0075ec..47f8cf0d8 100644 pe = (void *)((unsigned long)kernel_addr + lh.hdr_offset); diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index ac8dfd40c..d41e8ea14 100644 +index ac8dfd40c6..d41e8ea14a 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -1084,6 +1084,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), @@ -67,7 +67,7 @@ index ac8dfd40c..d41e8ea14 100644 fail: if (dev) diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c -index e8b9ecb17..9260731c1 100644 +index e8b9ecb17f..9260731c10 100644 --- a/grub-core/loader/efi/linux.c +++ b/grub-core/loader/efi/linux.c @@ -33,6 +33,7 @@ struct grub_efi_shim_lock @@ -79,7 +79,7 @@ index e8b9ecb17..9260731c1 100644 grub_linuxefi_secure_validate (void *data, grub_uint32_t size) { diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index f992ceeef..3cf0f9b33 100644 +index f992ceeef2..3cf0f9b330 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -30,6 +30,7 @@ diff --git a/0140-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch b/0140-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch index b99d5e0..f20f5c7 100644 --- a/0140-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch +++ b/0140-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c -index 8fb8918ae..7baf3540c 100644 +index 8fb8918ae7..7baf3540c8 100644 --- a/grub-core/net/bootp.c +++ b/grub-core/net/bootp.c @@ -329,7 +329,7 @@ grub_net_configure_by_dhcp_ack (const char *name, diff --git a/0141-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch b/0141-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch index 346beb3..ea92110 100644 --- a/0141-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch +++ b/0141-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/grub-core/net/efi/ip4_config.c b/grub-core/net/efi/ip4_config.c -index 9725e928f..cb880fc3e 100644 +index 9725e928f7..cb880fc3e8 100644 --- a/grub-core/net/efi/ip4_config.c +++ b/grub-core/net/efi/ip4_config.c @@ -61,7 +61,8 @@ int diff --git a/0142-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch b/0142-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch index e8e411b..915e6d7 100644 --- a/0142-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch +++ b/0142-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/net/efi/ip6_config.c b/grub-core/net/efi/ip6_config.c -index a46f6f9b6..1c5415d71 100644 +index a46f6f9b68..1c5415d718 100644 --- a/grub-core/net/efi/ip6_config.c +++ b/grub-core/net/efi/ip6_config.c @@ -85,7 +85,7 @@ grub_efi_string_to_ip6_address (const char *val, grub_efi_ipv6_address_t *addres diff --git a/0143-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch b/0143-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch index fa35002..fbba65a 100644 --- a/0143-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch +++ b/0143-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c -index a3f0535d4..78e5442fc 100644 +index a3f0535d43..78e5442fc5 100644 --- a/grub-core/net/efi/net.c +++ b/grub-core/net/efi/net.c @@ -729,7 +729,7 @@ grub_efi_net_parse_address (const char *address, diff --git a/0144-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch b/0144-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch index 8b55d80..9b9acfe 100644 --- a/0144-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch +++ b/0144-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/grub-core/net/efi/pxe.c b/grub-core/net/efi/pxe.c -index 531949cba..73e2bb01c 100644 +index 531949cba5..73e2bb01c1 100644 --- a/grub-core/net/efi/pxe.c +++ b/grub-core/net/efi/pxe.c @@ -187,7 +187,7 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest) diff --git a/0145-Add-systemd-integration-scripts-to-make-systemctl-re.patch b/0145-Add-systemd-integration-scripts-to-make-systemctl-re.patch index bef2e7d..9e0fc88 100644 --- a/0145-Add-systemd-integration-scripts-to-make-systemctl-re.patch +++ b/0145-Add-systemd-integration-scripts-to-make-systemctl-re.patch @@ -65,7 +65,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> create mode 100644 util/systemd/systemd-integration.sh.in diff --git a/Makefile.util.def b/Makefile.util.def -index 2e6ad979c..9927c2cfd 100644 +index 2e6ad979c3..9927c2cfd6 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -470,6 +470,12 @@ script = { @@ -110,7 +110,7 @@ index 2e6ad979c..9927c2cfd 100644 mansection = 1; name = grub-mkrescue; diff --git a/conf/Makefile.common b/conf/Makefile.common -index 0647c53b9..9fe5863b2 100644 +index 0647c53b91..9fe5863b2d 100644 --- a/conf/Makefile.common +++ b/conf/Makefile.common @@ -63,8 +63,11 @@ CCASFLAGS_LIBRARY = $(UTILS_CCASFLAGS) @@ -137,7 +137,7 @@ index 0647c53b9..9fe5863b2 100644 EXTRA_DIST = diff --git a/util/grub.d/14_menu_show_once.in b/util/grub.d/14_menu_show_once.in new file mode 100755 -index 000000000..1cd7f3614 +index 0000000000..1cd7f36142 --- /dev/null +++ b/util/grub.d/14_menu_show_once.in @@ -0,0 +1,13 @@ @@ -156,7 +156,7 @@ index 000000000..1cd7f3614 +EOF diff --git a/util/systemd/10-grub-logind-service.conf.in b/util/systemd/10-grub-logind-service.conf.in new file mode 100644 -index 000000000..f2d4ac007 +index 0000000000..f2d4ac0073 --- /dev/null +++ b/util/systemd/10-grub-logind-service.conf.in @@ -0,0 +1,2 @@ @@ -164,7 +164,7 @@ index 000000000..f2d4ac007 +Environment=SYSTEMD_REBOOT_TO_BOOT_LOADER_MENU=true diff --git a/util/systemd/grub-systemd-integration.service.in b/util/systemd/grub-systemd-integration.service.in new file mode 100644 -index 000000000..c81fb594c +index 0000000000..c81fb594ce --- /dev/null +++ b/util/systemd/grub-systemd-integration.service.in @@ -0,0 +1,8 @@ @@ -178,7 +178,7 @@ index 000000000..c81fb594c +ExecStart=@libexecdir@/@grubdirname(a)/systemd-integration.sh diff --git a/util/systemd/systemd-integration.sh.in b/util/systemd/systemd-integration.sh.in new file mode 100644 -index 000000000..dc1218597 +index 0000000000..dc1218597b --- /dev/null +++ b/util/systemd/systemd-integration.sh.in @@ -0,0 +1,6 @@ diff --git a/0146-systemd-integration.sh-Also-set-old-menu_show_once-g.patch b/0146-systemd-integration.sh-Also-set-old-menu_show_once-g.patch index 77131a2..a16ed68 100644 --- a/0146-systemd-integration.sh-Also-set-old-menu_show_once-g.patch +++ b/0146-systemd-integration.sh-Also-set-old-menu_show_once-g.patch @@ -18,7 +18,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> 1 file changed, 5 insertions(+) diff --git a/util/systemd/systemd-integration.sh.in b/util/systemd/systemd-integration.sh.in -index dc1218597..a4c071c5b 100644 +index dc1218597b..a4c071c5b0 100644 --- a/util/systemd/systemd-integration.sh.in +++ b/util/systemd/systemd-integration.sh.in @@ -4,3 +4,8 @@ TIMEOUT_USEC=$(cat /run/systemd/reboot-to-boot-loader-menu) diff --git a/0147-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch b/0147-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch index d16abcd..f891a69 100644 --- a/0147-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch +++ b/0147-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch @@ -29,7 +29,7 @@ Signed-off-by: Renaud Métrich <rmetrich(a)redhat.com> 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c -index 597111077..260143826 100644 +index 597111077b..2601438260 100644 --- a/grub-core/term/at_keyboard.c +++ b/grub-core/term/at_keyboard.c @@ -135,20 +135,28 @@ query_mode (void) @@ -105,7 +105,7 @@ index 597111077..260143826 100644 } diff --git a/include/grub/at_keyboard.h b/include/grub/at_keyboard.h -index bcb4d9ba7..9414dc1b9 100644 +index bcb4d9ba78..9414dc1b99 100644 --- a/include/grub/at_keyboard.h +++ b/include/grub/at_keyboard.h @@ -19,6 +19,10 @@ diff --git a/0148-grub-install-disable-support-for-EFI-platforms.patch b/0148-grub-install-disable-support-for-EFI-platforms.patch index 34d04d5..f6a7530 100644 --- a/0148-grub-install-disable-support-for-EFI-platforms.patch +++ b/0148-grub-install-disable-support-for-EFI-platforms.patch @@ -26,7 +26,7 @@ Signed-off-by: Jan Hlavac <jhlavac(a)redhat.com> 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/util/grub-install.c b/util/grub-install.c -index a2bec7446..5babc7af5 100644 +index a2bec7446c..5babc7af55 100644 --- a/util/grub-install.c +++ b/util/grub-install.c @@ -899,6 +899,22 @@ main (int argc, char *argv[]) @@ -82,7 +82,7 @@ index a2bec7446..5babc7af5 100644 { grub_fs_t fs; diff --git a/docs/grub.texi b/docs/grub.texi -index 04ed6ac1f..4870faaa0 100644 +index 04ed6ac1f0..4870faaa00 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -6509,6 +6509,13 @@ grub2-install @var{install_device} diff --git a/0149-New-with-debug-timestamps-configure-flag-to-prepend-.patch b/0149-New-with-debug-timestamps-configure-flag-to-prepend-.patch index d0a1f68..c32be3c 100644 --- a/0149-New-with-debug-timestamps-configure-flag-to-prepend-.patch +++ b/0149-New-with-debug-timestamps-configure-flag-to-prepend-.patch @@ -15,7 +15,7 @@ Signed-off-by: Renaud Métrich <rmetrich(a)redhat.com> 3 files changed, 39 insertions(+) diff --git a/configure.ac b/configure.ac -index de707f7e0..f069d8403 100644 +index de707f7e0b..f069d84039 100644 --- a/configure.ac +++ b/configure.ac @@ -1586,6 +1586,17 @@ else @@ -58,7 +58,7 @@ index de707f7e0..f069d8403 100644 echo efiemu runtime: Yes else diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index 578bf51a5..9f54b6b7d 100644 +index 578bf51a5f..9f54b6b7d2 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -25,6 +25,9 @@ @@ -99,7 +99,7 @@ index 578bf51a5..9f54b6b7d 100644 va_start (args, fmt); grub_vprintf (fmt, args); diff --git a/config.h.in b/config.h.in -index c7e316f0f..c80e3e0ab 100644 +index c7e316f0f1..c80e3e0aba 100644 --- a/config.h.in +++ b/config.h.in @@ -12,6 +12,7 @@ diff --git a/0150-Added-debug-statements-to-grub_disk_open-and-grub_di.patch b/0150-Added-debug-statements-to-grub_disk_open-and-grub_di.patch index 71fa73a..d26027c 100644 --- a/0150-Added-debug-statements-to-grub_disk_open-and-grub_di.patch +++ b/0150-Added-debug-statements-to-grub_disk_open-and-grub_di.patch @@ -13,7 +13,7 @@ Signed-off-by: Renaud Métrich <rmetrich(a)redhat.com> 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/grub-core/kern/disk.c b/grub-core/kern/disk.c -index e1b0e073e..05a28ab14 100644 +index e1b0e073e0..05a28ab142 100644 --- a/grub-core/kern/disk.c +++ b/grub-core/kern/disk.c @@ -285,6 +285,8 @@ grub_disk_open (const char *name) diff --git a/0151-Introduce-function-grub_debug_is_enabled-void-return.patch b/0151-Introduce-function-grub_debug_is_enabled-void-return.patch index ef33974..9ce5d9d 100644 --- a/0151-Introduce-function-grub_debug_is_enabled-void-return.patch +++ b/0151-Introduce-function-grub_debug_is_enabled-void-return.patch @@ -14,7 +14,7 @@ Signed-off-by: Renaud Métrich <rmetrich(a)redhat.com> 2 files changed, 14 insertions(+) diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index 9f54b6b7d..a186ad3dd 100644 +index 9f54b6b7d2..a186ad3dd4 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -163,6 +163,19 @@ int grub_err_printf (const char *fmt, ...) @@ -38,7 +38,7 @@ index 9f54b6b7d..a186ad3dd 100644 grub_debug_enabled (const char * condition) { diff --git a/include/grub/misc.h b/include/grub/misc.h -index 3adc4036e..6c4aa85ac 100644 +index 3adc4036e3..6c4aa85ac5 100644 --- a/include/grub/misc.h +++ b/include/grub/misc.h @@ -340,6 +340,7 @@ grub_puts (const char *s) diff --git a/0152-Don-t-clear-screen-when-debugging-is-enabled.patch b/0152-Don-t-clear-screen-when-debugging-is-enabled.patch index ee987e7..c35d8a3 100644 --- a/0152-Don-t-clear-screen-when-debugging-is-enabled.patch +++ b/0152-Don-t-clear-screen-when-debugging-is-enabled.patch @@ -14,7 +14,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index 1970e4816..4ebdbd228 100644 +index af9792c963..7de9e4c36d 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -215,8 +215,9 @@ grub_normal_init_page (struct grub_term_output *term, @@ -27,5 +27,5 @@ index 1970e4816..4ebdbd228 100644 + if (! grub_debug_is_enabled ()) + grub_term_cls (term); - msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION); + msg_formatted = grub_xasprintf (_("GRUB version %s"), PACKAGE_VERSION); if (!msg_formatted) diff --git a/0153-grub_file_-instrumentation-new-file-debug-tag.patch b/0153-grub_file_-instrumentation-new-file-debug-tag.patch index da9c4ab..908e1ff 100644 --- a/0153-grub_file_-instrumentation-new-file-debug-tag.patch +++ b/0153-grub_file_-instrumentation-new-file-debug-tag.patch @@ -12,7 +12,7 @@ Signed-off-by: Renaud Métrich <rmetrich(a)redhat.com> 1 file changed, 14 insertions(+) diff --git a/grub-core/kern/file.c b/grub-core/kern/file.c -index 58454458c..e19aea3e5 100644 +index 58454458c4..e19aea3e51 100644 --- a/grub-core/kern/file.c +++ b/grub-core/kern/file.c @@ -66,6 +66,8 @@ grub_file_open (const char *name, enum grub_file_type type) diff --git a/0154-ieee1275-Avoiding-many-unecessary-open-close.patch b/0154-ieee1275-Avoiding-many-unecessary-open-close.patch index 68b89ff..f6c5244 100644 --- a/0154-ieee1275-Avoiding-many-unecessary-open-close.patch +++ b/0154-ieee1275-Avoiding-many-unecessary-open-close.patch @@ -9,7 +9,7 @@ Signed-off-by: Diego Domingos <diegodo(a)br.ibm.com> 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c -index 03674cb47..ea7f78ac7 100644 +index 03674cb477..ea7f78ac7d 100644 --- a/grub-core/disk/ieee1275/ofdisk.c +++ b/grub-core/disk/ieee1275/ofdisk.c @@ -44,7 +44,7 @@ struct ofdisk_hash_ent diff --git a/0155-ieee1275-powerpc-implements-fibre-channel-discovery-.patch b/0155-ieee1275-powerpc-implements-fibre-channel-discovery-.patch index 94f4eb7..04c5c32 100644 --- a/0155-ieee1275-powerpc-implements-fibre-channel-discovery-.patch +++ b/0155-ieee1275-powerpc-implements-fibre-channel-discovery-.patch @@ -15,7 +15,7 @@ Signed-off-by: Diego Domingos <diegodo(a)br.ibm.com> 1 file changed, 49 insertions(+) diff --git a/grub-core/osdep/linux/ofpath.c b/grub-core/osdep/linux/ofpath.c -index a6153d359..0f5d54e9f 100644 +index a6153d3595..0f5d54e9f2 100644 --- a/grub-core/osdep/linux/ofpath.c +++ b/grub-core/osdep/linux/ofpath.c @@ -350,6 +350,38 @@ of_path_of_ide(const char *sys_devname __attribute__((unused)), const char *devi diff --git a/0156-ieee1275-powerpc-enables-device-mapper-discovery.patch b/0156-ieee1275-powerpc-enables-device-mapper-discovery.patch index 8bb1934..85dbde7 100644 --- a/0156-ieee1275-powerpc-enables-device-mapper-discovery.patch +++ b/0156-ieee1275-powerpc-enables-device-mapper-discovery.patch @@ -17,7 +17,7 @@ Signed-off-by: Diego Domingos <diegodo(a)br.ibm.com> 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/grub-core/osdep/linux/ofpath.c b/grub-core/osdep/linux/ofpath.c -index 0f5d54e9f..cc849d9c9 100644 +index 0f5d54e9f2..cc849d9c94 100644 --- a/grub-core/osdep/linux/ofpath.c +++ b/grub-core/osdep/linux/ofpath.c @@ -37,6 +37,7 @@ diff --git a/0157-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch b/0157-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch index 7b8150a..f938fd1 100644 --- a/0157-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch +++ b/0157-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch @@ -35,7 +35,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 96 insertions(+), 25 deletions(-) diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c -index 260143826..dac0f946f 100644 +index 2601438260..dac0f946fe 100644 --- a/grub-core/term/at_keyboard.c +++ b/grub-core/term/at_keyboard.c @@ -31,6 +31,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); diff --git a/0158-Add-suport-for-signing-grub-with-an-appended-signatu.patch b/0158-Add-suport-for-signing-grub-with-an-appended-signatu.patch index 9e42d64..81660d4 100644 --- a/0158-Add-suport-for-signing-grub-with-an-appended-signatu.patch +++ b/0158-Add-suport-for-signing-grub-with-an-appended-signatu.patch @@ -43,7 +43,7 @@ Signed-off-by: Rashmica Gupta <rashmica.g(a)gmail.com> 6 files changed, 80 insertions(+), 17 deletions(-) diff --git a/util/grub-install-common.c b/util/grub-install-common.c -index 4e212e690..a74fee16e 100644 +index 4e212e690c..a74fee16e2 100644 --- a/util/grub-install-common.c +++ b/util/grub-install-common.c @@ -461,10 +461,12 @@ static size_t npubkeys; @@ -99,7 +99,7 @@ index 4e212e690..a74fee16e 100644 while (dc--) grub_install_pop_module (); diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c -index c0d559937..8a5331054 100644 +index c0d5599370..8a53310548 100644 --- a/util/grub-mkimage.c +++ b/util/grub-mkimage.c @@ -84,6 +84,7 @@ static struct argp_option options[] = { @@ -153,7 +153,7 @@ index c0d559937..8a5331054 100644 if (grub_util_file_sync (fp) < 0) grub_util_error (_("cannot sync `%s': %s"), arguments.output ? : "stdout", diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c -index d78fa3e53..393119486 100644 +index d78fa3e533..393119486d 100644 --- a/util/grub-mkimagexx.c +++ b/util/grub-mkimagexx.c @@ -84,6 +84,15 @@ struct grub_ieee1275_note @@ -224,7 +224,7 @@ index d78fa3e53..393119486 100644 char *str_start = (elf_img + sizeof (*ehdr) + phnum * sizeof (*phdr) + shnum * sizeof (*shdr)); diff --git a/util/mkimage.c b/util/mkimage.c -index a26cf76f7..bab122760 100644 +index a26cf76f72..bab1227601 100644 --- a/util/mkimage.c +++ b/util/mkimage.c @@ -869,8 +869,9 @@ grub_install_generate_image (const char *dir, const char *prefix, @@ -256,7 +256,7 @@ index a26cf76f7..bab122760 100644 break; } diff --git a/include/grub/util/install.h b/include/grub/util/install.h -index 7df3191f4..cf4531e02 100644 +index 7df3191f47..cf4531e02b 100644 --- a/include/grub/util/install.h +++ b/include/grub/util/install.h @@ -67,6 +67,9 @@ @@ -289,7 +289,7 @@ index 7df3191f4..cf4531e02 100644 const char *sbat_path, const int disable_shim_lock); diff --git a/include/grub/util/mkimage.h b/include/grub/util/mkimage.h -index 3819a6744..6f1da89b9 100644 +index 3819a67441..6f1da89b9b 100644 --- a/include/grub/util/mkimage.h +++ b/include/grub/util/mkimage.h @@ -51,12 +51,12 @@ grub_mkimage_load_image64 (const char *kernel_path, diff --git a/0159-docs-grub-Document-signing-grub-under-UEFI.patch b/0159-docs-grub-Document-signing-grub-under-UEFI.patch index 328e5ab..f2b5c17 100644 --- a/0159-docs-grub-Document-signing-grub-under-UEFI.patch +++ b/0159-docs-grub-Document-signing-grub-under-UEFI.patch @@ -13,7 +13,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/docs/grub.texi b/docs/grub.texi -index 4870faaa0..365d1d693 100644 +index 4870faaa00..365d1d6931 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -5817,6 +5817,7 @@ environment variables and commands are listed in the same order. diff --git a/0160-docs-grub-Document-signing-grub-with-an-appended-sig.patch b/0160-docs-grub-Document-signing-grub-with-an-appended-sig.patch index 9e04af2..ee3d659 100644 --- a/0160-docs-grub-Document-signing-grub-with-an-appended-sig.patch +++ b/0160-docs-grub-Document-signing-grub-with-an-appended-sig.patch @@ -13,7 +13,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 1 file changed, 42 insertions(+) diff --git a/docs/grub.texi b/docs/grub.texi -index 365d1d693..afbde7c1f 100644 +index 365d1d6931..afbde7c1f7 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -6087,6 +6087,48 @@ image works under UEFI secure boot and can maintain the secure-boot chain. It diff --git a/0161-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch b/0161-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch index 1d8012d..b23ce49 100644 --- a/0161-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch +++ b/0161-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch @@ -16,7 +16,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 1 file changed, 11 insertions(+) diff --git a/include/grub/dl.h b/include/grub/dl.h -index 2f76e6b04..20d870f2a 100644 +index 2f76e6b043..20d870f2a4 100644 --- a/include/grub/dl.h +++ b/include/grub/dl.h @@ -245,11 +245,22 @@ grub_dl_get (const char *name) diff --git a/0162-pgp-factor-out-rsa_pad.patch b/0162-pgp-factor-out-rsa_pad.patch index 1c566b2..f1e721d 100644 --- a/0162-pgp-factor-out-rsa_pad.patch +++ b/0162-pgp-factor-out-rsa_pad.patch @@ -27,7 +27,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> create mode 100644 include/grub/pkcs1_v15.h diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 81fc27414..97347ae76 100644 +index 81fc274148..97347ae76f 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -2510,6 +2510,14 @@ module = { @@ -46,7 +46,7 @@ index 81fc27414..97347ae76 100644 name = all_video; common = lib/fake_module.c; diff --git a/grub-core/commands/pgp.c b/grub-core/commands/pgp.c -index 5daa1e9d0..2408db499 100644 +index 5daa1e9d00..2408db4994 100644 --- a/grub-core/commands/pgp.c +++ b/grub-core/commands/pgp.c @@ -24,6 +24,7 @@ @@ -93,7 +93,7 @@ index 5daa1e9d0..2408db499 100644 struct grub_pubkey_context diff --git a/grub-core/lib/pkcs1_v15.c b/grub-core/lib/pkcs1_v15.c new file mode 100644 -index 000000000..dbacd563d +index 0000000000..dbacd563d0 --- /dev/null +++ b/grub-core/lib/pkcs1_v15.c @@ -0,0 +1,59 @@ @@ -158,7 +158,7 @@ index 000000000..dbacd563d +} diff --git a/include/grub/pkcs1_v15.h b/include/grub/pkcs1_v15.h new file mode 100644 -index 000000000..5c338c84a +index 0000000000..5c338c84a1 --- /dev/null +++ b/include/grub/pkcs1_v15.h @@ -0,0 +1,27 @@ diff --git a/0163-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch b/0163-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch index b104617..541474e 100644 --- a/0163-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch +++ b/0163-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch @@ -40,7 +40,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/grub-core/commands/pgp.c b/grub-core/commands/pgp.c -index 2408db499..355a43844 100644 +index 2408db4994..355a43844a 100644 --- a/grub-core/commands/pgp.c +++ b/grub-core/commands/pgp.c @@ -147,10 +147,6 @@ const char *hashes[] = { @@ -55,7 +55,7 @@ index 2408db499..355a43844 100644 dsa_pad (gcry_mpi_t *hmpi, grub_uint8_t *hval, const gcry_md_spec_t *hash, struct grub_public_subkey *sk); diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c -index ca334d5a4..c578128a5 100644 +index ca334d5a40..c578128a59 100644 --- a/grub-core/lib/crypto.c +++ b/grub-core/lib/crypto.c @@ -121,6 +121,10 @@ grub_md_unregister (gcry_md_spec_t *cipher) diff --git a/0164-posix_wrap-tweaks-in-preparation-for-libtasn1.patch b/0164-posix_wrap-tweaks-in-preparation-for-libtasn1.patch index fed345e..3176f1b 100644 --- a/0164-posix_wrap-tweaks-in-preparation-for-libtasn1.patch +++ b/0164-posix_wrap-tweaks-in-preparation-for-libtasn1.patch @@ -23,7 +23,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 3 files changed, 10 insertions(+) diff --git a/grub-core/lib/posix_wrap/limits.h b/grub-core/lib/posix_wrap/limits.h -index 7217138ff..591dbf328 100644 +index 7217138ffd..591dbf3289 100644 --- a/grub-core/lib/posix_wrap/limits.h +++ b/grub-core/lib/posix_wrap/limits.h @@ -37,5 +37,6 @@ @@ -34,7 +34,7 @@ index 7217138ff..591dbf328 100644 #endif diff --git a/grub-core/lib/posix_wrap/stdlib.h b/grub-core/lib/posix_wrap/stdlib.h -index 7a8d385e9..4634db09f 100644 +index 7a8d385e97..4634db09f2 100644 --- a/grub-core/lib/posix_wrap/stdlib.h +++ b/grub-core/lib/posix_wrap/stdlib.h @@ -58,4 +58,12 @@ abs (int c) @@ -51,7 +51,7 @@ index 7a8d385e9..4634db09f 100644 + #endif diff --git a/grub-core/lib/posix_wrap/sys/types.h b/grub-core/lib/posix_wrap/sys/types.h -index 854eb0122..f63412c8d 100644 +index 854eb0122e..f63412c8da 100644 --- a/grub-core/lib/posix_wrap/sys/types.h +++ b/grub-core/lib/posix_wrap/sys/types.h @@ -51,6 +51,7 @@ typedef grub_uint8_t byte; diff --git a/0165-libtasn1-import-libtasn1-4.16.0.patch b/0165-libtasn1-import-libtasn1-4.16.0.patch index 7a7b05d..9587661 100644 --- a/0165-libtasn1-import-libtasn1-4.16.0.patch +++ b/0165-libtasn1-import-libtasn1-4.16.0.patch @@ -53,7 +53,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> diff --git a/grub-core/lib/libtasn1/lib/coding.c b/grub-core/lib/libtasn1/lib/coding.c new file mode 100644 -index 000000000..245ea64cf +index 0000000000..245ea64cf0 --- /dev/null +++ b/grub-core/lib/libtasn1/lib/coding.c @@ -0,0 +1,1415 @@ @@ -1474,7 +1474,7 @@ index 000000000..245ea64cf +} diff --git a/grub-core/lib/libtasn1/lib/decoding.c b/grub-core/lib/libtasn1/lib/decoding.c new file mode 100644 -index 000000000..ff04eb778 +index 0000000000..ff04eb778c --- /dev/null +++ b/grub-core/lib/libtasn1/lib/decoding.c @@ -0,0 +1,2478 @@ @@ -3958,7 +3958,7 @@ index 000000000..ff04eb778 +} diff --git a/grub-core/lib/libtasn1/lib/element.c b/grub-core/lib/libtasn1/lib/element.c new file mode 100644 -index 000000000..997eb2725 +index 0000000000..997eb2725d --- /dev/null +++ b/grub-core/lib/libtasn1/lib/element.c @@ -0,0 +1,1111 @@ @@ -5075,7 +5075,7 @@ index 000000000..997eb2725 +} diff --git a/grub-core/lib/libtasn1/lib/errors.c b/grub-core/lib/libtasn1/lib/errors.c new file mode 100644 -index 000000000..cee74daf7 +index 0000000000..cee74daf79 --- /dev/null +++ b/grub-core/lib/libtasn1/lib/errors.c @@ -0,0 +1,100 @@ @@ -5181,7 +5181,7 @@ index 000000000..cee74daf7 +} diff --git a/grub-core/lib/libtasn1/lib/gstr.c b/grub-core/lib/libtasn1/lib/gstr.c new file mode 100644 -index 000000000..e91a3a151 +index 0000000000..e91a3a151c --- /dev/null +++ b/grub-core/lib/libtasn1/lib/gstr.c @@ -0,0 +1,74 @@ @@ -5261,7 +5261,7 @@ index 000000000..e91a3a151 +} diff --git a/grub-core/lib/libtasn1/lib/parser_aux.c b/grub-core/lib/libtasn1/lib/parser_aux.c new file mode 100644 -index 000000000..d5dbbf876 +index 0000000000..d5dbbf8765 --- /dev/null +++ b/grub-core/lib/libtasn1/lib/parser_aux.c @@ -0,0 +1,1173 @@ @@ -6440,7 +6440,7 @@ index 000000000..d5dbbf876 +} diff --git a/grub-core/lib/libtasn1/lib/structure.c b/grub-core/lib/libtasn1/lib/structure.c new file mode 100644 -index 000000000..8189c56a4 +index 0000000000..8189c56a4c --- /dev/null +++ b/grub-core/lib/libtasn1/lib/structure.c @@ -0,0 +1,1220 @@ @@ -7666,7 +7666,7 @@ index 000000000..8189c56a4 +} diff --git a/grub-core/lib/libtasn1/lib/element.h b/grub-core/lib/libtasn1/lib/element.h new file mode 100644 -index 000000000..440a33f4b +index 0000000000..440a33f4bb --- /dev/null +++ b/grub-core/lib/libtasn1/lib/element.h @@ -0,0 +1,40 @@ @@ -7712,7 +7712,7 @@ index 000000000..440a33f4b +#endif diff --git a/grub-core/lib/libtasn1/lib/gstr.h b/grub-core/lib/libtasn1/lib/gstr.h new file mode 100644 -index 000000000..48229844f +index 0000000000..48229844ff --- /dev/null +++ b/grub-core/lib/libtasn1/lib/gstr.h @@ -0,0 +1,47 @@ @@ -7765,7 +7765,7 @@ index 000000000..48229844f +#endif /* GSTR_H */ diff --git a/grub-core/lib/libtasn1/lib/int.h b/grub-core/lib/libtasn1/lib/int.h new file mode 100644 -index 000000000..ea1625786 +index 0000000000..ea1625786c --- /dev/null +++ b/grub-core/lib/libtasn1/lib/int.h @@ -0,0 +1,221 @@ @@ -7992,7 +7992,7 @@ index 000000000..ea1625786 +#endif /* INT_H */ diff --git a/grub-core/lib/libtasn1/lib/parser_aux.h b/grub-core/lib/libtasn1/lib/parser_aux.h new file mode 100644 -index 000000000..598e684b3 +index 0000000000..598e684b35 --- /dev/null +++ b/grub-core/lib/libtasn1/lib/parser_aux.h @@ -0,0 +1,172 @@ @@ -8170,7 +8170,7 @@ index 000000000..598e684b3 +#endif diff --git a/grub-core/lib/libtasn1/lib/structure.h b/grub-core/lib/libtasn1/lib/structure.h new file mode 100644 -index 000000000..99e685da0 +index 0000000000..99e685da07 --- /dev/null +++ b/grub-core/lib/libtasn1/lib/structure.h @@ -0,0 +1,45 @@ @@ -8221,7 +8221,7 @@ index 000000000..99e685da0 +#endif diff --git a/include/grub/libtasn1.h b/include/grub/libtasn1.h new file mode 100644 -index 000000000..6fd7a30dc +index 0000000000..6fd7a30dc3 --- /dev/null +++ b/include/grub/libtasn1.h @@ -0,0 +1,588 @@ @@ -8815,7 +8815,7 @@ index 000000000..6fd7a30dc +#endif /* LIBTASN1_H */ diff --git a/grub-core/lib/libtasn1/LICENSE b/grub-core/lib/libtasn1/LICENSE new file mode 100644 -index 000000000..e8b3628db +index 0000000000..e8b3628db9 --- /dev/null +++ b/grub-core/lib/libtasn1/LICENSE @@ -0,0 +1,16 @@ @@ -8837,7 +8837,7 @@ index 000000000..e8b3628db +note that the range specifies every single year in that closed interval. diff --git a/grub-core/lib/libtasn1/README.md b/grub-core/lib/libtasn1/README.md new file mode 100644 -index 000000000..50a864229 +index 0000000000..50a8642296 --- /dev/null +++ b/grub-core/lib/libtasn1/README.md @@ -0,0 +1,91 @@ diff --git a/0166-libtasn1-disable-code-not-needed-in-grub.patch b/0166-libtasn1-disable-code-not-needed-in-grub.patch index 082cdb9..84dcbf0 100644 --- a/0166-libtasn1-disable-code-not-needed-in-grub.patch +++ b/0166-libtasn1-disable-code-not-needed-in-grub.patch @@ -25,7 +25,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 6 files changed, 38 insertions(+), 8 deletions(-) diff --git a/grub-core/lib/libtasn1/lib/coding.c b/grub-core/lib/libtasn1/lib/coding.c -index 245ea64cf..52def5983 100644 +index 245ea64cf0..52def59836 100644 --- a/grub-core/lib/libtasn1/lib/coding.c +++ b/grub-core/lib/libtasn1/lib/coding.c @@ -30,11 +30,11 @@ @@ -99,7 +99,7 @@ index 245ea64cf..52def5983 100644 +#endif \ No newline at end of file diff --git a/grub-core/lib/libtasn1/lib/decoding.c b/grub-core/lib/libtasn1/lib/decoding.c -index ff04eb778..42f9a92b5 100644 +index ff04eb778c..42f9a92b5d 100644 --- a/grub-core/lib/libtasn1/lib/decoding.c +++ b/grub-core/lib/libtasn1/lib/decoding.c @@ -1613,6 +1613,7 @@ asn1_der_decoding (asn1_node * element, const void *ider, int ider_len, @@ -119,7 +119,7 @@ index ff04eb778..42f9a92b5 100644 /** * asn1_der_decoding_startEnd: diff --git a/grub-core/lib/libtasn1/lib/element.c b/grub-core/lib/libtasn1/lib/element.c -index 997eb2725..539008d8e 100644 +index 997eb2725d..539008d8e9 100644 --- a/grub-core/lib/libtasn1/lib/element.c +++ b/grub-core/lib/libtasn1/lib/element.c @@ -191,7 +191,7 @@ _asn1_append_sequence_set (asn1_node node, struct node_tail_cache_st *pcache) @@ -141,7 +141,7 @@ index 997eb2725..539008d8e 100644 #define PUT_VALUE( ptr, ptr_size, data, data_size) \ *len = data_size; \ diff --git a/grub-core/lib/libtasn1/lib/errors.c b/grub-core/lib/libtasn1/lib/errors.c -index cee74daf7..42785e862 100644 +index cee74daf79..42785e8622 100644 --- a/grub-core/lib/libtasn1/lib/errors.c +++ b/grub-core/lib/libtasn1/lib/errors.c @@ -57,6 +57,8 @@ static const libtasn1_error_entry error_algorithms[] = { @@ -162,7 +162,7 @@ index cee74daf7..42785e862 100644 /** * asn1_strerror: diff --git a/grub-core/lib/libtasn1/lib/structure.c b/grub-core/lib/libtasn1/lib/structure.c -index 8189c56a4..fcfde01a3 100644 +index 8189c56a4c..fcfde01a39 100644 --- a/grub-core/lib/libtasn1/lib/structure.c +++ b/grub-core/lib/libtasn1/lib/structure.c @@ -76,7 +76,7 @@ _asn1_find_left (asn1_node_const node) @@ -218,7 +218,7 @@ index 8189c56a4..fcfde01a3 100644 /** * asn1_dup_node: diff --git a/include/grub/libtasn1.h b/include/grub/libtasn1.h -index 6fd7a30dc..785eda2ae 100644 +index 6fd7a30dc3..785eda2ae3 100644 --- a/include/grub/libtasn1.h +++ b/include/grub/libtasn1.h @@ -319,6 +319,8 @@ typedef struct asn1_data_node_st asn1_data_node_st; diff --git a/0167-libtasn1-changes-for-grub-compatibility.patch b/0167-libtasn1-changes-for-grub-compatibility.patch index 35ceb56..7c756bd 100644 --- a/0167-libtasn1-changes-for-grub-compatibility.patch +++ b/0167-libtasn1-changes-for-grub-compatibility.patch @@ -35,7 +35,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 6 files changed, 22 insertions(+), 33 deletions(-) diff --git a/grub-core/lib/libtasn1/lib/decoding.c b/grub-core/lib/libtasn1/lib/decoding.c -index 42f9a92b5..7856858b2 100644 +index 42f9a92b5d..7856858b27 100644 --- a/grub-core/lib/libtasn1/lib/decoding.c +++ b/grub-core/lib/libtasn1/lib/decoding.c @@ -32,7 +32,8 @@ @@ -71,7 +71,7 @@ index 42f9a92b5..7856858b2 100644 result = asn1_create_element (definitions, name, &aux); if (result == ASN1_SUCCESS) diff --git a/grub-core/lib/libtasn1/lib/element.c b/grub-core/lib/libtasn1/lib/element.c -index 539008d8e..ed761ff56 100644 +index 539008d8e9..ed761ff56b 100644 --- a/grub-core/lib/libtasn1/lib/element.c +++ b/grub-core/lib/libtasn1/lib/element.c @@ -30,9 +30,10 @@ @@ -87,7 +87,7 @@ index 539008d8e..ed761ff56 100644 _asn1_hierarchical_name (asn1_node_const node, char *name, int name_size) { diff --git a/grub-core/lib/libtasn1/lib/gstr.c b/grub-core/lib/libtasn1/lib/gstr.c -index e91a3a151..e33875c2c 100644 +index e91a3a151c..e33875c2c7 100644 --- a/grub-core/lib/libtasn1/lib/gstr.c +++ b/grub-core/lib/libtasn1/lib/gstr.c @@ -36,13 +36,13 @@ _asn1_str_cat (char *dest, size_t dest_tot_size, const char *src) @@ -107,7 +107,7 @@ index e91a3a151..e33875c2c 100644 } } diff --git a/grub-core/lib/libtasn1/lib/parser_aux.c b/grub-core/lib/libtasn1/lib/parser_aux.c -index d5dbbf876..89c9be69d 100644 +index d5dbbf8765..89c9be69dc 100644 --- a/grub-core/lib/libtasn1/lib/parser_aux.c +++ b/grub-core/lib/libtasn1/lib/parser_aux.c @@ -26,7 +26,8 @@ @@ -139,7 +139,7 @@ index d5dbbf876..89c9be69d 100644 temp[start + count] = '0' + (char) r; count++; diff --git a/grub-core/lib/libtasn1/lib/int.h b/grub-core/lib/libtasn1/lib/int.h -index ea1625786..4a568efee 100644 +index ea1625786c..4a568efee9 100644 --- a/grub-core/lib/libtasn1/lib/int.h +++ b/grub-core/lib/libtasn1/lib/int.h @@ -35,7 +35,7 @@ @@ -161,7 +161,7 @@ index ea1625786..4a568efee 100644 #if SIZEOF_UNSIGNED_LONG_INT == 8 # define _asn1_strtou64(n,e,b) strtoul((const char *) n, e, b) diff --git a/include/grub/libtasn1.h b/include/grub/libtasn1.h -index 785eda2ae..28dbf16c4 100644 +index 785eda2ae3..28dbf16c4e 100644 --- a/include/grub/libtasn1.h +++ b/include/grub/libtasn1.h @@ -38,29 +38,15 @@ diff --git a/0168-libtasn1-compile-into-asn1-module.patch b/0168-libtasn1-compile-into-asn1-module.patch index fe6ffdd..b557403 100644 --- a/0168-libtasn1-compile-into-asn1-module.patch +++ b/0168-libtasn1-compile-into-asn1-module.patch @@ -14,7 +14,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> create mode 100644 grub-core/lib/libtasn1_wrap/wrap.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 97347ae76..21d2c5418 100644 +index 97347ae76f..21d2c54185 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -2576,3 +2576,18 @@ module = { @@ -38,7 +38,7 @@ index 97347ae76..21d2c5418 100644 +}; diff --git a/grub-core/lib/libtasn1_wrap/wrap.c b/grub-core/lib/libtasn1_wrap/wrap.c new file mode 100644 -index 000000000..622ba942e +index 0000000000..622ba942e3 --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/wrap.c @@ -0,0 +1,26 @@ diff --git a/0169-test_asn1-test-module-for-libtasn1.patch b/0169-test_asn1-test-module-for-libtasn1.patch index 6bacdb9..1588c51 100644 --- a/0169-test_asn1-test-module-for-libtasn1.patch +++ b/0169-test_asn1-test-module-for-libtasn1.patch @@ -51,7 +51,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> create mode 100644 tests/test_asn1.in diff --git a/Makefile.util.def b/Makefile.util.def -index 9927c2cfd..3f191aa80 100644 +index 9927c2cfd6..3f191aa809 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -1306,6 +1306,12 @@ script = { @@ -68,7 +68,7 @@ index 9927c2cfd..3f191aa80 100644 testcase; name = example_unit_test; diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 21d2c5418..b4aaccf7b 100644 +index 21d2c54185..b4aaccf7b5 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -2591,3 +2591,16 @@ module = { @@ -90,7 +90,7 @@ index 21d2c5418..b4aaccf7b 100644 +}; diff --git a/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654.c b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654.c new file mode 100644 -index 000000000..534e30452 +index 0000000000..534e304521 --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654.c @@ -0,0 +1,61 @@ @@ -157,7 +157,7 @@ index 000000000..534e30452 +} diff --git a/grub-core/lib/libtasn1_wrap/tests/Test_overflow.c b/grub-core/lib/libtasn1_wrap/tests/Test_overflow.c new file mode 100644 -index 000000000..f48aea0ef +index 0000000000..f48aea0ef8 --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/tests/Test_overflow.c @@ -0,0 +1,138 @@ @@ -301,7 +301,7 @@ index 000000000..f48aea0ef +} diff --git a/grub-core/lib/libtasn1_wrap/tests/Test_simple.c b/grub-core/lib/libtasn1_wrap/tests/Test_simple.c new file mode 100644 -index 000000000..9f01006dd +index 0000000000..9f01006ddf --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/tests/Test_simple.c @@ -0,0 +1,207 @@ @@ -514,7 +514,7 @@ index 000000000..9f01006dd +} diff --git a/grub-core/lib/libtasn1_wrap/tests/Test_strings.c b/grub-core/lib/libtasn1_wrap/tests/Test_strings.c new file mode 100644 -index 000000000..dbe1474b2 +index 0000000000..dbe1474b20 --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/tests/Test_strings.c @@ -0,0 +1,150 @@ @@ -670,7 +670,7 @@ index 000000000..dbe1474b2 +} diff --git a/grub-core/lib/libtasn1_wrap/tests/object-id-decoding.c b/grub-core/lib/libtasn1_wrap/tests/object-id-decoding.c new file mode 100644 -index 000000000..d367bbfb5 +index 0000000000..d367bbfb5a --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/tests/object-id-decoding.c @@ -0,0 +1,116 @@ @@ -792,7 +792,7 @@ index 000000000..d367bbfb5 +} diff --git a/grub-core/lib/libtasn1_wrap/tests/object-id-encoding.c b/grub-core/lib/libtasn1_wrap/tests/object-id-encoding.c new file mode 100644 -index 000000000..3a83b58c5 +index 0000000000..3a83b58c59 --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/tests/object-id-encoding.c @@ -0,0 +1,120 @@ @@ -918,7 +918,7 @@ index 000000000..3a83b58c5 +} diff --git a/grub-core/lib/libtasn1_wrap/tests/octet-string.c b/grub-core/lib/libtasn1_wrap/tests/octet-string.c new file mode 100644 -index 000000000..d8a049e8d +index 0000000000..d8a049e8df --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/tests/octet-string.c @@ -0,0 +1,211 @@ @@ -1135,7 +1135,7 @@ index 000000000..d8a049e8d +} diff --git a/grub-core/lib/libtasn1_wrap/tests/reproducers.c b/grub-core/lib/libtasn1_wrap/tests/reproducers.c new file mode 100644 -index 000000000..dc7268d4c +index 0000000000..dc7268d4c6 --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/tests/reproducers.c @@ -0,0 +1,81 @@ @@ -1222,7 +1222,7 @@ index 000000000..dc7268d4c +} diff --git a/grub-core/lib/libtasn1_wrap/wrap_tests.c b/grub-core/lib/libtasn1_wrap/wrap_tests.c new file mode 100644 -index 000000000..75fcd21f0 +index 0000000000..75fcd21f0d --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/wrap_tests.c @@ -0,0 +1,75 @@ @@ -1303,7 +1303,7 @@ index 000000000..75fcd21f0 +} diff --git a/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-1_asn1_tab.h b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-1_asn1_tab.h new file mode 100644 -index 000000000..1e7d3d64f +index 0000000000..1e7d3d64f5 --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-1_asn1_tab.h @@ -0,0 +1,32 @@ @@ -1341,7 +1341,7 @@ index 000000000..1e7d3d64f +}; diff --git a/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-2_asn1_tab.h b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-2_asn1_tab.h new file mode 100644 -index 000000000..e2561e5ec +index 0000000000..e2561e5ec6 --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-2_asn1_tab.h @@ -0,0 +1,36 @@ @@ -1383,7 +1383,7 @@ index 000000000..e2561e5ec +}; diff --git a/grub-core/lib/libtasn1_wrap/wrap_tests.h b/grub-core/lib/libtasn1_wrap/wrap_tests.h new file mode 100644 -index 000000000..555e56dd2 +index 0000000000..555e56dd20 --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/wrap_tests.h @@ -0,0 +1,38 @@ @@ -1426,7 +1426,7 @@ index 000000000..555e56dd2 + +#endif diff --git a/.gitignore b/.gitignore -index 594d0134d..856e69bc5 100644 +index 594d0134d3..856e69bc5c 100644 --- a/.gitignore +++ b/.gitignore @@ -264,6 +264,7 @@ widthspec.bin @@ -1439,7 +1439,7 @@ index 594d0134d..856e69bc5 100644 /tests/syslinux/ubuntu10.04_grub.cfg diff --git a/tests/test_asn1.in b/tests/test_asn1.in new file mode 100644 -index 000000000..8173c5c27 +index 0000000000..8173c5c270 --- /dev/null +++ b/tests/test_asn1.in @@ -0,0 +1,12 @@ diff --git a/0170-grub-install-support-embedding-x509-certificates.patch b/0170-grub-install-support-embedding-x509-certificates.patch index c3c83a5..c4c35f4 100644 --- a/0170-grub-install-support-embedding-x509-certificates.patch +++ b/0170-grub-install-support-embedding-x509-certificates.patch @@ -20,7 +20,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 6 files changed, 80 insertions(+), 9 deletions(-) diff --git a/grub-core/commands/pgp.c b/grub-core/commands/pgp.c -index 355a43844..b81ac0ae4 100644 +index 355a43844a..b81ac0ae46 100644 --- a/grub-core/commands/pgp.c +++ b/grub-core/commands/pgp.c @@ -944,7 +944,7 @@ GRUB_MOD_INIT(pgp) @@ -33,7 +33,7 @@ index 355a43844..b81ac0ae4 100644 pseudo_file.fs = &pseudo_fs; diff --git a/util/grub-install-common.c b/util/grub-install-common.c -index a74fee16e..c603f5b30 100644 +index a74fee16e2..c603f5b308 100644 --- a/util/grub-install-common.c +++ b/util/grub-install-common.c @@ -460,6 +460,8 @@ static char **pubkeys; @@ -95,7 +95,7 @@ index a74fee16e..c603f5b30 100644 disable_shim_lock); while (dc--) diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c -index 8a5331054..e1f111278 100644 +index 8a53310548..e1f1112784 100644 --- a/util/grub-mkimage.c +++ b/util/grub-mkimage.c @@ -75,7 +75,8 @@ static struct argp_option options[] = { @@ -142,7 +142,7 @@ index 8a5331054..e1f111278 100644 arguments.appsig_size, arguments.comp, arguments.dtb, arguments.sbat, diff --git a/util/mkimage.c b/util/mkimage.c -index bab122760..8319e8dfb 100644 +index bab1227601..8319e8dfbd 100644 --- a/util/mkimage.c +++ b/util/mkimage.c @@ -867,7 +867,8 @@ void @@ -212,7 +212,7 @@ index bab122760..8319e8dfb 100644 { struct grub_module_header *header; diff --git a/include/grub/kernel.h b/include/grub/kernel.h -index 55849777e..98edc0863 100644 +index 55849777ea..98edc0863f 100644 --- a/include/grub/kernel.h +++ b/include/grub/kernel.h @@ -30,7 +30,9 @@ enum @@ -227,7 +227,7 @@ index 55849777e..98edc0863 100644 /* The module header. */ diff --git a/include/grub/util/install.h b/include/grub/util/install.h -index cf4531e02..51f3b13ac 100644 +index cf4531e02b..51f3b13ac1 100644 --- a/include/grub/util/install.h +++ b/include/grub/util/install.h @@ -67,6 +67,8 @@ diff --git a/0171-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch b/0171-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch index a9ee5b4..0ebc6c7 100644 --- a/0171-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch +++ b/0171-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch @@ -22,7 +22,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> diff --git a/grub-core/commands/appendedsig/gnutls_asn1_tab.c b/grub-core/commands/appendedsig/gnutls_asn1_tab.c new file mode 100644 -index 000000000..ddd1314e6 +index 0000000000..ddd1314e63 --- /dev/null +++ b/grub-core/commands/appendedsig/gnutls_asn1_tab.c @@ -0,0 +1,121 @@ @@ -149,7 +149,7 @@ index 000000000..ddd1314e6 +}; diff --git a/grub-core/commands/appendedsig/pkix_asn1_tab.c b/grub-core/commands/appendedsig/pkix_asn1_tab.c new file mode 100644 -index 000000000..adef69d95 +index 0000000000..adef69d95c --- /dev/null +++ b/grub-core/commands/appendedsig/pkix_asn1_tab.c @@ -0,0 +1,484 @@ diff --git a/0172-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch b/0172-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch index 7fb5688..5a13d5b 100644 --- a/0172-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch +++ b/0172-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch @@ -29,7 +29,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> diff --git a/grub-core/commands/appendedsig/asn1util.c b/grub-core/commands/appendedsig/asn1util.c new file mode 100644 -index 000000000..eff095a9d +index 0000000000..eff095a9df --- /dev/null +++ b/grub-core/commands/appendedsig/asn1util.c @@ -0,0 +1,102 @@ @@ -137,7 +137,7 @@ index 000000000..eff095a9d +} diff --git a/grub-core/commands/appendedsig/pkcs7.c b/grub-core/commands/appendedsig/pkcs7.c new file mode 100644 -index 000000000..dc6afe203 +index 0000000000..dc6afe203f --- /dev/null +++ b/grub-core/commands/appendedsig/pkcs7.c @@ -0,0 +1,305 @@ @@ -448,7 +448,7 @@ index 000000000..dc6afe203 +} diff --git a/grub-core/commands/appendedsig/x509.c b/grub-core/commands/appendedsig/x509.c new file mode 100644 -index 000000000..2b38b3670 +index 0000000000..2b38b3670a --- /dev/null +++ b/grub-core/commands/appendedsig/x509.c @@ -0,0 +1,958 @@ @@ -1412,7 +1412,7 @@ index 000000000..2b38b3670 +} diff --git a/grub-core/commands/appendedsig/appendedsig.h b/grub-core/commands/appendedsig/appendedsig.h new file mode 100644 -index 000000000..9792ef390 +index 0000000000..9792ef3901 --- /dev/null +++ b/grub-core/commands/appendedsig/appendedsig.h @@ -0,0 +1,110 @@ diff --git a/0173-appended-signatures-support-verifying-appended-signa.patch b/0173-appended-signatures-support-verifying-appended-signa.patch index 9545128..969293a 100644 --- a/0173-appended-signatures-support-verifying-appended-signa.patch +++ b/0173-appended-signatures-support-verifying-appended-signa.patch @@ -30,7 +30,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> create mode 100644 grub-core/commands/appendedsig/appendedsig.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index b4aaccf7b..77321d218 100644 +index b4aaccf7b5..77321d218c 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -980,6 +980,18 @@ module = { @@ -54,7 +54,7 @@ index b4aaccf7b..77321d218 100644 common = commands/hdparm.c; diff --git a/grub-core/commands/appendedsig/appendedsig.c b/grub-core/commands/appendedsig/appendedsig.c new file mode 100644 -index 000000000..bf8b18b62 +index 0000000000..bf8b18b620 --- /dev/null +++ b/grub-core/commands/appendedsig/appendedsig.c @@ -0,0 +1,645 @@ @@ -704,7 +704,7 @@ index 000000000..bf8b18b62 + grub_unregister_command (cmd_distrust); +} diff --git a/include/grub/file.h b/include/grub/file.h -index 31567483c..96827a4f8 100644 +index 31567483cc..96827a4f89 100644 --- a/include/grub/file.h +++ b/include/grub/file.h @@ -80,6 +80,8 @@ enum grub_file_type diff --git a/0174-appended-signatures-verification-tests.patch b/0174-appended-signatures-verification-tests.patch index 12ae1e8..982b3c8 100644 --- a/0174-appended-signatures-verification-tests.patch +++ b/0174-appended-signatures-verification-tests.patch @@ -17,7 +17,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> create mode 100644 grub-core/tests/appended_signatures.h diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 77321d218..6bddc841b 100644 +index 77321d218c..6bddc841b8 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -2161,6 +2161,12 @@ module = { @@ -35,7 +35,7 @@ index 77321d218..6bddc841b 100644 common = tests/signature_test.c; diff --git a/grub-core/tests/appended_signature_test.c b/grub-core/tests/appended_signature_test.c new file mode 100644 -index 000000000..88a485200 +index 0000000000..88a485200d --- /dev/null +++ b/grub-core/tests/appended_signature_test.c @@ -0,0 +1,281 @@ @@ -321,7 +321,7 @@ index 000000000..88a485200 + +GRUB_FUNCTIONAL_TEST (appended_signature_test, appended_signature_test); diff --git a/grub-core/tests/lib/functional_test.c b/grub-core/tests/lib/functional_test.c -index 96781fb39..403fa5c78 100644 +index 96781fb39b..403fa5c789 100644 --- a/grub-core/tests/lib/functional_test.c +++ b/grub-core/tests/lib/functional_test.c @@ -73,6 +73,7 @@ grub_functional_all_tests (grub_extcmd_context_t ctxt __attribute__ ((unused)), @@ -334,7 +334,7 @@ index 96781fb39..403fa5c78 100644 grub_dl_load ("ctz_test"); diff --git a/grub-core/tests/appended_signatures.h b/grub-core/tests/appended_signatures.h new file mode 100644 -index 000000000..aa3dc6278 +index 0000000000..aa3dc6278e --- /dev/null +++ b/grub-core/tests/appended_signatures.h @@ -0,0 +1,557 @@ diff --git a/0175-appended-signatures-documentation.patch b/0175-appended-signatures-documentation.patch index c67bcc1..eb58046 100644 --- a/0175-appended-signatures-documentation.patch +++ b/0175-appended-signatures-documentation.patch @@ -13,7 +13,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 1 file changed, 182 insertions(+), 17 deletions(-) diff --git a/docs/grub.texi b/docs/grub.texi -index afbde7c1f..4816be856 100644 +index afbde7c1f7..4816be8561 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -3214,6 +3214,7 @@ These variables have special meaning to GRUB. diff --git a/0176-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch b/0176-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch index 3e211b0..ed4c684 100644 --- a/0176-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch +++ b/0176-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch @@ -15,7 +15,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 6bddc841b..3f3459b2c 100644 +index 6bddc841b8..3f3459b2c7 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -323,6 +323,7 @@ kernel = { @@ -27,7 +27,7 @@ index 6bddc841b..3f3459b2c 100644 sparc64_ieee1275 = kern/sparc64/cache.S; sparc64_ieee1275 = kern/sparc64/dl.c; diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c -index 937c1bc44..fc7d97127 100644 +index 937c1bc44c..fc7d971272 100644 --- a/grub-core/kern/ieee1275/init.c +++ b/grub-core/kern/ieee1275/init.c @@ -44,6 +44,7 @@ @@ -79,7 +79,7 @@ index 937c1bc44..fc7d97127 100644 void diff --git a/include/grub/lockdown.h b/include/grub/lockdown.h -index 40531fa82..ebfee4bf0 100644 +index 40531fa823..ebfee4bf06 100644 --- a/include/grub/lockdown.h +++ b/include/grub/lockdown.h @@ -24,7 +24,8 @@ @@ -93,7 +93,7 @@ index 40531fa82..ebfee4bf0 100644 EXPORT_FUNC (grub_lockdown) (void); extern int diff --git a/docs/grub.texi b/docs/grub.texi -index 4816be856..a4da9c2a1 100644 +index 4816be8561..a4da9c2a1b 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -6227,8 +6227,8 @@ Measured boot is currently only supported on EFI platforms. diff --git a/0177-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch b/0177-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch index 30efae7..a40caea 100644 --- a/0177-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch +++ b/0177-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch @@ -32,7 +32,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 1 file changed, 17 deletions(-) diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c -index fc7d97127..0dcd114ce 100644 +index fc7d971272..0dcd114ce5 100644 --- a/grub-core/kern/ieee1275/init.c +++ b/grub-core/kern/ieee1275/init.c @@ -46,9 +46,6 @@ diff --git a/0178-ieee1275-claim-more-memory.patch b/0178-ieee1275-claim-more-memory.patch index 27bab15..6ec319b 100644 --- a/0178-ieee1275-claim-more-memory.patch +++ b/0178-ieee1275-claim-more-memory.patch @@ -86,7 +86,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 2 files changed, 69 insertions(+), 18 deletions(-) diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c -index 0dcd114ce..c61d91a02 100644 +index 0dcd114ce5..c61d91a028 100644 --- a/grub-core/kern/ieee1275/init.c +++ b/grub-core/kern/ieee1275/init.c @@ -46,11 +46,12 @@ @@ -227,7 +227,7 @@ index 0dcd114ce..c61d91a02 100644 #endif diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi -index 19f708ee6..90083772c 100644 +index 19f708ee66..90083772c8 100644 --- a/docs/grub-dev.texi +++ b/docs/grub-dev.texi @@ -1047,7 +1047,9 @@ space is limited to 4GiB. GRUB allocates pages from EFI for its heap, at most diff --git a/0179-ieee1275-request-memory-with-ibm-client-architecture.patch b/0179-ieee1275-request-memory-with-ibm-client-architecture.patch index edfbe92..4f3ab90 100644 --- a/0179-ieee1275-request-memory-with-ibm-client-architecture.patch +++ b/0179-ieee1275-request-memory-with-ibm-client-architecture.patch @@ -69,7 +69,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 3 files changed, 152 insertions(+), 3 deletions(-) diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c -index 04df9d2c6..6435628ec 100644 +index 04df9d2c66..6435628ec5 100644 --- a/grub-core/kern/ieee1275/cmain.c +++ b/grub-core/kern/ieee1275/cmain.c @@ -127,6 +127,9 @@ grub_ieee1275_find_options (void) @@ -83,7 +83,7 @@ index 04df9d2c6..6435628ec 100644 if (is_smartfirmware) diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c -index c61d91a02..9704715c8 100644 +index c61d91a028..9704715c83 100644 --- a/grub-core/kern/ieee1275/init.c +++ b/grub-core/kern/ieee1275/init.c @@ -242,6 +242,135 @@ heap_init (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type, @@ -248,7 +248,7 @@ index c61d91a02..9704715c8 100644 total = total / 4; diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h -index b5a1d49bb..e0a6c2ce1 100644 +index b5a1d49bbc..e0a6c2ce1e 100644 --- a/include/grub/ieee1275/ieee1275.h +++ b/include/grub/ieee1275/ieee1275.h @@ -149,7 +149,13 @@ enum grub_ieee1275_flag diff --git a/0180-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch b/0180-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch index 878bf60..5728f26 100644 --- a/0180-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch +++ b/0180-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch @@ -23,7 +23,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 3 files changed, 201 insertions(+), 3 deletions(-) diff --git a/grub-core/commands/appendedsig/x509.c b/grub-core/commands/appendedsig/x509.c -index 2b38b3670..42ec65c54 100644 +index 2b38b3670a..42ec65c54a 100644 --- a/grub-core/commands/appendedsig/x509.c +++ b/grub-core/commands/appendedsig/x509.c @@ -47,6 +47,12 @@ const char *keyUsage_oid = "2.5.29.15"; @@ -156,7 +156,7 @@ index 2b38b3670..42ec65c54 100644 cleanup_value: diff --git a/grub-core/tests/appended_signature_test.c b/grub-core/tests/appended_signature_test.c -index 88a485200..dbba06166 100644 +index 88a485200d..dbba061662 100644 --- a/grub-core/tests/appended_signature_test.c +++ b/grub-core/tests/appended_signature_test.c @@ -111,6 +111,22 @@ static struct grub_procfs_entry certificate_printable_der_entry = { @@ -225,7 +225,7 @@ index 88a485200..dbba06166 100644 GRUB_FUNCTIONAL_TEST (appended_signature_test, appended_signature_test); diff --git a/grub-core/tests/appended_signatures.h b/grub-core/tests/appended_signatures.h -index aa3dc6278..2e5ebd7d8 100644 +index aa3dc6278e..2e5ebd7d8b 100644 --- a/grub-core/tests/appended_signatures.h +++ b/grub-core/tests/appended_signatures.h @@ -555,3 +555,84 @@ unsigned char certificate_printable_der[] = { diff --git a/0181-ieee1275-ofdisk-retry-on-open-failure.patch b/0181-ieee1275-ofdisk-retry-on-open-failure.patch index 264c7c9..9149773 100644 --- a/0181-ieee1275-ofdisk-retry-on-open-failure.patch +++ b/0181-ieee1275-ofdisk-retry-on-open-failure.patch @@ -16,7 +16,7 @@ Signed-off-by: Diego Domingos <diegodo(a)br.ibm.com> 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c -index ea7f78ac7..55346849d 100644 +index ea7f78ac7d..55346849d3 100644 --- a/grub-core/disk/ieee1275/ofdisk.c +++ b/grub-core/disk/ieee1275/ofdisk.c @@ -225,7 +225,9 @@ dev_iterate (const struct grub_ieee1275_devalias *alias) @@ -85,7 +85,7 @@ index ea7f78ac7..55346849d 100644 } diff --git a/include/grub/ieee1275/ofdisk.h b/include/grub/ieee1275/ofdisk.h -index 2f69e3f19..7d2d54093 100644 +index 2f69e3f191..7d2d540930 100644 --- a/include/grub/ieee1275/ofdisk.h +++ b/include/grub/ieee1275/ofdisk.h @@ -22,4 +22,12 @@ diff --git a/0182-Allow-chainloading-EFI-apps-from-loop-mounts.patch b/0182-Allow-chainloading-EFI-apps-from-loop-mounts.patch index 32c6b60..c3101e1 100644 --- a/0182-Allow-chainloading-EFI-apps-from-loop-mounts.patch +++ b/0182-Allow-chainloading-EFI-apps-from-loop-mounts.patch @@ -13,7 +13,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> create mode 100644 include/grub/loopback.h diff --git a/grub-core/disk/loopback.c b/grub-core/disk/loopback.c -index 41bebd14f..99f47924e 100644 +index 41bebd14fe..99f47924ec 100644 --- a/grub-core/disk/loopback.c +++ b/grub-core/disk/loopback.c @@ -21,20 +21,13 @@ @@ -39,7 +39,7 @@ index 41bebd14f..99f47924e 100644 static unsigned long last_id = 0; diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index d41e8ea14..3af6b1229 100644 +index d41e8ea14a..3af6b12292 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -24,6 +24,7 @@ @@ -102,7 +102,7 @@ index d41e8ea14..3af6b1229 100644 diff --git a/include/grub/loopback.h b/include/grub/loopback.h new file mode 100644 -index 000000000..3b9a9e32e +index 0000000000..3b9a9e32e8 --- /dev/null +++ b/include/grub/loopback.h @@ -0,0 +1,30 @@ diff --git a/0183-efinet-Add-DHCP-proxy-support.patch b/0183-efinet-Add-DHCP-proxy-support.patch index f1fb5cb..eed2dbb 100644 --- a/0183-efinet-Add-DHCP-proxy-support.patch +++ b/0183-efinet-Add-DHCP-proxy-support.patch @@ -14,7 +14,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c -index e11d759f1..1a24f38a2 100644 +index e11d759f19..1a24f38a21 100644 --- a/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c @@ -850,10 +850,31 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device, diff --git a/0184-fs-ext2-Ignore-checksum-seed-incompat-feature.patch b/0184-fs-ext2-Ignore-checksum-seed-incompat-feature.patch index 8e3279a..3d7c641 100644 --- a/0184-fs-ext2-Ignore-checksum-seed-incompat-feature.patch +++ b/0184-fs-ext2-Ignore-checksum-seed-incompat-feature.patch @@ -23,7 +23,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c -index e7dd78e66..731d346f8 100644 +index e7dd78e663..731d346f88 100644 --- a/grub-core/fs/ext2.c +++ b/grub-core/fs/ext2.c @@ -103,6 +103,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); diff --git a/0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch b/0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch index 074d650..1982847 100644 --- a/0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch +++ b/0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch @@ -20,7 +20,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index c02c1f082..6af84b44e 100644 +index c02c1f0820..6af84b44e1 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -256,7 +256,9 @@ if [ -z "\${kernelopts}" ]; then diff --git a/0186-Suppress-gettext-error-message.patch b/0186-Suppress-gettext-error-message.patch index 2ca0ce0..64b219a 100644 --- a/0186-Suppress-gettext-error-message.patch +++ b/0186-Suppress-gettext-error-message.patch @@ -14,7 +14,7 @@ Signed-off-by: Paulo Flabiano Smorigo <pfsmorigo(a)br.ibm.com> 1 file changed, 7 insertions(+) diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c -index 4d02e62c1..7ec81ca0b 100644 +index 4d02e62c10..7ec81ca0b4 100644 --- a/grub-core/gettext/gettext.c +++ b/grub-core/gettext/gettext.c @@ -424,6 +424,13 @@ grub_gettext_init_ext (struct grub_gettext_context *ctx, diff --git a/0187-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch b/0187-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch index c83c532..b5d5e5c 100644 --- a/0187-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch +++ b/0187-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch @@ -15,7 +15,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/util/grub-set-password.in b/util/grub-set-password.in -index c0b5ebbfd..d8005e5a1 100644 +index c0b5ebbfdc..d8005e5a14 100644 --- a/util/grub-set-password.in +++ b/util/grub-set-password.in @@ -1,11 +1,6 @@ diff --git a/0188-templates-Check-for-EFI-at-runtime-instead-of-config.patch b/0188-templates-Check-for-EFI-at-runtime-instead-of-config.patch index 79040b4..265b967 100644 --- a/0188-templates-Check-for-EFI-at-runtime-instead-of-config.patch +++ b/0188-templates-Check-for-EFI-at-runtime-instead-of-config.patch @@ -30,7 +30,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/util/grub.d/30_uefi-firmware.in b/util/grub.d/30_uefi-firmware.in -index d344d3883..b6041b55e 100644 +index d344d3883d..b6041b55e2 100644 --- a/util/grub.d/30_uefi-firmware.in +++ b/util/grub.d/30_uefi-firmware.in @@ -26,19 +26,14 @@ export TEXTDOMAINDIR="@localedir@" diff --git a/0189-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch b/0189-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch index 81ac3e9..3b1a219 100644 --- a/0189-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch +++ b/0189-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch @@ -21,7 +21,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/grub-core/commands/efi/efifwsetup.c b/grub-core/commands/efi/efifwsetup.c -index eaca03283..328c45e82 100644 +index eaca032838..328c45e82e 100644 --- a/grub-core/commands/efi/efifwsetup.c +++ b/grub-core/commands/efi/efifwsetup.c @@ -27,6 +27,25 @@ diff --git a/0190-arm64-Fix-EFI-loader-kernel-image-allocation.patch b/0190-arm64-Fix-EFI-loader-kernel-image-allocation.patch index a206b72..cc5458c 100644 --- a/0190-arm64-Fix-EFI-loader-kernel-image-allocation.patch +++ b/0190-arm64-Fix-EFI-loader-kernel-image-allocation.patch @@ -24,7 +24,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 3 files changed, 68 insertions(+), 34 deletions(-) diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c -index 47f8cf0d8..f18d90bd7 100644 +index 47f8cf0d84..f18d90bd74 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -41,6 +41,8 @@ GRUB_MOD_LICENSE ("GPLv3+"); @@ -193,7 +193,7 @@ index 47f8cf0d8..f18d90bd7 100644 return grub_errno; } diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h -index b582f67f6..966a5074f 100644 +index b582f67f66..966a5074f5 100644 --- a/include/grub/arm/linux.h +++ b/include/grub/arm/linux.h @@ -44,6 +44,7 @@ struct grub_arm_linux_pe_header @@ -205,7 +205,7 @@ index b582f67f6..966a5074f 100644 # define grub_armxx_linux_pe_header grub_arm_linux_pe_header #endif diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h -index ea030312d..422bf2bf2 100644 +index ea030312df..422bf2bf24 100644 --- a/include/grub/arm64/linux.h +++ b/include/grub/arm64/linux.h @@ -48,6 +48,7 @@ struct grub_arm64_linux_pe_header diff --git a/0191-normal-main-Discover-the-device-to-read-the-config-f.patch b/0191-normal-main-Discover-the-device-to-read-the-config-f.patch index 5cf3cb2..2c9ca3a 100644 --- a/0191-normal-main-Discover-the-device-to-read-the-config-f.patch +++ b/0191-normal-main-Discover-the-device-to-read-the-config-f.patch @@ -26,7 +26,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 51 insertions(+), 7 deletions(-) diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index 4ebdbd228..b72fe3d65 100644 +index 7de9e4c36d..8f5fd81003 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -337,18 +337,13 @@ grub_enter_normal_mode (const char *config) diff --git a/0192-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch b/0192-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch index b03e3d3..b9bc140 100644 --- a/0192-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch +++ b/0192-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch @@ -25,7 +25,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c -index b573be665..3fc340147 100644 +index b573be6650..3fc3401472 100644 --- a/grub-core/kern/main.c +++ b/grub-core/kern/main.c @@ -216,13 +216,52 @@ grub_set_prefix_and_root (void) diff --git a/0193-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch b/0193-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch index fbb0ee7..7fc40f1 100644 --- a/0193-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch +++ b/0193-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch @@ -81,7 +81,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper(a)oracle.com> 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c -index 0f524c3a8..e3816d1ec 100644 +index 0f524c3a8a..e3816d1ec4 100644 --- a/grub-core/fs/xfs.c +++ b/grub-core/fs/xfs.c @@ -192,6 +192,11 @@ struct grub_xfs_time_legacy diff --git a/0194-Print-module-name-on-license-check-failure.patch b/0194-Print-module-name-on-license-check-failure.patch index f6c6041..5c30859 100644 --- a/0194-Print-module-name-on-license-check-failure.patch +++ b/0194-Print-module-name-on-license-check-failure.patch @@ -13,7 +13,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c -index 955725403..f30449457 100644 +index 9557254035..f304494574 100644 --- a/grub-core/kern/dl.c +++ b/grub-core/kern/dl.c @@ -528,14 +528,16 @@ grub_dl_find_section_index (Elf_Ehdr *e, const char *name) diff --git a/0195-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch b/0195-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch index 121ed5b..05417ed 100644 --- a/0195-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch +++ b/0195-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch @@ -79,7 +79,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 3f3459b2c..6b00eb555 100644 +index 3f3459b2c7..6b00eb5557 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -89,7 +89,7 @@ kernel = { @@ -92,7 +92,7 @@ index 3f3459b2c..6b00eb555 100644 mips_arc_ldflags = '-Wl,-Ttext,$(TARGET_LINK_ADDR)'; mips_qemu_mips_ldflags = '-Wl,-Ttext,0x80200000'; diff --git a/include/grub/offsets.h b/include/grub/offsets.h -index 871e1cd4c..69211aa79 100644 +index 871e1cd4c3..69211aa798 100644 --- a/include/grub/offsets.h +++ b/include/grub/offsets.h @@ -63,7 +63,7 @@ diff --git a/0196-grub-mkconfig-restore-umask-for-grub.cfg.patch b/0196-grub-mkconfig-restore-umask-for-grub.cfg.patch index f4936a7..76b73f5 100644 --- a/0196-grub-mkconfig-restore-umask-for-grub.cfg.patch +++ b/0196-grub-mkconfig-restore-umask-for-grub.cfg.patch @@ -25,7 +25,7 @@ Signed-off-by: Michael Chang <mchang(a)suse.com> 1 file changed, 2 insertions(+) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index f55339a3f..520a672cd 100644 +index f55339a3f6..520a672cd2 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -311,7 +311,9 @@ and /etc/grub.d/* files or please file a bug report with diff --git a/0197-fs-btrfs-Use-full-btrfs-bootloader-area.patch b/0197-fs-btrfs-Use-full-btrfs-bootloader-area.patch index 81b7e1c..3f7198f 100644 --- a/0197-fs-btrfs-Use-full-btrfs-bootloader-area.patch +++ b/0197-fs-btrfs-Use-full-btrfs-bootloader-area.patch @@ -32,7 +32,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper(a)oracle.com> 2 files changed, 79 insertions(+), 13 deletions(-) diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index 4cc86e9b7..07c0ff874 100644 +index 4cc86e9b79..07c0ff874b 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -2476,6 +2476,33 @@ grub_btrfs_label (grub_device_t device, char **label) @@ -146,7 +146,7 @@ index 4cc86e9b7..07c0ff874 100644 return GRUB_ERR_NONE; } diff --git a/include/grub/disk.h b/include/grub/disk.h -index f95aca929..06210a704 100644 +index f95aca929a..06210a7049 100644 --- a/include/grub/disk.h +++ b/include/grub/disk.h @@ -182,6 +182,8 @@ typedef struct grub_disk_memberlist *grub_disk_memberlist_t; diff --git a/0198-Add-Fedora-location-of-DejaVu-SANS-font.patch b/0198-Add-Fedora-location-of-DejaVu-SANS-font.patch index ba84f9c..c3e45e4 100644 --- a/0198-Add-Fedora-location-of-DejaVu-SANS-font.patch +++ b/0198-Add-Fedora-location-of-DejaVu-SANS-font.patch @@ -16,7 +16,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index f069d8403..88e33e0f0 100644 +index f069d84039..88e33e0f0c 100644 --- a/configure.ac +++ b/configure.ac @@ -1785,7 +1785,7 @@ fi diff --git a/0199-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch b/0199-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch index 3073238..200cd51 100644 --- a/0199-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch +++ b/0199-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch @@ -18,7 +18,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c -index ec0c92bad..c8516a5a0 100644 +index ec0c92bade..c8516a5a08 100644 --- a/grub-core/normal/menu.c +++ b/grub-core/normal/menu.c @@ -606,13 +606,15 @@ print_countdown (struct grub_term_coordinate *pos, int n) diff --git a/0200-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch b/0200-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch index de29340..0f99c22 100644 --- a/0200-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch +++ b/0200-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch @@ -22,7 +22,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> 1 file changed, 3 insertions(+) diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c -index 3fc340147..993b8a859 100644 +index 3fc3401472..993b8a8598 100644 --- a/grub-core/kern/main.c +++ b/grub-core/kern/main.c @@ -317,10 +317,13 @@ grub_main (void) diff --git a/0201-EFI-console-Do-not-set-colorstate-until-the-first-te.patch b/0201-EFI-console-Do-not-set-colorstate-until-the-first-te.patch index 1007041..ade6aae 100644 --- a/0201-EFI-console-Do-not-set-colorstate-until-the-first-te.patch +++ b/0201-EFI-console-Do-not-set-colorstate-until-the-first-te.patch @@ -29,7 +29,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> 1 file changed, 10 insertions(+) diff --git a/grub-core/term/efi/console.c b/grub-core/term/efi/console.c -index 2f1ae85ba..c44b2ac31 100644 +index 2f1ae85ba7..c44b2ac318 100644 --- a/grub-core/term/efi/console.c +++ b/grub-core/term/efi/console.c @@ -82,6 +82,16 @@ grub_console_setcolorstate (struct grub_term_output *term diff --git a/0202-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch b/0202-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch index c867451..5fab5db 100644 --- a/0202-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch +++ b/0202-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch @@ -25,7 +25,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/grub-core/term/efi/console.c b/grub-core/term/efi/console.c -index c44b2ac31..a3622e4fe 100644 +index c44b2ac318..a3622e4fe5 100644 --- a/grub-core/term/efi/console.c +++ b/grub-core/term/efi/console.c @@ -31,7 +31,15 @@ typedef enum { diff --git a/0203-Use-visual-indentation-in-config.h.in.patch b/0203-Use-visual-indentation-in-config.h.in.patch index 8881845..978eb07 100644 --- a/0203-Use-visual-indentation-in-config.h.in.patch +++ b/0203-Use-visual-indentation-in-config.h.in.patch @@ -11,7 +11,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/config.h.in b/config.h.in -index c80e3e0ab..f2ed0066e 100644 +index c80e3e0aba..f2ed0066ec 100644 --- a/config.h.in +++ b/config.h.in @@ -23,47 +23,47 @@ diff --git a/0204-Where-present-ensure-config-util.h-precedes-config.h.patch b/0204-Where-present-ensure-config-util.h-precedes-config.h.patch index 0bfb00e..626c4b4 100644 --- a/0204-Where-present-ensure-config-util.h-precedes-config.h.patch +++ b/0204-Where-present-ensure-config-util.h-precedes-config.h.patch @@ -31,7 +31,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/grub-core/disk/host.c b/grub-core/disk/host.c -index c151d225d..f34529f86 100644 +index c151d225df..f34529f86a 100644 --- a/grub-core/disk/host.c +++ b/grub-core/disk/host.c @@ -20,8 +20,8 @@ @@ -45,7 +45,7 @@ index c151d225d..f34529f86 100644 #include <grub/dl.h> #include <grub/disk.h> diff --git a/grub-core/kern/emu/argp_common.c b/grub-core/kern/emu/argp_common.c -index 166885870..8cb4608c3 100644 +index 1668858703..8cb4608c3d 100644 --- a/grub-core/kern/emu/argp_common.c +++ b/grub-core/kern/emu/argp_common.c @@ -17,8 +17,8 @@ @@ -59,7 +59,7 @@ index 166885870..8cb4608c3 100644 #pragma GCC diagnostic ignored "-Wmissing-prototypes" #pragma GCC diagnostic ignored "-Wmissing-declarations" diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c -index 846fe9715..3e7929cc4 100644 +index 846fe9715e..3e7929cc4a 100644 --- a/grub-core/kern/emu/main.c +++ b/grub-core/kern/emu/main.c @@ -16,8 +16,8 @@ @@ -73,7 +73,7 @@ index 846fe9715..3e7929cc4 100644 #include <time.h> #include <stdio.h> diff --git a/grub-core/osdep/aros/config.c b/grub-core/osdep/aros/config.c -index c82d0ea8e..55f5728ef 100644 +index c82d0ea8e7..55f5728efc 100644 --- a/grub-core/osdep/aros/config.c +++ b/grub-core/osdep/aros/config.c @@ -16,8 +16,8 @@ @@ -87,7 +87,7 @@ index c82d0ea8e..55f5728ef 100644 #include <grub/emu/hostdisk.h> #include <grub/emu/exec.h> diff --git a/grub-core/osdep/basic/emunet.c b/grub-core/osdep/basic/emunet.c -index 6362e5cfb..dbfd316d6 100644 +index 6362e5cfbb..dbfd316d61 100644 --- a/grub-core/osdep/basic/emunet.c +++ b/grub-core/osdep/basic/emunet.c @@ -16,8 +16,8 @@ @@ -101,7 +101,7 @@ index 6362e5cfb..dbfd316d6 100644 #include <grub/i18n.h> #include <grub/emu/net.h> diff --git a/grub-core/osdep/basic/init.c b/grub-core/osdep/basic/init.c -index c54c710db..b104c7e16 100644 +index c54c710dbc..b104c7e162 100644 --- a/grub-core/osdep/basic/init.c +++ b/grub-core/osdep/basic/init.c @@ -16,8 +16,8 @@ @@ -115,7 +115,7 @@ index c54c710db..b104c7e16 100644 #include <grub/util/misc.h> #include <grub/i18n.h> diff --git a/grub-core/osdep/haiku/getroot.c b/grub-core/osdep/haiku/getroot.c -index 4e123c090..927a1ebc9 100644 +index 4e123c0903..927a1ebc94 100644 --- a/grub-core/osdep/haiku/getroot.c +++ b/grub-core/osdep/haiku/getroot.c @@ -1,5 +1,5 @@ @@ -126,7 +126,7 @@ index 4e123c090..927a1ebc9 100644 #include <sys/stat.h> #include <string.h> diff --git a/grub-core/osdep/linux/emunet.c b/grub-core/osdep/linux/emunet.c -index 19b188f09..d5a641735 100644 +index 19b188f09e..d5a6417355 100644 --- a/grub-core/osdep/linux/emunet.c +++ b/grub-core/osdep/linux/emunet.c @@ -16,8 +16,8 @@ @@ -140,7 +140,7 @@ index 19b188f09..d5a641735 100644 #include <sys/socket.h> #include <sys/types.h> diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c -index 46a881530..0ce0e309a 100644 +index 46a881530c..0ce0e309ac 100644 --- a/grub-core/osdep/unix/config.c +++ b/grub-core/osdep/unix/config.c @@ -16,8 +16,8 @@ @@ -154,7 +154,7 @@ index 46a881530..0ce0e309a 100644 #include <grub/emu/hostdisk.h> #include <grub/emu/exec.h> diff --git a/grub-core/osdep/unix/cputime.c b/grub-core/osdep/unix/cputime.c -index cff359a3b..fb6ff55a1 100644 +index cff359a3b9..fb6ff55a1a 100644 --- a/grub-core/osdep/unix/cputime.c +++ b/grub-core/osdep/unix/cputime.c @@ -1,5 +1,5 @@ @@ -165,7 +165,7 @@ index cff359a3b..fb6ff55a1 100644 #include <sys/times.h> #include <unistd.h> diff --git a/grub-core/osdep/unix/dl.c b/grub-core/osdep/unix/dl.c -index 562b101a2..99b189bc1 100644 +index 562b101a28..99b189bc1c 100644 --- a/grub-core/osdep/unix/dl.c +++ b/grub-core/osdep/unix/dl.c @@ -16,8 +16,8 @@ @@ -179,7 +179,7 @@ index 562b101a2..99b189bc1 100644 #include <grub/dl.h> #include <grub/misc.h> diff --git a/grub-core/osdep/unix/emuconsole.c b/grub-core/osdep/unix/emuconsole.c -index 7308798ef..cac159424 100644 +index 7308798efe..cac159424d 100644 --- a/grub-core/osdep/unix/emuconsole.c +++ b/grub-core/osdep/unix/emuconsole.c @@ -17,8 +17,8 @@ @@ -193,7 +193,7 @@ index 7308798ef..cac159424 100644 #include <grub/term.h> #include <grub/types.h> diff --git a/grub-core/osdep/unix/getroot.c b/grub-core/osdep/unix/getroot.c -index 46d7116c6..4f436284c 100644 +index 46d7116c6e..4f436284ce 100644 --- a/grub-core/osdep/unix/getroot.c +++ b/grub-core/osdep/unix/getroot.c @@ -16,8 +16,8 @@ @@ -207,7 +207,7 @@ index 46d7116c6..4f436284c 100644 #include <sys/stat.h> #include <sys/types.h> diff --git a/grub-core/osdep/windows/config.c b/grub-core/osdep/windows/config.c -index 928ab1a49..2bb8a2fd8 100644 +index 928ab1a49b..2bb8a2fd88 100644 --- a/grub-core/osdep/windows/config.c +++ b/grub-core/osdep/windows/config.c @@ -16,8 +16,8 @@ @@ -221,7 +221,7 @@ index 928ab1a49..2bb8a2fd8 100644 #include <grub/emu/hostfile.h> #include <grub/emu/config.h> diff --git a/grub-core/osdep/windows/cputime.c b/grub-core/osdep/windows/cputime.c -index 3568aa2d3..5d06d79dd 100644 +index 3568aa2d35..5d06d79dd5 100644 --- a/grub-core/osdep/windows/cputime.c +++ b/grub-core/osdep/windows/cputime.c @@ -1,5 +1,5 @@ @@ -232,7 +232,7 @@ index 3568aa2d3..5d06d79dd 100644 #include <grub/emu/misc.h> #include <windows.h> diff --git a/grub-core/osdep/windows/dl.c b/grub-core/osdep/windows/dl.c -index eec6a24ad..8eab7057e 100644 +index eec6a24ad7..8eab7057e4 100644 --- a/grub-core/osdep/windows/dl.c +++ b/grub-core/osdep/windows/dl.c @@ -16,8 +16,8 @@ @@ -246,7 +246,7 @@ index eec6a24ad..8eab7057e 100644 #include <grub/dl.h> #include <grub/misc.h> diff --git a/grub-core/osdep/windows/emuconsole.c b/grub-core/osdep/windows/emuconsole.c -index 4fb3693cc..17a44de46 100644 +index 4fb3693cc0..17a44de469 100644 --- a/grub-core/osdep/windows/emuconsole.c +++ b/grub-core/osdep/windows/emuconsole.c @@ -16,8 +16,8 @@ @@ -260,7 +260,7 @@ index 4fb3693cc..17a44de46 100644 #include <grub/term.h> #include <grub/misc.h> diff --git a/grub-core/osdep/windows/init.c b/grub-core/osdep/windows/init.c -index 6297de632..51a9647dd 100644 +index 6297de6326..51a9647dde 100644 --- a/grub-core/osdep/windows/init.c +++ b/grub-core/osdep/windows/init.c @@ -16,8 +16,8 @@ diff --git a/0205-Drop-gnulib-fix-base64.patch.patch b/0205-Drop-gnulib-fix-base64.patch.patch index 9815550..054e476 100644 --- a/0205-Drop-gnulib-fix-base64.patch.patch +++ b/0205-Drop-gnulib-fix-base64.patch.patch @@ -31,7 +31,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> delete mode 100644 grub-core/lib/gnulib-patches/fix-base64.patch diff --git a/grub-core/lib/posix_wrap/sys/types.h b/grub-core/lib/posix_wrap/sys/types.h -index f63412c8d..2f3e86549 100644 +index f63412c8da..2f3e865495 100644 --- a/grub-core/lib/posix_wrap/sys/types.h +++ b/grub-core/lib/posix_wrap/sys/types.h @@ -23,11 +23,10 @@ @@ -50,7 +50,7 @@ index f63412c8d..2f3e86549 100644 typedef grub_uint8_t uint8_t; typedef grub_uint16_t uint16_t; diff --git a/grub-core/lib/xzembed/xz.h b/grub-core/lib/xzembed/xz.h -index f7b32d800..d1417039a 100644 +index f7b32d8003..d1417039aa 100644 --- a/grub-core/lib/xzembed/xz.h +++ b/grub-core/lib/xzembed/xz.h @@ -29,10 +29,7 @@ @@ -66,7 +66,7 @@ index f7b32d800..d1417039a 100644 /** * enum xz_ret - Return codes diff --git a/bootstrap.conf b/bootstrap.conf -index 52d4af44b..645e3a459 100644 +index 52d4af44be..645e3a459c 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -35,6 +35,7 @@ gnulib_modules=" @@ -87,7 +87,7 @@ index 52d4af44b..645e3a459 100644 patch -d grub-core/lib/gnulib -p2 \ < "grub-core/lib/gnulib-patches/$patchname.patch" diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist -index ad235de7f..f4791dc6c 100644 +index ad235de7fc..f4791dc6ca 100644 --- a/conf/Makefile.extra-dist +++ b/conf/Makefile.extra-dist @@ -31,7 +31,6 @@ EXTRA_DIST += grub-core/gensymlist.sh @@ -99,7 +99,7 @@ index ad235de7f..f4791dc6c 100644 EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-state-deref.patch EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch diff --git a/config.h.in b/config.h.in -index f2ed0066e..9c7b4afaa 100644 +index f2ed0066ec..9c7b4afaaa 100644 --- a/config.h.in +++ b/config.h.in @@ -66,4 +66,8 @@ @@ -113,7 +113,7 @@ index f2ed0066e..9c7b4afaa 100644 #endif diff --git a/grub-core/lib/gnulib-patches/fix-base64.patch b/grub-core/lib/gnulib-patches/fix-base64.patch deleted file mode 100644 -index 985db1279..000000000 +index 985db12797..0000000000 --- a/grub-core/lib/gnulib-patches/fix-base64.patch +++ /dev/null @@ -1,21 +0,0 @@ diff --git a/0206-Drop-gnulib-no-abort.patch.patch b/0206-Drop-gnulib-no-abort.patch.patch index a1a067a..a12789f 100644 --- a/0206-Drop-gnulib-no-abort.patch.patch +++ b/0206-Drop-gnulib-no-abort.patch.patch @@ -25,7 +25,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> delete mode 100644 grub-core/lib/gnulib-patches/no-abort.patch diff --git a/bootstrap.conf b/bootstrap.conf -index 645e3a459..71ce943c7 100644 +index 645e3a459c..71ce943c7d 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -81,7 +81,7 @@ cp -a INSTALL INSTALL.grub @@ -38,7 +38,7 @@ index 645e3a459..71ce943c7 100644 < "grub-core/lib/gnulib-patches/$patchname.patch" done diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist -index f4791dc6c..5eef70833 100644 +index f4791dc6ca..5eef708338 100644 --- a/conf/Makefile.extra-dist +++ b/conf/Makefile.extra-dist @@ -38,7 +38,6 @@ EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch @@ -50,7 +50,7 @@ index f4791dc6c..5eef70833 100644 EXTRA_DIST += grub-core/lib/libgcrypt EXTRA_DIST += grub-core/lib/libgcrypt-grub/mpi/generic diff --git a/config.h.in b/config.h.in -index 9c7b4afaa..c3134309c 100644 +index 9c7b4afaaa..c3134309c6 100644 --- a/config.h.in +++ b/config.h.in @@ -68,6 +68,9 @@ @@ -65,7 +65,7 @@ index 9c7b4afaa..c3134309c 100644 #endif diff --git a/grub-core/lib/gnulib-patches/no-abort.patch b/grub-core/lib/gnulib-patches/no-abort.patch deleted file mode 100644 -index e469c4762..000000000 +index e469c4762e..0000000000 --- a/grub-core/lib/gnulib-patches/no-abort.patch +++ /dev/null @@ -1,26 +0,0 @@ diff --git a/0207-Update-gnulib-version-and-drop-most-gnulib-patches.patch b/0207-Update-gnulib-version-and-drop-most-gnulib-patches.patch index fd44c8f..f0e2cc0 100644 --- a/0207-Update-gnulib-version-and-drop-most-gnulib-patches.patch +++ b/0207-Update-gnulib-version-and-drop-most-gnulib-patches.patch @@ -48,7 +48,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> delete mode 100644 grub-core/lib/gnulib-patches/fix-unused-value.patch diff --git a/configure.ac b/configure.ac -index 88e33e0f0..871235b91 100644 +index 88e33e0f0c..871235b91b 100644 --- a/configure.ac +++ b/configure.ac @@ -49,7 +49,7 @@ AC_CANONICAL_TARGET @@ -61,7 +61,7 @@ index 88e33e0f0..871235b91 100644 AC_CONFIG_HEADER([config-util.h]) diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 6b00eb555..39233096f 100644 +index 6b00eb5557..39233096f2 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -762,6 +762,9 @@ module = { @@ -75,7 +75,7 @@ index 6b00eb555..39233096f 100644 cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)'; cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)'; diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c -index 371a53b83..c917a5f91 100644 +index 371a53b837..c917a5f91e 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -389,7 +389,7 @@ luks2_verify_key (grub_luks2_digest_t *d, grub_uint8_t *candidate_key, @@ -97,7 +97,7 @@ index 371a53b83..c917a5f91 100644 const gcry_md_spec_t *hash; gcry_err_code_t gcry_ret; diff --git a/grub-core/lib/posix_wrap/limits.h b/grub-core/lib/posix_wrap/limits.h -index 591dbf328..4be7b4080 100644 +index 591dbf3289..4be7b40806 100644 --- a/grub-core/lib/posix_wrap/limits.h +++ b/grub-core/lib/posix_wrap/limits.h @@ -25,7 +25,11 @@ @@ -114,7 +114,7 @@ index 591dbf328..4be7b4080 100644 #define SCHAR_MIN GRUB_SCHAR_MIN #define SCHAR_MAX GRUB_SCHAR_MAX diff --git a/include/grub/compiler.h b/include/grub/compiler.h -index ebafec689..441a9eca0 100644 +index ebafec6895..441a9eca07 100644 --- a/include/grub/compiler.h +++ b/include/grub/compiler.h @@ -30,10 +30,10 @@ @@ -131,7 +131,7 @@ index ebafec689..441a9eca0 100644 #if GNUC_PREREQ(4,4) diff --git a/include/grub/list.h b/include/grub/list.h -index b13acb962..21f4b4b44 100644 +index b13acb9624..21f4b4b44a 100644 --- a/include/grub/list.h +++ b/include/grub/list.h @@ -40,7 +40,7 @@ void EXPORT_FUNC(grub_list_remove) (grub_list_t item); @@ -144,7 +144,7 @@ index b13acb962..21f4b4b44 100644 static inline void * grub_bad_type_cast_real (int line, const char *file) diff --git a/INSTALL b/INSTALL -index 79a0af7d9..ee9f536f7 100644 +index 79a0af7d93..ee9f536f76 100644 --- a/INSTALL +++ b/INSTALL @@ -42,7 +42,7 @@ If you use a development snapshot or want to hack on GRUB you may @@ -157,7 +157,7 @@ index 79a0af7d9..ee9f536f7 100644 Prerequisites for make-check: diff --git a/bootstrap b/bootstrap -index 5b08e7e2d..dc2238f4a 100755 +index 5b08e7e2d4..dc2238f4ad 100755 --- a/bootstrap +++ b/bootstrap @@ -1,10 +1,10 @@ @@ -563,7 +563,7 @@ index 5b08e7e2d..dc2238f4a 100755 # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" diff --git a/bootstrap.conf b/bootstrap.conf -index 71ce943c7..e4e5f3750 100644 +index 71ce943c7d..e4e5f3750a 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -1,6 +1,6 @@ @@ -618,7 +618,7 @@ index 71ce943c7..e4e5f3750 100644 0001-Support-POTFILES-shell \ 0002-Handle-gettext_printf-shell-function \ diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist -index 5eef70833..26ac8765e 100644 +index 5eef708338..26ac8765e3 100644 --- a/conf/Makefile.extra-dist +++ b/conf/Makefile.extra-dist @@ -31,12 +31,6 @@ EXTRA_DIST += grub-core/gensymlist.sh @@ -635,7 +635,7 @@ index 5eef70833..26ac8765e 100644 EXTRA_DIST += grub-core/lib/libgcrypt diff --git a/config.h.in b/config.h.in -index c3134309c..512d1bbe1 100644 +index c3134309c6..512d1bbe13 100644 --- a/config.h.in +++ b/config.h.in @@ -67,10 +67,78 @@ @@ -719,7 +719,7 @@ index c3134309c..512d1bbe1 100644 #endif diff --git a/grub-core/lib/gnulib-patches/fix-null-deref.patch b/grub-core/lib/gnulib-patches/fix-null-deref.patch deleted file mode 100644 -index 8fafa153a..000000000 +index 8fafa153a4..0000000000 --- a/grub-core/lib/gnulib-patches/fix-null-deref.patch +++ /dev/null @@ -1,13 +0,0 @@ @@ -738,7 +738,7 @@ index 8fafa153a..000000000 - struct parser *parser = state->pstate; diff --git a/grub-core/lib/gnulib-patches/fix-null-state-deref.patch b/grub-core/lib/gnulib-patches/fix-null-state-deref.patch deleted file mode 100644 -index 813ec09c8..000000000 +index 813ec09c8a..0000000000 --- a/grub-core/lib/gnulib-patches/fix-null-state-deref.patch +++ /dev/null @@ -1,12 +0,0 @@ @@ -756,7 +756,7 @@ index 813ec09c8..000000000 - "rmargin", up->name); diff --git a/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch b/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch deleted file mode 100644 -index 02e06315d..000000000 +index 02e06315df..0000000000 --- a/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch +++ /dev/null @@ -1,15 +0,0 @@ @@ -777,7 +777,7 @@ index 02e06315d..000000000 - diff --git a/grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch b/grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch deleted file mode 100644 -index db6dac9c9..000000000 +index db6dac9c9e..0000000000 --- a/grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch +++ /dev/null @@ -1,12 +0,0 @@ @@ -795,7 +795,7 @@ index db6dac9c9..000000000 - || (next_state_log_idx >= mctx->input.valid_len diff --git a/grub-core/lib/gnulib-patches/fix-uninit-structure.patch b/grub-core/lib/gnulib-patches/fix-uninit-structure.patch deleted file mode 100644 -index 7b4d9f67a..000000000 +index 7b4d9f67af..0000000000 --- a/grub-core/lib/gnulib-patches/fix-uninit-structure.patch +++ /dev/null @@ -1,11 +0,0 @@ @@ -812,7 +812,7 @@ index 7b4d9f67a..000000000 - sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1); diff --git a/grub-core/lib/gnulib-patches/fix-unused-value.patch b/grub-core/lib/gnulib-patches/fix-unused-value.patch deleted file mode 100644 -index ba51f1bf2..000000000 +index ba51f1bf22..0000000000 --- a/grub-core/lib/gnulib-patches/fix-unused-value.patch +++ /dev/null @@ -1,14 +0,0 @@ diff --git a/0208-commands-search-Fix-bug-stopping-iteration-when-no-f.patch b/0208-commands-search-Fix-bug-stopping-iteration-when-no-f.patch index 461a1b8..4f7feb9 100644 --- a/0208-commands-search-Fix-bug-stopping-iteration-when-no-f.patch +++ b/0208-commands-search-Fix-bug-stopping-iteration-when-no-f.patch @@ -19,7 +19,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c -index ed090b3af..51656e361 100644 +index ed090b3af8..51656e361c 100644 --- a/grub-core/commands/search.c +++ b/grub-core/commands/search.c @@ -64,7 +64,7 @@ iterate_device (const char *name, void *data) diff --git a/0209-search-new-efidisk-only-option-on-EFI-systems.patch b/0209-search-new-efidisk-only-option-on-EFI-systems.patch index 02e2412..3f6194a 100644 --- a/0209-search-new-efidisk-only-option-on-EFI-systems.patch +++ b/0209-search-new-efidisk-only-option-on-EFI-systems.patch @@ -26,7 +26,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 3 files changed, 47 insertions(+), 13 deletions(-) diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c -index 51656e361..57d26ced8 100644 +index 51656e361c..57d26ced8a 100644 --- a/grub-core/commands/search.c +++ b/grub-core/commands/search.c @@ -47,7 +47,7 @@ struct search_ctx @@ -86,7 +86,7 @@ index 51656e361..57d26ced8 100644 .nhints = nhints, .count = 0, diff --git a/grub-core/commands/search_wrap.c b/grub-core/commands/search_wrap.c -index 47fc8eb99..0b62acf85 100644 +index 47fc8eb996..0b62acf853 100644 --- a/grub-core/commands/search_wrap.c +++ b/grub-core/commands/search_wrap.c @@ -40,6 +40,7 @@ static const struct grub_arg_option options[] = @@ -139,7 +139,7 @@ index 47fc8eb99..0b62acf85 100644 grub_error (GRUB_ERR_INVALID_COMMAND, "unspecified search type"); diff --git a/include/grub/search.h b/include/grub/search.h -index d80347df3..4190aeb2c 100644 +index d80347df34..4190aeb2cb 100644 --- a/include/grub/search.h +++ b/include/grub/search.h @@ -19,11 +19,20 @@ diff --git a/0210-efi-new-connectefi-command.patch b/0210-efi-new-connectefi-command.patch index 524412c..55a49fd 100644 --- a/0210-efi-new-connectefi-command.patch +++ b/0210-efi-new-connectefi-command.patch @@ -64,7 +64,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> create mode 100644 grub-core/commands/efi/connectefi.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 39233096f..3c0ac3b7b 100644 +index 39233096f2..3c0ac3b7bd 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -836,6 +836,12 @@ module = { @@ -82,7 +82,7 @@ index 39233096f..3c0ac3b7b 100644 common = commands/blocklist.c; diff --git a/grub-core/commands/efi/connectefi.c b/grub-core/commands/efi/connectefi.c new file mode 100644 -index 000000000..8ab75bd51 +index 0000000000..8ab75bd51b --- /dev/null +++ b/grub-core/commands/efi/connectefi.c @@ -0,0 +1,205 @@ @@ -292,7 +292,7 @@ index 000000000..8ab75bd51 + grub_unregister_command (cmd); +} diff --git a/grub-core/commands/efi/lsefi.c b/grub-core/commands/efi/lsefi.c -index d1ce99af4..f2d2430e6 100644 +index d1ce99af43..f2d2430e66 100644 --- a/grub-core/commands/efi/lsefi.c +++ b/grub-core/commands/efi/lsefi.c @@ -19,6 +19,7 @@ @@ -304,7 +304,7 @@ index d1ce99af4..f2d2430e6 100644 #include <grub/efi/pci.h> #include <grub/efi/efi.h> diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c -index fe8ba6e6c..062143dff 100644 +index fe8ba6e6c9..062143dfff 100644 --- a/grub-core/disk/efi/efidisk.c +++ b/grub-core/disk/efi/efidisk.c @@ -396,6 +396,19 @@ enumerate_disks (void) @@ -328,7 +328,7 @@ index fe8ba6e6c..062143dff 100644 grub_efidisk_iterate (grub_disk_dev_iterate_hook_t hook, void *hook_data, grub_disk_pull_t pull) diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 14bc10eb5..7fcca69c1 100644 +index 14bc10eb56..7fcca69c17 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -95,6 +95,19 @@ grub_efi_locate_handle (grub_efi_locate_search_type_t search_type, @@ -352,7 +352,7 @@ index 14bc10eb5..7fcca69c1 100644 grub_efi_open_protocol (grub_efi_handle_t handle, grub_efi_guid_t *protocol, diff --git a/include/grub/efi/disk.h b/include/grub/efi/disk.h -index 254475c84..6845c2f1f 100644 +index 254475c842..6845c2f1fd 100644 --- a/include/grub/efi/disk.h +++ b/include/grub/efi/disk.h @@ -27,6 +27,8 @@ grub_efi_handle_t @@ -365,7 +365,7 @@ index 254475c84..6845c2f1f 100644 void grub_efidisk_fini (void); diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h -index 8dfc89a33..ec52083c4 100644 +index 8dfc89a33b..ec52083c49 100644 --- a/include/grub/efi/efi.h +++ b/include/grub/efi/efi.h @@ -41,6 +41,11 @@ EXPORT_FUNC(grub_efi_locate_handle) (grub_efi_locate_search_type_t search_type, @@ -381,7 +381,7 @@ index 8dfc89a33..ec52083c4 100644 grub_efi_guid_t *protocol, grub_efi_uint32_t attributes); diff --git a/NEWS b/NEWS -index 73b8492bc..d7c1d23ae 100644 +index 73b8492bc4..d7c1d23aed 100644 --- a/NEWS +++ b/NEWS @@ -98,7 +98,7 @@ New in 2.02: diff --git a/0211-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch b/0211-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch index 869d0a4..4fe8adf 100644 --- a/0211-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch +++ b/0211-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch @@ -34,7 +34,7 @@ Signed-off-by: Dimitri John Ledkov <dimitri.ledkov(a)canonical.com> 1 file changed, 13 deletions(-) diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index 3cf0f9b33..941df6400 100644 +index 3cf0f9b330..941df6400b 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -30,7 +30,6 @@ diff --git a/0212-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch b/0212-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch index 5d76beb..5b450f9 100644 --- a/0212-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch +++ b/0212-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch @@ -19,7 +19,7 @@ Signed-off-by: Dimitri John Ledkov <dimitri.ledkov(a)canonical.com> 1 file changed, 13 deletions(-) diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c -index f18d90bd7..d2af47c2c 100644 +index f18d90bd74..d2af47c2c0 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -34,7 +34,6 @@ diff --git a/0213-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch b/0213-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch index adc8179..4c56d60 100644 --- a/0213-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch +++ b/0213-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch @@ -39,7 +39,7 @@ Signed-off-by: Dimitri John Ledkov <dimitri.ledkov(a)canonical.com> 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index 3af6b1229..644cd2e56 100644 +index 3af6b12292..644cd2e56f 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -906,7 +906,6 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), diff --git a/0214-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch b/0214-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch index c298c04..c683fcb 100644 --- a/0214-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch +++ b/0214-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch @@ -18,7 +18,7 @@ Signed-off-by: Dimitri John Ledkov <dimitri.ledkov(a)canonical.com> 2 files changed, 42 deletions(-) diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c -index 9260731c1..9265cf420 100644 +index 9260731c10..9265cf4200 100644 --- a/grub-core/loader/efi/linux.c +++ b/grub-core/loader/efi/linux.c @@ -24,46 +24,6 @@ @@ -69,7 +69,7 @@ index 9260731c1..9265cf420 100644 #pragma GCC diagnostic ignored "-Wcast-align" diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h -index 0033d9305..887b02fd9 100644 +index 0033d9305a..887b02fd9f 100644 --- a/include/grub/efi/linux.h +++ b/include/grub/efi/linux.h @@ -22,8 +22,6 @@ diff --git a/grub2.spec b/grub2.spec index 3ce0542..16d5587 100644 --- a/grub2.spec +++ b/grub2.spec @@ -17,7 +17,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -529,6 +529,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Mon Apr 18 2022 Robbie Harwood <rharwood(a)redhat.com> - 1:2.06-37 +- Attempt to fix version display + * Mon Apr 18 2022 Robbie Harwood <rharwood(a)redhat.com> - 2.06-36 - Fix permission change report from rpm verification on grub.cfg commit f9344de20ac5e841101ea84ac4e95cd4fa59cd66 Author: Robbie Harwood <rharwood(a)redhat.com> Date: Mon Apr 18 17:01:36 2022 -0400 Stop using %{name} for things in the spec file There's no point to this (the packaging isn't generic, confusion between grub and grub2 in places, it's not fewer characters to type, have to think about escaping in macros, ...) and it makes searching for things needlessly difficult. This finishes the revert of 967c5629ed9fdb4e8572daa78f3bb5ac5e675e77 ("Don't harcode grub2 in the spec file") that was begun in af038a0bdc38f46db45fc5aeaca0a6942fc22440 ("Revert "Don't harcode grub2 in the spec file""). Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> diff --git a/grub.macros b/grub.macros index ff58cec..d967035 100644 --- a/grub.macros +++ b/grub.macros @@ -237,13 +237,13 @@ %define define_legacy_variant() \ %{expand:%%package %%{1}} \ Summary: Bootloader with support for Linux, Multiboot, and more \ -Provides: %{name} = %{evr} \ -Obsoletes: %{name} < %{evr} \ -Requires: %{name}-common = %{evr} \ -Requires: %{name}-tools-minimal = %{evr} \ -Requires: %{name}-%{1}-modules = %{evr} \ +Provides: grub2 = %{evr} \ +Obsoletes: grub2 < %{evr} \ +Requires: grub2-common = %{evr} \ +Requires: grub2-tools-minimal = %{evr} \ +Requires: grub2-%{1}-modules = %{evr} \ Requires: gettext which file \ -Requires: %{name}-tools = %{evr} \ +Requires: grub2-tools = %{evr} \ Requires(pre): dracut \ Requires(post): dracut \ %{expand:%%description %%{1}} \ @@ -255,7 +255,7 @@ This subpackage provides support for %{1} systems. \ %%package %%{1}-modules \ Summary: Modules used to build custom grub images \ BuildArch: noarch \ -Requires: %%{name}-common = %%{evr} \ +Requires: grub2-common = %%{evr} \ %%description %%{1}-modules \ %%{desc} \ This subpackage provides support for rebuilding your own grub.efi. \ @@ -266,8 +266,8 @@ This subpackage provides support for rebuilding your own grub.efi. \ %{expand:%%package %%{1}-tools} \ Summary: Support tools for GRUB. \ Requires: gettext os-prober which file system-logos \ -Requires: %{name}-common = %{evr} \ -Requires: %{name}-tools-minimal = %{evr} \ +Requires: grub2-common = %{evr} \ +Requires: grub2-tools-minimal = %{evr} \ Requires: os-prober >= 1.58-11 \ Requires: gettext which file \ \ @@ -280,12 +280,12 @@ This subpackage provides tools for support of %%{1} platforms. \ %{expand:%%package %{1}} \ Summary: GRUB for EFI systems. \ Requires: efi-filesystem \ -Requires: %{name}-common = %{evr} \ -Requires: %{name}-tools-minimal >= %{evr} \ -Requires: %{name}-tools = %{evr} \ -Provides: %{name}-efi = %{evr} \ -%{?legacy_provides:Provides: %{name} = %{evr}} \ -%{-o:Obsoletes: %{name}-efi < %{evr}} \ +Requires: grub2-common = %{evr} \ +Requires: grub2-tools-minimal >= %{evr} \ +Requires: grub2-tools = %{evr} \ +Provides: grub2-efi = %{evr} \ +%{?legacy_provides:Provides: grub2 = %{evr}} \ +%{-o:Obsoletes: grub2-efi < %{evr}} \ \ %{expand:%%description %{1}} \ %{desc} \ @@ -296,9 +296,9 @@ This subpackage provides support for %{1} systems. \ %{expand:%%package %{1}-modules} \ Summary: Modules used to build custom grub.efi images \ BuildArch: noarch \ -Requires: %{name}-common = %{evr} \ -Provides: %{name}-efi-modules = %{evr} \ -Obsoletes: %{name}-efi-modules < %{evr} \ +Requires: grub2-common = %{evr} \ +Provides: grub2-efi-modules = %{evr} \ +Obsoletes: grub2-efi-modules < %{evr} \ %{expand:%%description %{1}-modules} \ %{desc} \ This subpackage provides support for rebuilding your own grub.efi. \ @@ -306,8 +306,8 @@ This subpackage provides support for rebuilding your own grub.efi. \ \ %{expand:%%package %{1}-cdboot} \ Summary: Files used to boot removeable media with EFI \ -Requires: %{name}-common = %{evr} \ -Provides: %{name}-efi-cdboot = %{evr} \ +Requires: grub2-common = %{evr} \ +Provides: grub2-efi-cdboot = %{evr} \ %{expand:%%description %{1}-cdboot} \ %{desc} \ This subpackage provides optional components of grub used with removeable media on %{1} systems.\ @@ -327,7 +327,7 @@ git init \ echo '![[:digit:]][[:digit:]]_*.in' > util/grub.d/.gitignore \ echo '!*.[[:digit:]]' > util/.gitignore \ echo '!config.h' > include/grub/emu/.gitignore \ -git config user.email "%{name}-owner(a)fedoraproject.org" \ +git config user.email "grub2-owner(a)fedoraproject.org" \ git config user.name "Fedora Ninjas" \ git config gc.auto 0 \ rm -f configure \ @@ -350,8 +350,8 @@ rm -r build-aux m4 \ --with-platform=efi \\\ --with-utils=host \\\ --target=%{1} \\\ - --with-grubdir=%{name} \\\ - --program-transform-name=s,grub,%{name}, \\\ + --with-grubdir=grub2 \\\ + --program-transform-name=s,grub,grub2, \\\ --disable-werror || ( cat config.log ; exit 1 ) \ git add . \ git commit -m "After efi configure" \ @@ -454,8 +454,8 @@ cd grub-%{1}-%{tarversion} \ --with-platform=%{platform} \\\ --with-utils=host \\\ --target=%{_target_platform} \\\ - --with-grubdir=%{name} \\\ - --program-transform-name=s,grub,%{name}, \\\ + --with-grubdir=grub2 \\\ + --program-transform-name=s,grub,grub2, \\\ --disable-werror || ( cat config.log ; exit 1 ) \ git add . \ git commit -m "After legacy configure" \ @@ -471,8 +471,8 @@ cd grub-emu-%{tarversion} \ HOST_CPPFLAGS="-I$(pwd)" \\\ HOST_LDFLAGS="%{legacy_host_ldflags}" \\\ --with-platform=emu \\\ - --with-grubdir=%{name} \\\ - --program-transform-name=s,grub,%{name}, \\\ + --with-grubdir=grub2 \\\ + --program-transform-name=s,grub,grub2, \\\ --disable-werror || ( cat config.log ; exit 1 ) \ git add . \ git commit -m "After emu configure" \ @@ -498,7 +498,7 @@ find . '(' -iname gdb_grub \\\ find $RPM_BUILD_ROOT -type f -iname "*.mod*" -exec chmod a-x {} '\;' \ install -m 700 %{2} $RPM_BUILD_ROOT%{efi_esp_dir}/%{2} \ install -m 700 %{3} $RPM_BUILD_ROOT%{efi_esp_dir}/%{3} \ -%{expand:%%do_install_protected_file %{name}-%{alt_package_arch}} \ +%{expand:%%do_install_protected_file grub2-%{alt_package_arch}} \ cd .. \ %{nil} @@ -512,18 +512,18 @@ if [ -f $RPM_BUILD_ROOT%{_infodir}/grub-dev.info ]; then \ rm -f $RPM_BUILD_ROOT%{_infodir}/grub-dev.info \ fi \ find $RPM_BUILD_ROOT -iname "*.module" -exec chmod a-x {} '\;' \ -ln -s ../boot/%{name}/grub.cfg \\\ - $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-efi.cfg \ +ln -s ../boot/grub2/grub.cfg \\\ + $RPM_BUILD_ROOT%{_sysconfdir}/grub2-efi.cfg \ install -m 700 %{2} $RPM_BUILD_ROOT%{efi_esp_dir}/%{2} \ install -m 700 %{3} $RPM_BUILD_ROOT%{efi_esp_dir}/%{3} \ %ifarch %{arm} \ install -D -m 700 %{2} $RPM_BUILD_ROOT%{efi_esp_boot}/BOOTARM.EFI \ %endif \ install -D -m 700 unicode.pf2 \\\ - ${RPM_BUILD_ROOT}/boot/%{name}/fonts/unicode.pf2 \ -${RPM_BUILD_ROOT}/%{_bindir}/%{name}-editenv \\\ - ${RPM_BUILD_ROOT}/boot/%{name}/grubenv create \ -%{expand:%%do_install_protected_file %{name}-%{package_arch}} \ + ${RPM_BUILD_ROOT}/boot/grub2/fonts/unicode.pf2 \ +${RPM_BUILD_ROOT}/%{_bindir}/grub2-editenv \\\ + ${RPM_BUILD_ROOT}/boot/grub2/grubenv create \ +%{expand:%%do_install_protected_file grub2-%{package_arch}} \ cd .. \ %{nil} @@ -541,10 +541,10 @@ if [ -f $RPM_BUILD_ROOT/%{_libdir}/grub/%{1}/grub2.chrp ]; then \ $RPM_BUILD_ROOT/%{_libdir}/grub/%{1}/grub.chrp \ fi \ if [ %{3} -eq 0 ]; then \ - ${RPM_BUILD_ROOT}/%{_bindir}/%{name}-editenv \\\ - ${RPM_BUILD_ROOT}/boot/%{name}/grubenv create \ + ${RPM_BUILD_ROOT}/%{_bindir}/grub2-editenv \\\ + ${RPM_BUILD_ROOT}/boot/grub2/grubenv create \ fi \ -%{expand:%%do_install_protected_file %{name}-%{legacy_package_arch}} \ +%{expand:%%do_install_protected_file grub2-%{legacy_package_arch}} \ cd .. \ %{nil} @@ -571,30 +571,30 @@ install -d -m 0755 \\\ $RPM_BUILD_ROOT%{_infodir}/ \ cp -a $RPM_BUILD_ROOT%{_datarootdir}/locale/en\@quot \\\ $RPM_BUILD_ROOT%{_datarootdir}/locale/en \ -cp docs/grub.info $RPM_BUILD_ROOT%{_infodir}/%{name}.info \ +cp docs/grub.info $RPM_BUILD_ROOT%{_infodir}/grub2.info \ cp docs/grub-dev.info \\\ - $RPM_BUILD_ROOT%{_infodir}/%{name}-dev.info \ + $RPM_BUILD_ROOT%{_infodir}/grub2-dev.info \ install -d -m 0700 ${RPM_BUILD_ROOT}%{efi_esp_dir}/ \ install -d -m 0700 ${RPM_BUILD_ROOT}/boot/grub2/ \ install -d -m 0700 ${RPM_BUILD_ROOT}/boot/loader/entries \ -install -d -m 0700 ${RPM_BUILD_ROOT}/boot/%{name}/themes/system \ +install -d -m 0700 ${RPM_BUILD_ROOT}/boot/grub2/themes/system \ install -d -m 0700 ${RPM_BUILD_ROOT}%{_sysconfdir}/default \ install -d -m 0700 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig \ touch ${RPM_BUILD_ROOT}%{_sysconfdir}/default/grub \ ln -sf ../default/grub \\\ ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/grub \ -touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \ -ln -s ../boot/%{name}/grub.cfg \\\ +touch ${RPM_BUILD_ROOT}/boot/grub2/grub.cfg \ +ln -s ../boot/grub2/grub.cfg \\\ ${RPM_BUILD_ROOT}%{_sysconfdir}/grub2.cfg \ %{nil} %define define_legacy_variant_files() \ %{expand:%%files %{1}} \ %defattr(-,root,root,-) \ -%config(noreplace) %{_sysconfdir}/%{name}.cfg \ -%ghost %config(noreplace) %attr(0700,root,root)/boot/%{name}/grub.cfg \ +%config(noreplace) %{_sysconfdir}/grub2.cfg \ +%ghost %config(noreplace) %attr(0700,root,root)/boot/grub2/grub.cfg \ %dir %attr(0700,root,root)/boot/loader/entries \ -%attr(0644,root,root) %config(noreplace) /etc/dnf/protected.d/%{name}-%{1}.conf \ +%attr(0644,root,root) %config(noreplace) /etc/dnf/protected.d/grub2-%{1}.conf \ \ %{expand:%if 0%{?with_legacy_modules} \ %{expand:%%files %{1}-modules} \ @@ -612,18 +612,18 @@ ln -s ../boot/%{name}/grub.cfg \\\ %define define_efi_variant_files() \ %{expand:%%files %{1}} \ %defattr(-,root,root,-) \ -%config(noreplace) %{_sysconfdir}/%{name}.cfg \ -%config(noreplace) %{_sysconfdir}/%{name}-efi.cfg \ +%config(noreplace) %{_sysconfdir}/grub2.cfg \ +%config(noreplace) %{_sysconfdir}/grub2-efi.cfg \ %attr(0700,root,root)%{efi_esp_dir}/%{2} \ %ifarch %{arm} \ %attr(0700,root,root)%{efi_esp_boot}/BOOTARM.EFI \ %endif \ -%attr(0700,root,root)/boot/%{name}/fonts \ +%attr(0700,root,root)/boot/grub2/fonts \ %dir %attr(0700,root,root)/boot/loader/entries \ -%ghost %config(noreplace) %attr(0700,root,root)/boot/%{name}/grub.cfg \ +%ghost %config(noreplace) %attr(0700,root,root)/boot/grub2/grub.cfg \ %ghost %config(noreplace) %attr(0700,root,root)%{efi_esp_dir}/grub.cfg \ %config(noreplace) %verify(not size mode md5 mtime) /boot/grub2/grubenv \ -%attr(0644,root,root) %config(noreplace) /etc/dnf/protected.d/%{name}-%{1}.conf \ +%attr(0644,root,root) %config(noreplace) /etc/dnf/protected.d/grub2-%{1}.conf \ %{expand:%if 0%{?without_efi_modules} \ %exclude %{_libdir}/grub/%{6} \ %exclude %{_libdir}/grub/%{6}/* \ @@ -640,5 +640,5 @@ ln -s ../boot/%{name}/grub.cfg \\\ %{expand:%%files %{1}-cdboot} \ %defattr(-,root,root,-) \ %attr(0700,root,root)%{efi_esp_dir}/%{3} \ -%attr(0700,root,root)/boot/%{name}/fonts \ +%attr(0700,root,root)/boot/grub2/fonts \ %{nil} diff --git a/grub2.spec b/grub2.spec index 704efdc..3ce0542 100644 --- a/grub2.spec +++ b/grub2.spec @@ -59,12 +59,12 @@ BuildRequires: ccache %endif ExcludeArch: s390 s390x %{ix86} -Obsoletes: %{name} <= %{evr} +Obsoletes: grub2 <= %{evr} %if 0%{with_legacy_arch} -Requires: %{name}-%{legacy_package_arch} = %{evr} +Requires: grub2-%{legacy_package_arch} = %{evr} %else -Requires: %{name}-%{package_arch} = %{evr} +Requires: grub2-%{package_arch} = %{evr} %endif %global desc \ @@ -94,8 +94,8 @@ subpackages. %package tools Summary: Support tools for GRUB. -Obsoletes: %{name}-tools < %{evr} -Requires: %{name}-common = %{epoch}:%{version}-%{release} +Obsoletes: grub2-tools < %{evr} +Requires: grub2-common = %{epoch}:%{version}-%{release} Requires: gettext os-prober file Requires(pre): dracut Requires(pre): grep @@ -109,8 +109,8 @@ This subpackage provides tools for support of all platforms. %package tools-efi Summary: Support tools for GRUB. Requires: gettext os-prober file -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Obsoletes: %{name}-tools < %{evr} +Requires: grub2-common = %{epoch}:%{version}-%{release} +Obsoletes: grub2-tools < %{evr} %description tools-efi %{desc} @@ -120,8 +120,8 @@ This subpackage provides tools for support of EFI platforms. %package tools-minimal Summary: Support tools for GRUB. Requires: gettext -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Obsoletes: %{name}-tools < %{evr} +Requires: grub2-common = %{epoch}:%{version}-%{release} +Obsoletes: grub2-tools < %{evr} %description tools-minimal %{desc} @@ -130,9 +130,9 @@ This subpackage provides tools for support of all platforms. %package tools-extra Summary: Support tools for GRUB. Requires: gettext os-prober file -Requires: %{name}-tools-minimal = %{epoch}:%{version}-%{release} -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Obsoletes: %{name}-tools < %{evr} +Requires: grub2-tools-minimal = %{epoch}:%{version}-%{release} +Requires: grub2-common = %{epoch}:%{version}-%{release} +Obsoletes: grub2-tools < %{evr} %description tools-extra %{desc} @@ -151,7 +151,7 @@ This subpackage provides tools for support of all platforms. %if 0%{with_emu_arch} %package emu Summary: GRUB user-space emulation. -Requires: %{name}-tools-minimal = %{epoch}:%{version}-%{release} +Requires: grub2-tools-minimal = %{epoch}:%{version}-%{release} %description emu %{desc} @@ -159,7 +159,7 @@ This subpackage provides the GRUB user-space emulation support of all platforms. %package emu-modules Summary: GRUB user-space emulation modules. -Requires: %{name}-tools-minimal = %{epoch}:%{version}-%{release} +Requires: grub2-tools-minimal = %{epoch}:%{version}-%{release} %description emu-modules %{desc} @@ -236,14 +236,14 @@ rm -fr $RPM_BUILD_ROOT %{expand:%do_emu_install %%{package_arch}} %endif rm -f $RPM_BUILD_ROOT%{_infodir}/dir -ln -s %{name}-set-password ${RPM_BUILD_ROOT}/%{_sbindir}/%{name}-setpassword -echo '.so man8/%{name}-set-password.8' > ${RPM_BUILD_ROOT}/%{_datadir}/man/man8/%{name}-setpassword.8 +ln -s grub2-set-password ${RPM_BUILD_ROOT}/%{_sbindir}/grub2-setpassword +echo '.so man8/grub2-set-password.8' > ${RPM_BUILD_ROOT}/%{_datadir}/man/man8/grub2-setpassword.8 %ifnarch x86_64 -rm -vf ${RPM_BUILD_ROOT}/%{_bindir}/%{name}-render-label -rm -vf ${RPM_BUILD_ROOT}/%{_sbindir}/%{name}-bios-setup -rm -vf ${RPM_BUILD_ROOT}/%{_sbindir}/%{name}-macbless +rm -vf ${RPM_BUILD_ROOT}/%{_bindir}/grub2-render-label +rm -vf ${RPM_BUILD_ROOT}/%{_sbindir}/grub2-bios-setup +rm -vf ${RPM_BUILD_ROOT}/%{_sbindir}/grub2-macbless %endif -%{expand:%%do_install_protected_file %{name}-tools-minimal} +%{expand:%%do_install_protected_file grub2-tools-minimal} %find_lang grub @@ -364,9 +364,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %{_prefix}/lib/kernel/install.d/99-grub-mkconfig.install %dir %{_datarootdir}/grub %exclude %{_datarootdir}/grub/* -%dir /boot/%{name} -%dir /boot/%{name}/themes/ -%dir /boot/%{name}/themes/system +%dir /boot/grub2 +%dir /boot/grub2/themes/ +%dir /boot/grub2/themes/system %attr(0700,root,root) %dir /boot/grub2 %exclude /boot/grub2/* %dir %attr(0700,root,root) %{efi_esp_dir} @@ -379,30 +379,30 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %doc docs/font_char_metrics.png %files tools-minimal -%{_sbindir}/%{name}-get-kernel-settings -%{_sbindir}/%{name}-probe -%attr(4755, root, root) %{_sbindir}/%{name}-set-bootflag -%{_sbindir}/%{name}-set-default -%{_sbindir}/%{name}-set*password -%{_bindir}/%{name}-editenv -%{_bindir}/%{name}-mkpasswd-pbkdf2 -%{_bindir}/%{name}-mount -%attr(0644,root,root) %config(noreplace) /etc/dnf/protected.d/%{name}-tools-minimal.conf - -%{_datadir}/man/man3/%{name}-get-kernel-settings* -%{_datadir}/man/man8/%{name}-set-default* -%{_datadir}/man/man8/%{name}-set*password* -%{_datadir}/man/man1/%{name}-editenv* -%{_datadir}/man/man1/%{name}-mkpasswd-* +%{_sbindir}/grub2-get-kernel-settings +%{_sbindir}/grub2-probe +%attr(4755, root, root) %{_sbindir}/grub2-set-bootflag +%{_sbindir}/grub2-set-default +%{_sbindir}/grub2-set*password +%{_bindir}/grub2-editenv +%{_bindir}/grub2-mkpasswd-pbkdf2 +%{_bindir}/grub2-mount +%attr(0644,root,root) %config(noreplace) /etc/dnf/protected.d/grub2-tools-minimal.conf + +%{_datadir}/man/man3/grub2-get-kernel-settings* +%{_datadir}/man/man8/grub2-set-default* +%{_datadir}/man/man8/grub2-set*password* +%{_datadir}/man/man1/grub2-editenv* +%{_datadir}/man/man1/grub2-mkpasswd-* %ifarch x86_64 %files tools-efi -%{_bindir}/%{name}-glue-efi -%{_bindir}/%{name}-render-label -%{_sbindir}/%{name}-macbless -%{_datadir}/man/man1/%{name}-glue-efi* -%{_datadir}/man/man1/%{name}-render-label* -%{_datadir}/man/man8/%{name}-macbless* +%{_bindir}/grub2-glue-efi +%{_bindir}/grub2-render-label +%{_sbindir}/grub2-macbless +%{_datadir}/man/man1/grub2-glue-efi* +%{_datadir}/man/man1/grub2-render-label* +%{_datadir}/man/man8/grub2-macbless* %endif %files tools @@ -414,98 +414,98 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %{_userunitdir}/timers.target.wants %{_unitdir}/grub-boot-indeterminate.service %{_unitdir}/system-update.target.wants -%{_unitdir}/%{name}-systemd-integration.service +%{_unitdir}/grub2-systemd-integration.service %{_unitdir}/reboot.target.wants %{_unitdir}/systemd-logind.service.d -%{_infodir}/%{name}* +%{_infodir}/grub2* %{_datarootdir}/grub/* -%{_sbindir}/%{name}-install +%{_sbindir}/grub2-install %exclude %{_datarootdir}/grub/themes %exclude %{_datarootdir}/grub/*.h %{_datarootdir}/bash-completion/completions/grub -%{_sbindir}/%{name}-mkconfig -%{_sbindir}/%{name}-switch-to-blscfg -%{_sbindir}/%{name}-rpm-sort -%{_sbindir}/%{name}-reboot -%{_bindir}/%{name}-file -%{_bindir}/%{name}-menulst2cfg -%{_bindir}/%{name}-mkimage -%{_bindir}/%{name}-mkrelpath -%{_bindir}/%{name}-script-check -%{_libexecdir}/%{name} +%{_sbindir}/grub2-mkconfig +%{_sbindir}/grub2-switch-to-blscfg +%{_sbindir}/grub2-rpm-sort +%{_sbindir}/grub2-reboot +%{_bindir}/grub2-file +%{_bindir}/grub2-menulst2cfg +%{_bindir}/grub2-mkimage +%{_bindir}/grub2-mkrelpath +%{_bindir}/grub2-script-check +%{_libexecdir}/grub2 %{_datadir}/man/man?/* # exclude man pages from tools-extra -%exclude %{_datadir}/man/man8/%{name}-sparc64-setup* -%exclude %{_datadir}/man/man1/%{name}-fstest* -%exclude %{_datadir}/man/man1/%{name}-glue-efi* -%exclude %{_datadir}/man/man1/%{name}-kbdcomp* -%exclude %{_datadir}/man/man1/%{name}-mkfont* -%exclude %{_datadir}/man/man1/%{name}-mklayout* -%exclude %{_datadir}/man/man1/%{name}-mknetdir* -%exclude %{_datadir}/man/man1/%{name}-mkrescue* -%exclude %{_datadir}/man/man1/%{name}-mkstandalone* -%exclude %{_datadir}/man/man1/%{name}-syslinux2cfg* +%exclude %{_datadir}/man/man8/grub2-sparc64-setup* +%exclude %{_datadir}/man/man1/grub2-fstest* +%exclude %{_datadir}/man/man1/grub2-glue-efi* +%exclude %{_datadir}/man/man1/grub2-kbdcomp* +%exclude %{_datadir}/man/man1/grub2-mkfont* +%exclude %{_datadir}/man/man1/grub2-mklayout* +%exclude %{_datadir}/man/man1/grub2-mknetdir* +%exclude %{_datadir}/man/man1/grub2-mkrescue* +%exclude %{_datadir}/man/man1/grub2-mkstandalone* +%exclude %{_datadir}/man/man1/grub2-syslinux2cfg* # exclude man pages from tools-minimal -%exclude %{_datadir}/man/man3/%{name}-get-kernel-settings* -%exclude %{_datadir}/man/man8/%{name}-set-default* -%exclude %{_datadir}/man/man8/%{name}-set*password* -%exclude %{_datadir}/man/man1/%{name}-editenv* -%exclude %{_datadir}/man/man1/%{name}-mkpasswd-* -%exclude %{_datadir}/man/man8/%{name}-macbless* -%exclude %{_datadir}/man/man1/%{name}-render-label* +%exclude %{_datadir}/man/man3/grub2-get-kernel-settings* +%exclude %{_datadir}/man/man8/grub2-set-default* +%exclude %{_datadir}/man/man8/grub2-set*password* +%exclude %{_datadir}/man/man1/grub2-editenv* +%exclude %{_datadir}/man/man1/grub2-mkpasswd-* +%exclude %{_datadir}/man/man8/grub2-macbless* +%exclude %{_datadir}/man/man1/grub2-render-label* %if %{with_legacy_arch} -%{_sbindir}/%{name}-install +%{_sbindir}/grub2-install %ifarch x86_64 -%{_sbindir}/%{name}-bios-setup +%{_sbindir}/grub2-bios-setup %else -%exclude %{_sbindir}/%{name}-bios-setup -%exclude %{_datadir}/man/man8/%{name}-bios-setup* +%exclude %{_sbindir}/grub2-bios-setup +%exclude %{_datadir}/man/man8/grub2-bios-setup* %endif %ifarch %{sparc} -%{_sbindir}/%{name}-sparc64-setup +%{_sbindir}/grub2-sparc64-setup %else -%exclude %{_sbindir}/%{name}-sparc64-setup -%exclude %{_datadir}/man/man8/%{name}-sparc64-setup* +%exclude %{_sbindir}/grub2-sparc64-setup +%exclude %{_datadir}/man/man8/grub2-sparc64-setup* %endif %ifarch %{sparc} ppc ppc64 ppc64le -%{_sbindir}/%{name}-ofpathname +%{_sbindir}/grub2-ofpathname %else -%exclude %{_sbindir}/%{name}-ofpathname -%exclude %{_datadir}/man/man8/%{name}-ofpathname* +%exclude %{_sbindir}/grub2-ofpathname +%exclude %{_datadir}/man/man8/grub2-ofpathname* %endif %endif %files tools-extra -%{_bindir}/%{name}-fstest -%{_bindir}/%{name}-kbdcomp -%{_bindir}/%{name}-mkfont -%{_bindir}/%{name}-mklayout -%{_bindir}/%{name}-mknetdir +%{_bindir}/grub2-fstest +%{_bindir}/grub2-kbdcomp +%{_bindir}/grub2-mkfont +%{_bindir}/grub2-mklayout +%{_bindir}/grub2-mknetdir %ifnarch %{sparc} -%{_bindir}/%{name}-mkrescue -%{_datadir}/man/man1/%{name}-mkrescue* +%{_bindir}/grub2-mkrescue +%{_datadir}/man/man1/grub2-mkrescue* %else -%exclude %{_datadir}/man/man1/%{name}-mkrescue* +%exclude %{_datadir}/man/man1/grub2-mkrescue* %endif -%{_bindir}/%{name}-mkstandalone -%{_bindir}/%{name}-syslinux2cfg +%{_bindir}/grub2-mkstandalone +%{_bindir}/grub2-syslinux2cfg %{_sysconfdir}/sysconfig/grub -%{_datadir}/man/man1/%{name}-fstest* -%{_datadir}/man/man1/%{name}-kbdcomp* -%{_datadir}/man/man1/%{name}-mkfont* -%{_datadir}/man/man1/%{name}-mklayout* -%{_datadir}/man/man1/%{name}-mknetdir* -%{_datadir}/man/man1/%{name}-mkstandalone* -%{_datadir}/man/man1/%{name}-syslinux2cfg* -%exclude %{_bindir}/%{name}-glue-efi -%exclude %{_sbindir}/%{name}-sparc64-setup -%exclude %{_sbindir}/%{name}-ofpathname -%exclude %{_datadir}/man/man1/%{name}-glue-efi* -%exclude %{_datadir}/man/man8/%{name}-ofpathname* -%exclude %{_datadir}/man/man8/%{name}-sparc64-setup* +%{_datadir}/man/man1/grub2-fstest* +%{_datadir}/man/man1/grub2-kbdcomp* +%{_datadir}/man/man1/grub2-mkfont* +%{_datadir}/man/man1/grub2-mklayout* +%{_datadir}/man/man1/grub2-mknetdir* +%{_datadir}/man/man1/grub2-mkstandalone* +%{_datadir}/man/man1/grub2-syslinux2cfg* +%exclude %{_bindir}/grub2-glue-efi +%exclude %{_sbindir}/grub2-sparc64-setup +%exclude %{_sbindir}/grub2-ofpathname +%exclude %{_datadir}/man/man1/grub2-glue-efi* +%exclude %{_datadir}/man/man8/grub2-ofpathname* +%exclude %{_datadir}/man/man8/grub2-sparc64-setup* %exclude %{_datarootdir}/grub/themes/starfield %if 0%{with_efi_arch} @@ -520,8 +520,8 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %if 0%{with_emu_arch} %files emu -%{_bindir}/%{name}-emu* -%{_datadir}/man/man1/%{name}-emu* +%{_bindir}/grub2-emu* +%{_datadir}/man/man1/grub2-emu* %files emu-modules %{_libdir}/grub/%{emuarch}-emu/* commit 1d98b5f26098166435e0e85c3b887000fe6e3961 Author: Robbie Harwood <rharwood(a)redhat.com> Date: Mon Apr 18 17:50:28 2022 +0000 Fix permission change report from rpm verification on grub.cfg Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> diff --git a/grub.macros b/grub.macros index d1ac1dc..ff58cec 100644 --- a/grub.macros +++ b/grub.macros @@ -592,7 +592,7 @@ ln -s ../boot/%{name}/grub.cfg \\\ %{expand:%%files %{1}} \ %defattr(-,root,root,-) \ %config(noreplace) %{_sysconfdir}/%{name}.cfg \ -%ghost %config(noreplace) /boot/%{name}/grub.cfg \ +%ghost %config(noreplace) %attr(0700,root,root)/boot/%{name}/grub.cfg \ %dir %attr(0700,root,root)/boot/loader/entries \ %attr(0644,root,root) %config(noreplace) /etc/dnf/protected.d/%{name}-%{1}.conf \ \ @@ -620,7 +620,7 @@ ln -s ../boot/%{name}/grub.cfg \\\ %endif \ %attr(0700,root,root)/boot/%{name}/fonts \ %dir %attr(0700,root,root)/boot/loader/entries \ -%ghost %config(noreplace) /boot/%{name}/grub.cfg \ +%ghost %config(noreplace) %attr(0700,root,root)/boot/%{name}/grub.cfg \ %ghost %config(noreplace) %attr(0700,root,root)%{efi_esp_dir}/grub.cfg \ %config(noreplace) %verify(not size mode md5 mtime) /boot/grub2/grubenv \ %attr(0644,root,root) %config(noreplace) /etc/dnf/protected.d/%{name}-%{1}.conf \ diff --git a/grub2.spec b/grub2.spec index 906296e..704efdc 100644 --- a/grub2.spec +++ b/grub2.spec @@ -17,7 +17,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -529,6 +529,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Mon Apr 18 2022 Robbie Harwood <rharwood(a)redhat.com> - 2.06-36 +- Fix permission change report from rpm verification on grub.cfg + * Wed Apr 13 2022 Robbie Harwood <rharwood(a)redhat.com> - 2.06-35 - Enable "read" module - Resolves: #2071644 commit 6c2cc464515fdd21bc934e0b4c3109c7cdc2448f Author: Robbie Harwood <rharwood(a)redhat.com> Date: Wed Apr 13 15:13:22 2022 +0000 Enable "read" module Resolves: #2071644 Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> diff --git a/grub.macros b/grub.macros index 037230d..d1ac1dc 100644 --- a/grub.macros +++ b/grub.macros @@ -416,7 +416,7 @@ GRUB_MODULES=" all_video boot blscfg btrfs \\\ loadenv loopback linux lvm lsefi lsefimmap luks \\\ luks2 mdraid09 mdraid1x minicmd net \\\ normal part_apple part_msdos part_gpt \\\ - password_pbkdf2 pgp png reboot \\\ + password_pbkdf2 pgp png read reboot \\\ regexp search search_fs_uuid search_fs_file \\\ search_label serial sleep syslinuxcfg test tftp \\\ version video xfs zstd " \ diff --git a/grub2.spec b/grub2.spec index c4cffaf..906296e 100644 --- a/grub2.spec +++ b/grub2.spec @@ -17,7 +17,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -529,6 +529,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Wed Apr 13 2022 Robbie Harwood <rharwood(a)redhat.com> - 2.06-35 +- Enable "read" module +- Resolves: #2071644 + * Tue Apr 12 2022 Robbie Harwood <rharwood(a)redhat.com> - 2.06-34 - Bump for requirements updates; no code changes commit 2e106f9a3e56545d02b768a43e90247659048ddf Author: Robbie Harwood <rharwood(a)redhat.com> Date: Tue Apr 12 14:42:54 2022 -0400 Drop use of which and update requirements Original patches by Zbigniew Jędrzejewski-Szmek. Merges: #16 Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> diff --git a/0059-Add-BLS-support-to-grub-mkconfig.patch b/0059-Add-BLS-support-to-grub-mkconfig.patch index ccdd403..ba68046 100644 --- a/0059-Add-BLS-support-to-grub-mkconfig.patch +++ b/0059-Add-BLS-support-to-grub-mkconfig.patch @@ -131,7 +131,7 @@ index fafeac950..d8bb40693 100644 fi IFS="$old_ifs" diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 7bb3a211a..9fcd77cac 100644 +index 7bb3a211a..f1548a260 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -82,6 +82,218 @@ case x"$GRUB_FS" in @@ -248,7 +248,7 @@ index 7bb3a211a..9fcd77cac 100644 +} + +# Make BLS the default if GRUB_ENABLE_BLSCFG was not set and grubby is not installed. -+if [ -z "${GRUB_ENABLE_BLSCFG}" ] && [ -z "$(which new-kernel-pkg 2> /dev/null)" ]; then ++if [ -z "${GRUB_ENABLE_BLSCFG}" ] && ! command -v new-kernel-pkg >/dev/null; then + GRUB_ENABLE_BLSCFG="true" +fi + diff --git a/0062-Add-grub2-switch-to-blscfg.patch b/0062-Add-grub2-switch-to-blscfg.patch index bc1ac3f..e353259 100644 --- a/0062-Add-grub2-switch-to-blscfg.patch +++ b/0062-Add-grub2-switch-to-blscfg.patch @@ -381,7 +381,7 @@ index 000000000..a851424be +# Bye. +exit 0 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 9fcd77cac..70d56518b 100644 +index f1548a260..c02c1f082 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -138,7 +138,7 @@ blsdir="/boot/loader/entries" diff --git a/0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch b/0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch index ab236fc..074d650 100644 --- a/0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch +++ b/0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch @@ -20,7 +20,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 70d56518b..f8e868b6c 100644 +index c02c1f082..6af84b44e 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -256,7 +256,9 @@ if [ -z "\${kernelopts}" ]; then diff --git a/grub2.spec b/grub2.spec index 6ba76e7..c4cffaf 100644 --- a/grub2.spec +++ b/grub2.spec @@ -17,7 +17,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -84,7 +84,9 @@ hardware devices.\ Summary: grub2 common layout BuildArch: noarch Conflicts: grubby < 8.40-18 -Requires(post): util-linux +Requires(posttrans): util-linux-core +Requires(posttrans): coreutils +Requires(posttrans): grep %description common This package provides some directories which are required by various grub2 @@ -94,9 +96,10 @@ subpackages. Summary: Support tools for GRUB. Obsoletes: %{name}-tools < %{evr} Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: gettext os-prober which file +Requires: gettext os-prober file Requires(pre): dracut -Requires(post): dracut +Requires(pre): grep +Requires(pre): sed %description tools %{desc} @@ -105,7 +108,7 @@ This subpackage provides tools for support of all platforms. %ifarch x86_64 %package tools-efi Summary: Support tools for GRUB. -Requires: gettext os-prober which file +Requires: gettext os-prober file Requires: %{name}-common = %{epoch}:%{version}-%{release} Obsoletes: %{name}-tools < %{evr} @@ -126,7 +129,7 @@ This subpackage provides tools for support of all platforms. %package tools-extra Summary: Support tools for GRUB. -Requires: gettext os-prober which file +Requires: gettext os-prober file Requires: %{name}-tools-minimal = %{epoch}:%{version}-%{release} Requires: %{name}-common = %{epoch}:%{version}-%{release} Obsoletes: %{name}-tools < %{evr} @@ -526,6 +529,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Tue Apr 12 2022 Robbie Harwood <rharwood(a)redhat.com> - 2.06-34 +- Bump for requirements updates; no code changes + * Thu Mar 31 2022 Robbie Harwood <rharwood(a)redhat.com> - 1:2.06-33 - Drop i32 build for real this time commit d17f80cfd556d8a582756ee393361f6d203f2d77 Author: Robbie Harwood <rharwood(a)redhat.com> Date: Fri Apr 1 13:50:04 2022 -0400 Update rpminspect configuration Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> diff --git a/rpminspect.yaml b/rpminspect.yaml index 015af4e..e05d04c 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -9,9 +9,6 @@ inspections: patches: off upstream: off - # https://bugzilla.redhat.com/show_bug.cgi?id=2007427 - manpage: off - # https://bugzilla.redhat.com/show_bug.cgi?id=2007428 elf: off @@ -20,3 +17,6 @@ inspections: # https://bugzilla.redhat.com/show_bug.cgi?id=2007431 permissions: off + + # https://bugzilla.redhat.com/show_bug.cgi?id=2007431 + addedfiles: off commit eeff7639b35c67554e65de4d618967fec93c39c4 Author: Robbie Harwood <rharwood(a)redhat.com> Date: Thu Mar 31 21:23:48 2022 +0000 Drop i32 build for real this time Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> diff --git a/grub.macros b/grub.macros index 4162b82..037230d 100644 --- a/grub.macros +++ b/grub.macros @@ -226,8 +226,8 @@ %ifarch x86_64 %global with_efi_common 1 -%global with_legacy_modules 0 -%global with_legacy_common 0 +%global with_legacy_modules 1 +%global with_legacy_common 1 %else %global with_efi_common 0 %global with_legacy_common 1 diff --git a/grub2.spec b/grub2.spec index 789399e..6ba76e7 100644 --- a/grub2.spec +++ b/grub2.spec @@ -17,7 +17,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -58,7 +58,7 @@ BuildRequires: pesign >= 0.99-8 BuildRequires: ccache %endif -ExcludeArch: s390 s390x +ExcludeArch: s390 s390x %{ix86} Obsoletes: %{name} <= %{evr} %if 0%{with_legacy_arch} @@ -526,6 +526,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Thu Mar 31 2022 Robbie Harwood <rharwood(a)redhat.com> - 1:2.06-33 +- Drop i32 build for real this time + * Thu Mar 31 2022 Robbie Harwood <rharwood(a)redhat.com> - 1:2.06-32 - Switch to upstream man pages commit bd73b85ea3356cbeac4afd7095ebf923c60ab7a3 Author: Robbie Harwood <rharwood(a)redhat.com> Date: Thu Mar 31 21:21:43 2022 +0000 Switch to upstream man pages Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> diff --git a/0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch b/0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch index fcc7825..3ddefe6 100644 --- a/0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch +++ b/0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch @@ -10,7 +10,7 @@ This reverts commit 722737630889607c3b5761f1f5a48f1674cd2821. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in -index 5984e92d291..94622481284 100644 +index 5984e92d2..946224812 100644 --- a/util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in @@ -36,7 +36,7 @@ if ! command -v os-prober > /dev/null || ! command -v linux-boot-prober > /dev/n diff --git a/0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch b/0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch index 4187765..5429c42 100644 --- a/0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch +++ b/0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch @@ -10,7 +10,7 @@ This reverts commit 54e0a1bbf1e9106901a557195bb35e5e20fb3925. 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index f8cbb8d7a2b..d3e879b8e5c 100644 +index f8cbb8d7a..d3e879b8e 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -140,9 +140,6 @@ GRUB_DEVICE_PARTUUID="`${grub_probe} --device ${GRUB_DEVICE} --target=partuuid 2 @@ -40,7 +40,7 @@ index f8cbb8d7a2b..d3e879b8e5c 100644 GRUB_SAVEDEFAULT \ GRUB_ENABLE_CRYPTODISK \ diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in -index 94622481284..80685b15f4d 100644 +index 946224812..80685b15f 100644 --- a/util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in @@ -26,8 +26,8 @@ export TEXTDOMAINDIR="@localedir@" diff --git a/0003-Revert-templates-Disable-the-os-prober-by-default.patch b/0003-Revert-templates-Disable-the-os-prober-by-default.patch index 68cacfc..4e4dc55 100644 --- a/0003-Revert-templates-Disable-the-os-prober-by-default.patch +++ b/0003-Revert-templates-Disable-the-os-prober-by-default.patch @@ -10,7 +10,7 @@ This reverts commit e346414725a70e5c74ee87ca14e580c66f517666. 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/docs/grub.texi b/docs/grub.texi -index f8b4b3b21a7..69f08d289f9 100644 +index f8b4b3b21..69f08d289 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -1519,13 +1519,10 @@ boot sequence. If you have problems, set this option to @samp{text} and @@ -46,7 +46,7 @@ index f8b4b3b21a7..69f08d289f9 100644 First create a separate GRUB partition, big enough to hold GRUB. Some of the following entries show how to load OS installer images from this same partition, diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in -index 80685b15f4d..1b91c102f35 100644 +index 80685b15f..1b91c102f 100644 --- a/util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in @@ -26,8 +26,7 @@ export TEXTDOMAINDIR="@localedir@" diff --git a/0004-Add-support-for-Linux-EFI-stub-loading.patch b/0004-Add-support-for-Linux-EFI-stub-loading.patch index 73d231a..bdd7dde 100644 --- a/0004-Add-support-for-Linux-EFI-stub-loading.patch +++ b/0004-Add-support-for-Linux-EFI-stub-loading.patch @@ -44,7 +44,7 @@ moves the check into grub_dl_load_file. create mode 100644 include/grub/efi/linux.h diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 8022e1c0a79..45d3edaa4dc 100644 +index 8022e1c0a..45d3edaa4 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -1734,13 +1734,6 @@ module = { @@ -88,7 +88,7 @@ index 8022e1c0a79..45d3edaa4dc 100644 module = { diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c -index 48f8a79073d..b7149370950 100644 +index 48f8a7907..b71493709 100644 --- a/grub-core/kern/dl.c +++ b/grub-core/kern/dl.c @@ -38,6 +38,14 @@ @@ -127,7 +127,7 @@ index 48f8a79073d..b7149370950 100644 file = grub_file_open (filename, GRUB_FILE_TYPE_GRUB_MODULE); diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 8cff7be0289..35b8f670602 100644 +index 8cff7be02..35b8f6706 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -286,6 +286,34 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, @@ -166,7 +166,7 @@ index 8cff7be0289..35b8f670602 100644 /* Search the mods section from the PE32/PE32+ image. This code uses diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c -index 9838fb2f50d..f6aef0ef649 100644 +index 9838fb2f5..f6aef0ef6 100644 --- a/grub-core/kern/efi/mm.c +++ b/grub-core/kern/efi/mm.c @@ -113,6 +113,38 @@ grub_efi_drop_alloc (grub_efi_physical_address_t address, @@ -209,7 +209,7 @@ index 9838fb2f50d..f6aef0ef649 100644 void * grub_efi_allocate_pages_real (grub_efi_physical_address_t address, diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c -index ef3e9f9444c..a312c668685 100644 +index ef3e9f944..a312c6686 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -29,6 +29,7 @@ @@ -390,7 +390,7 @@ index ef3e9f9444c..a312c668685 100644 linux_args = grub_malloc (cmdline_size); if (!linux_args) diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c -index 22cc25eccd9..d9b7a9ba400 100644 +index 22cc25ecc..d9b7a9ba4 100644 --- a/grub-core/loader/arm64/xen_boot.c +++ b/grub-core/loader/arm64/xen_boot.c @@ -266,7 +266,6 @@ xen_boot (void) @@ -403,7 +403,7 @@ index 22cc25eccd9..d9b7a9ba400 100644 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c new file mode 100644 -index 00000000000..c24202a5dd1 +index 000000000..c24202a5d --- /dev/null +++ b/grub-core/loader/efi/linux.c @@ -0,0 +1,70 @@ @@ -479,7 +479,7 @@ index 00000000000..c24202a5dd1 +#pragma GCC diagnostic pop diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c new file mode 100644 -index 00000000000..bb2616a8092 +index 000000000..bb2616a80 --- /dev/null +++ b/grub-core/loader/i386/efi/linux.c @@ -0,0 +1,335 @@ @@ -819,7 +819,7 @@ index 00000000000..bb2616a8092 + grub_unregister_command (cmd_initrdefi); +} diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c -index 2a299520160..8be4c3b3f48 100644 +index 2a2995201..8be4c3b3f 100644 --- a/grub-core/loader/i386/pc/linux.c +++ b/grub-core/loader/i386/pc/linux.c @@ -474,14 +474,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), @@ -853,7 +853,7 @@ index 2a299520160..8be4c3b3f48 100644 + grub_unregister_command (cmd_initrd16); } diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h -index bcd5a7eb186..b582f67f661 100644 +index bcd5a7eb1..b582f67f6 100644 --- a/include/grub/arm/linux.h +++ b/include/grub/arm/linux.h @@ -20,6 +20,7 @@ @@ -883,7 +883,7 @@ index bcd5a7eb186..b582f67f661 100644 #if defined GRUB_MACHINE_UBOOT diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h -index 7e22b4ab699..ea030312df3 100644 +index 7e22b4ab6..ea030312d 100644 --- a/include/grub/arm64/linux.h +++ b/include/grub/arm64/linux.h @@ -19,6 +19,7 @@ @@ -913,7 +913,7 @@ index 7e22b4ab699..ea030312df3 100644 #endif /* ! GRUB_ARM64_LINUX_HEADER */ diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h -index 83d958f9945..6295df85f3f 100644 +index 83d958f99..6295df85f 100644 --- a/include/grub/efi/efi.h +++ b/include/grub/efi/efi.h @@ -47,6 +47,9 @@ EXPORT_FUNC(grub_efi_allocate_fixed) (grub_efi_physical_address_t address, @@ -946,7 +946,7 @@ index 83d958f9945..6295df85f3f 100644 grub_addr_t grub_efi_modules_addr (void); diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h new file mode 100644 -index 00000000000..d9ede36773b +index 000000000..d9ede3677 --- /dev/null +++ b/include/grub/efi/linux.h @@ -0,0 +1,31 @@ diff --git a/0005-Rework-linux-command.patch b/0005-Rework-linux-command.patch index 9954dd0..6f5f879 100644 --- a/0005-Rework-linux-command.patch +++ b/0005-Rework-linux-command.patch @@ -13,7 +13,7 @@ Signed-off-by: Matthew Garrett <mjg59(a)coreos.com> 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c -index 9f74a96b19a..dccf3bb3005 100644 +index 9f74a96b1..dccf3bb30 100644 --- a/grub-core/loader/i386/linux.c +++ b/grub-core/loader/i386/linux.c @@ -649,13 +649,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), diff --git a/0006-Rework-linux16-command.patch b/0006-Rework-linux16-command.patch index 2c2d6f0..63b1ad3 100644 --- a/0006-Rework-linux16-command.patch +++ b/0006-Rework-linux16-command.patch @@ -13,7 +13,7 @@ Signed-off-by: Matthew Garrett <mjg59(a)coreos.com> 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c -index 8be4c3b3f48..4b1750e360e 100644 +index 8be4c3b3f..4b1750e36 100644 --- a/grub-core/loader/i386/pc/linux.c +++ b/grub-core/loader/i386/pc/linux.c @@ -124,13 +124,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), diff --git a/0007-Add-secureboot-support-on-efi-chainloader.patch b/0007-Add-secureboot-support-on-efi-chainloader.patch index 6826cce..065d506 100644 --- a/0007-Add-secureboot-support-on-efi-chainloader.patch +++ b/0007-Add-secureboot-support-on-efi-chainloader.patch @@ -190,7 +190,7 @@ Signed-off-by: David Abdurachmanov <david.abdurachmanov(a)sifive.com> 7 files changed, 844 insertions(+), 90 deletions(-) diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 35b8f670602..4a2259aa1c7 100644 +index 35b8f6706..4a2259aa1 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -296,14 +296,20 @@ grub_efi_secure_boot (void) @@ -219,7 +219,7 @@ index 35b8f670602..4a2259aa1c7 100644 if (*secure_boot && !*setup_mode) ret = 1; diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c -index a312c668685..04994d5c67d 100644 +index a312c6686..04994d5c6 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -284,6 +284,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), @@ -241,7 +241,7 @@ index a312c668685..04994d5c67d 100644 grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"), argv[0]); goto fail; diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index 2bd80f4db3d..e6a8d4ad0e9 100644 +index 2bd80f4db..e6a8d4ad0 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -32,6 +32,8 @@ @@ -1184,7 +1184,7 @@ index 2bd80f4db3d..e6a8d4ad0e9 100644 return grub_errno; diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c -index c24202a5dd1..c8ecce6dfd0 100644 +index c24202a5d..c8ecce6df 100644 --- a/grub-core/loader/efi/linux.c +++ b/grub-core/loader/efi/linux.c @@ -33,21 +33,34 @@ struct grub_efi_shim_lock @@ -1229,7 +1229,7 @@ index c24202a5dd1..c8ecce6dfd0 100644 #pragma GCC diagnostic push diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index bb2616a8092..6b24cbb9483 100644 +index bb2616a80..6b24cbb94 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -117,6 +117,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), @@ -1297,7 +1297,7 @@ index bb2616a8092..6b24cbb9483 100644 grub_file_close (file); diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h -index d9ede36773b..0033d9305a9 100644 +index d9ede3677..0033d9305 100644 --- a/include/grub/efi/linux.h +++ b/include/grub/efi/linux.h @@ -22,7 +22,7 @@ @@ -1310,7 +1310,7 @@ index d9ede36773b..0033d9305a9 100644 grub_err_t EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset, diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h -index 0ed8781f037..a43adf27464 100644 +index 0ed8781f0..a43adf274 100644 --- a/include/grub/efi/pe32.h +++ b/include/grub/efi/pe32.h @@ -223,7 +223,11 @@ struct grub_pe64_optional_header diff --git a/0008-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch b/0008-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch index 030c71c..3f53d8b 100644 --- a/0008-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch +++ b/0008-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch @@ -32,7 +32,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> create mode 100644 include/grub/sparc64/linux.h diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c -index 584baec8f91..7b2999b14b5 100644 +index 584baec8f..7b2999b14 100644 --- a/grub-core/commands/iorw.c +++ b/grub-core/commands/iorw.c @@ -24,6 +24,7 @@ @@ -64,7 +64,7 @@ index 584baec8f91..7b2999b14b5 100644 grub_unregister_extcmd (cmd_read_word); grub_unregister_extcmd (cmd_read_dword); diff --git a/grub-core/commands/memrw.c b/grub-core/commands/memrw.c -index d401a6db0ef..39cf3a06dbd 100644 +index d401a6db0..39cf3a06d 100644 --- a/grub-core/commands/memrw.c +++ b/grub-core/commands/memrw.c @@ -23,6 +23,7 @@ @@ -96,7 +96,7 @@ index d401a6db0ef..39cf3a06dbd 100644 grub_unregister_extcmd (cmd_read_word); grub_unregister_extcmd (cmd_read_dword); diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c -index b7149370950..7afb9e6f724 100644 +index b71493709..7afb9e6f7 100644 --- a/grub-core/kern/dl.c +++ b/grub-core/kern/dl.c @@ -32,6 +32,7 @@ @@ -117,7 +117,7 @@ index b7149370950..7afb9e6f724 100644 #if 0 /* This is an error, but grub2-mkconfig still generates a pile of diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 4a2259aa1c7..8cff7be0289 100644 +index 4a2259aa1..8cff7be02 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -286,40 +286,6 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, @@ -162,7 +162,7 @@ index 4a2259aa1c7..8cff7be0289 100644 /* Search the mods section from the PE32/PE32+ image. This code uses diff --git a/grub-core/loader/efi/appleloader.c b/grub-core/loader/efi/appleloader.c -index 74888c463ba..585f2b57385 100644 +index 74888c463..585f2b573 100644 --- a/grub-core/loader/efi/appleloader.c +++ b/grub-core/loader/efi/appleloader.c @@ -24,6 +24,7 @@ @@ -193,7 +193,7 @@ index 74888c463ba..585f2b57385 100644 grub_unregister_command (cmd); } diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index e6a8d4ad0e9..07c4937898d 100644 +index e6a8d4ad0..07c493789 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -34,6 +34,7 @@ @@ -205,7 +205,7 @@ index e6a8d4ad0e9..07c4937898d 100644 #include <grub/i18n.h> #include <grub/net.h> diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c -index 5f3290ce17b..54befc26626 100644 +index 5f3290ce1..54befc266 100644 --- a/grub-core/loader/i386/bsd.c +++ b/grub-core/loader/i386/bsd.c @@ -40,6 +40,7 @@ @@ -237,7 +237,7 @@ index 5f3290ce17b..54befc26626 100644 grub_unregister_extcmd (cmd_openbsd); grub_unregister_extcmd (cmd_netbsd); diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c -index dccf3bb3005..4aeb0e4b9a6 100644 +index dccf3bb30..4aeb0e4b9 100644 --- a/grub-core/loader/i386/linux.c +++ b/grub-core/loader/i386/linux.c @@ -37,6 +37,7 @@ @@ -269,7 +269,7 @@ index dccf3bb3005..4aeb0e4b9a6 100644 grub_unregister_command (cmd_initrd); } diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c -index 4b1750e360e..e3fa1221e81 100644 +index 4b1750e36..e3fa1221e 100644 --- a/grub-core/loader/i386/pc/linux.c +++ b/grub-core/loader/i386/pc/linux.c @@ -36,6 +36,7 @@ @@ -301,7 +301,7 @@ index 4b1750e360e..e3fa1221e81 100644 grub_unregister_command (cmd_linux16); grub_unregister_command (cmd_initrd); diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c -index facb13f3d36..47e481f4576 100644 +index facb13f3d..47e481f45 100644 --- a/grub-core/loader/multiboot.c +++ b/grub-core/loader/multiboot.c @@ -50,6 +50,7 @@ @@ -333,7 +333,7 @@ index facb13f3d36..47e481f4576 100644 grub_unregister_command (cmd_module); } diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c -index 1c0cf6a430a..baa54e652ab 100644 +index 1c0cf6a43..baa54e652 100644 --- a/grub-core/loader/xnu.c +++ b/grub-core/loader/xnu.c @@ -35,6 +35,7 @@ @@ -365,7 +365,7 @@ index 1c0cf6a430a..baa54e652ab 100644 grub_unregister_command (cmd_resume); #endif diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h -index 6295df85f3f..585fa6662b6 100644 +index 6295df85f..585fa6662 100644 --- a/include/grub/efi/efi.h +++ b/include/grub/efi/efi.h @@ -91,7 +91,6 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var, @@ -378,13 +378,13 @@ index 6295df85f3f..585fa6662b6 100644 const grub_efi_device_path_t *dp2); diff --git a/include/grub/ia64/linux.h b/include/grub/ia64/linux.h new file mode 100644 -index 00000000000..e69de29bb2d +index 000000000..e69de29bb diff --git a/include/grub/mips/linux.h b/include/grub/mips/linux.h new file mode 100644 -index 00000000000..e69de29bb2d +index 000000000..e69de29bb diff --git a/include/grub/powerpc/linux.h b/include/grub/powerpc/linux.h new file mode 100644 -index 00000000000..e69de29bb2d +index 000000000..e69de29bb diff --git a/include/grub/sparc64/linux.h b/include/grub/sparc64/linux.h new file mode 100644 -index 00000000000..e69de29bb2d +index 000000000..e69de29bb diff --git a/0009-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch b/0009-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch index f3aae38..dc54e2d 100644 --- a/0009-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch +++ b/0009-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch @@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 3 files changed, 89 insertions(+), 37 deletions(-) diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c -index c8ecce6dfd0..0622dfa48d4 100644 +index c8ecce6df..0622dfa48 100644 --- a/grub-core/loader/efi/linux.c +++ b/grub-core/loader/efi/linux.c @@ -69,12 +69,17 @@ grub_linuxefi_secure_validate (void *data, grub_uint32_t size) @@ -37,7 +37,7 @@ index c8ecce6dfd0..0622dfa48d4 100644 return GRUB_ERR_BUG; diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index 6b24cbb9483..3017d0f3e52 100644 +index 6b24cbb94..3017d0f3e 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -44,14 +44,10 @@ static char *linux_cmdline; @@ -245,7 +245,7 @@ index 6b24cbb9483..3017d0f3e52 100644 if (kernel_mem && !loaded) grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem, diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h -index eddf9251d9a..25ef52c04eb 100644 +index eddf9251d..25ef52c04 100644 --- a/include/grub/i386/linux.h +++ b/include/grub/i386/linux.h @@ -138,7 +138,12 @@ struct linux_i386_kernel_header diff --git a/0010-re-write-.gitignore.patch b/0010-re-write-.gitignore.patch index 74cb0da..af1859c 100644 --- a/0010-re-write-.gitignore.patch +++ b/0010-re-write-.gitignore.patch @@ -20,7 +20,7 @@ Subject: [PATCH] re-write .gitignore create mode 100644 util/bash-completion.d/.gitignore diff --git a/.gitignore b/.gitignore -index f6a1bd05175..594d0134d33 100644 +index f6a1bd051..594d0134d 100644 --- a/.gitignore +++ b/.gitignore @@ -275,3 +275,155 @@ widthspec.bin @@ -181,7 +181,7 @@ index f6a1bd05175..594d0134d33 100644 +/widthspec.h diff --git a/docs/.gitignore b/docs/.gitignore new file mode 100644 -index 00000000000..e1d849ef95b +index 000000000..e1d849ef9 --- /dev/null +++ b/docs/.gitignore @@ -0,0 +1,5 @@ @@ -192,7 +192,7 @@ index 00000000000..e1d849ef95b +/version*.texi diff --git a/grub-core/.gitignore b/grub-core/.gitignore new file mode 100644 -index 00000000000..2acce281159 +index 000000000..2acce2811 --- /dev/null +++ b/grub-core/.gitignore @@ -0,0 +1,16 @@ @@ -214,14 +214,14 @@ index 00000000000..2acce281159 +/trigtables.c diff --git a/grub-core/lib/.gitignore b/grub-core/lib/.gitignore new file mode 100644 -index 00000000000..68154591404 +index 000000000..681545914 --- /dev/null +++ b/grub-core/lib/.gitignore @@ -0,0 +1 @@ +/libgcrypt-grub/ diff --git a/include/grub/gcrypt/.gitignore b/include/grub/gcrypt/.gitignore new file mode 100644 -index 00000000000..8fbf5646246 +index 000000000..8fbf56462 --- /dev/null +++ b/include/grub/gcrypt/.gitignore @@ -0,0 +1,2 @@ @@ -229,7 +229,7 @@ index 00000000000..8fbf5646246 +gcrypt.h diff --git a/po/.gitignore b/po/.gitignore new file mode 100644 -index 00000000000..f507e7741e3 +index 000000000..f507e7741 --- /dev/null +++ b/po/.gitignore @@ -0,0 +1,5 @@ @@ -240,7 +240,7 @@ index 00000000000..f507e7741e3 +/stamp-po diff --git a/util/bash-completion.d/.gitignore b/util/bash-completion.d/.gitignore new file mode 100644 -index 00000000000..6813a527ad3 +index 000000000..6813a527a --- /dev/null +++ b/util/bash-completion.d/.gitignore @@ -0,0 +1,2 @@ diff --git a/0011-IBM-client-architecture-CAS-reboot-support.patch b/0011-IBM-client-architecture-CAS-reboot-support.patch index 431a443..cea157b 100644 --- a/0011-IBM-client-architecture-CAS-reboot-support.patch +++ b/0011-IBM-client-architecture-CAS-reboot-support.patch @@ -29,7 +29,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 4 files changed, 91 insertions(+) diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c -index 4d493ab7661..3a6689abb11 100644 +index 4d493ab76..3a6689abb 100644 --- a/grub-core/kern/ieee1275/openfw.c +++ b/grub-core/kern/ieee1275/openfw.c @@ -591,3 +591,66 @@ grub_ieee1275_get_boot_dev (void) @@ -100,7 +100,7 @@ index 4d493ab7661..3a6689abb11 100644 + return 0; +} diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index c4ebe9e22ad..70614de1565 100644 +index c4ebe9e22..70614de15 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -34,6 +34,9 @@ @@ -137,7 +137,7 @@ index c4ebe9e22ad..70614de1565 100644 grub_errno = GRUB_ERR_NONE; } diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c -index 25158407dd8..ad80399246a 100644 +index 25158407d..ad8039924 100644 --- a/grub-core/script/execute.c +++ b/grub-core/script/execute.c @@ -28,6 +28,9 @@ @@ -162,7 +162,7 @@ index 25158407dd8..ad80399246a 100644 { char *line; diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h -index 73e2f464475..0a599607f31 100644 +index 73e2f4644..0a599607f 100644 --- a/include/grub/ieee1275/ieee1275.h +++ b/include/grub/ieee1275/ieee1275.h @@ -254,6 +254,8 @@ int EXPORT_FUNC(grub_ieee1275_devalias_next) (struct grub_ieee1275_devalias *ali diff --git a/0012-for-ppc-reset-console-display-attr-when-clear-screen.patch b/0012-for-ppc-reset-console-display-attr-when-clear-screen.patch index c8ccc7e..fa45929 100644 --- a/0012-for-ppc-reset-console-display-attr-when-clear-screen.patch +++ b/0012-for-ppc-reset-console-display-attr-when-clear-screen.patch @@ -17,7 +17,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c -index 85ecf06b4df..05c88dcf49e 100644 +index 85ecf06b4..05c88dcf4 100644 --- a/grub-core/term/terminfo.c +++ b/grub-core/term/terminfo.c @@ -151,7 +151,7 @@ grub_terminfo_set_current (struct grub_term_output *term, diff --git a/0013-Disable-GRUB-video-support-for-IBM-power-machines.patch b/0013-Disable-GRUB-video-support-for-IBM-power-machines.patch index e8aa367..aebfe75 100644 --- a/0013-Disable-GRUB-video-support-for-IBM-power-machines.patch +++ b/0013-Disable-GRUB-video-support-for-IBM-power-machines.patch @@ -15,7 +15,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c -index 20cbbd761ec..04df9d2c667 100644 +index 20cbbd761..04df9d2c6 100644 --- a/grub-core/kern/ieee1275/cmain.c +++ b/grub-core/kern/ieee1275/cmain.c @@ -90,7 +90,10 @@ grub_ieee1275_find_options (void) @@ -31,7 +31,7 @@ index 20cbbd761ec..04df9d2c667 100644 /* Old Macs have no key repeat, newer ones have fully working one. The ones inbetween when repeated key generates an escaoe sequence diff --git a/grub-core/video/ieee1275.c b/grub-core/video/ieee1275.c -index 17a3dbbb575..b8e4b3feb32 100644 +index 17a3dbbb5..b8e4b3feb 100644 --- a/grub-core/video/ieee1275.c +++ b/grub-core/video/ieee1275.c @@ -352,9 +352,12 @@ static struct grub_video_adapter grub_video_ieee1275_adapter = @@ -51,7 +51,7 @@ index 17a3dbbb575..b8e4b3feb32 100644 GRUB_MOD_FINI(ieee1275_fb) diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h -index 0a599607f31..b5a1d49bbc3 100644 +index 0a599607f..b5a1d49bb 100644 --- a/include/grub/ieee1275/ieee1275.h +++ b/include/grub/ieee1275/ieee1275.h @@ -148,6 +148,8 @@ enum grub_ieee1275_flag diff --git a/0014-Move-bash-completion-script-922997.patch b/0014-Move-bash-completion-script-922997.patch index 6bf0b4b..ffc1685 100644 --- a/0014-Move-bash-completion-script-922997.patch +++ b/0014-Move-bash-completion-script-922997.patch @@ -10,7 +10,7 @@ Apparently these go in a new place now. 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 7517fc49d98..8331f95b645 100644 +index 7517fc49d..8331f95b6 100644 --- a/configure.ac +++ b/configure.ac @@ -314,6 +314,14 @@ AC_SUBST(grubdirname) @@ -39,7 +39,7 @@ index 7517fc49d98..8331f95b645 100644 if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then tmp_ac_tool_prefix="$ac_tool_prefix" diff --git a/util/bash-completion.d/Makefile.am b/util/bash-completion.d/Makefile.am -index 136287cf1bf..61108f05429 100644 +index 136287cf1..61108f054 100644 --- a/util/bash-completion.d/Makefile.am +++ b/util/bash-completion.d/Makefile.am @@ -6,7 +6,6 @@ EXTRA_DIST = $(bash_completion_source) diff --git a/0015-Allow-fallback-to-include-entries-by-title-not-just-.patch b/0015-Allow-fallback-to-include-entries-by-title-not-just-.patch index f2a4a82..3141fea 100644 --- a/0015-Allow-fallback-to-include-entries-by-title-not-just-.patch +++ b/0015-Allow-fallback-to-include-entries-by-title-not-just-.patch @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 58 insertions(+), 27 deletions(-) diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c -index 8397886fa05..d7a222e681b 100644 +index 8397886fa..d7a222e68 100644 --- a/grub-core/normal/menu.c +++ b/grub-core/normal/menu.c @@ -163,15 +163,40 @@ grub_menu_set_timeout (int timeout) diff --git a/0016-Make-exit-take-a-return-code.patch b/0016-Make-exit-take-a-return-code.patch index 39d7057..a538154 100644 --- a/0016-Make-exit-take-a-return-code.patch +++ b/0016-Make-exit-take-a-return-code.patch @@ -27,7 +27,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 14 files changed, 48 insertions(+), 21 deletions(-) diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c -index fa498931ed2..2bd3ac76f2d 100644 +index fa498931e..2bd3ac76f 100644 --- a/grub-core/commands/minicmd.c +++ b/grub-core/commands/minicmd.c @@ -182,12 +182,24 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)), @@ -60,7 +60,7 @@ index fa498931ed2..2bd3ac76f2d 100644 } diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 8cff7be0289..05d8237a9b2 100644 +index 8cff7be02..05d8237a9 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -165,11 +165,16 @@ grub_reboot (void) @@ -83,7 +83,7 @@ index 8cff7be0289..05d8237a9b2 100644 } diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c -index 425bb960347..55ea5a11ccd 100644 +index 425bb9603..55ea5a11c 100644 --- a/grub-core/kern/emu/main.c +++ b/grub-core/kern/emu/main.c @@ -67,7 +67,7 @@ grub_reboot (void) @@ -96,7 +96,7 @@ index 425bb960347..55ea5a11ccd 100644 grub_reboot (); } diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c -index dfd8a8ec488..0ff13bcaf8c 100644 +index dfd8a8ec4..0ff13bcaf 100644 --- a/grub-core/kern/emu/misc.c +++ b/grub-core/kern/emu/misc.c @@ -151,9 +151,10 @@ xasprintf (const char *fmt, ...) @@ -113,7 +113,7 @@ index dfd8a8ec488..0ff13bcaf8c 100644 #endif diff --git a/grub-core/kern/i386/coreboot/init.c b/grub-core/kern/i386/coreboot/init.c -index 3314f027fec..36f9134b7b7 100644 +index 3314f027f..36f9134b7 100644 --- a/grub-core/kern/i386/coreboot/init.c +++ b/grub-core/kern/i386/coreboot/init.c @@ -41,7 +41,7 @@ extern grub_uint8_t _end[]; @@ -126,7 +126,7 @@ index 3314f027fec..36f9134b7b7 100644 /* We can't use grub_fatal() in this function. This would create an infinite loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit(). */ diff --git a/grub-core/kern/i386/qemu/init.c b/grub-core/kern/i386/qemu/init.c -index 271b6fbfabd..9fafe98f015 100644 +index 271b6fbfa..9fafe98f0 100644 --- a/grub-core/kern/i386/qemu/init.c +++ b/grub-core/kern/i386/qemu/init.c @@ -42,7 +42,7 @@ extern grub_uint8_t _end[]; @@ -139,7 +139,7 @@ index 271b6fbfabd..9fafe98f015 100644 /* We can't use grub_fatal() in this function. This would create an infinite loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit(). */ diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c -index d483e35eed2..e71d1584164 100644 +index d483e35ee..e71d15841 100644 --- a/grub-core/kern/ieee1275/init.c +++ b/grub-core/kern/ieee1275/init.c @@ -71,7 +71,7 @@ grub_addr_t grub_ieee1275_original_stack; @@ -152,7 +152,7 @@ index d483e35eed2..e71d1584164 100644 grub_ieee1275_exit (); } diff --git a/grub-core/kern/mips/arc/init.c b/grub-core/kern/mips/arc/init.c -index 2ed3ff3191e..5c40c34078d 100644 +index 2ed3ff319..5c40c3407 100644 --- a/grub-core/kern/mips/arc/init.c +++ b/grub-core/kern/mips/arc/init.c @@ -276,7 +276,7 @@ grub_halt (void) @@ -165,7 +165,7 @@ index 2ed3ff3191e..5c40c34078d 100644 GRUB_ARC_FIRMWARE_VECTOR->exit (); diff --git a/grub-core/kern/mips/loongson/init.c b/grub-core/kern/mips/loongson/init.c -index 7b96531b983..dff598ca7b0 100644 +index 7b96531b9..dff598ca7 100644 --- a/grub-core/kern/mips/loongson/init.c +++ b/grub-core/kern/mips/loongson/init.c @@ -304,7 +304,7 @@ grub_halt (void) @@ -178,7 +178,7 @@ index 7b96531b983..dff598ca7b0 100644 grub_halt (); } diff --git a/grub-core/kern/mips/qemu_mips/init.c b/grub-core/kern/mips/qemu_mips/init.c -index be88b77d22d..8b6c55ffc01 100644 +index be88b77d2..8b6c55ffc 100644 --- a/grub-core/kern/mips/qemu_mips/init.c +++ b/grub-core/kern/mips/qemu_mips/init.c @@ -75,7 +75,7 @@ grub_machine_fini (int flags __attribute__ ((unused))) @@ -191,7 +191,7 @@ index be88b77d22d..8b6c55ffc01 100644 grub_halt (); } diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index 3af336ee227..63b586d09cb 100644 +index 3af336ee2..63b586d09 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -1209,9 +1209,18 @@ grub_abort (void) @@ -215,7 +215,7 @@ index 3af336ee227..63b586d09cb 100644 grub_fatal (const char *fmt, ...) { diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c -index 3e338645c57..be2a5be1d07 100644 +index 3e338645c..be2a5be1d 100644 --- a/grub-core/kern/uboot/init.c +++ b/grub-core/kern/uboot/init.c @@ -39,9 +39,9 @@ extern grub_size_t grub_total_module_size; @@ -240,7 +240,7 @@ index 3e338645c57..be2a5be1d07 100644 else if (ver > API_SIG_VERSION) { diff --git a/grub-core/kern/xen/init.c b/grub-core/kern/xen/init.c -index 782ca72952a..708b060f324 100644 +index 782ca7295..708b060f3 100644 --- a/grub-core/kern/xen/init.c +++ b/grub-core/kern/xen/init.c @@ -584,7 +584,7 @@ grub_machine_init (void) @@ -253,7 +253,7 @@ index 782ca72952a..708b060f324 100644 struct sched_shutdown arg; diff --git a/include/grub/misc.h b/include/grub/misc.h -index 7d2b5519690..fd18e6320b8 100644 +index 7d2b55196..fd18e6320 100644 --- a/include/grub/misc.h +++ b/include/grub/misc.h @@ -353,7 +353,7 @@ int EXPORT_FUNC(grub_vsnprintf) (char *str, grub_size_t n, const char *fmt, diff --git a/0017-Make-efi-machines-load-an-env-block-from-a-variable.patch b/0017-Make-efi-machines-load-an-env-block-from-a-variable.patch index d061461..7e702ad 100644 --- a/0017-Make-efi-machines-load-an-env-block-from-a-variable.patch +++ b/0017-Make-efi-machines-load-an-env-block-from-a-variable.patch @@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 45d3edaa4dc..c865a08b027 100644 +index 45d3edaa4..c865a08b0 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -207,6 +207,7 @@ kernel = { @@ -22,7 +22,7 @@ index 45d3edaa4dc..c865a08b027 100644 i386_multiboot = kern/i386/pc/acpi.c; i386_coreboot = kern/acpi.c; diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c -index 7facacf09c7..6d39bd3ad29 100644 +index 7facacf09..6d39bd3ad 100644 --- a/grub-core/kern/efi/init.c +++ b/grub-core/kern/efi/init.c @@ -27,8 +27,11 @@ diff --git a/0018-Migrate-PPC-from-Yaboot-to-Grub2.patch b/0018-Migrate-PPC-from-Yaboot-to-Grub2.patch index 5cbe731..070e4c9 100644 --- a/0018-Migrate-PPC-from-Yaboot-to-Grub2.patch +++ b/0018-Migrate-PPC-from-Yaboot-to-Grub2.patch @@ -15,7 +15,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> create mode 100644 util/grub.d/20_ppc_terminfo.in diff --git a/Makefile.util.def b/Makefile.util.def -index f8b356cc1fa..2c9b283a230 100644 +index f8b356cc1..2c9b283a2 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -508,6 +508,13 @@ script = { @@ -34,7 +34,7 @@ index f8b356cc1fa..2c9b283a230 100644 common = util/grub.d/30_os-prober.in; diff --git a/util/grub.d/20_ppc_terminfo.in b/util/grub.d/20_ppc_terminfo.in new file mode 100644 -index 00000000000..10d66586820 +index 000000000..10d665868 --- /dev/null +++ b/util/grub.d/20_ppc_terminfo.in @@ -0,0 +1,114 @@ diff --git a/0019-Add-fw_path-variable-revised.patch b/0019-Add-fw_path-variable-revised.patch index a8491e8..a1ea381 100644 --- a/0019-Add-fw_path-variable-revised.patch +++ b/0019-Add-fw_path-variable-revised.patch @@ -17,7 +17,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c -index 73967e2f5b0..d1de9fa6873 100644 +index 73967e2f5..d1de9fa68 100644 --- a/grub-core/kern/main.c +++ b/grub-core/kern/main.c @@ -128,16 +128,15 @@ grub_set_prefix_and_root (void) @@ -44,7 +44,7 @@ index 73967e2f5b0..d1de9fa6873 100644 } diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index 70614de1565..62571e6dfcc 100644 +index 70614de15..62571e6df 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -339,7 +339,30 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)), diff --git a/0020-Pass-x-hex-hex-straight-through-unmolested.patch b/0020-Pass-x-hex-hex-straight-through-unmolested.patch index b81abb5..853fcfd 100644 --- a/0020-Pass-x-hex-hex-straight-through-unmolested.patch +++ b/0020-Pass-x-hex-hex-straight-through-unmolested.patch @@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 3 files changed, 75 insertions(+), 9 deletions(-) diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c -index cc3290311f0..8f67a4be7f0 100644 +index cc3290311..8f67a4be7 100644 --- a/grub-core/commands/wildcard.c +++ b/grub-core/commands/wildcard.c @@ -488,6 +488,12 @@ check_file (const char *dir, const char *basename) @@ -47,7 +47,7 @@ index cc3290311f0..8f67a4be7f0 100644 *optr++ = iptr[1]; iptr += 2; diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c -index ed0b149dca5..8e2294d8ff6 100644 +index ed0b149dc..8e2294d8f 100644 --- a/grub-core/lib/cmdline.c +++ b/grub-core/lib/cmdline.c @@ -20,6 +20,12 @@ @@ -97,7 +97,7 @@ index ed0b149dca5..8e2294d8ff6 100644 *buf++ = *c; diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c -index ad80399246a..0c6dd9c5201 100644 +index ad8039924..0c6dd9c52 100644 --- a/grub-core/script/execute.c +++ b/grub-core/script/execute.c @@ -56,6 +56,12 @@ static struct grub_script_scope *scope = 0; diff --git a/0021-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch b/0021-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch index da65e18..78ba64a 100644 --- a/0021-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch +++ b/0021-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch @@ -28,7 +28,7 @@ Signed-off-by: Will Thompson <wjt(a)endlessm.com> create mode 100644 grub-core/commands/loadenv.h diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index c865a08b027..c15e91943b9 100644 +index c865a08b0..c15e91943 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -814,6 +814,16 @@ module = { @@ -58,7 +58,7 @@ index c865a08b027..c15e91943b9 100644 diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c new file mode 100644 -index 00000000000..e907a6a5d28 +index 000000000..e907a6a5d --- /dev/null +++ b/grub-core/commands/blscfg.c @@ -0,0 +1,1177 @@ @@ -1240,7 +1240,7 @@ index 00000000000..e907a6a5d28 + grub_unregister_extcmd (oldcmd); +} diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c -index cc5971f4dbd..782761c31aa 100644 +index cc5971f4d..782761c31 100644 --- a/grub-core/commands/legacycfg.c +++ b/grub-core/commands/legacycfg.c @@ -143,7 +143,7 @@ legacy_file (const char *filename) @@ -1263,7 +1263,7 @@ index cc5971f4dbd..782761c31aa 100644 } diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c -index 3fd664aac33..163b9a09042 100644 +index 3fd664aac..163b9a090 100644 --- a/grub-core/commands/loadenv.c +++ b/grub-core/commands/loadenv.c @@ -28,6 +28,8 @@ @@ -1358,7 +1358,7 @@ index 3fd664aac33..163b9a09042 100644 grub_cmd_load_env (grub_extcmd_context_t ctxt, int argc, char **args) { diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c -index 720e6d8ea3b..b194123eb67 100644 +index 720e6d8ea..b194123eb 100644 --- a/grub-core/commands/menuentry.c +++ b/grub-core/commands/menuentry.c @@ -78,7 +78,7 @@ grub_normal_add_menu_entry (int argc, const char **args, @@ -1430,7 +1430,7 @@ index 720e6d8ea3b..b194123eb67 100644 src[len - 1] = ch; args[argc - 1] = src; diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index 62571e6dfcc..7ca2e5400b1 100644 +index 62571e6df..7ca2e5400 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -21,6 +21,7 @@ @@ -1455,7 +1455,7 @@ index 62571e6dfcc..7ca2e5400b1 100644 grub_free ((void *) entry->title); diff --git a/grub-core/commands/loadenv.h b/grub-core/commands/loadenv.h new file mode 100644 -index 00000000000..952f46121bd +index 000000000..952f46121 --- /dev/null +++ b/grub-core/commands/loadenv.h @@ -0,0 +1,93 @@ @@ -1553,7 +1553,7 @@ index 00000000000..952f46121bd + return 0; +} diff --git a/include/grub/compiler.h b/include/grub/compiler.h -index 8f3be3ae706..ebafec68957 100644 +index 8f3be3ae7..ebafec689 100644 --- a/include/grub/compiler.h +++ b/include/grub/compiler.h @@ -56,4 +56,6 @@ @@ -1564,7 +1564,7 @@ index 8f3be3ae706..ebafec68957 100644 + #endif /* ! GRUB_COMPILER_HEADER */ diff --git a/include/grub/menu.h b/include/grub/menu.h -index ee2b5e91045..0acdc2aa6bf 100644 +index ee2b5e910..0acdc2aa6 100644 --- a/include/grub/menu.h +++ b/include/grub/menu.h @@ -20,6 +20,16 @@ @@ -1595,7 +1595,7 @@ index ee2b5e91045..0acdc2aa6bf 100644 typedef struct grub_menu_entry *grub_menu_entry_t; diff --git a/include/grub/normal.h b/include/grub/normal.h -index 218cbabccaf..8839ad85a19 100644 +index 218cbabcc..8839ad85a 100644 --- a/include/grub/normal.h +++ b/include/grub/normal.h @@ -145,7 +145,7 @@ grub_normal_add_menu_entry (int argc, const char **args, char **classes, diff --git a/0022-Add-devicetree-loading.patch b/0022-Add-devicetree-loading.patch index c0728a9..7d9ac65 100644 --- a/0022-Add-devicetree-loading.patch +++ b/0022-Add-devicetree-loading.patch @@ -20,7 +20,7 @@ Signed-off-by: David A. Marlin <dmarlin(a)redhat.com> 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index d3e879b8e5c..8ea2315ebc2 100644 +index d3e879b8e..8ea2315eb 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -248,7 +248,8 @@ export GRUB_DEFAULT \ @@ -34,7 +34,7 @@ index d3e879b8e5c..8ea2315ebc2 100644 if test "x${grub_cfg}" != "x"; then rm -f "${grub_cfg}.new" diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index e8b01c0d0c7..dc75a1c30bf 100644 +index e8b01c0d0..dc75a1c30 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -153,6 +153,13 @@ EOF diff --git a/0023-Enable-pager-by-default.-985860.patch b/0023-Enable-pager-by-default.-985860.patch index d92fbcc..24f2cbf 100644 --- a/0023-Enable-pager-by-default.-985860.patch +++ b/0023-Enable-pager-by-default.-985860.patch @@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 2 insertions(+) diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index 93a90233ead..858b526c925 100644 +index 93a90233e..858b526c9 100644 --- a/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in @@ -43,6 +43,8 @@ if [ "x${GRUB_DEFAULT_BUTTON}" = "xsaved" ] ; then GRUB_DEFAULT_BUTTON='${saved_ diff --git a/0024-Don-t-say-GNU-Linux-in-generated-menus.patch b/0024-Don-t-say-GNU-Linux-in-generated-menus.patch index f288095..f5c783a 100644 --- a/0024-Don-t-say-GNU-Linux-in-generated-menus.patch +++ b/0024-Don-t-say-GNU-Linux-in-generated-menus.patch @@ -9,7 +9,7 @@ Subject: [PATCH] Don't say "GNU/Linux" in generated menus. 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index dc75a1c30bf..4a499c53a61 100644 +index dc75a1c30..4a499c53a 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@" @@ -25,7 +25,7 @@ index dc75a1c30bf..4a499c53a61 100644 fi diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in -index 3b1f4704921..ada20775a14 100644 +index 3b1f47049..ada20775a 100644 --- a/util/grub.d/20_linux_xen.in +++ b/util/grub.d/20_linux_xen.in @@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@" diff --git a/0025-Add-.eh_frame-to-list-of-relocations-stripped.patch b/0025-Add-.eh_frame-to-list-of-relocations-stripped.patch index ed48c5c..2cdd762 100644 --- a/0025-Add-.eh_frame-to-list-of-relocations-stripped.patch +++ b/0025-Add-.eh_frame-to-list-of-relocations-stripped.patch @@ -8,7 +8,7 @@ Subject: [PATCH] Add .eh_frame to list of relocations stripped 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/Makefile.common b/conf/Makefile.common -index 2a1a886f6d5..191b1a70c6b 100644 +index 2a1a886f6..191b1a70c 100644 --- a/conf/Makefile.common +++ b/conf/Makefile.common @@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding diff --git a/0026-Don-t-require-a-password-to-boot-entries-generated-b.patch b/0026-Don-t-require-a-password-to-boot-entries-generated-b.patch index ac9475e..89d026f 100644 --- a/0026-Don-t-require-a-password-to-boot-entries-generated-b.patch +++ b/0026-Don-t-require-a-password-to-boot-entries-generated-b.patch @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 4a499c53a61..cf8d1186981 100644 +index 4a499c53a..cf8d11869 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -26,7 +26,7 @@ datarootdir="@datarootdir@" diff --git a/0027-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch b/0027-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch deleted file mode 100644 index daa6fae..0000000 --- a/0027-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch +++ /dev/null @@ -1,1959 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Peter Jones <pjones(a)redhat.com> -Date: Tue, 4 Mar 2014 11:00:23 -0500 -Subject: [PATCH] Replace a lot of man pages with slightly nicer ones. - -Replace a bunch of machine generated ones with ones that look nicer. ---- - configure.ac | 23 ++++++ - conf/Makefile.extra-dist | 1 - - docs/Makefile.am | 2 - - docs/man/grub-bios-setup.h2m | 6 -- - docs/man/grub-editenv.h2m | 5 -- - docs/man/grub-emu.h2m | 6 -- - docs/man/grub-file.h2m | 2 - - docs/man/grub-fstest.h2m | 4 - - docs/man/grub-glue-efi.h2m | 4 - - docs/man/grub-install.h2m | 6 -- - docs/man/grub-kbdcomp.h2m | 10 --- - docs/man/grub-macbless.h2m | 4 - - docs/man/grub-macho2img.h2m | 4 - - docs/man/grub-menulst2cfg.h2m | 4 - - docs/man/grub-mkconfig.h2m | 4 - - docs/man/grub-mkfont.h2m | 4 - - docs/man/grub-mkimage.h2m | 6 -- - docs/man/grub-mklayout.h2m | 10 --- - docs/man/grub-mknetdir.h2m | 4 - - docs/man/grub-mkpasswd-pbkdf2.h2m | 4 - - docs/man/grub-mkrelpath.h2m | 4 - - docs/man/grub-mkrescue.h2m | 4 - - docs/man/grub-mkstandalone.h2m | 4 - - docs/man/grub-mount.h2m | 2 - - docs/man/grub-ofpathname.h2m | 4 - - docs/man/grub-pe2elf.h2m | 4 - - docs/man/grub-probe.h2m | 4 - - docs/man/grub-reboot.h2m | 5 -- - docs/man/grub-render-label.h2m | 3 - - docs/man/grub-script-check.h2m | 4 - - docs/man/grub-set-default.h2m | 5 -- - docs/man/grub-sparc64-setup.h2m | 6 -- - docs/man/grub-syslinux2cfg.h2m | 4 - - gentpl.py | 5 +- - util/grub-bios-setup.8 | 54 +++++++++++++ - util/grub-editenv.1 | 46 +++++++++++ - util/grub-file.1 | 165 ++++++++++++++++++++++++++++++++++++++ - util/grub-fstest.1 | 99 +++++++++++++++++++++++ - util/grub-glue-efi.1 | 31 +++++++ - util/grub-install.8 | 128 +++++++++++++++++++++++++++++ - util/grub-kbdcomp.1 | 19 +++++ - util/grub-macbless.1 | 22 +++++ - util/grub-menulst2cfg.1 | 12 +++ - util/grub-mkconfig.8 | 17 ++++ - util/grub-mkfont.1 | 87 ++++++++++++++++++++ - util/grub-mkimage.1 | 95 ++++++++++++++++++++++ - util/grub-mklayout.1 | 27 +++++++ - util/grub-mknetdir.1 | 12 +++ - util/grub-mkpasswd-pbkdf2.1 | 27 +++++++ - util/grub-mkrelpath.1 | 12 +++ - util/grub-mkrescue.1 | 123 ++++++++++++++++++++++++++++ - util/grub-mkstandalone.1 | 100 +++++++++++++++++++++++ - util/grub-ofpathname.8 | 12 +++ - util/grub-probe.8 | 80 ++++++++++++++++++ - util/grub-reboot.8 | 21 +++++ - util/grub-render-label.1 | 51 ++++++++++++ - util/grub-script-check.1 | 21 +++++ - util/grub-set-default.8 | 21 +++++ - util/grub-sparc64-setup.8 | 12 +++ - 59 files changed, 1318 insertions(+), 147 deletions(-) - delete mode 100644 docs/man/grub-bios-setup.h2m - delete mode 100644 docs/man/grub-editenv.h2m - delete mode 100644 docs/man/grub-emu.h2m - delete mode 100644 docs/man/grub-file.h2m - delete mode 100644 docs/man/grub-fstest.h2m - delete mode 100644 docs/man/grub-glue-efi.h2m - delete mode 100644 docs/man/grub-install.h2m - delete mode 100644 docs/man/grub-kbdcomp.h2m - delete mode 100644 docs/man/grub-macbless.h2m - delete mode 100644 docs/man/grub-macho2img.h2m - delete mode 100644 docs/man/grub-menulst2cfg.h2m - delete mode 100644 docs/man/grub-mkconfig.h2m - delete mode 100644 docs/man/grub-mkfont.h2m - delete mode 100644 docs/man/grub-mkimage.h2m - delete mode 100644 docs/man/grub-mklayout.h2m - delete mode 100644 docs/man/grub-mknetdir.h2m - delete mode 100644 docs/man/grub-mkpasswd-pbkdf2.h2m - delete mode 100644 docs/man/grub-mkrelpath.h2m - delete mode 100644 docs/man/grub-mkrescue.h2m - delete mode 100644 docs/man/grub-mkstandalone.h2m - delete mode 100644 docs/man/grub-mount.h2m - delete mode 100644 docs/man/grub-ofpathname.h2m - delete mode 100644 docs/man/grub-pe2elf.h2m - delete mode 100644 docs/man/grub-probe.h2m - delete mode 100644 docs/man/grub-reboot.h2m - delete mode 100644 docs/man/grub-render-label.h2m - delete mode 100644 docs/man/grub-script-check.h2m - delete mode 100644 docs/man/grub-set-default.h2m - delete mode 100644 docs/man/grub-sparc64-setup.h2m - delete mode 100644 docs/man/grub-syslinux2cfg.h2m - create mode 100644 util/grub-bios-setup.8 - create mode 100644 util/grub-editenv.1 - create mode 100644 util/grub-file.1 - create mode 100644 util/grub-fstest.1 - create mode 100644 util/grub-glue-efi.1 - create mode 100644 util/grub-install.8 - create mode 100644 util/grub-kbdcomp.1 - create mode 100644 util/grub-macbless.1 - create mode 100644 util/grub-menulst2cfg.1 - create mode 100644 util/grub-mkconfig.8 - create mode 100644 util/grub-mkfont.1 - create mode 100644 util/grub-mkimage.1 - create mode 100644 util/grub-mklayout.1 - create mode 100644 util/grub-mknetdir.1 - create mode 100644 util/grub-mkpasswd-pbkdf2.1 - create mode 100644 util/grub-mkrelpath.1 - create mode 100644 util/grub-mkrescue.1 - create mode 100644 util/grub-mkstandalone.1 - create mode 100644 util/grub-ofpathname.8 - create mode 100644 util/grub-probe.8 - create mode 100644 util/grub-reboot.8 - create mode 100644 util/grub-render-label.1 - create mode 100644 util/grub-script-check.1 - create mode 100644 util/grub-set-default.8 - create mode 100644 util/grub-sparc64-setup.8 - -diff --git a/configure.ac b/configure.ac -index 8331f95b645..bec8535af70 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -77,6 +77,29 @@ grub_TRANSFORM([grub-set-default]) - grub_TRANSFORM([grub-sparc64-setup]) - grub_TRANSFORM([grub-render-label]) - grub_TRANSFORM([grub-file]) -+grub_TRANSFORM([grub-bios-setup.3]) -+grub_TRANSFORM([grub-editenv.1]) -+grub_TRANSFORM([grub-fstest.3]) -+grub_TRANSFORM([grub-glue-efi.3]) -+grub_TRANSFORM([grub-install.1]) -+grub_TRANSFORM([grub-kbdcomp.3]) -+grub_TRANSFORM([grub-menulst2cfg.1]) -+grub_TRANSFORM([grub-mkconfig.1]) -+grub_TRANSFORM([grub-mkfont.3]) -+grub_TRANSFORM([grub-mkimage.1]) -+grub_TRANSFORM([grub-mklayout.3]) -+grub_TRANSFORM([grub-mknetdir.3]) -+grub_TRANSFORM([grub-mkpasswd-pbkdf2.3]) -+grub_TRANSFORM([grub-mkrelpath.3]) -+grub_TRANSFORM([grub-mkrescue.1]) -+grub_TRANSFORM([grub-mkstandalone.3]) -+grub_TRANSFORM([grub-ofpathname.3]) -+grub_TRANSFORM([grub-probe.3]) -+grub_TRANSFORM([grub-reboot.3]) -+grub_TRANSFORM([grub-render-label.3]) -+grub_TRANSFORM([grub-script-check.3]) -+grub_TRANSFORM([grub-set-default.1]) -+grub_TRANSFORM([grub-sparc64-setup.3]) - - # Optimization flag. Allow user to override. - if test "x$TARGET_CFLAGS" = x; then -diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist -index 8f1485d52a5..b909f2c073a 100644 ---- a/conf/Makefile.extra-dist -+++ b/conf/Makefile.extra-dist -@@ -11,7 +11,6 @@ EXTRA_DIST += unicode - EXTRA_DIST += util/import_gcry.py - EXTRA_DIST += util/import_unicode.py - --EXTRA_DIST += docs/man - EXTRA_DIST += docs/autoiso.cfg - EXTRA_DIST += docs/grub.cfg - EXTRA_DIST += docs/osdetect.cfg -diff --git a/docs/Makefile.am b/docs/Makefile.am -index 93eb3962765..ab28f199694 100644 ---- a/docs/Makefile.am -+++ b/docs/Makefile.am -@@ -5,5 +5,3 @@ info_TEXINFOS = grub.texi grub-dev.texi - grub_TEXINFOS = fdl.texi - - EXTRA_DIST = font_char_metrics.png font_char_metrics.txt -- -- -diff --git a/docs/man/grub-bios-setup.h2m b/docs/man/grub-bios-setup.h2m -deleted file mode 100644 -index ac6ede36296..00000000000 ---- a/docs/man/grub-bios-setup.h2m -+++ /dev/null -@@ -1,6 +0,0 @@ --[NAME] --grub-bios-setup \- set up a device to boot using GRUB --[SEE ALSO] --.BR grub-install (8), --.BR grub-mkimage (1), --.BR grub-mkrescue (1) -diff --git a/docs/man/grub-editenv.h2m b/docs/man/grub-editenv.h2m -deleted file mode 100644 -index 3859d3d4c4f..00000000000 ---- a/docs/man/grub-editenv.h2m -+++ /dev/null -@@ -1,5 +0,0 @@ --[NAME] --grub-editenv \- edit GRUB environment block --[SEE ALSO] --.BR grub-reboot (8), --.BR grub-set-default (8) -diff --git a/docs/man/grub-emu.h2m b/docs/man/grub-emu.h2m -deleted file mode 100644 -index ef1c000656a..00000000000 ---- a/docs/man/grub-emu.h2m -+++ /dev/null -@@ -1,6 +0,0 @@ --[NAME] --grub-emu \- GRUB emulator --[SEE ALSO] --If you are trying to install GRUB, then you should use --.BR grub-install (8) --rather than this program. -diff --git a/docs/man/grub-file.h2m b/docs/man/grub-file.h2m -deleted file mode 100644 -index e09bb4d3101..00000000000 ---- a/docs/man/grub-file.h2m -+++ /dev/null -@@ -1,2 +0,0 @@ --[NAME] --grub-file \- check file type -diff --git a/docs/man/grub-fstest.h2m b/docs/man/grub-fstest.h2m -deleted file mode 100644 -index 9676b159afd..00000000000 ---- a/docs/man/grub-fstest.h2m -+++ /dev/null -@@ -1,4 +0,0 @@ --[NAME] --grub-fstest \- debug tool for GRUB filesystem drivers --[SEE ALSO] --.BR grub-probe (8) -diff --git a/docs/man/grub-glue-efi.h2m b/docs/man/grub-glue-efi.h2m -deleted file mode 100644 -index c1c6ded49ff..00000000000 ---- a/docs/man/grub-glue-efi.h2m -+++ /dev/null -@@ -1,4 +0,0 @@ --[NAME] --grub-glue-efi \- generate a fat binary for EFI --[DESCRIPTION] --grub-glue-efi processes ia32 and amd64 EFI images and glues them according to Apple format. -diff --git a/docs/man/grub-install.h2m b/docs/man/grub-install.h2m -deleted file mode 100644 -index 8cbbc87a0f2..00000000000 ---- a/docs/man/grub-install.h2m -+++ /dev/null -@@ -1,6 +0,0 @@ --[NAME] --grub-install \- install GRUB to a device --[SEE ALSO] --.BR grub-mkconfig (8), --.BR grub-mkimage (1), --.BR grub-mkrescue (1) -diff --git a/docs/man/grub-kbdcomp.h2m b/docs/man/grub-kbdcomp.h2m -deleted file mode 100644 -index d81f9157e01..00000000000 ---- a/docs/man/grub-kbdcomp.h2m -+++ /dev/null -@@ -1,10 +0,0 @@ --[NAME] --grub-kbdcomp \- generate a GRUB keyboard layout file --[DESCRIPTION] --grub-kbdcomp processes a X keyboard layout description in --.BR keymaps (5) --format into a format that can be used by GRUB's --.B keymap --command. --[SEE ALSO] --.BR grub-mklayout (8) -diff --git a/docs/man/grub-macbless.h2m b/docs/man/grub-macbless.h2m -deleted file mode 100644 -index 0197c0087d7..00000000000 ---- a/docs/man/grub-macbless.h2m -+++ /dev/null -@@ -1,4 +0,0 @@ --[NAME] --grub-macbless \- bless a mac file/directory --[SEE ALSO] --.BR grub-install (1) -diff --git a/docs/man/grub-macho2img.h2m b/docs/man/grub-macho2img.h2m -deleted file mode 100644 -index d79aaeed8f9..00000000000 ---- a/docs/man/grub-macho2img.h2m -+++ /dev/null -@@ -1,4 +0,0 @@ --[NAME] --grub-macho2img \- convert Mach-O to raw image --[SEE ALSO] --.BR grub-mkimage (1) -diff --git a/docs/man/grub-menulst2cfg.h2m b/docs/man/grub-menulst2cfg.h2m -deleted file mode 100644 -index c2e0055ed7e..00000000000 ---- a/docs/man/grub-menulst2cfg.h2m -+++ /dev/null -@@ -1,4 +0,0 @@ --[NAME] --grub-menulst2cfg \- transform legacy menu.lst into grub.cfg --[SEE ALSO] --.BR grub-mkconfig (8) -diff --git a/docs/man/grub-mkconfig.h2m b/docs/man/grub-mkconfig.h2m -deleted file mode 100644 -index 9b42f813010..00000000000 ---- a/docs/man/grub-mkconfig.h2m -+++ /dev/null -@@ -1,4 +0,0 @@ --[NAME] --grub-mkconfig \- generate a GRUB configuration file --[SEE ALSO] --.BR grub-install (8) -diff --git a/docs/man/grub-mkfont.h2m b/docs/man/grub-mkfont.h2m -deleted file mode 100644 -index d46fe600eca..00000000000 ---- a/docs/man/grub-mkfont.h2m -+++ /dev/null -@@ -1,4 +0,0 @@ --[NAME] --grub-mkfont \- make GRUB font files --[SEE ALSO] --.BR grub-mkconfig (8) -diff --git a/docs/man/grub-mkimage.h2m b/docs/man/grub-mkimage.h2m -deleted file mode 100644 -index f0fbc2bb197..00000000000 ---- a/docs/man/grub-mkimage.h2m -+++ /dev/null -@@ -1,6 +0,0 @@ --[NAME] --grub-mkimage \- make a bootable image of GRUB --[SEE ALSO] --.BR grub-install (8), --.BR grub-mkrescue (1), --.BR grub-mknetdir (8) -diff --git a/docs/man/grub-mklayout.h2m b/docs/man/grub-mklayout.h2m -deleted file mode 100644 -index 1e43409c0ab..00000000000 ---- a/docs/man/grub-mklayout.h2m -+++ /dev/null -@@ -1,10 +0,0 @@ --[NAME] --grub-mklayout \- generate a GRUB keyboard layout file --[DESCRIPTION] --grub-mklayout processes a keyboard layout description in --.BR keymaps (5) --format into a format that can be used by GRUB's --.B keymap --command. --[SEE ALSO] --.BR grub-mkconfig (8) -diff --git a/docs/man/grub-mknetdir.h2m b/docs/man/grub-mknetdir.h2m -deleted file mode 100644 -index a2ef13ec111..00000000000 ---- a/docs/man/grub-mknetdir.h2m -+++ /dev/null -@@ -1,4 +0,0 @@ --[NAME] --grub-mknetdir \- prepare a GRUB netboot directory. --[SEE ALSO] --.BR grub-mkimage (1) -diff --git a/docs/man/grub-mkpasswd-pbkdf2.h2m b/docs/man/grub-mkpasswd-pbkdf2.h2m -deleted file mode 100644 -index 4d202f3da7e..00000000000 ---- a/docs/man/grub-mkpasswd-pbkdf2.h2m -+++ /dev/null -@@ -1,4 +0,0 @@ --[NAME] --grub-mkpasswd-pbkdf2 \- generate hashed password for GRUB --[SEE ALSO] --.BR grub-mkconfig (8) -diff --git a/docs/man/grub-mkrelpath.h2m b/docs/man/grub-mkrelpath.h2m -deleted file mode 100644 -index d01f3961e3f..00000000000 ---- a/docs/man/grub-mkrelpath.h2m -+++ /dev/null -@@ -1,4 +0,0 @@ --[NAME] --grub-mkrelpath \- make a system path relative to its root --[SEE ALSO] --.BR grub-probe (8) -diff --git a/docs/man/grub-mkrescue.h2m b/docs/man/grub-mkrescue.h2m -deleted file mode 100644 -index a427f02e3c6..00000000000 ---- a/docs/man/grub-mkrescue.h2m -+++ /dev/null -@@ -1,4 +0,0 @@ --[NAME] --grub-mkrescue \- make a GRUB rescue image --[SEE ALSO] --.BR grub-mkimage (1) -diff --git a/docs/man/grub-mkstandalone.h2m b/docs/man/grub-mkstandalone.h2m -deleted file mode 100644 -index c77313978ad..00000000000 ---- a/docs/man/grub-mkstandalone.h2m -+++ /dev/null -@@ -1,4 +0,0 @@ --[NAME] --grub-mkstandalone \- make a memdisk-based GRUB image --[SEE ALSO] --.BR grub-mkimage (1) -diff --git a/docs/man/grub-mount.h2m b/docs/man/grub-mount.h2m -deleted file mode 100644 -index 8d168982d72..00000000000 ---- a/docs/man/grub-mount.h2m -+++ /dev/null -@@ -1,2 +0,0 @@ --[NAME] --grub-mount \- export GRUB filesystem with FUSE -diff --git a/docs/man/grub-ofpathname.h2m b/docs/man/grub-ofpathname.h2m -deleted file mode 100644 -index 74b43eea039..00000000000 ---- a/docs/man/grub-ofpathname.h2m -+++ /dev/null -@@ -1,4 +0,0 @@ --[NAME] --grub-ofpathname \- find OpenBOOT path for a device --[SEE ALSO] --.BR grub-probe (8) -diff --git a/docs/man/grub-pe2elf.h2m b/docs/man/grub-pe2elf.h2m -deleted file mode 100644 -index 7ca29bd703c..00000000000 ---- a/docs/man/grub-pe2elf.h2m -+++ /dev/null -@@ -1,4 +0,0 @@ --[NAME] --grub-pe2elf \- convert PE image to ELF --[SEE ALSO] --.BR grub-mkimage (1) -diff --git a/docs/man/grub-probe.h2m b/docs/man/grub-probe.h2m -deleted file mode 100644 -index 6e1ffdcf937..00000000000 ---- a/docs/man/grub-probe.h2m -+++ /dev/null -@@ -1,4 +0,0 @@ --[NAME] --grub-probe \- probe device information for GRUB --[SEE ALSO] --.BR grub-fstest (1) -diff --git a/docs/man/grub-reboot.h2m b/docs/man/grub-reboot.h2m -deleted file mode 100644 -index e4acace65ce..00000000000 ---- a/docs/man/grub-reboot.h2m -+++ /dev/null -@@ -1,5 +0,0 @@ --[NAME] --grub-reboot \- set the default boot entry for GRUB, for the next boot only --[SEE ALSO] --.BR grub-set-default (8), --.BR grub-editenv (1) -diff --git a/docs/man/grub-render-label.h2m b/docs/man/grub-render-label.h2m -deleted file mode 100644 -index 50ae5247c05..00000000000 ---- a/docs/man/grub-render-label.h2m -+++ /dev/null -@@ -1,3 +0,0 @@ --[NAME] --grub-render-label \- generate a .disk_label for Apple Macs. -- -diff --git a/docs/man/grub-script-check.h2m b/docs/man/grub-script-check.h2m -deleted file mode 100644 -index 3653682671a..00000000000 ---- a/docs/man/grub-script-check.h2m -+++ /dev/null -@@ -1,4 +0,0 @@ --[NAME] --grub-script-check \- check grub.cfg for syntax errors --[SEE ALSO] --.BR grub-mkconfig (8) -diff --git a/docs/man/grub-set-default.h2m b/docs/man/grub-set-default.h2m -deleted file mode 100644 -index 7945001c154..00000000000 ---- a/docs/man/grub-set-default.h2m -+++ /dev/null -@@ -1,5 +0,0 @@ --[NAME] --grub-set-default \- set the saved default boot entry for GRUB --[SEE ALSO] --.BR grub-reboot (8), --.BR grub-editenv (1) -diff --git a/docs/man/grub-sparc64-setup.h2m b/docs/man/grub-sparc64-setup.h2m -deleted file mode 100644 -index 18f803a50db..00000000000 ---- a/docs/man/grub-sparc64-setup.h2m -+++ /dev/null -@@ -1,6 +0,0 @@ --[NAME] --grub-sparc64-setup \- set up a device to boot using GRUB --[SEE ALSO] --.BR grub-install (8), --.BR grub-mkimage (1), --.BR grub-mkrescue (1) -diff --git a/docs/man/grub-syslinux2cfg.h2m b/docs/man/grub-syslinux2cfg.h2m -deleted file mode 100644 -index ad25c8ab753..00000000000 ---- a/docs/man/grub-syslinux2cfg.h2m -+++ /dev/null -@@ -1,4 +0,0 @@ --[NAME] --grub-syslinux2cfg \- transform syslinux config into grub.cfg --[SEE ALSO] --.BR grub-menulst2cfg (8) -diff --git a/gentpl.py b/gentpl.py -index c86550d4f9e..2cba0bbbd6f 100644 ---- a/gentpl.py -+++ b/gentpl.py -@@ -805,10 +805,7 @@ def manpage(defn, adddeps): - - output("if COND_MAN_PAGES\n") - gvar_add("man_MANS", name + "." + mansection) -- rule(name + "." + mansection, name + " " + adddeps, """ --chmod a+x """ + name + """ --PATH=$(builddir):$$PATH pkgdatadir=$(builddir) $(HELP2MAN) --section=""" + mansection + """ -i $(top_srcdir)/docs/man/""" + name + """.h2m -o $@ """ + name + """ --""") -+ rule(name + "." + mansection, name + " " + adddeps, "cat $(top_srcdir)/util/" + name + "." + mansection + " | $(top_builddir)/config.status --file=$@:-") - gvar_add("CLEANFILES", name + "." + mansection) - output("endif\n") - -diff --git a/util/grub-bios-setup.8 b/util/grub-bios-setup.8 -new file mode 100644 -index 00000000000..56f582b3d75 ---- /dev/null -+++ b/util/grub-bios-setup.8 -@@ -0,0 +1,54 @@ -+.TH GRUB-BIOS-SETUP 3 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-bios-setup\fR \(em Set up images to boot from a device. -+ -+.SH SYNOPSIS -+\fBgrub-bios-setup\fR [-a | --allow-floppy] [-b | --boot-image=\fIFILE\fR] -+.RS 17 -+[-c | --core-image=\fIFILE\fR] [-d | --directory=\fIDIR\fR] -+.RE -+.RS 17 -+[-f | --force] [-m | --device-map=\fIFILE\fR] -+.RE -+.RS 17 -+[-s | --skip-fs-probe] [-v | --verbose] \fIDEVICE\fR -+ -+.SH DESCRIPTION -+You should not normally run this program directly. Use grub-install instead. -+ -+.SH OPTIONS -+.TP -+\fB--allow-floppy\fR -+Make the device also bootable as a floppy. This option is the default for -+/dev/fdX devices. Some BIOSes will not boot images created with this option. -+ -+.TP -+\fB--boot-image\fR=\fIFILE\fR -+Use FILE as the boot image. The default value is \fBboot.img\fR. -+ -+.TP -+\fB--core-image\fR=\fIFILE\fR -+Use FILE as ther core image. The default value is \fBcore.img\fR. -+ -+.TP -+\fB--directory\fR=\fIDIR\fR -+Use GRUB files in the directory DIR. The default value is \fB/boot/grub\fR. -+ -+.TP -+\fB--force\fR -+Install even if problems are detected. -+ -+.TP -+\fB--device-map\fR=\fIFILE\fR -+Use FILE as the device map. The default value is /boot/grub/device.map . -+ -+.TP -+\fB--skip-fs-probe\fR -+Do not probe DEVICE for filesystems. -+ -+.TP -+\fB--verbose\fR -+Print verbose messages. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-editenv.1 b/util/grub-editenv.1 -new file mode 100644 -index 00000000000..d28ba03ba42 ---- /dev/null -+++ b/util/grub-editenv.1 -@@ -0,0 +1,46 @@ -+.TH GRUB-EDITENV 1 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-editenv\fR \(em Manage the GRUB environment block. -+ -+.SH SYNOPSIS -+\fBgrub-editenv\fR [-v | --verbose] [\fIFILE\fR] -+.RS 14 -+<create | list | set \fINAME\fR=\fIVALUE\fR | unset \fINAME\fR> -+ -+.SH DESCRIPTION -+\fBgrub-editenv\fR is a command line tool to manage GRUB's stored environment. -+ -+.SH OPTIONS -+.TP -+\fB--verbose\fR -+Print verbose messages. -+ -+.TP -+\fBFILE\fR -+.RS 7 -+File name to use for grub environment. Default is /boot/grub/grubenv . -+.RE -+ -+.SH COMMANDS -+.TP -+\fBcreate\fR -+.RS 7 -+Create a blank environment block file. -+.RE -+ -+.TP -+\fBlist\fR -+.RS 7 -+List the current variables. -+.RE -+ -+.TP -+\fBset\fR [\fINAME\fR=\fIVALUE\fR ...] -+Set variables. -+ -+.TP -+\fBunset [\fINAME\fR ...] -+Delete variables. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-file.1 b/util/grub-file.1 -new file mode 100644 -index 00000000000..b29cb327889 ---- /dev/null -+++ b/util/grub-file.1 -@@ -0,0 +1,165 @@ -+.TH GRUB-FILE 1 "Web Feb 26 2014" -+.SH NAME -+\fBgrub-file\fR \(em Check if FILE is of specified type. -+ -+.SH SYNOPSIS -+\fBgrub-file\fR (--is-i386-xen-pae-domu | --is-x86_64-xen-domu | -+.RS 11 -+--is-x86-xen-dom0 | --is-x86-multiboot | -+.RE -+.RS 11 -+--is-x86-multiboot2 | --is-arm-linux | --is-arm64-linux | -+.RE -+.RS 11 -+--is-ia64-linux | --is-mips-linux | --is-mipsel-linux | -+.RE -+.RS 11 -+--is-sparc64-linux | --is-powerpc-linux | --is-x86-linux | -+.RE -+.RS 11 -+--is-x86-linux32 | --is-x86-kfreebsd | --is-i386-kfreebsd | -+.RE -+.RS 11 -+--is-x86_64-kfreebsd | --is-x86-knetbsd | -+.RE -+.RS 11 -+--is-i386-knetbsd | --is-x86_64-knetbsd | --is-i386-efi | -+.RE -+.RS 11 -+--is-x86_64-efi | --is-ia64-efi | --is-arm64-efi | -+.RE -+.RS 11 -+--is-arm-efi | --is-hibernated-hiberfil | --is-x86_64-xnu | -+.RE -+.RS 11 -+--is-i386-xnu | --is-xnu-hibr | --is-x86-bios-bootsector) -+.RE -+.RS 11 -+\fIFILE\fR -+ -+.SH DESCRIPTION -+\fBgrub-file\fR is used to check if \fIFILE\fR is of a specified type. -+ -+.SH OPTIONS -+.TP -+--is-i386-xen-pae-domu -+Check if FILE can be booted as i386 PAE Xen unprivileged guest kernel -+ -+.TP -+--is-x86_64-xen-domu -+Check if FILE can be booted as x86_64 Xen unprivileged guest kernel -+ -+.TP -+--is-x86-xen-dom0 -+Check if FILE can be used as Xen x86 privileged guest kernel -+ -+.TP -+--is-x86-multiboot -+Check if FILE can be used as x86 multiboot kernel -+ -+.TP -+--is-x86-multiboot2 -+Check if FILE can be used as x86 multiboot2 kernel -+ -+.TP -+--is-arm-linux -+Check if FILE is ARM Linux -+ -+.TP -+--is-arm64-linux -+Check if FILE is ARM64 Linux -+ -+.TP -+--is-ia64-linux -+Check if FILE is IA64 Linux -+ -+.TP -+--is-mips-linux -+Check if FILE is MIPS Linux -+ -+.TP -+--is-mipsel-linux -+Check if FILE is MIPSEL Linux -+ -+.TP -+--is-sparc64-linux -+Check if FILE is SPARC64 Linux -+ -+.TP -+--is-powerpc-linux -+Check if FILE is POWERPC Linux -+ -+.TP -+--is-x86-linux -+Check if FILE is x86 Linux -+ -+.TP -+--is-x86-linux32 -+Check if FILE is x86 Linux supporting 32-bit protocol -+ -+.TP -+--is-x86-kfreebsd -+Check if FILE is x86 kFreeBSD -+ -+.TP -+--is-i386-kfreebsd -+Check if FILE is i386 kFreeBSD -+ -+.TP -+--is-x86_64-kfreebsd -+Check if FILE is x86_64 kFreeBSD -+ -+.TP -+--is-x86-knetbsd -+Check if FILE is x86 kNetBSD -+ -+.TP -+--is-i386-knetbsd -+Check if FILE is i386 kNetBSD -+ -+.TP -+--is-x86_64-knetbsd -+Check if FILE is x86_64 kNetBSD -+ -+.TP -+--is-i386-efi -+Check if FILE is i386 EFI file -+ -+.TP -+--is-x86_64-efi -+Check if FILE is x86_64 EFI file -+ -+.TP -+--is-ia64-efi -+Check if FILE is IA64 EFI file -+ -+.TP -+--is-arm64-efi -+Check if FILE is ARM64 EFI file -+ -+.TP -+--is-arm-efi -+Check if FILE is ARM EFI file -+ -+.TP -+--is-hibernated-hiberfil -+Check if FILE is hiberfil.sys in hibernated state -+ -+.TP -+--is-x86_64-xnu -+Check if FILE is x86_64 XNU (Mac OS X kernel) -+ -+.TP -+--is-i386-xnu -+Check if FILE is i386 XNU (Mac OS X kernel) -+ -+.TP -+--is-xnu-hibr -+Check if FILE is XNU (Mac OS X kernel) hibernated image -+ -+.TP -+--is-x86-bios-bootsector -+Check if FILE is BIOS bootsector -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-fstest.1 b/util/grub-fstest.1 -new file mode 100644 -index 00000000000..792fa78634c ---- /dev/null -+++ b/util/grub-fstest.1 -@@ -0,0 +1,99 @@ -+.TH GRUB-FSTEST 3 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-fstest\fR — Debug tool for GRUB's filesystem driver. -+ -+.SH SYNOPSIS -+\fBgrub-fstest\fR [-c | --diskcount=\fINUM\fR] [-C | --crypto] -+.RS 13 -+[-d | --debug=\fISTRING\fR] [-K | --zfs-key=\fIFILE\fR|\fIprompt\fR] -+.RE -+.RS 13 -+[-n | --length=\fINUM\fR] [-r | --root=\fIDEVICE_NAME\fR] -+.RE -+.RS 13 -+[-s | --skip=\fINUM\fR] [-u | --uncompress] [-v | --verbose] -+.RE -+.RS 13 -+\fIIMAGE_PATH\fR <blocklist \fIFILE\fR | cat \fIFILE\fR | -+.RE -+.RS 13 -+cmp \fIFILE\fR \fILOCAL\fR | cp \fIFILE\fR \fILOCAL\fR | crc \fIFILE\fR | -+.RE -+.RS 13 -+hex \fIFILE\fR | ls \fIPATH\fR | xnu_uuid \fIDEVICE\fR> -+ -+.SH DESCRIPTION -+\fBgrub-fstest\fR is a tool for testing GRUB's filesystem drivers. You should not normally need to run this program. -+ -+.SH OPTIONS -+.TP -+\fB--diskcount\fR=\fINUM\fR -+Specify the number of input files. -+ -+.TP -+\fB--crypto\fR -+Mount cryptographic devices. -+ -+.TP -+\fB--debug\fR=\fISTRING\fR -+Set debug environment variable. -+ -+.TP -+\fB--zfs-key\fR=\fIFILE\fR|\fIprompt\fR -+Load ZFS cryptographic key. -+ -+.TP -+\fB--length\fR=\fINUM\fR -+Handle NUM bytes in output file. -+ -+.TP -+\fB--root\fR=\fIDEVICE_NAME\fR -+Set root device. -+ -+.TP -+\fB--skip\fR=\fINUM\fR -+Skip NUM bytes from output file. -+ -+.TP -+\fB--uncompress\fR -+Uncompress data. -+ -+.TP -+\fB--verbose\fR -+Print verbose messages. -+ -+.SH COMMANDS -+.TP -+\fBblocklist\fR \fIFILE\fR -+Display block list of \fIFILE\fR. -+ -+.TP -+\fBcat\fR \fIFILE\fR -+Display \fIFILE\fR on standard output. -+ -+.TP -+\fBcmp\fR \fIFILE\fR \fILOCAL\fR -+Compare \fIFILE\fR with local file \fILOCAL\fR. -+ -+.TP -+\fBcp\fR \fIFILE\fR \fILOCAL\fR -+Copy \fIFILE\fR to local file \fILOCAL\fR. -+ -+.TP -+\fBcrc\fR \fIFILE\fR -+Display the CRC-32 checksum of \fIFILE\fR. -+ -+.TP -+\fBhex\fR \fIFILE\fR -+Display contents of \fIFILE\fR in hexidecimal. -+ -+.TP -+\fBls\fR \fIPATH\fR -+List files at \fIPATH\fR. -+ -+.TP -+\fBxnu_uuid\fR \fIDEVICE\fR -+Display the XNU UUID of \fIDEVICE\fR. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-glue-efi.1 b/util/grub-glue-efi.1 -new file mode 100644 -index 00000000000..72bd555d577 ---- /dev/null -+++ b/util/grub-glue-efi.1 -@@ -0,0 +1,31 @@ -+.TH GRUB-GLUE-EFI 3 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-glue-efi\fR \(em Create an Apple fat EFI binary. -+ -+.SH SYNOPSIS -+\fBgrub-glue-efi\fR <-3 | --input32=\fIFILE\fR> <-6 | --input64=\fIFILE\fR> -+.RS 15 -+<-o | --output=\fIFILE\fR> [-v | --verbose] -+ -+.SH DESCRIPTION -+\fBgrub-glue-efi\fR creates an Apple fat EFI binary from two EFI binaries. -+ -+.SH OPTIONS -+.TP -+\fB--input32\fR=\fIFILE\fR -+Read 32-bit binary from \fIFILE\fR. -+ -+.TP -+\fB--input64\fR=\fIFILE\fR -+Read 64-bit binary from \fIFILE\fR. -+ -+.TP -+\fB--output\fR=\fIFILE\fR -+Write resulting fat binary to \fIFILE\fR. -+ -+.TP -+\fB--verbose\fR -+Print verbose messages. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-install.8 b/util/grub-install.8 -new file mode 100644 -index 00000000000..1db89e94b3b ---- /dev/null -+++ b/util/grub-install.8 -@@ -0,0 +1,128 @@ -+.TH GRUB-INSTALL 1 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-install\fR \(em Install GRUB on a device. -+ -+.SH SYNOPSIS -+\fBgrub-install\fR [--modules=\fIMODULES\fR] [--install-modules=\fIMODULES\fR] -+.RS 14 -+[--themes=\fITHEMES\fR] [--fonts=\fIFONTS\fR] [--locales=\fILOCALES\fR] -+.RE -+.RS 14 -+[--compress[=\fIno\fR,\fIxz\fR,\fIgz\fR,\fIlzo\fR]] [-d | --directory=\fIDIR\fR] -+.RE -+.RS 14 -+[--grub-mkimage=\fIFILE\fR] [--boot-directory=\fIDIR\fR] -+.RE -+.RS 14 -+[--target=\fITARGET\fR] [--grub-setup=\fIFILE\fR] -+.RE -+.RS 14 -+[--grub-mkrelpath=\fIFILE\fR] [--grub-probe=\fIFILE\fR] -+.RE -+.RS 14 -+[--allow-floppy] [--recheck] [--force] [--force-file-id] -+.RE -+.RS 14 -+[--disk-module=\fIMODULE\fR] [--no-nvram] [--removable] -+.RE -+.RS 14 -+[--bootloader-id=\fIID\fR] [--efi-directory=\fIDIR\fR] \fIINSTALL_DEVICE\fR -+ -+.SH DESCRIPTION -+\fBgrub-install\fR installs GRUB onto a device. This includes copying GRUB images into the target directory (generally \fI/boot/grub\fR), and on some platforms may also include installing GRUB onto a boot sector. -+ -+.SH OPTIONS -+.TP -+\fB--modules\fR=\fIMODULES\fR\! -+Pre-load modules specified by \fIMODULES\fR. -+ -+.TP -+\fB--install-modules\fR=\fIMODULES\fR -+Install only \fIMODULES\fR and their dependencies. The default is to install all available modules. -+ -+.TP -+\fB--themes\fR=\fITHEMES\fR -+Install \fITHEMES\fR. The default is to install the \fIstarfield\fR theme, if available. -+ -+.TP -+\fB--fonts\fR=\fIFONTS\fR -+Install \fIFONTS\fR. The default is to install the \fIunicode\fR font. -+ -+.TP -+\fB--locales\fR=\fILOCALES\fR -+Install only locales listed in \fILOCALES\fR. The default is to install all available locales. -+ -+.TP -+\fB--compress\fR=\fIno\fR,\fIxz\fR,\fIgz\fR,\fIlzo\fR -+Compress GRUB files using the specified compression algorithm. -+ -+.TP -+\fB--directory\fR=\fIDIR\fR -+Use images and modules in \fIDIR\fR. -+ -+.TP -+\fB--grub-mkimage\fR=\fIFILE\fR -+Use \fIFILE\fR as \fBgrub-mkimage\fR. The default is \fI/usr/bin/grub-mkimage\fR. -+ -+.TP -+\fB--boot-directory\fR=\fIDIR\fR -+Use \fIDIR\fR as the boot directory. The default is \fI/boot\fR. GRUB will put its files in a subdirectory of this directory named \fIgrub\fR. -+ -+.TP -+\fB--target\fR=\fITARGET\fR -+Install GRUB for \fITARGET\fR platform. The default is the platform \fBgrub-install\fR is running on. -+ -+.TP -+\fB--grub-setup\fR=\fIFILE\fR -+Use \fIFILE\fR as \fBgrub-setup\fR. The default is \fI/usr/bin/grub-setup\fR. -+ -+.TP -+\fB--grub-mkrelpath\fR=\fIFILE\fR -+Use \fIFILE\fR as \fBgrub-mkrelpath\fR. The default is \fI/usr/bin/grub-mkrelpath\fR. -+ -+.TP -+\fB--grub-probe\fR=\fIFILE\fR -+Use \fIFILE\fR as \fBgrub-probe\fR. The default is \fI/usr/bin/grub-mkrelpath\fR. -+ -+.TP -+\fB--allow-floppy -+Make the device also bootable as a floppy. This option is the default for /dev/fdX devices. Some BIOSes will not boot images created with this option. -+ -+.TP -+\fB--recheck -+Delete any existing device map and create a new one if necessary. -+ -+.TP -+\fB--force -+Install even if problems are detected. -+ -+.TP -+\fB--force-file-id -+Use identifier file even if UUID is available. -+ -+.TP -+\fB--disk-module\fR=\fIMODULE\fR -+Use \fIMODULE\fR for disk access. This allows you to manually specify either \fIbiosdisk\fR or \fInative\fR disk access. This option is only available on the BIOS target platform. -+ -+.TP -+\fB--no-nvram -+Do not update the \fIboot-device\fR NVRAM variable. This option is only available on IEEE1275 target platforms. -+ -+.TP -+\fB--removable -+Treat the target device as if it is removeable. This option is only available on the EFI target platform. -+ -+.TP -+\fB--bootloader-id\fR=\fIID\fR -+Use \fIID\fR as the bootloader ID. This option is only available on the EFI target platform. -+ -+.TP -+\fB--efi-directory\fR=\fIDIR\fR -+Use \fIDIR\fR as the EFI System Partition root. This option is only available on the EFI target platform. -+ -+.TP -+\fIINSTALL_DEVICE\fR -+Install GRUB to the block device \fIINSTALL_DEVICE\fR. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-kbdcomp.1 b/util/grub-kbdcomp.1 -new file mode 100644 -index 00000000000..0bb969a5b43 ---- /dev/null -+++ b/util/grub-kbdcomp.1 -@@ -0,0 +1,19 @@ -+.TH GRUB-KBDCOMP 3 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-kbdcomp\fR \(em Generate a GRUB keyboard layout file. -+ -+.SH SYNOPSIS -+\fBgrub-kbdcomp\fR <-o | --output=\fIFILE\fR> \fICKBMAP_ARGUMENTS\fR -+ -+.SH DESCRIPTION -+\fBgrub-kbdcomp\fR processes an X keyboard layout description in -+\fBkeymaps\fR(5) format into a format that can be used by GRUB's \fBkeymap\fR -+command. -+ -+.SH OPTIONS -+.TP -+\fB--output\fR=\fIFILE\fR -+Write output to \fIFILE\fR. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-macbless.1 b/util/grub-macbless.1 -new file mode 100644 -index 00000000000..41a96186f70 ---- /dev/null -+++ b/util/grub-macbless.1 -@@ -0,0 +1,22 @@ -+.TH GRUB-MACBLESS 1 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-macbless\fR \(em Mac-style bless on HFS or HFS+ -+ -+.SH SYNOPSIS -+\fBgrub-macbless\fR [-v | --verbose] [-p | --ppc] \fIFILE\fR | [-x | --x86] \fIFILE\fR -+ -+.SH OPTIONS -+.TP -+--x86 -+Bless for x86 based Macs. -+ -+.TP -+--ppc -+Bless for PPC based Macs. -+ -+.TP -+--verbose -+Print verbose messages. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-menulst2cfg.1 b/util/grub-menulst2cfg.1 -new file mode 100644 -index 00000000000..91e2ef87113 ---- /dev/null -+++ b/util/grub-menulst2cfg.1 -@@ -0,0 +1,12 @@ -+.TH GRUB-MENULST2CFG 1 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-menulst2cfg\fR \(em Convert a configuration file from GRUB 0.xx to GRUB 2.xx format. -+ -+.SH SYNOPSIS -+\fBgrub-menulst2cfg\fR [\fIINFILE\fR [\fIOUTFILE\fR]] -+ -+.SH DESCRIPTION -+\fBgrub-menulst2cfg\fR converts a configuration file from GRUB 0.xx to the current format. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-mkconfig.8 b/util/grub-mkconfig.8 -new file mode 100644 -index 00000000000..a2d1f577b9b ---- /dev/null -+++ b/util/grub-mkconfig.8 -@@ -0,0 +1,17 @@ -+.TH GRUB-MKCONFIG 1 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-mkconfig\fR \(em Generate a GRUB configuration file. -+ -+.SH SYNOPSIS -+\fBgrub-mkconfig\fR [-o | --output=\fIFILE\fR] -+ -+.SH DESCRIPTION -+\fBgrub-mkconfig\fR generates a configuration file for GRUB. -+ -+.SH OPTIONS -+.TP -+\fB--output\fR=\fIFILE\fR -+Write generated output to \fIFILE\fR. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-mkfont.1 b/util/grub-mkfont.1 -new file mode 100644 -index 00000000000..3494857987d ---- /dev/null -+++ b/util/grub-mkfont.1 -@@ -0,0 +1,87 @@ -+.TH GRUB-MKFONT 3 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-mkfont\fR \(em Convert common font file formats into the PF2 format. -+ -+.SH SYNOPSIS -+\fBgrub-mkfont\fR [--ascii-bitmaps] [-a | --force-autohint] -+.RS 13 -+[-b | --bold] [-c | --asce=\fINUM\fR] [-d | --desc=\fINUM\fR] -+.RE -+.RS 13 -+[-i | --index=\fINUM\fR] [-n | --name=\fINAME\fR] [--no-bitmap] -+.RE -+.RS 13 -+[--no-hinting] <-o | --output=\fIFILE\fR> -+.RE -+.RS 13 -+[-r | --range=\fIFROM-TO\fR[\fI,FROM-TO\fR]] [-s | --size=\fISIZE\fR] -+.RE -+.RS 13 -+[-v | --verbose] [--width-spec] \fIFONT_FILES\fR -+ -+.SH DESCRIPTION -+\fBgrub-mkfont\fR converts font files from common formats into the PF2 format used by GRUB. -+ -+.SH OPTIONS -+.TP -+--ascii-bitmaps -+Save only bitmaps for ASCII characters. -+ -+.TP -+--force-autohint -+Force generation of automatic hinting. -+ -+.TP -+--bold -+Convert font to bold. -+ -+.TP -+--asce=\fINUM\fR -+Set font ascent to \fINUM\fR. -+ -+.TP -+--desc=\fINUM\fR -+Set font descent to \fINUM\fR. -+ -+.TP -+--index=\fINUM\fR -+Select face index \fINUM\fR. -+ -+.TP -+--name=\fINAME\fR -+Set font family to \fINAME\fR. -+ -+.TP -+--no-bitmap -+Ignore bitmap strikes when loading. -+ -+.TP -+--no-hinting -+Disable hinting. -+ -+.TP -+--output=\fIFILE\fR -+Save ouptut to \fIFILE\fR. This argument is required. -+ -+.TP -+--range=\fIFROM-TO\fR\fI,FROM-TO\fR -+Set the font ranges to each pair of \fIFROM\fR,\fITO\fR. -+ -+.TP -+--size=\fISIZE\fR -+Set font size to \fISIZE\fR. -+ -+.TP -+--verbose -+Print verbose messages. -+ -+.TP -+--width-spec -+Create a width summary file. -+ -+.TP -+\fIFONT_FILES\fR -+The input files to be converted. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1 -new file mode 100644 -index 00000000000..4dea4f54597 ---- /dev/null -+++ b/util/grub-mkimage.1 -@@ -0,0 +1,95 @@ -+.TH GRUB-MKIMAGE 1 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-mkimage\fR \(em Make a bootable GRUB image. -+ -+.SH SYNOPSIS -+\fBgrub-mkimage\fR [-c | --config=\fRFILE\fI] [-C | --compression=(\fIxz\fR,\fInone\fR,\fIauto\fR)] -+.RS 14 -+[-d | --directory=\fRDIR\fR] [-k | --pubkey=\fIFILE\fR] -+.RE -+.RS 14 -+[-m | --memdisk=\fIFILE\fR] [-n | --note] [-o | --output=\fIFILE\fR] -+.RE -+.RS 14 -+[-O | --format=\fIFORMAT\fR] [-p | --prefix=\fIDIR\fR] -+.RE -+.RS 14 -+[-v | --verbose] \fIMODULES\fR -+ -+.SH DESCRIPTION -+\fBgrub-mkimage\fI builds a bootable image of GRUB. -+ -+.SH OPTIONS -+.TP -+--config=\fIFILE\fR -+Embed \fIFILE\fR as the image's initial configuration file. -+ -+.TP -+--compression=(\fIxz\fR,\fInone\fR,\fIauto\fR) -+Use one of \fIxz\fR, \fInone\fR, or \fIauto\fR as the compression method for the core image. -+ -+.TP -+--directory=\fIDIR\fR -+Use images and modules from \fIDIR\fR. The default value is \fB/usr/lib/grub/<platform>\fR. -+ -+.TP -+--pubkey=\fIFILE\fR -+Embed the public key \fIFILE\fR for signature checking. -+ -+.TP -+--memdisk=\fIFILE\fR -+Embed the memdisk image \fIFILE\fR. If no \fB-p\fR option is also specified, this implies \fI-p (memdisk)/boot/grub\fR. -+ -+.TP -+--note -+Add a CHRP \fINOTE\fR section. This option is only valid on IEEE1275 platforms. -+ -+.TP -+--output=\fIFILE\fR -+Write the generated file to \fIFILE\fR. The default is to write to standard output. -+ -+.TP -+--format=\fIFORMAT\fR -+Generate an image in the specified \fIFORMAT\fR. Valid values are: -+.RS -+.RS 4 -+.P -+i386-coreboot, -+i386-multiboot, -+i386-pc, -+i386-pc-pxe, -+i386-efi, -+i386-ieee1275, -+i386-qemu, -+x86_64-efi, -+mipsel-yeeloong-flash, -+mipsel-fuloong2f-flash, -+mipself-loongson-elf, -+powerpc-ieee1275, -+sparc64-ieee1275-raw, -+sparc64-ieee1275-cdcore, -+sparc64-ieee1275-aout, -+ia64-efi, -+mips-arc, -+mipsel-arc, -+mipsel-qemu_mips-elf, -+mips-qemu_mips-flash, -+mipsel-qemu_mips-flash, -+mips-qemu_mips-elf -+.RE -+.RE -+ -+.TP -+--prefix=\fIDIR\fR -+Set prefix directory. The default value is \fI/boot/grub\fR. -+ -+.TP -+--verbose -+Print verbose messages. -+ -+.TP -+\fIMODULES\fR -+Include \fIMODULES\fR. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-mklayout.1 b/util/grub-mklayout.1 -new file mode 100644 -index 00000000000..d1bbc2ec515 ---- /dev/null -+++ b/util/grub-mklayout.1 -@@ -0,0 +1,27 @@ -+.TH GRUB-MKLAYOUT 3 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-mklayout\fR \(em Generate a GRUB keyboard layout file. -+ -+.SH SYNOPSIS -+\fBgrub-mklayout\fR [-i | --input=\fIFILE\fR] [-o | --output=\fIFILE\fR] -+.RS 15 -+[-v | --verbose] -+ -+.SH DESCRIPTION -+\fBgrub-mklayout\fR generates a GRUB keyboard layout description which corresponds with the Linux console layout description given as input. -+ -+.SH OPTIONS -+.TP -+--input=\fIFILE\fR -+Use \fIFILE\fR as the input. The default value is the standard input device. -+ -+.TP -+--output=\fIFILE\fR -+Use \fIFILE\fR as the output. The default value is the standard output device. -+ -+.TP -+--verbose -+Print verbose messages. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-mknetdir.1 b/util/grub-mknetdir.1 -new file mode 100644 -index 00000000000..fa7e8d4ef0d ---- /dev/null -+++ b/util/grub-mknetdir.1 -@@ -0,0 +1,12 @@ -+.TH GRUB-MKNETDIR 3 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-mknetdir\fR \(em Prepare a GRUB netboot directory. -+ -+.SH SYNOPSIS -+\fBgrub-mknetdir\fR -+ -+.SH DESCRIPTION -+\fBgrub-mknetdir\fR prepares a directory for GRUB to be netbooted from. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-mkpasswd-pbkdf2.1 b/util/grub-mkpasswd-pbkdf2.1 -new file mode 100644 -index 00000000000..73c437c15d8 ---- /dev/null -+++ b/util/grub-mkpasswd-pbkdf2.1 -@@ -0,0 +1,27 @@ -+.TH GRUB-MKPASSWD-PBKDF2 3 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-mkpasswd-pbkdf2\fR \(em Generate a PBKDF2 password hash. -+ -+.SH SYNOPSIS -+\fBgrub-mkpasswd-pbkdf2\fR [-c | --iteration-count=\fINUM\fR] [-l | --buflen=\fINUM\fR] -+.RS 22 -+[-s | --salt=\fINUM\fR] -+ -+.SH DESCRIPTION -+\fBgrub-mkpasswd-pbkdf2\fR generates a PBKDF2 password string suitable for use in a GRUB configuration file. -+ -+.SH OPTIONS -+.TP -+--iteration-count=\fINUM\fR -+Number of PBKDF2 iterations. -+ -+.TP -+--buflen=\fINUM\fR -+Length of generated hash. -+ -+.TP -+--salt=\fINUM\fR -+Length of salt to use. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-mkrelpath.1 b/util/grub-mkrelpath.1 -new file mode 100644 -index 00000000000..85f1113621d ---- /dev/null -+++ b/util/grub-mkrelpath.1 -@@ -0,0 +1,12 @@ -+.TH GRUB-MKRELPATH 3 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-mkrelpath\fR \(em Generate a relative GRUB path given an OS path. -+ -+.SH SYNOPSIS -+\fBgrub-mkrelpath\fR \fIFILE\fR -+ -+.SH DESCRIPTION -+\fBgrub-mkrelpath\fR takes an OS filesystem path for \fIFILE\fR and returns a relative path suitable for use in a GRUB configuration file. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-mkrescue.1 b/util/grub-mkrescue.1 -new file mode 100644 -index 00000000000..4ed9fc723fd ---- /dev/null -+++ b/util/grub-mkrescue.1 -@@ -0,0 +1,123 @@ -+.TH GRUB-MKRESCUE 3 "Wed Feb 26 2014" -+.SH NAME -+grub-mkrescue \(em Generate a GRUB rescue image using GNU Xorriso. -+ -+.SH SYNOPSIS -+\fBgrub-mkrescue\fR [-o | --output=\fIFILE\fR] [--modules=\fIMODULES\fR] -+.RS 15 -+[--install-modules=\fIMODULES\fR] [--themes=\fITHEMES\fR] -+.RE -+.RS 15 -+[--fonts=\fIFONTS\fR] [--locales=\fILOCALES\fR] -+.RE -+.RS 15 -+[--compress[=\fIno\fR,\fIxz\fR,\fIgz\fR,\fIlzo\fR]] [-d | --directory=\fIDIR\fR] -+.RE -+.RS 15 -+[--grub-mkimage=\fIFILE\fR] [--rom-directory=\fIDIR\fR] -+.RE -+.RS 15 -+[--xorriso=\fIFILE\fR] [--grub-glue-efi=\fIFILE\fR] -+.RE -+.RS 15 -+[--grub-render-label=\fIFILE\fR] [--label-font=\fIFILE\fR] -+.RE -+.RS 15 -+[--label-color=\fICOLOR\fR] [--label-bgcolor=\fIFILE\fR] -+.RE -+.RS 15 -+[--product-name=\fISTRING\fR] [--product-version=\fISTRING\fR] -+.RE -+.RS 15 -+[--sparc-boot] [--arcs-boot] -+ -+.SH DESCRIPTION -+\fBgrub-mkrescue\fR can be used to generate a rescue image with the GRUB bootloader. -+ -+.SH OPTIONS -+.TP -+\fB--output\fR=\fIFILE\fR -+Write the generated file to \fIFILE\fR. The default is to write to standard output. -+ -+.TP -+\fB--modules\fR=\fIMODULES\fR -+Pre-load modules specified by \fIMODULES\fR. -+ -+.TP -+\fB--install-modules\fR=\fIMODULES\fR -+Install only \fIMODULES\fR and their dependencies. The default is to install all available modules. -+ -+.TP -+\fB--themes\fR=\fITHEMES\fR -+Install \fITHEMES\fR. The default is to install the \fIstarfield\fR theme, if available. -+ -+.TP -+\fB--fonts\fR=\fIFONTS\fR -+Install \fIFONTS\fR. The default is to install the \fIunicode\fR font. -+ -+.TP -+\fB--locales\fR=\fILOCALES\fR -+Install only locales listed in \fILOCALES\fR. The default is to install all available locales. -+ -+.TP -+\fB--compress\fR[=\fIno\fR,\fIxz\fR,\fIgz\fR,\fIlzo\fR] -+Compress GRUB files using the specified compression algorithm. -+ -+.TP -+\fB--directory\fR=\fIDIR\fR -+Use images and modules in \fIDIR\fR. -+ -+.TP -+\fB--grub-mkimage\fR=\fIFILE\fR -+Use \fIFILE\fR as \fBgrub-mkimage\fR(1). The default is \fI/usr/bin/grub-mkimage\fR. -+ -+.TP -+\fB--rom-directory\fR=\fIDIR\fR -+Save ROM images in \fIDIR\fR. -+ -+.TP -+\fB--xorriso\fR=\fIFILE\fR -+Use \fIFILE\fR as \fBxorriso\fI. -+ -+.TP -+\fB--grub-glue-efi\fR=\fIFILE\fR -+Use \fIFILE\fR as \fBgrub-glue-efi\fR(3). -+ -+.TP -+\fB--grub-render-label\fR=\fIFILE\fR -+Use \fIFILE\fR as \fBgrub-render-label\fR(3). -+ -+.TP -+\fB--label-font\fR=\fIFILE\fR -+Use \fIFILE\fR as the font file for generated labels. -+ -+.TP -+\fB--label-color\fR=\fICOLOR\fR -+Use \fICOLOR\fI as the color for generated labels. -+ -+.TP -+\fB--label-bgcolor\fR=\fICOLOR\fR -+Use \fICOLOR\fR as the background color for generated labels. -+ -+.TP -+\fB--product-name\fR=\fISTRING\fR -+Use \fISTRING\fR as the product name in generated labels. -+ -+.TP -+\fB--product-version\fR=\fISTRING\fR -+Use \fISTRING\fR as the product version in generated labels. -+ -+.TP -+\fB--sparc-boot\fR -+Enable booting the SPARC platform. This disables HFS+, APM, ARCS, and "boot as disk image" on the \fIi386-pc\fR target platform. -+ -+.TP -+\fB--arcs-boot\fR -+Enable ARCS booting. This is typically for big-endian MIPS machines, and disables HFS+, APM, sparc64, and "boot as disk image" on the \fIi386-pc\fR target platform. -+ -+.TP -+\fB--\fR -+All options after a \fB--\fR will be passed directly to xorriso's command line when generating the image. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-mkstandalone.1 b/util/grub-mkstandalone.1 -new file mode 100644 -index 00000000000..ba2d2bdf279 ---- /dev/null -+++ b/util/grub-mkstandalone.1 -@@ -0,0 +1,100 @@ -+.TH GRUB-MKSTANDALONE 3 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-mkstandalone\fR \(em Generate a standalone image in the selected format. -+ -+.SH SYNOPSIS -+\fBgrub-mkstandalone\fR [-o | --output=\fIFILE\fR] [-O | --format=\fIFORMAT\fR] -+.RS 19 -+[-C | --compression=(\fIxz\fR|\fInone\fR|\fIauto\fR)] -+.RE -+.RS 19 -+[--modules=\fIMODULES\fR] [--install-modules=\fIMODULES\fR] -+.RE -+.RS 19 -+[--themes=\fITHEMES\fR] [--fonts=\fIFONTS\fR] -+.RE -+.RS 19 -+[--locales=\fILOCALES\fR] [--compress[=\fIno\fR,\fIxz\fR,\fIgz\fR,\fIlzo\fR]] -+.RE -+.RS 19 -+[-d | --directory=\fIDIR\fR] [--grub-mkimage=\fIFILE\fR] -+.RE -+.RS 19 -+\fISOURCE...\fR -+ -+.SH DESCRIPTION -+ -+.SH OPTIONS -+.TP -+--output=\fIFILE\fR -+Write the generated file to \fIFILE\fR. The default is to write to standard output. -+ -+.TP -+--format=\fIFORMAT\fR -+Generate an image in the specified \fIFORMAT\fR. Valid values are: -+.RS -+.RS 4 -+.P -+i386-coreboot, -+i386-multiboot, -+i386-pc, -+i386-pc-pxe, -+i386-efi, -+i386-ieee1275, -+i386-qemu, -+x86_64-efi, -+mipsel-yeeloong-flash, -+mipsel-fuloong2f-flash, -+mipself-loongson-elf, -+powerpc-ieee1275, -+sparc64-ieee1275-raw, -+sparc64-ieee1275-cdcore, -+sparc64-ieee1275-aout, -+ia64-efi, -+mips-arc, -+mipsel-arc, -+mipsel-qemu_mips-elf, -+mips-qemu_mips-flash, -+mipsel-qemu_mips-flash, -+mips-qemu_mips-elf -+.RE -+.RE -+ -+.TP -+--compression=(\fIxz\fR|\fInone\fR|\fIauto\fR) -+Use one of \fIxz\fR, \fInone\fR, or \fIauto\fR as the compression method for the core image. -+ -+.TP -+--modules=\fIMODULES\fR -+Pre-load modules specified by \fIMODULES\fR. -+ -+.TP -+--install-modules=\fIMODULES\fR -+Install only \fIMODULES\fR and their dependencies. The default is to install all available modules. -+ -+.TP -+--themes=\fITHEMES\fR -+Install \fITHEMES\fR. The default is to install the \fIstarfield\fR theme, if available. -+ -+.TP -+--fonts=\fIFONTS\fR -+Install \fIFONTS\fR. The default is to install the \fIunicode\fR font. -+ -+.TP -+--locales=\fILOCALES\fR -+Install only locales listed in \fILOCALES\fR. The default is to install all available locales. -+ -+.TP -+--compress[=\fIno\fR,\fIxz\fR,\fIgz\fR,\fIlzo\fR] -+Compress GRUB files using the specified compression algorithm. -+ -+.TP -+--directory=\fIDIR\fR -+Use images and modules in \fIDIR\fR. -+ -+.TP -+--grub-mkimage=\fIFILE\fR -+Use \fIFILE\fR as \fBgrub-mkimage\fR. The default is \fI/usr/bin/grub-mkimage\fR. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-ofpathname.8 b/util/grub-ofpathname.8 -new file mode 100644 -index 00000000000..bf3743aeba1 ---- /dev/null -+++ b/util/grub-ofpathname.8 -@@ -0,0 +1,12 @@ -+.TH GRUB-OFPATHNAME 3 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-ofpathname\fR \(em Generate an IEEE-1275 device path for a specified device. -+ -+.SH SYNOPSIS -+\fBgrub-ofpathname\fR \fIDEVICE\fR -+ -+.SH DESCRIPTION -+\fBgrub-ofpathname\fR generates an IEEE-1275 device path for the specified \fIDEVICE\fR. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-probe.8 b/util/grub-probe.8 -new file mode 100644 -index 00000000000..04e26c832bb ---- /dev/null -+++ b/util/grub-probe.8 -@@ -0,0 +1,80 @@ -+.TH GRUB-PROBE 3 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-probe\fR \(em Probe device information for a given path. -+ -+.SH SYNOPSIS -+\fBgrub-probe\fR \[-d | --device] [-m | --device-map=\fIFILE\fR] -+.RS 12 -+[-t | --target=(fs|fs_uuid|fs_label|drive|device|partmap| -+.RE -+.RS 28 -+abstraction|cryptodisk_uuid| -+.RE -+.RS 28 -+msdos_parttype)] -+.RE -+.RS 12 -+[-v | --verbose] (PATH|DEVICE) -+ -+.SH DESCRIPTION -+\fBgrub-probe\fR probes a path or device for filesystem and related information. -+ -+.SH OPTIONS -+.TP -+--device -+Final option represents a \fIDEVICE\fR, rather than a filesystem \fIPATH\fR. -+.TP -+--device-map=\fIFILE\fR -+Use \fIFILE\fR as the device map. The default value is \fI/boot/grub/device.map\fR. -+ -+.TP -+--target=(fs|fs_uuid|fs_label|drive|device|partmap|msdos_parttype) -+Select among various output definitions. The default is \fIfs\fR. -+.RS -+.TP -+\fIfs\fR -+filesystem module -+ -+.TP -+\fIfs_uuid\fR -+filesystem UUID -+ -+.TP -+\fIfs_label\fR -+filesystem label -+ -+.TP -+\fIdrive\fR -+GRUB drive name -+ -+.TP -+\fIdevice\fR -+System device -+ -+.TP -+\fIpartmap\fR -+partition map module -+ -+.TP -+\fIabstraction\fR -+abstraction module -+ -+.TP -+\fIcryptodisk_uuid\fR -+cryptographic container -+ -+.TP -+\fImsdos_partmap\fR -+MS-DOS partition map -+.RE -+ -+.TP -+--verbose -+Print verbose output. -+ -+.TP -+(\fIPATH\fR|\fIDEVICE\fR) -+If --device is passed, a block \fIDEVICE\fR. Otherwise, the \fIPATH\fR of a file on the filesystem. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-reboot.8 b/util/grub-reboot.8 -new file mode 100644 -index 00000000000..faa5e4eece2 ---- /dev/null -+++ b/util/grub-reboot.8 -@@ -0,0 +1,21 @@ -+.TH GRUB-REBOOT 3 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-reboot\fR \(em Set the default boot menu entry for the next boot only. -+ -+.SH SYNOPSIS -+\fBgrub-reboot\fR [--boot-directory=\fIDIR\fR] \fIMENU_ENTRY\fR -+ -+.SH DESCRIPTION -+\fBgrub-reboot\fR sets the default boot menu entry for the next boot, but not further boots after that. This command only works for GRUB configuration files created with \fIGRUB_DEFAULT=saved\fR in \fI/etc/default/grub\fR. -+ -+.SH OPTIONS -+.TP -+--boot-directory=\fIDIR\fR -+Find GRUB images under \fIDIR/grub\fR. The default value is \fI/boot\fR, resulting in grub images being search for at \fI/boot/grub\fR. -+ -+.TP -+\fIMENU_ENTRY\fR -+A number, a menu item title or a menu item identifier. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-render-label.1 b/util/grub-render-label.1 -new file mode 100644 -index 00000000000..4d51c8abf01 ---- /dev/null -+++ b/util/grub-render-label.1 -@@ -0,0 +1,51 @@ -+.TH GRUB-RENDER-LABEL 3 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-render-label\fR \(em Render an Apple disk label. -+ -+.SH SYNOPSIS -+\fBgrub-render-label\fR [-b | --bgcolor=\fICOLOR\fR] [-c | --color=\fICOLOR\fR] -+.RS 19 -+[-f | --font=\fIFILE\fR] [-i | --input=\fIFILE\fR] -+.RE -+.RS 19 -+[-o | --output=\fIFILE\fR] [-t | --text=\fISTRING\fR] -+.RE -+.RS 19 -+[-v | --verbose] -+ -+.SH DESCRIPTION -+\fBgrub-render-label\fR renders an Apple disk label (.disk_label) file. -+ -+ -+.SH OPTIONS -+.TP -+\fB--color\fR=\fICOLOR\fR -+Use \fICOLOR\fI as the color for generated labels. -+ -+.TP -+\fB--bgcolor\fR=\fICOLOR\fR -+Use \fICOLOR\fR as the background color for generated labels. -+ -+.TP -+\fB--font\fR=\fIFILE\fR -+Use \fIFILE\fR as the font file for generated labels. -+ -+.TP -+--input=\fIFILE\fR -+Read input text from \fIFILE\fR. -+ -+.TP -+--output=\fIFILE\fR -+Render output to \fIFILE\fR. -+ -+.TP -+--text=\fISTRING\fR -+Use \fISTRING\fR as input text. -+ -+.TP -+--verbose -+Print verbose output. -+ -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-script-check.1 b/util/grub-script-check.1 -new file mode 100644 -index 00000000000..0f1f625b05d ---- /dev/null -+++ b/util/grub-script-check.1 -@@ -0,0 +1,21 @@ -+.TH GRUB-SCRIPT-CHECK 3 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-script-check\fR \(em Check GRUB configuration file for syntax errors. -+ -+.SH SYNOPSIS -+\fBgrub-script-check\fR [-v | --verbose] \fIPATH\fR -+ -+.SH DESCRIPTION -+\fBgrub-script-check\fR verifies that a specified GRUB configuration file does not contain syntax errors. -+ -+.SH OPTIONS -+.TP -+--verbose -+Print verbose output. -+ -+.TP -+\fIPATH\fR -+Path of the file to use as input. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-set-default.8 b/util/grub-set-default.8 -new file mode 100644 -index 00000000000..a96265a1509 ---- /dev/null -+++ b/util/grub-set-default.8 -@@ -0,0 +1,21 @@ -+.TH GRUB-SET-DEFAULT 1 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-set-default\fR \(em Set the default boot menu entry for GRUB. -+ -+.SH SYNOPSIS -+\fBgrub-set-default\fR [--boot-directory=\fIDIR\fR] \fIMENU_ENTRY\fR -+ -+.SH DESCRIPTION -+\fBgrub-set-default\fR sets the default boot menu entry for all subsequent boots. This command only works for GRUB configuration files created with \fIGRUB_DEFAULT=saved\fR in \fI/etc/default/grub\fR. -+ -+.SH OPTIONS -+.TP -+--boot-directory=\fIDIR\fR -+Find GRUB images under \fIDIR/grub\fR. The default value is \fI/boot\fR, resulting in grub images being search for at \fI/boot/grub\fR. -+ -+.TP -+\fIMENU_ENTRY\fR -+A number, a menu item title or a menu item identifier. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-sparc64-setup.8 b/util/grub-sparc64-setup.8 -new file mode 100644 -index 00000000000..37ea2dd5eaa ---- /dev/null -+++ b/util/grub-sparc64-setup.8 -@@ -0,0 +1,12 @@ -+.TH GRUB-SPARC64-SETUP 3 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-sparc64-setup\fR \(em Set up a device to boot a sparc64 GRUB image. -+ -+.SH SYNOPSIS -+\fBgrub-sparc64-setup\fR [OPTIONS]. -+ -+.SH DESCRIPTION -+You should not normally run this program directly. Use grub-install instead. -+ -+.SH SEE ALSO -+.BR "info grub" diff --git a/0028-use-fw_path-prefix-when-fallback-searching-for-grub-.patch b/0027-use-fw_path-prefix-when-fallback-searching-for-grub-.patch similarity index 97% rename from 0028-use-fw_path-prefix-when-fallback-searching-for-grub-.patch rename to 0027-use-fw_path-prefix-when-fallback-searching-for-grub-.patch index 6b1580b..619cd92 100644 --- a/0028-use-fw_path-prefix-when-fallback-searching-for-grub-.patch +++ b/0027-use-fw_path-prefix-when-fallback-searching-for-grub-.patch @@ -17,7 +17,7 @@ Signed-off-by: Mark Salter <msalter(a)redhat.com> 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index 7ca2e5400b1..02577502116 100644 +index 7ca2e5400..025775021 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -347,7 +347,7 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)), diff --git a/0029-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch b/0028-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch similarity index 99% rename from 0029-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch rename to 0028-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch index ab49bb1..54b8a05 100644 --- a/0029-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch +++ b/0028-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch @@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 51 insertions(+), 46 deletions(-) diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index 02577502116..880d0ebd454 100644 +index 025775021..880d0ebd4 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -345,61 +345,66 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)), diff --git a/0030-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch b/0029-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch similarity index 96% rename from 0030-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch rename to 0029-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch index 245faf7..6ad5b7a 100644 --- a/0030-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch +++ b/0029-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index cf8d1186981..5f6d3c8d52d 100644 +index cf8d11869..5f6d3c8d5 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -29,7 +29,8 @@ export TEXTDOMAINDIR="@localedir@" diff --git a/0031-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch b/0030-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch similarity index 96% rename from 0031-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch rename to 0030-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch index 3e2d3ae..6d8d673 100644 --- a/0031-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch +++ b/0030-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch @@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 8 insertions(+) diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in -index 301d1ac229a..0f6505bf3b6 100644 +index 301d1ac22..0f6505bf3 100644 --- a/util/grub-mkconfig_lib.in +++ b/util/grub-mkconfig_lib.in @@ -253,6 +253,14 @@ version_test_gt () diff --git a/0032-Try-prefix-if-fw_path-doesn-t-work.patch b/0031-Try-prefix-if-fw_path-doesn-t-work.patch similarity index 98% rename from 0032-Try-prefix-if-fw_path-doesn-t-work.patch rename to 0031-Try-prefix-if-fw_path-doesn-t-work.patch index 54a876b..2abb239 100644 --- a/0032-Try-prefix-if-fw_path-doesn-t-work.patch +++ b/0031-Try-prefix-if-fw_path-doesn-t-work.patch @@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 3 files changed, 82 insertions(+), 82 deletions(-) diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c -index e71d1584164..0cd2a627231 100644 +index e71d15841..0cd2a6272 100644 --- a/grub-core/kern/ieee1275/init.c +++ b/grub-core/kern/ieee1275/init.c @@ -127,23 +127,25 @@ grub_machine_get_bootlocation (char **device, char **path) @@ -56,7 +56,7 @@ index e71d1584164..0cd2a627231 100644 } diff --git a/grub-core/net/net.c b/grub-core/net/net.c -index 4d3eb5c1a52..0ef148f4adc 100644 +index 4d3eb5c1a..0ef148f4a 100644 --- a/grub-core/net/net.c +++ b/grub-core/net/net.c @@ -1869,7 +1869,7 @@ grub_net_search_config_file (char *config) @@ -69,7 +69,7 @@ index 4d3eb5c1a52..0ef148f4adc 100644 static struct grub_preboot *fini_hnd; diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index 880d0ebd454..d5df4f815b0 100644 +index 880d0ebd4..d5df4f815 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -335,81 +335,79 @@ grub_enter_normal_mode (const char *config) diff --git a/0033-Use-rpm-s-sort-for-grub2-mkconfig.patch b/0032-Use-rpm-s-sort-for-grub2-mkconfig.patch similarity index 89% rename from 0033-Use-rpm-s-sort-for-grub2-mkconfig.patch rename to 0032-Use-rpm-s-sort-for-grub2-mkconfig.patch index ff1c13e..2a1e364 100644 --- a/0033-Use-rpm-s-sort-for-grub2-mkconfig.patch +++ b/0032-Use-rpm-s-sort-for-grub2-mkconfig.patch @@ -16,20 +16,20 @@ Signed-off-by: Thierry Vignaud <thierry.vignaud(a)gmail.com> Signed-off-by: Tim Landscheidt <tim(a)tim-landscheidt.de> [javierm: don't check for rpmvercmp in librpm] Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> -[rharwood: commit message] +[rharwood: commit message, migrate to h2m] Signed-off-by: Robbie Harwood <rharwood(a)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(-) + configure.ac | 36 ++++++ + Makefile.util.def | 17 +++ + util/grub-rpm-sort.c | 281 +++++++++++++++++++++++++++++++++++++++++++++ + docs/man/grub-rpm-sort.h2m | 2 + + util/grub-mkconfig_lib.in | 11 +- + 5 files changed, 346 insertions(+), 1 deletion(-) create mode 100644 util/grub-rpm-sort.c - create mode 100644 util/grub-rpm-sort.8 + create mode 100644 docs/man/grub-rpm-sort.h2m diff --git a/configure.ac b/configure.ac -index bec8535af70..643a13f9147 100644 +index 8331f95b6..87c8f1739 100644 --- a/configure.ac +++ b/configure.ac @@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath]) @@ -40,15 +40,7 @@ index bec8535af70..643a13f9147 100644 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 +@@ -1837,6 +1838,35 @@ fi AC_SUBST([LIBDEVMAPPER]) @@ -84,7 +76,7 @@ index bec8535af70..643a13f9147 100644 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]) +@@ -2024,6 +2054,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]) @@ -92,7 +84,7 @@ index bec8535af70..643a13f9147 100644 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 +@@ -2145,6 +2176,11 @@ echo grub-mount: Yes else echo grub-mount: No "($grub_mount_excuse)" fi @@ -105,7 +97,7 @@ index bec8535af70..643a13f9147 100644 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 +index 2c9b283a2..bc10cc797 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -703,6 +703,23 @@ program = { @@ -134,7 +126,7 @@ index 2c9b283a230..bc10cc79722 100644 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 +index 000000000..f33bd1ed5 --- /dev/null +++ b/util/grub-rpm-sort.c @@ -0,0 +1,281 @@ @@ -419,8 +411,16 @@ index 00000000000..f33bd1ed568 + + return 0; +} +diff --git a/docs/man/grub-rpm-sort.h2m b/docs/man/grub-rpm-sort.h2m +new file mode 100644 +index 000000000..fe711ae10 +--- /dev/null ++++ b/docs/man/grub-rpm-sort.h2m +@@ -0,0 +1,2 @@ ++[NAME] ++grub-rpm-sort \- sort input according to RPM version compare diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in -index 0f6505bf3b6..42c2ea9ba50 100644 +index 0f6505bf3..42c2ea9ba 100644 --- a/util/grub-mkconfig_lib.in +++ b/util/grub-mkconfig_lib.in @@ -33,6 +33,9 @@ fi @@ -455,21 +455,3 @@ index 0f6505bf3b6..42c2ea9ba50 100644 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" diff --git a/0034-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0033-Make-grub2-mkconfig-construct-titles-that-look-like-.patch similarity index 98% rename from 0034-Make-grub2-mkconfig-construct-titles-that-look-like-.patch rename to 0033-Make-grub2-mkconfig-construct-titles-that-look-like-.patch index 4eb37e1..89a3879 100644 --- a/0034-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +++ b/0033-Make-grub2-mkconfig-construct-titles-that-look-like-.patch @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 5f6d3c8d52d..786dbabb4a8 100644 +index 5f6d3c8d5..786dbabb4 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -78,6 +78,32 @@ case x"$GRUB_FS" in diff --git a/0035-Add-friendly-grub2-password-config-tool-985962.patch b/0034-Add-friendly-grub2-password-config-tool-985962.patch similarity index 80% rename from 0035-Add-friendly-grub2-password-config-tool-985962.patch rename to 0034-Add-friendly-grub2-password-config-tool-985962.patch index 2d6f18a..40f9738 100644 --- a/0035-Add-friendly-grub2-password-config-tool-985962.patch +++ b/0034-Add-friendly-grub2-password-config-tool-985962.patch @@ -13,21 +13,23 @@ Signed-off-by: Robert Marshall <rmarshall(a)redhat.com> [pjones: fix the efidir in grub-setpassword and rename tool] Signed-off-by: Peter Jones <pjones(a)redhat.com> [luto: fix grub-setpassword -o's output path] -Andy Lutomirski <luto(a)kernel.org> +Signed-off-by: Andy Lutomirski <luto(a)kernel.org> +[rharwood: migrate man page to h2m] +Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> --- - configure.ac | 1 + - Makefile.util.def | 13 +++++ - util/grub-mkconfig.in | 2 + - util/grub-set-password.8 | 28 ++++++++++ - util/grub-set-password.in | 128 ++++++++++++++++++++++++++++++++++++++++++++++ - util/grub.d/01_users.in | 11 ++++ - 6 files changed, 183 insertions(+) - create mode 100644 util/grub-set-password.8 + configure.ac | 1 + + Makefile.util.def | 13 +++++ + docs/man/grub-set-password.h2m | 2 + + util/grub-mkconfig.in | 2 + + util/grub-set-password.in | 128 +++++++++++++++++++++++++++++++++++++++++ + util/grub.d/01_users.in | 11 ++++ + 6 files changed, 157 insertions(+) + create mode 100644 docs/man/grub-set-password.h2m create mode 100644 util/grub-set-password.in create mode 100644 util/grub.d/01_users.in diff --git a/configure.ac b/configure.ac -index 643a13f9147..25e1abb59b9 100644 +index 87c8f1739..916bede6b 100644 --- a/configure.ac +++ b/configure.ac @@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath]) @@ -39,7 +41,7 @@ index 643a13f9147..25e1abb59b9 100644 grub_TRANSFORM([grub-script-check]) grub_TRANSFORM([grub-set-default]) diff --git a/Makefile.util.def b/Makefile.util.def -index bc10cc79722..8ca4c14f0b9 100644 +index bc10cc797..8ca4c14f0 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -452,6 +452,12 @@ script = { @@ -69,8 +71,16 @@ index bc10cc79722..8ca4c14f0b9 100644 script = { name = grub-mkconfig_lib; common = util/grub-mkconfig_lib.in; +diff --git a/docs/man/grub-set-password.h2m b/docs/man/grub-set-password.h2m +new file mode 100644 +index 000000000..10ee82f4d +--- /dev/null ++++ b/docs/man/grub-set-password.h2m +@@ -0,0 +1,2 @@ ++[NAME] ++grub-set-password \- generate the user.cfg file containing the hashed grub bootloader password diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 8ea2315ebc2..ba14cf6261c 100644 +index 8ea2315eb..ba14cf626 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -276,6 +276,8 @@ for i in "${grub_mkconfig_dir}"/* ; do @@ -82,43 +92,9 @@ index 8ea2315ebc2..ba14cf6261c 100644 *) if grub_file_is_not_garbage "$i" && test -x "$i" ; then echo -diff --git a/util/grub-set-password.8 b/util/grub-set-password.8 -new file mode 100644 -index 00000000000..9646546e43d ---- /dev/null -+++ b/util/grub-set-password.8 -@@ -0,0 +1,28 @@ -+.TH GRUB-SET-PASSWORD 3 "Thu Jun 25 2015" -+.SH NAME -+\fBgrub-set-password\fR \(em Generate the user.cfg file containing the hashed grub bootloader password. -+ -+.SH SYNOPSIS -+\fBgrub-set-password\fR [OPTION] -+ -+.SH DESCRIPTION -+\fBgrub-set-password\fR outputs the user.cfg file which contains the hashed GRUB bootloader password. This utility only supports configurations where there is a single root user. -+ -+The file has the format: -+GRUB2_PASSWORD=<\fIhashed password\fR>. -+ -+.SH OPTIONS -+.TP -+-h, --help -+Display program usage and exit. -+.TP -+-v, --version -+Display the current version. -+.TP -+-o, --output=<\fIDIRECTORY\fR> -+Choose the file path to which user.cfg will be written. -+ -+.SH SEE ALSO -+.BR "info grub" -+ -+.BR "info grub2-mkpasswd-pbkdf2" diff --git a/util/grub-set-password.in b/util/grub-set-password.in new file mode 100644 -index 00000000000..5ebf50576d6 +index 000000000..5ebf50576 --- /dev/null +++ b/util/grub-set-password.in @@ -0,0 +1,128 @@ @@ -252,7 +228,7 @@ index 00000000000..5ebf50576d6 +fi diff --git a/util/grub.d/01_users.in b/util/grub.d/01_users.in new file mode 100644 -index 00000000000..db2f44bfb78 +index 000000000..db2f44bfb --- /dev/null +++ b/util/grub.d/01_users.in @@ -0,0 +1,11 @@ diff --git a/0036-tcp-add-window-scaling-support.patch b/0035-tcp-add-window-scaling-support.patch similarity index 98% rename from 0036-tcp-add-window-scaling-support.patch rename to 0035-tcp-add-window-scaling-support.patch index 7d1996c..e19ddf8 100644 --- a/0036-tcp-add-window-scaling-support.patch +++ b/0035-tcp-add-window-scaling-support.patch @@ -17,7 +17,7 @@ Signed-off-by: Josef Bacik <jbacik(a)fb.com> 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/grub-core/net/tcp.c b/grub-core/net/tcp.c -index e8ad34b84d4..7d4b822626d 100644 +index e8ad34b84..7d4b82262 100644 --- a/grub-core/net/tcp.c +++ b/grub-core/net/tcp.c @@ -106,6 +106,18 @@ struct tcphdr diff --git a/0037-efinet-and-bootp-add-support-for-dhcpv6.patch b/0036-efinet-and-bootp-add-support-for-dhcpv6.patch similarity index 98% rename from 0037-efinet-and-bootp-add-support-for-dhcpv6.patch rename to 0036-efinet-and-bootp-add-support-for-dhcpv6.patch index a9844b8..4daf9e5 100644 --- a/0037-efinet-and-bootp-add-support-for-dhcpv6.patch +++ b/0036-efinet-and-bootp-add-support-for-dhcpv6.patch @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 6 files changed, 477 insertions(+), 14 deletions(-) diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c -index 6fb5627025d..e28fb6a09f9 100644 +index 6fb562702..e28fb6a09 100644 --- a/grub-core/net/bootp.c +++ b/grub-core/net/bootp.c @@ -902,6 +902,179 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)), @@ -198,7 +198,7 @@ index 6fb5627025d..e28fb6a09f9 100644 grub_bootp_init (void) { diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c -index 5388f952ba9..173fb63153c 100644 +index 5388f952b..173fb6315 100644 --- a/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c @@ -18,11 +18,14 @@ @@ -307,7 +307,7 @@ index 5388f952ba9..173fb63153c 100644 } } diff --git a/grub-core/net/net.c b/grub-core/net/net.c -index 0ef148f4adc..22f2689aaeb 100644 +index 0ef148f4a..22f2689aa 100644 --- a/grub-core/net/net.c +++ b/grub-core/net/net.c @@ -960,6 +960,78 @@ grub_net_network_level_interface_register (struct grub_net_network_level_interfa @@ -390,7 +390,7 @@ index 0ef148f4adc..22f2689aaeb 100644 grub_err_t grub_net_add_ipv4_local (struct grub_net_network_level_interface *inter, diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c -index 7f44b30f521..4ab2f5c7357 100644 +index 7f44b30f5..4ab2f5c73 100644 --- a/grub-core/net/tftp.c +++ b/grub-core/net/tftp.c @@ -358,18 +358,22 @@ tftp_open (struct grub_file *file, const char *filename) @@ -417,7 +417,7 @@ index 7f44b30f521..4ab2f5c7357 100644 return grub_errno; } diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h -index f1a52210c0c..117469450d3 100644 +index f1a52210c..117469450 100644 --- a/include/grub/efi/api.h +++ b/include/grub/efi/api.h @@ -592,10 +592,16 @@ typedef void *grub_efi_handle_t; @@ -572,7 +572,7 @@ index f1a52210c0c..117469450d3 100644 typedef struct grub_efi_pxe diff --git a/include/grub/net.h b/include/grub/net.h -index 7ae4b6bd805..8a05ec4fe7a 100644 +index 7ae4b6bd8..8a05ec4fe 100644 --- a/include/grub/net.h +++ b/include/grub/net.h @@ -447,6 +447,51 @@ struct grub_net_bootp_packet diff --git a/0038-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch b/0037-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch similarity index 84% rename from 0038-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch rename to 0037-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch index bf78c81..80948ce 100644 --- a/0038-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch +++ b/0037-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch @@ -10,20 +10,21 @@ variables are then used by 10_linux to choose whether or not to create debug stanzas. Resolves: rhbz#1226325 +[rharwood: migrate man page to h2m] --- - configure.ac | 2 + + configure.ac | 1 + Makefile.util.def | 7 ++ + docs/man/grub-get-kernel-settings.h2m | 2 + util/bash-completion.d/grub-completion.bash.in | 22 +++++++ - util/grub-get-kernel-settings.3 | 20 ++++++ util/grub-get-kernel-settings.in | 88 ++++++++++++++++++++++++++ util/grub-mkconfig.in | 3 + util/grub.d/10_linux.in | 23 +++++-- - 7 files changed, 160 insertions(+), 5 deletions(-) - create mode 100644 util/grub-get-kernel-settings.3 + 7 files changed, 141 insertions(+), 5 deletions(-) + create mode 100644 docs/man/grub-get-kernel-settings.h2m create mode 100644 util/grub-get-kernel-settings.in diff --git a/configure.ac b/configure.ac -index 25e1abb59b9..58e57a745fa 100644 +index 916bede6b..4f1676967 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,7 @@ grub_TRANSFORM([grub-install]) @@ -34,16 +35,8 @@ index 25e1abb59b9..58e57a745fa 100644 grub_TRANSFORM([grub-glue-efi]) grub_TRANSFORM([grub-mklayout]) grub_TRANSFORM([grub-mkpasswd-pbkdf2]) -@@ -82,6 +83,7 @@ grub_TRANSFORM([grub-file]) - grub_TRANSFORM([grub-bios-setup.3]) - grub_TRANSFORM([grub-editenv.1]) - grub_TRANSFORM([grub-fstest.3]) -+grub_TRANSFORM([grub-get-kernel-settings.3]) - grub_TRANSFORM([grub-glue-efi.3]) - grub_TRANSFORM([grub-install.1]) - grub_TRANSFORM([grub-kbdcomp.3]) diff --git a/Makefile.util.def b/Makefile.util.def -index 8ca4c14f0b9..43a1c7453b1 100644 +index 8ca4c14f0..43a1c7453 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -733,6 +733,13 @@ script = { @@ -60,8 +53,16 @@ index 8ca4c14f0b9..43a1c7453b1 100644 script = { name = grub-set-default; common = util/grub-set-default.in; +diff --git a/docs/man/grub-get-kernel-settings.h2m b/docs/man/grub-get-kernel-settings.h2m +new file mode 100644 +index 000000000..b8051f01f +--- /dev/null ++++ b/docs/man/grub-get-kernel-settings.h2m +@@ -0,0 +1,2 @@ ++[NAME] ++grub-get-kernel-settings \- Evaluate the system's kernel installation settings for use while making a grub configuration file diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completion.d/grub-completion.bash.in -index 44bf135b9f8..5c4acd496d4 100644 +index 44bf135b9..5c4acd496 100644 --- a/util/bash-completion.d/grub-completion.bash.in +++ b/util/bash-completion.d/grub-completion.bash.in @@ -264,6 +264,28 @@ have ${__grub_sparc64_setup_program} && \ @@ -93,35 +94,9 @@ index 44bf135b9f8..5c4acd496d4 100644 # # grub-install # -diff --git a/util/grub-get-kernel-settings.3 b/util/grub-get-kernel-settings.3 -new file mode 100644 -index 00000000000..ba33330e28d ---- /dev/null -+++ b/util/grub-get-kernel-settings.3 -@@ -0,0 +1,20 @@ -+.TH GRUB-GET-KERNEL-SETTINGS 3 "Thu Jun 25 2015" -+.SH NAME -+\fBgrub-get-kernel-settings\fR \(em Evaluate the system's kernel installation settings for use while making a grub configuration file. -+ -+.SH SYNOPSIS -+\fBgrub-get-kernel-settings\fR [OPTION] -+ -+.SH DESCRIPTION -+\fBgrub-get-kernel-settings\fR reads the kernel installation settings on the host system, and emits a set of grub settings suitable for use when creating a grub configuration file. -+ -+.SH OPTIONS -+.TP -+-h, --help -+Display program usage and exit. -+.TP -+-v, --version -+Display the current version. -+ -+.SH SEE ALSO -+.BR "info grub" diff --git a/util/grub-get-kernel-settings.in b/util/grub-get-kernel-settings.in new file mode 100644 -index 00000000000..7e87dfccc0e +index 000000000..7e87dfccc --- /dev/null +++ b/util/grub-get-kernel-settings.in @@ -0,0 +1,88 @@ @@ -214,7 +189,7 @@ index 00000000000..7e87dfccc0e + echo export GRUB_UPDATE_DEFAULT_KERNEL +fi diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index ba14cf6261c..005f093809b 100644 +index ba14cf626..005f09380 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -45,6 +45,7 @@ grub_probe="${sbindir}/@grub_probe@" @@ -235,7 +210,7 @@ index ba14cf6261c..005f093809b 100644 if [ -z "${GRUB_DISABLE_LINUX_UUID}" ]; then GRUB_DISABLE_LINUX_UUID="true" diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 786dbabb4a8..292e333324b 100644 +index 786dbabb4..292e33332 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -111,7 +111,8 @@ linux_entry () diff --git a/0039-bz1374141-fix-incorrect-mask-for-ppc64.patch b/0038-bz1374141-fix-incorrect-mask-for-ppc64.patch similarity index 98% rename from 0039-bz1374141-fix-incorrect-mask-for-ppc64.patch rename to 0038-bz1374141-fix-incorrect-mask-for-ppc64.patch index ef992f5..feec4a6 100644 --- a/0039-bz1374141-fix-incorrect-mask-for-ppc64.patch +++ b/0038-bz1374141-fix-incorrect-mask-for-ppc64.patch @@ -33,7 +33,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c -index ac4e62a95c9..3860b6f78d8 100644 +index ac4e62a95..3860b6f78 100644 --- a/grub-core/net/drivers/ieee1275/ofnet.c +++ b/grub-core/net/drivers/ieee1275/ofnet.c @@ -220,8 +220,7 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath, diff --git a/0040-Make-grub_fatal-also-backtrace.patch b/0039-Make-grub_fatal-also-backtrace.patch similarity index 96% rename from 0040-Make-grub_fatal-also-backtrace.patch rename to 0039-Make-grub_fatal-also-backtrace.patch index 3534b05..ec24049 100644 --- a/0040-Make-grub_fatal-also-backtrace.patch +++ b/0039-Make-grub_fatal-also-backtrace.patch @@ -13,7 +13,7 @@ Subject: [PATCH] Make grub_fatal() also backtrace. create mode 100644 grub-core/lib/arm64/backtrace.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index c15e91943b9..058c88ac3af 100644 +index c15e91943..058c88ac3 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -188,6 +188,9 @@ kernel = { @@ -27,7 +27,7 @@ index c15e91943b9..058c88ac3af 100644 i386_xen = kern/i386/dl.c; i386_xen_pvh = kern/i386/dl.c; diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index 63b586d09cb..a3e215155bd 100644 +index 63b586d09..a3e215155 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -24,6 +24,7 @@ @@ -55,7 +55,7 @@ index 63b586d09cb..a3e215155bd 100644 #endif diff --git a/grub-core/lib/arm64/backtrace.c b/grub-core/lib/arm64/backtrace.c new file mode 100644 -index 00000000000..1079b5380e1 +index 000000000..1079b5380 --- /dev/null +++ b/grub-core/lib/arm64/backtrace.c @@ -0,0 +1,62 @@ @@ -122,7 +122,7 @@ index 00000000000..1079b5380e1 +} + diff --git a/grub-core/lib/backtrace.c b/grub-core/lib/backtrace.c -index 825a8800e25..c0ad6ab8be1 100644 +index 825a8800e..c0ad6ab8b 100644 --- a/grub-core/lib/backtrace.c +++ b/grub-core/lib/backtrace.c @@ -29,6 +29,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); @@ -142,7 +142,7 @@ index 825a8800e25..c0ad6ab8be1 100644 } diff --git a/grub-core/lib/i386/backtrace.c b/grub-core/lib/i386/backtrace.c -index c3e03c7275c..c67273db3ae 100644 +index c3e03c727..c67273db3 100644 --- a/grub-core/lib/i386/backtrace.c +++ b/grub-core/lib/i386/backtrace.c @@ -15,11 +15,23 @@ diff --git a/0042-Make-our-info-pages-say-grub2-where-appropriate.patch b/0040-Make-our-info-pages-say-grub2-where-appropriate.patch similarity index 99% rename from 0042-Make-our-info-pages-say-grub2-where-appropriate.patch rename to 0040-Make-our-info-pages-say-grub2-where-appropriate.patch index be28efd..eda8d45 100644 --- a/0042-Make-our-info-pages-say-grub2-where-appropriate.patch +++ b/0040-Make-our-info-pages-say-grub2-where-appropriate.patch @@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 171 insertions(+), 154 deletions(-) diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi -index 6c629a23e2d..19f708ee662 100644 +index 6c629a23e..19f708ee6 100644 --- a/docs/grub-dev.texi +++ b/docs/grub-dev.texi @@ -1,7 +1,7 @@ @@ -35,7 +35,7 @@ index 6c629a23e2d..19f708ee662 100644 @setchapternewpage odd diff --git a/docs/grub.texi b/docs/grub.texi -index 69f08d289f9..0615d0ed97e 100644 +index 69f08d289..0615d0ed9 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -1,7 +1,7 @@ diff --git a/0041-Fix-up-some-man-pages-rpmdiff-noticed.patch b/0041-Fix-up-some-man-pages-rpmdiff-noticed.patch deleted file mode 100644 index be58417..0000000 --- a/0041-Fix-up-some-man-pages-rpmdiff-noticed.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Peter Jones <pjones(a)redhat.com> -Date: Tue, 23 Sep 2014 09:58:49 -0400 -Subject: [PATCH] Fix up some man pages rpmdiff noticed. - ---- - configure.ac | 2 ++ - util/grub-macbless.8 | 26 +++++++++++++++++++ - util/grub-mkimage.1 | 2 +- - util/grub-syslinux2cfg.1 | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 94 insertions(+), 1 deletion(-) - create mode 100644 util/grub-macbless.8 - create mode 100644 util/grub-syslinux2cfg.1 - -diff --git a/configure.ac b/configure.ac -index 58e57a745fa..a0030632220 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -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]) -+grub_TRANSFORM([grub-macbless.8]) - grub_TRANSFORM([grub-menulst2cfg.1]) - grub_TRANSFORM([grub-mkconfig.1]) - grub_TRANSFORM([grub-mkfont.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]) -+grub_TRANSFORM([grub-syslinux2cfg.1]) - - # Optimization flag. Allow user to override. - if test "x$TARGET_CFLAGS" = x; then -diff --git a/util/grub-macbless.8 b/util/grub-macbless.8 -new file mode 100644 -index 00000000000..ae842f3a606 ---- /dev/null -+++ b/util/grub-macbless.8 -@@ -0,0 +1,26 @@ -+.TH GRUB-MACBLESS 1 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-macbless\fR \(em Mac-style bless utility for HFS or HFS+ -+ -+.SH SYNOPSIS -+\fBgrub-macbless\fR [-p | --ppc] [-v | --verbose] [-x | --x86] \fIFILE\fR -+ -+.SH DESCRIPTION -+\fBgrub-mkimage\fR blesses a file on an HFS or HFS+ file system, so that it -+can be used to boot a Mac. -+ -+.SH OPTIONS -+.TP -+--ppc -+Bless the file for use on PPC-based Macs. -+ -+.TP -+--verbose -+Print verbose messages. -+ -+.TP -+--x86 -+Bless the file for use on x86-based Macs. -+ -+.SH SEE ALSO -+.BR "info grub" -diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1 -index 4dea4f54597..0eaaafe505b 100644 ---- a/util/grub-mkimage.1 -+++ b/util/grub-mkimage.1 -@@ -17,7 +17,7 @@ - [-v | --verbose] \fIMODULES\fR - - .SH DESCRIPTION --\fBgrub-mkimage\fI builds a bootable image of GRUB. -+\fBgrub-mkimage\fR builds a bootable image of GRUB. - - .SH OPTIONS - .TP -diff --git a/util/grub-syslinux2cfg.1 b/util/grub-syslinux2cfg.1 -new file mode 100644 -index 00000000000..85309482718 ---- /dev/null -+++ b/util/grub-syslinux2cfg.1 -@@ -0,0 +1,65 @@ -+.TH GRUB-SYSLINUX2CFG 1 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-syslinux2cfg\fR \(em Transform a syslinux config file into a GRUB config. -+ -+.SH SYNOPSIS -+\fBgrub-syslinux2cfg\fR [-c | --cwd=\fRDIR\fI] [-r | --root=\fIDIR\fR] [-v | --verbose] -+.RE -+.RS 25 -+[-t | --target-root=\fIDIR\fR] [-T | --target-cwd=\fIDIR\fR] -+.RE -+.RS 25 -+[-o | --output=\fIFILE\fR] [[-i | --isolinux] | -+.RE -+.RS 46 -+ [-s | --syslinux] | -+.RE -+.RS 46 -+ [-p | --pxelinux]] \fIFILE\fR -+ -+.SH DESCRIPTION -+\fBgrub-syslinux2cfg\fR builds a GRUB configuration file out of an existing -+syslinux configuration file. -+ -+.SH OPTIONS -+.TP -+--cwd=\fIDIR\fR -+Set \fIDIR\fR as syslinux's working directory. The default is to use the -+parent directory of the input file. -+ -+.TP -+--root=\fIDIR\fR -+Set \fIDIR\fR as the root directory of the syslinux disk. The default value -+is "/". -+ -+.TP -+--verbose -+Print verbose messages. -+ -+.TP -+--target-root=\fIDIR\fR -+Root directory as it will be seen at runtime. The default value is "/". -+ -+.TP -+--target-cwd=\fIDIR\fR -+Working directory of syslinux as it will be seen at runtime. The default -+value is the parent directory of the input file. -+ -+.TP -+--output=\fIFILE\fR -+Write the new config file to \fIFILE\fR. The default value is standard output. -+ -+.TP -+--isolinux -+Assume that the input file is an isolinux configuration file. -+ -+.TP -+--pxelinux -+Assume that the input file is a pxelinux configuration file. -+ -+.TP -+--syslinux -+Assume that the input file is a syslinux configuration file. -+ -+.SH SEE ALSO -+.BR "info grub" diff --git a/0043-macos-just-build-chainloader-entries-don-t-try-any-x.patch b/0041-macos-just-build-chainloader-entries-don-t-try-any-x.patch similarity index 99% rename from 0043-macos-just-build-chainloader-entries-don-t-try-any-x.patch rename to 0041-macos-just-build-chainloader-entries-don-t-try-any-x.patch index 574d117..5610661 100644 --- a/0043-macos-just-build-chainloader-entries-don-t-try-any-x.patch +++ b/0041-macos-just-build-chainloader-entries-don-t-try-any-x.patch @@ -20,7 +20,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 18 insertions(+), 60 deletions(-) diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in -index 1b91c102f35..4b27bd20153 100644 +index 1b91c102f..4b27bd201 100644 --- a/util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in @@ -42,68 +42,25 @@ if [ -z "${OSPROBED}" ] ; then diff --git a/0044-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch b/0042-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch similarity index 99% rename from 0044-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch rename to 0042-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch index 68dfc1d..bea6e32 100644 --- a/0044-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch +++ b/0042-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch @@ -24,7 +24,7 @@ Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> 2 files changed, 533 insertions(+), 20 deletions(-) diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index 63203034dfc..f1fff7385b5 100644 +index 63203034d..f1fff7385 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -38,6 +38,9 @@ @@ -690,7 +690,7 @@ index 63203034dfc..f1fff7385b5 100644 + +// vim: si et sw=2: diff --git a/include/grub/btrfs.h b/include/grub/btrfs.h -index 9d93fb6c182..234ad976771 100644 +index 9d93fb6c1..234ad9767 100644 --- a/include/grub/btrfs.h +++ b/include/grub/btrfs.h @@ -29,6 +29,7 @@ enum diff --git a/0045-export-btrfs_subvol-and-btrfs_subvolid.patch b/0043-export-btrfs_subvol-and-btrfs_subvolid.patch similarity index 95% rename from 0045-export-btrfs_subvol-and-btrfs_subvolid.patch rename to 0043-export-btrfs_subvol-and-btrfs_subvolid.patch index d38a6b8..61d1699 100644 --- a/0045-export-btrfs_subvol-and-btrfs_subvolid.patch +++ b/0043-export-btrfs_subvol-and-btrfs_subvolid.patch @@ -12,7 +12,7 @@ Signed-off-by: Michael Chang <mchang(a)suse.com> 1 file changed, 2 insertions(+) diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index f1fff7385b5..ad1b56b716d 100644 +index f1fff7385..ad1b56b71 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -2714,6 +2714,8 @@ GRUB_MOD_INIT (btrfs) diff --git a/0046-grub2-btrfs-03-follow_default.patch b/0044-grub2-btrfs-03-follow_default.patch similarity index 99% rename from 0046-grub2-btrfs-03-follow_default.patch rename to 0044-grub2-btrfs-03-follow_default.patch index ca203f4..f9a935e 100644 --- a/0046-grub2-btrfs-03-follow_default.patch +++ b/0044-grub2-btrfs-03-follow_default.patch @@ -10,7 +10,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 76 insertions(+), 31 deletions(-) diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index ad1b56b716d..113c1f746c9 100644 +index ad1b56b71..113c1f746 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -1256,6 +1256,7 @@ grub_btrfs_mount (grub_device_t dev) diff --git a/0047-grub2-btrfs-04-grub2-install.patch b/0045-grub2-btrfs-04-grub2-install.patch similarity index 95% rename from 0047-grub2-btrfs-04-grub2-install.patch rename to 0045-grub2-btrfs-04-grub2-install.patch index 451f61d..2ce64b1 100644 --- a/0047-grub2-btrfs-04-grub2-install.patch +++ b/0045-grub2-btrfs-04-grub2-install.patch @@ -15,7 +15,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 6 files changed, 54 insertions(+), 2 deletions(-) diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c -index 001b818fe58..caf9b1ccd3f 100644 +index 001b818fe..caf9b1ccd 100644 --- a/grub-core/osdep/linux/getroot.c +++ b/grub-core/osdep/linux/getroot.c @@ -376,6 +376,7 @@ get_btrfs_fs_prefix (const char *mount_path) @@ -40,7 +40,7 @@ index 001b818fe58..caf9b1ccd3f 100644 else if (!retry && grub_strcmp (entries[i].fstype, "autofs") == 0) { diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c -index 7d6325138ce..46a881530c0 100644 +index 7d6325138..46a881530 100644 --- a/grub-core/osdep/unix/config.c +++ b/grub-core/osdep/unix/config.c @@ -82,6 +82,19 @@ grub_util_load_config (struct grub_util_config *cfg) @@ -75,7 +75,7 @@ index 7d6325138ce..46a881530c0 100644 argv[2] = script; argv[3] = '\0'; diff --git a/util/config.c b/util/config.c -index ebcdd8f5e22..f044a880a76 100644 +index ebcdd8f5e..f044a880a 100644 --- a/util/config.c +++ b/util/config.c @@ -42,6 +42,16 @@ grub_util_parse_config (FILE *f, struct grub_util_config *cfg, int simple) @@ -96,7 +96,7 @@ index ebcdd8f5e22..f044a880a76 100644 sizeof ("GRUB_DISTRIBUTOR=") - 1) == 0) { diff --git a/util/grub-install.c b/util/grub-install.c -index 0fbe7f78c6d..0f66f36d23a 100644 +index 0fbe7f78c..0f66f36d2 100644 --- a/util/grub-install.c +++ b/util/grub-install.c @@ -827,6 +827,8 @@ fill_core_services (const char *core_services) @@ -136,7 +136,7 @@ index 0fbe7f78c6d..0f66f36d23a 100644 char *install_drive = NULL; diff --git a/util/grub-mkrelpath.c b/util/grub-mkrelpath.c -index 47a241a391b..5db7a9a7d97 100644 +index 47a241a39..5db7a9a7d 100644 --- a/util/grub-mkrelpath.c +++ b/util/grub-mkrelpath.c @@ -40,9 +40,12 @@ struct arguments @@ -163,7 +163,7 @@ index 47a241a391b..5db7a9a7d97 100644 if (state->arg_num == 0) arguments->pathname = xstrdup (arg); diff --git a/include/grub/emu/config.h b/include/grub/emu/config.h -index 875d5896ce1..c9a7e5f4ade 100644 +index 875d5896c..c9a7e5f4a 100644 --- a/include/grub/emu/config.h +++ b/include/grub/emu/config.h @@ -37,6 +37,7 @@ struct grub_util_config diff --git a/0048-grub2-btrfs-05-grub2-mkconfig.patch b/0046-grub2-btrfs-05-grub2-mkconfig.patch similarity index 95% rename from 0048-grub2-btrfs-05-grub2-mkconfig.patch rename to 0046-grub2-btrfs-05-grub2-mkconfig.patch index 5afd183..08b5224 100644 --- a/0048-grub2-btrfs-05-grub2-mkconfig.patch +++ b/0046-grub2-btrfs-05-grub2-mkconfig.patch @@ -13,7 +13,7 @@ Signed-off-by: Michael Chang <mchang(a)suse.com> 5 files changed, 38 insertions(+), 2 deletions(-) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 005f093809b..535c0f02499 100644 +index 005f09380..535c0f024 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -252,7 +252,8 @@ export GRUB_DEFAULT \ @@ -27,7 +27,7 @@ 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 42c2ea9ba50..fafeac95061 100644 +index 42c2ea9ba..fafeac950 100644 --- a/util/grub-mkconfig_lib.in +++ b/util/grub-mkconfig_lib.in @@ -52,7 +52,11 @@ grub_warn () @@ -43,7 +43,7 @@ index 42c2ea9ba50..fafeac95061 100644 is_path_readable_by_grub () diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index 858b526c925..de727e6ee6b 100644 +index 858b526c9..de727e6ee 100644 --- a/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in @@ -27,6 +27,14 @@ export TEXTDOMAINDIR="@localedir@" @@ -90,7 +90,7 @@ index 858b526c925..de727e6ee6b 100644 +EOF +fi diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 292e333324b..7bb3a211a7c 100644 +index 292e33332..7bb3a211a 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -66,10 +66,14 @@ fi @@ -109,7 +109,7 @@ index 292e333324b..7bb3a211a7c 100644 xzfs) rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true` diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in -index ada20775a14..e9e73b815fb 100644 +index ada20775a..e9e73b815 100644 --- a/util/grub.d/20_linux_xen.in +++ b/util/grub.d/20_linux_xen.in @@ -73,10 +73,14 @@ fi diff --git a/0049-grub2-btrfs-06-subvol-mount.patch b/0047-grub2-btrfs-06-subvol-mount.patch similarity index 98% rename from 0049-grub2-btrfs-06-subvol-mount.patch rename to 0047-grub2-btrfs-06-subvol-mount.patch index 14117ab..d36c966 100644 --- a/0049-grub2-btrfs-06-subvol-mount.patch +++ b/0047-grub2-btrfs-06-subvol-mount.patch @@ -13,7 +13,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 4 files changed, 392 insertions(+), 5 deletions(-) diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index 113c1f746c9..d323746ecfa 100644 +index 113c1f746..d323746ec 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -41,6 +41,7 @@ @@ -279,7 +279,7 @@ index 113c1f746c9..d323746ecfa 100644 grub_cmd_btrfs_list_subvols, 0, "[-p|-n] [-o var] DEVICE", diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c -index caf9b1ccd3f..28790307e00 100644 +index caf9b1ccd..28790307e 100644 --- a/grub-core/osdep/linux/getroot.c +++ b/grub-core/osdep/linux/getroot.c @@ -107,6 +107,14 @@ struct btrfs_ioctl_search_key @@ -462,7 +462,7 @@ index caf9b1ccd3f..28790307e00 100644 grub_make_system_path_relative_to_its_root_os (const char *path) { diff --git a/util/grub-install.c b/util/grub-install.c -index 0f66f36d23a..84ed6e88ecb 100644 +index 0f66f36d2..84ed6e88e 100644 --- a/util/grub-install.c +++ b/util/grub-install.c @@ -1569,6 +1569,55 @@ main (int argc, char *argv[]) @@ -522,7 +522,7 @@ index 0f66f36d23a..84ed6e88ecb 100644 const char *core_name = NULL; diff --git a/include/grub/emu/getroot.h b/include/grub/emu/getroot.h -index 73fa2d34abb..9c642ae3fe3 100644 +index 73fa2d34a..9c642ae3f 100644 --- a/include/grub/emu/getroot.h +++ b/include/grub/emu/getroot.h @@ -53,6 +53,11 @@ char ** diff --git a/0050-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch b/0048-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch similarity index 97% rename from 0050-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch rename to 0048-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch index b02ab53..8e56f31 100644 --- a/0050-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch +++ b/0048-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch @@ -10,7 +10,7 @@ Ref: bsc#953538 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index d323746ecfa..673ded03522 100644 +index d323746ec..673ded035 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -1260,11 +1260,41 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path) diff --git a/0051-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch b/0049-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch similarity index 99% rename from 0051-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch rename to 0049-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch index b54b196..49d8972 100644 --- a/0051-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch +++ b/0049-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch @@ -10,7 +10,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 238 insertions(+) diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index 673ded03522..2b21cbaa67e 100644 +index 673ded035..2b21cbaa6 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -2887,6 +2887,238 @@ out: diff --git a/0052-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch b/0050-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch similarity index 98% rename from 0052-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch rename to 0050-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch index bde7096..071fa4e 100644 --- a/0052-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch +++ b/0050-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch @@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h -index 585fa6662b6..03f9a9d0118 100644 +index 585fa6662..03f9a9d01 100644 --- a/include/grub/efi/efi.h +++ b/include/grub/efi/efi.h @@ -24,6 +24,10 @@ diff --git a/0053-Use-grub_efi_.-memory-helpers-where-reasonable.patch b/0051-Use-grub_efi_.-memory-helpers-where-reasonable.patch similarity index 98% rename from 0053-Use-grub_efi_.-memory-helpers-where-reasonable.patch rename to 0051-Use-grub_efi_.-memory-helpers-where-reasonable.patch index ccdf282..11c7c27 100644 --- a/0053-Use-grub_efi_.-memory-helpers-where-reasonable.patch +++ b/0051-Use-grub_efi_.-memory-helpers-where-reasonable.patch @@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index 07c4937898d..89ac84cc663 100644 +index 07c493789..89ac84cc6 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -65,7 +65,7 @@ grub_chainloader_unload (void) diff --git a/0054-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch b/0052-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch similarity index 95% rename from 0054-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch rename to 0052-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch index ef41fe1..5afc095 100644 --- a/0054-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch +++ b/0052-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index 89ac84cc663..ac8dfd40c61 100644 +index 89ac84cc6..ac8dfd40c 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -810,7 +810,8 @@ handle_image (void *data, grub_efi_uint32_t datasize) @@ -26,7 +26,7 @@ index 89ac84cc663..ac8dfd40c61 100644 efi_status = grub_efi_free_pool (buffer); diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h -index 117469450d3..99628801478 100644 +index 117469450..996288014 100644 --- a/include/grub/efi/api.h +++ b/include/grub/efi/api.h @@ -546,7 +546,16 @@ typedef grub_uint64_t grub_efi_uint64_t; diff --git a/0055-don-t-use-int-for-efi-status.patch b/0053-don-t-use-int-for-efi-status.patch similarity index 94% rename from 0055-don-t-use-int-for-efi-status.patch rename to 0053-don-t-use-int-for-efi-status.patch index 44d3555..808823e 100644 --- a/0055-don-t-use-int-for-efi-status.patch +++ b/0053-don-t-use-int-for-efi-status.patch @@ -8,7 +8,7 @@ Subject: [PATCH] don't use int for efi status 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 05d8237a9b2..ae9885edb84 100644 +index 05d8237a9..ae9885edb 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -167,7 +167,7 @@ grub_reboot (void) diff --git a/0056-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch b/0054-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch similarity index 96% rename from 0056-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch rename to 0054-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch index 1014900..ce03b0b 100644 --- a/0056-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch +++ b/0054-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch @@ -8,7 +8,7 @@ Subject: [PATCH] make GRUB_MOD_INIT() declare its function prototypes. 1 file changed, 2 insertions(+) diff --git a/include/grub/dl.h b/include/grub/dl.h -index b3753c9ca26..91933b85f2c 100644 +index b3753c9ca..91933b85f 100644 --- a/include/grub/dl.h +++ b/include/grub/dl.h @@ -54,6 +54,7 @@ grub_mod_fini (void) diff --git a/0057-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch b/0055-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch similarity index 96% rename from 0057-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch rename to 0055-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch index 890aa34..974f5eb 100644 --- a/0057-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch +++ b/0055-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch @@ -16,7 +16,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/util/grub-install.c b/util/grub-install.c -index 84ed6e88ecb..a2bec7446cb 100644 +index 84ed6e88e..a2bec7446 100644 --- a/util/grub-install.c +++ b/util/grub-install.c @@ -1190,18 +1190,8 @@ main (int argc, char *argv[]) diff --git a/0058-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch b/0056-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch similarity index 97% rename from 0058-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch rename to 0056-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch index 3fd779f..b9902f2 100644 --- a/0058-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch +++ b/0056-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch @@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 5 insertions(+) diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in -index e9e73b815fb..c23b064be6c 100644 +index e9e73b815..c23b064be 100644 --- a/util/grub.d/20_linux_xen.in +++ b/util/grub.d/20_linux_xen.in @@ -153,6 +153,7 @@ linux_entry_xsm () diff --git a/0059-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch b/0057-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch similarity index 99% rename from 0059-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch rename to 0057-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch index acfb116..0632696 100644 --- a/0059-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch +++ b/0057-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch @@ -63,7 +63,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 89 insertions(+), 20 deletions(-) diff --git a/grub-core/kern/i386/tsc_pmtimer.c b/grub-core/kern/i386/tsc_pmtimer.c -index c9c36169978..ca15c3aacd7 100644 +index c9c361699..ca15c3aac 100644 --- a/grub-core/kern/i386/tsc_pmtimer.c +++ b/grub-core/kern/i386/tsc_pmtimer.c @@ -28,40 +28,101 @@ diff --git a/0060-align-struct-efi_variable-better.patch b/0058-align-struct-efi_variable-better.patch similarity index 92% rename from 0060-align-struct-efi_variable-better.patch rename to 0058-align-struct-efi_variable-better.patch index ec26def..bbadf71 100644 --- a/0060-align-struct-efi_variable-better.patch +++ b/0058-align-struct-efi_variable-better.patch @@ -9,7 +9,7 @@ Subject: [PATCH] align struct efi_variable better... 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h -index 36d2dedf47e..9d93ba88bac 100644 +index 36d2dedf4..9d93ba88b 100644 --- a/include/grub/efiemu/runtime.h +++ b/include/grub/efiemu/runtime.h @@ -33,5 +33,5 @@ struct efi_variable @@ -20,7 +20,7 @@ index 36d2dedf47e..9d93ba88bac 100644 +} GRUB_PACKED GRUB_ALIGNED(8); #endif /* ! GRUB_EFI_EMU_RUNTIME_HEADER */ diff --git a/include/grub/types.h b/include/grub/types.h -index 0a3ff159136..ba446d99040 100644 +index 0a3ff1591..ba446d990 100644 --- a/include/grub/types.h +++ b/include/grub/types.h @@ -29,6 +29,7 @@ diff --git a/0061-Add-BLS-support-to-grub-mkconfig.patch b/0059-Add-BLS-support-to-grub-mkconfig.patch similarity index 95% rename from 0061-Add-BLS-support-to-grub-mkconfig.patch rename to 0059-Add-BLS-support-to-grub-mkconfig.patch index 7211afb..ccdd403 100644 --- a/0061-Add-BLS-support-to-grub-mkconfig.patch +++ b/0059-Add-BLS-support-to-grub-mkconfig.patch @@ -24,31 +24,16 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> [iwienand(a)redhat.com: skip machine ID check when updating entries] Signed-off-by: Ian Wienand <iwienand(a)redhat.com> -[rharwood: commit message composits] +[rharwood: commit message composits, drop man pages] Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> --- - util/grub-mkconfig.8 | 4 + util/grub-mkconfig.in | 9 +- util/grub-mkconfig_lib.in | 22 ++++- util/grub.d/10_linux.in | 218 +++++++++++++++++++++++++++++++++++++++++++++- - 4 files changed, 247 insertions(+), 6 deletions(-) + 3 files changed, 243 insertions(+), 6 deletions(-) -diff --git a/util/grub-mkconfig.8 b/util/grub-mkconfig.8 -index a2d1f577b9b..434fa4deda4 100644 ---- a/util/grub-mkconfig.8 -+++ b/util/grub-mkconfig.8 -@@ -13,5 +13,9 @@ - \fB--output\fR=\fIFILE\fR - Write generated output to \fIFILE\fR. - -+.TP -+\fB--no-grubenv-update\fR -+Do not update variables in the grubenv file. -+ - .SH SEE ALSO - .BR "info grub" diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 535c0f02499..f55339a3f64 100644 +index 535c0f024..f55339a3f 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -50,6 +50,8 @@ grub_get_kernel_settings="${sbindir}/@grub_get_kernel_settings@" @@ -89,7 +74,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 fafeac95061..d8bb4069360 100644 +index fafeac950..d8bb40693 100644 --- a/util/grub-mkconfig_lib.in +++ b/util/grub-mkconfig_lib.in @@ -30,6 +30,9 @@ fi @@ -146,7 +131,7 @@ index fafeac95061..d8bb4069360 100644 fi IFS="$old_ifs" diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 7bb3a211a7c..9fcd77cacc3 100644 +index 7bb3a211a..9fcd77cac 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -82,6 +82,218 @@ case x"$GRUB_FS" in diff --git a/0062-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch b/0060-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch similarity index 95% rename from 0062-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch rename to 0060-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch index 9ff4c8b..c1cdd3c 100644 --- a/0062-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch +++ b/0060-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch @@ -12,7 +12,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index a3e215155bd..c60601b699d 100644 +index a3e215155..c60601b69 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -1201,7 +1201,7 @@ static void __attribute__ ((noreturn)) diff --git a/0063-Add-linux-and-initrd-commands-for-grub-emu.patch b/0061-Add-linux-and-initrd-commands-for-grub-emu.patch similarity index 97% rename from 0063-Add-linux-and-initrd-commands-for-grub-emu.patch rename to 0061-Add-linux-and-initrd-commands-for-grub-emu.patch index 2431a4d..25838e7 100644 --- a/0063-Add-linux-and-initrd-commands-for-grub-emu.patch +++ b/0061-Add-linux-and-initrd-commands-for-grub-emu.patch @@ -21,7 +21,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> create mode 100644 grub-core/loader/emu/linux.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 058c88ac3af..5354f9613d3 100644 +index 058c88ac3..5354f9613 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -1826,7 +1826,6 @@ module = { @@ -33,7 +33,7 @@ index 058c88ac3af..5354f9613d3 100644 efi = loader/efi/linux.c; }; diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c -index 55ea5a11ccd..846fe9715ec 100644 +index 55ea5a11c..846fe9715 100644 --- a/grub-core/kern/emu/main.c +++ b/grub-core/kern/emu/main.c @@ -107,6 +107,7 @@ static struct argp_option options[] = { @@ -55,7 +55,7 @@ index 55ea5a11ccd..846fe9715ec 100644 case ARGP_KEY_ARG: { diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c -index 0ff13bcaf8c..eeea092752d 100644 +index 0ff13bcaf..eeea09275 100644 --- a/grub-core/kern/emu/misc.c +++ b/grub-core/kern/emu/misc.c @@ -39,6 +39,7 @@ @@ -103,7 +103,7 @@ index 0ff13bcaf8c..eeea092752d 100644 +} diff --git a/grub-core/loader/emu/linux.c b/grub-core/loader/emu/linux.c new file mode 100644 -index 00000000000..fda9e00d24c +index 000000000..fda9e00d2 --- /dev/null +++ b/grub-core/loader/emu/linux.c @@ -0,0 +1,172 @@ @@ -280,7 +280,7 @@ index 00000000000..fda9e00d24c + grub_unregister_command (cmd_initrd); +} diff --git a/include/grub/emu/exec.h b/include/grub/emu/exec.h -index d1073ef86af..1b61b4a2e5d 100644 +index d1073ef86..1b61b4a2e 100644 --- a/include/grub/emu/exec.h +++ b/include/grub/emu/exec.h @@ -23,6 +23,8 @@ @@ -302,7 +302,7 @@ index d1073ef86af..1b61b4a2e5d 100644 grub_util_exec_redirect (const char *const *argv, const char *stdin_file, const char *stdout_file); diff --git a/include/grub/emu/hostfile.h b/include/grub/emu/hostfile.h -index cfb1e2b5661..a61568e36e9 100644 +index cfb1e2b56..a61568e36 100644 --- a/include/grub/emu/hostfile.h +++ b/include/grub/emu/hostfile.h @@ -22,6 +22,7 @@ @@ -323,7 +323,7 @@ index cfb1e2b5661..a61568e36e9 100644 char * grub_util_path_concat (size_t n, ...); diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h -index ff9c48a6490..01056954b96 100644 +index ff9c48a64..01056954b 100644 --- a/include/grub/emu/misc.h +++ b/include/grub/emu/misc.h @@ -57,6 +57,9 @@ void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...) __attribute__ ((format ( @@ -337,7 +337,7 @@ index ff9c48a6490..01056954b96 100644 #ifdef HAVE_DEVICE_MAPPER diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am -index ee88e44e97a..80e7a83edf9 100644 +index ee88e44e9..80e7a83ed 100644 --- a/grub-core/Makefile.am +++ b/grub-core/Makefile.am @@ -307,6 +307,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/net.h diff --git a/0064-Add-grub2-switch-to-blscfg.patch b/0062-Add-grub2-switch-to-blscfg.patch similarity index 85% rename from 0064-Add-grub2-switch-to-blscfg.patch rename to 0062-Add-grub2-switch-to-blscfg.patch index ccac357..bc1ac3f 100644 --- a/0064-Add-grub2-switch-to-blscfg.patch +++ b/0062-Add-grub2-switch-to-blscfg.patch @@ -7,20 +7,20 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> [jhlavac: Use ${etcdefaultgrub} instead of /etc/default/grub] Signed-off-by: Jan Hlavac <jhlavac(a)redhat.com> -[rharwood: skip on ostree installations] +[rharwood: skip on ostree installations, migrate man to h2m] Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> --- - Makefile.util.def | 7 + - util/grub-set-password.in | 2 +- - util/grub-switch-to-blscfg.8 | 33 +++++ - util/grub-switch-to-blscfg.in | 317 ++++++++++++++++++++++++++++++++++++++++++ - util/grub.d/10_linux.in | 2 +- - 5 files changed, 359 insertions(+), 2 deletions(-) - create mode 100644 util/grub-switch-to-blscfg.8 + Makefile.util.def | 7 + + docs/man/grub-switch-to-blscfg.h2m | 2 + + util/grub-set-password.in | 2 +- + util/grub-switch-to-blscfg.in | 317 +++++++++++++++++++++++++++++++++++++ + util/grub.d/10_linux.in | 2 +- + 5 files changed, 328 insertions(+), 2 deletions(-) + create mode 100644 docs/man/grub-switch-to-blscfg.h2m create mode 100644 util/grub-switch-to-blscfg.in diff --git a/Makefile.util.def b/Makefile.util.def -index 43a1c7453b1..a90879fa9ba 100644 +index 43a1c7453..a90879fa9 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -1365,6 +1365,13 @@ program = { @@ -37,8 +37,16 @@ index 43a1c7453b1..a90879fa9ba 100644 program = { name = grub-glue-efi; mansection = 1; +diff --git a/docs/man/grub-switch-to-blscfg.h2m b/docs/man/grub-switch-to-blscfg.h2m +new file mode 100644 +index 000000000..fa341426a +--- /dev/null ++++ b/docs/man/grub-switch-to-blscfg.h2m +@@ -0,0 +1,2 @@ ++[NAME] ++grub-switch-to-blscfg \- switch to using BLS config files diff --git a/util/grub-set-password.in b/util/grub-set-password.in -index 5ebf50576d6..c0b5ebbfdc5 100644 +index 5ebf50576..c0b5ebbfd 100644 --- a/util/grub-set-password.in +++ b/util/grub-set-password.in @@ -1,6 +1,6 @@ @@ -49,48 +57,9 @@ index 5ebf50576d6..c0b5ebbfdc5 100644 if [ -d /sys/firmware/efi/efivars/ ]; then grubdir=`echo "/@bootdirname@/efi/EFI/${EFIDIR}/" | sed 's,//*,/,g'` else -diff --git a/util/grub-switch-to-blscfg.8 b/util/grub-switch-to-blscfg.8 -new file mode 100644 -index 00000000000..9a886282976 ---- /dev/null -+++ b/util/grub-switch-to-blscfg.8 -@@ -0,0 +1,33 @@ -+.TH GRUB-SWITCH-TO-BLSCFG 1 "Wed Feb 26 2014" -+.SH NAME -+\fBgrub-switch-to-blscfg\fR \(em Switch to using BLS config files. -+ -+.SH SYNOPSIS -+\fBgrub-switch-to-blscfg\fR [--grub-directory=\fIDIR\fR] [--config-file=\fIFILE\fR] [--grub-defaults=\fIFILE\fR] -+ -+.SH DESCRIPTION -+\fBgrub-switch-to-blscfg\fR reconfigures grub-mkconfig to use BLS-style config files, and then regenerates the GRUB configuration. -+ -+.SH OPTIONS -+.TP -+--grub-directory=\fIDIR\fR -+Search for grub.cfg under \fIDIR\fR. The default value is \fI/boot/efi/EFI/\fBVENDOR\fR on UEFI machines and \fI/boot/grub2\fR elsewhere. -+ -+.TP -+--config-file=\fIFILE\fR -+The grub config file to use. The default value is \fI/etc/grub2-efi.cfg\fR on UEFI machines and \fI/etc/grub2.cfg\fR elsewhere. Symbolic links will be followed. -+ -+.TP -+--grub-defaults=\fIFILE\fR -+The defaults file for grub-mkconfig. The default value is \fI/etc/default/grub\fR. -+ -+.TP -+--bls-directory=\fIDIR\fR -+Create BootLoaderSpec fragments in \fIDIR\fR. The default value is \fI/boot/loader/entries\fR. -+ -+.TP -+--backup-suffix=\fSUFFIX\fR -+The suffix to use for saved backup files. The default value is \fI.bak\fR. -+ -+.SH SEE ALSO -+.BR "info grub" diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in new file mode 100644 -index 00000000000..a851424beb2 +index 000000000..a851424be --- /dev/null +++ b/util/grub-switch-to-blscfg.in @@ -0,0 +1,317 @@ @@ -412,7 +381,7 @@ index 00000000000..a851424beb2 +# Bye. +exit 0 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 9fcd77cacc3..81f35a2f3f0 100644 +index 9fcd77cac..70d56518b 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -138,7 +138,7 @@ blsdir="/boot/loader/entries" diff --git a/0065-make-better-backtraces.patch b/0063-make-better-backtraces.patch similarity index 96% rename from 0065-make-better-backtraces.patch rename to 0063-make-better-backtraces.patch index 6376567..06a0a45 100644 --- a/0065-make-better-backtraces.patch +++ b/0063-make-better-backtraces.patch @@ -38,7 +38,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> delete mode 100644 grub-core/lib/i386/backtrace.c diff --git a/Makefile.util.def b/Makefile.util.def -index a90879fa9ba..48512bc6311 100644 +index a90879fa9..48512bc63 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -51,6 +51,12 @@ library = { @@ -55,7 +55,7 @@ index a90879fa9ba..48512bc6311 100644 library = { diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 5354f9613d3..4b7c45a7b06 100644 +index 5354f9613..4b7c45a7b 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -142,6 +142,12 @@ kernel = { @@ -103,7 +103,7 @@ diff --git a/grub-core/lib/backtrace.c b/grub-core/commands/backtrace.c similarity index 98% rename from grub-core/lib/backtrace.c rename to grub-core/commands/backtrace.c -index c0ad6ab8be1..8b5ec3913b5 100644 +index c0ad6ab8b..8b5ec3913 100644 --- a/grub-core/lib/backtrace.c +++ b/grub-core/commands/backtrace.c @@ -54,7 +54,7 @@ grub_cmd_backtrace (grub_command_t cmd __attribute__ ((unused)), @@ -116,7 +116,7 @@ index c0ad6ab8be1..8b5ec3913b5 100644 } diff --git a/grub-core/gdb/cstub.c b/grub-core/gdb/cstub.c -index b64acd70fee..99281472d36 100644 +index b64acd70f..99281472d 100644 --- a/grub-core/gdb/cstub.c +++ b/grub-core/gdb/cstub.c @@ -215,7 +215,6 @@ grub_gdb_trap (int trap_no) @@ -129,7 +129,7 @@ index b64acd70fee..99281472d36 100644 diff --git a/grub-core/kern/arm64/backtrace.c b/grub-core/kern/arm64/backtrace.c new file mode 100644 -index 00000000000..019c6fdfef2 +index 000000000..019c6fdfe --- /dev/null +++ b/grub-core/kern/arm64/backtrace.c @@ -0,0 +1,94 @@ @@ -229,7 +229,7 @@ index 00000000000..019c6fdfef2 +} diff --git a/grub-core/kern/backtrace.c b/grub-core/kern/backtrace.c new file mode 100644 -index 00000000000..4a82e865cc6 +index 000000000..4a82e865c --- /dev/null +++ b/grub-core/kern/backtrace.c @@ -0,0 +1,97 @@ @@ -331,7 +331,7 @@ index 00000000000..4a82e865cc6 + grub_backtrace (skip + 1); +} diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c -index 7afb9e6f724..88d2077709e 100644 +index 7afb9e6f7..88d207770 100644 --- a/grub-core/kern/dl.c +++ b/grub-core/kern/dl.c @@ -124,6 +124,50 @@ grub_dl_resolve_symbol (const char *name) @@ -395,7 +395,7 @@ index 7afb9e6f724..88d2077709e 100644 i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize)) diff --git a/grub-core/kern/i386/backtrace.c b/grub-core/kern/i386/backtrace.c new file mode 100644 -index 00000000000..2413f9a57db +index 000000000..2413f9a57 --- /dev/null +++ b/grub-core/kern/i386/backtrace.c @@ -0,0 +1,125 @@ @@ -525,7 +525,7 @@ index 00000000000..2413f9a57db +#endif +} diff --git a/grub-core/kern/i386/pc/init.c b/grub-core/kern/i386/pc/init.c -index 27bc68b8a53..b51d0abfa6e 100644 +index 27bc68b8a..b51d0abfa 100644 --- a/grub-core/kern/i386/pc/init.c +++ b/grub-core/kern/i386/pc/init.c @@ -153,7 +153,7 @@ compact_mem_regions (void) @@ -547,7 +547,7 @@ index 27bc68b8a53..b51d0abfa6e 100644 /* Initialize the console as early as possible. */ grub_console_init (); diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c -index 0cd2a627231..937c1bc44cb 100644 +index 0cd2a6272..937c1bc44 100644 --- a/grub-core/kern/ieee1275/init.c +++ b/grub-core/kern/ieee1275/init.c @@ -63,7 +63,6 @@ @@ -559,7 +559,7 @@ index 0cd2a627231..937c1bc44cb 100644 #ifdef __sparc__ diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index c60601b699d..a432a6be54a 100644 +index c60601b69..a432a6be5 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -1197,15 +1197,15 @@ grub_printf_fmt_check (const char *fmt, const char *fmt_expected) @@ -593,7 +593,7 @@ index c60601b699d..a432a6be54a 100644 grub_vprintf (_(fmt), ap); va_end (ap); diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c -index c070afc621f..d8c8377578b 100644 +index c070afc62..d8c837757 100644 --- a/grub-core/kern/mm.c +++ b/grub-core/kern/mm.c @@ -97,13 +97,13 @@ get_header_from_pointer (void *ptr, grub_mm_header_t *p, grub_mm_region_t *r) @@ -615,7 +615,7 @@ index c070afc621f..d8c8377578b 100644 diff --git a/grub-core/lib/arm64/backtrace.c b/grub-core/lib/arm64/backtrace.c deleted file mode 100644 -index 1079b5380e1..00000000000 +index 1079b5380..000000000 --- a/grub-core/lib/arm64/backtrace.c +++ /dev/null @@ -1,62 +0,0 @@ @@ -683,7 +683,7 @@ index 1079b5380e1..00000000000 - diff --git a/grub-core/lib/i386/backtrace.c b/grub-core/lib/i386/backtrace.c deleted file mode 100644 -index c67273db3ae..00000000000 +index c67273db3..000000000 --- a/grub-core/lib/i386/backtrace.c +++ /dev/null @@ -1,78 +0,0 @@ @@ -766,7 +766,7 @@ index c67273db3ae..00000000000 -} - diff --git a/include/grub/backtrace.h b/include/grub/backtrace.h -index 395519762f0..275cf85e2d3 100644 +index 395519762..275cf85e2 100644 --- a/include/grub/backtrace.h +++ b/include/grub/backtrace.h @@ -19,8 +19,14 @@ @@ -787,7 +787,7 @@ index 395519762f0..275cf85e2d3 100644 #endif diff --git a/include/grub/dl.h b/include/grub/dl.h -index 91933b85f2c..2f76e6b0437 100644 +index 91933b85f..2f76e6b04 100644 --- a/include/grub/dl.h +++ b/include/grub/dl.h @@ -259,6 +259,8 @@ grub_dl_is_persistent (grub_dl_t mod) @@ -800,7 +800,7 @@ index 91933b85f2c..2f76e6b0437 100644 int isfunc, grub_dl_t mod); diff --git a/include/grub/kernel.h b/include/grub/kernel.h -index abbca5ea335..300a9766cda 100644 +index abbca5ea3..300a9766c 100644 --- a/include/grub/kernel.h +++ b/include/grub/kernel.h @@ -111,6 +111,9 @@ grub_addr_t grub_modules_get_end (void); @@ -814,7 +814,7 @@ index abbca5ea335..300a9766cda 100644 void grub_main (void) __attribute__ ((noreturn)); diff --git a/grub-core/kern/arm/efi/startup.S b/grub-core/kern/arm/efi/startup.S -index 9f8265315a9..f3bc41f9d0f 100644 +index 9f8265315..f3bc41f9d 100644 --- a/grub-core/kern/arm/efi/startup.S +++ b/grub-core/kern/arm/efi/startup.S @@ -23,6 +23,8 @@ @@ -827,7 +827,7 @@ index 9f8265315a9..f3bc41f9d0f 100644 /* * EFI_SYSTEM_TABLE and EFI_HANDLE are passed in r1/r0. diff --git a/grub-core/kern/arm/startup.S b/grub-core/kern/arm/startup.S -index 3946fe8e183..5679a1d00ad 100644 +index 3946fe8e1..5679a1d00 100644 --- a/grub-core/kern/arm/startup.S +++ b/grub-core/kern/arm/startup.S @@ -48,6 +48,8 @@ @@ -840,7 +840,7 @@ index 3946fe8e183..5679a1d00ad 100644 b codestart diff --git a/grub-core/kern/arm64/efi/startup.S b/grub-core/kern/arm64/efi/startup.S -index 666a7ee3c92..41676bdb2b8 100644 +index 666a7ee3c..41676bdb2 100644 --- a/grub-core/kern/arm64/efi/startup.S +++ b/grub-core/kern/arm64/efi/startup.S @@ -19,7 +19,9 @@ @@ -854,7 +854,7 @@ index 666a7ee3c92..41676bdb2b8 100644 /* * EFI_SYSTEM_TABLE and EFI_HANDLE are passed in x1/x0. diff --git a/grub-core/kern/i386/qemu/startup.S b/grub-core/kern/i386/qemu/startup.S -index 0d89858d9b3..939f182fc74 100644 +index 0d89858d9..939f182fc 100644 --- a/grub-core/kern/i386/qemu/startup.S +++ b/grub-core/kern/i386/qemu/startup.S @@ -24,7 +24,8 @@ @@ -868,7 +868,7 @@ index 0d89858d9b3..939f182fc74 100644 jmp codestart diff --git a/grub-core/kern/ia64/efi/startup.S b/grub-core/kern/ia64/efi/startup.S -index d75c6d7cc74..8f2a593e529 100644 +index d75c6d7cc..8f2a593e5 100644 --- a/grub-core/kern/ia64/efi/startup.S +++ b/grub-core/kern/ia64/efi/startup.S @@ -24,8 +24,9 @@ @@ -883,7 +883,7 @@ index d75c6d7cc74..8f2a593e529 100644 alloc loc0=ar.pfs,2,4,0,0 mov loc1=rp diff --git a/grub-core/kern/sparc64/ieee1275/crt0.S b/grub-core/kern/sparc64/ieee1275/crt0.S -index 03b916f0534..701bf63abcf 100644 +index 03b916f05..701bf63ab 100644 --- a/grub-core/kern/sparc64/ieee1275/crt0.S +++ b/grub-core/kern/sparc64/ieee1275/crt0.S @@ -22,7 +22,8 @@ @@ -897,7 +897,7 @@ index 03b916f0534..701bf63abcf 100644 ba codestart mov %o4, %o0 diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am -index 80e7a83edf9..f512573c0da 100644 +index 80e7a83ed..f512573c0 100644 --- a/grub-core/Makefile.am +++ b/grub-core/Makefile.am @@ -66,6 +66,7 @@ CLEANFILES += grub_script.yy.c grub_script.yy.h diff --git a/0066-normal-don-t-draw-our-startup-message-if-debug-is-se.patch b/0064-normal-don-t-draw-our-startup-message-if-debug-is-se.patch similarity index 95% rename from 0066-normal-don-t-draw-our-startup-message-if-debug-is-se.patch rename to 0064-normal-don-t-draw-our-startup-message-if-debug-is-se.patch index 9ebfc7a..d872cb8 100644 --- a/0066-normal-don-t-draw-our-startup-message-if-debug-is-se.patch +++ b/0064-normal-don-t-draw-our-startup-message-if-debug-is-se.patch @@ -8,7 +8,7 @@ Subject: [PATCH] normal: don't draw our startup message if debug is set 1 file changed, 3 insertions(+) diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index d5df4f815b0..1970e4816a8 100644 +index d5df4f815..1970e4816 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -430,6 +430,9 @@ grub_normal_reader_init (int nested) diff --git a/0067-Work-around-some-minor-include-path-weirdnesses.patch b/0065-Work-around-some-minor-include-path-weirdnesses.patch similarity index 97% rename from 0067-Work-around-some-minor-include-path-weirdnesses.patch rename to 0065-Work-around-some-minor-include-path-weirdnesses.patch index 460d792..589f335 100644 --- a/0067-Work-around-some-minor-include-path-weirdnesses.patch +++ b/0065-Work-around-some-minor-include-path-weirdnesses.patch @@ -17,7 +17,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> diff --git a/include/grub/arm/efi/console.h b/include/grub/arm/efi/console.h new file mode 100644 -index 00000000000..1592f6f76b5 +index 000000000..1592f6f76 --- /dev/null +++ b/include/grub/arm/efi/console.h @@ -0,0 +1,24 @@ @@ -47,7 +47,7 @@ index 00000000000..1592f6f76b5 +#endif /* ! GRUB_ARM_EFI_CONSOLE_H */ diff --git a/include/grub/arm64/efi/console.h b/include/grub/arm64/efi/console.h new file mode 100644 -index 00000000000..95689339384 +index 000000000..956893393 --- /dev/null +++ b/include/grub/arm64/efi/console.h @@ -0,0 +1,24 @@ @@ -77,7 +77,7 @@ index 00000000000..95689339384 +#endif /* ! GRUB_ARM64_EFI_CONSOLE_H */ diff --git a/include/grub/i386/efi/console.h b/include/grub/i386/efi/console.h new file mode 100644 -index 00000000000..9231375cb07 +index 000000000..9231375cb --- /dev/null +++ b/include/grub/i386/efi/console.h @@ -0,0 +1,24 @@ @@ -107,7 +107,7 @@ index 00000000000..9231375cb07 +#endif /* ! GRUB_I386_EFI_CONSOLE_H */ diff --git a/include/grub/x86_64/efi/console.h b/include/grub/x86_64/efi/console.h new file mode 100644 -index 00000000000..dba9d8678d0 +index 000000000..dba9d8678 --- /dev/null +++ b/include/grub/x86_64/efi/console.h @@ -0,0 +1,24 @@ diff --git a/0068-Make-it-possible-to-enabled-build-id-sha1.patch b/0066-Make-it-possible-to-enabled-build-id-sha1.patch similarity index 93% rename from 0068-Make-it-possible-to-enabled-build-id-sha1.patch rename to 0066-Make-it-possible-to-enabled-build-id-sha1.patch index f68fc58..5088c89 100644 --- a/0068-Make-it-possible-to-enabled-build-id-sha1.patch +++ b/0066-Make-it-possible-to-enabled-build-id-sha1.patch @@ -10,10 +10,10 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 27 insertions(+) diff --git a/configure.ac b/configure.ac -index a0030632220..b50fb2e9897 100644 +index 4f1676967..b809c0078 100644 --- a/configure.ac +++ b/configure.ac -@@ -1470,7 +1470,15 @@ grub_PROG_TARGET_CC +@@ -1443,7 +1443,15 @@ grub_PROG_TARGET_CC if test "x$TARGET_APPLE_LINKER" != x1 ; then grub_PROG_OBJCOPY_ABSOLUTE fi @@ -30,7 +30,7 @@ index a0030632220..b50fb2e9897 100644 if test "$platform" != emu && test "x$TARGET_APPLE_LINKER" != x1 ; then if test ! -z "$TARGET_IMG_LDSCRIPT"; then diff --git a/acinclude.m4 b/acinclude.m4 -index 6e14bb553c6..21238fcfd03 100644 +index 6e14bb553..21238fcfd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -136,6 +136,25 @@ if test "x$grub_cv_prog_ld_build_id_none" = xyes; then diff --git a/0069-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch b/0067-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch similarity index 95% rename from 0069-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch rename to 0067-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch index a8a757e..20f19c6 100644 --- a/0069-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch +++ b/0067-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch @@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 20 insertions(+) diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index a432a6be54a..9a2fae6398e 100644 +index a432a6be5..9a2fae639 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -191,6 +191,24 @@ grub_real_dprintf (const char *file, const int line, const char *condition, @@ -42,7 +42,7 @@ index a432a6be54a..9a2fae6398e 100644 int diff --git a/include/grub/misc.h b/include/grub/misc.h -index fd18e6320b8..3adc4036e3b 100644 +index fd18e6320..3adc4036e 100644 --- a/include/grub/misc.h +++ b/include/grub/misc.h @@ -345,6 +345,8 @@ void EXPORT_FUNC(grub_real_dprintf) (const char *file, diff --git a/0070-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch b/0068-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch similarity index 97% rename from 0070-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch rename to 0068-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch index 75de764..91bc557 100644 --- a/0070-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch +++ b/0068-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch @@ -20,7 +20,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 4 files changed, 78 insertions(+), 4 deletions(-) diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c -index 88d2077709e..9557254035e 100644 +index 88d207770..955725403 100644 --- a/grub-core/kern/dl.c +++ b/grub-core/kern/dl.c @@ -501,6 +501,23 @@ grub_dl_find_section (Elf_Ehdr *e, const char *name) @@ -95,7 +95,7 @@ index 88d2077709e..9557254035e 100644 { grub_dl_unload (mod); diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index ae9885edb84..d6a2fb57789 100644 +index ae9885edb..d6a2fb577 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -296,7 +296,7 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, @@ -117,7 +117,7 @@ index ae9885edb84..d6a2fb57789 100644 } diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c -index 6d39bd3ad29..2d12e6188fd 100644 +index 6d39bd3ad..2d12e6188 100644 --- a/grub-core/kern/efi/init.c +++ b/grub-core/kern/efi/init.c @@ -115,10 +115,33 @@ grub_efi_env_init (void) @@ -164,7 +164,7 @@ index 6d39bd3ad29..2d12e6188fd 100644 } diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h -index 03f9a9d0118..2e0691454b1 100644 +index 03f9a9d01..2e0691454 100644 --- a/include/grub/efi/efi.h +++ b/include/grub/efi/efi.h @@ -138,7 +138,7 @@ grub_err_t grub_arch_efi_linux_check_image(struct linux_arch_kernel_header *lh); diff --git a/0069-Fixup-for-newer-compiler.patch b/0069-Fixup-for-newer-compiler.patch new file mode 100644 index 0000000..aff1662 --- /dev/null +++ b/0069-Fixup-for-newer-compiler.patch @@ -0,0 +1,36 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones <pjones(a)redhat.com> +Date: Thu, 10 May 2018 13:40:19 -0400 +Subject: [PATCH] Fixup for newer compiler + +--- + grub-core/fs/btrfs.c | 2 +- + include/grub/gpt_partition.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c +index 2b21cbaa6..4cc86e9b7 100644 +--- a/grub-core/fs/btrfs.c ++++ b/grub-core/fs/btrfs.c +@@ -218,7 +218,7 @@ struct grub_btrfs_inode + grub_uint64_t size; + grub_uint8_t dummy2[0x70]; + struct grub_btrfs_time mtime; +-} GRUB_PACKED; ++} GRUB_PACKED __attribute__ ((aligned(8))); + + struct grub_btrfs_extent_data + { +diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h +index 7a93f4329..8212697bf 100644 +--- a/include/grub/gpt_partition.h ++++ b/include/grub/gpt_partition.h +@@ -76,7 +76,7 @@ struct grub_gpt_partentry + grub_uint64_t end; + grub_uint64_t attrib; + char name[72]; +-} GRUB_PACKED; ++} GRUB_PACKED __attribute__ ((aligned(8))); + + grub_err_t + grub_gpt_partition_map_iterate (grub_disk_t disk, diff --git a/0072-Don-t-attempt-to-export-the-start-and-_start-symbols.patch b/0070-Don-t-attempt-to-export-the-start-and-_start-symbols.patch similarity index 97% rename from 0072-Don-t-attempt-to-export-the-start-and-_start-symbols.patch rename to 0070-Don-t-attempt-to-export-the-start-and-_start-symbols.patch index 0e925ee..6d85ecc 100644 --- a/0072-Don-t-attempt-to-export-the-start-and-_start-symbols.patch +++ b/0070-Don-t-attempt-to-export-the-start-and-_start-symbols.patch @@ -26,7 +26,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 2 insertions(+) diff --git a/include/grub/kernel.h b/include/grub/kernel.h -index 300a9766cda..55849777eaa 100644 +index 300a9766c..55849777e 100644 --- a/include/grub/kernel.h +++ b/include/grub/kernel.h @@ -111,8 +111,10 @@ grub_addr_t grub_modules_get_end (void); diff --git a/0071-Fixup-for-newer-compiler.patch b/0071-Fixup-for-newer-compiler.patch index 12dd193..f384404 100644 --- a/0071-Fixup-for-newer-compiler.patch +++ b/0071-Fixup-for-newer-compiler.patch @@ -4,33 +4,19 @@ Date: Thu, 10 May 2018 13:40:19 -0400 Subject: [PATCH] Fixup for newer compiler --- - grub-core/fs/btrfs.c | 2 +- - include/grub/gpt_partition.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + conf/Makefile.common | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index 2b21cbaa67e..4cc86e9b79e 100644 ---- a/grub-core/fs/btrfs.c -+++ b/grub-core/fs/btrfs.c -@@ -218,7 +218,7 @@ struct grub_btrfs_inode - grub_uint64_t size; - grub_uint8_t dummy2[0x70]; - struct grub_btrfs_time mtime; --} GRUB_PACKED; -+} GRUB_PACKED __attribute__ ((aligned(8))); +diff --git a/conf/Makefile.common b/conf/Makefile.common +index 191b1a70c..5f0ef9698 100644 +--- a/conf/Makefile.common ++++ b/conf/Makefile.common +@@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding + LDFLAGS_KERNEL = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) + CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1 + CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM) +-STRIPFLAGS_KERNEL = -R .eh_frame -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx ++STRIPFLAGS_KERNEL = -R .eh_frame -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx -R .note.gnu.property -R .gnu.build.attributes - struct grub_btrfs_extent_data - { -diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h -index 7a93f43291c..8212697bf6b 100644 ---- a/include/grub/gpt_partition.h -+++ b/include/grub/gpt_partition.h -@@ -76,7 +76,7 @@ struct grub_gpt_partentry - grub_uint64_t end; - grub_uint64_t attrib; - char name[72]; --} GRUB_PACKED; -+} GRUB_PACKED __attribute__ ((aligned(8))); - - grub_err_t - grub_gpt_partition_map_iterate (grub_disk_t disk, + CFLAGS_MODULE = $(CFLAGS_PLATFORM) -ffreestanding + LDFLAGS_MODULE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d diff --git a/0074-Add-support-for-non-Ethernet-network-cards.patch b/0072-Add-support-for-non-Ethernet-network-cards.patch similarity index 98% rename from 0074-Add-support-for-non-Ethernet-network-cards.patch rename to 0072-Add-support-for-non-Ethernet-network-cards.patch index 02fb951..e161fa0 100644 --- a/0074-Add-support-for-non-Ethernet-network-cards.patch +++ b/0072-Add-support-for-non-Ethernet-network-cards.patch @@ -38,7 +38,7 @@ Signed-off-by: Mark Salter <msalter(a)redhat.com> 12 files changed, 219 insertions(+), 152 deletions(-) diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c -index 54306e3b16d..67b409a8acc 100644 +index 54306e3b1..67b409a8a 100644 --- a/grub-core/net/arp.c +++ b/grub-core/net/arp.c @@ -31,22 +31,12 @@ enum @@ -271,7 +271,7 @@ index 54306e3b16d..67b409a8acc 100644 /* Change operation to REPLY and send packet */ send_ethernet_packet (inf, &nb_reply, target, GRUB_NET_ETHERTYPE_ARP); diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c -index e28fb6a09f9..08b6b2b5d6c 100644 +index e28fb6a09..08b6b2b5d 100644 --- a/grub-core/net/bootp.c +++ b/grub-core/net/bootp.c @@ -233,7 +233,6 @@ grub_net_configure_by_dhcp_ack (const char *name, @@ -318,7 +318,7 @@ index e28fb6a09f9..08b6b2b5d6c 100644 grub_netbuff_push (nb, sizeof (*udph)); diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c -index 173fb63153c..a673bea807a 100644 +index 173fb6315..a673bea80 100644 --- a/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c @@ -279,6 +279,9 @@ grub_efinet_findcards (void) @@ -346,7 +346,7 @@ index 173fb63153c..a673bea807a 100644 card->efi_handle = *handle; diff --git a/grub-core/net/drivers/emu/emunet.c b/grub-core/net/drivers/emu/emunet.c -index b194920861f..5b6c5e16a6d 100644 +index b19492086..5b6c5e16a 100644 --- a/grub-core/net/drivers/emu/emunet.c +++ b/grub-core/net/drivers/emu/emunet.c @@ -46,6 +46,7 @@ static struct grub_net_card emucard = @@ -358,7 +358,7 @@ index b194920861f..5b6c5e16a6d 100644 }, .flags = 0 diff --git a/grub-core/net/drivers/i386/pc/pxe.c b/grub-core/net/drivers/i386/pc/pxe.c -index 3f4152d036c..9f8fb4b6d2b 100644 +index 3f4152d03..9f8fb4b6d 100644 --- a/grub-core/net/drivers/i386/pc/pxe.c +++ b/grub-core/net/drivers/i386/pc/pxe.c @@ -386,20 +386,21 @@ GRUB_MOD_INIT(pxe) @@ -390,7 +390,7 @@ index 3f4152d036c..9f8fb4b6d2b 100644 grub_pxe_card.default_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET; diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c -index 3860b6f78d8..bcb3f9ea02d 100644 +index 3860b6f78..bcb3f9ea0 100644 --- a/grub-core/net/drivers/ieee1275/ofnet.c +++ b/grub-core/net/drivers/ieee1275/ofnet.c @@ -160,6 +160,7 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath, @@ -410,7 +410,7 @@ index 3860b6f78d8..bcb3f9ea02d 100644 card->txbufsize = ALIGN_UP (card->mtu, 64) + 256; diff --git a/grub-core/net/drivers/uboot/ubootnet.c b/grub-core/net/drivers/uboot/ubootnet.c -index 056052e40d5..22ebcbf211e 100644 +index 056052e40..22ebcbf21 100644 --- a/grub-core/net/drivers/uboot/ubootnet.c +++ b/grub-core/net/drivers/uboot/ubootnet.c @@ -131,6 +131,7 @@ GRUB_MOD_INIT (ubootnet) @@ -422,7 +422,7 @@ index 056052e40d5..22ebcbf211e 100644 card->txbufsize = ALIGN_UP (card->mtu, 64) + 256; card->txbuf = grub_zalloc (card->txbufsize); diff --git a/grub-core/net/ethernet.c b/grub-core/net/ethernet.c -index 4d7ceed6f93..9aae83a5eb4 100644 +index 4d7ceed6f..9aae83a5e 100644 --- a/grub-core/net/ethernet.c +++ b/grub-core/net/ethernet.c @@ -29,13 +29,6 @@ @@ -572,7 +572,7 @@ index 4d7ceed6f93..9aae83a5eb4 100644 { /* ARP packet. */ diff --git a/grub-core/net/icmp6.c b/grub-core/net/icmp6.c -index 2cbd95dce25..56a3ec5c8e8 100644 +index 2cbd95dce..56a3ec5c8 100644 --- a/grub-core/net/icmp6.c +++ b/grub-core/net/icmp6.c @@ -231,8 +231,9 @@ grub_net_recv_icmp6_packet (struct grub_net_buff *nb, @@ -612,7 +612,7 @@ index 2cbd95dce25..56a3ec5c8e8 100644 } if (ohdr->type == OPTION_PREFIX && ohdr->len == 4) diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c -index ea5edf8f1f6..a5896f6dc26 100644 +index ea5edf8f1..a5896f6dc 100644 --- a/grub-core/net/ip.c +++ b/grub-core/net/ip.c @@ -276,8 +276,8 @@ handle_dgram (struct grub_net_buff *nb, @@ -627,7 +627,7 @@ index ea5edf8f1f6..a5896f6dc26 100644 grub_net_process_dhcp (nb, inf); grub_netbuff_free (nb); diff --git a/grub-core/net/net.c b/grub-core/net/net.c -index 22f2689aaeb..a46f82362ed 100644 +index 22f2689aa..a46f82362 100644 --- a/grub-core/net/net.c +++ b/grub-core/net/net.c @@ -133,8 +133,9 @@ grub_net_link_layer_resolve (struct grub_net_network_level_interface *inf, @@ -713,7 +713,7 @@ index 22f2689aaeb..a46f82362ed 100644 int diff --git a/include/grub/net.h b/include/grub/net.h -index 8a05ec4fe7a..af0404db7e3 100644 +index 8a05ec4fe..af0404db7 100644 --- a/include/grub/net.h +++ b/include/grub/net.h @@ -29,7 +29,8 @@ diff --git a/0073-Fixup-for-newer-compiler.patch b/0073-Fixup-for-newer-compiler.patch deleted file mode 100644 index 11ed6e5..0000000 --- a/0073-Fixup-for-newer-compiler.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Peter Jones <pjones(a)redhat.com> -Date: Thu, 10 May 2018 13:40:19 -0400 -Subject: [PATCH] Fixup for newer compiler - ---- - conf/Makefile.common | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/conf/Makefile.common b/conf/Makefile.common -index 191b1a70c6b..5f0ef969857 100644 ---- a/conf/Makefile.common -+++ b/conf/Makefile.common -@@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding - LDFLAGS_KERNEL = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) - CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1 - CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM) --STRIPFLAGS_KERNEL = -R .eh_frame -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx -+STRIPFLAGS_KERNEL = -R .eh_frame -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx -R .note.gnu.property -R .gnu.build.attributes - - CFLAGS_MODULE = $(CFLAGS_PLATFORM) -ffreestanding - LDFLAGS_MODULE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d diff --git a/0075-net-read-bracketed-ipv6-addrs-and-port-numbers.patch b/0073-net-read-bracketed-ipv6-addrs-and-port-numbers.patch similarity index 98% rename from 0075-net-read-bracketed-ipv6-addrs-and-port-numbers.patch rename to 0073-net-read-bracketed-ipv6-addrs-and-port-numbers.patch index 834b96e..997c189 100644 --- a/0075-net-read-bracketed-ipv6-addrs-and-port-numbers.patch +++ b/0073-net-read-bracketed-ipv6-addrs-and-port-numbers.patch @@ -18,7 +18,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 4 files changed, 109 insertions(+), 12 deletions(-) diff --git a/grub-core/net/http.c b/grub-core/net/http.c -index b616cf40b1e..12a2632ea55 100644 +index b616cf40b..12a2632ea 100644 --- a/grub-core/net/http.c +++ b/grub-core/net/http.c @@ -289,7 +289,9 @@ http_receive (grub_net_tcp_socket_t sock __attribute__ ((unused)), @@ -87,7 +87,7 @@ index b616cf40b1e..12a2632ea55 100644 file); if (!data->sock) diff --git a/grub-core/net/net.c b/grub-core/net/net.c -index a46f82362ed..0ce5e675ed7 100644 +index a46f82362..0ce5e675e 100644 --- a/grub-core/net/net.c +++ b/grub-core/net/net.c @@ -444,6 +444,13 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest) @@ -225,7 +225,7 @@ index a46f82362ed..0ce5e675ed7 100644 } diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c -index 4ab2f5c7357..d54b13f09ff 100644 +index 4ab2f5c73..d54b13f09 100644 --- a/grub-core/net/tftp.c +++ b/grub-core/net/tftp.c @@ -295,6 +295,7 @@ tftp_open (struct grub_file *file, const char *filename) @@ -257,7 +257,7 @@ index 4ab2f5c7357..d54b13f09ff 100644 if (!data->sock) { diff --git a/include/grub/net.h b/include/grub/net.h -index af0404db7e3..d55d505a03a 100644 +index af0404db7..d55d505a0 100644 --- a/include/grub/net.h +++ b/include/grub/net.h @@ -273,6 +273,7 @@ typedef struct grub_net diff --git a/0076-bootp-New-net_bootp6-command.patch b/0074-bootp-New-net_bootp6-command.patch similarity index 99% rename from 0076-bootp-New-net_bootp6-command.patch rename to 0074-bootp-New-net_bootp6-command.patch index 21b3871..8307409 100644 --- a/0076-bootp-New-net_bootp6-command.patch +++ b/0074-bootp-New-net_bootp6-command.patch @@ -19,7 +19,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 5 files changed, 1002 insertions(+), 209 deletions(-) diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c -index 08b6b2b5d6c..fe93b80f1cf 100644 +index 08b6b2b5d..fe93b80f1 100644 --- a/grub-core/net/bootp.c +++ b/grub-core/net/bootp.c @@ -24,6 +24,98 @@ @@ -1136,7 +1136,7 @@ index 08b6b2b5d6c..fe93b80f1cf 100644 grub_unregister_command (cmd_bootp); grub_unregister_command (cmd_dhcp); diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c -index a673bea807a..8e25680db0c 100644 +index a673bea80..8e25680db 100644 --- a/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c @@ -393,9 +393,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device, @@ -1174,7 +1174,7 @@ index a673bea807a..8e25680db0c 100644 } else diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c -index a5896f6dc26..ce6bdc75c6d 100644 +index a5896f6dc..ce6bdc75c 100644 --- a/grub-core/net/ip.c +++ b/grub-core/net/ip.c @@ -239,6 +239,45 @@ handle_dgram (struct grub_net_buff *nb, @@ -1224,7 +1224,7 @@ index a5896f6dc26..ce6bdc75c6d 100644 { const struct grub_net_bootp_packet *bootp; diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h -index 99628801478..7614b58dca8 100644 +index 996288014..7614b58dc 100644 --- a/include/grub/efi/api.h +++ b/include/grub/efi/api.h @@ -1532,7 +1532,7 @@ typedef struct grub_efi_pxe_ip_filter @@ -1237,7 +1237,7 @@ index 99628801478..7614b58dca8 100644 } grub_efi_pxe_ip_filter_t; diff --git a/include/grub/net.h b/include/grub/net.h -index d55d505a03a..543251f7273 100644 +index d55d505a0..543251f72 100644 --- a/include/grub/net.h +++ b/include/grub/net.h @@ -451,50 +451,65 @@ struct grub_net_bootp_packet diff --git a/0077-efinet-UEFI-IPv6-PXE-support.patch b/0075-efinet-UEFI-IPv6-PXE-support.patch similarity index 98% rename from 0077-efinet-UEFI-IPv6-PXE-support.patch rename to 0075-efinet-UEFI-IPv6-PXE-support.patch index d8b22b8..8f1dca6 100644 --- a/0077-efinet-UEFI-IPv6-PXE-support.patch +++ b/0075-efinet-UEFI-IPv6-PXE-support.patch @@ -15,7 +15,7 @@ Signed-off-by: Ken Lin <ken.lin(a)hpe.com> 2 files changed, 46 insertions(+), 27 deletions(-) diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c -index 8e25680db0c..014e5bf9802 100644 +index 8e25680db..014e5bf98 100644 --- a/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c @@ -409,6 +409,8 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device, @@ -28,7 +28,7 @@ index 8e25680db0c..014e5bf9802 100644 else { diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h -index 7614b58dca8..91ab528e4d0 100644 +index 7614b58dc..91ab528e4 100644 --- a/include/grub/efi/api.h +++ b/include/grub/efi/api.h @@ -1524,31 +1524,6 @@ typedef union diff --git a/0078-grub.texi-Add-net_bootp6-doument.patch b/0076-grub.texi-Add-net_bootp6-doument.patch similarity index 97% rename from 0078-grub.texi-Add-net_bootp6-doument.patch rename to 0076-grub.texi-Add-net_bootp6-doument.patch index 3f8ec97..d12f33e 100644 --- a/0078-grub.texi-Add-net_bootp6-doument.patch +++ b/0076-grub.texi-Add-net_bootp6-doument.patch @@ -12,7 +12,7 @@ Signed-off-by: Ken Lin <ken.lin(a)hpe.com> 1 file changed, 17 insertions(+) diff --git a/docs/grub.texi b/docs/grub.texi -index 0615d0ed97e..04ed6ac1f07 100644 +index 0615d0ed9..04ed6ac1f 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -5487,6 +5487,7 @@ This command is only available on AArch64 systems. diff --git a/0079-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch b/0077-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch similarity index 98% rename from 0079-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch rename to 0077-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch index e800dd2..114f102 100644 --- a/0079-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch +++ b/0077-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch @@ -22,7 +22,7 @@ Signed-off-by: Ken Lin <ken.lin(a)hpe.com> 2 files changed, 56 insertions(+) diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c -index fe93b80f1cf..8fb8918ae7e 100644 +index fe93b80f1..8fb8918ae 100644 --- a/grub-core/net/bootp.c +++ b/grub-core/net/bootp.c @@ -20,6 +20,7 @@ @@ -95,7 +95,7 @@ index fe93b80f1cf..8fb8918ae7e 100644 if (opt && opt_len) grub_env_set_net_property (name, "extensionspath", (const char *) opt, opt_len); diff --git a/include/grub/net.h b/include/grub/net.h -index 543251f7273..42af7de250a 100644 +index 543251f72..42af7de25 100644 --- a/include/grub/net.h +++ b/include/grub/net.h @@ -531,6 +531,7 @@ enum diff --git a/0080-efinet-Setting-network-from-UEFI-device-path.patch b/0078-efinet-Setting-network-from-UEFI-device-path.patch similarity index 99% rename from 0080-efinet-Setting-network-from-UEFI-device-path.patch rename to 0078-efinet-Setting-network-from-UEFI-device-path.patch index 11b2a72..0aef614 100644 --- a/0080-efinet-Setting-network-from-UEFI-device-path.patch +++ b/0078-efinet-Setting-network-from-UEFI-device-path.patch @@ -32,7 +32,7 @@ Signed-off-by: Ken Lin <ken.lin(a)hpe.com> 2 files changed, 280 insertions(+), 15 deletions(-) diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c -index 014e5bf9802..8171ecaa5e4 100644 +index 014e5bf98..8171ecaa5 100644 --- a/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c @@ -26,6 +26,7 @@ @@ -375,7 +375,7 @@ index 014e5bf9802..8171ecaa5e4 100644 } } diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h -index 91ab528e4d0..4a51667adb1 100644 +index 91ab528e4..4a51667ad 100644 --- a/include/grub/efi/api.h +++ b/include/grub/efi/api.h @@ -864,6 +864,8 @@ struct grub_efi_ipv4_device_path diff --git a/0081-efinet-Setting-DNS-server-from-UEFI-protocol.patch b/0079-efinet-Setting-DNS-server-from-UEFI-protocol.patch similarity index 99% rename from 0081-efinet-Setting-DNS-server-from-UEFI-protocol.patch rename to 0079-efinet-Setting-DNS-server-from-UEFI-protocol.patch index 1460c8a..a539267 100644 --- a/0081-efinet-Setting-DNS-server-from-UEFI-protocol.patch +++ b/0079-efinet-Setting-DNS-server-from-UEFI-protocol.patch @@ -33,7 +33,7 @@ Signed-off-by: Ken Lin <ken.lin(a)hpe.com> 2 files changed, 238 insertions(+) diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c -index 8171ecaa5e4..715a6168d77 100644 +index 8171ecaa5..715a6168d 100644 --- a/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c @@ -33,6 +33,8 @@ GRUB_MOD_LICENSE ("GPLv3+"); @@ -242,7 +242,7 @@ index 8171ecaa5e4..715a6168d77 100644 } diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h -index 4a51667adb1..0b490195ad9 100644 +index 4a51667ad..0b490195a 100644 --- a/include/grub/efi/api.h +++ b/include/grub/efi/api.h @@ -352,6 +352,15 @@ diff --git a/0082-Support-UEFI-networking-protocols.patch b/0080-Support-UEFI-networking-protocols.patch similarity index 99% rename from 0082-Support-UEFI-networking-protocols.patch rename to 0080-Support-UEFI-networking-protocols.patch index fb14386..ec8e159 100644 --- a/0082-Support-UEFI-networking-protocols.patch +++ b/0080-Support-UEFI-networking-protocols.patch @@ -57,7 +57,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> create mode 100644 include/grub/net/efi.h diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 4b7c45a7b06..c40170f2dd2 100644 +index 4b7c45a7b..c40170f2d 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -2299,6 +2299,12 @@ module = { @@ -87,7 +87,7 @@ index 4b7c45a7b06..c40170f2dd2 100644 module = { diff --git a/grub-core/io/bufio.c b/grub-core/io/bufio.c -index a458c3aca78..1637731535e 100644 +index a458c3aca..163773153 100644 --- a/grub-core/io/bufio.c +++ b/grub-core/io/bufio.c @@ -139,7 +139,7 @@ grub_bufio_read (grub_file_t file, char *buf, grub_size_t len) @@ -100,7 +100,7 @@ index a458c3aca78..1637731535e 100644 if (file->offset + res < next_buf) { diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index d6a2fb57789..2a446f5031b 100644 +index d6a2fb577..2a446f503 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -755,7 +755,7 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp) @@ -231,7 +231,7 @@ index d6a2fb57789..2a446f5031b 100644 grub_printf ("/UnknownMessaging(%x)", (unsigned) subtype); break; diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c -index 715a6168d77..e11d759f19a 100644 +index 715a6168d..e11d759f1 100644 --- a/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c @@ -27,6 +27,7 @@ @@ -304,7 +304,7 @@ index 715a6168d77..e11d759f19a 100644 diff --git a/grub-core/net/efi/dhcp.c b/grub-core/net/efi/dhcp.c new file mode 100644 -index 00000000000..dbef63d8c08 +index 000000000..dbef63d8c --- /dev/null +++ b/grub-core/net/efi/dhcp.c @@ -0,0 +1,397 @@ @@ -707,7 +707,7 @@ index 00000000000..dbef63d8c08 +grub_command_func_t grub_efi_net_bootp6 = grub_cmd_efi_bootp6; diff --git a/grub-core/net/efi/efi_netfs.c b/grub-core/net/efi/efi_netfs.c new file mode 100644 -index 00000000000..ef371d885ea +index 000000000..ef371d885 --- /dev/null +++ b/grub-core/net/efi/efi_netfs.c @@ -0,0 +1,57 @@ @@ -770,7 +770,7 @@ index 00000000000..ef371d885ea +} diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c new file mode 100644 -index 00000000000..3f61fd2fa5b +index 000000000..3f61fd2fa --- /dev/null +++ b/grub-core/net/efi/http.c @@ -0,0 +1,419 @@ @@ -1195,7 +1195,7 @@ index 00000000000..3f61fd2fa5b + }; diff --git a/grub-core/net/efi/ip4_config.c b/grub-core/net/efi/ip4_config.c new file mode 100644 -index 00000000000..b711a5d9457 +index 000000000..b711a5d94 --- /dev/null +++ b/grub-core/net/efi/ip4_config.c @@ -0,0 +1,398 @@ @@ -1599,7 +1599,7 @@ index 00000000000..b711a5d9457 + }; diff --git a/grub-core/net/efi/ip6_config.c b/grub-core/net/efi/ip6_config.c new file mode 100644 -index 00000000000..017c4d05bc7 +index 000000000..017c4d05b --- /dev/null +++ b/grub-core/net/efi/ip6_config.c @@ -0,0 +1,422 @@ @@ -2027,7 +2027,7 @@ index 00000000000..017c4d05bc7 + }; diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c new file mode 100644 -index 00000000000..86bce6535d3 +index 000000000..86bce6535 --- /dev/null +++ b/grub-core/net/efi/net.c @@ -0,0 +1,1428 @@ @@ -3461,7 +3461,7 @@ index 00000000000..86bce6535d3 +} diff --git a/grub-core/net/efi/pxe.c b/grub-core/net/efi/pxe.c new file mode 100644 -index 00000000000..531949cba5c +index 000000000..531949cba --- /dev/null +++ b/grub-core/net/efi/pxe.c @@ -0,0 +1,424 @@ @@ -3890,7 +3890,7 @@ index 00000000000..531949cba5c + }; + diff --git a/grub-core/net/net.c b/grub-core/net/net.c -index 0ce5e675ed7..55aed92722c 100644 +index 0ce5e675e..55aed9272 100644 --- a/grub-core/net/net.c +++ b/grub-core/net/net.c @@ -32,6 +32,9 @@ @@ -4000,7 +4000,7 @@ index 0ce5e675ed7..55aed92722c 100644 +#endif } diff --git a/util/grub-mknetdir.c b/util/grub-mknetdir.c -index a2461cda1c4..77958dd9dd5 100644 +index a2461cda1..77958dd9d 100644 --- a/util/grub-mknetdir.c +++ b/util/grub-mknetdir.c @@ -32,13 +32,15 @@ @@ -4082,7 +4082,7 @@ index a2461cda1c4..77958dd9dd5 100644 if (!grub_install_source_directory) { diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h -index 0b490195ad9..f431f49973e 100644 +index 0b490195a..f431f4997 100644 --- a/include/grub/efi/api.h +++ b/include/grub/efi/api.h @@ -622,6 +622,23 @@ typedef union @@ -4333,7 +4333,7 @@ index 0b490195ad9..f431f49973e 100644 || defined(__riscv) diff --git a/include/grub/efi/dhcp.h b/include/grub/efi/dhcp.h new file mode 100644 -index 00000000000..fdb88eb810e +index 000000000..fdb88eb81 --- /dev/null +++ b/include/grub/efi/dhcp.h @@ -0,0 +1,343 @@ @@ -4682,7 +4682,7 @@ index 00000000000..fdb88eb810e +#endif /* ! GRUB_EFI_DHCP_HEADER */ diff --git a/include/grub/efi/http.h b/include/grub/efi/http.h new file mode 100644 -index 00000000000..c5e9a89f505 +index 000000000..c5e9a89f5 --- /dev/null +++ b/include/grub/efi/http.h @@ -0,0 +1,215 @@ @@ -4903,7 +4903,7 @@ index 00000000000..c5e9a89f505 +#endif /* !GRUB_EFI_HTTP_HEADER */ diff --git a/include/grub/net/efi.h b/include/grub/net/efi.h new file mode 100644 -index 00000000000..de90d223e8e +index 000000000..de90d223e --- /dev/null +++ b/include/grub/net/efi.h @@ -0,0 +1,144 @@ diff --git a/0083-AUDIT-0-http-boot-tracker-bug.patch b/0081-AUDIT-0-http-boot-tracker-bug.patch similarity index 96% rename from 0083-AUDIT-0-http-boot-tracker-bug.patch rename to 0081-AUDIT-0-http-boot-tracker-bug.patch index ef3e67b..d9a20a9 100644 --- a/0083-AUDIT-0-http-boot-tracker-bug.patch +++ b/0081-AUDIT-0-http-boot-tracker-bug.patch @@ -22,7 +22,7 @@ Signed-off-by: Michael Chang <mchang(a)suse.com> 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c -index 86bce6535d3..4bb308026ce 100644 +index 86bce6535..4bb308026 100644 --- a/grub-core/net/efi/net.c +++ b/grub-core/net/efi/net.c @@ -645,8 +645,10 @@ grub_efihttp_chunk_read (grub_file_t file, char *buf, @@ -38,7 +38,7 @@ index 86bce6535d3..4bb308026ce 100644 if (buf) { diff --git a/grub-core/net/http.c b/grub-core/net/http.c -index 12a2632ea55..b52b558d631 100644 +index 12a2632ea..b52b558d6 100644 --- a/grub-core/net/http.c +++ b/grub-core/net/http.c @@ -31,7 +31,8 @@ GRUB_MOD_LICENSE ("GPLv3+"); diff --git a/0084-grub-editenv-Add-incr-command-to-increment-integer-v.patch b/0082-grub-editenv-Add-incr-command-to-increment-integer-v.patch similarity index 98% rename from 0084-grub-editenv-Add-incr-command-to-increment-integer-v.patch rename to 0082-grub-editenv-Add-incr-command-to-increment-integer-v.patch index f8de42a..b64dad2 100644 --- a/0084-grub-editenv-Add-incr-command-to-increment-integer-v.patch +++ b/0082-grub-editenv-Add-incr-command-to-increment-integer-v.patch @@ -17,7 +17,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> 1 file changed, 50 insertions(+) diff --git a/util/grub-editenv.c b/util/grub-editenv.c -index db6f187cc63..948eec8a114 100644 +index db6f187cc..948eec8a1 100644 --- a/util/grub-editenv.c +++ b/util/grub-editenv.c @@ -53,6 +53,9 @@ static struct argp_option options[] = { diff --git a/0085-Add-auto-hide-menu-support.patch b/0083-Add-auto-hide-menu-support.patch similarity index 93% rename from 0085-Add-auto-hide-menu-support.patch rename to 0083-Add-auto-hide-menu-support.patch index 863cd05..d012255 100644 --- a/0085-Add-auto-hide-menu-support.patch +++ b/0083-Add-auto-hide-menu-support.patch @@ -35,12 +35,6 @@ fastboot If set to "1" and the conditions for auto-hiding the menu https://git.launchpad.net/~ubuntu-core-dev/grub/+git/ubuntu/tree/debian/p... Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> ---- -Changes in v2: --Drop shutdown_success tests, there is no meaningful way for systemd to set - this flag (by the time it knows all filesystems are unmounted or read-only --Drop fwsetup_once support, systemd already supports booting directly into - the fwsetup by doing "systemctl reboot --firmware" --- Makefile.util.def | 6 +++++ util/grub.d/01_menu_auto_hide.in | 48 ++++++++++++++++++++++++++++++++++++++++ @@ -49,7 +43,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 48512bc6311..314e6f2acf8 100644 +index 48512bc63..314e6f2ac 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -458,6 +458,12 @@ script = { @@ -67,7 +61,7 @@ index 48512bc6311..314e6f2acf8 100644 common = util/grub.d/01_users.in; diff --git a/util/grub.d/01_menu_auto_hide.in b/util/grub.d/01_menu_auto_hide.in new file mode 100644 -index 00000000000..ad175870a54 +index 000000000..ad175870a --- /dev/null +++ b/util/grub.d/01_menu_auto_hide.in @@ -0,0 +1,48 @@ @@ -120,7 +114,7 @@ index 00000000000..ad175870a54 +fi +EOF diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in -index 4b27bd20153..3c9431cfcfb 100644 +index 4b27bd201..3c9431cfc 100644 --- a/util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in @@ -42,6 +42,7 @@ if [ -z "${OSPROBED}" ] ; then diff --git a/0086-Add-grub-set-bootflag-utility.patch b/0084-Add-grub-set-bootflag-utility.patch similarity index 85% rename from 0086-Add-grub-set-bootflag-utility.patch rename to 0084-Add-grub-set-bootflag-utility.patch index e39f8be..a0a6da9 100644 --- a/0086-Add-grub-set-bootflag-utility.patch +++ b/0084-Add-grub-set-bootflag-utility.patch @@ -33,22 +33,23 @@ and a symlink to grub-boot-success.timer should be added to Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> [makhomed: grub-boot-success.timer: Only run if not in a container] Signed-off-by: Gena Makhomed <makhomed(a)gmail.com> +[rharwood: migrate to h2m] Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> --- Makefile.util.def | 7 ++ - util/grub-set-bootflag.c | 160 +++++++++++++++++++++++++++++++++++++++++ + util/grub-set-bootflag.c | 172 +++++++++++++++++++++++++++++++++++++++++ conf/Makefile.extra-dist | 3 + docs/grub-boot-success.service | 6 ++ docs/grub-boot-success.timer | 7 ++ - util/grub-set-bootflag.1 | 20 ++++++ - 6 files changed, 203 insertions(+) + docs/man/grub-set-bootflag.h2m | 2 + + 6 files changed, 197 insertions(+) create mode 100644 util/grub-set-bootflag.c create mode 100644 docs/grub-boot-success.service create mode 100644 docs/grub-boot-success.timer - create mode 100644 util/grub-set-bootflag.1 + create mode 100644 docs/man/grub-set-bootflag.h2m diff --git a/Makefile.util.def b/Makefile.util.def -index 314e6f2acf8..0b85a7fce4a 100644 +index 314e6f2ac..0b85a7fce 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -1446,3 +1446,10 @@ program = { @@ -64,10 +65,10 @@ index 314e6f2acf8..0b85a7fce4a 100644 +}; diff --git a/util/grub-set-bootflag.c b/util/grub-set-bootflag.c new file mode 100644 -index 00000000000..bb198f02351 +index 000000000..d506f7e75 --- /dev/null +++ b/util/grub-set-bootflag.c -@@ -0,0 +1,160 @@ +@@ -0,0 +1,172 @@ +/* grub-set-bootflag.c - tool to set boot-flags in the grubenv. */ +/* + * GRUB -- GRand Unified Bootloader @@ -101,6 +102,8 @@ index 00000000000..bb198f02351 +#include <string.h> +#include <unistd.h> + ++#include "progname.h" ++ +#define GRUBENV "/" GRUB_BOOT_DIR_NAME "/" GRUB_DIR_NAME "/" GRUB_ENVBLK_DEFCFG +#define GRUBENV_SIZE 1024 + @@ -110,13 +113,13 @@ index 00000000000..bb198f02351 + NULL +}; + -+static void usage(void) ++static void usage(FILE *out) +{ + int i; + -+ fprintf (stderr, "Usage: 'grub-set-bootflag <bootflag>', where <bootflag> is one of:\n"); ++ fprintf (out, "Usage: 'grub-set-bootflag <bootflag>', where <bootflag> is one of:\n"); + for (i = 0; bootflags[i]; i++) -+ fprintf (stderr, " %s\n", bootflags[i]); ++ fprintf (out, " %s\n", bootflags[i]); +} + +int main(int argc, char *argv[]) @@ -129,9 +132,19 @@ index 00000000000..bb198f02351 + + if (argc != 2) + { -+ usage(); ++ usage (stderr); + return 1; + } ++ else if (!strcmp (argv[1], "--help")) ++ { ++ usage (stdout); ++ return 0; ++ } ++ else if (!strcmp (argv[1], "--version")) ++ { ++ printf ("grub-set-bootflag (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION); ++ return 0; ++ } + + for (i = 0; bootflags[i]; i++) + if (!strcmp (argv[1], bootflags[i])) @@ -139,7 +152,7 @@ index 00000000000..bb198f02351 + if (!bootflags[i]) + { + fprintf (stderr, "Invalid bootflag: '%s'\n", argv[1]); -+ usage(); ++ usage (stderr); + return 1; + } + @@ -229,10 +242,10 @@ index 00000000000..bb198f02351 + return 0; +} diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist -index b909f2c073a..ea58362b555 100644 +index 8f1485d52..ad235de7f 100644 --- a/conf/Makefile.extra-dist +++ b/conf/Makefile.extra-dist -@@ -14,6 +14,9 @@ EXTRA_DIST += util/import_unicode.py +@@ -15,6 +15,9 @@ EXTRA_DIST += docs/man EXTRA_DIST += docs/autoiso.cfg EXTRA_DIST += docs/grub.cfg EXTRA_DIST += docs/osdetect.cfg @@ -244,7 +257,7 @@ index b909f2c073a..ea58362b555 100644 diff --git a/docs/grub-boot-success.service b/docs/grub-boot-success.service new file mode 100644 -index 00000000000..80e79584c91 +index 000000000..80e79584c --- /dev/null +++ b/docs/grub-boot-success.service @@ -0,0 +1,6 @@ @@ -256,7 +269,7 @@ index 00000000000..80e79584c91 +ExecStart=/usr/sbin/grub2-set-bootflag boot_success diff --git a/docs/grub-boot-success.timer b/docs/grub-boot-success.timer new file mode 100644 -index 00000000000..406f1720056 +index 000000000..406f17200 --- /dev/null +++ b/docs/grub-boot-success.timer @@ -0,0 +1,7 @@ @@ -267,29 +280,11 @@ index 00000000000..406f1720056 + +[Timer] +OnActiveSec=2min -diff --git a/util/grub-set-bootflag.1 b/util/grub-set-bootflag.1 +diff --git a/docs/man/grub-set-bootflag.h2m b/docs/man/grub-set-bootflag.h2m new file mode 100644 -index 00000000000..57801da22a0 +index 000000000..94ec0b92e --- /dev/null -+++ b/util/grub-set-bootflag.1 -@@ -0,0 +1,20 @@ -+.TH GRUB-SET-BOOTFLAG 1 "Tue Jun 12 2018" -+.SH NAME -+\fBgrub-set-bootflag\fR \(em Set a bootflag in the GRUB environment block. -+ -+.SH SYNOPSIS -+\fBgrub-set-bootflag\fR <\fIBOOTFLAG\fR> -+ -+.SH DESCRIPTION -+\fBgrub-set-bootflag\fR is a command line to set bootflags in GRUB's -+stored environment. -+ -+.SH COMMANDS -+.TP -+\fBBOOTFLAG\fR -+.RS 7 -+Bootflag to set, one of \fIboot_success\fR or \fIshow_menu_once\fR. -+.RE -+ -+.SH SEE ALSO -+.BR "info grub" ++++ b/docs/man/grub-set-bootflag.h2m +@@ -0,0 +1,2 @@ ++[NAME] ++grub-set-bootflag \- set a bootflag in the GRUB environment block diff --git a/0087-docs-Add-grub-boot-indeterminate.service-example.patch b/0085-docs-Add-grub-boot-indeterminate.service-example.patch similarity index 97% rename from 0087-docs-Add-grub-boot-indeterminate.service-example.patch rename to 0085-docs-Add-grub-boot-indeterminate.service-example.patch index 44f6ad3..5b8732a 100644 --- a/0087-docs-Add-grub-boot-indeterminate.service-example.patch +++ b/0085-docs-Add-grub-boot-indeterminate.service-example.patch @@ -16,7 +16,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> diff --git a/docs/grub-boot-indeterminate.service b/docs/grub-boot-indeterminate.service new file mode 100644 -index 00000000000..6c8dcb186b6 +index 000000000..6c8dcb186 --- /dev/null +++ b/docs/grub-boot-indeterminate.service @@ -0,0 +1,11 @@ diff --git a/0088-gentpl-add-disable-support.patch b/0086-gentpl-add-disable-support.patch similarity index 97% rename from 0088-gentpl-add-disable-support.patch rename to 0086-gentpl-add-disable-support.patch index 2c3c998..fabba4b 100644 --- a/0088-gentpl-add-disable-support.patch +++ b/0086-gentpl-add-disable-support.patch @@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gentpl.py b/gentpl.py -index 2cba0bbbd6f..628e8bec1d7 100644 +index c86550d4f..f3c5f84f8 100644 --- a/gentpl.py +++ b/gentpl.py @@ -592,11 +592,21 @@ def platform_conditional(platform, closure): diff --git a/0089-gentpl-add-pc-firmware-type.patch b/0087-gentpl-add-pc-firmware-type.patch similarity index 95% rename from 0089-gentpl-add-pc-firmware-type.patch rename to 0087-gentpl-add-pc-firmware-type.patch index 96dd2b8..e364787 100644 --- a/0089-gentpl-add-pc-firmware-type.patch +++ b/0087-gentpl-add-pc-firmware-type.patch @@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 1 insertion(+) diff --git a/gentpl.py b/gentpl.py -index 628e8bec1d7..34a4eba2b42 100644 +index f3c5f84f8..f09b33686 100644 --- a/gentpl.py +++ b/gentpl.py @@ -51,6 +51,7 @@ GROUPS["riscv32"] = [ "riscv32_efi" ] diff --git a/0090-efinet-also-use-the-firmware-acceleration-for-http.patch b/0088-efinet-also-use-the-firmware-acceleration-for-http.patch similarity index 96% rename from 0090-efinet-also-use-the-firmware-acceleration-for-http.patch rename to 0088-efinet-also-use-the-firmware-acceleration-for-http.patch index 915b5aa..9fec27c 100644 --- a/0090-efinet-also-use-the-firmware-acceleration-for-http.patch +++ b/0088-efinet-also-use-the-firmware-acceleration-for-http.patch @@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c -index 4bb308026ce..6603cd83edc 100644 +index 4bb308026..6603cd83e 100644 --- a/grub-core/net/efi/net.c +++ b/grub-core/net/efi/net.c @@ -1324,7 +1324,9 @@ grub_efi_net_boot_from_https (void) diff --git a/0091-efi-http-Make-root_url-reflect-the-protocol-hostname.patch b/0089-efi-http-Make-root_url-reflect-the-protocol-hostname.patch similarity index 97% rename from 0091-efi-http-Make-root_url-reflect-the-protocol-hostname.patch rename to 0089-efi-http-Make-root_url-reflect-the-protocol-hostname.patch index 985a037..1af9ba0 100644 --- a/0091-efi-http-Make-root_url-reflect-the-protocol-hostname.patch +++ b/0089-efi-http-Make-root_url-reflect-the-protocol-hostname.patch @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 19 insertions(+) diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c -index 3f61fd2fa5b..243acbaa35b 100644 +index 3f61fd2fa..243acbaa3 100644 --- a/grub-core/net/efi/http.c +++ b/grub-core/net/efi/http.c @@ -4,6 +4,7 @@ diff --git a/0092-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch b/0090-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch similarity index 96% rename from 0092-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch rename to 0090-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch index ee2216e..e77a96c 100644 --- a/0092-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch +++ b/0090-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch @@ -17,10 +17,10 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 3 files changed, 64 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac -index b50fb2e9897..b27573b3de5 100644 +index b809c0078..b1ca89479 100644 --- a/configure.ac +++ b/configure.ac -@@ -877,11 +877,23 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$p +@@ -850,11 +850,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 b50fb2e9897..b27573b3de5 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 -@@ -2011,6 +2023,41 @@ HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_builddir)/include" +@@ -1984,6 +1996,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" @@ -88,7 +88,7 @@ index b50fb2e9897..b27573b3de5 100644 GRUB_PLATFORM="${platform}" diff --git a/conf/Makefile.common b/conf/Makefile.common -index 5f0ef969857..2ff9b39357c 100644 +index 5f0ef9698..2ff9b3935 100644 --- a/conf/Makefile.common +++ b/conf/Makefile.common @@ -40,24 +40,25 @@ CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1 @@ -129,7 +129,7 @@ index 5f0ef969857..2ff9b39357c 100644 # Other variables diff --git a/gentpl.py b/gentpl.py -index 34a4eba2b42..59f62ef9522 100644 +index f09b33686..0e62e1466 100644 --- a/gentpl.py +++ b/gentpl.py @@ -697,10 +697,10 @@ def module(defn, platform): diff --git a/0093-module-verifier-make-it-possible-to-run-checkers-on-.patch b/0091-module-verifier-make-it-possible-to-run-checkers-on-.patch similarity index 94% rename from 0093-module-verifier-make-it-possible-to-run-checkers-on-.patch rename to 0091-module-verifier-make-it-possible-to-run-checkers-on-.patch index e31b38f..5419b61 100644 --- a/0093-module-verifier-make-it-possible-to-run-checkers-on-.patch +++ b/0091-module-verifier-make-it-possible-to-run-checkers-on-.patch @@ -22,7 +22,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 3 files changed, 13 insertions(+) diff --git a/util/grub-module-verifier32.c b/util/grub-module-verifier32.c -index 257229f8f08..ba7d41aafea 100644 +index 257229f8f..ba7d41aaf 100644 --- a/util/grub-module-verifier32.c +++ b/util/grub-module-verifier32.c @@ -1,2 +1,4 @@ @@ -31,7 +31,7 @@ index 257229f8f08..ba7d41aafea 100644 #include "grub-module-verifierXX.c" +#endif diff --git a/util/grub-module-verifier64.c b/util/grub-module-verifier64.c -index 4db6b4bedd1..fc23ef800b3 100644 +index 4db6b4bed..fc23ef800 100644 --- a/util/grub-module-verifier64.c +++ b/util/grub-module-verifier64.c @@ -1,2 +1,4 @@ @@ -40,7 +40,7 @@ index 4db6b4bedd1..fc23ef800b3 100644 #include "grub-module-verifierXX.c" +#endif diff --git a/util/grub-module-verifierXX.c b/util/grub-module-verifierXX.c -index ceb24309aec..a98e2f9b1ac 100644 +index ceb24309a..a98e2f9b1 100644 --- a/util/grub-module-verifierXX.c +++ b/util/grub-module-verifierXX.c @@ -1,3 +1,12 @@ diff --git a/0094-Rework-how-the-fdt-command-builds.patch b/0092-Rework-how-the-fdt-command-builds.patch similarity index 95% rename from 0094-Rework-how-the-fdt-command-builds.patch rename to 0092-Rework-how-the-fdt-command-builds.patch index e233067..8cf19f0 100644 --- a/0094-Rework-how-the-fdt-command-builds.patch +++ b/0092-Rework-how-the-fdt-command-builds.patch @@ -25,7 +25,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index c40170f2dd2..84a3d89de9a 100644 +index c40170f2d..84a3d89de 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -177,7 +177,6 @@ kernel = { @@ -62,7 +62,7 @@ index c40170f2dd2..84a3d89de9a 100644 }; diff --git a/grub-core/lib/fdt.c b/grub-core/lib/fdt.c -index 0d371c5633e..37e04bd69e7 100644 +index 0d371c563..37e04bd69 100644 --- a/grub-core/lib/fdt.c +++ b/grub-core/lib/fdt.c @@ -21,8 +21,6 @@ @@ -75,7 +75,7 @@ index 0d371c5633e..37e04bd69e7 100644 #define FDT_BEGIN_NODE 0x00000001 diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c -index c86f283d756..c572415d38a 100644 +index c86f283d7..c572415d3 100644 --- a/grub-core/loader/efi/fdt.c +++ b/grub-core/loader/efi/fdt.c @@ -27,6 +27,8 @@ @@ -88,7 +88,7 @@ index c86f283d756..c572415d38a 100644 static void *fdt; diff --git a/include/grub/fdt.h b/include/grub/fdt.h -index e609c7e4111..3514aa4a5b6 100644 +index e609c7e41..3514aa4a5 100644 --- a/include/grub/fdt.h +++ b/include/grub/fdt.h @@ -19,6 +19,9 @@ @@ -110,7 +110,7 @@ index e609c7e4111..3514aa4a5b6 100644 + #endif /* ! GRUB_FDT_HEADER */ diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am -index f512573c0da..dd49939aaa9 100644 +index f512573c0..dd49939aa 100644 --- a/grub-core/Makefile.am +++ b/grub-core/Makefile.am @@ -76,6 +76,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/sb.h diff --git a/0095-Disable-non-wordsize-allocations-on-arm.patch b/0093-Disable-non-wordsize-allocations-on-arm.patch similarity index 93% rename from 0095-Disable-non-wordsize-allocations-on-arm.patch rename to 0093-Disable-non-wordsize-allocations-on-arm.patch index e28041a..60adf7e 100644 --- a/0095-Disable-non-wordsize-allocations-on-arm.patch +++ b/0093-Disable-non-wordsize-allocations-on-arm.patch @@ -9,10 +9,10 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 20 insertions(+) diff --git a/configure.ac b/configure.ac -index b27573b3de5..bb4e05ceef3 100644 +index b1ca89479..f42be6533 100644 --- a/configure.ac +++ b/configure.ac -@@ -1288,6 +1288,26 @@ if test "x$target_cpu" = xarm; then +@@ -1261,6 +1261,26 @@ if test "x$target_cpu" = xarm; then done ]) diff --git a/0096-Prepend-prefix-when-HTTP-path-is-relative.patch b/0094-Prepend-prefix-when-HTTP-path-is-relative.patch similarity index 98% rename from 0096-Prepend-prefix-when-HTTP-path-is-relative.patch rename to 0094-Prepend-prefix-when-HTTP-path-is-relative.patch index d3e599d..787e681 100644 --- a/0096-Prepend-prefix-when-HTTP-path-is-relative.patch +++ b/0094-Prepend-prefix-when-HTTP-path-is-relative.patch @@ -16,7 +16,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 2 files changed, 71 insertions(+), 21 deletions(-) diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c -index d1de9fa6873..1c540fc8c26 100644 +index d1de9fa68..1c540fc8c 100644 --- a/grub-core/kern/main.c +++ b/grub-core/kern/main.c @@ -131,11 +131,19 @@ grub_set_prefix_and_root (void) @@ -41,7 +41,7 @@ index d1de9fa6873..1c540fc8c26 100644 } } diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c -index 243acbaa35b..de351b2cd03 100644 +index 243acbaa3..de351b2cd 100644 --- a/grub-core/net/efi/http.c +++ b/grub-core/net/efi/http.c @@ -9,10 +9,52 @@ diff --git a/0097-Make-grub_error-more-verbose.patch b/0095-Make-grub_error-more-verbose.patch similarity index 96% rename from 0097-Make-grub_error-more-verbose.patch rename to 0095-Make-grub_error-more-verbose.patch index 2492e9f..8ecefea 100644 --- a/0097-Make-grub_error-more-verbose.patch +++ b/0095-Make-grub_error-more-verbose.patch @@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/grub-core/kern/err.c b/grub-core/kern/err.c -index 53c734de70e..aebfe0cf839 100644 +index 53c734de7..aebfe0cf8 100644 --- a/grub-core/kern/err.c +++ b/grub-core/kern/err.c @@ -33,15 +33,24 @@ static struct grub_error_saved grub_error_stack_items[GRUB_ERROR_STACK_SIZE]; @@ -41,7 +41,7 @@ index 53c734de70e..aebfe0cf839 100644 return n; diff --git a/include/grub/err.h b/include/grub/err.h -index b08d5d0de4c..c0f90ef07c8 100644 +index b08d5d0de..c0f90ef07 100644 --- a/include/grub/err.h +++ b/include/grub/err.h @@ -85,8 +85,12 @@ struct grub_error_saved diff --git a/0098-Make-reset-an-alias-for-the-reboot-command.patch b/0096-Make-reset-an-alias-for-the-reboot-command.patch similarity index 97% rename from 0098-Make-reset-an-alias-for-the-reboot-command.patch rename to 0096-Make-reset-an-alias-for-the-reboot-command.patch index c86acf1..f7bd855 100644 --- a/0098-Make-reset-an-alias-for-the-reboot-command.patch +++ b/0096-Make-reset-an-alias-for-the-reboot-command.patch @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/grub-core/commands/reboot.c b/grub-core/commands/reboot.c -index 46d364c99a9..f5cc2283636 100644 +index 46d364c99..f5cc22836 100644 --- a/grub-core/commands/reboot.c +++ b/grub-core/commands/reboot.c @@ -32,15 +32,18 @@ grub_cmd_reboot (grub_command_t cmd __attribute__ ((unused)), diff --git a/0099-Add-a-version-command.patch b/0097-Add-a-version-command.patch similarity index 95% rename from 0099-Add-a-version-command.patch rename to 0097-Add-a-version-command.patch index bf3b4b8..a70170f 100644 --- a/0099-Add-a-version-command.patch +++ b/0097-Add-a-version-command.patch @@ -17,10 +17,10 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> create mode 100644 grub-core/commands/version.c diff --git a/configure.ac b/configure.ac -index bb4e05ceef3..59ccda24475 100644 +index f42be6533..2af5f23ad 100644 --- a/configure.ac +++ b/configure.ac -@@ -312,6 +312,19 @@ AC_SUBST(target_cpu) +@@ -285,6 +285,19 @@ AC_SUBST(target_cpu) AC_SUBST(platform) # Define default variables @@ -41,7 +41,7 @@ index bb4e05ceef3..59ccda24475 100644 have_with_bootdir=n AC_ARG_WITH([bootdir], diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 84a3d89de9a..498ca11762a 100644 +index 84a3d89de..498ca1176 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -579,6 +579,11 @@ image = { @@ -58,7 +58,7 @@ index 84a3d89de9a..498ca11762a 100644 common = lib/disk.c; diff --git a/grub-core/commands/version.c b/grub-core/commands/version.c new file mode 100644 -index 00000000000..f0966a518f7 +index 000000000..f0966a518 --- /dev/null +++ b/grub-core/commands/version.c @@ -0,0 +1,56 @@ @@ -119,7 +119,7 @@ index 00000000000..f0966a518f7 + grub_unregister_command (cmd); +} diff --git a/config.h.in b/config.h.in -index 9e8f9911b18..c7e316f0f1f 100644 +index 9e8f9911b..c7e316f0f 100644 --- a/config.h.in +++ b/config.h.in @@ -59,6 +59,7 @@ diff --git a/0100-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch b/0098-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch similarity index 94% rename from 0100-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch rename to 0098-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch index 9afb315..3283495 100644 --- a/0100-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch +++ b/0098-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 4 files changed, 10 insertions(+) diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c -index 0320115662f..7cdffe3ebd5 100644 +index 032011566..7cdffe3eb 100644 --- a/grub-core/disk/diskfilter.c +++ b/grub-core/disk/diskfilter.c @@ -188,6 +188,8 @@ scan_disk (const char *name, int accept_diskfilter) @@ -33,7 +33,7 @@ index 0320115662f..7cdffe3ebd5 100644 if (!pv->disk) return grub_errno; diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c -index f077b5f5535..fe8ba6e6c93 100644 +index f077b5f55..fe8ba6e6c 100644 --- a/grub-core/disk/efi/efidisk.c +++ b/grub-core/disk/efi/efidisk.c @@ -855,6 +855,7 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle) @@ -45,7 +45,7 @@ index f077b5f5535..fe8ba6e6c93 100644 grub_free (dup_dp); diff --git a/grub-core/kern/device.c b/grub-core/kern/device.c -index 73b8ecc0c09..f58b58c89d5 100644 +index 73b8ecc0c..f58b58c89 100644 --- a/grub-core/kern/device.c +++ b/grub-core/kern/device.c @@ -34,6 +34,7 @@ grub_device_open (const char *name) @@ -57,7 +57,7 @@ index 73b8ecc0c09..f58b58c89d5 100644 { name = grub_env_get ("root"); diff --git a/grub-core/script/script.c b/grub-core/script/script.c -index ec4d4337c66..844e8343ca7 100644 +index ec4d4337c..844e8343c 100644 --- a/grub-core/script/script.c +++ b/grub-core/script/script.c @@ -22,6 +22,11 @@ diff --git a/0101-arm-arm64-loader-Better-memory-allocation-and-error-.patch b/0099-arm-arm64-loader-Better-memory-allocation-and-error-.patch similarity index 99% rename from 0101-arm-arm64-loader-Better-memory-allocation-and-error-.patch rename to 0099-arm-arm64-loader-Better-memory-allocation-and-error-.patch index 1fdc552..54e336c 100644 --- a/0101-arm-arm64-loader-Better-memory-allocation-and-error-.patch +++ b/0099-arm-arm64-loader-Better-memory-allocation-and-error-.patch @@ -71,7 +71,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 76 insertions(+), 25 deletions(-) diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c -index f6aef0ef649..85ad4b4494c 100644 +index f6aef0ef6..85ad4b449 100644 --- a/grub-core/kern/efi/mm.c +++ b/grub-core/kern/efi/mm.c @@ -154,6 +154,7 @@ grub_efi_allocate_pages_real (grub_efi_physical_address_t address, @@ -146,7 +146,7 @@ index f6aef0ef649..85ad4b4494c 100644 grub_free(memory_map); diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c -index 04994d5c67d..70a0075ec5e 100644 +index 04994d5c6..70a0075ec 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -71,20 +71,25 @@ finalize_params_linux (void) diff --git a/0102-Try-to-pick-better-locations-for-kernel-and-initrd.patch b/0100-Try-to-pick-better-locations-for-kernel-and-initrd.patch similarity index 96% rename from 0102-Try-to-pick-better-locations-for-kernel-and-initrd.patch rename to 0100-Try-to-pick-better-locations-for-kernel-and-initrd.patch index 06329b9..83fc610 100644 --- a/0102-Try-to-pick-better-locations-for-kernel-and-initrd.patch +++ b/0100-Try-to-pick-better-locations-for-kernel-and-initrd.patch @@ -38,7 +38,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 8 files changed, 29 insertions(+), 12 deletions(-) diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c -index 85ad4b4494c..e84961d078c 100644 +index 85ad4b449..e84961d07 100644 --- a/grub-core/kern/efi/mm.c +++ b/grub-core/kern/efi/mm.c @@ -122,7 +122,7 @@ grub_efi_allocate_pages_max (grub_efi_physical_address_t max, @@ -72,7 +72,7 @@ index 85ad4b4494c..e84961d078c 100644 #endif diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index 3017d0f3e52..33e981e76e7 100644 +index 3017d0f3e..33e981e76 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -27,6 +27,7 @@ @@ -138,7 +138,7 @@ index 3017d0f3e52..33e981e76e7 100644 { grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate kernel")); diff --git a/include/grub/arm/efi/memory.h b/include/grub/arm/efi/memory.h -index 2c64918e3f7..a4c2ec83502 100644 +index 2c64918e3..a4c2ec835 100644 --- a/include/grub/arm/efi/memory.h +++ b/include/grub/arm/efi/memory.h @@ -2,5 +2,6 @@ @@ -149,7 +149,7 @@ index 2c64918e3f7..a4c2ec83502 100644 #endif /* ! GRUB_MEMORY_CPU_HEADER */ diff --git a/include/grub/arm64/efi/memory.h b/include/grub/arm64/efi/memory.h -index c6cb3241714..acb61dca44b 100644 +index c6cb32417..acb61dca4 100644 --- a/include/grub/arm64/efi/memory.h +++ b/include/grub/arm64/efi/memory.h @@ -2,5 +2,6 @@ @@ -160,7 +160,7 @@ index c6cb3241714..acb61dca44b 100644 #endif /* ! GRUB_MEMORY_CPU_HEADER */ diff --git a/include/grub/i386/efi/memory.h b/include/grub/i386/efi/memory.h -index 2c64918e3f7..a4c2ec83502 100644 +index 2c64918e3..a4c2ec835 100644 --- a/include/grub/i386/efi/memory.h +++ b/include/grub/i386/efi/memory.h @@ -2,5 +2,6 @@ @@ -171,7 +171,7 @@ index 2c64918e3f7..a4c2ec83502 100644 #endif /* ! GRUB_MEMORY_CPU_HEADER */ diff --git a/include/grub/ia64/efi/memory.h b/include/grub/ia64/efi/memory.h -index 2c64918e3f7..a4c2ec83502 100644 +index 2c64918e3..a4c2ec835 100644 --- a/include/grub/ia64/efi/memory.h +++ b/include/grub/ia64/efi/memory.h @@ -2,5 +2,6 @@ @@ -182,7 +182,7 @@ index 2c64918e3f7..a4c2ec83502 100644 #endif /* ! GRUB_MEMORY_CPU_HEADER */ diff --git a/include/grub/riscv64/efi/memory.h b/include/grub/riscv64/efi/memory.h -index c6cb3241714..acb61dca44b 100644 +index c6cb32417..acb61dca4 100644 --- a/include/grub/riscv64/efi/memory.h +++ b/include/grub/riscv64/efi/memory.h @@ -2,5 +2,6 @@ @@ -193,7 +193,7 @@ index c6cb3241714..acb61dca44b 100644 #endif /* ! GRUB_MEMORY_CPU_HEADER */ diff --git a/include/grub/x86_64/efi/memory.h b/include/grub/x86_64/efi/memory.h -index 46e9145a308..e81cfb32213 100644 +index 46e9145a3..e81cfb322 100644 --- a/include/grub/x86_64/efi/memory.h +++ b/include/grub/x86_64/efi/memory.h @@ -2,9 +2,11 @@ diff --git a/0103-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch b/0101-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch similarity index 94% rename from 0103-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch rename to 0101-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch index e6cd8b4..f060b0f 100644 --- a/0103-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch +++ b/0101-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch @@ -19,7 +19,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 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 +index eeea09275..f08a1bb84 100644 --- a/grub-core/kern/emu/misc.c +++ b/grub-core/kern/emu/misc.c @@ -189,7 +189,7 @@ grub_util_get_image_size (const char *path) @@ -32,7 +32,7 @@ index eeea092752d..f08a1bb8415 100644 ret = (size_t) sz; diff --git a/grub-core/lib/reed_solomon.c b/grub-core/lib/reed_solomon.c -index 467305b46ab..79037c093f7 100644 +index 467305b46..79037c093 100644 --- a/grub-core/lib/reed_solomon.c +++ b/grub-core/lib/reed_solomon.c @@ -157,7 +157,7 @@ static void @@ -54,7 +54,7 @@ index 467305b46ab..79037c093f7 100644 { grub_size_t ds = (s + SECTOR_SIZE - 1 - i) / SECTOR_SIZE; diff --git a/grub-core/osdep/linux/blocklist.c b/grub-core/osdep/linux/blocklist.c -index c77d6085ccb..42a315031ff 100644 +index c77d6085c..42a315031 100644 --- a/grub-core/osdep/linux/blocklist.c +++ b/grub-core/osdep/linux/blocklist.c @@ -109,7 +109,7 @@ grub_install_get_blocklist (grub_device_t root_dev, @@ -67,7 +67,7 @@ index c77d6085ccb..42a315031ff 100644 + fie1.fm_mapped_extents * sizeof (fie1.fm_extents[1])); diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c -index 28790307e00..9f730b35189 100644 +index 28790307e..9f730b351 100644 --- a/grub-core/osdep/linux/getroot.c +++ b/grub-core/osdep/linux/getroot.c @@ -236,7 +236,7 @@ grub_find_root_devices_from_btrfs (const char *dir) @@ -80,7 +80,7 @@ index 28790307e00..9f730b35189 100644 fd = open (dir, 0); diff --git a/grub-core/osdep/linux/hostdisk.c b/grub-core/osdep/linux/hostdisk.c -index da62f924e35..7bc99ac1c1d 100644 +index da62f924e..7bc99ac1c 100644 --- a/grub-core/osdep/linux/hostdisk.c +++ b/grub-core/osdep/linux/hostdisk.c @@ -83,7 +83,7 @@ grub_util_get_fd_size_os (grub_util_fd_t fd, const char *name, unsigned *log_sec @@ -93,7 +93,7 @@ index da62f924e35..7bc99ac1c1d 100644 if (log_secsize) diff --git a/util/grub-fstest.c b/util/grub-fstest.c -index 83865642009..bfcef852d83 100644 +index 838656420..bfcef852d 100644 --- a/util/grub-fstest.c +++ b/util/grub-fstest.c @@ -323,7 +323,7 @@ cmd_cmp (char *src, char *dest) @@ -106,7 +106,7 @@ index 83865642009..bfcef852d83 100644 fseek (ff, 0, SEEK_END); if (pre != ftell (ff)) diff --git a/util/grub-menulst2cfg.c b/util/grub-menulst2cfg.c -index a39f8693947..358d604210b 100644 +index a39f86939..358d60421 100644 --- a/util/grub-menulst2cfg.c +++ b/util/grub-menulst2cfg.c @@ -34,7 +34,7 @@ main (int argc, char **argv) @@ -119,7 +119,7 @@ index a39f8693947..358d604210b 100644 grub_util_host_init (&argc, &argv); diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c -index 0fe45a6103d..3e09240b99f 100644 +index 0fe45a610..3e09240b9 100644 --- a/util/grub-mkfont.c +++ b/util/grub-mkfont.c @@ -138,7 +138,8 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face, @@ -173,7 +173,7 @@ index 0fe45a6103d..3e09240b99f 100644 add_pixel (&data, &mask, glyph->bitmap.buffer[i / 8 + j * glyph->bitmap.pitch] & diff --git a/util/grub-probe.c b/util/grub-probe.c -index c08e46bbb40..c6fac732b40 100644 +index c08e46bbb..c6fac732b 100644 --- a/util/grub-probe.c +++ b/util/grub-probe.c @@ -798,7 +798,7 @@ argp_parser (int key, char *arg, struct argp_state *state) @@ -186,7 +186,7 @@ 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 +index f33bd1ed5..834594410 100644 --- a/util/grub-rpm-sort.c +++ b/util/grub-rpm-sort.c @@ -232,7 +232,7 @@ main (int argc, char *argv[]) @@ -199,7 +199,7 @@ index f33bd1ed568..8345944105f 100644 grub_util_host_init (&argc, &argv); diff --git a/util/setup.c b/util/setup.c -index da5f2c07f50..8b22bb8ccac 100644 +index da5f2c07f..8b22bb8cc 100644 --- a/util/setup.c +++ b/util/setup.c @@ -406,7 +406,7 @@ SETUP (const char *dir, diff --git a/0104-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch b/0102-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch similarity index 92% rename from 0104-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch rename to 0102-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch index 1fa705e..bbcefd2 100644 --- a/0104-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch +++ b/0102-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch @@ -11,10 +11,10 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index 59ccda24475..6eb297fdbf6 100644 +index 2af5f23ad..091ab3283 100644 --- a/configure.ac +++ b/configure.ac -@@ -1480,11 +1480,11 @@ fi +@@ -1453,11 +1453,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 59ccda24475..6eb297fdbf6 100644 fi CPPFLAGS="$TARGET_CPPFLAGS" -@@ -2047,6 +2047,14 @@ if test x"$enable_werror" != xno ; then +@@ -2020,6 +2020,14 @@ if test x"$enable_werror" != xno ; then HOST_CFLAGS="$HOST_CFLAGS -Werror" fi @@ -45,7 +45,7 @@ index 59ccda24475..6eb297fdbf6 100644 TARGET_CCAS=$TARGET_CC diff --git a/conf/Makefile.common b/conf/Makefile.common -index 2ff9b39357c..35e14ff017e 100644 +index 2ff9b3935..35e14ff01 100644 --- a/conf/Makefile.common +++ b/conf/Makefile.common @@ -66,7 +66,7 @@ grubconfdir = $(sysconfdir)/grub.d diff --git a/0105-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch b/0103-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch similarity index 98% rename from 0105-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch rename to 0103-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch index fdd3096..15f7e2c 100644 --- a/0105-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch +++ b/0103-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index 33e981e76e7..2f0336809e7 100644 +index 33e981e76..2f0336809 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -35,11 +35,16 @@ static grub_dl_t my_mod; diff --git a/0106-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch b/0104-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch similarity index 99% rename from 0106-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch rename to 0104-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch index f8284ec..56c524c 100644 --- a/0106-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch +++ b/0104-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch @@ -11,7 +11,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 41 insertions(+), 34 deletions(-) diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index 2f0336809e7..5f48fa55619 100644 +index 2f0336809..5f48fa556 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -243,32 +243,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), diff --git a/0107-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch b/0105-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch similarity index 99% rename from 0107-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch rename to 0105-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch index 4ad0696..bba44ec 100644 --- a/0107-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch +++ b/0105-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch @@ -11,7 +11,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 94 insertions(+), 73 deletions(-) diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index 5f48fa55619..3e4f7ef39f4 100644 +index 5f48fa556..3e4f7ef39 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -47,6 +47,65 @@ static char *linux_cmdline; diff --git a/0108-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch b/0106-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch similarity index 98% rename from 0108-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch rename to 0106-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch index b1233ce..e30c437 100644 --- a/0108-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch +++ b/0106-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 65 insertions(+), 8 deletions(-) diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index 3e4f7ef39f4..6bc18d5aef5 100644 +index 3e4f7ef39..6bc18d5ae 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -52,13 +52,22 @@ struct allocation_choice { @@ -153,7 +153,7 @@ index 3e4f7ef39f4..6bc18d5aef5 100644 grub_memcpy (kernel_mem, (char *)kernel + start, filelen - start); diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h -index 25ef52c04eb..fac22476cc5 100644 +index 25ef52c04..fac22476c 100644 --- a/include/grub/i386/linux.h +++ b/include/grub/i386/linux.h @@ -236,7 +236,11 @@ struct linux_kernel_params diff --git a/0109-Fix-getroot.c-s-trampolines.patch b/0107-Fix-getroot.c-s-trampolines.patch similarity index 97% rename from 0109-Fix-getroot.c-s-trampolines.patch rename to 0107-Fix-getroot.c-s-trampolines.patch index 29ec44c..dbf875c 100644 --- a/0109-Fix-getroot.c-s-trampolines.patch +++ b/0107-Fix-getroot.c-s-trampolines.patch @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c -index 9f730b35189..f0c503f43d3 100644 +index 9f730b351..f0c503f43 100644 --- a/grub-core/osdep/linux/getroot.c +++ b/grub-core/osdep/linux/getroot.c @@ -1264,22 +1264,20 @@ grub_util_get_grub_dev_os (const char *os_dev) diff --git a/0110-Do-not-allow-stack-trampolines-anywhere.patch b/0108-Do-not-allow-stack-trampolines-anywhere.patch similarity index 90% rename from 0110-Do-not-allow-stack-trampolines-anywhere.patch rename to 0108-Do-not-allow-stack-trampolines-anywhere.patch index 2a3247a..b05a36e 100644 --- a/0110-Do-not-allow-stack-trampolines-anywhere.patch +++ b/0108-Do-not-allow-stack-trampolines-anywhere.patch @@ -10,10 +10,10 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 6eb297fdbf6..c6bd965f1f9 100644 +index 091ab3283..de707f7e0 100644 --- a/configure.ac +++ b/configure.ac -@@ -2055,6 +2055,9 @@ if test x"$enable_wextra" != xno ; then +@@ -2028,6 +2028,9 @@ if test x"$enable_wextra" != xno ; then HOST_CFLAGS="$HOST_CFLAGS -Wextra" fi @@ -24,7 +24,7 @@ index 6eb297fdbf6..c6bd965f1f9 100644 TARGET_CCAS=$TARGET_CC diff --git a/conf/Makefile.common b/conf/Makefile.common -index 35e14ff017e..0647c53b916 100644 +index 35e14ff01..0647c53b9 100644 --- a/conf/Makefile.common +++ b/conf/Makefile.common @@ -66,7 +66,7 @@ grubconfdir = $(sysconfdir)/grub.d diff --git a/0111-Reimplement-boot_counter.patch b/0109-Reimplement-boot_counter.patch similarity index 97% rename from 0111-Reimplement-boot_counter.patch rename to 0109-Reimplement-boot_counter.patch index a203929..b884f81 100644 --- a/0111-Reimplement-boot_counter.patch +++ b/0109-Reimplement-boot_counter.patch @@ -23,7 +23,7 @@ Signed-off-by: Christian Glombek <lorbus(a)fedoraproject.org> create mode 100644 util/grub.d/01_fallback_counting.in diff --git a/Makefile.util.def b/Makefile.util.def -index 0b85a7fce4a..27a13bc734e 100644 +index 0b85a7fce..27a13bc73 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -458,6 +458,12 @@ script = { @@ -40,7 +40,7 @@ index 0b85a7fce4a..27a13bc734e 100644 name = '01_menu_auto_hide'; common = util/grub.d/01_menu_auto_hide.in; diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 498ca11762a..1e15345107e 100644 +index 498ca1176..1e1534510 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -398,6 +398,11 @@ kernel = { @@ -57,7 +57,7 @@ index 498ca11762a..1e15345107e 100644 mansection = 1; diff --git a/grub-core/commands/increment.c b/grub-core/commands/increment.c new file mode 100644 -index 00000000000..79cf137656c +index 000000000..79cf13765 --- /dev/null +++ b/grub-core/commands/increment.c @@ -0,0 +1,105 @@ @@ -168,7 +168,7 @@ index 00000000000..79cf137656c +} diff --git a/util/grub.d/01_fallback_counting.in b/util/grub.d/01_fallback_counting.in new file mode 100644 -index 00000000000..be0e770ea82 +index 000000000..be0e770ea --- /dev/null +++ b/util/grub.d/01_fallback_counting.in @@ -0,0 +1,22 @@ diff --git a/0112-Fix-menu-entry-selection-based-on-ID-and-title.patch b/0110-Fix-menu-entry-selection-based-on-ID-and-title.patch similarity index 99% rename from 0112-Fix-menu-entry-selection-based-on-ID-and-title.patch rename to 0110-Fix-menu-entry-selection-based-on-ID-and-title.patch index 957fda3..cd9e50f 100644 --- a/0112-Fix-menu-entry-selection-based-on-ID-and-title.patch +++ b/0110-Fix-menu-entry-selection-based-on-ID-and-title.patch @@ -24,7 +24,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 71 insertions(+), 70 deletions(-) diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c -index d7a222e681b..4a02aadb01c 100644 +index d7a222e68..4a02aadb0 100644 --- a/grub-core/normal/menu.c +++ b/grub-core/normal/menu.c @@ -164,12 +164,12 @@ grub_menu_set_timeout (int timeout) diff --git a/0113-Make-the-menu-entry-users-option-argument-to-be-opti.patch b/0111-Make-the-menu-entry-users-option-argument-to-be-opti.patch similarity index 97% rename from 0113-Make-the-menu-entry-users-option-argument-to-be-opti.patch rename to 0111-Make-the-menu-entry-users-option-argument-to-be-opti.patch index e0d36db..c2fbe65 100644 --- a/0113-Make-the-menu-entry-users-option-argument-to-be-opti.patch +++ b/0111-Make-the-menu-entry-users-option-argument-to-be-opti.patch @@ -23,7 +23,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c -index b194123eb67..b175a1b43b7 100644 +index b194123eb..b175a1b43 100644 --- a/grub-core/commands/menuentry.c +++ b/grub-core/commands/menuentry.c @@ -29,7 +29,7 @@ static const struct grub_arg_option options[] = diff --git a/0114-Add-efi-export-env-and-efi-load-env-commands.patch b/0112-Add-efi-export-env-and-efi-load-env-commands.patch similarity index 97% rename from 0114-Add-efi-export-env-and-efi-load-env-commands.patch rename to 0112-Add-efi-export-env-and-efi-load-env-commands.patch index 73456bc..abff17c 100644 --- a/0114-Add-efi-export-env-and-efi-load-env-commands.patch +++ b/0112-Add-efi-export-env-and-efi-load-env-commands.patch @@ -21,7 +21,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> create mode 100644 grub-core/commands/efi/env.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 1e15345107e..81fc274148e 100644 +index 1e1534510..81fc27414 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -820,6 +820,12 @@ module = { @@ -39,7 +39,7 @@ index 1e15345107e..81fc274148e 100644 efi = commands/efi/efifwsetup.c; diff --git a/grub-core/commands/efi/env.c b/grub-core/commands/efi/env.c new file mode 100644 -index 00000000000..cbd13e03e81 +index 000000000..cbd13e03e --- /dev/null +++ b/grub-core/commands/efi/env.c @@ -0,0 +1,168 @@ @@ -212,7 +212,7 @@ index 00000000000..cbd13e03e81 + grub_unregister_command (loadenv_cmd); +} diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 2a446f5031b..14bc10eb564 100644 +index 2a446f503..14bc10eb5 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -225,6 +225,9 @@ grub_efi_set_variable(const char *var, const grub_efi_guid_t *guid, @@ -226,7 +226,7 @@ index 2a446f5031b..14bc10eb564 100644 } diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c -index 2d12e6188fd..0574d8d6217 100644 +index 2d12e6188..0574d8d62 100644 --- a/grub-core/kern/efi/init.c +++ b/grub-core/kern/efi/init.c @@ -85,11 +85,6 @@ stack_protector_init (void) @@ -242,7 +242,7 @@ index 2d12e6188fd..0574d8d6217 100644 static int set_var (const char *name, const char *value, diff --git a/grub-core/lib/envblk.c b/grub-core/lib/envblk.c -index 2e4e78b132d..874506da169 100644 +index 2e4e78b13..874506da1 100644 --- a/grub-core/lib/envblk.c +++ b/grub-core/lib/envblk.c @@ -223,6 +223,49 @@ grub_envblk_delete (grub_envblk_t envblk, const char *name) @@ -296,7 +296,7 @@ index 2e4e78b132d..874506da169 100644 grub_envblk_iterate (grub_envblk_t envblk, void *hook_data, diff --git a/util/grub-set-bootflag.c b/util/grub-set-bootflag.c -index bb198f02351..6a79ee67444 100644 +index d506f7e75..a6ccc1138 100644 --- a/util/grub-set-bootflag.c +++ b/util/grub-set-bootflag.c @@ -25,6 +25,7 @@ @@ -308,7 +308,7 @@ index bb198f02351..6a79ee67444 100644 #include <errno.h> #include <stdio.h> diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h -index 2e0691454b1..8dfc89a33b9 100644 +index 2e0691454..8dfc89a33 100644 --- a/include/grub/efi/efi.h +++ b/include/grub/efi/efi.h @@ -24,6 +24,11 @@ @@ -324,7 +324,7 @@ index 2e0691454b1..8dfc89a33b9 100644 extern grub_efi_system_table_t *EXPORT_VAR(grub_efi_system_table); extern grub_efi_handle_t EXPORT_VAR(grub_efi_image_handle); diff --git a/include/grub/lib/envblk.h b/include/grub/lib/envblk.h -index c3e65592170..ab969af2461 100644 +index c3e655921..ab969af24 100644 --- a/include/grub/lib/envblk.h +++ b/include/grub/lib/envblk.h @@ -22,6 +22,8 @@ diff --git a/0115-Make-it-possible-to-subtract-conditions-from-debug.patch b/0113-Make-it-possible-to-subtract-conditions-from-debug.patch similarity index 97% rename from 0115-Make-it-possible-to-subtract-conditions-from-debug.patch rename to 0113-Make-it-possible-to-subtract-conditions-from-debug.patch index fce51ea..53e28fd 100644 --- a/0115-Make-it-possible-to-subtract-conditions-from-debug.patch +++ b/0113-Make-it-possible-to-subtract-conditions-from-debug.patch @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index 9a2fae6398e..578bf51a5fc 100644 +index 9a2fae639..578bf51a5 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -164,12 +164,24 @@ int diff --git a/0116-Export-all-variables-from-the-initial-context-when-c.patch b/0114-Export-all-variables-from-the-initial-context-when-c.patch similarity index 95% rename from 0116-Export-all-variables-from-the-initial-context-when-c.patch rename to 0114-Export-all-variables-from-the-initial-context-when-c.patch index 4e32260..554884b 100644 --- a/0116-Export-all-variables-from-the-initial-context-when-c.patch +++ b/0114-Export-all-variables-from-the-initial-context-when-c.patch @@ -17,7 +17,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/grub-core/normal/context.c b/grub-core/normal/context.c -index ee53d4a68e5..87edd254c44 100644 +index ee53d4a68..87edd254c 100644 --- a/grub-core/normal/context.c +++ b/grub-core/normal/context.c @@ -99,7 +99,7 @@ grub_env_new_context (int export_all) @@ -30,7 +30,7 @@ index ee53d4a68e5..87edd254c44 100644 int grub_extractor_level = 0; diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c -index 4a02aadb01c..fe2e77a43e2 100644 +index 4a02aadb0..fe2e77a43 100644 --- a/grub-core/normal/menu.c +++ b/grub-core/normal/menu.c @@ -375,8 +375,6 @@ grub_menu_execute_entry(grub_menu_entry_t entry, int auto_boot) diff --git a/0117-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch b/0115-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch similarity index 97% rename from 0117-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch rename to 0115-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch index 92f259d..ad2e25f 100644 --- a/0117-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch +++ b/0115-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch @@ -21,7 +21,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)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 27a13bc734e..2e6ad979c3e 100644 +index 27a13bc73..2e6ad979c 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -459,14 +459,14 @@ script = { @@ -60,7 +60,7 @@ diff --git a/util/grub.d/01_fallback_counting.in b/util/grub.d/08_fallback_count similarity index 65% rename from util/grub.d/01_fallback_counting.in rename to util/grub.d/08_fallback_counting.in -index be0e770ea82..2e2c3ff7d31 100644 +index be0e770ea..2e2c3ff7d 100644 --- a/util/grub.d/01_fallback_counting.in +++ b/util/grub.d/08_fallback_counting.in @@ -1,15 +1,17 @@ @@ -89,7 +89,7 @@ index be0e770ea82..2e2c3ff7d31 100644 set boot_counter=-1 diff --git a/util/grub.d/10_reset_boot_success.in b/util/grub.d/10_reset_boot_success.in new file mode 100644 -index 00000000000..6c88d933dde +index 000000000..6c88d933d --- /dev/null +++ b/util/grub.d/10_reset_boot_success.in @@ -0,0 +1,25 @@ @@ -122,7 +122,7 @@ diff --git a/util/grub.d/01_menu_auto_hide.in b/util/grub.d/12_menu_auto_hide.in similarity index 58% rename from util/grub.d/01_menu_auto_hide.in rename to util/grub.d/12_menu_auto_hide.in -index ad175870a54..6a7c0fa0d43 100644 +index ad175870a..6a7c0fa0d 100644 --- a/util/grub.d/01_menu_auto_hide.in +++ b/util/grub.d/12_menu_auto_hide.in @@ -1,5 +1,8 @@ diff --git a/0118-Fix-systemctl-kexec-exit-status-check.patch b/0116-Fix-systemctl-kexec-exit-status-check.patch similarity index 97% rename from 0118-Fix-systemctl-kexec-exit-status-check.patch rename to 0116-Fix-systemctl-kexec-exit-status-check.patch index 74ecedc..e10d649 100644 --- a/0118-Fix-systemctl-kexec-exit-status-check.patch +++ b/0116-Fix-systemctl-kexec-exit-status-check.patch @@ -19,7 +19,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/grub-core/loader/emu/linux.c b/grub-core/loader/emu/linux.c -index fda9e00d24c..5b85b225eed 100644 +index fda9e00d2..5b85b225e 100644 --- a/grub-core/loader/emu/linux.c +++ b/grub-core/loader/emu/linux.c @@ -71,8 +71,10 @@ grub_linux_boot (void) diff --git a/0119-Print-grub-emu-linux-loader-messages-as-debug.patch b/0117-Print-grub-emu-linux-loader-messages-as-debug.patch similarity index 97% rename from 0119-Print-grub-emu-linux-loader-messages-as-debug.patch rename to 0117-Print-grub-emu-linux-loader-messages-as-debug.patch index a49ec44..5afe511 100644 --- a/0119-Print-grub-emu-linux-loader-messages-as-debug.patch +++ b/0117-Print-grub-emu-linux-loader-messages-as-debug.patch @@ -11,7 +11,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/loader/emu/linux.c b/grub-core/loader/emu/linux.c -index 5b85b225eed..22ab6af1727 100644 +index 5b85b225e..22ab6af17 100644 --- a/grub-core/loader/emu/linux.c +++ b/grub-core/loader/emu/linux.c @@ -50,7 +50,7 @@ grub_linux_boot (void) diff --git a/0120-Don-t-assume-that-boot-commands-will-only-return-on-.patch b/0118-Don-t-assume-that-boot-commands-will-only-return-on-.patch similarity index 98% rename from 0120-Don-t-assume-that-boot-commands-will-only-return-on-.patch rename to 0118-Don-t-assume-that-boot-commands-will-only-return-on-.patch index bd7b2c1..96e56cf 100644 --- a/0120-Don-t-assume-that-boot-commands-will-only-return-on-.patch +++ b/0118-Don-t-assume-that-boot-commands-will-only-return-on-.patch @@ -17,7 +17,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c -index fe2e77a43e2..ec0c92bade0 100644 +index fe2e77a43..ec0c92bad 100644 --- a/grub-core/normal/menu.c +++ b/grub-core/normal/menu.c @@ -285,7 +285,7 @@ get_and_remove_first_entry_number (grub_menu_t menu, const char *name) diff --git a/0121-grub-set-bootflag-Update-comment-about-running-as-ro.patch b/0119-grub-set-bootflag-Update-comment-about-running-as-ro.patch similarity index 96% rename from 0121-grub-set-bootflag-Update-comment-about-running-as-ro.patch rename to 0119-grub-set-bootflag-Update-comment-about-running-as-ro.patch index cd4ef77..16829c7 100644 --- a/0121-grub-set-bootflag-Update-comment-about-running-as-ro.patch +++ b/0119-grub-set-bootflag-Update-comment-about-running-as-ro.patch @@ -13,7 +13,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/grub-set-bootflag.c b/util/grub-set-bootflag.c -index 6a79ee67444..65d74ce010f 100644 +index a6ccc1138..3eb04beb5 100644 --- a/util/grub-set-bootflag.c +++ b/util/grub-set-bootflag.c @@ -18,7 +18,7 @@ diff --git a/0122-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch b/0120-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch similarity index 95% rename from 0122-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch rename to 0120-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch index 122bf68..bb611f6 100644 --- a/0122-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch +++ b/0120-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch @@ -13,7 +13,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> 1 file changed, 78 insertions(+), 9 deletions(-) diff --git a/util/grub-set-bootflag.c b/util/grub-set-bootflag.c -index 65d74ce010f..d1c5e28862b 100644 +index 3eb04beb5..3b4c25ca2 100644 --- a/util/grub-set-bootflag.c +++ b/util/grub-set-bootflag.c @@ -28,7 +28,9 @@ @@ -26,7 +26,7 @@ index 65d74ce010f..d1c5e28862b 100644 #include <string.h> #include <unistd.h> -@@ -54,8 +56,10 @@ int main(int argc, char *argv[]) +@@ -56,8 +58,10 @@ int main(int argc, char *argv[]) { /* NOTE buf must be at least the longest bootflag length + 4 bytes */ char env[GRUBENV_SIZE + 1], buf[64], *s; @@ -38,7 +38,7 @@ index 65d74ce010f..d1c5e28862b 100644 FILE *f; if (argc != 2) -@@ -77,7 +81,32 @@ int main(int argc, char *argv[]) +@@ -89,7 +93,32 @@ int main(int argc, char *argv[]) bootflag = bootflags[i]; len = strlen (bootflag); @@ -72,7 +72,7 @@ index 65d74ce010f..d1c5e28862b 100644 if (!f) { perror ("Error opening " GRUBENV " for reading"); -@@ -132,30 +161,70 @@ int main(int argc, char *argv[]) +@@ -144,30 +173,70 @@ int main(int argc, char *argv[]) snprintf(buf, sizeof(buf), "%s=1\n", bootflag); memcpy(s, buf, len + 3); diff --git a/0123-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch b/0121-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch similarity index 98% rename from 0123-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch rename to 0121-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch index a32c146..ff129c6 100644 --- a/0123-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch +++ b/0121-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch @@ -53,7 +53,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/util/grub.d/10_reset_boot_success.in b/util/grub.d/10_reset_boot_success.in -index 6c88d933dde..e73f4137b36 100644 +index 6c88d933d..e73f4137b 100644 --- a/util/grub.d/10_reset_boot_success.in +++ b/util/grub.d/10_reset_boot_success.in @@ -6,18 +6,18 @@ diff --git a/0124-Add-start-symbol-for-RISC-V.patch b/0122-Add-start-symbol-for-RISC-V.patch similarity index 95% rename from 0124-Add-start-symbol-for-RISC-V.patch rename to 0122-Add-start-symbol-for-RISC-V.patch index 677efae..cc8aa6f 100644 --- a/0124-Add-start-symbol-for-RISC-V.patch +++ b/0122-Add-start-symbol-for-RISC-V.patch @@ -15,7 +15,7 @@ Signed-off-by: David Abdurachmanov <david.abdurachmanov(a)sifive.com> 1 file changed, 1 insertion(+) diff --git a/grub-core/kern/riscv/efi/startup.S b/grub-core/kern/riscv/efi/startup.S -index f2a7b2b1ede..781773136e8 100644 +index f2a7b2b1e..781773136 100644 --- a/grub-core/kern/riscv/efi/startup.S +++ b/grub-core/kern/riscv/efi/startup.S @@ -29,6 +29,7 @@ diff --git a/0125-bootstrap.conf-Force-autogen.sh-to-use-python3.patch b/0123-bootstrap.conf-Force-autogen.sh-to-use-python3.patch similarity index 96% rename from 0125-bootstrap.conf-Force-autogen.sh-to-use-python3.patch rename to 0123-bootstrap.conf-Force-autogen.sh-to-use-python3.patch index 49c92b9..873ce0c 100644 --- a/0125-bootstrap.conf-Force-autogen.sh-to-use-python3.patch +++ b/0123-bootstrap.conf-Force-autogen.sh-to-use-python3.patch @@ -19,7 +19,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.conf b/bootstrap.conf -index 6b043fc354c..52d4af44bec 100644 +index 6b043fc35..52d4af44b 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -92,7 +92,7 @@ bootstrap_post_import_hook () { diff --git a/0126-efi-http-Export-fw-http-_path-variables-to-make-them.patch b/0124-efi-http-Export-fw-http-_path-variables-to-make-them.patch similarity index 95% rename from 0126-efi-http-Export-fw-http-_path-variables-to-make-them.patch rename to 0124-efi-http-Export-fw-http-_path-variables-to-make-them.patch index 74183bc..5f9b8a8 100644 --- a/0126-efi-http-Export-fw-http-_path-variables-to-make-them.patch +++ b/0124-efi-http-Export-fw-http-_path-variables-to-make-them.patch @@ -25,7 +25,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 2 files changed, 2 insertions(+) diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c -index 1c540fc8c26..b573be6650d 100644 +index 1c540fc8c..b573be665 100644 --- a/grub-core/kern/main.c +++ b/grub-core/kern/main.c @@ -143,6 +143,7 @@ grub_set_prefix_and_root (void) @@ -37,7 +37,7 @@ index 1c540fc8c26..b573be6650d 100644 grub_free (fw_path); } diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c -index de351b2cd03..755b7a6d054 100644 +index de351b2cd..755b7a6d0 100644 --- a/grub-core/net/efi/http.c +++ b/grub-core/net/efi/http.c @@ -39,6 +39,7 @@ http_configure (struct grub_efi_net_device *dev, int prefer_ip6) diff --git a/0127-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch b/0125-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch similarity index 99% rename from 0127-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch rename to 0125-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch index c394549..69764f0 100644 --- a/0127-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch +++ b/0125-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch @@ -43,7 +43,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c -index 755b7a6d054..fc8cb25ae0a 100644 +index 755b7a6d0..fc8cb25ae 100644 --- a/grub-core/net/efi/http.c +++ b/grub-core/net/efi/http.c @@ -158,13 +158,7 @@ efihttp_request (grub_efi_http_t *http, char *server, char *name, int use_https, diff --git a/0128-efi-net-Allow-to-specify-a-port-number-in-addresses.patch b/0126-efi-net-Allow-to-specify-a-port-number-in-addresses.patch similarity index 97% rename from 0128-efi-net-Allow-to-specify-a-port-number-in-addresses.patch rename to 0126-efi-net-Allow-to-specify-a-port-number-in-addresses.patch index 209aed8..9426842 100644 --- a/0128-efi-net-Allow-to-specify-a-port-number-in-addresses.patch +++ b/0126-efi-net-Allow-to-specify-a-port-number-in-addresses.patch @@ -25,7 +25,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c -index 6603cd83edc..84573937b18 100644 +index 6603cd83e..84573937b 100644 --- a/grub-core/net/efi/net.c +++ b/grub-core/net/efi/net.c @@ -742,7 +742,7 @@ grub_efi_net_parse_address (const char *address, diff --git a/0129-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch b/0127-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch similarity index 97% rename from 0129-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch rename to 0127-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch index f92dee4..807bda4 100644 --- a/0129-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch +++ b/0127-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch @@ -21,7 +21,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/grub-core/net/efi/ip4_config.c b/grub-core/net/efi/ip4_config.c -index b711a5d9457..313c818b184 100644 +index b711a5d94..313c818b1 100644 --- a/grub-core/net/efi/ip4_config.c +++ b/grub-core/net/efi/ip4_config.c @@ -56,9 +56,20 @@ int diff --git a/0130-efi-net-Print-a-debug-message-if-parsing-the-address.patch b/0128-efi-net-Print-a-debug-message-if-parsing-the-address.patch similarity index 98% rename from 0130-efi-net-Print-a-debug-message-if-parsing-the-address.patch rename to 0128-efi-net-Print-a-debug-message-if-parsing-the-address.patch index 33d8f88..0f5ff97 100644 --- a/0130-efi-net-Print-a-debug-message-if-parsing-the-address.patch +++ b/0128-efi-net-Print-a-debug-message-if-parsing-the-address.patch @@ -22,7 +22,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c -index 84573937b18..a3f0535d43c 100644 +index 84573937b..a3f0535d4 100644 --- a/grub-core/net/efi/net.c +++ b/grub-core/net/efi/net.c @@ -778,9 +778,9 @@ grub_efi_net_parse_address (const char *address, diff --git a/0131-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch b/0129-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch similarity index 96% rename from 0131-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch rename to 0129-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch index 3dd525a..b8f4eeb 100644 --- a/0131-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch +++ b/0129-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch @@ -12,7 +12,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/grub-core/kern/term.c b/grub-core/kern/term.c -index 14d59649832..4d61f4e9790 100644 +index 14d596498..4d61f4e97 100644 --- a/grub-core/kern/term.c +++ b/grub-core/kern/term.c @@ -144,9 +144,10 @@ grub_key_is_interrupt (int key) diff --git a/0132-efi-Set-image-base-address-before-jumping-to-the-PE-.patch b/0130-efi-Set-image-base-address-before-jumping-to-the-PE-.patch similarity index 98% rename from 0132-efi-Set-image-base-address-before-jumping-to-the-PE-.patch rename to 0130-efi-Set-image-base-address-before-jumping-to-the-PE-.patch index 336bcf1..c3d2b9b 100644 --- a/0132-efi-Set-image-base-address-before-jumping-to-the-PE-.patch +++ b/0130-efi-Set-image-base-address-before-jumping-to-the-PE-.patch @@ -29,7 +29,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 14 insertions(+) diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c -index 0622dfa48d4..e8b9ecb17f6 100644 +index 0622dfa48..e8b9ecb17 100644 --- a/grub-core/loader/efi/linux.c +++ b/grub-core/loader/efi/linux.c @@ -72,6 +72,7 @@ grub_err_t diff --git a/0133-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch b/0131-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch similarity index 98% rename from 0133-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch rename to 0131-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch index 747773d..35a5a6a 100644 --- a/0133-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch +++ b/0131-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch @@ -18,7 +18,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/grub-core/commands/tpm.c b/grub-core/commands/tpm.c -index 2052c36eaba..e287d042e6b 100644 +index 2052c36ea..e287d042e 100644 --- a/grub-core/commands/tpm.c +++ b/grub-core/commands/tpm.c @@ -42,7 +42,8 @@ grub_tpm_verify_init (grub_file_t io, diff --git a/0134-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch b/0132-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch similarity index 97% rename from 0134-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch rename to 0132-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch index 825d0f7..420bc23 100644 --- a/0134-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch +++ b/0132-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch @@ -26,7 +26,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index 6bc18d5aef5..15d40d6e35b 100644 +index 6bc18d5ae..15d40d6e3 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -144,7 +144,7 @@ grub_linuxefi_unload (void) diff --git a/0135-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch b/0133-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch similarity index 97% rename from 0135-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch rename to 0133-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch index 97d2e06..e62feb0 100644 --- a/0135-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch +++ b/0133-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch @@ -20,7 +20,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/grub-core/net/http.c b/grub-core/net/http.c -index b52b558d631..7f878b56157 100644 +index b52b558d6..7f878b561 100644 --- a/grub-core/net/http.c +++ b/grub-core/net/http.c @@ -501,13 +501,20 @@ http_open (struct grub_file *file, const char *filename) diff --git a/0136-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch b/0134-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch similarity index 95% rename from 0136-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch rename to 0134-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch index 1657d7a..956208a 100644 --- a/0136-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch +++ b/0134-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch @@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 2 insertions(+) diff --git a/grub-core/commands/efi/env.c b/grub-core/commands/efi/env.c -index cbd13e03e81..977edb6b065 100644 +index cbd13e03e..977edb6b0 100644 --- a/grub-core/commands/efi/env.c +++ b/grub-core/commands/efi/env.c @@ -149,6 +149,8 @@ grub_efi_load_env(grub_command_t cmd __attribute__ ((unused)), diff --git a/0137-efi-dhcp-fix-some-allocation-error-checking.patch b/0135-efi-dhcp-fix-some-allocation-error-checking.patch similarity index 97% rename from 0137-efi-dhcp-fix-some-allocation-error-checking.patch rename to 0135-efi-dhcp-fix-some-allocation-error-checking.patch index 7549733..b705d12 100644 --- a/0137-efi-dhcp-fix-some-allocation-error-checking.patch +++ b/0135-efi-dhcp-fix-some-allocation-error-checking.patch @@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/grub-core/net/efi/dhcp.c b/grub-core/net/efi/dhcp.c -index dbef63d8c08..e5c79b748b0 100644 +index dbef63d8c..e5c79b748 100644 --- a/grub-core/net/efi/dhcp.c +++ b/grub-core/net/efi/dhcp.c @@ -80,7 +80,7 @@ grub_efi_dhcp4_parse_dns (grub_efi_dhcp4_protocol_t *dhcp4, grub_efi_dhcp4_packe diff --git a/0138-efi-http-fix-some-allocation-error-checking.patch b/0136-efi-http-fix-some-allocation-error-checking.patch similarity index 96% rename from 0138-efi-http-fix-some-allocation-error-checking.patch rename to 0136-efi-http-fix-some-allocation-error-checking.patch index 4dffab9..6aa40dd 100644 --- a/0138-efi-http-fix-some-allocation-error-checking.patch +++ b/0136-efi-http-fix-some-allocation-error-checking.patch @@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c -index fc8cb25ae0a..26647a50fa4 100644 +index fc8cb25ae..26647a50f 100644 --- a/grub-core/net/efi/http.c +++ b/grub-core/net/efi/http.c @@ -412,8 +412,8 @@ grub_efihttp_open (struct grub_efi_net_device *dev, diff --git a/0139-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch b/0137-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch similarity index 98% rename from 0139-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch rename to 0137-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch index 30c21a5..b40c4c2 100644 --- a/0139-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch +++ b/0137-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch @@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/grub-core/net/efi/ip4_config.c b/grub-core/net/efi/ip4_config.c -index 313c818b184..9725e928f7e 100644 +index 313c818b1..9725e928f 100644 --- a/grub-core/net/efi/ip4_config.c +++ b/grub-core/net/efi/ip4_config.c @@ -4,15 +4,20 @@ @@ -82,7 +82,7 @@ index 313c818b184..9725e928f7e 100644 char *subnet, *gateway, *mask; grub_uint32_t u32_subnet, u32_gateway; diff --git a/grub-core/net/efi/ip6_config.c b/grub-core/net/efi/ip6_config.c -index 017c4d05bc7..a46f6f9b685 100644 +index 017c4d05b..a46f6f9b6 100644 --- a/grub-core/net/efi/ip6_config.c +++ b/grub-core/net/efi/ip6_config.c @@ -3,6 +3,7 @@ diff --git a/0140-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch b/0138-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch similarity index 97% rename from 0140-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch rename to 0138-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch index 95f7e20..e1db533 100644 --- a/0140-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch +++ b/0138-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch @@ -13,7 +13,7 @@ Signed-off-by: Colin Watson <cjwatson(a)debian.org> 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index 15d40d6e35b..f992ceeef20 100644 +index 15d40d6e3..f992ceeef 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -28,6 +28,8 @@ diff --git a/0141-linuxefi-fail-kernel-validation-without-shim-protoco.patch b/0139-linuxefi-fail-kernel-validation-without-shim-protoco.patch similarity index 96% rename from 0141-linuxefi-fail-kernel-validation-without-shim-protoco.patch rename to 0139-linuxefi-fail-kernel-validation-without-shim-protoco.patch index 20fc786..2b5f602 100644 --- a/0141-linuxefi-fail-kernel-validation-without-shim-protoco.patch +++ b/0139-linuxefi-fail-kernel-validation-without-shim-protoco.patch @@ -23,7 +23,7 @@ Signed-off-by: Dimitri John Ledkov <xnox(a)ubuntu.com> 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c -index 70a0075ec5e..47f8cf0d84b 100644 +index 70a0075ec..47f8cf0d8 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -34,6 +34,7 @@ @@ -55,7 +55,7 @@ index 70a0075ec5e..47f8cf0d84b 100644 pe = (void *)((unsigned long)kernel_addr + lh.hdr_offset); diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index ac8dfd40c61..d41e8ea14a8 100644 +index ac8dfd40c..d41e8ea14 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -1084,6 +1084,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), @@ -67,7 +67,7 @@ index ac8dfd40c61..d41e8ea14a8 100644 fail: if (dev) diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c -index e8b9ecb17f6..9260731c107 100644 +index e8b9ecb17..9260731c1 100644 --- a/grub-core/loader/efi/linux.c +++ b/grub-core/loader/efi/linux.c @@ -33,6 +33,7 @@ struct grub_efi_shim_lock @@ -79,7 +79,7 @@ index e8b9ecb17f6..9260731c107 100644 grub_linuxefi_secure_validate (void *data, grub_uint32_t size) { diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index f992ceeef20..3cf0f9b330b 100644 +index f992ceeef..3cf0f9b33 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -30,6 +30,7 @@ diff --git a/0142-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch b/0140-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch similarity index 97% rename from 0142-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch rename to 0140-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch index 9b0db5f..b99d5e0 100644 --- a/0142-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch +++ b/0140-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c -index 8fb8918ae7e..7baf3540c81 100644 +index 8fb8918ae..7baf3540c 100644 --- a/grub-core/net/bootp.c +++ b/grub-core/net/bootp.c @@ -329,7 +329,7 @@ grub_net_configure_by_dhcp_ack (const char *name, diff --git a/0143-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch b/0141-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch similarity index 97% rename from 0143-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch rename to 0141-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch index 6c16e9e..346beb3 100644 --- a/0143-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch +++ b/0141-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/grub-core/net/efi/ip4_config.c b/grub-core/net/efi/ip4_config.c -index 9725e928f7e..cb880fc3e8f 100644 +index 9725e928f..cb880fc3e 100644 --- a/grub-core/net/efi/ip4_config.c +++ b/grub-core/net/efi/ip4_config.c @@ -61,7 +61,8 @@ int diff --git a/0144-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch b/0142-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch similarity index 96% rename from 0144-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch rename to 0142-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch index 7c29683..e8e411b 100644 --- a/0144-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch +++ b/0142-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/net/efi/ip6_config.c b/grub-core/net/efi/ip6_config.c -index a46f6f9b685..1c5415d7185 100644 +index a46f6f9b6..1c5415d71 100644 --- a/grub-core/net/efi/ip6_config.c +++ b/grub-core/net/efi/ip6_config.c @@ -85,7 +85,7 @@ grub_efi_string_to_ip6_address (const char *val, grub_efi_ipv6_address_t *addres diff --git a/0145-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch b/0143-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch similarity index 97% rename from 0145-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch rename to 0143-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch index 0fe90c8..fa35002 100644 --- a/0145-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch +++ b/0143-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c -index a3f0535d43c..78e5442fc52 100644 +index a3f0535d4..78e5442fc 100644 --- a/grub-core/net/efi/net.c +++ b/grub-core/net/efi/net.c @@ -729,7 +729,7 @@ grub_efi_net_parse_address (const char *address, diff --git a/0146-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch b/0144-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch similarity index 97% rename from 0146-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch rename to 0144-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch index 59f29e4..8b55d80 100644 --- a/0146-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch +++ b/0144-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones(a)redhat.com> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/grub-core/net/efi/pxe.c b/grub-core/net/efi/pxe.c -index 531949cba5c..73e2bb01c1b 100644 +index 531949cba..73e2bb01c 100644 --- a/grub-core/net/efi/pxe.c +++ b/grub-core/net/efi/pxe.c @@ -187,7 +187,7 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest) diff --git a/0147-Add-systemd-integration-scripts-to-make-systemctl-re.patch b/0145-Add-systemd-integration-scripts-to-make-systemctl-re.patch similarity index 97% rename from 0147-Add-systemd-integration-scripts-to-make-systemctl-re.patch rename to 0145-Add-systemd-integration-scripts-to-make-systemctl-re.patch index 8e2481e..bef2e7d 100644 --- a/0147-Add-systemd-integration-scripts-to-make-systemctl-re.patch +++ b/0145-Add-systemd-integration-scripts-to-make-systemctl-re.patch @@ -65,7 +65,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> create mode 100644 util/systemd/systemd-integration.sh.in diff --git a/Makefile.util.def b/Makefile.util.def -index 2e6ad979c3e..9927c2cfd6a 100644 +index 2e6ad979c..9927c2cfd 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -470,6 +470,12 @@ script = { @@ -110,7 +110,7 @@ index 2e6ad979c3e..9927c2cfd6a 100644 mansection = 1; name = grub-mkrescue; diff --git a/conf/Makefile.common b/conf/Makefile.common -index 0647c53b916..9fe5863b2d9 100644 +index 0647c53b9..9fe5863b2 100644 --- a/conf/Makefile.common +++ b/conf/Makefile.common @@ -63,8 +63,11 @@ CCASFLAGS_LIBRARY = $(UTILS_CCASFLAGS) @@ -137,7 +137,7 @@ index 0647c53b916..9fe5863b2d9 100644 EXTRA_DIST = diff --git a/util/grub.d/14_menu_show_once.in b/util/grub.d/14_menu_show_once.in new file mode 100755 -index 00000000000..1cd7f36142b +index 000000000..1cd7f3614 --- /dev/null +++ b/util/grub.d/14_menu_show_once.in @@ -0,0 +1,13 @@ @@ -156,7 +156,7 @@ index 00000000000..1cd7f36142b +EOF diff --git a/util/systemd/10-grub-logind-service.conf.in b/util/systemd/10-grub-logind-service.conf.in new file mode 100644 -index 00000000000..f2d4ac00732 +index 000000000..f2d4ac007 --- /dev/null +++ b/util/systemd/10-grub-logind-service.conf.in @@ -0,0 +1,2 @@ @@ -164,7 +164,7 @@ index 00000000000..f2d4ac00732 +Environment=SYSTEMD_REBOOT_TO_BOOT_LOADER_MENU=true diff --git a/util/systemd/grub-systemd-integration.service.in b/util/systemd/grub-systemd-integration.service.in new file mode 100644 -index 00000000000..c81fb594ce1 +index 000000000..c81fb594c --- /dev/null +++ b/util/systemd/grub-systemd-integration.service.in @@ -0,0 +1,8 @@ @@ -178,7 +178,7 @@ index 00000000000..c81fb594ce1 +ExecStart=@libexecdir@/@grubdirname(a)/systemd-integration.sh diff --git a/util/systemd/systemd-integration.sh.in b/util/systemd/systemd-integration.sh.in new file mode 100644 -index 00000000000..dc1218597bc +index 000000000..dc1218597 --- /dev/null +++ b/util/systemd/systemd-integration.sh.in @@ -0,0 +1,6 @@ diff --git a/0148-systemd-integration.sh-Also-set-old-menu_show_once-g.patch b/0146-systemd-integration.sh-Also-set-old-menu_show_once-g.patch similarity index 97% rename from 0148-systemd-integration.sh-Also-set-old-menu_show_once-g.patch rename to 0146-systemd-integration.sh-Also-set-old-menu_show_once-g.patch index 9021de5..77131a2 100644 --- a/0148-systemd-integration.sh-Also-set-old-menu_show_once-g.patch +++ b/0146-systemd-integration.sh-Also-set-old-menu_show_once-g.patch @@ -18,7 +18,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> 1 file changed, 5 insertions(+) diff --git a/util/systemd/systemd-integration.sh.in b/util/systemd/systemd-integration.sh.in -index dc1218597bc..a4c071c5b0c 100644 +index dc1218597..a4c071c5b 100644 --- a/util/systemd/systemd-integration.sh.in +++ b/util/systemd/systemd-integration.sh.in @@ -4,3 +4,8 @@ TIMEOUT_USEC=$(cat /run/systemd/reboot-to-boot-loader-menu) diff --git a/0149-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch b/0147-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch similarity index 98% rename from 0149-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch rename to 0147-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch index c338840..d16abcd 100644 --- a/0149-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch +++ b/0147-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch @@ -29,7 +29,7 @@ Signed-off-by: Renaud Métrich <rmetrich(a)redhat.com> 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c -index 597111077bd..26014382608 100644 +index 597111077..260143826 100644 --- a/grub-core/term/at_keyboard.c +++ b/grub-core/term/at_keyboard.c @@ -135,20 +135,28 @@ query_mode (void) @@ -105,7 +105,7 @@ index 597111077bd..26014382608 100644 } diff --git a/include/grub/at_keyboard.h b/include/grub/at_keyboard.h -index bcb4d9ba78f..9414dc1b996 100644 +index bcb4d9ba7..9414dc1b9 100644 --- a/include/grub/at_keyboard.h +++ b/include/grub/at_keyboard.h @@ -19,6 +19,10 @@ diff --git a/0150-grub-install-disable-support-for-EFI-platforms.patch b/0148-grub-install-disable-support-for-EFI-platforms.patch similarity index 74% rename from 0150-grub-install-disable-support-for-EFI-platforms.patch rename to 0148-grub-install-disable-support-for-EFI-platforms.patch index 41003e2..34d04d5 100644 --- a/0150-grub-install-disable-support-for-EFI-platforms.patch +++ b/0148-grub-install-disable-support-for-EFI-platforms.patch @@ -19,14 +19,14 @@ build-time option. Resolves: rhbz#1737444 Signed-off-by: Jan Hlavac <jhlavac(a)redhat.com> +[rharwood: drop man page] --- util/grub-install.c | 37 ++++++++++++++++--------------------- docs/grub.texi | 7 +++++++ - util/grub-install.8 | 4 +++- - 3 files changed, 26 insertions(+), 22 deletions(-) + 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/util/grub-install.c b/util/grub-install.c -index a2bec7446cb..5babc7af551 100644 +index a2bec7446..5babc7af5 100644 --- a/util/grub-install.c +++ b/util/grub-install.c @@ -899,6 +899,22 @@ main (int argc, char *argv[]) @@ -82,7 +82,7 @@ index a2bec7446cb..5babc7af551 100644 { grub_fs_t fs; diff --git a/docs/grub.texi b/docs/grub.texi -index 04ed6ac1f07..4870faaa00a 100644 +index 04ed6ac1f..4870faaa0 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -6509,6 +6509,13 @@ grub2-install @var{install_device} @@ -99,22 +99,3 @@ index 04ed6ac1f07..4870faaa00a 100644 @command{grub2-install} accepts the following options: @table @option -diff --git a/util/grub-install.8 b/util/grub-install.8 -index 1db89e94b3b..811d441b16c 100644 ---- a/util/grub-install.8 -+++ b/util/grub-install.8 -@@ -1,4 +1,4 @@ --.TH GRUB-INSTALL 1 "Wed Feb 26 2014" -+.TH GRUB-INSTALL 1 "Fri Nov 20 2020" - .SH NAME - \fBgrub-install\fR \(em Install GRUB on a device. - -@@ -31,6 +31,8 @@ - .SH DESCRIPTION - \fBgrub-install\fR installs GRUB onto a device. This includes copying GRUB images into the target directory (generally \fI/boot/grub\fR), and on some platforms may also include installing GRUB onto a boot sector. - -+In order to support UEFI Secure Boot, the resulting GRUB EFI binary must be signed by a recognized private key. For this reason, for EFI platforms, most distributions also ship prebuilt GRUB EFI binaries signed by a distribution-specific private key. In this case, however, the \fBgrub-install\fR utility should not be used because it would overwrite the signed EFI binary. -+ - .SH OPTIONS - .TP - \fB--modules\fR=\fIMODULES\fR\! diff --git a/0151-New-with-debug-timestamps-configure-flag-to-prepend-.patch b/0149-New-with-debug-timestamps-configure-flag-to-prepend-.patch similarity index 93% rename from 0151-New-with-debug-timestamps-configure-flag-to-prepend-.patch rename to 0149-New-with-debug-timestamps-configure-flag-to-prepend-.patch index d216284..d0a1f68 100644 --- a/0151-New-with-debug-timestamps-configure-flag-to-prepend-.patch +++ b/0149-New-with-debug-timestamps-configure-flag-to-prepend-.patch @@ -15,10 +15,10 @@ Signed-off-by: Renaud Métrich <rmetrich(a)redhat.com> 3 files changed, 39 insertions(+) diff --git a/configure.ac b/configure.ac -index c6bd965f1f9..3c808a72230 100644 +index de707f7e0..f069d8403 100644 --- a/configure.ac +++ b/configure.ac -@@ -1613,6 +1613,17 @@ else +@@ -1586,6 +1586,17 @@ else fi AC_SUBST([BOOT_TIME_STATS]) @@ -36,7 +36,7 @@ index c6bd965f1f9..3c808a72230 100644 AC_ARG_ENABLE([grub-emu-sdl], [AS_HELP_STRING([--enable-grub-emu-sdl], [build and install the `grub-emu' debugging utility with SDL support (default=guessed)])]) -@@ -2194,6 +2205,7 @@ AM_CONDITIONAL([COND_APPLE_LINKER], [test x$TARGET_APPLE_LINKER = x1]) +@@ -2167,6 +2178,7 @@ AM_CONDITIONAL([COND_APPLE_LINKER], [test x$TARGET_APPLE_LINKER = x1]) AM_CONDITIONAL([COND_ENABLE_EFIEMU], [test x$enable_efiemu = xyes]) AM_CONDITIONAL([COND_ENABLE_CACHE_STATS], [test x$DISK_CACHE_STATS = x1]) AM_CONDITIONAL([COND_ENABLE_BOOT_TIME_STATS], [test x$BOOT_TIME_STATS = x1]) @@ -44,7 +44,7 @@ index c6bd965f1f9..3c808a72230 100644 AM_CONDITIONAL([COND_HAVE_CXX], [test x$HAVE_CXX = xyes]) -@@ -2289,6 +2301,12 @@ else +@@ -2262,6 +2274,12 @@ else echo With boot time statistics: No fi @@ -58,7 +58,7 @@ index c6bd965f1f9..3c808a72230 100644 echo efiemu runtime: Yes else diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index 578bf51a5fc..9f54b6b7d2d 100644 +index 578bf51a5..9f54b6b7d 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -25,6 +25,9 @@ @@ -99,7 +99,7 @@ index 578bf51a5fc..9f54b6b7d2d 100644 va_start (args, fmt); grub_vprintf (fmt, args); diff --git a/config.h.in b/config.h.in -index c7e316f0f1f..c80e3e0aba3 100644 +index c7e316f0f..c80e3e0ab 100644 --- a/config.h.in +++ b/config.h.in @@ -12,6 +12,7 @@ diff --git a/0152-Added-debug-statements-to-grub_disk_open-and-grub_di.patch b/0150-Added-debug-statements-to-grub_disk_open-and-grub_di.patch similarity index 97% rename from 0152-Added-debug-statements-to-grub_disk_open-and-grub_di.patch rename to 0150-Added-debug-statements-to-grub_disk_open-and-grub_di.patch index cbb1a38..71fa73a 100644 --- a/0152-Added-debug-statements-to-grub_disk_open-and-grub_di.patch +++ b/0150-Added-debug-statements-to-grub_disk_open-and-grub_di.patch @@ -13,7 +13,7 @@ Signed-off-by: Renaud Métrich <rmetrich(a)redhat.com> 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/grub-core/kern/disk.c b/grub-core/kern/disk.c -index e1b0e073e09..05a28ab1429 100644 +index e1b0e073e..05a28ab14 100644 --- a/grub-core/kern/disk.c +++ b/grub-core/kern/disk.c @@ -285,6 +285,8 @@ grub_disk_open (const char *name) diff --git a/0153-Introduce-function-grub_debug_is_enabled-void-return.patch b/0151-Introduce-function-grub_debug_is_enabled-void-return.patch similarity index 95% rename from 0153-Introduce-function-grub_debug_is_enabled-void-return.patch rename to 0151-Introduce-function-grub_debug_is_enabled-void-return.patch index 4e4718b..ef33974 100644 --- a/0153-Introduce-function-grub_debug_is_enabled-void-return.patch +++ b/0151-Introduce-function-grub_debug_is_enabled-void-return.patch @@ -14,7 +14,7 @@ Signed-off-by: Renaud Métrich <rmetrich(a)redhat.com> 2 files changed, 14 insertions(+) diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index 9f54b6b7d2d..a186ad3dd41 100644 +index 9f54b6b7d..a186ad3dd 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -163,6 +163,19 @@ int grub_err_printf (const char *fmt, ...) @@ -38,7 +38,7 @@ index 9f54b6b7d2d..a186ad3dd41 100644 grub_debug_enabled (const char * condition) { diff --git a/include/grub/misc.h b/include/grub/misc.h -index 3adc4036e3b..6c4aa85ac50 100644 +index 3adc4036e..6c4aa85ac 100644 --- a/include/grub/misc.h +++ b/include/grub/misc.h @@ -340,6 +340,7 @@ grub_puts (const char *s) diff --git a/0154-Don-t-clear-screen-when-debugging-is-enabled.patch b/0152-Don-t-clear-screen-when-debugging-is-enabled.patch similarity index 96% rename from 0154-Don-t-clear-screen-when-debugging-is-enabled.patch rename to 0152-Don-t-clear-screen-when-debugging-is-enabled.patch index d17b080..ee987e7 100644 --- a/0154-Don-t-clear-screen-when-debugging-is-enabled.patch +++ b/0152-Don-t-clear-screen-when-debugging-is-enabled.patch @@ -14,7 +14,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index 1970e4816a8..4ebdbd228d4 100644 +index 1970e4816..4ebdbd228 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -215,8 +215,9 @@ grub_normal_init_page (struct grub_term_output *term, diff --git a/0155-grub_file_-instrumentation-new-file-debug-tag.patch b/0153-grub_file_-instrumentation-new-file-debug-tag.patch similarity index 98% rename from 0155-grub_file_-instrumentation-new-file-debug-tag.patch rename to 0153-grub_file_-instrumentation-new-file-debug-tag.patch index 0cc6b8c..da9c4ab 100644 --- a/0155-grub_file_-instrumentation-new-file-debug-tag.patch +++ b/0153-grub_file_-instrumentation-new-file-debug-tag.patch @@ -12,7 +12,7 @@ Signed-off-by: Renaud Métrich <rmetrich(a)redhat.com> 1 file changed, 14 insertions(+) diff --git a/grub-core/kern/file.c b/grub-core/kern/file.c -index 58454458c47..e19aea3e514 100644 +index 58454458c..e19aea3e5 100644 --- a/grub-core/kern/file.c +++ b/grub-core/kern/file.c @@ -66,6 +66,8 @@ grub_file_open (const char *name, enum grub_file_type type) diff --git a/0156-ieee1275-Avoiding-many-unecessary-open-close.patch b/0154-ieee1275-Avoiding-many-unecessary-open-close.patch similarity index 99% rename from 0156-ieee1275-Avoiding-many-unecessary-open-close.patch rename to 0154-ieee1275-Avoiding-many-unecessary-open-close.patch index 6a0ad75..68b89ff 100644 --- a/0156-ieee1275-Avoiding-many-unecessary-open-close.patch +++ b/0154-ieee1275-Avoiding-many-unecessary-open-close.patch @@ -9,7 +9,7 @@ Signed-off-by: Diego Domingos <diegodo(a)br.ibm.com> 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c -index 03674cb477e..ea7f78ac7d8 100644 +index 03674cb47..ea7f78ac7 100644 --- a/grub-core/disk/ieee1275/ofdisk.c +++ b/grub-core/disk/ieee1275/ofdisk.c @@ -44,7 +44,7 @@ struct ofdisk_hash_ent diff --git a/0157-ieee1275-powerpc-implements-fibre-channel-discovery-.patch b/0155-ieee1275-powerpc-implements-fibre-channel-discovery-.patch similarity index 98% rename from 0157-ieee1275-powerpc-implements-fibre-channel-discovery-.patch rename to 0155-ieee1275-powerpc-implements-fibre-channel-discovery-.patch index 9fa02bb..94f4eb7 100644 --- a/0157-ieee1275-powerpc-implements-fibre-channel-discovery-.patch +++ b/0155-ieee1275-powerpc-implements-fibre-channel-discovery-.patch @@ -15,7 +15,7 @@ Signed-off-by: Diego Domingos <diegodo(a)br.ibm.com> 1 file changed, 49 insertions(+) diff --git a/grub-core/osdep/linux/ofpath.c b/grub-core/osdep/linux/ofpath.c -index a6153d35954..0f5d54e9f2d 100644 +index a6153d359..0f5d54e9f 100644 --- a/grub-core/osdep/linux/ofpath.c +++ b/grub-core/osdep/linux/ofpath.c @@ -350,6 +350,38 @@ of_path_of_ide(const char *sys_devname __attribute__((unused)), const char *devi diff --git a/0158-ieee1275-powerpc-enables-device-mapper-discovery.patch b/0156-ieee1275-powerpc-enables-device-mapper-discovery.patch similarity index 98% rename from 0158-ieee1275-powerpc-enables-device-mapper-discovery.patch rename to 0156-ieee1275-powerpc-enables-device-mapper-discovery.patch index 6f1c21b..8bb1934 100644 --- a/0158-ieee1275-powerpc-enables-device-mapper-discovery.patch +++ b/0156-ieee1275-powerpc-enables-device-mapper-discovery.patch @@ -17,7 +17,7 @@ Signed-off-by: Diego Domingos <diegodo(a)br.ibm.com> 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/grub-core/osdep/linux/ofpath.c b/grub-core/osdep/linux/ofpath.c -index 0f5d54e9f2d..cc849d9c94c 100644 +index 0f5d54e9f..cc849d9c9 100644 --- a/grub-core/osdep/linux/ofpath.c +++ b/grub-core/osdep/linux/ofpath.c @@ -37,6 +37,7 @@ diff --git a/0159-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch b/0157-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch similarity index 99% rename from 0159-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch rename to 0157-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch index 01e7e67..7b8150a 100644 --- a/0159-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch +++ b/0157-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch @@ -35,7 +35,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 96 insertions(+), 25 deletions(-) diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c -index 26014382608..dac0f946fe6 100644 +index 260143826..dac0f946f 100644 --- a/grub-core/term/at_keyboard.c +++ b/grub-core/term/at_keyboard.c @@ -31,6 +31,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); diff --git a/0160-Add-suport-for-signing-grub-with-an-appended-signatu.patch b/0158-Add-suport-for-signing-grub-with-an-appended-signatu.patch similarity index 96% rename from 0160-Add-suport-for-signing-grub-with-an-appended-signatu.patch rename to 0158-Add-suport-for-signing-grub-with-an-appended-signatu.patch index ef64414..9e42d64 100644 --- a/0160-Add-suport-for-signing-grub-with-an-appended-signatu.patch +++ b/0158-Add-suport-for-signing-grub-with-an-appended-signatu.patch @@ -33,15 +33,6 @@ under this scheme. Signed-off-by: Daniel Axtens <dja(a)axtens.net> Signed-off-by: Rashmica Gupta <rashmica.g(a)gmail.com> - ---- - -You can experiment with this code with a patched version of SLOF -that verifies these signatures. You can find one at: - https://github.com/daxtens/SLOF - -I will be proposing this for inclusion in a future Power Architecture -Platform Reference (PAPR). --- util/grub-install-common.c | 18 ++++++++++++++---- util/grub-mkimage.c | 15 +++++++++++++-- @@ -52,7 +43,7 @@ Platform Reference (PAPR). 6 files changed, 80 insertions(+), 17 deletions(-) diff --git a/util/grub-install-common.c b/util/grub-install-common.c -index 4e212e690c5..a74fee16e22 100644 +index 4e212e690..a74fee16e 100644 --- a/util/grub-install-common.c +++ b/util/grub-install-common.c @@ -461,10 +461,12 @@ static size_t npubkeys; @@ -108,7 +99,7 @@ index 4e212e690c5..a74fee16e22 100644 while (dc--) grub_install_pop_module (); diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c -index c0d55993702..8a53310548b 100644 +index c0d559937..8a5331054 100644 --- a/util/grub-mkimage.c +++ b/util/grub-mkimage.c @@ -84,6 +84,7 @@ static struct argp_option options[] = { @@ -162,7 +153,7 @@ index c0d55993702..8a53310548b 100644 if (grub_util_file_sync (fp) < 0) grub_util_error (_("cannot sync `%s': %s"), arguments.output ? : "stdout", diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c -index d78fa3e5330..393119486d3 100644 +index d78fa3e53..393119486 100644 --- a/util/grub-mkimagexx.c +++ b/util/grub-mkimagexx.c @@ -84,6 +84,15 @@ struct grub_ieee1275_note @@ -233,7 +224,7 @@ index d78fa3e5330..393119486d3 100644 char *str_start = (elf_img + sizeof (*ehdr) + phnum * sizeof (*phdr) + shnum * sizeof (*shdr)); diff --git a/util/mkimage.c b/util/mkimage.c -index a26cf76f72f..bab12276010 100644 +index a26cf76f7..bab122760 100644 --- a/util/mkimage.c +++ b/util/mkimage.c @@ -869,8 +869,9 @@ grub_install_generate_image (const char *dir, const char *prefix, @@ -265,7 +256,7 @@ index a26cf76f72f..bab12276010 100644 break; } diff --git a/include/grub/util/install.h b/include/grub/util/install.h -index 7df3191f47e..cf4531e02b6 100644 +index 7df3191f4..cf4531e02 100644 --- a/include/grub/util/install.h +++ b/include/grub/util/install.h @@ -67,6 +67,9 @@ @@ -298,7 +289,7 @@ index 7df3191f47e..cf4531e02b6 100644 const char *sbat_path, const int disable_shim_lock); diff --git a/include/grub/util/mkimage.h b/include/grub/util/mkimage.h -index 3819a67441c..6f1da89b9b6 100644 +index 3819a6744..6f1da89b9 100644 --- a/include/grub/util/mkimage.h +++ b/include/grub/util/mkimage.h @@ -51,12 +51,12 @@ grub_mkimage_load_image64 (const char *kernel_path, diff --git a/0161-docs-grub-Document-signing-grub-under-UEFI.patch b/0159-docs-grub-Document-signing-grub-under-UEFI.patch similarity index 98% rename from 0161-docs-grub-Document-signing-grub-under-UEFI.patch rename to 0159-docs-grub-Document-signing-grub-under-UEFI.patch index 9b9b19a..328e5ab 100644 --- a/0161-docs-grub-Document-signing-grub-under-UEFI.patch +++ b/0159-docs-grub-Document-signing-grub-under-UEFI.patch @@ -13,7 +13,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/docs/grub.texi b/docs/grub.texi -index 4870faaa00a..365d1d6931b 100644 +index 4870faaa0..365d1d693 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -5817,6 +5817,7 @@ environment variables and commands are listed in the same order. diff --git a/0162-docs-grub-Document-signing-grub-with-an-appended-sig.patch b/0160-docs-grub-Document-signing-grub-with-an-appended-sig.patch similarity index 98% rename from 0162-docs-grub-Document-signing-grub-with-an-appended-sig.patch rename to 0160-docs-grub-Document-signing-grub-with-an-appended-sig.patch index 4d85d93..9e04af2 100644 --- a/0162-docs-grub-Document-signing-grub-with-an-appended-sig.patch +++ b/0160-docs-grub-Document-signing-grub-with-an-appended-sig.patch @@ -13,7 +13,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 1 file changed, 42 insertions(+) diff --git a/docs/grub.texi b/docs/grub.texi -index 365d1d6931b..afbde7c1f7b 100644 +index 365d1d693..afbde7c1f 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -6087,6 +6087,48 @@ image works under UEFI secure boot and can maintain the secure-boot chain. It diff --git a/0163-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch b/0161-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch similarity index 96% rename from 0163-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch rename to 0161-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch index 6e46db0..1d8012d 100644 --- a/0163-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch +++ b/0161-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch @@ -16,7 +16,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 1 file changed, 11 insertions(+) diff --git a/include/grub/dl.h b/include/grub/dl.h -index 2f76e6b0437..20d870f2a47 100644 +index 2f76e6b04..20d870f2a 100644 --- a/include/grub/dl.h +++ b/include/grub/dl.h @@ -245,11 +245,22 @@ grub_dl_get (const char *name) diff --git a/0164-pgp-factor-out-rsa_pad.patch b/0162-pgp-factor-out-rsa_pad.patch similarity index 97% rename from 0164-pgp-factor-out-rsa_pad.patch rename to 0162-pgp-factor-out-rsa_pad.patch index a8154e7..1c566b2 100644 --- a/0164-pgp-factor-out-rsa_pad.patch +++ b/0162-pgp-factor-out-rsa_pad.patch @@ -27,7 +27,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> create mode 100644 include/grub/pkcs1_v15.h diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 81fc274148e..97347ae76f9 100644 +index 81fc27414..97347ae76 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -2510,6 +2510,14 @@ module = { @@ -46,7 +46,7 @@ index 81fc274148e..97347ae76f9 100644 name = all_video; common = lib/fake_module.c; diff --git a/grub-core/commands/pgp.c b/grub-core/commands/pgp.c -index 5daa1e9d00c..2408db4994f 100644 +index 5daa1e9d0..2408db499 100644 --- a/grub-core/commands/pgp.c +++ b/grub-core/commands/pgp.c @@ -24,6 +24,7 @@ @@ -93,7 +93,7 @@ index 5daa1e9d00c..2408db4994f 100644 struct grub_pubkey_context diff --git a/grub-core/lib/pkcs1_v15.c b/grub-core/lib/pkcs1_v15.c new file mode 100644 -index 00000000000..dbacd563d01 +index 000000000..dbacd563d --- /dev/null +++ b/grub-core/lib/pkcs1_v15.c @@ -0,0 +1,59 @@ @@ -158,7 +158,7 @@ index 00000000000..dbacd563d01 +} diff --git a/include/grub/pkcs1_v15.h b/include/grub/pkcs1_v15.h new file mode 100644 -index 00000000000..5c338c84a15 +index 000000000..5c338c84a --- /dev/null +++ b/include/grub/pkcs1_v15.h @@ -0,0 +1,27 @@ diff --git a/0165-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch b/0163-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch similarity index 96% rename from 0165-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch rename to 0163-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch index 763cdc6..b104617 100644 --- a/0165-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch +++ b/0163-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch @@ -40,7 +40,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/grub-core/commands/pgp.c b/grub-core/commands/pgp.c -index 2408db4994f..355a43844ac 100644 +index 2408db499..355a43844 100644 --- a/grub-core/commands/pgp.c +++ b/grub-core/commands/pgp.c @@ -147,10 +147,6 @@ const char *hashes[] = { @@ -55,7 +55,7 @@ index 2408db4994f..355a43844ac 100644 dsa_pad (gcry_mpi_t *hmpi, grub_uint8_t *hval, const gcry_md_spec_t *hash, struct grub_public_subkey *sk); diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c -index ca334d5a40e..c578128a59d 100644 +index ca334d5a4..c578128a5 100644 --- a/grub-core/lib/crypto.c +++ b/grub-core/lib/crypto.c @@ -121,6 +121,10 @@ grub_md_unregister (gcry_md_spec_t *cipher) diff --git a/0166-posix_wrap-tweaks-in-preparation-for-libtasn1.patch b/0164-posix_wrap-tweaks-in-preparation-for-libtasn1.patch similarity index 94% rename from 0166-posix_wrap-tweaks-in-preparation-for-libtasn1.patch rename to 0164-posix_wrap-tweaks-in-preparation-for-libtasn1.patch index a09cab1..fed345e 100644 --- a/0166-posix_wrap-tweaks-in-preparation-for-libtasn1.patch +++ b/0164-posix_wrap-tweaks-in-preparation-for-libtasn1.patch @@ -23,7 +23,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 3 files changed, 10 insertions(+) diff --git a/grub-core/lib/posix_wrap/limits.h b/grub-core/lib/posix_wrap/limits.h -index 7217138ffd6..591dbf3289d 100644 +index 7217138ff..591dbf328 100644 --- a/grub-core/lib/posix_wrap/limits.h +++ b/grub-core/lib/posix_wrap/limits.h @@ -37,5 +37,6 @@ @@ -34,7 +34,7 @@ index 7217138ffd6..591dbf3289d 100644 #endif diff --git a/grub-core/lib/posix_wrap/stdlib.h b/grub-core/lib/posix_wrap/stdlib.h -index 7a8d385e973..4634db09f29 100644 +index 7a8d385e9..4634db09f 100644 --- a/grub-core/lib/posix_wrap/stdlib.h +++ b/grub-core/lib/posix_wrap/stdlib.h @@ -58,4 +58,12 @@ abs (int c) @@ -51,7 +51,7 @@ index 7a8d385e973..4634db09f29 100644 + #endif diff --git a/grub-core/lib/posix_wrap/sys/types.h b/grub-core/lib/posix_wrap/sys/types.h -index 854eb0122ef..f63412c8da0 100644 +index 854eb0122..f63412c8d 100644 --- a/grub-core/lib/posix_wrap/sys/types.h +++ b/grub-core/lib/posix_wrap/sys/types.h @@ -51,6 +51,7 @@ typedef grub_uint8_t byte; diff --git a/0167-libtasn1-import-libtasn1-4.16.0.patch b/0165-libtasn1-import-libtasn1-4.16.0.patch similarity index 99% rename from 0167-libtasn1-import-libtasn1-4.16.0.patch rename to 0165-libtasn1-import-libtasn1-4.16.0.patch index 89552c8..7a7b05d 100644 --- a/0167-libtasn1-import-libtasn1-4.16.0.patch +++ b/0165-libtasn1-import-libtasn1-4.16.0.patch @@ -53,7 +53,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> diff --git a/grub-core/lib/libtasn1/lib/coding.c b/grub-core/lib/libtasn1/lib/coding.c new file mode 100644 -index 00000000000..245ea64cf0a +index 000000000..245ea64cf --- /dev/null +++ b/grub-core/lib/libtasn1/lib/coding.c @@ -0,0 +1,1415 @@ @@ -1474,7 +1474,7 @@ index 00000000000..245ea64cf0a +} diff --git a/grub-core/lib/libtasn1/lib/decoding.c b/grub-core/lib/libtasn1/lib/decoding.c new file mode 100644 -index 00000000000..ff04eb778cb +index 000000000..ff04eb778 --- /dev/null +++ b/grub-core/lib/libtasn1/lib/decoding.c @@ -0,0 +1,2478 @@ @@ -3958,7 +3958,7 @@ index 00000000000..ff04eb778cb +} diff --git a/grub-core/lib/libtasn1/lib/element.c b/grub-core/lib/libtasn1/lib/element.c new file mode 100644 -index 00000000000..997eb2725dc +index 000000000..997eb2725 --- /dev/null +++ b/grub-core/lib/libtasn1/lib/element.c @@ -0,0 +1,1111 @@ @@ -5075,7 +5075,7 @@ index 00000000000..997eb2725dc +} diff --git a/grub-core/lib/libtasn1/lib/errors.c b/grub-core/lib/libtasn1/lib/errors.c new file mode 100644 -index 00000000000..cee74daf795 +index 000000000..cee74daf7 --- /dev/null +++ b/grub-core/lib/libtasn1/lib/errors.c @@ -0,0 +1,100 @@ @@ -5181,7 +5181,7 @@ index 00000000000..cee74daf795 +} diff --git a/grub-core/lib/libtasn1/lib/gstr.c b/grub-core/lib/libtasn1/lib/gstr.c new file mode 100644 -index 00000000000..e91a3a151c0 +index 000000000..e91a3a151 --- /dev/null +++ b/grub-core/lib/libtasn1/lib/gstr.c @@ -0,0 +1,74 @@ @@ -5261,7 +5261,7 @@ index 00000000000..e91a3a151c0 +} diff --git a/grub-core/lib/libtasn1/lib/parser_aux.c b/grub-core/lib/libtasn1/lib/parser_aux.c new file mode 100644 -index 00000000000..d5dbbf8765d +index 000000000..d5dbbf876 --- /dev/null +++ b/grub-core/lib/libtasn1/lib/parser_aux.c @@ -0,0 +1,1173 @@ @@ -6440,7 +6440,7 @@ index 00000000000..d5dbbf8765d +} diff --git a/grub-core/lib/libtasn1/lib/structure.c b/grub-core/lib/libtasn1/lib/structure.c new file mode 100644 -index 00000000000..8189c56a4c9 +index 000000000..8189c56a4 --- /dev/null +++ b/grub-core/lib/libtasn1/lib/structure.c @@ -0,0 +1,1220 @@ @@ -7666,7 +7666,7 @@ index 00000000000..8189c56a4c9 +} diff --git a/grub-core/lib/libtasn1/lib/element.h b/grub-core/lib/libtasn1/lib/element.h new file mode 100644 -index 00000000000..440a33f4bb1 +index 000000000..440a33f4b --- /dev/null +++ b/grub-core/lib/libtasn1/lib/element.h @@ -0,0 +1,40 @@ @@ -7712,7 +7712,7 @@ index 00000000000..440a33f4bb1 +#endif diff --git a/grub-core/lib/libtasn1/lib/gstr.h b/grub-core/lib/libtasn1/lib/gstr.h new file mode 100644 -index 00000000000..48229844ff3 +index 000000000..48229844f --- /dev/null +++ b/grub-core/lib/libtasn1/lib/gstr.h @@ -0,0 +1,47 @@ @@ -7765,7 +7765,7 @@ index 00000000000..48229844ff3 +#endif /* GSTR_H */ diff --git a/grub-core/lib/libtasn1/lib/int.h b/grub-core/lib/libtasn1/lib/int.h new file mode 100644 -index 00000000000..ea1625786c1 +index 000000000..ea1625786 --- /dev/null +++ b/grub-core/lib/libtasn1/lib/int.h @@ -0,0 +1,221 @@ @@ -7992,7 +7992,7 @@ index 00000000000..ea1625786c1 +#endif /* INT_H */ diff --git a/grub-core/lib/libtasn1/lib/parser_aux.h b/grub-core/lib/libtasn1/lib/parser_aux.h new file mode 100644 -index 00000000000..598e684b355 +index 000000000..598e684b3 --- /dev/null +++ b/grub-core/lib/libtasn1/lib/parser_aux.h @@ -0,0 +1,172 @@ @@ -8170,7 +8170,7 @@ index 00000000000..598e684b355 +#endif diff --git a/grub-core/lib/libtasn1/lib/structure.h b/grub-core/lib/libtasn1/lib/structure.h new file mode 100644 -index 00000000000..99e685da07a +index 000000000..99e685da0 --- /dev/null +++ b/grub-core/lib/libtasn1/lib/structure.h @@ -0,0 +1,45 @@ @@ -8221,7 +8221,7 @@ index 00000000000..99e685da07a +#endif diff --git a/include/grub/libtasn1.h b/include/grub/libtasn1.h new file mode 100644 -index 00000000000..6fd7a30dc35 +index 000000000..6fd7a30dc --- /dev/null +++ b/include/grub/libtasn1.h @@ -0,0 +1,588 @@ @@ -8815,7 +8815,7 @@ index 00000000000..6fd7a30dc35 +#endif /* LIBTASN1_H */ diff --git a/grub-core/lib/libtasn1/LICENSE b/grub-core/lib/libtasn1/LICENSE new file mode 100644 -index 00000000000..e8b3628db9b +index 000000000..e8b3628db --- /dev/null +++ b/grub-core/lib/libtasn1/LICENSE @@ -0,0 +1,16 @@ @@ -8837,7 +8837,7 @@ index 00000000000..e8b3628db9b +note that the range specifies every single year in that closed interval. diff --git a/grub-core/lib/libtasn1/README.md b/grub-core/lib/libtasn1/README.md new file mode 100644 -index 00000000000..50a8642296c +index 000000000..50a864229 --- /dev/null +++ b/grub-core/lib/libtasn1/README.md @@ -0,0 +1,91 @@ diff --git a/0168-libtasn1-disable-code-not-needed-in-grub.patch b/0166-libtasn1-disable-code-not-needed-in-grub.patch similarity index 97% rename from 0168-libtasn1-disable-code-not-needed-in-grub.patch rename to 0166-libtasn1-disable-code-not-needed-in-grub.patch index 00f5588..082cdb9 100644 --- a/0168-libtasn1-disable-code-not-needed-in-grub.patch +++ b/0166-libtasn1-disable-code-not-needed-in-grub.patch @@ -25,7 +25,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 6 files changed, 38 insertions(+), 8 deletions(-) diff --git a/grub-core/lib/libtasn1/lib/coding.c b/grub-core/lib/libtasn1/lib/coding.c -index 245ea64cf0a..52def598368 100644 +index 245ea64cf..52def5983 100644 --- a/grub-core/lib/libtasn1/lib/coding.c +++ b/grub-core/lib/libtasn1/lib/coding.c @@ -30,11 +30,11 @@ @@ -99,7 +99,7 @@ index 245ea64cf0a..52def598368 100644 +#endif \ No newline at end of file diff --git a/grub-core/lib/libtasn1/lib/decoding.c b/grub-core/lib/libtasn1/lib/decoding.c -index ff04eb778cb..42f9a92b5d4 100644 +index ff04eb778..42f9a92b5 100644 --- a/grub-core/lib/libtasn1/lib/decoding.c +++ b/grub-core/lib/libtasn1/lib/decoding.c @@ -1613,6 +1613,7 @@ asn1_der_decoding (asn1_node * element, const void *ider, int ider_len, @@ -119,7 +119,7 @@ index ff04eb778cb..42f9a92b5d4 100644 /** * asn1_der_decoding_startEnd: diff --git a/grub-core/lib/libtasn1/lib/element.c b/grub-core/lib/libtasn1/lib/element.c -index 997eb2725dc..539008d8e94 100644 +index 997eb2725..539008d8e 100644 --- a/grub-core/lib/libtasn1/lib/element.c +++ b/grub-core/lib/libtasn1/lib/element.c @@ -191,7 +191,7 @@ _asn1_append_sequence_set (asn1_node node, struct node_tail_cache_st *pcache) @@ -141,7 +141,7 @@ index 997eb2725dc..539008d8e94 100644 #define PUT_VALUE( ptr, ptr_size, data, data_size) \ *len = data_size; \ diff --git a/grub-core/lib/libtasn1/lib/errors.c b/grub-core/lib/libtasn1/lib/errors.c -index cee74daf795..42785e8622b 100644 +index cee74daf7..42785e862 100644 --- a/grub-core/lib/libtasn1/lib/errors.c +++ b/grub-core/lib/libtasn1/lib/errors.c @@ -57,6 +57,8 @@ static const libtasn1_error_entry error_algorithms[] = { @@ -162,7 +162,7 @@ index cee74daf795..42785e8622b 100644 /** * asn1_strerror: diff --git a/grub-core/lib/libtasn1/lib/structure.c b/grub-core/lib/libtasn1/lib/structure.c -index 8189c56a4c9..fcfde01a393 100644 +index 8189c56a4..fcfde01a3 100644 --- a/grub-core/lib/libtasn1/lib/structure.c +++ b/grub-core/lib/libtasn1/lib/structure.c @@ -76,7 +76,7 @@ _asn1_find_left (asn1_node_const node) @@ -218,7 +218,7 @@ index 8189c56a4c9..fcfde01a393 100644 /** * asn1_dup_node: diff --git a/include/grub/libtasn1.h b/include/grub/libtasn1.h -index 6fd7a30dc35..785eda2ae3f 100644 +index 6fd7a30dc..785eda2ae 100644 --- a/include/grub/libtasn1.h +++ b/include/grub/libtasn1.h @@ -319,6 +319,8 @@ typedef struct asn1_data_node_st asn1_data_node_st; diff --git a/0169-libtasn1-changes-for-grub-compatibility.patch b/0167-libtasn1-changes-for-grub-compatibility.patch similarity index 96% rename from 0169-libtasn1-changes-for-grub-compatibility.patch rename to 0167-libtasn1-changes-for-grub-compatibility.patch index 9b2275c..35ceb56 100644 --- a/0169-libtasn1-changes-for-grub-compatibility.patch +++ b/0167-libtasn1-changes-for-grub-compatibility.patch @@ -35,7 +35,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 6 files changed, 22 insertions(+), 33 deletions(-) diff --git a/grub-core/lib/libtasn1/lib/decoding.c b/grub-core/lib/libtasn1/lib/decoding.c -index 42f9a92b5d4..7856858b272 100644 +index 42f9a92b5..7856858b2 100644 --- a/grub-core/lib/libtasn1/lib/decoding.c +++ b/grub-core/lib/libtasn1/lib/decoding.c @@ -32,7 +32,8 @@ @@ -71,7 +71,7 @@ index 42f9a92b5d4..7856858b272 100644 result = asn1_create_element (definitions, name, &aux); if (result == ASN1_SUCCESS) diff --git a/grub-core/lib/libtasn1/lib/element.c b/grub-core/lib/libtasn1/lib/element.c -index 539008d8e94..ed761ff56bd 100644 +index 539008d8e..ed761ff56 100644 --- a/grub-core/lib/libtasn1/lib/element.c +++ b/grub-core/lib/libtasn1/lib/element.c @@ -30,9 +30,10 @@ @@ -87,7 +87,7 @@ index 539008d8e94..ed761ff56bd 100644 _asn1_hierarchical_name (asn1_node_const node, char *name, int name_size) { diff --git a/grub-core/lib/libtasn1/lib/gstr.c b/grub-core/lib/libtasn1/lib/gstr.c -index e91a3a151c0..e33875c2c7c 100644 +index e91a3a151..e33875c2c 100644 --- a/grub-core/lib/libtasn1/lib/gstr.c +++ b/grub-core/lib/libtasn1/lib/gstr.c @@ -36,13 +36,13 @@ _asn1_str_cat (char *dest, size_t dest_tot_size, const char *src) @@ -107,7 +107,7 @@ index e91a3a151c0..e33875c2c7c 100644 } } diff --git a/grub-core/lib/libtasn1/lib/parser_aux.c b/grub-core/lib/libtasn1/lib/parser_aux.c -index d5dbbf8765d..89c9be69dc2 100644 +index d5dbbf876..89c9be69d 100644 --- a/grub-core/lib/libtasn1/lib/parser_aux.c +++ b/grub-core/lib/libtasn1/lib/parser_aux.c @@ -26,7 +26,8 @@ @@ -139,7 +139,7 @@ index d5dbbf8765d..89c9be69dc2 100644 temp[start + count] = '0' + (char) r; count++; diff --git a/grub-core/lib/libtasn1/lib/int.h b/grub-core/lib/libtasn1/lib/int.h -index ea1625786c1..4a568efee9c 100644 +index ea1625786..4a568efee 100644 --- a/grub-core/lib/libtasn1/lib/int.h +++ b/grub-core/lib/libtasn1/lib/int.h @@ -35,7 +35,7 @@ @@ -161,7 +161,7 @@ index ea1625786c1..4a568efee9c 100644 #if SIZEOF_UNSIGNED_LONG_INT == 8 # define _asn1_strtou64(n,e,b) strtoul((const char *) n, e, b) diff --git a/include/grub/libtasn1.h b/include/grub/libtasn1.h -index 785eda2ae3f..28dbf16c4e0 100644 +index 785eda2ae..28dbf16c4 100644 --- a/include/grub/libtasn1.h +++ b/include/grub/libtasn1.h @@ -38,29 +38,15 @@ diff --git a/0170-libtasn1-compile-into-asn1-module.patch b/0168-libtasn1-compile-into-asn1-module.patch similarity index 97% rename from 0170-libtasn1-compile-into-asn1-module.patch rename to 0168-libtasn1-compile-into-asn1-module.patch index 67be4e8..fe6ffdd 100644 --- a/0170-libtasn1-compile-into-asn1-module.patch +++ b/0168-libtasn1-compile-into-asn1-module.patch @@ -14,7 +14,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> create mode 100644 grub-core/lib/libtasn1_wrap/wrap.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 97347ae76f9..21d2c541850 100644 +index 97347ae76..21d2c5418 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -2576,3 +2576,18 @@ module = { @@ -38,7 +38,7 @@ index 97347ae76f9..21d2c541850 100644 +}; diff --git a/grub-core/lib/libtasn1_wrap/wrap.c b/grub-core/lib/libtasn1_wrap/wrap.c new file mode 100644 -index 00000000000..622ba942e33 +index 000000000..622ba942e --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/wrap.c @@ -0,0 +1,26 @@ diff --git a/0171-test_asn1-test-module-for-libtasn1.patch b/0169-test_asn1-test-module-for-libtasn1.patch similarity index 99% rename from 0171-test_asn1-test-module-for-libtasn1.patch rename to 0169-test_asn1-test-module-for-libtasn1.patch index b659558..6bacdb9 100644 --- a/0171-test_asn1-test-module-for-libtasn1.patch +++ b/0169-test_asn1-test-module-for-libtasn1.patch @@ -51,7 +51,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> create mode 100644 tests/test_asn1.in diff --git a/Makefile.util.def b/Makefile.util.def -index 9927c2cfd6a..3f191aa8095 100644 +index 9927c2cfd..3f191aa80 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -1306,6 +1306,12 @@ script = { @@ -68,7 +68,7 @@ index 9927c2cfd6a..3f191aa8095 100644 testcase; name = example_unit_test; diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 21d2c541850..b4aaccf7b57 100644 +index 21d2c5418..b4aaccf7b 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -2591,3 +2591,16 @@ module = { @@ -90,7 +90,7 @@ index 21d2c541850..b4aaccf7b57 100644 +}; diff --git a/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654.c b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654.c new file mode 100644 -index 00000000000..534e304521e +index 000000000..534e30452 --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654.c @@ -0,0 +1,61 @@ @@ -157,7 +157,7 @@ index 00000000000..534e304521e +} diff --git a/grub-core/lib/libtasn1_wrap/tests/Test_overflow.c b/grub-core/lib/libtasn1_wrap/tests/Test_overflow.c new file mode 100644 -index 00000000000..f48aea0ef8b +index 000000000..f48aea0ef --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/tests/Test_overflow.c @@ -0,0 +1,138 @@ @@ -301,7 +301,7 @@ index 00000000000..f48aea0ef8b +} diff --git a/grub-core/lib/libtasn1_wrap/tests/Test_simple.c b/grub-core/lib/libtasn1_wrap/tests/Test_simple.c new file mode 100644 -index 00000000000..9f01006ddf4 +index 000000000..9f01006dd --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/tests/Test_simple.c @@ -0,0 +1,207 @@ @@ -514,7 +514,7 @@ index 00000000000..9f01006ddf4 +} diff --git a/grub-core/lib/libtasn1_wrap/tests/Test_strings.c b/grub-core/lib/libtasn1_wrap/tests/Test_strings.c new file mode 100644 -index 00000000000..dbe1474b204 +index 000000000..dbe1474b2 --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/tests/Test_strings.c @@ -0,0 +1,150 @@ @@ -670,7 +670,7 @@ index 00000000000..dbe1474b204 +} diff --git a/grub-core/lib/libtasn1_wrap/tests/object-id-decoding.c b/grub-core/lib/libtasn1_wrap/tests/object-id-decoding.c new file mode 100644 -index 00000000000..d367bbfb5a7 +index 000000000..d367bbfb5 --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/tests/object-id-decoding.c @@ -0,0 +1,116 @@ @@ -792,7 +792,7 @@ index 00000000000..d367bbfb5a7 +} diff --git a/grub-core/lib/libtasn1_wrap/tests/object-id-encoding.c b/grub-core/lib/libtasn1_wrap/tests/object-id-encoding.c new file mode 100644 -index 00000000000..3a83b58c59f +index 000000000..3a83b58c5 --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/tests/object-id-encoding.c @@ -0,0 +1,120 @@ @@ -918,7 +918,7 @@ index 00000000000..3a83b58c59f +} diff --git a/grub-core/lib/libtasn1_wrap/tests/octet-string.c b/grub-core/lib/libtasn1_wrap/tests/octet-string.c new file mode 100644 -index 00000000000..d8a049e8df0 +index 000000000..d8a049e8d --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/tests/octet-string.c @@ -0,0 +1,211 @@ @@ -1135,7 +1135,7 @@ index 00000000000..d8a049e8df0 +} diff --git a/grub-core/lib/libtasn1_wrap/tests/reproducers.c b/grub-core/lib/libtasn1_wrap/tests/reproducers.c new file mode 100644 -index 00000000000..dc7268d4c6c +index 000000000..dc7268d4c --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/tests/reproducers.c @@ -0,0 +1,81 @@ @@ -1222,7 +1222,7 @@ index 00000000000..dc7268d4c6c +} diff --git a/grub-core/lib/libtasn1_wrap/wrap_tests.c b/grub-core/lib/libtasn1_wrap/wrap_tests.c new file mode 100644 -index 00000000000..75fcd21f0d5 +index 000000000..75fcd21f0 --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/wrap_tests.c @@ -0,0 +1,75 @@ @@ -1303,7 +1303,7 @@ index 00000000000..75fcd21f0d5 +} diff --git a/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-1_asn1_tab.h b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-1_asn1_tab.h new file mode 100644 -index 00000000000..1e7d3d64f55 +index 000000000..1e7d3d64f --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-1_asn1_tab.h @@ -0,0 +1,32 @@ @@ -1341,7 +1341,7 @@ index 00000000000..1e7d3d64f55 +}; diff --git a/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-2_asn1_tab.h b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-2_asn1_tab.h new file mode 100644 -index 00000000000..e2561e5ec6d +index 000000000..e2561e5ec --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-2_asn1_tab.h @@ -0,0 +1,36 @@ @@ -1383,7 +1383,7 @@ index 00000000000..e2561e5ec6d +}; diff --git a/grub-core/lib/libtasn1_wrap/wrap_tests.h b/grub-core/lib/libtasn1_wrap/wrap_tests.h new file mode 100644 -index 00000000000..555e56dd202 +index 000000000..555e56dd2 --- /dev/null +++ b/grub-core/lib/libtasn1_wrap/wrap_tests.h @@ -0,0 +1,38 @@ @@ -1426,7 +1426,7 @@ index 00000000000..555e56dd202 + +#endif diff --git a/.gitignore b/.gitignore -index 594d0134d33..856e69bc5c1 100644 +index 594d0134d..856e69bc5 100644 --- a/.gitignore +++ b/.gitignore @@ -264,6 +264,7 @@ widthspec.bin @@ -1439,7 +1439,7 @@ index 594d0134d33..856e69bc5c1 100644 /tests/syslinux/ubuntu10.04_grub.cfg diff --git a/tests/test_asn1.in b/tests/test_asn1.in new file mode 100644 -index 00000000000..8173c5c270e +index 000000000..8173c5c27 --- /dev/null +++ b/tests/test_asn1.in @@ -0,0 +1,12 @@ diff --git a/0172-grub-install-support-embedding-x509-certificates.patch b/0170-grub-install-support-embedding-x509-certificates.patch similarity index 97% rename from 0172-grub-install-support-embedding-x509-certificates.patch rename to 0170-grub-install-support-embedding-x509-certificates.patch index 089e34f..c3c83a5 100644 --- a/0172-grub-install-support-embedding-x509-certificates.patch +++ b/0170-grub-install-support-embedding-x509-certificates.patch @@ -20,7 +20,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 6 files changed, 80 insertions(+), 9 deletions(-) diff --git a/grub-core/commands/pgp.c b/grub-core/commands/pgp.c -index 355a43844ac..b81ac0ae46c 100644 +index 355a43844..b81ac0ae4 100644 --- a/grub-core/commands/pgp.c +++ b/grub-core/commands/pgp.c @@ -944,7 +944,7 @@ GRUB_MOD_INIT(pgp) @@ -33,7 +33,7 @@ index 355a43844ac..b81ac0ae46c 100644 pseudo_file.fs = &pseudo_fs; diff --git a/util/grub-install-common.c b/util/grub-install-common.c -index a74fee16e22..c603f5b308d 100644 +index a74fee16e..c603f5b30 100644 --- a/util/grub-install-common.c +++ b/util/grub-install-common.c @@ -460,6 +460,8 @@ static char **pubkeys; @@ -95,7 +95,7 @@ index a74fee16e22..c603f5b308d 100644 disable_shim_lock); while (dc--) diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c -index 8a53310548b..e1f1112784a 100644 +index 8a5331054..e1f111278 100644 --- a/util/grub-mkimage.c +++ b/util/grub-mkimage.c @@ -75,7 +75,8 @@ static struct argp_option options[] = { @@ -142,7 +142,7 @@ index 8a53310548b..e1f1112784a 100644 arguments.appsig_size, arguments.comp, arguments.dtb, arguments.sbat, diff --git a/util/mkimage.c b/util/mkimage.c -index bab12276010..8319e8dfbde 100644 +index bab122760..8319e8dfb 100644 --- a/util/mkimage.c +++ b/util/mkimage.c @@ -867,7 +867,8 @@ void @@ -212,7 +212,7 @@ index bab12276010..8319e8dfbde 100644 { struct grub_module_header *header; diff --git a/include/grub/kernel.h b/include/grub/kernel.h -index 55849777eaa..98edc0863f6 100644 +index 55849777e..98edc0863 100644 --- a/include/grub/kernel.h +++ b/include/grub/kernel.h @@ -30,7 +30,9 @@ enum @@ -227,7 +227,7 @@ index 55849777eaa..98edc0863f6 100644 /* The module header. */ diff --git a/include/grub/util/install.h b/include/grub/util/install.h -index cf4531e02b6..51f3b13ac13 100644 +index cf4531e02..51f3b13ac 100644 --- a/include/grub/util/install.h +++ b/include/grub/util/install.h @@ -67,6 +67,8 @@ diff --git a/0173-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch b/0171-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch similarity index 99% rename from 0173-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch rename to 0171-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch index 7b7d70c..a9ee5b4 100644 --- a/0173-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch +++ b/0171-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch @@ -22,7 +22,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> diff --git a/grub-core/commands/appendedsig/gnutls_asn1_tab.c b/grub-core/commands/appendedsig/gnutls_asn1_tab.c new file mode 100644 -index 00000000000..ddd1314e63b +index 000000000..ddd1314e6 --- /dev/null +++ b/grub-core/commands/appendedsig/gnutls_asn1_tab.c @@ -0,0 +1,121 @@ @@ -149,7 +149,7 @@ index 00000000000..ddd1314e63b +}; diff --git a/grub-core/commands/appendedsig/pkix_asn1_tab.c b/grub-core/commands/appendedsig/pkix_asn1_tab.c new file mode 100644 -index 00000000000..adef69d95ce +index 000000000..adef69d95 --- /dev/null +++ b/grub-core/commands/appendedsig/pkix_asn1_tab.c @@ -0,0 +1,484 @@ diff --git a/0174-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch b/0172-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch similarity index 99% rename from 0174-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch rename to 0172-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch index 04bf1df..7fb5688 100644 --- a/0174-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch +++ b/0172-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch @@ -29,7 +29,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> diff --git a/grub-core/commands/appendedsig/asn1util.c b/grub-core/commands/appendedsig/asn1util.c new file mode 100644 -index 00000000000..eff095a9df2 +index 000000000..eff095a9d --- /dev/null +++ b/grub-core/commands/appendedsig/asn1util.c @@ -0,0 +1,102 @@ @@ -137,7 +137,7 @@ index 00000000000..eff095a9df2 +} diff --git a/grub-core/commands/appendedsig/pkcs7.c b/grub-core/commands/appendedsig/pkcs7.c new file mode 100644 -index 00000000000..dc6afe203f7 +index 000000000..dc6afe203 --- /dev/null +++ b/grub-core/commands/appendedsig/pkcs7.c @@ -0,0 +1,305 @@ @@ -448,7 +448,7 @@ index 00000000000..dc6afe203f7 +} diff --git a/grub-core/commands/appendedsig/x509.c b/grub-core/commands/appendedsig/x509.c new file mode 100644 -index 00000000000..2b38b3670a2 +index 000000000..2b38b3670 --- /dev/null +++ b/grub-core/commands/appendedsig/x509.c @@ -0,0 +1,958 @@ @@ -1412,7 +1412,7 @@ index 00000000000..2b38b3670a2 +} diff --git a/grub-core/commands/appendedsig/appendedsig.h b/grub-core/commands/appendedsig/appendedsig.h new file mode 100644 -index 00000000000..9792ef3901e +index 000000000..9792ef390 --- /dev/null +++ b/grub-core/commands/appendedsig/appendedsig.h @@ -0,0 +1,110 @@ diff --git a/0175-appended-signatures-support-verifying-appended-signa.patch b/0173-appended-signatures-support-verifying-appended-signa.patch similarity index 99% rename from 0175-appended-signatures-support-verifying-appended-signa.patch rename to 0173-appended-signatures-support-verifying-appended-signa.patch index f655bb5..9545128 100644 --- a/0175-appended-signatures-support-verifying-appended-signa.patch +++ b/0173-appended-signatures-support-verifying-appended-signa.patch @@ -30,7 +30,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> create mode 100644 grub-core/commands/appendedsig/appendedsig.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index b4aaccf7b57..77321d218c8 100644 +index b4aaccf7b..77321d218 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -980,6 +980,18 @@ module = { @@ -54,7 +54,7 @@ index b4aaccf7b57..77321d218c8 100644 common = commands/hdparm.c; diff --git a/grub-core/commands/appendedsig/appendedsig.c b/grub-core/commands/appendedsig/appendedsig.c new file mode 100644 -index 00000000000..bf8b18b6205 +index 000000000..bf8b18b62 --- /dev/null +++ b/grub-core/commands/appendedsig/appendedsig.c @@ -0,0 +1,645 @@ @@ -704,7 +704,7 @@ index 00000000000..bf8b18b6205 + grub_unregister_command (cmd_distrust); +} diff --git a/include/grub/file.h b/include/grub/file.h -index 31567483ccf..96827a4f896 100644 +index 31567483c..96827a4f8 100644 --- a/include/grub/file.h +++ b/include/grub/file.h @@ -80,6 +80,8 @@ enum grub_file_type diff --git a/0176-appended-signatures-verification-tests.patch b/0174-appended-signatures-verification-tests.patch similarity index 99% rename from 0176-appended-signatures-verification-tests.patch rename to 0174-appended-signatures-verification-tests.patch index 9f6c3c6..12ae1e8 100644 --- a/0176-appended-signatures-verification-tests.patch +++ b/0174-appended-signatures-verification-tests.patch @@ -17,7 +17,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> create mode 100644 grub-core/tests/appended_signatures.h diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 77321d218c8..6bddc841b85 100644 +index 77321d218..6bddc841b 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -2161,6 +2161,12 @@ module = { @@ -35,7 +35,7 @@ index 77321d218c8..6bddc841b85 100644 common = tests/signature_test.c; diff --git a/grub-core/tests/appended_signature_test.c b/grub-core/tests/appended_signature_test.c new file mode 100644 -index 00000000000..88a485200d8 +index 000000000..88a485200 --- /dev/null +++ b/grub-core/tests/appended_signature_test.c @@ -0,0 +1,281 @@ @@ -321,7 +321,7 @@ index 00000000000..88a485200d8 + +GRUB_FUNCTIONAL_TEST (appended_signature_test, appended_signature_test); diff --git a/grub-core/tests/lib/functional_test.c b/grub-core/tests/lib/functional_test.c -index 96781fb39b5..403fa5c789a 100644 +index 96781fb39..403fa5c78 100644 --- a/grub-core/tests/lib/functional_test.c +++ b/grub-core/tests/lib/functional_test.c @@ -73,6 +73,7 @@ grub_functional_all_tests (grub_extcmd_context_t ctxt __attribute__ ((unused)), @@ -334,7 +334,7 @@ index 96781fb39b5..403fa5c789a 100644 grub_dl_load ("ctz_test"); diff --git a/grub-core/tests/appended_signatures.h b/grub-core/tests/appended_signatures.h new file mode 100644 -index 00000000000..aa3dc6278e3 +index 000000000..aa3dc6278 --- /dev/null +++ b/grub-core/tests/appended_signatures.h @@ -0,0 +1,557 @@ diff --git a/0177-appended-signatures-documentation.patch b/0175-appended-signatures-documentation.patch similarity index 99% rename from 0177-appended-signatures-documentation.patch rename to 0175-appended-signatures-documentation.patch index 864cfa3..c67bcc1 100644 --- a/0177-appended-signatures-documentation.patch +++ b/0175-appended-signatures-documentation.patch @@ -13,7 +13,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 1 file changed, 182 insertions(+), 17 deletions(-) diff --git a/docs/grub.texi b/docs/grub.texi -index afbde7c1f7b..4816be85611 100644 +index afbde7c1f..4816be856 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -3214,6 +3214,7 @@ These variables have special meaning to GRUB. diff --git a/0178-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch b/0176-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch similarity index 95% rename from 0178-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch rename to 0176-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch index 40c3b3e..3e211b0 100644 --- a/0178-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch +++ b/0176-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch @@ -15,7 +15,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 6bddc841b85..3f3459b2c70 100644 +index 6bddc841b..3f3459b2c 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -323,6 +323,7 @@ kernel = { @@ -27,7 +27,7 @@ index 6bddc841b85..3f3459b2c70 100644 sparc64_ieee1275 = kern/sparc64/cache.S; sparc64_ieee1275 = kern/sparc64/dl.c; diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c -index 937c1bc44cb..fc7d9712729 100644 +index 937c1bc44..fc7d97127 100644 --- a/grub-core/kern/ieee1275/init.c +++ b/grub-core/kern/ieee1275/init.c @@ -44,6 +44,7 @@ @@ -79,7 +79,7 @@ index 937c1bc44cb..fc7d9712729 100644 void diff --git a/include/grub/lockdown.h b/include/grub/lockdown.h -index 40531fa823b..ebfee4bf06e 100644 +index 40531fa82..ebfee4bf0 100644 --- a/include/grub/lockdown.h +++ b/include/grub/lockdown.h @@ -24,7 +24,8 @@ @@ -93,7 +93,7 @@ index 40531fa823b..ebfee4bf06e 100644 EXPORT_FUNC (grub_lockdown) (void); extern int diff --git a/docs/grub.texi b/docs/grub.texi -index 4816be85611..a4da9c2a1b9 100644 +index 4816be856..a4da9c2a1 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -6227,8 +6227,8 @@ Measured boot is currently only supported on EFI platforms. diff --git a/0179-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch b/0177-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch similarity index 98% rename from 0179-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch rename to 0177-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch index 52fa9d2..30efae7 100644 --- a/0179-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch +++ b/0177-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch @@ -32,7 +32,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 1 file changed, 17 deletions(-) diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c -index fc7d9712729..0dcd114ce54 100644 +index fc7d97127..0dcd114ce 100644 --- a/grub-core/kern/ieee1275/init.c +++ b/grub-core/kern/ieee1275/init.c @@ -46,9 +46,6 @@ diff --git a/0180-ieee1275-claim-more-memory.patch b/0178-ieee1275-claim-more-memory.patch similarity index 99% rename from 0180-ieee1275-claim-more-memory.patch rename to 0178-ieee1275-claim-more-memory.patch index 001a9df..27bab15 100644 --- a/0180-ieee1275-claim-more-memory.patch +++ b/0178-ieee1275-claim-more-memory.patch @@ -86,7 +86,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 2 files changed, 69 insertions(+), 18 deletions(-) diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c -index 0dcd114ce54..c61d91a0285 100644 +index 0dcd114ce..c61d91a02 100644 --- a/grub-core/kern/ieee1275/init.c +++ b/grub-core/kern/ieee1275/init.c @@ -46,11 +46,12 @@ @@ -227,7 +227,7 @@ index 0dcd114ce54..c61d91a0285 100644 #endif diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi -index 19f708ee662..90083772c8a 100644 +index 19f708ee6..90083772c 100644 --- a/docs/grub-dev.texi +++ b/docs/grub-dev.texi @@ -1047,7 +1047,9 @@ space is limited to 4GiB. GRUB allocates pages from EFI for its heap, at most diff --git a/0181-ieee1275-request-memory-with-ibm-client-architecture.patch b/0179-ieee1275-request-memory-with-ibm-client-architecture.patch similarity index 98% rename from 0181-ieee1275-request-memory-with-ibm-client-architecture.patch rename to 0179-ieee1275-request-memory-with-ibm-client-architecture.patch index 6e6c1f0..edfbe92 100644 --- a/0181-ieee1275-request-memory-with-ibm-client-architecture.patch +++ b/0179-ieee1275-request-memory-with-ibm-client-architecture.patch @@ -69,7 +69,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 3 files changed, 152 insertions(+), 3 deletions(-) diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c -index 04df9d2c667..6435628ec57 100644 +index 04df9d2c6..6435628ec 100644 --- a/grub-core/kern/ieee1275/cmain.c +++ b/grub-core/kern/ieee1275/cmain.c @@ -127,6 +127,9 @@ grub_ieee1275_find_options (void) @@ -83,7 +83,7 @@ index 04df9d2c667..6435628ec57 100644 if (is_smartfirmware) diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c -index c61d91a0285..9704715c837 100644 +index c61d91a02..9704715c8 100644 --- a/grub-core/kern/ieee1275/init.c +++ b/grub-core/kern/ieee1275/init.c @@ -242,6 +242,135 @@ heap_init (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type, @@ -248,7 +248,7 @@ index c61d91a0285..9704715c837 100644 total = total / 4; diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h -index b5a1d49bbc3..e0a6c2ce1e6 100644 +index b5a1d49bb..e0a6c2ce1 100644 --- a/include/grub/ieee1275/ieee1275.h +++ b/include/grub/ieee1275/ieee1275.h @@ -149,7 +149,13 @@ enum grub_ieee1275_flag diff --git a/0182-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch b/0180-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch similarity index 99% rename from 0182-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch rename to 0180-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch index a237a21..878bf60 100644 --- a/0182-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch +++ b/0180-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch @@ -23,7 +23,7 @@ Signed-off-by: Daniel Axtens <dja(a)axtens.net> 3 files changed, 201 insertions(+), 3 deletions(-) diff --git a/grub-core/commands/appendedsig/x509.c b/grub-core/commands/appendedsig/x509.c -index 2b38b3670a2..42ec65c54aa 100644 +index 2b38b3670..42ec65c54 100644 --- a/grub-core/commands/appendedsig/x509.c +++ b/grub-core/commands/appendedsig/x509.c @@ -47,6 +47,12 @@ const char *keyUsage_oid = "2.5.29.15"; @@ -156,7 +156,7 @@ index 2b38b3670a2..42ec65c54aa 100644 cleanup_value: diff --git a/grub-core/tests/appended_signature_test.c b/grub-core/tests/appended_signature_test.c -index 88a485200d8..dbba0616621 100644 +index 88a485200..dbba06166 100644 --- a/grub-core/tests/appended_signature_test.c +++ b/grub-core/tests/appended_signature_test.c @@ -111,6 +111,22 @@ static struct grub_procfs_entry certificate_printable_der_entry = { @@ -225,7 +225,7 @@ index 88a485200d8..dbba0616621 100644 GRUB_FUNCTIONAL_TEST (appended_signature_test, appended_signature_test); diff --git a/grub-core/tests/appended_signatures.h b/grub-core/tests/appended_signatures.h -index aa3dc6278e3..2e5ebd7d8bd 100644 +index aa3dc6278..2e5ebd7d8 100644 --- a/grub-core/tests/appended_signatures.h +++ b/grub-core/tests/appended_signatures.h @@ -555,3 +555,84 @@ unsigned char certificate_printable_der[] = { diff --git a/0183-ieee1275-ofdisk-retry-on-open-failure.patch b/0181-ieee1275-ofdisk-retry-on-open-failure.patch similarity index 97% rename from 0183-ieee1275-ofdisk-retry-on-open-failure.patch rename to 0181-ieee1275-ofdisk-retry-on-open-failure.patch index 275d14f..264c7c9 100644 --- a/0183-ieee1275-ofdisk-retry-on-open-failure.patch +++ b/0181-ieee1275-ofdisk-retry-on-open-failure.patch @@ -16,7 +16,7 @@ Signed-off-by: Diego Domingos <diegodo(a)br.ibm.com> 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c -index ea7f78ac7d8..55346849d35 100644 +index ea7f78ac7..55346849d 100644 --- a/grub-core/disk/ieee1275/ofdisk.c +++ b/grub-core/disk/ieee1275/ofdisk.c @@ -225,7 +225,9 @@ dev_iterate (const struct grub_ieee1275_devalias *alias) @@ -85,7 +85,7 @@ index ea7f78ac7d8..55346849d35 100644 } diff --git a/include/grub/ieee1275/ofdisk.h b/include/grub/ieee1275/ofdisk.h -index 2f69e3f191d..7d2d5409305 100644 +index 2f69e3f19..7d2d54093 100644 --- a/include/grub/ieee1275/ofdisk.h +++ b/include/grub/ieee1275/ofdisk.h @@ -22,4 +22,12 @@ diff --git a/0184-Allow-chainloading-EFI-apps-from-loop-mounts.patch b/0182-Allow-chainloading-EFI-apps-from-loop-mounts.patch similarity index 97% rename from 0184-Allow-chainloading-EFI-apps-from-loop-mounts.patch rename to 0182-Allow-chainloading-EFI-apps-from-loop-mounts.patch index 66e61a7..32c6b60 100644 --- a/0184-Allow-chainloading-EFI-apps-from-loop-mounts.patch +++ b/0182-Allow-chainloading-EFI-apps-from-loop-mounts.patch @@ -13,7 +13,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> create mode 100644 include/grub/loopback.h diff --git a/grub-core/disk/loopback.c b/grub-core/disk/loopback.c -index 41bebd14fe3..99f47924ec2 100644 +index 41bebd14f..99f47924e 100644 --- a/grub-core/disk/loopback.c +++ b/grub-core/disk/loopback.c @@ -21,20 +21,13 @@ @@ -39,7 +39,7 @@ index 41bebd14fe3..99f47924ec2 100644 static unsigned long last_id = 0; diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index d41e8ea14a8..3af6b122926 100644 +index d41e8ea14..3af6b1229 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -24,6 +24,7 @@ @@ -102,7 +102,7 @@ index d41e8ea14a8..3af6b122926 100644 diff --git a/include/grub/loopback.h b/include/grub/loopback.h new file mode 100644 -index 00000000000..3b9a9e32e80 +index 000000000..3b9a9e32e --- /dev/null +++ b/include/grub/loopback.h @@ -0,0 +1,30 @@ diff --git a/0185-efinet-Add-DHCP-proxy-support.patch b/0183-efinet-Add-DHCP-proxy-support.patch similarity index 98% rename from 0185-efinet-Add-DHCP-proxy-support.patch rename to 0183-efinet-Add-DHCP-proxy-support.patch index dcaac6f..f1fb5cb 100644 --- a/0185-efinet-Add-DHCP-proxy-support.patch +++ b/0183-efinet-Add-DHCP-proxy-support.patch @@ -14,7 +14,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c -index e11d759f19a..1a24f38a21a 100644 +index e11d759f1..1a24f38a2 100644 --- a/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c @@ -850,10 +850,31 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device, diff --git a/0186-fs-ext2-Ignore-checksum-seed-incompat-feature.patch b/0184-fs-ext2-Ignore-checksum-seed-incompat-feature.patch similarity index 98% rename from 0186-fs-ext2-Ignore-checksum-seed-incompat-feature.patch rename to 0184-fs-ext2-Ignore-checksum-seed-incompat-feature.patch index b4a5fd4..8e3279a 100644 --- a/0186-fs-ext2-Ignore-checksum-seed-incompat-feature.patch +++ b/0184-fs-ext2-Ignore-checksum-seed-incompat-feature.patch @@ -23,7 +23,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c -index e7dd78e6635..731d346f886 100644 +index e7dd78e66..731d346f8 100644 --- a/grub-core/fs/ext2.c +++ b/grub-core/fs/ext2.c @@ -103,6 +103,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); diff --git a/0187-Don-t-update-the-cmdline-when-generating-legacy-menu.patch b/0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch similarity index 97% rename from 0187-Don-t-update-the-cmdline-when-generating-legacy-menu.patch rename to 0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch index c4ce251..ab236fc 100644 --- a/0187-Don-t-update-the-cmdline-when-generating-legacy-menu.patch +++ b/0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch @@ -20,7 +20,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 81f35a2f3f0..98fd9da6610 100644 +index 70d56518b..f8e868b6c 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -256,7 +256,9 @@ if [ -z "\${kernelopts}" ]; then diff --git a/0188-Suppress-gettext-error-message.patch b/0186-Suppress-gettext-error-message.patch similarity index 96% rename from 0188-Suppress-gettext-error-message.patch rename to 0186-Suppress-gettext-error-message.patch index c42dd0d..2ca0ce0 100644 --- a/0188-Suppress-gettext-error-message.patch +++ b/0186-Suppress-gettext-error-message.patch @@ -14,7 +14,7 @@ Signed-off-by: Paulo Flabiano Smorigo <pfsmorigo(a)br.ibm.com> 1 file changed, 7 insertions(+) diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c -index 4d02e62c109..7ec81ca0b48 100644 +index 4d02e62c1..7ec81ca0b 100644 --- a/grub-core/gettext/gettext.c +++ b/grub-core/gettext/gettext.c @@ -424,6 +424,13 @@ grub_gettext_init_ext (struct grub_gettext_context *ctx, diff --git a/0189-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch b/0187-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch similarity index 97% rename from 0189-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch rename to 0187-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch index 7ecea22..c83c532 100644 --- a/0189-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch +++ b/0187-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch @@ -15,7 +15,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/util/grub-set-password.in b/util/grub-set-password.in -index c0b5ebbfdc5..d8005e5a142 100644 +index c0b5ebbfd..d8005e5a1 100644 --- a/util/grub-set-password.in +++ b/util/grub-set-password.in @@ -1,11 +1,6 @@ diff --git a/0190-templates-Check-for-EFI-at-runtime-instead-of-config.patch b/0188-templates-Check-for-EFI-at-runtime-instead-of-config.patch similarity index 98% rename from 0190-templates-Check-for-EFI-at-runtime-instead-of-config.patch rename to 0188-templates-Check-for-EFI-at-runtime-instead-of-config.patch index e36afa1..79040b4 100644 --- a/0190-templates-Check-for-EFI-at-runtime-instead-of-config.patch +++ b/0188-templates-Check-for-EFI-at-runtime-instead-of-config.patch @@ -30,7 +30,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/util/grub.d/30_uefi-firmware.in b/util/grub.d/30_uefi-firmware.in -index d344d3883d7..b6041b55e2a 100644 +index d344d3883..b6041b55e 100644 --- a/util/grub.d/30_uefi-firmware.in +++ b/util/grub.d/30_uefi-firmware.in @@ -26,19 +26,14 @@ export TEXTDOMAINDIR="@localedir@" diff --git a/0191-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch b/0189-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch similarity index 98% rename from 0191-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch rename to 0189-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch index 65b4aec..81ac3e9 100644 --- a/0191-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch +++ b/0189-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch @@ -21,7 +21,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/grub-core/commands/efi/efifwsetup.c b/grub-core/commands/efi/efifwsetup.c -index eaca0328388..328c45e82e0 100644 +index eaca03283..328c45e82 100644 --- a/grub-core/commands/efi/efifwsetup.c +++ b/grub-core/commands/efi/efifwsetup.c @@ -27,6 +27,25 @@ diff --git a/0192-arm64-Fix-EFI-loader-kernel-image-allocation.patch b/0190-arm64-Fix-EFI-loader-kernel-image-allocation.patch similarity index 98% rename from 0192-arm64-Fix-EFI-loader-kernel-image-allocation.patch rename to 0190-arm64-Fix-EFI-loader-kernel-image-allocation.patch index 0472a42..a206b72 100644 --- a/0192-arm64-Fix-EFI-loader-kernel-image-allocation.patch +++ b/0190-arm64-Fix-EFI-loader-kernel-image-allocation.patch @@ -24,7 +24,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 3 files changed, 68 insertions(+), 34 deletions(-) diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c -index 47f8cf0d84b..f18d90bd749 100644 +index 47f8cf0d8..f18d90bd7 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -41,6 +41,8 @@ GRUB_MOD_LICENSE ("GPLv3+"); @@ -193,7 +193,7 @@ index 47f8cf0d84b..f18d90bd749 100644 return grub_errno; } diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h -index b582f67f661..966a5074f53 100644 +index b582f67f6..966a5074f 100644 --- a/include/grub/arm/linux.h +++ b/include/grub/arm/linux.h @@ -44,6 +44,7 @@ struct grub_arm_linux_pe_header @@ -205,7 +205,7 @@ index b582f67f661..966a5074f53 100644 # define grub_armxx_linux_pe_header grub_arm_linux_pe_header #endif diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h -index ea030312df3..422bf2bf24b 100644 +index ea030312d..422bf2bf2 100644 --- a/include/grub/arm64/linux.h +++ b/include/grub/arm64/linux.h @@ -48,6 +48,7 @@ struct grub_arm64_linux_pe_header diff --git a/0193-normal-main-Discover-the-device-to-read-the-config-f.patch b/0191-normal-main-Discover-the-device-to-read-the-config-f.patch similarity index 98% rename from 0193-normal-main-Discover-the-device-to-read-the-config-f.patch rename to 0191-normal-main-Discover-the-device-to-read-the-config-f.patch index 8009038..5cf3cb2 100644 --- a/0193-normal-main-Discover-the-device-to-read-the-config-f.patch +++ b/0191-normal-main-Discover-the-device-to-read-the-config-f.patch @@ -26,7 +26,7 @@ Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> 1 file changed, 51 insertions(+), 7 deletions(-) diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index 4ebdbd228d4..b72fe3d653c 100644 +index 4ebdbd228..b72fe3d65 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -337,18 +337,13 @@ grub_enter_normal_mode (const char *config) diff --git a/0194-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch b/0192-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch similarity index 98% rename from 0194-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch rename to 0192-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch index 7f3161e..b03e3d3 100644 --- a/0194-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch +++ b/0192-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch @@ -25,7 +25,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c -index b573be6650d..3fc34014726 100644 +index b573be665..3fc340147 100644 --- a/grub-core/kern/main.c +++ b/grub-core/kern/main.c @@ -216,13 +216,52 @@ grub_set_prefix_and_root (void) diff --git a/0195-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch b/0193-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch similarity index 99% rename from 0195-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch rename to 0193-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch index 893d8b4..fbb0ee7 100644 --- a/0195-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch +++ b/0193-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch @@ -81,7 +81,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper(a)oracle.com> 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c -index 0f524c3a8a6..e3816d1ec4a 100644 +index 0f524c3a8..e3816d1ec 100644 --- a/grub-core/fs/xfs.c +++ b/grub-core/fs/xfs.c @@ -192,6 +192,11 @@ struct grub_xfs_time_legacy diff --git a/0196-Print-module-name-on-license-check-failure.patch b/0194-Print-module-name-on-license-check-failure.patch similarity index 98% rename from 0196-Print-module-name-on-license-check-failure.patch rename to 0194-Print-module-name-on-license-check-failure.patch index c4b9a13..f6c6041 100644 --- a/0196-Print-module-name-on-license-check-failure.patch +++ b/0194-Print-module-name-on-license-check-failure.patch @@ -13,7 +13,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c -index 9557254035e..f3044945742 100644 +index 955725403..f30449457 100644 --- a/grub-core/kern/dl.c +++ b/grub-core/kern/dl.c @@ -528,14 +528,16 @@ grub_dl_find_section_index (Elf_Ehdr *e, const char *name) diff --git a/0197-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch b/0195-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch similarity index 98% rename from 0197-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch rename to 0195-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch index a80727e..121ed5b 100644 --- a/0197-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch +++ b/0195-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch @@ -79,7 +79,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 3f3459b2c70..6b00eb55575 100644 +index 3f3459b2c..6b00eb555 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -89,7 +89,7 @@ kernel = { @@ -92,7 +92,7 @@ index 3f3459b2c70..6b00eb55575 100644 mips_arc_ldflags = '-Wl,-Ttext,$(TARGET_LINK_ADDR)'; mips_qemu_mips_ldflags = '-Wl,-Ttext,0x80200000'; diff --git a/include/grub/offsets.h b/include/grub/offsets.h -index 871e1cd4c38..69211aa798b 100644 +index 871e1cd4c..69211aa79 100644 --- a/include/grub/offsets.h +++ b/include/grub/offsets.h @@ -63,7 +63,7 @@ diff --git a/0198-grub-mkconfig-restore-umask-for-grub.cfg.patch b/0196-grub-mkconfig-restore-umask-for-grub.cfg.patch similarity index 97% rename from 0198-grub-mkconfig-restore-umask-for-grub.cfg.patch rename to 0196-grub-mkconfig-restore-umask-for-grub.cfg.patch index 7c7bee0..f4936a7 100644 --- a/0198-grub-mkconfig-restore-umask-for-grub.cfg.patch +++ b/0196-grub-mkconfig-restore-umask-for-grub.cfg.patch @@ -25,7 +25,7 @@ Signed-off-by: Michael Chang <mchang(a)suse.com> 1 file changed, 2 insertions(+) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index f55339a3f64..520a672cd2c 100644 +index f55339a3f..520a672cd 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -311,7 +311,9 @@ and /etc/grub.d/* files or please file a bug report with diff --git a/0199-fs-btrfs-Use-full-btrfs-bootloader-area.patch b/0197-fs-btrfs-Use-full-btrfs-bootloader-area.patch similarity index 98% rename from 0199-fs-btrfs-Use-full-btrfs-bootloader-area.patch rename to 0197-fs-btrfs-Use-full-btrfs-bootloader-area.patch index ecfc58c..81b7e1c 100644 --- a/0199-fs-btrfs-Use-full-btrfs-bootloader-area.patch +++ b/0197-fs-btrfs-Use-full-btrfs-bootloader-area.patch @@ -32,7 +32,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper(a)oracle.com> 2 files changed, 79 insertions(+), 13 deletions(-) diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index 4cc86e9b79e..07c0ff874b8 100644 +index 4cc86e9b7..07c0ff874 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -2476,6 +2476,33 @@ grub_btrfs_label (grub_device_t device, char **label) @@ -146,7 +146,7 @@ index 4cc86e9b79e..07c0ff874b8 100644 return GRUB_ERR_NONE; } diff --git a/include/grub/disk.h b/include/grub/disk.h -index f95aca929a6..06210a70492 100644 +index f95aca929..06210a704 100644 --- a/include/grub/disk.h +++ b/include/grub/disk.h @@ -182,6 +182,8 @@ typedef struct grub_disk_memberlist *grub_disk_memberlist_t; diff --git a/0200-Add-Fedora-location-of-DejaVu-SANS-font.patch b/0198-Add-Fedora-location-of-DejaVu-SANS-font.patch similarity index 95% rename from 0200-Add-Fedora-location-of-DejaVu-SANS-font.patch rename to 0198-Add-Fedora-location-of-DejaVu-SANS-font.patch index eb76649..ba84f9c 100644 --- a/0200-Add-Fedora-location-of-DejaVu-SANS-font.patch +++ b/0198-Add-Fedora-location-of-DejaVu-SANS-font.patch @@ -16,10 +16,10 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 3c808a72230..3527f069ab2 100644 +index f069d8403..88e33e0f0 100644 --- a/configure.ac +++ b/configure.ac -@@ -1812,7 +1812,7 @@ fi +@@ -1785,7 +1785,7 @@ fi if test x"$starfield_excuse" = x; then for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do diff --git a/0201-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch b/0199-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch similarity index 98% rename from 0201-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch rename to 0199-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch index 531c4f5..3073238 100644 --- a/0201-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch +++ b/0199-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch @@ -18,7 +18,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c -index ec0c92bade0..c8516a5a080 100644 +index ec0c92bad..c8516a5a0 100644 --- a/grub-core/normal/menu.c +++ b/grub-core/normal/menu.c @@ -606,13 +606,15 @@ print_countdown (struct grub_term_coordinate *pos, int n) diff --git a/0202-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch b/0200-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch similarity index 97% rename from 0202-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch rename to 0200-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch index 8f34b74..de29340 100644 --- a/0202-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch +++ b/0200-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch @@ -22,7 +22,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> 1 file changed, 3 insertions(+) diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c -index 3fc34014726..993b8a8598e 100644 +index 3fc340147..993b8a859 100644 --- a/grub-core/kern/main.c +++ b/grub-core/kern/main.c @@ -317,10 +317,13 @@ grub_main (void) diff --git a/0203-EFI-console-Do-not-set-colorstate-until-the-first-te.patch b/0201-EFI-console-Do-not-set-colorstate-until-the-first-te.patch similarity index 97% rename from 0203-EFI-console-Do-not-set-colorstate-until-the-first-te.patch rename to 0201-EFI-console-Do-not-set-colorstate-until-the-first-te.patch index cb430c0..1007041 100644 --- a/0203-EFI-console-Do-not-set-colorstate-until-the-first-te.patch +++ b/0201-EFI-console-Do-not-set-colorstate-until-the-first-te.patch @@ -29,7 +29,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> 1 file changed, 10 insertions(+) diff --git a/grub-core/term/efi/console.c b/grub-core/term/efi/console.c -index 2f1ae85ba7d..c44b2ac318c 100644 +index 2f1ae85ba..c44b2ac31 100644 --- a/grub-core/term/efi/console.c +++ b/grub-core/term/efi/console.c @@ -82,6 +82,16 @@ grub_console_setcolorstate (struct grub_term_output *term diff --git a/0204-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch b/0202-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch similarity index 98% rename from 0204-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch rename to 0202-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch index e33d1f3..c867451 100644 --- a/0204-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch +++ b/0202-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch @@ -25,7 +25,7 @@ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/grub-core/term/efi/console.c b/grub-core/term/efi/console.c -index c44b2ac318c..a3622e4fe5f 100644 +index c44b2ac31..a3622e4fe 100644 --- a/grub-core/term/efi/console.c +++ b/grub-core/term/efi/console.c @@ -31,7 +31,15 @@ typedef enum { diff --git a/0205-Use-visual-indentation-in-config.h.in.patch b/0203-Use-visual-indentation-in-config.h.in.patch similarity index 98% rename from 0205-Use-visual-indentation-in-config.h.in.patch rename to 0203-Use-visual-indentation-in-config.h.in.patch index 1acc333..8881845 100644 --- a/0205-Use-visual-indentation-in-config.h.in.patch +++ b/0203-Use-visual-indentation-in-config.h.in.patch @@ -11,7 +11,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/config.h.in b/config.h.in -index c80e3e0aba3..f2ed0066ec0 100644 +index c80e3e0ab..f2ed0066e 100644 --- a/config.h.in +++ b/config.h.in @@ -23,47 +23,47 @@ diff --git a/0206-Where-present-ensure-config-util.h-precedes-config.h.patch b/0204-Where-present-ensure-config-util.h-precedes-config.h.patch similarity index 91% rename from 0206-Where-present-ensure-config-util.h-precedes-config.h.patch rename to 0204-Where-present-ensure-config-util.h-precedes-config.h.patch index 351d50f..0bfb00e 100644 --- a/0206-Where-present-ensure-config-util.h-precedes-config.h.patch +++ b/0204-Where-present-ensure-config-util.h-precedes-config.h.patch @@ -31,7 +31,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/grub-core/disk/host.c b/grub-core/disk/host.c -index c151d225df7..f34529f86ae 100644 +index c151d225d..f34529f86 100644 --- a/grub-core/disk/host.c +++ b/grub-core/disk/host.c @@ -20,8 +20,8 @@ @@ -45,7 +45,7 @@ index c151d225df7..f34529f86ae 100644 #include <grub/dl.h> #include <grub/disk.h> diff --git a/grub-core/kern/emu/argp_common.c b/grub-core/kern/emu/argp_common.c -index 16688587037..8cb4608c3df 100644 +index 166885870..8cb4608c3 100644 --- a/grub-core/kern/emu/argp_common.c +++ b/grub-core/kern/emu/argp_common.c @@ -17,8 +17,8 @@ @@ -59,7 +59,7 @@ index 16688587037..8cb4608c3df 100644 #pragma GCC diagnostic ignored "-Wmissing-prototypes" #pragma GCC diagnostic ignored "-Wmissing-declarations" diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c -index 846fe9715ec..3e7929cc4af 100644 +index 846fe9715..3e7929cc4 100644 --- a/grub-core/kern/emu/main.c +++ b/grub-core/kern/emu/main.c @@ -16,8 +16,8 @@ @@ -73,7 +73,7 @@ index 846fe9715ec..3e7929cc4af 100644 #include <time.h> #include <stdio.h> diff --git a/grub-core/osdep/aros/config.c b/grub-core/osdep/aros/config.c -index c82d0ea8e76..55f5728efca 100644 +index c82d0ea8e..55f5728ef 100644 --- a/grub-core/osdep/aros/config.c +++ b/grub-core/osdep/aros/config.c @@ -16,8 +16,8 @@ @@ -87,7 +87,7 @@ index c82d0ea8e76..55f5728efca 100644 #include <grub/emu/hostdisk.h> #include <grub/emu/exec.h> diff --git a/grub-core/osdep/basic/emunet.c b/grub-core/osdep/basic/emunet.c -index 6362e5cfbb3..dbfd316d613 100644 +index 6362e5cfb..dbfd316d6 100644 --- a/grub-core/osdep/basic/emunet.c +++ b/grub-core/osdep/basic/emunet.c @@ -16,8 +16,8 @@ @@ -101,7 +101,7 @@ index 6362e5cfbb3..dbfd316d613 100644 #include <grub/i18n.h> #include <grub/emu/net.h> diff --git a/grub-core/osdep/basic/init.c b/grub-core/osdep/basic/init.c -index c54c710dbcb..b104c7e162b 100644 +index c54c710db..b104c7e16 100644 --- a/grub-core/osdep/basic/init.c +++ b/grub-core/osdep/basic/init.c @@ -16,8 +16,8 @@ @@ -115,7 +115,7 @@ index c54c710dbcb..b104c7e162b 100644 #include <grub/util/misc.h> #include <grub/i18n.h> diff --git a/grub-core/osdep/haiku/getroot.c b/grub-core/osdep/haiku/getroot.c -index 4e123c0903a..927a1ebc941 100644 +index 4e123c090..927a1ebc9 100644 --- a/grub-core/osdep/haiku/getroot.c +++ b/grub-core/osdep/haiku/getroot.c @@ -1,5 +1,5 @@ @@ -126,7 +126,7 @@ index 4e123c0903a..927a1ebc941 100644 #include <sys/stat.h> #include <string.h> diff --git a/grub-core/osdep/linux/emunet.c b/grub-core/osdep/linux/emunet.c -index 19b188f09ee..d5a6417355f 100644 +index 19b188f09..d5a641735 100644 --- a/grub-core/osdep/linux/emunet.c +++ b/grub-core/osdep/linux/emunet.c @@ -16,8 +16,8 @@ @@ -140,7 +140,7 @@ index 19b188f09ee..d5a6417355f 100644 #include <sys/socket.h> #include <sys/types.h> diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c -index 46a881530c0..0ce0e309ac0 100644 +index 46a881530..0ce0e309a 100644 --- a/grub-core/osdep/unix/config.c +++ b/grub-core/osdep/unix/config.c @@ -16,8 +16,8 @@ @@ -154,7 +154,7 @@ index 46a881530c0..0ce0e309ac0 100644 #include <grub/emu/hostdisk.h> #include <grub/emu/exec.h> diff --git a/grub-core/osdep/unix/cputime.c b/grub-core/osdep/unix/cputime.c -index cff359a3b94..fb6ff55a1a7 100644 +index cff359a3b..fb6ff55a1 100644 --- a/grub-core/osdep/unix/cputime.c +++ b/grub-core/osdep/unix/cputime.c @@ -1,5 +1,5 @@ @@ -165,7 +165,7 @@ index cff359a3b94..fb6ff55a1a7 100644 #include <sys/times.h> #include <unistd.h> diff --git a/grub-core/osdep/unix/dl.c b/grub-core/osdep/unix/dl.c -index 562b101a280..99b189bc1c9 100644 +index 562b101a2..99b189bc1 100644 --- a/grub-core/osdep/unix/dl.c +++ b/grub-core/osdep/unix/dl.c @@ -16,8 +16,8 @@ @@ -179,7 +179,7 @@ index 562b101a280..99b189bc1c9 100644 #include <grub/dl.h> #include <grub/misc.h> diff --git a/grub-core/osdep/unix/emuconsole.c b/grub-core/osdep/unix/emuconsole.c -index 7308798efe9..cac159424d8 100644 +index 7308798ef..cac159424 100644 --- a/grub-core/osdep/unix/emuconsole.c +++ b/grub-core/osdep/unix/emuconsole.c @@ -17,8 +17,8 @@ @@ -193,7 +193,7 @@ index 7308798efe9..cac159424d8 100644 #include <grub/term.h> #include <grub/types.h> diff --git a/grub-core/osdep/unix/getroot.c b/grub-core/osdep/unix/getroot.c -index 46d7116c6e6..4f436284ce0 100644 +index 46d7116c6..4f436284c 100644 --- a/grub-core/osdep/unix/getroot.c +++ b/grub-core/osdep/unix/getroot.c @@ -16,8 +16,8 @@ @@ -207,7 +207,7 @@ index 46d7116c6e6..4f436284ce0 100644 #include <sys/stat.h> #include <sys/types.h> diff --git a/grub-core/osdep/windows/config.c b/grub-core/osdep/windows/config.c -index 928ab1a49be..2bb8a2fd88e 100644 +index 928ab1a49..2bb8a2fd8 100644 --- a/grub-core/osdep/windows/config.c +++ b/grub-core/osdep/windows/config.c @@ -16,8 +16,8 @@ @@ -221,7 +221,7 @@ index 928ab1a49be..2bb8a2fd88e 100644 #include <grub/emu/hostfile.h> #include <grub/emu/config.h> diff --git a/grub-core/osdep/windows/cputime.c b/grub-core/osdep/windows/cputime.c -index 3568aa2d359..5d06d79dd53 100644 +index 3568aa2d3..5d06d79dd 100644 --- a/grub-core/osdep/windows/cputime.c +++ b/grub-core/osdep/windows/cputime.c @@ -1,5 +1,5 @@ @@ -232,7 +232,7 @@ index 3568aa2d359..5d06d79dd53 100644 #include <grub/emu/misc.h> #include <windows.h> diff --git a/grub-core/osdep/windows/dl.c b/grub-core/osdep/windows/dl.c -index eec6a24ad7f..8eab7057e4d 100644 +index eec6a24ad..8eab7057e 100644 --- a/grub-core/osdep/windows/dl.c +++ b/grub-core/osdep/windows/dl.c @@ -16,8 +16,8 @@ @@ -246,7 +246,7 @@ index eec6a24ad7f..8eab7057e4d 100644 #include <grub/dl.h> #include <grub/misc.h> diff --git a/grub-core/osdep/windows/emuconsole.c b/grub-core/osdep/windows/emuconsole.c -index 4fb3693cc01..17a44de4690 100644 +index 4fb3693cc..17a44de46 100644 --- a/grub-core/osdep/windows/emuconsole.c +++ b/grub-core/osdep/windows/emuconsole.c @@ -16,8 +16,8 @@ @@ -260,7 +260,7 @@ index 4fb3693cc01..17a44de4690 100644 #include <grub/term.h> #include <grub/misc.h> diff --git a/grub-core/osdep/windows/init.c b/grub-core/osdep/windows/init.c -index 6297de6326a..51a9647dde4 100644 +index 6297de632..51a9647dd 100644 --- a/grub-core/osdep/windows/init.c +++ b/grub-core/osdep/windows/init.c @@ -16,8 +16,8 @@ diff --git a/0207-Drop-gnulib-fix-base64.patch.patch b/0205-Drop-gnulib-fix-base64.patch.patch similarity index 94% rename from 0207-Drop-gnulib-fix-base64.patch.patch rename to 0205-Drop-gnulib-fix-base64.patch.patch index 1d26c57..9815550 100644 --- a/0207-Drop-gnulib-fix-base64.patch.patch +++ b/0205-Drop-gnulib-fix-base64.patch.patch @@ -31,7 +31,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> delete mode 100644 grub-core/lib/gnulib-patches/fix-base64.patch diff --git a/grub-core/lib/posix_wrap/sys/types.h b/grub-core/lib/posix_wrap/sys/types.h -index f63412c8da0..2f3e865495a 100644 +index f63412c8d..2f3e86549 100644 --- a/grub-core/lib/posix_wrap/sys/types.h +++ b/grub-core/lib/posix_wrap/sys/types.h @@ -23,11 +23,10 @@ @@ -50,7 +50,7 @@ index f63412c8da0..2f3e865495a 100644 typedef grub_uint8_t uint8_t; typedef grub_uint16_t uint16_t; diff --git a/grub-core/lib/xzembed/xz.h b/grub-core/lib/xzembed/xz.h -index f7b32d80032..d1417039aa4 100644 +index f7b32d800..d1417039a 100644 --- a/grub-core/lib/xzembed/xz.h +++ b/grub-core/lib/xzembed/xz.h @@ -29,10 +29,7 @@ @@ -66,7 +66,7 @@ index f7b32d80032..d1417039aa4 100644 /** * enum xz_ret - Return codes diff --git a/bootstrap.conf b/bootstrap.conf -index 52d4af44bec..645e3a459ce 100644 +index 52d4af44b..645e3a459 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -35,6 +35,7 @@ gnulib_modules=" @@ -87,10 +87,10 @@ index 52d4af44bec..645e3a459ce 100644 patch -d grub-core/lib/gnulib -p2 \ < "grub-core/lib/gnulib-patches/$patchname.patch" diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist -index ea58362b555..ca6a50deca9 100644 +index ad235de7f..f4791dc6c 100644 --- a/conf/Makefile.extra-dist +++ b/conf/Makefile.extra-dist -@@ -30,7 +30,6 @@ EXTRA_DIST += grub-core/gensymlist.sh +@@ -31,7 +31,6 @@ EXTRA_DIST += grub-core/gensymlist.sh EXTRA_DIST += grub-core/genemuinit.sh EXTRA_DIST += grub-core/genemuinitheader.sh @@ -99,7 +99,7 @@ index ea58362b555..ca6a50deca9 100644 EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-state-deref.patch EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch diff --git a/config.h.in b/config.h.in -index f2ed0066ec0..9c7b4afaaad 100644 +index f2ed0066e..9c7b4afaa 100644 --- a/config.h.in +++ b/config.h.in @@ -66,4 +66,8 @@ @@ -113,7 +113,7 @@ index f2ed0066ec0..9c7b4afaaad 100644 #endif diff --git a/grub-core/lib/gnulib-patches/fix-base64.patch b/grub-core/lib/gnulib-patches/fix-base64.patch deleted file mode 100644 -index 985db127971..00000000000 +index 985db1279..000000000 --- a/grub-core/lib/gnulib-patches/fix-base64.patch +++ /dev/null @@ -1,21 +0,0 @@ diff --git a/0208-Drop-gnulib-no-abort.patch.patch b/0206-Drop-gnulib-no-abort.patch.patch similarity index 94% rename from 0208-Drop-gnulib-no-abort.patch.patch rename to 0206-Drop-gnulib-no-abort.patch.patch index 79bcb03..a1a067a 100644 --- a/0208-Drop-gnulib-no-abort.patch.patch +++ b/0206-Drop-gnulib-no-abort.patch.patch @@ -25,7 +25,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> delete mode 100644 grub-core/lib/gnulib-patches/no-abort.patch diff --git a/bootstrap.conf b/bootstrap.conf -index 645e3a459ce..71ce943c7d4 100644 +index 645e3a459..71ce943c7 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -81,7 +81,7 @@ cp -a INSTALL INSTALL.grub @@ -38,10 +38,10 @@ index 645e3a459ce..71ce943c7d4 100644 < "grub-core/lib/gnulib-patches/$patchname.patch" done diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist -index ca6a50deca9..16248ccf032 100644 +index f4791dc6c..5eef70833 100644 --- a/conf/Makefile.extra-dist +++ b/conf/Makefile.extra-dist -@@ -37,7 +37,6 @@ EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch +@@ -38,7 +38,6 @@ EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch EXTRA_DIST += grub-core/lib/gnulib-patches/fix-uninit-structure.patch EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch EXTRA_DIST += grub-core/lib/gnulib-patches/fix-width.patch @@ -50,7 +50,7 @@ index ca6a50deca9..16248ccf032 100644 EXTRA_DIST += grub-core/lib/libgcrypt EXTRA_DIST += grub-core/lib/libgcrypt-grub/mpi/generic diff --git a/config.h.in b/config.h.in -index 9c7b4afaaad..c3134309c63 100644 +index 9c7b4afaa..c3134309c 100644 --- a/config.h.in +++ b/config.h.in @@ -68,6 +68,9 @@ @@ -65,7 +65,7 @@ index 9c7b4afaaad..c3134309c63 100644 #endif diff --git a/grub-core/lib/gnulib-patches/no-abort.patch b/grub-core/lib/gnulib-patches/no-abort.patch deleted file mode 100644 -index e469c4762eb..00000000000 +index e469c4762..000000000 --- a/grub-core/lib/gnulib-patches/no-abort.patch +++ /dev/null @@ -1,26 +0,0 @@ diff --git a/0209-Update-gnulib-version-and-drop-most-gnulib-patches.patch b/0207-Update-gnulib-version-and-drop-most-gnulib-patches.patch similarity index 97% rename from 0209-Update-gnulib-version-and-drop-most-gnulib-patches.patch rename to 0207-Update-gnulib-version-and-drop-most-gnulib-patches.patch index 4b5a44c..fd44c8f 100644 --- a/0209-Update-gnulib-version-and-drop-most-gnulib-patches.patch +++ b/0207-Update-gnulib-version-and-drop-most-gnulib-patches.patch @@ -48,7 +48,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> delete mode 100644 grub-core/lib/gnulib-patches/fix-unused-value.patch diff --git a/configure.ac b/configure.ac -index 3527f069ab2..d04c94691ef 100644 +index 88e33e0f0..871235b91 100644 --- a/configure.ac +++ b/configure.ac @@ -49,7 +49,7 @@ AC_CANONICAL_TARGET @@ -61,7 +61,7 @@ index 3527f069ab2..d04c94691ef 100644 AC_CONFIG_HEADER([config-util.h]) diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 6b00eb55575..39233096f29 100644 +index 6b00eb555..39233096f 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -762,6 +762,9 @@ module = { @@ -75,7 +75,7 @@ index 6b00eb55575..39233096f29 100644 cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)'; cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)'; diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c -index 371a53b837d..c917a5f91e7 100644 +index 371a53b83..c917a5f91 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -389,7 +389,7 @@ luks2_verify_key (grub_luks2_digest_t *d, grub_uint8_t *candidate_key, @@ -97,7 +97,7 @@ index 371a53b837d..c917a5f91e7 100644 const gcry_md_spec_t *hash; gcry_err_code_t gcry_ret; diff --git a/grub-core/lib/posix_wrap/limits.h b/grub-core/lib/posix_wrap/limits.h -index 591dbf3289d..4be7b408063 100644 +index 591dbf328..4be7b4080 100644 --- a/grub-core/lib/posix_wrap/limits.h +++ b/grub-core/lib/posix_wrap/limits.h @@ -25,7 +25,11 @@ @@ -114,7 +114,7 @@ index 591dbf3289d..4be7b408063 100644 #define SCHAR_MIN GRUB_SCHAR_MIN #define SCHAR_MAX GRUB_SCHAR_MAX diff --git a/include/grub/compiler.h b/include/grub/compiler.h -index ebafec68957..441a9eca07c 100644 +index ebafec689..441a9eca0 100644 --- a/include/grub/compiler.h +++ b/include/grub/compiler.h @@ -30,10 +30,10 @@ @@ -131,7 +131,7 @@ index ebafec68957..441a9eca07c 100644 #if GNUC_PREREQ(4,4) diff --git a/include/grub/list.h b/include/grub/list.h -index b13acb96243..21f4b4b44a1 100644 +index b13acb962..21f4b4b44 100644 --- a/include/grub/list.h +++ b/include/grub/list.h @@ -40,7 +40,7 @@ void EXPORT_FUNC(grub_list_remove) (grub_list_t item); @@ -144,7 +144,7 @@ index b13acb96243..21f4b4b44a1 100644 static inline void * grub_bad_type_cast_real (int line, const char *file) diff --git a/INSTALL b/INSTALL -index 79a0af7d937..ee9f536f760 100644 +index 79a0af7d9..ee9f536f7 100644 --- a/INSTALL +++ b/INSTALL @@ -42,7 +42,7 @@ If you use a development snapshot or want to hack on GRUB you may @@ -157,7 +157,7 @@ index 79a0af7d937..ee9f536f760 100644 Prerequisites for make-check: diff --git a/bootstrap b/bootstrap -index 5b08e7e2d42..dc2238f4adf 100755 +index 5b08e7e2d..dc2238f4a 100755 --- a/bootstrap +++ b/bootstrap @@ -1,10 +1,10 @@ @@ -563,7 +563,7 @@ index 5b08e7e2d42..dc2238f4adf 100755 # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" diff --git a/bootstrap.conf b/bootstrap.conf -index 71ce943c7d4..e4e5f3750ad 100644 +index 71ce943c7..e4e5f3750 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -1,6 +1,6 @@ @@ -618,10 +618,10 @@ index 71ce943c7d4..e4e5f3750ad 100644 0001-Support-POTFILES-shell \ 0002-Handle-gettext_printf-shell-function \ diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist -index 16248ccf032..5b9fda752b6 100644 +index 5eef70833..26ac8765e 100644 --- a/conf/Makefile.extra-dist +++ b/conf/Makefile.extra-dist -@@ -30,12 +30,6 @@ EXTRA_DIST += grub-core/gensymlist.sh +@@ -31,12 +31,6 @@ EXTRA_DIST += grub-core/gensymlist.sh EXTRA_DIST += grub-core/genemuinit.sh EXTRA_DIST += grub-core/genemuinitheader.sh @@ -635,7 +635,7 @@ index 16248ccf032..5b9fda752b6 100644 EXTRA_DIST += grub-core/lib/libgcrypt diff --git a/config.h.in b/config.h.in -index c3134309c63..512d1bbe138 100644 +index c3134309c..512d1bbe1 100644 --- a/config.h.in +++ b/config.h.in @@ -67,10 +67,78 @@ @@ -719,7 +719,7 @@ index c3134309c63..512d1bbe138 100644 #endif diff --git a/grub-core/lib/gnulib-patches/fix-null-deref.patch b/grub-core/lib/gnulib-patches/fix-null-deref.patch deleted file mode 100644 -index 8fafa153a47..00000000000 +index 8fafa153a..000000000 --- a/grub-core/lib/gnulib-patches/fix-null-deref.patch +++ /dev/null @@ -1,13 +0,0 @@ @@ -738,7 +738,7 @@ index 8fafa153a47..00000000000 - struct parser *parser = state->pstate; diff --git a/grub-core/lib/gnulib-patches/fix-null-state-deref.patch b/grub-core/lib/gnulib-patches/fix-null-state-deref.patch deleted file mode 100644 -index 813ec09c8a1..00000000000 +index 813ec09c8..000000000 --- a/grub-core/lib/gnulib-patches/fix-null-state-deref.patch +++ /dev/null @@ -1,12 +0,0 @@ @@ -756,7 +756,7 @@ index 813ec09c8a1..00000000000 - "rmargin", up->name); diff --git a/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch b/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch deleted file mode 100644 -index 02e06315dff..00000000000 +index 02e06315d..000000000 --- a/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch +++ /dev/null @@ -1,15 +0,0 @@ @@ -777,7 +777,7 @@ index 02e06315dff..00000000000 - diff --git a/grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch b/grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch deleted file mode 100644 -index db6dac9c9e3..00000000000 +index db6dac9c9..000000000 --- a/grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch +++ /dev/null @@ -1,12 +0,0 @@ @@ -795,7 +795,7 @@ index db6dac9c9e3..00000000000 - || (next_state_log_idx >= mctx->input.valid_len diff --git a/grub-core/lib/gnulib-patches/fix-uninit-structure.patch b/grub-core/lib/gnulib-patches/fix-uninit-structure.patch deleted file mode 100644 -index 7b4d9f67af4..00000000000 +index 7b4d9f67a..000000000 --- a/grub-core/lib/gnulib-patches/fix-uninit-structure.patch +++ /dev/null @@ -1,11 +0,0 @@ @@ -812,7 +812,7 @@ index 7b4d9f67af4..00000000000 - sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1); diff --git a/grub-core/lib/gnulib-patches/fix-unused-value.patch b/grub-core/lib/gnulib-patches/fix-unused-value.patch deleted file mode 100644 -index ba51f1bf223..00000000000 +index ba51f1bf2..000000000 --- a/grub-core/lib/gnulib-patches/fix-unused-value.patch +++ /dev/null @@ -1,14 +0,0 @@ diff --git a/0210-commands-search-Fix-bug-stopping-iteration-when-no-f.patch b/0208-commands-search-Fix-bug-stopping-iteration-when-no-f.patch similarity index 97% rename from 0210-commands-search-Fix-bug-stopping-iteration-when-no-f.patch rename to 0208-commands-search-Fix-bug-stopping-iteration-when-no-f.patch index 388d323..461a1b8 100644 --- a/0210-commands-search-Fix-bug-stopping-iteration-when-no-f.patch +++ b/0208-commands-search-Fix-bug-stopping-iteration-when-no-f.patch @@ -19,7 +19,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c -index ed090b3af8b..51656e361cc 100644 +index ed090b3af..51656e361 100644 --- a/grub-core/commands/search.c +++ b/grub-core/commands/search.c @@ -64,7 +64,7 @@ iterate_device (const char *name, void *data) diff --git a/0211-search-new-efidisk-only-option-on-EFI-systems.patch b/0209-search-new-efidisk-only-option-on-EFI-systems.patch similarity index 98% rename from 0211-search-new-efidisk-only-option-on-EFI-systems.patch rename to 0209-search-new-efidisk-only-option-on-EFI-systems.patch index 20ee979..02e2412 100644 --- a/0211-search-new-efidisk-only-option-on-EFI-systems.patch +++ b/0209-search-new-efidisk-only-option-on-EFI-systems.patch @@ -26,7 +26,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> 3 files changed, 47 insertions(+), 13 deletions(-) diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c -index 51656e361cc..57d26ced8a8 100644 +index 51656e361..57d26ced8 100644 --- a/grub-core/commands/search.c +++ b/grub-core/commands/search.c @@ -47,7 +47,7 @@ struct search_ctx @@ -86,7 +86,7 @@ index 51656e361cc..57d26ced8a8 100644 .nhints = nhints, .count = 0, diff --git a/grub-core/commands/search_wrap.c b/grub-core/commands/search_wrap.c -index 47fc8eb9966..0b62acf8535 100644 +index 47fc8eb99..0b62acf85 100644 --- a/grub-core/commands/search_wrap.c +++ b/grub-core/commands/search_wrap.c @@ -40,6 +40,7 @@ static const struct grub_arg_option options[] = @@ -139,7 +139,7 @@ index 47fc8eb9966..0b62acf8535 100644 grub_error (GRUB_ERR_INVALID_COMMAND, "unspecified search type"); diff --git a/include/grub/search.h b/include/grub/search.h -index d80347df34b..4190aeb2cbf 100644 +index d80347df3..4190aeb2c 100644 --- a/include/grub/search.h +++ b/include/grub/search.h @@ -19,11 +19,20 @@ diff --git a/0212-efi-new-connectefi-command.patch b/0210-efi-new-connectefi-command.patch similarity index 97% rename from 0212-efi-new-connectefi-command.patch rename to 0210-efi-new-connectefi-command.patch index a9d860b..524412c 100644 --- a/0212-efi-new-connectefi-command.patch +++ b/0210-efi-new-connectefi-command.patch @@ -64,7 +64,7 @@ Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> create mode 100644 grub-core/commands/efi/connectefi.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 39233096f29..3c0ac3b7bd0 100644 +index 39233096f..3c0ac3b7b 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -836,6 +836,12 @@ module = { @@ -82,7 +82,7 @@ index 39233096f29..3c0ac3b7bd0 100644 common = commands/blocklist.c; diff --git a/grub-core/commands/efi/connectefi.c b/grub-core/commands/efi/connectefi.c new file mode 100644 -index 00000000000..8ab75bd51be +index 000000000..8ab75bd51 --- /dev/null +++ b/grub-core/commands/efi/connectefi.c @@ -0,0 +1,205 @@ @@ -292,7 +292,7 @@ index 00000000000..8ab75bd51be + grub_unregister_command (cmd); +} diff --git a/grub-core/commands/efi/lsefi.c b/grub-core/commands/efi/lsefi.c -index d1ce99af438..f2d2430e666 100644 +index d1ce99af4..f2d2430e6 100644 --- a/grub-core/commands/efi/lsefi.c +++ b/grub-core/commands/efi/lsefi.c @@ -19,6 +19,7 @@ @@ -304,7 +304,7 @@ index d1ce99af438..f2d2430e666 100644 #include <grub/efi/pci.h> #include <grub/efi/efi.h> diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c -index fe8ba6e6c93..062143dfffd 100644 +index fe8ba6e6c..062143dff 100644 --- a/grub-core/disk/efi/efidisk.c +++ b/grub-core/disk/efi/efidisk.c @@ -396,6 +396,19 @@ enumerate_disks (void) @@ -328,7 +328,7 @@ index fe8ba6e6c93..062143dfffd 100644 grub_efidisk_iterate (grub_disk_dev_iterate_hook_t hook, void *hook_data, grub_disk_pull_t pull) diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 14bc10eb564..7fcca69c17b 100644 +index 14bc10eb5..7fcca69c1 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -95,6 +95,19 @@ grub_efi_locate_handle (grub_efi_locate_search_type_t search_type, @@ -352,7 +352,7 @@ index 14bc10eb564..7fcca69c17b 100644 grub_efi_open_protocol (grub_efi_handle_t handle, grub_efi_guid_t *protocol, diff --git a/include/grub/efi/disk.h b/include/grub/efi/disk.h -index 254475c8428..6845c2f1fd8 100644 +index 254475c84..6845c2f1f 100644 --- a/include/grub/efi/disk.h +++ b/include/grub/efi/disk.h @@ -27,6 +27,8 @@ grub_efi_handle_t @@ -365,7 +365,7 @@ index 254475c8428..6845c2f1fd8 100644 void grub_efidisk_fini (void); diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h -index 8dfc89a33b9..ec52083c49f 100644 +index 8dfc89a33..ec52083c4 100644 --- a/include/grub/efi/efi.h +++ b/include/grub/efi/efi.h @@ -41,6 +41,11 @@ EXPORT_FUNC(grub_efi_locate_handle) (grub_efi_locate_search_type_t search_type, @@ -381,7 +381,7 @@ index 8dfc89a33b9..ec52083c49f 100644 grub_efi_guid_t *protocol, grub_efi_uint32_t attributes); diff --git a/NEWS b/NEWS -index 73b8492bc42..d7c1d23aed7 100644 +index 73b8492bc..d7c1d23ae 100644 --- a/NEWS +++ b/NEWS @@ -98,7 +98,7 @@ New in 2.02: diff --git a/0213-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch b/0211-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch similarity index 98% rename from 0213-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch rename to 0211-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch index e4a8522..869d0a4 100644 --- a/0213-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch +++ b/0211-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch @@ -34,7 +34,7 @@ Signed-off-by: Dimitri John Ledkov <dimitri.ledkov(a)canonical.com> 1 file changed, 13 deletions(-) diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index 3cf0f9b330b..941df6400b9 100644 +index 3cf0f9b33..941df6400 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -30,7 +30,6 @@ diff --git a/0214-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch b/0212-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch similarity index 98% rename from 0214-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch rename to 0212-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch index 9fb39a6..5d76beb 100644 --- a/0214-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch +++ b/0212-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch @@ -19,7 +19,7 @@ Signed-off-by: Dimitri John Ledkov <dimitri.ledkov(a)canonical.com> 1 file changed, 13 deletions(-) diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c -index f18d90bd749..d2af47c2c0a 100644 +index f18d90bd7..d2af47c2c 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -34,7 +34,6 @@ diff --git a/0215-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch b/0213-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch similarity index 98% rename from 0215-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch rename to 0213-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch index ad34309..adc8179 100644 --- a/0215-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch +++ b/0213-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch @@ -39,7 +39,7 @@ Signed-off-by: Dimitri John Ledkov <dimitri.ledkov(a)canonical.com> 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index 3af6b122926..644cd2e56fe 100644 +index 3af6b1229..644cd2e56 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -906,7 +906,6 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), diff --git a/0216-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch b/0214-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch similarity index 97% rename from 0216-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch rename to 0214-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch index 46eafc0..c298c04 100644 --- a/0216-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch +++ b/0214-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch @@ -18,7 +18,7 @@ Signed-off-by: Dimitri John Ledkov <dimitri.ledkov(a)canonical.com> 2 files changed, 42 deletions(-) diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c -index 9260731c107..9265cf4200a 100644 +index 9260731c1..9265cf420 100644 --- a/grub-core/loader/efi/linux.c +++ b/grub-core/loader/efi/linux.c @@ -24,46 +24,6 @@ @@ -69,7 +69,7 @@ index 9260731c107..9265cf4200a 100644 #pragma GCC diagnostic ignored "-Wcast-align" diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h -index 0033d9305a9..887b02fd9f3 100644 +index 0033d9305..887b02fd9 100644 --- a/include/grub/efi/linux.h +++ b/include/grub/efi/linux.h @@ -22,8 +22,6 @@ diff --git a/grub.patches b/grub.patches index 29c5894..286d011 100644 --- a/grub.patches +++ b/grub.patches @@ -24,193 +24,191 @@ Patch0023: 0023-Enable-pager-by-default.-985860.patch Patch0024: 0024-Don-t-say-GNU-Linux-in-generated-menus.patch Patch0025: 0025-Add-.eh_frame-to-list-of-relocations-stripped.patch Patch0026: 0026-Don-t-require-a-password-to-boot-entries-generated-b.patch -Patch0027: 0027-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch -Patch0028: 0028-use-fw_path-prefix-when-fallback-searching-for-grub-.patch -Patch0029: 0029-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch -Patch0030: 0030-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch -Patch0031: 0031-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch -Patch0032: 0032-Try-prefix-if-fw_path-doesn-t-work.patch -Patch0033: 0033-Use-rpm-s-sort-for-grub2-mkconfig.patch -Patch0034: 0034-Make-grub2-mkconfig-construct-titles-that-look-like-.patch -Patch0035: 0035-Add-friendly-grub2-password-config-tool-985962.patch -Patch0036: 0036-tcp-add-window-scaling-support.patch -Patch0037: 0037-efinet-and-bootp-add-support-for-dhcpv6.patch -Patch0038: 0038-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch -Patch0039: 0039-bz1374141-fix-incorrect-mask-for-ppc64.patch -Patch0040: 0040-Make-grub_fatal-also-backtrace.patch -Patch0041: 0041-Fix-up-some-man-pages-rpmdiff-noticed.patch -Patch0042: 0042-Make-our-info-pages-say-grub2-where-appropriate.patch -Patch0043: 0043-macos-just-build-chainloader-entries-don-t-try-any-x.patch -Patch0044: 0044-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch -Patch0045: 0045-export-btrfs_subvol-and-btrfs_subvolid.patch -Patch0046: 0046-grub2-btrfs-03-follow_default.patch -Patch0047: 0047-grub2-btrfs-04-grub2-install.patch -Patch0048: 0048-grub2-btrfs-05-grub2-mkconfig.patch -Patch0049: 0049-grub2-btrfs-06-subvol-mount.patch -Patch0050: 0050-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch -Patch0051: 0051-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch -Patch0052: 0052-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch -Patch0053: 0053-Use-grub_efi_.-memory-helpers-where-reasonable.patch -Patch0054: 0054-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch -Patch0055: 0055-don-t-use-int-for-efi-status.patch -Patch0056: 0056-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch -Patch0057: 0057-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch -Patch0058: 0058-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch -Patch0059: 0059-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch -Patch0060: 0060-align-struct-efi_variable-better.patch -Patch0061: 0061-Add-BLS-support-to-grub-mkconfig.patch -Patch0062: 0062-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch -Patch0063: 0063-Add-linux-and-initrd-commands-for-grub-emu.patch -Patch0064: 0064-Add-grub2-switch-to-blscfg.patch -Patch0065: 0065-make-better-backtraces.patch -Patch0066: 0066-normal-don-t-draw-our-startup-message-if-debug-is-se.patch -Patch0067: 0067-Work-around-some-minor-include-path-weirdnesses.patch -Patch0068: 0068-Make-it-possible-to-enabled-build-id-sha1.patch -Patch0069: 0069-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch -Patch0070: 0070-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch +Patch0027: 0027-use-fw_path-prefix-when-fallback-searching-for-grub-.patch +Patch0028: 0028-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch +Patch0029: 0029-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch +Patch0030: 0030-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch +Patch0031: 0031-Try-prefix-if-fw_path-doesn-t-work.patch +Patch0032: 0032-Use-rpm-s-sort-for-grub2-mkconfig.patch +Patch0033: 0033-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +Patch0034: 0034-Add-friendly-grub2-password-config-tool-985962.patch +Patch0035: 0035-tcp-add-window-scaling-support.patch +Patch0036: 0036-efinet-and-bootp-add-support-for-dhcpv6.patch +Patch0037: 0037-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch +Patch0038: 0038-bz1374141-fix-incorrect-mask-for-ppc64.patch +Patch0039: 0039-Make-grub_fatal-also-backtrace.patch +Patch0040: 0040-Make-our-info-pages-say-grub2-where-appropriate.patch +Patch0041: 0041-macos-just-build-chainloader-entries-don-t-try-any-x.patch +Patch0042: 0042-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch +Patch0043: 0043-export-btrfs_subvol-and-btrfs_subvolid.patch +Patch0044: 0044-grub2-btrfs-03-follow_default.patch +Patch0045: 0045-grub2-btrfs-04-grub2-install.patch +Patch0046: 0046-grub2-btrfs-05-grub2-mkconfig.patch +Patch0047: 0047-grub2-btrfs-06-subvol-mount.patch +Patch0048: 0048-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch +Patch0049: 0049-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch +Patch0050: 0050-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch +Patch0051: 0051-Use-grub_efi_.-memory-helpers-where-reasonable.patch +Patch0052: 0052-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch +Patch0053: 0053-don-t-use-int-for-efi-status.patch +Patch0054: 0054-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch +Patch0055: 0055-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch +Patch0056: 0056-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch +Patch0057: 0057-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch +Patch0058: 0058-align-struct-efi_variable-better.patch +Patch0059: 0059-Add-BLS-support-to-grub-mkconfig.patch +Patch0060: 0060-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch +Patch0061: 0061-Add-linux-and-initrd-commands-for-grub-emu.patch +Patch0062: 0062-Add-grub2-switch-to-blscfg.patch +Patch0063: 0063-make-better-backtraces.patch +Patch0064: 0064-normal-don-t-draw-our-startup-message-if-debug-is-se.patch +Patch0065: 0065-Work-around-some-minor-include-path-weirdnesses.patch +Patch0066: 0066-Make-it-possible-to-enabled-build-id-sha1.patch +Patch0067: 0067-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch +Patch0068: 0068-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch +Patch0069: 0069-Fixup-for-newer-compiler.patch +Patch0070: 0070-Don-t-attempt-to-export-the-start-and-_start-symbols.patch Patch0071: 0071-Fixup-for-newer-compiler.patch -Patch0072: 0072-Don-t-attempt-to-export-the-start-and-_start-symbols.patch -Patch0073: 0073-Fixup-for-newer-compiler.patch -Patch0074: 0074-Add-support-for-non-Ethernet-network-cards.patch -Patch0075: 0075-net-read-bracketed-ipv6-addrs-and-port-numbers.patch -Patch0076: 0076-bootp-New-net_bootp6-command.patch -Patch0077: 0077-efinet-UEFI-IPv6-PXE-support.patch -Patch0078: 0078-grub.texi-Add-net_bootp6-doument.patch -Patch0079: 0079-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch -Patch0080: 0080-efinet-Setting-network-from-UEFI-device-path.patch -Patch0081: 0081-efinet-Setting-DNS-server-from-UEFI-protocol.patch -Patch0082: 0082-Support-UEFI-networking-protocols.patch -Patch0083: 0083-AUDIT-0-http-boot-tracker-bug.patch -Patch0084: 0084-grub-editenv-Add-incr-command-to-increment-integer-v.patch -Patch0085: 0085-Add-auto-hide-menu-support.patch -Patch0086: 0086-Add-grub-set-bootflag-utility.patch -Patch0087: 0087-docs-Add-grub-boot-indeterminate.service-example.patch -Patch0088: 0088-gentpl-add-disable-support.patch -Patch0089: 0089-gentpl-add-pc-firmware-type.patch -Patch0090: 0090-efinet-also-use-the-firmware-acceleration-for-http.patch -Patch0091: 0091-efi-http-Make-root_url-reflect-the-protocol-hostname.patch -Patch0092: 0092-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch -Patch0093: 0093-module-verifier-make-it-possible-to-run-checkers-on-.patch -Patch0094: 0094-Rework-how-the-fdt-command-builds.patch -Patch0095: 0095-Disable-non-wordsize-allocations-on-arm.patch -Patch0096: 0096-Prepend-prefix-when-HTTP-path-is-relative.patch -Patch0097: 0097-Make-grub_error-more-verbose.patch -Patch0098: 0098-Make-reset-an-alias-for-the-reboot-command.patch -Patch0099: 0099-Add-a-version-command.patch -Patch0100: 0100-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch -Patch0101: 0101-arm-arm64-loader-Better-memory-allocation-and-error-.patch -Patch0102: 0102-Try-to-pick-better-locations-for-kernel-and-initrd.patch -Patch0103: 0103-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch -Patch0104: 0104-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch -Patch0105: 0105-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch -Patch0106: 0106-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch -Patch0107: 0107-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch -Patch0108: 0108-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch -Patch0109: 0109-Fix-getroot.c-s-trampolines.patch -Patch0110: 0110-Do-not-allow-stack-trampolines-anywhere.patch -Patch0111: 0111-Reimplement-boot_counter.patch -Patch0112: 0112-Fix-menu-entry-selection-based-on-ID-and-title.patch -Patch0113: 0113-Make-the-menu-entry-users-option-argument-to-be-opti.patch -Patch0114: 0114-Add-efi-export-env-and-efi-load-env-commands.patch -Patch0115: 0115-Make-it-possible-to-subtract-conditions-from-debug.patch -Patch0116: 0116-Export-all-variables-from-the-initial-context-when-c.patch -Patch0117: 0117-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch -Patch0118: 0118-Fix-systemctl-kexec-exit-status-check.patch -Patch0119: 0119-Print-grub-emu-linux-loader-messages-as-debug.patch -Patch0120: 0120-Don-t-assume-that-boot-commands-will-only-return-on-.patch -Patch0121: 0121-grub-set-bootflag-Update-comment-about-running-as-ro.patch -Patch0122: 0122-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch -Patch0123: 0123-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch -Patch0124: 0124-Add-start-symbol-for-RISC-V.patch -Patch0125: 0125-bootstrap.conf-Force-autogen.sh-to-use-python3.patch -Patch0126: 0126-efi-http-Export-fw-http-_path-variables-to-make-them.patch -Patch0127: 0127-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch -Patch0128: 0128-efi-net-Allow-to-specify-a-port-number-in-addresses.patch -Patch0129: 0129-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch -Patch0130: 0130-efi-net-Print-a-debug-message-if-parsing-the-address.patch -Patch0131: 0131-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch -Patch0132: 0132-efi-Set-image-base-address-before-jumping-to-the-PE-.patch -Patch0133: 0133-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch -Patch0134: 0134-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch -Patch0135: 0135-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch -Patch0136: 0136-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch -Patch0137: 0137-efi-dhcp-fix-some-allocation-error-checking.patch -Patch0138: 0138-efi-http-fix-some-allocation-error-checking.patch -Patch0139: 0139-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch -Patch0140: 0140-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch -Patch0141: 0141-linuxefi-fail-kernel-validation-without-shim-protoco.patch -Patch0142: 0142-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch -Patch0143: 0143-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch -Patch0144: 0144-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch -Patch0145: 0145-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch -Patch0146: 0146-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch -Patch0147: 0147-Add-systemd-integration-scripts-to-make-systemctl-re.patch -Patch0148: 0148-systemd-integration.sh-Also-set-old-menu_show_once-g.patch -Patch0149: 0149-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch -Patch0150: 0150-grub-install-disable-support-for-EFI-platforms.patch -Patch0151: 0151-New-with-debug-timestamps-configure-flag-to-prepend-.patch -Patch0152: 0152-Added-debug-statements-to-grub_disk_open-and-grub_di.patch -Patch0153: 0153-Introduce-function-grub_debug_is_enabled-void-return.patch -Patch0154: 0154-Don-t-clear-screen-when-debugging-is-enabled.patch -Patch0155: 0155-grub_file_-instrumentation-new-file-debug-tag.patch -Patch0156: 0156-ieee1275-Avoiding-many-unecessary-open-close.patch -Patch0157: 0157-ieee1275-powerpc-implements-fibre-channel-discovery-.patch -Patch0158: 0158-ieee1275-powerpc-enables-device-mapper-discovery.patch -Patch0159: 0159-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch -Patch0160: 0160-Add-suport-for-signing-grub-with-an-appended-signatu.patch -Patch0161: 0161-docs-grub-Document-signing-grub-under-UEFI.patch -Patch0162: 0162-docs-grub-Document-signing-grub-with-an-appended-sig.patch -Patch0163: 0163-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch -Patch0164: 0164-pgp-factor-out-rsa_pad.patch -Patch0165: 0165-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch -Patch0166: 0166-posix_wrap-tweaks-in-preparation-for-libtasn1.patch -Patch0167: 0167-libtasn1-import-libtasn1-4.16.0.patch -Patch0168: 0168-libtasn1-disable-code-not-needed-in-grub.patch -Patch0169: 0169-libtasn1-changes-for-grub-compatibility.patch -Patch0170: 0170-libtasn1-compile-into-asn1-module.patch -Patch0171: 0171-test_asn1-test-module-for-libtasn1.patch -Patch0172: 0172-grub-install-support-embedding-x509-certificates.patch -Patch0173: 0173-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch -Patch0174: 0174-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch -Patch0175: 0175-appended-signatures-support-verifying-appended-signa.patch -Patch0176: 0176-appended-signatures-verification-tests.patch -Patch0177: 0177-appended-signatures-documentation.patch -Patch0178: 0178-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch -Patch0179: 0179-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch -Patch0180: 0180-ieee1275-claim-more-memory.patch -Patch0181: 0181-ieee1275-request-memory-with-ibm-client-architecture.patch -Patch0182: 0182-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch -Patch0183: 0183-ieee1275-ofdisk-retry-on-open-failure.patch -Patch0184: 0184-Allow-chainloading-EFI-apps-from-loop-mounts.patch -Patch0185: 0185-efinet-Add-DHCP-proxy-support.patch -Patch0186: 0186-fs-ext2-Ignore-checksum-seed-incompat-feature.patch -Patch0187: 0187-Don-t-update-the-cmdline-when-generating-legacy-menu.patch -Patch0188: 0188-Suppress-gettext-error-message.patch -Patch0189: 0189-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch -Patch0190: 0190-templates-Check-for-EFI-at-runtime-instead-of-config.patch -Patch0191: 0191-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch -Patch0192: 0192-arm64-Fix-EFI-loader-kernel-image-allocation.patch -Patch0193: 0193-normal-main-Discover-the-device-to-read-the-config-f.patch -Patch0194: 0194-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch -Patch0195: 0195-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch -Patch0196: 0196-Print-module-name-on-license-check-failure.patch -Patch0197: 0197-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch -Patch0198: 0198-grub-mkconfig-restore-umask-for-grub.cfg.patch -Patch0199: 0199-fs-btrfs-Use-full-btrfs-bootloader-area.patch -Patch0200: 0200-Add-Fedora-location-of-DejaVu-SANS-font.patch -Patch0201: 0201-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch -Patch0202: 0202-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch -Patch0203: 0203-EFI-console-Do-not-set-colorstate-until-the-first-te.patch -Patch0204: 0204-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch -Patch0205: 0205-Use-visual-indentation-in-config.h.in.patch -Patch0206: 0206-Where-present-ensure-config-util.h-precedes-config.h.patch -Patch0207: 0207-Drop-gnulib-fix-base64.patch.patch -Patch0208: 0208-Drop-gnulib-no-abort.patch.patch -Patch0209: 0209-Update-gnulib-version-and-drop-most-gnulib-patches.patch -Patch0210: 0210-commands-search-Fix-bug-stopping-iteration-when-no-f.patch -Patch0211: 0211-search-new-efidisk-only-option-on-EFI-systems.patch -Patch0212: 0212-efi-new-connectefi-command.patch -Patch0213: 0213-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch -Patch0214: 0214-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch -Patch0215: 0215-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch -Patch0216: 0216-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch +Patch0072: 0072-Add-support-for-non-Ethernet-network-cards.patch +Patch0073: 0073-net-read-bracketed-ipv6-addrs-and-port-numbers.patch +Patch0074: 0074-bootp-New-net_bootp6-command.patch +Patch0075: 0075-efinet-UEFI-IPv6-PXE-support.patch +Patch0076: 0076-grub.texi-Add-net_bootp6-doument.patch +Patch0077: 0077-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch +Patch0078: 0078-efinet-Setting-network-from-UEFI-device-path.patch +Patch0079: 0079-efinet-Setting-DNS-server-from-UEFI-protocol.patch +Patch0080: 0080-Support-UEFI-networking-protocols.patch +Patch0081: 0081-AUDIT-0-http-boot-tracker-bug.patch +Patch0082: 0082-grub-editenv-Add-incr-command-to-increment-integer-v.patch +Patch0083: 0083-Add-auto-hide-menu-support.patch +Patch0084: 0084-Add-grub-set-bootflag-utility.patch +Patch0085: 0085-docs-Add-grub-boot-indeterminate.service-example.patch +Patch0086: 0086-gentpl-add-disable-support.patch +Patch0087: 0087-gentpl-add-pc-firmware-type.patch +Patch0088: 0088-efinet-also-use-the-firmware-acceleration-for-http.patch +Patch0089: 0089-efi-http-Make-root_url-reflect-the-protocol-hostname.patch +Patch0090: 0090-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch +Patch0091: 0091-module-verifier-make-it-possible-to-run-checkers-on-.patch +Patch0092: 0092-Rework-how-the-fdt-command-builds.patch +Patch0093: 0093-Disable-non-wordsize-allocations-on-arm.patch +Patch0094: 0094-Prepend-prefix-when-HTTP-path-is-relative.patch +Patch0095: 0095-Make-grub_error-more-verbose.patch +Patch0096: 0096-Make-reset-an-alias-for-the-reboot-command.patch +Patch0097: 0097-Add-a-version-command.patch +Patch0098: 0098-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch +Patch0099: 0099-arm-arm64-loader-Better-memory-allocation-and-error-.patch +Patch0100: 0100-Try-to-pick-better-locations-for-kernel-and-initrd.patch +Patch0101: 0101-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch +Patch0102: 0102-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch +Patch0103: 0103-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch +Patch0104: 0104-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch +Patch0105: 0105-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch +Patch0106: 0106-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch +Patch0107: 0107-Fix-getroot.c-s-trampolines.patch +Patch0108: 0108-Do-not-allow-stack-trampolines-anywhere.patch +Patch0109: 0109-Reimplement-boot_counter.patch +Patch0110: 0110-Fix-menu-entry-selection-based-on-ID-and-title.patch +Patch0111: 0111-Make-the-menu-entry-users-option-argument-to-be-opti.patch +Patch0112: 0112-Add-efi-export-env-and-efi-load-env-commands.patch +Patch0113: 0113-Make-it-possible-to-subtract-conditions-from-debug.patch +Patch0114: 0114-Export-all-variables-from-the-initial-context-when-c.patch +Patch0115: 0115-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch +Patch0116: 0116-Fix-systemctl-kexec-exit-status-check.patch +Patch0117: 0117-Print-grub-emu-linux-loader-messages-as-debug.patch +Patch0118: 0118-Don-t-assume-that-boot-commands-will-only-return-on-.patch +Patch0119: 0119-grub-set-bootflag-Update-comment-about-running-as-ro.patch +Patch0120: 0120-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch +Patch0121: 0121-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch +Patch0122: 0122-Add-start-symbol-for-RISC-V.patch +Patch0123: 0123-bootstrap.conf-Force-autogen.sh-to-use-python3.patch +Patch0124: 0124-efi-http-Export-fw-http-_path-variables-to-make-them.patch +Patch0125: 0125-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch +Patch0126: 0126-efi-net-Allow-to-specify-a-port-number-in-addresses.patch +Patch0127: 0127-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch +Patch0128: 0128-efi-net-Print-a-debug-message-if-parsing-the-address.patch +Patch0129: 0129-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch +Patch0130: 0130-efi-Set-image-base-address-before-jumping-to-the-PE-.patch +Patch0131: 0131-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch +Patch0132: 0132-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch +Patch0133: 0133-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch +Patch0134: 0134-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch +Patch0135: 0135-efi-dhcp-fix-some-allocation-error-checking.patch +Patch0136: 0136-efi-http-fix-some-allocation-error-checking.patch +Patch0137: 0137-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch +Patch0138: 0138-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch +Patch0139: 0139-linuxefi-fail-kernel-validation-without-shim-protoco.patch +Patch0140: 0140-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch +Patch0141: 0141-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch +Patch0142: 0142-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch +Patch0143: 0143-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch +Patch0144: 0144-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch +Patch0145: 0145-Add-systemd-integration-scripts-to-make-systemctl-re.patch +Patch0146: 0146-systemd-integration.sh-Also-set-old-menu_show_once-g.patch +Patch0147: 0147-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch +Patch0148: 0148-grub-install-disable-support-for-EFI-platforms.patch +Patch0149: 0149-New-with-debug-timestamps-configure-flag-to-prepend-.patch +Patch0150: 0150-Added-debug-statements-to-grub_disk_open-and-grub_di.patch +Patch0151: 0151-Introduce-function-grub_debug_is_enabled-void-return.patch +Patch0152: 0152-Don-t-clear-screen-when-debugging-is-enabled.patch +Patch0153: 0153-grub_file_-instrumentation-new-file-debug-tag.patch +Patch0154: 0154-ieee1275-Avoiding-many-unecessary-open-close.patch +Patch0155: 0155-ieee1275-powerpc-implements-fibre-channel-discovery-.patch +Patch0156: 0156-ieee1275-powerpc-enables-device-mapper-discovery.patch +Patch0157: 0157-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch +Patch0158: 0158-Add-suport-for-signing-grub-with-an-appended-signatu.patch +Patch0159: 0159-docs-grub-Document-signing-grub-under-UEFI.patch +Patch0160: 0160-docs-grub-Document-signing-grub-with-an-appended-sig.patch +Patch0161: 0161-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch +Patch0162: 0162-pgp-factor-out-rsa_pad.patch +Patch0163: 0163-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch +Patch0164: 0164-posix_wrap-tweaks-in-preparation-for-libtasn1.patch +Patch0165: 0165-libtasn1-import-libtasn1-4.16.0.patch +Patch0166: 0166-libtasn1-disable-code-not-needed-in-grub.patch +Patch0167: 0167-libtasn1-changes-for-grub-compatibility.patch +Patch0168: 0168-libtasn1-compile-into-asn1-module.patch +Patch0169: 0169-test_asn1-test-module-for-libtasn1.patch +Patch0170: 0170-grub-install-support-embedding-x509-certificates.patch +Patch0171: 0171-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch +Patch0172: 0172-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch +Patch0173: 0173-appended-signatures-support-verifying-appended-signa.patch +Patch0174: 0174-appended-signatures-verification-tests.patch +Patch0175: 0175-appended-signatures-documentation.patch +Patch0176: 0176-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch +Patch0177: 0177-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch +Patch0178: 0178-ieee1275-claim-more-memory.patch +Patch0179: 0179-ieee1275-request-memory-with-ibm-client-architecture.patch +Patch0180: 0180-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch +Patch0181: 0181-ieee1275-ofdisk-retry-on-open-failure.patch +Patch0182: 0182-Allow-chainloading-EFI-apps-from-loop-mounts.patch +Patch0183: 0183-efinet-Add-DHCP-proxy-support.patch +Patch0184: 0184-fs-ext2-Ignore-checksum-seed-incompat-feature.patch +Patch0185: 0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch +Patch0186: 0186-Suppress-gettext-error-message.patch +Patch0187: 0187-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch +Patch0188: 0188-templates-Check-for-EFI-at-runtime-instead-of-config.patch +Patch0189: 0189-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch +Patch0190: 0190-arm64-Fix-EFI-loader-kernel-image-allocation.patch +Patch0191: 0191-normal-main-Discover-the-device-to-read-the-config-f.patch +Patch0192: 0192-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch +Patch0193: 0193-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch +Patch0194: 0194-Print-module-name-on-license-check-failure.patch +Patch0195: 0195-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch +Patch0196: 0196-grub-mkconfig-restore-umask-for-grub.cfg.patch +Patch0197: 0197-fs-btrfs-Use-full-btrfs-bootloader-area.patch +Patch0198: 0198-Add-Fedora-location-of-DejaVu-SANS-font.patch +Patch0199: 0199-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch +Patch0200: 0200-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch +Patch0201: 0201-EFI-console-Do-not-set-colorstate-until-the-first-te.patch +Patch0202: 0202-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch +Patch0203: 0203-Use-visual-indentation-in-config.h.in.patch +Patch0204: 0204-Where-present-ensure-config-util.h-precedes-config.h.patch +Patch0205: 0205-Drop-gnulib-fix-base64.patch.patch +Patch0206: 0206-Drop-gnulib-no-abort.patch.patch +Patch0207: 0207-Update-gnulib-version-and-drop-most-gnulib-patches.patch +Patch0208: 0208-commands-search-Fix-bug-stopping-iteration-when-no-f.patch +Patch0209: 0209-search-new-efidisk-only-option-on-EFI-systems.patch +Patch0210: 0210-efi-new-connectefi-command.patch +Patch0211: 0211-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch +Patch0212: 0212-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch +Patch0213: 0213-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch +Patch0214: 0214-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch diff --git a/grub2.spec b/grub2.spec index f0feedb..789399e 100644 --- a/grub2.spec +++ b/grub2.spec @@ -17,7 +17,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -526,6 +526,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Thu Mar 31 2022 Robbie Harwood <rharwood(a)redhat.com> - 1:2.06-32 +- Switch to upstream man pages + * Wed Mar 30 2022 Robbie Harwood <rharwood(a)redhat.com> - 2.06-31 - Revert previous change (grub2-pc-modules is built on i32) commit d171a2a95c9fb2ce2490bac0066fa9354c0c0e3a Author: Robbie Harwood <rharwood(a)redhat.com> Date: Wed Mar 30 14:44:17 2022 +0000 Revert previous change (grub2-pc-modules is built on i32) Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> diff --git a/grub2.spec b/grub2.spec index 0df7d5d..f0feedb 100644 --- a/grub2.spec +++ b/grub2.spec @@ -17,7 +17,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -58,7 +58,7 @@ BuildRequires: pesign >= 0.99-8 BuildRequires: ccache %endif -ExcludeArch: s390 s390x %{ix86} +ExcludeArch: s390 s390x Obsoletes: %{name} <= %{evr} %if 0%{with_legacy_arch} @@ -526,6 +526,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Wed Mar 30 2022 Robbie Harwood <rharwood(a)redhat.com> - 2.06-31 +- Revert previous change (grub2-pc-modules is built on i32) + * Tue Mar 29 2022 Robbie Harwood <rharwood(a)redhat.com> - 2.06-30 - Drop i32 support commit 2b909b72a4317b3584d43ee5d2cf6b369719db12 Author: Robbie Harwood <rharwood(a)redhat.com> Date: Tue Mar 29 18:45:49 2022 +0000 Drop i32 support Signed-off-by: Robbie Harwood <rharwood(a)redhat.com> diff --git a/grub2.spec b/grub2.spec index 486931c..0df7d5d 100644 --- a/grub2.spec +++ b/grub2.spec @@ -17,7 +17,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -58,7 +58,7 @@ BuildRequires: pesign >= 0.99-8 BuildRequires: ccache %endif -ExcludeArch: s390 s390x +ExcludeArch: s390 s390x %{ix86} Obsoletes: %{name} <= %{evr} %if 0%{with_legacy_arch} @@ -526,6 +526,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Tue Mar 29 2022 Robbie Harwood <rharwood(a)redhat.com> - 2.06-30 +- Drop i32 support + * Wed Mar 23 2022 Adam Williamson <awilliam(a)redhat.com> - 2.06-29 - Fix a syntax error in the ostree BLS fix attempt

2 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

Arch-excludes May 2022