[LinuxBIOS] [PATCH] Rename "stream" to "payload"

[Ed Swierk]

After our discussion in the "Download payload from console via XMODEM"
thread, I posted these patches. There was no response, possibly due to
the LinuxBIOS conference.

Here they are again in case they were overlooked the first time
around, in increasing order of invasiveness:

The first patch renames CONFIG_COMPRESSED_ROM_STREAM* and
CONFIG_PRECOMPRESSED_ROM_STREAM.

The second one renames the other CONFIG_*_STREAM options.

The third one goes whole-hog and replaces every remaining instance of
"stream" with "payload" in code, filenames and directory names. The
diff is pretty huge due to the file renaming.

--Ed

[Stefan Reinauer]

* Ed Swierk  [061023 23:15]:
> After our discussion in the "Download payload from console via XMODEM"
> thread, I posted these patches. There was no response, possibly due to
> the LinuxBIOS conference.
>
> Here they are again in case they were overlooked the first time
> around, in increasing order of invasiveness:
>
> The first patch renames CONFIG_COMPRESSED_ROM_STREAM* and
> CONFIG_PRECOMPRESSED_ROM_STREAM.
>
> The second one renames the other CONFIG_*_STREAM options.
>
> The third one goes whole-hog and replaces every remaining instance of
> "stream" with "payload" in code, filenames and directory names. The
> diff is pretty huge due to the file renaming.

Acked-by: Stefan Reinauer

[Uwe Hermann]

Hi,

On Mon, Oct 23, 2006 at 02:15:19PM -0700, Ed Swierk wrote:
> After our discussion in the "Download payload from console via XMODEM"
> thread, I posted these patches. There was no response, possibly due to
> the LinuxBIOS conference.
>
> Here they are again in case they were overlooked the first time
> around, in increasing order of invasiveness:
>
> The first patch renames CONFIG_COMPRESSED_ROM_STREAM* and
> CONFIG_PRECOMPRESSED_ROM_STREAM.
>
> The second one renames the other CONFIG_*_STREAM options.
>
> The third one goes whole-hog and replaces every remaining instance of
> "stream" with "payload" in code, filenames and directory names. The
> diff is pretty huge due to the file renaming.

The patches are nice, apply fine, but are not complete anymore. I ran
abuild and it failed in a few places:

-----------------------------------------------------------------------
Processing mainboard/Iwill/dk8_htx (i386: ok)
  Creating config file... ok
  Creating builddir...FAILED! Log excerpt:
Configuring TARGET Iwill_dk8_htx
Will place Makefile, crt0.S, etc. in Iwill_dk8_htx
===> ERROR: Can't use undefined option CONFIG_ROM_STREAM
Config-Iwill_dk8_htx.lb:0
src/mainboard/Iwill/dk8_htx/Options.lb:0

Processing mainboard/olpc/btest (i386: ok)
  Creating config file... ok
  Creating builddir...FAILED! Log excerpt:
Configuring TARGET olpc_btest
Will place Makefile, crt0.S, etc. in olpc_btest
===> ERROR: Can't use undefined option CONFIG_ROM_STREAM
Config-olpc_btest.lb:0
src/mainboard/olpc/btest/Options.lb:0

Processing mainboard/via/epia-m (i386: ok)
Using existing test target
[...]/LinuxBIOSv2/targets/via/epia-m/Config-abuild.lb
ok
  Creating builddir...FAILED! Log excerpt:
  (@231)  NUM  =  '1'
  (@233)  OPTION  =  'option'
  (@240)  ID  =  'CONFIG_ROM_'
===> ERROR: Could not parse file
Config-via_epia-m.lb:0
-----------------------------------------------------------------------

The Iwill/dk8_htx and olpc/btest are probably new and are simply not
contained in your patch. Not sure what breaks the via/epia-m.

HTH, Uwe.

[yhlu]

I don't like linuxbios_rename_payload_code.patch

NAcked-by: Yinghai Lu

[Peter Stuge]

