Merge branch 'master' of git+ssh://openadk.org/git/openadk

Config.in

@@ -44,6 +44,7 @@ config ADK_DEVELSYSTEM
 	select BUSYBOX_TEE
 	select BUSYBOX_WGET
 	select BUSYBOX_YES
+	select BUSYBOX_TRUE
 	select ADK_PACKAGE_BASH
 	select ADK_PACKAGE_BINUTILS
 	select ADK_PACKAGE_BZIP2

mk/build.mk

@@ -18,7 +18,6 @@ DEFCONFIG=		ADK_DEVELSYSTEM=n \
 			ADK_FORCE_PARALLEL=n \
 			ADK_PACKAGE_BZR=n \
 			ADK_PACKAGE_GRUB=n \
-			ADK_PACKAGE_XORG_SERVER_WITH_DRI=n \
 			ADK_PACKAGE_AUFS2_UTIL=n \
 			ADK_PACKAGE_BASE_FILES=y \
 			ADK_PACKAGE_MGETTY=n \

package/chillispot/patches/patch-Makefile

@@ -1,178 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- chillispot-1.1.0.orig/Makefile	2006-09-24 21:35:16.000000000 +0200
-+++ chillispot-1.1.0/Makefile	2009-05-21 20:42:08.000000000 +0200
-@@ -13,9 +13,9 @@
- # PARTICULAR PURPOSE.
- 
- 
--srcdir = .
--top_srcdir = .
--
-+srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0
-+top_srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0
-+VPATH = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0
- pkgdatadir = $(datadir)/chillispot
- pkglibdir = $(libdir)/chillispot
- pkgincludedir = $(includedir)/chillispot
-@@ -33,8 +33,8 @@ POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--build_triplet = i686-pc-linux-gnu
--host_triplet = i686-pc-linux-gnu
-+build_triplet = x86_64-pc-linux-gnu
-+host_triplet = i586-pc-linux-gnu
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(srcdir)/chillispot.spec.in \
- 	$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
-@@ -72,24 +72,24 @@ DIST_ARCHIVES = $(distdir).tar.gz
- GZIP_ENV = --best
- distuninstallcheck_listfiles = find . -type f -print
- distcleancheck_listfiles = find . -type f -print
--ACLOCAL = ${SHELL} /home/jj/chillispot/missing --run aclocal-1.9
--AMDEP_FALSE = #
--AMDEP_TRUE = 
--AMTAR = ${SHELL} /home/jj/chillispot/missing --run tar
--AR = ar
--AUTOCONF = ${SHELL} /home/jj/chillispot/missing --run autoconf
--AUTOHEADER = ${SHELL} /home/jj/chillispot/missing --run autoheader
--AUTOMAKE = ${SHELL} /home/jj/chillispot/missing --run automake-1.9
-+ACLOCAL = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run aclocal-1.9
-+AMDEP_FALSE = 
-+AMDEP_TRUE = #
-+AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run tar
-+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar
-+AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoconf
-+AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoheader
-+AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run automake-1.9
- AWK = gawk
--CC = gcc
--CCDEPMODE = depmode=gcc3
--CFLAGS = -g -O2
--CPP = gcc -E
--CPPFLAGS = 
--CXX = g++
--CXXCPP = g++ -E
--CXXDEPMODE = depmode=gcc3
--CXXFLAGS = -g -O2
-+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc
-+CCDEPMODE = depmode=none
-+CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
-+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E
-+CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG
-+CXX = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++
-+CXXCPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -E
-+CXXDEPMODE = depmode=none
-+CXXFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
- CYGPATH_W = echo
- DEFS = -DHAVE_CONFIG_H
- DEPDIR = .deps
-@@ -99,19 +99,19 @@ ECHO_N = -n
- ECHO_T = 
- EGREP = grep -E
- EXEEXT = 
--F77 = f95
--FFLAGS = -g -O2
-+F77 = 
-+FFLAGS = 
- INSTALL_DATA = ${INSTALL} -m 644
- INSTALL_PROGRAM = ${INSTALL}
- INSTALL_SCRIPT = ${INSTALL}
- INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
--LDFLAGS = 
--LIBOBJS = 
-+LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib
-+LIBOBJS =  memcmp$U.o
- LIBS = 
- LIBTOOL = $(SHELL) $(top_builddir)/libtool
- LN_S = ln -s
--LTLIBOBJS = 
--MAKEINFO = ${SHELL} /home/jj/chillispot/missing --run makeinfo
-+LTLIBOBJS =  memcmp$U.lo
-+MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run makeinfo
- OBJEXT = o
- PACKAGE = chillispot
- PACKAGE_BUGREPORT = bugs@chillispot.org
-@@ -120,54 +120,54 @@ PACKAGE_STRING = chillispot 1.1.0
- PACKAGE_TARNAME = chillispot
- PACKAGE_VERSION = 1.1.0
- PATH_SEPARATOR = :
--RANLIB = ranlib
-+RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib
- SET_MAKE = 
--SHELL = /bin/sh
--STRIP = strip
-+SHELL = /bin/bash
-+STRIP = i586-linux-strip
- VERSION = 1.1.0
--ac_ct_AR = ar
--ac_ct_CC = gcc
--ac_ct_CXX = g++
--ac_ct_F77 = f95
--ac_ct_RANLIB = ranlib
--ac_ct_STRIP = strip
--am__fastdepCC_FALSE = #
--am__fastdepCC_TRUE = 
--am__fastdepCXX_FALSE = #
--am__fastdepCXX_TRUE = 
-+ac_ct_AR = 
-+ac_ct_CC = 
-+ac_ct_CXX = 
-+ac_ct_F77 = 
-+ac_ct_RANLIB = 
-+ac_ct_STRIP = 
-+am__fastdepCC_FALSE = 
-+am__fastdepCC_TRUE = #
-+am__fastdepCXX_FALSE = 
-+am__fastdepCXX_TRUE = #
- am__include = include
- am__leading_dot = .
- am__quote = 
- am__tar = ${AMTAR} chof - "$$tardir"
- am__untar = ${AMTAR} xf -
- bindir = ${exec_prefix}/bin
--build = i686-pc-linux-gnu
--build_alias = 
--build_cpu = i686
-+build = x86_64-pc-linux-gnu
-+build_alias = x86_64-linux-gnu
-+build_cpu = x86_64
- build_os = linux-gnu
- build_vendor = pc
--datadir = ${prefix}/share
-+datadir = /usr/share
- exec_prefix = ${prefix}
--host = i686-pc-linux-gnu
--host_alias = 
--host_cpu = i686
-+host = i586-pc-linux-gnu
-+host_alias = i586-linux
-+host_cpu = i586
- host_os = linux-gnu
- host_vendor = pc
- includedir = ${prefix}/include
- infodir = ${prefix}/info
--install_sh = /home/jj/chillispot/install-sh
-+install_sh = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/install-sh
- libdir = ${exec_prefix}/lib
--libexecdir = ${exec_prefix}/libexec
--localstatedir = ${prefix}/var
--mandir = ${prefix}/man
-+libexecdir = /usr/sbin
-+localstatedir = /var
-+mandir = /usr/share/man
- mkdir_p = mkdir -p --
- oldincludedir = /usr/include
--prefix = /usr/local
--program_transform_name = s,x,x,
-+prefix = /usr
-+program_transform_name = s,$$,,;s,^,,
- sbindir = ${exec_prefix}/sbin
- sharedstatedir = ${prefix}/com
--sysconfdir = ${prefix}/etc
--target_alias = 
-+sysconfdir = /etc
-+target_alias = i586-linux
- SUBDIRS = src doc
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

package/chillispot/patches/patch-doc_Makefile

