Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/python-aiohttp-security: new package
@ 2018-12-06 23:33 james.hilliard1 at gmail.com
  2018-12-07  8:05 ` Yegor Yefremov
  0 siblings, 1 reply; 8+ messages in thread
From: james.hilliard1 at gmail.com @ 2018-12-06 23:33 UTC (permalink / raw)
  To: buildroot

From: James Hilliard <james.hilliard1@gmail.com>

security for aiohttp.web.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 DEVELOPERS                                                 |  1 +
 package/Config.in                                          |  1 +
 package/python-aiohttp-security/Config.in                  |  8 ++++++++
 .../python-aiohttp-security/python-aiohttp-security.hash   |  5 +++++
 package/python-aiohttp-security/python-aiohttp-security.mk | 14 ++++++++++++++
 5 files changed, 29 insertions(+)
 create mode 100644 package/python-aiohttp-security/Config.in
 create mode 100644 package/python-aiohttp-security/python-aiohttp-security.hash
 create mode 100644 package/python-aiohttp-security/python-aiohttp-security.mk

diff --git a/DEVELOPERS b/DEVELOPERS
index c289b3f..b9bb05b 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -992,6 +992,7 @@ F:	configs/pine64_sopine_defconfig
 N:	James Hilliard <james.hilliard1@gmail.com>
 F:	package/python-aiodns/
 F:	package/python-aiohttp/
+F:	package/python-aiohttp-security/
 F:	package/python-async-timeout/
 F:	package/python-cchardet/
 F:	package/python-multidict/
diff --git a/package/Config.in b/package/Config.in
index f6252f2..f3c8b56 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -799,6 +799,7 @@ menu "External python modules"
 	source "package/python-aiocoap/Config.in"
 	source "package/python-aiodns/Config.in"
 	source "package/python-aiohttp/Config.in"
+	source "package/python-aiohttp-security/Config.in"
 	source "package/python-alsaaudio/Config.in"
 	source "package/python-argh/Config.in"
 	source "package/python-arrow/Config.in"
diff --git a/package/python-aiohttp-security/Config.in b/package/python-aiohttp-security/Config.in
new file mode 100644
index 0000000..6695ce3
--- /dev/null
+++ b/package/python-aiohttp-security/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_AIOHTTP_SECURITY
+	bool "python-aiohttp-security"
+	depends on BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON_AIOHTTP # runtime
+	help
+	  security for aiohttp.web.
+
+	  https://github.com/aio-libs/aiohttp_security/
diff --git a/package/python-aiohttp-security/python-aiohttp-security.hash b/package/python-aiohttp-security/python-aiohttp-security.hash
new file mode 100644
index 0000000..1d2604c
--- /dev/null
+++ b/package/python-aiohttp-security/python-aiohttp-security.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/aiohttp-security/json
+md5	1624f982d7a779e6ed396ef2ed20acc7  aiohttp-security-0.4.0.tar.gz
+sha256	40d4bb150454e392c2dfa3620f6eab28e140e94cf0c2d3b4bf43aef653ec9405  aiohttp-security-0.4.0.tar.gz
+# Locally computed sha256 checksums
+sha256	a1cc8ff7210897d55d2552fa0792340f8e59720e0160b6918699d40f9a782b1c  LICENSE
diff --git a/package/python-aiohttp-security/python-aiohttp-security.mk b/package/python-aiohttp-security/python-aiohttp-security.mk
new file mode 100644
index 0000000..9ab3b16
--- /dev/null
+++ b/package/python-aiohttp-security/python-aiohttp-security.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-aiohttp-security
+#
+################################################################################
+
+PYTHON_AIOHTTP_SECURITY_VERSION = 0.4.0
+PYTHON_AIOHTTP_SECURITY_SOURCE = aiohttp-security-$(PYTHON_AIOHTTP_SECURITY_VERSION).tar.gz
+PYTHON_AIOHTTP_SECURITY_SITE = https://files.pythonhosted.org/packages/36/01/d85be376b7c1773b3cb7849cd56dc7d38165664df7de2d3e20af507ef5bb
+PYTHON_AIOHTTP_SECURITY_SETUP_TYPE = setuptools
+PYTHON_AIOHTTP_SECURITY_LICENSE = Apache-2.0
+PYTHON_AIOHTTP_SECURITY_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH 1/1] package/python-aiohttp-security: new package
  2018-12-06 23:33 [Buildroot] [PATCH 1/1] package/python-aiohttp-security: new package james.hilliard1 at gmail.com
@ 2018-12-07  8:05 ` Yegor Yefremov
  2018-12-07  8:16   ` James Hilliard
  0 siblings, 1 reply; 8+ messages in thread
From: Yegor Yefremov @ 2018-12-07  8:05 UTC (permalink / raw)
  To: buildroot

On Fri, Dec 7, 2018 at 12:33 AM <james.hilliard1@gmail.com> wrote:
>
> From: James Hilliard <james.hilliard1@gmail.com>
>
> security for aiohttp.web.
>
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  DEVELOPERS                                                 |  1 +
>  package/Config.in                                          |  1 +
>  package/python-aiohttp-security/Config.in                  |  8 ++++++++
>  .../python-aiohttp-security/python-aiohttp-security.hash   |  5 +++++
>  package/python-aiohttp-security/python-aiohttp-security.mk | 14 ++++++++++++++
>  5 files changed, 29 insertions(+)
>  create mode 100644 package/python-aiohttp-security/Config.in
>  create mode 100644 package/python-aiohttp-security/python-aiohttp-security.hash
>  create mode 100644 package/python-aiohttp-security/python-aiohttp-security.mk
>
> diff --git a/DEVELOPERS b/DEVELOPERS
> index c289b3f..b9bb05b 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -992,6 +992,7 @@ F:  configs/pine64_sopine_defconfig
>  N:     James Hilliard <james.hilliard1@gmail.com>
>  F:     package/python-aiodns/
>  F:     package/python-aiohttp/
> +F:     package/python-aiohttp-security/
>  F:     package/python-async-timeout/
>  F:     package/python-cchardet/
>  F:     package/python-multidict/
> diff --git a/package/Config.in b/package/Config.in
> index f6252f2..f3c8b56 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -799,6 +799,7 @@ menu "External python modules"
>         source "package/python-aiocoap/Config.in"
>         source "package/python-aiodns/Config.in"
>         source "package/python-aiohttp/Config.in"
> +       source "package/python-aiohttp-security/Config.in"
>         source "package/python-alsaaudio/Config.in"
>         source "package/python-argh/Config.in"
>         source "package/python-arrow/Config.in"
> diff --git a/package/python-aiohttp-security/Config.in b/package/python-aiohttp-security/Config.in
> new file mode 100644
> index 0000000..6695ce3
> --- /dev/null
> +++ b/package/python-aiohttp-security/Config.in
> @@ -0,0 +1,8 @@
> +config BR2_PACKAGE_PYTHON_AIOHTTP_SECURITY
> +       bool "python-aiohttp-security"
> +       depends on BR2_PACKAGE_PYTHON3
> +       select BR2_PACKAGE_PYTHON_AIOHTTP # runtime
> +       help
> +         security for aiohttp.web.

s/security/Security

Please resend the whole patches as series, i.e.

git format patch -v2 -7 -o outgoing

add my Reviewed-by: Yegor Yefremov <yegorslists@googlemail.com> and
changes history as described in [1].

[1] http://nightly.buildroot.org/manual.html#submitting-patches

Regards,
Yegor

> +
> +         https://github.com/aio-libs/aiohttp_security/
> diff --git a/package/python-aiohttp-security/python-aiohttp-security.hash b/package/python-aiohttp-security/python-aiohttp-security.hash
> new file mode 100644
> index 0000000..1d2604c
> --- /dev/null
> +++ b/package/python-aiohttp-security/python-aiohttp-security.hash
> @@ -0,0 +1,5 @@
> +# md5, sha256 from https://pypi.org/pypi/aiohttp-security/json
> +md5    1624f982d7a779e6ed396ef2ed20acc7  aiohttp-security-0.4.0.tar.gz
> +sha256 40d4bb150454e392c2dfa3620f6eab28e140e94cf0c2d3b4bf43aef653ec9405  aiohttp-security-0.4.0.tar.gz
> +# Locally computed sha256 checksums
> +sha256 a1cc8ff7210897d55d2552fa0792340f8e59720e0160b6918699d40f9a782b1c  LICENSE
> diff --git a/package/python-aiohttp-security/python-aiohttp-security.mk b/package/python-aiohttp-security/python-aiohttp-security.mk
> new file mode 100644
> index 0000000..9ab3b16
> --- /dev/null
> +++ b/package/python-aiohttp-security/python-aiohttp-security.mk
> @@ -0,0 +1,14 @@
> +################################################################################
> +#
> +# python-aiohttp-security
> +#
> +################################################################################
> +
> +PYTHON_AIOHTTP_SECURITY_VERSION = 0.4.0
> +PYTHON_AIOHTTP_SECURITY_SOURCE = aiohttp-security-$(PYTHON_AIOHTTP_SECURITY_VERSION).tar.gz
> +PYTHON_AIOHTTP_SECURITY_SITE = https://files.pythonhosted.org/packages/36/01/d85be376b7c1773b3cb7849cd56dc7d38165664df7de2d3e20af507ef5bb
> +PYTHON_AIOHTTP_SECURITY_SETUP_TYPE = setuptools
> +PYTHON_AIOHTTP_SECURITY_LICENSE = Apache-2.0
> +PYTHON_AIOHTTP_SECURITY_LICENSE_FILES = LICENSE
> +
> +$(eval $(python-package))
> --
> 2.7.4
>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH 1/1] package/python-aiohttp-security: new package
  2018-12-07  8:05 ` Yegor Yefremov
