From: nslu2-linux.adm@bkbits.net Date: Wed, 29 Dec 2004 19:40:09 +0000 (+0000) Subject: Merge bk://oe-devel.bkbits.net/openembedded X-Git-Tag: Release-2010-05/1~15541 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dded3ca7e0cfceb939bfa91c80ca1f853abce7ae;p=openembedded.git Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2004/12/29 20:07:01+01:00 uni-frankfurt.de!mickeyl use busybox's modutils also for collie 2004/12/29 20:04:33+01:00 uni-frankfurt.de!mickeyl yank the collie specific defconfig for busybox BKrev: 41d30819s-xHH9k9fqmpr7mLgtnWvw --- diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 51304b78d7..c43c70e8f0 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -7,7 +7,7 @@ IPKG_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "openzaurus-sa" BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils hostap-modules-cs orinoco-modules \ +BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules \ sharp-sdmmc-support kernel-module-devinfo kernel-module-gpio kernel-module-net-fd \ kernel-module-registers kernel-module-sa1100-bi kernel-module-usbdcore \ kernel-module-usbdmonitor" diff --git a/packages/busybox/busybox-1.00/collie/defconfig b/packages/busybox/busybox-1.00/collie/defconfig deleted file mode 100644 index e69de29bb2..0000000000