From 1013db1ec05ba46496af7c73b7b1c430e1f7c063 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 28 Jan 2010 18:42:26 +0100
Subject: gsm package does not build in parallel

---
 package/gsm/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'package')

diff --git a/package/gsm/Makefile b/package/gsm/Makefile
index dfa0cbb5c..308c174c9 100644
--- a/package/gsm/Makefile
+++ b/package/gsm/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:=		libs
 PKG_URL:=		http://www-rn.informatik.uni-bremen.de/software/gsm/
 PKG_SITES:=		http://www-rn.informatik.uni-bremen.de/software/gsm/
 
+PKG_NOPARALLEL:=	1
 PKG_DESCR_1:=		A GSM 06.10 full-rate speech transcoding implementation (utilities)
 PKG_DEPENDS_1:=		libgsm
 
-- 
cgit v1.2.3


From 56cbee0cb11c894340b1961910cf9af18e4cb8a3 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 28 Jan 2010 18:43:08 +0100
Subject: do not strip binaries via install -s

---
 package/evilwm/patches/patch-Makefile                  | 12 +++++++++++-
 package/proftpd/patches/patch-Make_rules_in            |  6 +++---
 package/tptest/patches/patch-apps_unix_client_Makefile |  4 ++--
 package/tptest/patches/patch-apps_unix_server_Makefile |  4 ++--
 4 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'package')

diff --git a/package/evilwm/patches/patch-Makefile b/package/evilwm/patches/patch-Makefile
index a945a534f..d45dcee52 100644
--- a/package/evilwm/patches/patch-Makefile
+++ b/package/evilwm/patches/patch-Makefile
@@ -1,5 +1,6 @@
+do not strip by install
 --- evilwm-1.0.1.orig/Makefile	2009-03-30 12:37:06.000000000 +0200
-+++ evilwm-1.0.1/Makefile	2010-01-22 17:14:53.000000000 +0100
++++ evilwm-1.0.1/Makefile	2010-01-27 08:14:46.000000000 +0100
 @@ -1,11 +1,11 @@
  # If you don't use CC 
 -CC       = gcc
@@ -34,3 +35,12 @@
  #CFLAGS  += $(INCLUDES) $(DEFINES) -g -Wall
  CFLAGS  += -W -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Waggregate-return -Wnested-externs -Winline -Wwrite-strings -Wundef -Wsign-compare -Wmissing-prototypes -Wredundant-decls
  LDFLAGS += $(LDPATH) $(LIBS)
+@@ -93,7 +93,7 @@ evilwm: $(OBJS)
+ install: evilwm
+ 	if [ -f evilwm.exe ]; then mv evilwm.exe evilwm; fi
+ 	mkdir -p $(prefix)/bin $(prefix)/share/man/man1
+-	install -s evilwm $(prefix)/bin
++	install evilwm $(prefix)/bin
+ 	install evilwm.1 $(prefix)/share/man/man1
+ 	#gzip -9 $(prefix)/share/man/man1/evilwm.1
+ 
diff --git a/package/proftpd/patches/patch-Make_rules_in b/package/proftpd/patches/patch-Make_rules_in
index 028fd90b3..6f12634fa 100644
--- a/package/proftpd/patches/patch-Make_rules_in
+++ b/package/proftpd/patches/patch-Make_rules_in
@@ -1,6 +1,6 @@
 	do not try to set user or group id when installing
 --- proftpd-1.3.2b.orig/Make.rules.in	2008-11-19 04:51:38.000000000 +0100
-+++ proftpd-1.3.2b/Make.rules.in	2010-01-20 17:52:24.864178426 +0100
++++ proftpd-1.3.2b/Make.rules.in	2010-01-27 23:00:19.000000000 +0100
 @@ -29,9 +29,9 @@ UTILS_LIBS=@UTILS_LIBS@ @LIBS@
  INSTALL=@INSTALL@
  INSTALL_USER=@install_user@
@@ -8,8 +8,8 @@
 -INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
 -INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
 -INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644
-+INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -m 0755
-+INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -m 0755
++INSTALL_BIN=$(INSTALL) -m 0755
++INSTALL_SBIN=$(INSTALL) -m 0755
 +INSTALL_MAN=$(INSTALL) -m 0644
  
  RM=rm -f
diff --git a/package/tptest/patches/patch-apps_unix_client_Makefile b/package/tptest/patches/patch-apps_unix_client_Makefile
index 239d4770e..4043f3ec2 100644
--- a/package/tptest/patches/patch-apps_unix_client_Makefile
+++ b/package/tptest/patches/patch-apps_unix_client_Makefile
@@ -4,7 +4,7 @@
 	- drop the local subdir (openadk doesnt use this path)
 	- create the directories to install into
 --- tptest-3.1.7.orig/apps/unix/client/Makefile	2004-04-07 15:22:56.000000000 +0200
-+++ tptest-3.1.7/apps/unix/client/Makefile	2010-01-20 12:01:14.267178336 +0100
++++ tptest-3.1.7/apps/unix/client/Makefile	2010-01-28 00:00:45.000000000 +0100
 @@ -1,4 +1,4 @@
 -CC		= gcc
 +CC		?= gcc
@@ -28,7 +28,7 @@
  install:
 -	install -c -s -o bin -g bin -m 555 tptestclient /usr/local/bin
 +	install -d -m 755 ${DESTDIR}/usr/bin
-+	install -c -s -m 555 tptestclient ${DESTDIR}/usr/bin
++	install -c -m 755 tptestclient ${DESTDIR}/usr/bin
  
  depend: 
  	${MAKEDEPEND} ${INCL} ${SRCS} ${LIBSRCS}
diff --git a/package/tptest/patches/patch-apps_unix_server_Makefile b/package/tptest/patches/patch-apps_unix_server_Makefile
index e4ea1eab8..127bd0a72 100644
--- a/package/tptest/patches/patch-apps_unix_server_Makefile
+++ b/package/tptest/patches/patch-apps_unix_server_Makefile
@@ -4,7 +4,7 @@
         - drop the local subdir (openadk doesnt use this path)
         - create the directories to install into
 --- tptest-3.1.7.orig/apps/unix/server/Makefile	2003-01-22 11:42:45.000000000 +0100
-+++ tptest-3.1.7/apps/unix/server/Makefile	2010-01-20 12:01:24.758178270 +0100
++++ tptest-3.1.7/apps/unix/server/Makefile	2010-01-28 00:00:23.000000000 +0100
 @@ -1,4 +1,4 @@
 -CC		= gcc
 +CC		?= gcc
@@ -28,7 +28,7 @@
  install:
 -	install -c -s -o bin -g bin -m 555 tptestserver /usr/local/bin
 +	install -d -m 755 ${DESTDIR}/usr/bin
-+	install -c -s -m 555 tptestserver ${DESTDIR}/usr/bin
++	install -c -m 755 tptestserver ${DESTDIR}/usr/bin
  
  depend: 
  	${MAKEDEPEND} ${INCL} ${SRCS} ${LIBSRCS}
-- 
cgit v1.2.3


From fac41fa2bb0040cdea1a489c30eb424594a1a9d6 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 28 Jan 2010 18:43:30 +0100
Subject: fix dependency

---
 package/font-adobe-100dpi/Makefile | 2 ++
 package/font-adobe-75dpi/Makefile  | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'package')

diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile
index 08d05d0d2..013910dd5 100644
--- a/package/font-adobe-100dpi/Makefile
+++ b/package/font-adobe-100dpi/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		93bd04e2fb348a0c48e13ab3933f2381
 PKG_DESCR:=		X fonts
 PKG_SECTION:=		x11
+PKG_DEPENDS:=		font-util
+PKG_BUILDDEP+=		font-util
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
diff --git a/package/font-adobe-75dpi/Makefile b/package/font-adobe-75dpi/Makefile
index f39871761..34ace47f1 100644
--- a/package/font-adobe-75dpi/Makefile
+++ b/package/font-adobe-75dpi/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		d22283daba10129643800d73f5496aab
 PKG_DESCR:=		X fonts
 PKG_SECTION:=		x11
+PKG_DEPENDS:=		font-util
+PKG_BUILDDEP+=		font-util
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-- 
cgit v1.2.3


From 90618d893e8b702978787c4873a25ba701108f0c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 28 Jan 2010 19:53:57 +0100
Subject: disable cfgfs for nfsroot

---
 package/cfgfs/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package')

diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index dd5784512..3d89f2072 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -13,7 +13,7 @@ PKG_TARGET_DEPENDS:=	alix1c alix2d alix2d13 wrap foxboard ag241 rb532
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
 
-CFLINE_CFGFS:= 		select BUSYBOX_COMM\n\tselect BUSYBOX_MD5SUM\n\tselect BUSYBOX_XARGS\n\tselect BUSYBOX_FEATURE_SORT_BIG
+CFLINE_CFGFS:= 		select BUSYBOX_COMM\n\tselect BUSYBOX_MD5SUM\n\tselect BUSYBOX_XARGS\n\tselect BUSYBOX_FEATURE_SORT_BIG\n\tdepends on !ADK_TARGET_ROOTFS_NFSROOT
 
 include ${TOPDIR}/mk/package.mk
 
