util-linux: Update to 2.20.1

Add patch remove setting CC, LD and LDFLAGS on commandline
since they are passed correctly via configure. Those setting
also caused the configure information about -std=gnu99 from
being passed correctly.

Removed patch that was fixed upstream
Added scanf configuration, since this is a cross-compile target check

libuuid removed an API that e2fsprogs uuidd used (uuid__generate_*),
thus we disable it in this patch and will now provide uuidd from
util-linux.

See http://sourceforge.net/projects/e2fsprogs/forums/forum/7053/topic/4639484

Signed-off-by: Saul Wold <sgw@linux.intel.com>

10 files changed, 0 insertions, 495 deletions

diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/MCONFIG b/meta/recipes-core/util-linux/util-linux-2.19.1/MCONFIG
deleted file mode 100644
index 3fea2c02d..000000000
--- a/meta/recipes-core/util-linux/util-linux-2.19.1/MCONFIG
+++ /dev/null
@@ -1,223 +0,0 @@
-# MCONFIG -- Configuration stuff for util-linux
-# Created: Sat Feb  4 15:50:30 1995
-# Copyright 1995 Rickard E. Faith (faith@cs.unc.edu)
-
-# For a user-mode install, make (at least) three changes:
-#  - remove the `-o root' part in INSTALLSUID
-#  - set USE_TTY_GROUP=no
-#  - define DESTDIR
-
-# Select for ARCH one of intel, alpha, sparc, arm, m68k, mips
-# Select for CPU i386 if the binaries must be able to run on an intel 386
-# (by default i486 code is generated, see below)
-CPU=$(shell uname -m)
-ARCH=$(shell echo $(CPU) | sed 's/i.86/intel/;s/arm.*/arm/')
-
-# If HAVE_PAM is set to "yes", then login, chfn, chsh, and newgrp
-# will use PAM for authentication. Additionally, passwd will not be
-# installed as it is not PAM aware.
-HAVE_PAM=no
-
-# If HAVE_SHADOW is set to "yes", then login, chfn, chsh, newgrp, passwd,
-# and vipw will not be built or installed from the login-utils
-# subdirectory.  
-HAVE_SHADOW=yes
-
-# If HAVE_PASSWD is set to "yes", then passwd will not be built or
-# installed from the login-utils subdirectory (but login, chfn, chsh,
-# newgrp, and vipw *will* be installed).
-HAVE_PASSWD=no
-
-# If you use chfn and chsh from this package, REQUIRE_PASSWORD will require
-# non-root users to enter the account password before updating /etc/passwd.
-REQUIRE_PASSWORD=yes
-#REQUIRE_PASSWORD=no
-
-# If you use chsh from this package, ONLY_LISTED_SHELLS will require that
-# the selected shell be listed in /etc/shells -- otherwise only a warning is
-# printed.  This prevents someone from setting their shell to /bin/false.
-ONLY_LISTED_SHELLS=yes
-#ONLY_LISTED_SHELLS=no
-
-
-# If HAVE_SYSVINIT is set to "yes", then simpleinit and shutdown will not
-# be built or installed from the login-utils subdirectory.  (The shutdown
-# and halt that come with the SysVinit package should be used with the init
-# found in that package.)
-HAVE_SYSVINIT=no
-
-# If HAVE_SYSVINIT_UTILS is set to "yes", then last, mesg, and wall will
-# not be built or installed from the login-utils subdirectory.  (The
-# shutdown and init from the SysVinit package do not depend on the last,
-# mesg, and wall from that package.)
-HAVE_SYSVINIT_UTILS=no
-
-# If HAVE_WRITE is set to "yes", then write will not be built or
-# installed from the misc-utils subdirectory.
-# (There is a network aware write in netwrite from NetKit 0.16 or later.)
-HAVE_WRITE=no
-
-# If HAVE_GETTY is set to "yes", then agetty will not be built or
-# installed from the login-utils subdirectory.  Note that agetty can
-# co-exist with other gettys, so this option should never be used.
-HAVE_GETTY=no
-
-# If USE_TTY_GROUP is set to "yes", then wall and write will be installed
-# setgid to the "tty" group, and mesg will only set the group write bit.
-# Note that this is only useful if login/xterm/etc. change the group of the
-# user's tty to "tty" [The login in util-linux does this correctly, and
-# xterm will do it correctly if X is compiled with USE_TTY_GROUP set
-# properly.]
-USE_TTY_GROUP=no
-
-# If HAVE_KILL is set to "yes", then kill will not be built or
-# installed from the misc-utils subdirectory.
-# (There is also a kill in the procps package.)
-HAVE_KILL=no
-
-# If ALLOW_VCS_USE is set to "yes", then login will chown /dev/vcsN
-# to the current user, allowing her to make a screendump and do other
-# nifty things on the console, but also allowing him to keep an open
-# file descriptor after logging out to trick the next user.
-ALLOW_VCS_USE=yes
-
-# If HAVE_RESET is set to "yes", then reset won't be installed.  The version
-# of reset that comes with the ncurses package is less aggressive.
-HAVE_RESET=yes
-
-# If HAVE_SLN is set to "yes", then sln won't be installed
-# (but the man page sln.8 will be installed anyway).
-# sln also comes with libc and glibc.
-HAVE_SLN=no
-
-# If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed.
-HAVE_FDUTILS=no
-
-# If SILENT_PG is set to "yes", then pg will not ring the bell
-# when an invalid key is pressed
-SILENT_PG=no
-
-# If configure decides that Native Language Support (NLS) is available,
-# it sets MAY_ENABLE_NLS in defines.h. If you don't want NLS, set
-# DISABLE_NLS to "yes".
-DISABLE_NLS=no
-
-# Different optimizations for different cpus.
-# gcc 3.0 likes options -mcpu=i486 instead of -m486
-ifeq "$(ARCH)" "intel"
-  ifeq "$(HAVE_OLD_GCC)" "yes"
-    CPUHEAD=-m
-  else
-    CPUHEAD=-mcpu=i
-  endif
-  ifeq "$(CPU)" "i386"
-    CPUTAIL=386
-  else
-    CPUTAIL=486
-  endif
-  CPUOPT= $(CPUHEAD)$(CPUTAIL)
-  OPT=          -pipe -O2 $(CPUOPT) -fomit-frame-pointer
-else 
-  ifeq "$(ARCH)" "arm"
-    OPT=	-pipe -O2 -fsigned-char -fomit-frame-pointer
-  else
-    OPT=	-O2 -fomit-frame-pointer
-  endif
-endif
-
-WARNFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes
-
-LIB=../lib
-
-ERR_O=$(LIB)/err.o
-
-# Set HAVE_SLANG to yes if you have slang (and prefer to use that for cfdisk)
-# (If neither HAVE_NCURSES nor HAVE_SLANG is defined, cfdisk is not made.)
-# HAVE_SLANG=yes
-# There is a subdirectory /usr/include/slang containing slcurses.h
-# SLANGFLAGS=-I/usr/include/slang
-# No such subdirectory - slcurses.h lives in /usr/include
-#   (no extra definition required).
-LIBSLANG=-lslang
-
-#
-# Paths used for compilation (not all are actually used, see CFLAGS below)
-#
-DEV_DIR=	/dev
-ETC_DIR=	/etc
-SBIN_DIR=	/sbin
-USRSBIN_DIR=	/usr/sbin
-USRLIB_DIR=	/usr/lib
-USRBIN_DIR=	/usr/bin
-USRGAMES_DIR=	/usr/games
-USRSHAREMISC_DIR=/usr/share/misc
-LOCALE_DIR=	/usr/share/locale
-BIN_DIR=        /bin
-VAR_PATH=	/var
-LOG_DIR=	/var/log
-MAN_DIR=	/usr/share/man
-INFO_DIR=	/usr/share/info
-
-#
-# Paths used for install
-#
-DEVDIR=		$(DESTDIR)$(DEV_DIR)
-ETCDIR=		$(DESTDIR)$(ETC_DIR)
-SBINDIR=	$(DESTDIR)$(SBIN_DIR)
-USRSBINDIR=	$(DESTDIR)$(USRSBIN_DIR)
-USRLIBDIR=      $(DESTDIR)$(USRLIB_DIR)
-USRBINDIR=      $(DESTDIR)$(USRBIN_DIR)
-USRGAMESDIR=    $(DESTDIR)$(USRGAMES_DIR)
-USRSHAREMISCDIR=$(DESTDIR)$(USRSHAREMISC_DIR)
-LOCALEDIR=      $(DESTDIR)$(LOCALE_DIR)
-BINDIR=         $(DESTDIR)$(BIN_DIR)
-VARPATH=	$(DESTDIR)$(VAR_PATH)
-LOGDIR=		$(DESTDIR)$(LOG_DIR)
-MANDIR=		$(DESTDIR)$(MAN_DIR)
-MAN1DIR=	$(MANDIR)/man1
-MAN3DIR=	$(MANDIR)/man3
-MAN5DIR=	$(MANDIR)/man5
-MAN6DIR=	$(MANDIR)/man6
-MAN8DIR=	$(MANDIR)/man8
-INFODIR=	$(DESTDIR)$(INFO_DIR)
-
-# Directory for shutdown, halt, reboot, etc.
-SHUTDOWNDIR=	$(SBINDIR)
-
-# Modes
-DIRMODE=	755
-BINMODE=	755
-MANMODE=	644
-DATMODE=	644
-INFOMODE=	644
-SUIDMODE=      4755
-
-CHMOD=		chmod
-INSTALL=	install
-INSTALLDIR=	$(INSTALL) -d -m $(DIRMODE)
-INSTALLBIN=	$(INSTALL) -m $(BINMODE)
-INSTALLMAN=	$(INSTALL) -m $(MANMODE)
-INSTALLDAT=	$(INSTALL) -m $(DATMODE)
-INSTALLSUID=    $(INSTALL) -m $(SUIDMODE)
-
-ifeq "$(DISABLE_NLS)" "yes"
-NLSFLAGS = -DDISABLE_NLS
-endif
-
-CFLAGS := $(OPT) -I$(LIB) $(WARNFLAGS) \
-			$(CURSESFLAGS) $(SLANGFLAGS) $(NLSFLAGS) \
-			-D_FILE_OFFSET_BITS=64 \
-			-DSBINDIR=\"$(SBIN_DIR)\" \
-			-DUSRSBINDIR=\"$(USRSBIN_DIR)\" \
-			-DLOGDIR=\"$(LOG_DIR)\" \
-			-DVARPATH=\"$(VAR_PATH)\" \
-			-DLOCALEDIR=\"$(LOCALE_DIR)\" \
-			$(CFLAGS)
-
-
-%.o: %.c
-	$(CC) -c $(CFLAGS) $< -o $@
-
-%: %.cc
-	$(CXX) $(CFLAGS) $< -o $@
-
diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/defines.h b/meta/recipes-core/util-linux/util-linux-2.19.1/defines.h
deleted file mode 100644
index 6ce6b86df..000000000
--- a/meta/recipes-core/util-linux/util-linux-2.19.1/defines.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#define UTIL_LINUX_VERSION "2.12"
-#define util_linux_version "util-linux-2.12"
-
-#define HAVE_blkpg_h
-#define HAVE_kd_h
-#define HAVE_locale_h
-#define HAVE_langinfo_h
-#define HAVE_sys_user_h
-#define HAVE_asm_types_h
-//#define NEED_tqueue_h
diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/make_include b/meta/recipes-core/util-linux/util-linux-2.19.1/make_include
deleted file mode 100644
index e6abcd91f..000000000
--- a/meta/recipes-core/util-linux/util-linux-2.19.1/make_include
+++ /dev/null
@@ -1,17 +0,0 @@
-VERSION=2.12
-CC=gcc
-CFLAGS=
-LDFLAGS=
-HAVE_OLD_GCC=yes
-HAVE_RAW_H=yes
-HAVE_NCURSES=yes
-CURSESFLAGS=-DNCH=1
-LIBCURSES=-lncurses
-HAVE_TERMCAP=no
-NEED_LIBCRYPT=yes
-FOREIGN = --foreign-user
-HAVE_XGETTEXT=yes
-HAVE_OPENPTY=yes
-HAVE_PIVOT_ROOT=yes
-HAVE_GOOD_RPC=yes
-HAVE_ZLIB=yes
diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/remove-lscpu.patch b/meta/recipes-core/util-linux/util-linux-2.19.1/remove-lscpu.patch
deleted file mode 100644
index afa50f46b..000000000
--- a/meta/recipes-core/util-linux/util-linux-2.19.1/remove-lscpu.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Upstream-Status: Inappropriate [distribution]
-
-Take out lscpu stuff from the code
-
-2011/03/17
-Saul Wold <saul.wold@intel.com>
-Nitin A Kamble <nitin.a.kamble@intel.com>
-
-Index: util-linux-2.19.1/sys-utils/Makefile.am
-===================================================================
---- util-linux-2.19.1.orig/sys-utils/Makefile.am	2011-04-05 03:43:02.000000000 -0700
-+++ util-linux-2.19.1/sys-utils/Makefile.am	2011-06-29 12:08:24.187440334 -0700
-@@ -17,12 +17,6 @@
- dist_man_MANS += dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
- 		ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8
- 
--if HAVE_CPU_SET_T
--usrbin_exec_PROGRAMS += lscpu
--lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c
--dist_man_MANS += lscpu.1
--endif
--
- endif
- 
- cytune_SOURCES = cytune.c cyclades.h
-Index: util-linux-2.19.1/sys-utils/Makefile.in
-===================================================================
---- util-linux-2.19.1.orig/sys-utils/Makefile.in	2011-05-02 02:49:19.000000000 -0700
-+++ util-linux-2.19.1/sys-utils/Makefile.in	2011-06-29 12:10:47.647440371 -0700
-@@ -51,8 +51,6 @@
- @LINUX_TRUE@am__append_5 = dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
- @LINUX_TRUE@		ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8
- 
--@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am__append_6 = lscpu
--@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am__append_7 = lscpu.1
- @BUILD_FALLOCATE_TRUE@am__append_8 = fallocate
- @BUILD_FALLOCATE_TRUE@am__append_9 = fallocate.1
- @BUILD_PIVOT_ROOT_TRUE@am__append_10 = pivot_root
-@@ -98,7 +96,6 @@
- @BUILD_PIVOT_ROOT_TRUE@am__EXEEXT_4 = pivot_root$(EXEEXT)
- @BUILD_SWITCH_ROOT_TRUE@am__EXEEXT_5 = switch_root$(EXEEXT)
- @LINUX_TRUE@am__EXEEXT_6 = cytune$(EXEEXT) setarch$(EXEEXT)
--@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am__EXEEXT_7 = lscpu$(EXEEXT)
- @BUILD_FALLOCATE_TRUE@am__EXEEXT_8 = fallocate$(EXEEXT)
- @BUILD_UNSHARE_TRUE@am__EXEEXT_9 = unshare$(EXEEXT)
- @LINUX_TRUE@am__EXEEXT_10 = ldattach$(EXEEXT) tunelp$(EXEEXT) \
-@@ -146,11 +143,6 @@
- ldattach_SOURCES = ldattach.c
- ldattach_OBJECTS = ldattach.$(OBJEXT)
- ldattach_LDADD = $(LDADD)
--am__lscpu_SOURCES_DIST = lscpu.c $(top_srcdir)/lib/cpuset.c
--@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am_lscpu_OBJECTS = lscpu.$(OBJEXT) \
--@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@	cpuset.$(OBJEXT)
--lscpu_OBJECTS = $(am_lscpu_OBJECTS)
--lscpu_LDADD = $(LDADD)
- pivot_root_SOURCES = pivot_root.c
- pivot_root_OBJECTS = pivot_root.$(OBJEXT)
- pivot_root_LDADD = $(LDADD)
-@@ -206,13 +198,13 @@
- am__v_GEN_0 = @echo "  GEN   " $@;
- SOURCES = arch.c ctrlaltdel.c $(cytune_SOURCES) $(dmesg_SOURCES) \
- 	$(fallocate_SOURCES) flock.c fsfreeze.c $(fstrim_SOURCES) \
--	ipcmk.c ipcrm.c ipcs.c ldattach.c $(lscpu_SOURCES) \
-+	ipcmk.c ipcrm.c ipcs.c ldattach.c \
- 	pivot_root.c readprofile.c renice.c $(rtcwake_SOURCES) \
- 	setarch.c setsid.c switch_root.c $(tunelp_SOURCES) unshare.c
- DIST_SOURCES = arch.c ctrlaltdel.c $(cytune_SOURCES) $(dmesg_SOURCES) \
- 	$(am__fallocate_SOURCES_DIST) flock.c fsfreeze.c \
- 	$(fstrim_SOURCES) ipcmk.c ipcrm.c ipcs.c ldattach.c \
--	$(am__lscpu_SOURCES_DIST) pivot_root.c readprofile.c renice.c \
-+	pivot_root.c readprofile.c renice.c \
- 	$(rtcwake_SOURCES) setarch.c setsid.c switch_root.c \
- 	$(tunelp_SOURCES) unshare.c
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -242,7 +234,7 @@
- MANS = $(dist_man_MANS) $(man_MANS)
- am__dist_noinst_DATA_DIST = flock.1 ipcrm.1 ipcs.1 ipcmk.1 renice.1 \
- 	setsid.1 readprofile.1 dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
--	ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8 lscpu.1 \
-+	ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8 \
- 	fallocate.1 pivot_root.8 switch_root.8 unshare.1 arch.1
- DATA = $(dist_noinst_DATA)
- ETAGS = etags
-@@ -438,7 +430,6 @@
- 	readprofile.1 $(am__append_5) $(am__append_7) $(am__append_9) \
- 	$(am__append_11) $(am__append_13) $(am__append_15) \
- 	$(am__append_17)
--@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c
- cytune_SOURCES = cytune.c cyclades.h
- tunelp_SOURCES = tunelp.c lp.h
- fstrim_SOURCES = fstrim.c $(top_srcdir)/lib/strutils.c
-@@ -693,9 +684,6 @@
- ldattach$(EXEEXT): $(ldattach_OBJECTS) $(ldattach_DEPENDENCIES) 
- 	@rm -f ldattach$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(ldattach_OBJECTS) $(ldattach_LDADD) $(LIBS)
--lscpu$(EXEEXT): $(lscpu_OBJECTS) $(lscpu_DEPENDENCIES) 
--	@rm -f lscpu$(EXEEXT)
--	$(AM_V_CCLD)$(LINK) $(lscpu_OBJECTS) $(lscpu_LDADD) $(LIBS)
- pivot_root$(EXEEXT): $(pivot_root_OBJECTS) $(pivot_root_DEPENDENCIES) 
- 	@rm -f pivot_root$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(pivot_root_OBJECTS) $(pivot_root_LDADD) $(LIBS)
-@@ -743,7 +731,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipcrm.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipcs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldattach.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lscpu.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pivot_root.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readprofile.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/renice.Po@am__quote@
diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch b/meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch
deleted file mode 100644
index 02e4d16ff..000000000
--- a/meta/recipes-core/util-linux/util-linux-2.19.1/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-2.19.1/swapargs.h b/meta/recipes-core/util-linux/util-linux-2.19.1/swapargs.h
deleted file mode 100644
index e960eef05..000000000
--- a/meta/recipes-core/util-linux/util-linux-2.19.1/swapargs.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define SWAPON_HAS_TWO_ARGS
-#include <asm/page.h>
-#include <sys/swap.h>
diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-__progname-conflict.patch b/meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-__progname-conflict.patch
deleted file mode 100644
index 45826b180..000000000
--- a/meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-__progname-conflict.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-configure should include errno.h instead of argp.h when
-checking for presence of program_invocation_short_name
-uclibc defines this to be const char* unlike util-linux-ng
-which defines this to be char* so this error goes unnoticed
-on glibc/eglibc systems.
-
-here is the error it fixes
-
-in file included from mountP.h:14:0,                                                                               
-                 from cache.c:29:                                                                                  
-/home/kraj/work/slugos/build/tmp-slugos-uclibc/sysroots/nslu2le/usr/include/errno.h:55:46: error: conflicting types for '__progname'                                                                                                  
-../../../include/c.h:118:14: note: previous declaration of '__progname' was here                                   
-make[3]: *** [cache.lo] Error 1          
-
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
-Index: util-linux-2.19.1/configure.ac
-===================================================================
---- util-linux-2.19.1.orig/configure.ac
-+++ util-linux-2.19.1/configure.ac
-@@ -250,7 +250,7 @@ esac
- 
- 
- AC_MSG_CHECKING(whether program_invocation_short_name is defined)
--AC_TRY_COMPILE([#include <argp.h>],
-+AC_TRY_COMPILE([#include <errno.h>],
-                [program_invocation_short_name = "test";],
-                AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1,
-                          [Define if program_invocation_short_name is defined])
diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-compile.patch b/meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-compile.patch
deleted file mode 100644
index 75774d820..000000000
--- a/meta/recipes-core/util-linux/util-linux-2.19.1/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]
diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-2.16-mount_lock_path.patch b/meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-2.16-mount_lock_path.patch
deleted file mode 100644
index 5773d7ea1..000000000
--- a/meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-2.16-mount_lock_path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-The FHS indicates that /etc must be capable of being mounted R/O.
-
-The FHS also indicates that lock files belong in /var/lock, and /var must
-be R/W as soon as possible during boot.
-
-This patch moves the mtab lock file from the potentially R/O /etc, to the
-R/W /var/lock area.  This lock file is used when mounting disks and making
-other mount adjustments.  The _PATH_MOUNTED_TMP is not adjusted, as failing
-to write to this file does not cause any functional limitations.
-
-(Note, if /etc is R/O, then /etc/mtab should be a symlink to /proc/mounts)
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-
---- util-linux-ng-2.16/include/pathnames.h.orig
-+++ util-linux-ng-2.16/include/pathnames.h
-@@ -90,7 +90,7 @@
- # endif
- #endif
- 
--#define _PATH_MOUNTED_LOCK	_PATH_MOUNTED "~"
-+#define _PATH_MOUNTED_LOCK	"/var/lock/mtab~"
- #define _PATH_MOUNTED_TMP	_PATH_MOUNTED ".tmp"
- 
- #ifndef _PATH_DEV
diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-replace-siginterrupt.patch b/meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-replace-siginterrupt.patch
deleted file mode 100644
index c5c0affcb..000000000
--- a/meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-replace-siginterrupt.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream-Status: Pending
-
-Index: util-linux-ng-2.14/login-utils/login.c
-===================================================================
---- util-linux-ng-2.14.orig/login-utils/login.c	2008-05-28 16:01:02.000000000 -0700
-+++ util-linux-ng-2.14/login-utils/login.c	2009-03-04 18:31:42.000000000 -0800
-@@ -358,6 +358,7 @@
-     char *childArgv[10];
-     char *buff;
-     int childArgc = 0;
-+    struct sigaction act;
- #ifdef HAVE_SECURITY_PAM_MISC_H
-     int retcode;
-     pam_handle_t *pamh = NULL;
-@@ -373,7 +374,9 @@
-     pid = getpid();
- 
-     signal(SIGALRM, timedout);
--    siginterrupt(SIGALRM,1);           /* we have to interrupt syscalls like ioclt() */
-+    (void) sigaction(SIGALRM, NULL, &act);
-+    act.sa_flags &= ~SA_RESTART;
-+    sigaction(SIGALRM, &act, NULL);
-     alarm((unsigned int)timeout);
-     signal(SIGQUIT, SIG_IGN);
-     signal(SIGINT, SIG_IGN);