From 20b9d956aab21a5a2a61162e6c88fbee5828a9e9 Mon Sep 17 00:00:00 2001 From: Jack Magne Date: Mon, 11 Aug 2014 17:25:21 -0700 Subject: Misc TPS packaging tasks: 1. Make sure the new TPS packages all the applet files, like the old TPS has done. 2. Create a small new package called "pki-tps-client", which will hold ONLY the command line utility "tpsclient" and all of its supporting libraries. 3. Move the directory pki/base/tps to pki/base/tps-client We will do this until we can rewrite "tpclien" on the new Java TPS system. Add package pki-tps-client. --- scripts/compose_pki_tps_client_packages | 199 ++++++++++++++++++++++++++++++++ scripts/compose_pki_tps_packages | 199 -------------------------------- 2 files changed, 199 insertions(+), 199 deletions(-) create mode 100755 scripts/compose_pki_tps_client_packages delete mode 100755 scripts/compose_pki_tps_packages (limited to 'scripts') diff --git a/scripts/compose_pki_tps_client_packages b/scripts/compose_pki_tps_client_packages new file mode 100755 index 000000000..4efd7f874 --- /dev/null +++ b/scripts/compose_pki_tps_client_packages @@ -0,0 +1,199 @@ +#!/bin/bash +# BEGIN COPYRIGHT BLOCK +# (C) 2014 Red Hat, Inc. +# All rights reserved. +# END COPYRIGHT BLOCK + +## +## Include common 'compose' functions +## + +COMPOSE_PWD=`dirname $0` +source ${COMPOSE_PWD}/compose_functions + + +## Always switch into the base directory three levels +## above this shell script prior to executing it so +## that all of its output is written to this directory + +cd `dirname $0`/../.. + + +## +## Retrieve the name of this base directory +## + +PKI_PWD=`pwd` + + +## +## Establish the 'pki-tps-client' name and version information +## + +PKI_TPS_CLIENT="pki-tps-client" +PKI_TPS_CLIENT_VERSION="10.2.0" + + +## +## Establish the SOURCE files/directories of the 'pki-tps-client' source directory +## + +PKI_SPECS_FILE="${PKI_DIR}/specs/${PKI_TPS_CLIENT}.spec" +PKI_COMPONENT_LIST="tps-client" + + +## +## Establish the TARGET files/directories of the 'pki-tps-client' source/spec files +## + +if [ $WORK_DIR ]; then + PKI_PACKAGES="`cd $WORK_DIR ; pwd`" +else + PKI_PACKAGES="${PKI_PWD}/packages" +fi + +PKI_TPS_CLIENT_BUILD_DIR="${PKI_PACKAGES}/BUILD" +PKI_TPS_CLIENT_RPMS_DIR="${PKI_PACKAGES}/RPMS" +PKI_TPS_CLIENT_SOURCES_DIR="${PKI_PACKAGES}/SOURCES" +PKI_TPS_CLIENT_SPECS_DIR="${PKI_PACKAGES}/SPECS" +PKI_TPS_CLIENT_SRPMS_DIR="${PKI_PACKAGES}/SRPMS" + +PKI_TPS_CLIENT_TARBALL="${PKI_TPS_CLIENT}-${PKI_TPS_CLIENT_VERSION}.tar.gz" +PKI_TPS_CLIENT_SPEC_FILE="${PKI_TPS_CLIENT_SPECS_DIR}/${PKI_TPS_CLIENT}.spec" +PKI_TPS_CLIENT_PACKAGE_SCRIPT="${PKI_PACKAGES}/package_${PKI_TPS_CLIENT}" +PKI_TPS_CLIENT_PACKAGE_COMMAND="${RPMBUILD_CMD} SPECS/${PKI_TPS_CLIENT}.spec" + +PKI_TPS_CLIENT_STAGING_DIR="${PKI_PACKAGES}/staging" +PKI_TPS_CLIENT_DIR="${PKI_TPS_CLIENT_STAGING_DIR}/${PKI_TPS_CLIENT}-${PKI_TPS_CLIENT_VERSION}" +PKI_TPS_CLIENT_BASE_DIR="${PKI_TPS_CLIENT_DIR}/base" + + +## +## Always create a top-level 'packages' directory +## + +mkdir -p ${PKI_PACKAGES} + + +## +## Always create 'pki-tps-client' package directories +## + +mkdir -p ${PKI_TPS_CLIENT_BUILD_DIR} +mkdir -p ${PKI_TPS_CLIENT_RPMS_DIR} +mkdir -p ${PKI_TPS_CLIENT_SOURCES_DIR} +mkdir -p ${PKI_TPS_CLIENT_SPECS_DIR} +mkdir -p ${PKI_TPS_CLIENT_SRPMS_DIR} + + +## +## Always start with new 'pki-tps-client' package files +## + +rm -rf ${PKI_TPS_CLIENT_BUILD_DIR}/${PKI_TPS_CLIENT}-${PKI_TPS_CLIENT_VERSION} +rm -f ${PKI_TPS_CLIENT_RPMS_DIR}/${PKI_TPS_CLIENT}-${PKI_TPS_CLIENT_VERSION}*.rpm +rm -f ${PKI_TPS_CLIENT_SOURCES_DIR}/${PKI_TPS_CLIENT_TARBALL} +rm -f ${PKI_TPS_CLIENT_SPEC_FILE} +rm -f ${PKI_TPS_CLIENT_SRPMS_DIR}/${PKI_TPS_CLIENT}-${PKI_TPS_CLIENT_VERSION}*.rpm + + +## +## Copy a new 'pki-tps-client' spec file from the +## current contents of the PKI working repository +## + +cp -p ${PKI_SPECS_FILE} ${PKI_TPS_CLIENT_SPECS_DIR} + + +## +## If specified, copy all Patches from the spec file URL to SOURCES +## + +if [ ${FETCH_PATCH_FILES} -eq 1 ] ; then + Fetch_Patch_Files ${PKI_SPECS_FILE} ${PKI_TPS_CLIENT_SOURCES_DIR} +fi + + +## +## Copy the specified Source Tarball from the spec file URL to SOURCES, or +## Generate a fresh Source Tarball from the local source +## + +if [ ${FETCH_SOURCE_TARBALL} -eq 1 ] ; then + Fetch_Source_Tarball ${PKI_SPECS_FILE} ${PKI_TPS_CLIENT_SOURCES_DIR} +else + ## + ## Always start with a new 'pki-tps-client' staging directory + ## + + rm -rf ${PKI_TPS_CLIENT_STAGING_DIR} + + + ## + ## To generate the 'pki-tps-client' tarball, construct a staging area + ## consisting of the 'pki-tps-client' source components from the + ## current contents of the PKI working repository + ## + + mkdir -p ${PKI_TPS_CLIENT_DIR} + cd ${PKI_DIR} + for file in "${PKI_FILE_LIST}" ; + do + cp -p ${file} ${PKI_TPS_CLIENT_DIR} + done + find ${PKI_CMAKE_DIR} \ + -name .svn -prune -o \ + -name *.swp -prune -o \ + -print | cpio -pdum ${PKI_TPS_CLIENT_DIR} > /dev/null 2>&1 + cd - > /dev/null 2>&1 + + mkdir -p ${PKI_TPS_CLIENT_BASE_DIR} + cd ${PKI_BASE_DIR} + cp -p ${PKI_BASE_MANIFEST} ${PKI_TPS_CLIENT_BASE_DIR} + for component in "${PKI_COMPONENT_LIST}" ; + do + find ${component} \ + -name .svn -prune -o \ + -name *.swp -prune -o \ + -print | cpio -pdum ${PKI_TPS_CLIENT_BASE_DIR} > /dev/null 2>&1 + done + cd - > /dev/null 2>&1 + + + ## + ## Create the 'pki-tps-client' tarball + ## + + mkdir -p ${PKI_TPS_CLIENT_SOURCES_DIR} + cd ${PKI_TPS_CLIENT_STAGING_DIR} + gtar -zcvf ${PKI_TPS_CLIENT_TARBALL} \ + "${PKI_TPS_CLIENT}-${PKI_TPS_CLIENT_VERSION}" > /dev/null 2>&1 + mv ${PKI_TPS_CLIENT_TARBALL} ${PKI_TPS_CLIENT_SOURCES_DIR} + cd - > /dev/null 2>&1 + + + ## + ## Always remove the PKI staging area + ## + + rm -rf ${PKI_TPS_CLIENT_STAGING_DIR} +fi + + +## +## Always generate a fresh 'pki-tps-client' package script +## + +rm -rf ${PKI_TPS_CLIENT_PACKAGE_SCRIPT} +printf "#!/bin/bash\n\n" > ${PKI_TPS_CLIENT_PACKAGE_SCRIPT} +printf "${PKI_TPS_CLIENT_PACKAGE_COMMAND}\n\n" >> ${PKI_TPS_CLIENT_PACKAGE_SCRIPT} +chmod 775 ${PKI_TPS_CLIENT_PACKAGE_SCRIPT} + + +## +## Automatically invoke RPM/SRPM creation +## + +cd ${PKI_PACKAGES} ; +bash ./package_${PKI_TPS_CLIENT} | tee package_${PKI_TPS_CLIENT}.log 2>&1 + diff --git a/scripts/compose_pki_tps_packages b/scripts/compose_pki_tps_packages deleted file mode 100755 index 0e7f85a44..000000000 --- a/scripts/compose_pki_tps_packages +++ /dev/null @@ -1,199 +0,0 @@ -#!/bin/bash -# BEGIN COPYRIGHT BLOCK -# (C) 2010 Red Hat, Inc. -# All rights reserved. -# END COPYRIGHT BLOCK - -## -## Include common 'compose' functions -## - -COMPOSE_PWD=`dirname $0` -source ${COMPOSE_PWD}/compose_functions - - -## Always switch into the base directory three levels -## above this shell script prior to executing it so -## that all of its output is written to this directory - -cd `dirname $0`/../.. - - -## -## Retrieve the name of this base directory -## - -PKI_PWD=`pwd` - - -## -## Establish the 'pki-tps' name and version information -## - -PKI_TPS="pki-tps" -PKI_TPS_VERSION="10.2.0" - - -## -## Establish the SOURCE files/directories of the 'pki-tps' source directory -## - -PKI_SPECS_FILE="${PKI_DIR}/specs/${PKI_TPS}.spec" -PKI_COMPONENT_LIST="tps" - - -## -## Establish the TARGET files/directories of the 'pki-tps' source/spec files -## - -if [ $WORK_DIR ]; then - PKI_PACKAGES="`cd $WORK_DIR ; pwd`" -else - PKI_PACKAGES="${PKI_PWD}/packages" -fi - -PKI_TPS_BUILD_DIR="${PKI_PACKAGES}/BUILD" -PKI_TPS_RPMS_DIR="${PKI_PACKAGES}/RPMS" -PKI_TPS_SOURCES_DIR="${PKI_PACKAGES}/SOURCES" -PKI_TPS_SPECS_DIR="${PKI_PACKAGES}/SPECS" -PKI_TPS_SRPMS_DIR="${PKI_PACKAGES}/SRPMS" - -PKI_TPS_TARBALL="${PKI_TPS}-${PKI_TPS_VERSION}.tar.gz" -PKI_TPS_SPEC_FILE="${PKI_TPS_SPECS_DIR}/${PKI_TPS}.spec" -PKI_TPS_PACKAGE_SCRIPT="${PKI_PACKAGES}/package_${PKI_TPS}" -PKI_TPS_PACKAGE_COMMAND="${RPMBUILD_CMD} SPECS/${PKI_TPS}.spec" - -PKI_TPS_STAGING_DIR="${PKI_PACKAGES}/staging" -PKI_TPS_DIR="${PKI_TPS_STAGING_DIR}/${PKI_TPS}-${PKI_TPS_VERSION}" -PKI_TPS_BASE_DIR="${PKI_TPS_DIR}/base" - - -## -## Always create a top-level 'packages' directory -## - -mkdir -p ${PKI_PACKAGES} - - -## -## Always create 'pki-tps' package directories -## - -mkdir -p ${PKI_TPS_BUILD_DIR} -mkdir -p ${PKI_TPS_RPMS_DIR} -mkdir -p ${PKI_TPS_SOURCES_DIR} -mkdir -p ${PKI_TPS_SPECS_DIR} -mkdir -p ${PKI_TPS_SRPMS_DIR} - - -## -## Always start with new 'pki-tps' package files -## - -rm -rf ${PKI_TPS_BUILD_DIR}/${PKI_TPS}-${PKI_TPS_VERSION} -rm -f ${PKI_TPS_RPMS_DIR}/${PKI_TPS}-${PKI_TPS_VERSION}*.rpm -rm -f ${PKI_TPS_SOURCES_DIR}/${PKI_TPS_TARBALL} -rm -f ${PKI_TPS_SPEC_FILE} -rm -f ${PKI_TPS_SRPMS_DIR}/${PKI_TPS}-${PKI_TPS_VERSION}*.rpm - - -## -## Copy a new 'pki-tps' spec file from the -## current contents of the PKI working repository -## - -cp -p ${PKI_SPECS_FILE} ${PKI_TPS_SPECS_DIR} - - -## -## If specified, copy all Patches from the spec file URL to SOURCES -## - -if [ ${FETCH_PATCH_FILES} -eq 1 ] ; then - Fetch_Patch_Files ${PKI_SPECS_FILE} ${PKI_TPS_SOURCES_DIR} -fi - - -## -## Copy the specified Source Tarball from the spec file URL to SOURCES, or -## Generate a fresh Source Tarball from the local source -## - -if [ ${FETCH_SOURCE_TARBALL} -eq 1 ] ; then - Fetch_Source_Tarball ${PKI_SPECS_FILE} ${PKI_TPS_SOURCES_DIR} -else - ## - ## Always start with a new 'pki-tps' staging directory - ## - - rm -rf ${PKI_TPS_STAGING_DIR} - - - ## - ## To generate the 'pki-tps' tarball, construct a staging area - ## consisting of the 'pki-tps' source components from the - ## current contents of the PKI working repository - ## - - mkdir -p ${PKI_TPS_DIR} - cd ${PKI_DIR} - for file in "${PKI_FILE_LIST}" ; - do - cp -p ${file} ${PKI_TPS_DIR} - done - find ${PKI_CMAKE_DIR} \ - -name .svn -prune -o \ - -name *.swp -prune -o \ - -print | cpio -pdum ${PKI_TPS_DIR} > /dev/null 2>&1 - cd - > /dev/null 2>&1 - - mkdir -p ${PKI_TPS_BASE_DIR} - cd ${PKI_BASE_DIR} - cp -p ${PKI_BASE_MANIFEST} ${PKI_TPS_BASE_DIR} - for component in "${PKI_COMPONENT_LIST}" ; - do - find ${component} \ - -name .svn -prune -o \ - -name *.swp -prune -o \ - -print | cpio -pdum ${PKI_TPS_BASE_DIR} > /dev/null 2>&1 - done - cd - > /dev/null 2>&1 - - - ## - ## Create the 'pki-tps' tarball - ## - - mkdir -p ${PKI_TPS_SOURCES_DIR} - cd ${PKI_TPS_STAGING_DIR} - gtar -zcvf ${PKI_TPS_TARBALL} \ - "${PKI_TPS}-${PKI_TPS_VERSION}" > /dev/null 2>&1 - mv ${PKI_TPS_TARBALL} ${PKI_TPS_SOURCES_DIR} - cd - > /dev/null 2>&1 - - - ## - ## Always remove the PKI staging area - ## - - rm -rf ${PKI_TPS_STAGING_DIR} -fi - - -## -## Always generate a fresh 'pki-tps' package script -## - -rm -rf ${PKI_TPS_PACKAGE_SCRIPT} -printf "#!/bin/bash\n\n" > ${PKI_TPS_PACKAGE_SCRIPT} -printf "${PKI_TPS_PACKAGE_COMMAND}\n\n" >> ${PKI_TPS_PACKAGE_SCRIPT} -chmod 775 ${PKI_TPS_PACKAGE_SCRIPT} - - -## -## Automatically invoke RPM/SRPM creation -## - -cd ${PKI_PACKAGES} ; -bash ./package_${PKI_TPS} | tee package_${PKI_TPS}.log 2>&1 - -- cgit