From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 15 May 2005 06:35:51 +0000 (+0000)
Subject: Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~14162
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d78dc60dc5a3a908c5e3310c94435883261396de;p=openembedded.git

Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/bitkeeper/openembedded

2005/05/14 19:39:49-07:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/15 03:49:57+02:00 handhelds.org!zecke
Aliens has moved the server ftp://ftp.sonic.net/pub/users/nbs/unix/agenda/aliens/src/README.txt

update the SRC_URI to match the new location

2005/05/15 03:42:18+02:00 handhelds.org!zecke
LIRC Kernel Modules:
	Setting TOPDIR this way will occur in a infinite loop
	when bb.data.getVar(..,d,True) (expanding).
	I don't know why TOPDIR is needed, when I found out
	something else will be done...

2005/05/15 03:39:31+02:00 handhelds.org!zecke
OpenSIMpad:
	Include OpenZaurus 3.5.4 for the 0.9.0 release ;)
	(whenever that will be)

BKrev: 4286edc71nvdvgP4yUSyICBhd6IdIQ
---

diff --git a/conf/distro/opensimpad-0.9.0.conf b/conf/distro/opensimpad-0.9.0.conf
index 34fd1106dc..aa39eb2e04 100644
--- a/conf/distro/opensimpad-0.9.0.conf
+++ b/conf/distro/opensimpad-0.9.0.conf
@@ -1,4 +1,4 @@
-include conf/distro/openzaurus-3.5.3.conf
+include conf/distro/openzaurus-3.5.4.conf
 DISTRO = "opensimpad"
 DISTRO_NAME = "OpenSIMpad"
 DISTRO_VERSION = "0.9.0-rc2-${DATE}"
diff --git a/packages/aliens/aliens_1.0.0.bb b/packages/aliens/aliens_1.0.0.bb
index 0c9d21caaa..845eb5a7fc 100644
--- a/packages/aliens/aliens_1.0.0.bb
+++ b/packages/aliens/aliens_1.0.0.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 DEPENDS = "virtual/libqpe libsdl-qpe libsdl-mixer libsdl-image"
 PR = "r2"
 
-SRC_URI = "ftp://ftp.sonic.net/pub/users/nbs/unix/agenda/aliens/src/aliens_V${PV}.tar.gz"
+SRC_URI = "ftp://ftp.billsgames.com/unix/agenda/aliens/src/aliens_V${PV}.tar.gz"
 S = "${WORKDIR}/aliens_V${PV}"
 
 inherit palmtop
diff --git a/packages/lirc/lirc-modules_0.6.6+cvs20040918.bb b/packages/lirc/lirc-modules_0.6.6+cvs20040918.bb
index a23cd4bfb8..632926acd7 100644
--- a/packages/lirc/lirc-modules_0.6.6+cvs20040918.bb
+++ b/packages/lirc/lirc-modules_0.6.6+cvs20040918.bb
@@ -20,8 +20,6 @@ EXTRA_OECONF_append_h3600 = " --with-driver=sa1100 --without-x"
 EXTRA_OECONF_append_beagle = " --with-driver=sa1100 --without-x"
 EXTRA_OECONF_append_simpad = " --with-driver=sa1100 --without-x"
 
-export TOPDIR = "${STAGING_KERNEL_DIR}"
-
 do_compile() {
 	cd drivers && oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}"
 }
diff --git a/packages/lirc/lirc-modules_0.6.6.bb b/packages/lirc/lirc-modules_0.6.6.bb
index 7073bab8d8..cd6b7e406a 100644
--- a/packages/lirc/lirc-modules_0.6.6.bb
+++ b/packages/lirc/lirc-modules_0.6.6.bb
@@ -17,8 +17,6 @@ EXTRA_OECONF_h3600 = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa110
 EXTRA_OECONF_beagle = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
 EXTRA_OECONF_simpad = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
 
-export TOPDIR = "${STAGING_KERNEL_DIR}"
-
 do_compile() {
 	cd drivers && oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}"
 }
diff --git a/packages/lirc/lirc-modules_0.7.0.bb b/packages/lirc/lirc-modules_0.7.0.bb
index fa6cd3ba0b..7e63c561fc 100644
--- a/packages/lirc/lirc-modules_0.7.0.bb
+++ b/packages/lirc/lirc-modules_0.7.0.bb
@@ -19,8 +19,6 @@ EXTRA_OECONF_append_h3600 = " --with-driver=sa1100 --without-x"
 EXTRA_OECONF_append_beagle = " --with-driver=sa1100 --without-x"
 EXTRA_OECONF_append_simpad = " --with-driver=sa1100 --without-x"
 
-export TOPDIR = "${STAGING_KERNEL_DIR}"
-
 do_compile() {
 	cd drivers && oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}"
 }