-- 
cgit v1.2.3


From 757fa3963c69a28b8d4e8ce083f79a007f386e00 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 30 Jan 2010 11:19:54 +0100
Subject: make them more quiet

---
 package/depmaker | 4 ++--
 package/pkgmaker | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'package')

diff --git a/package/depmaker b/package/depmaker
index da3923554..67dcb498d 100644
--- a/package/depmaker
+++ b/package/depmaker
@@ -34,5 +34,5 @@ for dn in */Makefile; do
 	done
 	print -r -- $x
 done >Depends.mk
-pbar=done
-print -u2 "$pbar"
+#pbar=done
+#print -u2 "$pbar"
diff --git a/package/pkgmaker b/package/pkgmaker
index 4a6ed12a0..7b50517f2 100644
--- a/package/pkgmaker
+++ b/package/pkgmaker
@@ -261,5 +261,5 @@ EOF
 	) 4>Config.in 5>Config.in.lib
 	cd ..
 done
-pbar=done
-print -u2 "$pbar"
+#pbar=done
+#print -u2 "$pbar"
-- 
cgit v1.2.3


From b3785da634e0e05f9991afebbdf998b111856839 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 30 Jan 2010 11:21:22 +0100
Subject: do not install interfaces file on NFSROOT filesystems

---
 package/base-files/Makefile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'package')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 82541e6f4..92949ea13 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		9
+PKG_RELEASE:=		10
 PKG_DESCR:=		basic filesystem structure and scripts
 PKG_SECTION:=		base
 
@@ -24,8 +24,15 @@ INSTALL_STYLE:=		manual
 do-install:
 	$(CP) ./extra/* $(IDIR_BASE_FILES)
 	$(CP) $(TOPDIR)/target/$(ADK_TARGET)/files/* $(IDIR_BASE_FILES)
+ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y)
+	@-rm $(IDIR_BASE_FILES)/etc/network/interfaces
+endif
+ifeq (${ADK_TARGET_PACKAGE_IPKG},y)
 	$(SED) 's,@TARGET@,$(ADK_TARGET),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
 	$(SED) 's,@VERSION@,$(ADK_VERSION),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
+else
+	@-rm $(IDIR_BASE_FILES)/etc/ipkg.conf
+endif
 	echo /bin/sh >${IDIR_BASE_FILES}/etc/shells
 	echo /bin/ash >>${IDIR_BASE_FILES}/etc/shells
 ifneq (${ADK_PACKAGE_BASH},)
-- 
cgit v1.2.3


From 2b00eeeb1c3ec2bdb1c2591582c6282d31284c01 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 30 Jan 2010 11:21:57 +0100
Subject: fix bootup on rb532/mips

the ld.so.1 symlink was missing. Install linker script
and symlinks in dev-package only.
---
 package/eglibc/Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'package')

diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index de7c80e45..5389c388f 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -46,15 +46,18 @@ EGLIBC_ENV:=		PATH='${TARGET_PATH}' \
 
 # compile nothing, eglibc is already build in toolchain directory
 do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
-	${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc $(IDIR_EGLIBC)/usr/lib
+	${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc \
+		$(IDIR_EGLIBC)/usr/lib
 	# install /etc/localtime from host system (FIXME)
 	${CP} /etc/localtime $(IDIR_EGLIBC)/etc
-	$(CP) $(STAGING_DIR)/lib/ld-* $(IDIR_EGLIBC)/lib/
+	$(CP) $(STAGING_DIR)/lib/ld* $(IDIR_EGLIBC)/lib/
 	$(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_EGLIBC)/lib/
 	-for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
 		$(CP) $(STAGING_DIR)/lib/$$file.so* $(IDIR_EGLIBC)/lib/; \
 		$(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/lib/; \
 	done
+
+eglibc-dev-install:
 	# install linker script
 	-cp ./files/libc.so.$(CPU_ARCH) $(IDIR_EGLIBC)/usr/lib/libc.so
 	cd $(IDIR_EGLIBC)/lib && ln -sf libm.so.6 libm.so
@@ -62,8 +65,6 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	cd $(IDIR_EGLIBC)/lib && ln -sf librt.so.1 librt.so
 	cd $(IDIR_EGLIBC)/lib && ln -sf libcrypt.so.1 libcrypt.so
 	cd $(IDIR_EGLIBC)/lib && ln -sf libdl.so.2 libdl.so
-
-eglibc-dev-install:
 	# header package
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
 		HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
-- 
cgit v1.2.3


From 276e47c2fae8adc759cf8672cc9f60e2cebbfb0c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 30 Jan 2010 12:49:59 +0100
Subject: update to latest upstream version

add a default config file with watchdog enabled.
Enable watchdog in /etc/rc.conf by default.
---
 package/watchdog/Makefile                          | 11 +++---
 package/watchdog/files/watchdog.conf               | 41 ++++++++++++++++++++++
 package/watchdog/files/watchdog.postinst           |  2 +-
 .../watchdog/patches/01-fstab-sys_siglist.patch    | 11 ------
 package/watchdog/patches/patch-src_mntent_c        | 21 -----------
 package/watchdog/patches/patch-src_umount_c        | 12 -------
 6 files changed, 46 insertions(+), 52 deletions(-)
 create mode 100644 package/watchdog/files/watchdog.conf
 delete mode 100644 package/watchdog/patches/01-fstab-sys_siglist.patch
 delete mode 100644 package/watchdog/patches/patch-src_mntent_c
 delete mode 100644 package/watchdog/patches/patch-src_umount_c

(limited to 'package')

diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile
index 1424b29fd..eda6f83cb 100644
--- a/package/watchdog/Makefile
+++ b/package/watchdog/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		watchdog
-PKG_VERSION:=		5.4
+PKG_VERSION:=		5.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		66480128b9dabcced2e4c8db3e60fa50
+PKG_MD5SUM:=		31766450ecfc9aff70fe966c0b9df06d
 PKG_DESCR:=		watchdog daemon
 PKG_SECTION:=		sys
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=watchdog/}
@@ -16,16 +16,13 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,WATCHDOG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
-XAKE_FLAGS+=		CCOPT="${TARGET_CFLAGS}" \
-			INCLS="-I. -I${STAGING_DIR}/usr/include" \
-			LIBS="-L${STAGING_DIR}/usr/lib"
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_WATCHDOG}/usr/sbin ${IDIR_WATCHDOG}/etc/
-	${INSTALL_DATA} ${WRKINST}/etc/watchdog.conf ${IDIR_WATCHDOG}/etc/
+	${INSTALL_DATA} ./files/watchdog.conf ${IDIR_WATCHDOG}/etc/
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/watchdog \
-		       ${WRKINST}/usr/sbin/wd_keepalive ${IDIR_WATCHDOG}/usr/sbin/
+		       ${IDIR_WATCHDOG}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/watchdog/files/watchdog.conf b/package/watchdog/files/watchdog.conf
new file mode 100644
index 000000000..0314adcfb
--- /dev/null
+++ b/package/watchdog/files/watchdog.conf
@@ -0,0 +1,41 @@
+#ping			= 172.31.14.1
+#ping			= 172.26.1.255
+#interface		= eth0
+#file			= /var/log/messages
+#change			= 1407
+
+# Uncomment to enable test. Setting one of these values to '0' disables it.
+# These values will hopefully never reboot your machine during normal use
+# (if your machine is really hung, the loadavg will go much higher than 25)
+#max-load-1		= 24
+#max-load-5		= 18
+#max-load-15		= 12
+
+# Note that this is the number of pages!
+# To get the real size, check how large the pagesize is on your machine.
+#min-memory		= 1
+
+#repair-binary		= /usr/sbin/repair
+#test-binary		= 
+#test-timeout		= 
+
+watchdog-device	= /dev/watchdog
+watchdog-timeout = 20
+
+# Defaults compiled into the binary
+#temperature-device	=
+#max-temperature	= 120
+
+# Defaults compiled into the binary
+#admin			= root
+#interval		= 10
+#logtick                = 1
+
+# This greatly decreases the chance that watchdog won't be scheduled before
+# your machine is really loaded
+realtime		= yes
+priority		= 1
+
+# Check if syslogd is still running by enabling the following line
+#pidfile		= /var/run/syslogd.pid   
+
diff --git a/package/watchdog/files/watchdog.postinst b/package/watchdog/files/watchdog.postinst
index 17d144395..a44195149 100644
--- a/package/watchdog/files/watchdog.postinst
+++ b/package/watchdog/files/watchdog.postinst
@@ -1,3 +1,3 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
-add_rcconf watchdog watchdog NO
+add_rcconf watchdog watchdog YES
diff --git a/package/watchdog/patches/01-fstab-sys_siglist.patch b/package/watchdog/patches/01-fstab-sys_siglist.patch
deleted file mode 100644
index 604ecdcb6..000000000
--- a/package/watchdog/patches/01-fstab-sys_siglist.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- watchdog-5.2.4.orig.orig/src/fstab.c	2003-01-28 07:47:38.000000000 +0100
-+++ watchdog-5.2.4.orig/src/fstab.c	2008-10-16 12:56:40.000000000 +0200
-@@ -237,7 +237,7 @@ static int old_lockfile = 1;
- /* Ensure that the lock is released if we are interrupted.  */
- static void
- handler (int sig) {
--     die (EX_USER, "%s", sys_siglist[sig]);
-+     die (EX_USER, "%s", "sys_siglist[sig]");
- }
- 
- static void
diff --git a/package/watchdog/patches/patch-src_mntent_c b/package/watchdog/patches/patch-src_mntent_c
deleted file mode 100644
index c00b6ff45..000000000
--- a/package/watchdog/patches/patch-src_mntent_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- watchdog-5.2.4.orig.orig/src/mntent.c	2003-01-28 07:47:38.000000000 +0100
-+++ watchdog-5.2.4.orig/src/mntent.c	2008-10-16 13:00:20.000000000 +0200
-@@ -6,7 +6,7 @@
- #endif
- 
- #include <stdio.h>
--#include <string.h>		/* for index */
-+#include <string.h>		/* for strchr */
- #include <ctype.h>		/* for isdigit */
- #include "wd_mntent.h"
- #include "sundries.h"		/* for xmalloc */
-@@ -155,7 +155,7 @@ my_getmntent (mntFILE *mfp) {
- 		if (fgets (buf, sizeof(buf), mfp->mntent_fp) == NULL)
- 			return NULL;
- 
--		s = index (buf, '\n');
-+		s = strchr (buf, '\n');
- 		if (s == NULL) {
- 			/* extremely long line - assume file was corrupted */
- 			mfp->mntent_errs = 1;
diff --git a/package/watchdog/patches/patch-src_umount_c b/package/watchdog/patches/patch-src_umount_c
deleted file mode 100644
index cf421ce79..000000000
--- a/package/watchdog/patches/patch-src_umount_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- watchdog-5.2.4.orig.orig/src/umount.c	2003-01-28 07:47:38.000000000 +0100
-+++ watchdog-5.2.4.orig/src/umount.c	2008-10-16 13:00:07.000000000 +0200
-@@ -210,7 +210,7 @@ umount_one (const char *spec, const char
- 	    if (res < 0)
- 		 umnt_err2 = errno;
- 	    /* Do not complain about remote NFS mount points */
--	    if (errno == ENOENT && index(spec, ':'))
-+	    if (errno == ENOENT && strchr(spec, ':'))
- 		 umnt_err2 = 0;
-        }
-   }
-- 
cgit v1.2.3


From 5af89f5f951db199840e83b49d240f47eacdd0c2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 30 Jan 2010 13:12:43 +0100
Subject: enable watchdog on rb532 by default, use busybox applet.

the package/watchdog could also be used, if more checks
are required. (high load, free memory,..)
---
 package/busybox/Makefile               | 4 ++--
 package/busybox/files/busybox.postinst | 5 +++--
 package/busybox/files/watchdog.init    | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'package')

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 37f50bdd6..b2509c937 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
 PKG_VERSION:=		1.15.2
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		495e320537f0772125f2db3c098e437c
 PKG_DESCR:=		Core utilities for embedded Linux systems
 PKG_SECTION:=		base
