summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/machine/tosa.conf21
-rw-r--r--packages/ice/files/autofoo.patch0
-rw-r--r--packages/ice/ice_6.3.3.bb16
-rw-r--r--packages/ice/ice_cvs.bb17
-rw-r--r--packages/ipkg/files/uclibc.patch0
-rw-r--r--packages/ipkg/ipkg_0.99.129.bb53
-rw-r--r--packages/ipkg/ipkg_0.99.130.bb53
-rw-r--r--packages/ipkg/ipkg_0.99.135.bb5
-rw-r--r--packages/libsm/files/autofoo.patch0
-rw-r--r--packages/libsm/libsm_6.0.3.bb16
-rw-r--r--packages/libsm/libsm_cvs.bb17
-rw-r--r--packages/libxcursor/files/autofoo.patch0
-rw-r--r--packages/libxcursor/libxcursor-1.1.2/autofoo.patch0
-rw-r--r--packages/libxcursor/libxcursor_1.1.2.bb21
-rw-r--r--packages/libxcursor/libxcursor_cvs.bb22
-rw-r--r--packages/libxfixes/files/autofoo.patch0
-rw-r--r--packages/libxfixes/libxfixes_2.0.1.bb18
-rw-r--r--packages/libxft/files/autofoo.patch0
-rw-r--r--packages/libxft/libxft_2.1.6.bb31
-rw-r--r--packages/libxss/files/autofoo.patch0
-rw-r--r--packages/libxss/libxss_cvs.bb24
-rw-r--r--packages/linux-uml/linux-uml_2.6.11-rc1-mm1.bb55
-rw-r--r--packages/lockstat/lockstat_1.4.10.bb26
-rw-r--r--packages/opie-tinykate/opie-tinykate_1.1.8.bb48
-rw-r--r--packages/opie-tinykate/opie-tinykate_cvs.bb1
-rw-r--r--packages/pcmcia-cs/pcmcia-cs_3.2.8.bb4
-rw-r--r--packages/rosetta/rosetta_cvs.bb5
-rw-r--r--packages/shfs/shfs-utils_0.35.bb25
-rw-r--r--packages/wireless-tools/wireless-tools/fixheaders.patch0
-rw-r--r--packages/wireless-tools/wireless-tools_27.bb44
-rw-r--r--packages/wlan-ng/wlan-ng-modules_0.2.1pre23.bb78
-rw-r--r--packages/xcomposite/xcomposite-1.0.1/autofoo.patch0
-rw-r--r--packages/xcomposite/xcomposite_1.0.1.bb18
-rw-r--r--packages/xdamage/xdamage-1.0.1/autofoo.patch0
-rw-r--r--packages/xdamage/xdamage_1.0.1.bb19
-rw-r--r--packages/xpm/files/autofoo.patch0
-rw-r--r--packages/xpm/xpm_3.5.1.bb18
-rw-r--r--packages/xpm/xpm_cvs.bb19
-rw-r--r--packages/xt/files/autofoo.patch0
-rw-r--r--packages/xt/xt_0.1.5.bb4
-rw-r--r--packages/xt/xt_cvs.bb4
-rw-r--r--packages/xtst/files/autofoo.patch0
-rw-r--r--packages/xtst/xtst_cvs.bb5
43 files changed, 671 insertions, 16 deletions
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index e92e026f20..be495925c1 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -6,13 +6,22 @@ TARGET_ARCH = "arm"
IPKG_ARCHS = "all arm ${MACHINE}"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
-BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support usbutils"
-BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils kernel-module-acm kernel-module-evdev kernel-module-net-fd \
-kernel-module-pxa-bi kernel-module-registers kernel-module-storage-fd kernel-module-usb-ohci-tc6393 kernel-module-usb-storage \
-kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support kernel-module-pxa-bi modutils kernel-module-ip-gre \
-kernel-module-irnet kernel-module-ipip kernel-module-usbcore kernel-module-usbdcore kernel-module-usbdmonitor"
+BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules virtual/kernel hostap-modules \
+ orinoco-modules sharp-sdmmc-support usbutils"
+BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils kernel-module-acm \
+ kernel-module-evdev kernel-module-net-fd \
+ kernel-module-pxa-bi kernel-module-registers \
+ kernel-module-storage-fd kernel-module-usb-ohci-tc6393 \
+ kernel-module-usb-storage \
+ kernel hostap-modules-cs orinoco-modules-cs \
+ sharp-sdmmc-support kernel-module-pxa-bi \
+ kernel-module-ip-gre \
+ kernel-module-irnet kernel-module-ipip kernel-module-usbcore \
+ kernel-module-usbdcore kernel-module-usbdmonitor"
-RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd kernel-module-usbmouse kernel-module-hid usbutils kernel-module-evdev"
+RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd \
+ kernel-module-usbmouse kernel-module-hid usbutils \
+ kernel-module-evdev"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime"
diff --git a/packages/ice/files/autofoo.patch b/packages/ice/files/autofoo.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ice/files/autofoo.patch
diff --git a/packages/ice/ice_6.3.3.bb b/packages/ice/ice_6.3.3.bb
index e69de29bb2..a46794ab77 100644
--- a/packages/ice/ice_6.3.3.bb
+++ b/packages/ice/ice_6.3.3.bb
@@ -0,0 +1,16 @@
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "x11"
+DESCRIPTION = "X11 ICE library"
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libICE-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libICE-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+}
diff --git a/packages/ice/ice_cvs.bb b/packages/ice/ice_cvs.bb
index e69de29bb2..3392f7d0dc 100644
--- a/packages/ice/ice_cvs.bb
+++ b/packages/ice/ice_cvs.bb
@@ -0,0 +1,17 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "x11"
+DESCRIPTION = "X11 ICE library"
+PR = "r1"
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=ICE \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/ICE"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+}
diff --git a/packages/ipkg/files/uclibc.patch b/packages/ipkg/files/uclibc.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ipkg/files/uclibc.patch
diff --git a/packages/ipkg/ipkg_0.99.129.bb b/packages/ipkg/ipkg_0.99.129.bb
index e69de29bb2..4bb025c487 100644
--- a/packages/ipkg/ipkg_0.99.129.bb
+++ b/packages/ipkg/ipkg_0.99.129.bb
@@ -0,0 +1,53 @@
+SECTION = "base"
+DESCRIPTION = "Itsy Package Manager"
+DESCRIPTION_libipkg = "Itsy Package Manager Library"
+LICENSE = "GPL"
+PROVIDES = "virtual/ipkg libipkg"
+PR = "r5"
+
+PACKAGES =+ "libipkg-dev libipkg"
+FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
+FILES_libipkg = "${libdir}"
+AUTO_LIBNAME_PKGS = "libipkg"
+
+SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+ file://buffer-overflow.patch;patch=1 \
+ file://uninclude-replace.patch;patch=1 \
+ file://uclibc.patch;patch=1"
+S = "${WORKDIR}/ipkg/C"
+
+inherit autotools pkgconfig
+
+pkg_postinst_ipkg () {
+#!/bin/sh
+if [ "x$D" != "x" ]; then
+ install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
+ # this happens at S98 where our good 'ole packages script used to run
+ echo -e "#!/bin/sh
+ipkg-cl configure
+" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+ chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+fi
+
+update-alternatives --install /usr/bin/ipkg ipkg /usr/bin/ipkg-cl 100
+}
+
+pkg_postrm_ipkg () {
+#!/bin/sh
+update-alternatives --remove ipkg /usr/bin/ipkg-cl
+}
+
+do_stage() {
+ oe_libinstall -so libipkg ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}/replace/
+ install -m 0644 replace/replace.h ${STAGING_INCDIR}/replace/
+ install -d ${STAGING_INCDIR}/libipkg/
+ for f in *.h
+ do
+ install -m 0644 $f ${STAGING_INCDIR}/libipkg/
+ done
+}
+
+#
+# FIXME: Install /etc/ipkg.conf and /etc/ipkg/arch.conf
+#
diff --git a/packages/ipkg/ipkg_0.99.130.bb b/packages/ipkg/ipkg_0.99.130.bb
index e69de29bb2..a270c48fa6 100644
--- a/packages/ipkg/ipkg_0.99.130.bb
+++ b/packages/ipkg/ipkg_0.99.130.bb
@@ -0,0 +1,53 @@
+SECTION = "base"
+DESCRIPTION = "Itsy Package Manager"
+DESCRIPTION_libipkg = "Itsy Package Manager Library"
+LICENSE = "GPL"
+PROVIDES = "virtual/ipkg libipkg"
+PR = "r2"
+
+PACKAGES =+ "libipkg-dev libipkg"
+FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
+FILES_libipkg = "${libdir}"
+AUTO_LIBNAME_PKGS = "libipkg"
+
+SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+ file://uninclude-replace.patch;patch=1 \
+ file://terse.patch;patch=1 \
+ file://uclibc.patch;patch=1"
+S = "${WORKDIR}/ipkg/C"
+
+inherit autotools pkgconfig
+
+pkg_postinst_ipkg () {
+#!/bin/sh
+if [ "x$D" != "x" ]; then
+ install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
+ # this happens at S98 where our good 'ole packages script used to run
+ echo -e "#!/bin/sh
+ipkg-cl configure
+" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+ chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+fi
+
+update-alternatives --install /usr/bin/ipkg ipkg /usr/bin/ipkg-cl 100
+}
+
+pkg_postrm_ipkg () {
+#!/bin/sh
+update-alternatives --remove ipkg /usr/bin/ipkg-cl
+}
+
+do_stage() {
+ oe_libinstall -so libipkg ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}/replace/
+ install -m 0644 replace/replace.h ${STAGING_INCDIR}/replace/
+ install -d ${STAGING_INCDIR}/libipkg/
+ for f in *.h
+ do
+ install -m 0644 $f ${STAGING_INCDIR}/libipkg/
+ done
+}
+
+#
+# FIXME: Install /etc/ipkg.conf and /etc/ipkg/arch.conf
+#
diff --git a/packages/ipkg/ipkg_0.99.135.bb b/packages/ipkg/ipkg_0.99.135.bb
index 7b682aad8c..4e948a7a42 100644
--- a/packages/ipkg/ipkg_0.99.135.bb
+++ b/packages/ipkg/ipkg_0.99.135.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Itsy Package Manager"
DESCRIPTION_libipkg = "Itsy Package Manager Library"
LICENSE = "GPL"
PROVIDES = "virtual/ipkg libipkg"
-PR = "r1"
+PR = "r2"
PACKAGES =+ "libipkg-dev libipkg"
FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
@@ -14,7 +14,8 @@ SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVa
file://depends.patch;patch=1 \
file://uninclude-replace.patch;patch=1 \
file://terse.patch;patch=1 \
- file://remove-c99isms.patch;patch=1"
+ file://remove-c99isms.patch;patch=1 \
+ file://uclibc.patch;patch=1"
S = "${WORKDIR}/ipkg/C"
diff --git a/packages/libsm/files/autofoo.patch b/packages/libsm/files/autofoo.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libsm/files/autofoo.patch
diff --git a/packages/libsm/libsm_6.0.3.bb b/packages/libsm/libsm_6.0.3.bb
index e69de29bb2..b7910ff66e 100644
--- a/packages/libsm/libsm_6.0.3.bb
+++ b/packages/libsm/libsm_6.0.3.bb
@@ -0,0 +1,16 @@
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "x11 ice"
+DESCRIPTION = "Session management library"
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libSM-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libSM-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+}
diff --git a/packages/libsm/libsm_cvs.bb b/packages/libsm/libsm_cvs.bb
index e69de29bb2..9fb72b865d 100644
--- a/packages/libsm/libsm_cvs.bb
+++ b/packages/libsm/libsm_cvs.bb
@@ -0,0 +1,17 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "x11 ice"
+DESCRIPTION = "Session management library"
+PR = "r1"
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=SM \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/SM"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+}
diff --git a/packages/libxcursor/files/autofoo.patch b/packages/libxcursor/files/autofoo.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxcursor/files/autofoo.patch
diff --git a/packages/libxcursor/libxcursor-1.1.2/autofoo.patch b/packages/libxcursor/libxcursor-1.1.2/autofoo.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxcursor/libxcursor-1.1.2/autofoo.patch
diff --git a/packages/libxcursor/libxcursor_1.1.2.bb b/packages/libxcursor/libxcursor_1.1.2.bb
index e69de29bb2..b4f0400b11 100644
--- a/packages/libxcursor/libxcursor_1.1.2.bb
+++ b/packages/libxcursor/libxcursor_1.1.2.bb
@@ -0,0 +1,21 @@
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DESCRIPTION = "X Cursor library"
+DEPENDS = "libxfixes"
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libXcursor-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXcursor-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ oe_runmake install prefix=${STAGING_DIR} \
+ bindir=${STAGING_BINDIR} \
+ includedir=${STAGING_INCDIR} \
+ libdir=${STAGING_LIBDIR} \
+ datadir=${STAGING_DATADIR} \
+ mandir=${STAGING_DIR}/man
+}
diff --git a/packages/libxcursor/libxcursor_cvs.bb b/packages/libxcursor/libxcursor_cvs.bb
index e69de29bb2..668395d07a 100644
--- a/packages/libxcursor/libxcursor_cvs.bb
+++ b/packages/libxcursor/libxcursor_cvs.bb
@@ -0,0 +1,22 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DESCRIPTION = "X Cursor library"
+DEPENDS = "libxfixes"
+PR = "r1"
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xcursor \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/Xcursor"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ oe_runmake install prefix=${STAGING_DIR} \
+ bindir=${STAGING_BINDIR} \
+ includedir=${STAGING_INCDIR} \
+ libdir=${STAGING_LIBDIR} \
+ datadir=${STAGING_DATADIR} \
+ mandir=${STAGING_DIR}/man
+}
diff --git a/packages/libxfixes/files/autofoo.patch b/packages/libxfixes/files/autofoo.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxfixes/files/autofoo.patch
diff --git a/packages/libxfixes/libxfixes_2.0.1.bb b/packages/libxfixes/libxfixes_2.0.1.bb
index e69de29bb2..8e983e7953 100644
--- a/packages/libxfixes/libxfixes_2.0.1.bb
+++ b/packages/libxfixes/libxfixes_2.0.1.bb
@@ -0,0 +1,18 @@
+SECTION = "x11/libs"
+DEPENDS = "x11 fixesext"
+DESCRIPTION = "X Fixes extension library."
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libXfixes-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXfixes-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ oe_runmake install prefix=${STAGING_DIR} \
+ bindir=${STAGING_BINDIR} \
+ includedir=${STAGING_INCDIR} \
+ libdir=${STAGING_LIBDIR} \
+ datadir=${STAGING_DATADIR}
+}
diff --git a/packages/libxft/files/autofoo.patch b/packages/libxft/files/autofoo.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxft/files/autofoo.patch
diff --git a/packages/libxft/libxft_2.1.6.bb b/packages/libxft/libxft_2.1.6.bb
index e69de29bb2..070d82f13b 100644
--- a/packages/libxft/libxft_2.1.6.bb
+++ b/packages/libxft/libxft_2.1.6.bb
@@ -0,0 +1,31 @@
+SECTION = "x11/libs"
+DEPENDS = "x11 xproto libxrender freetype fontconfig"
+DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
+PROVIDES = "xft"
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libXft-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXft-${PV}"
+
+FILES_${PN} = ${libdir}/lib*.so.*
+FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
+ ${libdir}/*.a ${libdir}/pkgconfig \
+ ${datadir}/aclocal ${bindir} ${sbindir}
+
+inherit autotools pkgconfig
+
+do_stage() {
+ oe_runmake install prefix=${STAGING_DIR} \
+ bindir=${STAGING_BINDIR} \
+ includedir=${STAGING_INCDIR} \
+ libdir=${STAGING_LIBDIR} \
+ datadir=${STAGING_DATADIR} \
+ mandir=${STAGING_DATADIR}/man
+}
+
+python do_package() {
+ if bb.data.getVar('DEBIAN_NAMES', d, 1):
+ bb.data.setVar('PKG_${PN}', 'libxft2', d)
+ bb.build.exec_func('package_do_package', d)
+}
diff --git a/packages/libxss/files/autofoo.patch b/packages/libxss/files/autofoo.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxss/files/autofoo.patch
diff --git a/packages/libxss/libxss_cvs.bb b/packages/libxss/libxss_cvs.bb
index e69de29bb2..d9238c4a1f 100644
--- a/packages/libxss/libxss_cvs.bb
+++ b/packages/libxss/libxss_cvs.bb
@@ -0,0 +1,24 @@
+LICENSE = GPL
+
+PV = "0.0cvs${CVSDATE}"
+PR = "r1"
+
+SECTION = "libs"
+DEPENDS = "x11 xext"
+DESCRIPTION = "X screen saver extension library."
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xss \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/Xss"
+
+inherit autotools pkgconfig
+
+#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
+
+do_stage() {
+ oe_runmake install prefix=${STAGING_DIR} \
+ bindir=${STAGING_BINDIR} \
+ includedir=${STAGING_INCDIR} \
+ libdir=${STAGING_LIBDIR} \
+ datadir=${STAGING_DATADIR}
+}
diff --git a/packages/linux-uml/linux-uml_2.6.11-rc1-mm1.bb b/packages/linux-uml/linux-uml_2.6.11-rc1-mm1.bb
index e69de29bb2..332dda499f 100644
--- a/packages/linux-uml/linux-uml_2.6.11-rc1-mm1.bb
+++ b/packages/linux-uml/linux-uml_2.6.11-rc1-mm1.bb
@@ -0,0 +1,55 @@
+DESCRIPTION = "User Mode Linux Kernel"
+SECTION = "kernel"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
+RCV = "${@bb.data.getVar('PV',d,True).split('-')[1]}"
+MMV = "${@bb.data.getVar('PV',d,True).split('-')[2]}"
+LV = "2.6.10"
+PR = "r0"
+
+SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-${LV}.tar.bz2 \
+ http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-${KV}-${RCV}.bz2;patch=1 \
+ http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/${KV}-${RCV}/${KV}-${RCV}-${MMV}/${KV}-${RCV}-${MMV}.gz;patch=1 \
+ file://defconfig"
+# file://compile-fix.patch;patch=1 \
+# file://defconfig"
+S = "${WORKDIR}/linux-${LV}"
+
+inherit kernel
+
+COMPATIBLE_HOST = 'i.86.*-linux'
+
+export OS = "Linux"
+ARCH = "um"
+SUBARCH = "${TARGET_ARCH}"
+KERNEL_IMAGETYPE = "linux"
+EXTRA_OEMAKE = "'CC=${KERNEL_CC}' 'LD=${KERNEL_LD}' \
+ 'SUBARCH=${SUBARCH}'"
+
+do_configure() {
+ install -m 0644 ${WORKDIR}/defconfig .config
+ oe_runmake oldconfig
+}
+
+do_compile() {
+ unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+ install -d arch/um/include/linux/
+ install -m 0644 include/linux/inet.h arch/um/include/linux/
+ kernel_do_compile
+# oe_runmake ${KERNEL_IMAGETYPE} 'CC=${KERNEL_CC}' 'LD=${KERNEL_LD}'
+}
+
+do_stage_prepend() {
+ install -d arch/um/boot/
+ ln -sf ${S}/linux arch/um/boot/linux
+}
+
+do_install() {
+ unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+ #oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
+ install -d ${D}/boot
+ install -m 0755 linux ${D}/boot/linux-${PV}
+ install -m 0644 System.map ${D}/boot/System.map-${PV}
+ install -m 0644 .config ${D}/boot/config-${PV}
+}
diff --git a/packages/lockstat/lockstat_1.4.10.bb b/packages/lockstat/lockstat_1.4.10.bb
index e69de29bb2..054ef4ca6f 100644
--- a/packages/lockstat/lockstat_1.4.10.bb
+++ b/packages/lockstat/lockstat_1.4.10.bb
@@ -0,0 +1,26 @@
+SECTION = "console/utils"
+DESCRIPTION = "A tool for retrieving kernel spinlock metering information."
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+DEPENDS = "virtual/kernel"
+
+SRC_URI = "ftp://oss.sgi.com/projects/lockmeter/download/lockstat-${PV}.tar.gz"
+S = "${WORKDIR}/lockstat"
+
+export KERNEL_VERSION = ${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}
+export KERNEL_SOURCE = ${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}
+CFLAGS += " -I${KERNEL_SOURCE}/include"
+
+python () {
+# NOTE: any target machines with kernels supporting spinlock metering should
+# check the MACHINE variable here to prevent the SkipPackage.
+ raise bb.parse.SkipPackage("The target machine's kernel does not appear able to use spinlock metering.")
+}
+
+do_compile () {
+ oe_runmake
+}
+
+do_install () {
+ install -d ${D}/${sbindir}
+ install -m 0755 lockstat ${D}/${sbindir}/
+}
diff --git a/packages/opie-tinykate/opie-tinykate_1.1.8.bb b/packages/opie-tinykate/opie-tinykate_1.1.8.bb
index e69de29bb2..daa8017390 100644
--- a/packages/opie-tinykate/opie-tinykate_1.1.8.bb
+++ b/packages/opie-tinykate/opie-tinykate_1.1.8.bb
@@ -0,0 +1,48 @@
+DESCRIPTION = "The Kate Text Editor for Opie"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "libqtaux2"
+
+APPNAME = "tinykate"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/tinykate \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/tinykate"
+
+inherit opie
+
+EXTRA_QMAKEVARS_POST += " LIBS+=-L.."
+PARALLEL_MAKE = ""
+
+# FILES plugins/application/libkate.so* bin/kate apps/Applications/tinykate.desktop pics/tinykate lib/libtinykate.so*
+do_install() {
+ install -d ${D}${palmtopdir}/lib/
+ oe_soinstall libkate.so.1.0.0 ${D}${palmtopdir}/lib/
+ install -d ${D}${palmtopdir}/pics/${APPNAME}/
+ install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+ install -d ${D}${palmtopdir}/share/${APPNAME}/syntax/
+ install -m 0644 ${WORKDIR}/share/${APPNAME}/syntax/*.* ${D}${palmtopdir}/share/${APPNAME}/syntax/
+}
+
+PACKAGES = " \
+ opie-tinykate-syntax-commondev \
+ opie-tinykate-syntax-documentation \
+ opie-tinykate-syntax-misc \
+ opie-tinykate-syntax-miscdev \
+ opie-tinykate-syntax-unix \
+ opie-tinykate-syntax-web \
+ opie-tinykate "
+
+
+FILES_opie-tinykate-syntax-commondev = " ${palmtopdir}/share/tinykate/syntax/c.xml ${palmtopdir}/share/tinykate/syntax/cpp.xml ${palmtopdir}/share/tinykate/syntax/gnuassembler.xml ${palmtopdir}/share/tinykate/syntax/kbasic.xml ${palmtopdir}/share/tinykate/syntax/pascal.xml ${palmtopdir}/share/tinykate/syntax/perl.xml ${palmtopdir}/share/tinykate/syntax/php.xml ${palmtopdir}/share/tinykate/syntax/python.xml ${palmtopdir}/share/tinykate/syntax/ruby.xml ${palmtopdir}/share/tinykate/syntax/sql.xml ${palmtopdir}/share/tinykate/syntax/tcl.xml ${palmtopdir}/share/tinykate/syntax/xml.xml ${palmtopdir}/share/tinykate/syntax/xmldebug.xml ${palmtopdir}/share/tinykate/syntax/java.xml"
+FILES_opie-tinykate-syntax-documentation = " ${palmtopdir}/share/tinykate/syntax/latex.xml ${palmtopdir}/share/tinykate/syntax/postscript.xml ${palmtopdir}/share/tinykate/syntax/sgml.xml"
+FILES_opie-tinykate-syntax-misc = " ${palmtopdir}/share/tinykate/syntax/idconsole.xml ${palmtopdir}/share/tinykate/syntax/matlab.xml ${palmtopdir}/share/tinykate/syntax/verilog.xml ${palmtopdir}/share/tinykate/syntax/vhdl.xml"
+FILES_opie-tinykate-syntax-miscdev = " ${palmtopdir}/share/tinykate/syntax/ada.xml ${palmtopdir}/share/tinykate/syntax/eiffel.xml ${palmtopdir}/share/tinykate/syntax/ferite.xml ${palmtopdir}/share/tinykate/syntax/fortran.xml ${palmtopdir}/share/tinykate/syntax/haskell.xml ${palmtopdir}/share/tinykate/syntax/literate-haskell.xml ${palmtopdir}/share/tinykate/syntax/objectivec.xml ${palmtopdir}/share/tinykate/syntax/sather.xml ${palmtopdir}/share/tinykate/syntax/scheme.xml"
+FILES_opie-tinykate-syntax-unix = " ${palmtopdir}/share/tinykate/syntax/cs.xml ${palmtopdir}/share/tinykate/syntax/bash.xml ${palmtopdir}/share/tinykate/syntax/changelog.xml ${palmtopdir}/share/tinykate/syntax/desktop.xml ${palmtopdir}/share/tinykate/syntax/diff.xml ${palmtopdir}/share/tinykate/syntax/mab.xml ${palmtopdir}/share/tinykate/syntax/makefile.xml ${palmtopdir}/share/tinykate/syntax/rpmspec.xml ${palmtopdir}/share/tinykate/syntax/sml.xml ${palmtopdir}/share/tinykate/syntax/winehq.xml"
+FILES_opie-tinykate-syntax-web = " ${palmtopdir}/share/tinykate/syntax/css.xml ${palmtopdir}/share/tinykate/syntax/html.xml ${palmtopdir}/share/tinykate/syntax/javascript.xml"
diff --git a/packages/opie-tinykate/opie-tinykate_cvs.bb b/packages/opie-tinykate/opie-tinykate_cvs.bb
index 96a4ed5a4a..ab3c1f34ce 100644
--- a/packages/opie-tinykate/opie-tinykate_cvs.bb
+++ b/packages/opie-tinykate/opie-tinykate_cvs.bb
@@ -17,6 +17,7 @@ S = "${WORKDIR}/tinykate"
inherit opie
EXTRA_QMAKEVARS_POST += " LIBS+=-L.."
+PARALLEL_MAKE = ""
# FILES plugins/application/libkate.so* bin/kate apps/Applications/tinykate.desktop pics/tinykate lib/libtinykate.so*
do_install() {
diff --git a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
index 17ef69a7d8..982bcfdfa4 100644
--- a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
+++ b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
@@ -20,9 +20,9 @@ S = "${WORKDIR}/pcmcia-cs-${PV}"
INITSCRIPT_NAME = "pcmcia"
INITSCRIPT_PARAMS = "defaults"
-inherit update-rc.d
+inherit update-rc.d module-base
-export KERNEL_SOURCE = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-source')}
+export KERNEL_SOURCE = ${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}
sbindir = "/sbin"
diff --git a/packages/rosetta/rosetta_cvs.bb b/packages/rosetta/rosetta_cvs.bb
index 4512e2c691..c7a6eca505 100644
--- a/packages/rosetta/rosetta_cvs.bb
+++ b/packages/rosetta/rosetta_cvs.bb
@@ -1,6 +1,7 @@
SECTION = "x11/utils"
PV = "0.0cvs${CVSDATE}"
-DEPENDS = "gtk+ libgpewidget x11 libxrandr libxft xtst xext xau"
+DEPENDS = "gtk+ libgpewidget x11 libxrandr libxft xtst xext xau \
+ virtual/libintl"
DESCRIPTION = "Multistroke / full word handwriting recognition for X"
LICENSE = "GPL"
@@ -9,7 +10,7 @@ SRC_URI = "${HANDHELDS_CVS};module=rosetta \
S = "${WORKDIR}/rosetta"
PR = "r4"
-inherit pkgconfig
+inherit pkgconfig gettext
FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps ${datadir}/applications ${datadir}/rosetta"
diff --git a/packages/shfs/shfs-utils_0.35.bb b/packages/shfs/shfs-utils_0.35.bb
index e69de29bb2..4af52f2973 100644
--- a/packages/shfs/shfs-utils_0.35.bb
+++ b/packages/shfs/shfs-utils_0.35.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "A simple and easy to use Linux kernel (2.4+) module which allows you to mount remote filesystems using plain shell (ssh/rsh) connection. \
+It supports some nice features like number of different caches for access speedup, target system optimisations, etc."
+SECTION = "kernel/userland"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+RDEPENDS = "shfs-modules (${PV})"
+DEPENDS = "virtual/kernel"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/shfs/shfs-${PV}.tar.gz"
+S = "${WORKDIR}/shfs-${PV}/shfsmount"
+
+KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}"
+KV = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')[:3]}"
+
+CFLAGS_append=' -DVERSION=\\"${KERNEL_VERSION}\\" -DSHFS_VERSION=\\"${PV}\\" -I../shfs/Linux-${KV}'
+
+do_compile() {
+ oe_runmake LINKER="${CC}"
+}
+
+do_install() {
+ install -d ${D}/${bindir}
+ install -m 0755 shfsmount shfsumount ${D}/${bindir}
+}
diff --git a/packages/wireless-tools/wireless-tools/fixheaders.patch b/packages/wireless-tools/wireless-tools/fixheaders.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wireless-tools/wireless-tools/fixheaders.patch
diff --git a/packages/wireless-tools/wireless-tools_27.bb b/packages/wireless-tools/wireless-tools_27.bb
index e69de29bb2..7142a3de56 100644
--- a/packages/wireless-tools/wireless-tools_27.bb
+++ b/packages/wireless-tools/wireless-tools_27.bb
@@ -0,0 +1,44 @@
+DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem"
+HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
+SECTION = "base"
+PRIORITY = "optional"
+#DEPENDS = "virtual/kernel"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://pcmcia-cs.sourceforge.net/ftp/contrib/wireless_tools.${PV}.tar.gz \
+ file://man.patch;patch=1 \
+ file://fixheaders.patch;patch=1 \
+ file://wireless-tools.if-pre-up"
+S = "${WORKDIR}/wireless_tools.${PV}"
+
+CFLAGS =+ "-I${S}"
+EXTRA_OEMAKE = "-e 'BUILD_SHARED=y' \
+ 'INSTALL_DIR=${D}/sbin' \
+ 'INSTALL_LIB=${D}/${libdir}' \
+ 'INSTALL_INC=${D}/${includedir}' \
+ 'INSTALL_MAN=${D}/${mandir}'"
+
+do_compile() {
+ oe_runmake all libiw.a
+}
+
+do_stage () {
+ install -m 0644 wireless.h ${STAGING_INCDIR}/
+ install -m 0644 iwlib.h ${STAGING_INCDIR}/
+ oe_libinstall -a -so libiw ${STAGING_LIBDIR}/
+}
+
+do_install() {
+ oe_runmake PREFIX=${D} install install-static
+ install -d ${D}/etc/network/if-pre-up.d
+ install ${WORKDIR}/wireless-tools.if-pre-up ${D}/etc/network/if-pre-up.d/wireless-tools
+}
+
+PACKAGES = "libiw libiw-dev libiw-doc ${PN} ${PN}-doc"
+FILES_libiw = "${libdir}/*.so.*"
+FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}"
+FILES_libiw-doc = "${mandir}/man7"
+FILES_${PN} = "${bindir} ${sbindir} /sbin /bin ${sysconfdir}/network"
+FILES_${PN}-doc = "${mandir}/man8"
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.1pre23.bb b/packages/wlan-ng/wlan-ng-modules_0.2.1pre23.bb
index e69de29bb2..3a9195f412 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.1pre23.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.1pre23.bb
@@ -0,0 +1,78 @@
+DESCRIPTION = "linux-wlan-ng (prism2.x, prism3, pcmcia, pci, usb) driver for 11Mbps wireless lan cards"
+HOMEPAGE = "http://www.linux-wlan.org"
+SECTION = "kernel/modules"
+DEPENDS = "virtual/kernel"
+RRECOMMENDS = "wlan-ng-utils"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
+ file://no-compat.patch;patch=1 \
+ file://Ambit_usb.patch;patch=1 \
+ file://scripts-makefile-hostcc.diff;patch=1;pnum=0 \
+ file://pass-kernel-cross.patch;patch=1;pnum=0 \
+ file://OZ-Configure.patch;patch=1 \
+ file://wlan-ng.modutils \
+ file://wlan.agent \
+ file://config.in \
+ file://usbctl \
+ file://resume \
+ file://pre-up \
+ file://post-down"
+S = "${WORKDIR}/linux-wlan-ng-${PV}"
+
+inherit module
+
+MAKE_TARGETS = "all"
+
+do_configure() {
+ cp ${WORKDIR}/config.in ${S}
+ if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then
+ export PRISM2_PCMCIA=y
+ export WLAN_KERN_PCMCIA=y
+ fi
+ export PRISM2_PCI=y
+ export PRISM2_PLX=n
+ export PRISM2_USB=y
+ export TARGET_ROOT_ON_HOST=${D}
+ export RC_DIR=${sysconfdir}
+ oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config
+}
+
+# override module_do_install in module.oeclass - dont want to set CC and
+# LD unless actually compiling the kernel modules - there are other user
+# level programs to be compiled. Note we need to use same compiler
+# that was used to build the kernel
+do_compile() {
+ unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+ oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \
+ KERNEL_SRC=${STAGING_KERNEL_DIR} \
+ KERNEL_VERSION=${KERNEL_VERSION} \
+ KERNEL_CC="${KERNEL_CC}" KERNEL_LD="${KERNEL_LD}" \
+ ${MAKE_TARGETS}
+}
+
+do_install() {
+ oe_runmake install DESTDIR=${D} TARGET_MODDIR=
+ mkdir -p ${D}/etc/modutils/
+ mkdir -p ${D}/etc/hotplug/
+ mkdir -p ${D}/sbin/
+ install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}/etc/modutils/wlan-ng.conf
+ install -m 0755 ${WORKDIR}/wlan.agent ${D}/etc/hotplug/wlan.agent
+ install -d ${D}/${sysconfdir}/network/if-pre-up.d
+ install -m 0755 ${WORKDIR}/pre-up ${D}/${sysconfdir}/network/if-pre-up.d/wlan-ng
+ install -d ${D}/${sysconfdir}/network/if-post-down.d
+ install -m 0755 ${WORKDIR}/post-down ${D}/${sysconfdir}/network/if-post-down.d/wlan-ng
+ install -d ${D}/${sysconfdir}/apm/resume.d
+ install -m 0755 ${WORKDIR}/resume ${D}/${sysconfdir}/apm/resume.d/wlan-ng
+ install -m 0755 ${WORKDIR}/usbctl ${D}/sbin/usbctl
+ install -d ${D}/${mandir}
+ mv ${D}/usr/local/man/* ${D}/${mandir}
+ rm -r ${D}/usr/local/man
+ rm -rf ${D}/etc/init.d
+}
+
+PACKAGES_prepend = "wlan-ng-utils "
+FILES_wlan-ng-utils = "${sysconfdir} /sbin"
+FILES_${PN} = "/lib"
diff --git a/packages/xcomposite/xcomposite-1.0.1/autofoo.patch b/packages/xcomposite/xcomposite-1.0.1/autofoo.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xcomposite/xcomposite-1.0.1/autofoo.patch
diff --git a/packages/xcomposite/xcomposite_1.0.1.bb b/packages/xcomposite/xcomposite_1.0.1.bb
index e69de29bb2..54af50581b 100644
--- a/packages/xcomposite/xcomposite_1.0.1.bb
+++ b/packages/xcomposite/xcomposite_1.0.1.bb
@@ -0,0 +1,18 @@
+SECTION = "x11/libs"
+DEPENDS = "x11 compositeext xextensions libxfixes"
+DESCRIPTION = "X Composite extension library."
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libXcomposite-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXcomposite-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ oe_runmake install prefix=${STAGING_DIR} \
+ bindir=${STAGING_BINDIR} \
+ includedir=${STAGING_INCDIR} \
+ libdir=${STAGING_LIBDIR} \
+ datadir=${STAGING_DATADIR}
+}
diff --git a/packages/xdamage/xdamage-1.0.1/autofoo.patch b/packages/xdamage/xdamage-1.0.1/autofoo.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xdamage/xdamage-1.0.1/autofoo.patch
diff --git a/packages/xdamage/xdamage_1.0.1.bb b/packages/xdamage/xdamage_1.0.1.bb
index e69de29bb2..2db0c3783b 100644
--- a/packages/xdamage/xdamage_1.0.1.bb
+++ b/packages/xdamage/xdamage_1.0.1.bb
@@ -0,0 +1,19 @@
+SECTION = "x11/libs"
+DEPENDS = "x11 damageext libxfixes xproto"
+DESCRIPTION = "X Damage extension library."
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libXdamage-${PV}.tar.bz2 \
+ file://m4.patch;patch=1 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXdamage-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ oe_runmake install prefix=${STAGING_DIR} \
+ bindir=${STAGING_BINDIR} \
+ includedir=${STAGING_INCDIR} \
+ libdir=${STAGING_LIBDIR} \
+ datadir=${STAGING_DATADIR}
+}
diff --git a/packages/xpm/files/autofoo.patch b/packages/xpm/files/autofoo.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xpm/files/autofoo.patch
diff --git a/packages/xpm/xpm_3.5.1.bb b/packages/xpm/xpm_3.5.1.bb
index e69de29bb2..ea863f1eb6 100644
--- a/packages/xpm/xpm_3.5.1.bb
+++ b/packages/xpm/xpm_3.5.1.bb
@@ -0,0 +1,18 @@
+SECTION = "x11/libs"
+LICENSE = "X-BSD"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto x11"
+DESCRIPTION = "X Pixmap library."
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libXpm-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXpm-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ install -m 0644 ${S}/lib/xpm.h ${STAGING_INCDIR}/X11/xpm.h
+ oe_libinstall -a -so -C lib libXpm ${STAGING_LIBDIR}
+}
diff --git a/packages/xpm/xpm_cvs.bb b/packages/xpm/xpm_cvs.bb
index e69de29bb2..72e39d0fc9 100644
--- a/packages/xpm/xpm_cvs.bb
+++ b/packages/xpm/xpm_cvs.bb
@@ -0,0 +1,19 @@
+PV = "0.0cvs${CVSDATE}"
+LICENSE = "X-BSD"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto x11"
+DESCRIPTION = "X Pixmap library."
+PR = "r1"
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xpm \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/Xpm"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ install -m 0644 ${S}/lib/xpm.h ${STAGING_INCDIR}/X11/xpm.h
+ oe_libinstall -a -so -C lib libXpm ${STAGING_LIBDIR}
+}
diff --git a/packages/xt/files/autofoo.patch b/packages/xt/files/autofoo.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xt/files/autofoo.patch
diff --git a/packages/xt/xt_0.1.5.bb b/packages/xt/xt_0.1.5.bb
index 29c13f2e98..241359407b 100644
--- a/packages/xt/xt_0.1.5.bb
+++ b/packages/xt/xt_0.1.5.bb
@@ -4,7 +4,9 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
DEPENDS = "x11 libsm"
DESCRIPTION = "X Toolkit Intrinsics"
LICENSE = "X-MIT"
-SRC_URI = "${XLIBS_MIRROR}/libXt-${PV}.tar.bz2"
+PR = "r1"
+SRC_URI = "${XLIBS_MIRROR}/libXt-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
S = "${WORKDIR}/libXt-${PV}"
inherit autotools pkgconfig
diff --git a/packages/xt/xt_cvs.bb b/packages/xt/xt_cvs.bb
index e38828b5bc..0976320fd5 100644
--- a/packages/xt/xt_cvs.bb
+++ b/packages/xt/xt_cvs.bb
@@ -5,7 +5,9 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
DEPENDS = "x11 libsm"
DESCRIPTION = "X Toolkit Intrinsics"
LICENSE = "X-MIT"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xt"
+PR = "r1"
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xt \
+ file://autofoo.patch;patch=1"
S = "${WORKDIR}/Xt"
inherit autotools pkgconfig
diff --git a/packages/xtst/files/autofoo.patch b/packages/xtst/files/autofoo.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xtst/files/autofoo.patch
diff --git a/packages/xtst/xtst_cvs.bb b/packages/xtst/xtst_cvs.bb
index 4fb88da3c0..db83ba17a9 100644
--- a/packages/xtst/xtst_cvs.bb
+++ b/packages/xtst/xtst_cvs.bb
@@ -5,9 +5,10 @@ PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
DEPENDS = "x11 recordext xext"
DESCRIPTION = "X Test Extension: client side library"
-PR = "r1"
+PR = "r2"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xtst"
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xtst \
+ file://autofoo.patch;patch=1"
S = "${WORKDIR}/Xtst"
inherit autotools pkgconfig