diff options
author | Chris Johns <chrisj@rtems.org> | 2017-04-12 11:03:01 +1000 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2017-04-12 11:03:01 +1000 |
commit | 34dfc163ae344a267fbd523c358762f0f1263c2e (patch) | |
tree | 419d889cd5ac74a7169666559546afe0147c67b5 | |
parent | Use defaults for compress. (diff) | |
download | rtems-release-34dfc163ae344a267fbd523c358762f0f1263c2e.tar.bz2 |
Use the top level rtems-tools and kernel packages. These are stamped.
The rtems-release-source packages are not version stamped so are not
suitable.
Clean any empty git repos if found. Creating rtems-tools and kernel
packages creates git source which is not allowed for a release.
-rwxr-xr-x | rtems-release-sources | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/rtems-release-sources b/rtems-release-sources index 1c823c9..39b3c40 100755 --- a/rtems-release-sources +++ b/rtems-release-sources @@ -113,7 +113,24 @@ cd ${release} --without-error-report \ --without-release-url \ ${rtems_pkgs} - + # + # Remove the top level packages because they do not have a VERSION file. + # + # These packages may or will be referencing git so remove those as well. + # + for p in rtems-tools rtems + do + rm sources/${p}-${release}.tar.${comp_ext} + rm -rf sources/git/${p}.git + done + # + # Remove the git, svn or cvs directory if empty. + # + for d in git svn cvs + do + find sources/${d} -type d -empty -delete + done + # # If git, svn or cvs exist the release fails. # if [ -d sources/git -o -d sources/svn -o -d sources/cvs ]; then @@ -137,7 +154,14 @@ cd ${release} --without-release-url \ ${bare_pkgs} # - # If svn or cvs exist the release fails. + # Remove the git, svn or cvs directory if empty. + # + for d in git svn cvs + do + find sources/${d} -type d -empty -delete + done + # + # If svn or cvs exist the release fails. Git is ok. # if [ -d sources/svn -o -d sources/cvs ]; then echo "error: ${release} contains repositories and cannot be released." @@ -179,6 +203,16 @@ cd ${release} rm -rf ${workspace} + # + # Copy the stamped packages from the top level release directory to the + # sources directory. The RSB requires all source be in the `sources` + # directory under the release URL. + # + for p in rtems-tools rtems + do + cp ${p}-${release}.tar.${comp_ext} sources/${p}-${release}.tar.${comp_ext} + done + cd sources rm -f ${checksum}sum.txt for f in $(ls -1) |