@ 2018-12-07  8:16   ` James Hilliard
  2018-12-07  8:46     ` Thomas Petazzoni
  0 siblings, 1 reply; 8+ messages in thread
From: James Hilliard @ 2018-12-07  8:16 UTC (permalink / raw)
  To: buildroot

These are all independent patches which shouldn't depend on each
other, I have them all in separate branches.
On Fri, Dec 7, 2018 at 1:05 AM Yegor Yefremov
<yegorslists@googlemail.com> wrote:
>
> On Fri, Dec 7, 2018 at 12:33 AM <james.hilliard1@gmail.com> wrote:
> >
> > From: James Hilliard <james.hilliard1@gmail.com>
> >
> > security for aiohttp.web.
> >
> > Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> > ---
> >  DEVELOPERS                                                 |  1 +
> >  package/Config.in                                          |  1 +
> >  package/python-aiohttp-security/Config.in                  |  8 ++++++++
> >  .../python-aiohttp-security/python-aiohttp-security.hash   |  5 +++++
> >  package/python-aiohttp-security/python-aiohttp-security.mk | 14 ++++++++++++++
> >  5 files changed, 29 insertions(+)
> >  create mode 100644 package/python-aiohttp-security/Config.in
> >  create mode 100644 package/python-aiohttp-security/python-aiohttp-security.hash
> >  create mode 100644 package/python-aiohttp-security/python-aiohttp-security.mk
> >
> > diff --git a/DEVELOPERS b/DEVELOPERS
> > index c289b3f..b9bb05b 100644
> > --- a/DEVELOPERS
> > +++ b/DEVELOPERS
> > @@ -992,6 +992,7 @@ F:  configs/pine64_sopine_defconfig
> >  N:     James Hilliard <james.hilliard1@gmail.com>
> >  F:     package/python-aiodns/
> >  F:     package/python-aiohttp/
> > +F:     package/python-aiohttp-security/
> >  F:     package/python-async-timeout/
> >  F:     package/python-cchardet/
> >  F:     package/python-multidict/
> > diff --git a/package/Config.in b/package/Config.in
> > index f6252f2..f3c8b56 100644
> > --- a/package/Config.in
> > +++ b/package/Config.in
> > @@ -799,6 +799,7 @@ menu "External python modules"
> >         source "package/python-aiocoap/Config.in"
> >         source "package/python-aiodns/Config.in"
> >         source "package/python-aiohttp/Config.in"
> > +       source "package/python-aiohttp-security/Config.in"
> >         source "package/python-alsaaudio/Config.in"
> >         source "package/python-argh/Config.in"
> >         source "package/python-arrow/Config.in"
> > diff --git a/package/python-aiohttp-security/Config.in b/package/python-aiohttp-security/Config.in
> > new file mode 100644
> > index 0000000..6695ce3
> > --- /dev/null
> > +++ b/package/python-aiohttp-security/Config.in
> > @@ -0,0 +1,8 @@
> > +config BR2_PACKAGE_PYTHON_AIOHTTP_SECURITY
> > +       bool "python-aiohttp-security"
> > +       depends on BR2_PACKAGE_PYTHON3
> > +       select BR2_PACKAGE_PYTHON_AIOHTTP # runtime
> > +       help
> > +         security for aiohttp.web.
>
> s/security/Security
>
> Please resend the whole patches as series, i.e.
>
> git format patch -v2 -7 -o outgoing
>
> add my Reviewed-by: Yegor Yefremov <yegorslists@googlemail.com> and
> changes history as described in [1].
>
> [1] http://nightly.buildroot.org/manual.html#submitting-patches
>
> Regards,
> Yegor
>
> > +
> > +         https://github.com/aio-libs/aiohttp_security/
> > diff --git a/package/python-aiohttp-security/python-aiohttp-security.hash b/package/python-aiohttp-security/python-aiohttp-security.hash
> > new file mode 100644
> > index 0000000..1d2604c
> > --- /dev/null
> > +++ b/package/python-aiohttp-security/python-aiohttp-security.hash
> > @@ -0,0 +1,5 @@
> > +# md5, sha256 from https://pypi.org/pypi/aiohttp-security/json
> > +md5    1624f982d7a779e6ed396ef2ed20acc7  aiohttp-security-0.4.0.tar.gz
> > +sha256 40d4bb150454e392c2dfa3620f6eab28e140e94cf0c2d3b4bf43aef653ec9405  aiohttp-security-0.4.0.tar.gz
> > +# Locally computed sha256 checksums
> > +sha256 a1cc8ff7210897d55d2552fa0792340f8e59720e0160b6918699d40f9a782b1c  LICENSE
> > diff --git a/package/python-aiohttp-security/python-aiohttp-security.mk b/package/python-aiohttp-security/python-aiohttp-security.mk
> > new file mode 100644
> > index 0000000..9ab3b16
> > --- /dev/null
> > +++ b/package/python-aiohttp-security/python-aiohttp-security.mk
> > @@ -0,0 +1,14 @@
> > +################################################################################
> > +#
> > +# python-aiohttp-security
> > +#
> > +################################################################################
> > +
> > +PYTHON_AIOHTTP_SECURITY_VERSION = 0.4.0
> > +PYTHON_AIOHTTP_SECURITY_SOURCE = aiohttp-security-$(PYTHON_AIOHTTP_SECURITY_VERSION).tar.gz
> > +PYTHON_AIOHTTP_SECURITY_SITE = https://files.pythonhosted.org/packages/36/01/d85be376b7c1773b3cb7849cd56dc7d38165664df7de2d3e20af507ef5bb
> > +PYTHON_AIOHTTP_SECURITY_SETUP_TYPE = setuptools
> > +PYTHON_AIOHTTP_SECURITY_LICENSE = Apache-2.0
> > +PYTHON_AIOHTTP_SECURITY_LICENSE_FILES = LICENSE
> > +
> > +$(eval $(python-package))
> > --
> > 2.7.4
> >

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH 1/1] package/python-aiohttp-security: new package
  2018-12-07  8:16   ` James Hilliard
@ 2018-12-07  8:46     ` Thomas Petazzoni
  2018-12-07  8:48       ` James Hilliard
  0 siblings, 1 reply; 8+ messages in thread
From: Thomas Petazzoni @ 2018-12-07  8:46 UTC (permalink / raw)
  To: buildroot

Hello James,

On Fri, 7 Dec 2018 01:16:34 -0700, James Hilliard wrote:
> These are all independent patches which shouldn't depend on each
> other, I have them all in separate branches.

One issue is that since they touch packages with very close names, all
of those patches will conflict on the DEVELOPERS file and
package/Config.in files. I.e, if I apply your patch on
package/python-aiohttp-session and then apply your patch on
package/python-aiohttp-security, the latter will fail.

Those conflicts are trivial, so we can resolve them when applying. But
it's nicer when there are no conflicts at all, and in this case,
posting as a series of patches, as suggested by Yegor, makes a lot of
sense.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH 1/1] package/python-aiohttp-security: new package
  2018-12-07  8:46     ` Thomas Petazzoni
