[Gluster-devel] fs-utils-patch!
Harshavardhana Ranganath
harsha at 80x25.org
Tue Feb 21 08:11:22 UTC 2006
patch for fs-utils
new package added as fs-utils.tgz
for building on x86_64.
-------------- next part --------------
diff -pruN orig/configure.ac new/configure.ac
--- orig/configure.ac 2006-02-14 11:04:53.000000000 +0530
+++ new/configure.ac 2006-02-21 13:01:58.470406000 +0530
@@ -9,6 +9,7 @@ extensions/bootp-manager/Makefile
extensions/client-boot/Makefile
extensions/client-reg/Makefile
extensions/mac-collector/Makefile
+extensions/fs-utils/Makefile
extensions/gpartdump/Makefile
extensions/ginstaller/Makefile
])
diff -pruN orig/deps.mk new/deps.mk
--- orig/deps.mk 2006-02-21 05:57:03.000000000 +0530
+++ new/deps.mk 2006-02-21 12:22:49.539497000 +0530
@@ -4,10 +4,11 @@
APPS_STAGE2 = kernel-modules termcap pcre ncurses dialog readline bash hotplug\
udev iproute2\
bzip2 gzip tar zlib openssl openssh sed util-linux sysvinit atftp\
- findutils grep gawk reiserfsprogs dhcp file pcap tcpdump lsof screen\
+ findutils grep gawk dhcp file pcap tcpdump lsof screen\
coreutils net-tools iputils jove pciutils libusb usbutils expat
-APPS_STAGE3 = python disktype udpcast dhcp-helper makebootfat
+APPS_STAGE3 = python disktype udpcast dhcp-helper makebootfat reiserfsprogs \
+ xfsprogs e2fsprogs jfsutils
APPS_RAMDISK = busybox
APPS_BUILD = cdrtools genext2fs kernel-prepare kernel-bzimage
APPS_ALL = $(APPS_STAGE2) $(APPS_STAGE3) $(APPS_RAMDISK) $(APPS_BUILD)
@@ -58,3 +59,6 @@ jove.cross: ncurses.cross # dependency
udev.cross: kernel-prepare.cross # for KERNEL_DIR
usbutils.cross: libusb.cross
util-linux.cross: ncurses.cross # for term.h in more.c
+xfsprogs.cross: e2fsprogs.cross # for uuid.h
+reiserfsprogs.cross: e2fsprogs.cross # for uuid.h
+jfsutils.cross: e2fsprogs.cross # uuid.h
diff -pruN orig/extensions/fs-utils/Makefile.am new/extensions/fs-utils/Makefile.am
--- orig/extensions/fs-utils/Makefile.am 1970-01-01 05:30:00.000000000 +0530
+++ new/extensions/fs-utils/Makefile.am 2006-02-21 12:58:41.054417000 +0530
@@ -0,0 +1,2 @@
+all:
+install:
diff -pruN orig/extensions/fs-utils/runme new/extensions/fs-utils/runme
--- orig/extensions/fs-utils/runme 1970-01-01 05:30:00.000000000 +0530
+++ new/extensions/fs-utils/runme 2006-02-21 12:58:57.055985000 +0530
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+_init ()
+{
+ return 0
+}
+
+main ()
+{
+ local my_dir="$(dirname $0)";
+ cp -al "${my_dir}"/destdir/* /;
+}
+
+_init "$@" && main "$@";
+
+
diff -pruN orig/extensions/fs-utils.gex new/extensions/fs-utils.gex
--- orig/extensions/fs-utils.gex 1970-01-01 05:30:00.000000000 +0530
+++ new/extensions/fs-utils.gex 2006-02-21 12:57:39.144829000 +0530
@@ -0,0 +1,5 @@
+package-name: File System Utilities
+package-description: mkfs,fsck etc. for ext2,ext3,reiserfs,xfs and jfs
+package-maintainer: Amar Tumballi <amar at 80x25.org>
+package-contents: fs-utils.tgz
+package-exec: ./runme
diff -pruN orig/extensions/fs-utils.mk new/extensions/fs-utils.mk
--- orig/extensions/fs-utils.mk 1970-01-01 05:30:00.000000000 +0530
+++ new/extensions/fs-utils.mk 2006-02-21 12:51:33.948347000 +0530
@@ -0,0 +1,2 @@
+fs-utils.gex: EXTENSION=fs-utils
+fs-utils.gex: e2fsprogs.stage3 xfsprogs.stage3 reiserfsprogs.stage3 jfsutils.stage3
diff -pruN orig/extensions/gex.mk new/extensions/gex.mk
--- orig/extensions/gex.mk 2006-02-20 08:49:38.000000000 +0530
+++ new/extensions/gex.mk 2006-02-21 13:04:57.953120000 +0530
@@ -6,6 +6,7 @@ EXTENSIONS= \
client-boot \
client-reg \
mac-collector \
+ fs-utils \
gpartdump \
ginstaller
diff -pruN orig/header.mk new/header.mk
--- orig/header.mk 2006-02-21 09:44:34.000000000 +0530
+++ new/header.mk 2006-02-21 12:14:43.313415000 +0530
@@ -27,6 +27,7 @@ PATH := $(TOOL_BASE)/bin:$(DESTDIR_NATIV
LD_LIBRARY_PATH := $(DESTDIR_NATIVE)/lib:$(DESTDIR_NATIVE)/usr/lib:$(LD_LIBRARY_PATH)
export PATH
+export DESTDIR_CROSS
export LD_LIBRARY_PATH
ENV_NATIVE_CFLAGS=CPPFLAGS=-I$(DESTDIR_NATIVE)/usr/include \
diff -pruN orig/Makefile.am new/Makefile.am
--- orig/Makefile.am 2006-02-21 09:44:34.000000000 +0530
+++ new/Makefile.am 2006-02-21 13:03:29.574556000 +0530
@@ -23,4 +23,4 @@ clean:
deptest:
make clean
- $(foreach p,$(APPS_ALL),make $(p).cross; make clean)
\ No newline at end of file
+ $(foreach p,$(APPS_ALL),make $(p).cross; make clean)
diff -pruN orig/patches/e2fsprogs-1.38/symlink.diff new/patches/e2fsprogs-1.38/symlink.diff
--- orig/patches/e2fsprogs-1.38/symlink.diff 1970-01-01 05:30:00.000000000 +0530
+++ new/patches/e2fsprogs-1.38/symlink.diff 2006-02-21 12:39:44.586187000 +0530
@@ -0,0 +1,13 @@
+diff -pru e2fsprogs-1.38/lib/Makefile.elf-lib e2fsprogs-1.38-fixed/lib/Makefile.elf-lib
+--- e2fsprogs-1.38/lib/Makefile.elf-lib 2004-12-15 22:00:39.000000000 +0530
++++ e2fsprogs-1.38-fixed/lib/Makefile.elf-lib 2006-02-21 12:38:34.663817088 +0530
+@@ -47,7 +47,7 @@ install-shlibs install:: $(ELF_LIB) inst
+ @echo " SYMLINK $(ELF_INSTALL_DIR)/$(ELF_SONAME)"
+ @$(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
+ @echo " SYMLINK $(libdir)/$(ELF_IMAGE).so"
+- @$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
++ @$(LN_S) -f $(ELF_SONAME) \
+ $(DESTDIR)$(libdir)/$(ELF_IMAGE).so
+ @echo " LDCONFIG"
+ @-$(LDCONFIG)
+Only in e2fsprogs-1.38-fixed/lib: Makefile.elf-lib~
diff -pruN orig/patches/xfsprogs-2.7.11/libtool-and-cross-compile.diff new/patches/xfsprogs-2.7.11/libtool-and-cross-compile.diff
--- orig/patches/xfsprogs-2.7.11/libtool-and-cross-compile.diff 1970-01-01 05:30:00.000000000 +0530
+++ new/patches/xfsprogs-2.7.11/libtool-and-cross-compile.diff 2006-02-21 13:10:21.846881000 +0530
@@ -0,0 +1,30 @@
+diff -pru xfsprogs-2.7.11/include/builddefs.in xfsprogs-2.7.11-fixed/include/builddefs.in
+--- xfsprogs-2.7.11/include/builddefs.in 2006-01-17 09:16:48.000000000 +0530
++++ xfsprogs-2.7.11-fixed/include/builddefs.in 2006-02-21 13:07:54.314309552 +0530
+@@ -104,7 +104,7 @@ endif
+
+ GCFLAGS = $(OPTIMIZER) $(DEBUG) -funsigned-char -fno-strict-aliasing -Wall \
+ -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\" \
+- -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include
++ -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include -I$(DESTDIR_CROSS)/usr/include
+
+ # First, Global, Platform, Local CFLAGS
+ CFLAGS += $(FCFLAGS) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS)
+Only in xfsprogs-2.7.11-fixed/include: builddefs.in~
+diff -pru xfsprogs-2.7.11/include/buildmacros xfsprogs-2.7.11-fixed/include/buildmacros
+--- xfsprogs-2.7.11/include/buildmacros 2006-01-17 09:16:48.000000000 +0530
++++ xfsprogs-2.7.11-fixed/include/buildmacros 2006-02-21 13:08:58.902490656 +0530
+@@ -41,10 +41,10 @@ LIBNAME = $(basename $(LTLIBRARY))
+ LTOBJECTS = $(OBJECTS:.o=.lo)
+ LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+
+-LTLINK = $(LIBTOOL) --mode=link $(CC)
++LTLINK = $(LIBTOOL) --mode=link --tag=CC $(CC) -L$(DESTDIR_CROSS)/usr/lib
+ LTEXEC = $(LIBTOOL) --mode=execute
+ LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF)
++LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CCF) -I$(DESTDIR_CROSS)/usr/include
+
+ ifeq ($(ENABLE_SHARED),yes)
+ LTLDFLAGS += -rpath $(PKG_LIB_DIR)
+Only in xfsprogs-2.7.11-fixed/include: buildmacros~
diff -pruN orig/stage3/e2fsprogs.mk new/stage3/e2fsprogs.mk
--- orig/stage3/e2fsprogs.mk 1970-01-01 05:30:00.000000000 +0530
+++ new/stage3/e2fsprogs.mk 2006-02-21 12:21:39.336170000 +0530
@@ -0,0 +1,5 @@
+
+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
diff -pruN orig/stage3/jfsutils.mk new/stage3/jfsutils.mk
--- orig/stage3/jfsutils.mk 1970-01-01 05:30:00.000000000 +0530
+++ new/stage3/jfsutils.mk 2006-02-21 10:58:57.055551000 +0530
@@ -0,0 +1,2 @@
+
+jfsutils.%: PACKAGE_NAME=jfsutils-1.1.10
diff -pruN orig/stage3/reiserfsprogs.mk new/stage3/reiserfsprogs.mk
--- orig/stage3/reiserfsprogs.mk 1970-01-01 05:30:00.000000000 +0530
+++ new/stage3/reiserfsprogs.mk 2006-02-21 10:58:57.056551000 +0530
@@ -0,0 +1,2 @@
+
+reiserfsprogs.%: PACKAGE_NAME=reiserfsprogs-3.6.19
diff -pruN orig/stage3/xfsprogs.mk new/stage3/xfsprogs.mk
--- orig/stage3/xfsprogs.mk 1970-01-01 05:30:00.000000000 +0530
+++ new/stage3/xfsprogs.mk 2006-02-21 13:21:37.436176000 +0530
@@ -0,0 +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
+
More information about the Gluster-devel
mailing list