[oe-commits] org.oe.dev merge of '425c38aa299f3015ce439347ec5c8736d76b984b'
mickeyl commit
openembedded-commits at lists.openembedded.org
Thu Feb 28 18:29:54 UTC 2008
merge of '425c38aa299f3015ce439347ec5c8736d76b984b'
and '4e11ae888ef9a24373e696b3cd581aab1009b46d'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 9503bc874f8bd12f7abadba4088ffc0a71237cd8
ViewMTN: http://monotone.openembedded.org/revision/info/9503bc874f8bd12f7abadba4088ffc0a71237cd8
Files:
1
classes/distutils.bbclass
classes/package_deb.bbclass
classes/rootfs_deb.bbclass
packages/apt/apt-native_0.6.46.2.bb
packages/apt/apt-native_0.7.2.bb
packages/apt/apt-native_0.7.3.bb
packages/apt/files/apt.conf
packages/ark3116/ark3116_0.4.1.bb
packages/avr-libc/avr-libc_1.0.3.bb
packages/cairo/libsvg-cairo_0.1.5.bb
packages/cairo/libsvg-cairo_0.1.6.bb
packages/cairo/xsvg_cvs.bb
packages/callweaver/callweaver_1.2.0-rc5.bb
packages/dejagnu/dejagnu-qemu_1.0.bb
packages/dtnrg/dtn_2.5.0.bb
packages/emacs/emacs_cvs.bb
packages/enca/enca_1.9.bb
packages/erlang/erlang_R11B.1.bb
packages/fltk/efltk_2.0.7.bb
packages/fltk/fltk_1.1.4.bb
packages/fltk/fltk_1.1.7.bb
packages/fs/fs_cvs.bb
packages/gcc/gcc_4.2.2.bb
packages/gpephone/linphone_1.5.0.bb
packages/gpgme/gpgme.inc
packages/gtk+/gdk-pixbuf_2.10.14.bb
packages/gtk+/gtk+-directfb_2.10.14.bb
packages/gxine/gxine_0.4.1.bb
packages/gxine/gxine_0.4.1enhanced.bb
packages/iperf/iperf_2.0.2.bb
packages/klibc/klibc-common.inc
packages/klibc/klibc-utils-static_1.5.bb
packages/klibc/klibc_1.5.bb
packages/konqueror/konqueror-embedded_20060404.bb
packages/konqueror/konqueror-embedded_20070212.bb
packages/libaio/libaio_0.3.103.bb
packages/libidl/libidl_0.8.2.bb
packages/libidl/libidl_0.8.3.bb
packages/libidl/libidl_0.8.6.bb
packages/libxslt/libxslt_1.1.17.bb
packages/linphone/linphone_1.3.99.8.bb
packages/linphone/linphone_1.6.0.bb
packages/ltrace/ltrace_0.4.bb
packages/maemo/xpext_1.0-5.bb
packages/maemo/xsp_1.0.0-8.bb
packages/mono/mono-mcs-intermediate.inc
packages/mono/mono_1.2.5.1.bb
packages/mono/mono_1.2.6.bb
packages/mono/mono_svn.bb
packages/motion/motion_3.2.9.bb
packages/mpfr/mpfr_2.1.1.bb
packages/mpfr/mpfr_2.3.0.bb
packages/mpfr/mpfr_svn.bb
packages/netatalk/netatalk_2.0.3.bb
packages/pax-utils/pax-utils-native_0.1.13.bb
packages/php/php_5.2.0.bb
packages/pwc/pwc_10.0.12-rc1.bb
packages/python/python-sword_1.5.10.bb
packages/radlib/radlib-mysql.inc
packages/radlib/radlib.inc
packages/roadster/roadster_cvs.bb
packages/skippy/skippy-xd_0.5.0.bb
packages/sox/sox-native_13.0.0.bb
packages/nonworking/ode/files/config.h
packages/nonworking/ode
packages/ode
packages/nonworking/ode/ode_0.8.bb
packages/ode/ode_0.9.bb
packages/nonworking/python/python-pyode_1.2.0.bb
packages/python/python-pyode_1.2.0.bb
Diffs:
#
# mt diff -r425c38aa299f3015ce439347ec5c8736d76b984b -r9503bc874f8bd12f7abadba4088ffc0a71237cd8
#
#
#
# patch "classes/distutils.bbclass"
# from [d6701363cef5b26ab81a90ffc863f5ea8686cb17]
# to [49bfc630952f23c8efac7ba9a7aaeafae466b739]
#
# patch "classes/package_deb.bbclass"
# from [7d3c717409e185acf693d9654d2623edca784403]
# to [e1c18789aa0e0ad6a1e1faafbefb41e9b69e22de]
#
# patch "classes/rootfs_deb.bbclass"
# from [e8db3994e43f6306e9aa0a2b2d8c58e06e87b803]
# to [1c50f0fcce662bacf2c6333a068ce2d725a9a0fa]
#
# patch "packages/apt/apt-native_0.6.46.2.bb"
# from [4fff433a631dd3b390cedffba74b1a4f6e27c067]
# to [df9f37be753866b1cc3ed597d51f32c1b95bfb30]
#
# patch "packages/apt/apt-native_0.7.2.bb"
# from [df9f37be753866b1cc3ed597d51f32c1b95bfb30]
# to [8dc4f447d98f36e642ab9f2f30fcdbee93e157fa]
#
# patch "packages/apt/apt-native_0.7.3.bb"
# from [8dc4f447d98f36e642ab9f2f30fcdbee93e157fa]
# to [b0989d5e0870cc4e217b461d8365a97faa3193c6]
#
# patch "packages/apt/files/apt.conf"
# from [efa1759f4e7e6b32306177bf4462c89759ca5466]
# to [53637caf02a561e87535f655e947e10993c4bc70]
#
# patch "packages/ark3116/ark3116_0.4.1.bb"
# from [04996cc8748fe065be0d70923860ea32a7fd81d2]
# to [6ac28543ae169d37814cf2c5863fc01180ddf41d]
#
# patch "packages/avr-libc/avr-libc_1.0.3.bb"
# from [de1ab5e8d135cb9b2e6fafd9253f7d65d74151fb]
# to [c7dbef3e514cedaaf18335bbd739278f8f2d79a6]
#
# patch "packages/cairo/libsvg-cairo_0.1.5.bb"
# from [c103a6b5a1b193ea2b8baa69dc64ebf41b4ba82c]
# to [2342da555afcfaa93d231b96f50d93fad186238f]
#
# patch "packages/cairo/libsvg-cairo_0.1.6.bb"
# from [c103a6b5a1b193ea2b8baa69dc64ebf41b4ba82c]
# to [2342da555afcfaa93d231b96f50d93fad186238f]
#
# patch "packages/cairo/xsvg_cvs.bb"
# from [91e1f5b0f3a663b0b9a713d6508ef424b457bf51]
# to [af92015dc1d92c9546d8696e6a31762d56879bb2]
#
# patch "packages/callweaver/callweaver_1.2.0-rc5.bb"
# from [ee0289ba433af46423d96382dc196aed501bbf1c]
# to [bf883304dc67e8c662b012b40c85817b528b5d3f]
#
# patch "packages/dejagnu/dejagnu-qemu_1.0.bb"
# from [0d9481f4a17574b3bc6f890b7370c32f579003c2]
# to [683934095c162c68f0ec5b88e056abf9dfa0ba9c]
#
# patch "packages/dtnrg/dtn_2.5.0.bb"
# from [f21e25b094f74aa1f1eba88ec1f6bcec6045077c]
# to [6269e792c57585a4f83b60ebe3aea65892143a86]
#
# patch "packages/emacs/emacs_cvs.bb"
# from [3aa46cad86255469e86d4335acb761ff26758023]
# to [3fcedbded9691ac85cd689abebc51f2417dc8fe0]
#
# patch "packages/enca/enca_1.9.bb"
# from [3f45d7d5c08af642979d6f00e1d4be738432916d]
# to [170a34fe65ffa5b756fb8a3ab945554409d7a1cd]
#
# patch "packages/erlang/erlang_R11B.1.bb"
# from [c84ac3e81c188f042c98ad27b508cb06878e37a6]
# to [490ef18f3db5feb8c2445fc922367910ed3b7783]
#
# patch "packages/fltk/efltk_2.0.7.bb"
# from [517c26248bfb9ee15cc164e0da939463e64635a8]
# to [79d1a33551c1b4c7394a632b7cc17de4bd2fd8c2]
#
# patch "packages/fltk/fltk_1.1.4.bb"
# from [292166784a0c981ed94808f8a64a67b60f9e35de]
# to [f3c382c40d107d7ae0ea8e1a5b92509c408fe1d6]
#
# patch "packages/fltk/fltk_1.1.7.bb"
# from [99b678ebac0256b01c297a4e03010519c10ad456]
# to [635fae23fe9dbb018af5f7fd420bbc8bad04517d]
#
# patch "packages/fs/fs_cvs.bb"
# from [4288e0c0653dc6991cf3a74d0494825ac9a5881e]
# to [39e4e44f7e1e94367611e6d619f4d13d1c38b5d7]
#
# patch "packages/gcc/gcc_4.2.2.bb"
# from [71f991a05f98b5c132567ed6c4ab496016222a4f]
# to [8fcbf0f98f7f23e93b4fb6bb643e11c81f1390e1]
#
# patch "packages/gpephone/linphone_1.5.0.bb"
# from [06011c047a001c6f25d8e4f565fb3ed2e25f7595]
# to [31e3201cfed20ecfce70a2e1c67934d800bc60c8]
#
# patch "packages/gpgme/gpgme.inc"
# from [b13cccb8a5bee784f86c9e8c266b18f6ca87022b]
# to [36ab592ddc0e1147ff7e3515f783b2f135903201]
#
# patch "packages/gtk+/gdk-pixbuf_2.10.14.bb"
# from [3f4ef78e369b41a0f8ccf8a4fe57f2e72ec08eac]
# to [ebc41824dadf597017213572755b0ea3d91f3acf]
#
# patch "packages/gtk+/gtk+-directfb_2.10.14.bb"
# from [adc3811f8a8a931557ef718a1d4b7cd23c8c11b6]
# to [9203ff8df91c8dd6af8c33efab6b8db7a66b8e57]
#
# patch "packages/gxine/gxine_0.4.1.bb"
# from [8960aa965527e6ef1a77efb0878e52138f66b7a4]
# to [66166c308e1752f6ae6835f1d50699c6592c9240]
#
# patch "packages/gxine/gxine_0.4.1enhanced.bb"
# from [7cd9d8702ca855a7b74febcbb2fb51bc4125c99a]
# to [3190f0f6048ed1a8ccf3aa6ccd93c96a4ead8f8f]
#
# patch "packages/iperf/iperf_2.0.2.bb"
# from [b6633a4674fceed57eca90e36124712ee4b61f3b]
# to [734e01b1f57953ae5be6c6e3d03456b3e11ff055]
#
# patch "packages/klibc/klibc-common.inc"
# from [d9cdde96fbe760ebc175aebd4671ee242e8abda3]
# to [c83aa430eb84f4c651df612010e2a39dd0618978]
#
# patch "packages/klibc/klibc-utils-static_1.5.bb"
# from [916360409c4a5217a7e3e90b9db1cd0c130af357]
# to [6d2d420a0b2f43a2d038f7d5b75564165b76ee2b]
#
# patch "packages/klibc/klibc_1.5.bb"
# from [db997233fef8b6147bfeef57ccb19e974a588240]
# to [70298950d40373a0bcad5610382718d352e6b930]
#
# patch "packages/konqueror/konqueror-embedded_20060404.bb"
# from [a95f7772113b22b1006258f45427849bb88ac5c9]
# to [4bd4dc00d00146a5c592875e547e7e81a174c825]
#
# patch "packages/konqueror/konqueror-embedded_20070212.bb"
# from [4b7b9152573fa0cb5af1e59387644f90358278dc]
# to [6e24fc121d123e76770ab74b853705ff5b790e98]
#
# patch "packages/libaio/libaio_0.3.103.bb"
# from [b9249381e7085f91ba58f1d33331200d3e448453]
# to [7f98e68099436c29270432af2bca0e073342245b]
#
# patch "packages/libidl/libidl_0.8.2.bb"
# from [47b65ec54de51f2335aa15ccfe234573e440340b]
# to [04b0aad36b91521563e15a8f7552fe71538ace92]
#
# patch "packages/libidl/libidl_0.8.3.bb"
# from [f9b5001826fe50bcdf2155f21a642d82e544bda3]
# to [3fd7da06c7073aaedd836974389d20d4d6e09ca3]
#
# patch "packages/libidl/libidl_0.8.6.bb"
# from [78196c500e6ee0fe8e7a475ab000ee657e43ff71]
# to [8f435cc271fab3eb7b68ccffd543e049e178b89e]
#
# patch "packages/libxslt/libxslt_1.1.17.bb"
# from [930ca00ca2f48ef84fb13e81cfcb4504680eb6c9]
# to [1961b7bc9bcf1d42fe3e6eb34691f7286b23107b]
#
# patch "packages/linphone/linphone_1.3.99.8.bb"
# from [075eb2f5c3aa3300f3343660141883a32e4e68dc]
# to [fadf3dd56dd5deef9baecbcf9a52ac8bca0e4646]
#
# patch "packages/linphone/linphone_1.6.0.bb"
# from [12fa57bdfc35f887f98bd8c835b566f34d02f011]
# to [8fdd4b224bf78001766099eb55bca18c72875d94]
#
# patch "packages/ltrace/ltrace_0.4.bb"
# from [0afb57078b5e4b319c5c6f3b602321bf65f6ea65]
# to [6e2c3ad590a42759e1095fd40763189000dc02d1]
#
# patch "packages/maemo/xpext_1.0-5.bb"
# from [57bd673cacfc8db18925885216e8e5e57f44b5be]
# to [f3a84714123f09b46679b12df43e6b83bfb3e01e]
#
# patch "packages/maemo/xsp_1.0.0-8.bb"
# from [d9a79489682141e292a24eba759a7cc8149700b9]
# to [ac99c39e28167509baa24b93d94cf785601ee73a]
#
# patch "packages/mono/mono-mcs-intermediate.inc"
# from [ece31464cff70bcaf69ba895f3b5b45659766426]
# to [7ccec4b4eee7517e65523bdf392cf961af742077]
#
# patch "packages/mono/mono_1.2.5.1.bb"
# from [0b3b8556d5b81453367c1df8e20663e5aa98052b]
# to [90bf83b28039fb40c1c7321f8cfbe6f54992f1cc]
#
# patch "packages/mono/mono_1.2.6.bb"
# from [642bc86c2b995b52f4648891b36cbb23eade40f3]
# to [47430fd0bacec1d9051c321cb9e732ff464aaa8a]
#
# patch "packages/mono/mono_svn.bb"
# from [3328353eac6d44a486ea3348fd54ebaebde29a22]
# to [f23d529d8625d39cc83c06bf21302f6a314341fe]
#
# patch "packages/motion/motion_3.2.9.bb"
# from [a4694608f643db6102bb78cb3e161b72f0e5a5f5]
# to [6ee124c5a1433238d4ff9e8f20ca72f7cb218fe0]
#
# patch "packages/mpfr/mpfr_2.1.1.bb"
# from [b78e94d2b43763f6e47c6d80d1253e12cdd7be4a]
# to [513e45de2002bc218ebb071530576e44ba9b4706]
#
# patch "packages/mpfr/mpfr_2.3.0.bb"
# from [6b48dfd071b1323f69f1aa09faf6ac6a3ab1a06f]
# to [b20fb238456f28535fb57b617caa5604cb87c127]
#
# patch "packages/mpfr/mpfr_svn.bb"
# from [bc40031a3b64de197388fcd8523b7442272a8873]
# to [8a57dfe812c56c5686cbff3026c2f1ceb1689f4b]
#
# patch "packages/netatalk/netatalk_2.0.3.bb"
# from [7ede53ec4a1d181c30789368b6a67f4163abf5d4]
# to [5c5d78936d965df7e139347c3b831c695e84a7f9]
#
# patch "packages/pax-utils/pax-utils-native_0.1.13.bb"
# from [d6f85d4805d38c1ecc0f4a1974444380619ed152]
# to [2769fe2cff5308efab9484c95ee1a94398cd2fa4]
#
# patch "packages/php/php_5.2.0.bb"
# from [a163ebe31efaf24ca70addf00fa32e5b9c85c89a]
# to [3c1f63cc7326dce0a534438bf37d88728f3048ec]
#
# patch "packages/pwc/pwc_10.0.12-rc1.bb"
# from [4e196bbd4879815efc74f59f9e3a1400ef65efc0]
# to [8b342c8d986eef894c9bd0078a375b9a2d21727e]
#
# patch "packages/python/python-sword_1.5.10.bb"
# from [73eb9b115d9b21296ba5df9e59506f3079400369]
# to [27131c1232e8e3161793c5807f692e05fd813591]
#
# patch "packages/radlib/radlib-mysql.inc"
# from [4ca3a9d43e735173c035e6d6a0970e8211040c09]
# to [d26d9ea097fcd700f44eea49fa844a8a436c133a]
#
# patch "packages/radlib/radlib.inc"
# from [022eda6c17dfe20004396c7b23362d65803c3503]
# to [c9156d913a06422e4c0da7414223276d6146897b]
#
# patch "packages/roadster/roadster_cvs.bb"
# from [f4155fbfca56cff5d579af457509f0d502da631b]
# to [594db1cb996e505c3b14f62eb3a48b5271d8d401]
#
# patch "packages/skippy/skippy-xd_0.5.0.bb"
# from [c0f9fbe37575c1403a668c8e05fe6ffe5d45d4af]
# to [ff5208f6fdc7c8dc791b90771c6923e51fa6011e]
#
# patch "packages/sox/sox-native_13.0.0.bb"
# from [e68db293ebf4ade3f81ddca28a1397483e646eab]
# to [9568812c2cfbd7569af7f233013e4386ec7f32d6]
#
============================================================
--- classes/distutils.bbclass d6701363cef5b26ab81a90ffc863f5ea8686cb17
+++ classes/distutils.bbclass 49bfc630952f23c8efac7ba9a7aaeafae466b739
@@ -13,16 +13,15 @@ distutils_stage_headers() {
}
distutils_stage_headers() {
- install -d ${STAGING_DIR_HOST}${layout_prefix}/lib/${PYTHON_DIR}/site-packages
+ install -d ${STAGING_DIR_HOST}${layout_libdir}/${PYTHON_DIR}/site-packages
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
oefatal "python setup.py install_headers execution failed."
}
distutils_stage_all() {
- install -d ${STAGING_DIR_HOST}${layout_prefix}/lib/${PYTHON_DIR}/site-packages
- # is this missing a lib below?
- PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \
+ install -d ${STAGING_DIR_HOST}${layout_libdir}/${PYTHON_DIR}/site-packages
+ PYTHONPATH=${STAGING_DIR_HOST}${layout_libdir}/${PYTHON_DIR}/site-packages \
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
oefatal "python setup.py install (stage) execution failed."
============================================================
--- classes/package_deb.bbclass 7d3c717409e185acf693d9654d2623edca784403
+++ classes/package_deb.bbclass e1c18789aa0e0ad6a1e1faafbefb41e9b69e22de
@@ -28,7 +28,7 @@ python do_package_deb_install () {
pkgfn = bb.data.getVar('PKGFN', d, 1)
rootfs = bb.data.getVar('IMAGE_ROOTFS', d, 1)
debdir = bb.data.getVar('DEPLOY_DIR_DEB', d, 1)
- stagingdir = bb.data.getVar('STAGING_DIR', d, 1)
+ apt_config = bb.data.expand('${STAGING_ETCDIR_NATIVE}/apt/apt.conf', d)
stagingbindir = bb.data.getVar('STAGING_BINDIR_NATIVE', d, 1)
tmpdir = bb.data.getVar('TMPDIR', d, 1)
@@ -55,7 +55,7 @@ python do_package_deb_install () {
# Set up environment
apt_config_backup = os.getenv('APT_CONFIG')
- os.putenv('APT_CONFIG', os.path.join(stagingdir, 'etc', 'apt', 'apt.conf'))
+ os.putenv('APT_CONFIG', apt_config)
path = os.getenv('PATH')
os.putenv('PATH', '%s:%s' % (stagingbindir, os.getenv('PATH')))
============================================================
--- classes/rootfs_deb.bbclass e8db3994e43f6306e9aa0a2b2d8c58e06e87b803
+++ classes/rootfs_deb.bbclass 1c50f0fcce662bacf2c6333a068ce2d725a9a0fa
@@ -10,12 +10,8 @@ fakeroot rootfs_deb_do_rootfs () {
mkdir -p ${IMAGE_ROOTFS}/var/dpkg/info
mkdir -p ${IMAGE_ROOTFS}/var/dpkg/updates
- mkdir -p ${STAGING_ETCDIR_NATIVE}/apt/
-
rm -f ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev
rm -f ${STAGING_ETCDIR_NATIVE}/apt/preferences
- > ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev
- > ${STAGING_ETCDIR_NATIVE}/apt/preferences
> ${IMAGE_ROOTFS}/var/dpkg/status
> ${IMAGE_ROOTFS}/var/dpkg/available
# > ${STAGING_DIR}/var/dpkg/status
@@ -40,9 +36,9 @@ fakeroot rootfs_deb_do_rootfs () {
priority=$(expr $priority + 5)
done
- tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_DIR}/etc/apt/sources.list
+ tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_ETCDIR_NATIVE}/apt/sources.list
- cat "${STAGING_DIR}/etc/apt/apt.conf.sample" \
+ cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \
| sed -e 's#Architecture ".*";#Architecture "${TARGET_ARCH}";#' \
> "${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf"
============================================================
--- packages/apt/apt-native_0.6.46.2.bb 4fff433a631dd3b390cedffba74b1a4f6e27c067
+++ packages/apt/apt-native_0.6.46.2.bb df9f37be753866b1cc3ed597d51f32c1b95bfb30
@@ -1,4 +1,5 @@ require apt-native.inc
require apt-native.inc
+PR = "r1"
SRC_URI += "file://nodoc.patch;patch=1 \
file://noconfigure.patch;patch=1"
============================================================
--- packages/apt/apt-native_0.7.2.bb df9f37be753866b1cc3ed597d51f32c1b95bfb30
+++ packages/apt/apt-native_0.7.2.bb 8dc4f447d98f36e642ab9f2f30fcdbee93e157fa
@@ -1,5 +1,5 @@ require apt-native.inc
require apt-native.inc
-PR = "r1"
+PR = "r2"
SRC_URI += "file://nodoc.patch;patch=1 \
file://noconfigure.patch;patch=1"
============================================================
--- packages/apt/apt-native_0.7.3.bb 8dc4f447d98f36e642ab9f2f30fcdbee93e157fa
+++ packages/apt/apt-native_0.7.3.bb b0989d5e0870cc4e217b461d8365a97faa3193c6
@@ -1,5 +1,5 @@ require apt-native.inc
require apt-native.inc
-PR = "r2"
+PR = "r3"
SRC_URI += "file://nodoc.patch;patch=1 \
file://noconfigure.patch;patch=1"
============================================================
--- packages/apt/files/apt.conf efa1759f4e7e6b32306177bf4462c89759ca5466
+++ packages/apt/files/apt.conf 53637caf02a561e87535f655e947e10993c4bc70
@@ -1,4 +1,4 @@
-Dir "${STAGING_DIR}/"
+Dir "${STAGING_DIR_NATIVE}/"
{
State "var/lib/apt/"
{
============================================================
--- packages/ark3116/ark3116_0.4.1.bb 04996cc8748fe065be0d70923860ea32a7fd81d2
+++ packages/ark3116/ark3116_0.4.1.bb 6ac28543ae169d37814cf2c5863fc01180ddf41d
@@ -25,8 +25,8 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}'
'LD=${KERNEL_LD}' \
'KDIR=${STAGING_KERNEL_DIR}'"
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
- -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
+export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \
+ -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir}"
do_install() {
install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/serial
============================================================
--- packages/avr-libc/avr-libc_1.0.3.bb de1ab5e8d135cb9b2e6fafd9253f7d65d74151fb
+++ packages/avr-libc/avr-libc_1.0.3.bb c7dbef3e514cedaaf18335bbd739278f8f2d79a6
@@ -22,12 +22,13 @@ do_stage () {
exec_prefix = "${prefix}"
do_stage () {
-# install into CROSS_DIR
+ # install into CROSS_DIR
oe_runmake install
-# install into STAGING_DIR
- oe_runmake "prefix=${STAGING_DIR}" "exec_prefix=${STAGING_DIR}" \
+ # install into staging
+ oe_runmake "prefix=${STAGING_DIR_HOST}${layout_prefix}" \
+ "exec_prefix=${STAGING_DIR_HOST}${layout_exec_prefix}" \
"bindir=${STAGING_BINDIR}" "libdir=${STAGING_LIBDIR}" \
- "tooldir=${STAGING_DIR}" "toolibdir=${STAGING_LIBDIR}" \
+ "tooldir=${STAGING_DIR_HOST}" "toolibdir=${STAGING_LIBDIR}" \
install
}
============================================================
--- packages/cairo/libsvg-cairo_0.1.5.bb c103a6b5a1b193ea2b8baa69dc64ebf41b4ba82c
+++ packages/cairo/libsvg-cairo_0.1.5.bb 2342da555afcfaa93d231b96f50d93fad186238f
@@ -9,5 +9,5 @@ do_stage () {
inherit autotools pkgconfig
do_stage () {
- oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+ autotools_stage_all
}
==============%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r4e11ae888ef9a24373e696b3cd581aab1009b46d -r9503bc874f8bd12f7abadba4088ffc0a71237cd8
#
#
#
# delete "packages/nonworking/ode/files/config.h"
#
# rename "packages/nonworking/ode"
# to "packages/ode"
#
# rename "packages/nonworking/ode/ode_0.8.bb"
# to "packages/ode/ode_0.9.bb"
#
# rename "packages/nonworking/python/python-pyode_1.2.0.bb"
# to "packages/python/python-pyode_1.2.0.bb"
#
# patch "packages/python/python-pyode_1.2.0.bb"
# from [3155048f4bd919058e947897229b986de8dc0f32]
# to [bf3b13da6e975ed6d75126769a45a9b6f8281d6c]
#
============================================================
--- packages/nonworking/python/python-pyode_1.2.0.bb 3155048f4bd919058e947897229b986de8dc0f32
+++ packages/python/python-pyode_1.2.0.bb bf3b13da6e975ed6d75126769a45a9b6f8281d6c
@@ -6,7 +6,8 @@ SRCNAME = "PyODE"
DEPENDS = "ode"
SRCNAME = "PyODE"
-SRC_URI = "${SOURCEFORGE_MIRROR}/pyode/${SRCNAME}-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/pyode/${SRCNAME}-${PV}.tar.bz2 \
+ file://install.patch;patch=1"
S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit distutils
More information about the Openembedded-commits
mailing list