@ 2018-12-07  8:48       ` James Hilliard
  2018-12-07  8:56         ` Yegor Yefremov
  2018-12-07  8:59         ` Thomas Petazzoni
  0 siblings, 2 replies; 8+ messages in thread
From: James Hilliard @ 2018-12-07  8:48 UTC (permalink / raw)
  To: buildroot

Ok, will try and do that in the future. I was keeping them in separate
branches so that they are easier to amend.
On Fri, Dec 7, 2018 at 1:46 AM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> Hello James,
>
> On Fri, 7 Dec 2018 01:16:34 -0700, James Hilliard wrote:
> > These are all independent patches which shouldn't depend on each
> > other, I have them all in separate branches.
>
> One issue is that since they touch packages with very close names, all
> of those patches will conflict on the DEVELOPERS file and
> package/Config.in files. I.e, if I apply your patch on
> package/python-aiohttp-session and then apply your patch on
> package/python-aiohttp-security, the latter will fail.
>
> Those conflicts are trivial, so we can resolve them when applying. But
> it's nicer when there are no conflicts at all, and in this case,
> posting as a series of patches, as suggested by Yegor, makes a lot of
> sense.
>
> Best regards,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH 1/1] package/python-aiohttp-security: new package
  2018-12-07  8:48       ` James Hilliard
