From 9d7c4b0a89e950c9fbfe548c18a50a67fa8102d2 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Fri, 20 Oct 2017 21:40:26 +0200 Subject: Updated build scripts. --- scripts/base-build.sh | 2 +- scripts/client-build.sh | 2 +- scripts/console-build.sh | 2 +- scripts/core-build.sh | 8 ++++---- scripts/core-install.sh | 5 +++-- scripts/core-mock-build.sh | 2 +- scripts/dev-init.sh | 5 +++-- scripts/meta-build.sh | 2 +- scripts/ra-build.sh | 19 ------------------- scripts/theme-build.sh | 2 +- scripts/theme-uninstall.sh | 4 +++- 11 files changed, 19 insertions(+), 34 deletions(-) delete mode 100755 scripts/ra-build.sh diff --git a/scripts/base-build.sh b/scripts/base-build.sh index 6f6877e..ed7200a 100755 --- a/scripts/base-build.sh +++ b/scripts/base-build.sh @@ -16,4 +16,4 @@ $COMPOSE --work-dir $BUILD_DIR/rpmbuild --without-server --without-javadoc hybri rm -rf repo mkdir -p repo mv `find rpmbuild/RPMS -name *.rpm` repo -createrepo repo +#createrepo repo diff --git a/scripts/client-build.sh b/scripts/client-build.sh index f2e0fb7..ae6ff40 100755 --- a/scripts/client-build.sh +++ b/scripts/client-build.sh @@ -18,4 +18,4 @@ $COMPOSE --work-dir $BUILD_DIR/rpmbuild --without-server hybrid_rpms rm -rf repo mkdir -p repo mv `find rpmbuild/RPMS -name *.rpm` repo -createrepo repo +#createrepo repo diff --git a/scripts/console-build.sh b/scripts/console-build.sh index 6cdffcc..c9f2678 100755 --- a/scripts/console-build.sh +++ b/scripts/console-build.sh @@ -16,4 +16,4 @@ $COMPOSE --work-dir $BUILD_DIR/rpmbuild rpms rm -rf repo mkdir -p repo mv `find rpmbuild/RPMS -name *.rpm` repo -createrepo repo +#createrepo repo diff --git a/scripts/core-build.sh b/scripts/core-build.sh index b0f228a..d213b06 100755 --- a/scripts/core-build.sh +++ b/scripts/core-build.sh @@ -8,6 +8,7 @@ COMPOSE=$PROJECT_DIR/pki/scripts/compose_pki_core_packages mkdir -p $BUILD_DIR cd $BUILD_DIR +rm -rf repo rm -rf rpmbuild mkdir -p rpmbuild @@ -16,7 +17,6 @@ echo $COMPOSE --work-dir $BUILD_DIR/rpmbuild hybrid_rpms #$COMPOSE --work-dir $BUILD_DIR/rpmbuild --without-javadoc hybrid_rpms $COMPOSE --work-dir $BUILD_DIR/rpmbuild rpms -rm -rf repo -mkdir -p repo -mv `find rpmbuild/RPMS -name *.rpm` repo -createrepo repo +#mkdir -p repo +#mv `find rpmbuild/RPMS -name *.rpm` repo +#createrepo repo diff --git a/scripts/core-install.sh b/scripts/core-install.sh index 6004a90..c55a759 100755 --- a/scripts/core-install.sh +++ b/scripts/core-install.sh @@ -4,7 +4,8 @@ PROJECT_DIR=`cd ../.. ; pwd` BUILD_DIR=$HOME/build/pki-core -cd $BUILD_DIR/repo +cd $BUILD_DIR/rpmbuild/RPMS -yum install -y *.rpm +yum install -y `find . -name *.rpm` +#yum install -y *.rpm #rpm -ivh *.rpm diff --git a/scripts/core-mock-build.sh b/scripts/core-mock-build.sh index 52948f7..fffc6f9 100755 --- a/scripts/core-mock-build.sh +++ b/scripts/core-mock-build.sh @@ -27,7 +27,7 @@ mv /var/lib/mock/fedora-17-${ARCH}/result/*.src.rpm SRPMS mkdir -p repo mv /var/lib/mock/fedora-17-${ARCH}/result/*.rpm repo -createrepo repo +#createrepo repo mv /var/lib/mock/fedora-17-${ARCH}/result/* . rm -rf /var/lib/mock/* diff --git a/scripts/dev-init.sh b/scripts/dev-init.sh index 5c91060..8bdb137 100755 --- a/scripts/dev-init.sh +++ b/scripts/dev-init.sh @@ -19,7 +19,6 @@ yum install -y --nogpgcheck \ rpm-build \ fedpkg \ fedora-packager \ - createrepo \ idm-console-framework # C dependencies @@ -38,7 +37,8 @@ yum install -y --nogpgcheck \ python3-devel \ python3-flake8 \ python3-nss \ - python3-pyldap + python3-pyldap \ + python3-lxml # Java dependencies yum install -y --nogpgcheck \ @@ -109,5 +109,6 @@ yum install -y --nogpgcheck\ # httpd-devel\ # pcre-devel\ # dnf\ +# createrepo \ # dnf-plugins-core\ # @development-tools diff --git a/scripts/meta-build.sh b/scripts/meta-build.sh index b9c8137..4283a59 100755 --- a/scripts/meta-build.sh +++ b/scripts/meta-build.sh @@ -16,4 +16,4 @@ $COMPOSE --work-dir $BUILD_DIR/rpmbuild hybrid_rpms rm -rf repo mkdir -p repo mv `find rpmbuild/RPMS -name *.rpm` repo -createrepo repo +#createrepo repo diff --git a/scripts/ra-build.sh b/scripts/ra-build.sh deleted file mode 100755 index b42e537..0000000 --- a/scripts/ra-build.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -x - -PROJECT_DIR=`cd ../.. ; pwd` - -BUILD_DIR=$HOME/build/pki-ra -COMPOSE=$PROJECT_DIR/pki/scripts/compose_pki_ra_packages - -mkdir -p $BUILD_DIR -cd $BUILD_DIR - -rm -rf rpmbuild -mkdir -p rpmbuild - -$COMPOSE --work-dir $BUILD_DIR/rpmbuild rpms 2>&1 | tee build.log - -rm -rf repo -mkdir -p repo -mv `find rpmbuild/RPMS -name *.rpm` repo -createrepo repo diff --git a/scripts/theme-build.sh b/scripts/theme-build.sh index 972ce61..f6bf46b 100755 --- a/scripts/theme-build.sh +++ b/scripts/theme-build.sh @@ -16,4 +16,4 @@ $COMPOSE --work-dir $BUILD_DIR/rpmbuild rpms rm -rf repo mkdir -p repo mv `find rpmbuild/RPMS -name *.rpm` repo -createrepo repo +#createrepo repo diff --git a/scripts/theme-uninstall.sh b/scripts/theme-uninstall.sh index b7f95c0..2d88591 100755 --- a/scripts/theme-uninstall.sh +++ b/scripts/theme-uninstall.sh @@ -9,4 +9,6 @@ yum erase -y\ dogtag-pki-ra-theme\ dogtag-pki-server-theme\ dogtag-pki-common-theme\ - dogtag-pki-ocsp-theme + dogtag-pki-ocsp-theme\ + redhat-pki-server-theme\ + redhat-pki-console-theme -- cgit