create xfstests install target

Index: xfstests-dev.work/Makefile
===================================================================
@@ -62,7 +62,21 @@ $(DMAPI_MAKEFILE):
 aclocal.m4::
 	aclocal --acdir=`pwd`/m4 --output=$@
 
-install install-dev install-lib:
+install: default $(addsuffix -install,$(SUBDIRS))
+	$(INSTALL) -m 755 -d $(PKG_LIB_DIR)
+	$(INSTALL) -m 755 check $(PKG_LIB_DIR)
+	$(INSTALL) -m 755 [0-9]?? $(PKG_LIB_DIR)
+	$(INSTALL) -m 755 run.* $(PKG_LIB_DIR)
+	$(INSTALL) -m 644 group $(PKG_LIB_DIR)
+	$(INSTALL) -m 644 randomize.awk $(PKG_LIB_DIR)
+	$(INSTALL) -m 644 [0-9]??.* $(PKG_LIB_DIR)
+	$(INSTALL) -m 644 common* $(PKG_LIB_DIR)
+
+# Nothing.
+install-dev install-lib:
+
+%-install:
+	$(MAKE) -C $* install
 
 realclean distclean: clean
 	rm -f $(LDIRT) $(CONFIGURE)

Index: xfstests-dev.work/include/builddefs.in
===================================================================
@@ -27,6 +27,8 @@ PKG_RELEASE     = @pkg_release@
 PKG_VERSION     = @pkg_version@
 PKG_PLATFORM    = @pkg_platform@
 PKG_DISTRIBUTION= @pkg_distribution@
+PKG_SBIN_DIR    = @sbindir@
+PKG_LIB_DIR     = @libexecdir@@libdirsuffix@/@pkg_name@
 
 CC              = @cc@
 AWK             = @awk@

Index: xfstests-dev.work/ltp/Makefile
===================================================================
@@ -49,3 +49,8 @@ ifeq ($(HAVE_AIO), true)
 aio-stress: aio-stress.c
 	$(LINKTEST) $(LIBAIO) $(LDLIBS)
 endif
+
+install:
+	$(INSTALL) -m 755 -d $(PKG_LIB_DIR)/ltp
+	$(INSTALL) -m 755 $(TARGETS) $(PKG_LIB_DIR)/ltp
+

Index: xfstests-dev.work/src/Makefile
===================================================================
@@ -126,3 +126,10 @@ open_unlink: open_unlink.o $(LIBHANDLE)
 	$(LINKTEST) $(LIBHANDLE) $(LDLIBS)
 
 endif
+
+install:
+	$(INSTALL) -m 755 -d $(PKG_LIB_DIR)/src
+	$(INSTALL) -m 755 $(TARGETS) $(PKG_LIB_DIR)/src
+	$(INSTALL) -m 755 fill2attr fill2fs $(PKG_LIB_DIR)/src
+	$(INSTALL) -m 755 fill2fs_check scaleread.sh $(PKG_LIB_DIR)/src
+	$(INSTALL) -m 644 dumpfile $(PKG_LIB_DIR)/src

Index: xfstests-dev.work/Makepkgs
===================================================================
@@ -0,0 +1,88 @@
+#! /bin/sh
+#
+#	Make whichever packages have been requested.
+#	Defaults to RPMs.
+#
+LOGDIR=Logs
+
+type=rpm
+verbose=false
+
+MAKE=${MAKE:-make}
+test ! -z "$MAKE" && make=$MAKE
+
+for opt in $*
+do
+	case "$opt" in
+	clean)
+		;; # ignored, kept for backward compatibility
+	rpm)
+		type=rpm ;;
+	debian)
+		type=debian ;;
+	verbose)
+		verbose=true ;;
+	*)
+		echo "Usage: Makepkgs [verbose] [debian|rpm]"; exit 1 ;;
+	esac
+done
+
+# start with a clean manifest
+test -f files.rpm && rm -f files.rpm
+test -f filesdevel.rpm && rm -f filesdevel.rpm
+test -f fileslib.rpm && rm -f fileslib.rpm
+
+test ! -d $LOGDIR && mkdir $LOGDIR
+rm -rf $LOGDIR/* > /dev/null 2>&1
+
+# build Debian packages, cleans itself before starting
+SUDO=${SUDO:-sudo}
+test ! -z "$SUDO" && sudo=$SUDO
+if [ $type = debian ] ; then
+	LOGDEB=`pwd`
+	LOGDEB=../`basename $LOGDEB`.log
+	echo "== Debian build, log is $LOGDEB"; echo
+	if $verbose ; then
+		dpkg-buildpackage -r$SUDO | tee $LOGDEB
+	else
+		dpkg-buildpackage -r$SUDO > $LOGDEB || exit 1
+	fi
+	exit 0
+fi
+
+# build RPM packages - manual clean before starting
+echo "== clean, log is $LOGDIR/clean"
+if $verbose ; then
+	$MAKE clean 2>&1 | tee $LOGDIR/clean
+else
+	$MAKE clean > $LOGDIR/clean 2>&1  || exit 1
+fi
+
+echo
+echo "== configure, log is $LOGDIR/configure"
+rm -f .census	# force configure to run here
+if $verbose ; then
+	$MAKE configure 2>&1 | tee $LOGDIR/configure
+else
+	$MAKE configure > $LOGDIR/configure 2>&1 || exit 1
+fi
+
+echo
+echo "== default, log is $LOGDIR/default"
+if $verbose ; then
+	$MAKE default 2>&1 | tee $LOGDIR/default
+else
+	$MAKE default > $LOGDIR/default 2>&1 || exit 1
+fi
+
+echo
+echo "== dist, log is $LOGDIR/dist"
+[ ! -f .census ] && touch .census
+if $verbose ; then
+	$MAKE -C build dist 2>&1 | tee $LOGDIR/dist
+else
+	$MAKE -C build dist > $LOGDIR/dist 2>&1 || exit 1
+	grep '^Wrote:' $LOGDIR/dist | sed -e 's/\.\.\/\.\.\///'
+fi
+
+exit 0

Index: xfstests-dev.work/build/rpm/macros.template
===================================================================
@@ -0,0 +1,30 @@
+#
+# rpmrc.template
+#
+# Template to fudge rpm directory structure inside IRIX-like build
+# environment
+
+# Force 386 build on all platforms
+%_target i386-pc-linux
+%_target_cpu i386
+%_target_os linux
+
+# topdir == $(WORKAREA)
+%_topdir %topdir%
+
+# Following directories are specific to the topdir
+# This is where build is done. In our case it's the same as $WORKAREA
+%_builddir %topdir%
+
+# This is where foo.1.99.tar.gz is living in the real world.
+# Be careful not to run full rpm build as it will override the sources
+%_sourcedir %topdir%/build
+
+# This is where binary RPM and source RPM would end up
+%_rpmdir    %topdir%/build/rpm
+%_srcrpmdir %topdir%/build/rpm
+%_specdir   %topdir%/build/rpm
+
+# Leave RPM files in the same directory - we're not building for
+# multiple architectures
+%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm

49 lines not on this page · raw message