From dcace9f7b61c64d30e7d062c7cf1969c04004833 Mon Sep 17 00:00:00 2001 From: Herb Lewis Date: Tue, 2 Apr 2002 05:54:55 +0000 Subject: merge from 2.2 - build winbindd and libsmbclient (This used to be commit 23f61938b6021effa9de90ab8c97e182ccd8701b) --- packaging/SGI/idb.pl | 17 +++++++++++------ packaging/SGI/mkrelease.sh | 7 ++++--- 2 files changed, 15 insertions(+), 9 deletions(-) (limited to 'packaging/SGI') diff --git a/packaging/SGI/idb.pl b/packaging/SGI/idb.pl index 8858702b9f..ddbad80356 100755 --- a/packaging/SGI/idb.pl +++ b/packaging/SGI/idb.pl @@ -113,11 +113,7 @@ chdir $curdir; # add my local files to the list of binaries to install @bins = sort byfilename (@sprogs,@progs,@progs1,@progs2,@mprogs,@scripts,@winbind_progs,@winbind_sprogs,("/findsmb","/sambalp","/smbprint")); -# add libnss_wins.so if it was built -if (-e "$SRCDIR/source/nsswitch/libnss_wins.so") { - $libns_wins = "nsswitch/libnss_wins.so"; -} -@nsswitch = sort byfilename (@winbind_lprogs,@winbind_pam_progs,$libns_wins); +@nsswitch = sort byfilename (@winbind_lprogs,@winbind_pam_progs); # get a complete list of all files in the tree chdir "$SRCDIR/"; @@ -141,9 +137,13 @@ chdir $curdir; open(IDB,"> $curdir/$PKG.idb") || die "Unable to open $PKG.idb for output\n"; print IDB "f 0644 root sys etc/config/samba $SRCPFX/packaging/SGI/samba.config $PKG.sw.base config(update)\n"; +print IDB "f 0644 root sys etc/config/winbind $SRCPFX/packaging/SGI/winbindd.config $PKG.sw.base config(update)\n"; print IDB "f 0755 root sys etc/init.d/samba $SRCPFX/packaging/SGI/samba.rc $PKG.sw.base\n"; -print IDB "l 0000 root sys etc/rc0.d/K39samba $SRCPFX/packaging/SGI $PKG.sw.base symval(../init.d/samba)\n"; +print IDB "f 0755 root sys etc/init.d/winbind $SRCPFX/packaging/SGI/winbindd.rc $PKG.sw.base\n"; +print IDB "l 0000 root sys etc/rc0.d/K36winbind $SRCPFX/packaging/SGI $PKG.sw.base symval(../init.d/winbind)\n"; +print IDB "l 0000 root sys etc/rc0.d/K37samba $SRCPFX/packaging/SGI $PKG.sw.base symval(../init.d/samba)\n"; print IDB "l 0000 root sys etc/rc2.d/S81samba $SRCPFX/packaging/SGI $PKG.sw.base symval(../init.d/samba)\n"; +print IDB "l 0000 root sys etc/rc2.d/S82winbind $SRCPFX/packaging/SGI $PKG.sw.base symval(../init.d/winbind)\n"; if ($PKG eq "samba_irix") { print IDB "d 0755 root sys usr/relnotes/samba_irix $SRCPFX/packaging/SGI $PKG.man.relnotes\n"; @@ -219,12 +219,17 @@ while (@docs) { } } +print IDB "d 0755 root sys usr/samba/include $SRCPFX/packaging/SGI $PKG.sw.base\n"; +print IDB "f 0644 root sys usr/samba/include/libsmbclient.h $SRCPFX/source/include/libsmbclient.h $PKG.sw.base\n"; + print IDB "d 0755 root sys usr/samba/lib $SRCPFX/packaging/SGI $PKG.sw.base\n"; print IDB "d 0755 root sys usr/samba/lib/codepages $SRCPFX/packaging/SGI $PKG.sw.base\n"; while (@codepage) { $nextpage = shift @codepage; print IDB "f 0644 root sys usr/samba/lib/codepages/$nextpage $SRCPFX/packaging/SGI/codepages/$nextpage $PKG.sw.base nostrip \n"; } +print IDB "f 0644 root sys usr/samba/lib/libsmbclient.a $SRCPFX/source/bin/libsmbclient.a $PKG.sw.base\n"; +print IDB "f 0644 root sys usr/samba/lib/libsmbclient.so $SRCPFX/source/bin/libsmbclient.so $PKG.sw.base\n"; print IDB "f 0644 root sys usr/samba/lib/smb.conf $SRCPFX/packaging/SGI/smb.conf $PKG.sw.base config(suggest)\n"; print IDB "d 0755 lp sys usr/samba/printer $SRCPFX/packaging/SGI $PKG.sw.base\n"; diff --git a/packaging/SGI/mkrelease.sh b/packaging/SGI/mkrelease.sh index 1a565a73e7..6ba486c673 100755 --- a/packaging/SGI/mkrelease.sh +++ b/packaging/SGI/mkrelease.sh @@ -19,14 +19,14 @@ if [ ! -f ../../source/Makefile ]; then doclean="clean" fi -if [ "$1" = "clean" ]; then +if [ "$1" = "clean" ] || [ "$1" = "cleanonly" ]; then doclean=$1 shift fi export SGI_ABI ISA CC -if [ "$doclean" = "clean" ]; then +if [ "$doclean" = "clean" ] || [ "$doclean" = "cleanonly" ]; then cd ../../source if [ -f Makefile ]; then make distclean @@ -34,6 +34,7 @@ if [ "$doclean" = "clean" ]; then rm -rf bin/*.profile bin/*.noquota cd ../packaging/SGI rm -rf bins catman html codepages swat samba.idb samba.spec + if [ "$doclean" = "cleanonly" ]; then exit 0 ; fi fi # create the catman versions of the manual pages @@ -88,7 +89,7 @@ fi mv bin/smbd bin/smbd.noquota echo "===================== Making Regular versions =======================" -make -P "CFLAGS=-O -g3 -woff 1188" all +make -P "CFLAGS=-O -g3 -woff 1188" all libsmbclient errstat=$? if [ $errstat -ne 0 ]; then echo "Error $errstat building sources\n"; -- cgit