Merge lp:~tplavcic/percona-toolkit/bld-114-2.2 into lp:percona-toolkit/2.2

Proposed by Tomislav Plavcic
Status: Needs review
Proposed branch: lp:~tplavcic/percona-toolkit/bld-114-2.2
Merge into: lp:percona-toolkit/2.2
Diff against target: 30 lines (+5/-2)
1 file modified
util/build-packages (+5/-2)
To merge this branch: bzr merge lp:~tplavcic/percona-toolkit/bld-114-2.2
Reviewer Review Type Date Requested Status
Percona Toolkit developers Pending
Review via email: mp+215847@code.launchpad.net

Description of the change

Added creation of source rpms next to "binary" rpm.
This was requested for some customer (see BLD-114 for info).

To post a comment you must log in.
597. By Tomislav Plavcic

Added creation of source RPM package

Unmerged revisions

597. By Tomislav Plavcic

Added creation of source RPM package

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'util/build-packages'
--- util/build-packages 2013-12-18 23:21:07 +0000
+++ util/build-packages 2014-04-15 14:05:10 +0000
@@ -358,12 +358,12 @@
358 fi358 fi
359359
360 mkdir -p rpm rpm/BUILD rpm/SOURCES rpm/RPMS rpm/SRPMS360 mkdir -p rpm rpm/BUILD rpm/SOURCES rpm/RPMS rpm/SRPMS
361 mkdir -p RPM361 mkdir -p RPM SRPMS
362 cd rpm362 cd rpm
363 local topdir=`pwd`363 local topdir=`pwd`
364364
365 # Build RPM package from the tarball.365 # Build RPM package from the tarball.
366 rpmbuild -bb --clean $RPM_CONFIG_DIR/percona-toolkit.spec \366 rpmbuild -ba --clean $RPM_CONFIG_DIR/percona-toolkit.spec \
367 --quiet \367 --quiet \
368 --define "_topdir $PWD" \368 --define "_topdir $PWD" \
369 --define "_sourcedir $RELEASE_DIR" \369 --define "_sourcedir $RELEASE_DIR" \
@@ -375,8 +375,11 @@
375375
376 if [ ! -f "RPMS/noarch/$PKG-1.noarch.rpm" ]; then376 if [ ! -f "RPMS/noarch/$PKG-1.noarch.rpm" ]; then
377 die "RPMS/noarch/$PKG-1.noarch.rpm did not build"377 die "RPMS/noarch/$PKG-1.noarch.rpm did not build"
378 elif [ ! -f "SRPMS/$PKG-1.src.rpm" ]; then
379 die "SRPMS/$PKG-1.src.rpm did not build"
378 fi380 fi
379 mv "RPMS/noarch/$PKG-1.noarch.rpm" $RELEASE_DIR/RPM381 mv "RPMS/noarch/$PKG-1.noarch.rpm" $RELEASE_DIR/RPM
382 mv "SRPMS/$PKG-1.src.rpm" $RELEASE_DIR/SRPMS
380 rm -rf $RELEASE_DIR/rpm383 rm -rf $RELEASE_DIR/rpm
381384
382 echo "OK"385 echo "OK"

Subscribers

People subscribed via source and target branches