diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-24 17:01:20 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-26 11:25:59 +0100 |
| commit | 491fde8cd3fd493f9fec2fd434fe1be547f66148 (patch) | |
| tree | 9d4be788354ccb51e6d0213bca0a20a56653012d /meta/classes/image.bbclass | |
| parent | 6dc46834c6edaf358c18b26e4304bc9e7413eb60 (diff) | |
| download | openembedded-core-contrib-491fde8cd3fd493f9fec2fd434fe1be547f66148.tar.gz | |
classes: Remove references to _remove in function names since this may become a bitbake keyword
There is a good chance we might want to support a bitbake operator
"_remove" which works in a similar way to _append and _prepend. As
such, we can't use those keywords in function or variable names.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes/image.bbclass')
| -rw-r--r-- | meta/classes/image.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 909702ac23..ea59c36441 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -335,7 +335,7 @@ fakeroot do_rootfs () { fi # remove unneeded packages/files from the final image - rootfs_remove_unneeded + rootfs_uninstall_unneeded insert_feed_uris @@ -497,7 +497,7 @@ rootfs_install_complementary() { fi } -rootfs_remove_unneeded () { +rootfs_uninstall_unneeded () { if ${@base_contains("IMAGE_FEATURES", "package-management", "false", "true", d)}; then if [ -z "$(delayed_postinsts)" ]; then # All packages were successfully configured. @@ -506,7 +506,7 @@ rootfs_remove_unneeded () { if [ -e ${IMAGE_ROOTFS}${sysconfdir}/init.d/run-postinsts ]; then remove_run_postinsts=true fi - rootfs_remove_packages update-rc.d base-passwd ${ROOTFS_BOOTSTRAP_INSTALL} + rootfs_uninstall_packages update-rc.d base-passwd ${ROOTFS_BOOTSTRAP_INSTALL} # Need to remove rc.d files for run-postinsts by hand since opkg won't # call postrm scripts in offline root mode. |