@ 2018-12-07  8:56         ` Yegor Yefremov
  2018-12-07  8:59         ` Thomas Petazzoni
  1 sibling, 0 replies; 8+ messages in thread
From: Yegor Yefremov @ 2018-12-07  8:56 UTC (permalink / raw)
  To: buildroot

Hello James,

On Fri, Dec 7, 2018 at 9:48 AM James Hilliard <james.hilliard1@gmail.com> wrote:
>
> Ok, will try and do that in the future. I was keeping them in separate
> branches so that they are easier to amend.

With this series applied you'll have more than 10 Python packages
you're responsible for. I wonder whether it make sense to add

package/python*

for your DEVELOPERS record. Especially if you're going to add more
Python packages in the future.

Yegor

> On Fri, Dec 7, 2018 at 1:46 AM Thomas Petazzoni
> <thomas.petazzoni@bootlin.com> wrote:
> >
> > Hello James,
> >
> > On Fri, 7 Dec 2018 01:16:34 -0700, James Hilliard wrote:
> > > These are all independent patches which shouldn't depend on each
> > > other, I have them all in separate branches.
> >
> > One issue is that since they touch packages with very close names, all
> > of those patches will conflict on the DEVELOPERS file and
> > package/Config.in files. I.e, if I apply your patch on
> > package/python-aiohttp-session and then apply your patch on
> > package/python-aiohttp-security, the latter will fail.
> >
> > Those conflicts are trivial, so we can resolve them when applying. But
> > it's nicer when there are no conflicts at all, and in this case,
> > posting as a series of patches, as suggested by Yegor, makes a lot of
> > sense.
> >
> > Best regards,
> >
> > Thomas
> > --
> > Thomas Petazzoni, CTO, Bootlin
> > Embedded Linux and Kernel engineering
> > https://bootlin.com

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH 1/1] package/python-aiohttp-security: new package
  2018-12-07  8:48       ` James Hilliard
  2018-12-07  8:56         ` Yegor Yefremov
