From 6b89cc186f86e4d2b36e94c7fcb0efadcd855cd2 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Thu, 22 Dec 2005 23:02:06 +0000
Subject: Some PACKAGE_ARCH changes to help mutlibuild and misc

git-svn-id: https://svn.o-hand.com/repos/poky@208 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 openembedded/classes/native.bbclass                |  1 +
 openembedded/packages/meta/meta-oh.bb              |  6 ++---
 openembedded/packages/oh/osso-addressbook_0.0.bb   | 29 ----------------------
 .../prism3-support/prism3-support_1.0.0.bb         |  1 +
 openembedded/packages/sysvinit/sysvinit_2.86.bb    |  1 +
 .../packages/zaurus-updater/zaurus-updater.bb      |  1 +
 6 files changed, 6 insertions(+), 33 deletions(-)
 delete mode 100755 openembedded/packages/oh/osso-addressbook_0.0.bb

(limited to 'openembedded')

diff --git a/openembedded/classes/native.bbclass b/openembedded/classes/native.bbclass
index 955a8ae64..f0a77d6e1 100644
--- a/openembedded/classes/native.bbclass
+++ b/openembedded/classes/native.bbclass
@@ -5,6 +5,7 @@ inherit base
 EXCLUDE_FROM_WORLD = "1"
 
 PACKAGES = ""
+PACKAGE_ARCH = "native"
 
 TARGET_ARCH = "${BUILD_ARCH}"
 TARGET_OS = "${BUILD_OS}"
diff --git a/openembedded/packages/meta/meta-oh.bb b/openembedded/packages/meta/meta-oh.bb
index 482e3135e..79e023c82 100644
--- a/openembedded/packages/meta/meta-oh.bb
+++ b/openembedded/packages/meta/meta-oh.bb
@@ -2,7 +2,7 @@ PACKAGES = "oh-base-depends oh-task-base"
 # oh-task-base
 DESCRIPTION = "Meta-package for OpenedHand Palmtop Environment"
 MAINTAINER = "Richard Purdie <richard@openedhand.com>"
-PR = "r18"
+PR = "r19"
 
 ALLOW_EMPTY = "1"
 
@@ -31,7 +31,6 @@ oh-task-base = "\
     chkhinge26 \
     usbinit \
     settings-daemon \
-    minimo \
     gtk+ \
     gtk-clearlooks-engine \
     eds-dbus \
@@ -51,8 +50,7 @@ oh-task-base = "\
     sysfsutils \
     xauth"
 
-#    avahi-daemon \
-#    avahi-dnsconfd \
+#    minimo \
 #    teleport \
 #    xst \
 #    libgtkstylus \
diff --git a/openembedded/packages/oh/osso-addressbook_0.0.bb b/openembedded/packages/oh/osso-addressbook_0.0.bb
deleted file mode 100755
index 6f627bd20..000000000
--- a/openembedded/packages/oh/osso-addressbook_0.0.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ libglade eds-dbus libgalago galago-daemon eds-feed"
-RDEPENDS = "galago-daemon eds-feed"
-PR = "r1"
-
-SRC_URI = "file:///tmp/${PN}-${PV}.tar.gz \
-	   file://stock_contact.png \
-	   file://stock_person.png \
-	   file://index.theme"
-
-inherit autotools pkgconfig
-
-do_install_append () {
-	install -d ${D}/${datadir}/icons/hicolor/48x48/stock/net
-	install -d ${D}/${datadir}/icons/hicolor/48x48/stock/generic
-
-	install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/icons/hicolor/48x48/stock/net
-	install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/icons/hicolor/48x48/stock/generic
-	install -m 0644 ${WORKDIR}/index.theme ${D}/${datadir}/icons/hicolor
-}
-
-FILES_${PN} += "${datadir}/icons/hicolor/48x48/apps/oh-contacts.png \
-		${datadir}/icons/hicolor/48x48/stock/*/*.png \
-		${datadir}/icons/hicolor/index.theme"
-
-pkg_postinst_${PN} () {
-	gtk-update-icon-cache /usr/share/icons/hicolor
-}
-
diff --git a/openembedded/packages/prism3-support/prism3-support_1.0.0.bb b/openembedded/packages/prism3-support/prism3-support_1.0.0.bb
index 762bd01e6..031fdf7e9 100644
--- a/openembedded/packages/prism3-support/prism3-support_1.0.0.bb
+++ b/openembedded/packages/prism3-support/prism3-support_1.0.0.bb
@@ -4,6 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "prism3-firmware hostap-utils"
 RDEPENDS = "prism3-firmware hostap-utils"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+PACKAGE_ARCH = "all"
 PR = "r0"
 
 SRC_URI = "file://hostap-fw-load"
diff --git a/openembedded/packages/sysvinit/sysvinit_2.86.bb b/openembedded/packages/sysvinit/sysvinit_2.86.bb
index 7611d79cd..0a8f78efc 100644
--- a/openembedded/packages/sysvinit/sysvinit_2.86.bb
+++ b/openembedded/packages/sysvinit/sysvinit_2.86.bb
@@ -7,6 +7,7 @@ PR = "r19"
 
 # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.
+PACKAGE_ARCH = "all"
 PACKAGE_ARCH_${PN}-inittab = "${MACHINE_ARCH}"
 
 RDEPENDS_${PN} = "${PN}-inittab"
diff --git a/openembedded/packages/zaurus-updater/zaurus-updater.bb b/openembedded/packages/zaurus-updater/zaurus-updater.bb
index 7707e48ee..ecbf353d2 100644
--- a/openembedded/packages/zaurus-updater/zaurus-updater.bb
+++ b/openembedded/packages/zaurus-updater/zaurus-updater.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
 DEPENDS = "encdec-updater-native"
 LICENSE = "zaurus-updater"
+PACKAGE_ARCH = "${MACHINE}"
 PR = "r2"
 
 SRC_URI = "file://updater.sh \
-- 
cgit v1.2.3