Hi Brian, thanks for looking into these. Indeed there is one more patch:
make.d/lvm.rul: - updates devmapper to 1.01.02 - creates the symbolic link libdevmapper.so.1.01 which is required when running mklibs (for tmp/boel_binaries/lib*). Without this patch the build fails except one builds on a system where libdevmapper of the same version is installed. But this is not why we build devmapper, after all... Best regards, Erich On Monday 11 July 2005 18:26, Brian Elliott Finley wrote: > Ok. > > I'm going to look at these patches, and the ones in the email (Subject: > 2.6.10 kernels and SATA support) for inclusion today for a 3.5.3 > release. If there are any other patches that are necessary for this > release to work properly for OSCAR, please send them along. > > -Brian > > > Erich Focht wrote: > > >The attached patches are needed for building systemimager on > >i386/ia64/x86_64 under RHEL3. Following changes have been made: > > > >1: Makefile > > - mklibs call is cleaned up a bit. If /lib64 exists on the compiling > > system the target directory will be tmp/boel_binaries/lib64 , otherwise it > > will be tmp/boel_binaries/lib. > > - the order of -L arguments to mklibs was wrong. The default system libs > > should come at the end of the list, such that the self-compiled libraries > > in systemimager are picked up. > > > >2: Makefile, initrd_source/initrd.rul and > >initrd_source/make.d/module-init-tools.rul > > - the "ifdef DEPMOD_BINARY block was never touched. As a consequence when > > one was building a 2.6 kernel on a system with 2.4 kernel (and modutils) > > installed, the 2.4 modutils were leading to wrong module > > dependencies. Switched to the latest module-init-tools release > > version. Using this instead of busybox and modutils! It works under 2.6 > > more reliably. Also replace in the Makefile the $(shell find ...) > > statemement. That one was plainly wrong because the $(shell ...) is > > interpreted when Makefile is read in, which is too early for the detection > > of the boel kernel version. > > > >3: make.d/zlib.rul > > - as Bernard Li observed, with the new zlib version one doesn't need the > > "-fPIC" option any more. > > - still a "rm -f *.o" is needed between the two zlib library builds > > (static > > and shared). > > > >Please consider adding these into the systemimager SVN. We need the changes > >for enabling x86_64 support in OSCAR. > > > >Thanks, > >best regards, > >Erich
--- make.d/lvm.rul.old 2005-06-26 13:44:21.000000000 +0200 +++ make.d/lvm.rul 2005-07-08 18:54:55.000000000 +0200 @@ -9,10 +9,10 @@ # -DEVMAPPER_VERSION := 1.00.21 +DEVMAPPER_VERSION := 1.01.02 DEVMAPPER_DIR := device-mapper.$(DEVMAPPER_VERSION) DEVMAPPER_TARBALL := device-mapper.$(DEVMAPPER_VERSION).tgz -DEVMAPPER_URL := ftp://sources.redhat.com/pub/dm/old/device-mapper.1.00.21.tgz +DEVMAPPER_URL := ftp://sources.redhat.com/pub/dm/old/device-mapper.$(DEVMAPPER_VERSION).tgz DEVMAPPER_BINARY := $(SRC_DIR)/$(DEVMAPPER_DIR)/lib/ioctl/libdevmapper.so MKLIBS += $(SRC_DIR)/$(DEVMAPPER_DIR)/lib/ioctl @@ -30,6 +30,7 @@ cd $(SRC_DIR)/$(DEVMAPPER_DIR) && \ ./configure --prefix=/usr --disable-nls --with-optimisation=-Os $(MAKE) -C $(SRC_DIR)/$(DEVMAPPER_DIR) + ln -s $(DEVMAPPER_BINARY) $(DEVMAPPER_BINARY).$(basename $(DEVMAPPER_VERSION)) $(SRC_DIR)/$(DEVMAPPER_TARBALL): [ -d $(SRC_DIR) ] || mkdir -p $(SRC_DIR)
