rpms/grub2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Renumber sources

Browse Source 
This gets rid of the vestigial remnants of the now-obsolete
release-to-master.patch , and moves gnulib to be earlier in our source list.

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2019-09-26 12:49:22 -04:00
parent af4ccfff6b
commit 0cb30b7d2b
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grub.macros
View File

@ -307,7 +307,7 @@ cp %{SOURCE6} .gitignore \
cp %{SOURCE7} bootstrap \ cp %{SOURCE7} bootstrap \
cp %{SOURCE8} bootstrap.conf \ cp %{SOURCE8} bootstrap.conf \
cp %{SOURCE9} ./grub-core/tests/strtoull_test.c \ cp %{SOURCE9} ./grub-core/tests/strtoull_test.c \
cp %{SOURCE12} gnulib-%{gnulibversion}.tar.gz \ cp %{SOURCE2} gnulib-%{gnulibversion}.tar.gz \
tar -zxf gnulib-%{gnulibversion}.tar.gz \ tar -zxf gnulib-%{gnulibversion}.tar.gz \
mv gnulib-%{gnulibversion} gnulib \ mv gnulib-%{gnulibversion} gnulib \
git init \ git init \

15
grub2.spec
View File

@ -16,8 +16,8 @@ URL: http://www.gnu.org/software/grub/
Obsoletes: grub < 1:0.98 Obsoletes: grub < 1:0.98
Source0: https://ftp.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz Source0: https://ftp.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz
Source1: grub.macros Source1: grub.macros
Source2: grub.patches Source2: gnulib-%{gnulibversion}.tar.gz
#Source3: release-to-master.patch Source3: 99-grub-mkconfig.install
Source4: http://unifoundry.com/unifont-5.1.20080820.pcf.gz Source4: http://unifoundry.com/unifont-5.1.20080820.pcf.gz
Source5: theme.tar.bz2 Source5: theme.tar.bz2
Source6: gitignore Source6: gitignore
@ -25,14 +25,10 @@ Source7: bootstrap
Source8: bootstrap.conf Source8: bootstrap.conf
Source9: strtoull_test.c Source9: strtoull_test.c
Source10: 20-grub.install Source10: 20-grub.install
Source11: 99-grub-mkconfig.install Source11: grub.patches
Source12: gnulib-%{gnulibversion}.tar.gz
%include %{SOURCE1} %include %{SOURCE1}
# generate with do-rebase
%include %{SOURCE2}
BuildRequires: gcc efi-srpm-macros BuildRequires: gcc efi-srpm-macros
BuildRequires: flex bison binutils python3 BuildRequires: flex bison binutils python3
BuildRequires: ncurses-devel xz-devel bzip2-devel BuildRequires: ncurses-devel xz-devel bzip2-devel
@ -69,6 +65,9 @@ variety of kernel formats, file systems, computer architectures and \
hardware devices.\ hardware devices.\
%{nil} %{nil}
# generate with do-rebase
%include %{SOURCE11}
%description %description
%{desc} %{desc}
@ -248,7 +247,7 @@ EOF
# Install kernel-install scripts # Install kernel-install scripts
install -d -m 0755 %{buildroot}%{_prefix}/lib/kernel/install.d/ install -d -m 0755 %{buildroot}%{_prefix}/lib/kernel/install.d/
install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE10} install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE10}
install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE11} install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE3}
install -d -m 0755 %{buildroot}%{_sysconfdir}/kernel/install.d/ install -d -m 0755 %{buildroot}%{_sysconfdir}/kernel/install.d/
# Install systemd user service to set the boot_success flag # Install systemd user service to set the boot_success flag
install -D -m 0755 -t %{buildroot}%{_userunitdir} \ install -D -m 0755 -t %{buildroot}%{_userunitdir} \