diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-09 19:19:08 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-09 19:19:08 +0000 |
| commit | 45e1048fb2a2fc047c8a903966ca5cc9d1e03112 (patch) | |
| tree | 6f5c507ceb9741a5598d2531b980c2f6d7ddf7f0 /classes | |
| parent | edbb148535f63e58a8e10ed5c68b7aecb983602e (diff) | |
| parent | ce0af9851e5a2231b9ed9fcfecfd10cc4b7794c3 (diff) | |
explicit_merge of '85da89c673cc2faec29d5ea692e6e7638f4c1b5e'
and '5f32961e5d0f4132f4513cbeac7fe59dc5ae5315'
using ancestor ''
to branch 'org.openembedded.dev'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/base.bbclass | 6 | ||||
| -rw-r--r-- | classes/image_ipk.bbclass | 4 | ||||
| -rw-r--r-- | classes/kernel.bbclass | 2 | ||||
| -rw-r--r-- | classes/multimachine.inc | 3 | ||||
| -rw-r--r-- | classes/native.bbclass | 1 | ||||
| -rw-r--r-- | classes/package_ipk.bbclass | 1 |
6 files changed, 10 insertions, 7 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index b0ca9358bd..9b87828594 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -722,9 +722,9 @@ python __anonymous () { pn = bb.data.getVar('PN', d, 1) - cvsdate = bb.data.getVar('CVSDATE_%s' % pn, d, 1) - if cvsdate != None: - bb.data.setVar('CVSDATE', cvsdate, d) + srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1) + if srcdate != None: + bb.data.setVar('SRCDATE', srcdate, d) use_nls = bb.data.getVar('USE_NLS_%s' % pn, d, 1) if use_nls != None: diff --git a/classes/image_ipk.bbclass b/classes/image_ipk.bbclass index 5fdd340673..c2f1c8d682 100644 --- a/classes/image_ipk.bbclass +++ b/classes/image_ipk.bbclass @@ -1,11 +1,15 @@ inherit rootfs_ipk +# We need to follow RDEPENDS and RRECOMMENDS for images +BUILD_ALL_DEPS = "1" + # Images are generally built explicitly, do not need to be part of world. EXCLUDE_FROM_WORLD = "1" USE_DEVFS ?= "0" DEPENDS += "makedevs-native" +PACKAGE_ARCH = "${MACHINE_ARCH}" def get_image_deps(d): import bb diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index ea99ec5401..2f9c65c8dd 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -5,6 +5,8 @@ DEPENDS += "virtual/${TARGET_PREFIX}depmod-${@get_kernelmajorversion('${PV}')} v inherit kernel-arch +PACKAGES_DYNAMIC = "kernel-module-*" + export OS = "${TARGET_OS}" export CROSS_COMPILE = "${TARGET_PREFIX}" KERNEL_IMAGETYPE = "zImage" diff --git a/classes/multimachine.inc b/classes/multimachine.inc deleted file mode 100644 index 1f73ffd30f..0000000000 --- a/classes/multimachine.inc +++ /dev/null @@ -1,3 +0,0 @@ -STAMP = "${TMPDIR}/stamps/${PACKAGE_ARCH}-${HOST_OS}/${PF}" -WORKDIR = "${TMPDIR}/work/${PACKAGE_ARCH}-${HOST_OS}/${PF}" -STAGING_KERNEL_DIR = "${STAGING_DIR}/${PACKAGE_ARCH}-${HOST_OS}/kernel" diff --git a/classes/native.bbclass b/classes/native.bbclass index 955a8ae646..feada55b3d 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -5,6 +5,7 @@ inherit base EXCLUDE_FROM_WORLD = "1" PACKAGES = "" +PACKAGE_ARCH = "${BUILD_ARCH}" TARGET_ARCH = "${BUILD_ARCH}" TARGET_OS = "${BUILD_OS}" diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 6d3e1eb686..a70b1e8cdd 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -1,7 +1,6 @@ inherit package DEPENDS_prepend="${@["ipkg-utils-native ", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}" BOOTSTRAP_EXTRA_RDEPENDS += "ipkg-collateral ipkg ipkg-link" -BOOTSTRAP_EXTRA_DEPENDS += "ipkg-collateral ipkg ipkg-link" PACKAGEFUNCS += "do_package_ipk" python package_ipk_fn () { |