klibc: Fix build issue when default ISA is not thumb
PATCH 1/18 klibc: Fix build issue when default ISA is not thumb
We were passing empty string '' to make as option when ISA was not thumb this breaks build for machines/distros which do not use ARM_INSTRUCTION_SET = thumb
--- meta-initramfs/recipes-devtools/klibc/klibc.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-initramfs/recipes-devtools/klibc/klibc.inc +1 -1
@@ -42,7 +42,7 @@ EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ " export FIX_ARMV4_EABI_BX = "${FIX_V4BX}" -KLIBCTHUMB = "${@['', 'CONFIG_KLIBC_THUMB=y'][(d.getVar('ARM_INSTRUCTION_SET') == 'thumb')]}" +KLIBCTHUMB = "${@['CONFIG_KLIBC_THUMB=n', 'CONFIG_KLIBC_THUMB=y'][(d.getVar('ARM_INSTRUCTION_SET') == 'thumb')]}" do_configure () { ln -sf "${STAGING_DIR_TARGET}${exec_prefix}" linux
Signature · 1 line
2.13.2
PATCH 2/18 libteam: Upgrade to 1.27
Fix build with musl
---
...nclude-sys-select.h-for-fd_set-definition.patch | 28 +++++++++++++++
...0002-teamd-Re-adjust-include-header-order.patch | 40 ++++++++++++++++++++++
.../libteam/{libteam_1.26.bb => libteam_1.27.bb} | 7 ++--
3 files changed, 73 insertions(+), 2 deletions(-)
create mode 100644 meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch
create mode 100644 meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch
rename meta-oe/recipes-support/libteam/{libteam_1.26.bb => libteam_1.27.bb} (75%)meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch new file +28 -0
@@ -0,0 +1,28 @@ +From 0ab69dc18a2057ff5bf41abcdf2b983b72d5a903 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 12 Jul 2017 15:34:49 -0700 +Subject: [PATCH 1/2] include sys/select.h for fd_set definition + +Fixes +teamnl.c:160:2: error: unknown type name 'fd_set'; did you mean 'fpos_t'? + +Signed-off-by: Khem Raj <[email protected]> +--- + utils/teamnl.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/utils/teamnl.c b/utils/teamnl.c +index e8de7e2..25129e8 100644 +--- a/utils/teamnl.c ++++ b/utils/teamnl.c +@@ -24,6 +24,7 @@ + #include <getopt.h> + #include <errno.h> + #include <sys/signalfd.h> ++#include <sys/select.h> + #include <signal.h> + #include <unistd.h> + #include <team.h> +-- +2.13.2 +
meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch new file +40 -0
@@ -0,0 +1,40 @@ +From a5b945cb3c62a18dcd7047f62707c09076c4e48b Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 12 Jul 2017 15:35:51 -0700 +Subject: [PATCH 2/2] teamd: Re-adjust include header order + +So it gets the library definition before kernel definition + +usr/include/ne +tinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' + struct ethhdr { + ^~~~~~ + +Signed-off-by: Khem Raj <[email protected]> +--- + teamd/teamd_runner_lacp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/teamd/teamd_runner_lacp.c b/teamd/teamd_runner_lacp.c +index 9c77fae..8800854 100644 +--- a/teamd/teamd_runner_lacp.c ++++ b/teamd/teamd_runner_lacp.c +@@ -23,6 +23,7 @@ + #include <unistd.h> + #include <limits.h> + #include <sys/ioctl.h> ++#include <net/ethernet.h> + #include <linux/if_ether.h> + #include <sys/socket.h> + #include <linux/netdevice.h> +@@ -30,7 +31,6 @@ + #include <errno.h> + #include <team.h> + #include <private/misc.h> +-#include <net/ethernet.h> + + #include "teamd.h" + #include "teamd_config.h" +-- +2.13.2 +
meta-oe/recipes-support/libteam/libteam_1.27.bb renamed from meta-oe/recipes-support/libteam/libteam_1.26.bb +5 -2
@@ -7,8 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libnl libdaemon jansson" -SRC_URI = "git://github.com/jpirko/libteam" -SRCREV = "8c1cea00a21950089058e4e33ea1f7bf4deaddeb" +SRC_URI = "git://github.com/jpirko/libteam \ + file://0001-include-sys-select.h-for-fd_set-definition.patch \ + file://0002-teamd-Re-adjust-include-header-order.patch \ + " +SRCREV = "91a928a56a501daac5ce8b3c16bd9943661f1d16" SRC_URI[md5sum] = "565114d70c41bff6093d8e57be284e8a" SRC_URI[sha256sum] = "d65286379141db141bea33424ec0507bb0f827a0bf03d9c65004bb593e3d5545"
Signature · 1 line
2.13.2
PATCH 3/18 sox: Fix build with musl
In reply to Khem Raj--- ...error-line-and-live-without-file-type-det.patch | 28 ++++++++++++++++++++++ .../recipes-multimedia/sox/sox_14.4.0.bb | 4 +++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch
meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch new file +28 -0
@@ -0,0 +1,28 @@ +From c2aed28e3e14329ad0a8c4371fdcce9934013f21 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 12 Jul 2017 16:36:06 -0700 +Subject: [PATCH] remove the #error line and live without file-type detection + with pipes + +this fallback is executed with musl + +Signed-off-by: Khem Raj <[email protected]> +--- + src/formats.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/formats.c b/src/formats.c +index 7e231ca..b13f0d5 100644 +--- a/src/formats.c ++++ b/src/formats.c +@@ -416,7 +416,6 @@ static void UNUSED rewind_pipe(FILE * fp) + /* To fix this #error, either simply remove the #error line and live without + * file-type detection with pipes, or add support for your compiler in the + * lines above. Test with cat monkey.au | ./sox --info - */ +- #error FIX NEEDED HERE + #define NO_REWIND_PIPE + (void)fp; + #endif +-- +2.13.2 +
meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb +3 -1
@@ -27,7 +27,9 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24" -SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz \ + file://0001-remove-the-error-line-and-live-without-file-type-det.patch \ + " SRC_URI[md5sum] = "b0c15cff7a4ba0ec17fdc74e6a1f9cf1" SRC_URI[sha256sum] = "3ee34b14dd267de378e8a117aae81ec4cae330772342e6a55bbf6520a0a88aa3"
Signature · 1 line
2.13.2
PATCH 4/18 webrtc-audio-processing: Link with libexecinfo on musl
In reply to Khem Raj--- .../webrtc-audio-processing/webrtc-audio-processing_0.3.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing_0.3.bb +3 -0
@@ -2,6 +2,8 @@ DESCRIPTION = "Audio processing bits of the WebRTC reference implementation" HOMEPAGE = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing/" SECTION = "audio" +DEPENDS_append_libc-musl = " libexecinfo" + LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=da08a38a32a340c5d91e13ee86a118f2 \ file://webrtc/common.h;beginline=1;endline=9;md5=41f7322d91deabaf0acbbd0b8d0bc548 \
@@ -22,4 +24,5 @@ SRC_URI = "http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/${ SRC_URI[md5sum] = "336ae032f608e65808ac577cde0ab72c" SRC_URI[sha256sum] = "756e291d4f557d88cd50c4fe3b8454ec238362d22cedb3e6173240d90f0a80fa" +LDFLAGS_append_libc-musl = " -lexecinfo" inherit autotools
Signature · 1 line
2.13.2
PATCH 5/18 cdparanoia: Fix build with musl
In reply to Khem Raj--- .../cdparanoia/cdparanoia_10.2.bb | 1 + ...-utils-Use-c99-compiler-independent-types.patch | 49 ++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 meta-multimedia/recipes-multimedia/cdparanoia/files/0001-utils-Use-c99-compiler-independent-types.patch
meta-multimedia/recipes-multimedia/cdparanoia/cdparanoia_10.2.bb +1 -0
@@ -15,6 +15,7 @@ SRC_URI = "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-${PV}.sr file://out-of-tree-build.patch \ file://0001-check-for-null-buffer-before-trying-a-byteswap.patch \ file://0002-Fix-printf-format-errors.patch \ + file://0001-utils-Use-c99-compiler-independent-types.patch \ " SRC_URI[md5sum] = "b304bbe8ab63373924a744eac9ebc652" SRC_URI[sha256sum] = "005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df"
meta-multimedia/recipes-multimedia/cdparanoia/files/0001-utils-Use-c99-compiler-independent-types.patch new file +49 -0
49 lines not on this page · raw message
Signature · 1 line
2.13.2
PATCH 6/18 lightmediascanner: Define comparison_fn_t if undefined
In reply to Khem Raj--- ...ine-comparison_fn_t-for-non-glibc-systems.patch | 33 ++++++++++++++++++++++ .../lightmediascanner/lightmediascanner_0.5.1.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta-efl/recipes-multimedia/lightmediascanner/files/0001-Define-comparison_fn_t-for-non-glibc-systems.patch
meta-efl/recipes-multimedia/lightmediascanner/files/0001-Define-comparison_fn_t-for-non-glibc-systems.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 5bc5b8c5dad3edec6736fd7e7ce61250c4ce3725 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 12 Jul 2017 17:13:19 -0700 +Subject: [PATCH] Define comparison_fn_t for non-glibc systems + +lightmediascanner.c:324:12: error: 'comparison_fn_t' undeclared (first use in this function) + (comparison_fn_t)_plugin_sort); + ^~~~~~~~~~~~~~~ + +Signed-off-by: Khem Raj <[email protected]> +--- + src/lib/lightmediascanner.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/lib/lightmediascanner.c b/src/lib/lightmediascanner.c +index 344b247..b866883 100644 +--- a/src/lib/lightmediascanner.c ++++ b/src/lib/lightmediascanner.c +@@ -37,6 +37,11 @@ + #define DEFAULT_SLAVE_TIMEOUT 1000 + #define DEFAULT_COMMIT_INTERVAL 100 + ++#if !defined(__GLIBC__) ++typedef int (*__compar_fn_t) (const void*, const void*); ++typedef __compar_fn_t comparison_fn_t; ++#endif ++ + #ifdef HAVE_MAGIC_H + static magic_t _magic_handle; + +-- +2.13.2 +
meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.5.1.bb +1 -0
@@ -12,6 +12,7 @@ PV = "0.5.1+git${SRCPV}" SRCREV = "adfddb3486276a5ed2f5008c9e43a811e1271cc9" SRC_URI = "git://github.com/profusion/lightmediascanner.git \ file://id3-plugin-support-out-of-tree-build.patch \ + file://0001-Define-comparison_fn_t-for-non-glibc-systems.patch \ " S = "${WORKDIR}/git"
Signature · 1 line
2.13.2
PATCH 7/18 lmbench: Fix build with musl
In reply to Khem Raj--- ...usl-define-guard-before-redefining-sockle.patch | 29 +++++++++ ...t-CFLAGS-LDFLAGS-to-append-values-passed-.patch | 76 ++++++++++++++++++++++ .../recipes-benchmark/lmbench/lmbench_3.0-a9.bb | 8 ++- 3 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-Check-for-musl-define-guard-before-redefining-sockle.patch create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch
meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-Check-for-musl-define-guard-before-redefining-sockle.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 31d58ed7e6552781f415501e96d7cc74f83b910d Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 12 Jul 2017 18:08:51 -0700 +Subject: [PATCH 1/2] Check for musl define guard before redefining socklen_t + +musl uses __DEFINED_socklen_t so check for that as well +along with HAVE_socklen_t + +Signed-off-by: Khem Raj <[email protected]> +--- + src/bench.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bench.h b/src/bench.h +index 597d068..2ebdf5a 100644 +--- a/src/bench.h ++++ b/src/bench.h +@@ -77,7 +77,7 @@ typedef long long int64; + #endif /* HAVE_int64_t */ + #endif /* HAVE_int64 */ + +-#ifndef HAVE_socklen_t ++#if !defined(HAVE_socklen_t) && !defined(__DEFINED_socklen_t) + typedef int socklen_t; + #endif + +-- +2.13.2 +
meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch new file +76 -0
76 lines not on this page · raw message
meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +7 -1
@@ -7,6 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ inherit autotools-brokensep +DEPENDS_append_libc-musl = " libtirpc" +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDLIBS_append_libc-musl = " -ltirpc " + PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \
@@ -20,12 +24,14 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ file://fix-lmbench-memory-check-failure.patch \ file://0001-avoid-gcc-optimize-away-the-loops.patch \ file://0001-lat_http.c-Add-printf-format.patch \ + file://0001-Check-for-musl-define-guard-before-redefining-sockle.patch \ + file://0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch \ " SRC_URI[md5sum] = "b3351a3294db66a72e2864a199d37cbf" SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551" EXTRA_OEMAKE = 'CC="${CC}" AR="${AR}" RANLIB="${RANLIB}" CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" LD="${LD}" OS="${TARGET_SYS}" \ + LDFLAGS="${LDFLAGS}" LDLIBS="${LDLIBS}" LD="${LD}" OS="${TARGET_SYS}" \ TARGET="${TARGET_OS}" BASE="${prefix}" MANDIR="${mandir}"' do_configure() {
Signature · 1 line
2.13.2
PATCH 8/18 xfce4-netload-plugin: Do not include sys/sysctl.h
In reply to Khem RajIts unused, moreover it helps it compile with musl
--- ...ude-sys-sysctl.h-its-unused-on-linux-port.patch | 25 ++++++++++++++++++++++ .../netload/xfce4-netload-plugin_1.3.1.bb | 3 +++ 2 files changed, 28 insertions(+) create mode 100644 meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch
meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch new file +25 -0
@@ -0,0 +1,25 @@ +From 7fcc7352ec11644ac8be4e9ec1584a5be3333684 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 12 Jul 2017 18:18:30 -0700 +Subject: [PATCH] Do not include sys/sysctl.h its unused on linux port + +Signed-off-by: Khem Raj <[email protected]> +--- + panel-plugin/os.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/panel-plugin/os.h b/panel-plugin/os.h +index 473c2a4..9a5c544 100644 +--- a/panel-plugin/os.h ++++ b/panel-plugin/os.h +@@ -170,7 +170,6 @@ + #elif __linux__ /* L I N U X */ + # include <stdio.h> + # include <sys/param.h> +-# include <sys/sysctl.h> + # include <stdlib.h> + # include <stdarg.h> + # include <unistd.h> +-- +2.13.2 +
meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb +3 -0
@@ -5,5 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=35a7203c41b86d15546dddc05995f97f" inherit xfce-panel-plugin +SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2 \ + file://0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch \ + " SRC_URI[md5sum] = "f25aa3242e3119b49f259a3e4a1af08b" SRC_URI[sha256sum] = "99762781099d1e0ab9aa6a7b30c2bd94d8f658dbe61c760410d5d42d0766391c"
Signature · 1 line
2.13.2
Re: [meta-xfce][PATCH 08/18] xfce4-netload-plugin: Do not include sys/sysctl.h
Quoted 54 lines · Khem Raj
Its unused, moreover it helps it compile with musl
Signed-off-by Khem Raj <[email protected]>--- ...ude-sys-sysctl.h-its-unused-on-linux-port.patch | 25 ++++++++++++++++++++++ .../netload/xfce4-netload-plugin_1.3.1.bb | 3 +++ 2 files changed, 28 insertions(+) create mode 100644 meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patchmeta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch new file +25
-0@@ -0,0 +1,25 @@ +From 7fcc7352ec11644ac8be4e9ec1584a5be3333684 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 12 Jul 2017 18:18:30 -0700 +Subject: [PATCH] Do not include sys/sysctl.h its unused on linux port + +Signed-off-by: Khem Raj <[email protected]> +--- + panel-plugin/os.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/panel-plugin/os.h b/panel-plugin/os.h +index 473c2a4..9a5c544 100644 +--- a/panel-plugin/os.h ++++ b/panel-plugin/os.h +@@ -170,7 +170,6 @@ + #elif __linux__ /* L I N U X */ + # include <stdio.h> + # include <sys/param.h> +-# include <sys/sysctl.h> + # include <stdlib.h> + # include <stdarg.h> + # include <unistd.h> +-- +2.13.2 +meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb +3
-1@@ -5,5 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=35a7203c41b86d15546dddc05995f97f" inherit xfce-panel-plugin +SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2 \ + file://0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch \ + " SRC_URI[md5sum] = "f25aa3242e3119b49f259a3e4a1af08b" SRC_URI[sha256sum] = "99762781099d1e0ab9aa6a7b30c2bd94d8f658dbe61c760410d5d42d0766391c" --
Quoted 2 lines
2.13.2
Please add Upstream-Status (or even better - send the xfce patches upstream)
Andreas
Re: [meta-xfce][PATCH 08/18] xfce4-netload-plugin: Do not include sys/sysctl.h
Quoted 49 lines · Andreas Müller
Quoted 48 lines · Khem Raj
Its unused, moreover it helps it compile with musl
Signed-off-by Khem Raj <[email protected]>--- ...ude-sys-sysctl.h-its-unused-on-linux-port.patch | 25 ++++++++++++++++++++++ .../netload/xfce4-netload-plugin_1.3.1.bb | 3 +++ 2 files changed, 28 insertions(+) create mode 100644 meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patchmeta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch new file +25
-0@@ -0,0 +1,25 @@ +From 7fcc7352ec11644ac8be4e9ec1584a5be3333684 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 12 Jul 2017 18:18:30 -0700 +Subject: [PATCH] Do not include sys/sysctl.h its unused on linux port + +Signed-off-by: Khem Raj <[email protected]> +--- + panel-plugin/os.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/panel-plugin/os.h b/panel-plugin/os.h +index 473c2a4..9a5c544 100644 +--- a/panel-plugin/os.h ++++ b/panel-plugin/os.h +@@ -170,7 +170,6 @@ + #elif __linux__ /* L I N U X */ + # include <stdio.h> + # include <sys/param.h> +-# include <sys/sysctl.h> + # include <stdlib.h> + # include <stdarg.h> + # include <unistd.h> +-- +2.13.2 +meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb +0
-0@@ -5,5 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=35a7203c41b86d15546dddc05995f97f" inherit xfce-panel-plugin
Quoted 10 lines
Quoted 8 lines
meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb +3
-1+SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2 \ + file://0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch \ + " SRC_URI[md5sum] = "f25aa3242e3119b49f259a3e4a1af08b" SRC_URI[sha256sum] = "99762781099d1e0ab9aa6a7b30c2bd94d8f658dbe61c760410d5d42d0766391c" --2.13.2
Please add Upstream-Status (or even better - send the xfce patches upstream)
help me upstream it
Quoted 1 line
Andreas
Re: [meta-xfce][PATCH 08/18] xfce4-netload-plugin: Do not include sys/sysctl.h
Quoted 62 lines · Khem Raj
Quoted 49 lines · Andreas Müller
Quoted 48 lines · Khem Raj
Its unused, moreover it helps it compile with musl
Signed-off-by Khem Raj <[email protected]>--- ...ude-sys-sysctl.h-its-unused-on-linux-port.patch | 25 ++++++++++++++++++++++ .../netload/xfce4-netload-plugin_1.3.1.bb | 3 +++ 2 files changed, 28 insertions(+) create mode 100644 meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patchmeta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch new file +25
-0@@ -0,0 +1,25 @@ +From 7fcc7352ec11644ac8be4e9ec1584a5be3333684 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 12 Jul 2017 18:18:30 -0700 +Subject: [PATCH] Do not include sys/sysctl.h its unused on linux port + +Signed-off-by: Khem Raj <[email protected]> +--- + panel-plugin/os.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/panel-plugin/os.h b/panel-plugin/os.h +index 473c2a4..9a5c544 100644 +--- a/panel-plugin/os.h ++++ b/panel-plugin/os.h +@@ -170,7 +170,6 @@ + #elif __linux__ /* L I N U X */ + # include <stdio.h> + # include <sys/param.h> +-# include <sys/sysctl.h> + # include <stdlib.h> + # include <stdarg.h> + # include <unistd.h> +-- +2.13.2 +meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb +0
-0@@ -5,5 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=35a7203c41b86d15546dddc05995f97f" inherit xfce-panel-pluginQuoted 10 lines
Quoted 8 lines
meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb +3
-1+SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2 \ + file://0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch \ + " SRC_URI[md5sum] = "f25aa3242e3119b49f259a3e4a1af08b" SRC_URI[sha256sum] = "99762781099d1e0ab9aa6a7b30c2bd94d8f658dbe61c760410d5d42d0766391c" --2.13.2
Please add Upstream-Status (or even better - send the xfce patches upstream)
Quoted 2 lines
help me upstream it
OK - but I think the next 2-3 weeks there is no time for that
Andreas
PATCH 9/18 imsettings: Fix build with musl
In reply to Khem Raj--- .../0001-Rename-use-of-stdout-and-stderr.patch | 72 ++++++++++++++++++++++ .../imsettings/imsettings_1.7.2.bb | 4 +- 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 meta-xfce/recipes-extended/imsettings/imsettings/0001-Rename-use-of-stdout-and-stderr.patch
meta-xfce/recipes-extended/imsettings/imsettings/0001-Rename-use-of-stdout-and-stderr.patch new file +72 -0
@@ -0,0 +1,72 @@ +From 7ee62ef0083844ab2fffcd106e3ee2e5f29b2a91 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 12 Jul 2017 18:53:56 -0700 +Subject: [PATCH] Rename use of stdout and stderr + +Since it shadow the standard definitions especially +seen on musl where libc defines these as macros they +cause all short of compilation errors on musl, using +a leading underscore makes it unique + +Signed-off-by: Khem Raj <[email protected]> +--- + imsettings-daemon/imsettings-proc.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/imsettings-daemon/imsettings-proc.c b/imsettings-daemon/imsettings-proc.c +index 915e78b..b78fcff 100644 +--- a/imsettings-daemon/imsettings-proc.c ++++ b/imsettings-daemon/imsettings-proc.c +@@ -39,8 +39,8 @@ + #define MAXRESTART 3 + + typedef struct _IMSettingsProcInfo { +- GIOChannel *stdout; +- GIOChannel *stderr; ++ GIOChannel *_stdout; ++ GIOChannel *_stderr; + GPid pid; + GTimeVal started_time; + guint id; +@@ -368,12 +368,12 @@ _start_process(IMSettingsProc *proc, + &ofd, &efd, + error)) { + pinfo->pid = pid; +- pinfo->stdout = g_io_channel_unix_new(ofd); +- pinfo->stderr = g_io_channel_unix_new(efd); +- g_io_channel_set_close_on_unref(pinfo->stdout, TRUE); +- g_io_channel_set_close_on_unref(pinfo->stderr, TRUE); +- pinfo->oid = g_io_add_watch(pinfo->stdout, G_IO_IN, _log_write_cb, proc); +- pinfo->eid = g_io_add_watch(pinfo->stderr, G_IO_IN, _log_write_cb, proc); ++ pinfo->_stdout = g_io_channel_unix_new(ofd); ++ pinfo->_stderr = g_io_channel_unix_new(efd); ++ g_io_channel_set_close_on_unref(pinfo->_stdout, TRUE); ++ g_io_channel_set_close_on_unref(pinfo->_stderr, TRUE); ++ pinfo->oid = g_io_add_watch(pinfo->_stdout, G_IO_IN, _log_write_cb, proc); ++ pinfo->eid = g_io_add_watch(pinfo->_stderr, G_IO_IN, _log_write_cb, proc); + g_get_current_time(&pinfo->started_time); + pinfo->id = g_child_watch_add(pid, _watch_im_status_cb, proc); + +@@ -521,13 +521,13 @@ imsettings_proc_get_property(GObject *object, + static void + imsettings_proc_info_finalize(IMSettingsProcInfo *pinfo) + { +- if (pinfo->stdout) { +- g_io_channel_unref(pinfo->stdout); +- pinfo->stdout = NULL; ++ if (pinfo->_stdout) { ++ g_io_channel_unref(pinfo->_stdout); ++ pinfo->_stdout = NULL; + } +- if (pinfo->stderr) { +- g_io_channel_unref(pinfo->stderr); +- pinfo->stderr = NULL; ++ if (pinfo->_stderr) { ++ g_io_channel_unref(pinfo->_stderr); ++ pinfo->_stderr = NULL; + } + if (pinfo->oid > 0) { + g_source_remove(pinfo->oid); +-- +2.13.2 +
meta-xfce/recipes-extended/imsettings/imsettings_1.7.2.bb +3 -1
@@ -11,7 +11,9 @@ inherit autotools gtk-doc gobject-introspection SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \ file://gtk-is-required-by-notify.patch \ - file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch" + file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch \ + file://0001-Rename-use-of-stdout-and-stderr.patch \ + " SRC_URI[md5sum] = "8153b0583a9f47d8a62af1f92fb9d3bf" SRC_URI[sha256sum] = "41addf0458f760212b6b6100835066e16deb3a8a50eb005a0fc17fbac0a2ae66"
Signature · 1 line
2.13.2
PATCH 10/18 gedit: Define ACCESSPERMS if not defined already
In reply to Khem RajFixes build on musl
--- ...ent-saver.c-Define-ACCESSPERMS-if-not-def.patch | 31 ++++++++++++++++++++++ meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb | 11 ++++---- 2 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch
meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch new file +31 -0
@@ -0,0 +1,31 @@ +From ee43bcc3c8d69fe56a64c3487e2d3c780ea5d25e Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 13 Jul 2017 06:53:35 -0700 +Subject: [PATCH] tests/document-saver.c: Define ACCESSPERMS if not defined + already + +Helps compile with musl + +Signed-off-by: Khem Raj <[email protected]> +--- + tests/document-saver.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/document-saver.c b/tests/document-saver.c +index 9f44d5a..811ade6 100644 +--- a/tests/document-saver.c ++++ b/tests/document-saver.c +@@ -41,6 +41,10 @@ + #define UNOWNED_GROUP_LOCAL_URI "/tmp/gedit-document-saver-unowned-group.txt" + #define UNOWNED_GROUP_REMOTE_URI "sftp://localhost/tmp/gedit-document-saver-unowned-group.txt" + ++#if !defined(ACCESSPERMS) ++#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ ++#endif ++ + static gboolean test_completed; + static gboolean mount_completed; + static gboolean mount_success; +-- +2.13.2 +
meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb +6 -5
@@ -8,11 +8,12 @@ DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 gtk+ gtksourceview2 iso-c LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit gnome gettext pythonnative -SRC_URI+= " \ - file://0001-workaround-void-pointer-arithmetic.patch \ - file://0001-Remove-help-directory-from-build.patch \ - file://0002-suppress-string-format-literal-warning-to-fix-build-.patch \ -" +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ + file://0001-workaround-void-pointer-arithmetic.patch \ + file://0001-Remove-help-directory-from-build.patch \ + file://0002-suppress-string-format-literal-warning-to-fix-build-.patch \ + file://0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch \ + " SRC_URI[archive.md5sum] = "e1eecb0a92a1a363b3d375ec5ac0fb3b" SRC_URI[archive.sha256sum] = "a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c" GNOME_COMPRESS_TYPE="bz2"
Signature · 1 line
2.13.2
PATCH 11/18 onboard: Fix build with musl
In reply to Khem Raj--- ...m-Define-error-API-if-platform-does-not-h.patch | 67 ++++++++++++++++++++++ .../recipes-support/onboard/onboard_1.4.1.bb | 4 +- 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch
meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch new file +67 -0
@@ -0,0 +1,67 @@ +From 1c95f64aa342147387ce4b1b7269a5c8b34bd898 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 13 Jul 2017 09:01:04 -0700 +Subject: [PATCH] pypredict/lm: Define error API if platform does not have it + +error() API is not implemented across all libcs on linux +e.g. musl does not provide it. + +Signed-off-by: Khem Raj <[email protected]> +--- + Onboard/pypredict/lm/lm.cpp | 1 - + Onboard/pypredict/lm/lm.h | 13 +++++++++++++ + Onboard/pypredict/lm/lm_dynamic.cpp | 2 -- + 3 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/Onboard/pypredict/lm/lm.cpp b/Onboard/pypredict/lm/lm.cpp +index 2e64296..37ae241 100644 +--- a/Onboard/pypredict/lm/lm.cpp ++++ b/Onboard/pypredict/lm/lm.cpp +@@ -19,7 +19,6 @@ + + #include <stdlib.h> + #include <stdio.h> +-#include <error.h> + #include <algorithm> + #include <cmath> + #include <string> +diff --git a/Onboard/pypredict/lm/lm.h b/Onboard/pypredict/lm/lm.h +index ed4164a..b8b63ee 100644 +--- a/Onboard/pypredict/lm/lm.h ++++ b/Onboard/pypredict/lm/lm.h +@@ -32,6 +32,19 @@ + #include <algorithm> + #include <string> + ++#if defined(HAVE_ERROR_H) ++#include <error.h> ++#else ++#include <err.h> ++#define _onboard_error(S, E, F, ...) do { \ ++ if (E) \ ++ err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \ ++ else \ ++ err(S, F, ##__VA_ARGS__); \ ++} while(0) ++ ++#define error _onboard_error ++#endif + + // break into debugger + // step twice to come back out of the raise() call into known code +diff --git a/Onboard/pypredict/lm/lm_dynamic.cpp b/Onboard/pypredict/lm/lm_dynamic.cpp +index 7c62824..e7c7f40 100644 +--- a/Onboard/pypredict/lm/lm_dynamic.cpp ++++ b/Onboard/pypredict/lm/lm_dynamic.cpp +@@ -17,8 +17,6 @@ + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +-#include <error.h> +- + #include "lm_dynamic.h" + + using namespace std; +-- +2.13.2 +
meta-gnome/recipes-support/onboard/onboard_1.4.1.bb +3 -1
@@ -4,7 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING.GPL3;md5=8521fa4dd51909b407c5150498d34f4e" DEPENDS += "gtk+3 hunspell libcanberra libxkbfile dconf python3-distutils-extra-native intltool-native" -SRC_URI = "https://launchpad.net/onboard/1.4/${PV}/+download/${BPN}-${PV}.tar.gz" +SRC_URI = "https://launchpad.net/onboard/1.4/${PV}/+download/${BPN}-${PV}.tar.gz \ + file://0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch \ + " SRC_URI[md5sum] = "1a2fbe82e934f5b37841d17ff51e80e8" SRC_URI[sha256sum] = "01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865"
Signature · 1 line
2.13.2
PATCH 12/18 libgtop: Fix build with musl
In reply to Khem Raj--- ...-Include-libc-net-headers-unconditionally.patch | 46 ++++++++++++++++++++++ meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb | 3 ++ 2 files changed, 49 insertions(+) create mode 100644 meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch
meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch new file +46 -0
@@ -0,0 +1,46 @@ +From 3c6f70e50cb586ac4add4dea627c316242691040 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 13 Jul 2017 09:17:29 -0700 +Subject: [PATCH] netload: Include libc net headers unconditionally + +This fixes compile with musl, and this conditional +is not needed now a days if we are still using glibc < 1.0 +we have other bigger problems + +Signed-off-by: Khem Raj <[email protected]> +--- + sysdeps/linux/netload.c | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/sysdeps/linux/netload.c b/sysdeps/linux/netload.c +index c275db2..446bddd 100644 +--- a/sysdeps/linux/netload.c ++++ b/sysdeps/linux/netload.c +@@ -34,8 +34,6 @@ + #include <sys/socket.h> + #include <sys/ioctl.h> + +-#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1 +-/* GNU LibC */ + #include <net/if.h> + #include <netinet/ip_icmp.h> + #include <netinet/in.h> +@@ -43,15 +41,6 @@ + #include <netinet/tcp.h> + #include <netinet/udp.h> + #include <net/if.h> +-#else /* Libc 5 */ +-#include <linux/if.h> +-#include <linux/in.h> +-#include <linux/ip.h> +-#include <linux/icmp.h> +-#include <linux/tcp.h> +-#include <linux/udp.h> +-#endif +- + + #ifdef HAVE_IFADDRS_H + /* needed for IPV6 support */ +-- +2.13.2 +
meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb +3 -0
@@ -6,6 +6,9 @@ inherit gnomebase lib_package gtk-doc distro_features_check gobject-introspectio # depends on libxau REQUIRED_DISTRO_FEATURES = "x11" +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ + file://0001-netload-Include-libc-net-headers-unconditionally.patch \ + " SRC_URI[archive.md5sum] = "ee29a9ef60659ebf4b075ac281f71cb2" SRC_URI[archive.sha256sum] = "463bcbe5737b1b93f3345ee34abf601e8eb864f507c49ff1921c2737abafc1e5"
Signature · 1 line
2.13.2
PATCH 13/18 netdata: Upgrade to 1.6.0
In reply to Khem RajLicence files has gotten cosmetic changes
additionally checksum COPYING file.
--- .../netdata/0001-Correct-Timeout-issue.patch | 32 ++++++++++++---------- .../0001-makefile-Do-not-build-contrib-dir.patch | 27 ++++++++++++++++++ .../recipes-webadmin/netdata/netdata_git.bb | 14 ++++++---- 3 files changed, 53 insertions(+), 20 deletions(-) create mode 100644 meta-webserver/recipes-webadmin/netdata/netdata/0001-makefile-Do-not-build-contrib-dir.patch
meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch +17 -15
@@ -1,19 +1,21 @@ -diff --git a/plugins.d/charts.d.plugin b/plugins.d/charts.d.plugin -index 40c0356..bca57b3 100755 ---- a/plugins.d/charts.d.plugin -+++ b/plugins.d/charts.d.plugin -@@ -184,10 +184,10 @@ fi - # timeout command we use, providing a function that - # can emulate the timeout command we need: - # > timeout SECONDS command ... +Index: git/plugins.d/charts.d.plugin +=================================================================== +--- git.orig/plugins.d/charts.d.plugin ++++ git/plugins.d/charts.d.plugin +@@ -246,16 +246,6 @@ else + info "configuration file '$myconfig' not found. Using defaults." + fi + +-# we check for the timeout command, after we load our +-# configuration, so that the user may overwrite the +-# timeout command we use, providing a function that +-# can emulate the timeout command we need: +-# > timeout SECONDS command ... -if [ $check_for_timeout -eq 1 ] -- then -- require_cmd timeout || exit 1 +- then +- require_cmd timeout || exit 1 -fi -+#if [ $check_for_timeout -eq 1 ] -+# then -+# require_cmd timeout || exit 1 -+#fi - +- # ----------------------------------------------------------------------------- # internal checks +
meta-webserver/recipes-webadmin/netdata/netdata/0001-makefile-Do-not-build-contrib-dir.patch new file +27 -0
@@ -0,0 +1,27 @@ +From 87f868918a9ae1dcf93e01f3e177d185c19a149a Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 13 Jul 2017 14:32:09 -0700 +Subject: [PATCH] makefile: Do not build contrib dir + +It contains debian build iteams anyway + +Signed-off-by: Khem Raj <[email protected]> +--- + Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 3ccf82f8..a852e529 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -52,7 +52,6 @@ SUBDIRS = \ + src \ + system \ + web \ +- contrib \ + $(NULL) + + dist_noinst_DATA= \ +-- +2.13.2 +
meta-webserver/recipes-webadmin/netdata/netdata_git.bb +9 -5
@@ -1,11 +1,15 @@ HOMEPAGE = "https://github.com/firehol/netdata/" SUMMARY = "Real-time performance monitoring" LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=747afe070ea9d6c2be0a31353609a35b" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a4a3b650ea3f74269cdfd45a3550e219 \ + file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + " -SRC_URI = "git://github.com/firehol/netdata.git;protocol=https" -SRCREV = "36c1304e37094174ea51001903058e65053107ca" -PV = "1.0.1+git${SRCPV}" +SRC_URI = "git://github.com/firehol/netdata.git;protocol=https \ + file://0001-makefile-Do-not-build-contrib-dir.patch \ +" +SRCREV = "f5fa346a188e906a8f2cce3c2cf32a88ce81c666" +PV = "1.6.0+git${SRCPV}" # patch to disable timeout because timeout are not available with actual version # of core-utils
@@ -19,7 +23,7 @@ SRC_URI += "file://netdata.service" S = "${WORKDIR}/git" -DEPENDS += "zlib" +DEPENDS += "zlib util-linux" inherit pkgconfig autotools useradd systemd
Signature · 1 line
2.13.2
PATCH 14/18 can-utils: Update to tip of master
In reply to Khem RajFixes build issues with musl
--- meta-oe/recipes-extended/socketcan/can-utils_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-extended/socketcan/can-utils_git.bb +1 -1
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://include/linux/can.h;endline=43;md5=390a2c9a3c5e3595a0 DEPENDS = "libsocketcan" SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git;branch=master" -SRCREV = "67a2bdcd336e6becfa5784742e18c88dbeddc973" +SRCREV = "4c8fb05cb4d6ddcd67299008db54af423f86fd05" PV = "0.0+gitr${SRCPV}"
Signature · 1 line
2.13.2
PATCH 15/18 kexec-tools-klibc: Fix build with musl
In reply to Khem Raj--- ...he-order-of-headers-to-fix-build-for-musl.patch | 30 ++++++++++++++++++++++ .../kexec/kexec-tools-klibc_2.0.2.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/0001-Adjust-the-order-of-headers-to-fix-build-for-musl.patch
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/0001-Adjust-the-order-of-headers-to-fix-build-for-musl.patch new file +30 -0
@@ -0,0 +1,30 @@ +From 86b962e7c0de43b20b6210d059e4855ce87078bc Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 13 Jul 2017 16:20:08 -0700 +Subject: [PATCH] Adjust the order of headers to fix build for musl + +Fixes +kexec/ifdown.c:33:16: error: storage size of 'ifc' isn't known + +Signed-off-by: Khem Raj <[email protected]> +--- + kexec/ifdown.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kexec/ifdown.c b/kexec/ifdown.c +index 2215798..e13f777 100644 +--- a/kexec/ifdown.c ++++ b/kexec/ifdown.c +@@ -16,8 +16,8 @@ char *v_ifdown = "@(#)ifdown.c 1.11 02-Jun-1998 [email protected]"; + #include <sys/time.h> + #include <errno.h> + +-#include <net/if.h> + #include <netinet/in.h> ++#include <net/if.h> + + #define MAX_IFS 64 + +-- +2.13.2 +
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb +1 -0
@@ -20,6 +20,7 @@ SRC_URI += " \ file://sha256.patch \ file://sysconf_nrprocessors.patch \ file://fix-out-of-tree-build.patch \ + file://0001-Adjust-the-order-of-headers-to-fix-build-for-musl.patch \ " SRC_URI_append_arm = " file://arm_crashdump.patch"
Signature · 1 line
2.13.2
PATCH 16/18 dracut: Upgrade to 045
In reply to Khem RajFix build on musl while here
--- ...-util.h-include-sys-reg.h-when-libc-glibc.patch | 33 ++++++++++++++++++++++ .../recipes-devtools/dracut/dracut_git.bb | 19 +++++++++---- 2 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch
meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 06011ce55b1e892e863568a73d64eebc6389544f Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 13 Jul 2017 17:14:05 -0700 +Subject: [PATCH] util.h: include <sys/reg.h> when libc != glibc + +For musl libc it is required to include <sys/reg.h> to +have __WORDSIZE defined to e.g. 32 for arm*-musl. + +Taken from void-linux +https://github.com/voidlinux/void-packages/blob/master/srcpkgs/dracut/patches/musl-__wordsize.patch + +Signed-off-by: Khem Raj <[email protected]> +--- + install/util.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/install/util.h b/install/util.h +index 2ad3254d..062626ec 100644 +--- a/install/util.h ++++ b/install/util.h +@@ -36,6 +36,9 @@ + #include <sys/stat.h> + #include <dirent.h> + #include <sys/resource.h> ++#if !defined(__GLIBC__) ++#include <sys/reg.h> ++#endif + + #include "macro.h" + +-- +2.13.2 +
meta-initramfs/recipes-devtools/dracut/dracut_git.bb +13 -6
@@ -5,13 +5,18 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" PE = "1" -PV = "044+git${SRCREV}" +PV = "045+git${SRCREV}" -# v044 tag -SRCREV = "1bc3e733f96033a508841e97fe08da7a12851782" -SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git;protocol=http" +# v045 tag +SRCREV = "39c9b67f86145953aa30def9d77c68597a4ccfe8" +SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git;protocol=http \ + file://0001-util.h-include-sys-reg.h-when-libc-glibc.patch \ + " -inherit bash-completion +DEPENDS += "kmod" +DEPENDS_append_libc-musl = " fts" + +inherit bash-completion pkgconfig S = "${WORKDIR}/git"
@@ -30,7 +35,9 @@ EXTRA_OECONF = "--prefix=${prefix} \ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,,systemd" -EXTRA_OEMAKE += 'libdir=${prefix}/lib' +EXTRA_OEMAKE += 'libdir=${prefix}/lib LDLIBS="${LDLIBS}"' + +LDLIBS_append_libc-musl = " -lfts" do_configure() { ./configure ${EXTRA_OECONF}
Signature · 1 line
2.13.2
PATCH 17/18 yaffs2-utils: Fix build with musl
In reply to Khem Raj--- ...0001-define-loff_t-if-not-already-defined.patch | 30 ++++++++++++++++++++++ .../recipes-filesystems/yaffs2/yaffs2-utils_git.bb | 3 ++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-define-loff_t-if-not-already-defined.patch
meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-define-loff_t-if-not-already-defined.patch new file +30 -0
@@ -0,0 +1,30 @@ +From 848717da4a28d33f8aa8f889377e61e6b1b8ae67 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 13 Jul 2017 18:29:52 -0700 +Subject: [PATCH] define loff_t if not already defined + +Helps to build with musl + +Signed-off-by: Khem Raj <[email protected]> +--- + yaffs_guts.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/yaffs_guts.h b/yaffs_guts.h +index 6bcf12d..4af17ce 100644 +--- a/yaffs_guts.h ++++ b/yaffs_guts.h +@@ -18,6 +18,10 @@ + + #include "yportenv.h" + ++#ifndef loff_t ++#define loff_t off_t ++#endif ++ + #define YAFFS_OK 1 + #define YAFFS_FAIL 0 + +-- +2.13.2 +
meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb +2 -1
@@ -14,7 +14,8 @@ DEPENDS = "mtd-utils" # Source is the HEAD of master branch at the time of writing this recipe SRC_URI = "git://www.aleph1.co.uk/yaffs2;protocol=git;branch=master \ file://makefile-add-ldflags.patch \ - " + file://0001-define-loff_t-if-not-already-defined.patch \ + " SRCREV = "bc76682d93955cfb33051beb503ad9f8a5450578" S = "${WORKDIR}/git"
Signature · 1 line
2.13.2
PATCH 18/18 logfsprogs: Rename setkey API to _setkey to not conflict with libc
In reply to Khem Raj--- ...-conflicts-with-libc-namespace-about-setk.patch | 135 +++++++++++++++++++++ .../logfsprogs/logfsprogs_git.bb | 3 +- 2 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-btree-Avoid-conflicts-with-libc-namespace-about-setk.patch
meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-btree-Avoid-conflicts-with-libc-namespace-about-setk.patch new file +135 -0
@@ -0,0 +1,135 @@ +From 5a8e26157d9642f022587cc1ca7525213c7a5379 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 13 Jul 2017 18:41:53 -0700 +Subject: [PATCH] btree: Avoid conflicts with libc namespace about setkey() + +This issue is highlighted with musl mainly because the +function signature from stdlib.h does not match the local +static function + +Signed-off-by: Khem Raj <[email protected]> +--- + btree.c | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +diff --git a/btree.c b/btree.c +index eddc33b..dd3fef9 100644 +--- a/btree.c ++++ b/btree.c +@@ -123,7 +123,7 @@ static unsigned long bval(struct btree_geo *geo, unsigned long *node, int n) + return node[geo->no_pairs * geo->keylen + n]; + } + +-static void setkey(struct btree_geo *geo, unsigned long *node, ++static void _setkey(struct btree_geo *geo, unsigned long *node, + unsigned long *key, int n) + { + longcpy(bkey(geo, node, n), key, geo->keylen); +@@ -292,7 +292,7 @@ static unsigned long *find_level(struct btree_head *head, struct btree_geo *geo, + /* FIXME: If the right-most key on higher levels is + * always zero, this wouldn't be necessary. */ + i--; +- setkey(geo, node, key, i); ++ _setkey(geo, node, key, i); + } + BUG_ON(i < 0); + node = (unsigned long *)bval(geo, node, i); +@@ -311,7 +311,7 @@ static int btree_grow(struct btree_head *head, struct btree_geo *geo) + return -ENOMEM; + if (head->node) { + fill = getfill(geo, head->node, 0); +- setkey(geo, node, bkey(geo, head->node, fill - 1), 0); ++ _setkey(geo, node, bkey(geo, head->node, fill - 1), 0); + setval(geo, node, (unsigned long)head->node, 0); + } + head->node = node; +@@ -342,16 +342,16 @@ static void steal_l(struct btree_head *head, struct btree_geo *geo, int level, + + for (i = rfill - 1; i >= 0; i--) { + /* Shift entries on the right */ +- setkey(geo, right, bkey(geo, right, i), i + no_entries); ++ _setkey(geo, right, bkey(geo, right, i), i + no_entries); + setval(geo, right, bval(geo, right, i), i + no_entries); + } + for (i = 0; i < no_entries; i++) { + /* Move some entries to the right */ +- setkey(geo, right, bkey(geo, left, lfill - no_entries + i), i); ++ _setkey(geo, right, bkey(geo, left, lfill - no_entries + i), i); + setval(geo, right, bval(geo, left, lfill - no_entries + i), i); + } + /* Set parent key */ +- setkey(geo, parent, bkey(geo, left, lfill - no_entries - 1), lpos); ++ _setkey(geo, parent, bkey(geo, left, lfill - no_entries - 1), lpos); + for (i = lfill - no_entries; i < lfill; i++) + clearpair(geo, left, i); + } +@@ -366,14 +366,14 @@ static void steal_r(struct btree_head *head, struct btree_geo *geo, int level, + + for (i = 0; i < no_entries; i++) { + /* Move some entries to the left */ +- setkey(geo, left, bkey(geo, right, i), lfill + i); ++ _setkey(geo, left, bkey(geo, right, i), lfill + i); + setval(geo, left, bval(geo, right, i), lfill + i); + } + /* Set parent key */ +- setkey(geo, parent, bkey(geo, right, no_entries - 1), lpos); ++ _setkey(geo, parent, bkey(geo, right, no_entries - 1), lpos); + /* Shift entries on the right */ + for ( ; i < rfill; i++) { +- setkey(geo, right, bkey(geo, right, i), i - no_entries); ++ _setkey(geo, right, bkey(geo, right, i), i - no_entries); + setval(geo, right, bval(geo, right, i), i - no_entries); + } + for (i = rfill - no_entries; i < rfill; i++) +@@ -399,14 +399,14 @@ static int split(struct btree_head *head, struct btree_geo *geo, + return err; + } + for (i = 0; i < fill / 2; i++) { +- setkey(geo, new, bkey(geo, node, i), i); ++ _setkey(geo, new, bkey(geo, node, i), i); + setval(geo, new, bval(geo, node, i), i); +- setkey(geo, node, bkey(geo, node, i + fill / 2), i); ++ _setkey(geo, node, bkey(geo, node, i + fill / 2), i); + setval(geo, node, bval(geo, node, i + fill / 2), i); + clearpair(geo, node, i + fill / 2); + } + if (fill & 1) { +- setkey(geo, node, bkey(geo, node, fill - 1), i); ++ _setkey(geo, node, bkey(geo, node, fill - 1), i); + setval(geo, node, bval(geo, node, fill - 1), i); + clearpair(geo, node, fill - 1); + } +@@ -487,10 +487,10 @@ retry: + + /* shift and insert */ + for (i = fill; i > pos; i--) { +- setkey(geo, node, bkey(geo, node, i - 1), i); ++ _setkey(geo, node, bkey(geo, node, i - 1), i); + setval(geo, node, bval(geo, node, i - 1), i); + } +- setkey(geo, node, key, pos); ++ _setkey(geo, node, key, pos); + setval(geo, node, val, pos); + + return 0; +@@ -513,7 +513,7 @@ static void merge(struct btree_head *head, struct btree_geo *geo, int level, + + for (i = 0; i < rfill; i++) { + /* Move all entries to the left */ +- setkey(geo, left, bkey(geo, right, i), lfill + i); ++ _setkey(geo, left, bkey(geo, right, i), lfill + i); + setval(geo, left, bval(geo, right, i), lfill + i); + } + /* Exchange left and right child in parent */ +@@ -615,7 +615,7 @@ static void *btree_remove_level(struct btree_head *head, struct btree_geo *geo, + + /* remove and shift */ + for (i = pos; i < fill - 1; i++) { +- setkey(geo, node, bkey(geo, node, i + 1), i); ++ _setkey(geo, node, bkey(geo, node, i + 1), i); + setval(geo, node, bval(geo, node, i + 1), i); + } + clearpair(geo, node, fill - 1); +-- +2.13.2 +
meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb +2 -1
@@ -13,7 +13,8 @@ DEPENDS = "zlib" SRC_URI = "git://github.com/prasad-joshi/logfsprogs.git \ file://0001-Add-LDFLAGS-to-linker-cmdline.patch \ -" + file://0001-btree-Avoid-conflicts-with-libc-namespace-about-setk.patch \ + " SRCREV = "45b72c81ce3c6fa17ca19bafc207ea93e76312f4" S = "${WORKDIR}/git"
Signature · 1 line
2.13.2