[oe-commits] org.oe.dev merge of '21fe2445ed0bb510a34a0e01c77e30f0e6c021c3'
rwhitby commit
openembedded-commits at lists.openembedded.org
Thu Jun 21 17:37:34 UTC 2007
merge of '21fe2445ed0bb510a34a0e01c77e30f0e6c021c3'
and '28d894c206a3bfee24708913d7b2a4fbdfca447e'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 931339025721c1ed37ba577e4e0f5ad191fe3568
ViewMTN: http://monotone.openembedded.org/revision.psp?id=931339025721c1ed37ba577e4e0f5ad191fe3568
Files:
1
packages/linux/linux-ezx-2.6.21/mux-linux-2.6.20.7-fix.patch
packages/asterisk/asterisk-1.2.18
packages/gamin
packages/gamin/files
packages/linux/linux-magicbox-2.6.18.6
packages/pango/pango-1.16.4
packages/rp-pppoe/rp-pppoe-3.8
packages/tracker
packages/tracker/files
conf/machine/include/tune-ppc440.conf
conf/machine/sequoia.conf
packages/asterisk/asterisk-1.2.18/asterisk.patch
packages/asterisk/asterisk-1.2.18/enable-speex.patch
packages/asterisk/asterisk-1.2.18/uclibc-compat-getloadavg.patch
packages/asterisk/asterisk-1.2.18/uclibc-dsn.patch
packages/asterisk/asterisk_1.2.18.bb
packages/gamin/files/no-abstract-sockets.patch
packages/gamin/gamin_0.1.8.bb
packages/images/angstrom-minimal-image.bb
packages/linux/linux-efika/0001-powerpc-Add-device-tree-fixup-for-the-EFIKA.txt
packages/linux/linux-ezx-2.6.21/mux-linux-2.6.21-fix.patch
packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01
packages/linux/linux-gta01.inc
packages/linux/linux-gta01_2.6.21.1.bb
packages/linux/linux-handhelds-2.6/h5000/defconfig
packages/linux/linux-magicbox-2.6.18.6/000-fix-makefile.patch
packages/linux/linux-magicbox-2.6.18.6/001-magicbox-board-2.6.18.patch
packages/linux/linux-magicbox-2.6.18.6/002-magicbox-mtd-map-2.6.18.patch
packages/linux/linux-magicbox-2.6.18.6/010-load-ramdisk-even-if-rootdev-equals-ramdisk.patch
packages/linux/linux-magicbox-2.6.18.6/config-2.6.18-magicbox2
packages/linux/linux-magicbox-2.6.18.6/kernel-2.6.18-layer7-2.6.patch
packages/linux/linux-magicbox-2.6.18.6/magicbox2-ide-cf_2.6.18.patch
packages/linux/linux-magicbox-2.6.18.6/squashfs3.1-patch
packages/linux/linux-magicbox_2.6.18.6.bb
packages/loudmouth/loudmouth_1.2.2.bb
packages/pango/pango-1.16.4/no-tests.patch
packages/pango/pango_1.16.4.bb
packages/perl/perl-5.8.8/perl-configpm-switch.patch
packages/quagga/quagga_0.99.7.bb
packages/rp-pppoe/rp-pppoe-3.8/configure_in_cross.patch
packages/rp-pppoe/rp-pppoe-3.8/pppoe-no-timeout.patch
packages/rp-pppoe/rp-pppoe-3.8/pppoe-src-restrictions.patch
packages/rp-pppoe/rp-pppoe_3.8.bb
packages/snes9x/snes9x-sdl/gcc-4.1.patch
packages/tracker/files/no-ioprio.patch
packages/tracker/tracker_0.5.4.bb
packages/uboot/u-boot-1.1.2/u-boot-emetec.patch
packages/util-linux/files/glibc-umount2.patch
packages/xorg-app/mkfontdir-native_1.0.3.bb
packages/xorg-app/mkfontdir_1.0.3.bb
packages/xorg-app/xdm_1.1.4.bb
packages/xorg-app/xrandr_1.2.0.bb
packages/xorg-app/xrdb_1.0.3.bb
packages/xorg-driver/xf86-input-evdev_1.1.5.bb
packages/xorg-driver/xf86-input-keyboard_1.2.0.bb
packages/xorg-driver/xf86-input-mouse_1.2.1.bb
packages/xorg-driver/xf86-video-siliconmotion_1.5.1.bb
packages/xorg-lib/libice_1.0.3.bb
packages/xorg-lib/libxaw_1.0.3.bb
packages/xorg-lib/libxfont_1.2.8.bb
packages/xorg-lib/libxi_1.1.0.bb
packages/xorg-lib/libxinerama_1.0.2.bb
packages/xorg-lib/libxrandr_1.2.1.bb
packages/xorg-lib/libxt_1.0.5.bb
packages/xorg-lib/libxv_1.0.3.bb
site/powerpc-common
MAINTAINERS
classes/cpan.bbclass
classes/siteinfo.bbclass
conf/checksums.ini
conf/distro/angstrom-2007.1.conf
packages/avahi/avahi.inc
packages/avahi/avahi_0.6.18.bb
packages/glib-2.0/glib.inc
packages/libmpeg2/libmpeg2_0.4.0b.bb
packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
packages/linux/linux-ezx-2.6.21/defconfig-a780
packages/linux/linux-ezx_2.6.21.bb
packages/linux/linux-gta01_2.6.20.bb
packages/linux/linux-x86-2.6.20/defconfig
packages/perl/libxml-parser-perl_2.34.bb
packages/perl/perl-native_5.8.8.bb
packages/perl/perl_5.8.8.bb
packages/quagga/quagga.inc
packages/scummvm/scummvm.inc
packages/snes9x/snes9x-sdl_1.39.bb
packages/uboot/u-boot_1.1.2.bb
packages/util-linux/util-linux_2.12r.bb
packages/xtscal/xtscal/xtscal-cxk.patch
packages/xtscal/xtscal_0.6.3.bb
site/arm-common
site/arm-linux
site/powerpc-linux
site/powerpc-linux-uclibc
Diffs:
#
# mt diff -r21fe2445ed0bb510a34a0e01c77e30f0e6c021c3 -r931339025721c1ed37ba577e4e0f5ad191fe3568
#
#
#
# delete "packages/linux/linux-ezx-2.6.21/mux-linux-2.6.20.7-fix.patch"
#
# add_dir "packages/asterisk/asterisk-1.2.18"
#
# add_dir "packages/gamin"
#
# add_dir "packages/gamin/files"
#
# add_dir "packages/linux/linux-magicbox-2.6.18.6"
#
# add_dir "packages/pango/pango-1.16.4"
#
# add_dir "packages/rp-pppoe/rp-pppoe-3.8"
#
# add_dir "packages/tracker"
#
# add_dir "packages/tracker/files"
#
# add_file "conf/machine/include/tune-ppc440.conf"
# content [dae534cce717ceebfa1d767669c009aa81f19e14]
#
# add_file "conf/machine/sequoia.conf"
# content [055d4e49235ed37a7ea7a3f8ec4a01e0421b01c9]
#
# add_file "packages/asterisk/asterisk-1.2.18/asterisk.patch"
# content [cd980f6cc48c01f2394a731d2cf247809e5c2231]
#
# add_file "packages/asterisk/asterisk-1.2.18/enable-speex.patch"
# content [123420f2bb25f198d687ae8cfad1eef6e90725bb]
#
# add_file "packages/asterisk/asterisk-1.2.18/uclibc-compat-getloadavg.patch"
# content [750cd99592c157b993f2ccb9f63edbe274d9edd1]
#
# add_file "packages/asterisk/asterisk-1.2.18/uclibc-dsn.patch"
# content [6041cf5de40ec782993d30633cb7539d12936098]
#
# add_file "packages/asterisk/asterisk_1.2.18.bb"
# content [a6f63f212f1a8cc2f1bf91b92f78a9c87e2a2171]
#
# add_file "packages/gamin/files/no-abstract-sockets.patch"
# content [55d2180d7ba5241c7eef7b1d0fed01938dfe0afe]
#
# add_file "packages/gamin/gamin_0.1.8.bb"
# content [9f064b252f1f300b983caab8ca95f4465c094d54]
#
# add_file "packages/images/angstrom-minimal-image.bb"
# content [9fc996ad7cc5cf3c8dfc1610cda27b4a37423fd4]
#
# add_file "packages/linux/linux-efika/0001-powerpc-Add-device-tree-fixup-for-the-EFIKA.txt"
# content [8405cd0cd4013cbd3ab806cb7ab3e6860b56d244]
#
# add_file "packages/linux/linux-ezx-2.6.21/mux-linux-2.6.21-fix.patch"
# content [696fc670335135b5f840df7a7eb27f3570a415ad]
#
# add_file "packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01"
# content [8753bb5758bd2b02104642d1fdd3f5983ed820d2]
#
# add_file "packages/linux/linux-gta01.inc"
# content [a905e1e7ffd865b4f347500527281bf7ebcf0c5d]
#
# add_file "packages/linux/linux-gta01_2.6.21.1.bb"
# content [f2933aca4e7fdd3d682481c2e3b82e361486871b]
#
# add_file "packages/linux/linux-handhelds-2.6/h5000/defconfig"
# content [b580cae5d9f057398579e88855617f8ca176518c]
#
# add_file "packages/linux/linux-magicbox-2.6.18.6/000-fix-makefile.patch"
# content [57d391b762bdb2c79daf1c70bbb48abceb0170a1]
#
# add_file "packages/linux/linux-magicbox-2.6.18.6/001-magicbox-board-2.6.18.patch"
# content [7324ab4814fe274ebd1127d69d09d107300645eb]
#
# add_file "packages/linux/linux-magicbox-2.6.18.6/002-magicbox-mtd-map-2.6.18.patch"
# content [bc00e61fb1d2355e89b320bffc78a9093f8f9a09]
#
# add_file "packages/linux/linux-magicbox-2.6.18.6/010-load-ramdisk-even-if-rootdev-equals-ramdisk.patch"
# content [237dd8b5545bd8f7460ec7dd4d22fd4020374173]
#
# add_file "packages/linux/linux-magicbox-2.6.18.6/config-2.6.18-magicbox2"
# content [b6561c6b26078d9579352703f03dd111ca79abb5]
#
# add_file "packages/linux/linux-magicbox-2.6.18.6/kernel-2.6.18-layer7-2.6.patch"
# content [f157ac0f4d7f3cd45b51ccba5b520fc2b9f2e169]
#
# add_file "packages/linux/linux-magicbox-2.6.18.6/magicbox2-ide-cf_2.6.18.patch"
# content [cb9bf1cfd85e364a7c6728bf5bcc67f2c47da52d]
#
# add_file "packages/linux/linux-magicbox-2.6.18.6/squashfs3.1-patch"
# content [8f5cca3f9e846523bbf1582ca1685f9171785ae0]
#
# add_file "packages/linux/linux-magicbox_2.6.18.6.bb"
# content [a9cfec6448adecc0291a63229893d93d6286d404]
#
# add_file "packages/loudmouth/loudmouth_1.2.2.bb"
# content [141b9adf1e925c52cf9ba27be1961196c34ad598]
#
# add_file "packages/pango/pango-1.16.4/no-tests.patch"
# content [60137f9cd0f6a15a189956274570896d16cd4631]
#
# add_file "packages/pango/pango_1.16.4.bb"
# content [fc1e699045d805d135ea55ae7c9d5addc3069c16]
#
# add_file "packages/perl/perl-5.8.8/perl-configpm-switch.patch"
# content [85b0aeb910c756d06158c7a3172b369cf264b02f]
#
# add_file "packages/quagga/quagga_0.99.7.bb"
# content [eec4379d7d239e3a33b5ffdfc910d255dadf8e91]
#
# add_file "packages/rp-pppoe/rp-pppoe-3.8/configure_in_cross.patch"
# content [e525fbd3c93e4c9b98a8fba1ca0c73ead7e403d4]
#
# add_file "packages/rp-pppoe/rp-pppoe-3.8/pppoe-no-timeout.patch"
# content [3151a2931021fe8bd10a919eeb183d0e6fc4c27a]
#
# add_file "packages/rp-pppoe/rp-pppoe-3.8/pppoe-src-restrictions.patch"
# content [a609cf119181bbf0ca535190d81cd604738096d7]
#
# add_file "packages/rp-pppoe/rp-pppoe_3.8.bb"
# content [a3828f0f926b651d5d2b49df5e6845f25bce3ec6]
#
# add_file "packages/snes9x/snes9x-sdl/gcc-4.1.patch"
# content [796b139b5909de01f9a3ceb33b582feaac9c5bf4]
#
# add_file "packages/tracker/files/no-ioprio.patch"
# content [b5ec8291d6a5ed7fb4cabae9410fdaf007f34af5]
#
# add_file "packages/tracker/tracker_0.5.4.bb"
# content [50e00de1e6f491fcaff07043bfb6c3d57f65a529]
#
# add_file "packages/uboot/u-boot-1.1.2/u-boot-emetec.patch"
# content [7a374cd08fa78b1a90b563ee31674b809ecd2149]
#
# add_file "packages/util-linux/files/glibc-umount2.patch"
# content [b23388a276e647109a4d0467dfb9ecc91142a53c]
#
# add_file "packages/xorg-app/mkfontdir-native_1.0.3.bb"
# content [1aded3f9087c6678c60e99dc4cdd11339334e74d]
#
# add_file "packages/xorg-app/mkfontdir_1.0.3.bb"
# content [69acb453b326a341063843ac11d81cda3880b971]
#
# add_file "packages/xorg-app/xdm_1.1.4.bb"
# content [13b745771af2f8c3b3752f2d1017ad34f48d91bc]
#
# add_file "packages/xorg-app/xrandr_1.2.0.bb"
# content [7a399a320bc306de2bf9f466131ee9d944743aee]
#
# add_file "packages/xorg-app/xrdb_1.0.3.bb"
# content [d4cdf974f7b7f788cdec0bf6ed2de08056feefe1]
#
# add_file "packages/xorg-driver/xf86-input-evdev_1.1.5.bb"
# content [990f1ce986d335d8548740e05621894eb174142e]
#
# add_file "packages/xorg-driver/xf86-input-keyboard_1.2.0.bb"
# content [beba8b8ea4126be51e05aba8df1eab2da8bfbdf4]
#
# add_file "packages/xorg-driver/xf86-input-mouse_1.2.1.bb"
# content [af8eb32d6b4525f9c5962de994c8bbb87154b4af]
#
# add_file "packages/xorg-driver/xf86-video-siliconmotion_1.5.1.bb"
# content [7b6a64072eab974af4580581d68140bfaa1c6662]
#
# add_file "packages/xorg-lib/libice_1.0.3.bb"
# content [068ee5d94438dbdc1e2c09a064e87fc8d1395841]
#
# add_file "packages/xorg-lib/libxaw_1.0.3.bb"
# content [c7a86b6c56ac1975b59d3d34d433a685c5230c60]
#
# add_file "packages/xorg-lib/libxfont_1.2.8.bb"
# content [6cd8e1296ab79293d4e02c63c20a2c92c31077c6]
#
# add_file "packages/xorg-lib/libxi_1.1.0.bb"
# content [ed28852f6b2865a4e0921c5d065c5a9061ec8464]
#
# add_file "packages/xorg-lib/libxinerama_1.0.2.bb"
# content [bb367052114695d89d0c6c714f0521470704e572]
#
# add_file "packages/xorg-lib/libxrandr_1.2.1.bb"
# content [11f6b9fe4ef85abdf7d0786de4ffee6f0d296abc]
#
# add_file "packages/xorg-lib/libxt_1.0.5.bb"
# content [4a29445398ec34066c9a23dfa9fa699028d46f27]
#
# add_file "packages/xorg-lib/libxv_1.0.3.bb"
# content [76ceac8413383a6d8ce861f45dd34a566c9afd96]
#
# add_file "site/powerpc-common"
# content [074e5fc597b5311f5e6a8afeed4898fb0445c223]
#
# patch "MAINTAINERS"
# from [6ef443b4a33071dcc9982970ed00d5ed8007faae]
# to [9725f7ac037ee4c5e60affa3c62399b768fbe2dd]
#
# patch "classes/cpan.bbclass"
# from [d09dc33e6742a5205337eab16edb0ab7da321296]
# to [481e36f5234d7b355038316b3d8ce9b8eb971b2a]
#
# patch "classes/siteinfo.bbclass"
# from [5589e5bd158b6aad00801ad2b828fa10af4f9cba]
# to [0315ca7b913071a66601e580e2a32904789d70cc]
#
# patch "conf/checksums.ini"
# from [6eb8314da0a859a76dbb8a41cc194b4bc0d28a04]
# to [05b3c295e928be1162a3d739528010fc6624da67]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [2b0293d818c1c296ead5ffe674dcba2fa2b53821]
# to [b339acab9c61275f45d2701326a98d6c315637f4]
#
# patch "packages/avahi/avahi.inc"
# from [fded6a4ee18c9973fb5c08eda2c6b31cd18c1d5c]
# to [aa45741a0099beb40eb47eb4cd490b16de3c403b]
#
# patch "packages/avahi/avahi_0.6.18.bb"
# from [5e6815387400e04e336cf40a4a843fd93a48f37c]
# to [99d7f68912f51799870f34c09ba1848b59d8d7cc]
#
# patch "packages/glib-2.0/glib.inc"
# from [14f316ed0f0318dc268c8b531f524cd3a3a27381]
# to [84c659a6580d6e3cb397895550e8cf2e14b8c341]
#
# patch "packages/libmpeg2/libmpeg2_0.4.0b.bb"
# from [79fba094e2a9931ba462ef9666b8fe29675df8d5]
# to [4f700b9527752d4fdf9a31488ae9cd575daf8ab6]
#
# patch "packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb"
# from [06382c243ca16578b84f66e7542adebbc64a76a5]
# to [26c6ea4ead01ea2614688932a93b68c6215afdac]
#
# patch "packages/linux/linux-ezx-2.6.21/defconfig-a780"
# from [236efaa372b0151de56fc6d16666b709d02e095a]
# to [70df3e67c48775275176735d14a69e2e2a0cca2c]
#
# patch "packages/linux/linux-ezx_2.6.21.bb"
# from [d8046ae900c04622a865583faab4c73a99bd61cc]
# to [c4136421b5c2a368273d4f011665dc589a473074]
#
# patch "packages/linux/linux-gta01_2.6.20.bb"
# from [1f40a86e0d855d68121a5c7de3a7c3967df906ae]
# to [f85e171e00b3317b9dd345bc307d790e43558a75]
#
# patch "packages/linux/linux-x86-2.6.20/defconfig"
# from [73b5bd29772aeec231936c54de86f775aad33764]
# to [eaeef6226e5d7f2bff7c3cadede34d438f45330a]
#
# patch "packages/perl/libxml-parser-perl_2.34.bb"
# from [85f54f3232917dea46a81a7be5187428c7977571]
# to [25b4e5bf4226ae454a8b3ef68ec63c00c598a794]
#
# patch "packages/perl/perl-native_5.8.8.bb"
# from [952fe897dd6f8f0d0bd3877b7e06ba8dea751e6e]
# to [b2290a3cf42bf873cda4c15ccf6735339d50e8bb]
#
# patch "packages/perl/perl_5.8.8.bb"
# from [1afcba9e1ad2cec68c604aaa9eecfdc308900263]
# to [ca1acef3f57d4920cfd1da64f35141df9091e3aa]
#
# patch "packages/quagga/quagga.inc"
# from [97540635d1eca693013ddb9424b7e64c72a9093d]
# to [e2600c5206d32ee5fbf888d6102425ec873a5029]
#
# patch "packages/scummvm/scummvm.inc"
# from [9966826a87d16e154e12013e30a8c5d8acd0e6b3]
# to [f897d1fd9be17c341a86f8735fe693e8d3a4cea8]
#
# patch "packages/snes9x/snes9x-sdl_1.39.bb"
# from [e9195f70916d4b1774b10f725c169a10f903a4e9]
# to [2a76f6065419714d292500f62cd3a1cb902f755e]
#
# patch "packages/uboot/u-boot_1.1.2.bb"
# from [a3889377bb092548a1ccae47ac1eef61ed16b8dd]
# to [16bfcf693d217b7d96a053df2b2eb514bbadc898]
#
# patch "packages/util-linux/util-linux_2.12r.bb"
# from [3925c575694ba9a5b31b7485c6976a3cdde7fae5]
# to [21793def7bcd5450f58381cac211e01a3f0b218b]
#
# patch "packages/xtscal/xtscal/xtscal-cxk.patch"
# from [46261ecf931133f92cfcaf138cace86bb6f387ac]
# to [dccc1fb45dd89a3a809d6548f692afc8f130a00e]
#
# patch "packages/xtscal/xtscal_0.6.3.bb"
# from [44f824ae612cd4ad4d50f7bfa37b541186d1569a]
# to [708b497c4542744bf0caacbf0d7e18ddb52de210]
#
# patch "site/arm-common"
# from [286d5a36d56fbbf25f2d5d1b68a54574ca051241]
# to [c210a1144d7c76f6e59d6da91a6984822524f08f]
#
# patch "site/arm-linux"
# from [d9a9fd42f5dcf99fb67e3e26e264e1a79084c3a8]
# to [21f3aa89b121b81d76d69d27a5a89f22c032afd9]
#
# patch "site/powerpc-linux"
# from [97614636c05a9d80d3dc1801feaffc0fba7c61a0]
# to [dfa99f11c8732add1ee22eef8cf7f2424b3ad830]
#
# patch "site/powerpc-linux-uclibc"
# from [49ab4ef3d79b32a9b799ffed7fb8d36f4c49c358]
# to [da39a3ee5e6b4b0d3255bfef95601890afd80709]
#
============================================================
--- conf/machine/include/tune-ppc440.conf dae534cce717ceebfa1d767669c009aa81f19e14
+++ conf/machine/include/tune-ppc440.conf dae534cce717ceebfa1d767669c009aa81f19e14
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=440"
+PACKAGE_ARCH = "ppc440"
============================================================
--- conf/machine/sequoia.conf 055d4e49235ed37a7ea7a3f8ec4a01e0421b01c9
+++ conf/machine/sequoia.conf 055d4e49235ed37a7ea7a3f8ec4a01e0421b01c9
@@ -0,0 +1,26 @@
+#@TYPE: Machine
+#@Name: AMCC Sequoia Development Platform
+#@DESCRIPTION: Machine configuration for the AMCC Sequoia development platform http://www.amcc.com/Embedded/Downloads/440EPx/
+
+
+TARGET_ARCH = "powerpc"
+PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppc440"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
+
+MACHINE_FEATURES = "kernel26 usbhost"
+MACHINE_TASK_PROVIDER = "task-base"
+
+#don't try to access tty1
+USE_VT = "0"
+
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+PREFERRED_VERSION_u-boot = "1.1.2"
+EXTRA_IMAGECMD = "--big-endian"
+ERASEBLOCK_SIZE = "0x10000"
+IMAGE_FSTYPES = "jffs2"
+
+#tune for the AMCC440 cpu
+require conf/machine/include/tune-ppc440.conf
============================================================
--- packages/asterisk/asterisk-1.2.18/asterisk.patch cd980f6cc48c01f2394a731d2cf247809e5c2231
+++ packages/asterisk/asterisk-1.2.18/asterisk.patch cd980f6cc48c01f2394a731d2cf247809e5c2231
@@ -0,0 +1,221 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- asterisk-1.2.9.1/./Makefile~asterisk
++++ asterisk-1.2.9.1/./Makefile
+@@ -331,7 +331,7 @@
+ ASTCFLAGS+= $(TRACE_FRAMES)
+ ASTCFLAGS+= $(MALLOC_DEBUG)
+ ASTCFLAGS+= $(BUSYDETECT)
+-ASTCFLAGS+= $(OPTIONS)
++#ASTCFLAGS+= $(OPTIONS)
+ ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
+ ASTCFLAGS+= -fomit-frame-pointer
+ endif
+@@ -347,12 +347,12 @@
+ netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
+ cryptostub.o
+
+-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),)
++ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/include/sys/poll.h),)
+ OBJS+= poll.o
+ ASTCFLAGS+=-DPOLLCOMPAT
+ endif
+
+-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/dlfcn.h),)
++ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/include/dlfcn.h),)
+ OBJS+= dlfcn.o
+ ASTCFLAGS+=-DDLFCNCOMPAT
+ endif
+@@ -397,7 +397,7 @@
+ endif
+
+ ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
+- CFLAGS+=$(ASTCFLAGS)
++override CFLAGS+=$(ASTCFLAGS)
+ endif
+
+ # This is used when generating the doxygen documentation
+@@ -519,7 +519,7 @@
+ fi
+ rm -f include/asterisk/build.h.tmp
+ $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
+- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
++ $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LDFLAGS) $(LIBS)
+
+ muted: muted.o
+ $(CC) $(AUDIO_LIBS) -o muted muted.o
+--- asterisk-1.2.9.1/codecs/gsm/Makefile~asterisk
++++ asterisk-1.2.9.1/codecs/gsm/Makefile
+@@ -51,7 +51,7 @@
+ ifneq (${PROC},ppc)
+ ifneq (${PROC},ppc64)
+ ifneq (${PROC},s390)
+-OPTIMIZE+=-march=$(PROC)
++#OPTIMIZE+=-march=$(PROC)
+ endif
+ endif
+ endif
+@@ -243,7 +243,7 @@
+ ifneq (${PROC},arm)
+ ifneq ($(shell uname -m), parisc)
+ ifneq ($(shell uname -m),s390)
+-GSM_SOURCES+= $(SRC)/k6opt.s
++#GSM_SOURCES+= $(SRC)/k6opt.s
+ endif
+ endif
+ endif
+@@ -309,7 +309,7 @@
+ ifneq ($(shell uname -m), armv4l)
+ ifneq ($(shell uname -m), parisc)
+ ifneq ($(shell uname -m),s390)
+-GSM_OBJECTS+= $(SRC)/k6opt.o
++#GSM_OBJECTS+= $(SRC)/k6opt.o
+ endif
+ endif
+ endif
+--- asterisk-1.2.9.1/res/Makefile~asterisk
++++ asterisk-1.2.9.1/res/Makefile
+@@ -89,7 +89,7 @@
+ fi
+
+ res_crypto.so: res_crypto.o
+- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS)
++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} $(CRYPTO_LIBS)
+
+ clean:
+ rm -f *.so *.o .depend
+--- asterisk-1.2.9.1/channels/Makefile~asterisk
++++ asterisk-1.2.9.1/channels/Makefile
+@@ -73,7 +73,7 @@
+ SOLINK+=-lrt
+ endif
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/linux/ixjuser.h),)
+ CHANNEL_LIBS+=chan_phone.so
+ endif
+
+@@ -88,16 +88,16 @@
+
+ CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/alsa/asoundlib.h),)
+ CHANNEL_LIBS+=chan_alsa.so
+ endif
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/lib/libpri.so.1),)
+ CFLAGS+=-DZAPATA_PRI
+ ZAPPRI=-lpri
+ endif
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/lib/libmfcr2.so.1),)
+ CFLAGS+=-DZAPATA_R2
+ ZAPR2=-lmfcr2
+ endif
+@@ -110,7 +110,7 @@
+ endif
+
+ ifndef WITHOUT_ZAPTEL
+-ifneq ($(wildcard $(CROSS_%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r28d894c206a3bfee24708913d7b2a4fbdfca447e -r931339025721c1ed37ba577e4e0f5ad191fe3568
#
#
# no changes
#
More information about the Openembedded-commits
mailing list