@ 2018-12-07  8:59         ` Thomas Petazzoni
  2018-12-07  9:13           ` James Hilliard
  1 sibling, 1 reply; 8+ messages in thread
From: Thomas Petazzoni @ 2018-12-07  8:59 UTC (permalink / raw)
  To: buildroot

Hello James,

On Fri, 7 Dec 2018 01:48:00 -0700, James Hilliard wrote:

> Ok, will try and do that in the future. I was keeping them in separate
> branches so that they are easier to amend.

You can keep them in the same branch, and still amend them very easily.
The magic thing is "interactive rebase".

Let's explain quickly how it works:

$ git checkout -b foo # create a new branch to work
add package foo1
$ git commit -as -m "foo1: new package"
add package foo2
$ git commit -as -m "foo2: new package"
add package foo3
$ git commit -as -m "foo3: new package"

No, you want to do some changes. You can do them right there in your
code base. Let's say you fixed one thing in package foo1 and one thing
in package foo2. Then you do:

$ git add package/foo1/
$ git commit -m "merge this with foo1"
$ git add package/foo2/
$ git commit -m "merge this with foo2"

And now, the magic:

$ git rebase -i HEAD~5

It opens up a text editor. You move the line "merge this with foo1"
right after the "foo1: new package" line, and change the "pick" word by
"fixup". You do the same with "merge this with foo2", and exit the text
editor. And voila.