@@ -1,178 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- chillispot-1.1.0.orig/doc/Makefile	2006-09-24 21:35:16.000000000 +0200
-+++ chillispot-1.1.0/doc/Makefile	2009-05-21 20:42:08.000000000 +0200
-@@ -13,9 +13,9 @@
- # PARTICULAR PURPOSE.
- 
- 
--srcdir = .
--top_srcdir = ..
--
-+srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/doc
-+top_srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0
-+VPATH = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/doc
- pkgdatadir = $(datadir)/chillispot
- pkglibdir = $(libdir)/chillispot
- pkgincludedir = $(includedir)/chillispot
-@@ -33,8 +33,8 @@ POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--build_triplet = i686-pc-linux-gnu
--host_triplet = i686-pc-linux-gnu
-+build_triplet = x86_64-pc-linux-gnu
-+host_triplet = i586-pc-linux-gnu
- subdir = doc
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -51,24 +51,24 @@ am__installdirs = "$(DESTDIR)$(man8dir)"
- NROFF = nroff
- MANS = $(man_MANS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--ACLOCAL = ${SHELL} /home/jj/chillispot/missing --run aclocal-1.9
--AMDEP_FALSE = #
--AMDEP_TRUE = 
--AMTAR = ${SHELL} /home/jj/chillispot/missing --run tar
--AR = ar
--AUTOCONF = ${SHELL} /home/jj/chillispot/missing --run autoconf
--AUTOHEADER = ${SHELL} /home/jj/chillispot/missing --run autoheader
--AUTOMAKE = ${SHELL} /home/jj/chillispot/missing --run automake-1.9
-+ACLOCAL = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run aclocal-1.9
-+AMDEP_FALSE = 
-+AMDEP_TRUE = #
-+AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run tar
-+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar
-+AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoconf
-+AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoheader
-+AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run automake-1.9
- AWK = gawk
--CC = gcc
--CCDEPMODE = depmode=gcc3
--CFLAGS = -g -O2
--CPP = gcc -E
--CPPFLAGS = 
--CXX = g++
--CXXCPP = g++ -E
--CXXDEPMODE = depmode=gcc3
--CXXFLAGS = -g -O2
-+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc
-+CCDEPMODE = depmode=none
-+CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
-+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E
-+CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG
-+CXX = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++
-+CXXCPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -E
-+CXXDEPMODE = depmode=none
-+CXXFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
- CYGPATH_W = echo
- DEFS = -DHAVE_CONFIG_H
- DEPDIR = .deps
-@@ -78,19 +78,19 @@ ECHO_N = -n
- ECHO_T = 
- EGREP = grep -E
- EXEEXT = 
--F77 = f95
--FFLAGS = -g -O2
-+F77 = 
-+FFLAGS = 
- INSTALL_DATA = ${INSTALL} -m 644
- INSTALL_PROGRAM = ${INSTALL}
- INSTALL_SCRIPT = ${INSTALL}
- INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
--LDFLAGS = 
--LIBOBJS = 
-+LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib
-+LIBOBJS =  memcmp$U.o
- LIBS = 
- LIBTOOL = $(SHELL) $(top_builddir)/libtool
- LN_S = ln -s
--LTLIBOBJS = 
--MAKEINFO = ${SHELL} /home/jj/chillispot/missing --run makeinfo
-+LTLIBOBJS =  memcmp$U.lo
-+MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run makeinfo
- OBJEXT = o
- PACKAGE = chillispot
- PACKAGE_BUGREPORT = bugs@chillispot.org
-@@ -99,54 +99,54 @@ PACKAGE_STRING = chillispot 1.1.0
- PACKAGE_TARNAME = chillispot
- PACKAGE_VERSION = 1.1.0
- PATH_SEPARATOR = :
--RANLIB = ranlib
-+RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib
- SET_MAKE = 
--SHELL = /bin/sh
--STRIP = strip
-+SHELL = /bin/bash
-+STRIP = i586-linux-strip
- VERSION = 1.1.0
--ac_ct_AR = ar
--ac_ct_CC = gcc
--ac_ct_CXX = g++
--ac_ct_F77 = f95
--ac_ct_RANLIB = ranlib
--ac_ct_STRIP = strip
--am__fastdepCC_FALSE = #
--am__fastdepCC_TRUE = 
--am__fastdepCXX_FALSE = #
--am__fastdepCXX_TRUE = 
-+ac_ct_AR = 
-+ac_ct_CC = 
-+ac_ct_CXX = 
-+ac_ct_F77 = 
-+ac_ct_RANLIB = 
-+ac_ct_STRIP = 
-+am__fastdepCC_FALSE = 
-+am__fastdepCC_TRUE = #
-+am__fastdepCXX_FALSE = 
-+am__fastdepCXX_TRUE = #
- am__include = include
- am__leading_dot = .
- am__quote = 
- am__tar = ${AMTAR} chof - "$$tardir"
- am__untar = ${AMTAR} xf -
- bindir = ${exec_prefix}/bin
--build = i686-pc-linux-gnu
--build_alias = 
--build_cpu = i686
-+build = x86_64-pc-linux-gnu
-+build_alias = x86_64-linux-gnu
-+build_cpu = x86_64
- build_os = linux-gnu
- build_vendor = pc
--datadir = ${prefix}/share
-+datadir = /usr/share
- exec_prefix = ${prefix}
--host = i686-pc-linux-gnu
--host_alias = 
--host_cpu = i686
-+host = i586-pc-linux-gnu
-+host_alias = i586-linux
-+host_cpu = i586
- host_os = linux-gnu
- host_vendor = pc
- includedir = ${prefix}/include
- infodir = ${prefix}/info
--install_sh = /home/jj/chillispot/install-sh
-+install_sh = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/install-sh
- libdir = ${exec_prefix}/lib
--libexecdir = ${exec_prefix}/libexec
--localstatedir = ${prefix}/var
--mandir = ${prefix}/man
-+libexecdir = /usr/sbin
-+localstatedir = /var
-+mandir = /usr/share/man
- mkdir_p = mkdir -p --
- oldincludedir = /usr/include
--prefix = /usr/local
--program_transform_name = s,x,x,
-+prefix = /usr
-+program_transform_name = s,$$,,;s,^,,
- sbindir = ${exec_prefix}/sbin
- sharedstatedir = ${prefix}/com
--sysconfdir = ${prefix}/etc
--target_alias = 
-+sysconfdir = /etc
-+target_alias = i586-linux
- man_MANS = chilli.8 
- man_aux = $(man_MANS:.1=.x)
- EXTRA_DIST = $(man_MANS)

package/chillispot/patches/patch-src_Makefile

@@ -1,243 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- chillispot-1.1.0.orig/src/Makefile	2006-09-24 21:35:16.000000000 +0200
-+++ chillispot-1.1.0/src/Makefile	2009-05-21 20:42:08.000000000 +0200
-@@ -16,9 +16,9 @@
- 
- SOURCES = $(chilli_SOURCES)
- 
--srcdir = .
--top_srcdir = ..
--
-+srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/src
-+top_srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0
-+VPATH = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/src
- pkgdatadir = $(datadir)/chillispot
- pkglibdir = $(libdir)/chillispot
- pkgincludedir = $(includedir)/chillispot
-@@ -36,8 +36,8 @@ POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--build_triplet = i686-pc-linux-gnu
--host_triplet = i686-pc-linux-gnu
-+build_triplet = x86_64-pc-linux-gnu
-+host_triplet = i586-pc-linux-gnu
- sbin_PROGRAMS = chilli$(EXEEXT)
- subdir = src
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -73,24 +73,24 @@ DIST_SOURCES = $(chilli_SOURCES)
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--ACLOCAL = ${SHELL} /home/jj/chillispot/missing --run aclocal-1.9
--AMDEP_FALSE = #
--AMDEP_TRUE = 
--AMTAR = ${SHELL} /home/jj/chillispot/missing --run tar
--AR = ar
--AUTOCONF = ${SHELL} /home/jj/chillispot/missing --run autoconf
--AUTOHEADER = ${SHELL} /home/jj/chillispot/missing --run autoheader
--AUTOMAKE = ${SHELL} /home/jj/chillispot/missing --run automake-1.9
-+ACLOCAL = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run aclocal-1.9
-+AMDEP_FALSE = 
-+AMDEP_TRUE = #
-+AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run tar
-+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar
-+AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoconf
-+AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoheader
-+AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run automake-1.9
- AWK = gawk
--CC = gcc
--CCDEPMODE = depmode=gcc3
--CFLAGS = -g -O2
--CPP = gcc -E
--CPPFLAGS = 
--CXX = g++
--CXXCPP = g++ -E
--CXXDEPMODE = depmode=gcc3
--CXXFLAGS = -g -O2
-+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc
-+CCDEPMODE = depmode=none
-+CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
-+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E
-+CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG
-+CXX = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++
-+CXXCPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -E
-+CXXDEPMODE = depmode=none
-+CXXFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
- CYGPATH_W = echo
- DEFS = -DHAVE_CONFIG_H
- DEPDIR = .deps
-@@ -100,19 +100,19 @@ ECHO_N = -n
- ECHO_T = 
- EGREP = grep -E
- EXEEXT = 
--F77 = f95
--FFLAGS = -g -O2
-+F77 = 
-+FFLAGS = 
- INSTALL_DATA = ${INSTALL} -m 644
- INSTALL_PROGRAM = ${INSTALL}
- INSTALL_SCRIPT = ${INSTALL}
- INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
--LDFLAGS = 
--LIBOBJS = 
-+LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib
-+LIBOBJS =  memcmp$U.o
- LIBS = 
- LIBTOOL = $(SHELL) $(top_builddir)/libtool
- LN_S = ln -s
--LTLIBOBJS = 
--MAKEINFO = ${SHELL} /home/jj/chillispot/missing --run makeinfo
-+LTLIBOBJS =  memcmp$U.lo
-+MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run makeinfo
- OBJEXT = o
- PACKAGE = chillispot
- PACKAGE_BUGREPORT = bugs@chillispot.org
-@@ -121,54 +121,54 @@ PACKAGE_STRING = chillispot 1.1.0
- PACKAGE_TARNAME = chillispot
- PACKAGE_VERSION = 1.1.0
- PATH_SEPARATOR = :
--RANLIB = ranlib
-+RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib
- SET_MAKE = 
--SHELL = /bin/sh
--STRIP = strip
-+SHELL = /bin/bash
-+STRIP = i586-linux-strip
- VERSION = 1.1.0
--ac_ct_AR = ar
--ac_ct_CC = gcc
--ac_ct_CXX = g++
--ac_ct_F77 = f95
--ac_ct_RANLIB = ranlib
--ac_ct_STRIP = strip
--am__fastdepCC_FALSE = #
--am__fastdepCC_TRUE = 
--am__fastdepCXX_FALSE = #
--am__fastdepCXX_TRUE = 
-+ac_ct_AR = 
-+ac_ct_CC = 
-+ac_ct_CXX = 
-+ac_ct_F77 = 
-+ac_ct_RANLIB = 
-+ac_ct_STRIP = 
-+am__fastdepCC_FALSE = 
-+am__fastdepCC_TRUE = #
-+am__fastdepCXX_FALSE = 
-+am__fastdepCXX_TRUE = #
- am__include = include
- am__leading_dot = .
- am__quote = 
- am__tar = ${AMTAR} chof - "$$tardir"
- am__untar = ${AMTAR} xf -
- bindir = ${exec_prefix}/bin
--build = i686-pc-linux-gnu
--build_alias = 
--build_cpu = i686
-+build = x86_64-pc-linux-gnu
-+build_alias = x86_64-linux-gnu
-+build_cpu = x86_64
- build_os = linux-gnu
- build_vendor = pc
--datadir = ${prefix}/share
-+datadir = /usr/share
- exec_prefix = ${prefix}
--host = i686-pc-linux-gnu
--host_alias = 
--host_cpu = i686
-+host = i586-pc-linux-gnu
-+host_alias = i586-linux
-+host_cpu = i586
- host_os = linux-gnu
- host_vendor = pc
- includedir = ${prefix}/include
- infodir = ${prefix}/info
--install_sh = /home/jj/chillispot/install-sh
-+install_sh = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/install-sh
- libdir = ${exec_prefix}/lib
--libexecdir = ${exec_prefix}/libexec
--localstatedir = ${prefix}/var
--mandir = ${prefix}/man
-+libexecdir = /usr/sbin
-+localstatedir = /var
-+mandir = /usr/share/man
- mkdir_p = mkdir -p --
- oldincludedir = /usr/include
--prefix = /usr/local
--program_transform_name = s,x,x,
-+prefix = /usr
-+program_transform_name = s,$$,,;s,^,,
- sbindir = ${exec_prefix}/sbin
- sharedstatedir = ${prefix}/com
--sysconfdir = ${prefix}/etc
--target_alias = 
-+sysconfdir = /etc
-+target_alias = i586-linux
- 
- # add -pg to enable gprof
- AM_CFLAGS = -D_GNU_SOURCE -fno-builtin -DSBINDIR='"$(sbindir)"' 
-@@ -244,38 +244,38 @@ mostlyclean-compile:
- distclean-compile:
- 	-rm -f *.tab.c
- 
--include ./$(DEPDIR)/chilli.Po
--include ./$(DEPDIR)/cmdline.Po
--include ./$(DEPDIR)/dhcp.Po
--include ./$(DEPDIR)/iphash.Po
--include ./$(DEPDIR)/ippool.Po
--include ./$(DEPDIR)/lookup.Po
--include ./$(DEPDIR)/md5.Po
--include ./$(DEPDIR)/radius.Po
--include ./$(DEPDIR)/redir.Po
--include ./$(DEPDIR)/syserr.Po
--include ./$(DEPDIR)/tun.Po
-+#include ./$(DEPDIR)/chilli.Po
-+#include ./$(DEPDIR)/cmdline.Po
-+#include ./$(DEPDIR)/dhcp.Po
-+#include ./$(DEPDIR)/iphash.Po
-+#include ./$(DEPDIR)/ippool.Po
-+#include ./$(DEPDIR)/lookup.Po
-+#include ./$(DEPDIR)/md5.Po
-+#include ./$(DEPDIR)/radius.Po
-+#include ./$(DEPDIR)/redir.Po
-+#include ./$(DEPDIR)/syserr.Po
-+#include ./$(DEPDIR)/tun.Po
- 
- .c.o:
--	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
--	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
--#	source='$<' object='$@' libtool=no \
--#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
--#	$(COMPILE) -c $<
-+#	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+#	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+#	source='$<' object='$@' libtool=no 
-+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) 
-+	$(COMPILE) -c $<
- 
- .c.obj:
--	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
--	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
--#	source='$<' object='$@' libtool=no \
--#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
--#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+#	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+#	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+#	source='$<' object='$@' libtool=no 
-+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) 
-+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
--	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
--#	source='$<' object='$@' libtool=yes \
--#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
--#	$(LTCOMPILE) -c -o $@ $<
-+#	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+#	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+#	source='$<' object='$@' libtool=yes 
-+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) 
-+	$(LTCOMPILE) -c -o $@ $<
- 
- mostlyclean-libtool:
- 	-rm -f *.lo

