[oe-commits] org.oe.dev klibc: move do_stage to separate inc file. Fixes do_stage failure for klibc-utils-static.

[Laibsch commit]

klibc: move do_stage to separate inc file.  Fixes do_stage failure for klibc-utils-static.

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: dbddf8bfc919a6529b18bff19b2637246b45443e
ViewMTN: http://monotone.openembedded.org/revision/info/dbddf8bfc919a6529b18bff19b2637246b45443e
Files:
1
packages/klibc/klibc.inc
packages/klibc/klibc-common.inc
packages/klibc/klibc-utils-static_1.5.bb
Diffs:

#
# mt diff -rf5ac91666271607b6fb0d8186495c57e9a4c5b01 -rdbddf8bfc919a6529b18bff19b2637246b45443e
#
# 
# 
# rename "packages/klibc/klibc.inc"
#     to "packages/klibc/klibc-common.inc"
# 
# add_file "packages/klibc/klibc.inc"
#  content [cdee53d9d84aed0197c588fae6119d3f6701904c]
# 
# patch "packages/klibc/klibc-common.inc"
#  from [fd7f5701dc639c6532f39f3bc998f5c46e0fa3ad]
#    to [ba81140300a9fbe13c2d1ef4661b42a4368a3b88]
# 
# patch "packages/klibc/klibc-utils-static_1.5.bb"
#  from [f250a8c76095a56a52a612a2671db45d2b74370c]
#    to [41e2472d9b51fdff4af9dcd02e9a0fdc3be79d9f]
# 
============================================================
--- packages/klibc/klibc.inc	cdee53d9d84aed0197c588fae6119d3f6701904c
+++ packages/klibc/klibc.inc	cdee53d9d84aed0197c588fae6119d3f6701904c
@@ -0,0 +1,17 @@
+require klibc-common.inc
+
+STAGING_KLIBC_DIR = "${STAGING_DIR_HOST}/klibc"
+
+do_stage() {
+        rm -rf "${STAGING_KLIBC_DIR}"
+        oe_runmake      'prefix=${STAGING_KLIBC_DIR}' \
+                        'bindir=${STAGING_BINDIR}' \
+                        'mandir=${STAGING_DIR_HOST}${layout_mandir}' \
+                        install
+        # The following is sufficient, at least in klibc 1.1.1 to make klcc
+        # use the staged libraries and include files.
+        sed -i -e 's@^\$prefix = .*$@\$prefix = "${STAGING_KLIBC_DIR}/lib/klibc";@' \
+                '${STAGING_BINDIR}/${TARGET_PREFIX}klcc'
+        # Perhaps other binaries need to be moved to cross?
+        mv '${STAGING_BINDIR}/${TARGET_PREFIX}klcc' '${STAGING_BINDIR_CROSS}'
+}
============================================================
--- packages/klibc/klibc.inc	fd7f5701dc639c6532f39f3bc998f5c46e0fa3ad
+++ packages/klibc/klibc-common.inc	ba81140300a9fbe13c2d1ef4661b42a4368a3b88
@@ -55,22 +55,6 @@ do_configure () {
 	ln -sf ${STAGING_KERNEL_DIR} linux
 }
 
-STAGING_KLIBC_DIR = "${STAGING_DIR_HOST}/klibc"
-
-do_stage() {
-	rm -rf "${STAGING_KLIBC_DIR}"
-	oe_runmake	'prefix=${STAGING_KLIBC_DIR}' \
-			'bindir=${STAGING_BINDIR}' \
-			'mandir=${STAGING_DIR_HOST}${layout_mandir}' \
-			install
-	# The following is sufficient, at least in klibc 1.1.1 to make klcc
-	# use the staged libraries and include files.
-	sed -i -e 's@^\$prefix = .*$@\$prefix = "${STAGING_KLIBC_DIR}/lib/klibc";@' \
-		'${STAGING_BINDIR}/${TARGET_PREFIX}klcc'
-        # Perhaps other binaries need to be moved to cross?
-	mv '${STAGING_BINDIR}/${TARGET_PREFIX}klcc' '${STAGING_BINDIR_CROSS}'
-}
-
 do_install() {
 	# The installed -dev won't work because it has the cross compiler
 	# path compiled in.
============================================================
--- packages/klibc/klibc-utils-static_1.5.bb	f250a8c76095a56a52a612a2671db45d2b74370c
+++ packages/klibc/klibc-utils-static_1.5.bb	41e2472d9b51fdff4af9dcd02e9a0fdc3be79d9f
@@ -1,4 +1,4 @@
-require klibc.inc
+require klibc-common.inc
 
 PR = "r3"