From f2a5ce4b9da5940604061294b2414e6d163ffc7b Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 30 Sep 2005 20:41:41 +0000 Subject: Add iostat, ltt, xfsprogs, and memtester --- package/xfsprogs/Config.in | 7 +++ package/xfsprogs/xfsprogs.mk | 100 ++++++++++++++++++++++++++++++++++++++++ package/xfsprogs/xfsprogs.patch | 59 ++++++++++++++++++++++++ 3 files changed, 166 insertions(+) create mode 100644 package/xfsprogs/Config.in create mode 100644 package/xfsprogs/xfsprogs.mk create mode 100644 package/xfsprogs/xfsprogs.patch (limited to 'package/xfsprogs') diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in new file mode 100644 index 000000000..afa43361d --- /dev/null +++ b/package/xfsprogs/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_XFSPROGS + bool "xfsprogs" + default n + help + The XFS file system utilities and libraries + + http://oss.sgi.com/projects/xfs/ diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk new file mode 100644 index 000000000..0a43f603a --- /dev/null +++ b/package/xfsprogs/xfsprogs.mk @@ -0,0 +1,100 @@ +############################################################# +# +# xfsprogs +# +############################################################# +XFSPROGS_VER:=2.6.36 +XFSPROGS_SOURCE=xfsprogs-$(XFSPROGS_VER).src.tar.gz +XFSPROGS_SITE=ftp://oss.sgi.com/projects/xfs/cmd_tars +XFSPROGS_DIR=$(BUILD_DIR)/xfsprogs-$(XFSPROGS_VER) +XFSPROGS_CAT:=zcat +XFSPROGS_BINARY:=mkfs/mkfs.xfs +XFSPROGS_TARGET_BINARY:=sbin/mkfs.xfs + +XFSPROGS_STRIP:= fsck/fsck.xfs mkfile/xfs_mkfile rtcp/xfs_rtcp +XFSPROGS_STRIP_LIBDEP:= \ + copy/xfs_copy db/xfs_db growfs/xfs_growfs io/xfs_io \ + logprint/xfs_logprint mkfs/fstyp mkfs/mkfs.xfs \ + repair/xfs_repair quota/xfs_quota + +$(DL_DIR)/$(XFSPROGS_SOURCE): + $(WGET) -P $(DL_DIR) $(XFSPROGS_SITE)/$(XFSPROGS_SOURCE) + +xfsprogs-source: $(DL_DIR)/$(XFSPROGS_SOURCE) + +$(XFSPROGS_DIR)/.unpacked: $(DL_DIR)/$(XFSPROGS_SOURCE) + $(XFSPROGS_CAT) $(DL_DIR)/$(XFSPROGS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(XFSPROGS_DIR) package/xfsprogs/ xfsprogs\*.patch + touch $(XFSPROGS_DIR)/.unpacked + +#XFSPROGS_CONFIG_SHARED:=--disable-shared +XFSPROGS_CONFIG_SHARED:=--enable-shared + +$(XFSPROGS_DIR)/.configured: e2fsprogs $(XFSPROGS_DIR)/.unpacked + (cd $(XFSPROGS_DIR); rm -rf config.cache; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + CPPFLAGS=-I$(E2FSPROGS_DIR)/lib \ + LDFLAGS=-L$(E2FSPROGS_DIR)/lib \ + LIBTOOL=$(LIBTOOL_DIR)/libtool \ + INSTALL_USER=$(shell whoami) \ + INSTALL_GROUP=$(shell groups | cut -d" " -f1) \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=/usr \ + --exec-prefix=/ \ + --libdir=/usr/lib \ + $(XFSPROGS_CONFIG_SHARED) \ + ); + touch $(XFSPROGS_DIR)/.configured + +$(XFSPROGS_DIR)/$(XFSPROGS_BINARY): $(XFSPROGS_DIR)/.configured + $(MAKE1) PATH=$(TARGET_PATH) CPPFLAGS=-I$(E2FSPROGS_DIR)/lib \ + LDFLAGS=-L$(E2FSPROGS_DIR)/lib -C $(XFSPROGS_DIR) +ifeq ($(XFSPROGS_CONFIG_SHARED),--enable-shared) + ( \ + cd $(XFSPROGS_DIR) ; \ + $(STRIP) $(XFSPROGS_STRIP) ; \ + $(STRIP) $(join $(dir $(XFSPROGS_STRIP_LIBDEP)), \ + $(addprefix .libs/,$(notdir $(XFSPROGS_STRIP_LIBDEP)))) \ + ) + $(STRIP) $(XFSPROGS_DIR)/lib*/.libs/lib*.so.*.* +else + ( \ + cd $(XFSPROGS_DIR) ; \ + $(STRIP) $(XFSPROGS_STRIP) $(XFSPROGS_STRIP_LIBDEP) \ + ) + $(STRIP) $(XFSPROGS_DIR)/lib*/lib*.so.*.* +endif + touch -c $(XFSPROGS_DIR)/$(XFSPROGS_BINARY) + +$(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY): $(XFSPROGS_DIR)/$(XFSPROGS_BINARY) + $(MAKE1) PATH=$(TARGET_PATH) \ + DIST_ROOT=$(TARGET_DIR) \ + prefix=/usr \ + exec-prefix=/ \ + -C $(XFSPROGS_DIR) install + rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc + touch -c $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY) + +xfsprogs: uclibc e2fsprogs libtool-cross $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY) + +xfsprogs-clean: + rm -f $(TARGET_DIR)/bin/xfs_* $(TARGET_DIR)/sbin/xfs_* $(TARGET_DIR)/sbin/*.xfs + rm -f $(TARGET_DIR)/usr/lib/libhandle.so* + rm -f $(TARGET_DIR)/usr/lib/libdisk.so* $(TARGET_DIR)/usr/lib/libxfs.so* + -$(MAKE1) -C $(XFSPROGS_DIR) clean + +xfsprogs-dirclean: + rm -rf $(XFSPROGS_DIR) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_XFSPROGS)),y) +TARGETS+=xfsprogs +endif diff --git a/package/xfsprogs/xfsprogs.patch b/package/xfsprogs/xfsprogs.patch new file mode 100644 index 000000000..091e65d16 --- /dev/null +++ b/package/xfsprogs/xfsprogs.patch @@ -0,0 +1,59 @@ +diff -urN xfsprogs-2.6.36.orig/libdisk/Makefile xfsprogs-2.6.36/libdisk/Makefile +--- xfsprogs-2.6.36.orig/libdisk/Makefile 2005-08-01 07:20:49.000000000 -0700 ++++ xfsprogs-2.6.36/libdisk/Makefile 2005-09-26 17:30:14.000000000 -0700 +@@ -53,6 +53,7 @@ + include $(BUILDRULES) + + install: default ++ $(INSTALL_LTLIB) + + install-dev: default +- $(INSTALL_LTLIB_STATIC) ++ $(INSTALL_LTLIB_DEV) +diff -urN xfsprogs-2.6.36.orig/libxcmd/Makefile xfsprogs-2.6.36/libxcmd/Makefile +--- xfsprogs-2.6.36.orig/libxcmd/Makefile 2005-08-01 07:20:49.000000000 -0700 ++++ xfsprogs-2.6.36/libxcmd/Makefile 2005-09-26 17:30:15.000000000 -0700 +@@ -45,6 +45,7 @@ + include $(BUILDRULES) + + install: default ++ $(INSTALL_LTLIB) + + install-dev: default +- $(INSTALL_LTLIB_STATIC) ++ $(INSTALL_LTLIB_DEV) +diff -urN xfsprogs-2.6.36.orig/libxfs/Makefile xfsprogs-2.6.36/libxfs/Makefile +--- xfsprogs-2.6.36.orig/libxfs/Makefile 2005-08-01 07:20:50.000000000 -0700 ++++ xfsprogs-2.6.36/libxfs/Makefile 2005-09-26 17:30:16.000000000 -0700 +@@ -70,6 +70,7 @@ + include $(BUILDRULES) + + install: default ++ $(INSTALL_LTLIB) + + install-dev: default +- $(INSTALL_LTLIB_STATIC) ++ $(INSTALL_LTLIB_DEV) +diff -urN xfsprogs-2.6.36.orig/libxlog/Makefile xfsprogs-2.6.36/libxlog/Makefile +--- xfsprogs-2.6.36.orig/libxlog/Makefile 2005-08-01 07:20:51.000000000 -0700 ++++ xfsprogs-2.6.36/libxlog/Makefile 2005-09-26 17:30:17.000000000 -0700 +@@ -48,6 +48,7 @@ + include $(BUILDRULES) + + install: default ++ $(INSTALL_LTLIB) + + install-dev: default +- $(INSTALL_LTLIB_STATIC) ++ $(INSTALL_LTLIB_DEV) +--- xfsprogs-2.6.36.orig/mkfs/Makefile 2005-08-01 07:20:54.000000000 -0700 ++++ xfsprogs-2.6.36/mkfs/Makefile 2005-09-23 15:17:42.000000000 -0700 +@@ -51,7 +51,7 @@ + include $(BUILDRULES) + + $(FSTYP): +- $(LTLINK) $@.c -o $@ $(CFLAGS) $(LDFLAGS) $(LIBDISK) $(PLDLIBS) ++ $(LTLINK) $@.c -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LIBDISK) $(PLDLIBS) + + install: default + $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) -- cgit v1.2.3