package/cxxtools/patches/patch-Makefile_in

@@ -1,11 +0,0 @@
---- cxxtools-1.4.8.orig/Makefile.in	2008-05-26 19:51:34.000000000 +0200
-+++ cxxtools-1.4.8/Makefile.in	2009-11-19 22:10:18.000000000 +0100
-@@ -200,7 +200,7 @@ subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = src include demo
-+SUBDIRS = src include
- bin_SCRIPTS = cxxtools-config
- EXTRA_dist = \
- 	m4/acx_pthread.m4 \

package/cxxtools/patches/patch-demo_Makefile_in

@@ -1,67 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- cxxtools-1.4.8.orig/demo/Makefile.in	2008-05-26 19:51:34.000000000 +0200
-+++ cxxtools-1.4.8/demo/Makefile.in	2009-04-28 22:29:02.476545131 +0200
-@@ -40,7 +40,7 @@ host_triplet = @host@
- noinst_PROGRAMS = arg$(EXEEXT) arg-set$(EXEEXT) cgi$(EXEEXT) \
- 	dir$(EXEEXT) dlloader$(EXEEXT) dynbuffer$(EXEEXT) \
- 	getini$(EXEEXT) hd$(EXEEXT) httprequest$(EXEEXT) \
--	iconv$(EXEEXT) log$(EXEEXT) logbench$(EXEEXT) logsh$(EXEEXT) \
-+	log$(EXEEXT) logbench$(EXEEXT) logsh$(EXEEXT) \
- 	md5sum$(EXEEXT) mime$(EXEEXT) multifstream$(EXEEXT) \
- 	netcat$(EXEEXT) netio$(EXEEXT) netmsg$(EXEEXT) \
- 	pipestream$(EXEEXT) pool$(EXEEXT) signals$(EXEEXT) \
-@@ -96,10 +96,6 @@ am_httprequest_OBJECTS = httprequest.$(O
- httprequest_OBJECTS = $(am_httprequest_OBJECTS)
- httprequest_LDADD = $(LDADD)
- httprequest_DEPENDENCIES = $(top_builddir)/src/libcxxtools.la
--am_iconv_OBJECTS = iconv.$(OBJEXT)
--iconv_OBJECTS = $(am_iconv_OBJECTS)
--iconv_LDADD = $(LDADD)
--iconv_DEPENDENCIES = $(top_builddir)/src/libcxxtools.la
- am_log_OBJECTS = log.$(OBJEXT)
- log_OBJECTS = $(am_log_OBJECTS)
- log_LDADD = $(LDADD)
-@@ -170,7 +166,7 @@ CXXLINK = $(LIBTOOL) --tag=CXX --mode=li
- SOURCES = $(arg_SOURCES) $(arg_set_SOURCES) $(cgi_SOURCES) \
- 	$(cxxlog_SOURCES) $(dir_SOURCES) $(dlloader_SOURCES) \
- 	$(dynbuffer_SOURCES) $(getini_SOURCES) $(hd_SOURCES) \
--	$(httprequest_SOURCES) $(iconv_SOURCES) $(log_SOURCES) \
-+	$(httprequest_SOURCES) $(log_SOURCES) \
- 	$(logbench_SOURCES) $(logsh_SOURCES) $(md5sum_SOURCES) \
- 	$(mime_SOURCES) $(multifstream_SOURCES) $(netcat_SOURCES) \
- 	$(netio_SOURCES) $(netmsg_SOURCES) $(pipestream_SOURCES) \
-@@ -179,7 +175,7 @@ SOURCES = $(arg_SOURCES) $(arg_set_SOURC
- DIST_SOURCES = $(arg_SOURCES) $(arg_set_SOURCES) $(cgi_SOURCES) \
- 	$(cxxlog_SOURCES) $(dir_SOURCES) $(dlloader_SOURCES) \
- 	$(dynbuffer_SOURCES) $(getini_SOURCES) $(hd_SOURCES) \
--	$(httprequest_SOURCES) $(iconv_SOURCES) $(log_SOURCES) \
-+	$(httprequest_SOURCES) $(log_SOURCES) \
- 	$(logbench_SOURCES) $(logsh_SOURCES) $(md5sum_SOURCES) \
- 	$(mime_SOURCES) $(multifstream_SOURCES) $(netcat_SOURCES) \
- 	$(netio_SOURCES) $(netmsg_SOURCES) $(pipestream_SOURCES) \
-@@ -319,7 +315,6 @@ dynbuffer_SOURCES = dynbuffer.cpp
- getini_SOURCES = getini.cpp
- hd_SOURCES = hd.cpp
- httprequest_SOURCES = httprequest.cpp
--iconv_SOURCES = iconv.cpp
- log_SOURCES = log.cpp
- logbench_SOURCES = logbench.cpp
- logsh_SOURCES = logsh.cpp
-@@ -415,9 +410,6 @@ hd$(EXEEXT): $(hd_OBJECTS) $(hd_DEPENDEN
- httprequest$(EXEEXT): $(httprequest_OBJECTS) $(httprequest_DEPENDENCIES) 
- 	@rm -f httprequest$(EXEEXT)
- 	$(CXXLINK) $(httprequest_LDFLAGS) $(httprequest_OBJECTS) $(httprequest_LDADD) $(LIBS)
--iconv$(EXEEXT): $(iconv_OBJECTS) $(iconv_DEPENDENCIES) 
--	@rm -f iconv$(EXEEXT)
--	$(CXXLINK) $(iconv_LDFLAGS) $(iconv_OBJECTS) $(iconv_LDADD) $(LIBS)
- log$(EXEEXT): $(log_OBJECTS) $(log_DEPENDENCIES) 
- 	@rm -f log$(EXEEXT)
- 	$(CXXLINK) $(log_LDFLAGS) $(log_OBJECTS) $(log_LDADD) $(LIBS)
-@@ -477,7 +469,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getini.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hd.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httprequest.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconv.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logbench.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logsh.Po@am__quote@

package/dillo/Makefile

@@ -17,6 +17,7 @@ PKG_SITES:=		http://www.dillo.org/download/
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
+PKG_TARGET_DEPENDS:=    ibmx40 lemote
 PKG_HOST_DEPENDS:=	!cygwin
 
 include $(TOPDIR)/mk/package.mk

package/firefox/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		firefox
-PKG_VERSION:=		3.6.6
+PKG_VERSION:=		3.6.8
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c9a071b31bb90d05edfb93117d0a7537
+PKG_MD5SUM:=		0ee5f14fd8be07513d16131027ebcb61
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libpthread alsa-lib dbus-glib glib libgtk+ libnotify
@@ -21,6 +21,7 @@ DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
 
 WRKDIST=		${WRKDIR}/mozilla-1.9.2
 PKG_TARGET_DEPENDS:=	alix1c x86_qemu x86_64_qemu shuttle ibmx40 lemote
+PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin
 
 include $(TOPDIR)/mk/package.mk
 
@@ -28,6 +29,8 @@ $(eval $(call PKG_template,FIREFOX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${P
 
 ifeq (${ADK_LINUX_MIPS64_LEMOTE},y)
 CONFIGURE_ARGS+=	--disable-ipc
+else ifeq (${ADK_TARGET_LIB_UCLIBC},y)
+CONFIGURE_ARGS+=	--disable-ipc
 else
 CONFIGURE_ARGS+=	--enable-ipc
 endif
@@ -42,6 +45,8 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--with-system-png \
 			--with-system-nss \
 			--with-system-nspr \
+			--with-libIDL-prefix=${STAGING_DIR}/usr \
+			--with-glib-prefix=${STAGING_DIR}/usr \
 			--enable-libxul \
 			--disable-tests \
 			--disable-static \

package/firefox/patches/patch-configure

@@ -1,6 +1,15 @@
---- mozilla-1.9.2.orig/configure	2010-04-02 18:07:41.000000000 +0200
-+++ mozilla-1.9.2/configure	2010-04-11 14:38:39.000000000 +0200
-@@ -21012,8 +21012,8 @@ if test -n "$CROSS_COMPILE"; then
+--- mozilla-1.9.2.orig/configure	2010-07-23 00:00:19.000000000 +0200
++++ mozilla-1.9.2/configure	2010-07-30 09:52:43.000000000 +0200
+@@ -3970,7 +3970,7 @@ else
+     echo "$ac_t""yes" 1>&6    
+ fi
+ 
+-  for ac_prog in $PYTHON python2.5 python2.4 python
++  for ac_prog in $PYTHON python2.6 python2.5 python2.4 python
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -21285,8 +21285,8 @@ if test -n "$CROSS_COMPILE"; then
          HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
      fi
      if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then

package/freeglut/Makefile

@@ -13,6 +13,7 @@ PKG_BUILDDEP+=		MesaLib
 PKG_URL:=		http://freeglut.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=freeglut/}
 
+PKG_TARGET_DEPENDS:=    ibmx40 lemote
 PKG_HOST_DEPENDS:=	!cygwin
 
 include $(TOPDIR)/mk/package.mk

package/git/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		git
-PKG_VERSION:=		1.7.1
+PKG_VERSION:=		1.7.2.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		d2fefae2b787a19601c09d89975ce5fb
+PKG_MD5SUM:=		13fc44363df744a401552e73e5476351
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		scm
 PKG_DEPENDS:=		libopenssl libcurl libexpat libpthread
@@ -18,8 +18,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GIT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-MAKE_ENV+=		NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 \
-			NO_CROSS_DIRECTORY_HARDLINKS=1 \
+MAKE_ENV+=		NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 NO_PYTHON=1 \
 			CURLDIR=${STAGING_DIR} EXPATDIR=${STAGING_DIR}
 XAKE_FLAGS+=		uname_S=Linux uname_O=GNU/Linux
 CONFIGURE_ENV+=		ac_cv_c_c99_format=yes \

package/git/patches/patch-Makefile

@@ -1,26 +1,6 @@
---- git-1.6.5.5.orig/Makefile	2009-12-06 04:51:25.000000000 +0100
-+++ git-1.6.5.5/Makefile	2009-12-07 20:13:40.753866786 +0100
-@@ -218,8 +218,8 @@ uname_V := $(shell sh -c 'uname -v 2>/de
- 
- # CFLAGS and LDFLAGS are for the users to override from the command line.
- 
--CFLAGS = -g -O2 -Wall
--LDFLAGS =
-+CFLAGS ?= -g -O2 -Wall
-+LDFLAGS ?=
- ALL_CFLAGS = $(CFLAGS)
- ALL_LDFLAGS = $(LDFLAGS)
- STRIP ?= strip
-@@ -241,7 +241,7 @@ bindir_relative = bin
- bindir = $(prefix)/$(bindir_relative)
- mandir = share/man
- infodir = share/info
--gitexecdir = libexec/git-core
-+gitexecdir = sbin/git-core
- sharedir = $(prefix)/share
- template_dir = share/git-core/templates
- htmldir = share/doc/git-doc
-@@ -1417,7 +1417,6 @@ builtin-help.o: builtin-help.c common-cm
+--- git-1.7.2.1.orig/Makefile	2010-07-28 19:03:43.000000000 +0200
++++ git-1.7.2.1/Makefile	2010-07-30 12:25:52.000000000 +0200
+@@ -1594,7 +1594,6 @@ builtin/help.s builtin/help.o: EXTRA_CPP
  
  $(BUILT_INS): git$X
  	$(QUIET_BUILT_IN)$(RM) $@ && \
@@ -28,11 +8,31 @@
  	ln -s git$X $@ 2>/dev/null || \
  	cp git$X $@
  
-@@ -1749,7 +1748,6 @@ endif
+@@ -1894,7 +1893,6 @@ git-http-push$X: revision.o http.o http-
+ 
+ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
+ 	$(QUIET_LNCP)$(RM) $@ && \
+-	ln $< $@ 2>/dev/null || \
+ 	ln -s $< $@ 2>/dev/null || \
+ 	cp $< $@
+ 
+@@ -2077,18 +2075,16 @@ endif
+ 	{ test "$$bindir/" = "$$execdir/" || \
+ 		{ $(RM) "$$execdir/git$X" && \
+ 		test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
+-		ln "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
++		ln -s "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
  		cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \
- 	{ for p in $(BUILT_INS); do \
+ 	for p in $(BUILT_INS); do \
  		$(RM) "$$execdir/$$p" && \
 -		ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
  		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
  		cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
- 	  done; } && \
+ 	done && \
+ 	remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \
+ 	for p in $$remote_curl_aliases; do \
+ 		$(RM) "$$execdir/$$p" && \
+-		ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
+ 		ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
+ 		cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
+ 	done && \

package/gpsd/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gpsd
-PKG_VERSION:=		2.92
+PKG_VERSION:=		2.95
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		50b60d9f6dd51e001f4dfbaeb825c988
+PKG_MD5SUM:=		12535a9ed9fecf9ea2c5bdc9840da5ae
 PKG_DESCR:=		An interface daemon for GPS receivers
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		libpthread
@@ -15,12 +15,12 @@ PKG_CXX:=		GPSD
 PKG_SITES:=		http://download.berlios.de/gpsd/
 PKG_URL:=		http://gpsd.berlios.de/
 
-PKG_DESCR_1:=		GPS client utilities
+PKG_DESCR_CLIENTS:=	GPS client utilities
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GPSD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
+$(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_CLIENTS},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		EGREP="grep -E" \
 			CPP="$(TARGET_CC) -E" \
@@ -41,7 +41,7 @@ TLDFLAGS+=		-shared -pthread
 endif
 
 post-extract:
-	@find ${WRKBUILD} -name *.rej -exec rm {} \;
+	#@find ${WRKBUILD} -name *.rej -exec rm {} \;
 
 ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y)
 # add workaround because libtool tries to link libstdc++
@@ -52,7 +52,7 @@ endif
 
 post-install:
 	${INSTALL_DIR} ${IDIR_GPSD}/usr/lib ${IDIR_GPSD}/usr/sbin
-	${CP} ${WRKINST}/usr/lib/libgps.so.* ${IDIR_GPSD}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libgps.so* ${IDIR_GPSD}/usr/lib
 	${CP} ${WRKINST}/usr/sbin/gpsd ${IDIR_GPSD}/usr/sbin
 	${INSTALL_DIR} ${IDIR_GPSD_CLIENTS}/usr/bin
 	${CP} ${WRKINST}/usr/bin/{cgps,gpxlogger} \

package/gpsd/patches/patch-Makefile_in

@@ -1,44 +1,13 @@
---- gpsd-2.92.orig/Makefile.in	2010-03-03 14:49:11.000000000 +0100
-+++ gpsd-2.92/Makefile.in	2010-04-03 10:33:48.782836143 +0200
-@@ -615,8 +615,6 @@ libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIB
- #
- # Build Python binding
- #
--@HAVE_PYTHON_TRUE@PYEXTENSIONS = gpspacket.so gpslib.so
--@HAVE_PYTHON_TRUE@noinst_SCRIPTS = gpspacket.so gpslib.so setup.py
- @LIBGPSMM_ENABLE_FALSE@TESTBINS = test_float test_trig test_bits test_packet test_geoid \
- @LIBGPSMM_ENABLE_FALSE@	test_mkgmtime test_json
+--- gpsd-2.95.orig/Makefile.in	2010-07-14 00:48:24.000000000 +0200
++++ gpsd-2.95/Makefile.in	2010-07-30 13:04:19.000000000 +0200
+@@ -612,8 +612,8 @@ libgps_la_SOURCES = $(libgps_c_sources) 
+ libgpsd_la_SOURCES = $(libgpsd_c_sources) $(libgpsd_h_sources) \
+ 				driver_rtcm2.h packet_states.h
  
-@@ -1946,32 +1944,6 @@ maskdump.c: gpsd.h-tail maskaudit.py
- 	$(PYTHON) maskaudit.py -c >maskdump.c && \
- 	chmod a-w maskdump.c
- 
--# Multiple-outputs hack.  See
--# http://www.gnu.org/software/automake/manual/automake.html#Multiple-Outputs
--@HAVE_PYTHON_TRUE@$(PYEXTENSIONS): stamp-python-modules
--@HAVE_PYTHON_TRUE@	+@WITNESS=stamp-python-modules; $(MULTIOUT_RECOVER_DELETED)
--# TODO:  Should the dependency on libgps.la be enforced inside
--# setup.py?  (See the variable 'needed_files' in setup.py.)
--@HAVE_PYTHON_TRUE@stamp-python-modules: gpspacket.c gpsclient.c libgps.la setup.py
--@HAVE_PYTHON_TRUE@	@rm -f '$@' '$@.tmp'
--@HAVE_PYTHON_TRUE@	@echo 'timestamp for $@' > '$@.tmp'
--@HAVE_PYTHON_TRUE@	(cd '$(srcdir)' && \
--@HAVE_PYTHON_TRUE@	env abs_builddir='$(abs_builddir)' \
--@HAVE_PYTHON_TRUE@	    MAKE='$(MAKE)' \
--@HAVE_PYTHON_TRUE@		$(PYTHON) setup.py build_ext \
--@HAVE_PYTHON_TRUE@			--build-lib '$(srcdir)' \
--@HAVE_PYTHON_TRUE@			--build-temp '$(srcdir)/build' \
--@HAVE_PYTHON_TRUE@			--include-dirs '$(srcdir):.'\
--@HAVE_PYTHON_TRUE@			--mangenerator '$(MANGENERATOR)') && \
--@HAVE_PYTHON_TRUE@	mv -f '$@.tmp' '$@'
--
--# Clean up after Python
--@HAVE_PYTHON_TRUE@clean-local:
--@HAVE_PYTHON_TRUE@	rm -rf build
--
--# Install Python modules
--@HAVE_PYTHON_TRUE@install-exec-local:
--@HAVE_PYTHON_TRUE@	$(PYTHON) setup.py install --prefix=${prefix} # --root=$(DESTDIR)
- 
- @HAVE_XSLT_PROCESSOR_TRUE@.xml.1:
- @HAVE_XSLT_PROCESSOR_TRUE@	$(MANGENERATOR) $(MANFLAGS) $(MANTARGET) $<
+-@LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = /bin/sh ./libtool --tag=CC --mode=link gcc $(libgps_la_LDFLAGS) -o $@
+-@LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = /bin/sh ./libtool --tag=CXX --mode=link g++ $(libgps_la_LDFLAGS) -o $@
++@LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = $(SHELL) ./libtool --tag=CC --mode=link gcc $(libgps_la_LDFLAGS) -o $@
++@LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = $(SHELL) ./libtool --tag=CXX --mode=link g++ $(libgps_la_LDFLAGS) -o $@
+ nodist_libgpsd_la_SOURCES = packet_names.h ais_json.i
+ libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD)
+ libgpsd_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) $(BLUEZ_LIBS) libgps.la

package/gpsd/patches/patch-gps_1

@@ -1,17 +0,0 @@
---- gpsd-2.92.orig/gps.1	2010-03-01 06:00:44.000000000 +0100
-+++ gpsd-2.92/gps.1	2010-04-03 10:22:50.111390920 +0200
-@@ -2,12 +2,12 @@
- .\"     Title: gps
- .\"    Author: [see the "AUTHORS" section]
- .\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/>
--.\"      Date: 03/01/2010
-+.\"      Date: 04/03/2010
- .\"    Manual: [FIXME: manual]
- .\"    Source: [FIXME: source]
- .\"  Language: English
- .\"
--.TH "GPS" "1" "03/01/2010" "[FIXME: source]" "[FIXME: manual]"
-+.TH "GPS" "1" "04/03/2010" "[FIXME: source]" "[FIXME: manual]"
- .\" -----------------------------------------------------------------
- .\" * set default formatting
- .\" -----------------------------------------------------------------

package/gpsd/patches/patch-gpsd_config_h

@@ -1,42 +0,0 @@
---- gpsd-2.92.orig/gpsd_config.h	2010-03-03 01:58:01.000000000 +0100
-+++ gpsd-2.92/gpsd_config.h	2010-04-03 10:22:22.423474030 +0200
-@@ -117,7 +117,7 @@
- #define HAVE_PYTHON_H 1
- 
- /* Define to 1 if you have the `round' function. */
--/* #undef HAVE_ROUND */
-+#define HAVE_ROUND 1
- 
- /* Define to 1 if you have the `setlocale' function. */
- #define HAVE_SETLOCALE 1
-@@ -141,7 +141,7 @@
- /* #undef HAVE_STRLCPY */
- 
- /* Define to 1 if you have the `strtonum' function. */
--/* #undef HAVE_STRTONUM */
-+#define HAVE_STRTONUM 1
- 
- /* Define to 1 if `struct tm' is a member of `tm_zone'. */
- #define HAVE_STRUCT_TM_TM_ZONE 1
-@@ -206,10 +206,10 @@
- #define HAVE_VSNPRINTF 1
- 
- /* Define to 1 if you have the <X11/xpm.h> header file. */
--#define HAVE_X11_XPM_H 1
-+/* #undef HAVE_X11_XPM_H */
- 
- /* Xpm available */
--#define HAVE_XPM 1
-+/* #undef HAVE_XPM */
- 
- /* Define to 1 if you have the <xpm.h> header file. */
- /* #undef HAVE_XPM_H */
-@@ -309,7 +309,7 @@
- #define SIZEOF_INT 4
- 
- /* The size of `long', as computed by sizeof. */
--#define SIZEOF_LONG 8
-+#define SIZEOF_LONG 4
- 
- /* The size of `long long', as computed by sizeof. */
- #define SIZEOF_LONG_LONG 8

package/gpsd/patches/patch-gpsd_h

@@ -1,42 +0,0 @@
---- gpsd-2.92.orig/gpsd.h	2010-03-03 01:58:01.000000000 +0100
-+++ gpsd-2.92/gpsd.h	2010-04-03 10:22:22.793473137 +0200
-@@ -137,7 +137,7 @@
- #define HAVE_PYTHON_H 1
- 
- /* Define to 1 if you have the `round' function. */
--/* #undef HAVE_ROUND */
-+#define HAVE_ROUND 1
- 
- /* Define to 1 if you have the `setlocale' function. */
- #define HAVE_SETLOCALE 1
-@@ -161,7 +161,7 @@
- /* #undef HAVE_STRLCPY */
- 
- /* Define to 1 if you have the `strtonum' function. */
--/* #undef HAVE_STRTONUM */
-+#define HAVE_STRTONUM 1
- 
- /* Define to 1 if `struct tm' is a member of `tm_zone'. */
- #define HAVE_STRUCT_TM_TM_ZONE 1
-@@ -226,10 +226,10 @@
- #define HAVE_VSNPRINTF 1
- 
- /* Define to 1 if you have the <X11/xpm.h> header file. */
--#define HAVE_X11_XPM_H 1
-+/* #undef HAVE_X11_XPM_H */
- 
- /* Xpm available */
--#define HAVE_XPM 1
-+/* #undef HAVE_XPM */
- 
- /* Define to 1 if you have the <xpm.h> header file. */
- /* #undef HAVE_XPM_H */
-@@ -329,7 +329,7 @@
- #define SIZEOF_INT 4
- 
- /* The size of `long', as computed by sizeof. */
--#define SIZEOF_LONG 8
-+#define SIZEOF_LONG 4
- 
- /* The size of `long long', as computed by sizeof. */
- #define SIZEOF_LONG_LONG 8

package/gpsd/patches/patch-revision_h

@@ -1,5 +0,0 @@
---- gpsd-2.92.orig/revision.h	2010-03-03 14:49:28.000000000 +0100
-+++ gpsd-2.92/revision.h	2010-04-03 10:22:22.843473239 +0200
-@@ -1 +1 @@
--#define REVISION "svn7020"
-+#define REVISION "svnexported"

package/libtool/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libtool
-PKG_VERSION:=		2.2.8
+PKG_VERSION:=		2.2.10
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		cad2a7188242bc8dbab0645532ae3d6f
+PKG_MD5SUM:=		b745d220e88163fcd9eea0a90ccf21b0
 PKG_DESCR:=		a generic dynamic object loading library
 PKG_SECTION:=		lang
 PKG_URL:=		http://www.gnu.org/software/libtool

package/lynx/Makefile

@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME=		lynx
 PKG_VERSION=		2.8.7
 PKG_RELEASE=		1
-PKG_MD5SUM=		124253e635f7c76bdffc47b9d036c812
+PKG_MD5SUM=		e36d70f3f09b2d502055ca67f09e363c
 PKG_DESCR:=		Standard text browser
 PKG_SECTION:=		browser
 PKG_DEPENDS:=		libncurses libopenssl zlib

package/mysql/patches/patch-configure

@@ -1,6 +1,53 @@
 --- mysql-5.1.48.orig/configure	2010-06-03 17:54:47.000000000 +0200
-+++ mysql-5.1.48/configure	2010-07-12 22:51:24.267118950 +0200
-@@ -48273,197 +48273,14 @@ $as_echo "$as_me: error: unknown endiann
++++ mysql-5.1.48/configure	2010-07-30 11:04:50.000000000 +0200
+@@ -19825,45 +19825,7 @@ fi
+ $as_echo_n "checking \"how to check if pid exists\"... " >&6; }
+ PS=$ac_cv_path_PS
+ # Linux style
+-if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null
+-then
+-  FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+-# Solaris
+-elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null
+-then
+-  FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+-# BSD style
+-elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null
+-then
+-  FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+-# SysV style
+-elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null
+-then
+-  FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+-# Do anybody use this?
+-elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null
+-then
+-  FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+-else
+-  case $SYSTEM_TYPE in
+-    *freebsd*|*dragonfly*)
+-      FIND_PROC="$PS p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+-      ;;
+-    *darwin*)
+-      FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+-      ;;
+-    *cygwin*)
+-      FIND_PROC="$PS -e | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+-      ;;
+-    *netware*)
+-      FIND_PROC=
+-      ;;
+-    *)
+-      { { $as_echo "$as_me:$LINENO: error: Could not find the right ps and/or grep switches. Which OS is this?  See the Installation chapter in the Reference Manual." >&5
+-$as_echo "$as_me: error: Could not find the right ps and/or grep switches. Which OS is this?  See the Installation chapter in the Reference Manual." >&2;}
+-   { (exit 1); exit 1; }; }
+-  esac
+-fi
++FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+ 
+ { $as_echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
+ $as_echo "\"$FIND_PROC\"" >&6; }
+@@ -48273,197 +48235,14 @@ $as_echo "$as_me: error: unknown endiann
    esac
  
  
