diff options
author | Chris Johns <chrisj@rtems.org> | 2019-07-14 15:11:46 +1000 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2019-07-22 09:36:38 +1000 |
commit | 831ae05364bca67088ddbe07cdc611300ee806c7 (patch) | |
tree | 6599c8255414852468fba0a10704d6fef5da698e /source-builder | |
parent | sb/setbuilder: Support staging of build set build before installing. (diff) | |
download | rtems-source-builder-831ae05364bca67088ddbe07cdc611300ee806c7.tar.bz2 |
rtems/bsp: Build packages for the beagle BSP.
Closes #3769
Diffstat (limited to 'source-builder')
-rw-r--r-- | source-builder/config/libpng-1.cfg | 2 | ||||
-rw-r--r-- | source-builder/config/libtiff-1.cfg | 3 | ||||
-rw-r--r-- | source-builder/config/lwip-1.cfg | 2 | ||||
-rw-r--r-- | source-builder/config/microwindows-1.cfg | 5 | ||||
-rw-r--r-- | source-builder/config/nxlib-1.cfg | 3 | ||||
-rw-r--r-- | source-builder/defaults.mc | 7 | ||||
-rw-r--r-- | source-builder/sb/setbuilder.py | 8 |
7 files changed, 18 insertions, 12 deletions
diff --git a/source-builder/config/libpng-1.cfg b/source-builder/config/libpng-1.cfg index dac60fc..adf0286 100644 --- a/source-builder/config/libpng-1.cfg +++ b/source-builder/config/libpng-1.cfg @@ -17,8 +17,6 @@ URL: http://www.libpng.org/ # # libpng Source # -#%source set libpng ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng%{libpng_src_dir_revision}/libpng-%{libpng_version}.tar.gz - %source set libpng --rsb-file=libpng-%{libpng_version}.tar.xz http://prdownloads.sourceforge.net/libpng/libpng-%{libpng_version}.tar.xz?download # diff --git a/source-builder/config/libtiff-1.cfg b/source-builder/config/libtiff-1.cfg index c9da951..79b84aa 100644 --- a/source-builder/config/libtiff-1.cfg +++ b/source-builder/config/libtiff-1.cfg @@ -12,7 +12,7 @@ Name: libtiff-v%{tiff_version}-%{_host}-%{release} Summary: libtiff provides support for the Tag Image File Format (TIFF), a widely used format for storing image data. Version: %{tiff_version} Release: %{release} -URL: http://www.libtiff.org/ +URL: http://www.libtiff.org/ # # libtiff Source @@ -55,7 +55,6 @@ URL: http://www.libtiff.org/ --with-docdir=%{_datarootdir}/doc \ --disable-shared - %{__make} %{?_smp_mflags} all cd ${build_top} diff --git a/source-builder/config/lwip-1.cfg b/source-builder/config/lwip-1.cfg index ef736c1..9c3fba8 100644 --- a/source-builder/config/lwip-1.cfg +++ b/source-builder/config/lwip-1.cfg @@ -40,9 +40,9 @@ URL: http://git.savannah.gnu.org/cgit/lwip.git cd ${build_dir} %{host_build_flags} + %{rtems_makefile_inc} cd ${build_top}/lwip-%{lwip_version} - export RTEMS_MAKEFILE_PATH=%{_exec_prefix} %{__make} all # cd ${build_top} diff --git a/source-builder/config/microwindows-1.cfg b/source-builder/config/microwindows-1.cfg index 6ec3f30..0aef8c1 100644 --- a/source-builder/config/microwindows-1.cfg +++ b/source-builder/config/microwindows-1.cfg @@ -43,9 +43,8 @@ URL: http://www.microwindows.org/ cd ${build_dir}/src cp -r ${build_top}/${source_dir_microwindows}/src/* . - #%{host_build_flags} - - export RTEMS_MAKEFILE_PATH=%{rtems_bsp_prefix} + %{host_build_flags} + %{rtems_makefile_inc} %{__make} -f Makefile.rtems CONFIG=`pwd`/Configs/config.rtems -k all diff --git a/source-builder/config/nxlib-1.cfg b/source-builder/config/nxlib-1.cfg index 32cbb62..d177aa4 100644 --- a/source-builder/config/nxlib-1.cfg +++ b/source-builder/config/nxlib-1.cfg @@ -43,7 +43,8 @@ URL: http://www.microwindows.org/ cd ${build_dir} cp -r ${build_top}/${source_dir_nxlib}/* . - export RTEMS_MAKEFILE_PATH=%{_exec_prefix} + %{host_build_flags} + %{rtems_makefile_inc} make -f Makefile.rtems diff --git a/source-builder/defaults.mc b/source-builder/defaults.mc index ce5d2b0..13c34cb 100644 --- a/source-builder/defaults.mc +++ b/source-builder/defaults.mc @@ -410,3 +410,10 @@ win_1253,win_1254,win_1255,win_1256,win_1257,win_1258''' # prefix as part of the path as just a path. # waf_build_root_suffix: none, none, ' %(echo %{_prefix} | cut -c 1-2)' + +# Makefile.inc support for staging +rtems_makefile_inc: none, none, ''' +export RTEMS_ROOT=%{rtems_bsp_rtems_root} +export PROJECT_RELEASE=%{rtems_bsp_prefix} +export RTEMS_MAKEFILE_PATH=%{rtems_bsp_prefix} +''' diff --git a/source-builder/sb/setbuilder.py b/source-builder/sb/setbuilder.py index d0a119f..425318b 100644 --- a/source-builder/sb/setbuilder.py +++ b/source-builder/sb/setbuilder.py @@ -575,9 +575,11 @@ class buildset: staging_size = path.get_size(stagingroot) if not self.opts.no_clean() or self.opts.always_clean(): log.notice('clean staging: %s' % (self.bset)) - log.trace('cleanup: %s' % (stagingroot)) - self.rmdir(stagingroot) - log.notice('Staging Size: %s' % (build.humanize_number(staging_size))) + log.trace('removing: %s' % (stagingroot)) + if not self.opts.dry_run(): + if path.exists(stagingroot): + path.removeall(stagingroot) + log.notice('Staging Size: %s' % (build.humanize_number(staging_size, 'B'))) except error.general as gerr: if not build_error: log.stderr(str(gerr)) |