Git commit failed with mbedtls/framework

[Tony Dinh]

Hi Raymond,

On Fri, Nov 15, 2024 at 1:55 PM Raymond Mao <raymond.mao at linaro.org> wrote:
>
> Hi Tony and Tom,
>
> On Fri, 15 Nov 2024 at 16:35, Tony Dinh <mibodhi at gmail.com> wrote:
>>
>> Hi Tom,
>> Hi Raymond,
>>
>> On Fri, Nov 15, 2024 at 1:09 PM Raymond Mao <raymond.mao at linaro.org> wrote:
>> >
>> > Hi Tony
>> >
>> > On Fri, 15 Nov 2024 at 15:32, Tony Dinh <mibodhi at gmail.com> wrote:
>> >>
>> >> Hi Tom,
>> >>
>> >> On Fri, Nov 15, 2024 at 11:27 AM Tony Dinh <mibodhi at gmail.com> wrote:
>> >> >
>> >> > Hi Tom,
>> >> >
>> >> > On Fri, Nov 15, 2024 at 6:17 AM Tom Rini <trini at konsulko.com> wrote:
>> >> > >
>> >> > > On Thu, Nov 14, 2024 at 08:26:33PM -0800, Tony Dinh wrote:
>> >> > > > Hi Tom,
>> >> > > >
>> >> > > > I am on 2025.01-rc2, and I am trying to commit some files. The error
>> >> > > > seems to indicate this framework directory might need some
>> >> > > > modification. Did I miss something?
>> >> > > >
>> >> > > > error: 'lib/mbedtls/external/mbedtls/framework' does not have a commit
>> >> > > > checked out
>> >> > > > fatal: updating files failed
>> >> > >
>> >> > > That's odd. You didn't happen to try out some of the previous lwIP
>> >> > > iterations on that tree did you?
>> >> >
>> >> > No, I did not. The tree is clean with "make mrproper" and on the
>> >> > master branch. I just did a git pull and worked on it.
>> >> >
>> >> > I went and looked at https://github.com/Mbed-TLS/mbedtls.git. The
>> >> > framework directory is pointing to a specific commit.
>> >> > framework @ 3867faa
>> >> >
>> >> > I'll stash and repeat it on another clean tree.
>> >>
>> >> I have the same commit error on a brand new tree.
>> >>
>> > I think you are talking about the test framework of MbedTLS's original testsuite,
>> > am I right?
>> > MbedTLS was ported into U-Boot as a git subtree and that framework is a git
>> > submodule of original MbedTLS repo which was not included in the porting
>> > of U-Boot since U-Boot has its own testsuite.
>>
>> Here is what I found.
>>
>> git clone https://github.com/u-boot/u-boot.git u-boot-master-test
>> cd /usr/src/u-boot-master-test/
>> patch -p1 < ../builds-u-boot-marvell/sheevaplug/sheevaplug_bootstd.patch
>> git add .
>> git commit . -m "arm: kirkwood: Enable bootstd and remove jffs2 for
>> Sheevaplug board" -e
>>
>> The git commit above gave out this error:
>>
>> error: 'lib/mbedtls/external/mbedtls/framework' does not have a commit
>> checked out
>> fatal: updating files failed
>>
>> So I tried to commit only the specific files, and it works OK.
>>
>> git commit configs/sheevaplug_defconfig include/configs/sheevaplug.h
>> -m "arm: kirkwood: Enable bootstd and remove jffs2 for Sheevaplug
>> board" -e
>> [master 47de8cff2d] arm: kirkwood: Enable bootstd and remove jffs2 for
>> Sheevaplug board
>>  2 files changed, 17 insertions(+), 19 deletions(-)
>>
>> I think it must be what Raymond said above. So perhaps during Tom's PR
>> pull, the framework directory was created. But "git commit ." does not
>> like the empty lib/mbedtls/external/mbedtls/framework directory.
>>
> Under the native MbedTLS git repo, by default it has a "framework" pointing to
> its git submodule.
> Maybe we should mark it in the gitignore.

I've tried .gitignore but could not make it work (my Gitfu is pretty
lousy). Can you suggest how that should be done?

Thanks,
Tony