@@ -198,7 +245,7 @@
  
    { $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5
  $as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; }
-@@ -48581,101 +48398,6 @@ fi
+@@ -48581,101 +48360,6 @@ fi
  done
  
  

package/rarpd/patches/patch-Makefile_in

@@ -0,0 +1,9 @@
+--- rarpd-1.1.orig/Makefile.in	1999-10-20 22:57:13.000000000 +0200
++++ rarpd-1.1/Makefile.in	2010-07-16 14:34:08.453125000 +0200
+@@ -13,5 +13,5 @@ rarpd: rarpd.o @LIBOBJS@
+ 	$(CC) @LDFLAGS@ -o $@ rarpd.o @LIBOBJS@ @LIBS@
+ 
+ install: rarpd
+-	$(ENSUREDIR)	$(DESTDIR)$(SBINDIR)	755
++	@mkdir -p $(DESTDIR)$(SBINDIR)
+ 	$(INSTALL) 	-c -m 0755 rarpd	$(DESTDIR)$(SBINDIR)

package/subversion/Makefile

@@ -4,18 +4,15 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		subversion
-PKG_VERSION:=		1.6.9
+PKG_VERSION:=		1.6.12
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		facaa0ee78c8f24b9af12c74662bbd24
+PKG_MD5SUM:=		ae008ac355581c90494fba86cbfc3413
 PKG_DESCR:=		revision control program
 PKG_SECTION:=		scm
