summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/dbus/dbus-1.6.10/test-run-path.patch26
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch33
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch39
-rw-r--r--meta/recipes-core/systemd/systemd/use-rootlibdir.patch107
-rw-r--r--meta/recipes-core/util-linux/util-linux/remove-lscpu.patch37
-rw-r--r--meta/recipes-core/util-linux/util-linux/remove_sigsetmark.patch35
-rw-r--r--meta/recipes-core/util-linux/util-linux/uclibc-compile.patch15
7 files changed, 0 insertions, 292 deletions
diff --git a/meta/recipes-core/dbus/dbus-1.6.10/test-run-path.patch b/meta/recipes-core/dbus/dbus-1.6.10/test-run-path.patch
deleted file mode 100644
index 5c08c9354a..0000000000
--- a/meta/recipes-core/dbus/dbus-1.6.10/test-run-path.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1
2
3Signed-off-by: Björn Stenberg <bjst@enea.com>
4Upstream-Status: Pending
5
6--- a/test/Makefile.am 2012-06-15 15:25:43.000000000 +0200
7+++ b/test/Makefile.am 2012-11-16 09:24:44.263140840 +0100
8@@ -119,12 +119,13 @@
9 DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \
10 DBUS_TEST_SYSCONFDIR=$(DESTDIR)$(sysconfdir)
11
12+ptest_run_dir = ..
13+
14 TESTS_ENVIRONMENT = \
15- DBUS_BLOCK_ON_ABORT=1 \
16- DBUS_FATAL_WARNINGS=1 \
17- DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \
18- DBUS_TEST_DATA=@abs_top_builddir@/test/data \
19- DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \
20+ DBUS_FATAL_WARNINGS=0 \
21+ DBUS_TEST_DAEMON=$(ptest_run_dir)/bus/dbus-daemon$(EXEEXT) \
22+ DBUS_TEST_DATA=$(ptest_run_dir)/test/data \
23+ DBUS_TEST_HOMEDIR=$(ptest_run_dir)/dbus \
24 $(NULL)
25
26 test_corrupt_SOURCES = corrupt.c
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch b/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch
deleted file mode 100644
index 36ce4630a2..0000000000
--- a/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1
2# Pulled from OpenEmbedded
3#
4# Commented by: Saul Wold <saul.wold@intel.com>
5
6Upstream-Status: Inappropriate [licensing]
7
8Index: gettext-tools/m4/csharpcomp.m4
9===================================================================
10RCS file: /cvs/gettext/gettext/gettext-tools/m4/csharpcomp.m4,v
11retrieving revision 1.4
12retrieving revision 1.6
13diff -u -r1.4 -r1.6
14--- a/gettext-tools/m4/csharpcomp.m4 30 Jan 2004 11:01:18 -0000 1.4
15+++ a/gettext-tools/m4/csharpcomp.m4 26 May 2004 12:15:23 -0000 1.6
16@@ -1,4 +1,4 @@
17-# csharpcomp.m4 serial 2 (gettext-0.14.1)
18+# csharpcomp.m4 serial 4 (gettext-0.15)
19 dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
20 dnl This file is free software, distributed under the terms of the GNU
21 dnl General Public License. As a special exception to the GNU General
22@@ -43,7 +43,8 @@
23 ;;
24 sscli)
25 if test -n "$HAVE_CSC_IN_PATH" \
26- && csc -help >/dev/null 2>/dev/null; then
27+ && csc -help >/dev/null 2>/dev/null \
28+ && { if csc -help 2>/dev/null | grep -i chicken > /dev/null; then false; else true; fi; }; then
29 HAVE_CSC=1
30 ac_result="csc"
31 break
32
33
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch b/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch
deleted file mode 100644
index bf995bc622..0000000000
--- a/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1
2# Pulled from OpenEmbedded
3#
4# Commented by: Saul Wold <saul.wold@intel.com>
5
6Upstream-Status: Inappropriate [licensing]
7
8--- /gettext-tools/m4/orig-getline.m4 2003-07-18 18:11:37.000000000 +0300
9+++ /gettext-tools/m4/getline.m4 2007-02-03 13:33:41.000000000 +0200
10@@ -42,12 +42,23 @@
11 return 1;
12 len = getline (&line, &siz, in);
13 exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1);
14- }
15- ], am_cv_func_working_getline=yes dnl The library version works.
16- , am_cv_func_working_getline=no dnl The library version does NOT work.
17- , am_cv_func_working_getline=no dnl We're cross compiling.
18- )])
19- fi
20+ }
21+ ], am_cv_func_working_getline=yes dnl The library version works.
22+ , am_cv_func_working_getline=no dnl The library version does NOT work.
23+! , dnl We're cross compiling. Assume ir works on glibc2 systems.
24+! [AC_EGREP_CPP([Lucky GNU user],
25+! [
26+! #include <features.h>
27+! #ifdef __GNU_LIBRARY__
28+! #if (__GLIBC__ >= 2)
29+! Lucky GNU user
30+! #endif
31+! #endif
32+! ],
33+! [am_cv_func_working_getline=yes],
34+! [am_cv_func_working_getline=no])]
35+ )])
36+ fi
37
38 if test $am_cv_func_working_getline = no; then
39 dnl We must choose a different name for our function, since on ELF systems
diff --git a/meta/recipes-core/systemd/systemd/use-rootlibdir.patch b/meta/recipes-core/systemd/systemd/use-rootlibdir.patch
deleted file mode 100644
index 4c471b673b..0000000000
--- a/meta/recipes-core/systemd/systemd/use-rootlibdir.patch
+++ /dev/null
@@ -1,107 +0,0 @@
1Upstream-Status: Undecided
2
3This patch removes some of hardcoded references to /lib
4and /usr/lib since on some architectures it should be
5/lib64 and /usr/lib64 atleast in OE
6
7I am not sure about the intention of hardcoded values
8thats why status is undecided
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
12Index: git/Makefile.am
13===================================================================
14--- git.orig/Makefile.am 2012-09-22 11:07:58.811981199 -0700
15+++ git/Makefile.am 2012-09-22 11:09:11.267983956 -0700
16@@ -64,25 +64,25 @@
17
18 # Our own, non-special dirs
19 pkgsysconfdir=$(sysconfdir)/systemd
20-userunitdir=$(prefix)/lib/systemd/user
21-userpresetdir=$(prefix)/lib/systemd/user-preset
22-tmpfilesdir=$(prefix)/lib/tmpfiles.d
23-sysctldir=$(prefix)/lib/sysctl.d
24-usergeneratordir=$(prefix)/lib/systemd/user-generators
25+userunitdir=$(prefix)/$(rootlibdir)/systemd/user
26+userpresetdir=$(prefix)/$(rootlibdir)/systemd/user-preset
27+tmpfilesdir=$(prefix)/$(rootlibdir)/tmpfiles.d
28+sysctldir=$(prefix)/$(rootlibdir)/sysctl.d
29+usergeneratordir=$(prefix)/$(rootlibdir)/systemd/user-generators
30 pkgincludedir=$(includedir)/systemd
31 systemgeneratordir=$(rootlibexecdir)/system-generators
32 systemshutdowndir=$(rootlibexecdir)/system-shutdown
33 systemsleepdir=$(rootlibexecdir)/system-sleep
34-systemunitdir=$(rootprefix)/lib/systemd/system
35-systempresetdir=$(rootprefix)/lib/systemd/system-preset
36-udevlibexecdir=$(rootprefix)/lib/udev
37+systemunitdir=$(rootprefix)/$(rootlibdir)/systemd/system
38+systempresetdir=$(rootprefix)/$(rootlibdir)/systemd/system-preset
39+udevlibexecdir=$(rootprefix)/$(rootlibdir)/udev
40 udevhomedir = $(udevlibexecdir)
41 udevrulesdir = $(udevlibexecdir)/rules.d
42
43 # And these are the special ones for /
44 rootprefix=@rootprefix@
45 rootbindir=$(rootprefix)/bin
46-rootlibexecdir=$(rootprefix)/lib/systemd
47+rootlibexecdir=$(rootprefix)/$(rootlibdir)/systemd
48
49 CLEANFILES = $(BUILT_SOURCES)
50 EXTRA_DIST =
51@@ -132,7 +132,7 @@
52 -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
53 -DROOTPREFIX=\"$(rootprefix)\" \
54 -DRUNTIME_DIR=\"/run\" \
55- -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
56+ -DRANDOM_SEED=\"$(localstatedir)/$(rootlibdir)/random-seed\" \
57 -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
58 -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
59 -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
60@@ -2692,7 +2692,7 @@
61
62 binfmt-install-data-hook:
63 $(MKDIR_P) -m 0755 \
64- $(DESTDIR)$(prefix)/lib/binfmt.d \
65+ $(DESTDIR)$(prefix)/$(rootlibdir)/binfmt.d \
66 $(DESTDIR)$(sysconfdir)/binfmt.d \
67 $(DESTDIR)$(systemunitdir)/sysinit.target.wants
68 ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
69@@ -3107,7 +3107,7 @@
70
71 timedated-install-data-hook:
72 $(MKDIR_P) -m 0755 \
73- $(DESTDIR)$(prefix)/lib/systemd/ntp-units.d \
74+ $(DESTDIR)$(prefix)/$(rootlibdir)/systemd/ntp-units.d \
75 $(DESTDIR)$(sysconfdir)/systemd/ntp-units.d
76 ( cd $(DESTDIR)$(systemunitdir) && \
77 rm -f dbus-org.freedesktop.timedate1.service && \
78@@ -3337,7 +3337,7 @@
79 logind-install-data-hook:
80 $(MKDIR_P) -m 0755 \
81 $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
82- $(DESTDIR)$(localstatedir)/lib/systemd
83+ $(DESTDIR)$(localstatedir)/$(rootlibdir)/systemd
84 ( cd $(DESTDIR)$(systemunitdir) && \
85 rm -f dbus-org.freedesktop.login1.service && \
86 $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
87@@ -3494,7 +3494,7 @@
88 -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
89 -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
90 -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
91- -e 's,@RANDOM_SEED\@,$(localstatedir)/lib/random-seed,g' \
92+ -e 's,@RANDOM_SEED\@,$(localstatedir)/$(rootlibdir)/random-seed,g' \
93 -e 's,@prefix\@,$(prefix),g' \
94 -e 's,@exec_prefix\@,$(exec_prefix),g' \
95 -e 's,@libdir\@,$(libdir),g' \
96@@ -3619,9 +3619,9 @@
97 $(MKDIR_P) -m 0755 \
98 $(DESTDIR)$(tmpfilesdir) \
99 $(DESTDIR)$(sysconfdir)/tmpfiles.d \
100- $(DESTDIR)$(prefix)/lib/modules-load.d \
101+ $(DESTDIR)$(prefix)/$(rootlibdir)/modules-load.d \
102 $(DESTDIR)$(sysconfdir)/modules-load.d \
103- $(DESTDIR)$(prefix)/lib/sysctl.d \
104+ $(DESTDIR)$(prefix)/$(rootlibdir)/sysctl.d \
105 $(DESTDIR)$(sysconfdir)/sysctl.d \
106 $(DESTDIR)$(systemshutdowndir) \
107 $(DESTDIR)$(systemsleepdir) \
diff --git a/meta/recipes-core/util-linux/util-linux/remove-lscpu.patch b/meta/recipes-core/util-linux/util-linux/remove-lscpu.patch
deleted file mode 100644
index ddf14a50d1..0000000000
--- a/meta/recipes-core/util-linux/util-linux/remove-lscpu.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1Upstream-Status: Inappropriate [distribution]
2
3Take out lscpu stuff from the code
4
5Signed-off-by: Saul Wold <sgw@linux.intel.com>
6
7Index: util-linux-2.22.1/configure.ac
8===================================================================
9--- util-linux-2.22.1.orig/configure.ac
10+++ util-linux-2.22.1/configure.ac
11@@ -937,7 +937,7 @@ UL_REQUIRES_BUILD([lsblk], [libmount])
12 AM_CONDITIONAL(BUILD_LSBLK, test "x$build_lsblk" = xyes)
13
14
15-UL_BUILD_INIT([lscpu], [check])
16+UL_BUILD_INIT([lscpu], [no])
17 UL_REQUIRES_LINUX([lscpu])
18 UL_REQUIRES_HAVE([lscpu], [cpu_set_t], [cpu_set_t type])
19 AM_CONDITIONAL(BUILD_LSCPU, test "x$build_lscpu" = xyes)
20Index: util-linux-2.22.1/sys-utils/Makemodule.am
21===================================================================
22--- util-linux-2.22.1.orig/sys-utils/Makemodule.am
23+++ util-linux-2.22.1/sys-utils/Makemodule.am
24@@ -224,13 +224,6 @@ swapoff_CFLAGS = $(AM_CFLAGS) -I$(ul_lib
25 swapoff_LDADD = $(LDADD) libmount.la
26 endif
27
28-if BUILD_LSCPU
29-usrbin_exec_PROGRAMS += lscpu
30-lscpu_SOURCES = sys-utils/lscpu.c
31-lscpu_LDADD = $(LDADD) libcommon.la
32-dist_man_MANS += sys-utils/lscpu.1
33-endif
34-
35 if BUILD_CHCPU
36 sbin_PROGRAMS += chcpu
37 chcpu_SOURCES = sys-utils/chcpu.c
diff --git a/meta/recipes-core/util-linux/util-linux/remove_sigsetmark.patch b/meta/recipes-core/util-linux/util-linux/remove_sigsetmark.patch
deleted file mode 100644
index 02e4d16ff7..0000000000
--- a/meta/recipes-core/util-linux/util-linux/remove_sigsetmark.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1simpleinit: remove deprecated sigsetmask()
2
3The sigsetmask() is deprecated in favor of sigprocmask().
4
5This is not needed upstream since simpleinit is removed from
6util-linux-ng master
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10Upstream-Status: Inappropriate
11
12Index: util-linux-2.19.1/simpleinit/shutdown.c
13===================================================================
14--- util-linux-2.19.1.orig/simpleinit/shutdown.c 2011-03-04 03:47:47.000000000 -0800
15+++ util-linux-2.19.1/simpleinit/shutdown.c 2011-07-06 08:43:39.183849752 -0700
16@@ -145,7 +145,7 @@
17 {
18 int c, i, fd;
19 char *ptr;
20-
21+ sigset_t sigmask;
22 i = getdtablesize ();
23 for (fd = 3; fd < i; fd++) close (fd);
24 if (getpid () == 1)
25@@ -153,7 +153,9 @@
26 for (fd = 0; fd < 3; fd++) close (fd);
27 while (1) wait (NULL); /* Grim reaper never stops */
28 }
29- sigsetmask (0); /* simpleinit(8) blocks all signals: undo for ALRM */
30+ /* simpleinit(8) blocks all signals: undo for ALRM */
31+ sigemptyset(&sigmask);
32+ sigprocmask (SIG_SETMASK, &sigmask, NULL);
33 for (i = 1; i < NSIG; i++) signal (i, SIG_DFL);
34
35 setlocale(LC_ALL, "");
diff --git a/meta/recipes-core/util-linux/util-linux/uclibc-compile.patch b/meta/recipes-core/util-linux/util-linux/uclibc-compile.patch
deleted file mode 100644
index 75774d8200..0000000000
--- a/meta/recipes-core/util-linux/util-linux/uclibc-compile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Index: util-linux-ng-2.16/misc-utils/cal.c
4===================================================================
5--- util-linux-ng-2.16.orig/misc-utils/cal.c 2009-07-03 16:20:01.000000000 -0700
6+++ util-linux-ng-2.16/misc-utils/cal.c 2009-07-18 23:21:37.000000000 -0700
7@@ -407,7 +407,7 @@
8 strcpy(day_headings,"");
9 strcpy(j_day_headings,"");
10
11-#ifdef HAVE_LANGINFO_H
12+#ifdef HAVE_LANGINFO_H && !defined(__UCLIBC__)
13 # define weekday(wd) nl_langinfo(ABDAY_1+wd)
14 #else
15 # define weekday(wd) _time_info->abbrev_wkday[wd]
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 16:02:43 +0000