On Tue, Oct 24, 2006 at 01:09:45AM -0700, yhlu wrote:
> I don't like linuxbios_rename_payload_code.patch

Why not?

Isn't the stream always the payload?

Thanks!

//Peter

[Richard Smith]

Ed Swierk wrote:
> The third one goes whole-hog and replaces every remaining instance of
> "stream" with "payload" in code, filenames and directory names. The
> diff is pretty huge due to the file renaming.

I've been saying we should do this for years...  But never got traction.

+1 by me.  I've not had a chance to review the patch yet however so I'm 
not Acking yet but I like the concept.
> I don't like linuxbios_rename_payload_code.patch
>
> NAcked-by: Yinghai Lu

What's your objection?

[yhlu]

You will lose the revision history to the dir and files.

YH

[Ed Swierk]

On 10/24/06, yhlu  wrote:
> You will lose the revision history to the dir and files.

That's true if the patch were applied as is. I will split it into a
patch plus a sequence of svn move operations so that revision history
is preserved.

--Ed

[Richard Smith]

On 10/24/06, Ed Swierk  wrote:
> On 10/24/06, yhlu  wrote:
> > You will lose the revision history to the dir and files.
>
> That's true if the patch were applied as is. I will split it into a
> patch plus a sequence of svn move operations so that revision history
> is preserved.

You can't generate a diff with svn moves.  Someone with commit access
will have to do it.

[Stefan Reinauer]

* Richard Smith  [061024 17:53]:
> On 10/24/06, Ed Swierk  wrote:
> > On 10/24/06, yhlu  wrote:
> > > You will lose the revision history to the dir and files.
> >
> > That's true if the patch were applied as is. I will split it into a
> > patch plus a sequence of svn move operations so that revision history
> > is preserved.
>
> You can't generate a diff with svn moves.  Someone with commit access
> will have to do it.

can we put a wrapper script in linuxbios that takes care of this?
(or fix svn diff and add an svn patch command)

Stefan

[Ed Swierk]

Here is a new set of patches against the head revision. I also split
out the move/rename operations, so please apply as follows:

apply linuxbios-rename-compressed-payload-options.patch
apply linuxbios-rename-other-payload-options.patch
mv src/include/stream src/include/payload
mv src/stream src/payload
mv src/payload/fs_stream.c src/payload/fs_payload.c
mv src/payload/ide_stream.c src/payload/ide_payload.c
mv src/payload/rom_stream.c src/payload/rom_payload.c
mv src/payload/serial_stream.c src/payload/serial_payload.c
apply linuxbios-rename-payload-code.patch

Thanks!

--Ed

[Uwe Hermann]

Hi,

On Tue, Oct 24, 2006 at 04:05:08PM -0700, Ed Swierk wrote:
> Here is a new set of patches against the head revision. I also split
> out the move/rename operations, so please apply as follows:
>
> apply linuxbios-rename-compressed-payload-options.patch
> apply linuxbios-rename-other-payload-options.patch
> mv src/include/stream src/include/payload
> mv src/stream src/payload
> mv src/payload/fs_stream.c src/payload/fs_payload.c
> mv src/payload/ide_stream.c src/payload/ide_payload.c
> mv src/payload/rom_stream.c src/payload/rom_payload.c
> mv src/payload/serial_stream.c src/payload/serial_payload.c
> apply linuxbios-rename-payload-code.patch

This still breaks the epia-m target:

--------------
Processing mainboard/via/epia-m (i386: ok)
Using existing test target
[...]/LinuxBIOSv2/targets/via/epia-m/Config-abuild.lb
ok
  Creating builddir...FAILED! Log excerpt:
  (@231)  NUM  =  '1'
  (@233)  OPTION  =  'option'
  (@240)  ID  =  'CONFIG_ROM_'
===> ERROR: Could not parse file
Config-via_epia-m.lb:0
--------------

Also, please sign-off your patches with
Signed-off-by: Ed Swierk

Other than that the patch looks fine.

Uwe.