From 9344e314df63b423f77c1e8a991bc1c391550bd1 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Mon, 18 Jun 2012 18:24:07 -0600 Subject: [PATCH] databases/installCDE - fixup a variety of issues. - databases need linux specific entries for CDE-SHLIBS - database Imakefile should undef the platform define (linux) - installCDE fixes - use $LOGFILE. There are still cases where tmp files are created in /tmp. - detect and set proper PLATFORM - Check to see if a db exists before trying to use it - don't print usage if you aren't root. --- cde/admin/IntegTools/dbTools/installCDE.src | 31 ++-- cde/databases/CDE-SHLIBS.src | 193 ++++++++++++++++++++ cde/databases/Imakefile | 2 +- 3 files changed, 214 insertions(+), 12 deletions(-) diff --git a/cde/admin/IntegTools/dbTools/installCDE.src b/cde/admin/IntegTools/dbTools/installCDE.src index 0ebfb9405..b4c5c91b4 100755 --- a/cde/admin/IntegTools/dbTools/installCDE.src +++ b/cde/admin/IntegTools/dbTools/installCDE.src @@ -45,12 +45,13 @@ XCOMM ########################################################################## #define HASH # #define STAR * +LOGFILE="installCDE.$$.log" REVISION="$(echo "$Revision: /main/20 $" | awk '{print $2}')" Log() { - echo "$1" | tee -a installCDE.log + echo "$1" | tee -a $LOGFILE } MakeTarball() @@ -154,11 +155,11 @@ DoFilesetScript() then Log "Executing $PLATFORM specific $FilesetName customize script" $POST_INSTALL_DIR/$PLATFORM_SCRIPT_DIR/$ScriptName -e 2>&1 | \ - tee -a /tmp/installCDE.log + tee -a $LOGFILE elif [ -x $POST_INSTALL_DIR/$ScriptName ] then Log "Executing $FilesetName customize script" - $POST_INSTALL_DIR/$ScriptName -e 2>&1 | tee -a /tmp/installCDE.log + $POST_INSTALL_DIR/$ScriptName -e 2>&1 | tee -a $LOGFILE fi fi } @@ -204,7 +205,7 @@ CleanDaemons() lssrc -s inetd >/dev/null 2>&1 if [ $? = "0" ] then - stopsrc -s inetd >>/tmp/installCDE.log 2>&1 + stopsrc -s inetd >>$LOGFILE 2>&1 fi else ps -ef | grep $i | grep -v grep >/tmp/tmppsout @@ -229,7 +230,7 @@ RestartInetd() /usr/sbin/inetd -s elif [ "$PLATFORM" = "aix" ] then - startsrc -s inetd >>/tmp/installCDE.log 2>&1 + startsrc -s inetd >>$LOGFILE 2>&1 elif [ "$PLATFORM" = "dec" ] then /usr/sbin/inetd @@ -475,11 +476,16 @@ LoadFileSet() num="$1." fi +XCOMM don't bother if the fileset doesn't exist + if [ ! -e $DATABASE_DIR/${2}.udb ] + then + return + fi + Log " $num installing database $2" Log " - creating ${2}.lst file" $TOOL_DIR/udbToAny.ksh -toLst -ReleaseStream $PLATFORM \ $DATABASE_DIR/${2}.udb > /tmp/${2}.lst - Log " - installing ... \c" $TOOL_DIR/mkProd -D / -S $BUILD_TREE /tmp/${2}.lst \ 2>/tmp/${2}.err 1>/tmp/${2}.good @@ -492,7 +498,7 @@ LoadFileSet() if [ -s /tmp/${2}.missing ] then Log " - missing files:" - cat /tmp/${2}.missing | tee -a /tmp/installCDE.log + cat /tmp/${2}.missing | tee -a $LOGFILE fi } @@ -527,6 +533,10 @@ XCOMM then PLATFORM=dec PLATFORM_SCRIPT_DIR=dec + elif [ $BUILDSYSTEM = "Linux" ]; + then + PLATFORM="linux" + PLATFORM_SCRIPT_DIR="" else # Build system = HP PLATFORM=hp-ux PLATFORM_SCRIPT_DIR=hp @@ -544,9 +554,8 @@ XCOMM if [ "$USER" != "root" ]; then - USAGE echo "" - echo "You must be root to run this script. Continuing anyway." + echo "You should be root to run this script. Continuing anyway." echo "" fi @@ -586,7 +595,7 @@ XCOMM theLang="" CONFIGURE_ONLY="no" - rm -f /tmp/installCDE.log + rm -f $LOGFILE Log "Options specified..." while [ $# -ne 0 ]; do @@ -959,5 +968,5 @@ XCOMM echo "Done." echo "" - echo "See /tmp/installCDE.log for a log of this install session." + echo "See $LOGFILE for a log of this install session." echo "" diff --git a/cde/databases/CDE-SHLIBS.src b/cde/databases/CDE-SHLIBS.src index 35a845309..e3e07ed5a 100644 --- a/cde/databases/CDE-SHLIBS.src +++ b/cde/databases/CDE-SHLIBS.src @@ -390,6 +390,199 @@ lib/DtMmdb/libDtMmdb.so.2.1 install_target = /usr/dt/lib/libDtMmdb.so.2.1 mode = 0755 } + +XCOMM +XCOMM +XCOMM >>----------------------------- +XCOMM linux libraries +XCOMM <<----------------------------- +XCOMM + +XCOMM +lib/DtHelp/libDtHelp.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtHelp.so.2.1 + mode = 0755 +} +XCOMM +./libDtHelp.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtHelp.so.2 + type = sym_link +} +XCOMM +./libDtHelp.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtHelp.so + type = sym_link +} +XCOMM +lib/DtPrint/libDtPrint.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtPrint.so.2.1 + mode = 0755 +} +XCOMM +./libDtPrint.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtPrint.so.2 + type = sym_link +} +XCOMM +./libDtPrint.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtPrint.so + type = sym_link +} +XCOMM +lib/DtMrm/libDtMrm.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtMrm.so.2.1 + mode = 0755 +} +XCOMM +./libDtMrm.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtMrm.so.2 + type = sym_link +} +XCOMM +./libDtMrm.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtMrm.so + type = sym_link +} +XCOMM +lib/DtSvc/libDtSvc.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtSvc.so.2.1 + mode = 0755 +} +XCOMM +./libDtSvc.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtSvc.so.2 + type = sym_link +} +XCOMM +./libDtSvc.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtSvc.so + type = sym_link +} +XCOMM +lib/DtWidget/libDtWidget.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtWidget.so.2.1 + mode = 0755 +} +XCOMM +./libDtWidget.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtWidget.so.2 + type = sym_link +} +XCOMM +./libDtWidget.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtWidget.so + type = sym_link +} +XCOMM +lib/DtTerm/libDtTerm.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtTerm.so.2.1 + mode = 0755 +} +XCOMM +./libDtTerm.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtTerm.so.2 + type = sym_link +} +XCOMM +./libDtTerm.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtTerm.so + type = sym_link +} +XCOMM +lib/tt/lib/libtt.so.2.1 +{ linux + install_target = /usr/dt/lib/libtt.so.2.1 + mode = 0755 +} +XCOMM +./libtt.so.2.1 +{ linux + install_target = /usr/dt/lib/libtt.so.2 + type = sym_link +} +XCOMM +./libtt.so.2.1 +{ linux + install_target = /usr/dt/lib/libtt.so + type = sym_link +} +XCOMM +lib/csa/libcsa.so.2.1 +{ linux + install_target = /usr/dt/lib/libcsa.so.2.1 + mode = 0755 +} +XCOMM +./libcsa.so.2.1 +{ linux + install_target = /usr/dt/lib/libcsa.so.2 + type = sym_link +} +XCOMM +./libcsa.so.2.1 +{ linux + install_target = /usr/dt/lib/libcsa.so + type = sym_link +} +XCOMM +lib/DtSearch/libDtSearch.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtSearch.so.2.1 + mode = 0755 +} +XCOMM +./libDtSearch.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtSearch.so.2 + type = sym_link +} +XCOMM +./libDtSearch.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtSearch.so + type = sym_link +} + +#if 0 /* JET - not for linux (yet) */ +XCOMM +lib/DtMmdb/libDtMmdb.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtMmdb.so.2.1 + mode = 0755 +} +XCOMM +./libDtMmdb.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtMmdb.so.2 + type = sym_link +} +XCOMM +./libDtMmdb.so.2.1 +{ linux + install_target = /usr/dt/lib/libDtMmdb.so + type = sym_link +} +#endif + + XCOMM XCOMM >>----------------------------- XCOMM AIX libraries diff --git a/cde/databases/Imakefile b/cde/databases/Imakefile index fa5cf390d..79f539f7a 100644 --- a/cde/databases/Imakefile +++ b/cde/databases/Imakefile @@ -36,7 +36,7 @@ UDB_RELEASE_OPT = -ReleaseStream linux /* AIX cpp rejects "hp-ux" as an invalid sub-option. */ UDB_CPP_UNDEF_LIST = -UhpV4 -Uhpux -Uaix -Usun -Uusl -Udec -Uuxp -Uunix #else -UDB_CPP_UNDEF_LIST = -UhpV4 -Uhpux -Uhp-ux -Uaix -Usun -Uusl -Udec -Uuxp -Uunix +UDB_CPP_UNDEF_LIST = -UhpV4 -Uhpux -Uhp-ux -Uaix -Usun -Uusl -Udec -Uuxp -Uunix -Ulinux #endif