diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2006-02-13 22:25:33 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2006-02-13 22:25:33 +0000 |
| commit | e225d7ed97cb4358c2e6e2bc5306be7592ae014f (patch) | |
| tree | cdf64cd23f877d06687be17702003d99b9730596 /ldap/cm | |
| parent | 3e9312ac1c76ac990ea44b5b837a795c04def632 (diff) | |
| download | ds-e225d7ed97cb4358c2e6e2bc5306be7592ae014f.tar.gz ds-e225d7ed97cb4358c2e6e2bc5306be7592ae014f.tar.xz ds-e225d7ed97cb4358c2e6e2bc5306be7592ae014f.zip | |
Use NSS 3.11 and NSPR 4.6.1 - NSS 3.11 requires the new freebl lib at runtime,
and more on Solaris and HP-UX.
Use setup.inf from admin server, and make sure the admin component is in there.
Diffstat (limited to 'ldap/cm')
| -rw-r--r-- | ldap/cm/Makefile | 14 | ||||
| -rw-r--r-- | ldap/cm/fixSetupInf.pl | 11 |
2 files changed, 21 insertions, 4 deletions
diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile index 75c15439..be1b04cc 100644 --- a/ldap/cm/Makefile +++ b/ldap/cm/Makefile @@ -595,7 +595,6 @@ packageDirectory: $(INSTDIR)/slapd \ # this gets setup, setup.inf, silent.inf, the zip wrapper, and svrcore, among others ifeq ($(USE_SETUPUTIL),1) cp -R $(SETUPUTIL_BINPATH)/* $(INSTDIR) - $(PERL) -w $(FIX_SETUP_INF) $(SETUPUTIL_BINPATH)/setup.inf $(INSTDIR)/setup.inf endif # copy in our product .inf files @@ -691,6 +690,13 @@ endif done ; \ fi +# make sure setup.inf has everything we need +ifeq ($(USE_SETUPUTIL),1) + cp $(INSTDIR)/setup.inf $(INSTDIR)/setup.inf.tmp + $(PERL) -w $(FIX_SETUP_INF) $(INSTDIR)/setup.inf.tmp $(INSTDIR)/setup.inf $(USE_ADMINSERVER) + rm -f $(INSTDIR)/setup.inf.tmp +endif + # we must remove the nsbase.zip file - we package those files now rm -f $(INSTDIR)/base/nsbase.zip # we also need to remove the Archive directive from the [base] section of the @@ -714,7 +720,7 @@ ifndef NO_INSTALLER_TAR_FILES # build the combined packages tar file; use h flag to follow symlinks ifdef BUILD_SHIP ifndef BUILD_PATCH - cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd \ + cd $(INSTDIR); $(TAR) cvfh - setup slapd \ dsktune $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ) endif ifeq ($(DEBUG), optimize) @@ -723,7 +729,7 @@ endif else echo base/unzipped > $(TMPLIST) echo admin/unzipped >> $(TMPLIST) - cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd \ + cd $(INSTDIR); $(TAR) cvfh - setup slapd \ dsktune $(ADMIN_IMPORTS) -X $(TMPLIST) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz rm -f $(TMPLIST) endif # BUILD_SHIP @@ -913,7 +919,7 @@ _admserv_files: $(INSTDIR) $(ADMSERV_DEP) # move the tarball back after the copy mv $(ADMSERV_DIR)/../$(ADMIN_SERVER_TARGZ) $(ADMSERV_DIR) # make sure our packages are in the setup.inf file - $(PERL) -w $(FIX_SETUP_INF) $(ADMSERV_DIR)/setup.inf $(INSTDIR)/setup.inf + $(PERL) -w $(FIX_SETUP_INF) $(ADMSERV_DIR)/setup.inf $(INSTDIR)/setup.inf $(USE_ADMINSERVER) #---------------------------- slapd rules -------------------------------------------------- diff --git a/ldap/cm/fixSetupInf.pl b/ldap/cm/fixSetupInf.pl index ca9b990b..003cba5f 100644 --- a/ldap/cm/fixSetupInf.pl +++ b/ldap/cm/fixSetupInf.pl @@ -51,6 +51,8 @@ $ServerDirKey = "DefaultInstallDirectory"; $input = shift; $output = shift; +$use_adminserver = shift; + die "cannot open input file $input" unless open( FILE, $input ); die "cannot open output file $output" unless open( OUT, ">$output" ); $inGeneralSection = 0; @@ -65,6 +67,10 @@ while ( <FILE> ) { $_ .= ", slapd"; $addedSlapd = 1; } + if (! /admin/ && $use_adminserver) { + $_ .= ", admin"; + $addedAdmin = 1; + } if (! /perldap/) { $_ .= ", perldap"; $addedPerLDAP = 1; @@ -95,6 +101,11 @@ if ($addedSlapd) { print OUT "ComponentInfoFile = slapd/slapd.inf\n"; } +if ($addedAdmin) { + print OUT "\n[admin]\n"; + print OUT "ComponentInfoFile = admin/admin.inf\n"; +} + if ($addedPerLDAP) { print OUT "\n[perldap]\n"; print OUT "ComponentInfoFile = perldap/perldap.inf\n"; |