Additional tips:

 - With proper commit titles, you can actually have git rebase -i
   automatically do the fixups.

 - You can also directly edit commits by changing the "pick" by an
   "edit".

I encourage you to read about "interactive rebase" in general. It's
going to change your life of patch preparation :-)

Another unrelated tip: please don't top post. Always write your replies
*below* the text you're replying to. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH 1/1] package/python-aiohttp-security: new package
  2018-12-07  8:59         ` Thomas Petazzoni
@ 2018-12-07  9:13           ` James Hilliard
  0 siblings, 0 replies; 8+ messages in thread
From: James Hilliard @ 2018-12-07  9:13 UTC (permalink / raw)
  To: buildroot

On Fri, Dec 7, 2018 at 1:59 AM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> Hello James,
>
> On Fri, 7 Dec 2018 01:48:00 -0700, James Hilliard wrote:
>
> > Ok, will try and do that in the future. I was keeping them in separate
> > branches so that they are easier to amend.
>
> You can keep them in the same branch, and still amend them very easily.
> The magic thing is "interactive rebase".
>
> Let's explain quickly how it works:
>
> $ git checkout -b foo # create a new branch to work
> add package foo1
> $ git commit -as -m "foo1: new package"
> add package foo2
> $ git commit -as -m "foo2: new package"
> add package foo3
> $ git commit -as -m "foo3: new package"
>
> No, you want to do some changes. You can do them right there in your
> code base. Let's say you fixed one thing in package foo1 and one thing
> in package foo2. Then you do:
>
> $ git add package/foo1/
> $ git commit -m "merge this with foo1"
> $ git add package/foo2/
> $ git commit -m "merge this with foo2"
>
> And now, the magic:
>
> $ git rebase -i HEAD~5
>
> It opens up a text editor. You move the line "merge this with foo1"
> right after the "foo1: new package" line, and change the "pick" word by
> "fixup". You do the same with "merge this with foo2", and exit the text
> editor. And voila.
>
> Additional tips:
>
>  - With proper commit titles, you can actually have git rebase -i
>    automatically do the fixups.
>
>  - You can also directly edit commits by changing the "pick" by an
>    "edit".
>
> I encourage you to read about "interactive rebase" in general. It's
> going to change your life of patch preparation :-)
Yeah, I've used it before, I'm just really slow at it since I don't
use it day to day for the most part.
>
> Another unrelated tip: please don't top post. Always write your replies
> *below* the text you're replying to. Thanks!
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2018-12-07  9:13 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-06 23:33 [Buildroot] [PATCH 1/1] package/python-aiohttp-security: new package james.hilliard1 at gmail.com
2018-12-07  8:05 ` Yegor Yefremov
2018-12-07  8:16   ` James Hilliard
2018-12-07  8:46     ` Thomas Petazzoni
2018-12-07  8:48       ` James Hilliard
2018-12-07  8:56         ` Yegor Yefremov
2018-12-07  8:59         ` Thomas Petazzoni
2018-12-07  9:13           ` James Hilliard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox