summaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
Diffstat (limited to 'meta-networking')
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch47
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/Makefile.rules-cross.patch23
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/autofs-additional-distros.patch12
-rw-r--r--meta-networking/recipes-daemons/squid/files/Add-default-entry-for-cross-compile.patch31
-rw-r--r--meta-networking/recipes-support/curlpp/curlpp/pkgconfig_fix.patch38
-rw-r--r--meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-don-t-compile-documentation.patch38
-rw-r--r--meta-networking/recipes-support/wireshark/files/Do-not-set-CC_FOR_BUILD-flags.patch46
7 files changed, 0 insertions, 235 deletions
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch
deleted file mode 100644
index 742f25de1..000000000
--- a/meta-networking/recipes-daemons/autofs/autofs/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From 40971911d653bf53de295d7462c643e4073916b9 Mon Sep 17 00:00:00 2001
2From: Joe MacDonald <joe@deserted.net>
3Date: Fri, 1 Nov 2013 12:47:18 -0400
4Subject: [PATCH] systemd: allow --with-systemd to take a path arg
5
6If building for a cross-compile environment with systemd it is convenient
7to be able to specify a systemd path for the target that may not be the
8same as that on the host.
9
10Upstream-status: Submitted [http://www.spinics.net/lists/autofs/msg00740.html]
11
12Signed-off-by: Joe MacDonald <joe@deserted.net>
13---
14 aclocal.m4 | 10 ++++++++--
15 1 file changed, 8 insertions(+), 2 deletions(-)
16
17diff --git a/aclocal.m4 b/aclocal.m4
18index 3e6f223..105e3e9 100644
19--- a/aclocal.m4
20+++ b/aclocal.m4
21@@ -229,8 +229,10 @@ dnl Check the location of the systemd unit files directory
22 dnl --------------------------------------------------------------------------
23 AC_DEFUN([AF_WITH_SYSTEMD],
24 [AC_ARG_WITH(systemd,
25-[ --with-systemd install systemd unit file if systemd unit directory
26- is found on system],
27+[ --with-systemd@<:@=systemddir@:>@ install systemd unit file. If 'yes'
28+ probe the system for unit directory.
29+ If a path is specified, assume that
30+ is a valid install path.],
31 [if test "$withval" = yes; then
32 if test -z "$systemddir"; then
33 AC_MSG_CHECKING([location of the systemd unit files directory])
34@@ -247,6 +249,10 @@ AC_DEFUN([AF_WITH_SYSTEMD],
35 else
36 AC_MSG_RESULT(not found)
37 fi
38+else
39+ if test "$withval" != no; then
40+ systemddir=$withval
41+ fi
42 fi])
43 ])
44
45--
461.7.10.4
47
diff --git a/meta-networking/recipes-daemons/autofs/autofs/Makefile.rules-cross.patch b/meta-networking/recipes-daemons/autofs/autofs/Makefile.rules-cross.patch
deleted file mode 100644
index 7dc7096c2..000000000
--- a/meta-networking/recipes-daemons/autofs/autofs/Makefile.rules-cross.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Index: autofs-5.0.7/Makefile.rules
2===================================================================
3--- autofs-5.0.7.orig/Makefile.rules 2012-07-24 23:05:26.000000000 -0700
4+++ autofs-5.0.7/Makefile.rules 2012-10-26 09:23:40.270204270 -0700
5@@ -34,14 +34,14 @@
6 else
7 CFLAGS ?= -O2 -Wall
8 LDFLAGS = -s
9-STRIP = strip --strip-debug
10+STRIP = ${TARGET_PREFIX}strip --strip-debug
11 endif
12 endif
13
14-CC = gcc
15-CXX = g++
16+CC ?= ${TARGET_PREFIX}gcc
17+CXX ?= ${TARGET_PREFIX}g++
18 CXXFLAGS = $(CFLAGS)
19-LD = ld
20+LD ?= ${TARGET_PREFIX}ld
21 SOLDFLAGS = -shared
22
23 CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64
diff --git a/meta-networking/recipes-daemons/autofs/autofs/autofs-additional-distros.patch b/meta-networking/recipes-daemons/autofs/autofs/autofs-additional-distros.patch
deleted file mode 100644
index 6a35843ce..000000000
--- a/meta-networking/recipes-daemons/autofs/autofs/autofs-additional-distros.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1--- autofs-4.1.4/samples/rc.autofs.in~ 2005-04-11 06:30:54.000000000 -0500
2+++ autofs-4.1.4/samples/rc.autofs.in 2007-04-07 13:18:44.000000000 -0500
3@@ -43,6 +43,9 @@
4 system=debian
5 elif [ -f /etc/redhat-release ]; then
6 system=redhat
7+elif [ -f /etc/issue ] && grep -q "^SlugOS\|Yocto" /etc/issue ; then
8+ # SlugOS and Yocto behave like Debian, at least for autofs purposes.
9+ system=debian
10 else
11 echo "$0: Unknown system, please port and contact autofs@linux.kernel.org" 1>&2
12 exit 1
diff --git a/meta-networking/recipes-daemons/squid/files/Add-default-entry-for-cross-compile.patch b/meta-networking/recipes-daemons/squid/files/Add-default-entry-for-cross-compile.patch
deleted file mode 100644
index 5f845bb4c..000000000
--- a/meta-networking/recipes-daemons/squid/files/Add-default-entry-for-cross-compile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From faa212a4e0aaf442ff58fca50770a8fadc1038e3 Mon Sep 17 00:00:00 2001
2Message-Id: <faa212a4e0aaf442ff58fca50770a8fadc1038e3.1382041123.git.Jim.Somerville@windriver.com>
3From: Jim Somerville <Jim.Somerville@windriver.com>
4Date: Thu, 17 Oct 2013 16:17:48 -0400
5Subject: [PATCH 1/1] Add default entry for cross compile
6
7Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
8---
9 acinclude/krb5.m4 | 6 +++++-
10 1 files changed, 5 insertions(+), 1 deletions(-)
11
12diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4
13index 5d9ac36..7a072a2 100644
14--- a/acinclude/krb5.m4
15+++ b/acinclude/krb5.m4
16@@ -82,7 +82,11 @@ main(void)
17
18 return 0;
19 }
20-]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ])
21+]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ],
22+[
23+ dnl Can't test in cross compiled env - so assume good
24+ squid_cv_broken_heimdal_krb5_h=no
25+])
26 ],
27 [
28 dnl Can't test in cross compiled env - so assume good
29--
301.7.4.1
31
diff --git a/meta-networking/recipes-support/curlpp/curlpp/pkgconfig_fix.patch b/meta-networking/recipes-support/curlpp/curlpp/pkgconfig_fix.patch
deleted file mode 100644
index ad73c0088..000000000
--- a/meta-networking/recipes-support/curlpp/curlpp/pkgconfig_fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Upstream-Status: Inappropriate [packaging]
2
3
4Index: curl-7.20.0/libcurl.pc.in
5===================================================================
6--- curl-7.20.0.orig/libcurl.pc.in 2009-11-17 18:11:07.000000000 +0000
7+++ curl-7.20.0/libcurl.pc.in 2010-03-25 12:13:26.814051066 +0000
8@@ -35,6 +35,7 @@
9 URL: http://curl.haxx.se/
10 Description: Library to transfer files with ftp, http, etc.
11 Version: @CURLVERSION@
12-Libs: -L${libdir} -lcurl @LIBS@
13-Libs.private: @LIBCURL_LIBS@ @LIBS@
14+Requires.private: @GNUTLS_REQUIRED@
15+Libs: -L${libdir} -lcurl
16+Libs.private: -ldl -lz
17 Cflags: -I${includedir}
18Index: curl-7.20.0/configure.ac
19===================================================================
20--- curl-7.20.0.orig/configure.ac 2010-02-04 21:41:46.000000000 +0000
21+++ curl-7.20.0/configure.ac 2010-03-25 12:12:18.673129001 +0000
22@@ -1668,6 +1668,7 @@
23 AC_SUBST(USE_GNUTLS, [1])
24 GNUTLS_ENABLED=1
25 USE_GNUTLS="yes"
26+ GNUTLS_REQUIRED="gnutls"
27 curl_ssl_msg="enabled (GnuTLS)"
28 ],
29 [
30@@ -1696,6 +1697,8 @@
31
32 fi dnl OPENSSL != 1
33
34+AC_SUBST(GNUTLS_REQUIRED)
35+
36 dnl ----------------------------------------------------
37 dnl NSS. Only check if GnuTLS and OpenSSL are not enabled
38 dnl ----------------------------------------------------
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-don-t-compile-documentation.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-don-t-compile-documentation.patch
deleted file mode 100644
index 1de4a86d9..000000000
--- a/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-don-t-compile-documentation.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From feccf89f08a455460668cf286151662e4c1557b3 Mon Sep 17 00:00:00 2001
2From: Li xin <lixin.fnst@cn.fujitsu.com>
3Date: Thu, 20 Aug 2015 15:32:30 +0900
4Subject: [PATCH] Makefile.in: don't compile documentation
5
6The documentation file is not suitable for cross-compile,
7Errors will occur:
8| /bin/sh: ../../user/v9/drbdsetup: /lib/ld-linux-x86-64.so.2: bad ELF interpreter: No such file or directory
9| ../../user/v9/drbdsetup xml-help disk-options > drbdsetup_xml-help_disk-options.xml
10| /bin/sh: ../../user/v9/drbdsetup: /lib/ld-linux-x86-64.so.2: bad ELF interpreter: No such file or directory
11| /bin/sh: ../../user/v9/drbdsetup: /lib/ld-linux-x86-64.so.2: bad ELF interpreter: No such file or directory
12| make[1]: *** [drbdsetup_xml-help_new-resource.xml] Error 126
13
14so we do not compile it.
15
16Upstream-Status: pending
17
18Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
19---
20 Makefile.in | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/Makefile.in b/Makefile.in
24index 5365a2c..d5967d8 100644
25--- a/Makefile.in
26+++ b/Makefile.in
27@@ -45,7 +45,7 @@ WITH_84_SUPPORT = @WITH_84_SUPPORT@
28 # and not in e.g. dash. I'm too lazy to fix it to be compatible.
29 SHELL=/bin/bash
30
31-SUBDIRS = user/shared user/v9 user/v84 user/v83 scripts documentation/v83 documentation/v84 documentation/v9
32+SUBDIRS = user/shared user/v9 user/v84 user/v83 scripts
33
34 REL_VERSION := $(shell $(SED) -ne '/^AC_INIT/{s/^[^,]*, *\([^,]*\) *,.*/\1/;p;q}' configure.ac)
35 ifdef FORCE
36--
371.8.4.2
38
diff --git a/meta-networking/recipes-support/wireshark/files/Do-not-set-CC_FOR_BUILD-flags.patch b/meta-networking/recipes-support/wireshark/files/Do-not-set-CC_FOR_BUILD-flags.patch
deleted file mode 100644
index 64a08add7..000000000
--- a/meta-networking/recipes-support/wireshark/files/Do-not-set-CC_FOR_BUILD-flags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1[PATCH] Do not set CC_FOR_BUILD flags
2
3Upstream-status: Pending
4
5AC_WIRESHARK_COMPILER_FLAGS_CHECK() is checking which options CC is supported,
6and put the supported options into CFLAGS, but it should not put them into
7CFLAGS_FOR_BUILD. since CC and BUILD_CC can be different, CFLAGS_FOR_BUILD is
8used by BUILD_CC
9
10BUILD_CC is used to generated host tools, do not use the gcc's optimised options,
11do not effect the running of host tools. so do not set CC_FOR_BUILD flags.
12
13Signed-off-by: Roy.Li <rongqing.li@windriver.com>
14---
15 acinclude.m4 | 8 --------
16 1 file changed, 8 deletions(-)
17
18diff --git a/acinclude.m4 b/acinclude.m4
19index 136fc27..8d3d360 100644
20--- a/acinclude.m4
21+++ b/acinclude.m4
22@@ -1755,10 +1755,6 @@ if test "x$ac_supports_gcc_flags" = "xyes" ; then
23 # just the new option.
24 #
25 CFLAGS="$CFLAGS_saved $GCC_OPTION"
26- #
27- # Add it to the flags we use when building build tools.
28- #
29- CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD $GCC_OPTION"
30 ],
31 [
32 AC_MSG_RESULT(yes)
33@@ -1771,10 +1767,6 @@ if test "x$ac_supports_gcc_flags" = "xyes" ; then
34 # just the new option.
35 #
36 CFLAGS="$CFLAGS_saved $GCC_OPTION"
37- #
38- # Add it to the flags we use when building build tools.
39- #
40- CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD $GCC_OPTION"
41 fi
42 ],
43 [
44--
451.9.1
46