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

mk/build.mk

@@ -37,6 +37,8 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_OPENAFS=n \
 			ADK_PACKAGE_OPENJDK7=n \
 			ADK_PKG_XORG=n \
+			ADK_PKG_CONSOLE=n \
+			ADK_PKG_TEST=n \
 			ADK_PKG_MPDBOX=n \
 			ADK_PKG_DEVELOPMENT=n \
 			ADK_PKG_CONSOLE=n \

package/dosfstools/Makefile

@@ -5,10 +5,11 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dosfstools
 PKG_VERSION:=		3.0.26
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		45012f5f56f2aae3afcd62120b9e5a08
 PKG_DESCR:=		utilities to create and check FAT filesystems
 PKG_SECTION:=		fs
+PKG_BUILDDEP:=		libiconv-tiny
 PKG_URL:=		http://www.daniel-baumann.ch/software/dosfstools/
 PKG_SITES:=		http://daniel-baumann.ch/files/software/dosfstools/
 
@@ -19,7 +20,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,DOSFSTOOLS,dosfstools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
-XAKE_FLAGS+=		PREFIX="" OPTFLAGS="-D_FILE_OFFSET_BITS=64"
+XAKE_FLAGS+=		PREFIX=""
 
 dosfstools-install:
 	${INSTALL_DIR} ${IDIR_DOSFSTOOLS}/sbin

package/dosfstools/patches/patch-Makefile

@@ -1,11 +1,13 @@
---- dosfstools-3.0.9.orig/Makefile	2009-10-04 11:03:23.000000000 +0200
-+++ dosfstools-3.0.9/Makefile	2011-01-07 21:50:15.000000000 +0100
-@@ -29,7 +29,7 @@ OPTFLAGS = -O2 -fomit-frame-pointer $(sh
+--- dosfstools-3.0.26.orig/Makefile	2014-01-17 07:09:28.000000000 +0100
++++ dosfstools-3.0.26/Makefile	2014-03-13 08:58:52.000000000 +0100
+@@ -32,7 +32,9 @@ OPTFLAGS = -O2 -fomit-frame-pointer -D_G
  #WARNFLAGS = -Wall -pedantic -std=c99
- WARNFLAGS = -Wall
+ WARNFLAGS = -Wall -Wextra -Wno-sign-compare -Wno-missing-field-initializers -Wmissing-prototypes -Wstrict-prototypes
  DEBUGFLAGS = -g
 -CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS)
++CFLAGS ?=
 +CFLAGS += $(WARNFLAGS)
++LDLIBS = -liconv
  
  VPATH = src
  

package/lighttpd/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		lighttpd
-PKG_VERSION:=		1.4.33
+PKG_VERSION:=		1.4.35
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		16e7c85a11a660213be4f83a9a1b752d
+PKG_MD5SUM:=		69057685df672218d45809539b874917
 PKG_DESCR:=		a lightweight web server
 PKG_SECTION:=		www
 PKG_DEPENDS:=		libgcc

target/sparc64/Makefile

@@ -19,8 +19,7 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC64),y)
 	@echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following command line:"
 ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
-	@echo 'qemu-system-sparc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 \
-		-net nic,model=virtio -net user'
+	@echo 'qemu-system-sparc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 -net nic,model=virtio -net user'
 else
 	@echo 'qemu-system-sparc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
 endif

toolchain/uClibc/patches/xxx-n32-pread_pwrite.patch

@@ -1,32 +0,0 @@
-Uclibc is not building for MIPS N64 because pread is trying to use the
-pread/pwrite system calls instead of pread64/pwrite64.  This patch fixes
-the problem and was tested with LFS enabled and disabled.
-
-Signed-off-by: Steve Ellcey <sellcey@mips.com>
----
- libc/sysdeps/linux/mips/pread_write.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libc/sysdeps/linux/mips/pread_write.c b/libc/sysdeps/linux/mips/pread_write.c
-index 3dc97c9..1220fec 100644
---- a/libc/sysdeps/linux/mips/pread_write.c
-+++ b/libc/sysdeps/linux/mips/pread_write.c
-@@ -13,14 +13,14 @@
- /* We should generalize this for 32bit userlands w/64bit regs.  This applies
-  * to the x86_64 x32 and the mips n32 ABIs.  */
- #if _MIPS_SIM == _MIPS_SIM_NABI32
--# define __NR___syscall_pread __NR_pread
-+# define __NR___syscall_pread __NR_pread64
- static _syscall4(ssize_t, __syscall_pread, int, fd, void *, buf, size_t, count, off_t, offset)
- # define MY_PREAD(fd, buf, count, offset) \
- 	__syscall_pread(fd, buf, count, offset)
- # define MY_PREAD64(fd, buf, count, offset) \
- 	__syscall_pread(fd, buf, count, offset)
- 
--# define __NR___syscall_pwrite __NR_pwrite
-+# define __NR___syscall_pwrite __NR_pwrite64
- static _syscall4(ssize_t, __syscall_pwrite, int, fd, const void *, buf, size_t, count, off_t, offset)
- # define MY_PWRITE(fd, buf, count, offset) \
- 	__syscall_pwrite(fd, buf, count, offset)
--- 
-1.7.9.5