From 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Thu, 9 Dec 2004 09:47:41 +0000
Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded into
 hyperion.kergoth.com:/home/kergoth/code/openembedded

2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.

BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
---
 meta/bootstrap-image.bb              |  0
 meta/dvb-image.bb                    |  0
 meta/e-image.bb                      |  0
 meta/gpe-feed.bb                     |  0
 meta/gpe-image-blank-user.bb         | 24 --------------
 meta/gpe-image.bb                    |  0
 meta/grant-image.bb                  |  0
 meta/meta-e-x11.bb                   |  0
 meta/meta-e.bb                       |  0
 meta/meta-gpe-extras.bb              |  0
 meta/meta-gpe.bb                     |  0
 meta/meta-grant.bb                   |  0
 meta/meta-opie-dynamic.bb            |  0
 meta/meta-opie.bb                    |  0
 meta/meta-sdk.bb                     |  0
 meta/meta-sdl.bb                     |  0
 meta/mythfront-image.bb              |  0
 meta/nslu2-linksys-image.bb          | 13 --------
 meta/nylon-feed.bb                   |  0
 meta/nylon-image-base.bb             |  0
 meta/nylon-image-extra.bb            | 14 --------
 meta/nylon-image-standard.bb         | 22 -------------
 meta/openslug-image.bb               | 33 -------------------
 meta/opie-collections.inc            | 63 ------------------------------------
 meta/opie-feed.bb                    |  0
 meta/opie-image.bb                   |  0
 meta/opie-kdepim-image.bb            |  0
 meta/opie-locale-feed.bb             |  0
 meta/oz-feed.bb                      |  0
 meta/oz-system-feed.bb               |  0
 meta/sdl-image.bb                    |  0
 meta/switchbox-image.bb              |  0
 meta/task-bootstrap.bb               |  0
 meta/task-dvb.bb                     |  0
 meta/task-mythfront.bb               |  0
 meta/task-python-everything_0.9.0.bb |  0
 meta/task-xfce-base.bb               |  0
 meta/task-xterminal.bb               |  0
 meta/twin-image.bb                   |  0
 meta/uml-image.bb                    |  0
 meta/unslung-able-image.bb           |  3 --
 meta/unslung-image.bb                |  0
 meta/unslung-packages.bb             |  0
 meta/unslung-standard-image.bb       | 40 -----------------------
 meta/xbase-clients.bb                |  0
 meta/xterminal-image.bb              |  0
 46 files changed, 212 deletions(-)
 delete mode 100644 meta/bootstrap-image.bb
 delete mode 100644 meta/dvb-image.bb
 delete mode 100644 meta/e-image.bb
 delete mode 100644 meta/gpe-feed.bb
 delete mode 100644 meta/gpe-image-blank-user.bb
 delete mode 100644 meta/gpe-image.bb
 delete mode 100644 meta/grant-image.bb
 delete mode 100644 meta/meta-e-x11.bb
 delete mode 100644 meta/meta-e.bb
 delete mode 100644 meta/meta-gpe-extras.bb
 delete mode 100644 meta/meta-gpe.bb
 delete mode 100644 meta/meta-grant.bb
 delete mode 100644 meta/meta-opie-dynamic.bb
 delete mode 100644 meta/meta-opie.bb
 delete mode 100644 meta/meta-sdk.bb
 delete mode 100644 meta/meta-sdl.bb
 delete mode 100644 meta/mythfront-image.bb
 delete mode 100644 meta/nslu2-linksys-image.bb
 delete mode 100644 meta/nylon-feed.bb
 delete mode 100644 meta/nylon-image-base.bb
 delete mode 100644 meta/nylon-image-extra.bb
 delete mode 100644 meta/nylon-image-standard.bb
 delete mode 100644 meta/openslug-image.bb
 delete mode 100644 meta/opie-collections.inc
 delete mode 100644 meta/opie-feed.bb
 delete mode 100644 meta/opie-image.bb
 delete mode 100644 meta/opie-kdepim-image.bb
 delete mode 100644 meta/opie-locale-feed.bb
 delete mode 100644 meta/oz-feed.bb
 delete mode 100644 meta/oz-system-feed.bb
 delete mode 100644 meta/sdl-image.bb
 delete mode 100644 meta/switchbox-image.bb
 delete mode 100644 meta/task-bootstrap.bb
 delete mode 100644 meta/task-dvb.bb
 delete mode 100644 meta/task-mythfront.bb
 delete mode 100644 meta/task-python-everything_0.9.0.bb
 delete mode 100644 meta/task-xfce-base.bb
 delete mode 100644 meta/task-xterminal.bb
 delete mode 100644 meta/twin-image.bb
 delete mode 100644 meta/uml-image.bb
 delete mode 100644 meta/unslung-able-image.bb
 delete mode 100644 meta/unslung-image.bb
 delete mode 100644 meta/unslung-packages.bb
 delete mode 100644 meta/unslung-standard-image.bb
 delete mode 100644 meta/xbase-clients.bb
 delete mode 100644 meta/xterminal-image.bb

