summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/fuse/gmailfs_0.6.bb21
-rw-r--r--packages/libpcre/libpcre-native_4.4.bb4
-rw-r--r--packages/povray/povray_3.6.1.bb2
-rw-r--r--packages/tasks/task-essential-parts.bb63
-rw-r--r--packages/tasks/task-essential-to-boot.bb35
5 files changed, 5 insertions, 120 deletions
diff --git a/packages/fuse/gmailfs_0.6.bb b/packages/fuse/gmailfs_0.6.bb
deleted file mode 100644
index 8c659441b3..0000000000
--- a/packages/fuse/gmailfs_0.6.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "GmailFS provides a mountable Linux filesystem which uses your Gmail account as its storage medium."
-HOMEPAGE = "http://richard.jones.name/google-hacks/gmail-filesystem/gmail-filesystem.html"
-LICENSE = "GPL"
-
-DEPENDS = "fuse libgmail python-fuse"
-RDEPENDS = "fuse libgmail python-fuse python-unixadmin python-lang python-textutils python-core"
-
-SRC_URI = "http://richard.jones.name/google-hacks/gmail-filesystem/gmailfs-0.6.tar.gz"
-
-
-do_install() {
-install -d ${D}${datadir}/gmailfs
-install -d ${D}${bindir}
-install -d ${D}${sysconfdir}
-
-install -m 755 ${S}/gmailfs.py ${D}${datadir}/gmailfs/
-install -m 755 ${S}/mount.gmailfs ${D}${bindir}
-install -m 644 ${S}/*.conf ${D}${sysconfdir}
-
-}
-
diff --git a/packages/libpcre/libpcre-native_4.4.bb b/packages/libpcre/libpcre-native_4.4.bb
index 7be8ffd0ac..a1813423c0 100644
--- a/packages/libpcre/libpcre-native_4.4.bb
+++ b/packages/libpcre/libpcre-native_4.4.bb
@@ -2,3 +2,7 @@ SECTION = "unknown"
require libpcre_${PV}.bb
inherit native
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpcre-${PV}"
+
+# NOTE: multiple providers are available (libpcre, libpcre-native);
+# NOTE: consider defining PREFERRED_PROVIDER_pcre
+PROVIDES = ""
diff --git a/packages/povray/povray_3.6.1.bb b/packages/povray/povray_3.6.1.bb
index c8d9220da6..12e0a043b3 100644
--- a/packages/povray/povray_3.6.1.bb
+++ b/packages/povray/povray_3.6.1.bb
@@ -4,7 +4,7 @@ SECTION = "console/graphics"
#Make this a weak assigment to allow branding of the povray binary
LICENSE = "povray"
-DEPENDS = "virtual/libx11 libz jpeg libpng tiff"
+DEPENDS = "virtual/libx11 zlib jpeg libpng tiff"
RDEPENDS = ""
PR = "r1"
diff --git a/packages/tasks/task-essential-parts.bb b/packages/tasks/task-essential-parts.bb
deleted file mode 100644
index 82c11537f8..0000000000
--- a/packages/tasks/task-essential-parts.bb
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-#
-# Filename: task-essential-parts.bb
-# Date: 23-Apr-06
-
-DESCRIPTION = "Creates all task-essential-* tasks"
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-
-######################################################################################
-
-PV = "0.0.1"
-PR = "r1"
-
-######################################################################################
-
-PACKAGE_ARCH = "${MACHINE}"
-ALLOW_EMPTY = 1
-
-PACKAGES = "task-essential-irda task-essential-bluetooth task-essential-bluetooth-all \
- task-essential-sound task-essential-sd task-essential-wifi task-essential-wifi-all \
- task-essential-usbclient task-essential-usbhost task-essential-pcmcia \
- task-essential-userspace task-essential-serial"
-
-######################################################################################
-
-DISTRO_PCMCIA ?= ""
-
-DISTRO_SERIAL ?= ""
-DISTRO_IRDA ?= ""
-DISTRO_BLUETOOTH ?= ""
-DISTRO_SOUND ?= ""
-DISTRO_WIFI ?= "hostap-utils prism3-firmware prism3-support spectrum-fw hostap-conf orinoco-conf \
- wireless-tools wpa-supplicant-nossl"
-
-DISTRO_USBCLIENT ?= ""
-DISTRO_USBHOST ?= ""
-
-DISTRO_SD ?= ""
-
-DISTRO_USERSPACE ?= "ipkg keymaps"
-
-DISTRO_DEPENDS ?= "hostap-utils prism3-firmware prism3-support spectrum-fw hostap-conf orinoco-conf \
- ipkg keymaps altboot wireless-tools wpa-supplicant-nossl"
-
-######################################################################################
-
-RDEPENDS_task-essential-serial = "${KMODULES_SERIAL} ${MACHINE_MODUTILS} ${MACHINE_SERIAL} ${DISTRO_SERIAL}"
-RDEPENDS_task-essential-irda = "task-essential-serial ${KMODULES_IRDA} ${MACHINE_MODUTILS} ${MACHINE_IRDA} ${DISTRO_IRDA}"
-RDEPENDS_task-essential-bluetooth = "${KMODULES_BLUETOOTH} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_BLUETOOTH} "
-RDEPENDS_task-essential-bluetooth-all = "task-essential-bluetooth ${KMODULES_BLUETOOTH_DRIVER} ${DISTRO_BLUETOOTH}"
-RDEPENDS_task-essential-pcmcia = "${KMODULES_PCMCIA} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_PCMCIA} ${DISTRO_PCMCIA}"
-RDEPENDS_task-essential-sound = "${KMODULES_SOUND} ${MACHINE_MODUTILS} ${MACHINE_SOUND} ${DISTRO_SOUND}"
-RDEPENDS_task-essential-sd = "${KMODULES_SD} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_SD} ${DISTRO_SD}"
-RDEPENDS_task-essential-wifi = "${KMODULES_WIFI} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_WIFI}"
-RDEPENDS_task-essential-wifi-all = "task-essential-wifi ${KMODULES_WIFI_DRIVER} ${DISTRO_WIFI}"
-RDEPENDS_task-essential-usbclient = "${KMODULES_USBCLIENT} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_USBCLIENT} ${DISTRO_USBCLIENT}"
-RDEPENDS_task-essential-usbhost = "${KMODULES_USBHOST} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_USBHOST} ${DISTRO_USBHOST}"
-RDEPENDS_task-essential-userspace = "${DISTRO_USERSPACE}"
-
-
-DEPENDS = "${MACHINE_DEPENDS} ${DISTRO_DEPENDS}"
diff --git a/packages/tasks/task-essential-to-boot.bb b/packages/tasks/task-essential-to-boot.bb
deleted file mode 100644
index 565823298a..0000000000
--- a/packages/tasks/task-essential-to-boot.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-#
-# Filename: task-essential-to-boot.bb
-# Date: 23-Apr-06
-
-DESCRIPTION = "This task includes everything to make a bootable image. And not a bit more."
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-
-######################################################################################
-
-ALLOW_EMPTY = 1
-PACKAGES = "${PN}"
-
-######################################################################################
-
-PV = "0.0.1"
-PR = "r0"
-
-######################################################################################
-
-CORE_EXTRA_D ?= ""
-CORE_EXTRA_RD ?= ""
-
-CORE_PACKAGES_D = "virtual/kernel base-files base-passwd-3.5.9 busybox initscripts \
- sysvinit tinylogin ${CORE_EXTRA_D}"
-
-CORE_PACKAGES_RD = "kernel base-files base-passwd busybox initscripts sysvinit \
- tinylogin ${CORE_EXTRA_RD}"
-
-######################################################################################
-
-DEPENDS = "${CORE_PACKAGES_D}"
-RDEPENDS = "${CORE_PACKAGES_RD}"