[oe-commits] Roy.Li : ebtables: make it be able to work on 64bit kernel with 32 bit userspace

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: c42ac37fe7314199d042b1c8865e28209f504c46
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=c42ac37fe7314199d042b1c8865e28209f504c46

Author: Roy.Li <rongqing.li at windriver.com>
Date:   Fri Nov  7 17:14:39 2014 +0800

ebtables: make it be able to work on 64bit kernel with 32 bit userspace

KERNEL_64_USERSPACE_32 should be enabled for 64bit kernel with 32 bit userspace,
otherwise, the date struct(struct ebt_replace, struct ebt_entry_match) have
different alignment size, will make it unable to work.

Signed-off-by: Roy.Li <rongqing.li at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
index 32cfc75..9b04d1b 100644
--- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
+++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
@@ -27,6 +27,16 @@ S = "${WORKDIR}/ebtables-v${PV}"
 
 inherit update-rc.d systemd
 
+python __anonymous () {
+    import re
+
+    multilib=d.getVar('MLPREFIX', True) or ""
+    searchstr = "lib.?32"
+    reg = re.compile(searchstr)
+    if reg.search(multilib):
+        d.appendVar('CFLAGS' ,' -DKERNEL_64_USERSPACE_32 -DEBT_MIN_ALIGN=8')
+}
+
 EXTRA_OEMAKE = " \
         BINDIR=${base_sbindir} \
         MANDIR=${mandir} \