-PKG_DEPENDS:=		zlib apr apr-util libiconv libexpat libsqlite
-PKG_BUILDDEP+=		apr-util expat apr zlib libiconv sqlite
-ifneq ($(ADK_PACKAGE_SUBVERSION_NEON),)
-PKG_DEPENDS+=		neon
-PKG_BUILDDEP+=		neon
-endif
+PKG_DEPENDS:=		zlib apr apr-util libiconv libexpat libsqlite neon
+PKG_BUILDDEP+=		apr-util expat apr zlib libiconv sqlite neon
 PKG_SITES:=		http://subversion.tigris.org/downloads/
+PKG_URL:=		http://subversion.apache.org/
 
 include ${TOPDIR}/mk/package.mk
 
@@ -32,20 +29,7 @@ CONFIGURE_ARGS+=	--without-jikes
 CONFIGURE_ARGS+=	--without-jdk
 CONFIGURE_ARGS+=	--disable-javahl
 CONFIGURE_ARGS+=	--without-berkeley-db
-LIBS= 			-lsqlite3 -laprutil-1 -lapr-1 -lexpat -liconv
-
-ifeq ($(ADK_PACKAGE_SUBVERSION_NEON),y)
-CONFIGURE_ARGS+=	-disable-neon-version-check
-LIBS+=			-lneon
-else
-CONFIGURE_ARGS+=	--without-neon
-endif
-
-ifeq ($(ADK_PACKAGE_APR_THREADING),y)
-LIBS+=			-pthread
-endif
-
-CONFIGURE_ENV+=		LIBS='${LIBS}'
+CONFIGURE_ENV+=		LIBS='-lsqlite3 -laprutil-1 -lapr-1 -lexpat -liconv'
 INSTALL_TARGET:=	external-install local-install
 
 post-install:

