[rtems commit] preinstall: Regenerated files differ from the repo.
Hesham Moustafa
heshamelmatary at gmail.com
Thu Aug 28 14:30:06 UTC 2014
On Thu, Aug 28, 2014 at 4:25 PM, Joel Sherrill
<joel.sherrill at 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.sherrill at 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.sherrill at 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 <chrisj at 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
>>>>>> vc at rtems.org
>>>>>> http://lists.rtems.org/mailman/listinfo/vc
>>>>> --
>>>>> Joel Sherrill, Ph.D. Director of Research & Development
>>>>> joel.sherrill at OARcorp.com On-Line Applications Research
>>>>> Ask me about RTEMS: a free RTOS Huntsville AL 35805
>>>>> Support Available (256) 722-9985
>>>>>
>>>>> _______________________________________________
>>>>> devel mailing list
>>>>> devel at rtems.org
>>>>> http://lists.rtems.org/mailman/listinfo/devel
>>> --
>>> Joel Sherrill, Ph.D. Director of Research & Development
>>> joel.sherrill at OARcorp.com On-Line Applications Research
>>> Ask me about RTEMS: a free RTOS Huntsville AL 35805
>>> Support Available (256) 722-9985
>>>
>
> --
> Joel Sherrill, Ph.D. Director of Research & Development
> joel.sherrill at OARcorp.com On-Line Applications Research
> Ask me about RTEMS: a free RTOS Huntsville AL 35805
> Support Available (256) 722-9985
>
More information about the devel
mailing list