Attaching the diff and newfiles.tar.gz for openib build in the gluster. Regards, Amar
diff -pru gluster-alpha1-cvs/deps.mk gluster-alpha1/deps.mk --- gluster-alpha1-cvs/deps.mk 2006-03-02 20:02:36.000000000 +0530 +++ gluster-alpha1/deps.mk 2006-03-09 11:11:32.000000000 +0530 @@ -6,10 +6,14 @@ APPS_STAGE2 = kernel-modules termcap pcr bzip2 gzip tar zlib openssl openssh sed util-linux sysvinit atftp\ findutils grep gawk dhcp file pcap tcpdump lsof screen\ coreutils net-tools iputils jove pciutils libusb usbutils expat \ - discover discover-data mc + discover discover-data APPS_STAGE3 = python disktype udpcast dhcp-helper makebootfat reiserfsprogs \ - xfsprogs e2fsprogs jfsutils os-prober netcat + xfsprogs e2fsprogs jfsutils sysfs ib-prepare ib-libibcommon \ + ib-libibumad ib-libibmad ib-libosmvendor ib-libosmcomp ib-tools \ + ib-osm ib-osminclude ib-osmtest ib-libibverbs ib-libibat ib-libibcm \ + ib-libmthca ib-libsdp netcat + APPS_RAMDISK = busybox APPS_BUILD = cdrtools genext2fs kernel-prepare kernel-bzimage APPS_ALL = $(APPS_STAGE2) $(APPS_STAGE3) $(APPS_RAMDISK) $(APPS_BUILD) @@ -65,3 +69,18 @@ reiserfsprogs.cross: e2fsprogs.cross # f jfsutils.cross: e2fsprogs.cross # uuid.h discover.cross: expat.cross # dependency discover.cross: discover-data.cross # for xml sepcfications +ib-libibcommon.cross: ib-prepare.cross # extract the openib tarball and apply the patch +ib-libibumad.cross: ib-libibcommon.cross # ib libraries have dependency on previously build libraries +ib-libibmad.cross: ib-libibumad.cross # ib libraries have dependency on previously build libraries +ib-libosmvendor.cross: ib-libibumad.cross +ib-osm.cross: ib-libosmvendor.cross ib-libosmcomp.cross +ib-osminclude.cross: ib-osm.cross +ib-osmtest.cross: ib-osm.cross +ib-libibverbs.cross: ib-osmtest.cross sysfs.cross +ib-libmthca.cross: ib-libibverbs.cross +ib-libibat.cross: ib-libibverbs.cross +ib-libibcm.cross: ib-libibat.cross +ib-libsdp.cross: ib-libibverbs.cross +ib-tools.cross: pciutils.cross zlib.cross ib-libmthca.cross # These tools use the already existing library +ib-libosmcomp.cross: ib-libibumad.cross +screen.cross: ncurses.cross # for tgetent diff -pru gluster-alpha1-cvs/extensions/gex.mk gluster-alpha1/extensions/gex.mk --- gluster-alpha1-cvs/extensions/gex.mk 2006-03-01 02:20:14.000000000 +0530 +++ gluster-alpha1/extensions/gex.mk 2006-03-09 11:11:56.000000000 +0530 @@ -9,6 +9,7 @@ EXTENSIONS= \ client-reg \ mac-collector \ fs-utils \ + ib-utils \ gpartdump \ ginstaller \ $(APPLICATIONS) diff -pru gluster-alpha1-cvs/extensions/ginstaller.mk gluster-alpha1/extensions/ginstaller.mk --- gluster-alpha1-cvs/extensions/ginstaller.mk 2006-02-23 15:15:26.000000000 +0530 +++ gluster-alpha1/extensions/ginstaller.mk 2006-03-09 11:35:48.000000000 +0530 @@ -1,2 +1,2 @@ ginstaller.gex: EXTENSION=ginstaller -ginstaller.gex: os-prober.stage3 +ginstaller.gex: diff -pru gluster-alpha1-cvs/header.mk gluster-alpha1/header.mk --- gluster-alpha1-cvs/header.mk 2006-02-21 14:14:51.000000000 +0530 +++ gluster-alpha1/header.mk 2006-03-09 11:11:10.000000000 +0530 @@ -46,8 +46,8 @@ DEFAULT_NATIVE_INSTALL_ENV=DESTDIR=$(DES DEFAULT_NATIVE_PREPARE_CMD=FOOBAR=FUBAR DEFAULT_NATIVE_CONFIGURE_CMD=./configure --prefix=/usr -DEFAULT_NATIVE_BUILD_CMD=$(MAKE) all -DEFAULT_NATIVE_INSTALL_CMD=$(MAKE) install DESTDIR=$1 +DEFAULT_NATIVE_BUILD_CMD=make all +DEFAULT_NATIVE_INSTALL_CMD=make install DESTDIR=$1 ### cross @@ -64,8 +64,8 @@ DEFAULT_CROSS_INSTALL_ENV=DESTDIR=$(DEST DEFAULT_CROSS_PREPARE_CMD= DEFAULT_CROSS_CONFIGURE_CMD=./configure --prefix=/usr --host=$(CROSS) --build=$(GLUSTER_BUILD) -DEFAULT_CROSS_BUILD_CMD=$(MAKE) all -DEFAULT_CROSS_INSTALL_CMD=$(MAKE) install DESTDIR=$1 +DEFAULT_CROSS_BUILD_CMD=make all +DEFAULT_CROSS_INSTALL_CMD=make install DESTDIR=$1 PATCH_CMD=$(foreach d,$(shell ls $(PATCHES_DIR)/$1/*.diff 2>/dev/null),\ cat $d | patch --verbose -p1 -d $2; ) Only in gluster-alpha1/patches: openib-userspace-svn3640-1 diff -pru gluster-alpha1-cvs/stage2/expat.mk gluster-alpha1/stage2/expat.mk --- gluster-alpha1-cvs/stage2/expat.mk 2006-02-23 12:15:30.000000000 +0530 +++ gluster-alpha1/stage2/expat.mk 2006-03-09 11:17:37.000000000 +0530 @@ -1,4 +1,4 @@ expat.%: PACKAGE_NAME=expat-1.95.8 expat.%: CROSS_CONFIGURE_CMD=$(DEFAULT_CROSS_CONFIGURE_CMD) --with-shared -expat.%: CROSS_INSTALL_CMD=$(MAKE) install prefix=$1/usr +expat.%: CROSS_INSTALL_CMD=make install prefix=$1/usr expat.%: NATIVE_CONFIGURE_CMD=./configure --prefix=/usr --with-shared diff -pru gluster-alpha1-cvs/stage2/pciutils.mk gluster-alpha1/stage2/pciutils.mk --- gluster-alpha1-cvs/stage2/pciutils.mk 2006-02-17 15:16:42.000000000 +0530 +++ gluster-alpha1/stage2/pciutils.mk 2006-03-09 11:18:53.000000000 +0530 @@ -1,3 +1,3 @@ pciutils.%: PACKAGE_NAME=pciutils-2.1.11 pciutils.%: CROSS_BUILD_CMD=make all $(CROSS_BUILD_ENV) PREFIX=/usr -pciutils.%: CROSS_INSTALL_CMD=make install PREFIX=$1/usr +pciutils.%: CROSS_INSTALL_CMD=make install PREFIX=$1/usr; mkdir -p $1/usr/incl\ude/pci && cp lib/pci.h lib/header.h lib/config.h $1/usr/include/pci ; mkdir -p\ $1/usr/lib && cp lib/libpci.a $1/usr/lib diff -pru gluster-alpha1-cvs/stage2/pcre.mk gluster-alpha1/stage2/pcre.mk --- gluster-alpha1-cvs/stage2/pcre.mk 2006-02-20 18:26:56.000000000 +0530 +++ gluster-alpha1/stage2/pcre.mk 2006-03-09 11:20:18.000000000 +0530 @@ -1,6 +1,7 @@ pcre.%: PACKAGE_NAME=pcre-6.3 -pcre.%: CROSS_CONFIGURE_CMD=$(DEFAULT_CROSS_CONFIGURE_CMD) --disable-cpp +pcre.%: CROSS_CONFIGURE_CMD=./configure --prefix=/usr \ ++ --disable-cpp --host=$(CROSS) --build=$(GLUSTER_BUILD) ## NOTE : pcre-config is used by apps which depend on pcre for determining ## the library and include paths of PCRE. The system's /usr/bin/pcre-config @@ -9,5 +10,6 @@ pcre.%: CROSS_CONFIGURE_CMD=$(DEFAULT_CR ## other PATHS ## pcre.%: CROSS_INSTALL_CMD=$(DEFAULT_CROSS_INSTALL_CMD); mkdir -p $(DESTDIR_NATIVE)/usr/bin; echo > $(DESTDIR_NATIVE)/usr/bin/pcre-config; chmod +x $(DESTDIR_NATIVE)/usr/bin/pcre-config -pcre.%: CROSS_INSTALL_CMD=make install DESTDIR=; ls pcre-config | cpio -puvd $(DESTDIR_NATIVE)/usr/bin +pcre.%: CROSS_INSTALL_CMD=make install prefix=$1/usr DESTDIR=; \ + ls pcre-config | cpio -puvd $(DESTDIR_NATIVE)/usr/bin diff -pru gluster-alpha1-cvs/stage3/e2fsprogs.mk gluster-alpha1/stage3/e2fsprogs.mk --- gluster-alpha1-cvs/stage3/e2fsprogs.mk 2006-02-21 14:14:51.000000000 +0530 +++ gluster-alpha1/stage3/e2fsprogs.mk 2006-03-09 11:22:34.000000000 +0530 @@ -2,4 +2,4 @@ e2fsprogs.%: PACKAGE_NAME=e2fsprogs-1.38 e2fsprogs.%: CROSS_CONFIGURE_CMD=$(DEFAULT_CROSS_CONFIGURE_CMD) \ --enable-elf-shlibs --disable-rpath -e2fsprogs.%: CROSS_INSTALL_CMD=$(MAKE) install install-libs DESTDIR=$1 +e2fsprogs.%: CROSS_INSTALL_CMD=make install install-libs DESTDIR=$1 diff -pru gluster-alpha1-cvs/stage3/xfsprogs.mk gluster-alpha1/stage3/xfsprogs.mk --- gluster-alpha1-cvs/stage3/xfsprogs.mk 2006-02-21 14:14:51.000000000 +0530 +++ gluster-alpha1/stage3/xfsprogs.mk 2006-03-09 11:22:50.000000000 +0530 @@ -1,6 +1,6 @@ xfsprogs.%: PACKAGE_NAME=xfsprogs-2.7.11 xfsprogs.%: CROSS_PREPARE_CMD=$(CROSS_CONFIGURE_ENV) $(DEFAULT_CROSS_CONFIGURE_CMD) -xfsprogs.%: CROSS_BUILD_CMD=$(MAKE) -xfsprogs.%: CROSS_INSTALL_CMD=$(MAKE) install prefix=$1/usr +xfsprogs.%: CROSS_BUILD_CMD=make +xfsprogs.%: CROSS_INSTALL_CMD=make install prefix=$1/usr
