[uboot-tools/f13/master] updated to to 2011.03 build the tool for manipulation with environment only on arm

[Dan Horák]

commit 9aeb92aa133e9452d2fc12cbde80f60ad96a6787
Author: Dan Horák <dan at danny.cz>
Date:   Thu Apr 14 15:26:30 2011 +0200

    updated to to 2011.03
    build the tool for manipulation with environment only on arm
    
    Conflicts:
    
    	uboot-tools.spec

 .gitignore                        |    1 +
 sources                           |    2 +-
 u-boot-2010.03-env-makefile.patch |   26 --------------------------
 uboot-tools.spec                  |   32 ++++++++++++++++++++++++++------
 4 files changed, 28 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 34b63d9..05018d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 u-boot-2010.03.tar.bz2
+/u-boot-2011.03.tar.bz2
diff --git a/sources b/sources
index 9bf3e8a..493d99e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2bf5ebf497dddc52440b1ea386cc1332  u-boot-2010.03.tar.bz2
+91d02124c94368557d0e9ac05fb8c33f  u-boot-2011.03.tar.bz2
diff --git a/uboot-tools.spec b/uboot-tools.spec
index bff0209..5f25e43 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -1,5 +1,5 @@
 Name:           uboot-tools
-Version:        2010.03
+Version:        2011.03
 Release:        1%{?dist}
 Summary:        U-Boot utilities
 
@@ -7,9 +7,13 @@ Group:          Development/Tools
 License:        GPLv2+
 URL:            http://www.denx.de/wiki/U-Boot
 Source0:        ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
-Patch0:         u-boot-2010.03-env-makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# build the tool for manipulation with environment only on arm
+%ifarch %{arm}
+%global with_env 1
+%endif
+
 
 %description
 This package contains a few U-Boot utilities - mkimage for creating boot images
@@ -18,7 +22,6 @@ and fw_printenv/fw_setenv for manipulating the boot environment variables.
 
 %prep
 %setup -q -n u-boot-%{version}
-%patch0 -p1
 
 
 %build
@@ -27,10 +30,15 @@ make sheevaplug_config
 # create files normally created by cross-compiler
 touch include/autoconf.mk
 touch include/autoconf.mk.dep
-touch {cpu/arm926ejs,examples/standalone,tools,tools/env}/.depend
+mkdir include/generated
+touch include/generated/generic-asm-offsets.h
+touch lib/asm-offsets.s
+touch {arch/arm/cpu/arm926ejs,examples/standalone,tools,tools/env}/.depend
 
 make tools HOSTCC="gcc $RPM_OPT_FLAGS" HOSTSTRIP=/bin/true CROSS_COMPILE=""
-make env CC="gcc $RPM_OPT_FLAGS"
+%if 0%{?with_env}
+make env HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
+%endif
 
 
 %install
@@ -38,12 +46,17 @@ rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 
 install -p -m 0755 tools/mkimage $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0644 doc/mkimage.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
+%if 0%{?with_env}
 install -p -m 0755 tools/env/fw_printenv $RPM_BUILD_ROOT%{_bindir}
 ( cd $RPM_BUILD_ROOT%{_bindir}; ln -sf fw_printenv fw_setenv )
 
 install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
+%endif
 
 
 %clean
@@ -52,14 +65,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README doc/uImage.FIT
+%doc COPYING README doc/README.imximage doc/README.kwbimage doc/uImage.FIT
 %{_bindir}/mkimage
+%{_mandir}/man1/mkimage.1*
+%if 0%{?with_env}
 %{_bindir}/fw_printenv
 %{_bindir}/fw_setenv
 %config(noreplace) %{_sysconfdir}/fw_env.config
+%endif
 
 
 %changelog
+* Thu Apr 14 2011 Dan Horák <dan[at]danny.cz> - 2011.03-1
+- updated to to 2011.03
+- build the tool for manipulation with environment only on arm
+
 * Thu May 27 2010 Dan Horák <dan[at]danny.cz> 2010.03-1
 - updated to to 2010.03
 - applied review feedback - added docs and expanded description