diff options
Diffstat (limited to 'meta/recipes-core/util-linux')
3 files changed, 0 insertions, 87 deletions
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 @@ -Upstream-Status: Inappropriate [distribution] - -Take out lscpu stuff from the code - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -Index: util-linux-2.22.1/configure.ac -=================================================================== ---- util-linux-2.22.1.orig/configure.ac -+++ util-linux-2.22.1/configure.ac -@@ -937,7 +937,7 @@ UL_REQUIRES_BUILD([lsblk], [libmount]) - AM_CONDITIONAL(BUILD_LSBLK, test "x$build_lsblk" = xyes) - - --UL_BUILD_INIT([lscpu], [check]) -+UL_BUILD_INIT([lscpu], [no]) - UL_REQUIRES_LINUX([lscpu]) - UL_REQUIRES_HAVE([lscpu], [cpu_set_t], [cpu_set_t type]) - AM_CONDITIONAL(BUILD_LSCPU, test "x$build_lscpu" = xyes) -Index: util-linux-2.22.1/sys-utils/Makemodule.am -=================================================================== ---- util-linux-2.22.1.orig/sys-utils/Makemodule.am -+++ util-linux-2.22.1/sys-utils/Makemodule.am -@@ -224,13 +224,6 @@ swapoff_CFLAGS = $(AM_CFLAGS) -I$(ul_lib - swapoff_LDADD = $(LDADD) libmount.la - endif - --if BUILD_LSCPU --usrbin_exec_PROGRAMS += lscpu --lscpu_SOURCES = sys-utils/lscpu.c --lscpu_LDADD = $(LDADD) libcommon.la --dist_man_MANS += sys-utils/lscpu.1 --endif -- - if BUILD_CHCPU - sbin_PROGRAMS += chcpu - 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 @@ -simpleinit: remove deprecated sigsetmask() - -The sigsetmask() is deprecated in favor of sigprocmask(). - -This is not needed upstream since simpleinit is removed from -util-linux-ng master - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Inappropriate - -Index: util-linux-2.19.1/simpleinit/shutdown.c -=================================================================== ---- util-linux-2.19.1.orig/simpleinit/shutdown.c 2011-03-04 03:47:47.000000000 -0800 -+++ util-linux-2.19.1/simpleinit/shutdown.c 2011-07-06 08:43:39.183849752 -0700 -@@ -145,7 +145,7 @@ - { - int c, i, fd; - char *ptr; -- -+ sigset_t sigmask; - i = getdtablesize (); - for (fd = 3; fd < i; fd++) close (fd); - if (getpid () == 1) -@@ -153,7 +153,9 @@ - for (fd = 0; fd < 3; fd++) close (fd); - while (1) wait (NULL); /* Grim reaper never stops */ - } -- sigsetmask (0); /* simpleinit(8) blocks all signals: undo for ALRM */ -+ /* simpleinit(8) blocks all signals: undo for ALRM */ -+ sigemptyset(&sigmask); -+ sigprocmask (SIG_SETMASK, &sigmask, NULL); - for (i = 1; i < NSIG; i++) signal (i, SIG_DFL); - - 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 @@ -Upstream-Status: Inappropriate [embedded specific] - -Index: util-linux-ng-2.16/misc-utils/cal.c -=================================================================== ---- util-linux-ng-2.16.orig/misc-utils/cal.c 2009-07-03 16:20:01.000000000 -0700 -+++ util-linux-ng-2.16/misc-utils/cal.c 2009-07-18 23:21:37.000000000 -0700 -@@ -407,7 +407,7 @@ - strcpy(day_headings,""); - strcpy(j_day_headings,""); - --#ifdef HAVE_LANGINFO_H -+#ifdef HAVE_LANGINFO_H && !defined(__UCLIBC__) - # define weekday(wd) nl_langinfo(ABDAY_1+wd) - #else - # define weekday(wd) _time_info->abbrev_wkday[wd] |