Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/31 23:22:49+02:00 vanille.de!mickeyl
add preferred opie datebook plugin versions

2005/03/31 23:19:30+02:00 vanille.de!mickeyl
collie: build all kernels in one run

BKrev: 424c6e8cYTLkRq_9E743zJclpaqIqw

diff --git a/conf/distro/preferred-opie-versions.inc b/conf/distro/preferred-opie-versions.inc
index 05f1e2e..cbd3356 100644 (file)
--- a/conf/distro/preferred-opie-versions.inc
+++ b/conf/distro/preferred-opie-versions.inc
@@ -41,6 +41,9 @@ PREFERRED_VERSION_opie-console = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-dagger = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-dasher = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-datebook = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-datebook-chrisholidayplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-datebook-nationalholidayplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-datebook-birthdayplugin = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-deco-flat = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-deco-liquid = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-deco-polished = "${OPIE_VERSION}"

diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 737ea4b..90d7ba4 100644 (file)
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -5,7 +5,7 @@
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm ${MACHINE}"
 PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel ?= "openzaurus-sa"
+PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs \
 sharp-sdmmc-support kernel-module-devinfo kernel-module-gpio kernel-module-net-fd \

diff --git a/packages/linux/c7x0-kernels-2.4-embedix.bb b/packages/linux/c7x0-kernels-2.4-embedix.bb
index e69de29..c7081e7 100644 (file)
--- a/packages/linux/c7x0-kernels-2.4-embedix.bb
+++ b/packages/linux/c7x0-kernels-2.4-embedix.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Build all c7x0 kernels in one go"
+SECTION = "kernel"
+LICENSE = "GPL"
+PROVIDES = "virtual/kernel"
+DEPENDS = "corgi-kernel-2.4-embedix shepherd-kernel-2.4-embedix husky-kernel-2.4-embedix"
+
+PACKAGES = ""
+EXCLUDE_FROM_WORLD = "1"
+

diff --git a/packages/linux/collie-kernel-all_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernels-2.4-embedix.bb
similarity index 100%
rename from packages/linux/collie-kernel-all_2.4.18-rmk7-pxa3-embedix20030509.bb
rename to packages/linux/collie-kernels-2.4-embedix.bb