[rtems-buildsys commit] Abandon Fedora 15.
Ralf Corsepius
ralf at rtems.org
Mon Jun 25 16:05:18 UTC 2012
Module: rtems-buildsys
Branch: master
Commit: 378ea7197cd5d582f7cf9921db222729b500e104
Changeset: http://git.rtems.org/rtems-buildsys/commit/?id=378ea7197cd5d582f7cf9921db222729b500e104
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Thu Jun 21 17:27:15 2012 +0200
Abandon Fedora 15.
---
rtems-mock/Makefile.in | 54 ------
rtems-mock/aclocal.m4 | 4 +-
rtems-mock/configure | 190 ++++++++++----------
rtems-mock/configure.ac | 2 +-
.../etc/mock/fedora-15-i386-rtems-infra.cfg.in | 35 ----
.../etc/mock/fedora-15-i386-rtems4.10.cfg.in | 40 ----
.../etc/mock/fedora-15-i386-rtems4.11.cfg.in | 40 ----
.../etc/mock/fedora-15-x86_64-rtems-infra.cfg.in | 35 ----
.../etc/mock/fedora-15-x86_64-rtems4.10.cfg.in | 40 ----
.../etc/mock/fedora-15-x86_64-rtems4.11.cfg.in | 40 ----
rtems-mock/etc/mock/makefile.am | 60 ------
rtems-mock/perl/RTEMS/Mock/Config.pm | 24 ---
12 files changed, 101 insertions(+), 463 deletions(-)
diff --git a/rtems-mock/Makefile.in b/rtems-mock/Makefile.in
index 70deb23..f80df17 100644
--- a/rtems-mock/Makefile.in
+++ b/rtems-mock/Makefile.in
@@ -224,12 +224,6 @@ CLEANFILES = bin/rtems-preprpms bin/rtems-drpmsclean \
etc/mock/cygwin-i686-rtems4.11.cfg \
etc/mock/cygwin-i686-rtems4.8.cfg \
etc/mock/cygwin-i686-rtems4.9.cfg \
- etc/mock/fedora-15-i386-rtems4.10.cfg \
- etc/mock/fedora-15-i386-rtems4.11.cfg \
- etc/mock/fedora-15-i386-rtems-infra.cfg \
- etc/mock/fedora-15-x86_64-rtems4.10.cfg \
- etc/mock/fedora-15-x86_64-rtems4.11.cfg \
- etc/mock/fedora-15-x86_64-rtems-infra.cfg \
etc/mock/fedora-16-i386-rtems4.10.cfg \
etc/mock/fedora-16-i386-rtems4.11.cfg \
etc/mock/fedora-16-i386-rtems-infra.cfg \
@@ -290,12 +284,6 @@ EXTRA_DIST = bin/rtems-preprpms.in bin/rtems-drpmsclean.in \
etc/mock/cygwin-i686-rtems4.11.cfg.in \
etc/mock/cygwin-i686-rtems4.8.cfg.in \
etc/mock/cygwin-i686-rtems4.9.cfg.in \
- etc/mock/fedora-15-i386-rtems4.10.cfg.in \
- etc/mock/fedora-15-i386-rtems4.11.cfg.in \
- etc/mock/fedora-15-i386-rtems-infra.cfg.in \
- etc/mock/fedora-15-x86_64-rtems4.10.cfg.in \
- etc/mock/fedora-15-x86_64-rtems4.11.cfg.in \
- etc/mock/fedora-15-x86_64-rtems-infra.cfg.in \
etc/mock/fedora-16-i386-rtems4.10.cfg.in \
etc/mock/fedora-16-i386-rtems4.11.cfg.in \
etc/mock/fedora-16-i386-rtems-infra.cfg.in \
@@ -402,12 +390,6 @@ mockcfg_DATA = etc/mock/centos-5-i386-rtems4.10.cfg \
etc/mock/cygwin-i686-rtems4.11.cfg \
etc/mock/cygwin-i686-rtems4.8.cfg \
etc/mock/cygwin-i686-rtems4.9.cfg \
- etc/mock/fedora-15-i386-rtems4.10.cfg \
- etc/mock/fedora-15-i386-rtems4.11.cfg \
- etc/mock/fedora-15-i386-rtems-infra.cfg \
- etc/mock/fedora-15-x86_64-rtems4.10.cfg \
- etc/mock/fedora-15-x86_64-rtems4.11.cfg \
- etc/mock/fedora-15-x86_64-rtems-infra.cfg \
etc/mock/fedora-16-i386-rtems4.10.cfg \
etc/mock/fedora-16-i386-rtems4.11.cfg \
etc/mock/fedora-16-i386-rtems-infra.cfg \
@@ -1496,42 +1478,6 @@ etc/mock/cygwin-i686-rtems4.9.cfg: etc/mock/cygwin-i686-rtems4.9.cfg.in etc/mock
< $(srcdir)/etc/mock/cygwin-i686-rtems4.9.cfg.in \
> etc/mock/cygwin-i686-rtems4.9.cfg
-etc/mock/fedora-15-i386-rtems4.10.cfg: etc/mock/fedora-15-i386-rtems4.10.cfg.in etc/mock/$(dirstamp)
- sed \
- -e 's,[@]buildgroupsdir[@],file://$(mockdatadir)/buildgroups,' \
- < $(srcdir)/etc/mock/fedora-15-i386-rtems4.10.cfg.in \
- > etc/mock/fedora-15-i386-rtems4.10.cfg
-
-etc/mock/fedora-15-i386-rtems4.11.cfg: etc/mock/fedora-15-i386-rtems4.11.cfg.in etc/mock/$(dirstamp)
- sed \
- -e 's,[@]buildgroupsdir[@],file://$(mockdatadir)/buildgroups,' \
- < $(srcdir)/etc/mock/fedora-15-i386-rtems4.11.cfg.in \
- > etc/mock/fedora-15-i386-rtems4.11.cfg
-
-etc/mock/fedora-15-i386-rtems-infra.cfg: etc/mock/fedora-15-i386-rtems-infra.cfg.in etc/mock/$(dirstamp)
- sed \
- -e 's,[@]buildgroupsdir[@],file://$(mockdatadir)/buildgroups,' \
- < $(srcdir)/etc/mock/fedora-15-i386-rtems-infra.cfg.in \
- > etc/mock/fedora-15-i386-rtems-infra.cfg
-
-etc/mock/fedora-15-x86_64-rtems4.10.cfg: etc/mock/fedora-15-x86_64-rtems4.10.cfg.in etc/mock/$(dirstamp)
- sed \
- -e 's,[@]buildgroupsdir[@],file://$(mockdatadir)/buildgroups,' \
- < $(srcdir)/etc/mock/fedora-15-x86_64-rtems4.10.cfg.in \
- > etc/mock/fedora-15-x86_64-rtems4.10.cfg
-
-etc/mock/fedora-15-x86_64-rtems4.11.cfg: etc/mock/fedora-15-x86_64-rtems4.11.cfg.in etc/mock/$(dirstamp)
- sed \
- -e 's,[@]buildgroupsdir[@],file://$(mockdatadir)/buildgroups,' \
- < $(srcdir)/etc/mock/fedora-15-x86_64-rtems4.11.cfg.in \
- > etc/mock/fedora-15-x86_64-rtems4.11.cfg
-
-etc/mock/fedora-15-x86_64-rtems-infra.cfg: etc/mock/fedora-15-x86_64-rtems-infra.cfg.in etc/mock/$(dirstamp)
- sed \
- -e 's,[@]buildgroupsdir[@],file://$(mockdatadir)/buildgroups,' \
- < $(srcdir)/etc/mock/fedora-15-x86_64-rtems-infra.cfg.in \
- > etc/mock/fedora-15-x86_64-rtems-infra.cfg
-
etc/mock/fedora-16-i386-rtems4.10.cfg: etc/mock/fedora-16-i386-rtems4.10.cfg.in etc/mock/$(dirstamp)
sed \
-e 's,[@]buildgroupsdir[@],file://$(mockdatadir)/buildgroups,' \
diff --git a/rtems-mock/aclocal.m4 b/rtems-mock/aclocal.m4
index 4c88ed9..7ad230a 100644
--- a/rtems-mock/aclocal.m4
+++ b/rtems-mock/aclocal.m4
@@ -14,8 +14,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff --git a/rtems-mock/configure b/rtems-mock/configure
index 4dcc5f0..b4bbf98 100755
--- a/rtems-mock/configure
+++ b/rtems-mock/configure
@@ -1,13 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for rtems-mock 1.20120501.0.
+# Generated by GNU Autoconf 2.69 for rtems-mock 1.20120501.0.
#
# Report bugs to <ralf.corsepius at rtems.org>.
#
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@ export LANGUAGE
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -213,21 +237,25 @@ IFS=$as_save_IFS
if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
if test x$as_have_required = xno; then :
@@ -330,6 +358,14 @@ $as_echo X"$as_dir" |
} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -451,6 +487,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -485,16 +525,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -506,28 +546,8 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -1108,8 +1128,6 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1340,9 +1358,9 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
rtems-mock configure 1.20120501.0
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1357,7 +1375,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by rtems-mock $as_me 1.20120501.0, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -1772,7 +1790,7 @@ case $as_dir/ in #((
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
@@ -1941,7 +1959,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -1981,7 +1999,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2032,7 +2050,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
@@ -2085,7 +2103,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AWK="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2347,7 +2365,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2388,7 +2406,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_MOCK="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2434,7 +2452,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_CREATEREPO="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2480,7 +2498,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_REPOMANAGE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2526,7 +2544,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_RPMBUILD="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2585,7 +2603,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_HARDLINK="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3115,16 +3133,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -3184,28 +3202,16 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -3227,7 +3233,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling.
ac_log="
This file was extended by rtems-mock $as_me 1.20120501.0, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -3280,10 +3286,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
rtems-mock config.status 1.20120501.0
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -3363,7 +3369,7 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
diff --git a/rtems-mock/configure.ac b/rtems-mock/configure.ac
index 6e08aa9..5b261c2 100644
--- a/rtems-mock/configure.ac
+++ b/rtems-mock/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.68)
-AC_INIT([rtems-mock],[1.20120501.0],[ralf.corsepius at rtems.org],[rtems-mock])
+AC_INIT([rtems-mock],[1.20120621.0],[ralf.corsepius at rtems.org],[rtems-mock])
AM_INIT_AUTOMAKE([no-dist-gzip dist-bzip2 dist-xz tar-pax 1.11.3 foreign])
AM_MAINTAINER_MODE
diff --git a/rtems-mock/etc/mock/fedora-15-i386-rtems-infra.cfg.in b/rtems-mock/etc/mock/fedora-15-i386-rtems-infra.cfg.in
deleted file mode 100644
index 03fd16c..0000000
--- a/rtems-mock/etc/mock/fedora-15-i386-rtems-infra.cfg.in
+++ /dev/null
@@ -1,35 +0,0 @@
-config_opts['root'] = 'fedora-15-i386-rtems'
-config_opts['runuser'] = '/sbin/runuser'
-config_opts['target_arch'] = 'i686'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['macros']['%vendor'] = 'RTEMS Project http://www.rtems.org'
-config_opts['macros']['%_with_noarch_subpackages'] = '1'
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-[fedora]
-name=fedora
-# baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/15/Everything/i386/os/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-15&arch=i386
-
-[updates]
-name=updates
-# baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/15/i386/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f15&arch=i386
-enabled=1
-
-[rtems-infra]
-name=infrastructure
-baseurl=ftp://ftp.rtems.org/pub/rtems/linux/infrastructure/fedora/15/i386/
-
-"""
diff --git a/rtems-mock/etc/mock/fedora-15-i386-rtems4.10.cfg.in b/rtems-mock/etc/mock/fedora-15-i386-rtems4.10.cfg.in
deleted file mode 100644
index 03e19e6..0000000
--- a/rtems-mock/etc/mock/fedora-15-i386-rtems4.10.cfg.in
+++ /dev/null
@@ -1,40 +0,0 @@
-config_opts['root'] = 'fedora-15-i386-rtems'
-config_opts['runuser'] = '/sbin/runuser'
-config_opts['target_arch'] = 'i686'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['macros']['%vendor'] = 'RTEMS Project http://www.rtems.org'
-config_opts['macros']['%_with_noarch_subpackages'] = '1'
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-[fedora]
-name=fedora
-# baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/15/Everything/i386/os/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-15&arch=i386
-
-[updates]
-name=updates
-# baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/15/i386/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f15&arch=i386
-enabled=1
-
-[rtems-infra]
-name=infrastructure
-baseurl=ftp://ftp.rtems.org/pub/rtems/linux/infrastructure/fedora/15/i386/
-
-[rtems-4.10]
-name=rtems-4.10
-baseurl=ftp://ftp.rtems.org/pub/rtems/linux/4.10/fedora/15/i386/
-
-
-"""
diff --git a/rtems-mock/etc/mock/fedora-15-i386-rtems4.11.cfg.in b/rtems-mock/etc/mock/fedora-15-i386-rtems4.11.cfg.in
deleted file mode 100644
index a26781e..0000000
--- a/rtems-mock/etc/mock/fedora-15-i386-rtems4.11.cfg.in
+++ /dev/null
@@ -1,40 +0,0 @@
-config_opts['root'] = 'fedora-15-i386-rtems'
-config_opts['runuser'] = '/sbin/runuser'
-config_opts['target_arch'] = 'i686'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['macros']['%vendor'] = 'RTEMS Project http://www.rtems.org'
-config_opts['macros']['%_with_noarch_subpackages'] = '1'
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-[fedora]
-name=fedora
-# baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/15/Everything/i386/os/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-15&arch=i386
-
-[updates]
-name=updates
-# baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/15/i386/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f15&arch=i386
-enabled=1
-
-[rtems-infra]
-name=infrastructure
-baseurl=ftp://ftp.rtems.org/pub/rtems/linux/infrastructure/fedora/15/i386/
-
-[rtems-4.11]
-name=rtems-4.11
-baseurl=ftp://ftp.rtems.org/pub/rtems/linux/4.11/fedora/15/i386/
-
-
-"""
diff --git a/rtems-mock/etc/mock/fedora-15-x86_64-rtems-infra.cfg.in b/rtems-mock/etc/mock/fedora-15-x86_64-rtems-infra.cfg.in
deleted file mode 100644
index ec464fb..0000000
--- a/rtems-mock/etc/mock/fedora-15-x86_64-rtems-infra.cfg.in
+++ /dev/null
@@ -1,35 +0,0 @@
-config_opts['root'] = 'fedora-15-x86_64-rtems'
-config_opts['runuser'] = '/sbin/runuser'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['macros']['%vendor'] = 'RTEMS Project http://www.rtems.org'
-config_opts['macros']['%_with_noarch_subpackages'] = '1'
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-[fedora]
-name=fedora
-# baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/15/Everything/x86_64/os/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-15&arch=x86_64
-
-[updates]
-name=updates
-# baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/15/x86_64/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f15&arch=x86_64
-enabled=1
-
-[rtems-infra]
-name=infrastructure
-baseurl=ftp://ftp.rtems.org/pub/rtems/linux/infrastructure/fedora/15/x86_64/
-
-"""
diff --git a/rtems-mock/etc/mock/fedora-15-x86_64-rtems4.10.cfg.in b/rtems-mock/etc/mock/fedora-15-x86_64-rtems4.10.cfg.in
deleted file mode 100644
index 7a642e3..0000000
--- a/rtems-mock/etc/mock/fedora-15-x86_64-rtems4.10.cfg.in
+++ /dev/null
@@ -1,40 +0,0 @@
-config_opts['root'] = 'fedora-15-x86_64-rtems'
-config_opts['runuser'] = '/sbin/runuser'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['macros']['%vendor'] = 'RTEMS Project http://www.rtems.org'
-config_opts['macros']['%_with_noarch_subpackages'] = '1'
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-[fedora]
-name=fedora
-# baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/15/Everything/x86_64/os/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-15&arch=x86_64
-
-[updates]
-name=updates
-# baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/15/x86_64/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f15&arch=x86_64
-enabled=1
-
-[rtems-infra]
-name=infrastructure
-baseurl=ftp://ftp.rtems.org/pub/rtems/linux/infrastructure/fedora/15/x86_64/
-
-[rtems-4.10]
-name=rtems-4.10
-baseurl=ftp://ftp.rtems.org/pub/rtems/linux/4.10/fedora/15/x86_64/
-
-
-"""
diff --git a/rtems-mock/etc/mock/fedora-15-x86_64-rtems4.11.cfg.in b/rtems-mock/etc/mock/fedora-15-x86_64-rtems4.11.cfg.in
deleted file mode 100644
index ca2f32c..0000000
--- a/rtems-mock/etc/mock/fedora-15-x86_64-rtems4.11.cfg.in
+++ /dev/null
@@ -1,40 +0,0 @@
-config_opts['root'] = 'fedora-15-x86_64-rtems'
-config_opts['runuser'] = '/sbin/runuser'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['macros']['%vendor'] = 'RTEMS Project http://www.rtems.org'
-config_opts['macros']['%_with_noarch_subpackages'] = '1'
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-[fedora]
-name=fedora
-# baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/15/Everything/x86_64/os/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-15&arch=x86_64
-
-[updates]
-name=updates
-# baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/15/x86_64/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f15&arch=x86_64
-enabled=1
-
-[rtems-infra]
-name=infrastructure
-baseurl=ftp://ftp.rtems.org/pub/rtems/linux/infrastructure/fedora/15/x86_64/
-
-[rtems-4.11]
-name=rtems-4.11
-baseurl=ftp://ftp.rtems.org/pub/rtems/linux/4.11/fedora/15/x86_64/
-
-
-"""
diff --git a/rtems-mock/etc/mock/makefile.am b/rtems-mock/etc/mock/makefile.am
index 409eedf..bb7c91a 100644
--- a/rtems-mock/etc/mock/makefile.am
+++ b/rtems-mock/etc/mock/makefile.am
@@ -227,66 +227,6 @@ etc/mock/cygwin-i686-rtems4.9.cfg: etc/mock/cygwin-i686-rtems4.9.cfg.in etc/mock
EXTRA_DIST += etc/mock/cygwin-i686-rtems4.9.cfg.in
CLEANFILES += etc/mock/cygwin-i686-rtems4.9.cfg
-mockcfg_DATA += etc/mock/fedora-15-i386-rtems4.10.cfg
-
-etc/mock/fedora-15-i386-rtems4.10.cfg: etc/mock/fedora-15-i386-rtems4.10.cfg.in etc/mock/$(dirstamp)
- sed \
- -e 's,[@]buildgroupsdir[@],file://$(mockdatadir)/buildgroups,' \
- < $(srcdir)/etc/mock/fedora-15-i386-rtems4.10.cfg.in \
- > etc/mock/fedora-15-i386-rtems4.10.cfg
-EXTRA_DIST += etc/mock/fedora-15-i386-rtems4.10.cfg.in
-CLEANFILES += etc/mock/fedora-15-i386-rtems4.10.cfg
-
-mockcfg_DATA += etc/mock/fedora-15-i386-rtems4.11.cfg
-
-etc/mock/fedora-15-i386-rtems4.11.cfg: etc/mock/fedora-15-i386-rtems4.11.cfg.in etc/mock/$(dirstamp)
- sed \
- -e 's,[@]buildgroupsdir[@],file://$(mockdatadir)/buildgroups,' \
- < $(srcdir)/etc/mock/fedora-15-i386-rtems4.11.cfg.in \
- > etc/mock/fedora-15-i386-rtems4.11.cfg
-EXTRA_DIST += etc/mock/fedora-15-i386-rtems4.11.cfg.in
-CLEANFILES += etc/mock/fedora-15-i386-rtems4.11.cfg
-
-mockcfg_DATA += etc/mock/fedora-15-i386-rtems-infra.cfg
-
-etc/mock/fedora-15-i386-rtems-infra.cfg: etc/mock/fedora-15-i386-rtems-infra.cfg.in etc/mock/$(dirstamp)
- sed \
- -e 's,[@]buildgroupsdir[@],file://$(mockdatadir)/buildgroups,' \
- < $(srcdir)/etc/mock/fedora-15-i386-rtems-infra.cfg.in \
- > etc/mock/fedora-15-i386-rtems-infra.cfg
-EXTRA_DIST += etc/mock/fedora-15-i386-rtems-infra.cfg.in
-CLEANFILES += etc/mock/fedora-15-i386-rtems-infra.cfg
-
-mockcfg_DATA += etc/mock/fedora-15-x86_64-rtems4.10.cfg
-
-etc/mock/fedora-15-x86_64-rtems4.10.cfg: etc/mock/fedora-15-x86_64-rtems4.10.cfg.in etc/mock/$(dirstamp)
- sed \
- -e 's,[@]buildgroupsdir[@],file://$(mockdatadir)/buildgroups,' \
- < $(srcdir)/etc/mock/fedora-15-x86_64-rtems4.10.cfg.in \
- > etc/mock/fedora-15-x86_64-rtems4.10.cfg
-EXTRA_DIST += etc/mock/fedora-15-x86_64-rtems4.10.cfg.in
-CLEANFILES += etc/mock/fedora-15-x86_64-rtems4.10.cfg
-
-mockcfg_DATA += etc/mock/fedora-15-x86_64-rtems4.11.cfg
-
-etc/mock/fedora-15-x86_64-rtems4.11.cfg: etc/mock/fedora-15-x86_64-rtems4.11.cfg.in etc/mock/$(dirstamp)
- sed \
- -e 's,[@]buildgroupsdir[@],file://$(mockdatadir)/buildgroups,' \
- < $(srcdir)/etc/mock/fedora-15-x86_64-rtems4.11.cfg.in \
- > etc/mock/fedora-15-x86_64-rtems4.11.cfg
-EXTRA_DIST += etc/mock/fedora-15-x86_64-rtems4.11.cfg.in
-CLEANFILES += etc/mock/fedora-15-x86_64-rtems4.11.cfg
-
-mockcfg_DATA += etc/mock/fedora-15-x86_64-rtems-infra.cfg
-
-etc/mock/fedora-15-x86_64-rtems-infra.cfg: etc/mock/fedora-15-x86_64-rtems-infra.cfg.in etc/mock/$(dirstamp)
- sed \
- -e 's,[@]buildgroupsdir[@],file://$(mockdatadir)/buildgroups,' \
- < $(srcdir)/etc/mock/fedora-15-x86_64-rtems-infra.cfg.in \
- > etc/mock/fedora-15-x86_64-rtems-infra.cfg
-EXTRA_DIST += etc/mock/fedora-15-x86_64-rtems-infra.cfg.in
-CLEANFILES += etc/mock/fedora-15-x86_64-rtems-infra.cfg
-
mockcfg_DATA += etc/mock/fedora-16-i386-rtems4.10.cfg
etc/mock/fedora-16-i386-rtems4.10.cfg: etc/mock/fedora-16-i386-rtems4.10.cfg.in etc/mock/$(dirstamp)
diff --git a/rtems-mock/perl/RTEMS/Mock/Config.pm b/rtems-mock/perl/RTEMS/Mock/Config.pm
index fd4f96b..4f47653 100644
--- a/rtems-mock/perl/RTEMS/Mock/Config.pm
+++ b/rtems-mock/perl/RTEMS/Mock/Config.pm
@@ -25,14 +25,6 @@ my @distros_infra = (
archs => [ "i386", "x86_64" ],
srpmargs => ""
},
- { id => "fedora 15",
- scut => "fc15",
- name => "fedora",
- version => "15",
- suffix => ".fc15",
- archs => [ "i386", "x86_64" ],
- srpmargs => ""
- },
{ id => "rhel 6",
scut => "el6",
name => "centos",
@@ -84,14 +76,6 @@ my @distros_4_11 = (
archs => [ "i386", "x86_64" ],
srpmargs => ""
},
- { id => "fedora 15",
- scut => "fc15",
- name => "fedora",
- version => "15",
- suffix => ".fc15",
- archs => [ "i386", "x86_64" ],
- srpmargs => ""
- },
{ id => "rhel 6",
scut => "el6",
name => "centos",
@@ -167,14 +151,6 @@ my @distros_4_10 = (
archs => [ "i386", "x86_64" ],
srpmargs => ""
},
- { id => "fedora 15",
- scut => "fc15",
- name => "fedora",
- version => "15",
- suffix => ".fc15",
- archs => [ "i386", "x86_64" ],
- srpmargs => ""
- },
{ id => "rhel 6",
scut => "el6",
name => "centos",
More information about the vc
mailing list