Show More
| @@ -247,7 +247,7 b' docker-ubuntu-bionic-ppa: contrib/packag' | |||
|
|
247 | 247 | |
|
|
248 | 248 | fedora20: |
|
|
249 | 249 | mkdir -p packages/fedora20 |
|
|
250 | contrib/buildrpm | |
|
|
250 | contrib/packaging/buildrpm | |
|
|
251 | 251 | cp rpmbuild/RPMS/*/* packages/fedora20 |
|
|
252 | 252 | cp rpmbuild/SRPMS/* packages/fedora20 |
|
|
253 | 253 | rm -rf rpmbuild |
| @@ -258,7 +258,7 b' docker-fedora20:' | |||
|
|
258 | 258 | |
|
|
259 | 259 | fedora21: |
|
|
260 | 260 | mkdir -p packages/fedora21 |
|
|
261 | contrib/buildrpm | |
|
|
261 | contrib/packaging/buildrpm | |
|
|
262 | 262 | cp rpmbuild/RPMS/*/* packages/fedora21 |
|
|
263 | 263 | cp rpmbuild/SRPMS/* packages/fedora21 |
|
|
264 | 264 | rm -rf rpmbuild |
| @@ -269,7 +269,7 b' docker-fedora21:' | |||
|
|
269 | 269 | |
|
|
270 | 270 | centos5: |
|
|
271 | 271 | mkdir -p packages/centos5 |
|
|
272 | contrib/buildrpm --withpython | |
|
|
272 | contrib/packaging/buildrpm --withpython | |
|
|
273 | 273 | cp rpmbuild/RPMS/*/* packages/centos5 |
|
|
274 | 274 | cp rpmbuild/SRPMS/* packages/centos5 |
|
|
275 | 275 | |
| @@ -279,7 +279,7 b' docker-centos5:' | |||
|
|
279 | 279 | |
|
|
280 | 280 | centos6: |
|
|
281 | 281 | mkdir -p packages/centos6 |
|
|
282 | contrib/buildrpm --withpython | |
|
|
282 | contrib/packaging/buildrpm --withpython | |
|
|
283 | 283 | cp rpmbuild/RPMS/*/* packages/centos6 |
|
|
284 | 284 | cp rpmbuild/SRPMS/* packages/centos6 |
|
|
285 | 285 | |
| @@ -289,7 +289,7 b' docker-centos6:' | |||
|
|
289 | 289 | |
|
|
290 | 290 | centos7: |
|
|
291 | 291 | mkdir -p packages/centos7 |
|
|
292 | contrib/buildrpm | |
|
|
292 | contrib/packaging/buildrpm | |
|
|
293 | 293 | cp rpmbuild/RPMS/*/* packages/centos7 |
|
|
294 | 294 | cp rpmbuild/SRPMS/* packages/centos7 |
|
|
295 | 295 | |
| @@ -7,7 +7,7 b'' | |||
|
|
7 | 7 | # - CentOS 5 |
|
|
8 | 8 | # - centOS 6 |
|
|
9 | 9 | |
|
|
10 |
. $(dirname $0)/packag |
|
|
|
10 | . $(dirname $0)/packagelib.sh | |
|
|
11 | 11 | |
|
|
12 | 12 | BUILD=1 |
|
|
13 | 13 | RPMBUILDDIR="$PWD/rpmbuild" |
| @@ -35,7 +35,7 b' while [ "$1" ]; do' | |||
|
|
35 | 35 | esac |
|
|
36 | 36 | done |
|
|
37 | 37 | |
|
|
38 | cd "`dirname $0`/.." | |
|
|
38 | cd "`dirname $0`/../.." | |
|
|
39 | 39 | |
|
|
40 | 40 | specfile=$PWD/contrib/packaging/mercurial.spec |
|
|
41 | 41 | if [ ! -f $specfile ]; then |
| @@ -13,7 +13,7 b' shift # extra params are passed to build' | |||
|
|
13 | 13 | initcontainer $PLATFORM |
|
|
14 | 14 | |
|
|
15 | 15 | RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM |
|
|
16 | contrib/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $* | |
|
|
16 | contrib/packaging/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $* | |
|
|
17 | 17 | |
|
|
18 | 18 | DSHARED=/mnt/shared |
|
|
19 | 19 | $DOCKER run -e http_proxy -e https_proxy -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \ |
General Comments 0
You need to be logged in to leave comments.
Login now