[oe-commits] org.oe.dev nonworking: Attempt to fix up various random broken staging references whilst in the area

[rpurdie commit]

nonworking: Attempt to fix up various random broken staging references whilst in the area

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 36b72e8f33f6dd01bcc6879e4a6b708d51e40aef
ViewMTN: http://monotone.openembedded.org/revision/info/36b72e8f33f6dd01bcc6879e4a6b708d51e40aef
Files:
1
packages/nonworking/docbook/docbook_4.2.bb
packages/nonworking/lufs/lufs_0.9.7.bb
packages/nonworking/pixdev/pixdev-stable_0.1.bb
packages/nonworking/python/python-gsl_0.2.0.bb
packages/nonworking/xfree86/xfree86_4.3.0.bb
Diffs:

#
# mt diff -r69da36fd53d55b9de609d90365d309d06138ae20 -r36b72e8f33f6dd01bcc6879e4a6b708d51e40aef
#
# 
# 
# patch "packages/nonworking/docbook/docbook_4.2.bb"
#  from [25d8885da2da6f96d18647fbbb1c478aa541d6ec]
#    to [09526fe32fac15a4d24d822262d01fbffc73ff72]
# 
# patch "packages/nonworking/lufs/lufs_0.9.7.bb"
#  from [6f5ee34c6442ab2e18a8889a706ba43158d7dcae]
#    to [67b02154f92c0d03776c3f5e52d4b57e6be28111]
# 
# patch "packages/nonworking/pixdev/pixdev-stable_0.1.bb"
#  from [96db2d0de37847ebafb87aa6fdef43968e60520a]
#    to [40c095b4cbeaf28c97908e780bcbf81d4550ee7e]
# 
# patch "packages/nonworking/python/python-gsl_0.2.0.bb"
#  from [fb8b06179d805122174063255ffbfc640aab3199]
#    to [c5eb46d6e074780c12aca8b5c3b774b2c4c78d57]
# 
# patch "packages/nonworking/xfree86/xfree86_4.3.0.bb"
#  from [aa28d0921f73395ac4b0b7efa141a5b4fd2b546f]
#    to [6f2e341c39d8eb59cf42474fe772bb6ede0308bb]
# 
============================================================
--- packages/nonworking/docbook/docbook_4.2.bb	25d8885da2da6f96d18647fbbb1c478aa541d6ec
+++ packages/nonworking/docbook/docbook_4.2.bb	09526fe32fac15a4d24d822262d01fbffc73ff72
@@ -5,9 +5,9 @@ do_stage () {
 catalog.xml dbcentx.mod dbhierx.mod dbpoolx.mod docbook.dcl docbookx.dtd soextblx.dtd
 
 do_stage () {
-	install -d ${STAGING_DIR}/share/sgml/docbook_${PV}
+	install -d ${STAGING_DATADIR}/sgml/docbook_${PV}
 	for i in ${installfiles}; do
-		install -m 0644 $i ${STAGING_DIR}/share/sgml/docbook_${PV}
+		install -m 0644 $i ${STAGING_DATADIR}/sgml/docbook_${PV}
 	done
 }
 
============================================================
--- packages/nonworking/lufs/lufs_0.9.7.bb	6f5ee34c6442ab2e18a8889a706ba43158d7dcae
+++ packages/nonworking/lufs/lufs_0.9.7.bb	67b02154f92c0d03776c3f5e52d4b57e6be28111
@@ -6,11 +6,10 @@ S = "${WORKDIR}/lufs-${PV}"
 SRC_URI = "${SOURCEFORGE_MIRROR}/lufs/lufs-${PV}.tar.gz"
 S = "${WORKDIR}/lufs-${PV}"
 
-inherit autotools
+inherit autotools module
 
-KERNEL_VERSION = "`cat ${STAGING_DIR}/target/kernel/kernel-version`"
-KERNEL_SOURCE = "`cat ${STAGING_DIR}/target/kernel/kernel-source`"
-KERNEL_PATH = "${STAGING_DIR}/target/kernel"
+KERNEL_SOURCE = "${STAGING_KERNEL_DIR}"
+KERNEL_PATH = "${STAGING_KERNEL_DIR}"
 
-EXTRA_OECONF = " --with-kernel=${KERNEL_VERSION} --with-kheaders=${STAGING_DIR}/target/kernel/include"
+EXTRA_OECONF = " --with-kernel=${KERNEL_VERSION} --with-kheaders=${STAGING_KERNEL_DIR}/include"
 
============================================================
--- packages/nonworking/pixdev/pixdev-stable_0.1.bb	96db2d0de37847ebafb87aa6fdef43968e60520a
+++ packages/nonworking/pixdev/pixdev-stable_0.1.bb	40c095b4cbeaf28c97908e780bcbf81d4550ee7e
@@ -17,7 +17,7 @@ do_compile() {
 	if [ -z "$CONFIG" ]; then CONFIG=defconfig; fi
 
 	oe_runmake $CONFIG
-	oe_runmake MWDIR=${STAGING_DIR}/target/ "TARGET_CROSS=${TARGET_PREFIX}" all
+	oe_runmake MWDIR=${STAGING_DIR_TARGET} "TARGET_CROSS=${TARGET_PREFIX}" all
 }
 
 do_install() {
============================================================
--- packages/nonworking/python/python-gsl_0.2.0.bb	fb8b06179d805122174063255ffbfc640aab3199
+++ packages/nonworking/python/python-gsl_0.2.0.bb	c5eb46d6e074780c12aca8b5c3b774b2c4c78d57
@@ -11,4 +11,4 @@ inherit distutils
 
 inherit distutils
 
+#export STAGING=${STAGING_DIR}
-export STAGING=${STAGING_DIR}
============================================================
--- packages/nonworking/xfree86/xfree86_4.3.0.bb	aa28d0921f73395ac4b0b7efa141a5b4fd2b546f
+++ packages/nonworking/xfree86/xfree86_4.3.0.bb	6f2e341c39d8eb59cf42474fe772bb6ede0308bb
@@ -38,7 +38,7 @@ EXTRA_OEMAKE="-C ${S} CC='${BUILD_CC}' \
 EXTRA_OEMAKE="-C ${S} CC='${BUILD_CC}' \
 	      CROSSCOMPILEDIR='${WORKDIR}/XXcompiler' \
 	      EXTRA_LDOPTIONS='${LDFLAGS}' \
-	      EXTRA_INCLUDES='-I${STAGING_DIR}/target/include' "
+	      EXTRA_INCLUDES='-I${STAGING_INCDIR}' "
 do_compile() {
     sed -e "s/^\#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension.*/\#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension ${FULL_OPTIMIZATION}/" < ${FILESDIR}/host.def > ${S}/config/cf/host.def;