r2040 - in trunk/user

dslinux_sonny_jim at dslinux.in-berlin.de dslinux_sonny_jim at dslinux.in-berlin.de
Wed Dec 12 12:13:13 CET 2007


Author: sonny_jim
Date: 2007-12-12 12:13:12 +0100 (Wed, 12 Dec 2007)
New Revision: 2040

Log:
Merge in boa from uclinux branch and add default website

Copied: trunk/user/boa (from rev 2038, tags/uclinux/uclinux_20051014/user/boa)

Modified: trunk/user/boa/Makefile
===================================================================
--- tags/uclinux/uclinux_20051014/user/boa/Makefile	2007-12-11 18:58:46 UTC (rev 2038)
+++ trunk/user/boa/Makefile	2007-12-12 11:13:12 UTC (rev 2040)
@@ -1,7 +1,7 @@
 
 .EXPORT_ALL_VARIABLES:
 
-DIRS = src
+DIRS = src util
 
 all romfs:
 	for i in $(DIRS) ; do make -C $$i $@ || exit $?; done

Added: trunk/user/boa/examples/dslinux/GPL.txt

Added: trunk/user/boa/examples/dslinux/about.html

Added: trunk/user/boa/examples/dslinux/background.png


Property changes on: trunk/user/boa/examples/dslinux/background.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/user/boa/examples/dslinux/background_content.png


Property changes on: trunk/user/boa/examples/dslinux/background_content.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/user/boa/examples/dslinux/boa.conf

Added: trunk/user/boa/examples/dslinux/bottom_bar.png


Property changes on: trunk/user/boa/examples/dslinux/bottom_bar.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/user/boa/examples/dslinux/favicon.ico


Property changes on: trunk/user/boa/examples/dslinux/favicon.ico
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/user/boa/examples/dslinux/index.html

Added: trunk/user/boa/examples/dslinux/readme.txt

Added: trunk/user/boa/examples/dslinux/style.css

Added: trunk/user/boa/examples/dslinux/stylus.gif


Property changes on: trunk/user/boa/examples/dslinux/stylus.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/user/boa/examples/dslinux/top_bar.png


Property changes on: trunk/user/boa/examples/dslinux/top_bar.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/user/boa/examples/dslinux/top_logo.png


Property changes on: trunk/user/boa/examples/dslinux/top_logo.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/user/boa/src/Makefile
===================================================================
--- tags/uclinux/uclinux_20051014/user/boa/src/Makefile	2007-12-11 18:58:46 UTC (rev 2038)
+++ trunk/user/boa/src/Makefile	2007-12-12 11:13:12 UTC (rev 2040)
@@ -50,6 +50,7 @@
 
 romfs:
 	$(ROMFSINST) /bin/$(EXEC)
+	$(ROMFSINST) ../examples/dslinux /var/www/
 
 clean:
 	-rm -f $(EXEC) *.gdb *.elf *.o

Modified: trunk/user/boa/src/defines.h
===================================================================
--- tags/uclinux/uclinux_20051014/user/boa/src/defines.h	2007-12-11 18:58:46 UTC (rev 2038)
+++ trunk/user/boa/src/defines.h	2007-12-12 11:13:12 UTC (rev 2040)
@@ -22,7 +22,7 @@
 
 #ifndef _DEFINES_H
 #define _DEFINES_H
-
+#define EMBED
 #include <linux/config.h>
 
 /***** Change this, or use -c on the command line to specify it *****/

Modified: trunk/user/boa/util/Makefile
===================================================================
--- tags/uclinux/uclinux_20051014/user/boa/util/Makefile	2007-12-11 18:58:46 UTC (rev 2038)
+++ trunk/user/boa/util/Makefile	2007-12-12 11:13:12 UTC (rev 2040)
@@ -1,13 +1,16 @@
 all:	cpsel	cp-test boa_indexer
 
 clean:	
-	rm cpsel cp-test 
+	rm cpsel cp-test boa_indexer
 
 cpsel:	cpsel.c	cpsel.config.h
-	gcc -o cpsel cpsel.c
+	$(CC)  $(LDFLAGS) -o cpsel cpsel.c
 
 cp-test: cp-test.c
-	gcc -o cp-test cp-test.c
+	$(CC)  $(LDFLAGS) -o cp-test cp-test.c
 	
 boa_indexer: index_dir.c
-	gcc -o boa_indexer index_dir.c
+	$(CC) $(LDFLAGS) -o boa_indexer index_dir.c
+
+romfs:
+	$(ROMFSINST) boa_indexer /bin/



More information about the dslinux-commit mailing list