packaging: move u-boot-tools from rpi3 to rpi4

Move u-boot-tools from rpi3 to rpi4.
RPi3 target was deprecated. To remove u-boot-rpi3 spec file, it needs to
move u-boot-tools package into rpi4.

Change-Id: I308af97d06e72e8809eb0194c001e631f915c416
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/packaging/u-boot-rpi3-32b.spec b/packaging/u-boot-rpi3-32b.spec
index bba6013..12de70f 100644 (file)
--- a/packaging/u-boot-rpi3-32b.spec
+++ b/packaging/u-boot-rpi3-32b.spec
@@ -18,16 +18,6 @@ BuildRequires: libopenssl1.1-devel
 %description
 u-boot - Tizen bootloader for RPI3 boards based
 
-%package -n u-boot-tools
-Summary: Companion tools for Das U-Boot bootloader
-Group: System/Kernel
-
-%description -n u-boot-tools
-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.
-
-
 %prep
 %setup -q -n u-boot-%{version}
 
@@ -62,13 +52,6 @@ mkimage -A arm -T script -C none -n "Tizen RPI3 u-boot helper" -d ./tizen/bootsc
 %install
 rm -rf %{buildroot}
 
-# Tools installation
-mkdir -p %{buildroot}%{_bindir}
-install -p -m 0755 tools/mkimage %{buildroot}%{_bindir}
-install -p -m 0755 tools/env/fw_printenv %{buildroot}%{_bindir}
-install -p -m 0755 scripts/dtc/dtc %{buildroot}%{_bindir}
-( cd %{buildroot}%{_bindir}; ln -sf fw_printenv fw_setenv )
-
 # u-boot installation
 mkdir -p %{buildroot}/boot
 install -m 755 u-boot.bin %{buildroot}/boot/
@@ -83,11 +66,3 @@ install -m 755 boot.scr.uimg %{buildroot}/boot/
 /boot/u-boot.bin
 /boot/uboot.env
 /boot/boot.scr.uimg
-
-%files -n u-boot-tools
-%manifest u_boot_rpi3.manifest
-%defattr(-,root,root,-)
-%{_bindir}/mkimage
-%{_bindir}/fw_printenv
-%{_bindir}/fw_setenv
-%{_bindir}/dtc

diff --git a/packaging/u-boot-rpi3.spec b/packaging/u-boot-rpi3.spec
index 7b98cf3..92e0d5a 100644 (file)
--- a/packaging/u-boot-rpi3.spec
+++ b/packaging/u-boot-rpi3.spec
@@ -18,16 +18,6 @@ BuildRequires: libopenssl1.1-devel
 %description
 u-boot - Tizen bootloader for RPI3 boards based
 
-%package -n u-boot-tools
-Summary: Companion tools for Das U-Boot bootloader
-Group: System/Kernel
-
-%description -n u-boot-tools
-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.
-
-
 %prep
 %setup -q -n u-boot-%{version}
 
@@ -62,13 +52,6 @@ mkimage -A arm64 -T script -C none -n "Tizen RPI3 u-boot helper" -d ./tizen/boot
 %install
 rm -rf %{buildroot}
 
-# Tools installation
-mkdir -p %{buildroot}%{_bindir}
-install -p -m 0755 tools/mkimage %{buildroot}%{_bindir}
-install -p -m 0755 tools/env/fw_printenv %{buildroot}%{_bindir}
-install -p -m 0755 scripts/dtc/dtc %{buildroot}%{_bindir}
-( cd %{buildroot}%{_bindir}; ln -sf fw_printenv fw_setenv )
-
 # u-boot installation
 mkdir -p %{buildroot}/boot
 install -m 755 u-boot.bin %{buildroot}/boot/
@@ -83,11 +66,3 @@ install -m 755 boot.scr.uimg %{buildroot}/boot/
 /boot/u-boot.bin
 /boot/uboot.env
 /boot/boot.scr.uimg
