Skip to content

Commit

Permalink
Bug Fix - RPM missing genesisfiles and Debian package misnamed (#1677)
Browse files Browse the repository at this point in the history
  • Loading branch information
bricerisingalgorand authored Oct 30, 2020
1 parent fcd3fd9 commit cccd1bf
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion scripts/release/mule/package/deb/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ BRANCH=${BRANCH:-$(./scripts/compute_branch.sh)}
CHANNEL=${CHANNEL:-$(./scripts/compute_branch_channel.sh "$BRANCH")}
VERSION=${VERSION:-$(./scripts/compute_build_number.sh -f)}
# A make target in Makefile.mule may pass the name as an argument.
ALGORAND_PACKAGE_NAME=${1:-$(./scripts/compute_package_name.sh "$CHANNEL")}
PACKAGE_NAME="$1"

DEFAULTNETWORK=${DEFAULTNETWORK:-$(./scripts/compute_branch_network.sh "$BRANCH")}
DEFAULT_RELEASE_NETWORK=$("./scripts/compute_branch_release_network.sh" "$DEFAULTNETWORK")
Expand All @@ -21,6 +21,7 @@ find tmp/node_pkgs -name "*${CHANNEL}*linux*${VERSION}*.tar.gz" | cut -d '/' -f3
PKG_ROOT=$(mktemp -d)
trap "rm -rf $PKG_ROOT" 0

ALGORAND_PACKAGE_NAME=$(./scripts/compute_package_name.sh "$CHANNEL" "$PACKAGE_NAME")
mkdir -p "${PKG_ROOT}/usr/bin"
OS_TYPE=$(echo "${OS_ARCH}" | cut -d '/' -f1)
ARCH=$(echo "${OS_ARCH}" | cut -d '/' -f2)
Expand Down
2 changes: 1 addition & 1 deletion scripts/release/mule/package/rpm/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ find tmp/node_pkgs -name "*${CHANNEL}*linux*${FULLVERSION}*.tar.gz" | cut -d '/'
-e "s,@REQUIRED_ALGORAND_PKG@,$REQUIRED_ALGORAND_PACKAGE," \
> "$TEMPDIR/$ALGORAND_PACKAGE_NAME.spec"

rpmbuild --buildroot "$HOME/foo" --define "_rpmdir $RPMTMP" --define "RELEASE_GENESIS_PROCESS x$RELEASE_GENESIS_PROCESS" --define "LICENSE_FILE ./COPYING" -bb "$TEMPDIR/$ALGORAND_PACKAGE_NAME.spec" --target $ARCH_UNAME
rpmbuild --buildroot "$HOME/foo" --define "_rpmdir $RPMTMP" --define "RELEASE_GENESIS_PROCESS xtrue" --define "LICENSE_FILE ./COPYING" -bb "$TEMPDIR/$ALGORAND_PACKAGE_NAME.spec" --target $ARCH_UNAME

cp -p "$RPMTMP"/*/*.rpm "./tmp/node_pkgs/$OS_TYPE/$ARCH_TYPE"
echo "${RPMTMP}"
Expand Down

0 comments on commit cccd1bf

Please sign in to comment.