From: Marek Szyprowski Date: Tue, 16 Nov 2021 13:05:00 +0000 (+0100) Subject: tizen: update specs after v2021.10 rebase and cleanup X-Git-Tag: submit/tizen/20211123.233157~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef420b834218783f3a8d60ff70864340c734c539;p=platform%2Fkernel%2Fu-boot.git tizen: update specs after v2021.10 rebase and cleanup Local, outdated copy of the dtc in tools/dtc has been removed, so the specs need to be adjusted for this. Signed-off-by: Marek Szyprowski --- diff --git a/packaging/u-boot-amlogic.spec b/packaging/u-boot-amlogic.spec index 2062a96..cfbbff7 100644 --- a/packaging/u-boot-amlogic.spec +++ b/packaging/u-boot-amlogic.spec @@ -15,8 +15,10 @@ Source0: u-boot-%{version}.tar.bz2 Source1001: u_boot_amlogic.manifest BuildRequires: gcc >= 6.0 +BuildRequires: bc BuildRequires: flex BuildRequires: bison +BuildRequires: libopenssl1.1-devel %description u-boot - Tizen bootloader for Embedded boards based on ARM processor @@ -109,9 +111,6 @@ for i in %{TARGETS}; do # 1-0. Clean make mrproper - # 1-1. Build dtc - make HOSTCC="gcc $RPM_OPT_FLAGS" -C tools/dtc - # 1-2. Set configuration make ${target}_defconfig @@ -121,7 +120,7 @@ for i in %{TARGETS}; do make HOSTCC="gcc $RPM_OPT_FLAGS" envtools # 1-4. Build u-boot - export PATH="$PATH:tools:tools/dtc/" + export PATH="$PATH:tools:" make %{?_smp_mflags} EXTRAVERSION=`echo %{vcs} | sed 's/.*u-boot.*#\(.\{9\}\).*/-g\1-TIZEN.org/'` # 1-5. Encryption diff --git a/packaging/u-boot-rpi3-32b.spec b/packaging/u-boot-rpi3-32b.spec index 10ead0f..98f9618 100644 --- a/packaging/u-boot-rpi3-32b.spec +++ b/packaging/u-boot-rpi3-32b.spec @@ -10,8 +10,10 @@ Source0: u-boot-%{version}.tar.bz2 Source1001: u_boot_rpi3.manifest BuildRequires: gcc >= 6.0 +BuildRequires: bc BuildRequires: flex BuildRequires: bison +BuildRequires: libopenssl1.1-devel %description u-boot - Tizen bootloader for RPI3 boards based @@ -19,7 +21,6 @@ u-boot - Tizen bootloader for RPI3 boards based %package -n u-boot-tools Summary: Companion tools for Das U-Boot bootloader Group: System/Kernel -Provides: dtc %description -n u-boot-tools This package includes the mkimage program, which allows generation of U-Boot @@ -38,9 +39,6 @@ CONFIG=rpi_3_32b_defconfig make mrproper -# Build dtc -make HOSTCC="gcc $RPM_OPT_FLAGS" -C tools/dtc - # Set configuration make $CONFIG @@ -50,7 +48,7 @@ make %{?_smp_mflags} HOSTCC="gcc $RPM_OPT_FLAGS" HOSTSTRIP=/bin/true tools make HOSTCC="gcc $RPM_OPT_FLAGS" envtools # Build u-boot -export PATH="$PATH:tools:tools/dtc/" +export PATH="$PATH:tools" make %{?_smp_mflags} EXTRAVERSION=`echo %{vcs} | sed 's/.*u-boot.*#\(.\{9\}\).*/-g\1-TIZEN.org/'` # Generate uboot.env @@ -68,7 +66,6 @@ rm -rf %{buildroot} 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 tools/dtc/dtc %{buildroot}%{_bindir} ( cd %{buildroot}%{_bindir}; ln -sf fw_printenv fw_setenv ) # u-boot installation @@ -92,4 +89,3 @@ install -m 755 boot.scr.uimg %{buildroot}/boot/ %{_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 c49a4af..34994e3 100644 --- a/packaging/u-boot-rpi3.spec +++ b/packaging/u-boot-rpi3.spec @@ -10,8 +10,10 @@ Source0: u-boot-%{version}.tar.bz2 Source1001: u_boot_rpi3.manifest BuildRequires: gcc >= 6.0 +BuildRequires: bc BuildRequires: flex BuildRequires: bison +BuildRequires: libopenssl1.1-devel %description u-boot - Tizen bootloader for RPI3 boards based @@ -19,7 +21,6 @@ u-boot - Tizen bootloader for RPI3 boards based %package -n u-boot-tools Summary: Companion tools for Das U-Boot bootloader Group: System/Kernel -Provides: dtc %description -n u-boot-tools This package includes the mkimage program, which allows generation of U-Boot @@ -38,9 +39,6 @@ CONFIG=rpi_3_defconfig make mrproper -# Build dtc -make HOSTCC="gcc $RPM_OPT_FLAGS" -C tools/dtc - # Set configuration make $CONFIG @@ -50,7 +48,7 @@ make %{?_smp_mflags} HOSTCC="gcc $RPM_OPT_FLAGS" HOSTSTRIP=/bin/true tools make HOSTCC="gcc $RPM_OPT_FLAGS" envtools # Build u-boot -export PATH="$PATH:tools:tools/dtc/" +export PATH="$PATH:tools" make %{?_smp_mflags} EXTRAVERSION=`echo %{vcs} | sed 's/.*u-boot.*#\(.\{9\}\).*/-g\1-TIZEN.org/'` # Generate params.bin @@ -68,7 +66,6 @@ rm -rf %{buildroot} 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 tools/dtc/dtc %{buildroot}%{_bindir} ( cd %{buildroot}%{_bindir}; ln -sf fw_printenv fw_setenv ) # u-boot installation @@ -92,4 +89,3 @@ install -m 755 boot.scr.uimg %{buildroot}/boot/ %{_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 5ad335f..5a273e8 100644 --- a/packaging/u-boot-rpi4-32b.spec +++ b/packaging/u-boot-rpi4-32b.spec @@ -10,8 +10,10 @@ Source0: u-boot-%{version}.tar.bz2 Source1001: u_boot_rpi4.manifest BuildRequires: gcc >= 6.0 +BuildRequires: bc BuildRequires: flex BuildRequires: bison +BuildRequires: libopenssl1.1-devel %description u-boot - Tizen bootloader for RPI4 boards based @@ -27,9 +29,6 @@ CONFIG=rpi_4_32b_defconfig make mrproper -# Build dtc -make HOSTCC="gcc $RPM_OPT_FLAGS" -C tools/dtc - # Set configuration make $CONFIG @@ -39,7 +38,7 @@ make %{?_smp_mflags} HOSTCC="gcc $RPM_OPT_FLAGS" HOSTSTRIP=/bin/true tools make HOSTCC="gcc $RPM_OPT_FLAGS" envtools # Build u-boot -export PATH="$PATH:tools:tools/dtc/" +export PATH="$PATH:tools" make %{?_smp_mflags} EXTRAVERSION=`echo %{vcs} | sed 's/.*u-boot.*#\(.\{9\}\).*/-g\1-TIZEN.org/'` # Generate uboot.env diff --git a/packaging/u-boot-rpi4.spec b/packaging/u-boot-rpi4.spec index 1ed4f9c..f4d7a95 100644 --- a/packaging/u-boot-rpi4.spec +++ b/packaging/u-boot-rpi4.spec @@ -10,8 +10,10 @@ Source0: u-boot-%{version}.tar.bz2 Source1001: u_boot_rpi4.manifest BuildRequires: gcc >= 6.0 +BuildRequires: bc BuildRequires: flex BuildRequires: bison +BuildRequires: libopenssl1.1-devel %description u-boot - Tizen bootloader for RPI4 boards based @@ -27,9 +29,6 @@ CONFIG=rpi_4_defconfig make mrproper -# Build dtc -make HOSTCC="gcc $RPM_OPT_FLAGS" -C tools/dtc - # Set configuration make $CONFIG @@ -39,7 +38,7 @@ make %{?_smp_mflags} HOSTCC="gcc $RPM_OPT_FLAGS" HOSTSTRIP=/bin/true tools make HOSTCC="gcc $RPM_OPT_FLAGS" envtools # Build u-boot -export PATH="$PATH:tools:tools/dtc/" +export PATH="$PATH:tools" make %{?_smp_mflags} EXTRAVERSION=`echo %{vcs} | sed 's/.*u-boot.*#\(.\{9\}\).*/-g\1-TIZEN.org/'` # Generate uboot.env