-
-%files -n u-boot-tools
-%manifest u_boot_rpi3.manifest
-%defattr(-,root,root,-)
-%{_bindir}/mkimage
-%{_bindir}/fw_printenv
-%{_bindir}/fw_setenv
-%{_bindir}/dtc

diff --git a/packaging/u-boot-rpi4-32b.spec b/packaging/u-boot-rpi4-32b.spec
index 0dc8e1f..2c07cc3 100644 (file)
--- a/packaging/u-boot-rpi4-32b.spec
+++ b/packaging/u-boot-rpi4-32b.spec
@@ -18,6 +18,15 @@ BuildRequires: libopenssl1.1-devel
 %description
 u-boot - Tizen bootloader for RPI4 boards based
 
+%package -n u-boot-tools
+Summary: Companion tools for Das U-Boot bootloader
+Group: System/Kernel
+
+%description -n u-boot-tools
+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.
+
 %prep
 %setup -q -n u-boot-%{version}
 
@@ -52,6 +61,13 @@ mkimage -A arm -T script -C none -n "Tizen RPI4 u-boot helper" -d ./tizen/bootsc
 %install
 rm -rf %{buildroot}
 
+# Tools installation
+mkdir -p %{buildroot}%{_bindir}
+install -p -m 0755 tools/mkimage %{buildroot}%{_bindir}
+install -p -m 0755 tools/env/fw_printenv %{buildroot}%{_bindir}
+install -p -m 0755 scripts/dtc/dtc %{buildroot}%{_bindir}
+( cd %{buildroot}%{_bindir}; ln -sf fw_printenv fw_setenv )
+
 # u-boot installation
 mkdir -p %{buildroot}/boot
 install -m 755 u-boot.bin %{buildroot}/boot/
@@ -66,3 +82,11 @@ install -m 755 boot.scr.uimg %{buildroot}/boot/
 /boot/u-boot.bin
 /boot/uboot.env
 /boot/boot.scr.uimg
+
+%files -n u-boot-tools
+%manifest u_boot_rpi4.manifest
+%defattr(-,root,root,-)
+%{_bindir}/mkimage
+%{_bindir}/fw_printenv
+%{_bindir}/fw_setenv
+%{_bindir}/dtc

diff --git a/packaging/u-boot-rpi4.spec b/packaging/u-boot-rpi4.spec
index 548edaa..f18d764 100644 (file)
--- a/packaging/u-boot-rpi4.spec
+++ b/packaging/u-boot-rpi4.spec
@@ -18,6 +18,15 @@ BuildRequires: libopenssl1.1-devel
 %description
 u-boot - Tizen bootloader for RPI4 boards based
 
+%package -n u-boot-tools
+Summary: Companion tools for Das U-Boot bootloader
+Group: System/Kernel
+
+%description -n u-boot-tools
+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.
+
 %prep
 %setup -q -n u-boot-%{version}
 
@@ -52,6 +61,13 @@ mkimage -A arm64 -T script -C none -n "Tizen RPI4 u-boot helper" -d ./tizen/boot
 %install
 rm -rf %{buildroot}
 
+# Tools installation
+mkdir -p %{buildroot}%{_bindir}
+install -p -m 0755 tools/mkimage %{buildroot}%{_bindir}
+install -p -m 0755 tools/env/fw_printenv %{buildroot}%{_bindir}
+install -p -m 0755 scripts/dtc/dtc %{buildroot}%{_bindir}
+( cd %{buildroot}%{_bindir}; ln -sf fw_printenv fw_setenv )
+
 # u-boot installation
 mkdir -p %{buildroot}/boot
 install -m 755 u-boot.bin %{buildroot}/boot/
@@ -66,3 +82,11 @@ install -m 755 boot.scr.uimg %{buildroot}/boot/
 /boot/u-boot.bin
 /boot/uboot.env
 /boot/boot.scr.uimg
+
+%files -n u-boot-tools
+%manifest u_boot_rpi4.manifest
+%defattr(-,root,root,-)
+%{_bindir}/mkimage
+%{_bindir}/fw_printenv
+%{_bindir}/fw_setenv
+%{_bindir}/dtc