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

Config.in

@@ -44,6 +44,7 @@ config ADK_DEVELSYSTEM
 	select ADK_PACKAGE_LIBTOOL
 	select ADK_PACKAGE_M4
 	select ADK_PACKAGE_MAKE
+	select ADK_PACKAGE_MKSH
 	select ADK_PACKAGE_PATCH
 	select ADK_PACKAGE_MICROPERL
 	select ADK_PACKAGE_TAR

Makefile

@@ -27,7 +27,6 @@ help:
 	@echo '  menuconfig   - Update current config utilising a menu based program'
 	@echo '                 (default when .config does not exist)'
 	@echo '  oldconfig    - Update current config utilising a provided .configs base'
-	@echo '  wconfig      - Same as "oldconfig", but also writes out hidden symbols'
 	@echo '  allmodconfig - New config selecting all packages as modules when possible'
 	@echo '  allconfig    - New config selecting all packages when possible'
 	@echo '  allnoconfig  - New config where all options are answered with no'
@@ -86,9 +85,6 @@ config: .prereq_done
 oldconfig: .prereq_done
 	@${GMAKE_INV} _config W=-o
 
-wconfig: .prereq_done
-	@${GMAKE_INV} _config W=-A
-
 download: .prereq_done
 	@${GMAKE_INV} toolchain/download
 	@${GMAKE_INV} package/download

README

@@ -19,9 +19,6 @@ Before you can start you need to install some tools:
 - wget
 - file
 - unzip
-- autoconf
-- automake
-- Ãlibtool
 - libc headers
 - ncurses5 headers
 - zlib headers

mk/vars.mk

@@ -12,9 +12,9 @@ BUILD_GROUP=		$(shell id -gn)
 ifneq ($(ADK_DEBUG),)
 TARGET_DEBUGGING:=	-g3 -fno-omit-frame-pointer
 else
-TARGET_DEBUGGING:=	-fomit-frame-pointer
+TARGET_DEBUGGING:=	-fomit-frame-pointer $(TARGET_OPTIMIZATION) 
 endif
-TARGET_CFLAGS:=		$(TARGET_OPTIMIZATION) $(TARGET_CFLAGS_ARCH) $(TARGET_DEBUGGING)
+TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) $(TARGET_DEBUGGING)
 ifneq ($(ADK_TARGET_ARCH_OPTIMIZATION),)
 TARGET_CFLAGS+=		-march=$(ADK_TARGET_ARCH_OPTIMIZATION)
 endif

package/eglibc/files/libc.so.mips

@@ -0,0 +1,5 @@
+/* GNU ld script
+   Use the shared library, but some functions are only in
+      the static library, so try that secondarily.  */
+      OUTPUT_FORMAT(elf64-tradlittlemips)
+      GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld.so.1 ) )

package/gcc/Makefile

@@ -10,14 +10,32 @@ PKG_OPTS:=		noremove
 PKG_DEPENDS:=		libgmp mpfr
 PKG_BUILDDEP+=		gmp mpfr
 
+ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
+PKG_DEPENDS:=		uclibc-dev
+PKG_BUILDDEP+=		uclibc
+endif
+ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
+PKG_DEPENDS:=		eglibc-dev
+PKG_BUILDDEP+=		eglibc
+endif
+ifeq ($(ADK_TARGET_LIB_GLIBC),y)
+PKG_DEPENDS:=		glibc-dev
+PKG_BUILDDEP+=		glibc
+endif
+
 PKG_HOST_DEPENDS:=	!freebsd
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,GCC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TCFLAGS:=		''
 TCPPFLAGS:=		''
+
+ifeq ($(ADK_LINUX_64),y)
+CONFIGURE_ARGS+=       --with-abi=64
+endif
+
 CONFIGURE_ARGS+=	--enable-languages=c,c++ \
 			--host=$(REAL_GNU_TARGET_NAME) \
 			--target=$(REAL_GNU_TARGET_NAME) \
@@ -40,6 +58,7 @@ post-install:
 	${INSTALL_BIN} ${WRKINST}/usr/bin/gcc ${IDIR_GCC}/usr/bin/
 	${INSTALL_BIN} ${WRKINST}/usr/bin/g++ ${IDIR_GCC}/usr/bin/
 	cd ${IDIR_GCC}/usr/bin/ && ln -sf g++ c++