package/tslib/Makefile

@@ -27,6 +27,9 @@ CONFIGURE_ARGS+=	--disable-ucb1x00 \
 			--disable-linear-h2200 \
 			--disable-arctic2
 
+pre-build:
+	@chmod u+x ${WRKBUILD}/install-sh
+
 post-install:
 	$(INSTALL_DIR) $(IDIR_TSLIB)/etc
 	$(INSTALL_DIR) $(IDIR_TSLIB)/usr/lib/ts

scripts/adkprepare.sh

@@ -68,6 +68,8 @@ netbsd() {
 
 netbsd_full() {
 	echo "Preparing NetBSD for full OpenADK package builds"
+	PKG_PATH="ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/${arch}/5.0/All/"
+	export PKG_PATH
 	pkg_add -vu intltool
 	pkg_add -vu lynx
 	pkg_add -vu pkg-config
@@ -75,6 +77,7 @@ netbsd_full() {
 	pkg_add -vu bison
 	pkg_add -vu libIDL
 	pkg_add -vu xkbcomp
+	pkg_add -vu python26
 }
 
 freebsd() {

scripts/automake.dep

@@ -9,6 +9,8 @@ configure missing
 aclocal.m4 configure.in
 aclocal.m4 configure.ac
 aclocal.m4 acinclude.m4
+config-h.in configure.in
+config-h.in configure.ac
 config.h.in configure.in
 config.h.in configure.ac
 config.h.in aclocal.m4
@@ -31,3 +33,4 @@ configure.in configure.files
 acinclude.m4 admin/libtool.m4.in
 acinclude.m4 admin/acinclude.m4.in
 acinclude.m4 libltdl/ltdl.m4
+libtoolize.in configure

scripts/scan-pkgs.sh

@@ -35,6 +35,7 @@ fi
 if [[ -n $ADK_PACKAGE_FIREFOX ]]; then
 	NEED_ZIP="$NEED_ZIP firefox"
 	NEED_LIBIDL="$NEED_LIBIDL firefox"
+	NEED_PYTHON="$NEED_PYTHON firefox"
 fi
 
 if [[ -n $ADK_COMPILE_HEIMDAL ]]; then
@@ -254,4 +255,15 @@ if [[ -n $NEED_FLEX ]]; then
 	fi
 fi
 
+if [[ -n $NEED_PYTHON ]]; then
+	if ! which python >/dev/null 2>&1; then
+		if ! test -x /usr/pkg/bin/python2.6 >/dev/null; then
+			echo >&2 You need python to to use $NEED_PYTHON package
+			out=1
+		fi
+	fi
+fi
+
+exit $out
+
 exit $out

scripts/tsort

@@ -4,9 +4,12 @@
 
 os=$(uname)
 case $os in
-	NetBSD|MirBSD|OpenBSD)
+	MirBSD|OpenBSD)
 		/usr/bin/tsort -r
 		;;
+	NetBSD|FreeBSD)
+		/usr/bin/tsort | tail -r
+		;;
 	*)
 		/usr/bin/tsort | tac
 		;;