(limited to 'meta')

diff --git a/meta/bootstrap-image.bb b/meta/bootstrap-image.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/dvb-image.bb b/meta/dvb-image.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/e-image.bb b/meta/e-image.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/gpe-feed.bb b/meta/gpe-feed.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/gpe-image-blank-user.bb b/meta/gpe-image-blank-user.bb
deleted file mode 100644
index 0f1dd53d90..0000000000
--- a/meta/gpe-image-blank-user.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-include gpe-collections.bb
-
-MAINTAINER = "Rob Taylor <rjt@cambridgebroadband.com"
-
-PR = "r4"
-
-export IMAGE_BASENAME = "gpe-image-blank-user"
-
-DEPENDS = "task-bootstrap ${GPE_BASE_DEPENDS} ${GPE_BASE} ${GPE_PIM} \
-	   ${GPE_BASE_SETTINGS} ${GPE_BASE_APPS} \
-	   ${GPE_EXTRA_DEPENDS}"
-
-export IPKG_INSTALL = "task-bootstrap ${GPE_BASE_DEPENDS} ${GPE_BASE} \
-           	       ${GPE_PIM} ${GPE_BASE_SETTINGS} \
-	               ${GPE_BASE_APPS} ${GPE_EXTRA_DEPENDS} \
-		       ${XSERVER} \
-		       ${GPE_BASE_RDEPENDS} \
-		       ${GPE_EXTRA_INSTALL}"
-
-
-ROOTFS_POSTPROCESS_COMMAND += "adduser -D user"
-
-
-inherit image_ipk
diff --git a/meta/gpe-image.bb b/meta/gpe-image.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/grant-image.bb b/meta/grant-image.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/meta-e-x11.bb b/meta/meta-e-x11.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/meta-e.bb b/meta/meta-e.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/meta-gpe-extras.bb b/meta/meta-gpe-extras.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/meta-gpe.bb b/meta/meta-gpe.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/meta-grant.bb b/meta/meta-grant.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/meta-opie-dynamic.bb b/meta/meta-opie-dynamic.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/meta-opie.bb b/meta/meta-opie.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/meta-sdk.bb b/meta/meta-sdk.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/meta-sdl.bb b/meta/meta-sdl.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/mythfront-image.bb b/meta/mythfront-image.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/nslu2-linksys-image.bb b/meta/nslu2-linksys-image.bb
deleted file mode 100644
index fd258d3b0d..0000000000
--- a/meta/nslu2-linksys-image.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-IMAGE_LINGUAS = ""
-USE_DEVFS = "1"
-
-IMAGE_BASENAME = "nslu2-linksys"
-
-IPKG_INSTALL = "nslu2-linksys-ramdisk"
-
-DEPENDS = "nslu2-linksys-kernel ${IPKG_INSTALL}"
-
-NSLU2_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-nslu2.txt')}"
-EXTRA_IMAGECMD_ext2.gz = "-f ${NSLU2_DEVICE_TABLE}"
-
-inherit image_ipk
diff --git a/meta/nylon-feed.bb b/meta/nylon-feed.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/nylon-image-base.bb b/meta/nylon-image-base.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/nylon-image-extra.bb b/meta/nylon-image-extra.bb
deleted file mode 100644
index 8ec4770029..0000000000
--- a/meta/nylon-image-extra.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-include nylon-image-standard.bb
-
-export IMAGE_BASENAME = "nylon-extra"
- 
-NYLON_EXTRA = "\
-	kismet \
-	netperf \
-	nylon-statistics \
-	openvpn \
-	"
-
-DEPENDS += "${NYLON_EXTRA}"
-
-RDEPENDS += "${NYLON_EXTRA}"
diff --git a/meta/nylon-image-standard.bb b/meta/nylon-image-standard.bb
deleted file mode 100644
index 4c69edbed8..0000000000
--- a/meta/nylon-image-standard.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-include nylon-image-base.bb
-
-export IMAGE_BASENAME = "nylon-standard"
- 
-NYLON_STANDARD = "\
-	bridge-utils \
-	dnsmasq \
-	hostap-utils \
-	ifplugd iproute2 iptables \
-	mobilemesh \
-	nylon-scripts \
-	ppp rp-pppoe \
-	shorewall \
-	tcpdump \
-	wireless-tools \
-	unik-olsrd"
-
-DEPENDS += "hostap-modules ntp \ 
-	${NYLON_STANDARD}"
-	
-RDEPENDS += "hostap-modules-pci ntpdate \
-	${NYLON_STANDARD}"
diff --git a/meta/openslug-image.bb b/meta/openslug-image.bb
deleted file mode 100644
index 9f672ff9dd..0000000000
--- a/meta/openslug-image.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-PR = "r1"
-
-IMAGE_BASENAME = "openslug"
-
-IMAGE_LINGUAS = ""
-USE_DEVFS = "1"
-
-OPENSLUG_HIDDEN_PACKAGES = "ipkg-native ipkg-utils-native fakeroot-native patcher-native virtual/armeb-linux-uclibc-gcc \
-	virtual/libc makedevs-native mtd-native slugimage-native nslu2-linksys-firmware nslu2-switchbox-firmware "
-
-DEPENDS = "base-files base-passwd-3.5.7 \
-        busybox dropbear hotplug initscripts netbase \
-        sysvinit tinylogin lrzsz portmap \
-        ixp4xx-csr ixp425-eth \
-        ipkg-collateral ipkg ipkg-link \
-        ${OPENSLUG_EXTRA_DEPENDS}"
-
-IPKG_INSTALL = "base-files base-passwd \
-        busybox dropbear hotplug initscripts netbase \
-        update-modules sysvinit tinylogin lrzsz portmap \
-        ixp4xx-csr ixp425-eth \
-        ipkg-collateral ipkg ipkg-link \
-        ${OPENSLUG_EXTRA_INSTALL}"
-
-inherit image_ipk
-
-python () {
-	# Don't build openslug images unless we're targeting an nslu2
-	mach = bb.data.getVar("MACHINE", d, 1)
-	dist = bb.data.getVar("DISTRO", d, 1)
-	if mach != 'nslu2' or dist != 'openslug':
-		raise bb.parse.SkipPackage("OpenSlug only builds for the Linksys NSLU2")
-}
diff --git a/meta/opie-collections.inc b/meta/opie-collections.inc
deleted file mode 100644
index 11da680940..0000000000
--- a/meta/opie-collections.inc
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# A collection of dependencies for images including Opie or parts of it.
-#
-
-#
-# Dependencies to get the launcher up and running
-#
-
-OPIE_LIBS_DEPENDS = "qte-for-opie libopie2 qpf-bitstream-vera qpf-bitstream-vera-sans-mono qpf-unifont"
-OPIE_LIBS_RDEPENDS = "qpf-bitstream-vera-small qte-font-fixed"
-OPIE_BASE = "opie-pics opie-sounds opie-qcop opie-quicklauncher opie-taskbar"
-
-#
-# High res displays want more fonts
-#
-OPIE_LIBS_RDEPENDS_append_corgi    = " qpf-bitstream-vera-large qpf-unifont"
-OPIE_LIBS_RDEPENDS_append_shepherd = " qpf-bitstream-vera-large qpf-unifont"
-OPIE_LIBS_RDEPENDS_append_husky    = " qpf-bitstream-vera-large qpf-unifont"
-OPIE_LIBS_RDEPENDS_append_tosa     = " qpf-bitstream-vera-large qpf-bitstream-vera-sans-mono-large"
-
-#
-# Things for reasonable bootstrap image
-#
-
-OPIE_BASE_APPLETS = "opie-aboutapplet opie-clockapplet opie-logoutapplet \
-                     opie-suspendapplet opie-batteryapplet opie-homeapplet \
-                     opie-multikeyapplet opie-rotateapplet opie-vtapplet \
-                     opie-cardmon opie-irdaapplet opie-brightnessapplet"
-
-OPIE_BASE_INPUTMETHODS = "opie-multikey opie-handwriting opie-pickboard"
-
-OPIE_BASE_APPS = "opie-packagemanager opie-keytabs opie-console opie-clock opie-citytime opie-backup"
-
-OPIE_BASE_SETTINGS = "opie-light-and-power opie-appearance opie-systemtime opie-sysinfo opie-networksettings opie-button-settings"
-
-OPIE_BASE_DECOS = "opie-deco-flat opie-deco-liquid opie-deco-polished"
-
-OPIE_BASE_STYLES = "opie-style-flat opie-style-liquid opie-style-fresh opie-style-metal opie-style-web opie-style-phase"
-
-OPIE_BASE_DEPENDS = "ipkg ntp bluez-utils-nodbus irda-utils openobex-apps libopieobex0"
-OPIE_BASE_RDEPENDS = "ntpdate opie-handwriting-classicset bluez-utils-nodbus openobex-apps libopieobex0"
-
-#
-# Additional things for a standard 16MB distribution
-#
-
-OPIE_PIM_BASE = "opie-alarm opie-drawpad opie-textedit"
-
-OPIE_PIM_MAIL = "opie-mail"
-
-OPIE_PIM = "${OPIE_PIM_BASE} opie-addressbook opie-datebook opie-todo opie-today \
-            opie-today opie-today-addressbookplugin opie-today-datebookplugin opie-today-todolistplugin"
-
-KDE_PIM_DEPENDS = "${OPIE_PIM_BASE} kdepimpi"
-KDE_PIM_RDEPENDS = "kopi kapi kopi-applet"
-
-OPIE_EXTRA_APPLETS = "opie-clipboardapplet opie-volumeapplet opie-screenshotapplet"
-
-OPIE_EXTRA_APPS = "opie-advancedfm"
-
-OPIE_EXTRA_SETTINGS = "opie-language opie-launcher-settings opie-doctab opie-security \
-            opie-mediummount opie-networksettings-wlanplugin opie-networksettings-pppplugin"
-
diff --git a/meta/opie-feed.bb b/meta/opie-feed.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/opie-image.bb b/meta/opie-image.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/opie-kdepim-image.bb b/meta/opie-kdepim-image.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/opie-locale-feed.bb b/meta/opie-locale-feed.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/oz-feed.bb b/meta/oz-feed.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/oz-system-feed.bb b/meta/oz-system-feed.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/sdl-image.bb b/meta/sdl-image.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/switchbox-image.bb b/meta/switchbox-image.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/task-bootstrap.bb b/meta/task-bootstrap.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/task-dvb.bb b/meta/task-dvb.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/task-mythfront.bb b/meta/task-mythfront.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/task-python-everything_0.9.0.bb b/meta/task-python-everything_0.9.0.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/task-xfce-base.bb b/meta/task-xfce-base.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/task-xterminal.bb b/meta/task-xterminal.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/twin-image.bb b/meta/twin-image.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/uml-image.bb b/meta/uml-image.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/unslung-able-image.bb b/meta/unslung-able-image.bb
deleted file mode 100644
index 443a20892a..0000000000
--- a/meta/unslung-able-image.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_VARIANT = "able"
-
-include unslung-standard-image.bb
diff --git a/meta/unslung-image.bb b/meta/unslung-image.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/unslung-packages.bb b/meta/unslung-packages.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/unslung-standard-image.bb b/meta/unslung-standard-image.bb
deleted file mode 100644
index 8edaa69979..0000000000
--- a/meta/unslung-standard-image.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-PR = "r1"
-
-IMAGE_LINGUAS = ""
-USE_DEVFS = "1"
-
-UNSLUNG_BASE_DEPENDS = "slingbox ipkg wget"
-UNSLUNG_BASE_PACKAGES = "slingbox ipkg wget"
-
-IMAGE_VARIANT ?= "standard"
-
-export IMAGE_BASENAME = "unslung-${IMAGE_VARIANT}"
-
-IPKG_INSTALL = "unslung-${IMAGE_VARIANT}-rootfs \
-		${UNSLUNG_BASE_PACKAGES} ${UNSLUNG_EXTRA_PACKAGES}"
-
-DEPENDS  = "unslung-${IMAGE_VARIANT}-kernel unslung-${IMAGE_VARIANT}-rootfs \
-		${UNSLUNG_BASE_DEPENDS} ${UNSLUNG_EXTRA_DEPENDS}"
-
-RDEPENDS = "${UNSLUNG_BASE_PACKAGES} ${UNSLUNG_EXTRA_RDEPENDS}"
-
-RRECOMMENDS = "${UNSLUNG_EXTRA_RRECOMMENDS}"
-
-IMAGE_PREPROCESS_COMMAND += "unslung_clean_image; "
-		
-inherit image_ipk
-
-# Note that anything in this function must be repeatable without having to rebuild the rootfs
-unslung_clean_image () {
-	# Remove info from the local feed used to build the image
-	rm -f ${IMAGE_ROOTFS}/usr/lib/ipkg/lists/*
-	rm -f ${IMAGE_ROOTFS}/${sysconfdir}/version
-}
-
-python () {
-	# Don't build unslung images unless we're targeting an nslu2
-	mach = bb.data.getVar("MACHINE", d, 1)
-	dist = bb.data.getVar("DISTRO", d, 1)
-	if mach != 'nslu2' or dist != 'unslung':
-		raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
-}
diff --git a/meta/xbase-clients.bb b/meta/xbase-clients.bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/meta/xterminal-image.bb b/meta/xterminal-image.bb
deleted file mode 100644
index e69de29bb2..0000000000
-- 
cgit v1.2.3