change log for rtems (2011-03-04)
rtems-vc at rtems.org
rtems-vc at rtems.org
Fri Mar 4 17:10:36 UTC 2011
*joel* (on branch rtems-4-10-branch):
2011-03-04 Joel Sherrill <joel.sherrilL at OARcorp.com>
* shared/start/start.S: Remove conflict markers in comment.
M 1.233.2.5 c/src/lib/libbsp/powerpc/ChangeLog
M 1.26.2.1 c/src/lib/libbsp/powerpc/shared/start/start.S
diff -u rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.233.2.4 rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.233.2.5
--- rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.233.2.4 Wed Feb 2 09:16:28 2011
+++ rtems/c/src/lib/libbsp/powerpc/ChangeLog Fri Mar 4 10:56:23 2011
@@ -1,3 +1,7 @@
+2011-03-04 Joel Sherrill <joel.sherrilL at OARcorp.com>
+
+ * shared/start/start.S: Remove conflict markers in comment.
+
2011-02-02 Ralf Corsépius <ralf.corsepius at rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.
diff -u rtems/c/src/lib/libbsp/powerpc/shared/start/start.S:1.26 rtems/c/src/lib/libbsp/powerpc/shared/start/start.S:1.26.2.1
--- rtems/c/src/lib/libbsp/powerpc/shared/start/start.S:1.26 Tue Dec 1 19:51:22 2009
+++ rtems/c/src/lib/libbsp/powerpc/shared/start/start.S Fri Mar 4 10:56:23 2011
@@ -7,12 +7,7 @@
* found in found in the file LICENSE in this distribution or at
* http://www.rtems.com/license/LICENSE.
*
-<<<<<<< start.S
* $Id$
-=======
- * $Id$
->>>>>>> 1.25
- *
*/
#include <rtems/asm.h>
*ralf*:
2011-03-04 Ralf Corsépius <ralf.corsepius at rtems.org>
* aclocal/env-rtemsbsp.m4, aclocal/rtems-top.m4, aclocal/version.m4:
Rename RTEMS_API into _RTEMS_API.
M 1.180 testsuites/ChangeLog
M 1.15 testsuites/aclocal/env-rtemsbsp.m4
M 1.15 testsuites/aclocal/rtems-top.m4
M 1.16 testsuites/aclocal/version.m4
diff -u rtems/testsuites/ChangeLog:1.179 rtems/testsuites/ChangeLog:1.180
--- rtems/testsuites/ChangeLog:1.179 Fri Feb 25 00:17:36 2011
+++ rtems/testsuites/ChangeLog Fri Mar 4 10:14:42 2011
@@ -1,3 +1,8 @@
+2011-03-04 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * aclocal/env-rtemsbsp.m4, aclocal/rtems-top.m4, aclocal/version.m4:
+ Rename RTEMS_API into _RTEMS_API.
+
2011-02-25 Ralf Corsépius <ralf.corsepius at rtems.org>
* aclocal/canonical-target-name.m4:
diff -u rtems/testsuites/aclocal/env-rtemsbsp.m4:1.14 rtems/testsuites/aclocal/env-rtemsbsp.m4:1.15
--- rtems/testsuites/aclocal/env-rtemsbsp.m4:1.14 Tue Nov 22 09:32:03 2005
+++ rtems/testsuites/aclocal/env-rtemsbsp.m4 Fri Mar 4 10:14:42 2011
@@ -27,5 +27,5 @@
AC_SUBST([PROJECT_LIB],["\$(PROJECT_ROOT)/lib"])
AC_SUBST([PROJECT_RELEASE],["\$(PROJECT_ROOT)"])
-AC_SUBST([rtems_testsdir],["\$(libdir)/rtems-][RTEMS_API][/tests"])
+AC_SUBST([rtems_testsdir],["\$(libdir)/rtems-][_RTEMS_API][/tests"])
])
diff -u rtems/testsuites/aclocal/rtems-top.m4:1.14 rtems/testsuites/aclocal/rtems-top.m4:1.15
--- rtems/testsuites/aclocal/rtems-top.m4:1.14 Tue Jul 1 21:19:10 2008
+++ rtems/testsuites/aclocal/rtems-top.m4 Fri Mar 4 10:14:42 2011
@@ -17,7 +17,7 @@
AC_CHECK_PROGS(MAKE, gmake make)
AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
-AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API])
+AC_PREFIX_DEFAULT([/opt/rtems-][_RTEMS_API])
## HACK to allow gnu-make conditionals in automake-Makefiles.
ENDIF=endif
diff -u rtems/testsuites/aclocal/version.m4:1.15 rtems/testsuites/aclocal/version.m4:1.16
--- rtems/testsuites/aclocal/version.m4:1.15 Mon Jun 7 14:32:44 2010
+++ rtems/testsuites/aclocal/version.m4 Fri Mar 4 10:14:42 2011
@@ -1,4 +1,4 @@
AC_DEFUN([RTEMS_VERSIONING],
m4_define([_RTEMS_VERSION],[4.10.99.0]))
-m4_define([RTEMS_API],[4.11])
+m4_define([_RTEMS_API],[4.11])
*ralf*:
2011-03-04 Ralf Corsépius <ralf.corsepius at rtems.org>
* aclocal/rtems-top.m4, aclocal/version.m4:
Rename RTEMS_API into _RTEMS_API.
M 1.545 c/src/ChangeLog
M 1.15 c/src/aclocal/rtems-top.m4
M 1.16 c/src/aclocal/version.m4
M 1.2762 cpukit/ChangeLog
M 1.23 cpukit/aclocal/rtems-top.m4
M 1.27 cpukit/aclocal/version.m4
diff -u rtems/c/src/ChangeLog:1.544 rtems/c/src/ChangeLog:1.545
--- rtems/c/src/ChangeLog:1.544 Fri Feb 25 00:13:14 2011
+++ rtems/c/src/ChangeLog Fri Mar 4 10:17:27 2011
@@ -1,3 +1,8 @@
+2011-03-04 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * aclocal/rtems-top.m4, aclocal/version.m4:
+ Rename RTEMS_API into _RTEMS_API.
+
2011-02-25 Ralf Corsépius <ralf.corsepius at rtems.org>
* aclocal/canonical-target-name.m4:
diff -u rtems/c/src/aclocal/rtems-top.m4:1.14 rtems/c/src/aclocal/rtems-top.m4:1.15
--- rtems/c/src/aclocal/rtems-top.m4:1.14 Sun Jun 29 01:27:06 2008
+++ rtems/c/src/aclocal/rtems-top.m4 Fri Mar 4 10:17:27 2011
@@ -17,7 +17,7 @@
AC_CHECK_PROGS(MAKE, gmake make)
AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
-AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API])
+AC_PREFIX_DEFAULT([/opt/rtems-][_RTEMS_API])
AC_SUBST([RTEMS_TOPdir],["$1"])
diff -u rtems/c/src/aclocal/version.m4:1.15 rtems/c/src/aclocal/version.m4:1.16
--- rtems/c/src/aclocal/version.m4:1.15 Mon Jun 7 14:33:09 2010
+++ rtems/c/src/aclocal/version.m4 Fri Mar 4 10:17:27 2011
@@ -1,4 +1,4 @@
AC_DEFUN([RTEMS_VERSIONING],
m4_define([_RTEMS_VERSION],[4.10.99.0]))
-m4_define([RTEMS_API],[4.11])
+m4_define([_RTEMS_API],[4.11])
diff -u rtems/cpukit/ChangeLog:1.2761 rtems/cpukit/ChangeLog:1.2762
--- rtems/cpukit/ChangeLog:1.2761 Thu Mar 3 10:01:34 2011
+++ rtems/cpukit/ChangeLog Fri Mar 4 10:16:15 2011
@@ -1,3 +1,8 @@
+2011-03-04 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * aclocal/rtems-top.m4, aclocal/version.m4:
+ Rename RTEMS_API into _RTEMS_API.
+
2011-03-03 Joel Sherrill <joel.sherrill at oarcorp.com>
* sapi/include/confdefs.h: Typos.
diff -u rtems/cpukit/aclocal/rtems-top.m4:1.22 rtems/cpukit/aclocal/rtems-top.m4:1.23
--- rtems/cpukit/aclocal/rtems-top.m4:1.22 Mon Jun 30 03:54:41 2008
+++ rtems/cpukit/aclocal/rtems-top.m4 Fri Mar 4 10:16:16 2011
@@ -17,7 +17,7 @@
AC_CHECK_PROGS(MAKE, gmake make)
AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
-AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API])
+AC_PREFIX_DEFAULT([/opt/rtems-][_RTEMS_API])
AC_SUBST([RTEMS_TOPdir],["$1"])
diff -u rtems/cpukit/aclocal/version.m4:1.26 rtems/cpukit/aclocal/version.m4:1.27
--- rtems/cpukit/aclocal/version.m4:1.26 Mon Jun 7 14:33:37 2010
+++ rtems/cpukit/aclocal/version.m4 Fri Mar 4 10:16:17 2011
@@ -1,4 +1,4 @@
AC_DEFUN([RTEMS_VERSIONING],
m4_define([_RTEMS_VERSION],[4.10.99.0]))
-m4_define([RTEMS_API],[4.11])
+m4_define([_RTEMS_API],[4.11])
*ralf*:
2011-03-04 Ralf Corsépius <ralf.corsepius at rtems.org>
* configure.ac: Rename RTEMS_API into _RTEMS_API.
M 1.86 c/src/ada-tests/ChangeLog
M 1.27 c/src/ada-tests/configure.ac
M 1.300 doc/ChangeLog
M 1.34 doc/configure.ac
diff -u rtems/c/src/ada-tests/ChangeLog:1.85 rtems/c/src/ada-tests/ChangeLog:1.86
--- rtems/c/src/ada-tests/ChangeLog:1.85 Wed Feb 2 08:57:40 2011
+++ rtems/c/src/ada-tests/ChangeLog Fri Mar 4 10:18:35 2011
@@ -1,3 +1,7 @@
+2011-03-04 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * configure.ac: Rename RTEMS_API into _RTEMS_API.
+
2011-02-02 Ralf Corsépius <ralf.corsepius at rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.
diff -u rtems/c/src/ada-tests/configure.ac:1.26 rtems/c/src/ada-tests/configure.ac:1.27
--- rtems/c/src/ada-tests/configure.ac:1.26 Wed Feb 2 08:57:40 2011
+++ rtems/c/src/ada-tests/configure.ac Fri Mar 4 10:18:41 2011
@@ -36,7 +36,7 @@
RTEMS_PROJECT_ROOT
-AC_SUBST([rtems_ada_testsdir],["\$(libdir)/rtems-][RTEMS_API][/ada-tests"])
+AC_SUBST([rtems_ada_testsdir],["\$(libdir)/rtems-][_RTEMS_API][/ada-tests"])
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile])
diff -u rtems/doc/ChangeLog:1.299 rtems/doc/ChangeLog:1.300
--- rtems/doc/ChangeLog:1.299 Fri Mar 4 09:34:10 2011
+++ rtems/doc/ChangeLog Fri Mar 4 10:20:41 2011
@@ -1,3 +1,7 @@
+2011-03-04 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * configure.ac: Rename RTEMS_API into _RTEMS_API.
+
2011-03-04 Joel Sherrill <joel.sherrilL at OARcorp.com>
PR 1744/doc
diff -u rtems/doc/configure.ac:1.33 rtems/doc/configure.ac:1.34
--- rtems/doc/configure.ac:1.33 Wed Feb 2 09:01:16 2011
+++ rtems/doc/configure.ac Fri Mar 4 10:20:41 2011
@@ -143,7 +143,7 @@
test -d common || mkdir common
cat << EOF > common/rtems.sed~
:t
-s/@RTEMSAPI@/RTEMS_API/;t t
+s/@RTEMSAPI@/_RTEMS_API/;t t
s, at RTEMSPREFIX@,$prefix,;t t
s, at RTEMSRPMPREFIX@,$rpmprefix,;t t
EOF
*ralf*:
2011-03-04 Ralf Corsépius <ralf.corsepius at rtems.org>
* Makefile.maint, aclocal/rpm.m4, aclocal/rtems-top.m4,
aclocal/version.m4: Rename RTEMS_API into _RTEMS_API.
M 1.392 ChangeLog
M 1.30 Makefile.maint
M 1.3 aclocal/rpm.m4
M 1.25 aclocal/rtems-top.m4
M 1.30 aclocal/version.m4
diff -u rtems/ChangeLog:1.391 rtems/ChangeLog:1.392
--- rtems/ChangeLog:1.391 Thu Mar 3 10:07:17 2011
+++ rtems/ChangeLog Fri Mar 4 10:22:17 2011
@@ -1,3 +1,8 @@
+2011-03-04 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * Makefile.maint, aclocal/rpm.m4, aclocal/rtems-top.m4,
+ aclocal/version.m4: Rename RTEMS_API into _RTEMS_API.
+
2011-03-03 Ralf Corsépius <ralf.corsepius at rtems.org>
* bootstrap: Add -g option.
diff -u rtems/Makefile.maint:1.29 rtems/Makefile.maint:1.30
--- rtems/Makefile.maint:1.29 Mon Jun 21 17:55:56 2010
+++ rtems/Makefile.maint Fri Mar 4 10:22:17 2011
@@ -145,7 +145,7 @@
api="$$v.$$(($$r + 1))"; \
echo "New branch release: $$version"; \
sed -i -e "s|\[_RTEMS_VERSION\],\[.*\]|\[_RTEMS_VERSION\],\[$$version\]|" \
- -e "s|\[RTEMS_API\],\[.*\]|\[RTEMS_API\],\[$$api\]|" \
+ -e "s|\[_RTEMS_API\],\[.*\]|\[_RTEMS_API\],\[$$api\]|" \
$(VERSION_FILES); \
sed -i -e "s,\(^RTEMS Version\).*,\1 $$version," VERSION
diff -u rtems/aclocal/rpm.m4:1.2 rtems/aclocal/rpm.m4:1.3
--- rtems/aclocal/rpm.m4:1.2 Mon Feb 2 22:56:26 2004
+++ rtems/aclocal/rpm.m4 Fri Mar 4 10:22:17 2011
@@ -2,19 +2,19 @@
AC_ARG_ENABLE([rpmprefix],
[ --enable-rpmprefix=<rpmprefix> prefix rpms],
[case $enable_rpmprefix in
-yes ) rpmprefix="rtems-"]RTEMS_API["-";;
+yes ) rpmprefix="rtems-"]_RTEMS_API["-";;
no ) rpmprefix="%{nil}";;
* ) AS_IF([test -z "$enable_rpmprefix"],
[rpmprefix="%{nil}"],
[rpmprefix="$enable_rpmprefix"]);;
esac],
-[rpmprefix="rtems-"]RTEMS_API["-"])
+[rpmprefix="rtems-"]_RTEMS_API["-"])
AC_ARG_ENABLE([osversions],
[ --enable-osversions whether to use version numbers in os-tripples],
[case $enable_osversions in
-yes ) osversion=RTEMS_API;;
+yes ) osversion=_RTEMS_API;;
* ) osversion=;;
esac],
-[osversion=RTEMS_API])
+[osversion=_RTEMS_API])
])
diff -u rtems/aclocal/rtems-top.m4:1.24 rtems/aclocal/rtems-top.m4:1.25
--- rtems/aclocal/rtems-top.m4:1.24 Sun Jul 27 01:47:01 2008
+++ rtems/aclocal/rtems-top.m4 Fri Mar 4 10:22:17 2011
@@ -16,7 +16,7 @@
AC_CHECK_PROGS(MAKE, gmake make)
AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
-AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API])
+AC_PREFIX_DEFAULT([/opt/rtems-][_RTEMS_API])
RTEMS_TOPdir="$1";
AC_SUBST(RTEMS_TOPdir)
diff -u rtems/aclocal/version.m4:1.29 rtems/aclocal/version.m4:1.30
--- rtems/aclocal/version.m4:1.29 Mon Jun 7 14:33:53 2010
+++ rtems/aclocal/version.m4 Fri Mar 4 10:22:17 2011
@@ -1,4 +1,4 @@
AC_DEFUN([RTEMS_VERSIONING],
m4_define([_RTEMS_VERSION],[4.10.99.0]))
-m4_define([RTEMS_API],[4.11])
+m4_define([_RTEMS_API],[4.11])
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110304/939528db/attachment-0001.html>
More information about the vc
mailing list