diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-04-05 22:07:14 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-04-05 22:07:14 +0000 |
| commit | bf39bb6e3fabae6da5f9b8084f8d478f07e4836c (patch) | |
| tree | fa86a0ab3b29ca6e78f34c99ba3b649d8e6a344a /packages | |
| parent | 2b5295d1ca8c5f876e8b6a5592706b751f03a401 (diff) | |
| parent | 58ec003f0bbcaaa89c6080b675726bac9b952e29 (diff) | |
merge of '2bc71b9b93f22417784c3a4ed3576a76841878f2'
and 'edac95232b05ccd8efaeee530e0442683d1ef50a'
Diffstat (limited to 'packages')
89 files changed, 2515 insertions, 370 deletions
diff --git a/packages/abiword/abiword-plugins_2.5.1.bb b/packages/abiword/abiword-plugins_2.5.1.bb index ec11982ad7..eb626aba91 100644 --- a/packages/abiword/abiword-plugins_2.5.1.bb +++ b/packages/abiword/abiword-plugins_2.5.1.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"" +DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word" HOMEPAGE = "http://www.abiword.org" SECTION = "x11/office" LICENSE = "GPLv2" diff --git a/packages/abiword/abiword-plugins_2.5.2.bb b/packages/abiword/abiword-plugins_2.5.2.bb index d750bf539d..89a0527401 100644 --- a/packages/abiword/abiword-plugins_2.5.2.bb +++ b/packages/abiword/abiword-plugins_2.5.2.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"" +DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word" HOMEPAGE = "http://www.abiword.org" SECTION = "x11/office" LICENSE = "GPLv2" diff --git a/packages/abiword/abiword-plugins_2.6.0.bb b/packages/abiword/abiword-plugins_2.6.0.bb new file mode 100644 index 0000000000..f6cdcc56b0 --- /dev/null +++ b/packages/abiword/abiword-plugins_2.6.0.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word" +HOMEPAGE = "http://www.abiword.org" +SECTION = "x11/office" +LICENSE = "GPLv2" +DEPENDS = "boost loudmouth libwpd librsvg goffice poppler libglade" +RDEPENDS = "abiword" + +SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \ + http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ + file://abiword-cxx-for-ld-fix.patch;patch=1 \ + " + +DEFAULT_PREFERENCE = "2" + +inherit autotools + +PARALLEL_MAKE="" + +# Ugly hack to find libstdc++ +export LD="${CXX}" + +EXTRA_OECONF = " --without-libwmf \ + --without-inter7eps \ + --with-abiword=${WORKDIR}/abiword-${PV} \ + --with-boost=${STAGING_DIR_HOST} \ + --with-boost-thread=boost_thread-mt \ + " + +PACKAGES_DYNAMIC = "abiword-plugin-*" + +python populate_packages_prepend () { + abiword_libdir = bb.data.expand('${libdir}/abiword-2.6/plugins', d) + do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='') + do_split_packages(d, abiword_libdir, '^libAbi(.*)\.la$', 'abiword-plugin-%s-dev', 'Abiword plugin for %s', extra_depends='') +} + + +PACKAGES =+ "abiword-plugin-collab-glade" + +FILES_abiword-plugin-collab-glade += "${datadir}" +RDEPENDS_abiword-plugin-collab-glade = "abiword-plugin-collab" + +FILES_${PN}-dbg += "${libdir}/abiword-2.6/plugins/.debug" + diff --git a/packages/abiword/abiword_2.6.0.bb b/packages/abiword/abiword_2.6.0.bb new file mode 100644 index 0000000000..e2db4a09cb --- /dev/null +++ b/packages/abiword/abiword_2.6.0.bb @@ -0,0 +1,3 @@ +require abiword-2.5.inc + +RCONFLICTS = "abiword-embedded" diff --git a/packages/abiword/files/abiword-cxx-for-ld-fix.patch b/packages/abiword/files/abiword-cxx-for-ld-fix.patch new file mode 100644 index 0000000000..e49b1e92e5 --- /dev/null +++ b/packages/abiword/files/abiword-cxx-for-ld-fix.patch @@ -0,0 +1,12 @@ +libstc++ isn't in staging anymore, so we must use g++ for linking + +--- /tmp/configure.ac 2008-03-31 11:39:13.130631737 +0200 ++++ abiword-plugins-2.6.0/configure.ac 2008-03-31 11:39:22.754586487 +0200 +@@ -14,6 +14,7 @@ + AC_PROG_INSTALL + AC_PROG_LN_S + AC_PROG_MAKE_SET ++AC_LANG_CPLUSPLUS + + AM_INIT_AUTOMAKE + diff --git a/packages/alsa/alsa-state/tosa/asound.state b/packages/alsa/alsa-state/tosa/asound.state index 12eaf2e036..c38265d792 100644 --- a/packages/alsa/alsa-state/tosa/asound.state +++ b/packages/alsa/alsa-state/tosa/asound.state @@ -37,13 +37,23 @@ state.Tosa { } control.5 { comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + iface MIXER + name 'PCM Playback Volume' + value.0 23 + value.1 23 + } + control.6 { + comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER name 'Speaker Playback ZC Switch' value true } - control.6 { + control.7 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -51,7 +61,7 @@ state.Tosa { name 'Speaker Playback Invert Switch' value true } - control.7 { + control.8 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -59,7 +69,7 @@ state.Tosa { name 'Headphone Playback ZC Switch' value true } - control.8 { + control.9 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -67,7 +77,7 @@ state.Tosa { name 'Mono Playback ZC Switch' value false } - control.9 { + control.10 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -76,7 +86,7 @@ state.Tosa { name 'Mono Playback Volume' value 0 } - control.10 { + control.11 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -85,16 +95,16 @@ state.Tosa { name 'ALC Target Volume' value 11 } - control.11 { + control.12 { comment.access 'read write' comment.type INTEGER comment.count 1 comment.range '0 - 15' iface MIXER name 'ALC Hold Time' - value 0 + value 2 } - control.12 { + control.13 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -103,7 +113,7 @@ state.Tosa { name 'ALC Decay Time' value 3 } - control.13 { + control.14 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -112,7 +122,7 @@ state.Tosa { name 'ALC Attack Time' value 2 } - control.14 { + control.15 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -124,7 +134,7 @@ state.Tosa { name 'ALC Function' value None } - control.15 { + control.16 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -133,7 +143,7 @@ state.Tosa { name 'ALC Max Volume' value 7 } - control.16 { + control.17 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -142,7 +152,7 @@ state.Tosa { name 'ALC ZC Timeout' value 0 } - control.17 { + control.18 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -150,7 +160,7 @@ state.Tosa { name 'ALC ZC Switch' value false } - control.18 { + control.19 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -158,7 +168,7 @@ state.Tosa { name 'ALC NG Switch' value false } - control.19 { + control.20 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -168,7 +178,7 @@ state.Tosa { name 'ALC NG Type' value 'Constant Gain' } - control.20 { + control.21 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -177,16 +187,16 @@ state.Tosa { name 'ALC NG Threshold' value 31 } - control.21 { + control.22 { comment.access 'read write' comment.type INTEGER comment.count 1 comment.range '0 - 7' iface MIXER name 'Mic Headphone Volume' - value 3 + value 7 } - control.22 { + control.23 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -195,7 +205,7 @@ state.Tosa { name 'ALC Headphone Volume' value 5 } - control.23 { + control.24 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -203,7 +213,7 @@ state.Tosa { name 'Out3 Switch' value false } - control.24 { + control.25 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -211,7 +221,7 @@ state.Tosa { name 'Out3 ZC Switch' value true } - control.25 { + control.26 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -220,7 +230,7 @@ state.Tosa { name 'Out3 Volume' value 0 } - control.26 { + control.27 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -229,7 +239,7 @@ state.Tosa { name 'PCBeep Bypass Headphone Volume' value 0 } - control.27 { + control.28 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -238,7 +248,7 @@ state.Tosa { name 'PCBeep Bypass Speaker Volume' value 0 } - control.28 { + control.29 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -247,16 +257,16 @@ state.Tosa { name 'PCBeep Bypass Phone Volume' value 0 } - control.29 { + control.30 { comment.access 'read write' comment.type INTEGER comment.count 1 comment.range '0 - 7' iface MIXER name 'Aux Playback Headphone Volume' - value 6 + value 5 } - control.30 { + control.31 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -265,7 +275,7 @@ state.Tosa { name 'Aux Playback Speaker Volume' value 0 } - control.31 { + control.32 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -274,7 +284,7 @@ state.Tosa { name 'Aux Playback Phone Volume' value 0 } - control.32 { + control.33 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -283,7 +293,7 @@ state.Tosa { name 'Phone Volume' value 0 } - control.33 { + control.34 { comment.access 'read write' comment.type INTEGER comment.count 2 @@ -293,7 +303,7 @@ state.Tosa { value.0 23 value.1 23 } - control.34 { + control.35 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -301,7 +311,7 @@ state.Tosa { name 'Capture 20dB Boost Switch' value true } - control.35 { + control.36 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -309,7 +319,7 @@ state.Tosa { name 'Capture to Phone 20dB Boost Switch' value true } - control.36 { + control.37 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -317,7 +327,7 @@ state.Tosa { name '3D Upper Cut-off Switch' value false } - control.37 { + control.38 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -325,7 +335,7 @@ state.Tosa { name '3D Lower Cut-off Switch' value false } - control.38 { + control.39 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -334,7 +344,7 @@ state.Tosa { name '3D Playback Volume' value 0 } - control.39 { + control.40 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -344,7 +354,7 @@ state.Tosa { name 'Bass Control' value 'Adaptive Boost' } - control.40 { + control.41 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -352,7 +362,7 @@ state.Tosa { name 'Bass Cut-off Switch' value true } - control.41 { + control.42 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -360,7 +370,7 @@ state.Tosa { name 'Tone Cut-off Switch' value false } - control.42 { + control.43 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -368,7 +378,7 @@ state.Tosa { name 'Playback Attenuate (-6dB) Switch' value false } - control.43 { + control.44 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -377,7 +387,7 @@ state.Tosa { name 'Bass Volume' value 8 } - control.44 { + control.45 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -386,7 +396,7 @@ state.Tosa { name 'Treble Volume' value 5 } - control.45 { + control.46 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -394,7 +404,7 @@ state.Tosa { name 'Capture ADC Switch' value false } - control.46 { + control.47 { comment.access 'read write' comment.type ENUMERATED comment.count 2 @@ -405,17 +415,17 @@ state.Tosa { value.0 '+0.75dB Steps' value.1 '+0.75dB Steps' } - control.47 { + control.48 { comment.access 'read write' comment.type INTEGER comment.count 2 comment.range '0 - 63' iface MIXER name 'Capture Volume' - value.0 63 - value.1 63 + value.0 0 + value.1 0 } - control.48 { + control.49 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -423,7 +433,7 @@ state.Tosa { name 'Capture ZC Switch' value false } - control.49 { + control.50 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -432,7 +442,7 @@ state.Tosa { name 'Mic 1 Volume' value 23 } - control.50 { + control.51 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -441,7 +451,7 @@ state.Tosa { name 'Mic 2 Volume' value 23 } - control.51 { + control.52 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -449,7 +459,7 @@ state.Tosa { name 'Mic 20dB Boost Switch' value false } - control.52 { + control.53 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -457,7 +467,7 @@ state.Tosa { name 'Speaker Mixer PCBeep Bypass Swi' value false } - control.53 { + control.54 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -465,7 +475,7 @@ state.Tosa { name 'Speaker Mixer Aux Playback Swit' value false } - control.54 { + control.55 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -473,7 +483,7 @@ state.Tosa { name 'Speaker Mixer Phone Bypass Swit' value false } - control.55 { + control.56 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -481,7 +491,7 @@ state.Tosa { name 'Speaker Mixer Line Bypass Switc' value false } - control.56 { + control.57 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -489,7 +499,7 @@ state.Tosa { name 'Speaker Mixer PCM Playback Swit' value true } - control.57 { + control.58 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -497,7 +507,7 @@ state.Tosa { name 'Phone Mixer PCBeep Bypass Switc' value false } - control.58 { + control.59 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -505,7 +515,7 @@ state.Tosa { name 'Phone Mixer Aux Playback Switch' value false } - control.59 { + control.60 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -513,7 +523,7 @@ state.Tosa { name 'Phone Mixer Line Bypass Switch' value false } - control.60 { + control.61 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -521,7 +531,7 @@ state.Tosa { name 'Phone Mixer PCM Playback Switch' value false } - control.61 { + control.62 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -529,7 +539,7 @@ state.Tosa { name 'Phone Mixer Mic 1 Sidetone Swit' value false } - control.62 { + control.63 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -537,55 +547,103 @@ state.Tosa { name 'Phone Mixer Mic 2 Sidetone Swit' value false } - control.63 { + control.64 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER - name 'HP Mixer PCBeep Bypass Switch' + name 'Right HP Mixer PCBeep Bypass Sw' value false } - control.64 { + control.65 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER - name 'HP Mixer Aux Playback Switch' + name 'Right HP Mixer Aux Playback Swi' value false } - control.65 { + control.66 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER - name 'HP Mixer Phone Bypass Switch' + name 'Right HP Mixer Phone Bypass Swi' value false } - control.66 { + control.67 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER - name 'HP Mixer Line Bypass Switch' + name 'Right HP Mixer Line Bypass Swit' value false } - control.67 { + control.68 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER - name 'HP Mixer PCM Playback Switch' + name 'Right HP Mixer PCM Playback Swi' value true } - control.68 { + control.69 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER - name 'HP Mixer Mic Sidetone Switch' + name 'Right HP Mixer Mic Sidetone Swi' value false } - control.69 { + control.70 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left HP Mixer PCBeep Bypass Swi' + value false + } + control.71 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left HP Mixer Aux Playback Swit' + value false + } + control.72 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left HP Mixer Phone Bypass Swit' + value false + } + control.73 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left HP Mixer Line Bypass Switc' + value false + } + control.74 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left HP Mixer PCM Playback Swit' + value true + } + control.75 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left HP Mixer Mic Sidetone Swit' + value false + } + control.76 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -595,7 +653,7 @@ state.Tosa { name 'Differential Source' value Mic } - control.70 { + control.77 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -607,7 +665,7 @@ state.Tosa { name 'Mic Select Source' value Differential } - control.71 { + control.78 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -623,7 +681,7 @@ state.Tosa { name 'Right Capture Select' value Mic } - control.72 { + control.79 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -639,7 +697,7 @@ state.Tosa { name 'Left Capture Select' value Mic } - control.73 { + control.80 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -651,7 +709,7 @@ state.Tosa { name 'Capture Phone Mux' value Mute } - control.74 { + control.81 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -659,9 +717,9 @@ state.Tosa { comment.item.1 'Headphone Mix' iface MIXER name 'Speaker Mux' - value 'Headphone Mix' + value 'Speaker Mix' } - control.75 { + control.82 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -673,7 +731,7 @@ state.Tosa { name 'Out3 Mux' value Left } - control.76 { + control.83 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -685,7 +743,7 @@ state.Tosa { name 'ALC Sidetone Mux' value Stereo } - control.77 { + control.84 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -696,17 +754,16 @@ state.Tosa { comment.item.4 Off iface MIXER name 'Jack Function' - value Headphone + value Off } - control.78 { + control.85 { comment.access 'read write' comment.type ENUMERATED comment.count 1 - comment.item.0 Auto - comment.item.1 On - comment.item.2 Off + comment.item.0 On + comment.item.1 Off iface MIXER name 'Speaker Function' - value Auto + value On } } diff --git a/packages/classpath/classpath-minimal_0.97.bb b/packages/classpath/classpath-minimal_0.97.1.bb index 7a44226940..31abce59c7 100644 --- a/packages/classpath/classpath-minimal_0.97.bb +++ b/packages/classpath/classpath-minimal_0.97.1.bb @@ -1,10 +1,6 @@ require classpath.inc -SRC_URI += "\ - file://xmlstream-fix.patch;patch=1;pnum=0 \ - " - -PR = "r1" +PR = "r0" PROVIDES = "${PN} classpath" diff --git a/packages/classpath/classpath_0.97.bb b/packages/classpath/classpath_0.97.1.bb index 4e45dd4350..b8cd02084a 100644 --- a/packages/classpath/classpath_0.97.bb +++ b/packages/classpath/classpath_0.97.1.bb @@ -1,10 +1,6 @@ require classpath.inc -SRC_URI += "\ - file://xmlstream-fix.patch;patch=1;pnum=0 \ - " - -PR = "r1" +PR = "r0" DEPENDS += "gtk+ gconf libxtst" diff --git a/packages/fakeroot/fakeroot-native_1.9.1.bb b/packages/fakeroot/fakeroot-native_1.9.4.bb index 77d6f58651..77d6f58651 100644 --- a/packages/fakeroot/fakeroot-native_1.9.1.bb +++ b/packages/fakeroot/fakeroot-native_1.9.4.bb diff --git a/packages/fakeroot/fakeroot_1.9.1.bb b/packages/fakeroot/fakeroot_1.9.4.bb index aaf696d79d..aaf696d79d 100644 --- a/packages/fakeroot/fakeroot_1.9.1.bb +++ b/packages/fakeroot/fakeroot_1.9.4.bb diff --git a/packages/flumotion/flumotion_0.4.1.bb b/packages/flumotion/flumotion_0.4.1.bb index f709086846..976c8c4142 100644 --- a/packages/flumotion/flumotion_0.4.1.bb +++ b/packages/flumotion/flumotion_0.4.1.bb @@ -9,7 +9,7 @@ RDEPENDS = "python-resource python-pprint python-threading \ python-lang python-zopeinterface python-textutils \ python-gst python-misc" RDEPENDS_${PN}-gui = "${PN} python-pygtk python-pycairo" -PR = "r9" +PR = "r10" SRC_URI = "http://www.flumotion.net/src/flumotion/flumotion-${PV}.tar.bz2 \ file://python-path.patch;patch=1 \ @@ -21,11 +21,7 @@ export EPYDOC = "no" EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" -#Yes, we know: -#ERROR: flumotion-dbg is listed in PACKAGES mutliple times, this leads to packaging errors. -#ERROR: Please fix the metadata/report this as bug to OE bugtracker. - -PACKAGES =+ "${PN}-dbg flumotion-gui" +PACKAGES =+ "flumotion-gui" FILES_${PN}-dbg += "${libdir}/flumotion/python/flumotion/extern/*/.debug/*" FILES_${PN} = "${bindir} ${sbindir} ${libdir}/flumotion" @@ -34,7 +30,11 @@ FILES_${PN}-gui = "${bindir}/flumotion-admin ${bindir}/flumotion-tester \ ${libdir}/flumotion/python/flumotion/admin/gtk \ ${libdir}/flumotion/python/flumotion/component/*/admin_gtk* \ ${libdir}/flumotion/python/flumotion/component/*/*/admin_gtk* \ - ${libdir}/flumotion/python/flumotion/extern \ + ${libdir}/flumotion/python/flumotion/extern/*.py* \ + ${libdir}/flumotion/python/flumotion/extern/fdpass/*.py* \ + ${libdir}/flumotion/python/flumotion/extern/fdpass/fdpass.so \ + ${libdir}/flumotion/python/flumotion/extern/pytrayicon/*.py* \ + ${libdir}/flumotion/python/flumotion/extern/pytrayicon/pytrayicon.so \ ${libdir}/flumotion/python/flumotion/manager \ ${libdir}/flumotion/python/flumotion/ui \ ${libdir}/flumotion/python/flumotion/wizard \ diff --git a/packages/gcc/gcc-package-target.inc b/packages/gcc/gcc-package-target.inc index 2c19c5ecc7..975aa88fe7 100644 --- a/packages/gcc/gcc-package-target.inc +++ b/packages/gcc/gcc-package-target.inc @@ -115,9 +115,9 @@ do_install () { if [ -f ${D}${libdir}/nof/libgcc_s.so ]; then mv ${D}${libdir}/nof/libgcc_s.so.* ${D}${base_libdir} else - mv ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir} + mv ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir} || true fi - rm -f ${D}${libdir}/libgcc_s.so + rm -f ${D}${libdir}/libgcc_s.so || true ln -sf `echo ${libdir}/gcc/${TARGET_SYS}/${BINV} \ | tr -s / \ | sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.1 \ diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb index 46846f5ee0..6646604dae 100644 --- a/packages/glibc/eglibc_svn.bb +++ b/packages/glibc/eglibc_svn.bb @@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE = "-1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.7+svnr${SRCREV}" -PR = "r3" +PR = "r4" SRC_URI = "svn://svn.eglibc.org;module=trunk \ file://etc/ld.so.conf \ file://generate-supported.mk" diff --git a/packages/glibc/files/glibc-includes-fixed-isystem.patch b/packages/glibc/files/glibc-includes-fixed-isystem.patch new file mode 100644 index 0000000000..06668f41ed --- /dev/null +++ b/packages/glibc/files/glibc-includes-fixed-isystem.patch @@ -0,0 +1,32 @@ +http://sourceware.org/ml/libc-alpha/2007-03/msg00017.html: + +GCC trunk now has multiple internal headers directories, one +containing the self-contained GCC-provided headers and one containing +the <limits.h> (not self-contained but including libc's <limits.h> or +a fixed version thereof) and the fixed headers; more such directories +may be added in future. + +When glibc uses -nostdinc, it needs to use -isystem options for all +these internal directories. This patch teaches it about the +include-fixed directory (and is harmless with old GCC versions without +that directory). + +2007-03-18 Joseph Myers <joseph@codesourcery.com> + + * configure.in: Also pass -isystem option for GCC's include-fixed + directory. + * configure: Regenerate. + +Index: configure.in +=================================================================== +--- /tmp/configure.in 2008-04-05 19:20:52.176759390 +0200 ++++ glibc-2.6.1/configure.in 2008-04-05 19:21:26.663424600 +0200 +@@ -912,7 +912,7 @@ + # thing on a system that doesn't need fixincludes. (Not presently a problem.) + if test -n "$sysheaders"; then + ccheaders=`$CC -print-file-name=include` +- SYSINCLUDES="-nostdinc -isystem $ccheaders \ ++ SYSINCLUDES="-nostdinc -isystem $ccheaders -isystem $ccheaders-fixed \ + -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`" + if test -n "$CXX"; then + cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` && diff --git a/packages/glibc/glibc.inc b/packages/glibc/glibc.inc index 40e0f8f333..c8d2d3b16f 100644 --- a/packages/glibc/glibc.inc +++ b/packages/glibc/glibc.inc @@ -7,6 +7,8 @@ LICENSE = "LGPL" DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" #this leads to circular deps, so lets not add it yet #RDEPENDS_ldd += " bash" +# nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this +RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES += "virtual/libintl virtual/libiconv" diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb index b3a779c6ef..bf4a4092fc 100644 --- a/packages/glibc/glibc_2.2.5.bb +++ b/packages/glibc/glibc_2.2.5.bb @@ -1,7 +1,7 @@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r13" +PR = "r14" DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb index 21568e24b3..04d5b415bf 100644 --- a/packages/glibc/glibc_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb @@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r23" +PR = "r24" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb index e782ecfa82..7289e0985a 100644 --- a/packages/glibc/glibc_2.3.2.bb +++ b/packages/glibc/glibc_2.3.2.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r12" +PR = "r13" DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb index 0af357a883..6bc6ccc0b1 100644 --- a/packages/glibc/glibc_2.3.3+cvs20041128.bb +++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb @@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r8" +PR = "r9" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb index f6a7d43812..5e4ee1ef66 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050221.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb @@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r8" +PR = "r9" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb index 2894ce835a..0b8376349e 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050420.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb @@ -5,7 +5,7 @@ DEFAULT_PREFERENCE_i586 = "0" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r6" +PR = "r7" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb index 7f2d67e87a..6421e6c966 100644 --- a/packages/glibc/glibc_2.3.3.bb +++ b/packages/glibc/glibc_2.3.3.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r9" +PR = "r10" DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index c916b2ba05..1635f6bf77 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -2,7 +2,7 @@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" -PR = "r15" +PR = "r16" #Doesnt build for sh3 DEFAULT_PREFERENCE_sh3="-1" diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb index 67446cad7d..85dfcb7f59 100644 --- a/packages/glibc/glibc_2.4.bb +++ b/packages/glibc/glibc_2.4.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r13" +PR = "r14" #add the hosts that are confirmed to be working to COMPATIBLE_HOSTi COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)' diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb index 0dc1c41070..b48f3e1884 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -1,5 +1,5 @@ require glibc.inc -PR = "r10" +PR = "r11" ARM_INSTRUCTION_SET = "arm" diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb index 4c59bbdc13..0cbdef8dcb 100644 --- a/packages/glibc/glibc_2.6.1.bb +++ b/packages/glibc/glibc_2.6.1.bb @@ -1,5 +1,5 @@ require glibc.inc -PR = "r3" +PR = "r4" ARM_INSTRUCTION_SET = "arm" diff --git a/packages/glibc/glibc_2.7.bb b/packages/glibc/glibc_2.7.bb index 97ce488df4..74fc79f586 100644 --- a/packages/glibc/glibc_2.7.bb +++ b/packages/glibc/glibc_2.7.bb @@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev" -PR = "r0" +PR = "r1" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb index 63fbba93e7..62d4cc53c3 100644 --- a/packages/glibc/glibc_cvs.bb +++ b/packages/glibc/glibc_cvs.bb @@ -1,7 +1,7 @@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" -PR = "r6" +PR = "r7" PV = "2.3.5+cvs${SRCDATE}" GLIBC_ADDONS ?= "ports,linuxthreads" diff --git a/packages/gnome/libgnomecups_0.2.2.bb b/packages/gnome/libgnomecups_0.2.2.bb index 53251ba84b..905a4a6ea7 100644 --- a/packages/gnome/libgnomecups_0.2.2.bb +++ b/packages/gnome/libgnomecups_0.2.2.bb @@ -6,6 +6,11 @@ DEPENDS="glib-2.0 gtk+ pango cups intltool libgnomeui" inherit gnome pkgconfig +do_compile_append () { + cp libgnomecups-1.0.pc libgnomecups-1.0.pc.old + sed 's:${STAGING_DIR_HOST}::' < libgnomecups-1.0.pc.old > libgnomecups-1.0.pc +} + do_stage() { autotools_stage_all } diff --git a/packages/gnuplot/gnuplot.inc b/packages/gnuplot/gnuplot.inc index 9f1eebf003..bf442527af 100644 --- a/packages/gnuplot/gnuplot.inc +++ b/packages/gnuplot/gnuplot.inc @@ -4,18 +4,16 @@ HOMEPAGE = "http://www.gnuplot.info/" SECTION = "console/scientific" LICENSE = "BSD-4" PRIORITY = "optional" -DEPENDS = "pango cairo virtual/libx11 libpng gd readline" +DEPENDS = "virtual/libx11 readline" inherit autotools acpaths = "" EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \ - --without-plot \ - --with-png=${STAGING_LIBDIR}/.. \ - --with-gd=${STAGING_LIBDIR}/.. \ --without-lisp-files \ - --without-tutorial" + --without-tutorial \ + --disable-wxwidgets" do_compile_prepend() { install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/ diff --git a/packages/gnuplot/gnuplot_4.0.0.bb b/packages/gnuplot/gnuplot_4.0.0.bb index 6e1be52173..abf519ae6e 100644 --- a/packages/gnuplot/gnuplot_4.0.0.bb +++ b/packages/gnuplot/gnuplot_4.0.0.bb @@ -1,6 +1,6 @@ require gnuplot.inc -PR = "r4" +PR = "r5" SRC_URI = "ftp://ftp.gnuplot.info/pub/gnuplot/gnuplot-${PV}.tar.gz \ file://subdirs.patch;patch=1 \ diff --git a/packages/gnuplot/gnuplot_4.2.2.bb b/packages/gnuplot/gnuplot_4.2.3.bb index 478f6e2b0f..478f6e2b0f 100644 --- a/packages/gnuplot/gnuplot_4.2.2.bb +++ b/packages/gnuplot/gnuplot_4.2.3.bb diff --git a/packages/gnuplot/gnuplot_cvs.bb b/packages/gnuplot/gnuplot_cvs.bb index d63d31a492..ff3e9b3810 100644 --- a/packages/gnuplot/gnuplot_cvs.bb +++ b/packages/gnuplot/gnuplot_cvs.bb @@ -3,6 +3,8 @@ require gnuplot.inc PV = "4.3.0+cvs${SRCDATE}" PR = "r0" +DEFAULT_PREFERENCE = "-1" + SRC_URI = "cvs://anonymous@gnuplot.cvs.sourceforge.net/cvsroot/${PN};module=${PN} \ http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz \ file://subdirs.patch;patch=1 \ diff --git a/packages/gnuplot/qtplot_0.2.bb b/packages/gnuplot/qtplot_0.2.bb index 80b3e4a603..cc57260f49 100644 --- a/packages/gnuplot/qtplot_0.2.bb +++ b/packages/gnuplot/qtplot_0.2.bb @@ -1,14 +1,14 @@ DESCRIPTION = "QT Gnuplot is a front end for Gnuplot. Install Opie-Embedded \ console to enable the Launch Gnuplot menu option." +HOMEPAGE = "http://www.mneuroth.de/privat/zaurus/gnuplot.html" SECTION = "opie/applications" -PRIORITY = "optional" -LICENSE = "GPL" -PRIORITY = "optional" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gnuplot" +RDEPDENDS_${PN} = "gnuplot" -DEPENDS = "gnuplot" -RDEPDENDS = "gnuplot" +PR = "r1" -HOMEPAGE = "http://www.mneuroth.de/privat/zaurus/gnuplot.html" SRC_URI = "http://www.mneuroth.de/privat/zaurus/qtplot-${PV}.tar.gz" APPTYPE = "binary" diff --git a/packages/hostap/hostap-daemon-0.6.0/.mtn2git_empty b/packages/gnuradio/gnuradio-3.1.2/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/hostap/hostap-daemon-0.6.0/.mtn2git_empty +++ b/packages/gnuradio/gnuradio-3.1.2/.mtn2git_empty diff --git a/packages/gnuradio/gnuradio-3.1.2/no-trellis-doc.patch b/packages/gnuradio/gnuradio-3.1.2/no-trellis-doc.patch new file mode 100644 index 0000000000..a5c1b90bd2 --- /dev/null +++ b/packages/gnuradio/gnuradio-3.1.2/no-trellis-doc.patch @@ -0,0 +1,20 @@ +--- /tmp/Makefile.am 2008-04-01 10:50:58.848945668 +0200 ++++ gnuradio-3.1.2/usrp/Makefile.am 2008-04-01 10:51:06.095612812 +0200 +@@ -24,7 +24,7 @@ + usrp.iss.in \ + usrp.inf + +-SUBDIRS = host firmware fpga doc ++SUBDIRS = host firmware fpga + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = \ +--- /tmp/Makefile.am 2008-04-01 10:52:10.615605452 +0200 ++++ gnuradio-3.1.2/gr-trellis/Makefile.am 2008-04-01 10:52:19.807923018 +0200 +@@ -21,5 +21,5 @@ + + include $(top_srcdir)/Makefile.common + +-SUBDIRS = src doc ++SUBDIRS = src + diff --git a/packages/gnuradio/gnuradio.inc b/packages/gnuradio/gnuradio.inc index 4916411f0a..79b1fcefa5 100644 --- a/packages/gnuradio/gnuradio.inc +++ b/packages/gnuradio/gnuradio.inc @@ -21,7 +21,8 @@ EXTRA_OECONF = " \ --enable-gr-audio-jack \ --enable-gr-audio-oss \ --enable-mblock \ - " + --disable-html-docs \ + " do_configure_append() { find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g diff --git a/packages/gnuradio/gnuradio_3.1.2.bb b/packages/gnuradio/gnuradio_3.1.2.bb new file mode 100644 index 0000000000..30a6d0ab5e --- /dev/null +++ b/packages/gnuradio/gnuradio_3.1.2.bb @@ -0,0 +1,8 @@ +require gnuradio.inc + +PR = "r0" + +SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \ + file://no-trellis-doc.patch;patch=1 \ + " + diff --git a/packages/gnuradio/gnuradio_svn.bb b/packages/gnuradio/gnuradio_svn.bb index c84a8a2121..00d3a04056 100644 --- a/packages/gnuradio/gnuradio_svn.bb +++ b/packages/gnuradio/gnuradio_svn.bb @@ -1,6 +1,6 @@ require gnuradio.inc -DEFAULT_PREFERENCE = "1" +DEFAULT_PREFERENCE = "-1" PV = "3.0.4+svnr${SRCREV}" PR = "r2" diff --git a/packages/gtk+/gtk+_2.10.14.bb b/packages/gtk+/gtk+_2.10.14.bb index d8ae8ae9ba..c9b98a1897 100644 --- a/packages/gtk+/gtk+_2.10.14.bb +++ b/packages/gtk+/gtk+_2.10.14.bb @@ -1,6 +1,6 @@ require gtk-2.10.inc -PR = "r8" +PR = "r9" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ file://no-xwc.patch;patch=1 \ @@ -12,7 +12,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ file://scroll-timings.patch;patch=1 \ file://small-gtkfilesel.patch;patch=1 \ file://small-gtkfilechooser.patch;patch=1 \ - file://migration.patch;patch=1;pnum=0 \ +# file://migration.patch;patch=1;pnum=0 \ file://run-iconcache.patch;patch=1 \ file://hardcoded_libtool.patch;patch=1 \ file://no-demos.patch;patch=1 \ diff --git a/packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty b/packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty diff --git a/packages/hostap/hostap-daemon-0.6.0/init b/packages/hostap/hostap-daemon-0.6.3/init index 79f74b681e..79f74b681e 100644 --- a/packages/hostap/hostap-daemon-0.6.0/init +++ b/packages/hostap/hostap-daemon-0.6.3/init diff --git a/packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff b/packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff index 9534199e78..9534199e78 100644 --- a/packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff +++ b/packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff diff --git a/packages/hostap/hostap-daemon_0.6.0.bb b/packages/hostap/hostap-daemon_0.6.3.bb index 37b710db19..37b710db19 100644 --- a/packages/hostap/hostap-daemon_0.6.0.bb +++ b/packages/hostap/hostap-daemon_0.6.3.bb diff --git a/packages/klibc/files/dash_readopt.patch b/packages/klibc/files/dash_readopt.patch new file mode 100644 index 0000000000..49bc087edd --- /dev/null +++ b/packages/klibc/files/dash_readopt.patch @@ -0,0 +1,105 @@ +Index: klibc-1.5/usr/dash/miscbltin.c +=================================================================== +--- klibc-1.5.orig/usr/dash/miscbltin.c 2008-03-27 20:38:09.354564817 +0100 ++++ klibc-1.5/usr/dash/miscbltin.c 2008-04-04 18:05:32.063364195 +0200 +@@ -46,6 +46,7 @@ + #include <ctype.h> + #include <stdint.h> + #include <time.h> /* strtotimeval() */ ++#include <termios.h> + + #include "shell.h" + #include "options.h" +@@ -83,6 +84,11 @@ + int timeout; + int i; + fd_set set; ++ int n_flag = 0; ++ unsigned int nchars = 0; ++ int silent = 0; ++ struct termios tty, old_tty; ++ + struct timeval ts, t0, t1, to; + + ts.tv_sec = ts.tv_usec = 0; +@@ -90,11 +96,18 @@ + rflag = 0; + timeout = 0; + prompt = NULL; +- while ((i = nextopt("p:rt:")) != '\0') { ++ while ((i = nextopt("p:rt:n:s")) != '\0') { + switch(i) { + case 'p': + prompt = optionarg; + break; ++ case 'n': ++ nchars = strtoul(optionarg, NULL, 10); ++ n_flag = nchars; /* just a flag "nchars is nonzero" */ ++ break; ++ case 's': ++ silent = 1; ++ break; + case 't': + p = strtotimeval(optionarg, &ts); + if (*p || (!ts.tv_sec && !ts.tv_usec)) +@@ -118,6 +131,23 @@ + sh_error("arg count"); + if ((ifs = bltinlookup("IFS")) == NULL) + ifs = defifs; ++ if (n_flag || silent) { ++ if (tcgetattr(0, &tty) != 0) { ++ /* Not a tty */ ++ n_flag = 0; ++ silent = 0; ++ } else { ++ old_tty = tty; ++ if (n_flag) { ++ tty.c_lflag &= ~ICANON; ++ tty.c_cc[VMIN] = nchars < 256 ? nchars : 255; ++ } ++ if (silent) { ++ tty.c_lflag &= ~(ECHO | ECHOK | ECHONL); ++ } ++ tcsetattr(0, TCSANOW, &tty); ++ } ++ } + status = 0; + startword = 1; + backslash = 0; +@@ -133,13 +163,15 @@ + ts.tv_sec += t0.tv_sec; + } + STARTSTACKSTR(p); +- for (;;) { ++ do { + if (timeout) { + gettimeofday(&t1, NULL); + if (t1.tv_sec > ts.tv_sec || + (t1.tv_sec == ts.tv_sec && + t1.tv_usec >= ts.tv_usec)) { + status = 1; ++ if (n_flag) ++ tcsetattr(0, TCSANOW, &old_tty); + break; /* Timeout! */ + } + +@@ -156,6 +188,8 @@ + FD_SET(0, &set); + if (select(1, &set, NULL, NULL, &to) != 1) { + status = 1; ++ if (n_flag) ++ tcsetattr(0, TCSANOW, &old_tty); + break; /* Timeout! */ + } + } +@@ -191,7 +225,9 @@ + put: + STPUTC(c, p); + } +- } ++ } while (!n_flag || --nchars); ++ if (n_flag || silent) ++ tcsetattr(0, TCSANOW, &old_tty); + STACKSTRNUL(p); + /* Remove trailing blanks */ + while ((char *)stackblock() <= --p && strchr(ifs, *p) != NULL) diff --git a/packages/klibc/klibc-common.inc b/packages/klibc/klibc-common.inc index 41859d3243..5e890b3bc8 100644 --- a/packages/klibc/klibc-common.inc +++ b/packages/klibc/klibc-common.inc @@ -8,6 +8,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2 \ file://fstype-sane-vfat-and-jffs2-for-1.5.patch;patch=1 \ file://modprobe.patch;patch=1 \ file://losetup.patch;patch=1 \ + file://dash_readopt.patch;patch=1 \ " S = "${WORKDIR}/klibc-${PV}" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/klibc/klibc-utils-static_1.5.bb b/packages/klibc/klibc-utils-static_1.5.bb index c6f54489ab..f0429e34a2 100644 --- a/packages/klibc/klibc-utils-static_1.5.bb +++ b/packages/klibc/klibc-utils-static_1.5.bb @@ -1,6 +1,6 @@ require klibc-common.inc -PR = "r8" +PR = "r9" # We only want the static utils. klibc build both. So we install only what we want. do_install() { diff --git a/packages/klibc/klibc_1.5.bb b/packages/klibc/klibc_1.5.bb index 925dcd0c36..967f88f948 100644 --- a/packages/klibc/klibc_1.5.bb +++ b/packages/klibc/klibc_1.5.bb @@ -1,2 +1,2 @@ require klibc.inc -PR = "r6" +PR = "r7" diff --git a/packages/libopieobex/files/.mtn2git_empty b/packages/libopieobex/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libopieobex/files/.mtn2git_empty diff --git a/packages/libopieobex/files/disable-bt-check.patch b/packages/libopieobex/files/disable-bt-check.patch new file mode 100644 index 0000000000..067af145f7 --- /dev/null +++ b/packages/libopieobex/files/disable-bt-check.patch @@ -0,0 +1,19 @@ +--- obex/obex.pro 2007-07-20 23:44:06.000000000 +1200 ++++ obex/obex.pro 2007-10-18 17:57:15.000000000 +1300 +@@ -13,12 +13,12 @@ + include( $(OPIEDIR)/include.pro ) + target.path = $$prefix/plugins/applets + +-#FIXME: These parameters are used if bluetooth is used +-CONFTEST = $$system( echo $CONFIG_LIBOPIETOOTH ) +-contains( CONFTEST, y ){ ++#FIXME: This test does not work under OE. Instead, just always enable bluetooth. ++#CONFTEST = $$system( echo $CONFIG_LIBOPIETOOTH ) ++#contains( CONFTEST, y ){ + HEADERS += btobex.h + SOURCES += btobex.cpp + INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib + LIBS += -lopietooth1 -lbluetooth + DEFINES += BLUETOOTH +-} ++#} diff --git a/packages/libopieobex/libopieobex0_1.2.3.bb b/packages/libopieobex/libopieobex0_1.2.3.bb index eeaeb7bb70..047dcee6e6 100644 --- a/packages/libopieobex/libopieobex0_1.2.3.bb +++ b/packages/libopieobex/libopieobex0_1.2.3.bb @@ -1,5 +1,6 @@ require libopieobex0.inc - +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + file://disable-bt-check.patch;patch=1" diff --git a/packages/libopieobex/libopieobex0_cvs.bb b/packages/libopieobex/libopieobex0_cvs.bb index 1dcce8b68c..50c36686a9 100644 --- a/packages/libopieobex/libopieobex0_cvs.bb +++ b/packages/libopieobex/libopieobex0_cvs.bb @@ -1,6 +1,7 @@ require libopieobex0.inc PV = "${OPIE_CVS_PV}" -PR = "r6" +PR = "r7" SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \ - ${HANDHELDS_CVS};module=opie/pics" + ${HANDHELDS_CVS};module=opie/pics \ + file://disable-bt-check.patch;patch=1" diff --git a/packages/libpixman/libpixman_0.10.0.bb b/packages/libpixman/libpixman_0.10.0.bb new file mode 100644 index 0000000000..fba7dc9152 --- /dev/null +++ b/packages/libpixman/libpixman_0.10.0.bb @@ -0,0 +1,13 @@ +SECTION = "libs" +PRIORITY = "optional" +DESCRIPTION = "Low-level pixel manipulation library." +LICENSE = "X11" +SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz" +S = "${WORKDIR}/pixman-${PV}" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} + diff --git a/packages/linux/linux-beagleboard/beagle-board-patch-dirk.diff b/packages/linux/linux-beagleboard/beagle-board-patch-dirk.diff new file mode 100644 index 0000000000..b382423635 --- /dev/null +++ b/packages/linux/linux-beagleboard/beagle-board-patch-dirk.diff @@ -0,0 +1,1103 @@ +Index: linux-osk/arch/arm/configs/omap3_beagle_defconfig +=================================================================== +--- /dev/null ++++ linux-osk/arch/arm/configs/omap3_beagle_defconfig +@@ -0,0 +1,843 @@ ++# ++# Automatically generated make config: don't edit ++# Linux kernel version: 2.6.25-rc7-omap1 ++# Sun Mar 30 15:03:23 2008 ++# ++CONFIG_ARM=y ++CONFIG_SYS_SUPPORTS_APM_EMULATION=y ++CONFIG_GENERIC_GPIO=y ++CONFIG_GENERIC_TIME=y ++CONFIG_GENERIC_CLOCKEVENTS=y ++CONFIG_MMU=y ++# CONFIG_NO_IOPORT is not set ++CONFIG_GENERIC_HARDIRQS=y ++CONFIG_STACKTRACE_SUPPORT=y ++CONFIG_LOCKDEP_SUPPORT=y ++CONFIG_TRACE_IRQFLAGS_SUPPORT=y ++CONFIG_HARDIRQS_SW_RESEND=y ++CONFIG_GENERIC_IRQ_PROBE=y ++CONFIG_RWSEM_GENERIC_SPINLOCK=y ++# CONFIG_ARCH_HAS_ILOG2_U32 is not set ++# CONFIG_ARCH_HAS_ILOG2_U64 is not set ++CONFIG_GENERIC_HWEIGHT=y ++CONFIG_GENERIC_CALIBRATE_DELAY=y ++CONFIG_ARCH_SUPPORTS_AOUT=y ++CONFIG_ZONE_DMA=y ++CONFIG_VECTORS_BASE=0xffff0000 ++CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" ++ ++# ++# General setup ++# ++CONFIG_EXPERIMENTAL=y ++CONFIG_BROKEN_ON_SMP=y ++CONFIG_INIT_ENV_ARG_LIMIT=32 ++CONFIG_LOCALVERSION="" ++CONFIG_LOCALVERSION_AUTO=y ++CONFIG_SWAP=y ++CONFIG_SYSVIPC=y ++CONFIG_SYSVIPC_SYSCTL=y ++CONFIG_BSD_PROCESS_ACCT=y ++# CONFIG_BSD_PROCESS_ACCT_V3 is not set ++# CONFIG_IKCONFIG is not set ++CONFIG_LOG_BUF_SHIFT=14 ++# CONFIG_CGROUPS is not set ++CONFIG_GROUP_SCHED=y ++CONFIG_FAIR_GROUP_SCHED=y ++# CONFIG_RT_GROUP_SCHED is not set ++CONFIG_USER_SCHED=y ++# CONFIG_CGROUP_SCHED is not set ++CONFIG_SYSFS_DEPRECATED=y ++CONFIG_SYSFS_DEPRECATED_V2=y ++# CONFIG_RELAY is not set ++# CONFIG_NAMESPACES is not set ++CONFIG_BLK_DEV_INITRD=y ++CONFIG_INITRAMFS_SOURCE="" ++CONFIG_CC_OPTIMIZE_FOR_SIZE=y ++CONFIG_SYSCTL=y ++CONFIG_EMBEDDED=y ++CONFIG_UID16=y ++# CONFIG_SYSCTL_SYSCALL is not set ++CONFIG_KALLSYMS=y ++# CONFIG_KALLSYMS_ALL is not set ++CONFIG_KALLSYMS_EXTRA_PASS=y ++CONFIG_HOTPLUG=y ++CONFIG_PRINTK=y ++CONFIG_BUG=y ++CONFIG_ELF_CORE=y ++CONFIG_COMPAT_BRK=y ++CONFIG_BASE_FULL=y ++CONFIG_FUTEX=y ++CONFIG_ANON_INODES=y ++CONFIG_EPOLL=y ++CONFIG_SIGNALFD=y ++CONFIG_TIMERFD=y ++CONFIG_EVENTFD=y ++CONFIG_SHMEM=y ++CONFIG_VM_EVENT_COUNTERS=y ++CONFIG_SLAB=y ++# CONFIG_SLUB is not set ++# CONFIG_SLOB is not set ++# CONFIG_PROFILING is not set ++# CONFIG_MARKERS is not set ++CONFIG_HAVE_OPROFILE=y ++# CONFIG_KPROBES is not set ++CONFIG_HAVE_KPROBES=y ++CONFIG_HAVE_KRETPROBES=y ++CONFIG_PROC_PAGE_MONITOR=y ++CONFIG_SLABINFO=y ++CONFIG_RT_MUTEXES=y ++# CONFIG_TINY_SHMEM is not set ++CONFIG_BASE_SMALL=0 ++CONFIG_MODULES=y ++CONFIG_MODULE_UNLOAD=y ++# CONFIG_MODULE_FORCE_UNLOAD is not set ++CONFIG_MODVERSIONS=y ++CONFIG_MODULE_SRCVERSION_ALL=y ++CONFIG_KMOD=y ++CONFIG_BLOCK=y ++# CONFIG_LBD is not set ++# CONFIG_BLK_DEV_IO_TRACE is not set ++# CONFIG_LSF is not set ++# CONFIG_BLK_DEV_BSG is not set ++ ++# ++# IO Schedulers ++# ++CONFIG_IOSCHED_NOOP=y ++CONFIG_IOSCHED_AS=y ++CONFIG_IOSCHED_DEADLINE=y ++CONFIG_IOSCHED_CFQ=y ++CONFIG_DEFAULT_AS=y ++# CONFIG_DEFAULT_DEADLINE is not set ++# CONFIG_DEFAULT_CFQ is not set ++# CONFIG_DEFAULT_NOOP is not set ++CONFIG_DEFAULT_IOSCHED="anticipatory" ++CONFIG_CLASSIC_RCU=y ++ ++# ++# 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_IOP13XX is not set ++# CONFIG_ARCH_IOP32X is not set ++# CONFIG_ARCH_IOP33X is not set ++# CONFIG_ARCH_IXP23XX is not set ++# CONFIG_ARCH_IXP2000 is not set ++# CONFIG_ARCH_IXP4XX is not set ++# CONFIG_ARCH_L7200 is not set ++# CONFIG_ARCH_KS8695 is not set ++# CONFIG_ARCH_NS9XXX is not set ++# CONFIG_ARCH_MXC is not set ++# CONFIG_ARCH_ORION is not set ++# CONFIG_ARCH_PNX4008 is not set ++# CONFIG_ARCH_PXA is not set ++# 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_DAVINCI is not set ++CONFIG_ARCH_OMAP=y ++# CONFIG_ARCH_MSM7X00A is not set ++ ++# ++# TI OMAP Implementations ++# ++CONFIG_ARCH_OMAP_OTG=y ++# CONFIG_ARCH_OMAP1 is not set ++# CONFIG_ARCH_OMAP2 is not set ++CONFIG_ARCH_OMAP3=y ++ ++# ++# OMAP Feature Selections ++# ++CONFIG_OMAP_DEBUG_SRAM_PATCH=y ++# CONFIG_OMAP_RESET_CLOCKS is not set ++CONFIG_OMAP_BOOT_TAG=y ++CONFIG_OMAP_BOOT_REASON=y ++# CONFIG_OMAP_COMPONENT_VERSION is not set ++# CONFIG_OMAP_GPIO_SWITCH is not set ++CONFIG_OMAP_MUX=y ++CONFIG_OMAP_MUX_DEBUG=y ++CONFIG_OMAP_MUX_WARNINGS=y ++# CONFIG_OMAP_MCBSP is not set ++# CONFIG_OMAP_MMU_FWK is not set ++# CONFIG_OMAP_MBOX_FWK is not set ++CONFIG_OMAP_MPU_TIMER=y ++# CONFIG_OMAP_32K_TIMER is not set ++CONFIG_OMAP_DM_TIMER=y ++CONFIG_OMAP_LL_DEBUG_UART1=y ++# CONFIG_OMAP_LL_DEBUG_UART2 is not set ++# CONFIG_OMAP_LL_DEBUG_UART3 is not set ++CONFIG_OMAP_SERIAL_WAKE=y ++CONFIG_ARCH_OMAP34XX=y ++CONFIG_ARCH_OMAP3430=y ++ ++# ++# OMAP Board Type ++# ++# CONFIG_MACH_OMAP_3430SDP is not set ++CONFIG_MACH_OMAP3_BEAGLE=y ++ ++# ++# Boot options ++# ++ ++# ++# Power management ++# ++ ++# ++# Processor Type ++# ++CONFIG_CPU_32=y ++CONFIG_CPU_32v6K=y ++CONFIG_CPU_V7=y ++CONFIG_CPU_32v7=y ++CONFIG_CPU_ABRT_EV7=y ++CONFIG_CPU_PABRT_IFAR=y ++CONFIG_CPU_CACHE_V7=y ++CONFIG_CPU_CACHE_VIPT=y ++CONFIG_CPU_COPY_V6=y ++CONFIG_CPU_TLB_V7=y ++CONFIG_CPU_HAS_ASID=y ++CONFIG_CPU_CP15=y ++CONFIG_CPU_CP15_MMU=y ++ ++# ++# Processor Features ++# ++CONFIG_ARM_THUMB=y ++# CONFIG_ARM_XENON is not set ++# CONFIG_CPU_ICACHE_DISABLE is not set ++# CONFIG_CPU_DCACHE_DISABLE is not set ++# CONFIG_CPU_BPREDICT_DISABLE is not set ++CONFIG_HAS_TLS_REG=y ++# CONFIG_OUTER_CACHE is not set ++ ++# ++# Bus support ++# ++# CONFIG_PCI_SYSCALL is not set ++# CONFIG_ARCH_SUPPORTS_MSI is not set ++# CONFIG_PCCARD is not set ++ ++# ++# Kernel Features ++# ++# CONFIG_TICK_ONESHOT is not set ++# CONFIG_NO_HZ is not set ++# CONFIG_HIGH_RES_TIMERS is not set ++CONFIG_GENERIC_CLOCKEVENTS_BUILD=y ++# CONFIG_PREEMPT is not set ++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_SPARSEMEM_VMEMMAP_ENABLE is not set ++CONFIG_SPLIT_PTLOCK_CPUS=4 ++# CONFIG_RESOURCES_64BIT is not set ++CONFIG_ZONE_DMA_FLAG=1 ++CONFIG_BOUNCE=y ++CONFIG_VIRT_TO_BUS=y ++# CONFIG_LEDS is not set ++CONFIG_ALIGNMENT_TRAP=y ++ ++# ++# Boot options ++# ++CONFIG_ZBOOT_ROM_TEXT=0x0 ++CONFIG_ZBOOT_ROM_BSS=0x0 ++CONFIG_CMDLINE="root=/dev/nfs nfsroot=192.168.0.1:/home/user/buildroot ip=192.168.0.2:192.168.0.1:192.168.0.1:255.255.255.0:tgt:eth0:off rw console=ttyS2,115200n8" ++# CONFIG_XIP_KERNEL is not set ++# CONFIG_KEXEC is not set ++ ++# ++# CPU Frequency scaling ++# ++# CONFIG_CPU_FREQ 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 ++CONFIG_VFP=y ++CONFIG_VFPv3=y ++# CONFIG_NEON is not set ++ ++# ++# Userspace binary formats ++# ++CONFIG_BINFMT_ELF=y ++# CONFIG_BINFMT_AOUT is not set ++CONFIG_BINFMT_MISC=y ++ ++# ++# Power management options ++# ++# CONFIG_PM is not set ++CONFIG_ARCH_SUSPEND_POSSIBLE=y ++ ++# ++# Networking ++# ++# CONFIG_NET is not set ++ ++# ++# Device Drivers ++# ++ ++# ++# Generic Driver Options ++# ++CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" ++CONFIG_STANDALONE=y ++CONFIG_PREVENT_FIRMWARE_BUILD=y ++# CONFIG_FW_LOADER is not set ++# CONFIG_DEBUG_DRIVER is not set ++# CONFIG_DEBUG_DEVRES is not set ++# CONFIG_SYS_HYPERVISOR is not set ++# CONFIG_MTD is not set ++# CONFIG_PARPORT is not set ++CONFIG_BLK_DEV=y ++# CONFIG_BLK_DEV_COW_COMMON is not set ++CONFIG_BLK_DEV_LOOP=y ++# CONFIG_BLK_DEV_CRYPTOLOOP is not set ++CONFIG_BLK_DEV_RAM=y ++CONFIG_BLK_DEV_RAM_COUNT=16 ++CONFIG_BLK_DEV_RAM_SIZE=16384 ++# CONFIG_BLK_DEV_XIP is not set ++# CONFIG_CDROM_PKTCDVD is not set ++CONFIG_MISC_DEVICES=y ++# CONFIG_EEPROM_93CX6 is not set ++# CONFIG_OMAP_STI is not set ++# CONFIG_ENCLOSURE_SERVICES is not set ++# CONFIG_HAVE_IDE is not set ++ ++# ++# SCSI device support ++# ++# CONFIG_RAID_ATTRS is not set ++# CONFIG_SCSI is not set ++# CONFIG_SCSI_DMA is not set ++# CONFIG_SCSI_NETLINK is not set ++# CONFIG_ATA is not set ++# CONFIG_MD is not set ++ ++# ++# Input device support ++# ++CONFIG_INPUT=y ++# CONFIG_INPUT_FF_MEMLESS is not set ++# CONFIG_INPUT_POLLDEV is not set ++ ++# ++# Userland interfaces ++# ++# CONFIG_INPUT_MOUSEDEV is not set ++# CONFIG_INPUT_JOYDEV is not set ++CONFIG_INPUT_EVDEV=y ++# CONFIG_INPUT_EVBUG is not set ++ ++# ++# Input Device Drivers ++# ++CONFIG_INPUT_KEYBOARD=y ++# CONFIG_KEYBOARD_ATKBD is not set ++# 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_KEYBOARD_STOWAWAY is not set ++# CONFIG_KEYBOARD_GPIO is not set ++# CONFIG_INPUT_MOUSE is not set ++# CONFIG_INPUT_JOYSTICK is not set ++# CONFIG_INPUT_TABLET is not set ++CONFIG_INPUT_TOUCHSCREEN=y ++# CONFIG_TOUCHSCREEN_FUJITSU is not set ++# CONFIG_TOUCHSCREEN_GUNZE is not set ++# CONFIG_TOUCHSCREEN_ELO is not set ++# CONFIG_TOUCHSCREEN_MTOUCH is not set ++# CONFIG_TOUCHSCREEN_MK712 is not set ++# CONFIG_TOUCHSCREEN_PENMOUNT is not set ++# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set ++# CONFIG_TOUCHSCREEN_TOUCHWIN is not set ++# CONFIG_TOUCHSCREEN_UCB1400 is not set ++# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set ++# CONFIG_INPUT_MISC is not set ++ ++# ++# Hardware I/O ports ++# ++# CONFIG_SERIO 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=y ++CONFIG_SERIAL_8250_CONSOLE=y ++CONFIG_SERIAL_8250_NR_UARTS=32 ++CONFIG_SERIAL_8250_RUNTIME_UARTS=4 ++CONFIG_SERIAL_8250_EXTENDED=y ++CONFIG_SERIAL_8250_MANY_PORTS=y ++CONFIG_SERIAL_8250_SHARE_IRQ=y ++CONFIG_SERIAL_8250_DETECT_IRQ=y ++CONFIG_SERIAL_8250_RSA=y ++ ++# ++# Non-8250 serial port support ++# ++CONFIG_SERIAL_CORE=y ++CONFIG_SERIAL_CORE_CONSOLE=y ++CONFIG_UNIX98_PTYS=y ++# CONFIG_LEGACY_PTYS is not set ++# CONFIG_IPMI_HANDLER is not set ++CONFIG_HW_RANDOM=y ++# CONFIG_NVRAM is not set ++# CONFIG_R3964 is not set ++# CONFIG_RAW_DRIVER is not set ++# CONFIG_TCG_TPM is not set ++CONFIG_I2C=y ++CONFIG_I2C_BOARDINFO=y ++CONFIG_I2C_CHARDEV=y ++ ++# ++# I2C Algorithms ++# ++# CONFIG_I2C_ALGOBIT is not set ++# CONFIG_I2C_ALGOPCF is not set ++# CONFIG_I2C_ALGOPCA is not set ++ ++# ++# I2C Hardware Bus support ++# ++# CONFIG_I2C_GPIO is not set ++# CONFIG_I2C_OCORES is not set ++CONFIG_I2C_OMAP=y ++# CONFIG_I2C_PARPORT_LIGHT is not set ++# CONFIG_I2C_SIMTEC is not set ++# CONFIG_I2C_TAOS_EVM is not set ++# CONFIG_I2C_STUB is not set ++ ++# ++# Miscellaneous I2C Chip support ++# ++# CONFIG_DS1682 is not set ++# CONFIG_SENSORS_EEPROM is not set ++# CONFIG_SENSORS_PCF8574 is not set ++# CONFIG_PCF8575 is not set ++# CONFIG_SENSORS_PCF8591 is not set ++# CONFIG_ISP1301_OMAP is not set ++# CONFIG_TPS65010 is not set ++# CONFIG_SENSORS_TLV320AIC23 is not set ++CONFIG_TWL4030_CORE=y ++CONFIG_TWL4030_GPIO=y ++# CONFIG_TWL4030_USB is not set ++# CONFIG_TWL4030_POWEROFF is not set ++# CONFIG_SENSORS_MAX6875 is not set ++# CONFIG_SENSORS_TSL2550 is not set ++# CONFIG_I2C_DEBUG_CORE is not set ++# CONFIG_I2C_DEBUG_ALGO is not set ++# CONFIG_I2C_DEBUG_BUS is not set ++# CONFIG_I2C_DEBUG_CHIP is not set ++ ++# ++# SPI support ++# ++# CONFIG_SPI is not set ++# CONFIG_SPI_MASTER is not set ++CONFIG_HAVE_GPIO_LIB=y ++ ++# ++# GPIO Support ++# ++# CONFIG_DEBUG_GPIO is not set ++ ++# ++# I2C GPIO expanders: ++# ++# CONFIG_GPIO_PCA953X is not set ++# CONFIG_GPIO_PCF857X is not set ++ ++# ++# SPI GPIO expanders: ++# ++# CONFIG_W1 is not set ++# CONFIG_POWER_SUPPLY is not set ++# CONFIG_HWMON is not set ++CONFIG_WATCHDOG=y ++CONFIG_WATCHDOG_NOWAYOUT=y ++ ++# ++# Watchdog Device Drivers ++# ++# CONFIG_SOFT_WATCHDOG is not set ++CONFIG_OMAP_WATCHDOG=y ++ ++# ++# Sonics Silicon Backplane ++# ++CONFIG_SSB_POSSIBLE=y ++# CONFIG_SSB is not set ++ ++# ++# Multifunction device drivers ++# ++# CONFIG_MFD_SM501 is not set ++# CONFIG_MFD_ASIC3 is not set ++ ++# ++# Multimedia devices ++# ++# CONFIG_VIDEO_DEV is not set ++CONFIG_DAB=y ++ ++# ++# Graphics support ++# ++# CONFIG_VGASTATE is not set ++CONFIG_VIDEO_OUTPUT_CONTROL=m ++# CONFIG_FB is not set ++# CONFIG_BACKLIGHT_LCD_SUPPORT is not set ++ ++# ++# Display device support ++# ++# CONFIG_DISPLAY_SUPPORT is not set ++ ++# ++# Console display driver support ++# ++# CONFIG_VGA_CONSOLE is not set ++CONFIG_DUMMY_CONSOLE=y ++ ++# ++# Sound ++# ++# CONFIG_SOUND is not set ++CONFIG_HID_SUPPORT=y ++CONFIG_HID=y ++# CONFIG_HID_DEBUG is not set ++# CONFIG_HIDRAW is not set ++CONFIG_USB_SUPPORT=y ++CONFIG_USB_ARCH_HAS_HCD=y ++CONFIG_USB_ARCH_HAS_OHCI=y ++CONFIG_USB_ARCH_HAS_EHCI=y ++# CONFIG_USB is not set ++ ++# ++# Enable Host or Gadget support to see Inventra options ++# ++ ++# ++# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' ++# ++# CONFIG_USB_GADGET is not set ++CONFIG_MMC=y ++# CONFIG_MMC_DEBUG is not set ++# CONFIG_MMC_UNSAFE_RESUME is not set ++ ++# ++# MMC/SD Card Drivers ++# ++CONFIG_MMC_BLOCK=y ++CONFIG_MMC_BLOCK_BOUNCE=y ++# CONFIG_SDIO_UART is not set ++ ++# ++# MMC/SD Host Controller Drivers ++# ++# CONFIG_MMC_OMAP_HS is not set ++# CONFIG_NEW_LEDS is not set ++CONFIG_RTC_LIB=y ++# CONFIG_RTC_CLASS is not set ++ ++# ++# CBUS support ++# ++# CONFIG_CBUS 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=y ++# CONFIG_EXT3_FS_XATTR is not set ++# CONFIG_EXT4DEV_FS is not set ++CONFIG_JBD=y ++# 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_GFS2_FS is not set ++CONFIG_DNOTIFY=y ++CONFIG_INOTIFY=y ++CONFIG_INOTIFY_USER=y ++CONFIG_QUOTA=y ++CONFIG_PRINT_QUOTA_WARNING=y ++# CONFIG_QFMT_V1 is not set ++CONFIG_QFMT_V2=y ++CONFIG_QUOTACTL=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=y ++CONFIG_MSDOS_FS=y ++CONFIG_VFAT_FS=y ++CONFIG_FAT_DEFAULT_CODEPAGE=437 ++CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" ++# CONFIG_NTFS_FS is not set ++ ++# ++# Pseudo filesystems ++# ++CONFIG_PROC_FS=y ++CONFIG_PROC_SYSCTL=y ++CONFIG_SYSFS=y ++CONFIG_TMPFS=y ++# CONFIG_TMPFS_POSIX_ACL is not set ++# CONFIG_HUGETLB_PAGE is not set ++# 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_CRAMFS is not set ++# CONFIG_VXFS_FS is not set ++# CONFIG_MINIX_FS is not set ++# CONFIG_HPFS_FS is not set ++# CONFIG_QNX4FS_FS is not set ++# CONFIG_ROMFS_FS is not set ++# CONFIG_SYSV_FS is not set ++# CONFIG_UFS_FS is not set ++ ++# ++# Partition Types ++# ++CONFIG_PARTITION_ADVANCED=y ++# CONFIG_ACORN_PARTITION is not set ++# CONFIG_OSF_PARTITION is not set ++# CONFIG_AMIGA_PARTITION is not set ++# CONFIG_ATARI_PARTITION is not set ++# CONFIG_MAC_PARTITION is not set ++CONFIG_MSDOS_PARTITION=y ++# CONFIG_BSD_DISKLABEL is not set ++# CONFIG_MINIX_SUBPARTITION is not set ++# CONFIG_SOLARIS_X86_PARTITION is not set ++# CONFIG_UNIXWARE_DISKLABEL is not set ++# CONFIG_LDM_PARTITION is not set ++# CONFIG_SGI_PARTITION is not set ++# CONFIG_ULTRIX_PARTITION is not set ++# CONFIG_SUN_PARTITION is not set ++# CONFIG_KARMA_PARTITION is not set ++# CONFIG_EFI_PARTITION is not set ++# CONFIG_SYSV68_PARTITION is not set ++CONFIG_NLS=y ++CONFIG_NLS_DEFAULT="iso8859-1" ++CONFIG_NLS_CODEPAGE_437=y ++# 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 is not set ++# 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 ++ ++# ++# Kernel hacking ++# ++# CONFIG_PRINTK_TIME is not set ++CONFIG_ENABLE_WARN_DEPRECATED=y ++CONFIG_ENABLE_MUST_CHECK=y ++CONFIG_MAGIC_SYSRQ=y ++# CONFIG_UNUSED_SYMBOLS is not set ++# CONFIG_DEBUG_FS is not set ++# CONFIG_HEADERS_CHECK is not set ++CONFIG_DEBUG_KERNEL=y ++# CONFIG_DEBUG_SHIRQ is not set ++CONFIG_DETECT_SOFTLOCKUP=y ++CONFIG_SCHED_DEBUG=y ++# CONFIG_SCHEDSTATS is not set ++# CONFIG_TIMER_STATS 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=y ++# CONFIG_DEBUG_LOCK_ALLOC is not set ++# CONFIG_PROVE_LOCKING is not set ++# CONFIG_LOCK_STAT 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 is not set ++CONFIG_DEBUG_INFO=y ++# CONFIG_DEBUG_VM is not set ++# CONFIG_DEBUG_LIST is not set ++# CONFIG_DEBUG_SG is not set ++CONFIG_FRAME_POINTER=y ++# CONFIG_BOOT_PRINTK_DELAY is not set ++# CONFIG_RCU_TORTURE_TEST is not set ++# CONFIG_BACKTRACE_SELF_TEST is not set ++# CONFIG_FAULT_INJECTION is not set ++# CONFIG_SAMPLES is not set ++# CONFIG_DEBUG_USER is not set ++# CONFIG_DEBUG_ERRORS is not set ++# CONFIG_DEBUG_STACK_USAGE is not set ++CONFIG_DEBUG_LL=y ++# CONFIG_DEBUG_ICEDCC is not set ++ ++# ++# Security options ++# ++# CONFIG_KEYS is not set ++# CONFIG_SECURITY is not set ++# CONFIG_SECURITY_FILE_CAPABILITIES is not set ++CONFIG_CRYPTO=y ++CONFIG_CRYPTO_ALGAPI=y ++CONFIG_CRYPTO_BLKCIPHER=y ++# CONFIG_CRYPTO_SEQIV is not set ++CONFIG_CRYPTO_MANAGER=y ++# CONFIG_CRYPTO_HMAC is not set ++# CONFIG_CRYPTO_XCBC is not set ++# CONFIG_CRYPTO_NULL is not set ++# CONFIG_CRYPTO_MD4 is not set ++CONFIG_CRYPTO_MD5=y ++# CONFIG_CRYPTO_SHA1 is not set ++# 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_GF128MUL is not set ++CONFIG_CRYPTO_ECB=m ++CONFIG_CRYPTO_CBC=y ++CONFIG_CRYPTO_PCBC=m ++# CONFIG_CRYPTO_LRW is not set ++# CONFIG_CRYPTO_XTS is not set ++# CONFIG_CRYPTO_CTR is not set ++# CONFIG_CRYPTO_GCM is not set ++# CONFIG_CRYPTO_CCM is not set ++# CONFIG_CRYPTO_CRYPTD is not set ++CONFIG_CRYPTO_DES=y ++# CONFIG_CRYPTO_FCRYPT 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 is not set ++# CONFIG_CRYPTO_KHAZAD is not set ++# CONFIG_CRYPTO_ANUBIS is not set ++# CONFIG_CRYPTO_SEED is not set ++# CONFIG_CRYPTO_SALSA20 is not set ++# CONFIG_CRYPTO_DEFLATE is not set ++# CONFIG_CRYPTO_MICHAEL_MIC is not set ++# CONFIG_CRYPTO_CRC32C is not set ++# CONFIG_CRYPTO_CAMELLIA is not set ++# CONFIG_CRYPTO_TEST is not set ++# CONFIG_CRYPTO_AUTHENC is not set ++# CONFIG_CRYPTO_LZO is not set ++CONFIG_CRYPTO_HW=y ++ ++# ++# Library routines ++# ++CONFIG_BITREVERSE=y ++CONFIG_CRC_CCITT=y ++# CONFIG_CRC16 is not set ++# CONFIG_CRC_ITU_T is not set ++CONFIG_CRC32=y ++# CONFIG_CRC7 is not set ++CONFIG_LIBCRC32C=y ++CONFIG_PLIST=y ++CONFIG_HAS_IOMEM=y ++CONFIG_HAS_IOPORT=y ++CONFIG_HAS_DMA=y +Index: linux-osk/arch/arm/mach-omap2/Kconfig +=================================================================== +--- linux-osk.orig/arch/arm/mach-omap2/Kconfig ++++ linux-osk/arch/arm/mach-omap2/Kconfig +@@ -102,6 +102,10 @@ config MACH_OMAP_3430SDP + bool "OMAP 3430 SDP board" + depends on ARCH_OMAP3 && ARCH_OMAP34XX + ++config MACH_OMAP3_BEAGLE ++ bool "OMAP3 BEAGLE board" ++ depends on ARCH_OMAP3 && ARCH_OMAP34XX ++ + config MACH_OMAP_2430OSK + bool "OMAP 2430 OSK board" + depends on ARCH_OMAP2 && ARCH_OMAP24XX +Index: linux-osk/arch/arm/mach-omap2/board-omap3beagle.c +=================================================================== +--- /dev/null ++++ linux-osk/arch/arm/mach-omap2/board-omap3beagle.c +@@ -0,0 +1,136 @@ ++/* ++ * linux/arch/arm/mach-omap2/board-omap3beagle.c ++ * ++ * Copyright (C) 2007-2008 Texas Instruments ++ * ++ * Modified from mach-omap2/board-generic.c ++ * ++ * Initial code: Syed Mohammed Khasim ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include <linux/kernel.h> ++#include <linux/init.h> ++#include <linux/platform_device.h> ++#include <linux/mtd/mtd.h> ++#include <linux/mtd/partitions.h> ++ ++#include <asm/hardware.h> ++#include <asm/mach-types.h> ++#include <asm/mach/arch.h> ++#include <asm/mach/map.h> ++#include <asm/mach/flash.h> ++ ++#include <asm/arch/gpio.h> ++#include <asm/arch/board.h> ++#include <asm/arch/common.h> ++ ++static struct mtd_partition beagleboard_partitions[] = { ++ /* bootloader (U-Boot, etc) in first sector */ ++ { ++ .name = "bootloader", ++ .offset = 0, ++ .size = SZ_256K, ++ .mask_flags = MTD_WRITEABLE, /* force read-only */ ++ }, ++ /* bootloader params in the next sector */ ++ { ++ .name = "params", ++ .offset = MTDPART_OFS_APPEND, ++ .size = SZ_128K, ++ .mask_flags = 0, ++ }, ++ /* kernel */ ++ { ++ .name = "kernel", ++ .offset = MTDPART_OFS_APPEND, ++ .size = SZ_2M, ++ .mask_flags = 0 ++ }, ++ /* file system */ ++ { ++ .name = "filesystem", ++ .offset = MTDPART_OFS_APPEND, ++ .size = MTDPART_SIZ_FULL, ++ .mask_flags = 0 ++ } ++}; ++ ++static struct flash_platform_data beagleboard_flash_data = { ++ .map_name = "cfi_probe", ++ .width = 2, ++ .parts = beagleboard_partitions, ++ .nr_parts = ARRAY_SIZE(beagleboard_partitions), ++}; ++ ++static struct resource beagleboard_flash_resource = { ++ .start = FLASH_BASE, ++ .end = FLASH_BASE + SZ_64M - 1, ++ .flags = IORESOURCE_MEM, ++}; ++ ++static struct platform_device beagleboard_flash_device = { ++ .name = "omapflash", ++ .id = 0, ++ .dev = { ++ .platform_data = &beagleboard_flash_data, ++ }, ++ .num_resources = 1, ++ .resource = &beagleboard_flash_resource, ++}; ++ ++static struct platform_device *beagleboard_devices[] = { ++ &beagleboard_flash_device, ++}; ++ ++static void __init beagleboard_init_irq(void) ++{ ++ omap2_init_common_hw(); ++ omap_init_irq(); ++ omap_gpio_init(); ++} ++ ++static struct omap_uart_config beagleboard_uart_config __initdata = { ++ .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), ++}; ++ ++static struct omap_board_config_kernel beagleboard_config[] __initdata = { ++ { OMAP_TAG_UART, &beagleboard_uart_config }, ++}; ++static int __init beagleboard_i2c_init(void) ++{ ++ omap_register_i2c_bus(1, 2600, NULL, 0); ++ omap_register_i2c_bus(2, 400, NULL, 0); ++ omap_register_i2c_bus(3, 400, NULL, 0); ++ return 0; ++} ++ ++static void __init beagleboard_init(void) ++{ ++ platform_add_devices(beagleboard_devices, ++ ARRAY_SIZE(beagleboard_devices)); ++ omap_board_config = beagleboard_config; ++ omap_board_config_size = ARRAY_SIZE(beagleboard_config); ++ omap_serial_init(); ++} ++ ++static void __init beagleboard_map_io(void) ++{ ++ omap2_set_globals_343x(); ++ omap2_map_common_io(); ++} ++arch_initcall(beagleboard_i2c_init); ++ ++MACHINE_START(OMAP3_BEAGLE, "OMAP3 BEAGLE board") ++ /* Maintainer: Syed Khasim - Texas Instruments Inc */ ++ .phys_io = 0x48000000, ++ .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, ++ .boot_params = 0x80000100, ++ .map_io = beagleboard_map_io, ++ .init_irq = beagleboard_init_irq, ++ .init_machine = beagleboard_init, ++ .timer = &omap_timer, ++MACHINE_END +Index: linux-osk/include/asm-arm/arch-omap/board-omap3beagle.h +=================================================================== +--- /dev/null ++++ linux-osk/include/asm-arm/arch-omap/board-omap3beagle.h +@@ -0,0 +1,54 @@ ++/* ++ * linux/include/asm-arm/arch-omap/board-omap3beagle.h ++ * ++ * Hardware definitions for TI OMAP3530 beagle board. ++ * ++ * Initial creation by Syed Mohammed Khasim ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN ++ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#ifndef __ASM_ARCH_OMAP_3530BEAGLE_H ++#define __ASM_ARCH_OMAP_3530BEAGLE_H ++ ++#define FLASH_BASE 0x04000000 /* NOR flash (64 Meg aligned) */ ++#define NAND_BASE 0x0C000000 /* NAND flash */ ++#define ONENAND_MAP 0x20000000 /* OneNand flash */ ++ ++#ifdef CONFIG_TWL4030_CORE ++ ++#define TWL4030_IRQNUM INT_34XX_SYS_NIRQ ++ ++/* TWL4030 Primary Interrupt Handler (PIH) interrupts */ ++#define IH_TWL4030_BASE IH_BOARD_BASE ++#define IH_TWL4030_END (IH_TWL4030_BASE+8) ++ ++#ifdef CONFIG_TWL4030_GPIO ++ ++/* TWL4030 GPIO Interrupts */ ++#define IH_TWL4030_GPIO_BASE (IH_TWL4030_END) ++#define IH_TWL4030_GPIO_END (IH_TWL4030_BASE+18) ++#define NR_IRQS (IH_TWL4030_GPIO_END) ++#else ++#define NR_IRQS (IH_TWL4030_END) ++#endif /* CONFIG_I2C_TWL4030_GPIO */ ++#endif /* End of support for TWL4030 */ ++#endif /* __ASM_ARCH_OMAP_3530BEAGLE_H */ +Index: linux-osk/include/asm-arm/arch-omap/hardware.h +=================================================================== +--- linux-osk.orig/include/asm-arm/arch-omap/hardware.h ++++ linux-osk/include/asm-arm/arch-omap/hardware.h +@@ -335,6 +335,10 @@ + #include "board-3430sdp.h" + #endif + ++#ifdef CONFIG_MACH_OMAP3_BEAGLE ++#include "board-omap3beagle.h" ++#endif ++ + #ifdef CONFIG_MACH_OMAP_APOLLON + #include "board-apollon.h" + #endif +Index: linux-osk/Makefile +=================================================================== +--- linux-osk.orig/Makefile ++++ linux-osk/Makefile +@@ -196,7 +196,7 @@ SUBARCH := arm + # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile + export KBUILD_BUILDHOST := $(SUBARCH) + ARCH ?= $(SUBARCH) +-CROSS_COMPILE ?= arm-linux- ++CROSS_COMPILE ?= arm-none-linux-gnueabi- + + # Architecture as present in compile.h + UTS_MACHINE := $(ARCH) +Index: linux-osk/arch/arm/mach-omap2/Makefile +=================================================================== +--- linux-osk.orig/arch/arm/mach-omap2/Makefile ++++ linux-osk/arch/arm/mach-omap2/Makefile +@@ -34,6 +34,7 @@ obj-$(CONFIG_MACH_OMAP_3430SDP) += boar + board-sdp-hsmmc.o \ + board-3430sdp-usb.o \ + board-3430sdp-flash.o ++obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o + obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o \ + board-apollon-mmc.o \ + board-apollon-keys.o diff --git a/packages/linux/linux-beagleboard/defconfig b/packages/linux/linux-beagleboard/defconfig index 7a994cc810..6f8534eb3b 100644 --- a/packages/linux/linux-beagleboard/defconfig +++ b/packages/linux/linux-beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.24-rc3-omap1 -# Mon Dec 3 16:12:50 2007 +# Linux kernel version: 2.6.25-rc7-omap1 +# Tue Apr 1 12:22:43 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -21,6 +21,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_SUPPORTS_AOUT=y CONFIG_ZONE_DMA=y CONFIG_VECTORS_BASE=0xffff0000 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -36,18 +37,23 @@ CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=14 # CONFIG_CGROUPS is not set +CONFIG_GROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y -CONFIG_FAIR_USER_SCHED=y -# CONFIG_FAIR_CGROUP_SCHED is not set +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_USER_SCHED=y +# CONFIG_CGROUP_SCHED is not set CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_RELAY is not set +# CONFIG_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -62,17 +68,27 @@ CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y +CONFIG_COMPAT_BRK=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_ANON_INODES=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +# CONFIG_MARKERS is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 @@ -83,9 +99,9 @@ CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_KMOD=y CONFIG_BLOCK=y -# CONFIG_LBD is not set +CONFIG_LBD=y # CONFIG_BLK_DEV_IO_TRACE is not set -# CONFIG_LSF is not set +CONFIG_LSF=y # CONFIG_BLK_DEV_BSG is not set # @@ -94,12 +110,13 @@ CONFIG_BLOCK=y CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y +# CONFIG_IOSCHED_CFQ is not set CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set # CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="anticipatory" +CONFIG_CLASSIC_RCU=y # # System Type @@ -128,6 +145,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_ARCH_KS8695 is not set # CONFIG_ARCH_NS9XXX is not set # CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_ORION is not set # CONFIG_ARCH_PNX4008 is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_RPC is not set @@ -137,10 +155,12 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_DAVINCI is not set CONFIG_ARCH_OMAP=y +# CONFIG_ARCH_MSM7X00A is not set # # TI OMAP Implementations # +CONFIG_ARCH_OMAP_OTG=y # CONFIG_ARCH_OMAP1 is not set # CONFIG_ARCH_OMAP2 is not set CONFIG_ARCH_OMAP3=y @@ -252,7 +272,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/nfs nfsroot=192.168.0.1:/home/user/buildroot ip=192.168.0.2:192.168.0.1:192.168.0.1:255.255.255.0:tgt:eth0:off rw console=ttyS2,115200n8" +CONFIG_CMDLINE=" debug " # CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set @@ -286,12 +306,153 @@ CONFIG_BINFMT_MISC=y # Power management options # # CONFIG_PM is not set -CONFIG_SUSPEND_UP_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y # # Networking # -# CONFIG_NET is not set +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS 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 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=m +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_LRO is not set +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_IPV6_MIP6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=m +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +CONFIG_BRIDGE=m +CONFIG_VLAN_8021Q=m +# CONFIG_DECNET is not set +CONFIG_LLC=m +# 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 +# CONFIG_NET_SCHED is not set +CONFIG_NET_SCH_FIFO=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +# CONFIG_BT_HCIUSB is not set +# CONFIG_BT_HCIBTUSB is not set +CONFIG_BT_HCIBTSDIO=m +# 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_HCIBRF6150 is not set +# CONFIG_BT_HCIH4P is not set +# CONFIG_BT_HCIVHCI is not set +# CONFIG_AF_RXRPC is not set + +# +# Wireless +# +CONFIG_CFG80211=m +CONFIG_NL80211=y +CONFIG_WIRELESS_EXT=y +CONFIG_MAC80211=m + +# +# Rate control algorithm selection +# +CONFIG_MAC80211_RC_DEFAULT_PID=y +# CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set +# CONFIG_MAC80211_RC_DEFAULT_NONE is not set + +# +# Selecting 'y' for an algorithm will +# + +# +# build the algorithm into mac80211. +# +CONFIG_MAC80211_RC_DEFAULT="pid" +CONFIG_MAC80211_RC_PID=y +# CONFIG_MAC80211_RC_SIMPLE is not set +# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set +# CONFIG_MAC80211_DEBUG 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_CRYPT_TKIP is not set +# CONFIG_IEEE80211_SOFTMAC is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set # # Device Drivers @@ -303,23 +464,30 @@ CONFIG_SUSPEND_UP_POSSIBLE=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y -# CONFIG_FW_LOADER is not set +CONFIG_FW_LOADER=y # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set # CONFIG_MTD is not set # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +# CONFIG_BLK_DEV_XIP is not set # CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set CONFIG_MISC_DEVICES=y -# CONFIG_EEPROM_93CX6 is not set +CONFIG_EEPROM_93CX6=m +# CONFIG_OMAP_STI is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_HAVE_IDE is not set # # SCSI device support @@ -330,6 +498,81 @@ CONFIG_MISC_DEVICES=y # CONFIG_SCSI_NETLINK is not set # CONFIG_ATA is not set # CONFIG_MD is not set +CONFIG_NETDEVICES=y +CONFIG_NETDEVICES_MULTIQUEUE=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_VETH is not set +# CONFIG_NET_ETHERNET is not set +CONFIG_MII=m +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +CONFIG_WLAN_80211=y +CONFIG_LIBERTAS=m +# CONFIG_LIBERTAS_USB is not set +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_DEBUG is not set +# CONFIG_USB_ZD1201 is not set +# CONFIG_USB_NET_RNDIS_WLAN is not set +# CONFIG_RTL8187 is not set +CONFIG_P54_COMMON=m +# CONFIG_P54_USB is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_FIRMWARE_NVRAM=y +# CONFIG_B43 is not set +# CONFIG_B43LEGACY is not set +# CONFIG_ZD1211RW is not set +# CONFIG_RT2X00 is not set + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +# 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_PPPOL2TP=m +# CONFIG_SLIP is not set +CONFIG_SLHC=m +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_ISDN is not set # # Input device support @@ -435,21 +678,24 @@ CONFIG_I2C_OMAP=y # CONFIG_I2C_SIMTEC is not set # CONFIG_I2C_TAOS_EVM is not set # CONFIG_I2C_STUB is not set +# CONFIG_I2C_TINY_USB is not set # # Miscellaneous I2C Chip support # -# CONFIG_SENSORS_DS1337 is not set -# CONFIG_SENSORS_DS1374 is not set # CONFIG_DS1682 is not set # CONFIG_SENSORS_EEPROM is not set # CONFIG_SENSORS_PCF8574 is not set -# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_PCF8575 is not set # CONFIG_SENSORS_PCF8591 is not set +# CONFIG_ISP1301_OMAP is not set # CONFIG_TPS65010 is not set # CONFIG_SENSORS_TLV320AIC23 is not set CONFIG_TWL4030_CORE=y CONFIG_TWL4030_GPIO=y +CONFIG_TWL4030_USB=y +CONFIG_TWL4030_USB_HS_ULPI=y +# CONFIG_TWL4030_POWEROFF is not set # CONFIG_SENSORS_MAX6875 is not set # CONFIG_SENSORS_TSL2550 is not set # CONFIG_I2C_DEBUG_CORE is not set @@ -462,6 +708,22 @@ CONFIG_TWL4030_GPIO=y # # CONFIG_SPI is not set # CONFIG_SPI_MASTER is not set +CONFIG_HAVE_GPIO_LIB=y + +# +# GPIO Support +# +# CONFIG_DEBUG_GPIO is not set + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set + +# +# SPI GPIO expanders: +# # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set @@ -475,6 +737,11 @@ CONFIG_WATCHDOG_NOWAYOUT=y CONFIG_OMAP_WATCHDOG=y # +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set + +# # Sonics Silicon Backplane # CONFIG_SSB_POSSIBLE=y @@ -484,19 +751,48 @@ CONFIG_SSB_POSSIBLE=y # Multifunction device drivers # # CONFIG_MFD_SM501 is not set +# CONFIG_MFD_ASIC3 is not set # # Multimedia devices # # CONFIG_VIDEO_DEV is not set +# CONFIG_DVB_CORE is not set CONFIG_DAB=y +# CONFIG_USB_DABUSB is not set # # Graphics support # # CONFIG_VGASTATE is not set CONFIG_VIDEO_OUTPUT_CONTROL=m -# CONFIG_FB is not set +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +# CONFIG_FB_DDC is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_SYS_FOPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_VIRTUAL is not set +CONFIG_FB_OMAP=y +# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set +# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set +CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set # @@ -509,6 +805,13 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_LOGO is not set # # Sound @@ -518,39 +821,151 @@ CONFIG_HID_SUPPORT=y CONFIG_HID=y # CONFIG_HID_DEBUG is not set # CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_HID_FF is not set +# CONFIG_USB_HIDDEV is not set CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y -# CONFIG_USB_ARCH_HAS_EHCI is not set -# CONFIG_USB is not set +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +# CONFIG_USB_DEVICEFS is not set +CONFIG_USB_DEVICE_CLASS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_EHCI_HCD=y +CONFIG_OMAP_EHCI_PHY_MODE=y +# CONFIG_OMAP_EHCI_TLL_MODE is not set +# CONFIG_USB_EHCI_ROOT_HUB_TT is not set +# CONFIG_USB_EHCI_TT_NEWSCHED is not set +CONFIG_USB_ISP116X_HCD=y +CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_SL811_HCD=y +CONFIG_USB_R8A66597_HCD=y +CONFIG_USB_MUSB_HDRC=m +CONFIG_USB_MUSB_SOC=y + +# +# OMAP 343x high speed USB support +# +CONFIG_USB_MUSB_HOST=y +# CONFIG_USB_MUSB_PERIPHERAL is not set +# CONFIG_USB_MUSB_OTG is not set +# CONFIG_USB_GADGET_MUSB_HDRC is not set +CONFIG_USB_MUSB_HDRC_HCD=y +# CONFIG_MUSB_PIO_ONLY is not set +CONFIG_USB_INVENTRA_DMA=y +# CONFIG_USB_TI_CPPI_DMA is not set +CONFIG_USB_MUSB_LOGLEVEL=0 # -# Enable Host or Gadget support to see Inventra options +# 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' # # -# USB Gadget Support +# may also be needed; see USB_STORAGE Help for more information # -# CONFIG_USB_GADGET is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX 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_BERRY_CHARGE is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_SISUSBVGA is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_ATMEL_USBA is not set +# CONFIG_USB_GADGET_FSL_USB2 is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_PXA2XX is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LH7A40X is not set +CONFIG_USB_GADGET_OMAP=y +CONFIG_USB_OMAP=m +# CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +# CONFIG_USB_GADGET_DUALSPEED is not set +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m +# CONFIG_USB_MIDI_GADGET is not set +CONFIG_USB_G_PRINTER=m CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_UNSAFE_RESUME is not set +CONFIG_MMC_UNSAFE_RESUME=y # # MMC/SD Card Drivers # CONFIG_MMC_BLOCK=y CONFIG_MMC_BLOCK_BOUNCE=y -# CONFIG_SDIO_UART is not set +CONFIG_SDIO_UART=m # # MMC/SD Host Controller Drivers # -CONFIG_MMC_OMAP=y +CONFIG_MMC_OMAP_HS=y # CONFIG_NEW_LEDS is not set CONFIG_RTC_LIB=y # CONFIG_RTC_CLASS is not set @@ -573,27 +988,34 @@ CONFIG_JBD=y # 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_XFS_FS=m +CONFIG_XFS_QUOTA=y +# CONFIG_XFS_SECURITY is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set # CONFIG_GFS2_FS is not set -# CONFIG_MINIX_FS is not set -# CONFIG_ROMFS_FS is not set +# CONFIG_OCFS2_FS is not set +CONFIG_DNOTIFY=y CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_QUOTA=y +# CONFIG_QUOTA_NETLINK_INTERFACE is not set CONFIG_PRINT_QUOTA_WARNING=y # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y CONFIG_QUOTACTL=y -CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set -# CONFIG_FUSE_FS is not set +CONFIG_FUSE_FS=m # # CD-ROM/DVD Filesystems # -# CONFIG_ISO9660_FS is not set -# CONFIG_UDF_FS is not set +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y # # DOS/FAT/NT Filesystems @@ -603,7 +1025,9 @@ CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -# CONFIG_NTFS_FS is not set +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set # # Pseudo filesystems @@ -622,16 +1046,26 @@ CONFIG_TMPFS=y # 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_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_CRAMFS is not set +CONFIG_CRAMFS=m # CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set +CONFIG_NETWORK_FILESYSTEMS=y +# CONFIG_NFS_FS is not set +# CONFIG_NFSD 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 # # Partition Types @@ -641,9 +1075,9 @@ CONFIG_PARTITION_ADVANCED=y # CONFIG_OSF_PARTITION is not set # CONFIG_AMIGA_PARTITION is not set # CONFIG_ATARI_PARTITION is not set -# CONFIG_MAC_PARTITION is not set +CONFIG_MAC_PARTITION=y CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set +CONFIG_BSD_DISKLABEL=y # CONFIG_MINIX_SUBPARTITION is not set # CONFIG_SOLARIS_X86_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set @@ -693,10 +1127,8 @@ CONFIG_NLS_CODEPAGE_437=y # 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 -CONFIG_INSTRUMENTATION=y -# CONFIG_PROFILING is not set -# CONFIG_MARKERS is not set +CONFIG_NLS_UTF8=m +# CONFIG_DLM is not set # # Kernel hacking @@ -731,13 +1163,14 @@ CONFIG_DEBUG_INFO=y # CONFIG_DEBUG_LIST is not set # CONFIG_DEBUG_SG is not set CONFIG_FRAME_POINTER=y -CONFIG_FORCED_INLINING=y # CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_SAMPLES is not set # CONFIG_DEBUG_USER is not set # CONFIG_DEBUG_ERRORS is not set +# CONFIG_DEBUG_STACK_USAGE is not set CONFIG_DEBUG_LL=y # CONFIG_DEBUG_ICEDCC is not set @@ -750,13 +1183,14 @@ CONFIG_DEBUG_LL=y CONFIG_CRYPTO=y CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_BLKCIPHER=y +# CONFIG_CRYPTO_SEQIV is not set CONFIG_CRYPTO_MANAGER=y # CONFIG_CRYPTO_HMAC is not set # CONFIG_CRYPTO_XCBC is not set # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_MD4 is not set CONFIG_CRYPTO_MD5=y -# CONFIG_CRYPTO_SHA1 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 @@ -767,26 +1201,31 @@ CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_PCBC=m # CONFIG_CRYPTO_LRW is not set # CONFIG_CRYPTO_XTS is not set +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_CCM is not set # CONFIG_CRYPTO_CRYPTD is not set CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_FCRYPT 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_AES=m # CONFIG_CRYPTO_CAST5 is not set # CONFIG_CRYPTO_CAST6 is not set # CONFIG_CRYPTO_TEA is not set -# CONFIG_CRYPTO_ARC4 is not set +CONFIG_CRYPTO_ARC4=m # CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_ANUBIS is not set # CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SALSA20 is not set # CONFIG_CRYPTO_DEFLATE is not set -# CONFIG_CRYPTO_MICHAEL_MIC is not set +CONFIG_CRYPTO_MICHAEL_MIC=m # CONFIG_CRYPTO_CRC32C is not set # CONFIG_CRYPTO_CAMELLIA is not set # CONFIG_CRYPTO_TEST is not set # CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_LZO is not set CONFIG_CRYPTO_HW=y # @@ -799,6 +1238,8 @@ CONFIG_CRC_CCITT=y CONFIG_CRC32=y # CONFIG_CRC7 is not set CONFIG_LIBCRC32C=y +CONFIG_ZLIB_INFLATE=m +CONFIG_ZLIB_DEFLATE=m CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y diff --git a/packages/linux/linux-beagleboard_git.bb b/packages/linux/linux-beagleboard_git.bb index 610b9ea361..b7096deabb 100644 --- a/packages/linux/linux-beagleboard_git.bb +++ b/packages/linux/linux-beagleboard_git.bb @@ -1,12 +1,14 @@ require linux.inc -SRCREV = "1a77f70604e00b94bb3c841665a44b34430e9eda" -PV = "2.6.23+2.6.24rc3-git${SRCREV}" -PR = "r1" +SRCREV = "039ced63db6a3f90f8b8f23a74499e38c0462b27" +PV = "2.6.24+2.6.25rc7-git${SRCREV}" +PR = "r2" COMPATIBLE_MACHINE = "beagleboard" -SRC_URI = "git://www.beagleboard.org/linux.git;protocol=http \ + +SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ + file://beagle-board-patch-dirk.diff;patch=1 \ file://defconfig" -S = "${WORKDIR}/linux" +S = "${WORKDIR}/git" diff --git a/packages/linux/linux-rp-2.6.24/defconfig-collie b/packages/linux/linux-rp-2.6.24/defconfig-collie index b4b1e114d9..847fef882c 100644 --- a/packages/linux/linux-rp-2.6.24/defconfig-collie +++ b/packages/linux/linux-rp-2.6.24/defconfig-collie @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.24 -# Sun Jan 27 14:12:17 2008 +# Fri Apr 4 14:44:13 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -150,6 +150,7 @@ CONFIG_ARCH_SA1100=y # CONFIG_SA1100_ASSABET is not set # CONFIG_SA1100_CERF is not set CONFIG_SA1100_COLLIE=y +CONFIG_COLLIE_PM=y # CONFIG_SA1100_H3100 is not set # CONFIG_SA1100_H3600 is not set # CONFIG_SA1100_H3800 is not set @@ -962,6 +963,7 @@ CONFIG_SOUND=m CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m +CONFIG_SND_RAWMIDI=m # CONFIG_SND_SEQUENCER is not set CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m @@ -1012,7 +1014,48 @@ CONFIG_HID_SUPPORT=y CONFIG_HID=m # CONFIG_HID_DEBUG is not set # CONFIG_HIDRAW is not set -# CONFIG_USB_SUPPORT is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +# CONFIG_USB_ARCH_HAS_OHCI is not set +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_ATMEL_USBA is not set +# CONFIG_USB_GADGET_FSL_USB2 is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_PXA2XX is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_PXA27X 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_S3C2410 is not set +# CONFIG_USB_GADGET_AT91 is not set +CONFIG_USB_GADGET_SA1100=y +CONFIG_USB_SA1100=m +# CONFIG_USB_GADGET_DUMMY_HCD is not set +# CONFIG_USB_GADGET_DUALSPEED is not set +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=m +# CONFIG_USB_ETH_RNDIS is not set +# CONFIG_USB_ETH_NO_MDLM is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m +# CONFIG_USB_MIDI_GADGET is not set CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb index a650a31743..62dca60e2a 100644 --- a/packages/linux/linux-rp_2.6.24.bb +++ b/packages/linux/linux-rp_2.6.24.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r7" +PR = "r9" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_collie = "1" @@ -95,10 +95,12 @@ SRC_URI_append_collie = "\ ${TKSRC}/pcmcia_suspend.patch;patch=1 \ ${TKSRC}/locomo_spi-6.patch;patch=1 \ ${TKSRC}/config.patch;patch=1 \ - ${TKSRC}/locomokeyb.patch;patch=1 \ + ${TKSRC}/locomokeyb-2.patch;patch=1 \ ${TKSRC}/mmc-spi.patch;patch=1 \ ${TKSRC}/linux-2.6.24-SIMpad-rtc-sa1100.patch;patch=1 \ ${TKSRC}/sa1100_spinlock.patch;patch=1 \ + ${TKSRC}/sa1100-dma.patch;patch=1 \ + ${TKSRC}/sa1100_udc_g_ether-2.patch;patch=1 \ " SRC_URI_append_poodle = "\ diff --git a/packages/linux/linux-rt_2.6.24.bb b/packages/linux/linux-rt_2.6.24.bb index 8081f44e93..bddb16fdf0 100644 --- a/packages/linux/linux-rt_2.6.24.bb +++ b/packages/linux/linux-rt_2.6.24.bb @@ -4,8 +4,6 @@ require linux.inc DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_mpc8313e-rdb = "1" -DEPENDS_append_mpc8313e-rdb = " dtc-native" - PR = "r3" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.3.tar.bz2 \ @@ -24,18 +22,3 @@ SRC_URI_append_mpc8313e-rdb = "\ # file://mpc831x-nand.patch;patch=1 \ # file://mpc8313e-rdb-rtc.patch;patch=1 " -DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts" -DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000" - -do_devicetree_image() { - if test -n "${DEVICETREE}" ; then - dtc -I dts -O dtb ${DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE} - - cd ${DEPLOY_DIR_IMAGE} - rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb - ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb - fi -} - -addtask devicetree_image after do_deploy before do_package - diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index ad7071c405..2757ad520d 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -18,6 +18,23 @@ CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfs CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}' CMDLINE_append = " ${CMDLINE_DEBUG} " +# Support for binary device tree generation + +KERNEL_DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts" +KERNEL_DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000" +KERNEL_DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts" + +python __anonymous () { + + import bb + + devicetree = bb.data.getVar('KERNEL_DEVICETREE', d, 1) or '' + if devicetree: + depends = bb.data.getVar("DEPENDS", d, 1) + depends = "%s dtc-native" % depends + bb.data.setVar("DEPENDS", depends, d) +} + do_configure_prepend() { echo "" > ${S}/.config @@ -106,5 +123,14 @@ do_compile_append() { fi } -KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}" -KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}" +do_devicetree_image() { + if test -n "${KERNEL_DEVICETREE}" ; then + dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_DEVICETREE} + + cd ${DEPLOY_DIR_IMAGE} + rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb + ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb + fi +} + +addtask devicetree_image after do_deploy before do_package diff --git a/packages/linux/linux_2.6.23+2.6.24-rc5.bb b/packages/linux/linux_2.6.23+2.6.24-rc5.bb index 20ee7d0508..648fe6b756 100644 --- a/packages/linux/linux_2.6.23+2.6.24-rc5.bb +++ b/packages/linux/linux_2.6.23+2.6.24-rc5.bb @@ -64,15 +64,5 @@ python do_compulab_image() { os.symlink(img_file, link_file) } -do_devicetree_image() { - if test -n "${DEVICETREE}" ; then - dtc -I dts -O dtb -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE} - - cd ${DEPLOY_DIR_IMAGE} - rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb - ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb - fi -} - addtask compulab_image after do_deploy before do_package -addtask devicetree_image after do_deploy before do_package + diff --git a/packages/linux/linux_2.6.23.bb b/packages/linux/linux_2.6.23.bb index d3989a42ef..76ebbbe917 100644 --- a/packages/linux/linux_2.6.23.bb +++ b/packages/linux/linux_2.6.23.bb @@ -6,9 +6,6 @@ DEFAULT_PREFERENCE_mpc8313e-rdb = "1" DEFAULT_PREFERENCE_mpc8323e-rdb = "1" DEFAULT_PREFERENCE_avr32 = "1" -DEPENDS_append_mpc8313e-rdb = " dtc-native" -DEPENDS_append_mpc8323e-rdb = " dtc-native" - PR = "r12" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \ @@ -52,10 +49,6 @@ SRC_URI_append_mpc8323e-rdb = "\ CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2" -DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts" -DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts" -DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000" - FILES_kernel-image_cm-x270 = "" python do_compulab_image() { @@ -93,16 +86,6 @@ python do_compulab_image() { os.symlink(img_file, link_file) } -do_devicetree_image() { - if test -n "${DEVICETREE}" ; then - dtc -I dts -O dtb ${DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE} - - cd ${DEPLOY_DIR_IMAGE} - rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb - ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb - fi -} addtask compulab_image after do_deploy before do_package -addtask devicetree_image after do_deploy before do_package diff --git a/packages/linux/linux_2.6.24.bb b/packages/linux/linux_2.6.24.bb index c0751634a5..fa255403e9 100644 --- a/packages/linux/linux_2.6.24.bb +++ b/packages/linux/linux_2.6.24.bb @@ -10,8 +10,6 @@ DEFAULT_PREFERENCE_atngw100 = "1" DEFAULT_PREFERENCE_at32stk1000 = "1" DEFAULT_PREFERENCE_ts72xx = "1" -DEPENDS_append_mpc8313e-rdb = " dtc-native" - PR = "r11" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ @@ -84,8 +82,6 @@ CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=1 mem=64M FILES_kernel-image_gesbc-9302 = "" -DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts" -DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000" python do_compulab_image() { import os import os.path @@ -122,16 +118,5 @@ python do_compulab_image() { } -do_devicetree_image() { - if test -n "${DEVICETREE}" ; then - dtc -I dts -O dtb ${DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE} - - cd ${DEPLOY_DIR_IMAGE} - rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb - ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb - fi -} - addtask compulab_image after do_deploy before do_package -addtask devicetree_image after do_deploy before do_package diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index c0e274e289..5401237c49 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r49" +PR = "r50" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2|ixp4xx" @@ -208,6 +208,7 @@ SLUGOS_PACKAGES = "\ smartmontools \ spandsp \ sqlite \ + squid \ ssmtp \ strace \ streamripper \ diff --git a/packages/ncurses/ncurses.inc b/packages/ncurses/ncurses.inc index 9b4fff50ad..7b1d2cb022 100644 --- a/packages/ncurses/ncurses.inc +++ b/packages/ncurses/ncurses.inc @@ -83,6 +83,9 @@ pkg_prerm_ncurses-tools () { PACKAGES =+ "${PN}-ncurses ${PN}-panel ${PN}-menu ${PN}-form ${PN}-terminfo ${PN}-tools" FILES_${PN}-ncurses = "${libdir}/libncurses.so.*" +# You can'r really run any ncurses app without terminfo files, which is why the packaging was that way before mickeyl broke it. +# This RRECOMMENDS should pull in terminfo to fix that +RRECOMMENDS_${PN}-ncurses = "${PN}-terminfo" FILES_${PN}-panel = "${libdir}/libpanel.so.*" FILES_${PN}-menu = "${libdir}/libmenu.so.*" FILES_${PN}-form = "${libdir}/libform.so.*" diff --git a/packages/ncurses/ncurses_5.4.bb b/packages/ncurses/ncurses_5.4.bb index 00dd7d1d1a..d73164d3c0 100644 --- a/packages/ncurses/ncurses_5.4.bb +++ b/packages/ncurses/ncurses_5.4.bb @@ -1,4 +1,4 @@ -PR = "r13" +PR = "r14" SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \ file://visibility.patch;patch=1" diff --git a/packages/openttd/openttd_0.6.0-beta4.bb b/packages/openttd/openttd_0.6.0.bb index b984d45dbf..b984d45dbf 100644 --- a/packages/openttd/openttd_0.6.0-beta4.bb +++ b/packages/openttd/openttd_0.6.0.bb diff --git a/packages/packagekit/packagekit_git.bb b/packages/packagekit/packagekit_git.bb index 8f1644cd25..b2d7ea8886 100644 --- a/packages/packagekit/packagekit_git.bb +++ b/packages/packagekit/packagekit_git.bb @@ -10,7 +10,6 @@ PR = "r8" SRC_URI = "git://anongit.freedesktop.org/git/packagekit;protocol=git \ file://disable-docbook2man.patch;patch=1" -SRCREV = "${AUTOREV}" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/packages/rsync/rsync_2.6.9.bb b/packages/rsync/rsync_2.6.9.bb index 102f7e8eb8..075dfa7b09 100644 --- a/packages/rsync/rsync_2.6.9.bb +++ b/packages/rsync/rsync_2.6.9.bb @@ -1,6 +1,6 @@ require rsync.inc -PR = "r1" +PR = "r2" -SRC_URI = "http://rsync.samba.org/ftp/old-versions/rsync/rsync-${PV}.tar.gz \ +SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz \ file://rsyncd.conf" diff --git a/packages/sdcc/sdcc-2.8.0/.mtn2git_empty b/packages/sdcc/sdcc-2.8.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sdcc/sdcc-2.8.0/.mtn2git_empty diff --git a/packages/sdcc/sdcc-2.8.0/use-native-tools.patch b/packages/sdcc/sdcc-2.8.0/use-native-tools.patch new file mode 100644 index 0000000000..3572f5ea5a --- /dev/null +++ b/packages/sdcc/sdcc-2.8.0/use-native-tools.patch @@ -0,0 +1,129 @@ +diff -Nurd sdcc.orig/device/lib/Makefile.in sdcc/device/lib/Makefile.in +--- sdcc.orig/device/lib/Makefile.in 2007-06-03 22:38:18.000000000 +0200 ++++ sdcc/device/lib/Makefile.in 2008-04-01 10:05:17.352552206 +0200 +@@ -27,8 +27,8 @@ + PORTINCDIR = $(INCDIR)/mcs51 + endif + +-CC = $(top_builddir)/bin/sdcc +-CPP = $(top_builddir)/bin/sdcpp ++CC = sdcc ++CPP = sdcpp + + prefix = @prefix@ + exec_prefix = @exec_prefix@ +diff -Nurd sdcc.orig/device/lib/ds390/Makefile.in sdcc/device/lib/ds390/Makefile.in +--- sdcc.orig/device/lib/ds390/Makefile.in 2007-06-03 22:38:18.000000000 +0200 ++++ sdcc/device/lib/ds390/Makefile.in 2008-04-01 10:06:23.287688808 +0200 +@@ -1,7 +1,7 @@ + VPATH = @srcdir@ + srcdir = @srcdir@ + +-CC = ../../../bin/sdcc ++CC = sdcc + + #VERBOSE = --verbose + +diff -Nurd sdcc.orig/device/lib/ds400/Makefile.in sdcc/device/lib/ds400/Makefile.in +--- sdcc.orig/device/lib/ds400/Makefile.in 2007-06-03 22:38:18.000000000 +0200 ++++ sdcc/device/lib/ds400/Makefile.in 2008-04-01 10:06:44.282796254 +0200 +@@ -1,4 +1,4 @@ +-CC = ../../../bin/sdcc ++CC = sdcc + + VPATH = @srcdir@ + srcdir = @srcdir@ +diff -Nurd sdcc.orig/device/lib/gbz80/Makefile.in sdcc/device/lib/gbz80/Makefile.in +--- sdcc.orig/device/lib/gbz80/Makefile.in 2007-04-18 21:56:32.000000000 +0200 ++++ sdcc/device/lib/gbz80/Makefile.in 2008-04-01 10:07:40.539249456 +0200 +@@ -5,8 +5,8 @@ + + TOPDIR = ../../.. + +-SCC = $(TOPDIR)/bin/sdcc -mgbz80 +-SAS = $(TOPDIR)/bin/as-gbz80 ++SCC = sdcc -mgbz80 ++SAS = as-gbz80 + + OBJ = div.o mul.o putchar.o printf.o shift.o stubs.o crt0_rle.o heap.o fstubs.o + +diff -Nurd sdcc.orig/device/lib/hc08/Makefile.in sdcc/device/lib/hc08/Makefile.in +--- sdcc.orig/device/lib/hc08/Makefile.in 2007-04-18 21:56:32.000000000 +0200 ++++ sdcc/device/lib/hc08/Makefile.in 2008-04-01 10:09:20.336580262 +0200 +@@ -5,8 +5,8 @@ + + TOPDIR = ../../.. + +-SCC = $(TOPDIR)/bin/sdcc -mhc08 +-SAS = $(TOPDIR)/bin/as6808 ++SCC = sdcc -mhc08 ++SAS = as6808 + + OBJ = _ret.rel _divuint.rel _divulong.rel _mulint.rel _mullong.rel + +diff -Nurd sdcc.orig/device/lib/mcs51/Makefile.in sdcc/device/lib/mcs51/Makefile.in +--- sdcc.orig/device/lib/mcs51/Makefile.in 2007-04-18 21:56:32.000000000 +0200 ++++ sdcc/device/lib/mcs51/Makefile.in 2008-04-01 10:05:53.603952030 +0200 +@@ -4,8 +4,8 @@ + top_srcdir = @top_srcdir@ + top_builddir = @top_builddir@ + +-SAS = $(top_builddir)/bin/asx8051 +-SCC = $(top_builddir)/bin/sdcc ++SAS = asx8051 ++SCC = sdcc + + OBJ = crtstart.rel crtxinit.rel crtxclear.rel crtclear.rel crtxstack.rel \ + crtpagesfr.rel crtbank.rel crtcall.rel +diff -Nurd sdcc.orig/device/lib/pic/Makefile.common.in sdcc/device/lib/pic/Makefile.common.in +--- sdcc.orig/device/lib/pic/Makefile.common.in 2007-05-05 09:41:17.000000000 +0200 ++++ sdcc/device/lib/pic/Makefile.common.in 2008-04-01 10:10:10.375857197 +0200 +@@ -68,8 +68,8 @@ + + ################################################# + ### programs to use +-CPP = $(top_builddir)/../../../bin/sdcpp +-CC = $(top_builddir)/../../../bin/sdcc ++CPP = sdcpp ++CC = sdcc + AS = @GPASM@ + LD = @GPLINK@ + LIB = @GPLIB@ +diff -Nurd sdcc.orig/device/lib/z80/Makefile.in sdcc/device/lib/z80/Makefile.in +--- sdcc.orig/device/lib/z80/Makefile.in 2007-04-18 21:56:32.000000000 +0200 ++++ sdcc/device/lib/z80/Makefile.in 2008-04-01 10:07:15.147644058 +0200 +@@ -5,8 +5,8 @@ + + TOPDIR = ../../.. + +-SCC = $(TOPDIR)/bin/sdcc -mz80 +-SAS = $(TOPDIR)/bin/as-z80 ++SCC = sdcc -mz80 ++SAS = as-z80 + + OBJ = div.o mul.o putchar.o shift.o stubs.o crt0_rle.o heap.o fstubs.o + +diff -Nurd sdcc.orig/support/regression/Makefile.in sdcc/support/regression/Makefile.in +--- sdcc.orig/support/regression/Makefile.in 2008-02-21 19:51:18.000000000 +0100 ++++ sdcc/support/regression/Makefile.in 2008-04-01 10:08:38.665755305 +0200 +@@ -155,7 +155,7 @@ + + # Defaults. Override in spec.mk if required. + # Path to SDCC +-SDCC = $(top_builddir)/bin/sdcc ++SDCC = sdcc + # Base flags. + SDCCFLAGS += --fverbose-asm -DNO_VARARGS + # Extension of object intermediate files +diff -Nurd sdcc.orig/support/tests/dhrystone/Makefile sdcc/support/tests/dhrystone/Makefile +--- sdcc.orig/support/tests/dhrystone/Makefile 2001-10-22 03:14:16.000000000 +0200 ++++ sdcc/support/tests/dhrystone/Makefile 2008-04-01 10:08:55.786456870 +0200 +@@ -3,7 +3,7 @@ + + PROC = z80 + +-CC = $(TOPDIR)/bin/sdcc ++CC = sdcc + + # -DNOENUM is here to make the results more predictable + CFLAGS += -DREG= -DNOSTRUCTASSIGN -DNOENUM -V -m$(PROC) --profile --dumpall --stack-auto diff --git a/packages/sdcc/sdcc-native_2.8.0.bb b/packages/sdcc/sdcc-native_2.8.0.bb new file mode 100644 index 0000000000..dbecffa4e5 --- /dev/null +++ b/packages/sdcc/sdcc-native_2.8.0.bb @@ -0,0 +1,16 @@ +require sdcc_${PV}.bb +inherit native +DEPENDS = "" + +# don't need native-tools patch here +SRC_URI = "${SOURCEFORGE_MIRROR}/sdcc/sdcc-src-${PV}.tar.bz2 \ + " + +do_stage() { + oe_runmake install +} + +#do_stage() { +# find bin -type f -perm -0755 -exec install -m 0755 {} ${STAGING_BINDIR} \; +#} + diff --git a/packages/sdcc/sdcc_2.8.0.bb b/packages/sdcc/sdcc_2.8.0.bb new file mode 100644 index 0000000000..07993eb0a1 --- /dev/null +++ b/packages/sdcc/sdcc_2.8.0.bb @@ -0,0 +1,21 @@ +DESCRIPTION= "SDCC - Small Device C Compiler" +LICENSE = "GPL" +SECTION = "devel" +HOMEPAGE = "http://sdcc.sourceforge.net" +DEPENDS = "sdcc-native" + +SRC_URI = "${SOURCEFORGE_MIRROR}/sdcc/sdcc-src-${PV}.tar.bz2 \ + file://use-native-tools.patch;patch=1" + +S = "${WORKDIR}/sdcc" + +PARALLEL_MAKE = "" + +inherit autotools + + +do_configure() { + gnu-configize + oe_runconf +} + diff --git a/packages/slugos-init/files/leds b/packages/slugos-init/files/leds index 1beb013c5f..7a51a247ef 100644 --- a/packages/slugos-init/files/leds +++ b/packages/slugos-init/files/leds @@ -81,8 +81,8 @@ sysled_readystatus(){ esac;; esac - led_set "$1/ready" "$ready" - led_set "$1/status" "$status" + led_set "$1/$ready_led_name" "$ready" + led_set "$1/$status_led_name" "$status" } # # the cases for one LED (just ready) @@ -104,7 +104,7 @@ sysled_ready(){ esac;; esac - led_set "$1/ready" "$ready" + led_set "$1/$ready_led_name" "$ready" } # # the cases for one blue flashing LED (just power) @@ -126,7 +126,7 @@ sysled_power(){ esac;; esac - led_set "$1/power" "$power" + led_set "$1/$power_led_name" "$power" } # sysled(){ @@ -154,16 +154,16 @@ sysled(){ fi # # check for the 'ready' LED - otherwise check for a 'power' LED - if test -d "$mp/class/leds/ready" + if test -d "$mp/class/leds/$ready_led_name" then - if test -d "$mp/class/leds/status" + if test -d "$mp/class/leds/$status_led_name" then sysled_readystatus "$mp/class/leds" $boot"$@" else sysled_ready "$mp/class/leds" $boot"$@" fi else - if test -d "$mp/class/leds/power" + if test -d "$mp/class/leds/$power_led_name" then sysled_power "$mp/class/leds" $boot"$@" fi @@ -211,7 +211,37 @@ leds_help(){ echo " if possible cause the machine to emit a beep" >&2 } -# +# Define the LED names based on kernel version. +version=$(uname -r | cut -c -6) +if [ "$version" \< "2.6.25" ]; then + status_led_name="status" + ready_led_name="ready" + power_led_name="power" +else + case "$(machine)" in + dsmg600) + status_led_name="none" + ready_led_name="none" + power_led_name="dsmg600:green:power" + ;; + fsg3) + status_led_name="none" + ready_led_name="fsg:blue:sync" + power_led_name="none" + ;; + nas100d) + status_led_name="none" + ready_led_name="none" + power_led_name="nas100d:blue:power" + ;; + nslu2) + status_led_name="nslu2:red:status" + ready_led_name="nslu2:green:ready" + power_led_name="none" + ;; + esac +fi + # the real command, if required case "$1" in boot|system|user|singleuser|shutdown) diff --git a/packages/slugos-init/slugos-init_4.8.bb b/packages/slugos-init/slugos-init_4.8.bb index 2eca9c9ecf..37b82c582c 100644 --- a/packages/slugos-init/slugos-init_4.8.bb +++ b/packages/slugos-init/slugos-init_4.8.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r4" +PR = "r5" SRC_URI = "file://boot/flash \ file://boot/disk \ diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb index 5487985fd4..cb08f92e3d 100644 --- a/packages/tasks/task-opie-all.bb +++ b/packages/tasks/task-opie-all.bb @@ -24,7 +24,7 @@ RDEPENDS_task-opie-applets = "opie-aboutapplet opie-autorotateapplet opie-batter opie-screenshotapplet opie-suspendapplet opie-vmemo \
opie-volumeapplet opie-vtapplet opie-zkbapplet \
"
-RDEPENDS_task-opie-inputmethods = "opie-dasher opie-dvorak opie-handwriting \
+RDEPENDS_task-opie-inputmethods = "opie-dvorak opie-handwriting \
opie-handwriting-classicset opie-jumpx opie-keyboard \
opie-keyview opie-kjumpx opie-multikey opie-unikeyboard"
diff --git a/packages/u-boot/u-boot.inc b/packages/u-boot/u-boot.inc index 9f7356d5d7..5a5bdb21c1 100644 --- a/packages/u-boot/u-boot.inc +++ b/packages/u-boot/u-boot.inc @@ -10,7 +10,8 @@ PARALLEL_MAKE="" EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" UBOOT_MACHINE ?= "${MACHINE}_config" -UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin" +UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.bin" +UBOOT_SYMLINK ?= "u-boot-${MACHINE}.bin" do_compile () { unset LDFLAGS @@ -23,6 +24,10 @@ do_compile () { do_deploy () { install -d ${DEPLOY_DIR_IMAGE} install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} + + cd ${DEPLOY_DIR_IMAGE} + rm -f ${UBOOT_SYMLINK} + ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} } do_deploy[dirs] = "${S}" addtask deploy before do_build after do_compile diff --git a/packages/wv/wv_1.2.0.bb b/packages/wv/wv_1.2.0.bb index 5b0a484a67..9e9e65fd49 100644 --- a/packages/wv/wv_1.2.0.bb +++ b/packages/wv/wv_1.2.0.bb @@ -12,6 +12,11 @@ S = "${WORKDIR}/${PN}-${PV}" EXTRA_OECONF = "" +do_compile_append () { + cp wv-1.0.pc wv-1.0.pc.old + sed 's:${STAGING_DIR_HOST}::g' < wv-1.0.pc.old > wv-1.0.pc +} + do_stage () { autotools_stage_all } diff --git a/packages/wxwidgets/wxbase-2.8.7/.mtn2git_empty b/packages/wxwidgets/wxbase-2.8.7/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wxwidgets/wxbase-2.8.7/.mtn2git_empty diff --git a/packages/wxwidgets/wxbase-2.8.7/Makefile.in.patch b/packages/wxwidgets/wxbase-2.8.7/Makefile.in.patch new file mode 100644 index 0000000000..2c495d7884 --- /dev/null +++ b/packages/wxwidgets/wxbase-2.8.7/Makefile.in.patch @@ -0,0 +1,18 @@ +--- wxBase-2.8.7/Makefile.in.old 2008-03-30 01:04:57.000000000 -0500 ++++ wxBase-2.8.7/Makefile.in 2008-03-30 01:05:58.000000000 -0500 +@@ -11331,13 +11331,11 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = + + ### Targets: ### + +-all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname) ++all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname) + +-install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) ++install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) + $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal + (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) +- $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets +- (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets) + $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx + for f in setup.h $(RCDEFS_H); do \ + if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \ diff --git a/packages/wxwidgets/wxbase.inc b/packages/wxwidgets/wxbase.inc new file mode 100644 index 0000000000..2976dec289 --- /dev/null +++ b/packages/wxwidgets/wxbase.inc @@ -0,0 +1,17 @@ +DESCRIPTION = "wxBase is a library for programming \ +non-GUI (console) applications using the base wxWidgets functionality." +HOMEPAGE = "http://www.wxwidgets.org/" +LICENSE = "GPL" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "zlib expat" + +SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2" + +S = "${WORKDIR}/wxBase-${PV}" + +inherit autotools pkgconfig + +do_configure() { + oe_runconf +} diff --git a/packages/wxwidgets/wxbase_2.6.2.bb b/packages/wxwidgets/wxbase_2.6.4.bb index 07d9199ae1..c8350d8aa5 100644 --- a/packages/wxwidgets/wxbase_2.6.2.bb +++ b/packages/wxwidgets/wxbase_2.6.4.bb @@ -1,25 +1,10 @@ -DESCRIPTION = "wxBase is a library for programming \ -non-GUI (console) applications using the base wxWidgets functionality." -HOMEPAGE = "http://www.wxwidgets.org/" -LICENSE = "GPL" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "jpeg libpng zlib" +require wxbase.inc - -SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2" - -S = "${WORKDIR}/wxBase-${PV}" - -inherit autotools pkgconfig +PR = "r0" EXTRA_OECONF = "--enable-largefile" -LEAD_SONAME = "libwx_base-2.6.so*" - -do_configure() { - oe_runconf -} +LEAD_SONAME = "libwx_base-2.6.so" do_stage() { install -d ${STAGING_INCDIR}/wx-2.6/wx @@ -36,12 +21,8 @@ do_stage() { -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 } -FILES_${PN} += " \ - ${libdir}/wx/config" - -FILES_${PN}-dev += " \ - ${libdir}/wx/include \ - ${datadir}/bakefile" +FILES_${PN} += "${libdir}/wx/config" +FILES_${PN}-dev += "${libdir}/wx/include ${datadir}/bakefile" do_install() { oe_runmake 'DESTDIR=${D}' install diff --git a/packages/wxwidgets/wxbase_2.7+cvs.bb b/packages/wxwidgets/wxbase_2.7+cvs.bb deleted file mode 100644 index 772ea4e27f..0000000000 --- a/packages/wxwidgets/wxbase_2.7+cvs.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "wxBase is a library for programming \ -non-GUI (console) applications using the base wxWidgets functionality." -HOMEPAGE = "http://www.wxwidgets.org/" -LICENSE = "GPL" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "jpeg libpng zlib" - - -SRC_URI = "http://biolpc22.york.ac.uk/pub/CVS_HEAD/v1/wx-cvs-Gtk.tar.bz2" -#SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2" - -S = "${WORKDIR}/wxGTK" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-gui --enable-largefile" - -LEAD_SONAME = "libwx_base-2.7*" - -do_configure() { - oe_runconf -} - -do_stage() { - install -d ${STAGING_INCDIR}/wx-2.7/wx - cp -pR include/wx ${STAGING_INCDIR}/wx-2.7 - cp -pR lib/libwx* ${STAGING_LIBDIR} - cp -pR lib/wx ${STAGING_LIBDIR} - cp -pR build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile - cp -pR wxwin.m4 ${STAGING_DATADIR}/aclocal - ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${STAGING_BINDIR_CROSS}/wx-config - sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \ - -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \ - -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \ - -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \ - -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 -} - -FILES_${PN} += " \ - ${libdir}/wx/config" - -FILES_${PN}-dev += " \ - ${libdir}/wx/include \ - ${datadir}/bakefile" - -do_install() { - oe_runmake 'DESTDIR=${D}' install - ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${D}${bindir}/wx-config - install -d ${D}${docdir}/${PN}-${PV} - install -m 644 -p docs/*.txt ${D}${docdir}/${PN}-${PV} - install -m 644 -p docs/*.htm ${D}${docdir}/${PN}-${PV} -} diff --git a/packages/wxwidgets/wxbase_2.8.7.bb b/packages/wxwidgets/wxbase_2.8.7.bb new file mode 100644 index 0000000000..816b96de6e --- /dev/null +++ b/packages/wxwidgets/wxbase_2.8.7.bb @@ -0,0 +1,33 @@ +require wxbase.inc + +DEFAULT_PREFERENCE = "-1" + +PR = "r0" + +SRC_URI += "file://Makefile.in.patch;patch=1" + +EXTRA_OECONF = " --disable-gui --enable-largefile --without-subdirs " + +LEAD_SONAME = "libwx_base-2.8.so" + +do_stage() { + install -d ${STAGING_INCDIR}/wx-2.8/wx + cp -pR include/wx ${STAGING_INCDIR}/wx-2.8 + cp -pR lib/libwx* ${STAGING_LIBDIR} + cp -pR lib/wx ${STAGING_LIBDIR} + cp -pR wxwin.m4 ${STAGING_DATADIR}/aclocal + ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.8 ${STAGING_BINDIR_CROSS}/wx-config + sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \ + -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \ + -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \ + -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \ + -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.8 +} + +FILES_${PN} += "${libdir}/wx/config" +FILES_${PN}-dev += "${libdir}/wx/include" + +do_install() { + oe_runmake 'DESTDIR=${D}' install + ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.8 ${D}${bindir}/wx-config +} diff --git a/packages/wxwidgets/wxwidgets_2.6.3.bb b/packages/wxwidgets/wxwidgets.inc index 0cd88334b3..1e4cd0b6bb 100644 --- a/packages/wxwidgets/wxwidgets_2.6.3.bb +++ b/packages/wxwidgets/wxwidgets.inc @@ -2,16 +2,19 @@ DESCRIPTION = "wxWidgets is a cross platform application framework utilizing nat HOMEPAGE = "http://www.wxwidgets.org" SECTION = "x11/libs" LICENSE = "GPL" -DEPENDS = "gtk+" -PR = "r0" +DEPENDS = "gtk+ jpeg tiff libpng zlib expat" SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxWidgets-${PV}.tar.gz" + S = "${WORKDIR}/wxWidgets-${PV}" inherit autotools pkgconfig +EXTRA_OECONF = " --enable-gpe " + do_configure() { - oe_runconf + oe_runconf } -#FIXME add sane packaging +FILES_${PN} += "${libdir}/wx/config" +FILES_${PN}-dev += "${libdir}/wx/include ${datadir}/bakefile" diff --git a/packages/wxwidgets/wxwidgets_2.6.4.bb b/packages/wxwidgets/wxwidgets_2.6.4.bb new file mode 100644 index 0000000000..775cf90587 --- /dev/null +++ b/packages/wxwidgets/wxwidgets_2.6.4.bb @@ -0,0 +1,30 @@ +require wxwidgets.inc + +PR = "r0" + +LEAD_SONAME = "libwx_gtk2_core-2.6.so" + +do_stage() { + install -d ${STAGING_INCDIR}/wx-2.6/wx + cp -pR include/wx ${STAGING_INCDIR}/wx-2.6 + cp -pR lib/libwx* ${STAGING_LIBDIR} + cp -pR lib/wx ${STAGING_LIBDIR} + cp -pR build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile + cp -pR wxwin.m4 ${STAGING_DATADIR}/aclocal + ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.6 ${STAGING_BINDIR_CROSS}/wx-config + sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \ + -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \ + -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \ + -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \ + -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.6 +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install + ln -sf ${libdir}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.6 ${D}${bindir}/wx-config + install -d ${D}${docdir}/${PN}-${PV} + install -m 644 -p CHANGES.txt ${D}${docdir}/${PN}-${PV} + install -m 644 -p COPYING.LIB ${D}${docdir}/${PN}-${PV} + install -m 644 -p LICENCE.txt ${D}${docdir}/${PN}-${PV} + install -m 644 -p README.txt ${D}${docdir}/${PN}-${PV} +} diff --git a/packages/wxwidgets/wxwidgets_2.8.7.bb b/packages/wxwidgets/wxwidgets_2.8.7.bb new file mode 100644 index 0000000000..8e8d3565fd --- /dev/null +++ b/packages/wxwidgets/wxwidgets_2.8.7.bb @@ -0,0 +1,25 @@ +require wxwidgets.inc + +PR = "r0" + +LEAD_SONAME = "libwx_gtk2_core-2.8.so" + +do_stage() { + install -d ${STAGING_INCDIR}/wx-2.8/wx + cp -pR include/wx ${STAGING_INCDIR}/wx-2.8 + cp -pR lib/libwx* ${STAGING_LIBDIR} + cp -pR lib/wx ${STAGING_LIBDIR} + cp -pR build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile + cp -pR wxwin.m4 ${STAGING_DATADIR}/aclocal + ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.8 ${STAGING_BINDIR_CROSS}/wx-config + sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \ + -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \ + -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \ + -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \ + -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.8 +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install + ln -sf ${libdir}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.8 ${D}${bindir}/wx-config +} diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb index 052560dcc9..56f067cbf7 100644 --- a/packages/zaurus-updater/zaurus-updater.bb +++ b/packages/zaurus-updater/zaurus-updater.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update" DEPENDS = "encdec-updater-native" LICENSE = "zaurus-updater" -PR = "r20" +PR = "r21" PACKAGES = "" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -22,10 +22,12 @@ do_compile() { do_deploy() { install -d ${DEPLOY_DIR_IMAGE} install -m 0755 updater.sh ${DEPLOY_DIR_IMAGE}/updater.sh.${MACHINE} + package_stagefile_shell ${DEPLOY_DIR_IMAGE}/updater.sh.${MACHINE} case ${MACHINE} in spitz ) install -m 0755 gnu-tar ${DEPLOY_DIR_IMAGE}/gnu-tar + package_stagefile_shell ${DEPLOY_DIR_IMAGE}/gnu-tar ;; *) ;; diff --git a/packages/zaurusd/files/alsa-6000x-default.state.patch b/packages/zaurusd/files/alsa-6000x-default.state.patch index e019f3a117..857b8c8b62 100644 --- a/packages/zaurusd/files/alsa-6000x-default.state.patch +++ b/packages/zaurusd/files/alsa-6000x-default.state.patch @@ -1,5 +1,5 @@ ---- zaurusd/config/alsa/6000x-default.state.old 2007-12-22 04:31:38.000000000 -0600 -+++ zaurusd/config/alsa/6000x-default.state 2007-12-26 00:06:02.000000000 -0600 +--- zaurusd/config/alsa/6000x-default.state.old 2008-03-21 02:21:47.000000000 -0500 ++++ zaurusd/config/alsa/6000x-default.state 2008-03-30 07:48:06.000000000 -0500 @@ -37,13 +37,23 @@ state.Tosa { } control.5 { @@ -701,9 +701,12 @@ comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -661,7 +719,7 @@ state.Tosa { +@@ -659,9 +717,9 @@ state.Tosa { + comment.item.1 'Headphone Mix' + iface MIXER name 'Speaker Mux' - value 'Headphone Mix' +- value 'Headphone Mix' ++ value 'Speaker Mix' } - control.75 { + control.82 { @@ -728,9 +731,12 @@ comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -698,15 +756,14 @@ state.Tosa { +@@ -696,17 +754,16 @@ state.Tosa { + comment.item.4 Off + iface MIXER name 'Jack Function' - value Headphone +- value Headphone ++ value Off } - control.78 { + control.85 { |