summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorOleksandr Kravchuk <oleksandr.kravchuk@pelagicore.com>2017-03-13 09:56:35 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2017-03-16 23:34:32 +0100
commit4b4a62ec0760873b96b738751bf9492aa2efb922 (patch)
treebf1d0f2e2f5f116d5979cf6ed0d16cec0a8744f0 /meta-oe
parentcd653249c2c8f185f2dd94424e0c4891affd315b (diff)
downloadmeta-openembedded-4b4a62ec0760873b96b738751bf9492aa2efb922.tar.gz
recipes: delete obsolete patches
Deleted bunch of patches which are not used anymore by any recipe. Signed-off-by: Oleksandr Kravchuk <oleksandr.kravchuk@pelagicore.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-benchmark/libhugetlbfs/files/0001-install-perl-lib-to-directory-perl-instead-of-perl5.patch39
-rw-r--r--meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch58
-rw-r--r--meta-oe/recipes-connectivity/obex/openobex/disable-cable-test.patch16
-rw-r--r--meta-oe/recipes-connectivity/obex/openobex/libusb_crosscompile_check.patch11
-rw-r--r--meta-oe/recipes-connectivity/obex/openobex/separate_builddir.patch16
-rw-r--r--meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/create-as-shared-lib.patch31
-rw-r--r--meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/stub-only.patch72
-rw-r--r--meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-to-fix-lib64-can-not-be-shiped-in-64bit-target.patch36
-rw-r--r--meta-oe/recipes-extended/liblockfile/liblockfile-1.09/glibc-2.4.patch70
-rw-r--r--meta-oe/recipes-support/mg/files/remove_ncurses_check.patch36
10 files changed, 0 insertions, 385 deletions
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-install-perl-lib-to-directory-perl-instead-of-perl5.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-install-perl-lib-to-directory-perl-instead-of-perl5.patch
deleted file mode 100644
index 0b8d0e4d5..000000000
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-install-perl-lib-to-directory-perl-instead-of-perl5.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1Upstream-Status: Inappropriate [oe-core specific]
2
3libhugetlbfs depends on perl, and perl installs a directory 'perl'
4and make a symlink 'perl5' to it. So just install perl libs in
5libhugetlbfs to directory 'perl' instead of 'perl5'. This can avoid
6the following error:
7| CalledProcessError: Command 'tar -cf - -C .../perl/5.14.3-r1/sysroot-destdir
8| -ps . | tar -xf - -C .../tmp/sysroots/t4240qds'
9| returned non-zero exit status 2 with output
10| tar: ./usr/lib/perl5: Cannot create symlink to `perl': File exists
11| tar: Exiting with failure status due to previous errors
12
13
14Signed-off-by: Ting Liu <b28495@freescale.com>
15
16--- a/Makefileold 2013-10-11 23:07:31.759421318 -0500
17+++ b/Makefile 2013-10-11 23:08:01.935571122 -0500
18@@ -173,17 +173,17 @@
19 DOCDIR = $(PREFIX)/share/doc/libhugetlbfs
20
21 ifdef CC32
22-PMDIR = $(PREFIX)/lib/perl5/TLBC
23+PMDIR = $(PREFIX)/lib/perl/TLBC
24 endif
25
26 ifdef CC64
27 ifeq ($(ARCH),x86_64)
28-PMDIR = $(PREFIX)/lib/perl5/TLBC
29+PMDIR = $(PREFIX)/lib/perl/TLBC
30 else
31 ifeq ($(ARCH),aarch64)
32-PMDIR = $(PREFIX)/lib/perl5/TLBC
33+PMDIR = $(PREFIX)/lib/perl/TLBC
34 else
35-PMDIR = $(PREFIX)/lib64/perl5/TLBC
36+PMDIR = $(PREFIX)/lib64/perl/TLBC
37 endif
38 endif
39 endif
diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch b/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch
deleted file mode 100644
index 7caaf51e6..000000000
--- a/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1From a130153ae84d8bb5914879cef94df09f06825c10 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sat, 18 Jun 2011 11:25:36 +0200
4Subject: [PATCH] buildsys: don't add /usr/include and /usr/lib to configure tests for libusb
5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7---
8 config/usrp_libusb.m4 | 13 -------------
9 1 files changed, 0 insertions(+), 13 deletions(-)
10
11diff --git a/config/usrp_libusb.m4 b/config/usrp_libusb.m4
12index cc3410f..b421820 100644
13--- a/config/usrp_libusb.m4
14+++ b/config/usrp_libusb.m4
15@@ -117,10 +117,6 @@ AC_DEFUN([USRP_LIBUSB], [
16 dnl configured to find this header.
17 AC_LANG_PUSH(C)
18 save_CPPFLAGS="$CPPFLAGS"
19- if test x$USB_INCLUDEDIR != x; then
20- USB_INCLUDES="-I$USB_INCLUDEDIR"
21- CPPFLAGS="$USB_INCLUDES"
22- fi
23 AC_MSG_CHECKING([$libusb_name for header $usb_header])
24 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
25 #include "$usb_header"
26@@ -172,9 +168,6 @@ AC_DEFUN([USRP_LIBUSB], [
27 *)
28 AC_LANG_PUSH(C)
29 save_CPPFLAGS="$CPPFLAGS"
30- if test x$USB_INCLUDEDIR != x; then
31- CPPFLAGS="$USB_INCLUDES"
32- fi
33 save_LIBS="$LIBS"
34 LIBS="$USB_LIBS"
35 AC_MSG_CHECKING([$libusb_name for symbol usb_debug in library $usb_lib_name])
36@@ -217,9 +210,6 @@ AC_DEFUN([USRP_LIBUSB], [
37 dnl final error checking, mostly to create #define's
38 AC_LANG_PUSH(C)
39 save_CPPFLAGS="$CPPFLAGS"
40- if test x$USB_INCLUDEDIR != x; then
41- CPPFLAGS="$USB_INCLUDES"
42- fi
43 dnl Check for the header.
44 AC_CHECK_HEADERS([$usb_header], [], [libusbok=no])
45 CPPFLAGS="$save_CPPFLAGS"
46@@ -231,9 +221,6 @@ AC_DEFUN([USRP_LIBUSB], [
47 dnl check for the library (again)
48 AC_LANG_PUSH(C)
49 save_CPPFLAGS="$CPPFLAGS"
50- if test x$USB_INCLUDEDIR != x; then
51- CPPFLAGS="$USB_INCLUDES"
52- fi
53 save_LIBS="$LIBS"
54 LIBS="$USB_LIBS"
55 AC_CHECK_LIB([$usb_lib_name], [$usb_lib_func], [], [
56--
571.6.6.1
58
diff --git a/meta-oe/recipes-connectivity/obex/openobex/disable-cable-test.patch b/meta-oe/recipes-connectivity/obex/openobex/disable-cable-test.patch
deleted file mode 100644
index 95b636dd8..000000000
--- a/meta-oe/recipes-connectivity/obex/openobex/disable-cable-test.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- openobex-1.2/apps/Makefile.am~disable-cable-test
7+++ openobex-1.2/apps/Makefile.am
8@@ -6,7 +6,7 @@
9 obex_io.c obex_io.h \
10 obex_put_common.c obex_put_common.h
11
12-bin_PROGRAMS = irxfer obex_tcp irobex_palm3 obex_test
13+bin_PROGRAMS = irxfer obex_tcp irobex_palm3
14
15 obex_test_SOURCES = \
16 obex_test.c obex_test.h \
diff --git a/meta-oe/recipes-connectivity/obex/openobex/libusb_crosscompile_check.patch b/meta-oe/recipes-connectivity/obex/openobex/libusb_crosscompile_check.patch
deleted file mode 100644
index 1177dfeac..000000000
--- a/meta-oe/recipes-connectivity/obex/openobex/libusb_crosscompile_check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- /tmp/acinclude.m4 2009-04-12 10:32:15.000000000 +0200
2+++ openobex-1.5/acinclude.m4 2009-04-12 10:32:38.000000000 +0200
3@@ -158,7 +158,7 @@
4 ;;
5 *)
6 PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no))
7- AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
8+ REQUIRES="libusb"
9 ;;
10 esac
11 AC_SUBST(USB_CFLAGS)
diff --git a/meta-oe/recipes-connectivity/obex/openobex/separate_builddir.patch b/meta-oe/recipes-connectivity/obex/openobex/separate_builddir.patch
deleted file mode 100644
index 8abf8ae24..000000000
--- a/meta-oe/recipes-connectivity/obex/openobex/separate_builddir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Fix detection of IrDA failing with B!=S
2
3Upstream-Status: Pending
4
5Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
6
7--- a/acinclude.m4 2014-05-24 14:05:41.757796816 +0100
8+++ b/acinclude.m4 2014-05-24 14:03:06.556795536 +0100
9@@ -54,6 +54,7 @@
10 ])
11
12 AC_DEFUN([AC_PATH_IRDA_LINUX], [
13+ CPPFLAGS="${CPPFLAGS} -I${srcdir}"
14 AC_CACHE_CHECK([for IrDA support], irda_found, [
15 AC_TRY_COMPILE([
16 #include <sys/socket.h>
diff --git a/meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/create-as-shared-lib.patch b/meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/create-as-shared-lib.patch
deleted file mode 100644
index 306e3b821..000000000
--- a/meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/create-as-shared-lib.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1--- a/src/proxy-libintl/Makefile.org 2009-09-12 23:19:04.989421607 -0700
2+++ a/src/proxy-libintl/Makefile 2009-09-12 23:21:14.100640001 -0700
3@@ -4,20 +4,20 @@ ZIPFILE = proxy-libintl-$(TIMESTAMP).zip
4 CC = gcc
5 CFLAGS = -Wall -I ../../include
6
7-all : ../../lib/libintl.a ../../lib/intl.lib
8+all : ../../lib/libintl.so ../../lib/intl.lib
9
10-../../lib/libintl.a : libintl.o
11- ar rc $@ libintl.o
12+../../lib/libintl.so : libintl.o
13+ $(CC) -shared -o $@ libintl.o
14
15-../../lib/intl.lib : ../../lib/libintl.a
16- cp ../../lib/libintl.a $@
17- strip --strip-unneeded $@
18+../../lib/intl.lib : ../../lib/libintl.so
19+ cp ../../lib/libintl.so $@
20+ $(STRIP) --strip-unneeded $@
21
22 libintl.o : libintl.c
23 $(CC) $(CFLAGS) -c libintl.c
24
25 clean :
26- rm -f *.o ../../lib/libintl.a ../../$(ZIPFILE)
27+ rm -f *.o ../../lib/libintl.so ../../$(ZIPFILE)
28
29 dist : clean all
30- cd ../..; zip $(ZIPFILE) include/libintl.h lib/{libintl.a,intl.lib} src/proxy-libintl/{README.txt,COPYING.LIB.txt,Makefile,libintl.[ch]}; manifestify $(ZIPFILE)
31+ cd ../..; zip $(ZIPFILE) include/libintl.h lib/{libintl.so,intl.lib} src/proxy-libintl/{README.txt,COPYING.LIB.txt,Makefile,libintl.[ch]}; manifestify $(ZIPFILE)
diff --git a/meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/stub-only.patch b/meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/stub-only.patch
deleted file mode 100644
index 7186b13c0..000000000
--- a/meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/stub-only.patch
+++ /dev/null
@@ -1,72 +0,0 @@
1Index: proxy-libintl/src/proxy-libintl/libintl.c
2===================================================================
3--- proxy-libintl.orig/src/proxy-libintl/libintl.c
4+++ proxy-libintl/src/proxy-libintl/libintl.c
5@@ -18,9 +18,12 @@
6 */
7
8 #ifdef _WIN32
9-#include <windows.h>
10+# include <windows.h>
11 #else
12-#include <dlfcn.h>
13+# include <stddef.h>
14+# if !STUB_ONLY
15+# include <dlfcn.h>
16+# endif
17 typedef void* HMODULE;
18 #endif
19
20@@ -65,11 +68,13 @@ static char * (*p_bind_textdomain_codese
21 static int
22 use_intl_dll (HMODULE dll)
23 {
24-#ifdef _WIN32
25-#define LOOKUP(fn) p_##fn = (void *) GetProcAddress (dll, #fn); if (p_##fn == NULL) return 0
26-#else
27-#define LOOKUP(fn) p_##fn = (void *) dlsym (dll, #fn); if (p_##fn == NULL) return 0
28-#endif
29+#if !STUB_ONLY
30+# ifdef _WIN32
31+# define LOOKUP(fn) p_##fn = (void *) GetProcAddress (dll, #fn); if (p_##fn == NULL) return 0
32+# else
33+# define LOOKUP(fn) p_##fn = (void *) dlsym (dll, #fn); if (p_##fn == NULL) return 0
34+# endif /* _WIN32 */
35+
36
37 LOOKUP (gettext);
38 LOOKUP (dgettext);
39@@ -82,7 +87,7 @@ use_intl_dll (HMODULE dll)
40 LOOKUP (bind_textdomain_codeset);
41
42 #undef LOOKUP
43-
44+#endif /* !STUB_ONLY */
45 return 1;
46 }
47
48@@ -171,13 +176,17 @@ setup (void)
49
50 if (!beenhere)
51 {
52-#ifdef _WIN32
53- HMODULE intl_dll = LoadLibrary ("intl.dll");
54-#elif defined(__APPLE__) && defined(__MACH__)
55- HMODULE intl_dll = dlopen ("libintl.dylib", RTLD_LAZY);
56-#else
57- HMODULE intl_dll = dlopen ("libintl.so", RTLD_LAZY);
58-#endif
59+#if !STUB_ONLY
60+# ifdef _WIN32
61+ HMODULE intl_dll = LoadLibrary ("intl.dll");
62+# elif defined(__APPLE__) && defined(__MACH__)
63+ HMODULE intl_dll = dlopen ("libintl.dylib", RTLD_LAZY);
64+# else
65+ HMODULE intl_dll = dlopen ("libintl.so", RTLD_LAZY);
66+# endif
67+#else /* !STUB_ONLY */
68+ HMODULE intl_dll = NULL;
69+#endif /* STUB_ONLY */
70
71 if (intl_dll != NULL &&
72 use_intl_dll (intl_dll))
diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-to-fix-lib64-can-not-be-shiped-in-64bit-target.patch b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-to-fix-lib64-can-not-be-shiped-in-64bit-target.patch
deleted file mode 100644
index 7da13ee3d..000000000
--- a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-to-fix-lib64-can-not-be-shiped-in-64bit-target.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From f3c39fd2a4b5f53338b5f821788c63858bf860cf Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui@cn.fujitsu.com>
3Date: Sun, 2 Aug 2015 22:08:43 +0900
4Subject: [PATCH] to fix lib64 can not be shiped in 64bit target
5
6To fix the warning as following:
7WARNING: QA Issue: konkretcmpi: Files/directories were installed but not shipped in any package:
8 /usr/lib64
9 /usr/lib64/libkonkret.so
10 /usr/lib64/libkonkret.so.0.0.1
11 /usr/lib64/libkonkret.so.0
12 /usr/lib64/libkonkretmof.so.0.0.1
13 /usr/lib64/libkonkretmof.so
14 ...
15
16Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
17---
18 cmake/modules/FindKonkretCMPI.cmake | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/cmake/modules/FindKonkretCMPI.cmake b/cmake/modules/FindKonkretCMPI.cmake
22index b888cfd..097caed 100644
23--- a/cmake/modules/FindKonkretCMPI.cmake
24+++ b/cmake/modules/FindKonkretCMPI.cmake
25@@ -9,7 +9,7 @@ find_path(KONKRETCMPI_INCLUDE_DIR
26 find_library(KONKRETCMPI_LIBRARY
27 NAMES konkret
28 HINTS $ENV{KONKRETCMPI_LIB_DIR}
29- PATH_SUFFIXES lib64 lib
30+ PATH_SUFFIXES lib lib64
31 PATHS /usr /usr/local
32 )
33
34--
351.8.4.2
36
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/glibc-2.4.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/glibc-2.4.patch
deleted file mode 100644
index e3c4aaae5..000000000
--- a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/glibc-2.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1The local function eaccess conflicts with a glibc function of the same name.
2Rename the function so that this can be build under glibc 2.4, and older
3revisions, without any problems.
4
5--- liblockfile-1.06/dotlockfile.c 2006/07/10 03:17:40 1.1
6+++ liblockfile-1.06/dotlockfile.c 2006/07/10 03:18:26
7@@ -42,7 +42,7 @@
8 extern int optind;
9 #endif
10
11-extern int eaccess(char *, gid_t, struct stat *);
12+extern int xeaccess(char *, gid_t, struct stat *);
13
14 /*
15 * Sleep for an amout of time while regulary checking if
16@@ -252,14 +252,14 @@
17 return L_ERROR;
18 }
19 gid = getgid();
20- if (eaccess(dir, gid, &st) < 0) {
21+ if (xeaccess(dir, gid, &st) < 0) {
22 if (errno == ENOENT) {
23 enoent:
24 if (!quiet) fprintf(stderr,
25 "dotlockfile: %s: no such directory\n", dir);
26 return L_TMPLOCK;
27 }
28- if ((r = eaccess(dir, getegid(), &st) < 0) && errno == ENOENT)
29+ if ((r = xeaccess(dir, getegid(), &st) < 0) && errno == ENOENT)
30 goto enoent;
31 if (r < 0 || !ismaillock(lockfile, pwd->pw_name)) {
32 if (!quiet) fprintf(stderr,
33@@ -272,7 +272,7 @@
34 /*
35 * Now we should be able to chdir() to the lock directory.
36 * When we stat("."), it should be the same as at the
37- * eaccess() check or someone played symlink() games on us.
38+ * xeaccess() check or someone played symlink() games on us.
39 */
40 if (chdir(dir) < 0 || stat(".", &st2) < 0) {
41 if (!quiet) fprintf(stderr,
42--- liblockfile-1.06/lockfile.c 2006/07/10 03:17:40 1.1
43+++ liblockfile-1.06/lockfile.c 2006/07/10 03:18:26
44@@ -54,7 +54,7 @@
45 #ifdef LIB
46 static
47 #endif
48-int eaccess(char *fn, gid_t gid, struct stat *st)
49+int xeaccess(char *fn, gid_t gid, struct stat *st)
50 {
51 struct stat tmp;
52 uid_t uid = geteuid();
53@@ -96,7 +96,7 @@
54 *p = 0;
55 else
56 strcpy(dir, ".");
57- if (eaccess(dir, egid, NULL) >= 0) {
58+ if (xeaccess(dir, egid, NULL) >= 0) {
59 free(dir);
60 return 0;
61 }
62@@ -111,7 +111,7 @@
63 return 0;
64 mailgid = st.st_gid;
65 }
66- ret = eaccess(dir, mailgid, NULL) >= 0;
67+ ret = xeaccess(dir, mailgid, NULL) >= 0;
68 free (dir);
69 return ret;
70 }
diff --git a/meta-oe/recipes-support/mg/files/remove_ncurses_check.patch b/meta-oe/recipes-support/mg/files/remove_ncurses_check.patch
deleted file mode 100644
index 16137da2b..000000000
--- a/meta-oe/recipes-support/mg/files/remove_ncurses_check.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1diff -uwr mg-20110905/configure mg-20110905-changed/configure
2--- mg-20110905/configure 2011-09-05 13:36:16.000000000 -0500
3+++ mg-20110905-changed/configure 2014-08-14 10:46:14.168715425 -0500
4@@ -163,32 +163,6 @@
5 echo 'Fails.'
6 fi
7
8-
9-if [ ! -r /usr/include/term.h ]; then
10- note 'term.h'
11- if [ -r /usr/include/ncurses/term.h ]; then
12- echo "Found in /usr/include/ncurses"
13- extraflags="$extraflags -I/usr/include/ncurses"
14- else
15- for i in pkg local; do
16- if [ -r /usr/$i/include/term.h ]; then
17- echo "Found in /usr/$i/include"
18- extralibs="$extralibs -L/usr/$i/lib"
19- extraflags="$extraflags -I/usr/$i/include"
20- break
21- else
22- false
23- fi
24- done ||
25- {
26- echo 'Not found!' >&2
27- echo 'Do you have the ncurses devel package installed?' >&2
28- echo 'If you know where term.h is, please email the author!' >&2
29- exit 1
30- }
31- fi
32-fi
33-
34 note 'base and dirname'
35 if gcc_defines "__GLIBC__" || gcc_defines "__CYGWIN__" ; then
36 echo 'Not present, adding.'