Re: [rtems commit] preinstall: Regenerated files differ from the repo.
On 08/29/2014 04:58 AM, Chris Johns wrote: This is a patch of the preinstall.am files. I have tested it on fedora 20 and OSX. If this is ok I will push to the repo. OK with me. I'd suspect this to happen due to perl's hash algorithm having changed, AFAICT (I am also Fedora perl co-maintainer), it is causing different result orders depending on the perl versions being used. Ralf ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: [rtems commit] preinstall: Regenerated files differ from the repo.
On Fri, Aug 29, 2014 at 3:45 AM, Chris Johns chr...@rtems.org wrote: On 29/08/2014 12:30 am, Hesham Moustafa wrote: On Thu, Aug 28, 2014 at 4:25 PM, Joel Sherrill joel.sherr...@oarcorp.com wrote: On 8/28/2014 9:20 AM, Hesham Moustafa wrote: On Thu, Aug 28, 2014 at 4:12 PM, Joel Sherrill joel.sherr...@oarcorp.com wrote: Chris should be on a Mac. I am on Fedora 20. I am on Fedora 20 too $ autoconf --version autoconf (GNU Autoconf) 2.69 The RSB version? 32 or 64 bit? RTEMS Source Builder - Set Builder, v0.4.0 Python: 2.7.5 (default, Jun 25 2014, 10:19:55) [GCC 4.8.2 20131212 (Red Hat 4.8.2-7)] Fedora 20 - 64 bit Does the attached patch fix the problem ? I applied the attached patch (for both HEAD, and before Joel's preinstall.am commit), and then run bootstrap -p, the same behavior occurs for me which is EVERY preinstall.am file is modified. For me this patch gives the same output before Joel's patch (which may need to be reverted). Chris ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: [rtems commit] preinstall: Regenerated files differ from the repo.
On 08/29/2014 10:55 AM, Hesham Moustafa wrote: Does the attached patch fix the problem ? I applied the attached patch (for both HEAD, and before Joel's preinstall.am commit), and then run bootstrap -p, the same behavior occurs for me which is EVERY preinstall.am file is modified. Which OS are you on, which version of perl is it and which LOCALE are you using? Ralf ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: [rtems commit] preinstall: Regenerated files differ from the repo.
On Fri, Aug 29, 2014 at 12:58 PM, Ralf Corsepius ralf.corsep...@rtems.org wrote: On 08/29/2014 10:55 AM, Hesham Moustafa wrote: Does the attached patch fix the problem ? I applied the attached patch (for both HEAD, and before Joel's preinstall.am commit), and then run bootstrap -p, the same behavior occurs for me which is EVERY preinstall.am file is modified. Which OS are you on, which version of perl is it and which LOCALE are you using? $ perl --version This is perl 5, version 18, subversion 2 (v5.18.2) built for x86_64-linux-thread-multi (with 19 registered patches, see perl -V for more detail) $ perl -V Summary of my perl5 (revision 5 version 18 subversion 2) $ locale --version locale (GNU libc) 2.18 Copyright (C) 2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Written by Ulrich Drepper. Ralf ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: [rtems commit] preinstall: Regenerated files differ from the repo.
On 08/29/2014 01:11 PM, Hesham Moustafa wrote: On Fri, Aug 29, 2014 at 12:58 PM, Ralf Corsepius ralf.corsep...@rtems.org wrote: On 08/29/2014 10:55 AM, Hesham Moustafa wrote: Does the attached patch fix the problem ? I applied the attached patch (for both HEAD, and before Joel's preinstall.am commit), and then run bootstrap -p, the same behavior occurs for me which is EVERY preinstall.am file is modified. Which OS are you on, which version of perl is it and which LOCALE are you using? You didn't answer my questions. Which OS is it? Ubuntu, Debian, CentOS, Windows, *BSD? Locale: What are the environment variables specifying your language set to (e.g. what does echo $LANG return)? Your name sounds Arab, so it would seem likely to me you are using some Arab locale. Also, it's quite possible, the files Chris has generated are affected, because he prefers to use exotic OSes. Ralf ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: [rtems commit] preinstall: Regenerated files differ from the repo.
Hi, On Fri, Aug 29, 2014 at 2:55 PM, Ralf Corsepius ralf.corsep...@rtems.org wrote: On 08/29/2014 01:11 PM, Hesham Moustafa wrote: On Fri, Aug 29, 2014 at 12:58 PM, Ralf Corsepius ralf.corsep...@rtems.org wrote: On 08/29/2014 10:55 AM, Hesham Moustafa wrote: Does the attached patch fix the problem ? I applied the attached patch (for both HEAD, and before Joel's preinstall.am commit), and then run bootstrap -p, the same behavior occurs for me which is EVERY preinstall.am file is modified. Which OS are you on, which version of perl is it and which LOCALE are you using? You didn't answer my questions. Which OS is it? Ubuntu, Debian, CentOS, Windows, *BSD? Oh, sorry, I though you read my reply to Joel in which I mentioned I am using fedora 20 - 64 bit Locale: What are the environment variables specifying your language set to (e.g. what does echo $LANG return)? Your name sounds Arab, so it would seem likely to me you are using some Arab locale. $ echo $LANG en_US.utf8 Also, it's quite possible, the files Chris has generated are affected, because he prefers to use exotic OSes. Ralf ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: [rtems commit] preinstall: Regenerated files differ from the repo.
When I bootstrap -p from the top, it looks like every other preinstall.am in the tree has this difference. Big commit following to deal with this. --joel On 8/27/2014 7:54 PM, Chris Johns wrote: Module:rtems Branch:master Commit:5826a1b284450778be4b73276560a48ccd0cd9a7 Changeset: http://git.rtems.org/rtems/commit/?id=5826a1b284450778be4b73276560a48ccd0cd9a7 Author:Chris Johns chr...@rtems.org Date: Thu Aug 28 10:08:00 2014 +1000 preinstall: Regenerated files differ from the repo. --- .../lib/libbsp/arm/altera-cyclone-v/preinstall.am | 12 ++-- c/src/lib/libbsp/or1k/or1ksim/preinstall.am| 13 +++-- c/src/lib/libbsp/or1k/preinstall.am|1 + c/src/lib/libcpu/or1k/preinstall.am|7 --- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/preinstall.am b/c/src/lib/libbsp/arm/altera-cyclone-v/preinstall.am index 768c01d..5b6b9fd 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/preinstall.am +++ b/c/src/lib/libbsp/arm/altera-cyclone-v/preinstall.am @@ -5,18 +5,18 @@ $(srcdir)/preinstall.am: Makefile.am $(AMPOLISH3) $(srcdir)/Makefile.am $(srcdir)/preinstall.am endif -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) - PREINSTALL_DIRS = DISTCLEANFILES += $(PREINSTALL_DIRS) all-local: $(TMPINSTALL_FILES) TMPINSTALL_FILES = -CLEANFILES += $(TMPINSTALL_FILES) +CLEANFILES = $(TMPINSTALL_FILES) + +all-am: $(PREINSTALL_FILES) + +PREINSTALL_FILES = +CLEANFILES += $(PREINSTALL_FILES) $(PROJECT_LIB)/$(dirstamp): @$(MKDIR_P) $(PROJECT_LIB) diff --git a/c/src/lib/libbsp/or1k/or1ksim/preinstall.am b/c/src/lib/libbsp/or1k/or1ksim/preinstall.am index cbdf3df..2569864 100644 --- a/c/src/lib/libbsp/or1k/or1ksim/preinstall.am +++ b/c/src/lib/libbsp/or1k/or1ksim/preinstall.am @@ -8,15 +8,15 @@ endif PREINSTALL_DIRS = DISTCLEANFILES += $(PREINSTALL_DIRS) -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) - all-local: $(TMPINSTALL_FILES) TMPINSTALL_FILES = -CLEANFILES += $(TMPINSTALL_FILES) +CLEANFILES = $(TMPINSTALL_FILES) + +all-am: $(PREINSTALL_FILES) + +PREINSTALL_FILES = +CLEANFILES += $(PREINSTALL_FILES) $(PROJECT_LIB)/$(dirstamp): @$(MKDIR_P) $(PROJECT_LIB) @@ -117,3 +117,4 @@ TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds $(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $ $(PROJECT_LIB)/linkcmds.base TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base + diff --git a/c/src/lib/libbsp/or1k/preinstall.am b/c/src/lib/libbsp/or1k/preinstall.am index 1143c2e..dba6cc4 100644 --- a/c/src/lib/libbsp/or1k/preinstall.am +++ b/c/src/lib/libbsp/or1k/preinstall.am @@ -4,3 +4,4 @@ if AMPOLISH3 $(srcdir)/preinstall.am: Makefile.am $(AMPOLISH3) $(srcdir)/Makefile.am $(srcdir)/preinstall.am endif + diff --git a/c/src/lib/libcpu/or1k/preinstall.am b/c/src/lib/libcpu/or1k/preinstall.am index 9670596..ee9d0da 100644 --- a/c/src/lib/libcpu/or1k/preinstall.am +++ b/c/src/lib/libcpu/or1k/preinstall.am @@ -5,14 +5,14 @@ $(srcdir)/preinstall.am: Makefile.am $(AMPOLISH3) $(srcdir)/Makefile.am $(srcdir)/preinstall.am endif +PREINSTALL_DIRS = +DISTCLEANFILES += $(PREINSTALL_DIRS) + all-am: $(PREINSTALL_FILES) PREINSTALL_FILES = CLEANFILES += $(PREINSTALL_FILES) -PREINSTALL_DIRS = -DISTCLEANFILES += $(PREINSTALL_DIRS) - $(PROJECT_INCLUDE)/libcpu/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu @: $(PROJECT_INCLUDE)/libcpu/$(dirstamp) @@ -21,3 +21,4 @@ PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(PROJECT_INCLUDE)/libcpu/cache.h: ../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $ $(PROJECT_INCLUDE)/libcpu/cache.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h + ___ vc mailing list v...@rtems.org http://lists.rtems.org/mailman/listinfo/vc -- Joel Sherrill, Ph.D. Director of Research Development joel.sherr...@oarcorp.comOn-Line Applications Research Ask me about RTEMS: a free RTOS Huntsville AL 35805 Support Available(256) 722-9985 ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: [rtems commit] preinstall: Regenerated files differ from the repo.
On Thu, Aug 28, 2014 at 4:25 PM, Joel Sherrill joel.sherr...@oarcorp.com wrote: On 8/28/2014 9:20 AM, Hesham Moustafa wrote: On Thu, Aug 28, 2014 at 4:12 PM, Joel Sherrill joel.sherr...@oarcorp.com wrote: Chris should be on a Mac. I am on Fedora 20. I am on Fedora 20 too $ autoconf --version autoconf (GNU Autoconf) 2.69 The RSB version? 32 or 64 bit? RTEMS Source Builder - Set Builder, v0.4.0 Python: 2.7.5 (default, Jun 25 2014, 10:19:55) [GCC 4.8.2 20131212 (Red Hat 4.8.2-7)] Fedora 20 - 64 bit $ autoconf --version autoconf (GNU Autoconf) 2.69 Double checking, mine is the one built by the RSB. Checking on a CentOS 6.x computer with the RSB built autoconf, it is different. *($)$#$*()*(^! That shouldn't happen. :( --joel On 8/28/2014 9:07 AM, Hesham Moustafa wrote: Hi, On Thu, Aug 28, 2014 at 3:44 PM, Joel Sherrill joel.sherr...@oarcorp.com wrote: When I bootstrap -p from the top, it looks like every other preinstall.am in the tree has this difference. Big commit following to deal with this. Is this host and/or automake version dependent? Because when I run bootsrap -p, EVERY preinstall.am file differs from the repo. A diff patch is attached. --joel On 8/27/2014 7:54 PM, Chris Johns wrote: Module:rtems Branch:master Commit:5826a1b284450778be4b73276560a48ccd0cd9a7 Changeset: http://git.rtems.org/rtems/commit/?id=5826a1b284450778be4b73276560a48ccd0cd9a7 Author:Chris Johns chr...@rtems.org Date: Thu Aug 28 10:08:00 2014 +1000 preinstall: Regenerated files differ from the repo. --- .../lib/libbsp/arm/altera-cyclone-v/preinstall.am | 12 ++-- c/src/lib/libbsp/or1k/or1ksim/preinstall.am| 13 +++-- c/src/lib/libbsp/or1k/preinstall.am|1 + c/src/lib/libcpu/or1k/preinstall.am|7 --- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/preinstall.am b/c/src/lib/libbsp/arm/altera-cyclone-v/preinstall.am index 768c01d..5b6b9fd 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/preinstall.am +++ b/c/src/lib/libbsp/arm/altera-cyclone-v/preinstall.am @@ -5,18 +5,18 @@ $(srcdir)/preinstall.am: Makefile.am $(AMPOLISH3) $(srcdir)/Makefile.am $(srcdir)/preinstall.am endif -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) - PREINSTALL_DIRS = DISTCLEANFILES += $(PREINSTALL_DIRS) all-local: $(TMPINSTALL_FILES) TMPINSTALL_FILES = -CLEANFILES += $(TMPINSTALL_FILES) +CLEANFILES = $(TMPINSTALL_FILES) + +all-am: $(PREINSTALL_FILES) + +PREINSTALL_FILES = +CLEANFILES += $(PREINSTALL_FILES) $(PROJECT_LIB)/$(dirstamp): @$(MKDIR_P) $(PROJECT_LIB) diff --git a/c/src/lib/libbsp/or1k/or1ksim/preinstall.am b/c/src/lib/libbsp/or1k/or1ksim/preinstall.am index cbdf3df..2569864 100644 --- a/c/src/lib/libbsp/or1k/or1ksim/preinstall.am +++ b/c/src/lib/libbsp/or1k/or1ksim/preinstall.am @@ -8,15 +8,15 @@ endif PREINSTALL_DIRS = DISTCLEANFILES += $(PREINSTALL_DIRS) -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) - all-local: $(TMPINSTALL_FILES) TMPINSTALL_FILES = -CLEANFILES += $(TMPINSTALL_FILES) +CLEANFILES = $(TMPINSTALL_FILES) + +all-am: $(PREINSTALL_FILES) + +PREINSTALL_FILES = +CLEANFILES += $(PREINSTALL_FILES) $(PROJECT_LIB)/$(dirstamp): @$(MKDIR_P) $(PROJECT_LIB) @@ -117,3 +117,4 @@ TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds $(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $ $(PROJECT_LIB)/linkcmds.base TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base + diff --git a/c/src/lib/libbsp/or1k/preinstall.am b/c/src/lib/libbsp/or1k/preinstall.am index 1143c2e..dba6cc4 100644 --- a/c/src/lib/libbsp/or1k/preinstall.am +++ b/c/src/lib/libbsp/or1k/preinstall.am @@ -4,3 +4,4 @@ if AMPOLISH3 $(srcdir)/preinstall.am: Makefile.am $(AMPOLISH3) $(srcdir)/Makefile.am $(srcdir)/preinstall.am endif + diff --git a/c/src/lib/libcpu/or1k/preinstall.am b/c/src/lib/libcpu/or1k/preinstall.am index 9670596..ee9d0da 100644 --- a/c/src/lib/libcpu/or1k/preinstall.am +++ b/c/src/lib/libcpu/or1k/preinstall.am @@ -5,14 +5,14 @@ $(srcdir)/preinstall.am: Makefile.am $(AMPOLISH3) $(srcdir)/Makefile.am $(srcdir)/preinstall.am endif +PREINSTALL_DIRS = +DISTCLEANFILES += $(PREINSTALL_DIRS) + all-am: $(PREINSTALL_FILES) PREINSTALL_FILES = CLEANFILES += $(PREINSTALL_FILES) -PREINSTALL_DIRS = -DISTCLEANFILES += $(PREINSTALL_DIRS) - $(PROJECT_INCLUDE)/libcpu/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu @: $(PROJECT_INCLUDE)/libcpu/$(dirstamp) @@ -21,3 +21,4 @@ PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(PROJECT_INCLUDE)/libcpu/cache.h: ../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $
Re: [rtems commit] preinstall: Regenerated files differ from the repo.
On 29/08/2014 12:30 am, Hesham Moustafa wrote:
On Thu, Aug 28, 2014 at 4:25 PM, Joel Sherrill
joel.sherr...@oarcorp.com wrote:
On 8/28/2014 9:20 AM, Hesham Moustafa wrote:
On Thu, Aug 28, 2014 at 4:12 PM, Joel Sherrill
joel.sherr...@oarcorp.com wrote:
Chris should be on a Mac. I am on Fedora 20.
I am on Fedora 20 too
$ autoconf --version
autoconf (GNU Autoconf) 2.69
The RSB version? 32 or 64 bit?
RTEMS Source Builder - Set Builder, v0.4.0
Python: 2.7.5 (default, Jun 25 2014, 10:19:55) [GCC 4.8.2 20131212
(Red Hat 4.8.2-7)]
Fedora 20 - 64 bit
Does the attached patch fix the problem ?
For me this patch gives the same output before Joel's patch (which may
need to be reverted).
Chris
From 93d0ddd41b6eec7e250eaad1f799cab6cdfb27f8 Mon Sep 17 00:00:00 2001
From: Chris Johns chr...@rtems.org
Date: Fri, 29 Aug 2014 11:39:29 +1000
Subject: [PATCH] bootstrap: Sort the various hash keys used in generating
preinstall.am.
Something must have changed in perl to change the way the keys are
ordered by default.
---
ampolish3 | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ampolish3 b/ampolish3
index 69bbf7b..aaa9757 100755
--- a/ampolish3
+++ b/ampolish3
@@ -9,7 +9,7 @@
#
# Usage: ampolish3 Makefile.am preinstall.am
#
-# Reads a Makefile.am from stdin and writes corresponding
+# Reads a Makefile.am from stdin and writes corresponding
# pre/tmpinstall rules to stdout.
sub replace($);
@@ -85,7 +85,7 @@ foreach my $l ( @buffer1 ) {
push @buffer2, $l;
$dirmap{\$\($1\)} = replace($2);
} elsif ( $l =~ /^\s*noinst_(.*)\s*[\+]?\=(.*)$/o )
- {
+ {
#ignore: noinst_* are not relevant here.
} elsif ( $l =~
/^\s*(nodist_|dist_|)(project_|)([a-zA-Z0-9_]+)_(HEADERS|LIBRARIES|DATA|SCRIPTS|PROGRAMS)\s*([\+]?\=)\s*(.*)/o
)
{
@@ -217,7 +217,7 @@ $output .= \$(srcdir)/preinstall.am: Makefile.am\n;
$output .= \t\$(AMPOLISH3) \$(srcdir)/Makefile.am
\$(srcdir)/preinstall.am\n;
$output .= endif\n\n;
-foreach my $k ( keys %seen )
+foreach my $k ( sort keys %seen )
{
if ( $k =~ /PREINSTALL_FILES/o ) {
$output .= all-am: \$(PREINSTALL_FILES)\n\n;
@@ -258,7 +258,7 @@ exit 0;
sub replace($)
{
my ($v) = @_;
- foreach my $i ( keys %dirmap )
+ foreach my $i ( sort keys %dirmap )
{
$v =~ s/\Q$i/$dirmap{$i}/g;
}
--
1.8.5.2 (Apple Git-48)
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
