diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2013-08-19 10:50:37 -0400 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2013-08-19 10:50:37 -0400 |
| commit | b6d3589e0d7f85217305fe6401f4d7f27bbe0788 (patch) | |
| tree | 86d42fda1b55475a7d030e4098248a9842ae7484 | |
| parent | b8418ed021f7ecea8642b10b15be2c42280dd163 (diff) | |
| download | pki-dev-b6d3589e0d7f85217305fe6401f4d7f27bbe0788.tar.gz pki-dev-b6d3589e0d7f85217305fe6401f4d7f27bbe0788.tar.xz pki-dev-b6d3589e0d7f85217305fe6401f4d7f27bbe0788.zip | |
Updated pki-core build scripts.
| -rwxr-xr-x | scripts/core-build.sh | 22 | ||||
| -rwxr-xr-x | scripts/core-install.sh | 6 | ||||
| -rwxr-xr-x | scripts/core-remove.sh | 30 | ||||
| -rwxr-xr-x | scripts/core-uninstall.sh | 2 |
4 files changed, 27 insertions, 33 deletions
diff --git a/scripts/core-build.sh b/scripts/core-build.sh index a1dfa46..1302f62 100755 --- a/scripts/core-build.sh +++ b/scripts/core-build.sh @@ -1,22 +1,20 @@ #!/bin/sh -x -WORK_DIR=`pwd` PROJECT_DIR=`cd ../.. ; pwd` -COMPONENT=core -mkdir -p $WORK_DIR/build -rm -rf $WORK_DIR/build/$COMPONENT +BUILD_DIR=$HOME/build/pki-core +COMPOSE=$PROJECT_DIR/pki/scripts/compose_pki_core_packages -cd $PROJECT_DIR -rm -rf packages -mkdir -p packages +mkdir -p $BUILD_DIR +cd $BUILD_DIR -pki/scripts/compose_pki_${COMPONENT}_packages --without-javadoc hybrid_rpms 2>&1 | tee packages/build.log -#pki/scripts/compose_pki_${COMPONENT}_packages hybrid_rpms 2>&1 | tee packages/build.log +rm -rf rpmbuild +mkdir -p rpmbuild -mv packages $WORK_DIR/build/$COMPONENT -cd $WORK_DIR/build/$COMPONENT +$COMPOSE --work-dir $BUILD_DIR/rpmbuild --without-javadoc hybrid_rpms 2>&1 | tee build.log +#$COMPOSE --work-dir $BUILD_DIR/rpmbuild hybrid_rpms 2>&1 | tee build.log +rm -rf repo mkdir -p repo -mv `find RPMS -name *.rpm` repo +mv `find rpmbuild/RPMS -name *.rpm` repo createrepo repo diff --git a/scripts/core-install.sh b/scripts/core-install.sh index 86fc7cb..b7f88d7 100755 --- a/scripts/core-install.sh +++ b/scripts/core-install.sh @@ -1,9 +1,9 @@ #!/bin/sh -x -WORK_DIR=`pwd` PROJECT_DIR=`cd ../.. ; pwd` -COMPONENT=core -cd $WORK_DIR/build/$COMPONENT/repo +BUILD_DIR=$HOME/build/pki-core + +cd $BUILD_DIR/repo yum localinstall -y *.rpm diff --git a/scripts/core-remove.sh b/scripts/core-remove.sh index 5747eb9..09629e5 100755 --- a/scripts/core-remove.sh +++ b/scripts/core-remove.sh @@ -1,20 +1,16 @@ #!/bin/sh -x -rpm -e --nodeps \ - pki-symkey\ - pki-base\ - pki-tools\ - pki-server\ - pki-ca\ - pki-kra\ - pki-ocsp\ - pki-tks\ - pki-core-debuginfo - -rpm -e --nodeps \ - pki-util\ - pki-silent\ - pki-selinux - -rpm -e --nodeps pki-tps +rpm -e --nodeps pki-symkey +rpm -e --nodeps pki-base +rpm -e --nodeps pki-tools +rpm -e --nodeps pki-server +rpm -e --nodeps pki-ca +rpm -e --nodeps pki-kra +rpm -e --nodeps pki-ocsp +rpm -e --nodeps pki-tks +rpm -e --nodeps pki-core-debuginfo +rpm -e --nodeps pki-util +rpm -e --nodeps pki-silent +rpm -e --nodeps pki-selinux +rpm -e --nodeps pki-tps-tomcat rpm -e --nodeps pki-javadoc diff --git a/scripts/core-uninstall.sh b/scripts/core-uninstall.sh index 48ff2ad..87de86c 100755 --- a/scripts/core-uninstall.sh +++ b/scripts/core-uninstall.sh @@ -12,6 +12,6 @@ yum erase -y\ pki-kra\ pki-ocsp\ pki-tks\ - pki-tps\ + pki-tps-tomcat\ pki-javadoc\ pki-core-debuginfo |