[oe-commits] org.oe.dev merge of 'bd40bda8858164c7f6d35494b85fbc1df9474e4d'
mickeyl commit
oe at amethyst.openembedded.net
Sun Jul 20 13:26:42 UTC 2008
merge of 'bd40bda8858164c7f6d35494b85fbc1df9474e4d'
and 'e73a25058e540cd7bb73833d96eb62b9a797b637'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 1979059342fd0fe3a4faa80a3628242cbb830d11
ViewMTN: http://monotone.openembedded.org/revision/info/1979059342fd0fe3a4faa80a3628242cbb830d11
Files:
1
packages/dfu-util/dfu-util-native_svn.bb
packages/dfu-util/dfu-util_svn.bb
classes/multimachine.bbclass
packages/freesmartphone/frameworkd/magician
packages/opkg-utils
classes/singlemachine.bbclass
packages/alsa/alsa-lib/fix_libmath.patch
packages/alsa/alsa-versym.inc
packages/freesmartphone/frameworkd/magician/frameworkd.conf
packages/opkg-utils/opkg-utils-native_svn.bb
packages/opkg-utils/opkg-utils_svn.bb
packages/pulseaudio/pulseaudio-0.9.10/libiconv.patch
classes/base.bbclass
classes/packaged-staging.bbclass
conf/bitbake.conf
conf/distro/celinux-test.conf
conf/distro/include/angstrom.inc
conf/distro/include/oplinux.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/include/slugos.inc
conf/distro/jlime-donkey.conf
conf/distro/jlime-henchman.conf
conf/distro/jlime-mongo.conf
conf/distro/minimal.conf
conf/distro/openprotium.conf
conf/machine/h6300.conf
conf/machine/htckaiser.conf
conf/machine/include/tune-arm1136jf-s.inc
conf/machine/include/tune-arm920t.inc
conf/machine/include/tune-arm926ejs.inc
conf/machine/include/tune-arm9tdmi.inc
conf/machine/include/tune-armv7.inc
conf/machine/include/tune-at32ap7000.inc
conf/machine/include/tune-athlonmp.inc
conf/machine/include/tune-c3.inc
conf/machine/include/tune-cortexa8.inc
conf/machine/include/tune-cortexm1.inc
conf/machine/include/tune-cortexm3.inc
conf/machine/include/tune-cortexr4.inc
conf/machine/include/tune-ep9312.inc
conf/machine/include/tune-geodelx.inc
conf/machine/include/tune-iwmmxt.inc
conf/machine/include/tune-pentium.inc
conf/machine/include/tune-pentium4c.inc
conf/machine/include/tune-pentiumpro.inc
conf/machine/include/tune-ppc405.inc
conf/machine/include/tune-ppc440.inc
conf/machine/include/tune-ppc440e.inc
conf/machine/include/tune-ppc603e.inc
conf/machine/include/tune-ppce300c2.inc
conf/machine/include/tune-ppce300c3.inc
conf/machine/include/tune-ppce500.inc
conf/machine/include/tune-supersparc.inc
conf/machine/include/tune-xscale.inc
packages/alsa/alsa-lib_1.0.15.bb
packages/ffmpeg/ffmpeg_git.bb
packages/ffmpeg/omapfbplay_git.bb
packages/linux/linux-neuros_git.bb
packages/pulseaudio/pulseaudio_0.9.10.bb
packages/speech-dispatcher/files/configure_fix.patch
packages/speech-dispatcher/speech-dispatcher_0.6.6.bb
Diffs:
#
# mt diff -rbd40bda8858164c7f6d35494b85fbc1df9474e4d -r1979059342fd0fe3a4faa80a3628242cbb830d11
#
#
#
# patch "packages/dfu-util/dfu-util-native_svn.bb"
# from [2fd60160899052185e3c54eb1e057336861e0c4a]
# to [dd351048f6658241601c95d6c7104595a8fc4ad2]
#
# patch "packages/dfu-util/dfu-util_svn.bb"
# from [ad9faa3d95d88fb20a79172199dce4ad77822880]
# to [a01f23e8b16761fa4605d9de2a6490444f75e99c]
#
============================================================
--- packages/dfu-util/dfu-util-native_svn.bb 2fd60160899052185e3c54eb1e057336861e0c4a
+++ packages/dfu-util/dfu-util-native_svn.bb dd351048f6658241601c95d6c7104595a8fc4ad2
@@ -7,11 +7,16 @@ do_stage() {
do_stage() {
install -d ${STAGING_BINDIR_NATIVE}
install -m 0755 src/dfu-util ${STAGING_BINDIR_NATIVE}/dfu-util-${PV}
+ rm -f ${STAGING_BINDIR_NATIVE}/dfu-util
+ ln -sf ./dfu-util-${PV} ${STAGING_BINDIR_NATIVE}/dfu-util
}
do_deploy() {
install -d ${DEPLOY_DIR_TOOLS}
install -m 0755 src/dfu-util_static ${DEPLOY_DIR_TOOLS}/dfu-util-${PV}
+ rm -f ${DEPLOY_DIR_TOOLS}/dfu-util
+ ln -sf ./dfu-util-${PV} ${DEPLOY_DIR_TOOLS}/dfu-util
+
}
addtask deploy before do_package after do_install
============================================================
--- packages/dfu-util/dfu-util_svn.bb ad9faa3d95d88fb20a79172199dce4ad77822880
+++ packages/dfu-util/dfu-util_svn.bb a01f23e8b16761fa4605d9de2a6490444f75e99c
@@ -3,7 +3,7 @@ PV = "0.1+svnr${SRCREV}"
AUTHOR = "Harald Welte <laforge at openmoko.org>"
LICENSE = "GPL"
PV = "0.1+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
DEPENDS = "libusb usbpath"
#
# mt diff -re73a25058e540cd7bb73833d96eb62b9a797b637 -r1979059342fd0fe3a4faa80a3628242cbb830d11
#
#
#
# delete "classes/multimachine.bbclass"
#
# add_dir "packages/freesmartphone/frameworkd/magician"
#
# add_dir "packages/opkg-utils"
#
# add_file "classes/singlemachine.bbclass"
# content [4223b7e3b30ce8af7f6ec008db68daca5c99ffa8]
#
# add_file "packages/alsa/alsa-lib/fix_libmath.patch"
# content [55db68aef57ed41890c8977335a2793c5f1b491b]
#
# add_file "packages/alsa/alsa-versym.inc"
# content [957d390b9f2272ea29b2cb24f7e33f8ca8843d15]
#
# add_file "packages/freesmartphone/frameworkd/magician/frameworkd.conf"
# content [956fbca634e435124be4f323573306632e11f8eb]
#
# add_file "packages/opkg-utils/opkg-utils-native_svn.bb"
# content [9a67c788e93d141f166154dcad9d6352cc7269c0]
#
# add_file "packages/opkg-utils/opkg-utils_svn.bb"
# content [c89ff762daf5d8fba20d61c14112256f2b2f0926]
#
# add_file "packages/pulseaudio/pulseaudio-0.9.10/libiconv.patch"
# content [d592e1582c3efd71bd9ff351ad21eb43951307ef]
#
# patch "classes/base.bbclass"
# from [d846aa59ec39d60c1f61a21e2b483cb0350bff34]
# to [42c3339379745f02de17747ffc6c264a4598e5a7]
#
# patch "classes/packaged-staging.bbclass"
# from [14d20073d82ebc1e8020080f2d3a644fa37ca552]
# to [d7e2bb166e10ab78e17adc253c90ba732da71f2f]
#
# patch "conf/bitbake.conf"
# from [d8122151bbc194ee830cb666879ae90585f1b985]
# to [5289f3b5b95939b1d3d267c6b93e7a17f6548463]
#
# patch "conf/distro/celinux-test.conf"
# from [beca92fe305476a03cc17be4ecf3f9b8a0b134c9]
# to [89d7e451fc9af9bf40690f40acee9b8634d4239f]
#
# patch "conf/distro/include/angstrom.inc"
# from [ace0abffaabc05f77898354b019af4e5cf579d14]
# to [1bf6a51462a70af6b60b8a47191a55e1627b96da]
#
# patch "conf/distro/include/oplinux.inc"
# from [5af0f3e555c3da25b2089272a44d317e776103c4]
# to [c4b652ddcd2e123967ad2e0eac25c8379b75139e]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [0b8c9a7cb3040653c57e443d986e33e9ea2f3131]
# to [cd4d9a24621db28587ab53e1d344cbea50c5e8fb]
#
# patch "conf/distro/include/slugos.inc"
# from [00976339770c45e02a1ecc25cf9066a2c866eeea]
# to [9b41afe5f573c4ce71c88ddf2bcda240c4dae42c]
#
# patch "conf/distro/jlime-donkey.conf"
# from [50f90b05f62918f1b8efc4d5f311a7d80b424ad9]
# to [fb7ea51917dde4bafa36f1b4a43be01e96610ad6]
#
# patch "conf/distro/jlime-henchman.conf"
# from [c5c0029ec6fcea5daaf00874e1a20e1d514d7586]
# to [40b971ca62e022ba5da642d0dd65e9472369efc9]
#
# patch "conf/distro/jlime-mongo.conf"
# from [649596799adddbe974beb9a95120de0c9db17b28]
# to [239a9bf19ee598d83ee84d5958a12b71bd7bef47]
#
# patch "conf/distro/minimal.conf"
# from [bd599ccea87a555d1025fc9d422556bb405c21d9]
# to [3659ec6bf90d9eac32c48e7ac2207b2a8c100d28]
#
# patch "conf/distro/openprotium.conf"
# from [c91df50d1b1b24f6a52eba1264c1e195813952dd]
# to [fa9e89af0f2d1321bd93fb2c08dfc7fa720a7d51]
#
# patch "conf/machine/h6300.conf"
# from [4c6c8fdebd9d8dc8eb6354ae169862cc5662c63a]
# to [25fcc50c0fe6e96973533769fde4fa84f5c444b4]
#
# patch "conf/machine/htckaiser.conf"
# from [daed3c3a075ede90bec1e6302f724e7805689cfb]
# to [be5f366c2e3de340ebc77ef4a63925013bd38587]
#
# patch "conf/machine/include/tune-arm1136jf-s.inc"
# from [eb16d920f5e4b5c23d60ef7eeb3c4dc30ba84f11]
# to [eeabfb8ca8e9b43a510bfb95672dd61af159f39b]
#
# patch "conf/machine/include/tune-arm920t.inc"
# from [90b20a2b9db56011eaade4f5842ba8b4a8584126]
# to [078a0be6224342dbb8942bdaa046bdaf106229fb]
#
# patch "conf/machine/include/tune-arm926ejs.inc"
# from [c76a174d9339a3b351d5f39e293bf9321cac008f]
# to [917d7cb1d978da4bb54649d5cc03ab70eb34dcd8]
#
# patch "conf/machine/include/tune-arm9tdmi.inc"
# from [6f184e7d957f36ba2cef5212bd97661f00637342]
# to [79388d34696a51ce5e20545788b9154842262651]
#
# patch "conf/machine/include/tune-armv7.inc"
# from [eccbfaf3855e34b17e836c1e89b4f4588912aa43]
# to [02a24b2d622b88cf8f3545e09374f8c8d44b56de]
#
# patch "conf/machine/include/tune-at32ap7000.inc"
# from [e5e452b43a8e689bee19061e97ddd89ec6361c59]
# to [5c4d1566b157fd0987ba15c70d27a0f5dc3a1221]
#
# patch "conf/machine/include/tune-athlonmp.inc"
# from [417e31e4adfc225d7259a61cf933a33081657be0]
# to [cf481b8b27709088470b1e2d8d8110b09255ae88]
#
# patch "conf/machine/include/tune-c3.inc"
# from [7f5fa845c925213467714b5e7e083c12f7cf2d50]
# to [d4f6f979474fef3c968049f88aa4cc5195353e35]
#
# patch "conf/machine/include/tune-cortexa8.inc"
# from [1c7e4d80a5ad5dd0a7deedf35e59fa26a9322663]
# to [6dd225734aacdd77430796fb5870fec44969139d]
#
# patch "conf/machine/include/tune-cortexm1.inc"
# from [13409d125701403164cfa8aa723a0e603f7c0e51]
# to [781d073e5fd6f5efc763d49b4838eea45a8a331e]
#
# patch "conf/machine/include/tune-cortexm3.inc"
# from [08cd5bf4032e4527974beda7b6affd3e8a081461]
# to [0d0d35e79c8e6d4afc4fd525d86c74b57ac4f3a3]
#
# patch "conf/machine/include/tune-cortexr4.inc"
# from [2a64e3403d59721dce5277b438e1ffef0d568cb0]
# to [cf6809f02db7fe43e6a93e8f637e5bc908b53892]
#
# patch "conf/machine/include/tune-ep9312.inc"
# from [72bb08d58889d339fd041d3a15f8fc03f0677d03]
# to [bb9f59576209e0caa33503e1cc107287e45bd412]
#
# patch "conf/machine/include/tune-geodelx.inc"
# from [25436a51b6bd7bb8892229e11052a1dd1760a76f]
# to [ee9e22451e15e82954bb02ecad0d41f0eb517463]
#
# patch "conf/machine/include/tune-iwmmxt.inc"
# from [de3adeef9a3b58de9d665740bc34e7d915542fb2]
# to [5eac3196d9a9bce2f909c057d3ba2a64f8be7227]
#
# patch "conf/machine/include/tune-pentium.inc"
# from [6b9ddb65b3836bda362d3f5eda88fcca7899e5b4]
# to [bec2d2950a44bdd1d982fe397345f7bb5f6b2f08]
#
# patch "conf/machine/include/tune-pentium4c.inc"
# from [6d4588e5e8c363a3883c76fc49befb8c4e75864d]
# to [3eef3e10f61acaabbaf4a3fa90097b5f2c9267ae]
#
# patch "conf/machine/include/tune-pentiumpro.inc"
# from [540ece970e180900a0c64ce122b9579a22601580]
# to [e71f5e42fa08687887c6c965d233a0e9ac2c9433]
#
# patch "conf/machine/include/tune-ppc405.inc"
# from [ed3e43d2b699eab49eb09fad69013a7777c0b1e3]
# to [5c16538bcc6b4fa6c74575a70e2eeb2c89a9da71]
#
# patch "conf/machine/include/tune-ppc440.inc"
# from [a9bf4faa977b4a302cb780a3560ef2cec7542640]
# to [e6b653056fdb4700cec63bfaf1d88c9aba620066]
#
# patch "conf/machine/include/tune-ppc440e.inc"
# from [b52a0440649cab37e1d9363690240ff022f24e0f]
# to [71d305b0f0a1bcc67a2080caafeb23c280f22fdf]
#
# patch "conf/machine/include/tune-ppc603e.inc"
# from [c5a3c033be3008ddd74e246788d6b1789e69b8c4]
# to [fa522a632c8dd938b60ed2be2ed24f81a51be81c]
#
# patch "conf/machine/include/tune-ppce300c2.inc"
# from [673bf0b7a98457941bf9c81d3200edb7cfe48a1a]
# to [5c55ef430c49351dd88911b6e0a18b9e9466e9e3]
#
# patch "conf/machine/include/tune-ppce300c3.inc"
# from [886a0b2ab156004ece209d03675294bedf89a5cf]
# to [b51135585d48585711544177a34347a2758b2001]
#
# patch "conf/machine/include/tune-ppce500.inc"
# from [dc1f3774a47c6b3da11f89eb426d4d2e4446aa64]
# to [d21c10e46e71714eb948daf82e662dc31254a82f]
#
# patch "conf/machine/include/tune-supersparc.inc"
# from [a0ecec3fc1f272c9d6ab5f54e6aa7f4917af49f0]
# to [beb4137221c3eaba7ec06d113dbfd502a577990d]
#
# patch "conf/machine/include/tune-xscale.inc"
# from [07b8a81fcb5c2ae0981da2f8244cf7272bae3fe2]
# to [c27a9b91cc15ed49012c56156613d5312ceb197f]
#
# patch "packages/alsa/alsa-lib_1.0.15.bb"
# from [2e5d3f16e83a9a0cb85abacde76247c41534ae70]
# to [60c8a8b8e5ce8fd414421ff9168d97354fbfa467]
#
# patch "packages/ffmpeg/ffmpeg_git.bb"
# from [eb05423fbb1596fa81f123b4bce01d87b1830343]
# to [faf2ab6d14f65eafbe5f12e4f19a9520790bb12b]
#
# patch "packages/ffmpeg/omapfbplay_git.bb"
# from [57b5c73f07170855d2045754a759ced839d76c83]
# to [dfca330567472a5564849f47415794ee946785dd]
#
# patch "packages/linux/linux-neuros_git.bb"
# from [34441f6cf7ffb67ea01a78256c99debb2b580e07]
# to [43e12e797fab6b06d254ddbdef56e571229f1522]
#
# patch "packages/pulseaudio/pulseaudio_0.9.10.bb"
# from [3c420fbf3c8622c357a6ec0821897fea459bfaa1]
# to [e7319c30eb5f481868102a1dcbc48a9e2ae7173c]
#
# patch "packages/speech-dispatcher/files/configure_fix.patch"
# from [414e2b325a6a6f7240beb5f7ad791b83dc462295]
# to [db5e0011b85cf14b8e0ef1607a9eb112d559c93a]
#
# patch "packages/speech-dispatcher/speech-dispatcher_0.6.6.bb"
# from [a925ce6224d9321377cd2532c8d0678d21df0710]
# to [2e70147586c6cb534c648efa86ef649576961a53]
#
============================================================
--- classes/singlemachine.bbclass 4223b7e3b30ce8af7f6ec008db68daca5c99ffa8
+++ classes/singlemachine.bbclass 4223b7e3b30ce8af7f6ec008db68daca5c99ffa8
@@ -0,0 +1,12 @@
+#
+# Emulates the old mode of OE operation where only one machine can be targetted.
+#
+
+MULTIMACH_TARGET_SYS = "${TARGET_SYS}"
+MULTIMACH_HOST_SYS = "${HOST_SYS}"
+
+STAMP = "${TMPDIR}/stamps/${PF}"
+WORKDIR = "${TMPDIR}/work/${PF}"
+PKGDATA_DIR = "${STAGING_DIR}/pkgdata"
+STAGING_KERNEL_DIR = "${STAGING_DIR_HOST}/kernel"
+
============================================================
--- packages/alsa/alsa-lib/fix_libmath.patch 55db68aef57ed41890c8977335a2793c5f1b491b
+++ packages/alsa/alsa-lib/fix_libmath.patch 55db68aef57ed41890c8977335a2793c5f1b491b
@@ -0,0 +1,17 @@
+Index: alsa-lib-1.0.15/configure.in
+===================================================================
+--- alsa-lib-1.0.15.orig/configure.in 2007-10-15 10:45:26.000000000 +0200
++++ alsa-lib-1.0.15/configure.in 2008-07-19 15:51:34.177119589 +0200
+@@ -191,9 +191,9 @@
+ AC_MSG_RESULT(no)
+ fi
+
+-ALSA_DEPLIBS=""
+-if test "$softfloat" != "yes"; then
+- ALSA_DEPLIBS="-lm"
++ALSA_DEPLIBS="-lm"
++if test "$softfloat" = "yes"; then
++ AC_CHECK_LIB([m], [floor], , [ALSA_DEPLIBS=""])
+ fi
+
+ dnl Check for libdl
============================================================
--- packages/alsa/alsa-versym.inc 957d390b9f2272ea29b2cb24f7e33f8ca8843d15
+++ packages/alsa/alsa-versym.inc 957d390b9f2272ea29b2cb24f7e33f8ca8843d15
@@ -0,0 +1,21 @@
+
+def get_alsa_versym_setting(bb, d):
+ # Versioned symbols don't work propery with uClibc
+ if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0:
+ return "--with-versioned=no"
+ return ""
+
+
+def get_alsa_versym_setting(bb, d):
+ # Versioned symbols don't work propery with uClibc
+ if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0:
+ return "--with-versioned=no"
+ return ""
+
+
+def get_alsa_versym_setting(bb, d):
+ # Versioned symbols don't work propery with uClibc
+ if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0:
+ return "--with-versioned=no"
+ return ""
+
============================================================
--- packages/freesmartphone/frameworkd/magician/frameworkd.conf 956fbca634e435124be4f323573306632e11f8eb
+++ packages/freesmartphone/frameworkd/magician/frameworkd.conf 956fbca634e435124be4f323573306632e11f8eb
@@ -0,0 +1,17 @@
+[idlenotifier]
+
+[input]
+# magician doesn't have AUX, use the CAMERA key for now
+# (it's in about the same place as AUX on gta01/02)
+report1 = AUX,key,212,1
+report2 = POWER,key,116,1
+# magician doesn't use KEY_POWER2 for the charger, need to fix
+report3 = CHARGER,key,356,0
+report4 = HEADSET,switch,2,0
+
+[ophoned]
+# Magician has TI Calypso
+modemtype = ti_calypso
+
+[opreferencesd]
+rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
============================================================
--- packages/opkg-utils/opkg-utils-native_svn.bb 9a67c788e93d141f166154dcad9d6352cc7269c0
+++ packages/opkg-utils/opkg-utils-native_svn.bb 9a67c788e93d141f166154dcad9d6352cc7269c0
@@ -0,0 +1,10 @@
+require opkg-utils_svn.bb
+
+RDEPENDS = ""
+
+inherit native
+
+# Avoid circular dependencies from package_ipk.bbclass
+PACKAGES = ""
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/opkg-utils"
+
============================================================
--- packages/opkg-utils/opkg-utils_svn.bb c89ff762daf5d8fba20d61c14112256f2b2f0926
+++ packages/opkg-utils/opkg-utils_svn.bb c89ff762daf5d8fba20d61c14112256f2b2f0926
@@ -0,0 +1,18 @@
+DESCRIPTION = "OPKG Package Manager Utilities"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+RDEPENDS = "python"
+PR = "r2"
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http"
+
+S = "${WORKDIR}/opkg-utils"
+
+inherit autotools
+
+S = "${WORKDIR}/opkg-utils"
+
+do_stage () {
+ autotools_stage_all
+}
============================================================
--- packages/pulseaudio/pulseaudio-0.9.10/libiconv.patch d592e1582c3efd71bd9ff351ad21eb43951307ef
+++ packages/pulseaudio/pulseaudio-0.9.10/libiconv.patch d592e1582c3efd71bd9ff351ad21eb43951307ef
@@ -0,0 +1,22 @@
+Index: pulseaudio-0.9.10/src/Makefile.am
+===================================================================
+--- pulseaudio-0.9.10.orig/src/Makefile.am 2008-07-20 13:16:51.548858829 +0200
++++ pulseaudio-0.9.10/src/Makefile.am 2008-07-20 13:43:39.842031837 +0200
+@@ -551,7 +551,7 @@
+
+ libpulse_la_CFLAGS = $(AM_CFLAGS)
+ libpulse_la_LDFLAGS = -version-info $(LIBPULSE_VERSION_INFO) -Wl,-version-script=$(srcdir)/map-file
+-libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LIBICONV)
++libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV)
+
+ if HAVE_X11
+ libpulse_la_CFLAGS += $(X_CFLAGS)
+@@ -771,7 +771,7 @@
+
+ libpulsecore_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBOIL_CFLAGS)
+ libpulsecore_la_LDFLAGS = -version-info $(LIBPULSECORE_VERSION_INFO)
+-libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LIBICONV) libspeex-resampler-fixed.la libspeex-resampler-float.la libffmpeg-resampler.la
++libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LTLIBICONV) libspeex-resampler-fixed.la libspeex-resampler-float.la libffmpeg-resampler.la
+
+ ###################################
+ # Plug-in support libraries #
============================================================
--- classes/base.bbclass d846aa59ec39d60c1f61a21e2b483cb0350bff34
+++ classes/base.bbclass 42c3339379745f02de17747ffc6c264a4598e5a7
@@ -999,10 +999,12 @@ def base_after_parse(d):
depends = depends + " git-native:do_populate_staging"
bb.data.setVarFlag('do_fetch', 'depends', depends, d)
+ # 'multimachine' handling
mach_arch = bb.data.getVar('MACHINE_ARCH', d, 1)
- old_arch = bb.data.getVar('PACKAGE_ARCH', d, 1)
- if (old_arch == mach_arch):
- # Nothing to do
+ pkg_arch = bb.data.getVar('PACKAGE_ARCH', d, 1)
+
+ if (pkg_arch == mach_arch):
+ # Already machine specific - nothing further to do
return
#
@@ -1010,27 +1012,39 @@ def base_after_parse(d):
# unless the package sets SRC_URI_OVERRIDES_PACKAGE_ARCH=0
#
override = bb.data.getVar('SRC_URI_OVERRIDES_PACKAGE_ARCH', d, 1)
- if override == '0':
- return
+ if override != '0':
+ paths = []
+ for p in [ "${PF}", "${P}", "${PN}", "files", "" ]:
+ path = bb.data.expand(os.path.join("${FILE_DIRNAME}", p, "${MACHINE}"), d)
+ if os.path.isdir(path):
+ paths.append(path)
+ if len(paths) != 0:
+ for s in srcuri.split():
+ if not s.startswith("file://"):
+ continue
+ local = bb.data.expand(bb.fetch.localpath(s, d), d)
+ for mp in paths:
+ if local.startswith(mp):
+ #bb.note("overriding PACKAGE_ARCH from %s to %s" % (pkg_arch, mach_arch))
+ bb.data.setVar('PACKAGE_ARCH', "${MACHINE_ARCH}", d)
+ bb.data.setVar('MULTIMACH_ARCH', mach_arch, d)
+ return
- paths = []
- for p in [ "${PF}", "${P}", "${PN}", "files", "" ]:
- path = bb.data.expand(os.path.join("${FILE_DIRNAME}", p, "${MACHINE}"), d)
- if os.path.isdir(path):
- paths.append(path)
- if len(paths) == 0:
- return
+ multiarch = pkg_arch
- for s in srcuri.split():
- if not s.startswith("file://"):
- continue
- local = bb.data.expand(bb.fetch.localpath(s, d), d)
- for mp in paths:
- if local.startswith(mp):
- #bb.note("overriding PACKAGE_ARCH from %s to %s" % (old_arch, mach_arch))
- bb.data.setVar('PACKAGE%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list