diff options
41 files changed, 1880 insertions, 62 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index e0b4c59e5f..d48d2a5726 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -906,7 +906,7 @@ def check_app_exists(app, d): from bb import which, data app = data.expand(app, d) - path = data.getVar('PATH', d) + path = data.getVar('PATH', d, 1) return len(which(path, app)) != 0 def check_gcc3(data): diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 5446a425ce..af96ae435a 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -42,7 +42,7 @@ SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" -SRCREV_pn-linux-ixp4xx ?= "927" +SRCREV_pn-linux-ixp4xx ?= "957" SRCREV_pn-linux-openmoko ?= "3238" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" diff --git a/packages/bluez/bluez-cups-backend_3.24.bb b/packages/bluez/bluez-cups-backend_3.24.bb index 64884fa904..1c43313a8a 100644 --- a/packages/bluez/bluez-cups-backend_3.24.bb +++ b/packages/bluez/bluez-cups-backend_3.24.bb @@ -1,5 +1,7 @@ require bluez-utils3.inc +PR = "r1" + DEPENDS += "cups" # see bluez-utils3.inc for the explanation of these option @@ -23,4 +25,4 @@ EXTRA_OECONF = " \ PACKAGES = "${PN}" FILES_${PN} = "${libdir}/cups/backend/bluetooth" -RDEPENDS_${PN} = "cups"
\ No newline at end of file +RDEPENDS_${PN} = "cups" diff --git a/packages/bluez/bluez-gstreamer-plugin_3.24.bb b/packages/bluez/bluez-gstreamer-plugin_3.24.bb index c5a1a9acee..e485d95c36 100644 --- a/packages/bluez/bluez-gstreamer-plugin_3.24.bb +++ b/packages/bluez/bluez-gstreamer-plugin_3.24.bb @@ -1,5 +1,7 @@ require bluez-utils3.inc +PR = "r1" + DEPENDS += "gstreamer gst-plugins-base " # see bluez-utils3.inc for the explanation of these option diff --git a/packages/bluez/bluez-libs_3.24.bb b/packages/bluez/bluez-libs_3.24.bb index 6ddf62a4fb..eb515b4aba 100644 --- a/packages/bluez/bluez-libs_3.24.bb +++ b/packages/bluez/bluez-libs_3.24.bb @@ -1 +1,4 @@ require bluez-libs.inc + +PR = "r1" + diff --git a/packages/bluez/bluez-utils-alsa_3.24.bb b/packages/bluez/bluez-utils-alsa_3.24.bb index e2f48fba49..5ef75b54a4 100644 --- a/packages/bluez/bluez-utils-alsa_3.24.bb +++ b/packages/bluez/bluez-utils-alsa_3.24.bb @@ -1,5 +1,7 @@ require bluez-utils3.inc +PR = "r1" + DEPENDS += "alsa-lib" # see bluez-utils3.inc for the explanation of these option diff --git a/packages/bluez/bluez-utils3.inc b/packages/bluez/bluez-utils3.inc index 97a604aaea..b995d6990c 100644 --- a/packages/bluez/bluez-utils3.inc +++ b/packages/bluez/bluez-utils3.inc @@ -68,6 +68,8 @@ EXTRA_OECONF = " \ #disable it: # --disable-hid2hci +OE_LT_RPATH_ALLOW = "any" +OE_LT_RPATH_ALLOW[export]="1" do_install_append() { install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/ diff --git a/packages/bluez/bluez-utils_3.24.bb b/packages/bluez/bluez-utils_3.24.bb index f96d1f2ba4..37365f67fc 100644 --- a/packages/bluez/bluez-utils_3.24.bb +++ b/packages/bluez/bluez-utils_3.24.bb @@ -1,5 +1,5 @@ require bluez-utils3.inc -PR = "r1" +PR = "r2" # see bluez-utils3.inc for the explanation of these option EXTRA_OECONF = " \ diff --git a/packages/distcc/distcc_2.18.3.bb b/packages/distcc/distcc_2.18.3.bb index 506618d359..ebf02e17ee 100644 --- a/packages/distcc/distcc_2.18.3.bb +++ b/packages/distcc/distcc_2.18.3.bb @@ -2,14 +2,15 @@ DESCRIPTION = "distcc is a parallel build system that distributes \ compilation of C/C++/ObjC code across machines on a network." SECTION = "devel" LICENSE = "GPLv2" -PR = "r2" +PR = "r3" DEPENDS = "avahi gtk+" RRECOMMENDS = "avahi-daemon" SRC_URI = "http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2 \ file://distcc-avahi.patch;patch=1 \ - file://default \ + file://no-man.patch;patch=1 \ + file://default \ file://distcc" inherit autotools pkgconfig update-rc.d @@ -21,8 +22,10 @@ EXTRA_OECONF = " --with-gtk " do_install_append() { install -d ${D}${sysconfdir}/init.d/ install -d ${D}${sysconfdir}/default + install -d ${D}${sysconfdir}/distcc install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc + echo "+zeroconf" > ${D}${sysconfdir}/distcc/hosts } PACKAGES += "distcc-distmon-gnome" @@ -31,5 +34,11 @@ FILES_${PN} = " ${sysconfdir} \ ${bindir}/distcc \ ${bindir}/distccd \ ${bindir}/distccmon-text" + +CONFFILES_${PN} += "${sysconfdir}/default/distcc \ + ${sysconfdir}/distcc/hosts \ + ${sysconfdir}/init.d/distcc \ + " + FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \ ${datadir}/distcc" diff --git a/packages/distcc/files/no-man.patch b/packages/distcc/files/no-man.patch new file mode 100644 index 0000000000..ac1c18ac96 --- /dev/null +++ b/packages/distcc/files/no-man.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile.in 2008-01-06 16:44:45.696595605 +0100 ++++ distcc-2.18.3/Makefile.in 2008-01-06 16:44:56.879181132 +0100 +@@ -556,7 +556,7 @@ + # install-sh can't handle multiple arguments, but we don't need any + # tricky features so mkinstalldirs and cp will do + +-install: showpaths install-doc install-man install-programs install-example @INSTALL_GNOME@ ++install: showpaths install-doc install-programs install-example @INSTALL_GNOME@ + + install-programs: $(bin_PROGRAMS) + $(mkinstalldirs) $(DESTDIR)$(bindir) diff --git a/packages/flite/flite-1.3/flite-1.3-Makefile.patch b/packages/flite/flite-1.3/flite-1.3-Makefile.patch new file mode 100644 index 0000000000..9a1a82e13b --- /dev/null +++ b/packages/flite/flite-1.3/flite-1.3-Makefile.patch @@ -0,0 +1,405 @@ +Index: lang/usenglish/Makefile +=================================================================== +--- flite-1.3-release/lang/usenglish/Makefile (.../flite-1.3-orig) (revision 7) ++++ flite-1.3-release/lang/usenglish/Makefile (.../release-1.2) (revision 7) +@@ -38,6 +38,7 @@ + DIRNAME=lang/usenglish + BUILD_DIRS = + ALL_DIRS= ++include $(TOP)/config/config + H = usenglish.h us_int_accent_cart.h us_int_tone_cart.h us_durz_cart.h \ + us_ffeatures.h us_phrasing_cart.h us_text.h us_f0.h us_nums_cart.h + SRCS = us_int_accent_cart.c us_int_tone_cart.c us_f0_model.c \ +@@ -45,7 +46,11 @@ + us_phoneset.c us_ffeatures.c us_phrasing_cart.c \ + us_gpos.c us_text.c us_expand.c us_postlex.c \ + us_nums_cart.c us_aswd.c usenglish.c +-OBJS = $(SRCS:.c=.o) ++ifdef SHFLAGS ++OBJS := $(SRCS:.c=.os) ++else ++OBJS := $(SRCS:.c=.o) ++endif + SCM= + FILES = Makefile $(SCM) $(SRCS) $(H) + LIBNAME = flite_usenglish + +Index: lang/cmu_us_kal/Makefile +=================================================================== +--- flite-1.3-release/lang/cmu_us_kal/Makefile (.../flite-1.3-orig) (revision 7) ++++ flite-1.3-release/lang/cmu_us_kal/Makefile (.../release-1.2) (revision 7) +@@ -43,7 +43,12 @@ + cmu_us_kal_lpc.c \ + cmu_us_kal_res.c \ + cmu_us_kal_residx.c +-OBJS = $(SRCS:.c=.o) ++include $(TOP)/config/config ++ifdef SHFLAGS ++OBJS := $(SRCS:.c=.os) ++else ++OBJS := $(SRCS:.c=.o) ++endif + SCM= + FILES = Makefile $(SCM) $(SRCS) $(H) + LIBNAME = flite_cmu_us_kal + +Index: lang/cmu_us_kal16/Makefile +=================================================================== +--- flite-1.3-release/lang/cmu_us_kal16/Makefile (.../flite-1.3-orig) (revision 7) ++++ flite-1.3-release/lang/cmu_us_kal16/Makefile (.../release-1.2) (revision 7) +@@ -44,7 +44,12 @@ + cmu_us_kal16_lpc.c \ + cmu_us_kal16_res.c \ + cmu_us_kal16_residx.c +-OBJS = $(SRCS:.c=.o) ++include $(TOP)/config/config ++ifdef SHFLAGS ++OBJS := $(SRCS:.c=.os) ++else ++OBJS := $(SRCS:.c=.o) ++endif + SCM= + FILES = Makefile $(SCM) $(SRCS) $(H) + LIBNAME = flite_cmu_us_kal16 + +Index: lang/cmu_time_awb/Makefile +=================================================================== +--- flite-1.3-release/lang/cmu_time_awb/Makefile (.../flite-1.3-orig) (revision 7) ++++ flite-1.3-release/lang/cmu_time_awb/Makefile (.../release-1.2) (revision 7) +@@ -45,7 +45,12 @@ + cmu_time_awb_mcep.c \ + cmu_time_awb_lpc.c \ + cmu_time_awb_lex_entry.c +-OBJS = $(SRCS:.c=.o) ++include $(TOP)/config/config ++ifdef SHFLAGS ++OBJS := $(SRCS:.c=.os) ++else ++OBJS := $(SRCS:.c=.o) ++endif + SCM= + FILES = Makefile $(SCM) $(SRCS) $(H) + LIBNAME = flite_cmu_time_awb + +Index: lang/cmulex/Makefile +=================================================================== +--- flite-1.3-release/lang/cmulex/Makefile (.../flite-1.3-orig) (revision 7) ++++ flite-1.3-release/lang/cmulex/Makefile (.../release-1.2) (revision 7) +@@ -38,13 +38,20 @@ + DIRNAME=lang/cmulex + BUILD_DIRS = + ALL_DIRS= ++ + H = cmu_lts_model.h cmulex.h + SRCS = cmu_lts_rules.c cmu_lts_model.c \ + cmu_lex.c cmu_lex_entries.c cmu_lex_data.c + LEX_DATA_INCLUDES = cmu_lex_data_raw.c cmu_lex_num_bytes.c \ + cmu_lex_phones_huff_table.c cmu_lex_entries_huff_table.c + +-OBJS = $(SRCS:.c=.o) ++include $(TOP)/config/config ++ifdef SHFLAGS ++OBJS := $(SRCS:.c=.os) ++else ++OBJS := $(SRCS:.c=.o) ++endif ++ + SCRIPTS=make_cmulex + + SCM= + +Index: src/hrg/Makefile +=================================================================== +--- flite-1.3-release/src/hrg/Makefile (.../flite-1.3-orig) (revision 7) ++++ flite-1.3-release/src/hrg/Makefile (.../release-1.2) (revision 7) +@@ -39,9 +39,14 @@ + BUILD_DIRS = + ALL_DIRS= + H = ++include $(TOP)/config/config + SRCS = cst_utterance.c cst_relation.c cst_item.c cst_ffeature.c \ + cst_rel_io.c +-OBJS = $(SRCS:.c=.o) ++ifdef SHFLAGS ++OBJS := $(SRCS:.c=.os) ++else ++OBJS := $(SRCS:.c=.o) ++endif + FILES = Makefile $(H) $(SRCS) + LIBNAME = flite + +Index: src/utils/Makefile +=================================================================== +--- flite-1.3-release/src/utils/Makefile (.../flite-1.3-orig) (revision 7) ++++ flite-1.3-release/src/utils/Makefile (.../release-1.2) (revision 7) +@@ -44,8 +44,13 @@ + cst_tokenstream.c cst_val.c cst_features.c \ + cst_endian.c cst_socket.c cst_val_const.c \ + cst_val_user.c cst_args.c ++ifdef SHFLAGS ++OBJS := $(SRCS:.c=.os) $(MMAPTYPE:%=cst_mmap_%.os) \ ++ $(STDIOTYPE:%=cst_file_%.os) ++else + OBJS := $(SRCS:.c=.o) $(MMAPTYPE:%=cst_mmap_%.o) \ + $(STDIOTYPE:%=cst_file_%.o) ++endif + FILES = Makefile $(H) $(SRCS) \ + cst_mmap_posix.c cst_mmap_win32.c cst_mmap_none.c \ + cst_file_stdio.c cst_file_wince.c cst_file_palmos.c + +Index: src/audio/Makefile +=================================================================== +--- flite-1.3-release/src/audio/Makefile (.../flite-1.3-orig) (revision 7) ++++ flite-1.3-release/src/audio/Makefile (.../release-1.2) (revision 7) +@@ -43,9 +43,13 @@ + + BASESRCS = auclient.c auserver.c audio.c + SRCS = $(BASESRCS) $(AUDIODRIVER:%=au_%.c) +-OBJS = $(SRCS:.c=.o) ++ifdef SHFLAGS ++OBJS := $(SRCS:.c=.os) ++else ++OBJS := $(SRCS:.c=.o) ++endif + FILES = Makefile $(H) $(BASESRCS) au_command.c au_none.c \ +- au_oss.c au_sun.c au_wince.c au_palmos.c ++ au_oss.c au_sun.c au_wince.c au_palmos.c au_alsa.c + LIBNAME = flite + + LOCAL_INCLUDES = -I. $(AUDIODEFS) + +Index: src/lexicon/Makefile +=================================================================== +--- flite-1.3-release/src/lexicon/Makefile (.../flite-1.3-orig) (revision 7) ++++ flite-1.3-release/src/lexicon/Makefile (.../release-1.2) (revision 7) +@@ -38,8 +38,13 @@ + DIRNAME=src/lexicon + BUILD_DIRS = + ALL_DIRS= ++include $(TOP)/config/config + SRCS = cst_lexicon.c cst_lts.c cst_lts_rewrites.c +-OBJS = $(SRCS:.c=.o) ++ifdef SHFLAGS ++OBJS := $(SRCS:.c=.os) ++else ++OBJS := $(SRCS:.c=.o) ++endif + FILES = Makefile $(SRCS) + LIBNAME = flite + +Index: src/synth/Makefile +=================================================================== +--- flite-1.3-release/src/synth/Makefile (.../flite-1.3-orig) (revision 7) ++++ flite-1.3-release/src/synth/Makefile (.../release-1.2) (revision 7) +@@ -38,9 +38,14 @@ + DIRNAME=src/synth + BUILD_DIRS = + ALL_DIRS= ++include $(TOP)/config/config + SRCS = cst_synth.c cst_utt_utils.c cst_voice.c cst_phoneset.c \ + flite.c +-OBJS = $(SRCS:.c=.o) ++ifdef SHFLAGS ++OBJS := $(SRCS:.c=.os) ++else ++OBJS := $(SRCS:.c=.o) ++endif + FILES = Makefile $(SRCS) + LIBNAME = flite + +Index: src/speech/Makefile +=================================================================== +--- flite-1.3-release/src/speech/Makefile (.../flite-1.3-orig) (revision 7) ++++ flite-1.3-release/src/speech/Makefile (.../release-1.2) (revision 7) +@@ -39,9 +39,14 @@ + BUILD_DIRS = + ALL_DIRS= + H = ++include $(TOP)/config/config + SRCS = cst_wave.c cst_wave_io.c cst_track.c cst_track_io.c \ + cst_wave_utils.c cst_lpcres.c rateconv.c +-OBJS = $(SRCS:.c=.o) ++ifdef SHFLAGS ++OBJS := $(SRCS:.c=.os) ++else ++OBJS := $(SRCS:.c=.o) ++endif + FILES = Makefile $(H) $(SRCS) + LIBNAME = flite + +Index: src/wavesynth/Makefile +=================================================================== +--- flite-1.3-release/src/wavesynth/Makefile (.../flite-1.3-orig) (revision 7) ++++ flite-1.3-release/src/wavesynth/Makefile (.../release-1.2) (revision 7) +@@ -38,9 +38,14 @@ + DIRNAME=src/wavesynth + BUILD_DIRS = + ALL_DIRS= ++include $(TOP)/config/config + SRCS = cst_units.c cst_sigpr.c cst_clunits.c cst_diphone.c \ + cst_sigprFP.c cst_sts.c cst_reflpc.c +-OBJS = $(SRCS:.c=.o) ++ifdef SHFLAGS ++OBJS := $(SRCS:.c=.os) ++else ++OBJS := $(SRCS:.c=.o) ++endif + LIBNAME = flite + FILES = Makefile $(SRCS) + +Index: src/regex/Makefile +=================================================================== +--- flite-1.3-release/src/regex/Makefile (.../flite-1.3-orig) (revision 7) ++++ flite-1.3-release/src/regex/Makefile (.../release-1.2) (revision 7) +@@ -42,8 +42,13 @@ + DIRNAME=src/regex + BUILD_DIRS = + ALL_DIRS= ++include $(TOP)/config/config + SRCS = cst_regex.c regexp.c regsub.c +-OBJS = $(SRCS:.c=.o) ++ifdef SHFLAGS ++OBJS := $(SRCS:.c=.os) ++else ++OBJS := $(SRCS:.c=.o) ++endif + FILES = Makefile $(H) $(SRCS) + LIBNAME = flite + +Index: src/stats/Makefile +=================================================================== +--- flite-1.3-release/src/stats/Makefile (.../flite-1.3-orig) (revision 7) ++++ flite-1.3-release/src/stats/Makefile (.../release-1.2) (revision 7) +@@ -39,8 +39,13 @@ + BUILD_DIRS = + ALL_DIRS= + H = ++include $(TOP)/config/config + SRCS = cst_cart.c cst_viterbi.c cst_ss.c +-OBJS = $(SRCS:.c=.o) ++ifdef SHFLAGS ++OBJS := $(SRCS:.c=.os) ++else ++OBJS := $(SRCS:.c=.o) ++endif + FILES = Makefile $(H) $(SRCS) + LIBNAME = flite + +Index: config/common_make_rules +=================================================================== +--- flite-1.3-release/config/common_make_rules (.../flite-1.3-orig) (revision 7) ++++ flite-1.3-release/config/common_make_rules (.../release-1.2) (revision 7) +@@ -73,12 +73,13 @@ + ifdef SHFLAGS + SOOBJS = $(OBJS:.o=.os) + FULLSHOBJS = $(SOOBJS:%=$(OBJDIR)/%) +-ifdef LIBNAME +-ALL += $(OBJDIR)/.build_so ++#ifdef LIBNAME ++#ALL += $(OBJDIR)/.build_so ++#endif + endif +-endif + ifdef LIBNAME + ALL += $(OBJDIR)/.build_lib ++ALL += $(OBJDIR)/.build_so + endif + # Only do some directories when you are not cross compiling + ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM)) +@@ -117,14 +118,17 @@ + @ touch $(OBJDIR)/.build_so + + # Used in the lib/ directory and in building new voices +-$(OBJDIR)/%.so: %.shared.a ++#$(OBJDIR)/%.so: %.shared.a ++%.so: %.shared.a + @ echo making $@ + @ rm -rf shared_os && mkdir shared_os + @ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} + @ (cd shared_os && ar x ../$<) + @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) +- @ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} +- @ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@ ++ #@ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} ++ #@ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@ ++ @ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} ++ @ ln -s $@.${PROJECT_SHLIB_VERSION} $@ + @ rm -rf shared_os + + $(OBJDIR)/.make_build_dirs: + +Index: lib/Makefile +=================================================================== +--- flite-1.3-release/lib/Makefile (.../flite-1.3-orig) (revision 0) ++++ flite-1.3-release/lib/Makefile (.../release-1.2) (revision 7) +@@ -0,0 +1,70 @@ ++########################################################################### ++## ## ++## Language Technologies Institute ## ++## Carnegie Mellon University ## ++## Copyright (c) 1999 ## ++## All Rights Reserved. ## ++## ## ++## Permission is hereby granted, free of charge, to use and distribute ## ++## this software and its documentation without restriction, including ## ++## without limitation the rights to use, copy, modify, merge, publish, ## ++## distribute, sublicense, and/or sell copies of this work, and to ## ++## permit persons to whom this work is furnished to do so, subject to ## ++## the following conditions: ## ++## 1. The code must retain the above copyright notice, this list of ## ++## conditions and the following disclaimer. ## ++## 2. Any modifications must be clearly marked as such. ## ++## 3. Original authors' names are not deleted. ## ++## 4. The authors' names are not used to endorse or promote products ## ++## derived from this software without specific prior written ## ++## permission. ## ++## ## ++## CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK ## ++## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ## ++## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ## ++## SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE ## ++## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ## ++## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ## ++## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ## ++## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ## ++## THIS SOFTWARE. ## ++## ## ++########################################################################### ++## ## ++## FLITE libraries ## ++## ## ++########################################################################### ++TOP=.. ++DIRNAME=lib ++BUILD_DIRS = ++ALL_DIRS= ++FILES = Makefile ++LIBNAMES = flite flite_cmulex flite_usenglish \ ++ flite_cmu_us_kal flite_cmu_us_kal16 flite_cmu_time_awb ++ ++STATICLIBS= $(LIBNAMES:%=lib%.a) ++SHAREDARLIBS= $(LIBNAMES:%=lib%.shared.a) ++#SHAREDLIBS = $(LIBNAMES:%=lib%.so) ++SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so) ++VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \ ++ $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION}) ++ALL_LIBS = $(STATICLIBS) $(SHAREDLIBS) $(VERSIONSHAREDLIBS) ++ ++ALL = shared_libs ++ ++LOCAL_CLEAN=*.a *.so *.so.${PROJECT_VERSION} *.so.${PROJECT_SHLIB_VERSION} ++ ++include $(TOP)/config/common_make_rules ++ ++ifdef SHFLAGS ++shared_libs: $(SHAREDLIBS) ++else ++shared_libs: nothing ++endif ++ ++install: ++ @ cp -vf $(LIBDIR)/* . ++ @ $(MAKE) shared_libs ++ @ echo ARLIBS: $(SHAREDARLIBS) ++ @ echo SHARLIBS: $(SHAREDLIBS) ++ @ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -) diff --git a/packages/flite/flite-1.3/flite-1.3-configure-with-audio.patch b/packages/flite/flite-1.3/flite-1.3-configure-with-audio.patch new file mode 100644 index 0000000000..3c077530f6 --- /dev/null +++ b/packages/flite/flite-1.3/flite-1.3-configure-with-audio.patch @@ -0,0 +1,12 @@ +--- flite-1.3-release/configure.in.old 2008-01-05 10:14:57.000000000 -0600 ++++ flite-1.3-release/configure.in 2008-01-05 10:15:38.000000000 -0600 +@@ -220,7 +220,8 @@ dnl allow the user to override the one d + dnl + AC_ARG_WITH( audio, + [ --with-audio with specific audio support (none linux freebsd etc) ], +- AUDIODRIVER=$with_audio ) ++ [AUDIODRIVER=$with_audio ++ AUDIODEFS=]) + + if test "x$AUDIODEFS" = x; then + case "$AUDIODRIVER" in diff --git a/packages/flite/flite-1.3/flite-1.3-fix-read-only-assignments.patch b/packages/flite/flite-1.3/flite-1.3-fix-read-only-assignments.patch new file mode 100644 index 0000000000..da8c88370f --- /dev/null +++ b/packages/flite/flite-1.3/flite-1.3-fix-read-only-assignments.patch @@ -0,0 +1,15 @@ +--- flite-1.3-release/include/cst_sts.h.old 2008-01-05 10:09:35.000000000 -0600 ++++ flite-1.3-release/include/cst_sts.h 2008-01-05 10:08:38.000000000 -0600 +@@ -45,9 +45,9 @@ + /* else where, this information plus the indexes in the Unit relation */ + /* allow reconstruction of the signal itself */ + struct cst_sts_struct { +- const unsigned short *frame; +- const int size; /* in samples */ +- const unsigned char *residual; ++ unsigned short *frame; ++ int size; /* in samples */ ++ unsigned char *residual; + }; + typedef struct cst_sts_struct cst_sts; + diff --git a/packages/flite/flite-alsa-1.2/.mtn2git_empty b/packages/flite/flite-alsa-1.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/flite/flite-alsa-1.2/.mtn2git_empty diff --git a/packages/flite/flite-1.2/flite-1.2-alsa_support-1.2.diff b/packages/flite/flite-alsa-1.2/flite-1.2-alsa_support-1.2.diff index 3d2753a01f..3d2753a01f 100644 --- a/packages/flite/flite-1.2/flite-1.2-alsa_support-1.2.diff +++ b/packages/flite/flite-alsa-1.2/flite-1.2-alsa_support-1.2.diff diff --git a/packages/flite/flite-alsa-1.2/flite-alsa-1.2-configure-with-audio.patch b/packages/flite/flite-alsa-1.2/flite-alsa-1.2-configure-with-audio.patch new file mode 100644 index 0000000000..b344877d04 --- /dev/null +++ b/packages/flite/flite-alsa-1.2/flite-alsa-1.2-configure-with-audio.patch @@ -0,0 +1,12 @@ +--- flite-1.2-release/configure.in.old 2008-01-06 02:30:57.000000000 -0600 ++++ flite-1.2-release/configure.in 2008-01-06 02:31:32.000000000 -0600 +@@ -145,7 +145,8 @@ dnl allow the user to override the one d + dnl + AC_ARG_WITH( audio, + [ --with-audio with specific audio support (none linux freebsd etc) ], +- AUDIODRIVER=$with_audio ) ++ [AUDIODRIVER=$with_audio ++ AUDIODEFS=]) + + if test "x$AUDIODEFS" = x; then + case "$AUDIODRIVER" in diff --git a/packages/flite/flite-alsa-1.3/.mtn2git_empty b/packages/flite/flite-alsa-1.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/flite/flite-alsa-1.3/.mtn2git_empty diff --git a/packages/flite/flite-1.3/flite-1.3-alsa_support-1.2.diff b/packages/flite/flite-alsa-1.3/flite-1.3-alsa_support-1.2.diff index b3e4b7aae4..b3e4b7aae4 100644 --- a/packages/flite/flite-1.3/flite-1.3-alsa_support-1.2.diff +++ b/packages/flite/flite-alsa-1.3/flite-1.3-alsa_support-1.2.diff diff --git a/packages/flite/flite-alsa-1.3/flite-alsa-1.3-configure-with-audio.patch b/packages/flite/flite-alsa-1.3/flite-alsa-1.3-configure-with-audio.patch new file mode 100644 index 0000000000..e1e7aed508 --- /dev/null +++ b/packages/flite/flite-alsa-1.3/flite-alsa-1.3-configure-with-audio.patch @@ -0,0 +1,12 @@ +--- flite-1.3-release/configure.in.old 2008-01-06 02:17:47.000000000 -0600 ++++ flite-1.3-release/configure.in 2008-01-06 02:19:56.000000000 -0600 +@@ -220,7 +220,8 @@ dnl allow the user to override the one d + dnl + AC_ARG_WITH( audio, + [ --with-audio with specific audio support (none linux freebsd etc) ], +- AUDIODRIVER=$with_audio ) ++ [AUDIODRIVER=$with_audio ++ AUDIODEFS=]) + + if test "x$AUDIODEFS" = x; then + case "$AUDIODRIVER" in diff --git a/packages/flite/flite-alsa_1.2.bb b/packages/flite/flite-alsa_1.2.bb new file mode 100644 index 0000000000..92db8c34f9 --- /dev/null +++ b/packages/flite/flite-alsa_1.2.bb @@ -0,0 +1,10 @@ +require flite.inc + +PR = "r1" + +EXTRA_OECONF = "--with-audio=alsa --enable-shared" + +SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.bz2 \ +# file://fix-read-only-assignments.patch;patch=1 \ # included in the alsa patch +#source http://homepage.hispeed.ch/loehrer/downloads/flite-1.2-alsa_support-1.2.diff.bz2 \ + file://flite-1.2-alsa_support-1.2.diff;patch=1" diff --git a/packages/flite/flite-alsa_1.3.bb b/packages/flite/flite-alsa_1.3.bb new file mode 100644 index 0000000000..438fe38e0e --- /dev/null +++ b/packages/flite/flite-alsa_1.3.bb @@ -0,0 +1,11 @@ +require flite.inc + +PR = "r1" + +EXTRA_OECONF = "--with-audio=alsa --enable-shared" + +SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.gz \ +# file://fix-read-only-assignments.patch;patch=1 \ # fixed elsewhere in 1.3 release? +#source http://homepage.hispeed.ch/loehrer/downloads/flite-1.3-alsa_support-1.2.diff.bz2 \ + file://flite-1.3-alsa_support-1.2.diff;patch=1 \ + file://flite-alsa-1.3-configure-with-audio.patch;patch=1" diff --git a/packages/flite/flite.inc b/packages/flite/flite.inc index 59373ba60d..64108c8390 100644 --- a/packages/flite/flite.inc +++ b/packages/flite/flite.inc @@ -11,8 +11,6 @@ S = "${WORKDIR}/flite-${PV}-release" inherit autotools -EXTRA_OECONF = "--with-audio=alsa --enable-shared" - PACKAGES += "lib${PN} lib${PN}-vox8 lib${PN}-vox16" FILES_${PN} = "${bindir}" @@ -32,9 +30,10 @@ do_install() { oe_runmake INSTALLBINDIR="${D}${bindir}" INSTALLLIBDIR="${D}${libdir}" INSTALLINCDIR="${D}${includedir}" install } - do_stage () { - install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/ + install -d ${STAGING_INCDIR}/flite + install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/flite/ + oe_libinstall -C lib -a -so libflite ${STAGING_LIBDIR} oe_libinstall -C lib -a -so libflite_cmu_time_awb ${STAGING_LIBDIR} oe_libinstall -C lib -a -so libflite_cmulex ${STAGING_LIBDIR} diff --git a/packages/flite/flite_1.2.bb b/packages/flite/flite_1.2.bb index e5a165eb97..5b8ff06358 100644 --- a/packages/flite/flite_1.2.bb +++ b/packages/flite/flite_1.2.bb @@ -1,8 +1,11 @@ require flite.inc -PR = "r3" +PR = "r5" + +EXTRA_OECONF = "--with-audio=oss --enable-shared" + +CFLAGS += " -lasound " SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.bz2 \ -# http://homepage.hispeed.ch/loehrer/downloads/flite-1.2-alsa_support-1.2.diff.bz2 \ - file://flite-1.2-alsa_support-1.2.diff;patch=1" -# file://configure-with-audio.patch;patch=1 \ + file://fix-read-only-assignments.patch;patch=1 \ + file://configure-with-audio.patch;patch=1" diff --git a/packages/flite/flite_1.3.bb b/packages/flite/flite_1.3.bb index 85154b2b36..b028510a56 100644 --- a/packages/flite/flite_1.3.bb +++ b/packages/flite/flite_1.3.bb @@ -1,8 +1,10 @@ require flite.inc -PR = "r0" +PR = "r2" + +EXTRA_OECONF = "--with-audio=oss --enable-shared" SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.gz \ -# http://homepage.hispeed.ch/loehrer/downloads/flite-1.3-alsa_support-1.2.diff.bz2 \ - file://flite-1.3-alsa_support-1.2.diff;patch=1" -# file://fix-read-only-assignments.patch;patch=1 \ + file://flite-1.3-Makefile.patch;patch=1 \ +# file://flite-1.3-fix-read-only-assignments.patch;patch=1 \ # fixed elsewhere in 1.3 release? + file://flite-1.3-configure-with-audio.patch;patch=1" diff --git a/packages/gpsd/files/fic-gta01/restart_gllin.sh b/packages/gpsd/files/fic-gta01/restart_gllin.sh new file mode 100644 index 0000000000..50810c3583 --- /dev/null +++ b/packages/gpsd/files/fic-gta01/restart_gllin.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +/etc/init.d/gps-hardware stop +sleep 1 +/etc/init.d/gps-hardware start + diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc index dac62ec76c..237971c9c7 100644 --- a/packages/gpsd/gpsd.inc +++ b/packages/gpsd/gpsd.inc @@ -15,6 +15,10 @@ SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \ file://gps-hardware \ file://gpsd" +SRC_URI_append_fic-gta01 = " \ + file://restart_gllin.sh \ + " + inherit autotools update-rc.d INITSCRIPT_NAME = "gpsd" @@ -48,6 +52,11 @@ do_install_append() { install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd.default } +do_install_append_fic-gta01() { + install -d ${D}/${sysconfdir}/apm/resume.d + install -m 755 ${WORKDIR}/restart_gllin.sh ${D}/${sysconfdir}/apm/resume.d +} + pkg_postinst_${PN}-conf() { update-alternatives --install ${sysconfdir}/default/gpsd gpsd-defaults ${sysconfdir}/default/gpsd.default 10 update-alternatives --install ${sysconfdir}/init.d/gps-hardware gps-hardware ${sysconfdir}/init.d/gps-hardware.default 10 diff --git a/packages/gpsd/gpsd_2.28.bb b/packages/gpsd/gpsd_2.28.bb index ffd7322bf1..7094893b99 100644 --- a/packages/gpsd/gpsd_2.28.bb +++ b/packages/gpsd/gpsd_2.28.bb @@ -1,2 +1,2 @@ require gpsd.inc -PR = "r5" +PR = "r8" diff --git a/packages/gpsd/gpsd_2.34.bb b/packages/gpsd/gpsd_2.34.bb index 969ef1b803..ea9fe4f550 100644 --- a/packages/gpsd/gpsd_2.34.bb +++ b/packages/gpsd/gpsd_2.34.bb @@ -1,4 +1,4 @@ require gpsd.inc -PR = "r7" +PR = "r8" diff --git a/packages/gpsd/gpsd_2.36.bb b/packages/gpsd/gpsd_2.36.bb index 885a41dbda..726ba42481 100644 --- a/packages/gpsd/gpsd_2.36.bb +++ b/packages/gpsd/gpsd_2.36.bb @@ -1,3 +1,3 @@ require gpsd.inc -PR = "r1" +PR = "r2" diff --git a/packages/hal/hal_0.5.9.bb b/packages/hal/hal_0.5.9.bb index 6ece4ea310..064e7985ca 100644 --- a/packages/hal/hal_0.5.9.bb +++ b/packages/hal/hal_0.5.9.bb @@ -5,12 +5,14 @@ RDEPENDS += "udev hal-info" #RDEPENDS_hal-device-manager = "python hal python-pygnome" RRECOMMENDS = "udev-utils" -PR = "r3" +PR = "r4" SRC_URI += "file://99_hal \ file://20hal \ " +LEAD_SONAME = "libhal.so" + # machines with pci and acpi get a machine dependant hal EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_LIBDIR}/.. \ diff --git a/packages/linux/linux-ixp4xx.inc b/packages/linux/linux-ixp4xx.inc index 02f80b06a1..9c4dd375a0 100644 --- a/packages/linux/linux-ixp4xx.inc +++ b/packages/linux/linux-ixp4xx.inc @@ -3,7 +3,7 @@ DESCRIPTION = "Linux 2.6.x kernel for IXP4xx devices" COMPATIBLE_HOST = 'arm.*-linux.*' -COMPATIBLE_MACHINE = '(ixp4xx|nslu2)' +COMPATIBLE_MACHINE = '(ixp4xx|nslu2|syhl1)' # To specify the console set KERNEL_CONSOLE in the .bb file. diff --git a/packages/linux/linux-ixp4xx/defconfig-2.6.23.8 b/packages/linux/linux-ixp4xx/defconfig-2.6.23.12 index efbd55195d..efbd55195d 100644 --- a/packages/linux/linux-ixp4xx/defconfig-2.6.23.8 +++ b/packages/linux/linux-ixp4xx/defconfig-2.6.23.12 diff --git a/packages/linux/linux-ixp4xx_2.6.23.8.bb b/packages/linux/linux-ixp4xx_2.6.23.12.bb index ab621f310a..14b79ae7cb 100644 --- a/packages/linux/linux-ixp4xx_2.6.23.8.bb +++ b/packages/linux/linux-ixp4xx_2.6.23.12.bb @@ -6,13 +6,13 @@ require linux.inc require linux-ixp4xx.inc VANILLA_VERSION = "2.6.23" -KERNEL_RELEASE = "2.6.23.8" +KERNEL_RELEASE = "2.6.23.12" # If you use a rc, you will need to use this: #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}" PV = "${KERNEL_RELEASE}+svnr${SRCREV}" -PR = "r1" +PR = "r0" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \ @@ -21,11 +21,25 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.ta S = "${WORKDIR}/linux-${VANILLA_VERSION}" -do_prepatch() { +# Apply the patches from the nslu2-linux project (after the patches in SRC_URI) +do_postpatch() { + # Move away OE patches which have been already applied. + mv ${S}/patches ${S}/patches.oe + mv .pc .pc.oe + + # Move the NSLU2 patches in place for quilt and apply them. mv ${WORKDIR}/${VANILLA_VERSION} ${S}/patches && cd ${S} && quilt push -av - mv patches patches.ixp4xx - mv .pc .pc.old + + # Store the NSLU2 patches + mv ${S}/patches ${S}/patches.ixp4xx + mv .pc .pc.ixp4xx + + # And move back the OE patches + mv ${S}/patches.oe ${S}/patches + mv .pc.oe .pc + + # Copy the defconfig into ${WORKDIR} mv ${WORKDIR}/defconfig-${KERNEL_RELEASE} ${WORKDIR}/defconfig } -addtask prepatch after do_unpack before do_patch +addtask postpatch after do_patch before do_configure diff --git a/packages/linux/mainstone-kernel/flash-unlock.patch b/packages/linux/mainstone-kernel/flash-unlock.patch new file mode 100644 index 0000000000..31f3f38e34 --- /dev/null +++ b/packages/linux/mainstone-kernel/flash-unlock.patch @@ -0,0 +1,14 @@ +--- drivers/mtd/maps/mainstone-flash.c~ 2008-01-05 01:15:54.000000000 +0100 ++++ drivers/mtd/maps/mainstone-flash.c 2008-01-05 01:15:54.000000000 +0100 +@@ -125,6 +125,11 @@ + continue; + } + mymtds[i]->owner = THIS_MODULE; ++ ++ /* Unlock the flash device. */ ++ if (mymtds[i]->unlock) ++ mymtds[i]->unlock(mymtds[i], 0, mymtds[i]->size); ++ + + ret = parse_mtd_partitions(mymtds[i], probes, + &parsed_parts[i], 0); diff --git a/packages/linux/mainstone-kernel/mainstone/.mtn2git_empty b/packages/linux/mainstone-kernel/mainstone/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/mainstone-kernel/mainstone/.mtn2git_empty diff --git a/packages/linux/mainstone-kernel/mainstone/defconfig b/packages/linux/mainstone-kernel/mainstone/defconfig new file mode 100644 index 0000000000..e421081233 --- /dev/null +++ b/packages/linux/mainstone-kernel/mainstone/defconfig @@ -0,0 +1,1276 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.18 +# Sun Jan 6 00:54:23 2008 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +# CONFIG_RELAY is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# +# CONFIG_BLK_DEV_IO_TRACE is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_PNX4008 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set + +# +# Intel PXA2xx Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_LOGICPD_PXA270 is not set +CONFIG_MACH_MAINSTONE=y +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_PXA_SHARPSL is not set +# CONFIG_MACH_TRIZEPS4 is not set +CONFIG_PXA27x=y +CONFIG_IWMMXT=y + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y + +# +# Processor Features +# +# CONFIG_ARM_THUMB is not set +CONFIG_XSCALE_PMU=y + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=m +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=m +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y + +# +# PC-card bridges +# +CONFIG_PCMCIA_PXA2XX=m + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +CONFIG_NO_IDLE_HZ=y +CONFIG_HZ=100 +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_LEDS=y +CONFIG_LEDS_TIMER=y +CONFIG_LEDS_CPU=y +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS0,115200 mem=64M console=ttyS0 debug " +# CONFIG_XIP_KERNEL is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +CONFIG_APM=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +# CONFIG_PACKET is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +# CONFIG_IRLAN is not set +# CONFIG_IRNET is not set +# CONFIG_IRCOMM is not set +# CONFIG_IRDA_ULTRA is not set + +# +# IrDA options +# +# CONFIG_IRDA_CACHE_LAST_LSAP is not set +# CONFIG_IRDA_FAST_RR is not set +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +# CONFIG_IRTTY_SIR is not set + +# +# Dongle support +# + +# +# Old SIR device drivers +# +# CONFIG_IRPORT_SIR is not set + +# +# Old Serial dongle support +# + +# +# FIR device drivers +# +# CONFIG_USB_IRDA is not set +# CONFIG_SIGMATEL_FIR is not set +# CONFIG_PXA_FICP is not set +# CONFIG_MCS_FIR is not set +CONFIG_BT=m +# CONFIG_BT_L2CAP is not set +# CONFIG_BT_SCO is not set + +# +# Bluetooth device drivers +# +# CONFIG_BT_HCIUSB is not set +# CONFIG_BT_HCIUART is not set +# CONFIG_BT_HCIBCM203X is not set +# CONFIG_BT_HCIBPA10X is not set +# CONFIG_BT_HCIBFUSB is not set +# CONFIG_BT_HCIDTL1 is not set +# CONFIG_BT_HCIBT3C is not set +# CONFIG_BT_HCIBLUECARD is not set +# CONFIG_BT_HCIBTUART is not set +# CONFIG_BT_HCIVHCI is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +# CONFIG_IEEE80211_CRYPT_CCMP is not set +CONFIG_IEEE80211_SOFTMAC=m +# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set +CONFIG_WIRELESS_EXT=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=m +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_REDBOOT_PARTS=y +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +CONFIG_MTD_CFI_GEOMETRY=y +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +# CONFIG_MTD_CFI_I1 is not set +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_OTP is not set +CONFIG_MTD_CFI_INTELEXT=y +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set +# CONFIG_MTD_XIP is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_MAINSTONE=y +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_SHARP_SL is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_CRYPTOLOOP=m +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +# CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_INITRD=y +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=y +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=y +# CONFIG_IDEDISK_MULTI_MODE is not set +CONFIG_BLK_DEV_IDECS=m +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +# CONFIG_IDE_GENERIC is not set +# CONFIG_IDE_ARM is not set +# CONFIG_BLK_DEV_IDEDMA is not set +# CONFIG_IDEDMA_AUTO is not set +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=m +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +# CONFIG_BLK_DEV_SD is not set +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +# CONFIG_CHR_DEV_SG is not set +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set + +# +# SCSI Transport Attributes +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set + +# +# SCSI low-level drivers +# +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_SATA is not set +# CONFIG_SCSI_DEBUG is not set + +# +# PCMCIA SCSI adapter support +# +# CONFIG_PCMCIA_AHA152X is not set +# CONFIG_PCMCIA_FDOMAIN is not set +# CONFIG_PCMCIA_NINJA_SCSI is not set +# CONFIG_PCMCIA_QLOGIC is not set +# CONFIG_PCMCIA_SYM53C500 is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# PHY device support +# +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +CONFIG_SMC91X=y +# CONFIG_DM9000 is not set +# CONFIG_SMC911X is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# PCMCIA network device support +# +# CONFIG_NET_PCMCIA is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +# CONFIG_SLIP is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_TSDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +# CONFIG_SERIO_SERPORT is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=16 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +CONFIG_HW_RANDOM=y +# CONFIG_NVRAM is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# Ftape, the floppy tape device driver +# + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set + +# +# I2C support +# +# CONFIG_I2C is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# + +# +# Hardware Monitoring support +# +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Misc devices +# + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set +CONFIG_VIDEO_V4L2=y + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set +# CONFIG_USB_DABUSB is not set + +# +# Graphics support +# +CONFIG_FIRMWARE_EDID=y +CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_PXA=y +# CONFIG_FB_PXA_PARAMETERS is not set +# CONFIG_FB_MBX is not set +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y + +# +# Logo configuration +# +# CONFIG_LOGO is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=m +CONFIG_BACKLIGHT_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_DEVICE=y + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_OHCI_HCD is not set +# CONFIG_USB_SL811_HCD is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=m +CONFIG_USB_HIDINPUT=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_HID_FF is not set +# CONFIG_USB_HIDDEV is not set + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_AIPTEK is not set +# CONFIG_USB_WACOM is not set +# CONFIG_USB_ACECAD is not set +# CONFIG_USB_KBTAB is not set +# CONFIG_USB_POWERMATE is not set +# CONFIG_USB_TOUCHSCREEN is not set +# CONFIG_USB_YEALINK is not set +# CONFIG_USB_XPAD is not set +# CONFIG_USB_ATI_REMOTE is not set +# CONFIG_USB_ATI_REMOTE2 is not set +# CONFIG_USB_KEYSPAN_REMOTE is not set +# CONFIG_USB_APPLETOUCH is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# + +# +# USB Serial Converter support +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGETKIT is not set +# CONFIG_USB_PHIDGETSERVO is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TEST is not set + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_PXA2XX is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_AT91 is not set +CONFIG_USB_GADGET_DUMMY_HCD=y +CONFIG_USB_DUMMY_HCD=m +CONFIG_USB_GADGET_DUALSPEED=y +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_GADGETFS is not set +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +# CONFIG_USB_G_SERIAL is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=m +CONFIG_MMC_PXA=m + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set + +# +# RTC drivers +# +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_M48T86 is not set +CONFIG_RTC_DRV_SA1100=y +# CONFIG_RTC_DRV_TEST is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_SUMMARY=y +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_CRAMFS=m +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=y +# CONFIG_NFS_V3 is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +# CONFIG_NLS_CODEPAGE_437 is not set +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_MAGIC_SYSRQ=y +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_KERNEL=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_RWSEMS is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_VM is not set +CONFIG_FRAME_POINTER=y +# CONFIG_UNWIND_INFO is not set +CONFIG_FORCED_INLINING=y +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_DEBUG_USER=y +# CONFIG_DEBUG_WAITQ is not set +CONFIG_DEBUG_ERRORS=y +CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_ICEDCC is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +CONFIG_CRYPTO_SHA1=m +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TEA is not set +CONFIG_CRYPTO_ARC4=m +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_CRC_CCITT=m +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_PLIST=y diff --git a/packages/linux/mainstone-kernel_2.6.18.bb b/packages/linux/mainstone-kernel_2.6.18.bb index 0e80721489..290bb5911d 100644 --- a/packages/linux/mainstone-kernel_2.6.18.bb +++ b/packages/linux/mainstone-kernel_2.6.18.bb @@ -1,37 +1,24 @@ +require linux.inc + SECTION = "kernel" DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ - file://mainstone_defconfig" + file://flash-unlock.patch;patch=1;pnum=0 \ + file://defconfig" S = "${WORKDIR}/linux-2.6.18" COMPATIBLE_HOST = 'arm.*-linux' -inherit kernel -inherit package - ARCH = "arm" -#CMDLINE_CONSOLE ?= "ttyS0,115200n8" + +CMDLINE_CONSOLE ?= "ttyS0,115200n8" #CMDLINE_ROOT = "root=/dev/slug rootfstype=ext2,jffs2 initrd=0x01000000,10M mem=32M@0x00000000" -#CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000" #CMDLINE_ROOT = "root=/dev/ram0 rw rootfstype=ext2,jffs2 initrd=0x01000000,10M init=/linuxrc mem=32M@0x00000000" -#CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}" - -do_configure_prepend() { - install -m 0644 ${WORKDIR}/${MACHINE}_defconfig ${S}/.config -# echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config -} - -do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin -} - -do_deploy[dirs] = "${S}" - -addtask deploy before do_build after do_compile +CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS0,115200 mem=64M" +CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}" COMPATIBLE_MACHINE = "mainstone" diff --git a/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch b/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch index c4a7f91ea0..72b5e3126a 100644 --- a/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch +++ b/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch @@ -9,19 +9,17 @@ #LogDir "/var/log/speech-dispatcher/" #LogDir "stdout" -@@ -129,9 +129,9 @@ +@@ -129,8 +129,8 @@ # - configuration is the path to the config file of this module, # either relative (to etc/speechd/modules/) or absolute -AddModule "espeak" "sd_espeak" "espeak.conf" -AddModule "festival" "sd_festival" "festival.conf" --AddModule "flite" "sd_flite" "flite.conf" +AddModule "espeak" "sd_espeak" "/etc/speech-dispatcher/modules/espeak.conf" +#AddModule "festival" "sd_festival" "festival.conf" -+#AddModule "flite" "sd_flite" "flite.conf" + AddModule "flite" "sd_flite" "flite.conf" #AddModule "espeak-generic" "sd_generic" "espeak-generic.conf" #AddModule "epos-generic" "sd_generic" "epos-generic.conf" - #AddModule "dtk-generic" "sd_generic" "dtk-generic.conf" @@ -172,6 +172,6 @@ # There are some sample client settings diff --git a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb index d8e2b8ed3a..f1321096c9 100644 --- a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb +++ b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb @@ -2,10 +2,10 @@ DESCRIPTION = "Speech Dispatcher is a high-level device independent layer \ for speech synthesis through a simple, stable and well documented interface." HOMEPAGE = "http://www.freebsoft.org/speechd/" LICENSE = "GPLv2" -DEPENDS = "flite libdotconf glib-2.0" +DEPENDS = "espeak flite pulseaudio libdotconf glib-2.0" RPROVIDES_${PN} += "speechd" -PR = "r5" +PR = "r6" inherit autotools update-rc.d @@ -15,7 +15,7 @@ SRC_URI = "http://www.freebsoft.org/pub/projects/speechd/${PN}-${PV}.tar.gz \ file://configSpeechd.conf.in_00.patch;patch=1" LEAD_SONAME = "libspeechd.so" -EXTRA_OECONF = " --with-espeak=yes --with-flite=no --with-ibmtts=no --with-nas=no --with-alsa=yes --with-pulse=yes " +EXTRA_OECONF = " --with-espeak=yes --with-flite=yes --with-ibmtts=no --with-nas=no --with-alsa=yes --with-pulse=yes " INITSCRIPT_NAME = "speech-dispatcher" INITSCRIPT_PARAMS = "defaults 45" @@ -34,7 +34,6 @@ do_install() { install -m 0644 ${S}/src/c/api/libspeechd.h ${D}${includedir} install -m 0755 ${S}/src/c/clients/say/.libs/spd-say ${D}${bindir} - install -m 0755 ${S}/src/c/clients/spdsend/spdsend ${D}${bindir} install -m 0755 ${S}/src/server/.libs/speech-dispatcher ${D}${bindir} install -m 0755 ${S}/src/modules/.libs/sd_* ${D}${libdir}/${PN}-modules/ diff --git a/packages/u-boot/u-boot-openmoko_svn.bb b/packages/u-boot/u-boot-openmoko_svn.bb index 550ff5d499..61e4516e1f 100644 --- a/packages/u-boot/u-boot-openmoko_svn.bb +++ b/packages/u-boot/u-boot-openmoko_svn.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" PROVIDES = "virtual/bootloader" LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}" PV = "1.3.1${LOCALVERSION}" -PR = "r2" +PR = "r3" SRCREV_FORMAT = "patches" @@ -17,7 +17,7 @@ DEFAULT_PREFERENCE = "-1" SRC_URI = "\ git://www.denx.de/git/u-boot.git/;protocol=git;name=upstream \ svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patches \ - file://uboot-eabi-fix-HACK.patch \ + file://uboot-eabi-fix-HACK.patch;patch=1;maxrev=3773 \ file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ file://makefile-no-dirafter.patch;patch=1 \ file://boot-menu-gfx-fix-openmoko-bug-1140.patch;patch=1 \ diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.bb b/packages/xorg-xserver/xserver-kdrive_1.4.bb index 87880c9ef8..50b103495b 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.4.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.4.bb @@ -1,8 +1,9 @@ require xserver-kdrive-common.inc -DEPENDS += "libxkbfile libxcalibrate pixman" +DEPENDS += "hal libxkbfile libxcalibrate pixman" PE = "1" +PR = "r1" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ |