From 0ea8903598da7c4ee8c34b476c2d78d69a8e2334 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Thu, 20 Jul 2017 08:24:13 +0200 Subject: Updated core scripts. --- scripts/core-9.0-build.sh | 17 ----------------- scripts/core-build.sh | 4 ++-- scripts/core-compare.sh | 18 ++++++++++++++++++ scripts/core-copr.sh | 3 +++ scripts/core-download.sh | 8 ++++---- scripts/core-install.sh | 1 + scripts/core-mock-build.sh | 2 +- scripts/core-remove.sh | 1 + scripts/core-srpm.sh | 14 ++++++++++++++ scripts/core-yum-install.sh | 2 +- 10 files changed, 45 insertions(+), 25 deletions(-) delete mode 100755 scripts/core-9.0-build.sh create mode 100755 scripts/core-compare.sh create mode 100755 scripts/core-copr.sh create mode 100755 scripts/core-srpm.sh (limited to 'scripts') diff --git a/scripts/core-9.0-build.sh b/scripts/core-9.0-build.sh deleted file mode 100755 index a573175..0000000 --- a/scripts/core-9.0-build.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -x - -SRC_DIR=`cd ../.. ; pwd` - -cd $SRC_DIR - -rm -rf packages -mkdir -p packages - -pki/scripts/compose_pki_core_packages hybrid_rpms 2>&1 | tee packages/build.log - -mkdir -p repo -mv `find packages/RPMS -name *.rpm` repo -createrepo repo - -rm -rf packages.core -mv packages packages.core diff --git a/scripts/core-build.sh b/scripts/core-build.sh index 5ad0932..b0f228a 100755 --- a/scripts/core-build.sh +++ b/scripts/core-build.sh @@ -13,8 +13,8 @@ mkdir -p rpmbuild echo $COMPOSE --work-dir $BUILD_DIR/rpmbuild hybrid_rpms -#$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 +#$COMPOSE --work-dir $BUILD_DIR/rpmbuild --without-javadoc hybrid_rpms +$COMPOSE --work-dir $BUILD_DIR/rpmbuild rpms rm -rf repo mkdir -p repo diff --git a/scripts/core-compare.sh b/scripts/core-compare.sh new file mode 100755 index 0000000..dfccf69 --- /dev/null +++ b/scripts/core-compare.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +old=$1 +new=/usr/share/java/pki + +./jar-compare.sh pki-ca.jar $old $new +./jar-compare.sh pki-certsrv.jar $old $new +./jar-compare.sh pki-cmsbundle.jar $old $new +./jar-compare.sh pki-cmscore.jar $old $new +./jar-compare.sh pki-cms.jar $old $new +./jar-compare.sh pki-cmsutil.jar $old $new +./jar-compare.sh pki-kra.jar $old $new +./jar-compare.sh pki-nsutil.jar $old $new +./jar-compare.sh pki-ocsp.jar $old $new +./jar-compare.sh pki-tks.jar $old $new +./jar-compare.sh pki-tomcat.jar $old $new +./jar-compare.sh pki-tools.jar $old $new +./jar-compare.sh pki-tps.jar $old $new diff --git a/scripts/core-copr.sh b/scripts/core-copr.sh new file mode 100755 index 0000000..5187cf3 --- /dev/null +++ b/scripts/core-copr.sh @@ -0,0 +1,3 @@ +#!/bin/sh -x + +scp ~/build/pki-core/rpmbuild/SRPMS/* edewata@fedorapeople.org:/home/fedora/edewata/public_html/pki/copr diff --git a/scripts/core-download.sh b/scripts/core-download.sh index 875ee12..975b85f 100755 --- a/scripts/core-download.sh +++ b/scripts/core-download.sh @@ -3,12 +3,12 @@ mkdir -p ~/Downloads cd ~/Downloads -#https://kojipkgs.fedoraproject.org//packages/pki-core/10.3.1/1.fc24/noarch/pki-base-10.3.1-1.fc24.noarch.rpm -BASE_URL=http://kojipkgs.fedoraproject.org/packages +#https://kojipkgs.fedoraproject.org//packages/pki-core/10.3.5/1.fc24/noarch/pki-base-10.3.5-1.fc24.noarch.rpm +BASE_URL=http://kojipkgs.fedoraproject.org/packages PACKAGE=pki-core -VERSION=10.3.1 -RELEASE=1 +VERSION=10.3.3 +RELEASE=3 OS=fc24 wget $BASE_URL/$PACKAGE/$VERSION/$RELEASE.$OS/noarch/pki-base-$VERSION-$RELEASE.$OS.noarch.rpm diff --git a/scripts/core-install.sh b/scripts/core-install.sh index 94bca7c..6004a90 100755 --- a/scripts/core-install.sh +++ b/scripts/core-install.sh @@ -7,3 +7,4 @@ BUILD_DIR=$HOME/build/pki-core cd $BUILD_DIR/repo yum install -y *.rpm +#rpm -ivh *.rpm diff --git a/scripts/core-mock-build.sh b/scripts/core-mock-build.sh index 89dcadb..52948f7 100755 --- a/scripts/core-mock-build.sh +++ b/scripts/core-mock-build.sh @@ -14,7 +14,7 @@ cd $PROJECT_DIR rm -rf packages mkdir -p packages -pki/scripts/compose_pki_${COMPONENT}_packages hybrid_srpm 2>&1 | tee packages/build.log +pki/scripts/compose_pki_${COMPONENT}_packages hybrid_srpm mv packages $WORK_DIR/build/$COMPONENT cd $WORK_DIR/build/$COMPONENT diff --git a/scripts/core-remove.sh b/scripts/core-remove.sh index 567e8b6..a440a01 100755 --- a/scripts/core-remove.sh +++ b/scripts/core-remove.sh @@ -16,3 +16,4 @@ rpm -e --nodeps pki-util rpm -e --nodeps pki-silent rpm -e --nodeps pki-selinux rpm -e --nodeps pki-javadoc +rpm -e --nodeps pki-base-python3 diff --git a/scripts/core-srpm.sh b/scripts/core-srpm.sh new file mode 100755 index 0000000..bb03b9f --- /dev/null +++ b/scripts/core-srpm.sh @@ -0,0 +1,14 @@ +#!/bin/sh -x + +PROJECT_DIR=`cd ../.. ; pwd` + +BUILD_DIR=$HOME/build/pki-core +COMPOSE=$PROJECT_DIR/pki/scripts/compose_pki_core_packages + +mkdir -p $BUILD_DIR +cd $BUILD_DIR + +rm -rf rpmbuild +mkdir -p rpmbuild + +$COMPOSE --work-dir $BUILD_DIR/rpmbuild hybrid_srpm diff --git a/scripts/core-yum-install.sh b/scripts/core-yum-install.sh index dd9b55d..c014bb5 100755 --- a/scripts/core-yum-install.sh +++ b/scripts/core-yum-install.sh @@ -1,3 +1,3 @@ #!/bin/sh -x -yum install -y pki-base pki-symkey pki-tools pki-server pki-ca pki-kra pki-ocsp pki-tks pki-tps +yum install -y pki-ca pki-kra pki-ocsp pki-tks pki-tps -- cgit