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

package/base-files/extra/sbin/update

@@ -6,6 +6,11 @@ if [ $who -ne 0 ]; then
   exit 1
 fi
 
+if [ -x /sbin/mtd ];then
+	updatecmd="mtd -r write - linux"
+else
+	updatecmd="gunzip -c | tar -xf -"
+fi
 
 check_exit() {
 	if [ $? -ne 0 ];then
@@ -22,19 +27,19 @@ prepare() {
 
 extract_from_file() {
 	prepare
-        cat $1 | gunzip -c | tar -xf -
+        cat $1 | $updatecmd
 	check_exit
 }
 
 extract_from_ssh() {
 	prepare
-        ssh $1 "cat $2" | gunzip -c | tar -xf -
+        ssh $1 "cat $2" | $updatecmd
 	check_exit
 }
 
 extract_from_http() {
 	prepare
-        wget -O - $1 | gunzip -c | tar -xf -
+        wget -O - $1 | $updatecmd
 	check_exit
 }
                 

package/digitemp/patches/patch-Makefile

@@ -1,6 +1,6 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+do not use static linking on Cygwin
 --- digitemp-3.6.0.orig/Makefile	2008-08-28 23:37:00.000000000 +0200
-+++ digitemp-3.6.0/Makefile	2009-06-01 20:04:20.000000000 +0200
++++ digitemp-3.6.0/Makefile	2010-01-06 19:12:56.868375000 +0100
 @@ -11,8 +11,8 @@
  
  VERSION = 3.6.0
@@ -12,3 +12,11 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
  OBJS		=	src/digitemp.o src/device_name.o src/ds2438.o
  HDRS		= 	src/digitemp.h src/device_name.h
+@@ -57,7 +57,6 @@ endif
+ 
+ ifneq (, $(findstring CYGWIN,$(SYSTYPE)))
+   CFLAGS += -DCYGWIN
+-  LIBS   += -static -static-libgcc
+ endif
+ 
+ ifeq ($(SYSTYPE), SunOS)

package/ffmpeg/patches/patch-configure

@@ -1,5 +1,14 @@
 --- ffmpeg-0.5.orig/configure	2009-03-01 18:57:14.000000000 +0100
-+++ ffmpeg-0.5/configure	2009-06-12 23:27:05.000000000 +0200
++++ ffmpeg-0.5/configure	2010-01-06 20:34:48.343750000 +0100
+@@ -1167,7 +1167,7 @@ arch=`uname -m`
+ cpu="generic"
+ 
+ # OS
+-target_os=$(tolower $(uname -s))
++target_os=linux
+ 
+ # configurable options
+ enable debug
 @@ -2486,51 +2486,6 @@ cmp -s $TMPH config.h &&
  
  rm -f $TMPC $TMPE $TMPH $TMPO $TMPS $TMPSH

package/file/Makefile

@@ -23,10 +23,10 @@ INSTALL_STYLE:=		auto
 
 pre-configure:
 	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
-		CFLAGS="-static" ./configure --enable-static --disable-shared \
+		./configure \
 	);
 	${MAKE} -C ${WRKBUILD}
-	${INSTALL_BIN} ${WRKBUILD}/src/file ${STAGING_TOOLS}/bin
+	${INSTALL_BIN} ${WRKBUILD}/src/.libs/file ${STAGING_TOOLS}/bin
 	${MAKE} -C ${WRKBUILD} clean
 
 post-install:

package/flac/patches/patch-src_Makefile_in

@@ -0,0 +1,20 @@
+--- flac-1.2.1.orig/src/Makefile.in	2007-09-16 22:05:09.000000000 +0200
++++ flac-1.2.1/src/Makefile.in	2010-01-06 21:10:24.984375000 +0100
+@@ -226,8 +226,6 @@ target_alias = @target_alias@
+ SUBDIRS = \
+ 	libFLAC \
+ 	share \
+-	flac \
+-	metaflac \
+ 	monkeys_audio_utilities \
+ 	$(XMMS_DIRS) \
+ 	plugin_winamp2 \
+@@ -255,7 +253,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+ 	installdirs-recursive install-recursive uninstall-recursive \
+ 	check-recursive installcheck-recursive
+ DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = libFLAC share flac metaflac monkeys_audio_utilities \
++DIST_SUBDIRS = libFLAC share monkeys_audio_utilities \
+ 	plugin_common plugin_xmms plugin_winamp2 test_grabbag \
+ 	test_libs_common test_libFLAC test_seeking test_streams \
+ 	libFLAC++ test_libFLAC++

package/git/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		git
-PKG_VERSION:=		1.6.5.5
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		50fb736021ef89916af622cb4772bbea
+PKG_VERSION:=		1.6.6
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		08af805fd59f68d9ad00a2f878cf820e
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		libopenssl libcurl libexpat

target/foxboard/Makefile

@@ -24,10 +24,13 @@ ifeq ($(FS),squashfs)
 imageinstall: $(BIN_DIR)/$(ROOTFSSQUASHFS)
 	dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \
 		bs=4063232 conv=sync $(MAKE_TRACE)
-	@echo 
-	@echo Use sudo ./boot_linux -F -i $(ROOTFSSQUASHFS) to flash
-	@echo Do not forget to set network boot jumper, before you start the foxboard
-	@echo 'Login as user root with password linux123 via ssh or console'
+	@if [ $$(stat --format=%s ${BIN_DIR}/${ROOTFSSQUASHFS}) -gt 4063232 ];then \
+		echo 'Image is too big!'; \
+	else \
+		echo 'Use sudo ./boot_linux -F -i $(ROOTFSSQUASHFS) to flash'; \
+		echo 'Do not forget to set the network boot jumper, before you start the foxboard'; \
+		echo 'Login as user root with password linux123 via ssh or console'; \
+	fi
 endif
 ifeq ($(FS),nfsroot)
 imageinstall: ${BIN_DIR}/${ROOTFSTARBALL}