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

mk/image.mk

@@ -146,16 +146,6 @@ ${FW_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR}
 ${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR}
 	$(BASH) ${LINUX_DIR}/scripts/gen_initramfs_list.sh -u squash -g squash \
 		${TARGET_DIR}/ >$@
-	( \
-		echo "nod /dev/console 0644 0 0 c 5 1"; \
-		echo "nod /dev/tty 0644 0 0 c 5 0"; \
-		for i in 0 1 2 3 4; do \
-			echo "nod /dev/tty$$i 0644 0 0 c 4 $$$$i"; \
-		done; \
-		echo "nod /dev/systty 0644 0 0 c 4 0"; \
-		echo "nod /dev/null 0644 0 0 c 1 3"; \
-		echo "nod /dev/ram 0655 0 0 b 1 1"; \
-	) >>$@
 
 ${FW_DIR}/${INITRAMFS}: ${STAGING_TARGET_DIR}/${INITRAMFS}_list
 	${LINUX_DIR}/usr/gen_init_cpio ${STAGING_TARGET_DIR}/${INITRAMFS}_list | \

package/arpd/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		arpd
 PKG_VERSION:=		0.2
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		e2911fa9de1b92ef50deda1489ae944d
 PKG_DESCR:=		Generates ARP responses for IP address ranges
 PKG_SECTION:=		route

package/arpd/patches/patch-arpd_c

@@ -1,5 +1,5 @@
 --- arpd.orig/arpd.c	2003-02-09 05:20:40.000000000 +0100
-+++ arpd/arpd.c	2007-01-21 00:39:05.000000000 +0100
++++ arpd/arpd.c	2014-03-16 08:11:53.000000000 +0100
 @@ -70,7 +70,7 @@ static int			 arpd_sig;
  static void
  usage(void)
@@ -74,10 +74,21 @@
  			    addr_ntoa(&req->pa), addr_ntoa(&src.arp_ha));
  			
  			/* This address is claimed */
-@@ -465,14 +469,14 @@ main(int argc, char *argv[])
+@@ -445,9 +449,6 @@ arpd_recv(int fd, short type, void *ev)
+ void
+ terminate_handler(int sig)
+ {
+-	extern int event_gotsig;
+-
+-	event_gotsig = 1;
+ 	arpd_sig = sig;
+ }
+ 
+@@ -464,15 +465,14 @@ int
+ main(int argc, char *argv[])
  {
  	struct event recv_ev;
- 	extern int (*event_sigcb)(void);
+-	extern int (*event_sigcb)(void);
 -	char *dev;
 +	char *dev, *and_pcap_exp;
  	int c, debug;
@@ -91,7 +102,7 @@
  		switch (c) {
  		case 'd':
  			debug = 1;
-@@ -480,6 +484,9 @@ main(int argc, char *argv[])
+@@ -480,6 +480,9 @@ main(int argc, char *argv[])
  		case 'i':
  			dev = optarg;
  			break;
@@ -101,7 +112,7 @@
  		default:
  			usage();
  			break;
-@@ -489,9 +496,9 @@ main(int argc, char *argv[])
+@@ -489,9 +492,9 @@ main(int argc, char *argv[])
  	argv += optind;
  
  	if (argc == 0)
@@ -113,3 +124,11 @@
  	
  	if ((fp = fopen(PIDFILE, "w")) == NULL)
  		err(1, "fopen");
+@@ -524,7 +527,6 @@ main(int argc, char *argv[])
+ 		perror("signal");
+ 		return (-1);
+ 	}
+-	event_sigcb = arpd_signal;
+ 	
+ 	event_dispatch();
+ 

package/gpsd/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gpsd
 PKG_VERSION:=		3.10
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		fc5b03aae38b9b5b6880b31924d0ace3
 PKG_DESCR:=		An interface daemon for GPS receivers
 PKG_SECTION:=		misc

package/gpsd/patches/patch-gpsmon_c

@@ -0,0 +1,13 @@
+--- gpsd-3.10.orig/gpsmon.c	2013-11-21 09:57:44.000000000 +0100
++++ gpsd-3.10/gpsmon.c	2014-03-16 09:08:34.000000000 +0100
+@@ -505,6 +505,10 @@ static /*@null@*/ char *curses_get_comma
+     static char line[80];
+     int c;
+ 
++#ifndef __GLIBC__
++#define CTRL(x)     (x&037)
++#endif
++
+     c = wgetch(cmdwin);
+     if (c == CTRL('L')) {
+ 	(void)clearok(stdscr, true);

target/mips/sys-available/qemu-mips

@@ -4,10 +4,6 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS
 	select ADK_big
 	select ADK_qemu_mips
 	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_INPUT
-	select ADK_TARGET_WITH_PCI
-	select ADK_TARGET_WITH_HDD
 	select ADK_TARGET_KERNEL_VMLINUZ
 	help
 	 Qemu support for mips big endian architecture.

target/mips/sys-available/qemu-mipsel

@@ -4,10 +4,6 @@ config ADK_TARGET_SYSTEM_QEMU_MIPSEL
 	select ADK_qemu_mipsel
 	select ADK_little
 	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_INPUT
-	select ADK_TARGET_WITH_PCI
-	select ADK_TARGET_WITH_HDD
 	select ADK_TARGET_KERNEL_VMLINUZ
 	help
 	 Qemu support for mips little endian architecture.

target/ppc/sys-available/qemu-ppc

@@ -4,8 +4,6 @@ config ADK_TARGET_SYSTEM_QEMU_PPC
 	select ADK_qemu_ppc
 	select ADK_CPU_PPC
 	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_INPUT
 	help
 	 Support for Qemu Emulator (PPC).
 

target/ppc64/sys-available/qemu-ppc64

@@ -4,8 +4,6 @@ config ADK_TARGET_SYSTEM_QEMU_PPC64
 	select ADK_qemu_ppc64
 	select ADK_CPU_PPC64
 	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_INPUT
 	help
 	 Support for Qemu Emulator (PPC64).
 

target/sh/sys-available/qemu-sh4

@@ -5,7 +5,6 @@ config ADK_TARGET_SYSTEM_QEMU_SH4
 	select ADK_qemu_sh4
 	select ADK_CPU_SH4
 	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	 Support for Qemu Emulator (superh).

target/sh/sys-available/qemu-sh4eb

@@ -5,7 +5,6 @@ config ADK_TARGET_SYSTEM_QEMU_SH4EB
 	select ADK_qemu_sh4
 	select ADK_CPU_SH4
 	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	 Support for Qemu Emulator (superh).

target/sparc/sys-available/qemu-sparc

@@ -4,8 +4,6 @@ config ADK_TARGET_SYSTEM_QEMU_SPARC
 	select ADK_qemu_sparc
 	select ADK_CPU_SPARC_V8
 	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	 Support for Qemu Emulator (SPARC).

target/sparc64/sys-available/qemu-sparc64

@@ -4,8 +4,6 @@ config ADK_TARGET_SYSTEM_QEMU_SPARC64
 	select ADK_qemu_sparc64
 	select ADK_CPU_SPARC_V9
 	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	 Support for Qemu Emulator (SPARC64).

target/x86_64/sys-available/qemu-x86_64

@@ -5,7 +5,6 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64
 	select ADK_CPU_X86_64
 	select ADK_LINUX_64
 	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_KERNEL_MAY_64BIT
 	select ADK_TARGET_KERNEL_BZIMAGE
 	help
 	 Support for Qemu Emulator.