unbreak kodi and util-linux, bad qa day.

9 files changed, 292 insertions, 9 deletions

diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index e1165e238..2a9cc59b6 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		util-linux
 PKG_VERSION:=		2.25.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6
 PKG_DESCR:=		basic utilities
 PKG_SECTION:=		base/apps
@@ -59,7 +59,7 @@ $(eval $(call PKG_template,LIBMOUNT,libmount,${PKG_VERSION}-${PKG_RELEASE},${PKG
 
 TARGET_CFLAGS+=		-DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK
 TARGET_LDFLAGS+=	-ltinfo
-#AUTOTOOL_STYLE:=	autoreconf
+AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ENV+=		have_scanf_alloc_modifier=yes \
 			scanf_cv_alloc_modifier=ms
 
@@ -77,6 +77,7 @@ CONFIGURE_ARGS+=	--disable-use-tty-group \
 			--disable-eject \
 			--without-python \
 			--without-systemd \
+			--without-user \
 			--enable-libuuid \
 			--enable-libblkid \
 			--enable-libmount \
@@ -85,28 +86,28 @@ FAKE_FLAGS+=		INSTALLSUID="install -m 4755"
 
 fdisk-install:
 	${INSTALL_DIR} ${IDIR_FDISK}/usr/sbin
-	${CP} ${WRKINST}/sbin/fdisk ${IDIR_FDISK}/usr/sbin
+	${CP} ${WRKINST}/usr/sbin/fdisk ${IDIR_FDISK}/usr/sbin
 
 cfdisk-install:
 	${INSTALL_DIR} ${IDIR_CFDISK}/usr/sbin
-	${CP} ${WRKINST}/sbin/cfdisk ${IDIR_FDISK}/usr/sbin
+	${CP} ${WRKINST}/usr/sbin/cfdisk ${IDIR_FDISK}/usr/sbin
 
 sfdisk-install:
 	${INSTALL_DIR} ${IDIR_SFDISK}/usr/sbin
-	${CP} ${WRKINST}/sbin/sfdisk ${IDIR_SFDISK}/usr/sbin
+	${CP} ${WRKINST}/usr/sbin/sfdisk ${IDIR_SFDISK}/usr/sbin
 
 losetup-install:
 	${INSTALL_DIR} ${IDIR_LOSETUP}/usr/sbin
-	${CP} ${WRKINST}/sbin/losetup ${IDIR_LOSETUP}/usr/sbin
+	${CP} ${WRKINST}/usr/sbin/losetup ${IDIR_LOSETUP}/usr/sbin
 
 swap-utils-install:
 	${INSTALL_DIR} ${IDIR_SWAP_UTILS}/usr/sbin
-	${CP} ${WRKINST}/sbin/mkswap ${IDIR_SWAP_UTILS}/usr/sbin
-	${CP} ${WRKINST}/sbin/swap{on,off} ${IDIR_SWAP_UTILS}/usr/sbin
+	${CP} ${WRKINST}/usr/sbin/mkswap ${IDIR_SWAP_UTILS}/usr/sbin
+	${CP} ${WRKINST}/usr/sbin/swap{on,off} ${IDIR_SWAP_UTILS}/usr/sbin
 
 mkfs-install:
 	${INSTALL_DIR} ${IDIR_MKFS}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/sbin/mkfs ${IDIR_MKFS}/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/mkfs ${IDIR_MKFS}/usr/sbin
 
 mount-install:
 	${INSTALL_DIR} ${IDIR_MOUNT}/bin
diff --git a/package/util-linux/patches/patch-Makefile_am b/package/util-linux/patches/patch-Makefile_am
new file mode 100644
index 000000000..cc6c3516d
--- /dev/null
+++ b/package/util-linux/patches/patch-Makefile_am
@@ -0,0 +1,11 @@
+--- util-linux-2.25.2.orig/Makefile.am	2014-10-24 04:21:20.304387835 -0500
++++ util-linux-2.25.2/Makefile.am	2014-12-27 12:28:09.631516950 -0600
+@@ -60,7 +60,7 @@ CHECK_LOCALS =
+ EXTRA_DIST =
+ CLEANFILES =
+ 
+-SUBDIRS = po
++SUBDIRS = 
+ 
+ RCS_FIND_IGNORE = \( -name SCCS -o -name BitKeeper -o -name .svn -o \
+ 		-name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o
diff --git a/package/util-linux/patches/patch-config_ltmain_sh b/package/util-linux/patches/patch-config_ltmain_sh
new file mode 100644
index 000000000..76996c357
--- /dev/null
+++ b/package/util-linux/patches/patch-config_ltmain_sh
@@ -0,0 +1,56 @@
+--- util-linux-2.25.2.orig/config/ltmain.sh	2014-06-25 02:25:47.000000000 -0500
++++ util-linux-2.25.2/config/ltmain.sh	2014-12-27 12:19:20.435521793 -0600
+@@ -5176,7 +5176,7 @@ func_mode_link ()
+ 	;;
+       -all-static | -static | -static-libtool-libs)
+ 	case $arg in
+-	-all-static)
++	-all-static|-static)
+ 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ 	    func_warning "complete static linking is impossible in this configuration"
+ 	  fi
+@@ -5185,12 +5185,6 @@ func_mode_link ()
+ 	  fi
+ 	  prefer_static_libs=yes
+ 	  ;;
+-	-static)
+-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+-	    dlopen_self=$dlopen_self_static
+-	  fi
+-	  prefer_static_libs=built
+-	  ;;
+ 	-static-libtool-libs)
+ 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+@@ -5473,7 +5467,7 @@ func_mode_link ()
+       prevarg="$arg"
+ 
+       case $arg in
+-      -all-static)
++      -all-static|-static)
+ 	if test -n "$link_static_flag"; then
+ 	  # See comment for -static flag below, for more details.
+ 	  func_append compile_command " $link_static_flag"
+@@ -5754,12 +5748,7 @@ func_mode_link ()
+ 	continue
+ 	;;
+ 
+-      -static | -static-libtool-libs)
+-	# The effects of -static are defined in a previous loop.
+-	# We used to do the same as -all-static on platforms that
+-	# didn't have a PIC flag, but the assumption that the effects
+-	# would be equivalent was wrong.  It would break on at least
+-	# Digital Unix and AIX.
++      -static-libtool-libs)
+ 	continue
+ 	;;
+ 
+@@ -5853,7 +5842,7 @@ func_mode_link ()
+       # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+-      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
++      -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
+         func_quote_for_eval "$arg"
+ 	arg="$func_quote_for_eval_result"
+         func_append compile_command " $arg"
diff --git a/package/util-linux/patches/patch-config_missing b/package/util-linux/patches/patch-config_missing
new file mode 100644
index 000000000..afebc2a0f
--- /dev/null
+++ b/package/util-linux/patches/patch-config_missing
@@ -0,0 +1,20 @@
+--- util-linux-2.25.2.orig/config/missing	2013-08-05 05:10:38.000000000 -0500
++++ util-linux-2.25.2/config/missing	2014-12-27 12:19:31.479521691 -0600
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # Common wrapper for a few potentially missing GNU programs.
+ 
+-scriptversion=2012-06-26.16; # UTC
++scriptversion=2013-10-28.13; # UTC
+ 
+ # Copyright (C) 1996-2013 Free Software Foundation, Inc.
+ # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+@@ -160,7 +160,7 @@ give_advice ()
+       ;;
+    autom4te*)
+       echo "You might have modified some maintainer files that require"
+-      echo "the 'automa4te' program to be rebuilt."
++      echo "the 'autom4te' program to be rebuilt."
+       program_details 'autom4te'
+       ;;
+     bison*|yacc*)
diff --git a/package/util-linux/patches/patch-config_test-driver b/package/util-linux/patches/patch-config_test-driver
new file mode 100644
index 000000000..60e8464d4
--- /dev/null
+++ b/package/util-linux/patches/patch-config_test-driver
@@ -0,0 +1,51 @@
+--- util-linux-2.25.2.orig/config/test-driver	2013-08-05 05:10:38.000000000 -0500
++++ util-linux-2.25.2/config/test-driver	2014-12-27 12:19:32.871521679 -0600
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # test-driver - basic testsuite driver script.
+ 
+-scriptversion=2012-06-27.10; # UTC
++scriptversion=2013-07-13.22; # UTC
+ 
+ # Copyright (C) 2011-2013 Free Software Foundation, Inc.
+ #
+@@ -44,13 +44,12 @@ print_usage ()
+ Usage:
+   test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+               [--expect-failure={yes|no}] [--color-tests={yes|no}]
+-              [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
++              [--enable-hard-errors={yes|no}] [--]
++              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
+ The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+ END
+ }
+ 
+-# TODO: better error handling in option parsing (in particular, ensure
+-# TODO: $log_file, $trs_file and $test_name are defined).
+ test_name= # Used for reporting.
+ log_file=  # Where to save the output of the test script.
+ trs_file=  # Where to save the metadata of the test run.
+@@ -69,10 +68,23 @@ while test $# -gt 0; do
+   --enable-hard-errors) enable_hard_errors=$2; shift;;
+   --) shift; break;;
+   -*) usage_error "invalid option: '$1'";;
++   *) break;;
+   esac
+   shift
+ done
+ 
++missing_opts=
++test x"$test_name" = x && missing_opts="$missing_opts --test-name"
++test x"$log_file"  = x && missing_opts="$missing_opts --log-file"
++test x"$trs_file"  = x && missing_opts="$missing_opts --trs-file"
++if test x"$missing_opts" != x; then
++  usage_error "the following mandatory options are missing:$missing_opts"
++fi
++
++if test $# -eq 0; then
++  usage_error "missing argument"
++fi
++
+ if test $color_tests = yes; then
+   # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
+   red='' # Red.
diff --git a/package/util-linux/patches/patch-configure_ac b/package/util-linux/patches/patch-configure_ac
new file mode 100644
index 000000000..bb5a1ca31
--- /dev/null
+++ b/package/util-linux/patches/patch-configure_ac
@@ -0,0 +1,36 @@
+--- util-linux-2.25.2.orig/configure.ac	2014-10-24 05:24:02.952545559 -0500
++++ util-linux-2.25.2/configure.ac	2014-12-27 12:18:53.179522044 -0600
+@@ -53,16 +53,6 @@ LIBSMARTCOLS_LT_MINOR=1
+ LIBSMARTCOLS_LT_MICRO=0
+ LIBSMARTCOLS_VERSION_INFO=`expr $LIBSMARTCOLS_LT_MAJOR + $LIBSMARTCOLS_LT_MINOR`:$LIBSMARTCOLS_LT_MICRO:$LIBSMARTCOLS_LT_MINOR
+ 
+-# Check whether exec_prefix=/usr:
+-AS_CASE([$exec_prefix:$prefix],
+-[NONE:NONE | NONE:/usr | /usr:*],
+-  [AC_MSG_NOTICE([Default --exec-prefix detected.])
+-   AS_CASE([$bindir],  ['${exec_prefix}/bin'],  [bindir=/bin;   AC_MSG_NOTICE([  --bindir defaults to /bin])  ])
+-   AS_CASE([$sbindir], ['${exec_prefix}/sbin'], [sbindir=/sbin; AC_MSG_NOTICE([  --sbindir defaults to /sbin])])
+-   AS_CASE([$libdir],  ['${exec_prefix}/lib'],  [libdir=/lib;   AC_MSG_NOTICE([  --libdir defaults to /lib])  ])
+-  ]
+-)
+-
+ AS_CASE([$prefix:$localstatedir],
+   [NONE:'${prefix}/var' | /usr:'${prefix}/var'],
+     [localstatedir=/run
+@@ -160,16 +150,6 @@ UL_SET_ARCH([HPPA], [hppa*])
+ 
+ AC_SYS_LARGEFILE
+ 
+-dnl Don't forget to maintain alternatively allowed versions in autogen.sh!
+-AM_GNU_GETTEXT_VERSION([0.18.3])
+-AM_GNU_GETTEXT([external])
+-
+-AS_IF([test -d "$srcdir/po"], [
+-  ALL_LINGUAS=`cd $srcdir/po > /dev/null && echo *.po | sed 's/\.po//g'`
+-], [
+-  ALL_LINGUAS="af am ar as be bg bn_IN bn ca cs cy da de el en_GB es et eu_ES fa fi fr gl gu he hi hr hu hy id is it ja ka kn ko ku lo lt lv mk ml mr ms my nb nl nn no nso or pa pl pt_BR pt ro ru si sk sl sq sr@Latn sr sv ta te th tr uk ur vi zh_CN zh_TW zu"
+-])
+-
+ AC_CHECK_HEADERS([linux/compiler.h linux/blkpg.h linux/major.h], [], [], [
+ #ifdef HAVE_LINUX_COMPILER_H
+ #include <linux/compiler.h>
diff --git a/package/util-linux/patches/patch-configure_ac.orig b/package/util-linux/patches/patch-configure_ac.orig
new file mode 100644
index 000000000..a2fc44d18
--- /dev/null
+++ b/package/util-linux/patches/patch-configure_ac.orig
@@ -0,0 +1,19 @@
+--- util-linux-2.25.2.orig/configure.ac	2014-10-24 05:24:02.952545559 -0500
++++ util-linux-2.25.2/configure.ac	2014-12-27 12:17:12.651522964 -0600
+@@ -53,16 +53,6 @@ LIBSMARTCOLS_LT_MINOR=1
+ LIBSMARTCOLS_LT_MICRO=0
+ LIBSMARTCOLS_VERSION_INFO=`expr $LIBSMARTCOLS_LT_MAJOR + $LIBSMARTCOLS_LT_MINOR`:$LIBSMARTCOLS_LT_MICRO:$LIBSMARTCOLS_LT_MINOR
+ 
+-# Check whether exec_prefix=/usr:
+-AS_CASE([$exec_prefix:$prefix],
+-[NONE:NONE | NONE:/usr | /usr:*],
+-  [AC_MSG_NOTICE([Default --exec-prefix detected.])
+-   AS_CASE([$bindir],  ['${exec_prefix}/bin'],  [bindir=/bin;   AC_MSG_NOTICE([  --bindir defaults to /bin])  ])
+-   AS_CASE([$sbindir], ['${exec_prefix}/sbin'], [sbindir=/sbin; AC_MSG_NOTICE([  --sbindir defaults to /sbin])])
+-   AS_CASE([$libdir],  ['${exec_prefix}/lib'],  [libdir=/lib;   AC_MSG_NOTICE([  --libdir defaults to /lib])  ])
+-  ]
+-)
+-
+ AS_CASE([$prefix:$localstatedir],
+   [NONE:'${prefix}/var' | /usr:'${prefix}/var'],
+     [localstatedir=/run
diff --git a/package/util-linux/patches/patch-m4_libtool_m4 b/package/util-linux/patches/patch-m4_libtool_m4
new file mode 100644
index 000000000..86f48d620
--- /dev/null
+++ b/package/util-linux/patches/patch-m4_libtool_m4
@@ -0,0 +1,69 @@
+--- util-linux-2.25.2.orig/m4/libtool.m4	2014-06-25 02:25:47.000000000 -0500
++++ util-linux-2.25.2/m4/libtool.m4	2014-12-27 12:19:20.527521791 -0600
+@@ -1312,7 +1312,7 @@ ia64-*-hpux*)
+   rm -rf conftest*
+   ;;
+ 
+-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+@@ -1326,10 +1326,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+ 	  x86_64-*linux*)
+ 	    LD="${LD-ld} -m elf_i386"
+ 	    ;;
+-	  powerpc64le-*linux*)
+-	    LD="${LD-ld} -m elf32lppclinux"
+-	    ;;
+-	  powerpc64-*linux*)
++	  ppc64-*linux*|powerpc64-*linux*)
+ 	    LD="${LD-ld} -m elf32ppclinux"
+ 	    ;;
+ 	  s390x-*linux*)
+@@ -1348,10 +1345,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+ 	  x86_64-*linux*)
+ 	    LD="${LD-ld} -m elf_x86_64"
+ 	    ;;
+-	  powerpcle-*linux*)
+-	    LD="${LD-ld} -m elf64lppc"
+-	    ;;
+-	  powerpc-*linux*)
++	  ppc*-*linux*|powerpc*-*linux*)
+ 	    LD="${LD-ld} -m elf64ppc"
+ 	    ;;
+ 	  s390*-*linux*|s390*-*tpf*)
+@@ -2675,14 +2669,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
+-  # Add ABI-specific directories to the system library path.
+-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+-
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+-
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -4602,7 +4592,7 @@ m4_if([$1], [CXX], [
+   _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+   _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+   _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  _LT_TAGVAR(hardcode_automatic, $1)=no
++  _LT_TAGVAR(hardcode_automatic, $1)=yes
+   _LT_TAGVAR(hardcode_direct, $1)=no
+   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+@@ -5850,7 +5840,7 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-_LT_TAGVAR(hardcode_automatic, $1)=no
++_LT_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_TAGVAR(inherit_rpath, $1)=no
+ _LT_TAGVAR(module_cmds, $1)=
+ _LT_TAGVAR(module_expsym_cmds, $1)=
diff --git a/package/util-linux/patches/patch-misc-utils_uuidd_8 b/package/util-linux/patches/patch-misc-utils_uuidd_8
new file mode 100644
index 000000000..e4709603e
--- /dev/null
+++ b/package/util-linux/patches/patch-misc-utils_uuidd_8
@@ -0,0 +1,20 @@
+--- util-linux-2.25.2.orig/misc-utils/uuidd.8	2014-10-24 05:29:31.248109303 -0500
++++ util-linux-2.25.2/misc-utils/uuidd.8	2014-12-27 12:01:48.179531428 -0600
+@@ -34,7 +34,7 @@ UUIDs.
+ .TP
+ .BR \-p , " \-\-pid " \fIpath\fR
+ Specify the pathname where the pid file should be written.  By default,
+-the pid file is written to /run/uuidd/uuidd.pid.
++the pid file is written to /var/uuidd/uuidd.pid.
+ .TP
+ .BR \-P , " \-\-no-pid "
+ Do not create pid file.
+@@ -57,7 +57,7 @@ request it to return a random-based UUID
+ .TP
+ .BR \-s , " \-\-socket " \fIpath\fR
+ Specify the pathname used for the unix-domain socket used by uuidd.  By
+-default, the pathname used is /run/uuidd/request.  This is primarily
++default, the pathname used is /var/uuidd/request.  This is primarily
+ for debugging purposes, since the pathname is hard-coded in the libuuid
+ library.
+ .TP