summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/machine/zaurus-clamshell.conf17
-rw-r--r--packages/directfb/directfb_0.9.20.bb40
-rw-r--r--packages/nonworking/directfb/directfb_0.9.21.bb0
-rw-r--r--packages/ruby/ruby-native_1.8.2.bb0
-rw-r--r--packages/ruby/ruby_1.8.2.bb0
5 files changed, 3 insertions, 54 deletions
diff --git a/conf/machine/zaurus-clamshell.conf b/conf/machine/zaurus-clamshell.conf
index f70176865e..9246d45197 100644
--- a/conf/machine/zaurus-clamshell.conf
+++ b/conf/machine/zaurus-clamshell.conf
@@ -1,26 +1,15 @@
TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm armv4 armv5te c7x0"
-# The machine specific PACKAGE_ARCH is set to zaurus-clamshell because
-# machine specific packages (other than the kernel) are common across
-# all the clamshell devices.
-MACHINE_ARCH = "${@['zaurus-clamshell', bb.data.getVar('MACHINE', d, 1)][bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d) or bb.data.inherits_class('module', d)]}"
-
-IPKG_ARCHS = "all arm armv4 armv5te zaurus-clamshell ${MACHINE}"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support chkhinge"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support \
-kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
-kernel-module-usbdcore kernel-module-usbdmonitor chkhinge"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
EXTRA_IMAGEDEPENDS = "sharp-flash-header-c700"
IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
- --output=${T}/${IMAGE_NAME}.rootfs.jffs2 \
- ${EXTRA_IMAGECMD}; \
+ --output=${T}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}; \
cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
- ${T}/${IMAGE_NAME}.rootfs.jffs2 > \
- ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
+ ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
GUI_MACHINE_CLASS = "bigscreen"
GPE_EXTRA_DEPENDS += "gaim sylpheed"
diff --git a/packages/directfb/directfb_0.9.20.bb b/packages/directfb/directfb_0.9.20.bb
deleted file mode 100644
index 78efa20027..0000000000
--- a/packages/directfb/directfb_0.9.20.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-DESCRIPTION = "DirectFB is a thin library that provides developers \
-with hardware graphics acceleration, input device handling and \
-abstraction, an integrated windowing system with support for \
-translucent windows and multiple display layers on top of the \
-Linux framebuffer device."
-SECTION = "libs"
-LICENSE = "LGPL"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "jpeg libpng zlib"
-PR = "r1"
-
-SRC_URI = "http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz"
-S = "${WORKDIR}/DirectFB-${PV}"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--with-gfxdrivers=none --enable-libmpeg3=no --enable-freetype=no --enable-sdl=no"
-
-do_stage() {
- oe_runmake -C src 'libdir=/lib' 'includedir=/include/directfb' \
- 'oldincludedir=/include' 'datadir=/share' \
- 'DESTDIR=${STAGING_LIBDIR}/..' \
- 'INTERNALINCLUDEDIR=/include/directfb-internal' \
- install-internalincludeHEADERS install-libLTLIBRARIES
- oe_runmake -C include 'libdir=/lib' 'includedir=/include/directfb' \
- 'oldincludedir=/include' 'datadir=/share' \
- 'DESTDIR=${STAGING_LIBDIR}/..' \
- 'INTERNALINCLUDEDIR=/include/directfb-internal' \
- install-internalincludeHEADERS install-includeHEADERS
-}
-
-do_install() {
- oe_runmake 'DESTDIR=${D}' install
-}
-
-FILES_directfb_append = " ${libdir}/directfb-${PV}/systems/*.so \
- ${libdir}/directfb-${PV}/inputdrivers/*.so \
- ${libdir}/directfb-${PV}/interfaces/*/*.so \
- ${datadir}/directfb-${PV}"
diff --git a/packages/nonworking/directfb/directfb_0.9.21.bb b/packages/nonworking/directfb/directfb_0.9.21.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/directfb/directfb_0.9.21.bb
diff --git a/packages/ruby/ruby-native_1.8.2.bb b/packages/ruby/ruby-native_1.8.2.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ruby/ruby-native_1.8.2.bb
diff --git a/packages/ruby/ruby_1.8.2.bb b/packages/ruby/ruby_1.8.2.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ruby/ruby_1.8.2.bb