Patches look good. Only one I have any question about is this one. Is it necessary to manually put the popt, openssl, and zlib stuff in the boel tarball? Won't mklibs include the necessary libraries when it is run with the new "super long" library path?
It's probably not worth worrying about changing/testing the change at this point for this release, as I see no reason things won't work as is. However, I do think it's good to make a note for when we look at bringing some of these changes forward into head. Cheers, -Brian [EMAIL PROTECTED] wrote: >Update of /cvsroot/systemimager/systemimager >In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24418 > >Modified Files: > Tag: v3_4_x > Makefile >Log Message: >Add popt, zlib and openssl libraries to build process. >Alter the library path used by mklibs to search our libraries before any >others. There were more than just the three above missing. >Move /lib64:/usr/lib64 to end of library list under the presumption that >the makefiles will build our source correctly. > > >Index: Makefile >=================================================================== >RCS file: /cvsroot/systemimager/systemimager/Makefile,v >retrieving revision 1.164 >retrieving revision 1.164.2.1 >diff -u -d -r1.164 -r1.164.2.1 >--- Makefile 19 Sep 2004 23:23:55 -0000 1.164 >+++ Makefile 20 Apr 2005 03:59:51 -0000 1.164.2.1 >@@ -428,12 +428,15 @@ > $(TUNE2FS_BINARY) \ > $(PARTED_BINARY) \ > $(MKSWAP_BINARY) \ >+ $(POPT_LIBRARY) \ > $(RAIDTOOLS_BINARIES) \ > $(MKREISERFS_BINARY) \ > $(MKJFS_BINARY) \ > $(MKXFS_BINARY) \ > $(CTCS_BINARY) \ > $(DEPMOD_BINARY) \ >+ $(ZLIB_LIBRARY) \ >+ $(OPENSSL_BINARIES) \ > $(OPENSSH_BINARIES) \ > $(OPENSSH_CONF_FILES) \ > $(SRC_DIR)/modules_build-stamp >@@ -501,7 +504,7 @@ > # copy standard libraries if it can't find a PIC equivalent. -BEF- > # > cd $(BOEL_BINARIES_DIR) && $(PYTHON) $(TOPDIR)/initrd_source/mklibs \ >- -L >/lib64:/usr/lib64:$(SRC_DIR)/$(PARTED_DIR)/libparted/.libs:$(SRC_DIR)/$(DISCOVER_DIR)/lib/.libs > -v -d lib bin/* sbin/* >+ -L >$(SRC_DIR)/$(ZLIB_DIR):$(SRC_DIR)/$(OPENSSL_DIR):$(SRC_DIR)/$(POPT_DIR)/.libs:$(SRC_DIR)/$(PARTED_DIR)/libparted/.libs:$(SRC_DIR)/$(DISCOVER_DIR)/lib/.libs:$(SRC_DIR)/$(E2FSPROGS_DIR)/lib:/lib64:/usr/lib64 > -v -d lib bin/* sbin/* > # > # Include other files required by openssh that apparently aren't > # picked up by mklibs for some reason. -BEF- > > > >------------------------------------------------------- >This SF.Net email is sponsored by: New Crystal Reports XI. >Version 11 adds new functionality designed to reduce time involved in >creating, integrating, and deploying reporting solutions. Free runtime info, >new features, or free trial, at: http://www.businessobjects.com/devxi/728 >_______________________________________________ >systemimager-cvs-commits mailing list >[EMAIL PROTECTED] >https://lists.sourceforge.net/lists/listinfo/systemimager-cvs-commits > > > > -- ------------------------------------------------------ Brian Elliott Finley Mobile: 630.631.6621 gpg --keyserver wwwkeys.pgp.net --recv-keys 10F8EE52 ------------------------------------------------------ ------------------------------------------------------- This SF.Net email is sponsored by: New Crystal Reports XI. Version 11 adds new functionality designed to reduce time involved in creating, integrating, and deploying reporting solutions. Free runtime info, new features, or free trial, at: http://www.businessobjects.com/devxi/728 _______________________________________________ Sisuite-devel mailing list Sisuite-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/sisuite-devel