target/ibmx40/kernel.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.34
-# Thu May 20 21:14:06 2010
+# Wed Jul 28 23:45:42 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -97,12 +97,7 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 # CONFIG_NAMESPACES is not set
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_RD_GZIP is not set
-# CONFIG_RD_BZIP2 is not set
-CONFIG_RD_LZMA=y
-# CONFIG_RD_LZO is not set
+# CONFIG_BLK_DEV_INITRD is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
@@ -294,10 +289,7 @@ CONFIG_VM86=y
 # CONFIG_TOSHIBA is not set
 # CONFIG_I8K is not set
 # CONFIG_X86_REBOOTFIXUPS is not set
-CONFIG_MICROCODE=y
-CONFIG_MICROCODE_INTEL=y
-# CONFIG_MICROCODE_AMD is not set
-CONFIG_MICROCODE_OLD_INTERFACE=y
+# CONFIG_MICROCODE is not set
 CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
 # CONFIG_NOHIGHMEM is not set
@@ -491,9 +483,7 @@ CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
-CONFIG_FW_LOADER=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_FW_LOADER is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
@@ -730,9 +720,9 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
+# CONFIG_MOUSE_PS2_ALPS is not set
+# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
+# CONFIG_MOUSE_PS2_SYNAPTICS is not set
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_MOUSE_PS2_ELANTECH is not set
 # CONFIG_MOUSE_PS2_SENTELIC is not set
