diff options
| -rw-r--r-- | MAINTAINERS | 3 | ||||
| -rw-r--r-- | packages/angstrom/angstrom-bootmanager-image.bb | 2 | ||||
| -rw-r--r-- | packages/angstrom/angstrom-bootstrap-image.bb | 3 | ||||
| -rw-r--r-- | packages/musicpd/mpd-alsa_0.11.5.bb | 57 | ||||
| -rw-r--r-- | packages/sqlite/sqlite3-3.3.9/cross-compile.patch | 92 | ||||
| -rw-r--r-- | packages/sqlite/sqlite3-3.3.9/ldflags.patch | 70 | ||||
| -rw-r--r-- | packages/sqlite/sqlite3-3.3.9/libtool.patch | 25 | ||||
| -rw-r--r-- | packages/sysvinit/sysvinit/inittab | 2 | ||||
| -rw-r--r-- | packages/wpa-supplicant/wpa-supplicant-0.5.inc | 3 |
9 files changed, 240 insertions, 17 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ace5d1a5de..d0891fe253 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -104,7 +104,8 @@ Recipes: linux-jlime*, scummvm, blackbox Person: Leon Woestenberg Mail: leonw@mailcan.com -Interests: SquashFS, LZMA +Machines: ixp4xxbe, efika +Interests: squashfs w/ lzma, smartmontools, lighttpd Person: Liam Girdwoord Mail: liam.girdwood@wolfsonmicro.com diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb index 43c25eb1ba..b7755bd4dd 100644 --- a/packages/angstrom/angstrom-bootmanager-image.bb +++ b/packages/angstrom/angstrom-bootmanager-image.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" PR = "r0" DEPENDS = "task-angstrom" -RDEPENDS = "angstrom-base-depends angstrom-bootmanager" +RDEPENDS = "angstrom-base-depends angstrom-bootmanager kernel-modules" export IMAGE_BASENAME = "bootmanager-image" export IMAGE_LINGUAS = "" diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb index 3977e223af..a325c9553b 100644 --- a/packages/angstrom/angstrom-bootstrap-image.bb +++ b/packages/angstrom/angstrom-bootstrap-image.bb @@ -14,5 +14,8 @@ export IMAGE_BASENAME = "bootstrap-image" export IMAGE_LINGUAS = "" export PACKAGE_INSTALL = "${RDEPENDS}" +#zap root password +ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " + inherit image diff --git a/packages/musicpd/mpd-alsa_0.11.5.bb b/packages/musicpd/mpd-alsa_0.11.5.bb index 1ba1fabd16..d78cd9f2e1 100644 --- a/packages/musicpd/mpd-alsa_0.11.5.bb +++ b/packages/musicpd/mpd-alsa_0.11.5.bb @@ -2,9 +2,10 @@ DESCRIPTION = "Music Player Daemon (mpd). This version is configured for alsa su HOMEPAGE = "http://www.musicpd.org" LICENSE = "GPLv2" SECTION = "console/multimedia" -DEPENDS = "libvorbis libogg libid3tag libao-alsa zlib libmikmod libmad flac audiofile virtual/libiconv" -RDEPENDS = "libao-alsa" -PR = "r3" +#DEPENDS = "libvorbis libogg libid3tag libao-alsa zlib libmikmod libmad flac audiofile virtual/libiconv" +DEPENDS = "zlib libmad" +#RDEPENDS = "libao-alsa" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \ file://mpd/save-volume-state.patch;patch=1 file://mpd/mpd.init" @@ -18,21 +19,49 @@ INITSCRIPT_NAME = "mpd" # in staging - remove the --with and replace with --enable to use the local # versions. -EXTRA_OECONF = "--enable-ogg \ - --with-iconv-libraries=${STAGING_LIBDIR} \ - --with-iconv-includes=${STAGING_INCDIR} \ - --with-vorbis-libraries=${STAGING_LIBDIR} \ - --with-vorbis-includes=${STAGING_INCDIR} \ - --with-ogg-libraries=${STAGING_LIBDIR} \ - --with-ogg-includes=${STAGING_INCDIR} \ - --with-ao-libraries=${STAGING_LIBDIR} \ - --with-ao-includes=${STAGING_INCDIR} \ - --with-id3tag-libraries=${STAGING_LIBDIR} \ - --with-id3tag-includes=${STAGING_INCDIR} \ +EXTRA_OECONF = " \ + --disable-ao \ + --disable-shout \ + --disable-iconv \ + --disable-ipv6 \ + --disable-sun \ + --disable-oss \ + --disable-alsa \ + --disable-pulse \ + --enable-mvp \ + --disable-oggvorbis \ + --disable-oggflac \ + --disable-flac \ + --enable-mp3 \ + --disable-aac \ + --disable-audiofile \ + --disable-mod \ + --disable-mpc \ + --disable-id3 \ + --disable-aotest \ + --disable-alsatest \ + --disable-oggtest \ + --disable-vorbistest \ + --disable-libFLACtest \ + --disable-libOggFLACtest \ + --disable-audiofiletest \ + --disable-libmikmodtest \ --with-mad-libraries=${STAGING_LIBDIR} \ --with-mad-includes=${STAGING_INCDIR} \ --without-faad" +# --with-iconv-libraries=${STAGING_LIBDIR} \ +# --with-iconv-includes=${STAGING_INCDIR} \ +# --with-vorbis-libraries=${STAGING_LIBDIR} \ +# --with-vorbis-includes=${STAGING_INCDIR} \ +# --with-ogg-libraries=${STAGING_LIBDIR} \ +# --with-ogg-includes=${STAGING_INCDIR} \ +# --with-ao-libraries=${STAGING_LIBDIR} \ +# --with-ao-includes=${STAGING_INCDIR} \ +# --with-id3tag-libraries=${STAGING_LIBDIR} \ +# --with-id3tag-includes=${STAGING_INCDIR} \ + + do_install_append() { install -d ${D}${sysconfdir}/init.d install -m 755 ${WORKDIR}/mpd/mpd.init ${D}${sysconfdir}/init.d/mpd diff --git a/packages/sqlite/sqlite3-3.3.9/cross-compile.patch b/packages/sqlite/sqlite3-3.3.9/cross-compile.patch new file mode 100644 index 0000000000..31d4f0d162 --- /dev/null +++ b/packages/sqlite/sqlite3-3.3.9/cross-compile.patch @@ -0,0 +1,92 @@ +--- 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/sqlite/sqlite3-3.3.9/ldflags.patch b/packages/sqlite/sqlite3-3.3.9/ldflags.patch new file mode 100644 index 0000000000..fb78ab9d87 --- /dev/null +++ b/packages/sqlite/sqlite3-3.3.9/ldflags.patch @@ -0,0 +1,70 @@ +Index: sqlite-3.3.9/Makefile.in +=================================================================== +--- sqlite-3.3.9.orig/Makefile.in 2007-01-08 19:37:52.000000000 +0100 ++++ sqlite-3.3.9/Makefile.in 2007-01-08 19:41:54.000000000 +0100 +@@ -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. +@@ -276,17 +280,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) + +@@ -474,13 +478,13 @@ + + 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 \ + -DSQLITE_NO_SYNC=1 $(TEMP_STORE) \ + -o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \ +- libsqlite3.la $(LIBTCL) ++ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL) + + + fulltest: testfixture$(TEXE) sqlite3$(TEXE) +@@ -490,7 +494,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' \ +@@ -500,7 +504,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/sqlite/sqlite3-3.3.9/libtool.patch b/packages/sqlite/sqlite3-3.3.9/libtool.patch new file mode 100644 index 0000000000..ccf9993ed2 --- /dev/null +++ b/packages/sqlite/sqlite3-3.3.9/libtool.patch @@ -0,0 +1,25 @@ +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/sysvinit/sysvinit/inittab b/packages/sysvinit/sysvinit/inittab index 6abbdf4558..d105834b0e 100644 --- a/packages/sysvinit/sysvinit/inittab +++ b/packages/sysvinit/sysvinit/inittab @@ -28,3 +28,5 @@ l5:5:wait:/etc/init.d/rc 5 l6:6:wait:/etc/init.d/rc 6 # Normally not reached, but fallthrough in case of emergency. z6:6:respawn:/sbin/sulogin + +s0:2345:respawn:/bin/sh diff --git a/packages/wpa-supplicant/wpa-supplicant-0.5.inc b/packages/wpa-supplicant/wpa-supplicant-0.5.inc index 28f355c612..61cf77e8ab 100644 --- a/packages/wpa-supplicant/wpa-supplicant-0.5.inc +++ b/packages/wpa-supplicant/wpa-supplicant-0.5.inc @@ -2,7 +2,8 @@ DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)." SECTION = "network" LICENSE = "GPL" HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" -DEPENDS = "gnutls ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}" +#DEPENDS = "gnutls ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}" +DEPENDS = "gnutls" #we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds MY_ARCH := "${PACKAGE_ARCH}" |