Browse Source

uclibc: Updated (0.9.28.3 -> 0.9.30.1), disabled old patches, adapted conf to new style.

karasz/new-early
Nagy Karoly Gabriel 15 years ago
parent
commit
45f23a7734
  1. 53
      base/uclibc/300-fix-ppoll.patch
  2. 4
      base/uclibc/add-dns-skipname.patch.disable
  3. 4
      base/uclibc/fix_make_install.patch.disable
  4. 4
      base/uclibc/ldconfig-glob.patch.disable
  5. 11
      base/uclibc/uclibc.conf
  6. 4
      base/uclibc/uclibc.desc

53
base/uclibc/300-fix-ppoll.patch

@ -0,0 +1,53 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../uclibc/300-fix-ppoll.patch
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
[uClibc 0.9.29 0.9.30.1] Add the missing 5th arg to the ppoll syscall.
Fixes the uclibc error that ppoll returns -EINVAL.
Thanks to Geoff Levand <geoffrey.levand@?>
It will match kernel's sigset_t starting from 0.9.31.
--- ./libc/sysdeps/linux/common/ppoll.c
+++ ./libc/sysdeps/linux/common/ppoll.c
@@ -17,6 +17,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#include <signal.h>
#include <sys/syscall.h>
#include <sys/poll.h>
@@ -26,9 +27,9 @@
# define __NR___libc_ppoll __NR_ppoll
static __always_inline
-_syscall4(int, __libc_ppoll, struct pollfd *, fds,
+_syscall5(int, __libc_ppoll, struct pollfd *, fds,
nfds_t, nfds, const struct timespec *, timeout,
- const __sigset_t *, sigmask)
+ const __sigset_t *, sigmask, size_t, sigsetsize)
int
ppoll (struct pollfd *fds, nfds_t nfds, const struct timespec *timeout,
@@ -43,7 +44,7 @@
timeout = &tval;
}
- return __libc_ppoll(fds, nfds, timeout, sigmask);
+ return __libc_ppoll(fds, nfds, timeout, sigmask, _NSIG / 8);
}
libc_hidden_def(ppoll)

4
base/uclibc/add-dns-skipname.patch → base/uclibc/add-dns-skipname.patch.disable

@ -1,8 +1,8 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../uclibc/add-dns-skipname.patch
# Copyright (C) 2007 The OpenSDE Project
# Filename: package/.../uclibc/add-dns-skipname.patch.disable
# Copyright (C) 2007 - 2009 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.

4
base/uclibc/fix_make_install.patch → base/uclibc/fix_make_install.patch.disable

@ -1,8 +1,8 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../uclibc/fix_make_install.patch
# Copyright (C) 2007 The OpenSDE Project
# Filename: package/.../uclibc/fix_make_install.patch.disable
# Copyright (C) 2007 - 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#

4
base/uclibc/ldconfig-glob.patch → base/uclibc/ldconfig-glob.patch.disable

@ -1,8 +1,8 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../uclibc/ldconfig-glob.patch
# Copyright (C) 2006 The OpenSDE Project
# Filename: package/.../uclibc/ldconfig-glob.patch.disable
# Copyright (C) 2006 - 2009 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.

11
base/uclibc/uclibc.conf

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../uclibc/uclibc.conf
# Copyright (C) 2006 - 2007 The OpenSDE Project
# Copyright (C) 2006 - 2009 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
@ -98,8 +98,9 @@ uclibc_config() {
# generate default config rules
default_config > $builddir/.config
eval $MAKE defconfig
conffiles_loop 2 TARGET_ARCH=$uC_arch
eval $MAKE TARGET_ARCH=$uC_arch ARCH=$uC_arch defconfig
conffiles_loop 2 TARGET_ARCH=$uC_arch ARCH=$uC_arch
}
var_remove_regex makeopt ' ' 'prefix=[^ ]*'
@ -119,6 +120,7 @@ fi
makeinstopt="$makeopt -j 1"
var_append makeopt ' ' "CROSS=${archprefix}"
var_append makeopt ' ' "ARCH=${uC_arch}"
if atstage toolchain; then
var_append makeopt ' ' "headers"
@ -135,4 +137,5 @@ else
fi
hook_add postdoc 5 'cp -vf .config $root/$docdir/'
hook_add inmake 5 'rm -rf $builddir/uClibc-$ver/include/scsi'
hook_add postmake 5 'cd $root$libdir; ln -sfv libc.so.0 libc.so; cd $builddir'

4
base/uclibc/uclibc.desc

@ -36,7 +36,7 @@
[L] LGPL
[S] Stable
[V] 0.9.28.3
[V] 0.9.30.1
[P] O 01---5---9 101.700
[D] 429602886 uClibc-0.9.28.3.tar.bz2 http://www.uclibc.org/downloads/
[D] 758585862 uClibc-0.9.30.1.tar.bz2 http://www.uclibc.org/downloads/

Loading…
Cancel
Save