diff --git a/uboot-tools.spec b/uboot-tools.spec index 8de3779a84d966bfc3bf30980886aff2643fa619..4b89ecf22969949bdc8b0bb261fd6f0d447a0cf6 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,6 +1,8 @@ +%global with_armv8 1 + Name: uboot-tools Version: 2018.09 -Release: 6 +Release: 7 Summary: tools for U-Boot License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ URL: http://www.denx.de/wiki/U-Boot @@ -22,12 +24,14 @@ Patch0008: sunxi-DT-A64-add-Pine64-LTS-support.patch BuildRequires: bc dtc gcc make flex bison git-core openssl-devel BuildRequires: python-unversioned-command python2-devel python2-setuptools BuildRequires: python2-libfdt python2-pyelftools SDL-devel swig +%if %{with_armv8} %ifarch %{arm} aarch64 BuildRequires: vboot-utils %endif %ifarch aarch64 BuildRequires: arm-trusted-firmware-armv8 %endif +%endif Requires: dtc systemd @@ -36,6 +40,7 @@ This package includes the mkimage program, which allows generation of U-Boot images in various formats, and the fw_printenv and fw_setenv programs to read and modify U-Boot's environment. +%if %{with_armv8} %ifarch aarch64 %package -n uboot-images-armv8 Summary: u-boot bootloader images for aarch64 boards @@ -45,6 +50,7 @@ BuildArch: noarch %description -n uboot-images-armv8 u-boot bootloader images for aarch64 boards %endif +%endif %ifarch %{arm} %package -n uboot-images-armv7 @@ -88,6 +94,7 @@ cp %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 . %build mkdir builds +%if %{with_armv8} %ifarch aarch64 %{arm} for board in $(cat %{_arch}-boards) do @@ -124,9 +131,10 @@ do fi done %endif +%endif -make HOSTCC="gcc $RPM_OPT_FLAGS" %{?_smp_mflags} CROSS_COMPILE="" defconfig V=1 O=builds/ -make HOSTCC="gcc $RPM_OPT_FLAGS" %{?_smp_mflags} CROSS_COMPILE="" tools-all V=1 O=builds/ +make HOSTCC="gcc $RPM_OPT_FLAGS" %{?_smp_mflags} CROSS_COMPILE="" defconfig V=1 O=builds/ -j16 +make HOSTCC="gcc $RPM_OPT_FLAGS" %{?_smp_mflags} CROSS_COMPILE="" tools-all V=1 O=builds/ -j16 %install mkdir -p %{buildroot}%{_bindir} @@ -134,6 +142,7 @@ mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_mandir}/man1 mkdir -p %{buildroot}%{_datadir}/uboot/ +%if %{with_armv8} %ifarch aarch64 for board in $(cat %{_arch}-boards) do @@ -146,6 +155,7 @@ mkdir -p %{buildroot}%{_datadir}/uboot/$(echo $board)/ done done %endif +%endif %ifarch %{arm} for board in $(cat %{_arch}-boards) @@ -255,12 +265,14 @@ cp -p board/warp7/README builds/docs/README.warp7 %dir %{_datadir}/uboot/ %config(noreplace) %{_sysconfdir}/fw_env.config +%if %{with_armv8} %ifarch aarch64 %files -n uboot-images-armv8 %defattr(-,root,root) %{_datadir}/uboot/* %exclude %{_datadir}/uboot/elf %endif +%endif %ifarch %{arm} %files -n uboot-images-armv7 @@ -283,6 +295,12 @@ cp -p board/warp7/README builds/docs/README.warp7 %{_mandir}/man1/mkimage.1.gz %changelog +* Wed Apr 14 2021 liuyumeng - 2018.09-7 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC: Copilation optimization + * Fri Jan 17 2020 Tianfei - 2018.09-6 - Type:bugfix - ID:NA