From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Petazzoni Date: Sun, 3 Jun 2018 20:37:35 +0200 Subject: [Buildroot] [PATCH v3 2/2] shadowsocks-libev: bump to version 3.2.0 add a patch for libipset licence add hashes for the license files Fix shadowsocks-libev.mk In-Reply-To: <20180530221315.19012-2-xuminready@gmail.com> References: <20180530221315.19012-1-xuminready@gmail.com> <20180530221315.19012-2-xuminready@gmail.com> Message-ID: <20180603203735.6b123022@windsurf> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Hello! Thanks for this contribution! On Wed, 30 May 2018 15:13:14 -0700, Min Xu wrote: > Signed-off-by: Min Xu > --- > .../0001-docs-add-BSD-3-Clause-licence.patch | 52 ++++++++++++++++++++++ > package/shadowsocks-libev/shadowsocks-libev.hash | 8 +++- > package/shadowsocks-libev/shadowsocks-libev.mk | 9 ++-- > 3 files changed, 63 insertions(+), 6 deletions(-) > create mode 100644 package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch All those changes should be part of the patch adding the shadowsocks-libev package. If you're not familiar with Git, then look at using "git rebase --interactive", it allows you to rewrite the commit history. In your case, you would have to do: $ git rebase --interactive HEAD~2 This opens up your text editor, with two lines, one for each of your two commits. On the second line, change the "pick" word for "fixup", and exit your text editor. This will rewrite the two commits by merging the second one into the first one. > diff --git a/package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch b/package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch > new file mode 100644 > index 0000000..64dda02 > --- /dev/null > +++ b/package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch > @@ -0,0 +1,52 @@ > +From 0047295445c499e010706598c50f1bff8b0d632c Mon Sep 17 00:00:00 2001 > +From: Min Xu > +Date: Wed, 30 May 2018 13:16:12 -0700 > +Subject: [PATCH] docs: add BSD-3-Clause licence > + > +add missing licence for shadowsocks-libev/libipset > + > +Signed-off-by: Min Xu I'm not sure it makes a lot of sense to add a patch adding the license file, especially if the patch is not blessed by upstream. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com