+	cd ${IDIR_GCC}/usr/bin/ && ln -sf gcc cc
 	${INSTALL_BIN} ${WRKINST}/usr/bin/cpp ${IDIR_GCC}/usr/bin/
 	${CP} ${WRKINST}/usr/lib/libstdc++*so* ${IDIR_GCC}/usr/lib/
 	${CP} ${WRKINST}/usr/include/c++/* ${IDIR_GCC}/usr/include/c++/

package/gcc/patches/mirbsd-compat.patch

@@ -0,0 +1,12 @@
+diff -Nur gcc-4.4.2.orig/gcc/configure gcc-4.4.2/gcc/configure
+--- gcc-4.4.2.orig/gcc/configure	Tue Mar 24 18:45:39 2009
++++ gcc-4.4.2/gcc/configure	Sat Dec 19 21:07:07 2009
+@@ -19381,7 +19381,7 @@
+   dynamic_linker='ldqnx.so'
+   ;;
+ 
+-openbsd*)
++mirbsd*|openbsd*)
+   version_type=sunos
+   sys_lib_dlsearch_path_spec="/usr/lib"
+   need_lib_prefix=no

package/gcc/patches/no-lib64.patch

@@ -0,0 +1,47 @@
+diff -Nur gcc-4.4.1.orig/gcc/config/i386/linux64.h gcc-4.4.1/gcc/config/i386/linux64.h
+--- gcc-4.4.1.orig/gcc/config/i386/linux64.h	2009-04-10 01:23:07.000000000 +0200
++++ gcc-4.4.1/gcc/config/i386/linux64.h	2009-08-21 18:34:13.000000000 +0200
+@@ -59,7 +59,7 @@
+    done.  */
+ 
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
+ 
+ #undef ASM_SPEC
+ #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \
+diff -Nur gcc-4.4.1.orig/gcc/config/i386/t-linux64 gcc-4.4.1/gcc/config/i386/t-linux64
+--- gcc-4.4.1.orig/gcc/config/i386/t-linux64	2008-07-02 17:59:19.000000000 +0200
++++ gcc-4.4.1/gcc/config/i386/t-linux64	2009-08-21 18:34:13.000000000 +0200
+@@ -7,7 +7,7 @@
+ 
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32 
+-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
++MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+ 
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
+diff -Nur gcc-4.4.1.orig/gcc/config/mips/linux64.h gcc-4.4.1/gcc/config/mips/linux64.h
+--- gcc-4.4.1.orig/gcc/config/mips/linux64.h	2009-02-20 16:20:38.000000000 +0100
++++ gcc-4.4.1/gcc/config/mips/linux64.h	2009-08-21 18:37:19.000000000 +0200
+@@ -36,7 +36,7 @@
+   %{profile:-lc_p} %{!profile:-lc}}"
+ 
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1"
+ #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
+ #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
+ #define LINUX_DYNAMIC_LINKERN32 \
+diff -Nur gcc-4.4.1.orig/gcc/config/mips/t-linux64 gcc-4.4.1/gcc/config/mips/t-linux64
+--- gcc-4.4.1.orig/gcc/config/mips/t-linux64	2006-06-06 14:51:24.000000000 +0200
++++ gcc-4.4.1/gcc/config/mips/t-linux64	2009-08-21 18:34:13.000000000 +0200
+@@ -1,6 +1,6 @@
+ MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
+ MULTILIB_DIRNAMES = n32 32 64
+-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
++MULTILIB_OSDIRNAMES = ../lib ../lib ../lib
+ 
+ EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
+ 

package/git/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		05485caf5c503ce378a87759bc3a0509
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		scm
-PKG_DEPENDS:=		libopenssl libcurl libexpat
+PKG_DEPENDS:=		libopenssl libcurl libexpat libpthread
 PKG_BUILDDEP+=		openssl curl expat
 PKG_URL:=		http://git-scm.com
 PKG_SITES:=		http://kernel.org/pub/software/scm/git/

package/mksh/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mksh
-PKG_VERSION:=		39b
+PKG_VERSION:=		39c
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		91274beff2be95260a51234d2c7bb4f7
+PKG_MD5SUM:=		0c3cd172b47eefcdf9a302baa42f5092
 PKG_DESCR:=		MirBSD Korn Shell
 PKG_SECTION:=		shells
 PKG_URL:=		http://www.mirbsd.org

package/mksh/patches/patch-dot_mkshrc

@@ -1,8 +1,8 @@
---- mksh.orig/dot.mkshrc	2010-02-16 20:13:59.000000000 +0100
-+++ mksh/dot.mkshrc	2010-02-16 20:13:50.000000000 +0100
+--- mksh/dot.mkshrc~	Thu Feb 25 20:48:10 2010
++++ mksh/dot.mkshrc	Sun Feb 28 18:05:10 2010
 @@ -21,7 +21,7 @@
  #-
- # ~/.mkshrc: mksh initialisation file for interactive shells
+ # ${ENV:-~/.mkshrc}: mksh initialisation file for interactive shells
  
 -: ${EDITOR:=/bin/ed} ${TERM:=vt100} ${HOSTNAME:=$(ulimit -c 0;hostname -s 2>&-)}
 +: ${EDITOR:=/bin/vi} ${TERM:=vt100} ${HOSTNAME:=$(ulimit -c 0;hostname -s 2>&-)}

package/strace/patches/patch-syscall_c

