summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-03-03 17:00:58 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-03-03 17:00:58 +0000
commitdc93078f8d7e84148dbea397bcbeaeb2b26000a4 (patch)
treea22f70687d39260ed96c41cb73daefb956fa740d
parent33bcbf5161fd0d6475e0ce44af3344b541d97d51 (diff)
parentd6a003a9b255b4bb4669c5de5b2db1b43a12aa13 (diff)
merge of 6e9e8adcb21fef25823c9f2d82e7207a517c308a
and 93aa2173d41c73ee5f9af3bc402117d7287055c2
-rw-r--r--conf/distro/angstrom.conf4
-rw-r--r--packages/binutils/binutils_csl-arm-20050416.bb4
-rw-r--r--packages/linux/ep93xx-kernel_2.6.15.bb4
3 files changed, 6 insertions, 6 deletions
diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index a68adaae42..916b14d9b9 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -31,8 +31,8 @@ TARGET_FPU = "soft"
PARALLEL_INSTALL_MODULES = "1"
-BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version"
-BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version"
+BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version dropbear sysvinit"
+BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version dropbear sysvinit"
#Name the generated images in a sane way
IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
diff --git a/packages/binutils/binutils_csl-arm-20050416.bb b/packages/binutils/binutils_csl-arm-20050416.bb
index 3dc386f0e9..e6ce5337ae 100644
--- a/packages/binutils/binutils_csl-arm-20050416.bb
+++ b/packages/binutils/binutils_csl-arm-20050416.bb
@@ -10,8 +10,8 @@ PV = "2.15.99+csl-arm+cvs20050416"
PR = "r0"
OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_arm-linux = "1"
-DEFAULT_PREFERENCE_arm-linuxeabi = "1"
+DEFAULT_PREFERENCE_arm-linux = "-1"
+DEFAULT_PREFERENCE_arm-linuxeabi = "-1"
PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
diff --git a/packages/linux/ep93xx-kernel_2.6.15.bb b/packages/linux/ep93xx-kernel_2.6.15.bb
index 46cb819d7d..278ac65caa 100644
--- a/packages/linux/ep93xx-kernel_2.6.15.bb
+++ b/packages/linux/ep93xx-kernel_2.6.15.bb
@@ -1,10 +1,10 @@
DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines"
SECTION = "kernel"
LICENSE = "GPL"
-PR = "r6"
+PR = "r7"
SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
- file://derevo6.diff;patch=1 \
+ http://www.wantstofly.org/~buytenh/ep93xx/derevo10.diff;patch=1 \
"
S = "${WORKDIR}/linux-${PV}"