diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-02-16 11:09:08 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-02-16 11:32:53 +0100 |
| commit | 5caa9d877b0de812f2937e69d26f519e59ded09f (patch) | |
| tree | ec9853ac026d52208bd40832a5ff950ce03acd3c /contrib | |
| parent | b04868cb520cbf91d1d77cd282cef9b2fc9fe5ff (diff) | |
| download | NetworkManager-5caa9d877b0de812f2937e69d26f519e59ded09f.tar.gz | |
contrit/rpm: create source tarball from git immidiately in SOURCES directory
Instead of first creating it as "$TEMP/NetworkManager-${VERSION}.tar.xz"
and then copy it to "$TEMP/SOURCES".
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/fedora/rpm/build.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/fedora/rpm/build.sh b/contrib/fedora/rpm/build.sh index 9095db54f2..513d9f2f1f 100755 --- a/contrib/fedora/rpm/build.sh +++ b/contrib/fedora/rpm/build.sh @@ -124,7 +124,8 @@ TEMP="$(mktemp -d "$SCRIPTDIR/NetworkManager.$DATE.XXXXXX")" TEMPBASE="$(basename "$TEMP")" if [[ "$SOURCE_FROM_GIT" == "1" ]]; then - SOURCE="$TEMP/NetworkManager-${VERSION}.tar.xz" + mkdir -p "$TEMP/SOURCES" + SOURCE="$TEMP/SOURCES/NetworkManager-${VERSION}.tar.xz" (cd "$GITDIR" && git archive --prefix="NetworkManager-$VERSION"/ "$COMMIT_FULL") | xz > "$SOURCE" fi @@ -152,7 +153,9 @@ rm -f "$BUILDLOG" TEMPSPEC="$TEMP/SPECS/NetworkManager.spec" mkdir -p "$TEMP/SOURCES/" "$TEMP/SPECS/" || die "error creating SPECS directoy" -cp "$SOURCE" "$TEMP/SOURCES/" || die "Could not copy source $SOURCE to $TEMP/SOURCES" +if [[ "$(dirname "$SOURCE")" != "$TEMP/SOURCES" ]]; then + cp "$SOURCE" "$TEMP/SOURCES/" || die "Could not copy source $SOURCE to $TEMP/SOURCES" +fi cp "$SOURCE_NETWORKMANAGER_CONF" "$TEMP/SOURCES/NetworkManager.conf" || die "Could not copy source $SOURCE_NETWORKMANAGER_CONF to $TEMP/SOURCES" cp "$SOURCE_CONFIG_SERVER" "$TEMP/SOURCES/00-server.conf" || die "Could not copy source $SOURCE_CONFIG_SERVER to $TEMP/SOURCES" cp "$SOURCE_CONFIG_CONNECTIVITY_FEDORA" "$TEMP/SOURCES/20-connectivity-fedora.conf" || die "Could not copy source $SOURCE_CONFIG_CONNECTIVITY_FEDORA to $TEMP/SOURCES" |