kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Find and implement the proper way to run ldconfig for both the linux

Browse source 
and linux32 emul subtrees on amd64, by setting LDCONFIG_ADD_CMD /
LDCONFIG_REMOVE_CMD.

While here, streamline a few things.
This commit is contained in:
Hauke Fath 2014-01-09 13:42:06 +00:00 committed by Thomas Klausner
parent bf91c30758
commit 36781248e2
3 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tsm62/MESSAGE
View file

@ -1,5 +1,5 @@
===========================================================================
$NetBSD: MESSAGE,v 1.1 2013/03/25 15:52:51 hfath Exp $
$NetBSD: MESSAGE,v 1.2 2014/01/09 13:42:06 hfath Exp $
Tivoli Storage Manager Client has been installed in
${EMULDIR}/opt/tivoli
@ -28,8 +28,8 @@ NetBSD configuration hints:
- For backing up the native filesystem hierarchy, use a construct
like "ln -s / /.`hostname`" to break out of the emul shadow hierarchy.
- If you want to use dsmj (option javagui), the directory containing
the java binary needs to be in PATH.
- If you want to use the GUI client dsmj (option java), the directory
containing the java binary needs to be in PATH.
TSM documentation (html and pdf) is installed under
${EMULDIR}/opt/tivoli/tsm/client/books.

25
tsm62/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.8 2014/01/07 14:13:42 hfath Exp $
# $NetBSD: Makefile,v 1.9 2014/01/09 13:42:06 hfath Exp $
DISTNAME= tsm-6.2.4.0
PKGREVISION= 4
PKGREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.software.ibm.com/storage/tivoli-storage-management/maintenance/client/v6r2/Linux/LinuxX86/v624/
DISTFILES= 6.2.4.0-TIV-TSMBAC-LinuxX86.tar
@ -62,10 +62,13 @@ RPMFILES+= ${WRKDIR}/TIVsm-API64.i386.rpm \
# Make sure suse pkg version equals the above
DEPENDS+= suse32_base:../../emulators/suse121_32_base
EMUL32DIR= ${_OPSYS_EMULDIR.linux32}
EMUL32DIR= ${PREFIX}${_OPSYS_EMULDIR.linux32}
PLIST_SUBST+= EMUL32DIR=${EMUL32DIR:Q}
MESSAGE_SUBST+= EMUL32DIR=${EMUL32DIR:Q}
MAKE_DIRS+= ${EMUL32DIR}/etc/ld.so.conf.d
LDCONFIG_ADD_CMD= ${EMULDIR}/sbin/ldconfig ; ${EMUL32DIR}/sbin/ldconfig
LDCONFIG_REMOVE_CMD= ${LDCONFIG_ADD_CMD}
.endif
.include "options.mk"
@ -89,15 +92,15 @@ post-install:
${INSTALL_DATA} ${FILESDIR}/tsm_ld.so.conf.${MACHINE_ARCH} \
${DESTDIR}${EMULDIR}/etc/ld.so.conf.d/tsm_ld.so.conf
.if ${EMUL_PLATFORM} == "linux-x86_64"
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}${EMUL32DIR}/opt
${INSTALL_DATA_DIR} ${DESTDIR}${EMUL32DIR}/opt
${LN} -s /..${EMULDIR}/opt/tivoli/ \
${DESTDIR}${PREFIX}${EMUL32DIR}/opt/tivoli
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}${EMUL32DIR}/usr/local/ibm
${DESTDIR}${EMUL32DIR}/opt/tivoli
${INSTALL_DATA_DIR} ${DESTDIR}${EMUL32DIR}/usr/local/ibm
${LN} -s /..${EMULDIR}/usr/local/ibm/gsk8/ \
${DESTDIR}${PREFIX}${EMUL32DIR}/usr/local/ibm/gsk8
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}${EMUL32DIR}/etc/ld.so.conf.d
${DESTDIR}${EMUL32DIR}/usr/local/ibm/gsk8
${INSTALL_DATA_DIR} ${DESTDIR}${EMUL32DIR}/etc/ld.so.conf.d
${INSTALL_DATA} ${FILESDIR}/tsm_ld.so.conf.i386 \
${DESTDIR}${PREFIX}${EMUL32DIR}/etc/ld.so.conf.d/tsm_ld.so.conf
${DESTDIR}${EMUL32DIR}/etc/ld.so.conf.d/tsm_ld.so.conf
.endif
${LN} -s /..${PKG_SYSCONFDIR}/dsm.sys \
${DESTDIR}${EMULDIR}/${TSMCLIENTSUBDIR}/ba/bin/
@ -105,10 +108,10 @@ post-install:
${DESTDIR}${EMULDIR}/${TSMCLIENTSUBDIR}/ba/bin/
${LN} -s ../../lang/EN_US \
${DESTDIR}${EMULDIR}/${TSMCLIENTSUBDIR}/ba/bin/
${INSTALL_PROGRAM_DIR} ${DESTDIR}/${PREFIX}/bin
${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
.for bb in ${PUBLIC_BINS}
${LN} -s ${EMULDIR}/${TSMCLIENTSUBDIR}/ba/bin/${bb} \
${DESTDIR}/${PREFIX}/bin/${bb}
${DESTDIR}${PREFIX}/bin/${bb}
.endfor
.include "../../mk/bsd.pkg.mk"

4
tsm62/PLIST.linux-x86_64
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST.linux-x86_64,v 1.4 2013/12/10 16:10:32 hfath Exp $
@comment $NetBSD: PLIST.linux-x86_64,v 1.5 2014/01/09 13:42:06 hfath Exp $
emul/linux/opt/tivoli/tsm/client/api/bin64/.buildDate
emul/linux/opt/tivoli/tsm/client/api/bin64/dsm.opt.smp
emul/linux/opt/tivoli/tsm/client/api/bin64/dsm.sys.smp
@ -65,5 +65,3 @@ emul/linux32/opt/tivoli
emul/linux32/usr/local/ibm/gsk8
@pkgdir emul/linux/usr/local/ibm/gsk8_64/inc
@pkgdir emul/linux/usr/local/ibm/gsk8_64/docs
@exec ${EMUL32DIR}/sbin/ldconfig -r ${EMUL32DIR} || /usr/bin/true
@unexec ${EMUL32DIR}/sbin/ldconfig -r ${EMUL32DIR} || /usr/bin/true