percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-02 18:45:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix building different architectures on one one machine

Browse Source
This commit is contained in:
Evgeniy Patlan
2017-02-13 17:14:10 +02:00
parent cfc705bf91
commit 0cda320cdf
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
util/build-packages
View File

@@ -90,9 +90,9 @@ TAR=${TAR:-tar}
check_branch() { check_branch() {
echo -n "Checking branch... " echo -n "Checking branch... "
local clean_branch=$(git status --porcelain|wc -l) local clean_branch=$(git status --porcelain|wc -l)
# if [ "$clean_branch" -gt 0 ]; then if [ "$clean_branch" -gt 0 ]; then
# die "The branch has uncommitted changes or unknown files" die "The branch has uncommitted changes or unknown files"
# fi fi
echo "OK" echo "OK"
} }
@@ -110,21 +110,21 @@ check_changelog() {
echo -n "Checking Changelog... " echo -n "Checking Changelog... "
cd $BRANCH cd $BRANCH
first_line=$(head -n 3 Changelog | tail -n 1) first_line=$(head -n 3 Changelog | tail -n 1)
# if [ $(expr "$first_line" : "v[0-9]") -gt 0 ]; then if [ $(expr "$first_line" : "v[0-9]") -gt 0 ]; then
# die "No changes since $first_line" die "No changes since $first_line"
# fi fi
# if [ -n "$(grep "^v$VERSION" Changelog)" ]; then if [ -n "$(grep "^v$VERSION" Changelog)" ]; then
# die "Entries for v$VERSION already exist" die "Entries for v$VERSION already exist"
# fi fi
echo "OK" echo "OK"
} }
check_rel_notes() { check_rel_notes() {
echo -n "Checking release_notes.rst... " echo -n "Checking release_notes.rst... "
cd $DOCS_DIR cd $DOCS_DIR
# if [ -n "$(grep "^v$VERSION" release_notes.rst)" ]; then if [ -n "$(grep "^v$VERSION" release_notes.rst)" ]; then
# die "Entries for v$VERSION already exist" die "Entries for v$VERSION already exist"
# fi fi
echo "OK" echo "OK"
} }
@@ -366,13 +366,13 @@ build_rpm() {
mkdir -p RPM mkdir -p RPM
cd rpm cd rpm
local topdir=`pwd` local topdir=`pwd`
# Build RPM package from the tarball. # Build RPM package from the tarball.
rpmbuild -bb --clean $RPM_CONFIG_DIR/percona-toolkit.spec \ rpmbuild -bb --clean $RPM_CONFIG_DIR/percona-toolkit.spec \
--quiet \ --quiet \
--define "_topdir $PWD" \ --define "_topdir $PWD" \
--define "_sourcedir $RELEASE_DIR" \ --define "_sourcedir $RELEASE_DIR" \
--define "version $VERSION" \ --define "version $VERSION" \
--target=$ARCH \
--define "release 1" > $tmpdir/rpmbuild 2>&1 --define "release 1" > $tmpdir/rpmbuild 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
warn "rpmbuild has warnings; see $tmpdir/rpmbuild" warn "rpmbuild has warnings; see $tmpdir/rpmbuild"
@@ -406,7 +406,7 @@ build_deb() {
# Build Debian binary and source packages. # Build Debian binary and source packages.
cd $RELEASE_DIR/$PKG cd $RELEASE_DIR/$PKG
dpkg-buildpackage -us -uc >$tmpdir/dpkg-buildpackage 2>&1 dpkg-buildpackage -us -uc -a$DEB_ARCH >$tmpdir/dpkg-buildpackage 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
warn "dpkg-buildpackage has warnings; see $tmpdir/dpkg-buildpackage" warn "dpkg-buildpackage has warnings; see $tmpdir/dpkg-buildpackage"
fi fi