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/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
@@ -28,6 +28,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

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/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/tsort

@@ -7,6 +7,9 @@ case $os in
 	NetBSD|MirBSD|OpenBSD)
 		/usr/bin/tsort -r
 		;;
+	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