diff options
| author | Philip Balister <philip@balister.org> | 2006-10-19 11:13:32 +0000 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2006-10-19 11:13:32 +0000 |
| commit | 157fcb8d7c3d0c164aa81fd72b676c6620aa252e (patch) | |
| tree | ce079558f5a73ee9cdf34686c22210526d4bbc40 /classes | |
| parent | 435e8d5448a71c761e996bf60410d8e1dc2d6dcc (diff) | |
| parent | 8d4f949be4d1c5ba0bdd81f9bf0426d7c70e59d0 (diff) | |
merge of '4d2506a7328df70c3c1b58a19a5f52a6e6841a91'
and '95790f96b79f6c36ad3f1f583d73e9d450736479'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/module_strip.bbclass | 6 | ||||
| -rw-r--r-- | classes/package.bbclass | 2 | ||||
| -rw-r--r-- | classes/package_ipk.bbclass | 2 | ||||
| -rw-r--r-- | classes/rootfs_ipk.bbclass | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/classes/module_strip.bbclass b/classes/module_strip.bbclass index 116e8b902f..63e6569799 100644 --- a/classes/module_strip.bbclass +++ b/classes/module_strip.bbclass @@ -5,7 +5,11 @@ do_strip_modules () { if test -e ${WORKDIR}/install/$p/lib/modules; then modules="`find ${WORKDIR}/install/$p/lib/modules -name \*${KERNEL_OBJECT_SUFFIX}`" if [ -n "$modules" ]; then - ${STRIP} -v -g $modules + for module in $modules ; do + if ! [ -d "$module" ] ; then + ${STRIP} -v -g $module + fi + done # NM="${CROSS_DIR}/bin/${HOST_PREFIX}nm" OBJCOPY="${CROSS_DIR}/bin/${HOST_PREFIX}objcopy" strip_module $modules fi fi diff --git a/classes/package.bbclass b/classes/package.bbclass index 27d5a3a685..7d3068852f 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -275,7 +275,7 @@ python populate_packages () { for root, dirs, files in os.walk(dvar): for f in files: file = os.path.join(root, f) - if not os.path.islink(file) and isexec(file): + if not os.path.islink(file) and not os.path.isdir(file) and isexec(file): stripfunc += "\trunstrip %s || st=1\n" % (file) if not stripfunc == "": from bb import build diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 0cb5128e17..af6d905490 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -1,6 +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_RDEPENDS += "ipkg-collateral ipkg" PACKAGEFUNCS += "do_package_ipk" python package_ipk_fn () { diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index ae87c2ed2d..8cea393b43 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -17,7 +17,7 @@ do_build[nostamp] = 1 IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS}" -IPKG_INSTALL += "ipkg ipkg-link ipkg-collateral" +IPKG_INSTALL += "ipkg ipkg-collateral" ROOTFS_POSTPROCESS_COMMAND ?= "" |