[PATCH] mtd-utils: remove double hashtable iterator definition

[PATCH] mtd-utils: remove double hashtable iterator definition

[Oleg Kokorin]

hashtable_iterator_key and hashtable_iterator_value redefinition inside
mkfs.ubifs/hashtable/hashtable_itr.h cause linker redefinition error

Signed-off-by: Oleg Kokorin <ole2mail@mail.com>
---
 .../mtd-utils-fix-hashtable_iterator.patch         | 31 ++++++++++++++++++++++
 meta/recipes-devtools/mtd/mtd-utils_git.bb         |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-hashtable_iterator.patch

diff --git a/meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-hashtable_iterator.patch b/meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-hashtable_iterator.patch
new file mode 100644
index 0000000..082f3b1
--- /dev/null
+++ b/meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-hashtable_iterator.patch
@@ -0,0 +1,31 @@
+Index: setup-scripts/build/tmp-angstrom_v2014_12-glibc/work/x86_64-linux/mtd-utils-native/1.5.1+gitAUTOINC+9f107132a6-r0/git/mkfs.ubifs/hashtable/hashtable_itr.h
+===================================================================
+--- a/mkfs.ubifs/hashtable/hashtable_itr.h
++++ b/mkfs.ubifs/hashtable/hashtable_itr.h
+@@ -27,22 +27,22 @@ hashtable_iterator(struct hashtable *h);
+ /*****************************************************************************/
+ /* hashtable_iterator_key
+  * - return the value of the (key,value) pair at the current position */
+-
++/*
+ extern inline void *
+ hashtable_iterator_key(struct hashtable_itr *i)
+ {
+     return i->e->k;
+ }
+-
++*/
+ /*****************************************************************************/
+ /* value - return the value of the (key,value) pair at the current position */
+-
++/*
+ extern inline void *
+ hashtable_iterator_value(struct hashtable_itr *i)
+ {
+     return i->e->v;
+ }
+-
++*/
+ /*****************************************************************************/
+ /* advance - advance the iterator to the next element
+  *           returns zero if advanced to end of table */
diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb
index 52297c6..f903a65 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_git.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb
@@ -11,6 +11,7 @@ SRCREV = "9f107132a6a073cce37434ca9cda6917dd8d866b"
 SRC_URI = "git://git.infradead.org/mtd-utils.git \
 		file://add-exclusion-to-mkfs-jffs2-git-2.patch \
 		file://fix-armv7-neon-alignment.patch \
+		file://mtd-utils-fix-hashtable_iterator.patch \
 "
 
 PV = "1.5.1+git${SRCPV}"
-- 
2.7.4

✗ patchtest: failure for mtd-utils: remove double hashtable iterator definition

[Patchwork]

== Series Details ==

Series: mtd-utils: remove double hashtable iterator definition
Revision: 1
URL   : https://patchwork.openembedded.org/series/10612/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  master (currently at 6b87ad5b08)

* Issue             A patch file has been added, but does not have a Signed-off-by tag [test_signed_off_by_presence] 
  Suggested fix    Sign off the added patch file (meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-hashtable_iterator.patch)

* Issue             Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format] 
  Suggested fix    Add Upstream-Status: <Valid status> to the header of meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-hashtable_iterator.patch
  Standard format  Upstream-Status: <Valid status>
  Valid status     Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where]



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

Re: [PATCH] mtd-utils: remove double hashtable iterator definition

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 776 bytes --]

On 19 January 2018 at 11:06, Oleg Kokorin <ole2mail@mail.com> wrote:

> diff --git a/meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-hashtable_iterator.patch
> b/meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-
> hashtable_iterator.patch
> new file mode 100644
> index 0000000..082f3b1
> --- /dev/null
> +++ b/meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-
> hashtable_iterator.patch
> @@ -0,0 +1,31 @@
> +Index: setup-scripts/build/tmp-angstrom_v2014_12-glibc/work/
> x86_64-linux/mtd-utils-native/1.5.1+gitAUTOINC+9f107132a6-
> r0/git/mkfs.ubifs/hashtable/hashtable_itr.h
>

This patch (the patch you add) needs a explanatory comment,
upstream-status, and signed-off-by:

https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines

Ross

[-- Attachment #2: Type: text/html, Size: 1311 bytes --]

Re: [PATCH] mtd-utils: remove double hashtable iterator definition

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 363 bytes --]

On 19 January 2018 at 13:17, Oleg Kokorin <ole2mail@mail.com> wrote:

> hello Ross
> why do I see this e-mail from you?
> "Signed-off-by: Oleg Kokorin <ole2mail@mail.com>" is in the patch.
>

The file mtd-utils-fix-hashtable_iterator.patch needs this information
too.  See the wiki link I added (and the mail from patchtest that was also
sent).

Ross

[-- Attachment #2: Type: text/html, Size: 928 bytes --]

Re: [PATCH] mtd-utils: remove double hashtable iterator definition

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 1021 bytes --]

On 19 January 2018 at 13:57, Oleg Kokorin <ole2mail@mail.com> wrote:

> I've got the points and re-sent the patch, but I'd like to add mine:
>
> by adding complexity instead of taking care of git and specifically
> send-email command providing necessary portions you'd like to have in patch
> in automated manner - you are decrising number of participants
> significantly.
>

Re-adding oe-core again.

How can git know that you're the original author of the patch and didn't
just copy/paste?  How can git know that you've hacked a workaround, or
backported a fix from upstream?

I'm fine with a small barrier to contributions when it means that in five
years time I'm not scratching my head at a patch with lost history, no
comments, no ownership, no indication whether it's a workaround or should
be sent upstream, wondering what it was meant to do.

There are still plenty of patches like that in oe-core, where the history
disappears into BitKeeper repositories that nobody has anymore.

Ross

[-- Attachment #2: Type: text/html, Size: 1547 bytes --]