From 05a2fb19f722652c5d13be911b8ed45a264bbb40 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 1 Apr 2014 11:08:58 +0100 Subject: image/image-prelink/image-mklibs/sanity: Drop pointless EXPORT_FUNCTIONS I'm sick of seeing people adding to EXPORT_FUNCTIONS in these classes when they clearly have no idea what it does. Worse, these uses of it are all broken, the naming is incorrect and they do nothing. Lets remove them and try and preserve any remaining part of my sanity. Signed-off-by: Richard Purdie --- meta/classes/image-mklibs.bbclass | 3 --- meta/classes/image-prelink.bbclass | 2 -- meta/classes/image.bbclass | 2 -- meta/classes/sanity.bbclass | 2 -- 4 files changed, 9 deletions(-) diff --git a/meta/classes/image-mklibs.bbclass b/meta/classes/image-mklibs.bbclass index 23456ccd96..11f082b373 100644 --- a/meta/classes/image-mklibs.bbclass +++ b/meta/classes/image-mklibs.bbclass @@ -69,6 +69,3 @@ mklibs_optimize_image() { fi done } - - -EXPORT_FUNCTIONS mklibs_optimize_image diff --git a/meta/classes/image-prelink.bbclass b/meta/classes/image-prelink.bbclass index 53ef47e4d4..d4bb3aec39 100644 --- a/meta/classes/image-prelink.bbclass +++ b/meta/classes/image-prelink.bbclass @@ -31,5 +31,3 @@ prelink_image () { pre_prelink_size=`du -ks ${IMAGE_ROOTFS} | awk '{size = $1 ; print size }'` echo "Size after prelinking $pre_prelink_size." } - -EXPORT_FUNCTIONS prelink_image diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index ea035fe144..32df01d2b3 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -384,8 +384,6 @@ rootfs_sysroot_relativelinks () { sysroot-relativelinks.py ${SDK_OUTPUT}/${SDKTARGETSYSROOT} } -EXPORT_FUNCTIONS zap_empty_root_password remove_init_link do_rootfs make_zimage_symlink_relative set_image_autologin rootfs_update_timestamp rootfs_no_x_startup - do_fetch[noexec] = "1" do_unpack[noexec] = "1" do_patch[noexec] = "1" diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 69d6a246de..dd7fe4cdfb 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -25,8 +25,6 @@ def sanity_conf_update(fn, lines, version_var_name, new_version): with open(fn, "w") as f: f.write(''.join(lines)) -EXPORT_FUNCTIONS bblayers_conf_file sanity_conf_read sanity_conf_find_line sanity_conf_update - # Functions added to this variable MUST throw an exception (or sys.exit()) unless they # successfully changed LCONF_VERSION in bblayers.conf BBLAYERS_CONF_UPDATE_FUNCS += "oecore_update_bblayers" -- cgit 1.2.3-korg