diff options
| author |   Chris Larson <clarson@kergoth.com> | 2004-11-02 20:10:06 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-02 20:10:06 +0000 |
| commit | 19db883ac9a0a71bb3e875e6cc991baea3a15701 (patch) | |
| tree | af9e6f949528ccbe36aa9f29949efe6dee543ea1 | |
| parent | f9d59090277f62f66eb9b54c84e4c41cab27b812 (diff) | |
| download | openembedded-19db883ac9a0a71bb3e875e6cc991baea3a15701.tar.gz | |
Merge openembedded@openembedded.bkbits.net:packages-devel
into handhelds.org:/home/kergoth/code/packages
2004/11/02 14:08:16-06:00 handhelds.org!kergoth
Prefer module-init-tools-cross for the openslug distro.
2004/11/02 14:06:33-06:00 handhelds.org!kergoth
Add module-init-tools-cross, and create a virtual provider for the cross depmod so that it gets used when appropriate.
BKrev: 4187e99evDd60POax4fUtUHxR0fW7A
| -rw-r--r-- | classes/kernel.oeclass | 2 | ||||
| -rw-r--r-- | conf/distro/openslug.conf | 1 | ||||
| -rw-r--r-- | conf/machine/ipaq-pxa-2.6.conf | 1 | ||||
| -rw-r--r-- | conf/machine/jornada56x.conf | 19 | ||||
| -rw-r--r-- | conf/machine/omap1610h2.conf | 5 | ||||
| -rw-r--r-- | module-init-tools/module-init-tools-cross_3.1-pre5.oe | 0 | ||||
| -rw-r--r-- | modutils/modutils-cross_2.4.27.oe | 4 |
7 files changed, 28 insertions, 4 deletions
diff --git a/classes/kernel.oeclass b/classes/kernel.oeclass index 16236055d6..fc769fac5b 100644 --- a/classes/kernel.oeclass +++ b/classes/kernel.oeclass @@ -1,5 +1,5 @@ PROVIDES += "virtual/kernel" -DEPENDS += "modutils-cross virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules" +DEPENDS += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules" export ARCH = "${TARGET_ARCH}" export OS = "${TARGET_OS}" diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 7bbca480fd..79f9681cbf 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -18,3 +18,4 @@ kernel-module-scsi-mod kernel-module-sd-mod kernel-module-ext3 kernel-module-jbd module-init-tools" PREFERRED_PROVIDER_virtual/kernel ?= "nslu2-openslug" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" diff --git a/conf/machine/ipaq-pxa-2.6.conf b/conf/machine/ipaq-pxa-2.6.conf index 7c48779784..7cde4217aa 100644 --- a/conf/machine/ipaq-pxa-2.6.conf +++ b/conf/machine/ipaq-pxa-2.6.conf @@ -2,6 +2,7 @@ IPKG_ARCHS = "all arm ipaqpxa ${MACHINE}" TARGET_ARCH = arm PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral module-init-tools" BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules modutils-collateral module-init-tools" include conf/machine/handheld-common.conf diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf index e69de29bb2..e7f508b36d 100644 --- a/conf/machine/jornada56x.conf +++ b/conf/machine/jornada56x.conf @@ -0,0 +1,19 @@ +#@TYPE: Machine +#@NAME: HP Jornada 56x +#@DESCRIPTION: Machine configuration for the SA1100 based HP Jornada 56x palmtop computer + +TARGET_ARCH = "arm" +IPKG_ARCHS = "all arm ${MACHINE}" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa-2.6" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" +BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel" +BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules module-init-tools" + +EXTRA_IMAGECMD_jornada56x = "-e 0x40000 -p" + +SERIAL_CONSOLE = "115200 ttySA0" +USE_DEVFS = "1" + +include conf/handheld-common.conf +include conf/tune-strongarm.conf diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf index 04a1c74665..51c9af2126 100644 --- a/conf/machine/omap1610h2.conf +++ b/conf/machine/omap1610h2.conf @@ -6,8 +6,9 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv5te ${MACHINE}" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral" -BOOTSTRAP_EXTRA_RDEPENDS = "modutils-collateral" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" +BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel modutils-collateral" +BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" diff --git a/module-init-tools/module-init-tools-cross_3.1-pre5.oe b/module-init-tools/module-init-tools-cross_3.1-pre5.oe new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/module-init-tools/module-init-tools-cross_3.1-pre5.oe diff --git a/modutils/modutils-cross_2.4.27.oe b/modutils/modutils-cross_2.4.27.oe index 5674061d14..5157ac4132 100644 --- a/modutils/modutils-cross_2.4.27.oe +++ b/modutils/modutils-cross_2.4.27.oe @@ -1,10 +1,12 @@ SECTION = "base" include modutils_${PV}.oe -PR = "r4" +PR = "r5" inherit cross S = "${WORKDIR}/modutils-${PV}" DEPENDS = "patcher-native" PACKAGES = "" +PROVIDES += "virtual/${TARGET_PREFIX}depmod" +DEFAULT_PREFERENCE = "1" SRC_URI += "file://modutils-cross/module.h.diff;patch=1" |