diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-12-08 15:43:30 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-12-08 15:43:30 +0100 |
| commit | 40754ccd94cd436b44343aeea25daa49b1c3809d (patch) | |
| tree | cef038bf7ffb5a3700b02275dd526fba883f8d78 /bin | |
| parent | 69fd96d860acd9320652b4d33a5ce73cdfb793d0 (diff) | |
| download | buildscripts-40754ccd94cd436b44343aeea25daa49b1c3809d.tar.gz buildscripts-40754ccd94cd436b44343aeea25daa49b1c3809d.tar.bz2 buildscripts-40754ccd94cd436b44343aeea25daa49b1c3809d.zip | |
fix for last commit
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/build-rpm-package | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/bin/build-rpm-package b/bin/build-rpm-package index d286833..03b31c5 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -155,12 +155,6 @@ clear_pkgdist() { } build_packages() { - - # tar upstream sources from our Git clone - TEMP_DIR="$(mktemp -d --tmpdir=$TEMP_BASE)" - mkdir -p "$TEMP_DIR/$PROJECT" - chmod 2770 "$TEMP_DIR" -Rf - echo "$RPM_BUILD_FOR" | sed -e 's/ /\n/g' | while read line; do l_DIST="$(echo ${line/: /:} | cut -d":" -f1 | tr [:upper:] [:lower:])" l_CODENAMES="${CODENAMES:-$(echo ${line/: /:} | cut -d":" -f2- | sed -e 's/,/ /g' | tr [:upper:] [:lower:])}" @@ -169,6 +163,14 @@ build_packages() { test -z $CODENAMES || echo $line | grep $CODENAMES || break + # create rpmbuild subdirectories + mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SOURCES + + # tar upstream sources from our Git clone + TEMP_DIR="$(mktemp -d --tmpdir=$TEMP_BASE)" + mkdir -p "$TEMP_DIR/$PROJECT" + chmod 2770 "$TEMP_DIR" -Rf + cd "$PROJECT_DIR" git clone --local "$PROJECT_DIR" "$TEMP_DIR/$PROJECT/" cd $TEMP_DIR |