[U-Boot-Users] Remove the bios emulator binary files from MAI board
Hi, Wolfgang,
I once have sent a patch to remove the bios emulator from MAI board. As the patch was too large, I put it in a internal git development tree and listed the url link in the mail. The url link I listed was the 'plain' of the patch. It's no harm to common patch, but when there're binary files in the patch, the 'plain' can not display those binaries. So the patch you get from the 'plain' link may not include the binary file deletion.
I've tried to make another patch to delete those binary files. But this patch is also large than the requirment. This time I tried put the patch itself on the link below, Please refer to it. Thanks.
http://www.kernel.org/pub/linux/kernel/people/leo/patches/u-boot-remove-obso...
Best Regards. Jason
In message 11877796533041-git-send-email-Jason.jin@freescale.com you wrote:
As the patch was too large, I put it in a internal git development tree and listed the url link in the mail. The url link I listed was the 'plain' of the patch. It's no harm to common patch, but when there're binary files in the patch, the 'plain' can not display those binaries. So the patch you get from the 'plain' link may not include the binary file deletion.
I'm afraid I don't really understand what that means.
I've tried to make another patch to delete those binary files. But this patch is also large than the requirment. This time I tried put the patch itself on the link below, Please refer to it. Thanks.
Umm... why is your patch that big? When I remove a file, I expect that the resulting "patch" takes only 3...4 lines per removed file, something like this:
diff --git a/<file> b/<file> deleted file mode 100644 index 5533346..0000000 Binary files <file> and /dev/null differ
Are you using git-diff to create the patch? If not, you should try that...
Best regards,
Wolfgang Denk
-----Original Message----- From: wd@denx.de [mailto:wd@denx.de] Sent: Thursday, August 23, 2007 12:20 AM To: Jin Zhengxiong-R64188 Cc: u-boot-users@lists.sourceforge.net; Loeliger Jon-LOELIGER Subject: Re: Remove the bios emulator binary files from MAI board
In message 11877796533041-git-send-email-Jason.jin@freescale.com you wrote:
As the patch was too large, I put it in a internal git development tree and listed the url link in the mail. The url link I listed was the 'plain' of the patch. It's no harm to common patch, but when there're binary files in the patch, the 'plain' can not
display those binaries.
So the patch you get from the 'plain' link may not include
the binary
file deletion.
I'm afraid I don't really understand what that means.
I mean that my orignal patch include removing those binary files. but the link can not display it.
I've tried to make another patch to delete those binary files. But this patch is also large than the requirment. This time I
tried put
the patch itself on the link below, Please refer to it. Thanks.
Umm... why is your patch that big? When I remove a file, I expect that the resulting "patch" takes only 3...4 lines per removed file, something like this:
diff --git a/<file> b/<file> deleted file mode 100644 index 5533346..0000000 Binary files <file> and /dev/null differ
Are you using git-diff to create the patch? If not, you should try that...
Usually, I use git-format-patch to create the patch and use git-apply apply the patch.
Yes, git-diff can generate the patch like you descripted. but the patch can not apply to the source by git-apply, I tried to use cg-patch to apply this kind of patch, it can remove the binary files but can not remove the empty directory.
Best Regards. Jason
On Wed, 2007-08-22 at 21:03, Jin Zhengxiong-R64188 wrote:
Usually, I use git-format-patch to create the patch and use git-apply apply the patch.
Yes, git-diff can generate the patch like you descripted. but the patch can not apply to the source by git-apply,
If there is a patch that git generates that git-apply or git-am can not then re-apply, file a bug report!
I tried to use cg-patch to apply this kind of patch,
Ewww..... You should stop using cogito entirely. Really. It is totally deprecated and unsupported these days. Most all of the original cogito functionality has been incorporated into core git these days.
it can remove the binary files but can not remove the empty directory.
Rest assured, git is not tracking the empty directories. :-)
Best Regards. Jason
jdl
-----Original Message----- From: Loeliger Jon-LOELIGER Sent: Friday, August 24, 2007 12:17 AM To: Jin Zhengxiong-R64188 Cc: Wolfgang Denk; u-boot-users Subject: RE: Remove the bios emulator binary files from MAI board
On Wed, 2007-08-22 at 21:03, Jin Zhengxiong-R64188 wrote:
Usually, I use git-format-patch to create the patch and use
git-apply
apply the patch.
Yes, git-diff can generate the patch like you descripted. but the patch can not apply to the source by git-apply,
If there is a patch that git generates that git-apply or git-am can not then re-apply, file a bug report!
I tried to use cg-patch to apply this kind of patch,
Ewww..... You should stop using cogito entirely. Really. It is totally deprecated and unsupported these days. Most all of the original cogito functionality has been incorporated into core git these days.
it can remove the binary files but can not remove the empty directory.
Rest assured, git is not tracking the empty directories. :-)
I updated git to V1.5 and used git-rm with option '-r', then used git-format- patch to generate the patch. The patch can apply by git-apply and can remove the directory, But as Wolfgang said, it's too large!
Jason
In message CC27DED0F8F39E48A7E75FD768688B7A4D0736@zch01exm27.fsl.freescale.net you wrote:
I updated git to V1.5 and used git-rm with option '-r', then used git-format- patch to generate the patch. The patch can apply by git-apply and can remove the directory, But as Wolfgang said, it's too large!
No, I didn't say this. I said that git-diff generates nice smallpatches.
Best regards,
Wolfgang Denk
-----Original Message----- From: wd@denx.de [mailto:wd@denx.de] Sent: Friday, August 24, 2007 2:47 PM To: Jin Zhengxiong-R64188 Cc: Loeliger Jon-LOELIGER; u-boot-users Subject: Re: Remove the bios emulator binary files from MAI board
In message <CC27DED0F8F39E48A7E75FD768688B7A4D0736@zch01exm27.fsl.freesca le.net> you wrote:
I updated git to V1.5 and used git-rm with option '-r', then used git-format- patch to generate the patch. The patch can apply by
git-apply and can
remove the directory, But as Wolfgang said, it's too large!
No, I didn't say this. I said that git-diff generates nice smallpatches.
I tried kinds of way to generate the patch, the only way I found to remove the binary files and the directories at the same time is the patch I sent dayes ago. If it's not acceptable, Could you please try to delete it directly in the tree? Thanks.
Best Regards, Jason Jin
In message 11877796533041-git-send-email-Jason.jin@freescale.com you wrote:
Hi, Wolfgang,
I once have sent a patch to remove the bios emulator from MAI board. As the patch was too large, I put it in a internal git development tree and listed the url link in the mail. The url link I listed was the 'plain' of the patch. It's no harm to common patch, but when there're binary files in the patch, the 'plain' can not display those binaries. So the patch you get from the 'plain' link may not include the binary file deletion.
I've tried to make another patch to delete those binary files. But this patch is also large than the requirment. This time I tried put the patch itself on the link below, Please refer to it. Thanks.
http://www.kernel.org/pub/linux/kernel/people/leo/patches/u-boot-remove-obso...
Applied, thanks.
Best regards,
Wolfgang Denk
Dear Jason Jin,
can you please also fix the missing BUILD_DIR support in drivers/bios_emulator/Makefile ?
Please try for example:
$ BUILD_DIR=/tmp/foo ./MAKEALL MPC8641HPCN
to see what I mean:
Configuring for MPC8641HPCN board... ati_radeon_fb.c: In function 'radeon_setmode': ati_radeon_fb.c:323: warning: unused variable 'i' ati_radeon_fb.c: In function 'radeon_probe': ati_radeon_fb.c:383: warning: implicit declaration of function 'BootVideoCardBIOS' ati_radeon_fb.c: At top level: ati_radeon_fb.c:307: warning: 'common_regs' defined but not used ppc_4xx-ld: cannot find drivers/bios_emulator/atibios.o make: *** [/work/wd/tmp/u-boot] Error 1
Thanks in advance.
Best regards,
Wolfgang Denk
participants (4)
-
Jason Jin -
Jin Zhengxiong-R64188
-
Jon Loeliger -
Wolfgang Denk