diff mbox series

[oe,meta-networking,V2,2/2] ebtables: Fix duplicate definition errors due to netinet/ether.h

Message ID 20180305030116.1901-2-raj.khem@gmail.com
State Superseded
Headers show
Series [oe,meta-oe,1/2] libyui-ncurses: Fix build with musl _nl_msg_cat_cntr in not available | expand

Commit Message

Khem Raj March 5, 2018, 3:01 a.m. UTC
Make the patch musl specific as it is regressing glibc 2.27

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
Changes since v1:
- Drop the new patch since it was reverting existing patch partially
- Apply the regressing patch conditionally to musl builds alone

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

-- 
2.16.2

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Comments

Bruce Ashfield March 5, 2018, 4:43 a.m. UTC | #1
FYI: I'm also about to spin a new linux-libc-headers that addresses this issue
as well.

There's a -stable patch that fixes the regression introduced in 4.15 headers, so
I've bumped to 4.15.7 to pick up that fix.  I also had to adjust the
musl libc-headers
patches for it slightly, but after those chances, this should build
without needing
any package specific patches.

I'm doing final testing (and will build ebtables directly to confirm),
and I expect to
get the series out Monday.

Bruce

On Sun, Mar 4, 2018 at 10:01 PM, Khem Raj <raj.khem@gmail.com> wrote:
> Make the patch musl specific as it is regressing glibc 2.27

>

> Signed-off-by: Khem Raj <raj.khem@gmail.com>

> ---

> Changes since v1:

> - Drop the new patch since it was reverting existing patch partially

> - Apply the regressing patch conditionally to musl builds alone

>

>  meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb | 3 ++-

>  1 file changed, 2 insertions(+), 1 deletion(-)

>

> 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 d5e7341a0..e4adafd3c 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

> @@ -29,9 +29,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \

>             file://0007-extensions-Use-stdint-types.patch \

>             file://0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch \

>             file://0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch \

> -           file://0010-Adjust-header-include-sequence.patch \

>             "

>

> +SRC_URI_append_libc-musl = " file://0010-Adjust-header-include-sequence.patch"

> +

>  SRC_URI[md5sum] = "506742a3d44b9925955425a659c1a8d0"

>  SRC_URI[sha256sum] = "dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d"

>

> --

> 2.16.2

>

> --

> _______________________________________________

> Openembedded-devel mailing list

> Openembedded-devel@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-devel




-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
diff mbox series

Patch

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 d5e7341a0..e4adafd3c 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
@@ -29,9 +29,10 @@  SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \
            file://0007-extensions-Use-stdint-types.patch \
            file://0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch \
            file://0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch \
-           file://0010-Adjust-header-include-sequence.patch \
            "
 
+SRC_URI_append_libc-musl = " file://0010-Adjust-header-include-sequence.patch"
+
 SRC_URI[md5sum] = "506742a3d44b9925955425a659c1a8d0"
 SRC_URI[sha256sum] = "dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d"