[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.10, 1.30.2.11 fedora-patch.inf, 1.1.2.5, 1.1.2.6 redhat-patch.inf, 1.1.2.5, 1.1.2.6 genRpmPatch.pl, 1.1.2.2, 1.1.2.3
Noriko Hosoi (nhosoi)
fedora-directory-commits at redhat.com
Sat Oct 22 00:07:47 UTC 2005
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3692/ldap/cm
Modified Files:
Tag: Directory71RtmBranch
Makefile fedora-patch.inf redhat-patch.inf genRpmPatch.pl
Log Message:
[171306] Cleanup of admin server code
(component_versions.mk ldap/cm/Makefile ldap/cm/fedora-patch.inf ldap/cm/redhat-patch.inf ldap/cm/genRpmPatch.pl)
[171349] JRE,JSS files in DS 7.1 SP1 package appear changed due to stripping
(ldap/cm/Makefile)
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.10
retrieving revision 1.30.2.11
diff -u -r1.30.2.10 -r1.30.2.11
--- Makefile 14 Oct 2005 16:07:56 -0000 1.30.2.10
+++ Makefile 22 Oct 2005 00:07:42 -0000 1.30.2.11
@@ -230,6 +230,8 @@
endif
endif
ABS_INSTDIR = $(shell cd $(INSTDIR); pwd)
+ABS_DISTDIR = $(ABSBUILD_ROOT)/../dist
+ESCAPED_ABS_DISTDIR = $(shell echo $(ABS_DISTDIR) | sed -e 's/\//\\\//g')
ifdef BUILD_PATCH
PATCHINSTDIR = $(ABS_INSTDIR)-SP
@@ -628,15 +630,6 @@
$(INSTDIR)/tools/infozip.zip \
$(ADMSERV_DEP)
-ifdef BUILD_PATCH
-ifdef BUILD_RPM
-# create a patch
- $(GENRPMPATCH) -i $(RPM_BASE_NAME) -o $(NS_BUILD_FLAVOR) -r $(ABSRELDIR) -e $(SPEXT) -f $(PATCHINF) -v
- mv $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR) $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR).original
- ln -s $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)$(SPEXT)/opt/$(RPM_BASE_NAME)-ds $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)
-endif
-endif
-
# copy over the setup sdk stuff
# hack - remove once admin server bundles setupsdk 6.02
# cp -R $(SETUP_SDK_BUILD_DIR)/bin/* $(INSTDIR)
@@ -661,6 +654,22 @@
endif
endif
endif
+
+ifdef BUILD_PATCH
+# take care of files in components (e.g., a file in nsadmin.zip)
+ - at for pair in `grep "^compfile:" $(PATCHINF) | awk '{print $$3}'`; do \
+ zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NC_BUILD_FLAVOR)/"` ; \
+ afile=`echo $$pair | awk -F: '{print $$2}'` ; \
+ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); $(UNZIP) -o $$zipfile $$afile ; \
+ done
+ifdef BUILD_RPM
+# create a patch
+ $(GENRPMPATCH) -i $(RPM_BASE_NAME) -o $(NS_BUILD_FLAVOR) -r $(ABSRELDIR) -e $(SPEXT) -f $(PATCHINF) -v
+ mv $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR) $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR).original
+ ln -s $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)$(SPEXT)/opt/$(RPM_BASE_NAME)-ds $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)
+endif
+endif
+
# create the slapd-client.zip file, which only has the ds jar file for the console and
# the ldap client utility programs
rm -f $(INSTDIR)/slapd/slapd-client.zip
@@ -821,6 +830,7 @@
echo "ComponentInfoFile = $(SLAPDSP)/$(SLAPDSP).inf" >> $(PATCHINSTDIR)/setup.inf
# create a zip file based upon the $(PATCHINF) file
cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `grep "^file:" $(PATCHINF) | awk -F: '{print $$3}'`
+ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip -u `grep "^compfile:" $(PATCHINF) | awk -F: '{print $$4}'`
# put ns-config and needed libs in the $(PATCHINSTDIR)/$(SLAPDSP) directory
$(INSTALL) -m 755 $(RELDIR_32)/bin/slapd/admin/bin/ns-config $(PATCHINSTDIR)/$(SLAPDSP)
- at for file in $(PACKAGE_SETUP_LIBS_32) ; \
@@ -831,6 +841,7 @@
# create patch inf file: $(SLAPD).inf
cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf
cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `grep "^file:" $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp
+ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `grep "^compfile:" $(PATCHINF) | awk -F: '{print $$4}'` >> $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp
echo `cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp` | sed -e "s/ /,/g" > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2
echo "BackupFiles="`cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2`>> $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf
rm -f $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2
Index: fedora-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/fedora-patch.inf,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- fedora-patch.inf 20 Oct 2005 18:11:23 -0000 1.1.2.5
+++ fedora-patch.inf 22 Oct 2005 00:07:42 -0000 1.1.2.6
@@ -39,6 +39,8 @@
# Info file to generate DS7.1 SP1 patch
# base: <builddir> containing the base package -- DS7.1
# file: bug#: <patchfile>
+# compfile: bug#: <patch_zipfile>:<patchfile>
+# %DISTDIR% points <buildroot>/dist/<platform>
#
base: /share/dev4/fedora-ds/fds71/ships/20050526.1
@@ -53,9 +55,10 @@
file: 164836,165600: lib/attr-unique-plugin.*
file: 165640: lib/views-plugin.*
file: 167478,160589: setup/setup
-file: 156120,159037: winsync/PassSync.msi
+file: 156120,159037,170321,170328,170556,170558,170816: winsync/PassSync.msi
file: 167761: java/jars/ds71.jar
-file: 169388: lib/replication-plugin.*
+file: 169388,169954,170071,170350: lib/replication-plugin.*
file: xxxxxx: bin/slapd/README.txt
file: xxxxxx: README.txt
+compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help
Index: redhat-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/redhat-patch.inf,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- redhat-patch.inf 20 Oct 2005 18:11:23 -0000 1.1.2.5
+++ redhat-patch.inf 22 Oct 2005 00:07:42 -0000 1.1.2.6
@@ -39,6 +39,8 @@
# Info file to generate DS7.1 SP1 patch
# base: <builddir> containing the base package -- DS7.1
# file: bug#: <patchfile>
+# compfile: bug#: <patch_zipfile>:<patchfile>
+# %DISTDIR% points <buildroot>/dist/<platform>
#
base: /share/dev4/ds/ds71/ships/20050524.1
@@ -53,8 +55,10 @@
file: 164836,165600: lib/attr-unique-plugin.*
file: 165640: lib/views-plugin.*
file: 167478,160589: setup/setup
-file: 156120,159037: winsync/PassSync.msi
+file: 156120,159037,170321,170328,170556,170558,170816: winsync/PassSync.msi
file: 167761: java/jars/ds71.jar
-file: 169388: lib/replication-plugin.*
+file: 169388,169954,170071,170350: lib/replication-plugin.*
file: xxxxxx: bin/slapd/README.txt
file: xxxxxx: README.txt
+
+compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help
Index: genRpmPatch.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/genRpmPatch.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- genRpmPatch.pl 14 Sep 2005 16:16:38 -0000 1.1.2.2
+++ genRpmPatch.pl 22 Oct 2005 00:07:42 -0000 1.1.2.3
@@ -129,7 +129,13 @@
$pos = rindex($l, ":", $pos);
$pos++;
$file = substr($l, $pos);
- $file =~ s/[ ]//g;
+ $file =~ s/[ ]//g;
+ push(@newfiles, ($file));
+ } elsif ($l =~ /^compfile: /) {
+ $pos = rindex($l, ":", $pos);
+ $pos++;
+ $file = substr($l, $pos);
+ $file =~ s/[ ]//g;
push(@newfiles, ($file));
}
}
More information about the Fedora-directory-commits
mailing list