@@ -0,0 +1,13 @@
+from git
+http://strace.git.sourceforge.net/git/gitweb.cgi?p=strace/strace;a=blobdiff;f=syscall.c;h=a56d7df44874389fbd1d171a94698d07a1e5555a;hp=4f46bf63d180feae18480b697764257947af699b;hb=2ee50b7;hpb=c8c6698ef7cde83a496b273672a51ec2a8f14fb3
+--- strace-4.5.19.orig/syscall.c	2009-10-12 21:54:21.000000000 +0200
++++ strace-4.5.19/syscall.c	2010-02-28 19:14:28.000000000 +0100
+@@ -2035,7 +2035,7 @@ syscall_enter(struct tcb *tcp)
+ 		else
+ 			nargs = tcp->u_nargs = MAX_ARGS;
+ 
+-		if (ptrace (PTRACE_GETREGS, pid, NULL, (long) &regs) < 0)
++		if (ptrace (PTRACE_GETREGS, tcp->pid, NULL, (long) &regs) < 0)
+ 			return -1;
+ 
+ 		for(i = 0; i < nargs; i++) {

target/Config.in

@@ -259,6 +259,9 @@ config ADK_LINUX_MIPS64_LEMOTE
 	bool "Lemote Subnotebook Yeeloong"
 	select ADK_lemote
 	select ADK_LINUX_64
+	select ADK_KERNEL_EXT2_FS
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_ATA
 	select ADK_KERNEL_BLK_DEV_SD
 	select ADK_KERNEL_INPUT_KEYBOARD
 	select ADK_KERNEL_NETDEVICES
@@ -269,6 +272,8 @@ config ADK_LINUX_MIPS64_LEMOTE
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_INPUT
+	select ADK_TARGET_WITH_PCI
+	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	help
 	  Lemote Subnotebook.
 	  http://www.lemote.com/english/index.html

target/lemote/Makefile

@@ -41,9 +41,9 @@ imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL)
 	@echo 'Login as user root with password linux123 via ssh or console'
 endif
 ifeq ($(FS),encrypted)
-imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) createinitcrypt
+imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) createinitcrypt
 	@echo 'The kernel+cryptinit file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
-	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL),"
+	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFUSERSTARBALL)"
 	@echo 'Boot your lemote via NFS or USB.'
 	@echo 'Then create at least three partitions with fdisk:'
 	@echo '/dev/sda1 (ext2)'

target/lemote/files/boot/boot.cfg

@@ -3,5 +3,5 @@ default 0
 showmenu 1
 
 title Linux
-	kernel /dev/fs/ext2@wd0/boot/lemote-mips-kernel
+	kernel /dev/fs/ext2@wd0/boot/lemote-encrypted-kernel
 	args no_auto_cmd root=/dev/mapper/root resume=/dev/mapper/swap

target/lemote/kernel.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.33
-# Sat Feb 27 10:09:18 2010
+# Sun Feb 28 16:36:49 2010
 #
 CONFIG_MIPS=y
 
@@ -544,7 +544,7 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_OSD_INITIATOR is not set
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATA_VERBOSE_ERROR=y
+# CONFIG_ATA_VERBOSE_ERROR is not set
 # CONFIG_SATA_PMP is not set
 # CONFIG_SATA_AHCI is not set
 # CONFIG_SATA_SIL24 is not set
@@ -697,7 +697,11 @@ CONFIG_8139TOO_TUNE_TWISTER=y
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
 # CONFIG_TR is not set
-# CONFIG_WLAN is not set
+CONFIG_WLAN=y
+# CONFIG_ATMEL is not set
+# CONFIG_PRISM54 is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_HOSTAP is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -1084,6 +1088,8 @@ CONFIG_STAGING=y
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 # CONFIG_ALTERA_PCIE_CHDMA is not set
+# CONFIG_R8187SE is not set
+# CONFIG_RTL8192E is not set
 # CONFIG_INPUT_MIMIO is not set
 # CONFIG_TRANZPORT is not set
 
@@ -1099,6 +1105,8 @@ CONFIG_STAGING=y
 # CONFIG_B3DFG is not set
 # CONFIG_IDE_PHISON is not set
 # CONFIG_PLAN9AUTH is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
 # CONFIG_FB_UDL is not set
 # CONFIG_VME_BUS is not set
 
@@ -1110,6 +1118,7 @@ CONFIG_STAGING=y
 # CONFIG_RAMZSWAP is not set
 # CONFIG_BATMAN_ADV is not set
 # CONFIG_STRIP is not set
+# CONFIG_WAVELAN is not set
 CONFIG_FB_SM7XX=y
 # CONFIG_FB_SM7XX_ACCEL is not set
 

target/linux/config/Config.in.usb

@@ -18,7 +18,7 @@ config ADK_KPACKAGE_KMOD_USB
 	tristate
 	default y if ADK_LINUX_X86_ALIX1C
 	default n
-	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXBOARD)
+	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXBOARD || ADK_LINUX_MIPS64_LEMOTE )
 	select ADK_KERNEL_NLS
 	select ADK_KERNEL_USB_DEVICEFS
 	help

target/native/target.mk

@@ -1,6 +1,6 @@
 ARCH:=			$(shell uname -m|sed -e "s/i.*86/x86/" -e "s/_64//")
 CPU_ARCH:=		$(shell uname -m)
-KERNEL_VERSION:=	2.6.32
+KERNEL_VERSION:=	2.6.33
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		260551284ac224c3a43c4adac7df4879
+KERNEL_MD5SUM:=		c3883760b18d50e8d78819c54d579b00
 TARGET_OPTIMIZATION:=	-Os -pipe