diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /import-layers/yocto-poky/meta/recipes-connectivity/socat/socat | |
parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
download | talos-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz talos-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-connectivity/socat/socat')
3 files changed, 119 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/socat/socat/0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch b/import-layers/yocto-poky/meta/recipes-connectivity/socat/socat/0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch new file mode 100644 index 000000000..c0e27f3d7 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-connectivity/socat/socat/0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch @@ -0,0 +1,52 @@ +From fb10ab134d630705cae0c7be42437cc289af7d32 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 15 Mar 2016 21:36:02 +0000 +Subject: [PATCH] Use __c_ispeed and __c_ospeed on musl + +Original intention of these asserts is to find if termios structure +is mapped correctly to locally define union, the get* APIs for +baudrate would not do the right thing since they do not return the +value from c_ospeed/c_ispeed but the value which is stored in iflag +for baudrate. + +So we check if we are on Linux but not using glibc then we use +__c_ispeed and __c_ospeed as defined in musl, however these are +internal elements of structs it should not have been used this +way. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- +Upstream-Status: Pending + + xioinitialize.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/xioinitialize.c b/xioinitialize.c +index 9f50155..8fb2e4c 100644 +--- a/xioinitialize.c ++++ b/xioinitialize.c +@@ -65,6 +65,12 @@ int xioinitialize(void) { + #if HAVE_TERMIOS_ISPEED && (ISPEED_OFFSET != -1) && (OSPEED_OFFSET != -1) + #if defined(ISPEED_OFFSET) && (ISPEED_OFFSET != -1) + #if defined(OSPEED_OFFSET) && (OSPEED_OFFSET != -1) ++#if defined(__linux__) && !defined(__GLIBC__) ++ tdata.termarg.__c_ispeed = 0x56789abc; ++ tdata.termarg.__c_ospeed = 0x6789abcd; ++ assert(tdata.termarg.__c_ispeed == tdata.speeds[ISPEED_OFFSET]); ++ assert(tdata.termarg.__c_ospeed == tdata.speeds[OSPEED_OFFSET]); ++#else + tdata.termarg.c_ispeed = 0x56789abc; + tdata.termarg.c_ospeed = 0x6789abcd; + assert(tdata.termarg.c_ispeed == tdata.speeds[ISPEED_OFFSET]); +@@ -72,6 +78,7 @@ int xioinitialize(void) { + #endif + #endif + #endif ++#endif + } + #endif + +-- +2.8.0 + diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/socat/socat/0001-define-NETDB_INTERNAL-to-1-if-not-available.patch b/import-layers/yocto-poky/meta/recipes-connectivity/socat/socat/0001-define-NETDB_INTERNAL-to-1-if-not-available.patch new file mode 100644 index 000000000..4bbd36766 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-connectivity/socat/socat/0001-define-NETDB_INTERNAL-to-1-if-not-available.patch @@ -0,0 +1,32 @@ +From e6a7d96fa3675bdd3f4d7a3d7682381789eef22f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 15 Feb 2016 20:25:34 +0000 +Subject: [PATCH] define NETDB_INTERNAL to -1 if not available + +helps build with musl + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + compat.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/compat.h b/compat.h +index c8bee4d..bfb013a 100644 +--- a/compat.h ++++ b/compat.h +@@ -666,6 +666,10 @@ typedef int sig_atomic_t; + # define NETDB_INTERNAL h_NETDB_INTERNAL + #endif + ++#if !defined(NETDB_INTERNAL) ++# define NETDB_INTERNAL (-1) ++#endif ++ + #ifndef INET_ADDRSTRLEN + # define INET_ADDRSTRLEN sizeof(struct sockaddr_in) + #endif +-- +2.7.1 + diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch b/import-layers/yocto-poky/meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch new file mode 100644 index 000000000..aa4db65a7 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch @@ -0,0 +1,35 @@ +From c6f0080b55679b6e8b5d332d6e05fdcbda1e4064 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Mon, 4 May 2015 00:58:47 -0700 +Subject: [PATCH] Makefile.in: fix for parallel build + +Fixed: +vsnprintf_r.o: file not recognized: File truncated +collect2: error: ld returned 3 exit status +Makefile:122: recipe for target 'filan' failed + +Let filan depend on vsnprintf_r.o and snprinterr.o to fix the issue. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index f2a6edb..88b784b 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -118,7 +118,7 @@ PROCAN_OBJS=procan_main.o procan.o procan-cdefs.o hostan.o error.o sycls.o sysut + procan: $(PROCAN_OBJS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(PROCAN_OBJS) $(CLIBS) + +-filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o ++filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o $(CLIBS) + + libxio.a: $(XIOOBJS) $(UTLOBJS) +-- +1.7.9.5 + |