diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-03-31 21:41:32 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-03-31 21:41:32 +0000 |
| commit | dd47bb73357b05e7f165bddd945265ce188a647c (patch) | |
| tree | e56a5264127ea919dc04fd45a9d740f7832f86b7 /conf | |
| parent | ebd7c12f4e761ffb102d23a4b8cc8b176a8a63d6 (diff) | |
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
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/preferred-opie-versions.inc | 3 | ||||
| -rw-r--r-- | conf/machine/collie.conf | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/conf/distro/preferred-opie-versions.inc b/conf/distro/preferred-opie-versions.inc index 05f1e2ebd2..cbd3356ea9 100644 --- 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 737ea4be75..90d7ba4cd6 100644 --- 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 \ |