From 8d620dae49bb98cd0c210bdb9356c91f5cb94ef6 Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Tue, 8 Nov 2022 14:53:00 +0900 Subject: [PATCH] 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 --- packaging/u-boot-rpi3-32b.spec | 25 ------------------------- packaging/u-boot-rpi3.spec | 25 ------------------------- packaging/u-boot-rpi4-32b.spec | 24 ++++++++++++++++++++++++ packaging/u-boot-rpi4.spec | 24 ++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 50 deletions(-) diff --git a/packaging/u-boot-rpi3-32b.spec b/packaging/u-boot-rpi3-32b.spec index bba6013652..12de70f6dd 100644 --- 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 7b98cf3f08..92e0d5ab1d 100644 --- 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 0dc8e1ff5c..2c07cc3ea9 100644 --- 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 548edaa06f..f18d764130 100644 --- 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 -- 2.34.1