[oe-commits] org.oe.dev packages: Remove various hardcoded staging layout assumptions
rpurdie commit
openembedded-commits at lists.openembedded.org
Sun Nov 18 01:06:18 UTC 2007
packages: Remove various hardcoded staging layout assumptions
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 3cffb6f807f2feecd902f3560cdc3ffe03e58134
ViewMTN: http://monotone.openembedded.org/revision/info/3cffb6f807f2feecd902f3560cdc3ffe03e58134
Files:
1
packages/apr/apr-util_0.9.12.bb
packages/apr/apr-util_1.2.7.bb
packages/asterisk/asterisk_1.2.24.bb
packages/boost/boost_1.33.0.bb
packages/boost/boost_1.33.1.bb
packages/clamav/clamav.inc
packages/duma/duma_2.5.7.bb
packages/enchant/enchant_1.1.3.bb
packages/enchant/enchant_1.2.5.bb
packages/enchant/enchant_1.3.0.bb
packages/file-roller/file-roller_2.6.1.bb
packages/gcalctool/gcalctool_5.5.21.bb
packages/gnome/gnome-desktop_2.10.2.bb
packages/gnome/gnome-desktop_2.16.1.bb
packages/gnome/gnome-desktop_2.18.3.bb
packages/gnome/gnome-desktop_2.7.90.bb
packages/gpdf/gpdf_2.10.0.bb
packages/gpdf/gpdf_2.8.0.bb
packages/gpdf/gpdf_2.8.2.bb
Diffs:
#
# mt diff -r548dc7f04a07aa1efaf73afb1c80fcc5b1a90b38 -r3cffb6f807f2feecd902f3560cdc3ffe03e58134
#
#
#
# patch "packages/apr/apr-util_0.9.12.bb"
# from [bd4d3d0829e9cbdad6d55ceef5a6b5d1e74174a1]
# to [1e12960a70bff1c6523d2f7c2538d715626dd335]
#
# patch "packages/apr/apr-util_1.2.7.bb"
# from [eafdc458a041562fe759adb4eade0a21d4818606]
# to [5bea7d4ba65baaae2f314e0e4725e74384c7d8c6]
#
# patch "packages/asterisk/asterisk_1.2.24.bb"
# from [c63cd54b2a89fcd7568d7662af05fc02b04b29ba]
# to [75b0abfa9a0684f19edd02f4383136655d35b61d]
#
# patch "packages/boost/boost_1.33.0.bb"
# from [8fa8e9505e20c792ddcac30a4b3c8d3d2f8a90fb]
# to [9250e9c2e1581c023e64867372028588784a5709]
#
# patch "packages/boost/boost_1.33.1.bb"
# from [4c47ab85f2b6ad4f19473452638727872754947f]
# to [b7d50805cd778e9f1ace2effa81618d4968d1175]
#
# patch "packages/clamav/clamav.inc"
# from [368bdddd995e9d32e0ae7e3f7dfbde55064ef7b3]
# to [6c1522361fd3f40d78e38a31c594878efbb79141]
#
# patch "packages/duma/duma_2.5.7.bb"
# from [b1ca5760b7d15aded488f0d1f3c54a45f2cb1def]
# to [e1658367dddd38b9789d8f6fef7f6659dc1a06c8]
#
# patch "packages/enchant/enchant_1.1.3.bb"
# from [066e12129a58ae25bbdc077e2f2b44784605261e]
# to [dc93fa3106e9f08fd59eefefc36ed3c9587bfc5f]
#
# patch "packages/enchant/enchant_1.2.5.bb"
# from [5fad4b190e6aa2f74c0ea429a588922845e78f8c]
# to [2a88fd9469d02bbf4cb6eb00004449c32d5fd822]
#
# patch "packages/enchant/enchant_1.3.0.bb"
# from [5d3482f3342a24589afff5f57df432edb1651a94]
# to [985996bbeae0c009a211076b1d413e9f20688e6d]
#
# patch "packages/file-roller/file-roller_2.6.1.bb"
# from [0eacecded1adbf3214e367aefec06fe1c1b671a5]
# to [7952715d413519456cb4f6d28519b49baee68e5b]
#
# patch "packages/gcalctool/gcalctool_5.5.21.bb"
# from [7fda82a461076e663974eb74b248de321e3d9896]
# to [b46fb79589359df12f05088bc49c1977a1fa9e25]
#
# patch "packages/gnome/gnome-desktop_2.10.2.bb"
# from [fe2de0492cdee4337cb21898f2876afb956ecc5b]
# to [9d8ed2560882aa4b8ce7f82115ed70e10d71a9b8]
#
# patch "packages/gnome/gnome-desktop_2.16.1.bb"
# from [aedf2dc2ff050fdb7531f504b91874001a221108]
# to [565cba914027dd074428c1510c94057850e452ca]
#
# patch "packages/gnome/gnome-desktop_2.18.3.bb"
# from [09b25d93e7c51249327663f8ed2786c0475092f4]
# to [ef92f7acaa754891bf23e36646e9c3faa46a8a6c]
#
# patch "packages/gnome/gnome-desktop_2.7.90.bb"
# from [79fdc802317918984cc4746057cce033ecb067c5]
# to [672cf3775b27ea7c0ca4479a528992bf28309f93]
#
# patch "packages/gpdf/gpdf_2.10.0.bb"
# from [62893c96f88dd7d1c1fbb07ca01a8e105bc6e78c]
# to [36e3098d3b9881f45edaca1c5aec8129523bb48b]
#
# patch "packages/gpdf/gpdf_2.8.0.bb"
# from [d41cb3e769026015793aee484042ad628a61482a]
# to [dff9485393917aba43d187f9c22331081f8195be]
#
# patch "packages/gpdf/gpdf_2.8.2.bb"
# from [6acf3349519b5d2b9eb35da96c52d4e713baa00b]
# to [bb25b66636b66a19b50f05a972168d4e2225c134]
#
============================================================
--- packages/apr/apr-util_0.9.12.bb bd4d3d0829e9cbdad6d55ceef5a6b5d1e74174a1
+++ packages/apr/apr-util_0.9.12.bb 1e12960a70bff1c6523d2f7c2538d715626dd335
@@ -9,7 +9,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar
file://gen_uri_delims.patch;patch=1 \
file://uri_delims.h"
-EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
+EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm --with-gdbm=${STAGING_DIR_HOST}${layout_prefix} --with-expat=${STAGING_DIR_HOST}${layout_prefix}"
inherit autotools lib_package binconfig
============================================================
--- packages/apr/apr-util_1.2.7.bb eafdc458a041562fe759adb4eade0a21d4818606
+++ packages/apr/apr-util_1.2.7.bb 5bea7d4ba65baaae2f314e0e4725e74384c7d8c6
@@ -9,10 +9,10 @@ EXTRA_OECONF = "--with-apr=${STAGING_BIN
SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz"
EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm \
- --with-gdbm=${STAGING_DIR}/${HOST_SYS} \
+ --with-gdbm=${STAGING_DIR_HOST}${layout_prefix} \
--without-sqlite2 \
--without-sqlite3 \
- --with-expat=${STAGING_DIR}/${HOST_SYS}"
+ --with-expat=${STAGING_DIR_HOST}${layout_prefix}"
inherit autotools lib_package binconfig
============================================================
--- packages/asterisk/asterisk_1.2.24.bb c63cd54b2a89fcd7568d7662af05fc02b04b29ba
+++ packages/asterisk/asterisk_1.2.24.bb 75b0abfa9a0684f19edd02f4383136655d35b61d
@@ -18,7 +18,7 @@ export CROSS_COMPILE_BIN="${STAGING_BIND
export CROSS_COMPILE="${CCACHE}${HOST_PREFIX}"
export CROSS_COMPILE_BIN="${STAGING_BINDIR_CROSS}"
-export CROSS_COMPILE_TARGET="${STAGING_DIR}/${HOST_SYS}"
+export CROSS_COMPILE_TARGET="${STAGING_DIR_HOST}"
export CROSS_ARCH="Linux"
export CROSS_PROC="${TARGET_ARCH}"
============================================================
--- packages/boost/boost_1.33.0.bb 8fa8e9505e20c792ddcac30a4b3c8d3d2f8a90fb
+++ packages/boost/boost_1.33.0.bb 9250e9c2e1581c023e64867372028588784a5709
@@ -63,7 +63,7 @@ DEPENDS += "python"
#PYTHON_ROOT = "/dev/null"
# to remove the python build
DEPENDS += "python"
-PYTHON_ROOT = "${STAGING_DIR}/${HOST_SYS}"
+PYTHON_ROOT = "${STAGING_DIR_HOST}"
PYTHON_VERSION = "2.4"
PACKAGES += "boost-python"
============================================================
--- packages/boost/boost_1.33.1.bb 4c47ab85f2b6ad4f19473452638727872754947f
+++ packages/boost/boost_1.33.1.bb b7d50805cd778e9f1ace2effa81618d4968d1175
@@ -63,7 +63,7 @@ DEPENDS += "python"
#PYTHON_ROOT = "/dev/null"
# to remove the python build
DEPENDS += "python"
-PYTHON_ROOT = "${STAGING_DIR}/${HOST_SYS}"
+PYTHON_ROOT = "${STAGING_DIR_HOST}"
PYTHON_VERSION = "2.4"
PACKAGES += "boost-python"
============================================================
--- packages/clamav/clamav.inc 368bdddd995e9d32e0ae7e3f7dfbde55064ef7b3
+++ packages/clamav/clamav.inc 6c1522361fd3f40d78e38a31c594878efbb79141
@@ -33,7 +33,7 @@ EXTRA_OECONF = "--disable-clamav \
# Don't check for clamav uid/gid - they don't exist on the host
# Put virus definitions in /var/lib not /usr/lib
EXTRA_OECONF = "--disable-clamav \
- --with-zlib=${STAGING_DIR}/${HOST_SYS} \
+ --with-zlib=${STAGING_DIR_HOST}${layout_prefix} \
--with-libcurl \
--with-dbdir=${localstatedir}/lib/clamav"
============================================================
--- packages/duma/duma_2.5.7.bb b1ca5760b7d15aded488f0d1f3c54a45f2cb1def
+++ packages/duma/duma_2.5.7.bb e1658367dddd38b9789d8f6fef7f6659dc1a06c8
@@ -12,7 +12,7 @@ do_configure () {
do_configure () {
oe_runmake createconf
- qemu-${TARGET_ARCH} -L ${STAGING_DIR}/${HOST_SYS} ./createconf
+ qemu-${TARGET_ARCH} -L ${STAGING_DIR_HOST} ./createconf
}
do_compile () {
============================================================
--- packages/enchant/enchant_1.1.3.bb 066e12129a58ae25bbdc077e2f2b44784605261e
+++ packages/enchant/enchant_1.1.3.bb dc93fa3106e9f08fd59eefefc36ed3c9587bfc5f
@@ -14,10 +14,10 @@ do_stage() {
SRC_URI = "http://download.sourceforge.net/abiword/enchant-1.1.3.tar.gz"
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
+ oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \
bindir=${STAGING_BINDIR} \
includedir=${STAGING_INCDIR} \
libdir=${STAGING_LIBDIR} \
datadir=${STAGING_DATADIR} \
- mandir=${STAGING_DIR}/share/man
+ mandir=${STAGING_DIR_HOST}${layout_mandir}
}
============================================================
--- packages/enchant/enchant_1.2.5.bb 5fad4b190e6aa2f74c0ea429a588922845e78f8c
+++ packages/enchant/enchant_1.2.5.bb 2a88fd9469d02bbf4cb6eb00004449c32d5fd822
@@ -14,15 +14,15 @@ SRC_URI = "http://www.abisource.com/down
SRC_URI = "http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz \
file://configure.patch;patch=1"
-EXTRA_OECONF = "--with-aspell-prefix=${STAGING_DIR}/${HOST_SYS} --enable-aspell --disable-binreloc"
+EXTRA_OECONF = "--with-aspell-prefix=${STAGING_DIR_HOST}${layout_prefix} --enable-aspell --disable-binreloc"
FILES_${PN} = "/usr/bin/* /usr/lib/enchant/*.so /usr/share/enchant /usr/lib/libenchant*.so.*"
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
+ oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \
bindir=${STAGING_BINDIR} \
includedir=${STAGING_INCDIR} \
libdir=${STAGING_LIBDIR} \
datadir=${STAGING_DATADIR} \
- mandir=${STAGING_DIR}/share/man
+ mandir=${STAGING_DIR_HOST}${layout_mandir}
}
============================================================
--- packages/enchant/enchant_1.3.0.bb 5d3482f3342a24589afff5f57df432edb1651a94
+++ packages/enchant/enchant_1.3.0.bb 985996bbeae0c009a211076b1d413e9f20688e6d
@@ -13,7 +13,7 @@ SRC_URI = "http://www.abisource.com/down
SRC_URI = "http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz"
-EXTRA_OECONF = "--with-aspell-prefix=${STAGING_DIR}/${HOST_SYS} --enable-aspell --disable-binreloc"
+EXTRA_OECONF = "--with-aspell-prefix=${STAGING_DIR_HOST}${layout_prefix} --enable-aspell --disable-binreloc"
FILES_${PN} = "/usr/bin/* /usr/lib/enchant/*.so /usr/share/enchant /usr/lib/libenchant*.so.*"
============================================================
--- packages/file-roller/file-roller_2.6.1.bb 0eacecded1adbf3214e367aefec06fe1c1b671a5
+++ packages/file-roller/file-roller_2.6.1.bb 7952715d413519456cb4f6d28519b49baee68e5b
@@ -11,5 +11,5 @@ do_configure_prepend () {
inherit autotools
do_configure_prepend () {
- cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
}
============================================================
--- packages/gcalctool/gcalctool_5.5.21.bb 7fda82a461076e663974eb74b248de321e3d9896
+++ packages/gcalctool/gcalctool_5.5.21.bb b46fb79589359df12f05088bc49c1977a1fa9e25
@@ -14,5 +14,5 @@ do_configure_prepend () {
SRC_URI += "file://noscrollkeeper.patch;patch=1"
do_configure_prepend () {
- cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
}
============================================================
--- packages/gnome/gnome-desktop_2.10.2.bb fe2de0492cdee4337cb21898f2876afb956ecc5b
+++ packages/gnome/gnome-desktop_2.10.2.bb 9d8ed2560882aa4b8ce7f82115ed70e10d71a9b8
@@ -6,10 +6,10 @@ DEPENDS = "gnome-common libgnomeui"
DEPENDS = "gnome-common libgnomeui"
-EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros"
+EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros"
do_configure_prepend () {
- cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
}
do_stage () {
============================================================
--- packages/gnome/gnome-desktop_2.16.1.bb aedf2dc2ff050fdb7531f504b91874001a221108
+++ packages/gnome/gnome-desktop_2.16.1.bb 565cba914027dd074428c1510c94057850e452ca
@@ -11,10 +11,10 @@ EXTRA_OECONF = "--disable-scrollkeeper"
EXTRA_OECONF = "--disable-scrollkeeper"
-EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros"
+EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros"
do_configure_prepend () {
- cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
}
FILES_${PN} += "${datadir}/gnome-about"
============================================================
--- packages/gnome/gnome-desktop_2.18.3.bb 09b25d93e7c51249327663f8ed2786c0475092f4
+++ packages/gnome/gnome-desktop_2.18.3.bb ef92f7acaa754891bf23e36646e9c3faa46a8a6c
@@ -12,7 +12,7 @@ do_configure_prepend () {
EXTRA_OECONF = "--disable-scrollkeeper"
do_configure_prepend () {
- cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
}
FILES_${PN} += "${datadir}/gnome-about"
============================================================
--- packages/gnome/gnome-desktop_2.7.90.bb 79fdc802317918984cc4746057cce033ecb067c5
+++ packages/gnome/gnome-desktop_2.7.90.bb 672cf3775b27ea7c0ca4479a528992bf28309f93
@@ -6,10 +6,10 @@ DEPENDS = "gnome-common libgnomeui"
DEPENDS = "gnome-common libgnomeui"
-EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros"
+EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros"
do_configure_prepend () {
- cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
}
do_stage () {
============================================================
--- packages/gpdf/gpdf_2.10.0.bb 62893c96f88dd7d1c1fbb07ca01a8e105bc6e78c
+++ packages/gpdf/gpdf_2.10.0.bb 36e3098d3b9881f45edaca1c5aec8129523bb48b
@@ -12,5 +12,5 @@ do_configure_prepend () {
EXTRA_OECONF = "--disable-schemas-install"
do_configure_prepend () {
- cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}/help
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}/help
}
============================================================
--- packages/gpdf/gpdf_2.8.0.bb d41cb3e769026015793aee484042ad628a61482a
+++ packages/gpdf/gpdf_2.8.0.bb dff9485393917aba43d187f9c22331081f8195be
@@ -13,5 +13,5 @@ do_configure_prepend () {
file://desktop.patch;patch=1"
do_configure_prepend () {
- cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}/help
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}/help
}
============================================================
--- packages/gpdf/gpdf_2.8.2.bb 6acf3349519b5d2b9eb35da96c52d4e713baa00b
+++ packages/gpdf/gpdf_2.8.2.bb bb25b66636b66a19b50f05a972168d4e2225c134
@@ -12,5 +12,5 @@ do_configure_prepend () {
SRC_URI += "file://aclocal-lossage.patch;patch=1"
do_configure_prepend () {
- cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}/help
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}/help
}
More information about the Openembedded-commits
mailing list