@@ -51,7 +51,7 @@ else
 	$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
 	    IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install
 endif
-ifeq ($(DEBUG),1)
+ifeq ($(ADK_DEBUG),y)
 	${INSTALL_BIN} $(WRKBUILD)/busybox_unstripped \
 		$(IDIR_BUSYBOX)/bin/busybox
 endif
diff --git a/package/busybox/files/busybox.postinst b/package/busybox/files/busybox.postinst
index 761fb777d..71d18be30 100644
--- a/package/busybox/files/busybox.postinst
+++ b/package/busybox/files/busybox.postinst
@@ -2,6 +2,7 @@
 . $IPKG_INSTROOT/etc/functions.sh
 add_rcconf network network YES
 add_rcconf crond crond NO
-add_rcconf watchdog watchdog NO
+add_rcconf watchdog watchdog YES
+add_rcconf watchdog_flags watchdog_flags '-t 10 -T 20'
 add_rcconf 'use "-C32" normally, "NO" to disable' syslogd_flags '-C32'
-add_rcconf inetd
+add_rcconf inetd inetd NO
diff --git a/package/busybox/files/watchdog.init b/package/busybox/files/watchdog.init
index c5d0e9545..3aad38380 100644
--- a/package/busybox/files/watchdog.init
+++ b/package/busybox/files/watchdog.init
@@ -10,7 +10,7 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	watchdog /dev/watchdog
+	watchdog $watchdog_flags /dev/watchdog
 	;;
 stop)
 	pkill watchdog
-- 
cgit v1.2.3


From 067cd649711b527b68299a2825620df2bdddb06b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 30 Jan 2010 13:30:32 +0100
Subject: combine all alix targets and use "alix" from target/target.lst

---
 package/cfinstall/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package')

diff --git a/package/cfinstall/Makefile b/package/cfinstall/Makefile
index 1197fd15a..94b423d83 100644
--- a/package/cfinstall/Makefile
+++ b/package/cfinstall/Makefile
@@ -5,12 +5,12 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cfinstall
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_DESCR:=		compact flash installer
 PKG_SECTION:=		base
 PKG_DEPENDS:=		parted sfdisk
 
-PKG_TARGET_DEPENDS:=	alix1c alix2d wrap rb532
+PKG_TARGET_DEPENDS:=	alix wrap rb532
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
-- 
cgit v1.2.3


From 6e03bb38c5d0309200152a1293d87f09c8545e13 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 30 Jan 2010 18:30:17 +0100
Subject: fix dependency to libreadline

---
 package/Config.in       | 1 +
 package/parted/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'package')

diff --git a/package/Config.in b/package/Config.in
index 4e6deca9a..298a36152 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -380,6 +380,7 @@ source "package/libpthread/Config.in"
 source "package/libpthread/Config.in.lib"
 source "package/libthread_db/Config.in"
 source "package/readline/Config.in"
+source "package/readline/Config.in.lib"
 source "package/cyrus-sasl/Config.in.lib"
 source "package/sdl/Config.in"
 source "package/sdl/Config.in.lib"
diff --git a/package/parted/Makefile b/package/parted/Makefile
index f845eb866..b51fefd90 100644
--- a/package/parted/Makefile
+++ b/package/parted/Makefile
@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		parted
 PKG_VERSION:=		1.9.0
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		e2fsprogs lvm readline
 PKG_MD5SUM:=		055305bc7bcf472ce38f9abf69a9d94d
 PKG_DESCR:=		GNU parted
-PKG_DEPENDS:=		libuuid libreadline device-mapper
 PKG_SECTION:=		admin
+PKG_DEPENDS:=		libuuid libreadline device-mapper
+PKG_BUILDDEP+=		e2fsprogs lvm readline
 PKG_URL:=		http://www.gnu.org/software/parted/index.shtml
 PKG_SITES:=		${MASTER_SITE_GNU:=parted/}
 
-- 
cgit v1.2.3


From 5df306b0c9d713021edd9d81ff8f37b5d7f01db5 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 30 Jan 2010 18:35:58 +0100
Subject: use target-libc combination for all builddirs

IMPORTANT: do a make distclean before compiling after
this commit.

The directories for all build and bin directories changed, so
that toolchains for different target-libc combinations can coexist.
This might be usefule in the future for continous compiling after
git commit, without rebuilding the toolchain.
Rework busybox rebuild, when config changes. Not optimal, but at least
working after this change to the directory structure.
---
 package/Makefile         |  6 ++----
 package/busybox/Makefile | 25 ++++++++++++++++---------
 2 files changed, 18 insertions(+), 13 deletions(-)

(limited to 'package')

diff --git a/package/Makefile b/package/Makefile
index 2e83a0799..0f8c43a92 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -41,9 +41,6 @@ compile: base-files-compile $(COMPILE_PACKAGES)
 install: base-files-install $(INSTALL_PACKAGES)
 endif
 
-#$(COMPILE_PACKAGES): base-files-compile
-#$(INSTALL_PACKAGES): base-files-install
-
 $(TARGET_DIR):
 	mkdir -p $(TARGET_DIR)
 
@@ -59,7 +56,8 @@ $(TARGET_DIR):
 	$(CMD_TRACE) " done"
 	$(END_TRACE)
 
-%-install: %-compile
+#%-install: %-compile
+%-install:
 	@$(START_TRACE) "package/$(patsubst %-install,%,$@)-install: "
 	@$(MAKE) -C $(patsubst %-install,%,$@) install
 	@$(CMD_TRACE) " done"
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index b2509c937..7779226a7 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -18,23 +18,28 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-do-configure:
+${TOPDIR}/.busyboxcfg: ${TOPDIR}/.config
 	grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \
-		${WRKBUILD}/.config
-	$(SED) 's
@IDIR@
${WRKINST}
' ${WRKBUILD}/.config
+		${TOPDIR}/.busyboxcfg
+
+${WRKBUILD}/.config: ${TOPDIR}/.busyboxcfg
+	cp $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
+	$(SED) 's;@IDIR@;${WRKINST};' ${WRKBUILD}/.config
+	
+do-configure: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
 ifeq ($(ADK_NATIVE),y)
 	yes '' | \
 	$(MAKE) V=1 \
 	    IPKG_ARCH="$(ARCH)" \
-	    ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig
+	    ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
 else
 	yes '' | \
 	$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
 	    EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(ARCH)" \
-	    ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig
+	    ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
 endif
 
-do-build:
+do-build: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
 ifeq ($(ADK_NATIVE),y)
 	$(MAKE) V=1 \
 	    IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
@@ -43,13 +48,13 @@ else
 	    IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
 endif
 
-do-install: ${TOPDIR}/.config
+do-install: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
 ifeq ($(ADK_NATIVE),y)
 	$(MAKE) V=1 \
-	    IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install
+	    IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
 else
 	$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
-	    IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install
+	    IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
 endif
 ifeq ($(ADK_DEBUG),y)
 	${INSTALL_BIN} $(WRKBUILD)/busybox_unstripped \
