diff --git a/config/options b/config/options index 011baa0d10..5c44c2302c 100644 --- a/config/options +++ b/config/options @@ -59,16 +59,6 @@ TOOLCHAIN_CXX=yes # Mediacenter to use (elisa, entertainer) MEDIACENTER=elisa -# Theme (omc) -THEME=omc - -# Resolution (640x480, 800x600, 1024x768, 1280x1024 or 1600x1200) -RESOLUTION=800x600 - -# Menu languages to include in the ISO (en is included by default) -# (ar/bg/br/ca/cs/de/es/en/et/fi/fr/gr/he/hu/it/nl/no/pl/ro/ru/sk/sr/sv/vn) -INCLUDED_LANGS="de" - # Menu language (ar/bg/br/ca/cs/de/en/es/et/fi/fr/gr/he/hu/it/nl/no/pl/ro/ru/sk/sr/sv/vn) MENU_LANG=de @@ -100,6 +90,9 @@ RECEIVER=atiusb # Use Extra Binary Firmwares - WiFi/DVB cards (yes/no) EXTRAFIRMWARES=no +# Support for emulators (yes/no) +EMULATORS=yes + # Network Support (Samba shares and FTP Server) (yes/no) NETWORK=yes diff --git a/packages/databases/sqlite/build b/packages/databases/sqlite/build deleted file mode 100755 index 05cd0f7691..0000000000 --- a/packages/databases/sqlite/build +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -. config/options - -$SCRIPTS/build toolchain -$SCRIPTS/build readline -$SCRIPTS/build ncurses - -export config_BUILD_CC="$HOST_CC" -export config_BUILD_CFLAGS="$HOST_CFLAGS" -export config_BUILD_LIBS="$HOST_LDFLAGS" -export config_TARGET_CC="$CC" -export config_TARGET_LINK="$LD" -export config_TARGET_CFLAGS="$CFLAGS" -export config_TARGET_LFLAGS="$LDFLAGS" -export config_TARGET_LIBS="-lncurses" -export config_TARGET_READLINE_LIBS="-L$SYSROOT_PREFIX/usr/lib" -export config_TARGET_READLINE_INC="-I$SYSROOT_PREFIX/usr/include/readline -lreadline" - -cd $BUILD/$1* - -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-static \ - --enable-shared \ - --disable-tcl \ - --enable-threadsafe - -make - -$STRIP .libs/*.so* -$STRIP .libs/sqlite3 - -$MAKEINSTALL diff --git a/packages/databases/sqlite/install b/packages/databases/sqlite/install deleted file mode 100755 index 1916c4f9f8..0000000000 --- a/packages/databases/sqlite/install +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -. config/options - -mkdir -p $INSTALL/usr/lib -cp -PR $BUILD/$1*/.libs/*.so* $INSTALL/usr/lib -cp $BUILD/$1*/.libs/sqlite3 $INSTALL/usr/bin diff --git a/packages/databases/sqlite/patches/10_cross_compile.diff b/packages/databases/sqlite/patches/10_cross_compile.diff deleted file mode 100644 index 31d4f0d162..0000000000 --- a/packages/databases/sqlite/patches/10_cross_compile.diff +++ /dev/null @@ -1,92 +0,0 @@ ---- sqlite-3.3.7/configure.ac.orig 2006-08-21 00:20:50.000000000 +0200 -+++ sqlite-3.3.7/configure.ac 2006-08-21 00:22:35.000000000 +0200 -@@ -187,10 +187,11 @@ - default_build_cflags="-g" - if test "$config_BUILD_CC" = ""; then - AC_PROG_CC -- if test "$cross_compiling" = "yes"; then -- AC_MSG_ERROR([unable to find a compiler for building build tools]) -- fi -- BUILD_CC=$CC -+# if test "$cross_compiling" = "yes"; then -+# AC_MSG_ERROR([unable to find a compiler for building build tools]) -+# fi -+# BUILD_CC=$CC -+BUILD_CC=gcc - default_build_cflags=$CFLAGS - else - BUILD_CC=$config_BUILD_CC -@@ -238,6 +239,12 @@ - TARGET_LINK=$config_TARGET_LINK - fi - AC_MSG_RESULT($TARGET_LINK) -+if test "$config_TARGET_LFLAGS" != ""; then -+ TARGET_LFLAGS=$config_TARGET_LFLAGS -+ else -+ TARGET_LFLAGS=$BUILD_LFLAGS -+ fi -+AC_MSG_RESULT($TARGET_LFLAGS) - AC_MSG_CHECKING([switches on the target compiler]) - if test "$config_TARGET_TFLAGS" != ""; then - TARGET_TFLAGS=$config_TARGET_TFLAGS -@@ -592,15 +599,7 @@ - # Figure out what C libraries are required to compile programs - # that use "readline()" library. - # --if test "$config_TARGET_READLINE_LIBS" != ""; then -- TARGET_READLINE_LIBS="$config_TARGET_READLINE_LIBS" --else -- CC=$TARGET_CC -- LIBS="" -- AC_SEARCH_LIBS(tgetent, [readline ncurses curses termcap]) -- AC_CHECK_LIB([readline], [readline]) -- TARGET_READLINE_LIBS="$LIBS" --fi -+TARGET_READLINE_LIBS="-lreadline" - AC_SUBST(TARGET_READLINE_LIBS) - - ########## -@@ -615,41 +614,8 @@ - ########## - # Figure out where to get the READLINE header files. - # --AC_MSG_CHECKING([readline header files]) --found=no --if test "$config_TARGET_READLINE_INC" != ""; then -- TARGET_READLINE_INC=$config_TARGET_READLINE_INC -- found=yes --fi --if test "$found" = "yes"; then -- AC_MSG_RESULT($TARGET_READLINE_INC) --else -- AC_MSG_RESULT(not specified: still searching...) -- AC_CHECK_HEADER(readline.h, [found=yes]) --fi --if test "$found" = "no"; then -- for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do -- AC_CHECK_FILE($dir/include/readline.h, found=yes) -- if test "$found" = "yes"; then -- TARGET_READLINE_INC="-I$dir/include" -- break -- fi -- AC_CHECK_FILE($dir/include/readline/readline.h, found=yes) -- if test "$found" = "yes"; then -- TARGET_READLINE_INC="-I$dir/include/readline" -- break -- fi -- done --fi --if test "$found" = "yes"; then -- if test "$TARGET_READLINE_LIBS" = ""; then -- TARGET_HAVE_READLINE=0 -- else -- TARGET_HAVE_READLINE=1 -- fi --else -- TARGET_HAVE_READLINE=0 --fi -+TARGET_READLINE_INC="" -+TARGET_HAVE_READLINE=1 - AC_SUBST(TARGET_READLINE_INC) - AC_SUBST(TARGET_HAVE_READLINE) - diff --git a/packages/databases/sqlite/patches/20_libtool.diff b/packages/databases/sqlite/patches/20_libtool.diff deleted file mode 100644 index ccf9993ed2..0000000000 --- a/packages/databases/sqlite/patches/20_libtool.diff +++ /dev/null @@ -1,25 +0,0 @@ -Index: sqlite-3.2.1/Makefile.in -=================================================================== ---- sqlite-3.2.1.orig/Makefile.in 2005-03-23 17:09:39.000000000 +0100 -+++ sqlite-3.2.1/Makefile.in 2005-04-25 23:11:20.000000000 +0200 -@@ -15,7 +15,10 @@ - # The toplevel directory of the source tree. This is the directory - # that contains this "Makefile.in" and the "configure.in" script. - # --TOP = @srcdir@ -+TOP = $(srcdir) -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+top_builddir = . - - # C Compiler and options for use in building executables that - # will run on the platform that is doing the build. -@@ -96,7 +99,7 @@ - exec_prefix = @exec_prefix@ - libdir = @libdir@ - INSTALL = @INSTALL@ --LIBTOOL = ./libtool -+LIBTOOL = @LIBTOOL@ - ALLOWRELEASE = @ALLOWRELEASE@ - - # libtool compile/link/install diff --git a/packages/databases/sqlite/patches/30_ldflags.diff b/packages/databases/sqlite/patches/30_ldflags.diff deleted file mode 100644 index ee5105ffff..0000000000 --- a/packages/databases/sqlite/patches/30_ldflags.diff +++ /dev/null @@ -1,67 +0,0 @@ ---- sqlite-3.3.7/Makefile.in.orig 2006-08-20 23:05:36.000000000 +0200 -+++ sqlite-3.3.7/Makefile.in 2006-08-20 23:42:49.000000000 +0200 -@@ -31,6 +31,10 @@ - # - TCC = @TARGET_CC@ @TARGET_CFLAGS@ -I. -I${TOP}/src - -+# OE overrides -+# -+TARGET_LFLAGS = @TARGET_LFLAGS@ -+ - # Define -DNDEBUG to compile without debugging (i.e., for production usage) - # Omitting the define will cause extra debugging code to be inserted and - # includes extra comments when "EXPLAIN stmt" is used. -@@ -257,17 +261,17 @@ - | $(NAWK) '{print $$5,$$6}' >last_change - - libsqlite3.la: $(LIBOBJ) -- $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \ -+ $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(TARGET_LFLAGS) $(LIBPTHREAD) \ - ${ALLOWRELEASE} -rpath $(libdir) -version-info "8:6:8" - - libtclsqlite3.la: tclsqlite.lo libsqlite3.la - $(LTLINK) -o libtclsqlite3.la tclsqlite.lo \ -- $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(LIBPTHREAD) \ -+ $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TARGET_LFLAGS) $(LIBPTHREAD) \ - -rpath $(libdir)/sqlite \ - -version-info "8:6:8" - - sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h -- $(LTLINK) $(READLINE_FLAGS) $(LIBPTHREAD) \ -+ $(LTLINK) $(TARGET_LFLAGS) $(READLINE_FLAGS) $(LIBPTHREAD) \ - -o $@ $(TOP)/src/shell.c libsqlite3.la \ - $(LIBREADLINE) $(TLIBS) - -@@ -456,12 +460,12 @@ - - tclsqlite3: tclsqlite-shell.lo libsqlite3.la - $(LTLINK) -o tclsqlite3 tclsqlite-shell.lo \ -- libsqlite3.la $(LIBTCL) -+ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL) - - testfixture$(TEXE): $(TOP)/src/tclsqlite.c libsqlite3.la $(TESTSRC) - $(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \ - $(TEMP_STORE) -o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \ -- libsqlite3.la $(LIBTCL) -+ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL) - - - fulltest: testfixture$(TEXE) sqlite3$(TEXE) -@@ -471,7 +475,7 @@ - ./testfixture $(TOP)/test/quick.test - - sqlite3_analyzer$(TEXE): $(TOP)/src/tclsqlite.c libtclsqlite3.la \ -- $(TESTSRC) $(TOP)/tool/spaceanal.tcl -+ $(TARGET_LFLAGS) $(TESTSRC) $(TOP)/tool/spaceanal.tcl - sed \ - -e '/^#/d' \ - -e 's,\\,\\\\,g' \ -@@ -481,7 +485,7 @@ - $(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h - $(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 $(TEMP_STORE)\ - -o sqlite3_analyzer$(EXE) $(TESTSRC) $(TOP)/src/tclsqlite.c \ -- libtclsqlite3.la $(LIBTCL) -+ libtclsqlite3.la $(TARGET_LFLAGS) $(LIBTCL) - - # Rules used to build documentation - # diff --git a/packages/databases/sqlite/patches/40_cross_check_readline.diff b/packages/databases/sqlite/patches/40_cross_check_readline.diff deleted file mode 100644 index a9fc02c259..0000000000 --- a/packages/databases/sqlite/patches/40_cross_check_readline.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur sqlite-3.3.7.orig/configure sqlite-3.3.7/configure ---- sqlite-3.3.7.orig/configure 2006-11-21 23:49:30.000000000 +0100 -+++ sqlite-3.3.7/configure 2006-11-21 23:49:38.000000000 +0100 -@@ -20414,7 +20414,7 @@ - if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- test "$cross_compiling" = yes && -+ test "$cross_compiling" = no && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 - echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} - { (exit 1); exit 1; }; } -@@ -20440,7 +20440,7 @@ - if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- test "$cross_compiling" = yes && -+ test "$cross_compiling" = no && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 - echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} - { (exit 1); exit 1; }; } diff --git a/packages/databases/sqlite/url b/packages/databases/sqlite/url deleted file mode 100644 index 4dcb0e0b08..0000000000 --- a/packages/databases/sqlite/url +++ /dev/null @@ -1 +0,0 @@ -http://www.hwaci.com/sw/sqlite/sqlite-3.3.7.tar.gz diff --git a/packages/toolchain/devel/uClibc/patches/uClibc-2.9.30.1-getline.diff b/packages/toolchain/devel/uClibc/patches/uClibc-2.9.30.1-getline.diff deleted file mode 100644 index 6fa3cbadd0..0000000000 --- a/packages/toolchain/devel/uClibc/patches/uClibc-2.9.30.1-getline.diff +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur uClibc-0.9.30.1/extra/scripts/unifdef.c uClibc-0.9.30.1.patch/extra/scripts/unifdef.c ---- uClibc-0.9.30.1/extra/scripts/unifdef.c 2008-04-28 01:10:00.000000000 +0200 -+++ uClibc-0.9.30.1.patch/extra/scripts/unifdef.c 2009-04-03 23:40:08.502998983 +0200 -@@ -206,7 +206,7 @@ - static void error(const char *); - static int findsym(const char *); - static void flushline(bool); --static Linetype getline(void); -+static Linetype parseline(void); - static Linetype ifeval(const char **); - static void ignoreoff(void); - static void ignoreon(void); -@@ -512,7 +512,7 @@ - - for (;;) { - linenum++; -- lineval = getline(); -+ lineval = parseline(); - trans_table[ifstate[depth]][lineval](); - debug("process %s -> %s depth %d", - linetype_name[lineval], -@@ -526,7 +526,7 @@ - * help from skipcomment(). - */ - static Linetype --getline(void) -+parseline(void) - { - const char *cp; - int cursym; diff --git a/packages/virtual/image/install b/packages/virtual/image/install index bf1dad4020..bbc46c2256 100755 --- a/packages/virtual/image/install +++ b/packages/virtual/image/install @@ -65,7 +65,7 @@ case "$2" in # sed -i "s/EXIT_PROC=.*/EXIT_PROC=\"$GUI\"/" $INSTALL/sbin/bootchartd # fi - #[ "$EMULATORS" = yes ] && $SCRIPTS/install emulators $1 + [ "$EMULATORS" = yes ] && $SCRIPTS/install emulators #[ "$GAMES" = yes ] && $SCRIPTS/install games $1 #[ "$GAMES" = yes ] && $SCRIPTS/install pygame $1 #[ "$LCD4LINUX" = yes ] && $SCRIPTS/install lcd4linux $1