diff options
| author |   Holger Freyther <zecke@selfish.org> | 2006-04-30 10:01:45 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-30 10:01:45 +0000 |
| commit | b895e2755f42577924d1f36a4338ba73c3c29f19 (patch) | |
| tree | 3203f6597e7532350c41e29fa6663d4c74ec354a /classes | |
| parent | 455b85596c1ea553b6b0608f4aa07cce828e7c4f (diff) | |
| parent | 490b82fb4d496a554102f186e9b6f0d7a0e2197e (diff) | |
| download | openembedded-b895e2755f42577924d1f36a4338ba73c3c29f19.tar.gz | |
merge of 206b62d33d8fadd9502205340feea3a4daeadab2
and c1af7d38a30e0ddecb5419ddff4da1059d587a73
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/kernel.bbclass | 5 | ||||
| -rw-r--r-- | classes/package.bbclass | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index c5f667747c..ab8c03014f 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -194,7 +194,7 @@ ALLOW_EMPTY_kernel-image = "1" pkg_postinst_modules () { if [ -n "$D" ]; then - ${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_RELEASE} ${KERNEL_VERSION} + ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_RELEASE} ${KERNEL_VERSION} else depmod -A update-modules || true @@ -262,8 +262,9 @@ python populate_packages_prepend () { kernelver_stripped = m.group(1) path = bb.data.getVar("PATH", d, 1) host_prefix = bb.data.getVar("HOST_PREFIX", d, 1) or "" + major_version = bb.data.getVar('KERNEL_MAJOR_VERSION', d, 1) - cmd = "PATH=\"%s\" %sdepmod -n -a -r -b %s -F %s/boot/System.map-%s %s" % (path, host_prefix, dvar, dvar, kernelver, kernelver_stripped) + cmd = "PATH=\"%s\" %sdepmod-%s -n -a -r -b %s -F %s/boot/System.map-%s %s" % (path, host_prefix, major_version, dvar, dvar, kernelver, kernelver_stripped) f = os.popen(cmd, 'r') deps = {} diff --git a/classes/package.bbclass b/classes/package.bbclass index d32cf53828..97e091c254 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -241,6 +241,14 @@ python populate_packages () { return 0 return (s[stat.ST_MODE] & stat.S_IEXEC) + # Sanity check PACKAGES for duplicates - should be moved to + # sanity.bbclass once we have he infrastucture + pkgs = [] + for pkg in packages.split(): + if pkg in pkgs: + bb.error("%s is listed in PACKAGES mutliple times. Undefined behaviour will result." % pkg) + pkgs += pkg + for pkg in packages.split(): localdata = bb.data.createCopy(d) root = os.path.join(workdir, "install", pkg) |