diff --git a/0063-Add-friendly-grub2-password-config-tool-985962.patch b/0063-Add-friendly-grub2-password-config-tool-985962.patch index 0bb4b8739f00aec105630992d89c69acdf85d6f1..fdb1d531de13dfe641edecb371f789159539d133 100644 --- a/0063-Add-friendly-grub2-password-config-tool-985962.patch +++ b/0063-Add-friendly-grub2-password-config-tool-985962.patch @@ -158,7 +158,7 @@ index 000000000..dd76f00fc +$0 prompts the user to set a password on the grub bootloader. The password +is written to a file named user.cfg. + -+Report bugs at https://bugs.cclinux.org. ++Report bugs at https://bugzilla.openanolis.cn. +EOF +} + diff --git a/0069-Clean-up-grub-setpassword-documentation-1290799.patch b/0069-Clean-up-grub-setpassword-documentation-1290799.patch index 8cd8c738ae3a4bb761ffa1880ebc42de503d69e6..28e01d423a4f76ad3d29764c61b011dba6d6ebdb 100644 --- a/0069-Clean-up-grub-setpassword-documentation-1290799.patch +++ b/0069-Clean-up-grub-setpassword-documentation-1290799.patch @@ -51,5 +51,5 @@ index fb9d3a3b6..c8c0fa419 100644 + -v, --version print the version information and exit + -o, --output_path put user.cfg in a user-selected directory - Report bugs at https://bugs.cclinux.org. + Report bugs at https://bugzilla.openanolis.cn. EOF diff --git a/circle-boot-ca-cert.der b/circle-boot-ca-cert.der deleted file mode 100644 index 7dd70ff1fdb34fc6317486b72d86f6a0dc995d98..0000000000000000000000000000000000000000 Binary files a/circle-boot-ca-cert.der and /dev/null differ diff --git a/circle-boot-signing-cert.der b/circle-boot-signing-cert.der deleted file mode 100644 index 576ac380e35b1a3bcf639ec50626e3a19a996e5e..0000000000000000000000000000000000000000 Binary files a/circle-boot-signing-cert.der and /dev/null differ diff --git a/dist b/dist index 5aa45c5bf3f5e5b781981aec176b4910ac39baaf..9c0e36ec42a2d9bfefacb21ac6354c9ddd910533 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an8_8 +an8 diff --git a/grub.macros b/grub.macros index c54a44aac2f7899ea8f87f490cec50a32b9b23a7..17afcbf9eace32c2960972385875142272b15826 100644 --- a/grub.macros +++ b/grub.macros @@ -409,8 +409,8 @@ done \ -p /EFI/BOOT -d grub-core \\\ --sbat %{4}./sbat.csv \\\ ${GRUB_MODULES} \ -%{expand:%%{pesign -s -i %%{2}.orig -o %%{2} -a %%{5} -c %%{6} -n %%{7}}} \ -%{expand:%%{pesign -s -i %%{3}.orig -o %%{3} -a %%{5} -c %%{6} -n %%{7}}} \ +%{expand:%%{pesign -s -i %%{2}.orig -o %%{2} -a %%{5} -c %%{6} -n %%{7}}} \ +%{expand:%%{pesign -s -i %%{3}.orig -o %%{3} -a %%{5} -c %%{6} -n %%{7}}} \ %{nil} %else %define efi_mkimage() \ diff --git a/grub2.spec b/grub2.spec index 73d65f1be127060e952a21b7c5ee5ab4a6a7a45c..a62cb9da101e8f390e9c62e356fd56f60b3d40e9 100644 --- a/grub2.spec +++ b/grub2.spec @@ -9,77 +9,76 @@ %global _configure_gnuconfig_hack 1 %endif -Name: grub2 -Epoch: 1 -Version: 2.02 -Release: 148%{anolis_release}%{?dist}.1 -Summary: Bootloader with support for Linux, Multiboot and more -Group: System Environment/Base -License: GPLv3+ -URL: http://www.gnu.org/software/grub/ -Obsoletes: grub < 1:0.98 -Source0: ftp://alpha.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz +Name: grub2 +Epoch: 1 +Version: 2.02 +Release: 150%{anolis_release}%{?dist} +Summary: Bootloader with support for Linux, Multiboot and more +Group: System Environment/Base +License: GPLv3+ +URL: http://www.gnu.org/software/grub/ +Obsoletes: grub < 1:0.98 +Source0: ftp://alpha.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz #Source0: ftp://ftp.gnu.org/gnu/grub/grub-%%{tarversion}.tar.xz -Source1: grub.macros -Source2: grub.patches -Source3: release-to-master.patch -Source4: http://unifoundry.com/unifont-5.1.20080820.pcf.gz -Source5: theme.tar.bz2 -Source6: gitignore -Source8: strtoull_test.c -Source9: 20-grub.install -Source12: 99-grub-mkconfig.install -Source13: circle-boot-ca-cert.der -Source14: circle-boot-signing-cert.der -Source19: sbat.csv.in +Source1: grub.macros +Source2: grub.patches +Source3: release-to-master.patch +Source4: http://unifoundry.com/unifont-5.1.20080820.pcf.gz +Source5: theme.tar.bz2 +Source6: gitignore +Source8: strtoull_test.c +Source9: 20-grub.install +Source12: 99-grub-mkconfig.install +Source19: sbat.csv.in + %include %{SOURCE1} %if 0%{with_efi_arch} -%define old_sb_ca %{SOURCE13} -%define old_sb_cer %{SOURCE14} -%define old_sb_key circlebootsigningcert -%define sb_ca %{SOURCE13} -%define sb_cer %{SOURCE14} -%define sb_key circlebootsigningcert +%define old_sb_ca %{_datadir}/pki/sb-certs/secureboot-ca-%{_arch}.cer +%define old_sb_cer %{_datadir}/pki/sb-certs/secureboot-grub2-%{_arch}.cer +%define old_sb_key anolisbootsigningcert +%define sb_ca %{_datadir}/pki/sb-certs/secureboot-ca-%{_arch}.cer +%define sb_cer %{_datadir}/pki/sb-certs/secureboot-grub2-%{_arch}.cer +%define sb_key anolisbootsigningcert %endif %ifarch ppc64le -%define old_sb_cer %{SOURCE13} -%define sb_cer %{SOURCE14} -%define sb_key circlebootsigningcert +%define old_sb_cer %{_datadir}/pki/sb-certs/secureboot-grub2-%{_arch}.cer +%define sb_cer %{_datadir}/pki/sb-certs/secureboot-grub2-%{_arch}.cer +%define sb_key anolisbootsigningcert %endif # generate with do-rebase %include %{SOURCE2} -BuildRequires: gcc efi-srpm-macros -BuildRequires: flex bison binutils python3-devel -BuildRequires: ncurses-devel xz-devel bzip2-devel -BuildRequires: freetype-devel libusb-devel -BuildRequires: rpm-devel -BuildRequires: rpm-devel rpm-libs -BuildRequires: autoconf automake autogen device-mapper-devel -BuildRequires: freetype-devel gettext-devel git -BuildRequires: texinfo -BuildRequires: dejavu-sans-fonts -BuildRequires: help2man +BuildRequires: gcc efi-srpm-macros +BuildRequires: flex bison binutils python3-devel +BuildRequires: ncurses-devel xz-devel bzip2-devel +BuildRequires: freetype-devel libusb-devel +BuildRequires: rpm-devel +BuildRequires: rpm-devel rpm-libs +BuildRequires: autoconf automake autogen device-mapper-devel +BuildRequires: freetype-devel gettext-devel git +BuildRequires: texinfo +BuildRequires: dejavu-sans-fonts +BuildRequires: help2man # For %%_userunitdir macro -BuildRequires: systemd +BuildRequires: systemd %ifarch %{efi_arch} -BuildRequires: pesign >= 0.99-8 +BuildRequires: pesign >= 0.99-8 %endif %if %{?_with_ccache: 1}%{?!_with_ccache: 0} -BuildRequires: ccache +BuildRequires: ccache %endif -ExcludeArch: s390 s390x %{arm} -Obsoletes: %{name} <= %{evr} +ExcludeArch: s390 s390x %{arm} +Obsoletes: %{name} <= %{evr} %if 0%{with_legacy_arch} -Requires: %{name}-%{legacy_package_arch} = %{evr} +Requires: %{name}-%{legacy_package_arch} = %{evr} %else -Requires: %{name}-%{package_arch} = %{evr} +Requires: %{name}-%{package_arch} = %{evr} %endif %global desc \ @@ -93,21 +92,21 @@ hardware devices.\ %{desc} %package common -Summary: grub2 common layout -Group: System Environment/Base -BuildArch: noarch -Conflicts: grubby < 8.40-13 +Summary: grub2 common layout +Group: System Environment/Base +BuildArch: noarch +Conflicts: grubby < 8.40-13 %description common This package provides some directories which are required by various grub2 subpackages. %package tools -Summary: Support tools for GRUB. -Group: System Environment/Base -Obsoletes: %{name}-tools < %{evr} -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: gettext os-prober which file +Summary: Support tools for GRUB. +Group: System Environment/Base +Obsoletes: %{name}-tools < %{evr} +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: gettext os-prober which file Requires(pre): dracut Requires(post): dracut @@ -117,11 +116,11 @@ This subpackage provides tools for support of all platforms. %ifarch x86_64 loongarch64 %package tools-efi -Summary: Support tools for GRUB. -Group: System Environment/Base -Requires: gettext os-prober which file -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Obsoletes: %{name}-tools < %{evr} +Summary: Support tools for GRUB. +Group: System Environment/Base +Requires: gettext os-prober which file +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Obsoletes: %{name}-tools < %{evr} %description tools-efi %{desc} @@ -129,23 +128,23 @@ This subpackage provides tools for support of EFI platforms. %endif %package tools-minimal -Summary: Support tools for GRUB. -Group: System Environment/Base -Requires: gettext -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Obsoletes: %{name}-tools < %{evr} +Summary: Support tools for GRUB. +Group: System Environment/Base +Requires: gettext +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Obsoletes: %{name}-tools < %{evr} %description tools-minimal %{desc} This subpackage provides tools for support of all platforms. %package tools-extra -Summary: Support tools for GRUB. -Group: System Environment/Base -Requires: gettext os-prober which file -Requires: %{name}-tools-minimal = %{epoch}:%{version}-%{release} -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Obsoletes: %{name}-tools < %{evr} +Summary: Support tools for GRUB. +Group: System Environment/Base +Requires: gettext os-prober which file +Requires: %{name}-tools-minimal = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Obsoletes: %{name}-tools < %{evr} %description tools-extra %{desc} @@ -168,7 +167,7 @@ mkdir grub-%{grubefiarch}-%{tarversion} grep -A100000 '# stuff "make" creates' .gitignore > grub-%{grubefiarch}-%{tarversion}/.gitignore cp %{SOURCE4} grub-%{grubefiarch}-%{tarversion}/unifont.pcf.gz sed -e "s,@@VERSION@@,%{version},g" -e "s,@@VERSION_RELEASE@@,%{version}-%{release},g" \ - %{SOURCE19} > grub-%{grubefiarch}-%{tarversion}/sbat.csv + -e '/,Red Hat,/ s,\.anolis\.[0-9]\.[0-9],,g' %{SOURCE19} > grub-%{grubefiarch}-%{tarversion}/sbat.csv git add grub-%{grubefiarch}-%{tarversion} %endif %if 0%{with_alt_efi_arch} @@ -192,10 +191,10 @@ git commit -m "After making subdirs" %build %if 0%{with_efi_arch} -%{expand:%do_primary_efi_build %%{grubefiarch} %%{grubefiname} %%{grubeficdname} %%{_target_platform} %%{efi_target_cflags} %%{efi_host_cflags} %{old_sb_ca} %{old_sb_cer} %{old_sb_key} %{sb_ca} %{sb_cer} %{sb_key}} +%{expand:%do_primary_efi_build %%{grubefiarch} %%{grubefiname} %%{grubeficdname} %%{_target_platform} %%{efi_target_cflags} %%{efi_host_cflags} %{sb_ca} %{sb_cer} %{sb_key}} %endif %if 0%{with_alt_efi_arch} -%{expand:%do_alt_efi_build %%{grubaltefiarch} %%{grubaltefiname} %%{grubalteficdname} %%{_alt_target_platform} %%{alt_efi_target_cflags} %%{alt_efi_host_cflags} %{old_sb_ca} %{old_sb_cer} %{old_sb_key} %{sb_ca} %{sb_cer} %{sb_key}} +%{expand:%do_alt_efi_build %%{grubaltefiarch} %%{grubaltefiname} %%{grubalteficdname} %%{_alt_target_platform} %%{alt_efi_target_cflags} %%{alt_efi_host_cflags} %{sb_ca} %{sb_cer} %{sb_key}} %endif %if 0%{with_legacy_arch} %{expand:%do_legacy_build %%{grublegacyarch}} @@ -519,7 +518,7 @@ fi %endif %changelog -* Wed Jul 05 2023 Bo Ren - 2.02-148.0.1.1 +* Mon Dec 18 2023 Bo Ren - 2.02-150.0.1 - Build pc-modules package on x86_64 (geliwei@openanolis.org) - Add loongarch64 base support (zhangwenlong@loongson.cn)(chenguoqi@loongson.cn) - Fix a bug in bls_make_list, blscfg. (zhonglingh@linux.alibaba.com) @@ -527,10 +526,15 @@ fi - Add LoongArch64 support(yangqiming@loongson.cn) - LoongArch64 support fdt and phy-addr BIOS(yangqiming@loongson.cn) - Remove dtb dir with correct argument (Liwei Ge) +- Remove unneeded buildrequires (Zhao Hang) + +* Fri Jun 16 2023 Nicolas Frayer - 2.02-150 +- kern/ieee1275/init: sync vec5 patchset with upstream +- Resolves: #2172111 -* Fri Jun 16 2023 Nicolas Frayer - 2.02-148.el8_8.1 -- Sync with 8.9 (actually 2.02-150) -- Resolves: #2207972 +* Wed Jun 14 2023 Nicolas Frayer - 2.02-149 +- efi/http: change uint32_t to uintn_t for grub_efi_http_message_t +- Resolves: #2178388 * Mon Feb 06 2023 Robbie Harwood - 2.02-148 - ppc64le: cas5, take 3 diff --git a/sbat.csv.in b/sbat.csv.in index 59a00611beb925b5ce305df8db67bfe50d06d026..d89d534f9daeb01d1d7e2b907081d6304d133627 100755 --- a/sbat.csv.in +++ b/sbat.csv.in @@ -1,4 +1,4 @@ sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md -grub,1,Free Software Foundation,grub,2.02,https://www.gnu.org/software/grub/ -grub.rhel8,1,Red Hat Enterprise Linux 8,grub2,@@VERSION@@,mail:secalert@redhat.com -grub.circle8,1,Circle Linux 8,grub2,@@VERSION@@,mail:security@cclinux.org +grub,3,Free Software Foundation,grub,@@VERSION@@,https//www.gnu.org/software/grub/ +grub.rh,2,Red Hat,grub2,@@VERSION_RELEASE@@,mailto:secalert@redhat.com +grub.anolis,2,Anolis OS,grub2,@@VERSION_RELEASE@@,mail:ansa-announce@lists.openanolis.cn