[Ocfs2-tools-devel] build: Add fc7 vendor definitions

[Joel Becker]

On Thu, Nov 08, 2007 at 09:35:46AM -0800, Mark Fasheh wrote:
> I copied vendor/rhel5 into vendor/fc7 and made appropiate changes. "make
> rpm" now builds a full set of rpms on my fc7 machines.

	Make sure to add fc7 to vendor/Makefile:SUBDIRS.  After that,

Signed-off-by: Joel Becker <joel.becker at oracle.com>


> 
> Signed-off-by: Mark Fasheh <mark.fasheh at oracle.com>
> ---
>  vendor/fc7/Makefile      |   10 +++++++
>  vendor/fc7/Vendor.make   |   10 +++++++
>  vendor/fc7/rpmarch.guess |   68 ++++++++++++++++++++++++++++++++++++++++++++++
>  vendor/fc7/vendor.guess  |   13 +++++++++
>  4 files changed, 101 insertions(+), 0 deletions(-)
>  create mode 100644 vendor/fc7/Makefile
>  create mode 100644 vendor/fc7/Vendor.make
>  create mode 100755 vendor/fc7/rpmarch.guess
>  create mode 100755 vendor/fc7/vendor.guess
> 
> diff --git a/vendor/fc7/Makefile b/vendor/fc7/Makefile
> new file mode 100644
> index 0000000..7afe47c
> --- /dev/null
> +++ b/vendor/fc7/Makefile
> @@ -0,0 +1,10 @@
> +TOPDIR = ../..
> +
> +include $(TOPDIR)/Preamble.make
> +
> +DIST_FILES = 				\
> +	rpmarch.guess			\
> +	Vendor.make			\
> +	vendor.guess
> +
> +include $(TOPDIR)/Postamble.make
> diff --git a/vendor/fc7/Vendor.make b/vendor/fc7/Vendor.make
> new file mode 100644
> index 0000000..025de08
> --- /dev/null
> +++ b/vendor/fc7/Vendor.make
> @@ -0,0 +1,10 @@
> +#
> +# Fedora 7
> +#
> +
> +TOOLSARCH = $(shell $(TOPDIR)/vendor/fc7/rpmarch.guess tools $(TOPDIR))
> +VENDOR_EXTENSION = fc7
> +
> +include $(TOPDIR)/vendor/common/Vendor.make
> +
> +packages: rpm
> diff --git a/vendor/fc7/rpmarch.guess b/vendor/fc7/rpmarch.guess
> new file mode 100755
> index 0000000..77a1142
> --- /dev/null
> +++ b/vendor/fc7/rpmarch.guess
> @@ -0,0 +1,68 @@
> +#! /bin/sh
> +
> +mode="$1"
> +srcdir="$2"
> +
> +host_cpu=
> +
> +
> +QUERYFILE=/etc/fedora-release
> +
> +if test -n "$QUERYFILE"; then
> +  host_cpu="`rpm -qf $QUERYFILE --queryformat \"%{ARCH}\"`"
> +fi
> +
> +if test -z "$host_cpu" -o "$host_cpu" = "noarch" ; then
> +  host_alias=`$srcdir/config.guess`
> +  host=`$srcdir/config.sub $host_alias`
> +  host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
> +fi
> +
> +case "$host_cpu" in
> +  x86_64|ia64|s390x)
> +    TOOLSARCH="$host_cpu"
> +    ;;
> +  i386|i486|i586|i686|i786|k6|k7)
> +    TOOLSARCH="i386"
> +    ;;
> +  ppc|ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)
> +    TOOLSARCH="ppc"
> +    ;;
> +  *)
> +    echo "rpmarch.guess: Warning: unknown RPM CPU architecture: $host_cpu" >&2
> +    TOOLSARCH=""
> +    ;;
> +esac
> +
> +# Only a few of these need to be overwritten from RPM's default
> +case "$host_cpu" in
> +  i386|i586)
> +    MODULEARCH="i686"
> +    ;;
> +  ppc|ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)
> +    MODULEARCH="ppc64"
> +    ;;
> +  *)
> +    MODULEARCH=""
> +    ;;
> +esac
> +
> +case "$mode" in
> +  module)
> +    if [ -n "$MODULEARCH" ] ; then
> +      echo "--target $MODULEARCH"
> +    fi
> +    ;;
> +  tools)
> +    if [ -n "$TOOLSARCH" ] ; then
> +      echo "--target $TOOLSARCH"
> +    fi
> +    ;;
> +  *)
> +    echo "rpmarch.guess: Invalid mode: $mode" >&2
> +    echo "error"
> +    exit 1
> +    ;;
> +esac
> +
> +exit 0
> diff --git a/vendor/fc7/vendor.guess b/vendor/fc7/vendor.guess
> new file mode 100755
> index 0000000..776fae4
> --- /dev/null
> +++ b/vendor/fc7/vendor.guess
> @@ -0,0 +1,13 @@
> +#!/bin/sh
> +
> +if [ ! -f /etc/redhat-release ]
> +then
> +    exit 1
> +fi
> +
> +case "`rpm -qf /etc/fedora-release --qf '%{VERSION}' 2>/dev/null`" in
> +    7*) ;;
> +    *) exit 1;;
> +esac
> +
> +exit 0
> -- 
> 1.5.3.4
> 
> 
> _______________________________________________
> Ocfs2-tools-devel mailing list
> Ocfs2-tools-devel at oss.oracle.com
> http://oss.oracle.com/mailman/listinfo/ocfs2-tools-devel

-- 

"Win95 file and print sharing are for relatively friendly nets."
	- Paul Leach, Microsoft

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127