[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         | 43 ++++++++++++++++++++++
 meta/recipes-devtools/mtd/mtd-utils_git.bb         |  1 +
 2 files changed, 44 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..c7a46bd
--- /dev/null
+++ b/meta/recipes-devtools/mtd/mtd-utils/mtd-utils-fix-hashtable_iterator.patch
@@ -0,0 +1,43 @@
+Upstream-Status: Pending
+
+Author: Oleg Kokorin <ole2mail@mail.com>
+Date:   Fri Jan 19 11:52:12 2018 +0100
+
+    mtd-utils: remove double hashtable iterator definition
+
+    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>
+
+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

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

[Burton, Ross]

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

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

> +Upstream-Status: Pending
>

Is there a reason you're not sending this upstream?

Ross

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

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

[Burton, Ross]

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

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

> hello Ross
>
> the whole patch supply procedure these days is completely messed-up IMHO.
>
> if I'm not sending to upstream, then why the damn patch being e-mailed? or
> perhaps
> just because I can't understand the difference in between "pending"
> (where?), "submitted" (definitely is),
> "accepted" (by who?), "backport" (to where?), "denied" (do you really
> assume someone will push the patch with the flag "denied" in it?
>
> you've added too much complexity requirements to apply inside the patch
> file.
> how could I know what means for you "sending or not" to upstream?
>
> from the wiki point, it's completely unclear what kind of status should I
> apply for the patch by default.
> https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
> so what do you want for "Upstream-Status:" instead of pending?
>

"Upstream" in distribution-builder-land means "the maintainer of the
package that I'm trying to build".  So in this case, the mtd-utils
maintainers.  If you've got a patch and cannot  be bothered to submit it
upstream, Pending is correct. Submitted means you've submitted it to the
maintainers.  Accepted means they've accepted it.  Backport means you've
backported the patch from the upstream source.  Denied means upstream have
refused the patch but we need it for some reason.


> and by the way, a robot refused my patch again, because it's not in sync
> with whatever the new stuff is in.
> if "git pull --rebase" is not enough, it would be WAY better to mention
> this command specifically in the WIKI about.
> I see a lot of completely useless text in the wiki but it helped not at
> all to push the patch an easy and more important the fast way.
>

That should be sufficient, I can confirm that your patch doesn't apply to
master, and the last time this file was modified was in December, so maybe
you're not working from the right branch?

and, GIT know's well who is signign and what is the commit message, so if
> you need patches with the git log attached ahead of each, why not to
> mention in wiki special command about injecting log message inside patch
> file. this definitely will simplify patches submission.
>

It's entirely appropriate for the patch to have a much longer explanatory
message than the commit.  Also I can send a patch to oe-core which contains
a patch that someone else has authored, in which case copying it
automatically wouldn't be correct.

All we're asking is that any patches added say what they do, if they're
upstream, and who wrote it.

Ross

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

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

[Patchwork]

== Series Details ==

Series: mtd-utils: remove double hashtable iterator definition (rev2)
Revision: 2
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 77144bc808)

* 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)



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: ✗ patchtest: failure - defective robot

[Oleg Kokorin]

[-- Attachment #1: Type: text/html, Size: 3055 bytes --]