[Buildroot] [PATCH 1/2] added infozip package
thomas.petazzoni at free-electrons.com
Thu Jan 10 10:22:46 UTC 2013
Dear Jan Pedersen,
On Thu, 10 Jan 2013 11:13:27 +0100, Jan Pedersen wrote:
> Signed-off-by: Jan Pedersen <jp at jp-embedded.com>
> package/Config.in | 1 +
> package/infozip/Config.in | 10 ++++++++++
> package/infozip/infozip.mk | 43 +++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 54 insertions(+)
> create mode 100644 package/infozip/Config.in
> create mode 100644 package/infozip/infozip.mk
Thanks, but your patches 1/2 and 2/2 should be only one patch. Please
merge them together.
In order to do that, you'll have to do an interactive git rebase:
1. Tell git to rebase the last two patches
git rebase -i HEAD~2
2. A text editor will open, which will show two lines
pick <some SHA1> added infozip package
pick <some SHA1> now using generic-package
Change the "pick" word on the second line to "squash", and exit your
3. A new text editor will open, which allows you to edit the commit
message. Change the commit message to be:
infozip: new package
This commit adds a package for infozip, compression and file
Signed-off-by: Jan Pedersen <jp at jp-embedded.com>
And exit your text editor.
And voilà, you have only one commit combining your two changes.
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
More information about the buildroot