mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-07-16 15:57:04 +00:00
Code Issues Projects Releases Wiki Activity

classes: Remove references to _remove in function names since this may become a bitbake keyword

Browse Source 
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.

(From OE-Core rev: 491fde8cd3fd493f9fec2fd434fe1be547f66148)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2013-08-24 17:01:20 +01:00
parent 3883187066
commit 93ec1e347c
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/image.bbclass
+3 -3
View File
@@ -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.