From 568d0172a478e4a23c8d5642466db3de0771a262 Mon Sep 17 00:00:00 2001 From: Robert Rosengren Date: Tue, 23 Nov 2010 13:37:38 +0100 Subject: MeeGo: spec-file prepared for other variants The u-boot spec-file is prepared for customized MeeGo products. The idea is to add new spec files with the main spec as template, changing the necessary configuration. From OBS perspective, a new linkpac should be created with the same name as the spec file (hence triggering build of the variant). ST-Ericsson ID: AP280926 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ie51a3c2ecbcd5b71aefa988efa5bc3758079093f Signed-off-by: Robert Rosengren Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/9338 Reviewed-by: Markus HELGESSON Reviewed-by: Oscar EKBLADH Reviewed-by: Olle TRANK Reviewed-by: Robert MARKLUND Reviewed-by: Michael BRANDT --- u-boot-u8500.changes | 19 +++++++++++++ u-boot-u8500.spec | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++ u-boot.changes | 17 ----------- u-boot.spec | 78 -------------------------------------------------- 4 files changed, 99 insertions(+), 95 deletions(-) create mode 100644 u-boot-u8500.changes create mode 100644 u-boot-u8500.spec delete mode 100644 u-boot.changes delete mode 100644 u-boot.spec diff --git a/u-boot-u8500.changes b/u-boot-u8500.changes new file mode 100644 index 000000000..164414aca --- /dev/null +++ b/u-boot-u8500.changes @@ -0,0 +1,19 @@ +* Tue Nov 23 2010 Robert Rosengren - 2009.11-2 +- Renamed u-boot packages to u8500 to easier handle u-boot variants +* Thu Nov 11 2010 Robert Rosengren - 2009.11-1 +- Upgraded u-boot that handles TOC partitions. Also removed incorrect git commit + from the RPM version. +* Tue Sep 28 2010 Robert Rosengren - 2009.11_00012_g7e89ff9 +- Spec file cleanup. +* Fri Aug 06 2010 Johann Dischler - 2009.11_00012_g7e89ff9 +- Update verion to 2009.11_00012_g7e89ff9 +* Tue Jun 29 2010 Olle Tränk - 1.3.1 +- Removed unnecessary source package. Fixed RPMLINT + warnings/errors, added rpmlintrc to supress false positive. + Cleaned .spec file. +* Wed Jun 09 2010 Robert Rosengren - 1.3.1 +- Added patch 3: u-boot-increase-default-kernel-load-size-to-0x220000 +* Mon Jun 07 2010 Olle Tränk - 1.3.1 +- Added patches to src package +* Wed Jun 03 2010 Olle Tränk - 1.3.1 +- Initial STE version \ No newline at end of file diff --git a/u-boot-u8500.spec b/u-boot-u8500.spec new file mode 100644 index 000000000..fdb5e47f8 --- /dev/null +++ b/u-boot-u8500.spec @@ -0,0 +1,80 @@ +#Defines +%define base_name u-boot +%define variant_name u8500 +%define base_version 2009.11 +%define boot_path /boot + +Name: %{base_name}-%{variant_name} +Release: 2 +Version: %{base_version} +License: GPL +URL: http://www.denx.de/wiki/U-Boot +Source0: %{base_name}-%{base_version}.tar.bz2 +Source100: %{base_name}-rpmlintrc + +Summary: Das U-Boot boot loader binary +Group: Binary + +%description +This package contains the source code for Das U-Boot. + +U-Boot is a boot loader for Embedded boards based on PowerPC, ARM, +MIPS and several other processors, which can be installed in a boot +ROM and used to initialize and test the hardware or to download and +run application code. + +%package -n %{base_name}-tools +Summary: Das U-Boot boot image maker +Group: Development/Tools + +%description -n %{base_name}-tools +U-Boot utility for creating bootable kernel images. + +%prep +%setup -q -n %{base_name}-%{base_version} + +%build +#Make default config for variant +make %{variant_name}_def_config + +#Build-id needed/wanted by rpmbuild +export LDFLAGS="$LDFLAGS --build-id" + +make u-boot + +#Additional tools +make -C tools/mk_envimg + +%install +#Build-id needed by rpm +export LDFLAGS="$LDFLAGS --build-id" + +#Binaries +mkdir -p %{buildroot}%{_bindir} %{buildroot}%{boot_path} +install -m 755 %{_builddir}/u-boot-%{base_version}/u-boot %{buildroot}%{boot_path} +install -m 644 %{_builddir}/u-boot-%{base_version}/u-boot.map %{buildroot}%{boot_path} +install -m 644 %{_builddir}/u-boot-%{base_version}/u-boot.lds %{buildroot}%{boot_path} +install -m 755 %{_builddir}/u-boot-%{base_version}/tools/mkimage %{buildroot}%{_bindir} +install -m 755 %{_builddir}/u-boot-%{base_version}/tools/img2srec %{buildroot}%{_bindir} +install -m 755 %{_builddir}/u-boot-%{base_version}/tools/mk_envimg/mk_envimg %{buildroot}%{_bindir} +install -m 644 %{_builddir}/u-boot-%{base_version}/tools/logos/ste-rgb565.bin %{buildroot}%{boot_path}/splash.bin + +#Remove unwanted sections +objcopy --gap-fill=0xff --remove-section=.note.gnu.build-id -O binary %{buildroot}%{boot_path}/u-boot %{buildroot}%{boot_path}/u-boot.bin + +%clean +rm -rf %{buildroot}/* + +%files +%defattr(-,root,root) +%{boot_path}/u-boot.bin +%{boot_path}/u-boot.map +%{boot_path}/u-boot +%{boot_path}/u-boot.lds +%{boot_path}/splash.bin + +%files -n %{base_name}-tools +%defattr(-,root,root) +%{_bindir}/mkimage +%{_bindir}/img2srec +%{_bindir}/mk_envimg diff --git a/u-boot.changes b/u-boot.changes deleted file mode 100644 index 5f6d7f033..000000000 --- a/u-boot.changes +++ /dev/null @@ -1,17 +0,0 @@ -* Thu Nov 11 2010 Robert Rosengren - 2009.11 -- Upgraded u-boot that handles TOC partitions. Also removed incorrect git commit - from the RPM version. -* Tue Sep 28 2010 Robert Rosengren - 2009.11_00012_g7e89ff9 -- Spec file cleanup. -* Fri Aug 06 2010 Johann Dischler - 2009.11_00012_g7e89ff9 -- Update verion to 2009.11_00012_g7e89ff9 -* Tue Jun 29 2010 Olle Tränk - 1.3.1 -- Removed unnecessary source package. Fixed RPMLINT - warnings/errors, added rpmlintrc to supress false positive. - Cleaned .spec file. -* Wed Jun 09 2010 Robert Rosengren - 1.3.1 -- Added patch 3: u-boot-increase-default-kernel-load-size-to-0x220000 -* Mon Jun 07 2010 Olle Tränk - 1.3.1 -- Added patches to src package -* Wed Jun 03 2010 Olle Tränk - 1.3.1 -- Initial STE version \ No newline at end of file diff --git a/u-boot.spec b/u-boot.spec deleted file mode 100644 index 253fb9175..000000000 --- a/u-boot.spec +++ /dev/null @@ -1,78 +0,0 @@ -#Defines -%define base_version 2009.11 -%define boot_path /boot - -Name: u-boot -Release: 1 -Version: %{base_version} -License: GPL -URL: http://www.denx.de/wiki/U-Boot -Source0: %{name}-%{base_version}.tar.bz2 -Source100: %{name}-rpmlintrc - -Summary: Das U-Boot boot loader binary -Group: Binary - -%description -This package contains the source code for Das U-Boot. - -U-Boot is a boot loader for Embedded boards based on PowerPC, ARM, -MIPS and several other processors, which can be installed in a boot -ROM and used to initialize and test the hardware or to download and -run application code. - -%package tools -Summary: Das U-Boot boot image maker -Group: Development/Tools - -%description tools -U-Boot utility for creating bootable kernel images. - -%prep -%setup -q - -%build -#Default config for u8500 -make u8500_def_config - -#Build-id needed/wanted by rpmbuild -export LDFLAGS="$LDFLAGS --build-id" - -make u-boot - -#Additional tools -make -C tools/mk_envimg - -%install -#Build-id needed by rpm -export LDFLAGS="$LDFLAGS --build-id" - -#Binaries -mkdir -p %{buildroot}%{_bindir} %{buildroot}%{boot_path} -install -m 755 %{_builddir}/u-boot-%{base_version}/u-boot %{buildroot}%{boot_path} -install -m 644 %{_builddir}/u-boot-%{base_version}/u-boot.map %{buildroot}%{boot_path} -install -m 644 %{_builddir}/u-boot-%{base_version}/u-boot.lds %{buildroot}%{boot_path} -install -m 755 %{_builddir}/u-boot-%{base_version}/tools/mkimage %{buildroot}%{_bindir} -install -m 755 %{_builddir}/u-boot-%{base_version}/tools/img2srec %{buildroot}%{_bindir} -install -m 755 %{_builddir}/u-boot-%{base_version}/tools/mk_envimg/mk_envimg %{buildroot}%{_bindir} -install -m 644 %{_builddir}/u-boot-%{base_version}/tools/logos/ste-rgb565.bin %{buildroot}%{boot_path}/splash.bin - -#Remove unwanted sections -objcopy --gap-fill=0xff --remove-section=.note.gnu.build-id -O binary %{buildroot}%{boot_path}/u-boot %{buildroot}%{boot_path}/u-boot.bin - -%clean -rm -rf %{buildroot}/* - -%files -%defattr(-,root,root) -%{boot_path}/u-boot.bin -%{boot_path}/u-boot.map -%{boot_path}/u-boot -%{boot_path}/u-boot.lds -%{boot_path}/splash.bin - -%files tools -%defattr(-,root,root) -%{_bindir}/mkimage -%{_bindir}/img2srec -%{_bindir}/mk_envimg -- cgit v1.2.3