From f2a5ce4b9da5940604061294b2414e6d163ffc7b Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 30 Sep 2005 20:41:41 +0000 Subject: [PATCH] Add iostat, ltt, xfsprogs, and memtester --- package/Config.in | 4 ++ package/iostat/Config.in | 7 ++ package/iostat/iostat.mk | 46 +++++++++++++ package/iostat/iostat.patch | 11 +++ package/ltt/Config.in | 8 +++ package/ltt/init-tracer | 93 +++++++++++++++++++++++++ package/ltt/ltt.mk | 116 ++++++++++++++++++++++++++++++++ package/ltt/ltt.patch | 42 ++++++++++++ package/memtester/Config.in | 7 ++ package/memtester/memtester.mk | 47 +++++++++++++ package/xfsprogs/Config.in | 7 ++ package/xfsprogs/xfsprogs.mk | 100 +++++++++++++++++++++++++++ package/xfsprogs/xfsprogs.patch | 59 ++++++++++++++++ 13 files changed, 547 insertions(+) create mode 100644 package/iostat/Config.in create mode 100644 package/iostat/iostat.mk create mode 100644 package/iostat/iostat.patch create mode 100644 package/ltt/Config.in create mode 100755 package/ltt/init-tracer create mode 100644 package/ltt/ltt.mk create mode 100644 package/ltt/ltt.patch create mode 100644 package/memtester/Config.in create mode 100644 package/memtester/memtester.mk create mode 100644 package/xfsprogs/Config.in create mode 100644 package/xfsprogs/xfsprogs.mk create mode 100644 package/xfsprogs/xfsprogs.patch diff --git a/package/Config.in b/package/Config.in index 8e64a3dd54..c65f3f4b78 100644 --- a/package/Config.in +++ b/package/Config.in @@ -46,6 +46,7 @@ source "package/gettext/Config.in" source "package/gzip/Config.in" source "package/hostap/Config.in" source "package/hotplug/Config.in" +source "package/iostat/Config.in" source "package/iproute2/Config.in" source "package/iptables/Config.in" source "package/jpeg/Config.in" @@ -62,10 +63,12 @@ source "package/links/Config.in" source "package/lrzsz/Config.in" source "package/ltp-testsuite/Config.in" source "package/ltrace/Config.in" +source "package/ltt/Config.in" source "package/lvm2/Config.in" source "package/lzo/Config.in" source "package/m4/Config.in" source "package/mdadm/Config.in" +source "package/memtester/Config.in" source "package/microcom/Config.in" source "package/microperl/Config.in" source "package/microwin/Config.in" @@ -119,6 +122,7 @@ source "package/vtun/Config.in" source "package/wget/Config.in" source "package/which/Config.in" source "package/wireless-tools/Config.in" +source "package/xfsprogs/Config.in" source "package/xorg/Config.in" source "package/zlib/Config.in" diff --git a/package/iostat/Config.in b/package/iostat/Config.in new file mode 100644 index 0000000000..5c6697aa33 --- /dev/null +++ b/package/iostat/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_IOSTAT + bool "iostat" + default n + help + An I/O performance monitoring utility. + + http://linux.inet.hr/ diff --git a/package/iostat/iostat.mk b/package/iostat/iostat.mk new file mode 100644 index 0000000000..0c6042c373 --- /dev/null +++ b/package/iostat/iostat.mk @@ -0,0 +1,46 @@ +############################################################# +# +# iostat +# +############################################################# +IOSTAT_VER:=2.2 +IOSTAT_SOURCE:=iostat-$(IOSTAT_VER).tar.gz +IOSTAT_SITE:=http://linux.inet.hr +IOSTAT_DIR:=$(BUILD_DIR)/iostat-$(IOSTAT_VER) +IOSTAT_BINARY:=iostat +IOSTAT_TARGET_BINARY:=usr/bin/iostat + +$(DL_DIR)/$(IOSTAT_SOURCE): + $(WGET) -P $(DL_DIR) $(IOSTAT_SITE)/$(IOSTAT_SOURCE) + +iostat-source: $(DL_DIR)/$(IOSTAT_SOURCE) + +$(IOSTAT_DIR)/.unpacked: $(DL_DIR)/$(IOSTAT_SOURCE) + zcat $(DL_DIR)/$(IOSTAT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(IOSTAT_DIR) package/iostat/ iostat\*.patch + touch $(IOSTAT_DIR)/.unpacked + +$(IOSTAT_DIR)/$(IOSTAT_BINARY): $(IOSTAT_DIR)/.unpacked + $(MAKE) CC=$(TARGET_CC) -C $(IOSTAT_DIR) + $(STRIP) $(IOSTAT_DIR)/$(IOSTAT_BINARY) + +$(TARGET_DIR)/$(IOSTAT_TARGET_BINARY): $(IOSTAT_DIR)/$(IOSTAT_BINARY) + $(INSTALL) -m 0755 -D $(IOSTAT_DIR)/$(IOSTAT_BINARY) $(TARGET_DIR)/$(IOSTAT_TARGET_BINARY) + +iostat: uclibc $(TARGET_DIR)/$(IOSTAT_TARGET_BINARY) + +iostat-clean: + rm -f $(TARGET_DIR)/$(IOSTAT_TARGET_BINARY) + -$(MAKE) -C $(IOSTAT_DIR) clean + +iostat-dirclean: + rm -rf $(IOSTAT_DIR) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_IOSTAT)),y) +TARGETS+=iostat +endif diff --git a/package/iostat/iostat.patch b/package/iostat/iostat.patch new file mode 100644 index 0000000000..acf2a52e49 --- /dev/null +++ b/package/iostat/iostat.patch @@ -0,0 +1,11 @@ +--- iostat-2.2/iostat.c.orig 2005-02-14 12:44:03.000000000 -0800 ++++ iostat-2.2/iostat.c 2005-03-10 15:24:09.000000000 -0800 +@@ -140,7 +140,7 @@ + + handle_error("Can't open /proc/cpuinfo", !ncpufp); + while (fgets(buffer, sizeof(buffer), ncpufp)) { +- if (!strncmp(buffer, "processor\t:", 11)) ++ if (!strncmp(buffer, "processor\t", 10)) + ncpu++; + } + fclose(ncpufp); diff --git a/package/ltt/Config.in b/package/ltt/Config.in new file mode 100644 index 0000000000..67da6603f6 --- /dev/null +++ b/package/ltt/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LTT + bool "LTT (Linux Trace Toolkit)" + default n + help + A suite of tools designed to extract program execution + details from the Linux operating system and interpret them. + + http://www.opersys.com/LTT/ diff --git a/package/ltt/init-tracer b/package/ltt/init-tracer new file mode 100755 index 0000000000..3dee49211b --- /dev/null +++ b/package/ltt/init-tracer @@ -0,0 +1,93 @@ +#!/bin/sh +# +# Load tracer module and create tracer device node. +# + +MODULE="tracer" +MAIN_DEVICE="tracer" +USER_DEVICE="tracerU" +GROUP="root" +MODE="664" + +start() { + if [ -e /dev/${MAIN_DEVICE} -o -e /dev/${USER_DEVICE} ] + then + # tell the user about what we are doing + echo "Deleting old tracer nodes: /dev/tracer and /dev/tracerU" + + # remove stale nodes + rm -f /dev/${MAIN_DEVICE} + rm -f /dev/${USER_DEVICE} + fi + + # look for the major number + MAJOR=`/bin/grep " ${MODULE}$" /proc/devices | cut -d" " -f1` + + # does the device exist? + if [ ${MAJOR} ] + then + echo "Found tracer device with major number:" ${MAJOR} + else + echo "Loading tracer kernel module: " + # invoke modprobe + /sbin/modprobe ${MODULE} + MAJOR=`/bin/grep " ${MODULE}$" /proc/devices | cut -d" " -f1` + if [ ${MAJOR} ] + then + echo "Found tracer device with major number:" ${MAJOR} + else + echo "Did not find tracer device ... /dev entries not created ..." + exit 1 + fi + fi + + # tell the user about what we are doing + echo "Creating new tracer nodes: /dev/tracer and /dev/tracerU" + + # create the character special file + /bin/mknod /dev/${MAIN_DEVICE} c ${MAJOR} 0 + /bin/mknod /dev/${USER_DEVICE} c ${MAJOR} 1 + + # set permissions and ownership + /bin/chgrp ${GROUP} /dev/${MAIN_DEVICE} + /bin/chmod ${MODE} /dev/${MAIN_DEVICE} + /bin/chgrp ${GROUP} /dev/${USER_DEVICE} + /bin/chmod ${MODE} /dev/${USER_DEVICE} +} +stop() { + # tell the user about what we are doing + echo "Deleting tracer nodes: /dev/tracer and /dev/tracerU" + + # remove nodes + rm -f /dev/${MAIN_DEVICE} + rm -f /dev/${USER_DEVICE} + + if lsmod | /bin/grep "^${MODULE} " + then + echo -n "Removing tracer kernel module: " + # invoke modprobe -r + /sbin/modprobe -r ${MODULE} + echo "OK" + fi +} +restart() { + stop + start +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + restart + ;; + *) + echo $"Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $? diff --git a/package/ltt/ltt.mk b/package/ltt/ltt.mk new file mode 100644 index 0000000000..dfc3178796 --- /dev/null +++ b/package/ltt/ltt.mk @@ -0,0 +1,116 @@ +############################################################# +# +# ltt +# +############################################################# +LTT_VER:=0.9.5a +LTT_SOURCE:=TraceToolkit-$(LTT_VER).tgz +LTT_SITE:=http://www.opersys.com/ftp/pub/LTT +LTT_CAT:=zcat +LTT_DIR1:=$(TOOL_BUILD_DIR)/TraceToolkit-$(LTT_VER:a=) +LTT_DIR2:=$(BUILD_DIR)/TraceToolkit-$(LTT_VER:a=) +LTT_BINARY:=Visualizer/tracevisualizer +LTT_TARGET_BINARY:=Daemon/tracedaemon + +$(DL_DIR)/$(LTT_SOURCE): + $(WGET) -P $(DL_DIR) $(LTT_SITE)/$(LTT_SOURCE) + +ltt-source: $(DL_DIR)/$(LTT_SOURCE) + + +############################################################# +# +# build tracevisualizer for use on the host system +# +############################################################# +$(LTT_DIR1)/.unpacked: $(DL_DIR)/$(LTT_SOURCE) + $(LTT_CAT) $(DL_DIR)/$(LTT_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(LTT_DIR1) package/ltt ltt\*.patch + touch $(LTT_DIR1)/.unpacked + +$(LTT_DIR1)/.configured: $(LTT_DIR1)/.unpacked + (cd $(LTT_DIR1); rm -rf config.cache; \ + ./configure \ + --prefix=$(TOOL_BUILD_DIR) \ + ); + touch $(LTT_DIR1)/.configured + +$(LTT_DIR1)/$(LTT_BINARY): $(LTT_DIR1)/.configured + $(MAKE) -C $(LTT_DIR1)/LibLTT + $(MAKE) -C $(LTT_DIR1)/Visualizer + +$(TOOL_BUILD_DIR)/bin/tracevisualizer: $(LTT_DIR1)/$(LTT_BINARY) + $(MAKE) -C $(LTT_DIR1)/LibLTT install + $(MAKE) -C $(LTT_DIR1)/Visualizer install + +host-ltt-tracevisualizer: $(TOOL_BUILD_DIR)/bin/tracevisualizer + +host-ltt-clean: + $(MAKE) -C $(LTT_DIR1) clean + +host-ltt-dirclean: + rm -rf $(LTT_DIR1) + + +############################################################# +# +# build tracedaemon for use on the target system +# +############################################################# +$(LTT_DIR2)/.unpacked: $(DL_DIR)/$(LTT_SOURCE) + $(LTT_CAT) $(DL_DIR)/$(LTT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(LTT_DIR2) package/ltt ltt\*.patch + touch $(LTT_DIR2)/.unpacked + +$(LTT_DIR2)/.configured: $(LTT_DIR2)/.unpacked + (cd $(LTT_DIR2); rm -rf config.cache; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ./configure \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --libexecdir=/usr/lib \ + --sysconfdir=/etc \ + --datadir=/usr/share \ + --localstatedir=/var \ + --mandir=/usr/man \ + --infodir=/usr/info \ + ); + touch $(LTT_DIR2)/.configured + +$(LTT_DIR2)/$(LTT_TARGET_BINARY): $(LTT_DIR2)/.configured + $(MAKE) CC=$(TARGET_CC) -C $(LTT_DIR2)/LibUserTrace + $(MAKE) CC=$(TARGET_CC) -C $(LTT_DIR2)/Daemon + +$(TARGET_DIR)/usr/bin/tracedaemon: $(LTT_DIR2)/$(LTT_TARGET_BINARY) + $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \ + -C $(LTT_DIR2)/LibUserTrace install + $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \ + -C $(LTT_DIR2)/Daemon install + $(STRIP) $(TARGET_DIR)/usr/bin/tracedaemon > /dev/null 2>&1 + $(INSTALL) -D -m 0755 package/ltt/init-tracer $(TARGET_DIR)/etc/init.d/S27tracer + +ltt-tracedaemon: uclibc $(TARGET_DIR)/usr/bin/tracedaemon + +ltt-clean: + $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(LTT_DIR2) uninstall + -$(MAKE) -C $(LTT_DIR2) clean + +ltt-dirclean: + rm -rf $(LTT_DIR2) + + +ltt: host-ltt-tracevisualizer ltt-tracedaemon + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_LTT)),y) +TARGETS+=ltt +endif diff --git a/package/ltt/ltt.patch b/package/ltt/ltt.patch new file mode 100644 index 0000000000..b0c7580867 --- /dev/null +++ b/package/ltt/ltt.patch @@ -0,0 +1,42 @@ +diff -urN TraceToolkit-0.9.5.orig/LibLTT/EventDB.c TraceToolkit-0.9.5/LibLTT/EventDB.c +--- TraceToolkit-0.9.5.orig/LibLTT/EventDB.c 2002-04-15 09:10:13.000000000 -0700 ++++ TraceToolkit-0.9.5/LibLTT/EventDB.c 2005-09-29 15:09:11.000000000 -0700 +@@ -2757,7 +2757,7 @@ + + /* Increment number of custom events */ + pmTraceDB->NbCustom++; +- goto NoControlEvent; ++ continue; + break; + + /* A custom event has occured */ +@@ -2800,8 +2800,6 @@ + lLastCtrlEvent = lEvent; + lLastCtrlEventTime = lEventTime; + } +- +-NoControlEvent: + } while(DBEventNext(pmTraceDB, &lEvent) == TRUE); + + /* Remember the last event and its time */ +diff -urN TraceToolkit-0.9.5.orig/LibLTT/RTAIDB.c TraceToolkit-0.9.5/LibLTT/RTAIDB.c +--- TraceToolkit-0.9.5.orig/LibLTT/RTAIDB.c 2002-04-15 20:00:05.000000000 -0700 ++++ TraceToolkit-0.9.5/LibLTT/RTAIDB.c 2005-09-29 15:09:17.000000000 -0700 +@@ -2621,7 +2621,7 @@ + + /* Increment number of custom events */ + pmTraceDB->NbCustom++; +- goto NoControlEvent; ++ continue; + break; + + /* A custom event has occured */ +@@ -2936,8 +2936,6 @@ + lLastCtrlEvent = lEvent; + lLastCtrlEventTime = lEventTime; + } +- +-NoControlEvent: + } while(DBEventNext(pmTraceDB, &lEvent) == TRUE); + + /* Remember the last event and it's time */ diff --git a/package/memtester/Config.in b/package/memtester/Config.in new file mode 100644 index 0000000000..d977617448 --- /dev/null +++ b/package/memtester/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_MEMTESTER + bool "memtester" + default n + help + A userspace utility for testing the memory subsystem for faults. + + http://pyropus.ca/software/memtester/ diff --git a/package/memtester/memtester.mk b/package/memtester/memtester.mk new file mode 100644 index 0000000000..084e97f5e1 --- /dev/null +++ b/package/memtester/memtester.mk @@ -0,0 +1,47 @@ +############################################################# +# +# memtester +# +############################################################# +MEMTESTER_VER:=4.0.5 +MEMTESTER_SOURCE:=memtester-$(MEMTESTER_VER).tar.gz +MEMTESTER_SITE:=http://pyropus.ca/software/memtester +MEMTESTER_DIR:=$(BUILD_DIR)/memtester-$(MEMTESTER_VER) +MEMTESTER_BINARY:=memtester +MEMTESTER_TARGET_BINARY:=usr/bin/memtester + +$(DL_DIR)/$(MEMTESTER_SOURCE): + $(WGET) -P $(DL_DIR) $(MEMTESTER_SITE)/$(MEMTESTER_SOURCE) + +memtester-source: $(DL_DIR)/$(MEMTESTER_SOURCE) + +$(MEMTESTER_DIR)/.unpacked: $(DL_DIR)/$(MEMTESTER_SOURCE) + zcat $(DL_DIR)/$(MEMTESTER_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + #toolchain/patch-kernel.sh $(MEMTESTER_DIR) package/memtester/ memtester\*.patch + $(SED) "s,cc,$(TARGET_CC)," $(MEMTESTER_DIR)/conf-* + touch $(MEMTESTER_DIR)/.unpacked + +$(MEMTESTER_DIR)/$(MEMTESTER_BINARY): $(MEMTESTER_DIR)/.unpacked + $(MAKE) -C $(MEMTESTER_DIR) + $(STRIP) $(MEMTESTER_DIR)/$(MEMTESTER_BINARY) + +$(TARGET_DIR)/$(MEMTESTER_TARGET_BINARY): $(MEMTESTER_DIR)/$(MEMTESTER_BINARY) + $(INSTALL) -m 0755 -D $(MEMTESTER_DIR)/$(MEMTESTER_BINARY) $(TARGET_DIR)/$(MEMTESTER_TARGET_BINARY) + +memtester: uclibc $(TARGET_DIR)/$(MEMTESTER_TARGET_BINARY) + +memtester-clean: + rm -f $(TARGET_DIR)/$(MEMTESTER_TARGET_BINARY) + -$(MAKE) -C $(MEMTESTER_DIR) clean + +memtester-dirclean: + rm -rf $(MEMTESTER_DIR) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_MEMTESTER)),y) +TARGETS+=memtester +endif diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in new file mode 100644 index 0000000000..afa43361d7 --- /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 0000000000..0a43f603ab --- /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 0000000000..091e65d169 --- /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) -- 2.30.2