Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26789
Modified Files:
Makefile fedora-patch.inf redhat-patch.inf
Log Message:
[167982] Service Pack framework
Ported the patch making code from Directory71RtmBranch to the trunk.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Makefile 3 Oct 2005 19:53:54 -0000 1.34
+++ Makefile 4 Oct 2005 17:03:43 -0000 1.35
@@ -749,15 +749,18 @@
ifdef BUILD_PATCH
mkdir -p $(PATCHINSTDIR)/$(SLAPDSP)
+ cp $(INSTDIR)/setup $(PATCHINSTDIR)/dssetup
+ cp $(INSTDIR)/unzip_wrapper.pl $(PATCHINSTDIR)
cp $(INSTDIR)/LICENSE.txt $(PATCHINSTDIR)
cp $(INSTDIR)/README.txt $(PATCHINSTDIR)
+ cp $(BUILD_ROOT)/ldap/cm/newinst/setup.patch $(PATCHINSTDIR)/setup
# prepare the main inf file: setup.inf pointing inf file $(SLAPDS)/$(SLAPD).inf
sed -e "s/Components.*=/Components = $(SLAPDSP)/" $(INSTDIR)/setup.inf >
$(PATCHINSTDIR)/setup.inf
echo "" >> $(PATCHINSTDIR)/setup.inf
echo "[$(SLAPDSP)]" >> $(PATCHINSTDIR)/setup.inf
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 `egrep file: $(PATCHINF) | awk -F: '{print
$$3}'`
+ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r
$(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `egrep "^file:" $(PATCHINF) | awk
-F: '{print $$3}'`
# put ns-config and needed libs in the $(PATCHINSTDIR)/$(SLAPDSP) directory
$(INSTALL) -m 755 $(RELDIR_32)/bin/slapd/admin/bin/ns-config $(PATCHINSTDIR)/$(SLAPDSP)
-@for file in $(PACKAGE_SETUP_LIBS_32) ; \
@@ -767,7 +770,7 @@
done
# create patch inf file: $(SLAPD).inf
cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf
- cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `egrep file: $(PATCHINF) | egrep -v
"setup/setup" | awk -F: '{print $$3}'` >
$(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp
+ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `egrep "^file:" $(PATCHINF) |
egrep -v "setup/setup" | awk -F: '{print $$3}'` >
$(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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-patch.inf 22 Sep 2005 16:48:16 -0000 1.2
+++ fedora-patch.inf 4 Oct 2005 17:03:43 -0000 1.3
@@ -43,5 +43,5 @@
base: /share/dev4/fedora-ds/fds71/ships/20050526.1
file: 000001: README.txt
-file: 000002: COPYRIGHT.txt
+file: 000002: lib/libback-ldbm.*
Index: redhat-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/redhat-patch.inf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- redhat-patch.inf 22 Sep 2005 16:48:16 -0000 1.2
+++ redhat-patch.inf 4 Oct 2005 17:03:43 -0000 1.3
@@ -43,5 +43,4 @@
base: /share/dev4/fedora-ds/fds71/ships/20050526.1
file: 000001: README.txt
-file: 000002: COPYRIGHT.txt
-
+file: 000002: lib/libback-ldbm.*
Show replies by date