[U-Boot] [GIT PULL] u-boot-mpc83xx fix

[U-Boot] [GIT PULL] u-boot-mpc83xx fix

[Kim Phillips]

Wolfgang Denk,

Please pull a fix for the mpc8313 usb setting:

The following changes since commit 9bb3b3d4406c1e388a99f6fb189147d6a06cc2cf:

  Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx (2010-05-30 21:44:07 +0200)

are available in the git repository at:

  git://git.denx.de/u-boot-mpc83xx.git master

Ron Madrid (1):
      Update SICRL_USBDR to reflect 4 different settings

 include/configs/MPC8313ERDB.h |    2 +-
 include/configs/SIMPC8313.h   |    2 +-
 include/mpc83xx.h             |    5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

Also, I've noticed main CHANGELOG updates are still being performed:

commit c4976807cbbabd281f45466ac5e47e5639bcc9cb
Author: Wolfgang Denk <wd@denx.de>
Date:   Wed May 26 23:51:22 2010 +0200

    Coding style cleanup, update CHANGELOG.
    
    Signed-off-by: Wolfgang Denk <wd@denx.de>

Any news wrt implementing a gitattributes based solution instead?:

http://lists.denx.de/pipermail/u-boot/2010-May/071118.html

Kim

[U-Boot] [GIT PULL] u-boot-mpc83xx fix

[Wolfgang Denk]

Dear Kim Phillips,

In message <20100607075435.9b556925.kim.phillips@freescale.com> you wrote:
> Wolfgang Denk,
> 
> Please pull a fix for the mpc8313 usb setting:
> 
> The following changes since commit 9bb3b3d4406c1e388a99f6fb189147d6a06cc2cf:
> 
>   Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx (2010-05-30 21:44:07 +0200)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-mpc83xx.git master
> 
> Ron Madrid (1):
>       Update SICRL_USBDR to reflect 4 different settings
> 
>  include/configs/MPC8313ERDB.h |    2 +-
>  include/configs/SIMPC8313.h   |    2 +-
>  include/mpc83xx.h             |    5 ++++-
>  3 files changed, 6 insertions(+), 3 deletions(-)

Applied, thanks.

> Also, I've noticed main CHANGELOG updates are still being performed:

Yes, as we don't have a new solution implemented yet.

> Any news wrt implementing a gitattributes based solution instead?:
> 
> http://lists.denx.de/pipermail/u-boot/2010-May/071118.html

I haven't seen any patches implementing this yet - am I missing
something?

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Writing a book is like washing an elephant: there's no good place  to
begin  or  end,  and  it's  hard to keep track of what you've already
covered.

[U-Boot] [GIT PULL] u-boot-mpc83xx fix

[Kim Phillips]

On Mon, 7 Jun 2010 22:40:27 +0200
Wolfgang Denk <wd@denx.de> wrote:

> Applied, thanks.

Thanks.

> > Also, I've noticed main CHANGELOG updates are still being performed:
> 
> Yes, as we don't have a new solution implemented yet.
> 
> > Any news wrt implementing a gitattributes based solution instead?:
> > 
> > http://lists.denx.de/pipermail/u-boot/2010-May/071118.html
> 
> I haven't seen any patches implementing this yet - am I missing
> something?

rather than provide a (deficient) patch, I decided to provide basic
instructions on how to enable the feature, because you still have to do
the:

echo 'snapshot.commit export-subst' > .git/info/attributes

to each repo that is subject to exports (and that file, being
under .git/, has to be manually patched).

The other part (which the patch below does very trivially) is adding
the snapshot.commit file, which effectively replaces the CHANGELOG by
being filled with the commit id sha upon each git export.  I just
wasn't sure if you felt like adding more reference data into the file -
see man gitattributes (search for export-subst), and placeholders under
PRETTY FORMATS of man git log - looking at the list now however, I'm
pretty sure just he commit id sha is enough, so here you go.

Kim

[U-Boot] [GIT PULL] u-boot-mpc83xx fix

[Wolfgang Denk]

Dear Kim Phillips,

In message <20100607165650.9894b805.kim.phillips@freescale.com> you wrote:
>
> > I haven't seen any patches implementing this yet - am I missing
> > something?
> 
> rather than provide a (deficient) patch, I decided to provide basic
> instructions on how to enable the feature, because you still have to do
> the:

Thanks for the recipe.

> The other part (which the patch below does very trivially) is adding
> the snapshot.commit file, which effectively replaces the CHANGELOG by
> being filled with the commit id sha upon each git export.  I just
> wasn't sure if you felt like adding more reference data into the file -
> see man gitattributes (search for export-subst), and placeholders under
> PRETTY FORMATS of man git log - looking at the list now however, I'm
> pretty sure just he commit id sha is enough, so here you go.

Well, I decided to add a "%cD" for easy classification.

Applied:

[U-Boot] [GIT PULL] u-boot-mpc83xx fix

[Kim Phillips]

On Sat, 7 Aug 2010 01:03:34 +0200
Wolfgang Denk <wd@denx.de> wrote:

> From b1f95b4438a6d44e12f04e7f51412f7a711ef87b Mon Sep 17 00:00:00 2001
> From: Wolfgang Denk <wd@denx.de>
> Date: Sat, 7 Aug 2010 00:32:50 +0200
> Subject: [PATCH] Replace CHANGELOG files by auto-generated "snapshot.commit"

thank you very much for this, Wolfgang.

However, to test, I hit the 'snapshot' button for the above commit on
denx.de's gitweb, and took a look at snapshot.commit's contents:

$ tar zxf u-boot-b1f95b4438a6d44e12f04e7f51412f7a711ef87b.tar.gz 
$ cd u-boot/
$ cat snapshot.commit 
$Format:%H  %cD$
$ 

so either the following was not executed on the server tree copy:

echo 'snapshot.commit' > .git/info/attributes

or, the server needs configuring? or maybe the version of git the
server is running is too old?  It looks like it's 1.5.6.5.

Kim

[U-Boot] [GIT PULL] u-boot-mpc83xx fix

[Wolfgang Denk]

Dear Kim Phillips,

In message <20100807130910.93a283e5.kim.phillips@freescale.com> you wrote:
> 
> However, to test, I hit the 'snapshot' button for the above commit on
> denx.de's gitweb, and took a look at snapshot.commit's contents:
...
> so either the following was not executed on the server tree copy:

Indeed I had tested this only locally so far. In the meantime, I have
updated all repos on the public server as well, so if you retry it
should work better now.

Thanks for testing and for the reminder.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
If you hear an onion ring, answer it.

[U-Boot] [GIT PULL] u-boot-mpc83xx fix

[Kim Phillips]

On Sat, 7 Aug 2010 20:55:01 +0200
Wolfgang Denk <wd@denx.de> wrote:

> Dear Kim Phillips,
> 
> In message <20100807130910.93a283e5.kim.phillips@freescale.com> you wrote:
> > 
> > However, to test, I hit the 'snapshot' button for the above commit on
> > denx.de's gitweb, and took a look at snapshot.commit's contents:
> ...
> > so either the following was not executed on the server tree copy:
> 
> Indeed I had tested this only locally so far. In the meantime, I have
> updated all repos on the public server as well, so if you retry it
> should work better now.

splendid - now snapshot.commit comes populated with:

b1f95b4438a6d44e12f04e7f51412f7a711ef87b  Sat, 7 Aug 2010 00:32:50 +0200

Thanks again,

Kim