[PATCH 1/2] jffs2: Do not use command line defines

Gedare Bloom gedare at rtems.org
Thu Mar 29 01:00:24 UTC 2018


On Wed, Mar 28, 2018 at 4:39 PM, Chris Johns <chrisj at rtems.org> wrote:
> On 28/03/2018 15:57, Sebastian Huber wrote:
>> On 28/03/18 01:01, Chris Johns wrote:
>>> On 27/03/2018 22:01, Sebastian Huber wrote:
>>>> Update #3375.
>>>> ---
>>>>   cpukit/libfs/Makefile.am                  | 2 --
>>>>   cpukit/libfs/src/jffs2/src/build.c        | 2 ++
>>>>   cpukit/libfs/src/jffs2/src/compat-crc32.c | 2 ++
>>>>   cpukit/libfs/src/jffs2/src/compr.c        | 2 ++
>>>>   cpukit/libfs/src/jffs2/src/compr_rtime.c  | 2 ++
>>>>   cpukit/libfs/src/jffs2/src/compr_rubin.c  | 2 ++
>>>>   cpukit/libfs/src/jffs2/src/compr_zlib.c   | 2 ++
>>>>   cpukit/libfs/src/jffs2/src/debug.c        | 2 ++
>>>>   cpukit/libfs/src/jffs2/src/dir-rtems.c    | 2 ++
>>>>   cpukit/libfs/src/jffs2/src/erase.c        | 2 ++
>>>>   cpukit/libfs/src/jffs2/src/flashio.c      | 2 ++
>>>>   cpukit/libfs/src/jffs2/src/fs-rtems.c     | 2 ++
>>>>   cpukit/libfs/src/jffs2/src/gc.c           | 2 ++
>>>>   cpukit/libfs/src/jffs2/src/jffs2-config.h | 2 ++
>>>>   cpukit/libfs/src/jffs2/src/malloc-rtems.c | 2 ++
>>>>   cpukit/libfs/src/jffs2/src/nodelist.c     | 2 ++
>>>>   cpukit/libfs/src/jffs2/src/nodemgmt.c     | 2 ++
>>>>   cpukit/libfs/src/jffs2/src/read.c         | 2 ++
>>>>   cpukit/libfs/src/jffs2/src/readinode.c    | 2 ++
>>>>   cpukit/libfs/src/jffs2/src/scan.c         | 2 ++
>>>>   cpukit/libfs/src/jffs2/src/write.c        | 2 ++
>>> Does this change diverge the code from the up stream?
>>
>> Yes, but this is not a problem. Merge conflicts from upstream are trivially to
>> resolve in this area.
>>
>
> Sure, so we allow this sort of change to 3rd party source?
>

I think that this is a reasonable way to solve a 3rd party source
problem. it might be better somehow to indicate that this is an
"rtems" file, e.g., jffs2-rtems-cfg.h -- that makes it easier to
remember we did it.

> Chris
>
> _______________________________________________
> devel mailing list
> devel at rtems.org
> http://lists.rtems.org/mailman/listinfo/devel



More information about the devel mailing list