From 94e77e445bef6023923d282085116a399e96b4e5 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Thu, 13 Dec 2012 12:12:09 -0600 Subject: [PATCH] Replace tarball with un-botched version --- .gitignore | 76 +++++++++++++++++++++--- Makefile | 165 +++++++++++++++++++++++++++++++++++++++++++++++------ sources | 2 +- 3 files changed, 216 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 6964785..525b9b7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,68 @@ -xfsprogs-3.1.2.tar.gz -/xfsprogs-3.1.3.tar.gz -/xfsprogs-3.1.4.tar.gz -/xfsprogs-3.1.5.tar.gz -/xfsprogs-3.1.6.tar.gz -/xfsprogs-3.1.7.tar.gz -/xfsprogs-3.1.8.tar.gz -/xfsprogs-3.1.9.tar.gz +# object files +*.o +.dep +.ltdep + +# build system +.census +/include/platform_defs.h +/include/builddefs +/install-sh + +# magic directory symlinks +/include/disk +/include/xfs + +# packaging +/doc/CHANGES.gz +/xfsprogs-* +/xfsprogs_* +/xfslibs-dev_* + +# autoconf generated files +/aclocal.m4 +/m4/libtool.m4 +/m4/ltoptions.m4 +/m4/ltsugar.m4 +/m4/ltversion.m4 +/m4/lt~obsolete.m4 +/autom4te.cache/ +/config.guess +/config.log +/config.status +/config.sub +/configure + +# libtool +/libtool +/ltmain.sh +*.lo +*.la +.libs + +# gettext +/po/de.mo +/po/pl.mo +/po/xfsprogs.pot + +# cscope stuff +cscope.* + +# quilt stuff +/.pc/ +/patches/ + +# binaries +/copy/xfs_copy +/db/xfs_db +/estimate/xfs_estimate +/fsr/xfs_fsr +/growfs/xfs_growfs +/io/xfs_io +/logprint/xfs_logprint +/mdrestore/xfs_mdrestore +/mkfs/fstyp +/mkfs/mkfs.xfs +/quota/xfs_quota +/repair/xfs_repair +/rtcp/xfs_rtcp diff --git a/Makefile b/Makefile index 61efb83..0bdc5e8 100644 --- a/Makefile +++ b/Makefile @@ -1,21 +1,150 @@ -# Makefile for source rpm: xfsprogs -# $Id$ -NAME := xfsprogs -SPECFILE = $(firstword $(wildcard *.spec)) +# +# Copyright (c) 2000-2006 Silicon Graphics, Inc. All Rights Reserved. +# -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +ifeq ("$(origin V)", "command line") + BUILD_VERBOSE = $(V) +endif +ifndef BUILD_VERBOSE + BUILD_VERBOSE = 0 endif -include $(MAKEFILE_COMMON) +ifeq ($(BUILD_VERBOSE),1) + Q = +else + Q = @ +endif + +MAKEOPTS = --no-print-directory Q=$(Q) + +TOPDIR = . +HAVE_BUILDDEFS = $(shell test -f $(TOPDIR)/include/builddefs && echo yes || echo no) + +ifeq ($(HAVE_BUILDDEFS), yes) +include $(TOPDIR)/include/builddefs +endif + +SRCDIR = $(PKG_NAME)-$(PKG_VERSION) +SRCTAR = $(PKG_NAME)-$(PKG_VERSION).tar.gz + +CONFIGURE = aclocal.m4 configure config.guess config.sub install-sh ltmain.sh +LSRCFILES = configure.ac release.sh README VERSION $(CONFIGURE) + +LDIRT = config.log .ltdep .dep config.status config.cache confdefs.h \ + conftest* built .census install.* install-dev.* *.gz \ + autom4te.cache/* libtool include/builddefs include/platform_defs.h + +ifeq ($(HAVE_BUILDDEFS), yes) +LDIRDIRT = $(SRCDIR) +LDIRT += $(SRCTAR) +endif + +LIB_SUBDIRS = libxfs libxlog libxcmd libhandle libdisk +TOOL_SUBDIRS = copy db estimate fsck fsr growfs io logprint mkfs quota \ + mdrestore repair rtcp m4 man doc po debian + +SUBDIRS = include $(LIB_SUBDIRS) $(TOOL_SUBDIRS) + +default: include/builddefs include/platform_defs.h +ifeq ($(HAVE_BUILDDEFS), no) + $(Q)$(MAKE) $(MAKEOPTS) -C . $@ +else + $(Q)$(MAKE) $(MAKEOPTS) $(SUBDIRS) +endif + +# tool/lib dependencies +$(LIB_SUBDIRS) $(TOOL_SUBDIRS): include +copy mdrestore: libxfs +db logprint: libxfs libxlog +fsr: libhandle +growfs: libxfs libxcmd +io: libxcmd libhandle +mkfs: libxfs +quota: libxcmd +repair: libxfs libxlog + +ifneq ($(ENABLE_BLKID), yes) +mkfs: libdisk +endif + +ifeq ($(HAVE_BUILDDEFS), yes) +include $(BUILDRULES) +else +clean: # if configure hasn't run, nothing to clean +endif + +# Recent versions of libtool require the -i option for copying auxiliary +# files (config.sub, config.guess, install-sh, ltmain.sh), while older +# versions will copy those files anyway, and don't understand -i. +LIBTOOLIZE_INSTALL = `libtoolize -n -i >/dev/null 2>/dev/null && echo -i` + +configure: + libtoolize -c $(LIBTOOLIZE_INSTALL) -f + cp include/install-sh . + aclocal -I m4 + autoconf + +include/builddefs: configure + ./configure $$LOCAL_CONFIGURE_OPTIONS + +include/platform_defs.h: include/builddefs +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f include/builddefs; \ + $(MAKE) $(MAKEOPTS) $(AM_MAKEFLAGS) include/builddefs; \ + fi + +install: $(addsuffix -install,$(SUBDIRS)) + $(INSTALL) -m 755 -d $(PKG_DOC_DIR) + $(INSTALL) -m 644 README $(PKG_DOC_DIR) + +install-dev: $(addsuffix -install-dev,$(SUBDIRS)) + +install-qa: install $(addsuffix -install-qa,$(SUBDIRS)) + +%-install: + @echo "Installing $@" + $(Q)$(MAKE) $(MAKEOPTS) -C $* install + +%-install-dev: + @echo "Installing $@" + $(Q)$(MAKE) $(MAKEOPTS) -C $* install-dev + +%-install-qa: + @echo "Installing $@" + $(Q)$(MAKE) $(MAKEOPTS) -C $* install-qa + +distclean: clean + $(Q)rm -f $(LDIRT) + +realclean: distclean + $(Q)rm -f $(CONFIGURE) + +# +# All this gunk is to allow for a make dist on an unconfigured tree +# +dist: include/builddefs include/platform_defs.h default +ifeq ($(HAVE_BUILDDEFS), no) + $(Q)$(MAKE) $(MAKEOPTS) -C . $@ +else + $(Q)$(MAKE) $(MAKEOPTS) $(SRCTAR) +endif + +deb: include/builddefs include/platform_defs.h +ifeq ($(HAVE_BUILDDEFS), no) + $(Q)$(MAKE) $(MAKEOPTS) -C . $@ +else + $(Q)$(MAKE) $(MAKEOPTS) $(SRCDIR) + $(Q)$(MAKE) $(MAKEOPTS) -C po + $(Q)$(MAKE) $(MAKEOPTS) source-link + $(Q)cd $(SRCDIR) && dpkg-buildpackage +endif + +$(SRCDIR) : $(_FORCE) + rm -fr $@ + mkdir -p $@ + +$(SRCTAR) : default $(SRCDIR) + $(Q)$(MAKE) $(MAKEOPTS) source-link + unset TAPE; $(TAR) -cf - $(SRCDIR) | $(ZIP) --best > $@ && \ + echo Wrote: $@ diff --git a/sources b/sources index 94b0a9f..35b2936 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d4704f4e98976bdb899007695f822bbb xfsprogs-3.1.9.tar.gz +3bdced1840fe8c0053b076224125b2a2 xfsprogs-3.1.9.tar.gz