From 3eb6f4614079df0b36b54164d6d6bc34ca7ce9ee Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 26 Jul 2004 22:35:09 +0000 Subject: Merge bk://openembedded@openembedded.bkbits.net/packages into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages 2004/07/27 00:28:12+02:00 vanille.de!mickeyl Merge bk://openembedded@openembedded.bkbits.net/packages into allanon.vanille.de:/usr/local/projects/packages 2004/07/27 00:25:53+02:00 vanille.de!mickeyl reduce duplicated modules in machine configurations 2004/07/26 22:55:52+01:00 nexus.co.uk!pb set DEFAULT_PREFERENCE=1 so that oemake prefers it over version 2.0 2004/07/26 22:08:47+01:00 nexus.co.uk!pb Merge bk://openembedded@openembedded.bkbits.net/packages into workhouse.nexus.co.uk:/home/pb/oe/oe-packages 2004/07/26 22:07:37+01:00 nexus.co.uk!pb update gtk to 2.4.4 2004/07/26 21:48:34+01:00 (none)!pb add --export-dynamic to LDFLAGS 2004/07/26 21:47:42+01:00 (none)!pb set ORBIT_IDL in do_compile BKrev: 4105871divQBk4byqxFye_T1td67Zw --- conf/collie.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'conf/collie.conf') diff --git a/conf/collie.conf b/conf/collie.conf index 17cc50adde..f84f1cd77d 100644 --- a/conf/collie.conf +++ b/conf/collie.conf @@ -8,8 +8,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "openzaurus-sa" BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support" BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support \ -kernel-module-devinfo kernel-module-gpio kernel-module-ip-gre \ -kernel-module-ipip kernel-module-irnet kernel-module-net-fd kernel-module-registers kernel-module-sa1100-bi \ +kernel-module-devinfo kernel-module-gpio kernel-module-net-fd kernel-module-registers kernel-module-sa1100-bi \ kernel-module-usbdcore kernel-module-usbdmonitor " EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" -- cgit v1.2.3