merge of '3e1adbc3c19ac71287b5a3e6200f3fe6bde5c106'

     and 'd9037235184b56c405c27cb611e52d27e7879173'

5 files changed, 84 insertions, 0 deletions

diff --git a/conf/machine/titan.conf b/conf/machine/titan.conf
new file mode 100644
index 0000000000..99f8b2a18b
--- /dev/null
+++ b/conf/machine/titan.conf
@@ -0,0 +1,33 @@
+#@TYPE: Machine
+#@NAME: Nimble NP51R / Linkgear SERIES 100
+#@DESCRIPTION: Machine configuration for the SH4 based Nimble NP51R / Linkgear Series 100
+
+TARGET_ARCH = "sh4"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-titan-sh4"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+
+# SH4 specific settings
+require conf/machine/include/tune-sh4.conf
+
+# Serial console settings for sysvinit
+SERIAL_CONSOLE = "38400 ttySC1"
+
+# There's no screen on the titan boards
+USE_VT = "0"
+
+# We are using UDEV, there is no devfs in 2.6 kernels
+USE_DEVFS = "0"
+
+# The NP51R has 64MB flash, 2nd partition (/) is 63984k in size.
+# The LinkGear Series 100 has 128MB of flash (not tested)
+IMAGE_FSTYPE ?= "ext2.gz"
+IMAGE_ROOTFS_SIZE_ext2 ?= "63984"
+
+# Extra items to include in the fs image
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel pciutils udev kernel-modules lilo-sh"
+
+# Add the SCI (serial) and SM (flash) devices to the minimal /dev
+IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
+                       files/device_table_add-sci.txt \
+                       files/device_table_add-sm.txt"
diff --git a/conf/machine/wrap.conf b/conf/machine/wrap.conf
new file mode 100644
index 0000000000..1073259e7a
--- /dev/null
+++ b/conf/machine/wrap.conf
@@ -0,0 +1,32 @@
+#@TYPE: Machine
+#@NAME: WRAP1 / WRAP2 wireless router boards
+#@DESCRIPTION: Machine configuration for the PC Engines WRAP (Wireless Router Application Platform) boards.
+
+TARGET_ARCH = "i486"
+IPKG_EXTRA_ARCHS = "i386"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-wrap-geode"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+
+# Serial console settings for sysvinit
+SERIAL_CONSOLE = "38400 ttyS0"
+
+# There's no screen on the titan boards
+USE_VT = "0"
+
+# We are using UDEV, there is no devfs in 2.6 kernels
+USE_DEVFS = "0"
+
+# Create a tar.gz by default which needs to be uncompress onto a
+# partition on the compact flash card being used.
+IMAGE_FSTYPE ?= "tar.gz"
+
+# Extra items to include in the fs image
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel pciutils udev kernel-modules grub"
+
+# Minimal device table is fine
+IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt"
+
+# glibc
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
diff --git a/packages/sl/.mtn2git_empty b/packages/sl/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sl/.mtn2git_empty
diff --git a/packages/sl/sl_3.03.bb b/packages/sl/sl_3.03.bb
new file mode 100644
index 0000000000..883a48f67e
--- /dev/null
+++ b/packages/sl/sl_3.03.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Corrects you if you type `sl' by mistake"
+SECTION = "console/games"
+LICENSE = "unknown"
+DEPENDS = "ncurses"
+
+SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/universe/s/sl/sl_3.03.orig.tar.gz \
+           http://archive.ubuntu.com/ubuntu/pool/universe/s/sl/sl_3.03-14.diff.gz;patch=1"
+
+S = "${WORKDIR}/${P}.orig"
+
+LDFLAGS += "-lcurses"
+
+do_install() {
+        install -d ${D}${bindir}
+        install -m 755 sl ${D}${bindir}
+}
+
+
diff --git a/packages/xchat/xchat_2.6.0.bb b/packages/xchat/xchat_2.6.0.bb
index 161593c972..42807413a4 100644
--- a/packages/xchat/xchat_2.6.0.bb
+++ b/packages/xchat/xchat_2.6.0.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Full-featured IRC chat client with scripting support"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.xchat.org"
+SECTION = "x11/network"
 MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 DEPENDS = "libgcrypt zlib gtk+"
 PR = "r1"