@@ -764,10 +754,10 @@ CONFIG_SERIO_LIBPS2=y
 #
 CONFIG_VT=y
 # CONFIG_CONSOLE_TRANSLATIONS is not set
-CONFIG_VT_CONSOLE=y
+# CONFIG_VT_CONSOLE is not set
 CONFIG_HW_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
-CONFIG_DEVKMEM=y
+# CONFIG_DEVKMEM is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_NOZOMI is not set
 
@@ -775,9 +765,9 @@ CONFIG_DEVKMEM=y
 # Serial drivers
 #
 CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_CONSOLE is not set
 CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_SERIAL_8250_PCI=y
+# CONFIG_SERIAL_8250_PCI is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
@@ -786,7 +776,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # Non-8250 serial port support
 #
 CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
 # CONFIG_SERIAL_TIMBERDALE is not set
 CONFIG_UNIX98_PTYS=y
@@ -950,7 +939,7 @@ CONFIG_RTC_DRV_CMOS=y
 # TI VLYNQ
 #
 # CONFIG_STAGING is not set
-CONFIG_X86_PLATFORM_DEVICES=y
+# CONFIG_X86_PLATFORM_DEVICES is not set
 
 #
 # Firmware Drivers
@@ -1231,7 +1220,6 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
 # CONFIG_CRC32 is not set
 # CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
-CONFIG_DECOMPRESS_LZMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y

target/ibmx40/uclibc.config

@@ -109,7 +109,7 @@ UCLIBC_HAS___PROGNAME=y
 UCLIBC_HAS_PTY=y
 ASSUME_DEVPTS=y
 UNIX98PTY_ONLY=y
-# UCLIBC_HAS_GETPT is not set
+UCLIBC_HAS_GETPT=y
 UCLIBC_HAS_TM_EXTENSIONS=y
 UCLIBC_HAS_TZ_CACHING=y
 UCLIBC_HAS_TZ_FILE=y

tools/cpio/src/cpio.c

@@ -81,7 +81,8 @@ int	sysv3;
 
 #if defined (__linux__) || defined (__sun) || defined (__FreeBSD__) || \
 	defined (__hpux) || defined (_AIX) || defined (__NetBSD__) || \
-	defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__)
+	defined (__OpenBSD__) || defined (__DragonFly__) || \
+	defined (__APPLE__) || defined (__CYGWIN__)
 #include <sys/mtio.h>
 #else	/* SVR4.2MP */
 #include <sys/scsi.h>
@@ -4495,7 +4496,8 @@ tseek(off_t n)
 		int	i = (n - poffs) / tapeblock;
 #if defined (__linux__) || defined (__sun) || defined (__FreeBSD__) || \
 	defined (__hpux) || defined (_AIX) || defined (__NetBSD__) || \
-	defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__)
+	defined (__OpenBSD__) || defined (__DragonFly__) || \
+	defined (__APPLE__) || defined (__CYGWIN__)
 		struct mtop	mo;
 		mo.mt_op = i > 0 ? MTFSR : MTBSR;
 		mo.mt_count = i > 0 ? i : -i;
@@ -4735,7 +4737,7 @@ mstat(void)
 		emsg(3, "Error during stat() of archive");
 		done(1);
 	}
-#if defined (__linux__)
+#if defined (__linux__) 
 	if ((mtst.st_mode&S_IFMT) == S_IFCHR) {
 		struct mtget	mg;
 		if (ioctl(mt, MTIOCGET, &mg) == 0)
@@ -4787,6 +4789,13 @@ mstat(void)
 		if (ioctl(mt, MTIOCGET, &mg) == 0)
 			tapeblock = mg.mt_blksiz;
 	}
+#elif defined (__CYGWIN__)
+	if ((mtst.st_mode&S_IFMT) == S_IFCHR) {
+		struct mtget	mg;
+		if (ioctl(mt, MTIOCGET, &mg) == 0)
+			tapeblock = (mg.mt_dsreg&MT_ST_BLKSIZE_MASK) >>
+					MT_ST_BLKSIZE_SHIFT;
+	}
 #elif defined (__hpux) || defined (_AIX)
 #else	/* SVR4.2MP */
 	if ((mtst.st_mode&S_IFMT) == S_IFCHR) {