The package rpms/uboot-tools.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/uboot-tools.git/commit/?id=f9e4eb....
Change:
+%ifarch aarch64 %{arm}
Thanks.
Full change:
============
commit f9e4eb9671521f749dc9ac2947fdcee4c85731b3
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Tue Jun 13 14:53:29 2017 +0100
Spec and build refactoring
diff --git a/aarch64-boards b/aarch64-boards
new file mode 100644
index 0000000..02f8675
--- /dev/null
+++ b/aarch64-boards
@@ -0,0 +1,13 @@
+dragonboard410c
+espresso7420
+evb-rk3399
+hikey
+mvebu_espressobin-88f3720
+mvebu_mcbin-88f8040
+odroid-c2
+p2371-2180
+pine64_plus
+rpi_3
+vexpress_aemv8a_dram
+vexpress_aemv8a_juno
+vexpress_aemv8a_semi
diff --git a/arm-boards b/arm-boards
new file mode 100644
index 0000000..dec40a9
--- /dev/null
+++ b/arm-boards
@@ -0,0 +1,131 @@
+A10-OLinuXino-Lime
+A10s-OLinuXino-M
+A13-OLinuXino
+A13-OLinuXinoM
+A20-Olimex-SOM-EVB
+A20-OLinuXino-Lime
+A20-OLinuXino-Lime2
+A20-OLinuXino_MICRO
+am335x_boneblack
+am335x_evm
+am57xx_evm
+Ampe_A76
+arndale
+Auxtek-T003
+Auxtek-T004
+ba10_tv_box
+Bananapi
+Bananapi_M2_Ultra
+Bananapro
+chiliboard
+CHIP
+chromebook_jerry
+chromebit_mickey
+chromebook_minnie
+Chuwi_V7_CW0825
+clearfog
+cl-som-am57x
+cm_fx6
+Colombus
+colorfly_e708_q1
+CSQ_CS908
+Cubieboard
+Cubieboard2
+Cubieboard4
+Cubietruck
+Cubietruck_plus
+db-mv784mp-gp
+difrnce_dit4350
+dserve_dsrv9703c
+fennec-rk3288
+firefly-rk3288
+highbank
+Hummingbird_A31
+Hyundai_A7HD
+i12-tvbox
+icnova-a20-swac
+iNet_86VS
+inet86dz
+Itead_Ibox_A20
+jesurun_q5
+jetson-tk1
+kc1
+Lamobo_R1
+Linksprite_pcDuino
+Linksprite_pcDuino3
+Linksprite_pcDuino3_Nano
+liteboard
+marsboard
+Marsboard_A10
+Mele_A1000
+Mele_A1000G_quad
+Mele_I7
+Mele_M3
+Mele_M5
+Mele_M9
+Mini-X
+mk802
+mk802_a10s
+mk802ii
+MK808C
+MSI_Primo73
+MSI_Primo81
+mx6cuboxi
+nanopi_neo
+novena
+nyan-big
+odroid
+odroid-xu3
+omap3_beagle
+omap3_pandora
+omap4_panda
+omap5_uevm
+Orangepi
+orangepi_2
+orangepi_lite
+Orangepi_mini
+orangepi_one
+orangepi_pc
+orangepi_pc_plus
+orangepi_plus
+orangepi_plus2e
+orangepi_zero
+origen
+paz00
+peach-pi
+peach-pit
+polaroid_mid2809pxe04
+pov_protab2_ips9
+q8_a13_tablet
+q8_a23_tablet_800x480
+q8_a33_tablet_1024x600
+q8_a33_tablet_800x480
+r7-tv-dongle
+riotboard
+rock
+rock2
+rpi_2
+rpi_3_32b
+Sinlinx_SinA31s
+smdkv310
+snow
+spring
+stih410-b2260
+sunxi_Gemei_G9
+tinker-rk3288
+trimslice
+udoo
+udoo_neo
+UTOO_P66
+usbarmory
+vexpress_ca15_tc2
+vexpress_ca9x4
+wandboard
+warp
+warp7
+Wexler_TAB7200
+Wits_Pro_A20_DKT
+Yones_Toptech_BS1078_V2
+zynq_microzed
+zynq_zed
+zynq_zybo
diff --git a/armv7-boards b/armv7-boards
deleted file mode 100644
index dec40a9..0000000
--- a/armv7-boards
+++ /dev/null
@@ -1,131 +0,0 @@
-A10-OLinuXino-Lime
-A10s-OLinuXino-M
-A13-OLinuXino
-A13-OLinuXinoM
-A20-Olimex-SOM-EVB
-A20-OLinuXino-Lime
-A20-OLinuXino-Lime2
-A20-OLinuXino_MICRO
-am335x_boneblack
-am335x_evm
-am57xx_evm
-Ampe_A76
-arndale
-Auxtek-T003
-Auxtek-T004
-ba10_tv_box
-Bananapi
-Bananapi_M2_Ultra
-Bananapro
-chiliboard
-CHIP
-chromebook_jerry
-chromebit_mickey
-chromebook_minnie
-Chuwi_V7_CW0825
-clearfog
-cl-som-am57x
-cm_fx6
-Colombus
-colorfly_e708_q1
-CSQ_CS908
-Cubieboard
-Cubieboard2
-Cubieboard4
-Cubietruck
-Cubietruck_plus
-db-mv784mp-gp
-difrnce_dit4350
-dserve_dsrv9703c
-fennec-rk3288
-firefly-rk3288
-highbank
-Hummingbird_A31
-Hyundai_A7HD
-i12-tvbox
-icnova-a20-swac
-iNet_86VS
-inet86dz
-Itead_Ibox_A20
-jesurun_q5
-jetson-tk1
-kc1
-Lamobo_R1
-Linksprite_pcDuino
-Linksprite_pcDuino3
-Linksprite_pcDuino3_Nano
-liteboard
-marsboard
-Marsboard_A10
-Mele_A1000
-Mele_A1000G_quad
-Mele_I7
-Mele_M3
-Mele_M5
-Mele_M9
-Mini-X
-mk802
-mk802_a10s
-mk802ii
-MK808C
-MSI_Primo73
-MSI_Primo81
-mx6cuboxi
-nanopi_neo
-novena
-nyan-big
-odroid
-odroid-xu3
-omap3_beagle
-omap3_pandora
-omap4_panda
-omap5_uevm
-Orangepi
-orangepi_2
-orangepi_lite
-Orangepi_mini
-orangepi_one
-orangepi_pc
-orangepi_pc_plus
-orangepi_plus
-orangepi_plus2e
-orangepi_zero
-origen
-paz00
-peach-pi
-peach-pit
-polaroid_mid2809pxe04
-pov_protab2_ips9
-q8_a13_tablet
-q8_a23_tablet_800x480
-q8_a33_tablet_1024x600
-q8_a33_tablet_800x480
-r7-tv-dongle
-riotboard
-rock
-rock2
-rpi_2
-rpi_3_32b
-Sinlinx_SinA31s
-smdkv310
-snow
-spring
-stih410-b2260
-sunxi_Gemei_G9
-tinker-rk3288
-trimslice
-udoo
-udoo_neo
-UTOO_P66
-usbarmory
-vexpress_ca15_tc2
-vexpress_ca9x4
-wandboard
-warp
-warp7
-Wexler_TAB7200
-Wits_Pro_A20_DKT
-Yones_Toptech_BS1078_V2
-zynq_microzed
-zynq_zed
-zynq_zybo
diff --git a/armv8-boards b/armv8-boards
deleted file mode 100644
index 02f8675..0000000
--- a/armv8-boards
+++ /dev/null
@@ -1,13 +0,0 @@
-dragonboard410c
-espresso7420
-evb-rk3399
-hikey
-mvebu_espressobin-88f3720
-mvebu_mcbin-88f8040
-odroid-c2
-p2371-2180
-pine64_plus
-rpi_3
-vexpress_aemv8a_dram
-vexpress_aemv8a_juno
-vexpress_aemv8a_semi
diff --git a/uboot-tools.spec b/uboot-tools.spec
index da1e0df..06cda1c 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -4,13 +4,12 @@ Name: uboot-tools
Version: 2017.05
Release: 2%{?candidate:.%{candidate}}%{?dist}
Summary: U-Boot utilities
-
-Group: Development/Tools
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
URL:
http://www.denx.de/wiki/U-Boot
+
Source0:
ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2
-Source1: armv7-boards
-Source2: armv8-boards
+Source1: arm-boards
+Source2: aarch64-boards
Patch1: add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
Patch2: u-boot-openssl-1.1.patch
@@ -86,31 +85,23 @@ git config --unset user.email
git config --unset user.name
rm -rf .git
+cp %SOURCE1 %SOURCE2 .
+
%build
mkdir builds
-%ifarch aarch64
-for board in $(cat %SOURCE2)
+%ifarch aarch64 %{arm}
+for board in $(cat %{_arch}-boards)
do
-mkdir builds/$(echo $board)/
-# Needs improving but currently Pine64 is the only one
-if [ "$board" = ""pine64_plus ]; then
- cp /usr/share/arm-trusted-firmware/sun50iw1p1/bl31.bin builds/$(echo $board)/
-fi
-make $(echo $board)_defconfig O=builds/$(echo $board)/
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
O=builds/$(echo $board)/
-done
-
-%endif
-
-%ifarch %{arm}
-for board in $(cat %SOURCE1)
-do
-mkdir builds/$(echo $board)/
-make $(echo $board)_defconfig V=1 O=builds/$(echo $board)/
-make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
O=builds/$(echo $board)/
+ echo "Building board: $board"
+ mkdir builds/$(echo $board)/
+ # Needs improving but currently Pine64 is the only one
+ if [ "$board" = ""pine64_plus ]; then
+ cp /usr/share/arm-trusted-firmware/sun50iw1p1/bl31.bin builds/$(echo $board)/
+ fi
+ make $(echo $board)_defconfig O=builds/$(echo $board)/
+ make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags}
V=1 O=builds/$(echo $board)/
done
-
%endif
make HOSTCC="gcc $RPM_OPT_FLAGS" %{?_smp_mflags} CROSS_COMPILE=""
defconfig V=1 O=builds/
@@ -122,34 +113,20 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/
-%ifarch aarch64
-for board in $(cat %SOURCE2)
-do
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
- for file in spl/*spl.bin u-boot.bin u-boot.dtb u-boot-dtb.img u-boot.img u-boot.itb
spl/sunxi-spl.bin
- do
- if [ -f builds/$(echo $board)/$(echo $file) ]; then
- install -p -m 0644 builds/$(echo $board)/$(echo $file)
$RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
- fi
- done
-done
-%endif
-
-%ifarch %{arm}
-for board in $(cat %SOURCE1)
+%ifarch aarch64 %{arm}
+for board in $(cat %{_arch}-boards)
do
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
- for file in MLO SPL spl/arndale-spl.bin spl/origen-spl.bin spl/smdkv310-spl.bin
spl/*spl.bin u-boot.bin u-boot.dtb u-boot-dtb-tegra.bin u-boot.img u-boot.imx
u-boot-nodtb-tegra.bin u-boot-spl.kwb u-boot-sunxi-with-spl.bin
+ for file in MLO SPL u-boot.bin u-boot.dtb u-boot-dtb-tegra.bin u-boot.img u-boot.imx
u-boot-nodtb-tegra.bin u-boot-spl.kwb u-boot-sunxi-with-spl.bin u-boot.itb
do
if [ -f builds/$(echo $board)/$(echo $file) ]; then
install -p -m 0644 builds/$(echo $board)/$(echo $file)
$RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
fi
done
-
done
# Bit of a hack to remove binaries we don't use as they're large
-for board in $(cat %SOURCE1)
+for board in $(cat %{_arch}-boards)
do
if [ -f $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot-sunxi-with-spl.bin ];
then
rm -f $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.*
@@ -163,11 +140,16 @@ do
if [ -f $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.imx ]; then
rm -f $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.bin
fi
+ if [ -f $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.itb ]; then
+ rm -f $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/*.bin
+ rm -f $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/*.dtb
+ rm -f $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/*.img
+ fi
done
%endif
%ifarch aarch64
-for board in $(cat %SOURCE2)
+for board in $(cat %{_arch}-boards)
do
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
for file in MLO SPL spl/arndale-spl.bin spl/origen-spl.bin spl/smdkv310-spl.bin
u-boot.bin u-boot.dtb u-boot-dtb-tegra.bin u-boot.img u-boot.imx u-boot-nodtb-tegra.bin
u-boot-spl.kwb u-boot-sunxi-with-spl.bin
@@ -194,7 +176,7 @@ done
%endif
%ifarch aarch64
-for board in $(cat %SOURCE2)
+for board in $(cat %{_arch}-boards)
do
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/elf/$(echo $board)/
for file in u-boot
@@ -262,11 +244,12 @@ cp -p board/warp7/README builds/docs/README.warp7
%endif
%changelog
-* Mon May 29 2017 Peter Robinson <pbrobinson(a)fedoraproject.org> 2017.05-02
+* Mon May 29 2017 Peter Robinson <pbrobinson(a)fedoraproject.org> 2017.05-2
+- Spec and build refactoring
- Add distro-boot support for ClearFog
- Add support for building a chained u-boot for nyan-big
-* Tue May 9 2017 Peter Robinson <pbrobinson(a)fedoraproject.org> 2017.05-01
+* Tue May 9 2017 Peter Robinson <pbrobinson(a)fedoraproject.org> 2017.05-1
- 2017.05
* Wed May 3 2017 Peter Robinson <pbrobinson(a)fedoraproject.org> 2017.05-0.7.rc7