2 files changed, 8 insertions, 4 deletions

diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
index bae0ace890..5e932051a2 100644
--- a/meta/classes/libc-common.bbclass
+++ b/meta/classes/libc-common.bbclass
@@ -21,3 +21,10 @@ def get_libc_fpu_setting(bb, d):
     if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
         return "--without-fp"
     return ""
+
+python populate_packages_prepend () {
+        if bb.data.getVar('DEBIAN_NAMES', d, 1):
+                bpn = bb.data.getVar('BPN', d, 1)
+                bb.data.setVar('PKG_'+bpn, 'libc6', d)
+                bb.data.setVar('PKG_'+bpn+'-dev', 'libc6-dev', d)
+}
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index ff92afb179..7cfeb7de45 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -369,9 +369,6 @@ python package_do_split_gconvs () {
 # We want to do this indirection so that we can safely 'return'
 # from the called function even though we're prepending
 python populate_packages_prepend () {
-        if bb.data.getVar('DEBIAN_NAMES', d, 1):
-                bpn = bb.data.getVar('BPN', d, 1)
-                bb.data.setVar('PKG_'+bpn, 'libc6', d)
-                bb.data.setVar('PKG_'+bpn+'-dev', 'libc6-dev', d)
         bb.build.exec_func('package_do_split_gconvs', d)
 }
+