summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/abiword/abiword-plugins_2.5.1.bb38
-rw-r--r--packages/angstrom/angstrom-x11-base-depends.bb2
-rw-r--r--packages/asterisk/asterisk-1.4.10/.mtn2git_empty (renamed from packages/asterisk/asterisk-1.4.7/.mtn2git_empty)0
-rw-r--r--packages/asterisk/asterisk-1.4.10/Makefile.patch (renamed from packages/asterisk/asterisk-1.4.7/Makefile.patch)0
-rw-r--r--packages/asterisk/asterisk-1.4.10/init (renamed from packages/asterisk/asterisk-1.4.7/init)0
-rw-r--r--packages/asterisk/asterisk-1.4.10/logrotate (renamed from packages/asterisk/asterisk-1.4.7/logrotate)0
-rw-r--r--packages/asterisk/asterisk-1.4.10/sounds.xml.patch (renamed from packages/asterisk/asterisk-1.4.7/sounds.xml.patch)0
-rw-r--r--packages/asterisk/asterisk-1.4.10/volatiles (renamed from packages/asterisk/asterisk-1.4.7/volatiles)0
-rw-r--r--packages/asterisk/asterisk_1.4.10.bb (renamed from packages/asterisk/asterisk_1.4.7.bb)55
-rw-r--r--packages/base-files/base-files/akita/fstab1
-rw-r--r--packages/base-files/base-files/amsdelta/fstab2
-rw-r--r--packages/base-files/base-files/armzone-qt2410/fstab1
-rw-r--r--packages/base-files/base-files/c7x0/fstab1
-rw-r--r--packages/base-files/base-files/collie/fstab1
-rw-r--r--packages/base-files/base-files/efika/fstab1
-rw-r--r--packages/base-files/base-files/ep93xx/fstab1
-rw-r--r--packages/base-files/base-files/epia/fstab1
-rw-r--r--packages/base-files/base-files/fic-gta01/fstab1
-rw-r--r--packages/base-files/base-files/fic-gta02/.mtn2git_empty (renamed from packages/webkit/webkit/.mtn2git_empty)0
-rw-r--r--packages/base-files/base-files/fic-gta02/fstab18
-rw-r--r--packages/base-files/base-files/fstab1
-rw-r--r--packages/base-files/base-files/h2200/fstab1
-rw-r--r--packages/base-files/base-files/h3600/fstab1
-rw-r--r--packages/base-files/base-files/h3900/fstab1
-rw-r--r--packages/base-files/base-files/h5000/fstab1
-rw-r--r--packages/base-files/base-files/h6300/fstab1
-rw-r--r--packages/base-files/base-files/htcuniversal/fstab1
-rw-r--r--packages/base-files/base-files/hx4700/fstab1
-rw-r--r--packages/base-files/base-files/jornada56x/fstab3
-rw-r--r--packages/base-files/base-files/jornada6xx/fstab1
-rw-r--r--packages/base-files/base-files/jornada7xx/fstab1
-rw-r--r--packages/base-files/base-files/mtx-1/fstab1
-rw-r--r--packages/base-files/base-files/mtx-2/fstab1
-rw-r--r--packages/base-files/base-files/netbook-pro/fstab1
-rw-r--r--packages/base-files/base-files/netvista/fstab1
-rw-r--r--packages/base-files/base-files/nokia770/fstab1
-rw-r--r--packages/base-files/base-files/omap5912osk/fstab1
-rw-r--r--packages/base-files/base-files/openmn/fstab1
-rw-r--r--packages/base-files/base-files/poodle/fstab1
-rw-r--r--packages/base-files/base-files/simpad/fstab1
-rw-r--r--packages/base-files/base-files/slugos/fstab1
-rw-r--r--packages/base-files/base-files/spitz/fstab2
-rw-r--r--packages/base-files/base-files/tosa/fstab1
-rw-r--r--packages/base-files/base-files/wrt54/fstab1
-rw-r--r--packages/base-files/base-files/xxs1500/fstab1
-rw-r--r--packages/base-files/base-files_3.0.14.bb4
-rw-r--r--packages/binutils/binutils-cross.inc4
-rw-r--r--packages/binutils/binutils-cross_2.17.50.0.1.bb33
-rw-r--r--packages/binutils/binutils-cross_2.17.50.0.12.bb33
-rw-r--r--packages/binutils/binutils-cross_2.17.50.0.5.bb33
-rw-r--r--packages/binutils/binutils-cross_2.17.50.0.8.bb33
-rw-r--r--packages/binutils/binutils-cross_cvs.bb31
-rw-r--r--packages/binutils/binutils-cvs/110-arm-eabi-conf.patch24
-rw-r--r--packages/binutils/binutils-cvs/binutils-100_cflags_for_build.patch91
-rw-r--r--packages/binutils/binutils-cvs/binutils-2.15.90.0.3-uclibc-200-build_modules.patch33
-rw-r--r--packages/binutils/binutils-cvs/binutils-2.15.90.0.3-uclibc-210-cflags.patch30
-rw-r--r--packages/binutils/binutils-cvs/binutils-2.15.91.0.1-uclibc-100-conf.patch603
-rw-r--r--packages/binutils/binutils-cvs/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch39
-rw-r--r--packages/binutils/binutils-cvs/binutils-uclibc-300-001_ld_makefile_patch.patch50
-rw-r--r--packages/binutils/binutils-cvs/binutils-uclibc-300-006_better_file_error.patch43
-rw-r--r--packages/binutils/binutils-cvs/binutils-uclibc-300-012_check_ldrunpath_length.patch47
-rw-r--r--packages/binutils/binutils-cvs/build_fix.patch16
-rw-r--r--packages/binutils/binutils.inc6
-rw-r--r--packages/binutils/binutils_cvs.bb136
-rw-r--r--packages/bluez/bluez-gnome_0.13.bb11
-rw-r--r--packages/bluez/bluez-gnome_cvs.bb2
-rw-r--r--packages/btscanner/btscanner_2.0.bb6
-rw-r--r--packages/btscanner/files/configurable-paths.patch183
-rw-r--r--packages/djvulibre/.mtn2git_empty0
-rw-r--r--packages/djvulibre/djvulibre/.mtn2git_empty0
-rw-r--r--packages/djvulibre/djvulibre/fix-cross-configure.patch50
-rw-r--r--packages/djvulibre/djvulibre_3.5.19.bb27
-rw-r--r--packages/ethtool/ethtool_6.bb2
-rw-r--r--packages/evince/evince_0.9.2.bb8
-rw-r--r--packages/fakeroot/fakeroot-native_1.7.1.bb21
-rw-r--r--packages/fakeroot/fakeroot_1.7.1.bb16
-rw-r--r--packages/fakeroot/files/work-with-older-libtool.patch11
-rw-r--r--packages/fluxbox/fluxbox_0.99+1.0rc.bb101
-rw-r--r--packages/fluxbox/fluxbox_svn.bb104
-rw-r--r--packages/gcc/gcc-cross-initial_4.2.1.bb30
-rw-r--r--packages/gloox/.mtn2git_empty0
-rw-r--r--packages/gloox/gloox_0.8.1.bb15
-rw-r--r--packages/gpe-login/gpe-login_0.87.bb6
-rw-r--r--packages/gpe-login/gpe-login_0.88.bb6
-rw-r--r--packages/gpe-login/gpe-login_0.90.bb6
-rw-r--r--packages/gpe-login/gpe-login_svn.bb6
-rw-r--r--packages/gsm/libgsmd_svn.bb25
-rw-r--r--packages/gtk+/gtk+_2.10.14.bb2
-rw-r--r--packages/gtk+/gtk-2.10.inc10
-rw-r--r--packages/gtk-webcore/midori_0.0.4.bb11
-rw-r--r--packages/hsetroot/.mtn2git_empty0
-rw-r--r--packages/hsetroot/files/.mtn2git_empty0
-rw-r--r--packages/hsetroot/files/pkgconfigize-imlib.patch22
-rw-r--r--packages/hsetroot/hsetroot_1.0.2.bb10
-rw-r--r--packages/iksemel/.mtn2git_empty0
-rw-r--r--packages/iksemel/iksemel_1.2.bb14
-rw-r--r--packages/libnet/libnet-1.1.2.1/new-autotools.patch20
-rw-r--r--packages/libnet/libnet_1.1.2.1.bb5
-rw-r--r--packages/linux-libc-headers/linux-libc-headers-2.6.22/.mtn2git_empty0
-rw-r--r--packages/linux-libc-headers/linux-libc-headers-2.6.22/procinfo.h24
-rw-r--r--packages/linux-libc-headers/linux-libc-headers_2.6.22.bb73
-rw-r--r--packages/linux/linux-jlime-current.bb2
-rw-r--r--packages/linux/linux-omap.inc (renamed from packages/linux/linux-omap1.inc)0
-rw-r--r--packages/linux/linux-omap1-2.6.22-omap1/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap1-2.6.22-omap1/defconfig1301
-rw-r--r--packages/linux/linux-omap1-2.6.22-omap1/defconfig.eabi1416
-rw-r--r--packages/linux/linux-omap1_2.6.12-rc2.bb2
-rw-r--r--packages/linux/linux-omap1_2.6.18+git.bb2
-rw-r--r--packages/linux/linux-omap1_2.6.18-omap1.bb2
-rw-r--r--packages/linux/linux-omap1_2.6.19-omap1.bb2
-rw-r--r--packages/linux/linux-omap1_2.6.20-omap1.bb2
-rw-r--r--packages/linux/linux-omap1_2.6.22-omap1.bb10
-rw-r--r--packages/linux/linux-omap1_2.6.x+git.bb2
-rw-r--r--packages/meta/meta-maemo.bb95
-rw-r--r--packages/musicpd/mpc_0.11.2.bb11
-rw-r--r--packages/musicpd/mpc_0.12.1.bb (renamed from packages/musicpd/mpc_0.12.0.bb)0
-rw-r--r--packages/musicpd/mpd_0.11.2.bb22
-rw-r--r--packages/musicpd/mpd_0.11.5.bb32
-rw-r--r--packages/musicpd/mpd_svn.bb11
-rw-r--r--packages/ncurses/ncurses.inc4
-rw-r--r--packages/ncurses/ncurses_5.4.bb2
-rw-r--r--packages/netbase/netbase_4.21.bb4
-rw-r--r--packages/openmoko2/neod_svn.bb4
-rw-r--r--packages/openmoko2/openmoko-common2_svn.bb22
-rw-r--r--packages/openmoko2/openmoko-feedreader2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-session2.bb9
-rwxr-xr-xpackages/openmoko2/openmoko-session2/etc/matchbox/session7
-rw-r--r--packages/openmoko2/openmoko-terminal2_1.0.0.bb5
-rw-r--r--packages/openmoko2/openmoko-today2-folders_svn.bb8
-rw-r--r--packages/openmoko2/openmoko-today2_svn.bb2
-rw-r--r--packages/openssh/openssh-4.6p1/.mtn2git_empty0
-rw-r--r--packages/openssh/openssh-4.6p1/ssh_config39
-rw-r--r--packages/openssh/openssh-4.6p1/sshd_config96
-rw-r--r--packages/openssh/openssh_4.6p1.bb112
-rw-r--r--packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch40
-rw-r--r--packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb2
-rw-r--r--packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb3
-rw-r--r--packages/poppler/poppler-data_0.1.bb2
-rw-r--r--packages/poppler/poppler.inc5
-rw-r--r--packages/poppler/poppler/.mtn2git_empty0
-rw-r--r--packages/poppler/poppler/fix-splash.patch28
-rw-r--r--packages/poppler/poppler0.6_cvs.bb2
-rw-r--r--packages/poppler/poppler_0.5.4.bb2
-rw-r--r--packages/poppler/poppler_0.5.9.bb6
-rw-r--r--packages/pulseaudio/pulse.inc34
-rw-r--r--packages/pulseaudio/pulseaudio_0.9.5.bb3
-rw-r--r--packages/pulseaudio/pulseaudio_0.9.6.bb2
-rw-r--r--packages/slugimage/slugimage.bb4
-rw-r--r--packages/slugos-init/files/initscripts/zleds23
-rw-r--r--packages/slugos-init/slugos-init_0.10.bb2
-rw-r--r--packages/sudo/files/autofoo.patch9
-rw-r--r--packages/sudo/sudo_1.6.8p12.bb2
-rw-r--r--packages/sysconf/sysconf_0.1.bb4
-rw-r--r--packages/tasks/task-maemo.bb73
-rw-r--r--packages/tasks/task-slugos.bb49
-rw-r--r--packages/uclibc/uclibc-0.9.29/bfin/uClibc.config0
-rw-r--r--packages/uclibc/uclibc-0.9.29/bfin/uClibc.distro0
-rw-r--r--packages/uclibc/uclibc-0.9.29/bfin/uClibc.machine124
-rw-r--r--packages/uclibc/uclibc_svn.bb11
-rw-r--r--packages/webkit/files/.mtn2git_empty0
-rw-r--r--packages/webkit/files/Makefile (renamed from packages/webkit/webkit/Makefile)0
-rw-r--r--packages/webkit/files/Makefile.shared (renamed from packages/webkit/webkit/Makefile.shared)0
-rw-r--r--packages/webkit/files/WebKit.pri (renamed from packages/webkit/webkit/WebKit.pri)0
-rw-r--r--packages/webkit/files/WebKit.pro (renamed from packages/webkit/webkit/WebKit.pro)0
-rw-r--r--packages/webkit/webkit-gtk_svn.bb (renamed from packages/webkit/webkit_svn.bb)0
-rw-r--r--packages/xorg-app/xsetroot_1.0.1.bb6
-rw-r--r--packages/xorg-data/xbitmaps_1.0.1.bb6
-rw-r--r--packages/xorg-data/xorg-data-common.inc9
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate (renamed from packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate)0
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common/60xXDefaults (renamed from packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults)0
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common/90xXWindowManager (renamed from packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager)0
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common/Xdefaults (renamed from packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults)0
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common/Xinit (renamed from packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit)0
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common/Xserver114
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common/Xsession (renamed from packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession)0
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver112
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/.mtn2git_empty0
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver114
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb40
179 files changed, 4714 insertions, 1612 deletions
diff --git a/packages/abiword/abiword-plugins_2.5.1.bb b/packages/abiword/abiword-plugins_2.5.1.bb
new file mode 100644
index 0000000000..10b7ba2de7
--- /dev/null
+++ b/packages/abiword/abiword-plugins_2.5.1.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word""
+HOMEPAGE = "http://www.abiword.org"
+SECTION = "x11/office"
+LICENSE = "GPLv2"
+DEPENDS = "libwpd librsvg goffice poppler libglade"
+RDEPENDS = "abiword"
+
+DEFAULT_PREFERENCE = "-1"
+
+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 \
+ "
+
+inherit autotools
+
+PARALLEL_MAKE=""
+
+EXTRA_OECONF = " --without-libwmf \
+ --without-inter7eps \
+ --with-abiword=${WORKDIR}/abiword-${PV} \
+ "
+
+PACKAGES_DYNAMIC = "abiword-plugin-*"
+
+python populate_packages_prepend () {
+ abiword_libdir = bb.data.expand('${libdir}/abiword-2.5/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.5/plugins/.debug"
+
diff --git a/packages/angstrom/angstrom-x11-base-depends.bb b/packages/angstrom/angstrom-x11-base-depends.bb
index 2eb3a36804..a2eda707f1 100644
--- a/packages/angstrom/angstrom-x11-base-depends.bb
+++ b/packages/angstrom/angstrom-x11-base-depends.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r34"
+PR = "r35"
ALLOW_EMPTY = "1"
XSERVER ?= "xserver-kdrive-fbdev"
diff --git a/packages/asterisk/asterisk-1.4.7/.mtn2git_empty b/packages/asterisk/asterisk-1.4.10/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/asterisk/asterisk-1.4.7/.mtn2git_empty
+++ b/packages/asterisk/asterisk-1.4.10/.mtn2git_empty
diff --git a/packages/asterisk/asterisk-1.4.7/Makefile.patch b/packages/asterisk/asterisk-1.4.10/Makefile.patch
index a6d630949e..a6d630949e 100644
--- a/packages/asterisk/asterisk-1.4.7/Makefile.patch
+++ b/packages/asterisk/asterisk-1.4.10/Makefile.patch
diff --git a/packages/asterisk/asterisk-1.4.7/init b/packages/asterisk/asterisk-1.4.10/init
index f26ad38db3..f26ad38db3 100644
--- a/packages/asterisk/asterisk-1.4.7/init
+++ b/packages/asterisk/asterisk-1.4.10/init
diff --git a/packages/asterisk/asterisk-1.4.7/logrotate b/packages/asterisk/asterisk-1.4.10/logrotate
index dfd25ee55c..dfd25ee55c 100644
--- a/packages/asterisk/asterisk-1.4.7/logrotate
+++ b/packages/asterisk/asterisk-1.4.10/logrotate
diff --git a/packages/asterisk/asterisk-1.4.7/sounds.xml.patch b/packages/asterisk/asterisk-1.4.10/sounds.xml.patch
index b549fea132..b549fea132 100644
--- a/packages/asterisk/asterisk-1.4.7/sounds.xml.patch
+++ b/packages/asterisk/asterisk-1.4.10/sounds.xml.patch
diff --git a/packages/asterisk/asterisk-1.4.7/volatiles b/packages/asterisk/asterisk-1.4.10/volatiles
index c68e786c90..c68e786c90 100644
--- a/packages/asterisk/asterisk-1.4.7/volatiles
+++ b/packages/asterisk/asterisk-1.4.10/volatiles
diff --git a/packages/asterisk/asterisk_1.4.7.bb b/packages/asterisk/asterisk_1.4.10.bb
index 3973ff41dd..4110f01930 100644
--- a/packages/asterisk/asterisk_1.4.7.bb
+++ b/packages/asterisk/asterisk_1.4.10.bb
@@ -3,8 +3,10 @@ HOMEPAGE = "http://www.asterisk.org"
SECTION = "voip"
LICENSE = "GPLv2"
PRIORITY = "optional"
-DEPENDS = "ncurses readline zlib openssl curl popt gnutls sqlite libogg libvorbis"
+SECTION = "console/telephony"
+DEPENDS = "speex readline zlib openssl curl popt gnutls sqlite libogg libvorbis"
RRECOMMENDS_${PN} = "logrotate"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"
@@ -15,23 +17,30 @@ SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz\
file://volatiles \
file://init"
+ARCH_efika="ppc"
+ARCH_dht-walnut="ppc"
+ARCH_magicbox="ppc"
+ARCH_sequoia="ppc"
+
+
+
INITSCRIPT_NAME = "asterisk"
INITSCRIPT_PARAMS = "defaults 60"
inherit autotools update-rc.d
-EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${HOST_SYS}\
- --with-z=${STAGING_DIR}/${HOST_SYS}\
- --with-curl=${STAGING_DIR}/${HOST_SYS}\
- --with-termcap=${STAGING_DIR}/${HOST_SYS}\
- --with-ogg=${STAGING_DIR}/${HOST_SYS}\
- --with-vorbis=${STAGING_DIR}/${HOST_SYS}\
- --with-sqlite=${STAGING_DIR}/${HOST_SYS}\
- --with-popt=${STAGING_DIR}/${HOST_SYS}\
- --with-gnutls=${STAGING_DIR}/${HOST_SYS}\
+EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
+ --with-z=${STAGING_DIR}/${TARGET_SYS}\
+ --with-curl=${STAGING_DIR}/${TARGET_SYS}\
+ --with-termcap=${STAGING_DIR}/${TARGET_SYS}\
+ --with-ogg=${STAGING_DIR}/${TARGET_SYS}\
+ --with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
+ --with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
+ --with-popt=${STAGING_DIR}/${TARGET_SYS}\
+ --with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
--without-curses\
- --with-ncurses=${STAGING_DIR}/${HOST_SYS}\
+ --with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
--without-imap\
--without-netsnmp\
--without-odbc\
@@ -47,7 +56,8 @@ EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${HOST_SYS}\
#export NOISY_BUILD=yes
export ASTCFLAGS = "-fsigned-char -I${STAGING_INCDIR} -DPATH_MAX=4096"
-export ASTLDFLAGS="${LDFLAGS}"
+export ASTLDFLAGS="${LDFLAGS} -lpthread -ldl -lresolv "
+export PROC="${ARCH}"
do_configure_prepend () {
sed -i 's:/var:${localstatedir}:' ${WORKDIR}/logrotate
@@ -63,7 +73,24 @@ do_configure () {
oe_runconf
}
+
+do_compile() {
+ (
+ #make sure that menuselect gets build using host toolchain
+ unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+ cd menuselect
+ ./configure
+ oe_runmake
+ cd ../
+ ) || exit 1
+ oe_runmake
+}
+
+
+
+
do_install_append() {
+ install -d ${D}${sysconfdir}/init.d/
install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/asterisk
install -c -D -m 644 ${WORKDIR}/logrotate ${D}${sysconfdir}/logrotate.d/asterisk
install -c -D -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/asterisk
@@ -76,6 +103,8 @@ pkg_postinst_prepend() {
}
FILES_${PN} += "${libdir}/asterisk/modules/*"
+FILES_${PN}-dbg += "${libdir}/asterisk/modules/.debug \
+ ${localstatedir}/lib/asterisk/*/.debug"
CONFFILES_${PN} += "${sysconfdir}/asterisk/adsi.conf"
CONFFILES_${PN} += "${sysconfdir}/asterisk/adtranvofr.conf"
@@ -139,4 +168,4 @@ CONFFILES_${PN} += "${sysconfdir}/asterisk/users.conf"
CONFFILES_${PN} += "${sysconfdir}/asterisk/voicemail.conf"
CONFFILES_${PN} += "${sysconfdir}/asterisk/vpb.conf"
CONFFILES_${PN} += "${sysconfdir}/asterisk/zapata.conf"
-
+CONFFILES_${PN} += "${sysconfdir}/logrotate.d/asterisk"
diff --git a/packages/base-files/base-files/akita/fstab b/packages/base-files/base-files/akita/fstab
index ba53cd6fd4..8a2b07a089 100644
--- a/packages/base-files/base-files/akita/fstab
+++ b/packages/base-files/base-files/akita/fstab
@@ -5,6 +5,7 @@ proc /proc proc defaults 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
tmpfs /media/ram tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
# SD/MMC in kernel 2.4
/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
diff --git a/packages/base-files/base-files/amsdelta/fstab b/packages/base-files/base-files/amsdelta/fstab
index 0285a1f7e7..45922b2a9c 100644
--- a/packages/base-files/base-files/amsdelta/fstab
+++ b/packages/base-files/base-files/amsdelta/fstab
@@ -1,6 +1,8 @@
/dev/mtdblock4 / jffs2 defaults 1 1
proc /proc proc defaults 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+
# we use a non-volatile ramdisk, see /etc/init.d/ramdisk
tmpfs /media/ram tmpfs defaults 0 0
diff --git a/packages/base-files/base-files/armzone-qt2410/fstab b/packages/base-files/base-files/armzone-qt2410/fstab
index 88d057c40d..9aedcbe0f0 100644
--- a/packages/base-files/base-files/armzone-qt2410/fstab
+++ b/packages/base-files/base-files/armzone-qt2410/fstab
@@ -8,6 +8,7 @@ proc /proc proc defaults 0 0
# Temporary
tmpfs /var/volatile tmpfs mode=0755 0 0
tmpfs /media/ram tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
# SD/MMC
/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
diff --git a/packages/base-files/base-files/c7x0/fstab b/packages/base-files/base-files/c7x0/fstab
index 03945ca81b..c3de8d28dc 100644
--- a/packages/base-files/base-files/c7x0/fstab
+++ b/packages/base-files/base-files/c7x0/fstab
@@ -5,6 +5,7 @@ proc /proc proc defaults 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
tmpfs /media/ram tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
# SD/MMC in kernel 2.4
/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
diff --git a/packages/base-files/base-files/collie/fstab b/packages/base-files/base-files/collie/fstab
index cbb38d1831..a3a9ea2df1 100644
--- a/packages/base-files/base-files/collie/fstab
+++ b/packages/base-files/base-files/collie/fstab
@@ -3,6 +3,7 @@ proc /proc proc defaults 0 0
/dev/hda1 /media/cf auto defaults,sync,noauto,noatime,user,exec,suid,gid=100,umask=0002 0 0
/dev/mmcda1 /media/card auto defaults,sync,noauto,noatime,user,exec,suid 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
# we use a non-volatile ramdisk, see /etc/init.d/ramdisk
#tmpfs /media/ram tmpfs defaults 0 0
diff --git a/packages/base-files/base-files/efika/fstab b/packages/base-files/base-files/efika/fstab
index 8c79a60df9..c7bf023f22 100644
--- a/packages/base-files/base-files/efika/fstab
+++ b/packages/base-files/base-files/efika/fstab
@@ -2,4 +2,5 @@ rootfs / auto defaults 1 1
proc /proc proc defaults 0 0
devpts /dev/pts devpts mode=0620,gid=5 0 0
usbfs /proc/bus/usb usbfs auto 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
diff --git a/packages/base-files/base-files/ep93xx/fstab b/packages/base-files/base-files/ep93xx/fstab
index 8c79a60df9..c7bf023f22 100644
--- a/packages/base-files/base-files/ep93xx/fstab
+++ b/packages/base-files/base-files/ep93xx/fstab
@@ -2,4 +2,5 @@ rootfs / auto defaults 1 1
proc /proc proc defaults 0 0
devpts /dev/pts devpts mode=0620,gid=5 0 0
usbfs /proc/bus/usb usbfs auto 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
diff --git a/packages/base-files/base-files/epia/fstab b/packages/base-files/base-files/epia/fstab
index 83d673c8b5..5ec79ba17a 100644
--- a/packages/base-files/base-files/epia/fstab
+++ b/packages/base-files/base-files/epia/fstab
@@ -1,4 +1,5 @@
/dev/ram0 / ext2 rw 1 1
tmpfs /var/volatile tmpfs mode=0755 0 0
proc /proc proc defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /tmp tmpfs defaults 0 0
diff --git a/packages/base-files/base-files/fic-gta01/fstab b/packages/base-files/base-files/fic-gta01/fstab
index 2f4a38e703..d2976a4205 100644
--- a/packages/base-files/base-files/fic-gta01/fstab
+++ b/packages/base-files/base-files/fic-gta01/fstab
@@ -8,6 +8,7 @@ proc /proc proc defaults 0 0
# Temporary
tmpfs /tmp tmpfs defaults 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /media/ram tmpfs defaults 0 0
# microSD slot
diff --git a/packages/webkit/webkit/.mtn2git_empty b/packages/base-files/base-files/fic-gta02/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/webkit/webkit/.mtn2git_empty
+++ b/packages/base-files/base-files/fic-gta02/.mtn2git_empty
diff --git a/packages/base-files/base-files/fic-gta02/fstab b/packages/base-files/base-files/fic-gta02/fstab
new file mode 100644
index 0000000000..d2976a4205
--- /dev/null
+++ b/packages/base-files/base-files/fic-gta02/fstab
@@ -0,0 +1,18 @@
+# Root and Pseudo
+/dev/mtdblock4 / jffs2 rw,noatime 1 1
+proc /proc proc defaults 0 0
+
+# devpts?
+# usb?
+
+# Temporary
+tmpfs /tmp tmpfs defaults 0 0
+tmpfs /var/volatile tmpfs mode=0755 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+tmpfs /media/ram tmpfs defaults 0 0
+
+# microSD slot
+/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
+
+# USB Storage
+/dev/sda1 /media/hdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0
diff --git a/packages/base-files/base-files/fstab b/packages/base-files/base-files/fstab
index 0720daf432..628a9e9876 100644
--- a/packages/base-files/base-files/fstab
+++ b/packages/base-files/base-files/fstab
@@ -5,6 +5,7 @@ proc /proc proc defaults 0 0
devpts /dev/pts devpts mode=0620,gid=5 0 0
usbfs /proc/bus/usb usbfs defaults 0 0
tmpfs /var/volatile tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /media/ram tmpfs defaults 0 0
# uncomment this if your device has a SD/MMC/Transflash slot
diff --git a/packages/base-files/base-files/h2200/fstab b/packages/base-files/base-files/h2200/fstab
index 6b008b3834..8243195d99 100644
--- a/packages/base-files/base-files/h2200/fstab
+++ b/packages/base-files/base-files/h2200/fstab
@@ -2,5 +2,6 @@
proc /proc proc defaults 0 0
sys /sys sysfs defaults 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
/dev/hda1 /media/cf auto defaults,sync,noauto,noatime,exec,suid 0 0
/dev/mmcblk0p1 /media/card auto defaults,sync,noauto,noatime,exec,suid 0 0
diff --git a/packages/base-files/base-files/h3600/fstab b/packages/base-files/base-files/h3600/fstab
index d300b02566..92293a59af 100644
--- a/packages/base-files/base-files/h3600/fstab
+++ b/packages/base-files/base-files/h3600/fstab
@@ -3,4 +3,5 @@ proc /proc proc defaults 0 0
/dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0
/dev/mmc/part1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /media/ram tmpfs defaults 0 0
diff --git a/packages/base-files/base-files/h3900/fstab b/packages/base-files/base-files/h3900/fstab
index afa028bf90..2a106ef945 100644
--- a/packages/base-files/base-files/h3900/fstab
+++ b/packages/base-files/base-files/h3900/fstab
@@ -5,4 +5,5 @@ proc /proc proc defaults 0 0
/dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0
/dev/mmc/part1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /media/ram tmpfs defaults 0 0
diff --git a/packages/base-files/base-files/h5000/fstab b/packages/base-files/base-files/h5000/fstab
index 4ae3ad1344..4d3c38eca8 100644
--- a/packages/base-files/base-files/h5000/fstab
+++ b/packages/base-files/base-files/h5000/fstab
@@ -5,4 +5,5 @@ proc /proc proc defaults 0 0
/dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0
/dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /media/ram tmpfs defaults 0 0
diff --git a/packages/base-files/base-files/h6300/fstab b/packages/base-files/base-files/h6300/fstab
index f2eeb25b36..f9b94d1960 100644
--- a/packages/base-files/base-files/h6300/fstab
+++ b/packages/base-files/base-files/h6300/fstab
@@ -2,6 +2,7 @@ rootfs / auto defaults 1 1
proc /proc proc defaults 0 0
sys /sys sysfs defaults 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
#The devpts file system provides an interface to pseudo terminal (pty) devices.
devpts /dev/pts devpts mode=0620,gid=5 0 0
#Mount first partition from the mmc card.
diff --git a/packages/base-files/base-files/htcuniversal/fstab b/packages/base-files/base-files/htcuniversal/fstab
index 1ec129e366..b4aa259c4e 100644
--- a/packages/base-files/base-files/htcuniversal/fstab
+++ b/packages/base-files/base-files/htcuniversal/fstab
@@ -4,6 +4,7 @@ devpts /dev/pts devpts mode=0620,gid=5 0 0
usbfs /proc/bus/usb usbfs defaults 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
tmpfs /media/ram tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
# uncomment this if your device has a SD/MMC/Transflash slot
/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
diff --git a/packages/base-files/base-files/hx4700/fstab b/packages/base-files/base-files/hx4700/fstab
index 1c90d577ac..04ac4849fd 100644
--- a/packages/base-files/base-files/hx4700/fstab
+++ b/packages/base-files/base-files/hx4700/fstab
@@ -6,4 +6,5 @@ sys /sys sysfs defaults 0 0
/dev/hda1 /media/cf auto defaults,noauto,noatime,exec,suid 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /media/ram tmpfs defaults 0 0
diff --git a/packages/base-files/base-files/jornada56x/fstab b/packages/base-files/base-files/jornada56x/fstab
index 65db0c94a3..d8258a0c05 100644
--- a/packages/base-files/base-files/jornada56x/fstab
+++ b/packages/base-files/base-files/jornada56x/fstab
@@ -3,4 +3,5 @@ proc /proc proc defaults 0 0
/dev/hda1 /mnt/cf auto defaults,sync,noauto 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
tmpfs /mnt/ram tmpfs defaults 0 0
-devpts /dev/pts devpts defaults 0 0 \ No newline at end of file
+tmpfs /dev/shm tmpfs mode=0777 0 0
+devpts /dev/pts devpts defaults 0 0
diff --git a/packages/base-files/base-files/jornada6xx/fstab b/packages/base-files/base-files/jornada6xx/fstab
index 22a3d30e71..f0c23d936c 100644
--- a/packages/base-files/base-files/jornada6xx/fstab
+++ b/packages/base-files/base-files/jornada6xx/fstab
@@ -4,4 +4,5 @@ proc /proc proc defaults 0 0
/dev/hda3 none swap sw 0 0
tmpfs /var/volatiles tmpfs defaults 0 0
tmpfs /mnt/ram tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
devpts /dev/pts devpts defaults 0 0
diff --git a/packages/base-files/base-files/jornada7xx/fstab b/packages/base-files/base-files/jornada7xx/fstab
index 22a3d30e71..f0c23d936c 100644
--- a/packages/base-files/base-files/jornada7xx/fstab
+++ b/packages/base-files/base-files/jornada7xx/fstab
@@ -4,4 +4,5 @@ proc /proc proc defaults 0 0
/dev/hda3 none swap sw 0 0
tmpfs /var/volatiles tmpfs defaults 0 0
tmpfs /mnt/ram tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
devpts /dev/pts devpts defaults 0 0
diff --git a/packages/base-files/base-files/mtx-1/fstab b/packages/base-files/base-files/mtx-1/fstab
index 06ba41dbb8..5c0e2b39d5 100644
--- a/packages/base-files/base-files/mtx-1/fstab
+++ b/packages/base-files/base-files/mtx-1/fstab
@@ -5,4 +5,5 @@ rootfs / auto defaults 1 1
tmpfs /var/volatile tmpfs mode=0755,size=10m 0 0
proc /proc proc defaults 0 0
devpts /dev/pts devpts mode=0620,gid=5 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
usbdevfs /proc/bus/usb usbdevfs noauto 0 0
diff --git a/packages/base-files/base-files/mtx-2/fstab b/packages/base-files/base-files/mtx-2/fstab
index a8f96f81b0..8b9ad0f308 100644
--- a/packages/base-files/base-files/mtx-2/fstab
+++ b/packages/base-files/base-files/mtx-2/fstab
@@ -5,4 +5,5 @@ rootfs / auto defaults 1 1
tmpfs /var/volatile tmpfs mode=0755,size=10m 0 0
proc /proc proc defaults 0 0
devpts /dev/pts devpts mode=0620,gid=5 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
usbdevfs /proc/bus/usb usbdevfs noauto 0 0
diff --git a/packages/base-files/base-files/netbook-pro/fstab b/packages/base-files/base-files/netbook-pro/fstab
index 8c79a60df9..c7bf023f22 100644
--- a/packages/base-files/base-files/netbook-pro/fstab
+++ b/packages/base-files/base-files/netbook-pro/fstab
@@ -2,4 +2,5 @@ rootfs / auto defaults 1 1
proc /proc proc defaults 0 0
devpts /dev/pts devpts mode=0620,gid=5 0 0
usbfs /proc/bus/usb usbfs auto 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
diff --git a/packages/base-files/base-files/netvista/fstab b/packages/base-files/base-files/netvista/fstab
index f26a57d2cd..351041d66e 100644
--- a/packages/base-files/base-files/netvista/fstab
+++ b/packages/base-files/base-files/netvista/fstab
@@ -2,4 +2,5 @@
tmpfs /var/volatile tmpfs mode=0755 0 0
proc /proc proc defaults 0 0
tmpfs /tmp tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
devfs /dev/devfs devfs defaults 0 0
diff --git a/packages/base-files/base-files/nokia770/fstab b/packages/base-files/base-files/nokia770/fstab
index c68c4d4b43..c09a851566 100644
--- a/packages/base-files/base-files/nokia770/fstab
+++ b/packages/base-files/base-files/nokia770/fstab
@@ -2,5 +2,6 @@ rootfs / rootfs defaults,errors=remount-ro,noatime 0
/dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,exec,suid 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
tmpfs /media/ram tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
proc /proc proc defaults 0 0
usbfs /proc/bus/usb usbfs defaults 0 0
diff --git a/packages/base-files/base-files/omap5912osk/fstab b/packages/base-files/base-files/omap5912osk/fstab
index 988cf717b0..687fd00227 100644
--- a/packages/base-files/base-files/omap5912osk/fstab
+++ b/packages/base-files/base-files/omap5912osk/fstab
@@ -4,6 +4,7 @@ rootfs / auto defaults 1 1
proc /proc proc defaults 0 0
sysfs /sysfs sysfs defaults 0 0
tmpfs /dev tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
tmpfs /media/ram tmpfs defaults 0 0
diff --git a/packages/base-files/base-files/openmn/fstab b/packages/base-files/base-files/openmn/fstab
index c3629a4887..06589b01dc 100644
--- a/packages/base-files/base-files/openmn/fstab
+++ b/packages/base-files/base-files/openmn/fstab
@@ -1,4 +1,5 @@
devfs /dev devfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
proc /proc proc defaults 0 0
none /sys sysfs defaults 0 0
rootfs / rootfs rw 1 1
diff --git a/packages/base-files/base-files/poodle/fstab b/packages/base-files/base-files/poodle/fstab
index 81de333ba7..9f87b91155 100644
--- a/packages/base-files/base-files/poodle/fstab
+++ b/packages/base-files/base-files/poodle/fstab
@@ -9,5 +9,6 @@ proc /proc proc defaults 0 0
# SD/MMC in kernel 2.4
/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
tmpfs /media/ram tmpfs defaults 0 0
diff --git a/packages/base-files/base-files/simpad/fstab b/packages/base-files/base-files/simpad/fstab
index c9f82ca2e8..3e57ae3534 100644
--- a/packages/base-files/base-files/simpad/fstab
+++ b/packages/base-files/base-files/simpad/fstab
@@ -1,6 +1,7 @@
rootfs / auto defaults 1 1
proc /proc proc defaults 0 0
devpts /dev/pts devpts mode=0620,gid=5 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
usbdevfs /proc/bus/usb usbdevfs noauto 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
tmpfs /media/ram tmpfs defaults 0 0
diff --git a/packages/base-files/base-files/slugos/fstab b/packages/base-files/base-files/slugos/fstab
index 3f35e7a3a7..d30f958401 100644
--- a/packages/base-files/base-files/slugos/fstab
+++ b/packages/base-files/base-files/slugos/fstab
@@ -2,4 +2,5 @@ rootfs / jffs2 defaults 1 1
proc /proc proc defaults 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
tmpfs /media/ram tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
usbfs /proc/bus/usb usbfs defaults 0 0
diff --git a/packages/base-files/base-files/spitz/fstab b/packages/base-files/base-files/spitz/fstab
index 8e667b63a5..f266212135 100644
--- a/packages/base-files/base-files/spitz/fstab
+++ b/packages/base-files/base-files/spitz/fstab
@@ -6,6 +6,8 @@ proc /proc proc defaults 0 0
# we can use a normal var filesystem with a microdrive
# tmpfs /var/volatiles tmpfs defaults 0 0
tmpfs /media/ram tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+
# Compact Flash memory cards
/dev/hdc1 /media/cf auto defaults,sync,noauto 0 0
diff --git a/packages/base-files/base-files/tosa/fstab b/packages/base-files/base-files/tosa/fstab
index b439abeb2c..8607c79be8 100644
--- a/packages/base-files/base-files/tosa/fstab
+++ b/packages/base-files/base-files/tosa/fstab
@@ -5,6 +5,7 @@ proc /proc proc defaults 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
tmpfs /media/ram tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
usbfs /proc/bus/usb usbfs auto 0 0
diff --git a/packages/base-files/base-files/wrt54/fstab b/packages/base-files/base-files/wrt54/fstab
index 3dce9b3ed1..0e64d3015e 100644
--- a/packages/base-files/base-files/wrt54/fstab
+++ b/packages/base-files/base-files/wrt54/fstab
@@ -3,5 +3,6 @@
# <file system> <mount pt> <type> <options> <dump> <pass>
rootfs / auto defaults 1 1
tmpfs /var/volatile tmpfs mode=0755,size=50% 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
proc /proc proc defaults 0 0
devpts /dev/pts devpts mode=0620,gid=5 0 0
diff --git a/packages/base-files/base-files/xxs1500/fstab b/packages/base-files/base-files/xxs1500/fstab
index d4e2eff592..655ea977b9 100644
--- a/packages/base-files/base-files/xxs1500/fstab
+++ b/packages/base-files/base-files/xxs1500/fstab
@@ -5,4 +5,5 @@ rootfs / auto defaults 1 1
tmpfs /var/volatile tmpfs mode=0755,size=10m 0 0
proc /proc proc defaults 0 0
devpts /dev/pts devpts mode=0620,gid=5 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
usbdevfs /proc/bus/usb usbdevfs noauto 0 0
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index d8335f7abb..ac12f5e08a 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Miscellaneous files for the base system."
SECTION = "base"
PRIORITY = "required"
-PR = "r69"
+PR = "r71"
LICENSE = "GPL"
SRC_URI = " \
@@ -24,6 +24,8 @@ SRC_URI = " \
file://licenses/Artistic "
S = "${WORKDIR}"
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
+
docdir_append = "/${P}"
dirs1777 = "/tmp ${localstatedir}/volatile/lock ${localstatedir}/volatile/tmp"
dirs2775 = "/home ${prefix}/src ${localstatedir}/local"
diff --git a/packages/binutils/binutils-cross.inc b/packages/binutils/binutils-cross.inc
index c63ea687aa..74ff4dd7a7 100644
--- a/packages/binutils/binutils-cross.inc
+++ b/packages/binutils/binutils-cross.inc
@@ -4,7 +4,9 @@ DEPENDS += "flex-native bison-native"
PROVIDES = "virtual/${TARGET_PREFIX}binutils"
PACKAGES = ""
EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
- --program-prefix=${TARGET_PREFIX}"
+ --program-prefix=${TARGET_PREFIX} \
+ --enable-install-libbfd \
+ "
do_stage () {
oe_runmake install
diff --git a/packages/binutils/binutils-cross_2.17.50.0.1.bb b/packages/binutils/binutils-cross_2.17.50.0.1.bb
index 1f2f43ecf8..d245f7d11a 100644
--- a/packages/binutils/binutils-cross_2.17.50.0.1.bb
+++ b/packages/binutils/binutils-cross_2.17.50.0.1.bb
@@ -1,32 +1,3 @@
-SECTION = "devel"
-require binutils_${PV}.bb
-inherit cross
-DEPENDS += "flex-native bison-native"
-PROVIDES = "virtual/${TARGET_PREFIX}binutils"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
-PACKAGES = ""
-EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
- --program-prefix=${TARGET_PREFIX}"
-
-do_stage () {
- oe_runmake install
-
- # We don't really need these, so we'll remove them...
- rm -rf ${CROSS_DIR}/lib/ldscripts
- rm -rf ${CROSS_DIR}/share/info
- rm -rf ${CROSS_DIR}/share/locale
- rm -rf ${CROSS_DIR}/share/man
- rmdir ${CROSS_DIR}/share || :
- rmdir ${CROSS_DIR}/${libdir}/gcc-lib || :
- rmdir ${CROSS_DIR}/${libdir} || :
- rmdir ${CROSS_DIR}/${prefix} || :
-
- # We want to move this into the target specific location
- mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
- mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
- rmdir ${CROSS_DIR}/lib || :
-}
-
-do_install () {
- :
-}
+require binutils_${PV}.bb
+require binutils-cross.inc
diff --git a/packages/binutils/binutils-cross_2.17.50.0.12.bb b/packages/binutils/binutils-cross_2.17.50.0.12.bb
index 1f2f43ecf8..d245f7d11a 100644
--- a/packages/binutils/binutils-cross_2.17.50.0.12.bb
+++ b/packages/binutils/binutils-cross_2.17.50.0.12.bb
@@ -1,32 +1,3 @@
-SECTION = "devel"
-require binutils_${PV}.bb
-inherit cross
-DEPENDS += "flex-native bison-native"
-PROVIDES = "virtual/${TARGET_PREFIX}binutils"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
-PACKAGES = ""
-EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
- --program-prefix=${TARGET_PREFIX}"
-
-do_stage () {
- oe_runmake install
-
- # We don't really need these, so we'll remove them...
- rm -rf ${CROSS_DIR}/lib/ldscripts
- rm -rf ${CROSS_DIR}/share/info
- rm -rf ${CROSS_DIR}/share/locale
- rm -rf ${CROSS_DIR}/share/man
- rmdir ${CROSS_DIR}/share || :
- rmdir ${CROSS_DIR}/${libdir}/gcc-lib || :
- rmdir ${CROSS_DIR}/${libdir} || :
- rmdir ${CROSS_DIR}/${prefix} || :
-
- # We want to move this into the target specific location
- mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
- mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
- rmdir ${CROSS_DIR}/lib || :
-}
-
-do_install () {
- :
-}
+require binutils_${PV}.bb
+require binutils-cross.inc
diff --git a/packages/binutils/binutils-cross_2.17.50.0.5.bb b/packages/binutils/binutils-cross_2.17.50.0.5.bb
index 1f2f43ecf8..d245f7d11a 100644
--- a/packages/binutils/binutils-cross_2.17.50.0.5.bb
+++ b/packages/binutils/binutils-cross_2.17.50.0.5.bb
@@ -1,32 +1,3 @@
-SECTION = "devel"
-require binutils_${PV}.bb
-inherit cross
-DEPENDS += "flex-native bison-native"
-PROVIDES = "virtual/${TARGET_PREFIX}binutils"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
-PACKAGES = ""
-EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
- --program-prefix=${TARGET_PREFIX}"
-
-do_stage () {
- oe_runmake install
-
- # We don't really need these, so we'll remove them...
- rm -rf ${CROSS_DIR}/lib/ldscripts
- rm -rf ${CROSS_DIR}/share/info
- rm -rf ${CROSS_DIR}/share/locale
- rm -rf ${CROSS_DIR}/share/man
- rmdir ${CROSS_DIR}/share || :
- rmdir ${CROSS_DIR}/${libdir}/gcc-lib || :
- rmdir ${CROSS_DIR}/${libdir} || :
- rmdir ${CROSS_DIR}/${prefix} || :
-
- # We want to move this into the target specific location
- mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
- mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
- rmdir ${CROSS_DIR}/lib || :
-}
-
-do_install () {
- :
-}
+require binutils_${PV}.bb
+require binutils-cross.inc
diff --git a/packages/binutils/binutils-cross_2.17.50.0.8.bb b/packages/binutils/binutils-cross_2.17.50.0.8.bb
index 1f2f43ecf8..d245f7d11a 100644
--- a/packages/binutils/binutils-cross_2.17.50.0.8.bb
+++ b/packages/binutils/binutils-cross_2.17.50.0.8.bb
@@ -1,32 +1,3 @@
-SECTION = "devel"
-require binutils_${PV}.bb
-inherit cross
-DEPENDS += "flex-native bison-native"
-PROVIDES = "virtual/${TARGET_PREFIX}binutils"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
-PACKAGES = ""
-EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
- --program-prefix=${TARGET_PREFIX}"
-
-do_stage () {
- oe_runmake install
-
- # We don't really need these, so we'll remove them...
- rm -rf ${CROSS_DIR}/lib/ldscripts
- rm -rf ${CROSS_DIR}/share/info
- rm -rf ${CROSS_DIR}/share/locale
- rm -rf ${CROSS_DIR}/share/man
- rmdir ${CROSS_DIR}/share || :
- rmdir ${CROSS_DIR}/${libdir}/gcc-lib || :
- rmdir ${CROSS_DIR}/${libdir} || :
- rmdir ${CROSS_DIR}/${prefix} || :
-
- # We want to move this into the target specific location
- mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
- mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
- rmdir ${CROSS_DIR}/lib || :
-}
-
-do_install () {
- :
-}
+require binutils_${PV}.bb
+require binutils-cross.inc
diff --git a/packages/binutils/binutils-cross_cvs.bb b/packages/binutils/binutils-cross_cvs.bb
index d37740b5e9..5236f766e1 100644
--- a/packages/binutils/binutils-cross_cvs.bb
+++ b/packages/binutils/binutils-cross_cvs.bb
@@ -1,32 +1,3 @@
-SECTION = "devel"
require binutils_cvs.bb
-inherit cross
-DEPENDS += "flex-native bison-native"
-PROVIDES = "virtual/${TARGET_PREFIX}binutils"
+require binutils-cross.inc
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
-PACKAGES = ""
-EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
- --program-prefix=${TARGET_PREFIX}"
-
-do_stage () {
- oe_runmake install
-
- # We don't really need these, so we'll remove them...
- rm -rf ${CROSS_DIR}/lib/ldscripts
- rm -rf ${CROSS_DIR}/share/info
- rm -rf ${CROSS_DIR}/share/locale
- rm -rf ${CROSS_DIR}/share/man
- rmdir ${CROSS_DIR}/share || :
- rmdir ${CROSS_DIR}/${libdir}/gcc-lib || :
- rmdir ${CROSS_DIR}/${libdir} || :
- rmdir ${CROSS_DIR}/${prefix} || :
-
- # We want to move this into the target specific location
- mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
- mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
- rmdir ${CROSS_DIR}/lib || :
-}
-
-do_install () {
- :
-}
diff --git a/packages/binutils/binutils-cvs/110-arm-eabi-conf.patch b/packages/binutils/binutils-cvs/110-arm-eabi-conf.patch
new file mode 100644
index 0000000000..ca586843f2
--- /dev/null
+++ b/packages/binutils/binutils-cvs/110-arm-eabi-conf.patch
@@ -0,0 +1,24 @@
+diff -urN binutils-2.16.91.0.7.orig/configure binutils-2.16.91.0.7/configure
+--- binutils-2.16.91.0.7.orig/configure 2006-05-31 14:54:24.000000000 +0300
++++ binutils-2.16.91.0.7/configure 2006-05-31 14:55:53.000000000 +0300
+@@ -1299,7 +1299,7 @@
+ arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
+ noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+ ;;
+- arm*-*-linux-gnueabi)
++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
+ noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+ noconfigdirs="$noconfigdirs target-libjava target-libobjc"
+ ;;
+diff -urN binutils-2.16.91.0.7.orig/configure.ac binutils-2.16.91.0.7/configure.ac
+--- binutils-2.16.91.0.7.orig/configure.ac 2006-05-31 14:54:24.000000000 +0300
++++ binutils-2.16.91.0.7/configure.ac 2006-05-31 14:55:53.000000000 +0300
+@@ -497,7 +497,7 @@
+ arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
+ noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+ ;;
+- arm*-*-linux-gnueabi)
++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
+ noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+ noconfigdirs="$noconfigdirs target-libjava target-libobjc"
+ ;;
diff --git a/packages/binutils/binutils-cvs/binutils-100_cflags_for_build.patch b/packages/binutils/binutils-cvs/binutils-100_cflags_for_build.patch
deleted file mode 100644
index 468808bf59..0000000000
--- a/packages/binutils/binutils-cvs/binutils-100_cflags_for_build.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- src/bfd/doc/Makefile.am~binutils-100_cflags_for_build.patch
-+++ src/bfd/doc/Makefile.am
-@@ -55,10 +55,10 @@
- MKDOC = chew$(EXEEXT_FOR_BUILD)
-
- $(MKDOC): chew.o
-- $(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS) $(LOADLIBES) $(LDFLAGS)
-+ $(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS_FOR_BUILD) $(LOADLIBES) $(LDFLAGS_FOR_BUILD)
-
- chew.o: chew.c
-- $(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS) $(srcdir)/chew.c
-+ $(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/chew.c
-
- protos: libbfd.h libcoff.h bfd.h
-
---- src/binutils/Makefile.am~binutils-100_cflags_for_build.patch
-+++ src/binutils/Makefile.am
-@@ -219,20 +219,20 @@
- ./sysinfo$(EXEEXT_FOR_BUILD) -d <$(srcdir)/sysroff.info >sysroff.h
-
- sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o
-- $(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) -o $@ sysinfo.o syslex.o
-+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.o syslex.o
-
- syslex.o: syslex.c sysinfo.h
- if [ -r syslex.c ]; then \
-- $(CC_FOR_BUILD) -c -I. $(CFLAGS) syslex.c ; \
-+ $(CC_FOR_BUILD) -c -I. $(CFLAGS_FOR_BUILD) syslex.c ; \
- else \
-- $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(CFLAGS) $(srcdir)/syslex.c ;\
-+ $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c ;\
- fi
-
- sysinfo.o: sysinfo.c
- if [ -r sysinfo.c ]; then \
-- $(CC_FOR_BUILD) -c -I. $(CFLAGS) sysinfo.c ; \
-+ $(CC_FOR_BUILD) -c -I. $(CFLAGS_FOR_BUILD) sysinfo.c ; \
- else \
-- $(CC_FOR_BUILD) -c -I. $(CFLAGS) $(srcdir)/sysinfo.c ; \
-+ $(CC_FOR_BUILD) -c -I. $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c ; \
- fi
-
- # We need these for parallel make.
---- src/bfd/doc/Makefile.in~binutils-100_cflags_for_build.patch
-+++ src/bfd/doc/Makefile.in
-@@ -470,10 +470,10 @@
-
-
- $(MKDOC): chew.o
-- $(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS) $(LOADLIBES) $(LDFLAGS)
-+ $(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS_FOR_BUILD) $(LOADLIBES) $(LDFLAGS_FOR_BUILD)
-
- chew.o: chew.c
-- $(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS) $(srcdir)/chew.c
-+ $(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/chew.c
-
- protos: libbfd.h libcoff.h bfd.h
-
---- src/binutils/Makefile.in~binutils-100_cflags_for_build.patch
-+++ src/binutils/Makefile.in
-@@ -978,20 +978,20 @@
- ./sysinfo$(EXEEXT_FOR_BUILD) -d <$(srcdir)/sysroff.info >sysroff.h
-
- sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o
-- $(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) -o $@ sysinfo.o syslex.o
-+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.o syslex.o
-
- syslex.o: syslex.c sysinfo.h
- if [ -r syslex.c ]; then \
-- $(CC_FOR_BUILD) -c -I. $(CFLAGS) syslex.c ; \
-+ $(CC_FOR_BUILD) -c -I. $(CFLAGS_FOR_BUILD) syslex.c ; \
- else \
-- $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(CFLAGS) $(srcdir)/syslex.c ;\
-+ $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c ;\
- fi
-
- sysinfo.o: sysinfo.c
- if [ -r sysinfo.c ]; then \
-- $(CC_FOR_BUILD) -c -I. $(CFLAGS) sysinfo.c ; \
-+ $(CC_FOR_BUILD) -c -I. $(CFLAGS_FOR_BUILD) sysinfo.c ; \
- else \
-- $(CC_FOR_BUILD) -c -I. $(CFLAGS) $(srcdir)/sysinfo.c ; \
-+ $(CC_FOR_BUILD) -c -I. $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c ; \
- fi
-
- # We need these for parallel make.
diff --git a/packages/binutils/binutils-cvs/binutils-2.15.90.0.3-uclibc-200-build_modules.patch b/packages/binutils/binutils-cvs/binutils-2.15.90.0.3-uclibc-200-build_modules.patch
deleted file mode 100644
index 3560d2ca36..0000000000
--- a/packages/binutils/binutils-cvs/binutils-2.15.90.0.3-uclibc-200-build_modules.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- src/configure~binutils-2.15.90.0.3-uclibc-200-build_modules.patch
-+++ src/configure
-@@ -940,6 +940,11 @@
- build_configdirs=`echo ${build_libs} ${build_tools}`
- fi
-
-+case "$target" in
-+ *-*-*-uclibc*)
-+ build_modules=
-+ ;;
-+esac
- ################################################################################
-
- srcname="gnu development package"
---- src/configure.in~binutils-2.15.90.0.3-uclibc-200-build_modules.patch
-+++ src/configure.in
-@@ -189,6 +189,11 @@
- build_configdirs=`echo ${build_libs} ${build_tools}`
- fi
-
-+case "$target" in
-+ *-*-*-uclibc*)
-+ build_modules=
-+ ;;
-+esac
- ################################################################################
-
- srcname="gnu development package"
diff --git a/packages/binutils/binutils-cvs/binutils-2.15.90.0.3-uclibc-210-cflags.patch b/packages/binutils/binutils-cvs/binutils-2.15.90.0.3-uclibc-210-cflags.patch
deleted file mode 100644
index 40a71c602a..0000000000
--- a/packages/binutils/binutils-cvs/binutils-2.15.90.0.3-uclibc-210-cflags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- binutils-2.15.90.0.3/bfd/doc/Makefile.am.cflags 2004-01-14 16:07:44.000000000 -0500
-+++ binutils-2.15.90.0.3/bfd/doc/Makefile.am 2004-04-22 22:06:35.000000000 -0400
-@@ -55,10 +55,10 @@
- MKDOC = chew$(EXEEXT_FOR_BUILD)
-
- $(MKDOC): chew.o
-- $(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS) $(LOADLIBES) $(LDFLAGS)
-+ $(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS_FOR_BUILD) $(LOADLIBES) $(LDFLAGS)
-
- chew.o: chew.c
-- $(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS) $(srcdir)/chew.c
-+ $(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/chew.c
-
- protos: libbfd.h libcoff.h bfd.h
-
---- binutils-2.15.90.0.3/bfd/doc/Makefile.in.cflags 2004-04-12 15:56:34.000000000 -0400
-+++ binutils-2.15.90.0.3/bfd/doc/Makefile.in 2004-04-22 22:06:35.000000000 -0400
-@@ -472,10 +472,10 @@
-
-
- $(MKDOC): chew.o
-- $(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS) $(LOADLIBES) $(LDFLAGS)
-+ $(CC_FOR_BUILD) -o $(MKDOC) chew.o $(CFLAGS_FOR_BUILD) $(LOADLIBES) $(LDFLAGS)
-
- chew.o: chew.c
-- $(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS) $(srcdir)/chew.c
-+ $(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/chew.c
-
- protos: libbfd.h libcoff.h bfd.h
-
diff --git a/packages/binutils/binutils-cvs/binutils-2.15.91.0.1-uclibc-100-conf.patch b/packages/binutils/binutils-cvs/binutils-2.15.91.0.1-uclibc-100-conf.patch
deleted file mode 100644
index 6d0ce34947..0000000000
--- a/packages/binutils/binutils-cvs/binutils-2.15.91.0.1-uclibc-100-conf.patch
+++ /dev/null
@@ -1,603 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- src/bfd/config.bfd~binutils-2.15.91.0.1-uclibc-100-conf
-+++ src/bfd/config.bfd
-@@ -140,7 +140,7 @@
- targ_defvec=ecoffalpha_little_vec
- targ_selvecs=bfd_elf64_alpha_vec
- ;;
-- alpha*-*-linux-gnu* | alpha*-*-elf*)
-+ alpha*-*-linux-gnu* | alpha*-*-linux-uclibc* | alpha*-*-elf*)
- targ_defvec=bfd_elf64_alpha_vec
- targ_selvecs=ecoffalpha_little_vec
- ;;
-@@ -150,7 +150,7 @@
- alpha*-*-*)
- targ_defvec=ecoffalpha_little_vec
- ;;
-- ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-gnu* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu)
-+ ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-gnu* | ia64*-*-elf* | ia64*-*-linux-uclibc* | ia64*-*-kfreebsd*-gnu)
- targ_defvec=bfd_elf64_ia64_little_vec
- targ_selvecs="bfd_elf64_ia64_big_vec bfd_efi_app_ia64_vec"
- ;;
-@@ -227,7 +227,7 @@
- targ_defvec=bfd_elf32_littlearm_vec
- targ_selvecs=bfd_elf32_bigarm_vec
- ;;
-- armeb-*-elf | arm*b-*-linux-gnu*)
-+ armeb-*-elf | arm*b-*-linux-gnu* | arm*b-*-linux-uclibc*)
- targ_defvec=bfd_elf32_bigarm_vec
- targ_selvecs=bfd_elf32_littlearm_vec
- ;;
-@@ -237,7 +237,7 @@
- ;;
- arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | \
- arm*-*-uclinux* | arm-*-kfreebsd*-gnu | arm-*-vxworks | \
-- arm*-*-eabi* )
-+ arm*-*-eabi* | arm*-*-linux-uclibc* )
- targ_defvec=bfd_elf32_littlearm_vec
- targ_selvecs=bfd_elf32_bigarm_vec
- ;;
-@@ -381,7 +381,7 @@
- ;;
-
- #ifdef BFD64
-- hppa*64*-*-linux-gnu*)
-+ hppa*64*-*-linux-gnu* | hppa*64*-*-linux-uclibc*)
- targ_defvec=bfd_elf64_hppa_linux_vec
- targ_selvecs=bfd_elf64_hppa_vec
- ;;
-@@ -392,7 +392,7 @@
- ;;
- #endif
-
-- hppa*-*-linux-gnu*)
-+ hppa*-*-linux-gnu* | hppa*-*-linux-uclibc*)
- targ_defvec=bfd_elf32_hppa_linux_vec
- targ_selvecs=bfd_elf32_hppa_vec
- ;;
-@@ -525,7 +525,7 @@
- targ_selvecs=bfd_elf32_i386_vec
- targ_underscore=yes
- ;;
-- i[3-7]86-*-linux-gnu*)
-+ i[3-7]86-*-linux-gnu* | i[3-7]86-*-linux-uclibc*)
- targ_defvec=bfd_elf32_i386_vec
- targ_selvecs="i386linux_vec bfd_efi_app_ia32_vec"
- targ64_selvecs=bfd_elf64_x86_64_vec
-@@ -539,7 +539,7 @@
- targ_defvec=bfd_elf64_x86_64_vec
- targ_selvecs="bfd_elf32_i386_vec i386netbsd_vec i386coff_vec bfd_efi_app_ia32_vec"
- ;;
-- x86_64-*-linux-gnu*)
-+ x86_64-*-linux-gnu* | x86_64-*-linux-uclibc*)
- targ_defvec=bfd_elf64_x86_64_vec
- targ_selvecs="bfd_elf32_i386_vec i386linux_vec bfd_efi_app_ia32_vec"
- ;;
-@@ -715,7 +715,7 @@
- targ_selvecs=bfd_elf32_m68k_vec
- targ_underscore=yes
- ;;
-- m68*-*-linux-gnu*)
-+ m68*-*-linux-gnu* | m68*-*-linux-uclibc*)
- targ_defvec=bfd_elf32_m68k_vec
- targ_selvecs=m68klinux_vec
- ;;
-@@ -1001,7 +1001,8 @@
- ;;
- #endif
- powerpc-*-*bsd* | powerpc-*-elf* | powerpc-*-sysv4* | powerpc-*-eabi* | \
-- powerpc-*-solaris2* | powerpc-*-linux-gnu* | powerpc-*-rtems* | \
-+ powerpc-*-solaris2* | powerpc-*-linux-gnu* | powerpc-*-linux-uclibc* | \
-+ powerpc-*-rtems* | \
- powerpc-*-chorus* | powerpc-*-vxworks* | powerpc-*-windiss*)
- targ_defvec=bfd_elf32_powerpc_vec
- targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec ppcboot_vec"
-@@ -1038,8 +1039,8 @@
- targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
- ;;
- powerpcle-*-elf* | powerpcle-*-sysv4* | powerpcle-*-eabi* | \
-- powerpcle-*-solaris2* | powerpcle-*-linux-gnu* | powerpcle-*-vxworks* |\
-- powerpcle-*-rtems*)
-+ powerpcle-*-solaris2* | powerpcle-*-linux-gnu* | powerpcle-*-linux-uclibc* |\
-+ powerpcle-*-vxworks* | powerpcle-*-rtems*)
- targ_defvec=bfd_elf32_powerpcle_vec
- targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
- targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec"
-@@ -1206,7 +1207,7 @@
- targ_selvecs="bfd_elf32_sparc_vec sunos_big_vec"
- targ_underscore=yes
- ;;
-- sparc-*-linux-gnu*)
-+ sparc-*-linux-gnu* | sparc-*-linux-uclibc*)
- targ_defvec=bfd_elf32_sparc_vec
- targ_selvecs="sparclinux_vec bfd_elf64_sparc_vec sunos_big_vec"
- ;;
-@@ -1253,7 +1254,7 @@
- targ_defvec=sunos_big_vec
- targ_underscore=yes
- ;;
-- sparc64-*-linux-gnu*)
-+ sparc64-*-linux-gnu* | sparc64-*-linux-uclibc*)
- targ_defvec=bfd_elf64_sparc_vec
- targ_selvecs="bfd_elf32_sparc_vec sparclinux_vec sunos_big_vec"
- ;;
---- src/bfd/configure~binutils-2.15.91.0.1-uclibc-100-conf
-+++ src/bfd/configure
-@@ -3583,6 +3583,11 @@
- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-@@ -9914,7 +9919,7 @@
- alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
- COREFILE=''
- ;;
-- alpha*-*-linux-gnu*)
-+ alpha*-*-linux-gnu* | alpha*-*-linux-uclibc*)
- COREFILE=trad-core.lo
- TRAD_HEADER='"hosts/alphalinux.h"'
- ;;
-@@ -9978,7 +9983,7 @@
- COREFILE=trad-core.lo
- TRAD_HEADER='"hosts/i386mach3.h"'
- ;;
-- i[3-7]86-*-linux-gnu*)
-+ i[3-7]86-*-linux-gnu* | i[3-7]86-*-linux-uclibc*)
- COREFILE=trad-core.lo
- TRAD_HEADER='"hosts/i386linux.h"'
- ;;
-@@ -10016,7 +10021,7 @@
- COREFILE=trad-core.lo
- TRAD_HEADER='"hosts/hp300bsd.h"'
- ;;
-- m68*-*-linux-gnu*)
-+ m68*-*-linux-gnu* | m68*-*-linux-uclibc*)
- COREFILE=trad-core.lo
- TRAD_HEADER='"hosts/m68klinux.h"'
- ;;
---- src/bfd/configure.in~binutils-2.15.91.0.1-uclibc-100-conf
-+++ src/bfd/configure.in
-@@ -163,7 +163,7 @@
- alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
- COREFILE=''
- ;;
-- alpha*-*-linux-gnu*)
-+ alpha*-*-linux-gnu* | alpha*-*-linux-uclibc*)
- COREFILE=trad-core.lo
- TRAD_HEADER='"hosts/alphalinux.h"'
- ;;
-@@ -248,7 +248,7 @@
- TRAD_HEADER='"hosts/i386mach3.h"'
- ;;
- changequote(,)dnl
-- i[3-7]86-*-linux-gnu*)
-+ i[3-7]86-*-linux-gnu* | i[3-7]86-*-linux-uclibc*)
- changequote([,])dnl
- COREFILE=trad-core.lo
- TRAD_HEADER='"hosts/i386linux.h"'
-@@ -289,7 +289,7 @@
- COREFILE=trad-core.lo
- TRAD_HEADER='"hosts/hp300bsd.h"'
- ;;
-- m68*-*-linux-gnu*)
-+ m68*-*-linux-gnu* | m68*-*-linux-uclibc*)
- COREFILE=trad-core.lo
- TRAD_HEADER='"hosts/m68klinux.h"'
- ;;
---- src/gas/configure~binutils-2.15.91.0.1-uclibc-100-conf
-+++ src/gas/configure
-@@ -3420,6 +3420,11 @@
- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-@@ -4256,6 +4261,7 @@
- alpha*-*-osf*) fmt=ecoff ;;
- alpha*-*-linuxecoff*) fmt=ecoff ;;
- alpha*-*-linux-gnu*) fmt=elf em=linux ;;
-+ alpha*-*-linux-uclibc*) fmt=elf em=linux ;;
- alpha*-*-netbsd*) fmt=elf em=nbsd ;;
- alpha*-*-openbsd*) fmt=elf em=obsd ;;
-
-@@ -4271,6 +4277,7 @@
- arm*-*-conix*) fmt=elf ;;
- arm-*-linux*aout*) fmt=aout em=linux ;;
- arm*-*-linux-gnu*) fmt=elf em=linux ;;
-+ arm*-*-linux-uclibc*) fmt=elf em=linux ;;
- arm*-*-uclinux*) fmt=elf em=linux ;;
- arm-*-netbsdelf*) fmt=elf em=nbsd ;;
- arm-*-*n*bsd*) fmt=aout em=nbsd ;;
-@@ -4284,6 +4291,7 @@
-
- cris-*-linux-gnu* | crisv32-*-linux-gnu*)
- fmt=multi bfd_gas=yes em=linux ;;
-+ cris-*-linux-uclibc*) fmt=multi bfd_gas=yes em=linux ;;
- cris-*-* | crisv32-*-*) fmt=multi bfd_gas=yes ;;
-
- crx-*-elf*) fmt=elf ;;
-@@ -4343,7 +4351,9 @@
- i386-*-linux*oldld) fmt=aout em=linux ;;
- i386-*-linux*coff*) fmt=coff em=linux ;;
- i386-*-linux-gnu*) fmt=elf em=linux ;;
-+ i386-*-linux-uclibc*) fmt=elf em=linux ;;
- x86_64-*-linux-gnu*) fmt=elf em=linux ;;
-+ x86_64-*-linux-uclibc*) fmt=elf em=linux ;;
- i386-*-lynxos*) fmt=elf em=lynx bfd_gas=yes ;;
- i386-*-sysv[45]*) fmt=elf ;;
- i386-*-solaris*) fmt=elf ;;
-@@ -4403,6 +4413,7 @@
- ia64-*-elf*) fmt=elf ;;
- ia64-*-aix*) fmt=elf em=ia64aix ;;
- ia64-*-linux-gnu*) fmt=elf em=linux ;;
-+ ia64-*-linux-uclibc*) fmt=elf em=linux ;;
- ia64-*-hpux*) fmt=elf em=hpux ;;
- ia64-*-netbsd*) fmt=elf em=nbsd ;;
-
-@@ -4430,6 +4441,7 @@
- m68k-*-hpux*) fmt=hp300 em=hp300 ;;
- m68k-*-linux*aout*) fmt=aout em=linux ;;
- m68k-*-linux-gnu*) fmt=elf em=linux ;;
-+ m68k-*-linux-uclibc*) fmt=elf em=linux ;;
- m68k-*-uclinux*) fmt=elf ;;
- m68k-*-gnu*) fmt=elf ;;
- m68k-*-lynxos*) fmt=coff em=lynx ;;
-@@ -4504,7 +4516,7 @@
- ppc-*-beos*) fmt=coff ;;
- ppc-*-*n*bsd* | ppc-*-elf*) fmt=elf ;;
- ppc-*-eabi* | ppc-*-sysv4*) fmt=elf ;;
-- ppc-*-linux-gnu*) fmt=elf em=linux
-+ ppc-*-linux-uclibc* | ppc-*-linux-gnu*) fmt=elf em=linux
- case "$endian" in
- big) ;;
- *) { { echo "$as_me:$LINENO: error: GNU/Linux must be configured big endian" >&5
-@@ -4531,7 +4543,9 @@
- ppc-*-lynxos*) fmt=elf em=lynx bfd_gas=yes ;;
-
- s390x-*-linux-gnu*) fmt=elf em=linux ;;
-+ s390x-*-linux-uclibc*) fmt=elf em=linux ;;
- s390-*-linux-gnu*) fmt=elf em=linux ;;
-+ s390-*-linux-uclibc*) fmt=elf em=linux ;;
-
- sh*-*-linux*) fmt=elf em=linux
- case ${cpu} in
-@@ -4566,6 +4580,7 @@
- sparc-*-coff) fmt=coff ;;
- sparc-*-linux*aout*) fmt=aout em=linux ;;
- sparc-*-linux-gnu*) fmt=elf em=linux ;;
-+ sparc-*-linux-uclibc*) fmt=elf em=linux ;;
- sparc-*-lynxos*) fmt=coff em=lynx ;;
- sparc-fujitsu-none) fmt=aout ;;
- sparc-*-elf) fmt=elf ;;
---- src/gas/configure.in~binutils-2.15.91.0.1-uclibc-100-conf
-+++ src/gas/configure.in
-@@ -202,6 +202,7 @@
- alpha*-*-osf*) fmt=ecoff ;;
- alpha*-*-linuxecoff*) fmt=ecoff ;;
- alpha*-*-linux-gnu*) fmt=elf em=linux ;;
-+ alpha*-*-linux-uclibc*) fmt=elf em=linux ;;
- alpha*-*-netbsd*) fmt=elf em=nbsd ;;
- alpha*-*-openbsd*) fmt=elf em=obsd ;;
-
-@@ -217,6 +218,7 @@
- arm*-*-conix*) fmt=elf ;;
- arm-*-linux*aout*) fmt=aout em=linux ;;
- arm*-*-linux-gnu*) fmt=elf em=linux ;;
-+ arm*-*-linux-uclibc*) fmt=elf em=linux ;;
- arm*-*-uclinux*) fmt=elf em=linux ;;
- arm-*-netbsdelf*) fmt=elf em=nbsd ;;
- arm-*-*n*bsd*) fmt=aout em=nbsd ;;
-@@ -230,6 +232,7 @@
-
- cris-*-linux-gnu* | crisv32-*-linux-gnu*)
- fmt=multi bfd_gas=yes em=linux ;;
-+ cris-*-linux-uclibc*) fmt=multi bfd_gas=yes em=linux ;;
- cris-*-* | crisv32-*-*) fmt=multi bfd_gas=yes ;;
-
- crx-*-elf*) fmt=elf ;;
-@@ -289,7 +292,9 @@
- i386-*-linux*oldld) fmt=aout em=linux ;;
- i386-*-linux*coff*) fmt=coff em=linux ;;
- i386-*-linux-gnu*) fmt=elf em=linux ;;
-+ i386-*-linux-uclibc*) fmt=elf em=linux ;;
- x86_64-*-linux-gnu*) fmt=elf em=linux ;;
-+ x86_64-*-linux-uclibc*) fmt=elf em=linux ;;
- i386-*-lynxos*) fmt=elf em=lynx bfd_gas=yes ;;
- changequote(,)dnl
- i386-*-sysv[45]*) fmt=elf ;;
-@@ -342,6 +347,7 @@
- ia64-*-elf*) fmt=elf ;;
- ia64-*-aix*) fmt=elf em=ia64aix ;;
- ia64-*-linux-gnu*) fmt=elf em=linux ;;
-+ ia64-*-linux-uclibc*) fmt=elf em=linux ;;
- ia64-*-hpux*) fmt=elf em=hpux ;;
- ia64-*-netbsd*) fmt=elf em=nbsd ;;
-
-@@ -369,6 +375,7 @@
- m68k-*-hpux*) fmt=hp300 em=hp300 ;;
- m68k-*-linux*aout*) fmt=aout em=linux ;;
- m68k-*-linux-gnu*) fmt=elf em=linux ;;
-+ m68k-*-linux-uclibc*) fmt=elf em=linux ;;
- m68k-*-uclinux*) fmt=elf ;;
- m68k-*-gnu*) fmt=elf ;;
- m68k-*-lynxos*) fmt=coff em=lynx ;;
-@@ -440,7 +447,7 @@
- ppc-*-beos*) fmt=coff ;;
- ppc-*-*n*bsd* | ppc-*-elf*) fmt=elf ;;
- ppc-*-eabi* | ppc-*-sysv4*) fmt=elf ;;
-- ppc-*-linux-gnu*) fmt=elf em=linux
-+ ppc-*-linux-uclibc* | ppc-*-linux-gnu*) fmt=elf em=linux
- case "$endian" in
- big) ;;
- *) AC_MSG_ERROR(GNU/Linux must be configured big endian) ;;
-@@ -460,7 +467,9 @@
- ppc-*-lynxos*) fmt=elf em=lynx bfd_gas=yes ;;
-
- s390x-*-linux-gnu*) fmt=elf em=linux ;;
-+ s390x-*-linux-uclibc*) fmt=elf em=linux ;;
- s390-*-linux-gnu*) fmt=elf em=linux ;;
-+ s390-*-linux-uclibc*) fmt=elf em=linux ;;
-
- sh*-*-linux*) fmt=elf em=linux
- case ${cpu} in
-@@ -491,6 +500,7 @@
- sparc-*-coff) fmt=coff ;;
- sparc-*-linux*aout*) fmt=aout em=linux ;;
- sparc-*-linux-gnu*) fmt=elf em=linux ;;
-+ sparc-*-linux-uclibc*) fmt=elf em=linux ;;
- sparc-*-lynxos*) fmt=coff em=lynx ;;
- sparc-fujitsu-none) fmt=aout ;;
- sparc-*-elf) fmt=elf ;;
---- src/ld/configure~binutils-2.15.91.0.1-uclibc-100-conf
-+++ src/ld/configure
-@@ -1579,6 +1579,11 @@
- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
---- src/ld/configure.tgt~binutils-2.15.91.0.1-uclibc-100-conf
-+++ src/ld/configure.tgt
-@@ -32,6 +32,7 @@
- targ_extra_libpath=$targ_extra_emuls ;;
- cris-*-linux-gnu* | cris-*-linux-gnu*)
- targ_emul=crislinux ;;
-+cris-*-linux-uclibc*) targ_emul=crislinux ;;
- cris-*-* | crisv32-*-*) targ_emul=criself
- targ_extra_emuls="crisaout crislinux"
- targ_extra_libpath=$targ_extra_emuls ;;
-@@ -62,14 +63,16 @@
- tdir_elf32_sparc=`echo ${targ_alias} | sed -e 's/aout//'`
- tdir_sun4=sparc-sun-sunos4
- ;;
--sparc64-*-linux-gnu*) targ_emul=elf64_sparc
-+sparc64-*-linux-gnu* | sparc64-*-linux-uclibc*) \
-+ targ_emul=elf64_sparc
- targ_extra_emuls="elf32_sparc sparclinux sun4"
- targ_extra_libpath=elf32_sparc
- tdir_elf32_sparc=`echo ${targ_alias} | sed -e 's/64//'`
- tdir_sparclinux=${tdir_elf32_sparc}aout
- tdir_sun4=sparc-sun-sunos4
- ;;
--sparc*-*-linux-gnu*) targ_emul=elf32_sparc
-+sparc*-*-linux-gnu* | sparc*-*-linux-uclibc*) \
-+ targ_emul=elf32_sparc
- targ_extra_emuls="sparclinux elf64_sparc sun4"
- targ_extra_libpath=elf64_sparc
- tdir_sparclinux=${targ_alias}aout
-@@ -132,7 +135,7 @@
- m68*-apple-aux*) targ_emul=m68kaux ;;
- maxq-*-coff) targ_emul=maxqcoff;;
- *-tandem-none) targ_emul=st2000 ;;
--i370-*-elf* | i370-*-linux-gnu*) targ_emul=elf32i370 ;;
-+i370-*-elf* | i370-*-linux-gnu* | i370-*-linux-uclibc*) targ_emul=elf32i370 ;;
- i[3-7]86-*-nto-qnx*) targ_emul=i386nto ;;
- i[3-7]86-*-vsta) targ_emul=vsta ;;
- i[3-7]86-go32-rtems*) targ_emul=i386go32 ;;
-@@ -156,14 +159,16 @@
- tdir_elf_i386=`echo ${targ_alias} | sed -e 's/aout//'`
- ;;
- i[3-7]86-*-linux*oldld) targ_emul=i386linux; targ_extra_emuls=elf_i386 ;;
--i[3-7]86-*-linux-gnu*) targ_emul=elf_i386
-+i[3-7]86-*-linux-gnu* | i[3-7]86-*-linux-uclibc*) \
-+ targ_emul=elf_i386
- targ_extra_emuls=i386linux
- if test x${want64} = xtrue; then
- targ_extra_emuls="$targ_extra_emuls elf_x86_64"
- fi
- tdir_i386linux=${targ_alias}aout
- ;;
--x86_64-*-linux-gnu*) targ_emul=elf_x86_64
-+x86_64-*-linux-gnu* | x86_64-*-linux-uclibc*) \
-+ targ_emul=elf_x86_64
- targ_extra_emuls="elf_i386 i386linux"
- targ_extra_libpath=elf_i386
- tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/'`
-@@ -263,10 +268,13 @@
- arm-*-kaos*) targ_emul=armelf ;;
- arm9e-*-elf) targ_emul=armelf ;;
- arm*b-*-linux-gnu*) targ_emul=armelfb_linux; targ_extra_emuls=armelfb ;;
-+arm*b-*-linux-uclibc*) targ_emul=armelfb_linux; targ_extra_emuls=armelfb ;;
- arm*-*-linux-gnu*) targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
-+arm*-*-linux-uclibc*) targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
- arm*-*-uclinux*) targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
- arm*-*-conix*) targ_emul=armelf ;;
--thumb-*-linux-gnu* | thumb-*-uclinux*) targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
-+thumb-*-linux-gnu* | thumb-*-linux-uclibc* | thumb-*-uclinux*) \
-+ targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
- strongarm-*-coff) targ_emul=armcoff ;;
- strongarm-*-elf) targ_emul=armelf ;;
- strongarm-*-kaos*) targ_emul=armelf ;;
-@@ -370,7 +378,8 @@
- targ_extra_emuls=m68kelf
- tdir_m68kelf=`echo ${targ_alias} | sed -e 's/aout//'`
- ;;
--m68k-*-linux-gnu*) targ_emul=m68kelf
-+m68k-*-linux-gnu* | m68k-*-linux-uclibc*) \
-+ targ_emul=m68kelf
- targ_extra_emuls=m68klinux
- tdir_m68klinux=`echo ${targ_alias} | sed -e 's/linux/linuxaout/'`
- ;;
-@@ -387,9 +396,9 @@
- m68*-*-psos*) targ_emul=m68kpsos ;;
- m68*-*-rtemscoff*) targ_emul=m68kcoff ;;
- m68*-*-rtems*) targ_emul=m68kelf ;;
--hppa*64*-*-linux-gnu*) targ_emul=hppa64linux ;;
-+hppa*64*-*-linux-gnu* | hppa*64*-*-linux-uclibc*) targ_emul=hppa64linux ;;
- hppa*64*-*) targ_emul=elf64hppa ;;
--hppa*-*-linux-gnu*) targ_emul=hppalinux ;;
-+hppa*-*-linux-gnu* | hppa*-*-linux-uclibc*) targ_emul=hppalinux ;;
- hppa*-*-*elf*) targ_emul=hppaelf ;;
- hppa*-*-lites*) targ_emul=hppaelf ;;
- hppa*-*-netbsd*) targ_emul=hppanbsd ;;
-@@ -435,16 +444,20 @@
- mips*-*-vxworks*) targ_emul=elf32ebmip
- targ_extra_emuls="elf32elmip" ;;
- mips*-*-windiss) targ_emul=elf32mipswindiss ;;
--mips64*el-*-linux-gnu*) targ_emul=elf32ltsmipn32
-+mips64*el-*-linux-gnu* | mips64*el-*-linux-uclibc*)
-+ targ_emul=elf32ltsmipn32
- targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
- ;;
--mips64*-*-linux-gnu*) targ_emul=elf32btsmipn32
-+mips64*-*-linux-gnu* | mips64*-*-linux-uclibc*)
-+ targ_emul=elf32btsmipn32
- targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
- ;;
--mips*el-*-linux-gnu*) targ_emul=elf32ltsmip
-+mips*el-*-linux-gnu* | mips*el-*-linux-uclibc*)
-+ targ_emul=elf32ltsmip
- targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip"
- ;;
--mips*-*-linux-gnu*) targ_emul=elf32btsmip
-+mips*-*-linux-gnu* | mips*-*-linux-uclibc*)
-+ targ_emul=elf32btsmip
- targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip"
- ;;
- mips*-*-lnews*) targ_emul=mipslnews ;;
-@@ -467,6 +480,10 @@
- alpha*-*-linux-gnu*) targ_emul=elf64alpha targ_extra_emuls=alpha
- tdir_alpha=`echo ${targ_alias} | sed -e 's/linux/linuxecoff/'`
- ;;
-+alpha*-*-linux-uclibc*) targ_emul=elf64alpha targ_extra_emuls=alpha
-+ # The following needs to be checked...
-+ tdir_alpha=`echo ${targ_alias} | sed -e 's/linux/linuxecoff/'`
-+ ;;
- alpha*-*-osf*) targ_emul=alpha ;;
- alpha*-*-gnu*) targ_emul=elf64alpha ;;
- alpha*-*-netware*) targ_emul=alpha ;;
---- src/configure~binutils-2.15.91.0.1-uclibc-100-conf
-+++ src/configure
-@@ -1344,6 +1344,18 @@
- i[3456789]86-*-coff | i[3456789]86-*-elf)
- noconfigdirs="$noconfigdirs ${libgcj}"
- ;;
-+ i[3456789]86-*-linux-uclibc)
-+ # This section makes it possible to build newlib natively on linux.
-+ # If we are using a cross compiler then don't configure newlib.
-+ if test x${is_cross_compiler} != xno ; then
-+ noconfigdirs="$noconfigdirs target-newlib"
-+ fi
-+ noconfigdirs="$noconfigdirs target-libgloss"
-+ # If we are not using a cross compiler, do configure newlib.
-+ # Note however, that newlib will only be configured in this situation
-+ # if the --with-newlib option has been given, because otherwise
-+ # 'target-newlib' will appear in skipdirs.
-+ ;;
- i[3456789]86-*-linux*)
- # The GCC port for glibc1 has no MD_FALLBACK_FRAME_STATE_FOR, so let's
- # not build java stuff by default.
---- src/configure.in~binutils-2.15.91.0.1-uclibc-100-conf
-+++ src/configure.in
-@@ -566,6 +566,19 @@
- i[[3456789]]86-*-coff | i[[3456789]]86-*-elf)
- noconfigdirs="$noconfigdirs ${libgcj}"
- ;;
-+ i[3456789]86-*-linux-uclibc)
-+ # This section makes it possible to build newlib natively on linux.
-+ # If we are using a cross compiler then don't configure newlib.
-+ if test x${is_cross_compiler} != xno ; then
-+ noconfigdirs="$noconfigdirs target-newlib"
-+ fi
-+ noconfigdirs="$noconfigdirs target-libgloss"
-+ build_modules=
-+ # If we are not using a cross compiler, do configure newlib.
-+ # Note however, that newlib will only be configured in this situation
-+ # if the --with-newlib option has been given, because otherwise
-+ # 'target-newlib' will appear in skipdirs.
-+ ;;
- i[[3456789]]86-*-linux*)
- # The GCC port for glibc1 has no MD_FALLBACK_FRAME_STATE_FOR, so let's
- # not build java stuff by default.
---- src/libtool.m4~binutils-2.15.91.0.1-uclibc-100-conf
-+++ src/libtool.m4
-@@ -645,6 +645,11 @@
- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd* | knetbsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
---- src/ltconfig~binutils-2.15.91.0.1-uclibc-100-conf
-+++ src/ltconfig
-@@ -603,6 +603,7 @@
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
- linux-gnu*) ;;
-+linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -1270,6 +1271,24 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+linux-uclibc*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+ soname_spec='${libname}${release}.so$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ # This implies no fast_install, which is unacceptable.
-+ # Some rework will be needed to allow for fast_install
-+ # before this can be enabled.
-+ # Note: copied from linux-gnu, and may not be appropriate.
-+ hardcode_into_libs=yes
-+ # Assume using the uClibc dynamic linker.
-+ dynamic_linker="uClibc ld.so"
-+ ;;
-+
- netbsd*)
- need_lib_prefix=no
- need_version=no
diff --git a/packages/binutils/binutils-cvs/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch b/packages/binutils/binutils-cvs/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch
new file mode 100644
index 0000000000..8df5b1fea0
--- /dev/null
+++ b/packages/binutils/binutils-cvs/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch
@@ -0,0 +1,39 @@
+# strip (and objcopy) fail to set the error code if there is no
+# output file name and the rename of the stripped (or copied) file
+# fails, yet the command fails to do anything. This fixes both
+# objcopy and strip.
+#
+# modification by bero: Ported to 2.16.91.0.6
+#
+#Signed-off-by: John Bowler <jbowler@acm.org>
+#Signed-off-by: Bernhard Rosenkraenzer <bero@arklinux.org>
+---
+# binutils/objcopy.c | 8 +++++---
+# 1 file changed, 5 insertions(+), 3 deletions(-)
+#
+Index: src/binutils/objcopy.c
+===================================================================
+--- src.orig/binutils/objcopy.c 2007-08-09 13:26:03.000000000 +0100
++++ src/binutils/objcopy.c 2007-08-09 16:36:12.000000000 +0100
+@@ -2787,8 +2787,9 @@ strip_main (int argc, char *argv[])
+ if (preserve_dates)
+ set_times (tmpname, &statbuf);
+ if (output_file != tmpname)
+- smart_rename (tmpname, output_file ? output_file : argv[i],
+- preserve_dates);
++ if (smart_rename (tmpname, output_file ? output_file : argv[i],
++ preserve_dates))
++ hold_status = 1;
+ status = hold_status;
+ }
+ else
+@@ -3411,7 +3412,8 @@ copy_main (int argc, char *argv[])
+ if (preserve_dates)
+ set_times (tmpname, &statbuf);
+ if (tmpname != output_filename)
+- smart_rename (tmpname, input_filename, preserve_dates);
++ if (smart_rename (tmpname, input_filename, preserve_dates))
++ status = 1;
+ }
+ else
+ unlink_if_ordinary (tmpname);
diff --git a/packages/binutils/binutils-cvs/binutils-uclibc-300-001_ld_makefile_patch.patch b/packages/binutils/binutils-cvs/binutils-uclibc-300-001_ld_makefile_patch.patch
new file mode 100644
index 0000000000..04a7e61e25
--- /dev/null
+++ b/packages/binutils/binutils-cvs/binutils-uclibc-300-001_ld_makefile_patch.patch
@@ -0,0 +1,50 @@
+#!/bin/sh -e
+## 001_ld_makefile_patch.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: correct where ld scripts are installed
+## DP: Author: Chris Chimelis <chris@debian.org>
+## DP: Upstream status: N/A
+## DP: Date: ??
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+ -patch) patch $patch_opts -p1 < $0;;
+ -unpatch) patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- binutils-2.16.91.0.1/ld/Makefile.am
++++ binutils-2.16.91.0.1/ld/Makefile.am
+@@ -20,7 +20,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+--- binutils-2.16.91.0.1/ld/Makefile.in
++++ binutils-2.16.91.0.1/ld/Makefile.in
+@@ -268,7 +268,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
diff --git a/packages/binutils/binutils-cvs/binutils-uclibc-300-006_better_file_error.patch b/packages/binutils/binutils-cvs/binutils-uclibc-300-006_better_file_error.patch
new file mode 100644
index 0000000000..f337611edf
--- /dev/null
+++ b/packages/binutils/binutils-cvs/binutils-uclibc-300-006_better_file_error.patch
@@ -0,0 +1,43 @@
+#!/bin/sh -e
+## 006_better_file_error.dpatch by David Kimdon <dwhedon@gordian.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Specify which filename is causing an error if the filename is a
+## DP: directory. (#45832)
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+ -patch) patch $patch_opts -p1 < $0;;
+ -unpatch) patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c
+--- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c 2003-07-23 16:08:09.000000000 +0100
++++ binutils-2.14.90.0.6/bfd/opncls.c 2003-09-10 22:35:00.000000000 +0100
+@@ -150,6 +150,13 @@
+ {
+ bfd *nbfd;
+ const bfd_target *target_vec;
++ struct stat s;
++
++ if (stat (filename, &s) == 0)
++ if (S_ISDIR(s.st_mode)) {
++ bfd_set_error (bfd_error_file_not_recognized);
++ return NULL;
++ }
+
+ nbfd = _bfd_new_bfd ();
+ if (nbfd == NULL)
diff --git a/packages/binutils/binutils-cvs/binutils-uclibc-300-012_check_ldrunpath_length.patch b/packages/binutils/binutils-cvs/binutils-uclibc-300-012_check_ldrunpath_length.patch
new file mode 100644
index 0000000000..498651a90c
--- /dev/null
+++ b/packages/binutils/binutils-cvs/binutils-uclibc-300-012_check_ldrunpath_length.patch
@@ -0,0 +1,47 @@
+#!/bin/sh -e
+## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
+## DP: cases where -rpath isn't specified. (#151024)
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+ -patch) patch $patch_opts -p1 < $0;;
+ -unpatch) patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em
+--- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:58.000000000 +0100
++++ binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:59.000000000 +0100
+@@ -692,6 +692,8 @@
+ && command_line.rpath == NULL)
+ {
+ lib_path = (const char *) getenv ("LD_RUN_PATH");
++ if ((lib_path) && (strlen (lib_path) == 0))
++ lib_path = NULL;
+ if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
+ force))
+ break;
+@@ -871,6 +873,8 @@
+ rpath = command_line.rpath;
+ if (rpath == NULL)
+ rpath = (const char *) getenv ("LD_RUN_PATH");
++ if ((rpath) && (strlen (rpath) == 0))
++ rpath = NULL;
+ if (! (bfd_elf_size_dynamic_sections
+ (output_bfd, command_line.soname, rpath,
+ command_line.filter_shlib,
diff --git a/packages/binutils/binutils-cvs/build_fix.patch b/packages/binutils/binutils-cvs/build_fix.patch
new file mode 100644
index 0000000000..eb8f5f25d3
--- /dev/null
+++ b/packages/binutils/binutils-cvs/build_fix.patch
@@ -0,0 +1,16 @@
+---
+ libiberty/fopen_unlocked.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: src/libiberty/fopen_unlocked.c
+===================================================================
+--- src.orig/libiberty/fopen_unlocked.c 2007-08-09 20:12:13.000000000 +0100
++++ src/libiberty/fopen_unlocked.c 2007-08-09 20:12:21.000000000 +0100
+@@ -70,6 +70,7 @@ unchanged.
+ #endif
+ #include <stdio.h>
+ #ifdef HAVE_STDIO_EXT_H
++#include <sys/cdefs.h>
+ #include <stdio_ext.h>
+ #endif
+
diff --git a/packages/binutils/binutils.inc b/packages/binutils/binutils.inc
index 007089761d..684cf54b8e 100644
--- a/packages/binutils/binutils.inc
+++ b/packages/binutils/binutils.inc
@@ -56,14 +56,14 @@ export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
-export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
-export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
+export CC_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
+export CXX_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
export CC_FOR_BUILD = "${BUILD_CC}"
export CPP_FOR_BUILD = "${BUILD_CPP}"
export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
-export CC = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
+export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
do_configure () {
(cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
diff --git a/packages/binutils/binutils_cvs.bb b/packages/binutils/binutils_cvs.bb
index 35291661f2..e719d93272 100644
--- a/packages/binutils/binutils_cvs.bb
+++ b/packages/binutils/binutils_cvs.bb
@@ -1,121 +1,27 @@
-SECTION = "devel"
-inherit autotools gettext
-
-DESCRIPTION = "A GNU collection of binary utilities"
-HOMEPAGE = "http://www.gnu.org/software/binutils/"
-LICENSE = "GPL"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
PV = "0.0+cvs${SRCDATE}"
-PR = "r3"
-
-PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
-
-FILES_${PN} = " \
- ${bindir}/${TARGET_PREFIX}* \
- ${libdir}/lib*-*.so \
- ${prefix}/${TARGET_SYS}/bin/*"
+PR = "r0"
-FILES_${PN}-dev = " \
- ${includedir} \
- ${libdir}/*.a \
- ${libdir}/*.la \
- ${libdir}/libbfd.so \
- ${libdir}/libopcodes.so"
-
-FILES_${PN}-symlinks = " \
- ${bindir}/addr2line \
- ${bindir}/ar \
- ${bindir}/as \
- ${bindir}/c++filt \
- ${bindir}/gprof \
- ${bindir}/ld \
- ${bindir}/nm \
- ${bindir}/objcopy \
- ${bindir}/objdump \
- ${bindir}/ranlib \
- ${bindir}/readelf \
- ${bindir}/size \
- ${bindir}/strings \
- ${bindir}/strip"
-
-SRC_URI = "cvs://anoncvs:anoncvs@sources.redhat.com/cvs/src;module=binutils;method=pserver;localdir=src \
- file://ld_makefile.patch;patch=1 \
- file://better_file_error.patch;patch=1 \
- file://signed_char_fix.patch;patch=1 \
- file://binutils-100_cflags_for_build.patch;patch=1 \
- file://binutils-2.15.91.0.1-uclibc-100-conf.patch;patch=1 \
- file://binutils-2.15.90.0.3-uclibc-200-build_modules.patch;patch=1"
+require binutils.inc
S = "${WORKDIR}/src"
-B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
-
-EXTRA_OECONF = "--with-sysroot=/ \
- --program-prefix=${TARGET_PREFIX} \
- --enable-shared"
-
-# This is necessary due to a bug in the binutils Makefiles
-EXTRA_OEMAKE = "configure-build-libiberty all"
-
-export AR = "${HOST_PREFIX}ar"
-export AS = "${HOST_PREFIX}as"
-export LD = "${HOST_PREFIX}ld"
-export NM = "${HOST_PREFIX}nm"
-export RANLIB = "${HOST_PREFIX}ranlib"
-export OBJCOPY = "${HOST_PREFIX}objcopy"
-export OBJDUMP = "${HOST_PREFIX}objdump"
-
-export AR_FOR_TARGET = "${TARGET_PREFIX}ar"
-export AS_FOR_TARGET = "${TARGET_PREFIX}as"
-export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
-export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
-export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
-
-export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
-export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
-export CC_FOR_BUILD = "${BUILD_CC}"
-
-export CC = "${CCACHE} ${HOST_PREFIX}gcc"
-
-do_configure () {
- (cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
- oe_runconf
-}
-
-do_stage () {
- oe_libinstall -so -a -C opcodes libopcodes ${STAGING_LIBDIR}/
- oe_libinstall -a -C libiberty libiberty ${STAGING_LIBDIR}/
- oe_libinstall -so -a -C bfd libbfd ${STAGING_LIBDIR}/
- install -m 0644 ${S}/include/dis-asm.h ${STAGING_INCDIR}/
- install -m 0644 ${S}/include/symcat.h ${STAGING_INCDIR}/
- install -m 0644 ${S}/include/libiberty.h ${STAGING_INCDIR}/
- install -m 0644 ${S}/include/ansidecl.h ${STAGING_INCDIR}/
- install -m 0644 ${S}/include/bfdlink.h ${STAGING_INCDIR}/
- install -m 0644 bfd/bfd.h ${STAGING_INCDIR}/
-}
-
-do_install () {
- autotools_do_install
-
- # We don't really need these, so we'll remove them...
- rm -rf ${D}${libdir}/ldscripts
-
- # Fix the /usr/${TARGET_SYS}/bin/* links
- for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do
- rm -f $l
- ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
- | tr -s / \
- | sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
- done
-
- # Install the libiberty header
- install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
- install -m 644 ${S}/include/libiberty.h ${D}${includedir}
-
- cd ${D}${bindir}
-
- # Symlinks for ease of running these on the native target
- for p in ${TARGET_SYS}-* ; do
- ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,`
- done
-}
+SRC_URI = "cvs://anoncvs:anoncvs@sources.redhat.com/cvs/src;module=binutils;method=pserver;localdir=src \
+ file://build_fix.patch;patch=1 \
+ file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
+ file://110-arm-eabi-conf.patch;patch=1 \
+ file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
+ file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
+ file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1"
+
+#EXTRA_OECONF = "--with-sysroot=/"
+
+do_configure_prepend () {
+ # RP:
+ # Remove rda and libgloss since they won't cross compile
+ # we don't need them anyway...
+ # Also remove gdb, we build that separately.
+ rm ${S}/gdb -Rf
+ rm ${S}/rda -Rf
+ rm ${S}/libgloss -Rf
+} \ No newline at end of file
diff --git a/packages/bluez/bluez-gnome_0.13.bb b/packages/bluez/bluez-gnome_0.13.bb
new file mode 100644
index 0000000000..d50e8e5fde
--- /dev/null
+++ b/packages/bluez/bluez-gnome_0.13.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "BLuetooth configuration applet"
+LICENSE = "GPL+LGPL"
+
+DEPENDS = "dbus-glib gconf libnotify gtk+"
+
+SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
+
+inherit autotools pkgconfig gconf
+
+FILES_${PN} += "${datadir}/gconf"
+
diff --git a/packages/bluez/bluez-gnome_cvs.bb b/packages/bluez/bluez-gnome_cvs.bb
index ea5bbe6c2f..8900bda6bf 100644
--- a/packages/bluez/bluez-gnome_cvs.bb
+++ b/packages/bluez/bluez-gnome_cvs.bb
@@ -8,7 +8,7 @@ DEPENDS = "dbus-glib gconf libnotify gtk+"
SRC_URI = "cvs://anonymous@cvs.bluez.org/cvsroot/bluez;module=gnome \
"
-PV = "0.10+cvs${SRCDATE}"
+PV = "0.13+cvs${SRCDATE}"
S = "${WORKDIR}/gnome"
inherit autotools pkgconfig gconf
diff --git a/packages/btscanner/btscanner_2.0.bb b/packages/btscanner/btscanner_2.0.bb
index 0478577320..4063a98b8e 100644
--- a/packages/btscanner/btscanner_2.0.bb
+++ b/packages/btscanner/btscanner_2.0.bb
@@ -3,14 +3,14 @@ SECTION = "libs"
PRIORITY = "optional"
HOMEPAGE = "http://www.pentest.co.uk/cgi-bin/viewcat.cgi?cat=downloads&section=01_bluetooth"
DEPENDS = "bluez-libs gdbm ncurses libxml2"
-PR = "r1"
+PR = "r2"
LICENSE = "GPLv2"
SRC_URI = "http://www.pentest.co.uk/src/btscanner-${PV}.tar.bz2 \
file://gcc-4.patch;patch=1 \
+ file://configurable-paths.patch;patch=1 \
"
-#Yes, the packages uses this ugly hardcoded path instead of ${sysconfdir}
-FILES_${PN} += "/usr/share/oui.txt"
+FILES_${PN} += "${datadir}/oui.txt"
inherit autotools
diff --git a/packages/btscanner/files/configurable-paths.patch b/packages/btscanner/files/configurable-paths.patch
new file mode 100644
index 0000000000..b8afbf4059
--- /dev/null
+++ b/packages/btscanner/files/configurable-paths.patch
@@ -0,0 +1,183 @@
+Index: btscanner-2.0/btscanner.xml
+===================================================================
+--- btscanner-2.0.orig/btscanner.xml 2007-08-11 18:51:51.000000000 +0200
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,81 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!DOCTYPE btscanner SYSTEM "file:///usr/local/etc/btscanner.dtd">
+-<btscanner>
+-<files>
+- <log>btscanner.log</log>
+- <oui>/usr/local/share/oui.txt</oui>
+- <store>~/bts</store>
+-</files>
+-
+-<!-- Global range -->
+-<rangedef start="00:00:00:00:00:00" end="FF:FF:FF:FF:FF:FF">
+- <vulnerabilities/>
+- <name/>
+- <hci/>
+-</rangedef>
+-
+-<!-- Nokia 6310i range 1 -->
+-<rangedef start="00:60:57:00:00:00" end="00:60:57:FF:FF:FF">
+- <vulnerabilities>Snarf</vulnerabilities>
+- <name/>
+- <hci/>
+- <rssi/>
+- <lq/>
+- <txpwr/>
+- <sdp/>
+-</rangedef>
+-<!-- Nokia 6310i range 2 -->
+-<rangedef start="00:0E:6D:00:00:00" end="00:0E:6D:FF:FF:FF">
+- <vulnerabilities>Snarf</vulnerabilities>
+- <name/>
+- <hci/>
+- <rssi/>
+- <lq/>
+- <txpwr/>
+- <sdp/>
+-</rangedef>
+-<!-- Nokia 6310i range 3 -->
+-<rangedef start="00:02:EE:00:00:00" end="00:02:EE:FF:FF:FF">
+- <vulnerabilities>Snarf</vulnerabilities>
+- <name/>
+- <hci/>
+- <rssi/>
+- <lq/>
+- <txpwr/>
+- <sdp/>
+-</rangedef>
+-
+-<!-- Nokia 6230 range 1 -->
+-<rangedef start="00:E0:03:00:00:00" end="00:E0:03:FF:FF:FF">
+- <vulnerabilities>Snarf</vulnerabilities>
+- <name/>
+- <hci/>
+- <rssi/>
+- <lq/>
+- <txpwr/>
+- <sdp/>
+-</rangedef>
+-
+-<!-- Sony Ericsson T610 range 1 -->
+-<rangedef start="00:0E:07:00:00:00" end="00:0E:07:FF:FF:FF">
+- <vulnerabilities>Snarf</vulnerabilities>
+- <name/>
+- <hci/>
+- <rssi/>
+- <lq/>
+- <txpwr/>
+- <sdp/>
+-</rangedef>
+-<!-- Sony Ericsson T610 (also others) range 2 -->
+-<rangedef start="00:0A:D9:00:00:00" end="00:0A:D9:FF:FF:FF">
+- <vulnerabilities>Snarf</vulnerabilities>
+- <name/>
+- <hci/>
+- <rssi/>
+- <lq/>
+- <txpwr/>
+- <sdp/>
+-</rangedef>
+-
+-</btscanner>
+-
+Index: btscanner-2.0/btscanner.xml.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ btscanner-2.0/btscanner.xml.in 2007-08-11 18:52:27.000000000 +0200
+@@ -0,0 +1,81 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE btscanner SYSTEM "file://@sysconfdir@/btscanner.dtd">
++<btscanner>
++<files>
++ <log>btscanner.log</log>
++ <oui>@datadir@/oui.txt</oui>
++ <store>~/bts</store>
++</files>
++
++<!-- Global range -->
++<rangedef start="00:00:00:00:00:00" end="FF:FF:FF:FF:FF:FF">
++ <vulnerabilities/>
++ <name/>
++ <hci/>
++</rangedef>
++
++<!-- Nokia 6310i range 1 -->
++<rangedef start="00:60:57:00:00:00" end="00:60:57:FF:FF:FF">
++ <vulnerabilities>Snarf</vulnerabilities>
++ <name/>
++ <hci/>
++ <rssi/>
++ <lq/>
++ <txpwr/>
++ <sdp/>
++</rangedef>
++<!-- Nokia 6310i range 2 -->
++<rangedef start="00:0E:6D:00:00:00" end="00:0E:6D:FF:FF:FF">
++ <vulnerabilities>Snarf</vulnerabilities>
++ <name/>
++ <hci/>
++ <rssi/>
++ <lq/>
++ <txpwr/>
++ <sdp/>
++</rangedef>
++<!-- Nokia 6310i range 3 -->
++<rangedef start="00:02:EE:00:00:00" end="00:02:EE:FF:FF:FF">
++ <vulnerabilities>Snarf</vulnerabilities>
++ <name/>
++ <hci/>
++ <rssi/>
++ <lq/>
++ <txpwr/>
++ <sdp/>
++</rangedef>
++
++<!-- Nokia 6230 range 1 -->
++<rangedef start="00:E0:03:00:00:00" end="00:E0:03:FF:FF:FF">
++ <vulnerabilities>Snarf</vulnerabilities>
++ <name/>
++ <hci/>
++ <rssi/>
++ <lq/>
++ <txpwr/>
++ <sdp/>
++</rangedef>
++
++<!-- Sony Ericsson T610 range 1 -->
++<rangedef start="00:0E:07:00:00:00" end="00:0E:07:FF:FF:FF">
++ <vulnerabilities>Snarf</vulnerabilities>
++ <name/>
++ <hci/>
++ <rssi/>
++ <lq/>
++ <txpwr/>
++ <sdp/>
++</rangedef>
++<!-- Sony Ericsson T610 (also others) range 2 -->
++<rangedef start="00:0A:D9:00:00:00" end="00:0A:D9:FF:FF:FF">
++ <vulnerabilities>Snarf</vulnerabilities>
++ <name/>
++ <hci/>
++ <rssi/>
++ <lq/>
++ <txpwr/>
++ <sdp/>
++</rangedef>
++
++</btscanner>
++
+Index: btscanner-2.0/configure.in
+===================================================================
+--- btscanner-2.0.orig/configure.in 2007-08-11 18:51:35.000000000 +0200
++++ btscanner-2.0/configure.in 2007-08-11 18:55:44.000000000 +0200
+@@ -89,5 +89,5 @@
+ CFLAGS="$CFLAGS -DCFG_FILE=\\\"$cfgfile\\\" -DCFG_DTD=\\\"$cfgdtd\\\""
+
+ # output
+-AC_CONFIG_FILES([Makefile])
++AC_CONFIG_FILES([Makefile btscanner.xml])
+ AC_OUTPUT
diff --git a/packages/djvulibre/.mtn2git_empty b/packages/djvulibre/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/djvulibre/.mtn2git_empty
diff --git a/packages/djvulibre/djvulibre/.mtn2git_empty b/packages/djvulibre/djvulibre/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/djvulibre/djvulibre/.mtn2git_empty
diff --git a/packages/djvulibre/djvulibre/fix-cross-configure.patch b/packages/djvulibre/djvulibre/fix-cross-configure.patch
new file mode 100644
index 0000000000..42d4eff715
--- /dev/null
+++ b/packages/djvulibre/djvulibre/fix-cross-configure.patch
@@ -0,0 +1,50 @@
+--- /tmp/acinclude.m4 2007-08-09 22:33:05.000000000 +0200
++++ djvulibre-3.5.19/config/acinclude.m4 2007-08-09 22:33:39.288400000 +0200
+@@ -784,30 +784,6 @@
+ QTDIR=no
+ fi
+ fi
+- # Execute
+- if test "x$ac_has_qt" != xno ; then
+- AC_MSG_CHECKING([if a small Qt program runs])
+- AC_LANG_PUSH(C++)
+- save_CXXFLAGS="$CXXFLAGS"
+- save_LIBS="$LIBS"
+- CXXFLAGS="$CXXFLAGS $CFLAGS $THREAD_CFLAGS $QT_CFLAGS $X_CFLAGS"
+- LIBS="$THREAD_LIBS $QT_LIBS $X_LIBS $LIBS"
+- AC_TRY_RUN([
+-#include <qfile.h>
+-#include <qtextstream.h>
+-#include <qglobal.h>
+-int main() {
+-QFile qf("confout"); if (!qf.open(IO_WriteOnly)) return 1;
+-QTextStream ts(&qf); ts << QT_VERSION; return 0;
+-}],[okay=yes],[okay=no; QTDIR=no])
+- CXXFLAGS="$save_CXXFLAGS"
+- LIBS="$save_LIBS"
+- AC_LANG_POP(C++)
+- AC_MSG_RESULT($okay)
+- if test "x$okay" = xno ; then
+- ac_has_qt=no
+- fi
+- fi
+ # Version
+ if test "x$ac_has_qt" != xno ; then
+ AC_MSG_CHECKING([Qt version])
+--- /tmp/configure.ac 2007-08-09 22:46:50.000000000 +0200
++++ djvulibre-3.5.19/configure.ac 2007-08-09 22:47:06.988400000 +0200
+@@ -563,14 +563,8 @@
+
+ /* - QT */
+ #ifdef HAVE_QT
+-#if HAVE_QT < 200
+-#define QT1
+-#elif HAVE_QT < 300
+-#define QT2
+-#else
+ #define QT3
+ #endif
+-#endif
+
+ /* - X STUFF */
+ #ifdef HAVE_SYS_IPC_H
diff --git a/packages/djvulibre/djvulibre_3.5.19.bb b/packages/djvulibre/djvulibre_3.5.19.bb
new file mode 100644
index 0000000000..5ba5751f2d
--- /dev/null
+++ b/packages/djvulibre/djvulibre_3.5.19.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "DjVuLibre is an open source (GPL'ed) implementation of DjVu, including viewers, browser plugins, decoders, simple encoders, and utilities."
+LICENSE = "GPL"
+
+DEPENDS = "jpeg libpng tiff"
+
+SRC_URI = "http://downloads.sourceforge.net/djvu/djvulibre-${PV}.tar.gz \
+ file://fix-cross-configure.patch;patch=1"
+
+
+inherit qt4x11 autotools pkgconfig
+
+#export QT_LIBS = "${OE_QMAKE_LIBS_QT}"
+#export QT_CFLAGS = "${OE_QMAKE_CXXFLAGS} -I${QTDIR}/include/Qt/ "
+
+EXTRA_OECONF = " --enable-threads \
+ --with-qt=${QTDIR} "
+
+PACKAGES =+ "libdjvulibre"
+
+FILES_libdjvulibre = "${libdir}/libdjvulibre.so.*"
+FILES_${PN} += "${datadir}/djvu"
+
+do_stage() {
+ autotools_stage_all
+}
+
+
diff --git a/packages/ethtool/ethtool_6.bb b/packages/ethtool/ethtool_6.bb
new file mode 100644
index 0000000000..4c9ae5304f
--- /dev/null
+++ b/packages/ethtool/ethtool_6.bb
@@ -0,0 +1,2 @@
+require ethtool.inc
+PR = "r0"
diff --git a/packages/evince/evince_0.9.2.bb b/packages/evince/evince_0.9.2.bb
index 64e2e41275..51bc969bff 100644
--- a/packages/evince/evince_0.9.2.bb
+++ b/packages/evince/evince_0.9.2.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu."
LICENSE = "GPL"
SECTION = "x11/office"
-DEPENDS = "tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring "
+DEPENDS = "tiff djvulibre libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring "
RDEPENDS = "espgs "
RRECOMMENDS = "gnome-vfs-plugin-file"
PR = "r1"
@@ -12,5 +12,9 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.9/${PN}-${PV}.tar.bz2
file://no-icon-theme.diff;patch=1;pnum=0 \
file://no-help-dir.patch;patch=1"
-EXTRA_OECONF = "--without-libgnome --disable-thumbnailer --disable-scrollkeeper"
+EXTRA_OECONF = " --without-libgnome \
+ --disable-thumbnailer \
+ --disable-scrollkeeper \
+ --enable-djvu \
+ "
diff --git a/packages/fakeroot/fakeroot-native_1.7.1.bb b/packages/fakeroot/fakeroot-native_1.7.1.bb
new file mode 100644
index 0000000000..6f2969e181
--- /dev/null
+++ b/packages/fakeroot/fakeroot-native_1.7.1.bb
@@ -0,0 +1,21 @@
+SECTION = "base"
+require fakeroot_${PV}.bb
+inherit native
+RDEPENDS="util-linux-native"
+
+SRC_URI += "file://fix-prefix.patch;patch=1 \
+ file://work-with-older-libtool.patch;patch=1"
+S = "${WORKDIR}/fakeroot-${PV}"
+
+EXTRA_OECONF = " --program-prefix="
+
+# Compatability for the rare systems not using or having SYSV
+python () {
+ if bb.data.getVar('HOST_NONSYSV', d, True) and bb.data.getVar('HOST_NONSYSV', d, True) != '0':
+ bb.data.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ', d)
+}
+
+do_stage_append () {
+ oe_libinstall -so libfakeroot ${STAGING_LIBDIR}/libfakeroot/
+}
+
diff --git a/packages/fakeroot/fakeroot_1.7.1.bb b/packages/fakeroot/fakeroot_1.7.1.bb
new file mode 100644
index 0000000000..486bf93a46
--- /dev/null
+++ b/packages/fakeroot/fakeroot_1.7.1.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Gives a fake root environment"
+SECTION = "base"
+LICENSE = "GPL"
+# fakeroot needs getopt which is provided by the util-linux package
+RDEPENDS = "util-linux"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_${PV}.tar.gz"
+
+inherit autotools
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/fakeroot
+ install -m 644 *.h ${STAGING_INCDIR}/fakeroot
+ autotools_stage_all
+}
diff --git a/packages/fakeroot/files/work-with-older-libtool.patch b/packages/fakeroot/files/work-with-older-libtool.patch
new file mode 100644
index 0000000000..05f9be87b6
--- /dev/null
+++ b/packages/fakeroot/files/work-with-older-libtool.patch
@@ -0,0 +1,11 @@
+--- fakeroot-1.7.1/configure.ac.orig 2007-08-09 16:03:34.000000000 -0500
++++ fakeroot-1.7.1/configure.ac 2007-08-09 18:26:11.000000000 -0500
+@@ -7,8 +7,6 @@
+ AC_CONFIG_HEADERS([config.h])
+ AC_PROG_MAKE_SET
+ AM_PROG_LIBTOOL
+-LT_INIT
+-LT_LANG(C)
+
+ AC_ARG_WITH([ipc],
+ AS_HELP_STRING([--with-ipc@<:@=IPCTYPE@:>@],
diff --git a/packages/fluxbox/fluxbox_0.99+1.0rc.bb b/packages/fluxbox/fluxbox_0.99+1.0rc.bb
index 68eeeb04b8..93c82025cf 100644
--- a/packages/fluxbox/fluxbox_0.99+1.0rc.bb
+++ b/packages/fluxbox/fluxbox_0.99+1.0rc.bb
@@ -1,21 +1,15 @@
-#
# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php for a copy of the license)
-#
-# Filename: fluxbox-gpe_1.0rc.bb
-# Date: 01-Jul-06
DESCRIPTION = "The Fluxbox WindowManager"
HOMEPAGE = "http://fluxbox.sourceforge.net"
LICENSE = "MIT"
-REALPV = "1.0rc"
-PR = "r5"
-######################################################################################
+REALPV = "1.0rc"
-S = "${WORKDIR}/fluxbox-${REALPV}"
+PV = "0.99+${REALPV}"
+PR = "r0"
+PE = "1"
-######################################################################################
SRC_URI = "${SOURCEFORGE_MIRROR}/fluxbox/fluxbox-${REALPV}.tar.gz \
file://gpe-init.patch;patch=1 \
@@ -27,69 +21,60 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/fluxbox/fluxbox-${REALPV}.tar.gz \
file://keylaunchrc.fluxbox \
file://gpe-logout.fluxbox"
-######################################################################################
-
-PACKAGES = "${PN}-dbg ${PN}-gpe ${PN}-styles ${PN}-doc ${PN}"
-
-DESCRIPTION_${PN}-styles = "The default styles for fluxbox"
-DESCRIPTION_${PN}-gpe = "The Fluxbox WindowManager for use with GPE"
-RDEPENDS_${PN}-gpe = "${PN}"
-
-######################################################################################
-
-FILES_${PN} = "/usr/bin \
- /usr/share/fluxbox/init \
- /usr/share/fluxbox/keys \
- /usr/share/fluxbox/menu "
-
-FILES_${PN}-gpe = "/usr/share/fluxbox/apps.gpe* \
- /usr/share/fluxbox/keys.* \
- /usr/bin/gpe-logout.fluxbox \
- /etc/keylaunchrc.fluxbox \
- /usr/share/fluxbox/styles/gpe-default \
- /usr/share/fluxbox/session \
- /usr/bin/fluxbox-gpe-session"
-
-FILES_${PN}-styles = "/usr/share/fluxbox/styles"
-
-FILES_${PN}-doc = "/usr/share/man"
-
-######################################################################################
+S = "${WORKDIR}/fluxbox-${REALPV}"
inherit autotools
-######################################################################################
-
EXTRA_OECONF = "--disable-xmb \
"
-######################################################################################
-
do_install_append() {
- install -d ${D}/usr/bin
- install -d ${D}/usr/share/fluxbox
- install -d ${D}/usr/share/fluxbox/styles
+ install -d ${D}${bindir}
+ install -d ${D}${datadir}/fluxbox
+ install -d ${D}${datadir}/fluxbox/styles
install -d ${D}/etc
- install -m 0644 ${WORKDIR}/apps.gpe.* ${D}/usr/share/fluxbox
- install -m 0644 ${WORKDIR}/keys.* ${D}/usr/share/fluxbox
- install -m 0755 ${WORKDIR}/fluxbox-gpe.session ${D}/usr/share/fluxbox/session
- install -m 0644 ${WORKDIR}/style.gpe-default ${D}/usr/share/fluxbox/styles/gpe-default
- install -m 0755 ${WORKDIR}/fluxbox-gpe-session ${D}/usr/bin
- install -m 0755 ${WORKDIR}/gpe-logout.fluxbox ${D}/usr/bin
+ install -m 0644 ${WORKDIR}/apps.gpe.* ${D}${datadir}/fluxbox
+ install -m 0644 ${WORKDIR}/keys.* ${D}${datadir}/fluxbox
+ install -m 0755 ${WORKDIR}/fluxbox-gpe.session ${D}${datadir}/fluxbox/session
+ install -m 0644 ${WORKDIR}/style.gpe-default ${D}${datadir}/fluxbox/styles/gpe-default
+ install -m 0755 ${WORKDIR}/fluxbox-gpe-session ${D}${bindir}
+ install -m 0755 ${WORKDIR}/gpe-logout.fluxbox ${D}${bindir}
install -m 0644 ${WORKDIR}/keylaunchrc.fluxbox ${D}/etc
}
-######################################################################################
+PACKAGES = "${PN}-dbg ${PN}-gpe ${PN}-styles ${PN}-doc ${PN}"
+
+DESCRIPTION_${PN}-styles = "The default styles for fluxbox"
+DESCRIPTION_${PN}-gpe = "The Fluxbox WindowManager for use with GPE"
+RDEPENDS_${PN}-gpe = "${PN}"
+
+FILES_${PN} = "${bindir} \
+ ${datadir}/fluxbox/init \
+ ${datadir}/fluxbox/keys \
+ ${datadir}/fluxbox/menu "
+
+FILES_${PN}-gpe = "${datadir}/fluxbox/apps.gpe* \
+ ${datadir}/fluxbox/keys.* \
+ ${bindir}/gpe-logout.fluxbox \
+ ${sysconfdir}/keylaunchrc.fluxbox \
+ ${datadir}/fluxbox/styles/gpe-default \
+ ${datadir}/fluxbox/session \
+ ${bindir}/fluxbox-gpe-session"
+
+FILES_${PN}-styles = "${datadir}/fluxbox/styles"
+
+FILES_${PN}-doc = "${datadir}/man"
+
pkg_postinst_${PN}-gpe() {
- update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/fluxbox-gpe-session 15
- update-alternatives --install /usr/bin/gpe-logout gpe-logout /usr/bin/gpe-logout.fluxbox 15
- update-alternatives --install /etc/keylaunchrc keylaunchrc /etc/keylaunchrc.fluxbox 15
+ update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/fluxbox-gpe-session 15
+ update-alternatives --install ${bindir}/gpe-logout gpe-logout ${bindir}/gpe-logout.fluxbox 15
+ update-alternatives --install ${sysconfdir}keylaunchrc keylaunchrc ${sysconfdir}keylaunchrc.fluxbox 15
}
pkg_postrm_${PN}-gpe() {
- update-alternatives --remove x-window-manager /usr/bin/fluxbox-gpe-session
- update-alternatives --remove gpe-logout /usr/bin/gpe-logout.fluxbox
- update-alternatives --remove keylaunchrc /etc/keylaunchrc.fluxbox
+ update-alternatives --remove x-window-manager ${bindir}/fluxbox-gpe-session
+ update-alternatives --remove gpe-logout ${bindir}/gpe-logout.fluxbox
+ update-alternatives --remove keylaunchrc ${sysconfdir}keylaunchrc.fluxbox
}
diff --git a/packages/fluxbox/fluxbox_svn.bb b/packages/fluxbox/fluxbox_svn.bb
index 1034c386c4..bc791bf0e2 100644
--- a/packages/fluxbox/fluxbox_svn.bb
+++ b/packages/fluxbox/fluxbox_svn.bb
@@ -1,25 +1,14 @@
-#
# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php for a copy of the license)
-#
-# Filename: fluxbox-gpe_1.0rc.bb
-# Date: 01-Jul-06
DESCRIPTION = "The Fluxbox WindowManager"
HOMEPAGE = "http://fluxbox.sourceforge.net"
LICENSE = "MIT"
-PV = "1.0+svn${SRCDATE}"
-PR = "r3"
-
-######################################################################################
-
-S = "${WORKDIR}/trunk"
-
-######################################################################################
+PV = "0.99+svn${SRCDATE}"
+PR = "r0"
+PE = "1"
SRC_URI = "svn://svn.berlios.de/fluxbox;module=trunk \
- file://gpe-init.patch;patch=1 \
file://apps.gpe.* \
file://style.gpe-default \
file://fluxbox-gpe-session \
@@ -28,69 +17,60 @@ SRC_URI = "svn://svn.berlios.de/fluxbox;module=trunk \
file://keylaunchrc.fluxbox \
file://gpe-logout.fluxbox"
-######################################################################################
-
-PACKAGES = "${PN}-dbg ${PN}-gpe ${PN}-styles ${PN}-doc ${PN}"
-
-DESCRIPTION_${PN}-styles = "The default styles for fluxbox"
-DESCRIPTION_${PN}-gpe = "The Fluxbox WindowManager for use with GPE"
-RDEPENDS_${PN}-gpe = "${PN}"
-
-######################################################################################
-
-FILES_${PN} = "/usr/bin \
- /usr/share/fluxbox/init \
- /usr/share/fluxbox/keys \
- /usr/share/fluxbox/menu "
-
-FILES_${PN}-gpe = "/usr/share/fluxbox/apps.gpe* \
- /usr/share/fluxbox/keys.* \
- /usr/bin/gpe-logout.fluxbox \
- /etc/keylaunchrc.fluxbox \
- /usr/share/fluxbox/styles/gpe-default \
- /usr/share/fluxbox/session \
- /usr/bin/fluxbox-gpe-session"
-
-FILES_${PN}-styles = "/usr/share/fluxbox/styles"
-
-FILES_${PN}-doc = "/usr/share/man"
-
-######################################################################################
+S = "${WORKDIR}/trunk"
inherit autotools
-######################################################################################
-
EXTRA_OECONF = "--disable-xmb \
"
-######################################################################################
-
do_install_append() {
- install -d ${D}/usr/bin
- install -d ${D}/usr/share/fluxbox
- install -d ${D}/usr/share/fluxbox/styles
+ install -d ${D}${bindir}
+ install -d ${D}${datadir}/fluxbox
+ install -d ${D}${datadir}/fluxbox/styles
install -d ${D}/etc
- install -m 0644 ${WORKDIR}/apps.gpe.* ${D}/usr/share/fluxbox
- install -m 0644 ${WORKDIR}/keys.* ${D}/usr/share/fluxbox
- install -m 0755 ${WORKDIR}/fluxbox-gpe.session ${D}/usr/share/fluxbox/session
- install -m 0644 ${WORKDIR}/style.gpe-default ${D}/usr/share/fluxbox/styles/gpe-default
- install -m 0755 ${WORKDIR}/fluxbox-gpe-session ${D}/usr/bin
- install -m 0755 ${WORKDIR}/gpe-logout.fluxbox ${D}/usr/bin
+ install -m 0644 ${WORKDIR}/apps.gpe.* ${D}${datadir}/fluxbox
+ install -m 0644 ${WORKDIR}/keys.* ${D}${datadir}/fluxbox
+ install -m 0755 ${WORKDIR}/fluxbox-gpe.session ${D}${datadir}/fluxbox/session
+ install -m 0644 ${WORKDIR}/style.gpe-default ${D}${datadir}/fluxbox/styles/gpe-default
+ install -m 0755 ${WORKDIR}/fluxbox-gpe-session ${D}${bindir}
+ install -m 0755 ${WORKDIR}/gpe-logout.fluxbox ${D}${bindir}
install -m 0644 ${WORKDIR}/keylaunchrc.fluxbox ${D}/etc
}
-######################################################################################
+PACKAGES = "${PN}-dbg ${PN}-gpe ${PN}-styles ${PN}-doc ${PN}"
+
+DESCRIPTION_${PN}-styles = "The default styles for fluxbox"
+DESCRIPTION_${PN}-gpe = "The Fluxbox WindowManager for use with GPE"
+RDEPENDS_${PN}-gpe = "${PN}"
+
+FILES_${PN} = "${bindir} \
+ ${datadir}/fluxbox/init \
+ ${datadir}/fluxbox/keys \
+ ${datadir}/fluxbox/menu "
+
+FILES_${PN}-gpe = "${datadir}/fluxbox/apps.gpe* \
+ ${datadir}/fluxbox/keys.* \
+ ${bindir}/gpe-logout.fluxbox \
+ ${sysconfdir}keylaunchrc.fluxbox \
+ ${datadir}/fluxbox/styles/gpe-default \
+ ${datadir}/fluxbox/session \
+ ${bindir}/fluxbox-gpe-session"
+
+FILES_${PN}-styles = "${datadir}/fluxbox/styles"
+
+FILES_${PN}-doc = "${datadir}/man"
+
pkg_postinst_${PN}-gpe() {
- update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/fluxbox-gpe-session 15
- update-alternatives --install /usr/bin/gpe-logout gpe-logout /usr/bin/gpe-logout.fluxbox 15
- update-alternatives --install /etc/keylaunchrc keylaunchrc /etc/keylaunchrc.fluxbox 15
+ update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/fluxbox-gpe-session 15
+ update-alternatives --install ${bindir}/gpe-logout gpe-logout ${bindir}/gpe-logout.fluxbox 15
+ update-alternatives --install ${sysconfdir}keylaunchrc keylaunchrc ${sysconfdir}keylaunchrc.fluxbox 15
}
pkg_postrm_${PN}-gpe() {
- update-alternatives --remove x-window-manager /usr/bin/fluxbox-gpe-session
- update-alternatives --remove gpe-logout /usr/bin/gpe-logout.fluxbox
- update-alternatives --remove keylaunchrc /etc/keylaunchrc.fluxbox
+ update-alternatives --remove x-window-manager ${bindir}/fluxbox-gpe-session
+ update-alternatives --remove gpe-logout ${bindir}/gpe-logout.fluxbox
+ update-alternatives --remove keylaunchrc ${sysconfdir}keylaunchrc.fluxbox
}
diff --git a/packages/gcc/gcc-cross-initial_4.2.1.bb b/packages/gcc/gcc-cross-initial_4.2.1.bb
new file mode 100644
index 0000000000..1e23ef9330
--- /dev/null
+++ b/packages/gcc/gcc-cross-initial_4.2.1.bb
@@ -0,0 +1,30 @@
+require gcc-cross_${PV}.bb
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils"
+DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
+PACKAGES = ""
+
+# This is intended to be a -very- basic config
+EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
+ --with-newlib \
+ --disable-shared \
+ --disable-threads \
+ --disable-multilib \
+ --disable-__cxa_atexit \
+ --disable-libmudflap \
+ --disable-libssp \
+ --enable-languages=c \
+ --enable-target-optspace \
+ --program-prefix=${TARGET_PREFIX} \
+ ${@get_gcc_fpu_setting(bb, d)}"
+
+do_stage_prepend () {
+ mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
+ ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
+}
+
+# Override the method from gcc-cross so we don't try to install libgcc
+do_install () {
+ oe_runmake 'DESTDIR=${D}' install
+}
diff --git a/packages/gloox/.mtn2git_empty b/packages/gloox/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gloox/.mtn2git_empty
diff --git a/packages/gloox/gloox_0.8.1.bb b/packages/gloox/gloox_0.8.1.bb
new file mode 100644
index 0000000000..09004a8182
--- /dev/null
+++ b/packages/gloox/gloox_0.8.1.bb
@@ -0,0 +1,15 @@
+LICENSE = "GPL"
+DESCRIPTION = "full-featured Jabber/XMPP client library."
+SECTION = "networking"
+PRIORITY = "optional"
+PR = "r0"
+
+DEPENDS = "iksemel libidn gnutls"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://camaya.net/download/${P}.tar.bz2"
+
+do_stage () {
+ autotools_stage_all
+}
diff --git a/packages/gpe-login/gpe-login_0.87.bb b/packages/gpe-login/gpe-login_0.87.bb
index 04839a4412..d75af4a3a0 100644
--- a/packages/gpe-login/gpe-login_0.87.bb
+++ b/packages/gpe-login/gpe-login_0.87.bb
@@ -6,8 +6,10 @@ SECTION = "gpe"
PRIORITY = "optional"
DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
RDEPENDS = "xkbd"
-RPROVIDES = "gpe-session-starter"
-PR = "r2"
+RPROVIDES_${PN} = "gpe-session-starter"
+PR = "r3"
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
diff --git a/packages/gpe-login/gpe-login_0.88.bb b/packages/gpe-login/gpe-login_0.88.bb
index 6780add5c8..a1d4c0e7fa 100644
--- a/packages/gpe-login/gpe-login_0.88.bb
+++ b/packages/gpe-login/gpe-login_0.88.bb
@@ -4,10 +4,10 @@ PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
RDEPENDS = "xkbd"
-RPROVIDES = "gpe-session-starter"
-PR = "r2"
+RPROVIDES_${PN} = "gpe-session-starter"
+PR = "r3"
-PACKAGE_ARCH_${PN} = "${MACHINE}"
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
inherit gpe
diff --git a/packages/gpe-login/gpe-login_0.90.bb b/packages/gpe-login/gpe-login_0.90.bb
index 6aeec56f12..08cfa2a0e0 100644
--- a/packages/gpe-login/gpe-login_0.90.bb
+++ b/packages/gpe-login/gpe-login_0.90.bb
@@ -4,10 +4,10 @@ PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
RDEPENDS = "xkbd gpe-theme-clearlooks"
-RPROVIDES = "gpe-session-starter"
-PR = "r1"
+RPROVIDES_${PN} = "gpe-session-starter"
+PR = "r2"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
GPE_TARBALL_SUFFIX = "bz2"
diff --git a/packages/gpe-login/gpe-login_svn.bb b/packages/gpe-login/gpe-login_svn.bb
index d38545fe57..9af539bad3 100644
--- a/packages/gpe-login/gpe-login_svn.bb
+++ b/packages/gpe-login/gpe-login_svn.bb
@@ -4,11 +4,13 @@ PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
RDEPENDS = "xkbd"
-RPROVIDES = "gpe-session-starter"
-PV = "0.88+svn-${SRCDATE}"
+RPROVIDES_${PN} = "gpe-session-starter"
+PV = "0.90+svn${SRCDATE}"
inherit autotools
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
+
SRC_URI = "${GPE_SVN} \
file://removeblue-fontsize8.patch;patch=1"
diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb
index 87b7dc090d..fbdbfe1e45 100644
--- a/packages/gsm/libgsmd_svn.bb
+++ b/packages/gsm/libgsmd_svn.bb
@@ -3,8 +3,10 @@ HOMEPAGE = "http://www.openmoko.org"
LICENSE = "GPL LGPL"
SECTION = "libs/gsm"
PROVIDES += "gsmd"
-PV = "0.1+svn${SRCDATE}"
-PR = "r16"
+PV = "0.1+svnr${SRCREV}"
+PR = "r18"
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
file://gsmd \
@@ -34,11 +36,26 @@ do_install_append() {
install ${WORKDIR}/default ${D}/${sysconfdir}/default/gsmd
}
-PACKAGES =+ "${PN}-tools gsmd gsmd-plugins"
+PACKAGES =+ "${PN}-tools gsmd gsmd-plugins \
+ gsmd-plugin-machine-generic gsmd-plugin-machine-tihtc \
+ gsmd-plugin-vendor-qc gsmd-plugin-vendor-ti \
+ gsmd-plugin-vendor-tihtc"
RDEPENDS_${PN} = "gsmd"
+RDEPENDS_gsmd-plugins = "gsmd-plugin-machine-generic \
+ gsmd-plugin-machine-tihtc \
+ gsmd-plugin-vendor-qc \
+ gsmd-plugin-vendor-ti \
+ gsmd-plugin-vendor-tihtc"
RRECOMMENDS_gsmd = "gsmd-plugins"
FILES_${PN}-tools = "${bindir}/*"
FILES_gsmd = "${sbindir}/gsmd ${sysconfdir}"
-FILES_gsmd-plugins = "${libdir}/gsmd/*.so*"
+FILES_gsmd-plugins = ""
+FILES_gsmd-plugin-machine-generic = "${libdir}/gsmd/libgsmd-machine_generic.so*"
+FILES_gsmd-plugin-machine-tihtc = "${libdir}/gsmd/libgsmd-machine_tihtc.so*"
+FILES_gsmd-plugin-vendor-qc = "${libdir}/gsmd/libgsmd-vendor_qc.so*"
+FILES_gsmd-plugin-vendor-ti = "${libdir}/gsmd/libgsmd-vendor_ti.so*"
+FILES_gsmd-plugin-vendor-tihtc = "${libdir}/gsmd/libgsmd-vendor_tihtc.so*"
PACKAGES_DYNAMIC = "libgsmd* gsmd"
+
+ALLOW_EMPTY_gsmd-plugins = "1"
diff --git a/packages/gtk+/gtk+_2.10.14.bb b/packages/gtk+/gtk+_2.10.14.bb
index db546d2cb6..751f4a4113 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 = "r3"
+PR = "r4"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
file://no-xwc.patch;patch=1 \
diff --git a/packages/gtk+/gtk-2.10.inc b/packages/gtk+/gtk-2.10.inc
index cc97e960a4..4ed214cfd3 100644
--- a/packages/gtk+/gtk-2.10.inc
+++ b/packages/gtk+/gtk-2.10.inc
@@ -27,11 +27,11 @@ FILES_${PN}-dbg += " \
${libdir}/gtk-2.0/${LIBV}/engines/.debug/*"
-RRECOMMENDS_${PN} = " ttf-dejavu-sans"
-RRECOMMENDS_${PN}_append_angstrom = " gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
-RRECOMMENDS_${PN}_append_openzaurus = " gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
-RRECOMMENDS_${PN}_append_linux = " glibc-gconv-iso8859-1"
-RRECOMMENDS_${PN}_append_linux-gnueabi = " glibc-gconv-iso8859-1"
+NEATSTUFF = " ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm "
+
+RRECOMMENDS_${PN} = " ${NEATSTUFF} "
+RRECOMMENDS_${PN}_linux = " ${NEATSTUFF} glibc-gconv-iso8859-1 "
+RRECOMMENDS_${PN}_linux-gnueabi = " ${NEATSTUFF} glibc-gconv-iso8859-1"
EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
diff --git a/packages/gtk-webcore/midori_0.0.4.bb b/packages/gtk-webcore/midori_0.0.4.bb
new file mode 100644
index 0000000000..4f39f7bab3
--- /dev/null
+++ b/packages/gtk-webcore/midori_0.0.4.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz"
+
+
+
diff --git a/packages/hsetroot/.mtn2git_empty b/packages/hsetroot/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/hsetroot/.mtn2git_empty
diff --git a/packages/hsetroot/files/.mtn2git_empty b/packages/hsetroot/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/hsetroot/files/.mtn2git_empty
diff --git a/packages/hsetroot/files/pkgconfigize-imlib.patch b/packages/hsetroot/files/pkgconfigize-imlib.patch
new file mode 100644
index 0000000000..862b74fad2
--- /dev/null
+++ b/packages/hsetroot/files/pkgconfigize-imlib.patch
@@ -0,0 +1,22 @@
+Index: hsetroot-1.0.2/configure.ac
+===================================================================
+--- hsetroot-1.0.2.orig/configure.ac 2003-09-05 21:41:38.000000000 +0000
++++ hsetroot-1.0.2/configure.ac 2007-08-09 21:14:09.000000000 +0000
+@@ -39,16 +39,7 @@
+ AC_C_CONST
+
+ # Check for imlib2
+-AC_CHECK_PROGS(imlib2config_cmd, imlib2-config)
+-if test x$imlib2config_cmd = "x"; then
+- AC_MSG_ERROR([error. Imlib2 is required to compile.])
+-fi
+-
+-IMLIB2_CFLAGS=`$imlib2config_cmd --cflags`
+-AC_SUBST(IMLIB2_CFLAGS)
+-
+-IMLIB2_LIBS=`$imlib2config_cmd --libs`
+-AC_SUBST(IMLIB2_LIBS)
++PKG_CHECK_MODULES(IMLIB2, imlib2)
+
+ # Some extra definitions for config.h
+ AC_DEFINE(DESCRIPTION, "yet another wallpaper application", [single line package description])
diff --git a/packages/hsetroot/hsetroot_1.0.2.bb b/packages/hsetroot/hsetroot_1.0.2.bb
new file mode 100644
index 0000000000..64ff997b50
--- /dev/null
+++ b/packages/hsetroot/hsetroot_1.0.2.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Yet another X Wallpaper Utility"
+DEPENDS += "imlib2 freetype zlib virtual/libx11 libxext"
+RDEPENDS += "imlib2-loaders"
+LICENSE = "GPL"
+
+SRC_URI = "http://thegraveyard.org/files/hsetroot-${PV}.tar.gz \
+ file://pkgconfigize-imlib.patch;patch=1"
+
+inherit autotools
+
diff --git a/packages/iksemel/.mtn2git_empty b/packages/iksemel/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/iksemel/.mtn2git_empty
diff --git a/packages/iksemel/iksemel_1.2.bb b/packages/iksemel/iksemel_1.2.bb
new file mode 100644
index 0000000000..903d8f046d
--- /dev/null
+++ b/packages/iksemel/iksemel_1.2.bb
@@ -0,0 +1,14 @@
+LICENSE = "LGPL"
+DESCRIPTION = "A simple, powerful XML-parsing library written in C."
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "glibc gnutls"
+PR = "r0"
+
+inherit pkgconfig autotools
+
+SRC_URI = "http://files.jabberstudio.org/iksemel/${P}.tar.gz"
+
+do_stage () {
+ autotools_stage_all
+}
diff --git a/packages/libnet/libnet-1.1.2.1/new-autotools.patch b/packages/libnet/libnet-1.1.2.1/new-autotools.patch
new file mode 100644
index 0000000000..064413e4ee
--- /dev/null
+++ b/packages/libnet/libnet-1.1.2.1/new-autotools.patch
@@ -0,0 +1,20 @@
+Index: libnet/src/Makefile.am
+===================================================================
+--- libnet.orig/src/Makefile.am 2004-03-12 05:50:20.000000000 +1100
++++ libnet/src/Makefile.am 2007-08-11 16:41:09.000000000 +1000
+@@ -57,15 +57,5 @@
+ libnet_version.c \
+ libnet_write.c
+
+-EXTRA_libnet_a_SOURCES = libnet_link_bpf.c \
+- libnet_link_dlpi.c \
+- libnet_link_linux.c \
+- libnet_link_nit.c \
+- libnet_link_none.c \
+- libnet_link_pf.c \
+- libnet_link_snit.c \
+- libnet_link_snoop.c \
+- libnet_link_win32.c
+-
+ libnet_a_LIBADD = @LIBOBJS@
+
diff --git a/packages/libnet/libnet_1.1.2.1.bb b/packages/libnet/libnet_1.1.2.1.bb
index f9464ae8bb..2dc6e713f9 100644
--- a/packages/libnet/libnet_1.1.2.1.bb
+++ b/packages/libnet/libnet_1.1.2.1.bb
@@ -6,11 +6,12 @@ LICENSE = "BSD"
DEPENDS = "libpcap"
# There are major API changes beween libnet v1.0 and libnet v1.1
PROVIDES = "libnet-1.1"
-PR = "r1"
+PR = "r2"
SRC_URI = "${DEBIAN_MIRROR}/main/libn/libnet/libnet_${PV}.orig.tar.gz \
file://support-uclibc.patch;patch=1 \
- file://fix-endianess-test.patch;patch=1"
+ file://fix-endianess-test.patch;patch=1 \
+ file://new-autotools.patch;patch=1"
S = "${WORKDIR}/libnet"
diff --git a/packages/linux-libc-headers/linux-libc-headers-2.6.22/.mtn2git_empty b/packages/linux-libc-headers/linux-libc-headers-2.6.22/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux-libc-headers/linux-libc-headers-2.6.22/.mtn2git_empty
diff --git a/packages/linux-libc-headers/linux-libc-headers-2.6.22/procinfo.h b/packages/linux-libc-headers/linux-libc-headers-2.6.22/procinfo.h
new file mode 100644
index 0000000000..8cdf828af8
--- /dev/null
+++ b/packages/linux-libc-headers/linux-libc-headers-2.6.22/procinfo.h
@@ -0,0 +1,24 @@
+/*
+ * linux/include/asm-arm/procinfo.h
+ *
+ * Copyright (C) 1996-1999 Russell King
+ *
+ * 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.
+ */
+#ifndef __ASM_PROCINFO_H
+#define __ASM_PROCINFO_H
+
+#define HWCAP_SWP 1
+#define HWCAP_HALF 2
+#define HWCAP_THUMB 4
+#define HWCAP_26BIT 8 /* Play it safe */
+#define HWCAP_FAST_MULT 16
+#define HWCAP_FPA 32
+#define HWCAP_VFP 64
+#define HWCAP_EDSP 128
+#define HWCAP_JAVA 256
+#define HWCAP_IWMMXT 512
+#define HWCAP_CRUNCH 1024
+#endif
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
new file mode 100644
index 0000000000..97e5a223a2
--- /dev/null
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
@@ -0,0 +1,73 @@
+require linux-libc-headers.inc
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = "unifdef-native"
+PR = "r0"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+ file://procinfo.h"
+
+S = "${WORKDIR}/linux-${PV}"
+
+set_arch() {
+ case ${TARGET_ARCH} in
+ alpha*) ARCH=alpha ;;
+ arm*) ARCH=arm ;;
+ cris*) ARCH=cris ;;
+ hppa*) ARCH=parisc ;;
+ i*86*) ARCH=i386 ;;
+ ia64*) ARCH=ia64 ;;
+ mips*) ARCH=mips ;;
+ m68k*) ARCH=m68k ;;
+ powerpc*) ARCH=powerpc ;;
+ s390*) ARCH=s390 ;;
+ sh*) ARCH=sh ;;
+ sparc64*) ARCH=sparc64 ;;
+ sparc*) ARCH=sparc ;;
+ x86_64*) ARCH=x86_64 ;;
+ avr32*) ARCH=avr32 ;;
+ bfin*) ARCH=blackfin ;;
+ esac
+}
+
+do_configure() {
+ set_arch
+ oe_runmake allnoconfig ARCH=$ARCH
+}
+
+do_compile () {
+}
+
+do_install() {
+ set_arch
+ oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=$ARCH
+}
+
+do_install_append_arm() {
+ cp ${WORKDIR}/procinfo.h ${D}${includedir}/asm/
+}
+
+STAGE_TEMP="${WORKDIR}/temp-staging"
+
+do_stage () {
+ set_arch
+ echo $ARCH
+ rm -rf ${STAGE_TEMP}
+ mkdir -p ${STAGE_TEMP}
+ oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=$ARCH
+ if [ "$ARCH" = "arm" ]; then
+ cp ${WORKDIR}/procinfo.h ${STAGE_TEMP}${includedir}/asm/
+ fi
+ install -d ${STAGING_INCDIR}
+ rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm ${STAGING_INCDIR}/asm-generic
+ cp -pfLR ${STAGE_TEMP}${includedir}/linux ${STAGING_INCDIR}/
+ cp -pfLR ${STAGE_TEMP}${includedir}/asm ${STAGING_INCDIR}/
+ cp -pfLR ${STAGE_TEMP}${includedir}/asm-generic ${STAGING_INCDIR}/
+ rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux
+ rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm
+ rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm-generic
+ install -d ${CROSS_DIR}/${TARGET_SYS}/include
+ cp -pfLR ${STAGE_TEMP}${includedir}/linux ${CROSS_DIR}/${TARGET_SYS}/include/
+ cp -pfLR ${STAGE_TEMP}${includedir}/asm ${CROSS_DIR}/${TARGET_SYS}/include/
+ cp -pfLR ${STAGE_TEMP}${includedir}/asm-generic ${CROSS_DIR}/${TARGET_SYS}/include/
+}
diff --git a/packages/linux/linux-jlime-current.bb b/packages/linux/linux-jlime-current.bb
index 68bcd4ab04..21cf1a224b 100644
--- a/packages/linux/linux-jlime-current.bb
+++ b/packages/linux/linux-jlime-current.bb
@@ -9,6 +9,8 @@ DESCRIPTION = "2.6 Linux Development Kernel for JLime supported Machines."
SECTION = "kernel"
LICENSE = "GPL"
+COMPATIBLE_MACHINE = "fillmein"
+
inherit kernel
PR = "r1"
diff --git a/packages/linux/linux-omap1.inc b/packages/linux/linux-omap.inc
index e2b168e454..e2b168e454 100644
--- a/packages/linux/linux-omap1.inc
+++ b/packages/linux/linux-omap.inc
diff --git a/packages/linux/linux-omap1-2.6.22-omap1/.mtn2git_empty b/packages/linux/linux-omap1-2.6.22-omap1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap1-2.6.22-omap1/.mtn2git_empty
diff --git a/packages/linux/linux-omap1-2.6.22-omap1/defconfig b/packages/linux/linux-omap1-2.6.22-omap1/defconfig
new file mode 100644
index 0000000000..93e8bea7d5
--- /dev/null
+++ b/packages/linux/linux-omap1-2.6.22-omap1/defconfig
@@ -0,0 +1,1301 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.19-omap1
+# Fri Dec 29 08:12:35 2006
+#
+CONFIG_ARM=y
+# CONFIG_GENERIC_TIME is not set
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_BLK_DEV_IO_TRACE is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA 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_OMAP=y
+
+#
+# TI OMAP Implementations
+#
+CONFIG_ARCH_OMAP_OTG=y
+CONFIG_ARCH_OMAP1=y
+# CONFIG_ARCH_OMAP2 is not set
+
+#
+# OMAP Feature Selections
+#
+CONFIG_OMAP_RESET_CLOCKS=y
+# CONFIG_OMAP_BOOT_TAG is not set
+# CONFIG_OMAP_GPIO_SWITCH is not set
+CONFIG_OMAP_MUX=y
+# CONFIG_OMAP_MUX_DEBUG is not set
+CONFIG_OMAP_MUX_WARNINGS=y
+# CONFIG_OMAP_STI is not set
+CONFIG_OMAP_MCBSP=y
+# CONFIG_OMAP_MPU_TIMER is not set
+CONFIG_OMAP_32K_TIMER=y
+CONFIG_OMAP_32K_TIMER_HZ=128
+# CONFIG_OMAP_DM_TIMER is not set
+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_OMAP_DSP=y
+# CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set
+# CONFIG_OMAP_DSP_TASK_MULTIOPEN is not set
+# CONFIG_OMAP_DSP_FBEXPORT is not set
+
+#
+# OMAP Core Type
+#
+# CONFIG_ARCH_OMAP730 is not set
+# CONFIG_ARCH_OMAP15XX is not set
+CONFIG_ARCH_OMAP16XX=y
+
+#
+# OMAP Board Type
+#
+# CONFIG_MACH_OMAP_INNOVATOR is not set
+# CONFIG_MACH_OMAP_H2 is not set
+# CONFIG_MACH_OMAP_H3 is not set
+CONFIG_MACH_OMAP_OSK=y
+# CONFIG_OMAP_OSK_MISTRAL is not set
+# CONFIG_MACH_NOKIA770 is not set
+# CONFIG_MACH_OMAP_GENERIC is not set
+
+#
+# OMAP CPU Speed
+#
+# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set
+# CONFIG_OMAP_ARM_216MHZ is not set
+CONFIG_OMAP_ARM_192MHZ=y
+# CONFIG_OMAP_ARM_168MHZ is not set
+# CONFIG_OMAP_ARM_120MHZ is not set
+# CONFIG_OMAP_ARM_60MHZ is not set
+# CONFIG_OMAP_ARM_30MHZ is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5TJ=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+# CONFIG_ARM_THUMB is not set
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+
+#
+# Bus support
+#
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+CONFIG_PCCARD=y
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+
+#
+# PC-card bridges
+#
+CONFIG_OMAP_CF=y
+
+#
+# Kernel Features
+#
+# CONFIG_PREEMPT is not set
+CONFIG_NO_IDLE_HZ=y
+CONFIG_HZ=128
+# CONFIG_AEABI is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+# CONFIG_LEDS is not set
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x10400000,8M root=/dev/ram0 rw"
+# CONFIG_XIP_KERNEL 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 is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Power management options
+#
+CONFIG_PM=y
+CONFIG_PM_LEGACY=y
+# CONFIG_PM_DEBUG is not set
+# CONFIG_PM_SYSFS_DEPRECATED is not set
+# CONFIG_APM is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=m
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+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_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+CONFIG_MTD_OMAP_NOR=y
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=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=8192
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=m
+CONFIG_BLK_DEV_IDE=m
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=m
+# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_BLK_DEV_IDECS=m
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+
+#
+# IDE chipset support/bugfixes
+#
+# CONFIG_IDE_GENERIC is not set
+# CONFIG_IDE_ARM is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_NETLINK is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+CONFIG_SMC91X=y
+# CONFIG_DM9000 is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# PCMCIA network device support
+#
+# CONFIG_NET_PCMCIA is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+CONFIG_PPP=y
+CONFIG_PPP_MULTILINK=y
+# CONFIG_PPP_FILTER is not set
+# CONFIG_PPP_ASYNC is not set
+# CONFIG_PPP_SYNC_TTY is not set
+# CONFIG_PPP_DEFLATE is not set
+# CONFIG_PPP_BSDCOMP is not set
+# CONFIG_PPP_MPPE is not set
+# CONFIG_PPPOE is not set
+# CONFIG_SLIP is not set
+CONFIG_SLHC=y
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ATKBD 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_OMAP=y
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# 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_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_CS is not set
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_OMAP=y
+# CONFIG_OMAP_RNG is not set
+# CONFIG_NVRAM is not set
+# CONFIG_OMAP_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=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_OCORES is not set
+CONFIG_I2C_OMAP=y
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_PCA_ISA is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_ISP1301_OMAP is not set
+CONFIG_TPS65010=y
+CONFIG_SENSORS_TLV320AIC23=y
+# CONFIG_GPIOEXPANDER_OMAP is not set
+# CONFIG_SENSORS_MAX6875 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
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Misc devices
+#
+# CONFIG_TIFM_CORE is not set
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+# CONFIG_USB_DABUSB is not set
+
+#
+# Graphics support
+#
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB=y
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+CONFIG_FB_MODE_HELPERS=y
+# CONFIG_FB_TILEBLITTING is not set
+# 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_LCD_MIPID is not set
+# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2
+# CONFIG_FB_OMAP_DMA_TUNE is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+# CONFIG_FONT_8x16 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+
+#
+# Logo configuration
+#
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Sound
+#
+CONFIG_SOUND=y
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+CONFIG_SND_SEQUENCER=y
+# CONFIG_SND_SEQ_DUMMY is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_SEQUENCER_OSS is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# ALSA ARM devices
+#
+CONFIG_SND_OMAP_AIC23=y
+# CONFIG_SND_OMAP_TSC2101 is not set
+# CONFIG_SND_SX1 is not set
+# CONFIG_SND_OMAP_TSC2102 is not set
+
+#
+# USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+
+#
+# PCMCIA devices
+#
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_PDAUDIOCF is not set
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_SL811_HCD is not set
+
+#
+# Enable Host or Gadget support to see Inventra options
+#
+# CONFIG_USB_MUSB_HDRC is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Input Devices
+#
+# CONFIG_USB_HID is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_TOUCHSCREEN is not set
+# CONFIG_USB_YEALINK is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_ATI_REMOTE2 is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_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_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_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# Real Time Clock
+#
+CONFIG_RTC_LIB=y
+# CONFIG_RTC_CLASS is not set
+
+#
+# Synchronous Serial Interfaces (SSI)
+#
+CONFIG_OMAP_UWIRE=y
+CONFIG_OMAP_TSC2101=y
+
+#
+# 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 is not set
+# CONFIG_EXT4DEV_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+CONFIG_AUTOFS_FS=y
+CONFIG_AUTOFS4_FS=y
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=m
+# 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=m
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_FS is not set
+CONFIG_FRAME_POINTER=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_USER is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
diff --git a/packages/linux/linux-omap1-2.6.22-omap1/defconfig.eabi b/packages/linux/linux-omap1-2.6.22-omap1/defconfig.eabi
new file mode 100644
index 0000000000..640e5e349a
--- /dev/null
+++ b/packages/linux/linux-omap1-2.6.22-omap1/defconfig.eabi
@@ -0,0 +1,1416 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.20-omap1
+# Mon Apr 30 16:19:37 2007
+#
+CONFIG_ARM=y
+CONFIG_GENERIC_TIME=y
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=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_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_POSIX_MQUEUE=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA 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_OMAP=y
+
+#
+# TI OMAP Implementations
+#
+CONFIG_ARCH_OMAP_OTG=y
+CONFIG_ARCH_OMAP1=y
+# CONFIG_ARCH_OMAP2 is not set
+
+#
+# OMAP Feature Selections
+#
+CONFIG_OMAP_RESET_CLOCKS=y
+# CONFIG_OMAP_BOOT_TAG is not set
+# CONFIG_OMAP_GPIO_SWITCH is not set
+CONFIG_OMAP_MUX=y
+# CONFIG_OMAP_MUX_DEBUG is not set
+CONFIG_OMAP_MUX_WARNINGS=y
+# CONFIG_OMAP_STI is not set
+CONFIG_OMAP_MCBSP=y
+# CONFIG_OMAP_MPU_TIMER is not set
+CONFIG_OMAP_32K_TIMER=y
+CONFIG_OMAP_32K_TIMER_HZ=128
+# CONFIG_OMAP_DM_TIMER is not set
+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_OMAP_DSP=y
+# CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set
+# CONFIG_OMAP_DSP_TASK_MULTIOPEN is not set
+# CONFIG_OMAP_DSP_FBEXPORT is not set
+
+#
+# OMAP Core Type
+#
+# CONFIG_ARCH_OMAP730 is not set
+# CONFIG_ARCH_OMAP15XX is not set
+CONFIG_ARCH_OMAP16XX=y
+
+#
+# OMAP Board Type
+#
+# CONFIG_MACH_OMAP_INNOVATOR is not set
+# CONFIG_MACH_OMAP_H2 is not set
+# CONFIG_MACH_OMAP_H3 is not set
+CONFIG_MACH_OMAP_OSK=y
+# CONFIG_OMAP_OSK_MISTRAL is not set
+# CONFIG_MACH_NOKIA770 is not set
+# CONFIG_MACH_OMAP_GENERIC is not set
+
+#
+# OMAP CPU Speed
+#
+# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set
+# CONFIG_OMAP_ARM_216MHZ is not set
+CONFIG_OMAP_ARM_192MHZ=y
+# CONFIG_OMAP_ARM_168MHZ is not set
+# CONFIG_OMAP_ARM_120MHZ is not set
+# CONFIG_OMAP_ARM_60MHZ is not set
+# CONFIG_OMAP_ARM_30MHZ is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5TJ=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+# CONFIG_ARM_THUMB is not set
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+
+#
+# Bus support
+#
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+CONFIG_PCCARD=y
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+
+#
+# PC-card bridges
+#
+CONFIG_OMAP_CF=y
+
+#
+# Kernel Features
+#
+# CONFIG_PREEMPT is not set
+CONFIG_NO_IDLE_HZ=y
+CONFIG_HZ=128
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+# CONFIG_LEDS is not set
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x10400000,8M root=/dev/ram0 rw"
+# CONFIG_XIP_KERNEL 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 is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Power management options
+#
+CONFIG_PM=y
+CONFIG_PM_LEGACY=y
+# CONFIG_PM_DEBUG is not set
+# CONFIG_PM_SYSFS_DEPRECATED is not set
+# CONFIG_APM is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=m
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+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 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+CONFIG_MTD_OMAP_NOR=y
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=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=8192
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=m
+CONFIG_BLK_DEV_IDE=m
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=m
+# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_BLK_DEV_IDECS=m
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+
+#
+# IDE chipset support/bugfixes
+#
+# CONFIG_IDE_GENERIC is not set
+# CONFIG_IDE_ARM is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=m
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# PCMCIA SCSI adapter support
+#
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+CONFIG_SMC91X=y
+# CONFIG_DM9000 is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# PCMCIA network device support
+#
+# CONFIG_NET_PCMCIA is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+CONFIG_PPP=y
+CONFIG_PPP_MULTILINK=y
+# CONFIG_PPP_FILTER is not set
+# CONFIG_PPP_ASYNC is not set
+# CONFIG_PPP_SYNC_TTY is not set
+# CONFIG_PPP_DEFLATE is not set
+# CONFIG_PPP_BSDCOMP is not set
+# CONFIG_PPP_MPPE is not set
+# CONFIG_PPPOE is not set
+# CONFIG_SLIP is not set
+CONFIG_SLHC=y
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ATKBD 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_OMAP=y
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# 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_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_CS is not set
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=16
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_OMAP=y
+CONFIG_OMAP_RNG=y
+# CONFIG_NVRAM is not set
+CONFIG_OMAP_RTC=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=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_OCORES is not set
+CONFIG_I2C_OMAP=y
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_PCA_ISA is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_ISP1301_OMAP is not set
+CONFIG_TPS65010=y
+CONFIG_SENSORS_TLV320AIC23=y
+# CONFIG_GPIOEXPANDER_OMAP is not set
+# CONFIG_SENSORS_MAX6875 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
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Misc devices
+#
+# CONFIG_TIFM_CORE is not set
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+# CONFIG_USB_DABUSB is not set
+
+#
+# Graphics support
+#
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB=y
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+CONFIG_FB_MODE_HELPERS=y
+# CONFIG_FB_TILEBLITTING is not set
+# 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_LCD_MIPID is not set
+# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2
+# CONFIG_FB_OMAP_DMA_TUNE is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+# CONFIG_FONT_8x16 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+
+#
+# Logo configuration
+#
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Sound
+#
+CONFIG_SOUND=y
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+CONFIG_SND_SEQUENCER=y
+# CONFIG_SND_SEQ_DUMMY is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_SEQUENCER_OSS is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# ALSA ARM devices
+#
+CONFIG_SND_OMAP_AIC23=y
+# CONFIG_SND_OMAP_TSC2101 is not set
+# CONFIG_SND_SX1 is not set
+# CONFIG_SND_OMAP_TSC2102 is not set
+
+#
+# USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+
+#
+# PCMCIA devices
+#
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_PDAUDIOCF is not set
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
+#
+# HID Devices
+#
+CONFIG_HID=y
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_SL811_HCD is not set
+
+#
+# Enable Host or Gadget support to see Inventra options
+#
+# CONFIG_USB_MUSB_HDRC is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Input Devices
+#
+# CONFIG_USB_HID is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_TOUCHSCREEN is not set
+# CONFIG_USB_YEALINK is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_ATI_REMOTE2 is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_AIRCABLE=m
+# CONFIG_USB_SERIAL_AIRPRIME is not set
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+CONFIG_USB_SERIAL_CP2101=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+# CONFIG_USB_SERIAL_EMPEG is not set
+# CONFIG_USB_SERIAL_FTDI_SIO is not set
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+CONFIG_USB_SERIAL_IR=m
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_GARMIN is not set
+# CONFIG_USB_SERIAL_IPW is not set
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
+CONFIG_USB_SERIAL_PL2303=m
+# CONFIG_USB_SERIAL_HP4X is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+CONFIG_USB_SERIAL_TI=m
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+# CONFIG_USB_SERIAL_OPTION is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
+# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_EZUSB=y
+
+#
+# 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_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_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# Real Time Clock
+#
+CONFIG_RTC_LIB=y
+# CONFIG_RTC_CLASS is not set
+
+#
+# Synchronous Serial Interfaces (SSI)
+#
+CONFIG_OMAP_UWIRE=y
+CONFIG_OMAP_TSC2101=y
+
+#
+# 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 is not set
+# CONFIG_EXT4DEV_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+CONFIG_AUTOFS_FS=y
+CONFIG_AUTOFS4_FS=y
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=m
+# 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=m
+# 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
+
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_USER is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_IOMAP_COPY=y
diff --git a/packages/linux/linux-omap1_2.6.12-rc2.bb b/packages/linux/linux-omap1_2.6.12-rc2.bb
index 1b9a1b6de0..ea25bb8f19 100644
--- a/packages/linux/linux-omap1_2.6.12-rc2.bb
+++ b/packages/linux/linux-omap1_2.6.12-rc2.bb
@@ -1,4 +1,4 @@
-require linux-omap1.inc
+require linux-omap.inc
PR = "r4"
diff --git a/packages/linux/linux-omap1_2.6.18+git.bb b/packages/linux/linux-omap1_2.6.18+git.bb
index a097caa113..61edc96c39 100644
--- a/packages/linux/linux-omap1_2.6.18+git.bb
+++ b/packages/linux/linux-omap1_2.6.18+git.bb
@@ -1,4 +1,4 @@
-require linux-omap1.inc
+require linux-omap.inc
PR = "r2"
diff --git a/packages/linux/linux-omap1_2.6.18-omap1.bb b/packages/linux/linux-omap1_2.6.18-omap1.bb
index 7c087e8cba..46f10dbe7b 100644
--- a/packages/linux/linux-omap1_2.6.18-omap1.bb
+++ b/packages/linux/linux-omap1_2.6.18-omap1.bb
@@ -1,4 +1,4 @@
-require linux-omap1.inc
+require linux-omap.inc
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
http://www.muru.com/linux/omap/patches/patch-2.6.18-omap1.bz2;patch=1 \
diff --git a/packages/linux/linux-omap1_2.6.19-omap1.bb b/packages/linux/linux-omap1_2.6.19-omap1.bb
index 1734149180..3ce97aa87f 100644
--- a/packages/linux/linux-omap1_2.6.19-omap1.bb
+++ b/packages/linux/linux-omap1_2.6.19-omap1.bb
@@ -1,4 +1,4 @@
-require linux-omap1.inc
+require linux-omap.inc
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \
http://www.muru.com/linux/omap/patches/patch-2.6.19-omap1.bz2;patch=1 \
diff --git a/packages/linux/linux-omap1_2.6.20-omap1.bb b/packages/linux/linux-omap1_2.6.20-omap1.bb
index 770883fbb6..fe747a7a35 100644
--- a/packages/linux/linux-omap1_2.6.20-omap1.bb
+++ b/packages/linux/linux-omap1_2.6.20-omap1.bb
@@ -1,4 +1,4 @@
-require linux-omap1.inc
+require linux-omap.inc
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \
http://www.muru.com/linux/omap/patches/patch-2.6.20-omap1.bz2;patch=1 \
diff --git a/packages/linux/linux-omap1_2.6.22-omap1.bb b/packages/linux/linux-omap1_2.6.22-omap1.bb
new file mode 100644
index 0000000000..2319b6d44e
--- /dev/null
+++ b/packages/linux/linux-omap1_2.6.22-omap1.bb
@@ -0,0 +1,10 @@
+require linux-omap.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \
+ http://www.muru.com/linux/omap/patches/patch-2.6.22-omap1.bz2;patch=1 \
+ file://defconfig.eabi \
+ file://defconfig"
+
+S = "${WORKDIR}/linux-2.6.22"
diff --git a/packages/linux/linux-omap1_2.6.x+git.bb b/packages/linux/linux-omap1_2.6.x+git.bb
index fbc0ee2ce7..3f0c652564 100644
--- a/packages/linux/linux-omap1_2.6.x+git.bb
+++ b/packages/linux/linux-omap1_2.6.x+git.bb
@@ -1,4 +1,4 @@
-require linux-omap1.inc
+require linux-omap.inc
PR = "r1"
diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb
index 94197d07cf..72216a6304 100644
--- a/packages/meta/meta-maemo.bb
+++ b/packages/meta/meta-maemo.bb
@@ -1,90 +1,11 @@
-PACKAGES = "maemo-task-base maemo-task-apps maemo-task-libs-install maemo-task-theme"
DESCRIPTION = "Meta-package for maemo environment"
-PR = "r8"
-
-ALLOW_EMPTY = "1"
-
-maemo-base-depends = "\
- diet-x11 \
- virtual/xserver \
- xpext \
- xsp"
-
-RDEPENDS_maemo-base-depends := "${maemo-base-depends}"
-DEPENDS += " ${maemo-base-depends}"
-
-maemo-task-libs-install = "\
- libsqlite \
- hildon-lgpl \
- libhildonbase \
- libhildonwidgets \
- hildon-fm"
-
-RDEPENDS_maemo-task-libs-install := "${maemo-task-libs-install}"
-
-
-maemo-task-base = "\
- bluez-utils-dbus \
- matchbox \
- shared-mime-info \
- rxvt-unicode \
- xst \
- xhost \
- xrdb \
- libgtkstylus \
- outo \
- hildon-initscripts \
- libosso \
- osso-af-utils \
- osso-af-startup \
- osso-core-config \
- osso-gnome-vfs2 \
- osso-thumbnail \
- xauth \
- esd"
-
-RDEPENDS_maemo-task-base := "gdk-pixbuf-loader-png \
- gdk-pixbuf-loader-xpm \
- gdk-pixbuf-loader-jpeg \
- pango-module-basic-x \
- pango-module-basic-fc \
- ${maemo-task-base}"
-
-DEPENDS += " ${maemo-task-base}"
-
-
-maemo-task-theme = "\
- xcursor-transparent-theme \
- sdk-default-theme \
- sdk-default-theme-config \
- sdk-default-icons \
- sapwood \
- ttf-bitstream-vera \
- sapwood \
- osso-sounds"
-
-RDEPENDS_maemo-task-theme := "${maemo-task-theme}"
-
-DEPENDS += " ${maemo-task-theme}"
-
-
-
-maemo-task-apps = "\
- osso-gwobex \
- osso-gwconnect \
- osso-bttools \
- hildon-status-bar \
- hildon-home \
- hildon-navigator \
- hildon-control-panel \
- osso-application-installer \
- osso-app-killer \
- osso-screenshot-tool \
- gpe-todo-hildon \
- gpe-contacts-hildon \
- gpe-mini-browser-hildon"
+LICENSE = "MIT"
+PR = "r0"
-RDEPENDS_maemo-task-apps := "${maemo-task-apps}"
-DEPENDS += " ${maemo-task-apps}"
+RDEPENDS = "\
+ maemo-task-base \
+ maemo-task-apps \
+ maemo-task-libs-install \
+ maemo-task-theme"
-LICENSE = "MIT"
+inherit meta \ No newline at end of file
diff --git a/packages/musicpd/mpc_0.11.2.bb b/packages/musicpd/mpc_0.11.2.bb
deleted file mode 100644
index 8d3eaa183a..0000000000
--- a/packages/musicpd/mpc_0.11.2.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Command-line (scriptable) Music Player Daemon (mpd) Client"
-HOMEPAGE = "http://www.musicpd.org/mpc.shtml"
-SECTION = "console/multimedia"
-LICENSE = "GPLv2"
-PR = "r1"
-
-SRC_URI = "http://mercury.chem.pitt.edu/~shank/mpc-${PV}.tar.gz"
-EXTRA_OECONF = "--with-iconv-libraries=${STAGING_LIBDIR} \
- --with-iconv-includes=${STAGING_INCDIR}"
-
-inherit autotools
diff --git a/packages/musicpd/mpc_0.12.0.bb b/packages/musicpd/mpc_0.12.1.bb
index ccd6926fcd..ccd6926fcd 100644
--- a/packages/musicpd/mpc_0.12.0.bb
+++ b/packages/musicpd/mpc_0.12.1.bb
diff --git a/packages/musicpd/mpd_0.11.2.bb b/packages/musicpd/mpd_0.11.2.bb
deleted file mode 100644
index 9d3c5f90b0..0000000000
--- a/packages/musicpd/mpd_0.11.2.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Music Player Daemon (mpd)"
-HOMEPAGE = "http://www.musicpd.org"
-SECTION = "console/multimedia"
-LICENSE = "GPLv2"
-DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile"
-PR = "r2"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz"
-
-inherit autotools
-
-# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to
-# be built, instead we use the OE built versions which should be installed
-# in staging - remove the --with and replace with --enable to use the local
-# versions.
-
-EXTRA_OECONF = "--enable-ogg \
- --with-id3tag-libraries=${STAGING_LIBDIR} \
- --with-id3tag-includes=${STAGING_INCDIR} \
- --with-mad-libraries=${STAGING_LIBDIR} \
- --with-mad-includes=${STAGING_INCDIR} \
- --without-faad"
diff --git a/packages/musicpd/mpd_0.11.5.bb b/packages/musicpd/mpd_0.11.5.bb
deleted file mode 100644
index 7a1d17ef5d..0000000000
--- a/packages/musicpd/mpd_0.11.5.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "Music Player Daemon (mpd)"
-HOMEPAGE = "http://www.musicpd.org"
-SECTION = "console/multimedia"
-LICENSE = "GPLv2"
-DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2"
-PR = "r8"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \
- file://save-volume-state.patch;patch=1"
-
-inherit autotools
-
-# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to
-# be built, instead we use the OE built versions which should be installed
-# in staging - remove the --with and replace with --enable to use the local
-# versions.
-
-EXTRA_OECONF = "--enable-ogg \
- --with-iconv-libraries=${STAGING_LIBDIR} \
- --with-iconv-includes=${STAGING_INCDIR} \
- --with-vorbis-libraries=${STAGING_LIBDIR} \
- --with-vorbis-includes=${STAGING_INCDIR} \
- --with-ogg-libraries=${STAGING_LIBDIR} \
- --with-ogg-includes=${STAGING_INCDIR} \
- --with-ao-libraries=${STAGING_LIBDIR} \
- --with-ao-includes=${STAGING_INCDIR} \
- --with-id3tag-libraries=${STAGING_LIBDIR} \
- --with-id3tag-includes=${STAGING_INCDIR} \
- --with-mad-libraries=${STAGING_LIBDIR} \
- --with-mad-includes=${STAGING_INCDIR} \
- --with-faad-libraries=${STAGING_LIBDIR} \
- --with-faad-includes=${STAGING_INCDIR}"
diff --git a/packages/musicpd/mpd_svn.bb b/packages/musicpd/mpd_svn.bb
index 04ddf8fdc3..673ff03b98 100644
--- a/packages/musicpd/mpd_svn.bb
+++ b/packages/musicpd/mpd_svn.bb
@@ -3,23 +3,24 @@ HOMEPAGE = "http://www.musicpd.org"
SECTION = "console/multimedia"
LICENSE = "GPLv2"
DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2 pulseaudio"
-SRCDATE = "20070120"
PV = "0.12.1+svn${SRCDATE}"
-PR = "r2"
+PR = "r0"
SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https \
- file://fix-mod-support.patch;patch=1;maxdate=20070302"
+ file://mpd/mpd.init"
# file://save-volume-state.patch;patch=1"
S = "${WORKDIR}/trunk"
-inherit autotools
+inherit autotools update-rc.d
+INITSCRIPT_NAME = "mpd"
# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to
# be built, instead we use the OE built versions which should be installed
# in staging - remove the --with and replace with --enable to use the local
# versions.
-EXTRA_OECONF = "--enable-ogg \
+EXTRA_OECONF = "\
+ --enable-ogg \
--with-id3tag-libraries=${STAGING_LIBDIR} \
--with-id3tag-includes=${STAGING_INCDIR} \
--with-mad-libraries=${STAGING_LIBDIR} \
diff --git a/packages/ncurses/ncurses.inc b/packages/ncurses/ncurses.inc
index 030cd1034c..027f037ee5 100644
--- a/packages/ncurses/ncurses.inc
+++ b/packages/ncurses/ncurses.inc
@@ -41,6 +41,10 @@ do_stage() {
ln -sf libncurses.a ${STAGING_LIBDIR}/libtermcap.a
}
+# This is necessary so that the "tic" command executed during the install can
+# link with the correct libary in staging.
+export LD_LIBRARY_PATH = "${STAGING_LIBDIR_NATIVE}"
+
do_install() {
autotools_do_install
diff --git a/packages/ncurses/ncurses_5.4.bb b/packages/ncurses/ncurses_5.4.bb
index 63272b4779..6da32232af 100644
--- a/packages/ncurses/ncurses_5.4.bb
+++ b/packages/ncurses/ncurses_5.4.bb
@@ -1,4 +1,4 @@
-PR = "r8"
+PR = "r9"
SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
file://visibility.patch;patch=1"
diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb
index 6851ae8d9a..6775008ea5 100644
--- a/packages/netbase/netbase_4.21.bb
+++ b/packages/netbase/netbase_4.21.bb
@@ -2,10 +2,12 @@ DESCRIPTION = "This package provides the necessary \
infrastructure for basic TCP/IP based networking."
SECTION = "base"
LICENSE = "GPL"
-PR = "r18"
+PR = "r20"
inherit update-rc.d
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
+
INITSCRIPT_NAME = "networking"
INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ."
# On MNCI etc, start very late so that our own apps come up faster
diff --git a/packages/openmoko2/neod_svn.bb b/packages/openmoko2/neod_svn.bb
index fd417c69f3..4d6115ae93 100644
--- a/packages/openmoko2/neod_svn.bb
+++ b/packages/openmoko2/neod_svn.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management"
SECTION = "openmoko/daemons"
-DEPENDS = "gtk+ pulseaudio"
+DEPENDS = "gconf gtk+ pulseaudio"
PV = "0.1.0+svn${SVNREV}"
PR = "r0"
-inherit openmoko2
+inherit openmoko2 gconf
diff --git a/packages/openmoko2/openmoko-common2_svn.bb b/packages/openmoko2/openmoko-common2_svn.bb
new file mode 100644
index 0000000000..f54a23de18
--- /dev/null
+++ b/packages/openmoko2/openmoko-common2_svn.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Common files for the OpenMoko distribution"
+SECTION = "openmoko/base"
+PV = "0.0+svn${SRCDATE}"
+PR = "r3"
+
+inherit openmoko2
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=pixmaps;proto=http"
+S = "${WORKDIR}"
+
+dirs = "pixmaps"
+
+do_install() {
+ find ${WORKDIR} -name ".svn" | xargs rm -rf
+ install -d ${D}${datadir}
+ for i in ${dirs}; do
+ cp -fpPR ${S}/$i ${D}${datadir}
+ done
+}
+
+PACKAGE_ARCH = "all"
+FILES_${PN} = "${datadir}"
diff --git a/packages/openmoko2/openmoko-feedreader2_svn.bb b/packages/openmoko2/openmoko-feedreader2_svn.bb
index 04b08539f2..3655f8977b 100644
--- a/packages/openmoko2/openmoko-feedreader2_svn.bb
+++ b/packages/openmoko2/openmoko-feedreader2_svn.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "The OpenMoko Feed Reader"
SECTION = "openmoko/apps"
-DEPENDS += "libmrss check webkit"
+DEPENDS += "libmrss check webkit-gtk"
PV = "0.0.1+svn${SVNREV}"
PR = "r0"
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index 86e1485003..046f59b3d9 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -1,9 +1,10 @@
-DESCRIPTION = "Custom MB session files for poky"
+DESCRIPTION = "Custom MB session files for OpenMoko"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
+RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
RCONFLICTS = "openmoko-session"
-PR = "r23"
+PR = "r29"
SRC_URI = "file://etc"
S = ${WORKDIR}
@@ -25,4 +26,8 @@ gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --dire
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5"
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2
+
}
+
+PACKAGE_ARCH = "all"
diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session
index 60ce553f67..b2867047b1 100755
--- a/packages/openmoko2/openmoko-session2/etc/matchbox/session
+++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session
@@ -1,5 +1,4 @@
#!/bin/sh
-
SHOWCURSOR="no"
openmoko-today &
@@ -7,5 +6,7 @@ openmoko-dialer &
matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ &
-exec matchbox-panel-2 --start-applets showdesktop,systray,startup \
- --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock --titlebar
+matchbox-panel-2 --start-applets systray,startup \
+ --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock --titlebar &
+
+exec neod
diff --git a/packages/openmoko2/openmoko-terminal2_1.0.0.bb b/packages/openmoko2/openmoko-terminal2_1.0.0.bb
index 8d9a5245ca..84bd470f7a 100644
--- a/packages/openmoko2/openmoko-terminal2_1.0.0.bb
+++ b/packages/openmoko2/openmoko-terminal2_1.0.0.bb
@@ -1,7 +1,10 @@
DESCRIPTION = "The OpenMoko Command Line Console"
SECTION = "openmoko/applications"
RDEPENDS += "mrxvt"
-PR = "r1"
+PR = "r2"
+
+RCONFLICTS = "openmoko-terminal"
+RREPLACES = "openmoko-terminal"
inherit openmoko2
diff --git a/packages/openmoko2/openmoko-today2-folders_svn.bb b/packages/openmoko2/openmoko-today2-folders_svn.bb
new file mode 100644
index 0000000000..7a7c90c091
--- /dev/null
+++ b/packages/openmoko2/openmoko-today2-folders_svn.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "The OpenMoko Today2 vfolder files"
+SECTION = "openmoko/misc"
+PV = "0.1.0+svn${SVNREV}"
+PR = "r1"
+
+inherit openmoko2
+
+FILES_${PN} += "${datadir}"
diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb
index 93e0b47456..bfc5fc201d 100644
--- a/packages/openmoko2/openmoko-today2_svn.bb
+++ b/packages/openmoko2/openmoko-today2_svn.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "The OpenMoko Application Launcher"
SECTION = "openmoko/pim"
DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm"
-RDEPENDS = "libedata-cal"
+RDEPENDS = "libedata-cal openmoko-today2-folders"
PV = "0.1.0+svn${SVNREV}"
PR = "r1"
diff --git a/packages/openssh/openssh-4.6p1/.mtn2git_empty b/packages/openssh/openssh-4.6p1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openssh/openssh-4.6p1/.mtn2git_empty
diff --git a/packages/openssh/openssh-4.6p1/ssh_config b/packages/openssh/openssh-4.6p1/ssh_config
new file mode 100644
index 0000000000..ad26d09b7c
--- /dev/null
+++ b/packages/openssh/openssh-4.6p1/ssh_config
@@ -0,0 +1,39 @@
+# $OpenBSD: ssh_config,v 1.16 2002/07/03 14:21:05 markus Exp $
+
+# This is the ssh client system-wide configuration file. See
+# ssh_config(5) for more information. This file provides defaults for
+# users, and the values can be changed in per-user configuration files
+# or on the command line.
+
+# Configuration data is parsed as follows:
+# 1. command line options
+# 2. user-specific file
+# 3. system-wide file
+# Any configuration value is only changed the first time it is set.
+# Thus, host-specific definitions should be at the beginning of the
+# configuration file, and defaults at the end.
+
+# Site-wide defaults for various options
+
+# Host *
+# ForwardAgent no
+# ForwardX11 no
+# RhostsAuthentication no
+# RhostsRSAAuthentication no
+# RSAAuthentication yes
+# PasswordAuthentication yes
+# HostbasedAuthentication no
+# BatchMode no
+# CheckHostIP yes
+# StrictHostKeyChecking ask
+# IdentityFile ~/.ssh/identity
+# IdentityFile ~/.ssh/id_rsa
+# IdentityFile ~/.ssh/id_dsa
+# Port 22
+# Protocol 2,1
+# Cipher 3des
+# Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
+# EscapeChar ~
+Host *
+ ForwardAgent yes
+ ForwardX11 yes
diff --git a/packages/openssh/openssh-4.6p1/sshd_config b/packages/openssh/openssh-4.6p1/sshd_config
new file mode 100644
index 0000000000..8c1069d9a6
--- /dev/null
+++ b/packages/openssh/openssh-4.6p1/sshd_config
@@ -0,0 +1,96 @@
+# $OpenBSD: sshd_config,v 1.59 2002/09/25 11:17:16 markus Exp $
+
+# This is the sshd server system-wide configuration file. See
+# sshd_config(5) for more information.
+
+# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
+# The strategy used for options in the default sshd_config shipped with
+# OpenSSH is to specify options with their default value where
+# possible, but leave them commented. Uncommented options change a
+# default value.
+
+#Port 22
+Protocol 2
+#ListenAddress 0.0.0.0
+#ListenAddress ::
+
+# HostKey for protocol version 1
+#HostKey /etc/ssh/ssh_host_key
+# HostKeys for protocol version 2
+#HostKey /etc/ssh/ssh_host_rsa_key
+#HostKey /etc/ssh/ssh_host_dsa_key
+
+# Lifetime and size of ephemeral version 1 server key
+#KeyRegenerationInterval 3600
+#ServerKeyBits 768
+
+# Logging
+#obsoletes QuietMode and FascistLogging
+#SyslogFacility AUTH
+#LogLevel INFO
+
+# Authentication:
+
+#LoginGraceTime 120
+#PermitRootLogin yes
+#StrictModes yes
+
+#RSAAuthentication yes
+#PubkeyAuthentication yes
+#AuthorizedKeysFile .ssh/authorized_keys
+
+# rhosts authentication should not be used
+#RhostsAuthentication no
+# Don't read the user's ~/.rhosts and ~/.shosts files
+#IgnoreRhosts yes
+# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
+#RhostsRSAAuthentication no
+# similar for protocol version 2
+#HostbasedAuthentication no
+# Change to yes if you don't trust ~/.ssh/known_hosts for
+# RhostsRSAAuthentication and HostbasedAuthentication
+#IgnoreUserKnownHosts no
+
+# To disable tunneled clear text passwords, change to no here!
+#PasswordAuthentication yes
+#PermitEmptyPasswords no
+
+# Change to no to disable s/key passwords
+#ChallengeResponseAuthentication yes
+
+# Kerberos options
+#KerberosAuthentication no
+#KerberosOrLocalPasswd yes
+#KerberosTicketCleanup yes
+
+#AFSTokenPassing no
+
+# Kerberos TGT Passing only works with the AFS kaserver
+#KerberosTgtPassing no
+
+# Set this to 'yes' to enable PAM keyboard-interactive authentication
+# Warning: enabling this may bypass the setting of 'PasswordAuthentication'
+#PAMAuthenticationViaKbdInt no
+
+#X11Forwarding no
+#X11DisplayOffset 10
+#X11UseLocalhost yes
+#PrintMotd yes
+#PrintLastLog yes
+#KeepAlive yes
+#UseLogin no
+UsePrivilegeSeparation yes
+#PermitUserEnvironment no
+Compression no
+
+#MaxStartups 10
+# no default banner path
+#Banner /some/path
+#VerifyReverseMapping no
+
+ClientAliveInterval 15
+ClientAliveCountMax 4
+
+# override default of no subsystems
+Subsystem sftp /usr/libexec/sftp-server
diff --git a/packages/openssh/openssh_4.6p1.bb b/packages/openssh/openssh_4.6p1.bb
new file mode 100644
index 0000000000..27bea2ce9a
--- /dev/null
+++ b/packages/openssh/openssh_4.6p1.bb
@@ -0,0 +1,112 @@
+DEFAULT_PREFERENCE = "-1"
+
+DEPENDS = "zlib openssl"
+
+RCONFLICTS_openssh = "dropbear"
+RCONFLICTS_openssh-sshd = "dropbear"
+
+SECTION = "console/network"
+DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \
+Ssh (Secure Shell) is a program for logging into a remote machine \
+and for executing commands on a remote machine. \
+It provides secure encrypted communications between two untrusted \
+hosts over an insecure network. X11 connections and arbitrary TCP/IP \
+ports can also be forwarded over the secure channel. \
+It is intended as a replacement for rlogin, rsh and rcp, and can be \
+used to provide applications with a secure communication channel."
+HOMEPAGE = "http://www.openssh.org/"
+LICENSE = "BSD"
+PR = "r2"
+
+SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
+ file://sshd_config \
+ file://ssh_config \
+ file://init"
+
+inherit autotools
+
+export ASKPASS_PROGRAM = "${bindir}/ssh-askpass"
+export LD = "${CC}"
+CFLAGS_prepend = "-I${S} "
+CFLAGS_append = " -D__FILE_OFFSET_BITS=64"
+LDFLAGS_prepend = "-L${S} -L${S}/openbsd-compat "
+EXTRA_OECONF = "--disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \
+ --with-rand-helper=no --without-pam \
+ --without-zlib-version-check \
+ --with-privsep-path=/var/run/sshd \
+ --sysconfdir=${sysconfdir}/ssh \
+ --with-xauth=/usr/bin/xauth"
+
+EXTRA_OEMAKE = "'STRIP_OPT='"
+
+do_configure_prepend () {
+ if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then
+ cp aclocal.m4 acinclude.m4
+ fi
+}
+
+do_compile_append () {
+ install -m 0644 ${WORKDIR}/sshd_config ${S}/
+ install -m 0644 ${WORKDIR}/ssh_config ${S}/
+}
+
+do_install_append() {
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd
+ mv ${D}${bindir}/scp ${D}${bindir}/scp.openssh
+ mv ${D}${bindir}/ssh ${D}${bindir}/ssh.openssh
+ rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var
+}
+
+PACKAGES =+ " openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc"
+FILES_openssh-dbg +=${bindir}/.debug ${libdir}exec/.debug"
+FILES_openssh-scp = "${bindir}/scp.${PN}"
+FILES_openssh-ssh = "${bindir}/ssh.${PN} ${bindir}/slogin /${sysconfdir}/ssh/ssh_config"
+FILES_openssh-sshd = "${sbindir}/sshd /${sysconfdir}/init.d/sshd ${bindir}/ssh-keygen"
+FILES_openssh-sshd += " /${sysconfdir}/ssh/moduli /${sysconfdir}/ssh/sshd_config"
+FILES_openssh-sftp = "${bindir}/sftp ${libdir}exec/sftp-server"
+FILES_openssh-misc = "${bindir}/ssh* ${libdir}exec/ssh*"
+
+RDEPENDS_openssh += " openssh-scp openssh-ssh openssh-sshd"
+DEPENDS_openssh-sshd += " update-rc.d"
+RDEPENDS_openssh-sshd += " update-rc.d"
+
+pkg_postinst_openssh-sshd() {
+if test "x$D" != "x"; then
+ exit 1
+else
+ addgroup sshd
+ adduser --system --home /var/run/sshd --no-create-home --disabled-password --ingroup sshd -s /bin/false sshd
+ update-rc.d sshd defaults 9
+fi
+}
+
+pkg_postinst_openssh-scp() {
+ update-alternatives --install ${bindir}/scp scp scp.${PN} 90
+}
+
+pkg_postinst_openssh-ssh() {
+ update-alternatives --install ${bindir}/ssh ssh ssh.${PN} 90
+}
+
+pkg_postrm_openssh-ssh() {
+ update-alternatives --remove ${bindir}/ssh ssh.${PN}
+}
+
+pkg_postrm_openssh-scp() {
+ update-alternatives --remove ${bindir}/scp scp.${PN}
+}
+
+pkg_postrm_openssh-sshd() {
+if test "x$D" != "x"; then
+ exit 1
+else
+ ${sysconfdir}/init.d/sshd stop
+ deluser sshd
+ delgroup sshd
+ update-rc.d -f sshd remove
+fi
+}
+
+CONFFILES_openssh-sshd = "${sysconfdir}/ssh/sshd_config"
+CONFFILES_openssh-ssh = "${sysconfdir}/ssh/ssh_config"
diff --git a/packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch b/packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch
deleted file mode 100644
index 83ee765b12..0000000000
--- a/packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- applet.org/bluezapplet.cpp.org 2007-02-11 16:48:06.000000000 +0000
-+++ applet/bluezapplet.cpp 2007-02-11 16:56:57.000000000 +0000
-@@ -52,6 +52,8 @@
- #include <qtimer.h>
- #include <qpopupmenu.h>
- #include <qmessagebox.h>
-+#include <qfile.h>
-+#include <qtextstream.h>
-
- /* STD */
- #include <device.h>
-@@ -124,6 +126,28 @@
- int BluezApplet::setBluezStatus(int c, bool sync) {
-
- if ( c == 1 ) {
-+
-+ QFile cfg("/etc/sysconfig/bluetooth");
-+ if(cfg.open(IO_ReadOnly)) {
-+ QTextStream stream (&cfg);
-+ QString streamIn = stream.read();
-+ QStringList list = QStringList::split("\n", streamIn);
-+ cfg.close();
-+ if(list.grep("BLUETOOTH_PORT=").count() > 0 &&
-+ list.grep("BLUETOOTH_PROTOCOL=").count() > 0 &&
-+ list.grep("BLUETOOTH_SPEED=").count() > 0) {
-+ btDevice = new Device( list.grep("BLUETOOTH_PORT=")[0].
-+ replace((QString)"BLUETOOTH_PORT=", ""),
-+ list.grep("BLUETOOTH_PROTOCOL=")[0].
-+ replace((QString)"BLUETOOTH_PROTOCOL=", ""),
-+ list.grep("BLUETOOTH_SPEED=")[0].
-+ replace((QString)"BLUETOOTH_SPEED=", ""));
-+ return 0;
-+ }
-+ }
-+
-+ // Device-specific stuff - should be removed
-+
- switch ( ODevice::inst()->model() ) {
- case Model_iPAQ_H39xx:
- btDevice = new Device( "/dev/tts/1", "bcsp", "921600" );
diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb
index f35accf577..f54012285d 100644
--- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb
+++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb
@@ -4,5 +4,3 @@ PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/applet \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics/bluetoothapplet"
-
-# file://sysconfig-bluetooth.patch;patch=1"
diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
index a919c3094b..04756ed77a 100644
--- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
+++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
@@ -4,5 +4,4 @@ PV = "${OPIE_CVS_PV}"
PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/applet \
- ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet \
- file://sysconfig-bluetooth.patch;patch=1"
+ ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet"
diff --git a/packages/poppler/poppler-data_0.1.bb b/packages/poppler/poppler-data_0.1.bb
index ca22e4dba0..e145cb07ee 100644
--- a/packages/poppler/poppler-data_0.1.bb
+++ b/packages/poppler/poppler-data_0.1.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
LICENSE = "Adobe"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
diff --git a/packages/poppler/poppler.inc b/packages/poppler/poppler.inc
index e01057cb4e..0e9b61cd30 100644
--- a/packages/poppler/poppler.inc
+++ b/packages/poppler/poppler.inc
@@ -21,3 +21,8 @@ EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}"
do_stage() {
autotools_stage_all
}
+
+PACKAGES =+ "libpoppler libpoppler-glib"
+FILES_libpoppler = "${libdir}/libpoppler.so.*"
+FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*"
+
diff --git a/packages/poppler/poppler/.mtn2git_empty b/packages/poppler/poppler/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/poppler/poppler/.mtn2git_empty
diff --git a/packages/poppler/poppler/fix-splash.patch b/packages/poppler/poppler/fix-splash.patch
new file mode 100644
index 0000000000..001c4ce301
--- /dev/null
+++ b/packages/poppler/poppler/fix-splash.patch
@@ -0,0 +1,28 @@
+--- poppler/splash/SplashMath.h 2007/04/25 19:59:10 1.3
++++ poppler/splash/SplashMath.h 2007/06/01 18:34:48 1.4
+@@ -8,7 +8,7 @@
+ #define SPLASHMATH_H
+
+ #if USE_FIXEDPOINT
+-#include "FixedPoint.h"
++#include "goo/FixedPoint.h"
+ #else
+ #include <math.h>
+ #endif
+--- poppler/splash/SplashFTFont.cc 2007/04/25 19:59:10 1.8
++++ poppler/splash/SplashFTFont.cc 2007/06/01 18:34:48 1.9
+@@ -127,10 +127,10 @@
+ matrix.yx = (FT_Fixed)((mat[1] / size).getRaw());
+ matrix.xy = (FT_Fixed)((mat[2] / size).getRaw());
+ matrix.yy = (FT_Fixed)((mat[3] / size).getRaw());
+- textMatrix.xx = (FT_Fixed)((textMat[0] / (size * textScale)).getRaw());
+- textMatrix.yx = (FT_Fixed)((textMat[1] / (size * textScale)).getRaw());
+- textMatrix.xy = (FT_Fixed)((textMat[2] / (size * textScale)).getRaw());
+- textMatrix.yy = (FT_Fixed)((textMat[3] / (size * textScale)).getRaw());
++ textMatrix.xx = (FT_Fixed)((textMat[0] / (textScale * size)).getRaw());
++ textMatrix.yx = (FT_Fixed)((textMat[1] / (textScale * size)).getRaw());
++ textMatrix.xy = (FT_Fixed)((textMat[2] / (textScale * size)).getRaw());
++ textMatrix.yy = (FT_Fixed)((textMat[3] / (textScale * size)).getRaw());
+ #else
+ matrix.xx = (FT_Fixed)((mat[0] / size) * 65536);
+ matrix.yx = (FT_Fixed)((mat[1] / size) * 65536);
diff --git a/packages/poppler/poppler0.6_cvs.bb b/packages/poppler/poppler0.6_cvs.bb
index ca4b8d6a03..15f94a775a 100644
--- a/packages/poppler/poppler0.6_cvs.bb
+++ b/packages/poppler/poppler0.6_cvs.bb
@@ -1,6 +1,6 @@
require poppler.inc
PV = "0.5.9+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/poppler;module=poppler"
S = "${WORKDIR}/poppler"
diff --git a/packages/poppler/poppler_0.5.4.bb b/packages/poppler/poppler_0.5.4.bb
index 92c25bc0ac..754eccf435 100644
--- a/packages/poppler/poppler_0.5.4.bb
+++ b/packages/poppler/poppler_0.5.4.bb
@@ -1,2 +1,2 @@
require poppler.inc
-PR = "r2"
+PR = "r3"
diff --git a/packages/poppler/poppler_0.5.9.bb b/packages/poppler/poppler_0.5.9.bb
index 347d9ae303..2fc2200afc 100644
--- a/packages/poppler/poppler_0.5.9.bb
+++ b/packages/poppler/poppler_0.5.9.bb
@@ -1,5 +1,7 @@
require poppler.inc
-# does not build, use cvs for now and eventually try to bump to 0.6.0 (or 1.0)
-DEFAULT_PREFERENCE = "-1"
+PR = "r1"
+
+SRC_URI += "file://fix-splash.patch;patch=1"
+EXTRA_OECONF_append = " --disable-abiword-output "
diff --git a/packages/pulseaudio/pulse.inc b/packages/pulseaudio/pulse.inc
index 0158a8a9cc..f765bec1a1 100644
--- a/packages/pulseaudio/pulse.inc
+++ b/packages/pulseaudio/pulse.inc
@@ -27,6 +27,11 @@ PARALLEL_MAKE = ""
export TARGET_PFPU = "${TARGET_FPU}"
+# TODO: Use more fine granular version
+#OE_LT_RPATH_ALLOW=":${libdir}/pulse-0.9:"
+OE_LT_RPATH_ALLOW = "any"
+OE_LT_RPATH_ALLOW[export]="1"
+
do_stage() {
autotools_stage_all
}
@@ -65,28 +70,25 @@ FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper"
FILES_${PN}-misc = "${bindir}/*"
CONFFILES_pulseaudio-server = "\
- ${sysconfdir}/pulse/default.pa \
- ${sysconfdir}/pulse/daemon.conf \
- ${sysconfdir}/pulse/client.conf \
- "
-pkg_postinst_libppulse() {
-if test "x$D" != "x"; then
- exit 1
-else
+ ${sysconfdir}/pulse/default.pa \
+ ${sysconfdir}/pulse/daemon.conf \
+ ${sysconfdir}/pulse/client.conf \
+ "
+
+pkg_postinst_${PN}-server() {
+ # can't do this offline
+ if [ "x$D" != "x" ]; then
+ exit 1
+ fi
grep -q pulse: /etc/group || addgroup pulse
grep -q pulse: /etc/passwd || \
- adduser --disabled-password --home=/var/run/pulse/ --system \
+ adduser --disabled-password --home=/var/run/pulse --system \
--ingroup pulse --no-create-home -g "Pulse audio daemon" pulse
/etc/init.d/populate-volatile.sh update
-fi
}
-pkg_postrm_libpulse() {
-if test "x$D" != "x"; then
- exit 1
-else
- deluser pulse
-fi
+pkg_postrm_${PN}-server() {
+ deluser pulse || true
}
python populate_packages_prepend() {
diff --git a/packages/pulseaudio/pulseaudio_0.9.5.bb b/packages/pulseaudio/pulseaudio_0.9.5.bb
deleted file mode 100644
index 63c33c4725..0000000000
--- a/packages/pulseaudio/pulseaudio_0.9.5.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require pulse.inc
-
-PR = "r11"
diff --git a/packages/pulseaudio/pulseaudio_0.9.6.bb b/packages/pulseaudio/pulseaudio_0.9.6.bb
index fd64673cc7..a93c8ee251 100644
--- a/packages/pulseaudio/pulseaudio_0.9.6.bb
+++ b/packages/pulseaudio/pulseaudio_0.9.6.bb
@@ -1,4 +1,4 @@
require pulse.inc
-PR = "r3"
+PR = "r5"
diff --git a/packages/slugimage/slugimage.bb b/packages/slugimage/slugimage.bb
index 16873d8d24..ad05d54851 100644
--- a/packages/slugimage/slugimage.bb
+++ b/packages/slugimage/slugimage.bb
@@ -3,11 +3,11 @@ SECTION = "console/utils"
LICENSE = "BSD"
DESCRIPTION = "Slugimage is a small app to disassemble and reassemble \
flash images for the Linksys NSLU2 device. It also has jffs2 support"
-PR = "r10"
+PR = "r11"
RDEPENDS = "perl"
-SLUGIMAGE_SVN_REV ?= "82"
+SLUGIMAGE_SVN_REV ?= "103"
SLUGIMAGE_SVN_REPO ?= "http://svn.nslu2-linux.org/svnroot/slugimage/trunk"
addtask svnfetch before do_configure after do_patch
diff --git a/packages/slugos-init/files/initscripts/zleds b/packages/slugos-init/files/initscripts/zleds
index f5bd703b65..4c8277a53d 100644
--- a/packages/slugos-init/files/initscripts/zleds
+++ b/packages/slugos-init/files/initscripts/zleds
@@ -21,8 +21,25 @@ state(){
esac
}
+# trumpet "beeps" an announcement on systems with such support.
+l=120 # Long beep time
+s=40 # Try to keep a 3:1 ratio
+trumpet(){
+ case "$1" in
+ k) leds beep -l $l; leds beep -l $s; leds beep -l $l;;
+ n) leds beep -l $l; leds beep -l $s;;
+ *) leds beep;;
+ esac
+}
+
case "$1" in
-start) leds "$(state "$runlevel")";;
-stop) leds boot "$(state "$runlevel")";;
-*) echo "led change: $1: command ignored" >&2;;
+start) leds "$(state "$runlevel")"
+ if [ "$(state "$runlevel")" == "user" ]; then
+ trumpet "k"
+ fi
+ ;;
+stop) leds boot "$(state "$runlevel")"
+ ;;
+*) echo "led change: $1: command ignored" >&2
+ ;;
esac
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index 9748f13ec9..301a6829a5 100644
--- a/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
LICENSE = "GPL"
DEPENDS = "base-files devio"
RDEPENDS = "busybox devio"
-PR = "r87"
+PR = "r88"
SRC_URI = "file://boot/flash \
file://boot/disk \
diff --git a/packages/sudo/files/autofoo.patch b/packages/sudo/files/autofoo.patch
index 4624979bba..995f026a83 100644
--- a/packages/sudo/files/autofoo.patch
+++ b/packages/sudo/files/autofoo.patch
@@ -2,6 +2,15 @@ Index: sudo-1.6.8p12/configure.in
===================================================================
--- sudo-1.6.8p12.orig/configure.in 2004-11-26 04:31:20.000000000 +1100
+++ sudo-1.6.8p12/configure.in 2007-05-16 16:45:20.000000000 +1000
+@@ -1609,7 +1609,7 @@
+ AC_CHECK_FUNCS(getspnam, [CHECKSHADOW="false"], [AC_CHECK_LIB(gen, getspnam, AC_DEFINE(HAVE_GETSPNAM) [SUDO_LIBS="${SUDO_LIBS} -lgen"; LIBS="${LIBS} -lgen"])])
+ fi
+ if test "$CHECKSHADOW" = "true"; then
+- AC_CHECK_FUNC(getprpwnam, [AC_DEFINE(HAVE_GETPRPWNAM) [CHECKSHADOW="false"; SECUREWARE=1], AC_CHECK_LIB(sec, getprpwnam, AC_DEFINE(HAVE_GETPRPWNAM) [CHECKSHADOW="false"; SECUREWARE=1; SUDO_LIBS="${SUDO_LIBS} -lsec"; LIBS="${LIBS} -lsec"], AC_CHECK_LIB(security, getprpwnam, AC_DEFINE(HAVE_GETPRPWNAM) [CHECKSHADOW="false"; SECUREWARE=1; SUDO_LIBS="${SUDO_LIBS} -lsecurity"; LIBS="${LIBS} -lsecurity"], AC_CHECK_LIB(prot, getprpwnam, AC_DEFINE(HAVE_GETPRPWNAM) [CHECKSHADOW="false"; SECUREWARE=1; SUDO_LIBS="${SUDO_LIBS} -lprot"; LIBS="${LIBS} -lprot"])))])
++ AC_CHECK_FUNC(getprpwnam, [AC_DEFINE(HAVE_GETPRPWNAM) CHECKSHADOW="false"; SECUREWARE=1], [AC_CHECK_LIB(sec, getprpwnam, [AC_DEFINE(HAVE_GETPRPWNAM) CHECKSHADOW="false"; SECUREWARE=1; SUDO_LIBS="${SUDO_LIBS} -lsec"; LIBS="${LIBS} -lsec"], [AC_CHECK_LIB(security, getprpwnam, [AC_DEFINE(HAVE_GETPRPWNAM) CHECKSHADOW="false"; SECUREWARE=1; SUDO_LIBS="${SUDO_LIBS} -lsecurity"; LIBS="${LIBS} -lsecurity"], [AC_CHECK_LIB(prot, getprpwnam, [AC_DEFINE(HAVE_GETPRPWNAM) CHECKSHADOW="false"; SECUREWARE=1; SUDO_LIBS="${SUDO_LIBS} -lprot"; LIBS="${LIBS} -lprot"])])])])
+ fi
+
+ dnl
@@ -1670,7 +1670,7 @@
SUDO_TYPE_INO_T
SUDO_FULL_VOID
diff --git a/packages/sudo/sudo_1.6.8p12.bb b/packages/sudo/sudo_1.6.8p12.bb
index a2e8f86314..f3fa0c6880 100644
--- a/packages/sudo/sudo_1.6.8p12.bb
+++ b/packages/sudo/sudo_1.6.8p12.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
file://nonrootinstall.patch;patch=1 \
diff --git a/packages/sysconf/sysconf_0.1.bb b/packages/sysconf/sysconf_0.1.bb
index e6bb3f29bb..608868f197 100644
--- a/packages/sysconf/sysconf_0.1.bb
+++ b/packages/sysconf/sysconf_0.1.bb
@@ -3,7 +3,7 @@ SECTION = "base"
PRIORITY = "optional"
LICENSE = "GPL"
RDEPENDS = "devio cpio findutils diffutils"
-PR = "r9"
+PR = "r10"
# Currently, the scripts only support ixp4xx machines.
# Feel free to add to the scripts ...
@@ -48,5 +48,3 @@ pkg_postrm() {
test -n "$D" && opt="-r $D"
update-rc.d $opt sysconfsetup remove
}
-
-CONFFILES = "${sysconfdir}/default/conffiles"
diff --git a/packages/tasks/task-maemo.bb b/packages/tasks/task-maemo.bb
new file mode 100644
index 0000000000..a4f16ac3a4
--- /dev/null
+++ b/packages/tasks/task-maemo.bb
@@ -0,0 +1,73 @@
+DESCRIPTION = "Task package for maemo environment"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+PR = "r0"
+
+PACKAGES = "\
+ maemo-task-base \
+ maemo-task-apps \
+ maemo-task-libs-install \
+ maemo-task-theme"
+
+RDEPENDS_maemo-base-depends = "\
+ diet-x11 \
+ virtual/xserver \
+ xpext \
+ xsp"
+
+RDEPENDS_maemo-task-libs-install = "\
+ libsqlite \
+ hildon-lgpl \
+ libhildonbase \
+ libhildonwidgets \
+ hildon-fm"
+
+RDEPENDS_maemo-task-base = "\
+ gdk-pixbuf-loader-png \
+ gdk-pixbuf-loader-xpm \
+ gdk-pixbuf-loader-jpeg \
+ pango-module-basic-x \
+ pango-module-basic-fc \
+ bluez-utils-dbus \
+ matchbox \
+ shared-mime-info \
+ rxvt-unicode \
+ xst \
+ xhost \
+ xrdb \
+ libgtkstylus \
+ outo \
+ hildon-initscripts \
+ libosso \
+ osso-af-utils \
+ osso-af-startup \
+ osso-core-config \
+ osso-gnome-vfs2 \
+ osso-thumbnail \
+ xauth \
+ esd"
+
+RDEPENDS_maemo-task-theme = "\
+ xcursor-transparent-theme \
+ sdk-default-theme \
+ sdk-default-theme-config \
+ sdk-default-icons \
+ sapwood \
+ ttf-bitstream-vera \
+ sapwood \
+ osso-sounds"
+
+RDEPENDS_maemo-task-apps = "\
+ osso-gwobex \
+ osso-gwconnect \
+ osso-bttools \
+ hildon-status-bar \
+ hildon-home \
+ hildon-navigator \
+ hildon-control-panel \
+ osso-application-installer \
+ osso-app-killer \
+ osso-screenshot-tool \
+ gpe-todo-hildon \
+ gpe-contacts-hildon \
+ gpe-mini-browser-hildon"
diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb
index 21f1b551f5..07457c52c7 100644
--- a/packages/tasks/task-slugos.bb
+++ b/packages/tasks/task-slugos.bb
@@ -6,7 +6,7 @@
DESCRIPTION = "Task packages for the SlugOS distribution"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r13"
+PR = "r14"
PACKAGE_ARCH = "${MACHINE_ARCH}"
ALLOW_EMPTY = "1"
@@ -28,7 +28,7 @@ SLUGOS_STANDARD_RRECOMMENDS = ""
# udev is the default way of handling devices, there is no guarantee
# that the static device table is completely correct (it is just
# known to be sufficient for boot.)
-SLUGOS_STANDARD_RRECOMMENDS += "diffutils cpio findutils udev"
+SLUGOS_STANDARD_RRECOMMENDS += "diffutils cpio findutils"
# These lines add support for formatting ext2 and ext3 file systems
# on a hard disk attached to the NSLU2. ext3 is the standard Linux
@@ -62,10 +62,6 @@ kernel-module-ext2 \
kernel-module-jbd \
kernel-module-ext3 \
kernel-module-vfat \
-kernel-module-isofs \
-kernel-module-udf \
-kernel-module-nfs \
-kernel-module-loop \
kernel-module-nls-cp437 \
kernel-module-nls-utf8 \
"
@@ -85,10 +81,8 @@ kernel-module-uhci-hcd \
"
# Add modules required for IDE support
-SLUGOS_STANDARD_RRECOMMENDS += "\
-kernel-module-libata \
-kernel-module-pata-artop \
-"
+# SLUGOS_STANDARD_RRECOMMENDS += "\
+# "
# Add modules required for Network support
SLUGOS_STANDARD_RRECOMMENDS += "\
@@ -98,28 +92,18 @@ kernel-module-ixp4xx-qmgr \
kernel-module-via-velocity \
"
-# Add modules required for Wifi support
-SLUGOS_STANDARD_RRECOMMENDS += "\
-madwifi-ng-modules madwifi-ng-tools wireless-tools \
-"
-
-## Other wireless tools that should be considered
-## should space be available in the rootfs
+# portmap \
+# kexec-tools \
+# kernel-module-nfs \
+# kernel-module-isofs \
+# kernel-module-udf \
+# kernel-module-loop \
+# kernel-module-libata \
+# kernel-module-pata-artop \
+# kernel-module-netconsole \
# wpa-supplicant \
# zd1211-firmware kernel-module-zd1211rw \
-
-# Add kexec tools for rebooting alternate kernels
-SLUGOS_STANDARD_RRECOMMENDS += "\
-kexec-tools \
-"
-
-# Add modules required for Network Console support
-# NOTE: This module is desirable for systems lacking a physical
-# console, but is usually only enabled if specific needs or issues
-# arise. If space in the flash is at a premium, it can be omitted.
-SLUGOS_STANDARD_RRECOMMENDS += "\
-kernel-module-netconsole \
-"
+# madwifi-ng-modules madwifi-ng-tools wireless-tools \
DISTRO_EXTRA_DEPENDS ?= ""
DEPENDS += "${DISTRO_EXTRA_DEPENDS}"
@@ -129,10 +113,9 @@ RDEPENDS += "\
kernel ixp4xx-npe \
base-files base-passwd netbase \
busybox initscripts-slugos slugos-init \
- update-modules sysvinit tinylogin \
+ update-modules sysvinit tinylogin udev \
module-init-tools modutils-initscripts \
ipkg-collateral ipkg ipkg-link \
- portmap \
beep \
e2fsprogs-blkid \
util-linux-mount \
@@ -143,6 +126,6 @@ RDEPENDS += "\
${DISTRO_EXTRA_RDEPENDS}"
RRECOMMENDS += "\
- dropbear \
+ openssh \
${SLUGOS_STANDARD_RRECOMMENDS} \
${DISTRO_EXTRA_RRECOMMENDS}"
diff --git a/packages/uclibc/uclibc-0.9.29/bfin/uClibc.config b/packages/uclibc/uclibc-0.9.29/bfin/uClibc.config
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.29/bfin/uClibc.config
diff --git a/packages/uclibc/uclibc-0.9.29/bfin/uClibc.distro b/packages/uclibc/uclibc-0.9.29/bfin/uClibc.distro
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.29/bfin/uClibc.distro
diff --git a/packages/uclibc/uclibc-0.9.29/bfin/uClibc.machine b/packages/uclibc/uclibc-0.9.29/bfin/uClibc.machine
index 5243119d2e..cef409289c 100644
--- a/packages/uclibc/uclibc-0.9.29/bfin/uClibc.machine
+++ b/packages/uclibc/uclibc-0.9.29/bfin/uClibc.machine
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Mon Jun 11 14:03:30 2007
+# Fri Aug 10 19:05:32 2007
#
# TARGET_alpha is not set
# TARGET_arm is not set
@@ -51,8 +51,126 @@ ARCH_HAS_NO_MMU=y
UCLIBC_HAS_FLOATS=y
UCLIBC_HAS_FPU=y
DO_C99_MATH=y
-KERNEL_HEADERS="/usr/include"
-UCLIBC_UCLINUX_BROKEN_MUNMAP=y
+KERNEL_HEADERS="/media/hda4/OE/build/tmp-new/angstrom/cross/bfin-angstrom-uclinux-uclibc/include"
+# UCLIBC_UCLINUX_BROKEN_MUNMAP is not set
EXCLUDE_BRK=y
HAVE_DOT_CONFIG=y
+#
+# General Library Settings
+#
+# HAVE_NO_PIC is not set
+# DOPIC is not set
+HAVE_NO_SHARED=y
+ARCH_HAS_NO_LDSO=y
+UCLIBC_CTOR_DTOR=y
+# HAS_NO_THREADS is not set
+# UCLIBC_HAS_THREADS is not set
+UCLIBC_HAS_LFS=y
+MALLOC=y
+# MALLOC_SIMPLE is not set
+# MALLOC_STANDARD is not set
+# MALLOC_GLIBC_COMPAT is not set
+UCLIBC_DYNAMIC_ATEXIT=y
+# COMPAT_ATEXIT is not set
+UCLIBC_SUSV3_LEGACY=y
+UCLIBC_SUSV3_LEGACY_MACROS=y
+# UCLIBC_HAS_SHADOW is not set
+# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
+UCLIBC_HAS___PROGNAME=y
+UNIX98PTY_ONLY=y
+ASSUME_DEVPTS=y
+UCLIBC_HAS_TM_EXTENSIONS=y
+# UCLIBC_HAS_TZ_CACHING is not set
+# UCLIBC_HAS_TZ_FILE is not set
+
+#
+# Networking Support
+#
+# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_RPC=y
+UCLIBC_HAS_FULL_RPC=y
+UCLIBC_HAS_REENTRANT_RPC=y
+# UCLIBC_USE_NETLINK is not set
+
+#
+# String and Stdio Support
+#
+UCLIBC_HAS_STRING_GENERIC_OPT=y
+UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_CTYPE_TABLES=y
+UCLIBC_HAS_CTYPE_SIGNED=y
+UCLIBC_HAS_CTYPE_UNSAFE=y
+# UCLIBC_HAS_CTYPE_CHECKED is not set
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+UCLIBC_HAS_WCHAR=y
+# UCLIBC_HAS_LOCALE is not set
+# UCLIBC_HAS_HEXADECIMAL_FLOATS is not set
+# UCLIBC_HAS_GLIBC_CUSTOM_PRINTF is not set
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+# UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+UCLIBC_HAS_STDIO_BUFSIZ_256=y
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
+UCLIBC_HAS_STDIO_GETC_MACRO=y
+UCLIBC_HAS_STDIO_PUTC_MACRO=y
+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+# UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE is not set
+# UCLIBC_HAS_GLIBC_CUSTOM_STREAMS is not set
+# UCLIBC_HAS_PRINTF_M_SPEC is not set
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_GNU_GETSUBOPT=y
+
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+UCLIBC_HAS_REGEX_OLD=y
+UCLIBC_HAS_FNMATCH=y
+UCLIBC_HAS_FNMATCH_OLD=y
+# UCLIBC_HAS_WORDEXP is not set
+# UCLIBC_HAS_FTW is not set
+UCLIBC_HAS_GLOB=y
+# UCLIBC_HAS_GNU_GLOB is not set
+
+#
+# Library Installation Options
+#
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="//usr"
+MULTILIB=""
+
+#
+# Security options
+#
+# UCLIBC_HAS_ARC4RANDOM is not set
+# HAVE_NO_SSP is not set
+# UCLIBC_HAS_SSP is not set
+# UCLIBC_BUILD_NOEXECSTACK is not set
+
+#
+# uClibc development/debugging options
+#
+CROSS_COMPILER_PREFIX="bfin-elf-"
+UCLIBC_EXTRA_CFLAGS=""
+# DODEBUG is not set
+# DOSTRIP is not set
+# DOASSERTS is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
+WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set
+# UCLIBC_MJN3_ONLY is not set
diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb
index 86fab657bd..8607c571b2 100644
--- a/packages/uclibc/uclibc_svn.bb
+++ b/packages/uclibc/uclibc_svn.bb
@@ -6,7 +6,7 @@
# UCLIBC_BASE can be set in a distro file, but whether this works depends
# on whether the base patches apply to the selected (SRCDATE) svn release.
#
-UCLIBC_BASE ?= "0.9.28"
+UCLIBC_BASE ?= "0.9.29"
PV = "${UCLIBC_BASE}+svn${SRCDATE}"
PR = "r5"
@@ -25,8 +25,13 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-cvs', '${FILE_DIRNA
#however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}"
-SRC_URI += "svn://uclibc.org/trunk;module=uClibc"
+SRC_URI += "svn://uclibc.org/trunk;module=uClibc \
+ file://uClibc.machine \
+ file://uClibc.distro \
+ file://error_print_progname.patch;patch=1 \
+ file://select.diff;patch=1 \
+ "
-SRC_URI += " file://error_print_progname.patch;patch=1"
S = "${WORKDIR}/uClibc"
+
diff --git a/packages/webkit/files/.mtn2git_empty b/packages/webkit/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/webkit/files/.mtn2git_empty
diff --git a/packages/webkit/webkit/Makefile b/packages/webkit/files/Makefile
index 89344f7a58..89344f7a58 100644
--- a/packages/webkit/webkit/Makefile
+++ b/packages/webkit/files/Makefile
diff --git a/packages/webkit/webkit/Makefile.shared b/packages/webkit/files/Makefile.shared
index a036aacc50..a036aacc50 100644
--- a/packages/webkit/webkit/Makefile.shared
+++ b/packages/webkit/files/Makefile.shared
diff --git a/packages/webkit/webkit/WebKit.pri b/packages/webkit/files/WebKit.pri
index 0375102a0c..0375102a0c 100644
--- a/packages/webkit/webkit/WebKit.pri
+++ b/packages/webkit/files/WebKit.pri
diff --git a/packages/webkit/webkit/WebKit.pro b/packages/webkit/files/WebKit.pro
index 335d11e6e7..335d11e6e7 100644
--- a/packages/webkit/webkit/WebKit.pro
+++ b/packages/webkit/files/WebKit.pro
diff --git a/packages/webkit/webkit_svn.bb b/packages/webkit/webkit-gtk_svn.bb
index 8a6480d54f..8a6480d54f 100644
--- a/packages/webkit/webkit_svn.bb
+++ b/packages/webkit/webkit-gtk_svn.bb
diff --git a/packages/xorg-app/xsetroot_1.0.1.bb b/packages/xorg-app/xsetroot_1.0.1.bb
new file mode 100644
index 0000000000..0f63feb79f
--- /dev/null
+++ b/packages/xorg-app/xsetroot_1.0.1.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "Sets the visual appearance of the X root window"
+LICENSE = "MIT"
+DEPENDS += "libxmu xbitmaps"
+PE = "1"
diff --git a/packages/xorg-data/xbitmaps_1.0.1.bb b/packages/xorg-data/xbitmaps_1.0.1.bb
new file mode 100644
index 0000000000..7d9dc18c84
--- /dev/null
+++ b/packages/xorg-data/xbitmaps_1.0.1.bb
@@ -0,0 +1,6 @@
+require xorg-data-common.inc
+
+DESCRIPTION = "Common X11 Bitmaps"
+LICENSE = "MIT"
+DEPENDS += "libxmu xbitmaps"
+
diff --git a/packages/xorg-data/xorg-data-common.inc b/packages/xorg-data/xorg-data-common.inc
index 9b236c852f..46b14d73af 100644
--- a/packages/xorg-data/xorg-data-common.inc
+++ b/packages/xorg-data/xorg-data-common.inc
@@ -1,15 +1,14 @@
-DESCRIPTION = "X data files"
HOMEPAGE = "http://www.x.org"
-SECTION = "x11/datas"
+SECTION = "x11/data"
LICENSE = "MIT-X"
-#DEPENDS = ""
XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/data/${XORG_PN}-${PV}.tar.bz2"
+
+SRC_URI = "${XORG_MIRROR}/individual/data/${XORG_PN}-${PV}.tar.bz2"
S = "${WORKDIR}/${XORG_PN}-${PV}"
inherit autotools pkgconfig
do_stage() {
- autotools_stage_all
+ autotools_stage_all
}
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate b/packages/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate
index 8e6a8b22cb..8e6a8b22cb 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults b/packages/xserver-kdrive-common/xserver-kdrive-common/60xXDefaults
index d3a284d8da..d3a284d8da 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/60xXDefaults
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager b/packages/xserver-kdrive-common/xserver-kdrive-common/90xXWindowManager
index b2b65a0993..b2b65a0993 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/90xXWindowManager
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults b/packages/xserver-kdrive-common/xserver-kdrive-common/Xdefaults
index f5b69dd516..f5b69dd516 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xdefaults
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit b/packages/xserver-kdrive-common/xserver-kdrive-common/Xinit
index f566ffe5be..f566ffe5be 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xinit
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
new file mode 100644
index 0000000000..709d501dfc
--- /dev/null
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
@@ -0,0 +1,114 @@
+#!/bin/sh
+#
+
+# note xinit needs full server path
+XSERVER=/usr/bin/Xipaq
+if [ -f /usr/bin/Xfbdev ]; then
+ XSERVER=/usr/bin/Xfbdev
+fi
+if [ -f /usr/bin/Xepson ]; then
+ XSERVER=/usr/bin/Xepson
+fi
+if [ -f /usr/bin/Xorg ]; then
+ XSERVER=/usr/bin/Xorg
+fi
+if [ -f /usr/bin/Xomap ]; then
+ XSERVER=/usr/bin/Xomap
+fi
+if [ -f /usr/bin/Xw100 ]; then
+ XSERVER=Xw100
+fi
+if [ -f /usr/bin/Ximageon ]; then
+ XSERVER=Ximageon
+fi
+
+. /etc/profile
+
+
+
+fallback_screen_arg() {
+ geom=`fbset | grep geometry`
+ w=`echo $geom | awk '{ print $2 }'`
+ h=`echo $geom | awk '{ print $3 }'`
+ b=`echo $geom | awk '{ print $6 }'`
+ echo -n "${w}x${h}x${b}"
+}
+
+module_id() {
+ ## used to read from assets, but sometimes assets is corrupted
+ # grep "Module ID" /proc/hal/assets | sed "s/.*://"
+ ## used to read from /proc/hal/model, but that is removed in 2.6
+ # echo ' iPAQ' `cat /proc/hal/model`
+ awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
+}
+
+export USER=root
+
+ARGS=" -br -pn"
+
+# use ucb 1x00 touchscreen if present
+if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
+ ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
+fi
+
+# use usb mouse if present
+# Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically
+if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then
+ ARGS="$ARGS -mouse /dev/input/mice"
+fi
+
+# start off server in conventional location.
+case `module_id` in
+ "HP iPAQ H3100" | "HP iPAQ H3800")
+ ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@90" ;;
+ "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900")
+ ARGS="$ARGS -dpi 100 -rgba vbgr -screen 320x240@270" ;;
+ "HP iPAQ H5400" | "HP iPAQ H2200")
+ ARGS="$ARGS -dpi 100 -rgba rgb" ;;
+ "HP iPAQ HX4700")
+ ARGS="$ARGS -dpi 200" ;;
+ "Ramses")
+ # What is this "vt2" in aid of?
+ ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@90 vt2" ;;
+ # both 'Sharp-Collie' and just 'Collie' have been reported
+ *Poodle)
+ ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270" ;;
+ *Collie)
+ ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270"
+ ;;
+ "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
+ ARGS="$ARGS -dpi 200 -rgba rgb" ;;
+ "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
+ ARGS="$ARGS -dpi 200 -rgba rgb -screen 480x640@270" ;;
+ "Simpad")
+ ARGS="$ARGS -dpi 100 -rgba rgb" ;;
+ "Generic OMAP1510/1610/1710")
+ ARGS="$ARGS -dpi 220 -mouse /dev/input/event0" ;;
+ "Cellon C8000 Board")
+ ARGS="$ARGS -dpi 100 -screen 240x320,10,1" ;;
+ "HTC Magician")
+ ARGS="$ARGS -dpi 142" ;;
+ "HTC Universal")
+ ARGS="$ARGS -dpi 225 -screen 480x640@270" ;;
+ "ARM-IntegratorCP" | "ARM-Versatile PB")
+ ARGS="$ARGS -rgba vrgb" ;;
+ "Compulab CM-x270")
+ modprobe mbxfb
+ ARGS="$ARGS -fb /dev/fb1"
+ ;;
+ "GTA01")
+ ARGS="$ARGS -dpi 285 -screen 480x640" ;;
+ "Nokia N800")
+ ARGS="$ARGS -dpi 225 -screen 800x480x16 -mouse tslib" ;;
+ *)
+ # Its a device we dont know about - in which case force
+ # kdrive to use the current framebuffer geometry otherwise
+ # it will defualt to trying to achieve 1024x768
+ S=`fallback_screen_arg`
+ ARGS="$ARGS -screen $S"
+ ;;
+esac
+
+DISPLAY=':0'
+
+exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession b/packages/xserver-kdrive-common/xserver-kdrive-common/Xsession
index a438e13050..a438e13050 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xsession
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
deleted file mode 100644
index e59460f3b0..0000000000
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/sh
-#
-
-# note xinit needs full server path
-XSERVER=/usr/bin/Xipaq
-if [ -f /usr/bin/Xfbdev ]; then
- XSERVER=/usr/bin/Xfbdev
-fi
-if [ -f /usr/bin/Xepson ]; then
- XSERVER=/usr/bin/Xepson
-fi
-if [ -f /usr/bin/Xorg ]; then
- XSERVER=/usr/bin/Xorg
-fi
-if [ -f /usr/bin/Xomap ]; then
- XSERVER=/usr/bin/Xomap
-fi
-if [ -f /usr/bin/Xw100 ]; then
- XSERVER=Xw100
-fi
-if [ -f /usr/bin/Ximageon ]; then
- XSERVER=Ximageon
-fi
-
-. /etc/profile
-
-
-
-fallback_screen_arg() {
- geom=`fbset | grep geometry`
- w=`echo $geom | awk '{ print $2 }'`
- h=`echo $geom | awk '{ print $3 }'`
- b=`echo $geom | awk '{ print $6 }'`
- echo -n "${w}x${h}x${b}"
-}
-
-module_id() {
- ## used to read from assets, but sometimes assets is corrupted
- # grep "Module ID" /proc/hal/assets | sed "s/.*://"
- ## used to read from /proc/hal/model, but that is removed in 2.6
- # echo ' iPAQ' `cat /proc/hal/model`
- awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
-}
-
-export USER=root
-
-ARGS=" -br -pn"
-
-# use ucb 1x00 touchscreen if present
-if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
- ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
-fi
-
-# use usb mouse if present
-# Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically
-if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then
- ARGS="$ARGS -mouse /dev/input/mice"
-fi
-
-# start off server in conventional location.
-case `module_id` in
- "HP iPAQ H3100" | "HP iPAQ H3800")
- ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@90" ;;
- "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900")
- ARGS="$ARGS -dpi 100 -rgba vbgr -screen 320x240@270" ;;
- "HP iPAQ H5400" | "HP iPAQ H2200")
- ARGS="$ARGS -dpi 100 -rgba rgb" ;;
- "HP iPAQ HX4700")
- ARGS="$ARGS -dpi 200" ;;
- "Ramses")
- # What is this "vt2" in aid of?
- ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@90 vt2" ;;
- # both 'Sharp-Collie' and just 'Collie' have been reported
- *Poodle)
- ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270" ;;
- *Collie)
- ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270"
- ;;
- "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
- ARGS="$ARGS -dpi 200 -rgba rgb" ;;
- "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
- ARGS="$ARGS -dpi 200 -rgba rgb -screen 480x640@270" ;;
- "Simpad")
- ARGS="$ARGS -dpi 100 -rgba rgb" ;;
- "Generic OMAP1510/1610/1710")
- ARGS="$ARGS -dpi 220 -mouse /dev/input/event0" ;;
- "Cellon C8000 Board")
- ARGS="$ARGS -dpi 100 -screen 240x320,10,1" ;;
- "HTC Universal")
- ARGS="$ARGS -dpi 225 -screen 480x640@270" ;;
- "ARM-IntegratorCP" | "ARM-Versatile PB")
- ARGS="$ARGS -rgba vrgb" ;;
- "Compulab CM-x270")
- modprobe mbxfb
- ARGS="$ARGS -fb /dev/fb1"
- ;;
- "GTA01")
- ARGS="$ARGS -dpi 285 -screen 480x640" ;;
- "Nokia N800")
- ARGS="$ARGS -dpi 225 -screen 800x480x16 -mouse tslib" ;;
- *)
- # Its a device we dont know about - in which case force
- # kdrive to use the current framebuffer geometry otherwise
- # it will defualt to trying to achieve 1024x768
- S=`fallback_screen_arg`
- ARGS="$ARGS -screen $S"
- ;;
-esac
-
-DISPLAY=':0'
-
-exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/.mtn2git_empty b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/.mtn2git_empty
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
new file mode 100644
index 0000000000..dddced4b6f
--- /dev/null
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
@@ -0,0 +1,114 @@
+#!/bin/sh
+#
+
+# note xinit needs full server path
+XSERVER=/usr/bin/Xipaq
+if [ -f /usr/bin/Xfbdev ]; then
+ XSERVER=/usr/bin/Xfbdev
+fi
+if [ -f /usr/bin/Xepson ]; then
+ XSERVER=/usr/bin/Xepson
+fi
+if [ -f /usr/bin/Xorg ]; then
+ XSERVER=/usr/bin/Xorg
+fi
+if [ -f /usr/bin/Xomap ]; then
+ XSERVER=/usr/bin/Xomap
+fi
+if [ -f /usr/bin/Xw100 ]; then
+ XSERVER=Xw100
+fi
+if [ -f /usr/bin/Ximageon ]; then
+ XSERVER=Ximageon
+fi
+
+. /etc/profile
+
+
+
+fallback_screen_arg() {
+ geom=`fbset | grep geometry`
+ w=`echo $geom | awk '{ print $2 }'`
+ h=`echo $geom | awk '{ print $3 }'`
+ b=`echo $geom | awk '{ print $6 }'`
+ echo -n "${w}x${h}x${b}"
+}
+
+module_id() {
+ ## used to read from assets, but sometimes assets is corrupted
+ # grep "Module ID" /proc/hal/assets | sed "s/.*://"
+ ## used to read from /proc/hal/model, but that is removed in 2.6
+ # echo ' iPAQ' `cat /proc/hal/model`
+ awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
+}
+
+export USER=root
+
+ARGS=" -pn"
+
+# use ucb 1x00 touchscreen if present
+if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
+ ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
+fi
+
+# use usb mouse if present
+# Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically
+if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then
+ ARGS="$ARGS -mouse /dev/input/mice"
+fi
+
+# start off server in conventional location.
+case `module_id` in
+ "HP iPAQ H3100" | "HP iPAQ H3800")
+ ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@90" ;;
+ "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900")
+ ARGS="$ARGS -br -dpi 100 -rgba vbgr -screen 320x240@270" ;;
+ "HP iPAQ H5400" | "HP iPAQ H2200")
+ ARGS="$ARGS -br -dpi 100 -rgba rgb" ;;
+ "HP iPAQ HX4700")
+ ARGS="$ARGS -br -dpi 200" ;;
+ "Ramses")
+ # What is this "vt2" in aid of?
+ ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@90 vt2" ;;
+ # both 'Sharp-Collie' and just 'Collie' have been reported
+ *Poodle)
+ ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270" ;;
+ *Collie)
+ ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270"
+ ;;
+ "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
+ ARGS="$ARGS -br -dpi 200 -rgba rgb" ;;
+ "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
+ ARGS="$ARGS -br -dpi 200 -rgba rgb -screen 480x640@270" ;;
+ "Simpad")
+ ARGS="$ARGS -br -dpi 100 -rgba rgb" ;;
+ "Generic OMAP1510/1610/1710")
+ ARGS="$ARGS -br -dpi 220 -mouse /dev/input/event0" ;;
+ "Cellon C8000 Board")
+ ARGS="$ARGS -br -dpi 100 -screen 240x320,10,1" ;;
+ "HTC Magician")
+ ARGS="$ARGS -br -dpi 142" ;;
+ "HTC Universal")
+ ARGS="$ARGS -br -dpi 225 -screen 480x640@270" ;;
+ "ARM-IntegratorCP" | "ARM-Versatile PB")
+ ARGS="$ARGS -br -rgba vrgb" ;;
+ "Compulab CM-x270")
+ modprobe mbxfb
+ ARGS="$ARGS -br -fb /dev/fb1"
+ ;;
+ "GTA01" | "GTA02")
+ ARGS="$ARGS -dpi 285 -screen 480x640 -hide-cursor -root-ppm /usr/share/pixmaps/xsplash.ppm" ;;
+ "Nokia N800")
+ ARGS="$ARGS -br -dpi 225 -screen 800x480x16 -mouse tslib" ;;
+ *)
+ # Its a device we dont know about - in which case force
+ # kdrive to use the current framebuffer geometry otherwise
+ # it will defualt to trying to achieve 1024x768
+ S=`fallback_screen_arg`
+ ARGS="$ARGS -screen $S"
+ ;;
+esac
+
+DISPLAY=':0'
+
+exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index 9d9b577766..cb3cf4578f 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -2,17 +2,41 @@ DESCRIPTION = "Common X11 scripts"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r14"
+PR = "r17"
-SRC_URI = "file://etc"
-S = ${WORKDIR}
+SRC_URI = "\
+ file://Xdefaults \
+ file://Xinit \
+ file://Xserver \
+ file://Xsession \
+ \
+ file://30xTs_Calibrate \
+ file://60xXDefaults \
+ file://90xXWindowManager \
+ "
+
+etcFiles = "\
+ Xdefaults \
+ Xinit \
+ Xserver \
+ Xsession \
+ "
+sessionFiles = "\
+ 30xTs_Calibrate \
+ 60xXDefaults \
+ 90xXWindowManager \
+ "
+
+S = "${WORKDIR}"
PACKAGE_ARCH = "all"
do_install() {
- cp -R ${S}/etc ${D}/etc
- rm -fR ${D}/etc/.svn
- rm -fR ${D}/etc/*/.svn
- rm -fR ${D}/etc/*/*/.svn
- chmod -R 755 ${D}/etc
+ install -d ${D}/${sysconfdir}/X11/Xsession.d
+ for i in ${etcFiles}; do
+ install -m 0755 ${WORKDIR}/$i ${D}/${sysconfdir}/X11/
+ done
+ for i in ${sessionFiles}; do
+ install -m 0755 ${WORKDIR}/$i ${D}/${sysconfdir}/X11/Xsession.d/
+ done
}