@@ -57,4 +62,6 @@ ifeq ($(ADK_DEBUG),y)
 endif
 	$(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
 
+fake:	$(TOPDIR)/.busyboxcfg do-configure do-install
+
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From 345795d6b5aeaad33091bbf34250b2ddbc9dcca2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 30 Jan 2010 20:33:35 +0100
Subject: implement cfinstaller for rb532

---
 package/cfinstall/Makefile            |  7 ++++-
 package/cfinstall/src/cfinstall.rb532 | 49 +++++++++++++++++++++++++++++++++++
 package/parted/Makefile               |  2 +-
 3 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 package/cfinstall/src/cfinstall.rb532

(limited to 'package')

diff --git a/package/cfinstall/Makefile b/package/cfinstall/Makefile
index 94b423d83..fb64446f3 100644
--- a/package/cfinstall/Makefile
+++ b/package/cfinstall/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cfinstall
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_DESCR:=		compact flash installer
 PKG_SECTION:=		base
 PKG_DEPENDS:=		parted sfdisk
@@ -27,6 +27,11 @@ pre-configure:
 
 do-install:
 	${INSTALL_DIR} $(IDIR_CFINSTALL)/sbin
+ifeq ($(ADK_LINUX_MIPS_RB532),y)
+	${INSTALL_BIN} ./src/cfinstall.rb532 \
+		$(IDIR_CFINSTALL)/sbin/cfinstall
+else
 	${INSTALL_BIN} ./src/cfinstall $(IDIR_CFINSTALL)/sbin
+endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cfinstall/src/cfinstall.rb532 b/package/cfinstall/src/cfinstall.rb532
new file mode 100644
index 000000000..900d6dc18
--- /dev/null
+++ b/package/cfinstall/src/cfinstall.rb532
@@ -0,0 +1,49 @@
+#!/bin/sh
+# installs a rootfs tar archive from OpenADK onto a Compact Flash disk
+# special script for routerboard rb532
+
+if [ -z $1 ];then
+        printf "Please give your root tar archive as first parameter\n"
+        exit 1
+fi
+if [ -z $2 ];then
+        printf "Please give your kernel as second parameter\n"
+        exit 1
+fi
+# create empty partition table
+parted -s /dev/sda mklabel msdos
+sleep 2
+maxsize=$(env LC_ALL=C parted /dev/sda -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
+rootsize=$(($maxsize-2))
+
+parted -s /dev/sda unit cyl mkpart primary ext2 0 1
+parted -s /dev/sda unit cyl mkpartfs primary ext2 1 $rootsize
+parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize
+parted -s /dev/sda set 1 boot on
+sfdisk --change-id /dev/sda 1 27 >/dev/null 2>&1
+sfdisk --change-id /dev/sda 3 88 >/dev/null 2>&1
+if [ $? -eq 0 ];then
+        printf "Successfully created partition ${rootpart}\n"
+else
+        printf "Partition creation failed, Exiting.\n"
+        exit 1
+fi
+sleep 2
+sync
+printf "Installing kernel\n"
+dd if=$2 of=/dev/sda1 bs=2048 >/dev/null 2>&1
+sync
+mount -t ext2 /dev/sda2 /mnt
+printf "Extracting install archive\n"
+tar -C /mnt -xzpf $1
+chmod 1777 /mnt/tmp
+chmod 4755 /mnt/bin/busybox
+
+printf "Creating device nodes\n"
+mknod -m 666 /mnt/dev/null c 1 3
+mknod -m 622 /mnt/dev/console c 5 1
+mknod -m 666 /mnt/dev/tty c 5 0
+
+umount /mnt
+printf "Successfully installed.\n"
+exit 0
diff --git a/package/parted/Makefile b/package/parted/Makefile
index b51fefd90..6323c875c 100644
--- a/package/parted/Makefile
+++ b/package/parted/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		055305bc7bcf472ce38f9abf69a9d94d
 PKG_DESCR:=		GNU parted
 PKG_SECTION:=		admin
-PKG_DEPENDS:=		libuuid libreadline device-mapper
+PKG_DEPENDS:=		libuuid libreadline device-mapper libpthread
 PKG_BUILDDEP+=		e2fsprogs lvm readline
 PKG_URL:=		http://www.gnu.org/software/parted/index.shtml
 PKG_SITES:=		${MASTER_SITE_GNU:=parted/}
-- 
cgit v1.2.3


From 74b82b8b841c83dd370d2109cb7d2ce2e2f8e00b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 30 Jan 2010 22:03:39 +0100
Subject: fix eglibc dev package and group alix/wrap devices

---
 package/eglibc/Makefile | 13 +++++++------
 package/glibc/Makefile  |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'package')

diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index 5389c388f..02065328b 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -58,13 +58,14 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	done
 
 eglibc-dev-install:
+	${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/lib
 	# install linker script
-	-cp ./files/libc.so.$(CPU_ARCH) $(IDIR_EGLIBC)/usr/lib/libc.so
-	cd $(IDIR_EGLIBC)/lib && ln -sf libm.so.6 libm.so
-	cd $(IDIR_EGLIBC)/lib && ln -sf libutil.so.1 libutil.so
-	cd $(IDIR_EGLIBC)/lib && ln -sf librt.so.1 librt.so
-	cd $(IDIR_EGLIBC)/lib && ln -sf libcrypt.so.1 libcrypt.so
-	cd $(IDIR_EGLIBC)/lib && ln -sf libdl.so.2 libdl.so
+	-cp ./files/libc.so.$(CPU_ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
+	cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libm.so.6 libm.so
+	cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libutil.so.1 libutil.so
+	cd $(IDIR_EGLIBC_DEV)/lib && ln -sf librt.so.1 librt.so
+	cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libcrypt.so.1 libcrypt.so
+	cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libdl.so.2 libdl.so
 	# header package
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
 		HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 45145d230..103452469 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -45,10 +45,10 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 		$(CP) $(STAGING_DIR)/lib/$$file.so* $(IDIR_GLIBC)/lib/; \
 		$(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/lib/; \
 	done
-	# create ld.so link for mips gcc linker option
-	cd $(IDIR_GLIBC)/lib && ln -sf ld-linux.so.2 ld.so.1
 
 glibc-dev-install:
+	${INSTALL_DIR} $(IDIR_GLIBC_DEV)/lib
+	cd $(IDIR_GLIBC_DEV)/lib && ln -sf ld-linux.so.2 ld.so.1
 	# header package
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
 		HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
-- 
cgit v1.2.3


From 6051971c313ca3558c05631dc7f1c2c4b23a0114 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 30 Jan 2010 22:19:01 +0100
Subject: implement installation on nand and fix nand bootup

rb532 nand usage fixed. Rename cfinstall to adkinstall
to abstract from backend device used.
---
 package/Config.in                       |  4 +-
 package/adkinstall/Makefile             | 37 ++++++++++++++++
 package/adkinstall/src/adkinstall       | 61 ++++++++++++++++++++++++++
 package/adkinstall/src/adkinstall.rb532 | 78 +++++++++++++++++++++++++++++++++
 package/cfgfs/Makefile                  |  4 +-
 package/cfinstall/Makefile              | 37 ----------------
 package/cfinstall/src/cfinstall         | 61 --------------------------
 package/cfinstall/src/cfinstall.rb532   | 49 ---------------------
 8 files changed, 180 insertions(+), 151 deletions(-)
 create mode 100644 package/adkinstall/Makefile
 create mode 100644 package/adkinstall/src/adkinstall
 create mode 100644 package/adkinstall/src/adkinstall.rb532
 delete mode 100644 package/cfinstall/Makefile
 delete mode 100644 package/cfinstall/src/cfinstall
 delete mode 100644 package/cfinstall/src/cfinstall.rb532

(limited to 'package')

diff --git a/package/Config.in b/package/Config.in
index 298a36152..31867be26 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -4,18 +4,18 @@
 menu "Package selection"
 
 menu "Basesystem"
+source "package/adkinstall/Config.in"
 source "package/base-files/Config.in"
 source "package/busybox/Config.in.manual"
 source "package/cfgfs/Config.in"
-source "package/cfinstall/Config.in"
 source "package/cryptinit/Config.in"
 source "package/uclibc/Config.in.manual"
 source "package/glibc/Config.in.manual"
 source "package/eglibc/Config.in.manual"
 source "package/libc/Config.in.manual"
-source "package/rpm/Config.in"
 source "package/grub/Config.in"
 source "package/grub-bin/Config.in"
+source "package/rpm/Config.in"
 endmenu
 
 menu "Bluetooth"
diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile
new file mode 100644
index 000000000..d250a1e70
--- /dev/null
+++ b/package/adkinstall/Makefile
@@ -0,0 +1,37 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		adkinstall
+PKG_VERSION:=		1.0
+PKG_RELEASE:=		3
+PKG_DESCR:=		installer for compact flash or nand/mtd devices
+PKG_SECTION:=		base
+PKG_DEPENDS:=		parted sfdisk
+
+PKG_TARGET_DEPENDS:=	alix wrap rb532
+
+WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
+NO_DISTFILES:=		1
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,ADKINSTALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+pre-configure:
+	mkdir -p ${WRKBUILD}
+
+do-install:
+	${INSTALL_DIR} $(IDIR_ADKINSTALL)/sbin
+ifeq ($(ADK_LINUX_MIPS_RB532),y)
+	${INSTALL_BIN} ./src/adkinstall.rb532 \
+		$(IDIR_ADKINSTALL)/sbin/adkinstall
+else
+	${INSTALL_BIN} ./src/adkinstall $(IDIR_ADKINSTALL)/sbin
+endif
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/adkinstall/src/adkinstall b/package/adkinstall/src/adkinstall
new file mode 100644
index 000000000..7e9a0d1ad
--- /dev/null
+++ b/package/adkinstall/src/adkinstall
@@ -0,0 +1,61 @@
+#!/bin/sh
+# installs a rootfs tar archive from OpenADK onto a Compact Flash disk
+
+if [ -z $1 ];then
+        printf "Please give your root tar archive as parameter\n"
+        exit 1
+fi
+# create empty partition table
+parted -s /dev/sda mklabel msdos
+sleep 2
+maxsize=$(env LC_ALL=C parted /dev/sda -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
+rootsize=$(($maxsize-2))
+parted -s /dev/sda unit cyl mkpartfs primary ext2 0 $rootsize
+parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize
+parted -s /dev/sda set 1 boot on
+sfdisk --change-id /dev/sda 2 88 >/dev/null 2>&1
+if [ $? -eq 0 ];then
+        printf "Successfully created partition ${rootpart}\n"
+else
+        printf "Partition creation failed, Exiting.\n"
+        exit 1
+fi
+mount -t ext2 /dev/sda1 /mnt
+printf "Extracting install archive\n"
+tar -C /mnt -xzpf $1
+chmod 1777 /mnt/tmp
+chmod 4755 /mnt/bin/busybox
+
+speed=$(awk -F \, '/console=ttyS0/ { print $2 }' /proc/cmdline|sed -e "s/ .*$//")
+
+printf "Install bootloader\n"
+mkdir -p /mnt/boot/grub
+mount -o bind /dev /mnt/dev
+chroot /mnt mount -t proc /proc /proc
+chroot /mnt mount -t sysfs /sys /sys
+cat << EOF > /mnt/boot/grub/grub.cfg
+set default=0
+set timeout=1
+serial --unit=0 --speed=$speed
+terminal_output serial 
+terminal_input serial 
+
+menuentry "GNU/Linux (OpenADK)" {
+        insmod ext2
+        set root=(hd0,1)
+        linux /boot/vmlinuz-adk root=/dev/sda1 ro init=/init panic=10
+}
+EOF
+chroot /mnt grub-install /dev/sda >/dev/null 2>&1
+umount /mnt/proc
+umount /mnt/sys
+umount /mnt/dev
+
+printf "Creating device nodes\n"
+mknod -m 666 /mnt/dev/null c 1 3
+mknod -m 622 /mnt/dev/console c 5 1
+mknod -m 666 /mnt/dev/tty c 5 0
+
+umount /mnt
+printf "Successfully installed.\n"
+exit 0
diff --git a/package/adkinstall/src/adkinstall.rb532 b/package/adkinstall/src/adkinstall.rb532
new file mode 100644
index 000000000..ca2ffde0d
--- /dev/null
+++ b/package/adkinstall/src/adkinstall.rb532
@@ -0,0 +1,78 @@
+#!/bin/sh
+# installs a rootfs tar archive from OpenADK onto 
+# a Compact Flash disk or NAND device
+# special script for routerboard rb532
+
+nandinstall=0
+cfinstall=0
+
+if [ -z $1 ];then
+        printf "Please give your target device as first parameter [cf|nand]\n"
+        exit 1
+fi
+if [ -z $2 ];then
+        printf "Please give your root tar archive as second parameter\n"
+        exit 1
+fi
+if [ -z $3 ];then
+        printf "Please give your kernel as third parameter\n"
+        exit 1
+fi
+case $1 in
+	nand)
+		nandinstall=1
+		;;
+	cf)
+		cfinstall=1
+		;;
+	*)
+		printf "Target not recognized\n"
+		exit 1
+		;;
+esac
+
+if [ $cfinstall -eq 1 ];then
+	# create empty partition table
+	printf "Creating partition scheme\n"
+	parted -s /dev/sda mklabel msdos
+	sleep 2
+	maxsize=$(env LC_ALL=C parted /dev/sda -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
+	rootsize=$(($maxsize-2))
+	parted -s /dev/sda unit cyl mkpart primary ext2 0 1
+	parted -s /dev/sda unit cyl mkpartfs primary ext2 1 $rootsize
+	parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize
+	parted -s /dev/sda set 1 boot on
+	sfdisk --change-id /dev/sda 1 27 >/dev/null 2>&1
+	sfdisk --change-id /dev/sda 3 88 >/dev/null 2>&1
+	sleep 2
+	sync
+	printf "Installing kernel\n"
+	dd if=$3 of=/dev/sda1 bs=2048 >/dev/null 2>&1
+	sync
+	mount -t ext2 /dev/sda2 /mnt
+fi
+
+if [ $nandinstall -eq 1 ];then
+	printf "Installing kernel\n"
+	mount -t yaffs2 /dev/mtdblock0 /mnt
+	cp $3 /mnt/kernel
+	sync
+	umount /mnt
+	mount -t yaffs2 /dev/mtdblock1 /mnt
+	rm -rf /mnt/* >/dev/null 2>&1
+fi
+
+printf "Extracting install archive\n"
+tar -C /mnt -xzpf $2
+
+chmod 1777 /mnt/tmp
+chmod 4755 /mnt/bin/busybox
+
+printf "Creating device nodes\n"
+mknod -m 666 /mnt/dev/null c 1 3
+mknod -m 622 /mnt/dev/console c 5 1
+mknod -m 666 /mnt/dev/tty c 5 0
+
+umount /mnt
+printf "Successfully installed.\n"
+exit 0
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index 3d89f2072..806da3199 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -8,12 +8,12 @@ PKG_VERSION:=		1.0.6
 PKG_RELEASE:=		5
 PKG_DESCR:=		compressed config filesystem
 PKG_SECTION:=		base
-PKG_TARGET_DEPENDS:=	alix1c alix2d alix2d13 wrap foxboard ag241 rb532
+PKG_TARGET_DEPENDS:=	alix wrap foxboard ag241 rb532
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
 
-CFLINE_CFGFS:= 		select BUSYBOX_COMM\n\tselect BUSYBOX_MD5SUM\n\tselect BUSYBOX_XARGS\n\tselect BUSYBOX_FEATURE_SORT_BIG\n\tdepends on !ADK_TARGET_ROOTFS_NFSROOT
+CFLINE_CFGFS:= 		select BUSYBOX_COMM\n\tselect BUSYBOX_MD5SUM\n\tselect BUSYBOX_XARGS\n\tselect BUSYBOX_FEATURE_SORT_BIG\n\tdepends on !ADK_TARGET_ROOTFS_NFSROOT\n\tdepends on !ADK_TARGET_ROOTFS_YAFFS
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/cfinstall/Makefile b/package/cfinstall/Makefile
deleted file mode 100644
index fb64446f3..000000000
--- a/package/cfinstall/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${TOPDIR}/rules.mk
-
-PKG_NAME:=		cfinstall
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		3
-PKG_DESCR:=		compact flash installer
-PKG_SECTION:=		base
-PKG_DEPENDS:=		parted sfdisk
-
-PKG_TARGET_DEPENDS:=	alix wrap rb532
-
-WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
-NO_DISTFILES:=		1
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,CFINSTALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-pre-configure:
-	mkdir -p ${WRKBUILD}
-
-do-install:
-	${INSTALL_DIR} $(IDIR_CFINSTALL)/sbin
-ifeq ($(ADK_LINUX_MIPS_RB532),y)
-	${INSTALL_BIN} ./src/cfinstall.rb532 \
-		$(IDIR_CFINSTALL)/sbin/cfinstall
-else
-	${INSTALL_BIN} ./src/cfinstall $(IDIR_CFINSTALL)/sbin
-endif
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cfinstall/src/cfinstall b/package/cfinstall/src/cfinstall
deleted file mode 100644
index 7e9a0d1ad..000000000
--- a/package/cfinstall/src/cfinstall
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-# installs a rootfs tar archive from OpenADK onto a Compact Flash disk
-
-if [ -z $1 ];then
-        printf "Please give your root tar archive as parameter\n"
-        exit 1
-fi
-# create empty partition table
-parted -s /dev/sda mklabel msdos
-sleep 2
-maxsize=$(env LC_ALL=C parted /dev/sda -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
-rootsize=$(($maxsize-2))
-parted -s /dev/sda unit cyl mkpartfs primary ext2 0 $rootsize
-parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize
-parted -s /dev/sda set 1 boot on
-sfdisk --change-id /dev/sda 2 88 >/dev/null 2>&1
-if [ $? -eq 0 ];then
-        printf "Successfully created partition ${rootpart}\n"
-else
-        printf "Partition creation failed, Exiting.\n"
-        exit 1
-fi
-mount -t ext2 /dev/sda1 /mnt
-printf "Extracting install archive\n"
-tar -C /mnt -xzpf $1
-chmod 1777 /mnt/tmp
-chmod 4755 /mnt/bin/busybox
-
-speed=$(awk -F \, '/console=ttyS0/ { print $2 }' /proc/cmdline|sed -e "s/ .*$//")
-
-printf "Install bootloader\n"
-mkdir -p /mnt/boot/grub
-mount -o bind /dev /mnt/dev
-chroot /mnt mount -t proc /proc /proc
-chroot /mnt mount -t sysfs /sys /sys
-cat << EOF > /mnt/boot/grub/grub.cfg
-set default=0
-set timeout=1
-serial --unit=0 --speed=$speed
-terminal_output serial 
-terminal_input serial 
-
-menuentry "GNU/Linux (OpenADK)" {
-        insmod ext2
-        set root=(hd0,1)
-        linux /boot/vmlinuz-adk root=/dev/sda1 ro init=/init panic=10
-}
-EOF
-chroot /mnt grub-install /dev/sda >/dev/null 2>&1
-umount /mnt/proc
-umount /mnt/sys
-umount /mnt/dev
-
-printf "Creating device nodes\n"
-mknod -m 666 /mnt/dev/null c 1 3
-mknod -m 622 /mnt/dev/console c 5 1
-mknod -m 666 /mnt/dev/tty c 5 0
-
-umount /mnt
-printf "Successfully installed.\n"
-exit 0
diff --git a/package/cfinstall/src/cfinstall.rb532 b/package/cfinstall/src/cfinstall.rb532
deleted file mode 100644
index 900d6dc18..000000000
--- a/package/cfinstall/src/cfinstall.rb532
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-# installs a rootfs tar archive from OpenADK onto a Compact Flash disk
-# special script for routerboard rb532
-
-if [ -z $1 ];then
-        printf "Please give your root tar archive as first parameter\n"
-        exit 1
-fi
-if [ -z $2 ];then
-        printf "Please give your kernel as second parameter\n"
-        exit 1
-fi
-# create empty partition table
-parted -s /dev/sda mklabel msdos
-sleep 2
-maxsize=$(env LC_ALL=C parted /dev/sda -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
-rootsize=$(($maxsize-2))
-
-parted -s /dev/sda unit cyl mkpart primary ext2 0 1
-parted -s /dev/sda unit cyl mkpartfs primary ext2 1 $rootsize
-parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize
-parted -s /dev/sda set 1 boot on
-sfdisk --change-id /dev/sda 1 27 >/dev/null 2>&1
-sfdisk --change-id /dev/sda 3 88 >/dev/null 2>&1
-if [ $? -eq 0 ];then
-        printf "Successfully created partition ${rootpart}\n"
-else
-        printf "Partition creation failed, Exiting.\n"
-        exit 1
-fi
-sleep 2
-sync
-printf "Installing kernel\n"
-dd if=$2 of=/dev/sda1 bs=2048 >/dev/null 2>&1
-sync
-mount -t ext2 /dev/sda2 /mnt
-printf "Extracting install archive\n"
-tar -C /mnt -xzpf $1
-chmod 1777 /mnt/tmp
-chmod 4755 /mnt/bin/busybox
-
-printf "Creating device nodes\n"
-mknod -m 666 /mnt/dev/null c 1 3
-mknod -m 622 /mnt/dev/console c 5 1
-mknod -m 666 /mnt/dev/tty c 5 0
-
-umount /mnt
-printf "Successfully installed.\n"
-exit 0
-- 
cgit v1.2.3


From 657effffde51e2cf9181d71524a6eef1b968e9f7 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 31 Jan 2010 10:27:55 +0100
Subject: fix dependency. finetune dropbear detection.

---
 package/openssh/Makefile        | 4 ++--
 package/openssh/files/sshd.init | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'package')

diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 6aa819a3d..3b724edbc 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -12,11 +12,11 @@ PKG_SECTION:=		net
 PKG_DEPENDS:=		zlib libopenssl
 PKG_BUILDDEP+=		zlib openssl
 ifeq (${ADK_COMPILE_OPENSSH_WITH_KRB5},y)
-PKG_DEPENDS+=		krb5-libs
+PKG_DEPENDS+=		krb5-libs libcom-err
 PKG_BUILDDEP+=		krb5
 endif
 ifeq (${ADK_COMPILE_OPENSSH_WITH_HEIMDAL},y)
-PKG_DEPENDS+=		heimdal-libs
+PKG_DEPENDS+=		heimdal-libs libcom-err
 PKG_BUILDDEP+=		heimdal
 endif
 PKG_URL:=		http://www.openssh.com
diff --git a/package/openssh/files/sshd.init b/package/openssh/files/sshd.init
index 149da9dc4..1a2db6ada 100644
--- a/package/openssh/files/sshd.init
+++ b/package/openssh/files/sshd.init
@@ -8,7 +8,7 @@ case $1 in
 autostop) ;;
 autostart)
 	[[ $openssh = NO ]] && exit 0
-	grep dropbear /etc/rc.conf >/dev/null 2>&1 || dropbear=NO
+	grep "^dropbear" /etc/rc.conf >/dev/null 2>&1 || dropbear=NO
 	if [[ $openssh = AUTO && $dropbear != NO ]]; then
 		echo openssh not starting: set to AUTO and dropbear is enabled
 		exit 0
-- 
cgit v1.2.3


From cae7454e8151e56da5f0b9f14a06fbcefe153a72 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 31 Jan 2010 11:11:18 +0100
Subject: rework libc-dev package, add linker script for x86

---
 package/eglibc/Makefile            | 6 ++++--
 package/eglibc/files/libc.so.x86   | 5 +++++
 package/gcc/Makefile               | 6 ------
 package/glibc/Makefile             | 7 +++++--
 package/glibc/files/libc.so.x86    | 5 +++++
 package/glibc/files/libc.so.x86_64 | 5 +++++
 package/uclibc/Makefile            | 1 +
 7 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 package/eglibc/files/libc.so.x86
 create mode 100644 package/glibc/files/libc.so.x86
 create mode 100644 package/glibc/files/libc.so.x86_64

(limited to 'package')

diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index 02065328b..83d74ab10 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -58,9 +58,11 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	done
 
 eglibc-dev-install:
-	${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/lib
+	${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/lib $(IDIR_EGLIBC_DEV)/usr/lib
 	# install linker script
-	-cp ./files/libc.so.$(CPU_ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
+	-cp ./files/libc.so.$(ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
+	${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_EGLIBC_DEV}/usr/lib
+	${CP} ${STAGING_DIR}/usr/lib/libc_nonshared.a ${IDIR_EGLIBC_DEV}/usr/lib
 	cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libm.so.6 libm.so
 	cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libutil.so.1 libutil.so
 	cd $(IDIR_EGLIBC_DEV)/lib && ln -sf librt.so.1 librt.so
diff --git a/package/eglibc/files/libc.so.x86 b/package/eglibc/files/libc.so.x86
new file mode 100644
index 000000000..cd8724cc5
--- /dev/null
+++ b/package/eglibc/files/libc.so.x86
@@ -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(elf32-i386)
+GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux.so.2 ) )
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index f2820d144..4e613efef 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -51,12 +51,6 @@ post-install:
 	${CP} ${WRKINST}/usr/include/c++/* ${IDIR_GCC}/usr/include/c++/
 	cd ${IDIR_GCC}/lib && ln -sf ../usr/bin/cpp .
 	${CP} ${WRKINST}/usr/lib/gcc/* ${IDIR_GCC}/usr/lib/gcc/
-ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
-	${CP} ${STAGING_DIR}/lib/crt* ${IDIR_GCC}/usr/lib
-else
-	${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GCC}/usr/lib
-	${CP} ${STAGING_DIR}/usr/lib/libc_nonshared.a ${IDIR_GCC}/usr/lib
-endif
 	rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/install-tools
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 103452469..27f5baafc 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -47,8 +47,11 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	done
 
 glibc-dev-install:
-	${INSTALL_DIR} $(IDIR_GLIBC_DEV)/lib
-	cd $(IDIR_GLIBC_DEV)/lib && ln -sf ld-linux.so.2 ld.so.1
+	${INSTALL_DIR} $(IDIR_GLIBC_DEV)/lib $(IDIR_GLIBC_DEV)/usr/lib
+	# install linker script
+	-cp ./files/libc.so.$(ARCH) $(IDIR_GLIBC_DEV)/usr/lib/libc.so
+	${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib
+	${CP} ${STAGING_DIR}/usr/lib/libc_nonshared.a ${IDIR_GLIBC_DEV}/usr/lib
 	# header package
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
 		HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
diff --git a/package/glibc/files/libc.so.x86 b/package/glibc/files/libc.so.x86
new file mode 100644
index 000000000..cd8724cc5
--- /dev/null
+++ b/package/glibc/files/libc.so.x86
@@ -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(elf32-i386)
+GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux.so.2 ) )
diff --git a/package/glibc/files/libc.so.x86_64 b/package/glibc/files/libc.so.x86_64
new file mode 100644
index 000000000..a2e2de87f
--- /dev/null
+++ b/package/glibc/files/libc.so.x86_64
@@ -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-x86-64)
+      GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux-x86-64.so.2 ) )
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index e6d080a37..5ee7b280c 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -34,6 +34,7 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	done
 
 uclibc-dev-install:
+	${CP} ${STAGING_DIR}/lib/crt* ${IDIR_UCLIBC_DEV}/usr/lib
 	# header package
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_UCLIBC_DEV)/usr \
-- 
cgit v1.2.3


From 0d9e15f4338505fa10d67aa995a00b2a45d201ce Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 31 Jan 2010 11:29:04 +0100
Subject: reworking startup using devtmpfs

After this change it is not needed to create
console, tty and null device nodes for nfsroot boot.
---
 package/asterisk/Makefile     | 1 -
 package/base-files/extra/init | 5 +++--
 package/busybox/Makefile      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'package')

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index c66f4c7e5..2a9fa679e 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -24,7 +24,6 @@ PKG_SITES:=		http://downloads.asterisk.org/pub/telephony/asterisk/releases/
 
 PKG_TARGET_DEPENDS:=	!foxboard
 
-#PKG_DEPENDS_MAIN:=		asterisk
 PKG_DESCR_CHAN_MGCP:=		Media Gateway Control Protocol implementation
 PKG_DESCR_CHAN_SKINNY:=		Skinny Client Control Protocol implementation
 PKG_DESCR_CHAN_IAX2:=		Support for the Inter Asterisk Protocol
diff --git a/package/base-files/extra/init b/package/base-files/extra/init
index e11446366..eabf45b5b 100755
--- a/package/base-files/extra/init
+++ b/package/base-files/extra/init
@@ -1,5 +1,5 @@
 #!/bin/sh
-echo "Starting system ..."
+echo "System initialization ..."
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 mount -nt proc proc /proc
 mount -o nosuid,nodev,noexec -t sysfs sysfs /sys
@@ -11,7 +11,6 @@ mount -o nosuid,nodev,noexec -t sysfs sysfs /sys
 mount -o nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
 mkdir /dev/pts /dev/shm
 mount -o nosuid,noexec -t devpts devpts /dev/pts
-exec 0<>/dev/console >&0 2>&0
 echo >/dev/mdev.seq
 echo "/sbin/mdev" >/proc/sys/kernel/hotplug
 mdev -s
@@ -19,4 +18,6 @@ mount -o remount,rw /
 cat /etc/.rnd >/dev/urandom 2>&1
 [ -f /etc/fstab ] && mount -a
 [ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;}
+echo "Starting system init ..."
+exec 0<>/dev/console >&0 2>&0
 exec /sbin/init
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 7779226a7..8481fd64f 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -56,11 +56,11 @@ else
 	$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
 	    IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
 endif
+	$(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
 ifeq ($(ADK_DEBUG),y)
 	${INSTALL_BIN} $(WRKBUILD)/busybox_unstripped \
 		$(IDIR_BUSYBOX)/bin/busybox
 endif
-	$(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
 
 fake:	$(TOPDIR)/.busyboxcfg do-configure do-install
 
-- 
cgit v1.2.3


From b4a851927de091d62541af277f70b13b4452d86d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 31 Jan 2010 13:44:30 +0100
Subject: add devel subpackages, my sample application compiles fine

---
 package/sdl-image/Makefile | 12 +++++++++++-
 package/sdl/Makefile       | 11 ++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

(limited to 'package')

diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile
index 1840817c6..d7cd7a2e7 100644
--- a/package/sdl-image/Makefile
+++ b/package/sdl-image/Makefile
@@ -20,6 +20,11 @@ WRKDIST=		${WRKDIR}/SDL_image-${PKG_VERSION}
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBSDL_IMAGE_DEV,libsdl-image-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl-image,${PKG_DESCR},${PKG_SECTION}))
+
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_LIBSDL_IMAGE_DEV}+=	libsdl-image-dev-install
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-png \
@@ -29,8 +34,13 @@ CONFIGURE_ARGS+=	--enable-png \
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	$(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE)/usr/lib
 	$(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL_IMAGE)/usr/lib
 
+libsdl-image-dev-install:
+	$(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE_DEV)/usr/include/SDL
+	$(CP) ${WRKINST}/usr/include/SDL/*.h \
+		$(IDIR_LIBSDL_IMAGE_DEV)/usr/include/SDL
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/sdl/Makefile b/package/sdl/Makefile
index 04526773c..f5f9ff6aa 100644
--- a/package/sdl/Makefile
+++ b/package/sdl/Makefile
@@ -20,6 +20,11 @@ WRKDIST=		${WRKDIR}/SDL-${PKG_VERSION}
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBSDL_DEV,libsdl-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl,${PKG_DESCR},${PKG_SECTION}))
+
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_LIBSDL_DEV}+=	libsdl-dev-install
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-esd \
@@ -33,8 +38,12 @@ CONFIGURE_ARGS+=	--disable-esd \
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	$(INSTALL_DIR) $(IDIR_LIBSDL)/usr/lib
 	$(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL)/usr/lib
 
+libsdl-dev-install:
+	$(INSTALL_DIR) $(IDIR_LIBSDL_DEV)/usr/include/SDL
+	$(CP) ${WRKINST}/usr/include/SDL/* $(IDIR_LIBSDL_DEV)/usr/include/SDL
+
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From 0551a2054198f2d8041bba5e10ff000905ee6a70 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 31 Jan 2010 13:44:58 +0100
Subject: set needed config option to startup

---
 package/vsftpd/files/vsftpd.conf | 1 +
 1 file changed, 1 insertion(+)

(limited to 'package')

diff --git a/package/vsftpd/files/vsftpd.conf b/package/vsftpd/files/vsftpd.conf
index 1868be6f8..e43a5f8c0 100644
--- a/package/vsftpd/files/vsftpd.conf
+++ b/package/vsftpd/files/vsftpd.conf
@@ -15,3 +15,4 @@ syslog_enable=YES
 #xferlog_enable=YES
 #xferlog_file=/var/log/vsftpd.log
 #xferlog_std_format=YES
+secure_chroot_dir=/var/run/vsftpd
-- 
cgit v1.2.3


From 6e27dc61a42f04237334d47fe6ae4a92384b9854 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 31 Jan 2010 15:29:47 +0100
Subject: add dependency to libiconv

---
 package/gdb/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package')

diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index c70345891..86152fced 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -6,8 +6,8 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc
 
 PKG_DESCR:=		GNU debugger
 PKG_SECTION:=		comp
-PKG_DEPENDS:=		libthread-db libncurses
-PKG_BUILDDEP+=		ncurses readline
+PKG_DEPENDS:=		libthread-db libncurses libiconv
+PKG_BUILDDEP+=		ncurses readline libiconv
 PKG_TARGET_DEPENDS:=	!foxboard !ag241
 
 include ${TOPDIR}/mk/package.mk
-- 
cgit v1.2.3


From 8b96e301c638ee8a434cbdb2599d8ec4ed124eb5 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 31 Jan 2010 15:30:06 +0100
Subject: revert change of /dev/console redirection

---
 package/base-files/extra/init | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'package')

diff --git a/package/base-files/extra/init b/package/base-files/extra/init
index eabf45b5b..618547693 100755
--- a/package/base-files/extra/init
+++ b/package/base-files/extra/init
@@ -11,6 +11,7 @@ mount -o nosuid,nodev,noexec -t sysfs sysfs /sys
 mount -o nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
 mkdir /dev/pts /dev/shm
 mount -o nosuid,noexec -t devpts devpts /dev/pts
+exec 0<>/dev/console >&0 2>&0
 echo >/dev/mdev.seq
 echo "/sbin/mdev" >/proc/sys/kernel/hotplug
 mdev -s
@@ -18,6 +19,4 @@ mount -o remount,rw /
 cat /etc/.rnd >/dev/urandom 2>&1
 [ -f /etc/fstab ] && mount -a
 [ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;}
-echo "Starting system init ..."
-exec 0<>/dev/console >&0 2>&0
 exec /sbin/init
-- 
cgit v1.2.3


From f5b49128645669ad0bb2a73a47d76003ab4d5dc8 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 31 Jan 2010 15:30:33 +0100
Subject: update asterisk to latest upstream

unfortunately asterisk 1.4.x just segfaults on startup
on mips board. 1.6.x works out of the box, so update
to latest version.
---
 package/asterisk/Makefile                          | 119 ++++++++++++---------
 package/asterisk/files/asterisk.init               |   5 +-
 package/asterisk/patches/patch-apps__moduleinfo    |  13 ---
 .../asterisk/patches/patch-channels_chan_iax2_c    |  20 ----
 package/asterisk/patches/patch-channels_chan_oss_c |  37 -------
 package/asterisk/patches/patch-codecs_gsm_Makefile |  66 ------------
 package/asterisk/patches/patch-main_astobj2_c      |  11 --
 package/asterisk/patches/patch-main_translate_c    |  11 --
 package/asterisk/patches/patch-menuselect-tree     |  12 ---
 package/asterisk/patches/patch-res_res_features_c  |  11 --
 10 files changed, 73 insertions(+), 232 deletions(-)
 delete mode 100644 package/asterisk/patches/patch-apps__moduleinfo
 delete mode 100644 package/asterisk/patches/patch-channels_chan_iax2_c
 delete mode 100644 package/asterisk/patches/patch-channels_chan_oss_c
 delete mode 100644 package/asterisk/patches/patch-codecs_gsm_Makefile
 delete mode 100644 package/asterisk/patches/patch-main_astobj2_c
 delete mode 100644 package/asterisk/patches/patch-main_translate_c
 delete mode 100644 package/asterisk/patches/patch-menuselect-tree
 delete mode 100644 package/asterisk/patches/patch-res_res_features_c

(limited to 'package')

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 2a9fa679e..86d311c83 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		asterisk
-PKG_VERSION:=		1.4.28
+PKG_VERSION:=		1.6.2.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e8006ce319e18ce07ce1335ad583330a
+PKG_MD5SUM:=		8fbc60f9d80e686c749ae95292e225d8
 PKG_DESCR:=		Open Source PBX
 PKG_SECTION:=		net
 PKG_MULTI:=		1
@@ -24,10 +24,10 @@ PKG_SITES:=		http://downloads.asterisk.org/pub/telephony/asterisk/releases/
 
 PKG_TARGET_DEPENDS:=	!foxboard
 
-PKG_DESCR_CHAN_MGCP:=		Media Gateway Control Protocol implementation
-PKG_DESCR_CHAN_SKINNY:=		Skinny Client Control Protocol implementation
-PKG_DESCR_CHAN_IAX2:=		Support for the Inter Asterisk Protocol
-PKG_DESCR_CODEC_SPEEX:=		Speex/PCM16 Codec Translator
+PKG_DESCR_CHAN_MGCP:=	Media Gateway Control Protocol implementation
+PKG_DESCR_CHAN_SKINNY:=	Skinny Client Control Protocol implementation
+PKG_DESCR_CHAN_IAX2:=	Support for the Inter Asterisk Protocol
+PKG_DESCR_CODEC_SPEEX:=	Speex/PCM16 Codec Translator
 
 include $(TOPDIR)/mk/package.mk
 
@@ -64,27 +64,31 @@ endif
 CONFIGURE_ARGS=		--with-z=${STAGING_DIR}/usr \
 			--with-ncurses=${STAGING_DIR}/usr \
 			--with-ssl=${STAGING_DIR}/usr \
-			--without-zaptel \
+			--disable-xmldoc \
 			--without-tonezone \
 			--without-asound \
 			--without-curses \
-			--without-gnutls \
+			--without-gtk \
+			--without-gtk2 \
 			--without-h323 \
 			--without-iksemel \
 			--without-imap \
-			--without-kde \
 			--without-nbs \
 			--without-netsnmp \
 			--without-newt \
-			--without-odbc \
 			--without-osptk \
 			--without-oss \
+			--without-popt \
 			--without-pri \
 			--without-pwlib \
 			--without-tds \
 			--without-termcap \
 			--without-tinfo \
-			--without-vpb
+			--without-vpb \
+			--without-misdn \
+			--without-isdnnet \
+			--without-suppserv
+
 ifneq (${ADK_PACKAGE_ASTERISK_CODEC_GSM},)
 CONFIGURE_ARGS+=	--with-gsm=internal
 else
@@ -109,17 +113,9 @@ CONFIGURE_ARGS+=	--with-postgres=${STAGING_DIR}/usr
 else
 CONFIGURE_ARGS+=	--without-postgres
 endif
-ifneq (${ADK_PACKAGE_LIBPOPT},)
-CONFIGURE_ARGS+=	--with-popt=${STAGING_DIR}/usr
-else
-CONFIGURE_ARGS+=	--without-popt
-endif
-CONFIGURE_ARGS+=	--without-misdn \
-			--without-isdnnet \
-			--without-suppserv
 
+TLDFLAGS+=		-lm
 CONFIGURE_STYLE:=	gnu
-CONFIGURE_ENV+=		STRIP=${STRIP}
 BUILD_STYLE:=		auto
 MAKE_ENV=		ASTCFLAGS="${TCPPFLAGS} -DHAVE_STRTOQ" \
 			ASTLDFLAGS="${TLDFLAGS}"
@@ -131,13 +127,12 @@ MAKE_FLAGS+=		DESTDIR="$(WRKINST)" \
 ALL_TARGET:=		all install samples
 
 pre-configure:
-	rm ${WRKBUILD}/apps/app_followme.c
 	cd "$(WRKBUILD)/menuselect"; ./configure 
 
 post-build:
 	cd ${WRKBUILD}/sounds ; \
-	tar xzf asterisk-core-sounds-en-gsm-1.4.16.tar.gz ; \
-	rm asterisk-core-sounds-en-gsm-1.4.16.tar.gz
+	tar xzf asterisk-core-sounds-en-gsm-1.4.17.tar.gz ; \
+	rm asterisk-core-sounds-en-gsm-1.4.17.tar.gz
 	@echo
 	@echo "---> have to install ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} <---"
 	@echo
@@ -156,8 +151,9 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 		rm -rf mohmp3/*.mp3; \
 		rm -rf sounds/*; \
 		cd modules; \
-		rm -rf	*adsi* *festival* *modem* *meetme* *oss* *phone* *intercom* \
-			*mp3* *nbscat* *mysql* *postgres* *pgsql* *voicemail* *speex* \
+		rm -rf	*adsi* *festival* *modem* *meetme* *oss* \
+			*phone* *intercom* *mp3* *nbscat* *mysql* \
+			*postgres* *pgsql* *voicemail* *speex* \
 			*zapateller* *jpeg*; \
 		rm -f chan_bluetooth.so ; \
 		rm -f chan_h323.so ; \
@@ -171,80 +167,105 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 		rm -f res_agi.so ; \
 	)
 	(cd $(IDIR_ASTERISK)/etc/asterisk; \
-		rm -f 	*iax* *odbc* *mysql* *postgres* *pgsql* *voicemail* *adsi* *oss* *alsa* \
-			*festival* *modem* *meetme* *phone* *tds* *vofr* *rpt* *vpb* \
+		rm -f 	*iax* *odbc* *mysql* *postgres* *pgsql* \
+			*voicemail* *adsi* *oss* *alsa* \
+			*festival* *modem* *meetme* *phone* *tds* \
+			*vofr* *rpt* *vpb* \
 			*zapata*; \
 		rm -f bluetooth.conf ; \
 		rm -f mgcp.conf ; \
+		rm -f gtalk.conf ; \
 		rm -f skinny.conf ; \
 		rm -f dundi.conf ;