[oe-commits] org.oe.dev merge of 'a1d436a1b0cce90dce4363a3bfd62bd8c6f53913'

oe commit oe at amethyst.openembedded.net
Thu May 1 20:37:05 UTC 2008 

merge of 'a1d436a1b0cce90dce4363a3bfd62bd8c6f53913'
     and 'e4016811f7d88c926c4dc798795d2b46651ddaf7'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 22d90510dcdbad0d05c38bbc2984c79754336a89
ViewMTN: http://monotone.openembedded.org/revision/info/22d90510dcdbad0d05c38bbc2984c79754336a89
Files:
1
conf/machine/beagleboard.conf
packages/tasks/task-base.bb
packages/asterisk/asterisk-1.4.10
packages/asterisk/asterisk-1.4.10/Makefile.patch
packages/asterisk/asterisk-1.4.10/init
packages/asterisk/asterisk-1.4.10/logrotate
packages/asterisk/asterisk-1.4.10/sounds.xml.patch
packages/asterisk/asterisk-1.4.10/volatiles
packages/asterisk/asterisk-1.4.11
packages/asterisk/asterisk-1.4.11/Makefile.patch
packages/asterisk/asterisk-1.4.11/init
packages/asterisk/asterisk-1.4.11/logrotate
packages/asterisk/asterisk-1.4.11/sounds.xml.patch
packages/asterisk/asterisk-1.4.11/volatiles
packages/asterisk/asterisk-1.6.0-beta6
packages/asterisk/asterisk-1.6.0-beta6/Makefile.patch
packages/asterisk/asterisk-1.6.0-beta6/init
packages/asterisk/asterisk-1.6.0-beta6/logrotate
packages/asterisk/asterisk-1.6.0-beta6/sounds.xml.patch
packages/asterisk/asterisk-1.6.0-beta6/volatiles
packages/asterisk/asterisk_1.4.10.bb
packages/asterisk/asterisk_1.4.11.bb
packages/asterisk/asterisk_1.6.0-beta6.bb
packages/altboot/altboot_1.1.1+wip-SVNR80.bb
packages/altboot/altboot_1.1.1+wip-SVNR81.bb
packages/gqview/gqview-2.1.1
packages/gqview/gqview-2.1.5
packages/gqview/gqview_2.1.1.bb
packages/gqview/gqview_2.1.5.bb
packages/ulxmlrpcpp/ulxmlrpcpp_1.5.2.bb
packages/ulxmlrpcpp/ulxmlrpcpp_1.7.3.bb
packages/asterisk/asterisk-1.2.28
packages/asterisk/asterisk-1.4.19.1
packages/asterisk/asterisk-1.6.0-beta8
packages/u-boot/u-boot-1.1.4/at32stk1000
conf/machine/d201gly2.conf
conf/machine/include/tune-pentium4c.inc
packages/asterisk/asterisk-1.2.28/asterisk.patch
packages/asterisk/asterisk-1.2.28/enable-speex.patch
packages/asterisk/asterisk-1.2.28/uclibc-compat-getloadavg.patch
packages/asterisk/asterisk-1.2.28/uclibc-dns.patch
packages/asterisk/asterisk-1.4.19.1/Makefile.patch
packages/asterisk/asterisk-1.4.19.1/init
packages/asterisk/asterisk-1.4.19.1/logrotate
packages/asterisk/asterisk-1.4.19.1/sounds.xml.patch
packages/asterisk/asterisk-1.4.19.1/volatiles
packages/asterisk/asterisk-1.6.0-beta8/Makefile.patch
packages/asterisk/asterisk-1.6.0-beta8/init
packages/asterisk/asterisk-1.6.0-beta8/logrotate
packages/asterisk/asterisk-1.6.0-beta8/sounds.xml.patch
packages/asterisk/asterisk-1.6.0-beta8/volatiles
packages/asterisk/asterisk_1.2.28.bb
packages/asterisk/asterisk_1.4.19.1.bb
packages/asterisk/asterisk_1.6.0-beta8.bb
packages/boost/files/atomic_count_gcc_atomicity.patch
packages/gnash/gnash-minimal_0.8.2.bb
packages/gpsd/gpsd_2.37.bb
packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
packages/python/python-setuptools-native_0.6c6.bb
packages/u-boot/u-boot-1.1.4/at32stk1000/ap7000-add-spi-device-and-lcdc-base-address.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-define-for-sdram-test.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-framebuffer-address.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-spi-initcalls.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-system-manager-header-file.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-add-lcd-and-spi-to-config.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-ltv350qv-display-support.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-spi-support.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/avr32-boards-fix-flash-read.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/cmd-bmp-add-gzip-compressed-bmp.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/fix-mmc-data-timeout.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/lcd-add-24-bpp-support-and-atmel-lcdc-support.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/lcdc-driver-for-avr32.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/libavr32-add-spi-and-lcd-board-support.patch
packages/u-boot/u-boot-1.1.4/at32stk1000/spi-driver-for-avr32.patch
packages/uclibc/uclibc-cvs/errno_values.h.patch
packages/uclibc/uclibc-cvs/uclibc-arm-ftruncate64.patch
packages/ulxmlrpcpp/files/remove-local-includes.patch
classes/setuptools.bbclass
conf/distro/generic-uclibc.conf
conf/distro/include/moko-autorev.inc
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/sane-srcdates.inc
conf/distro/oplinux-uclibc.conf
packages/asterisk/asterisk_1.2.24.bb
packages/binutils/binutils-avr32.inc
packages/boost/boost_1.33.1.bb
packages/gpgme/gpgme.inc
packages/gpgme/gpgme_1.0.0.bb
packages/gpgme/gpgme_1.0.3.bb
packages/gpgme/gpgme_1.1.4.bb
packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
packages/python/python-2.5-manifest.inc
packages/python/python-setuptools_0.6c6.bb
packages/python/python-simplejson_1.7.1.bb
packages/python/python_2.5.2.bb
packages/u-boot/u-boot_1.1.4.bb
packages/uclibc/uclibc-0.9.29/avr32/uClibc.machine
packages/uclibc/uclibc-initial_svn.bb
packages/uclibc/uclibc_0.9.29.bb
packages/uclibc/uclibc_svn.bb
packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb
Diffs:

#
# mt diff -ra1d436a1b0cce90dce4363a3bfd62bd8c6f53913 -r22d90510dcdbad0d05c38bbc2984c79754336a89
#
#
#
# patch "conf/machine/beagleboard.conf"
#  from [ed984e852b63ec950dba7f7bae3b3504a0b74fa6]
#    to [0aca1472398cfb3f3a6fc65d9d84b22667811ff5]
# 
# patch "packages/tasks/task-base.bb"
#  from [50285a37437adccf62033cd89c0d329f69d4e191]
#    to [4f3fba7e4b5f01a54b98411187bcbae655008613]
#
============================================================
--- conf/machine/beagleboard.conf	ed984e852b63ec950dba7f7bae3b3504a0b74fa6
+++ conf/machine/beagleboard.conf	0aca1472398cfb3f3a6fc65d9d84b22667811ff5
@@ -14,9 +14,9 @@ TARGET_FPU = "hard"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
 TARGET_FPU = "hard"
-#include conf/machine/include/tune-arm1136jf-s.inc
+include conf/machine/include/tune-arm1136jf-s.inc
 # requires gcc 4.3.0:
-include conf/machine/include/tune-cortexa8.inc
+#include conf/machine/include/tune-cortexa8.inc
 
 
 IMAGE_FSTYPES ?= "tar.bz2"
@@ -34,4 +34,4 @@ UBOOT_LOADADDRESS = "0x80008000"
 
 
 # and sdio
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa"
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat"
============================================================
--- packages/tasks/task-base.bb	50285a37437adccf62033cd89c0d329f69d4e191
+++ packages/tasks/task-base.bb	4f3fba7e4b5f01a54b98411187bcbae655008613
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r67"
+PR = "r68"
 
 inherit task
 


#
# mt diff -re4016811f7d88c926c4dc798795d2b46651ddaf7 -r22d90510dcdbad0d05c38bbc2984c79754336a89
#
#
#
# delete "packages/asterisk/asterisk-1.4.10"
# 
# delete "packages/asterisk/asterisk-1.4.10/Makefile.patch"
# 
# delete "packages/asterisk/asterisk-1.4.10/init"
# 
# delete "packages/asterisk/asterisk-1.4.10/logrotate"
# 
# delete "packages/asterisk/asterisk-1.4.10/sounds.xml.patch"
# 
# delete "packages/asterisk/asterisk-1.4.10/volatiles"
# 
# delete "packages/asterisk/asterisk-1.4.11"
# 
# delete "packages/asterisk/asterisk-1.4.11/Makefile.patch"
# 
# delete "packages/asterisk/asterisk-1.4.11/init"
# 
# delete "packages/asterisk/asterisk-1.4.11/logrotate"
# 
# delete "packages/asterisk/asterisk-1.4.11/sounds.xml.patch"
# 
# delete "packages/asterisk/asterisk-1.4.11/volatiles"
# 
# delete "packages/asterisk/asterisk-1.6.0-beta6"
# 
# delete "packages/asterisk/asterisk-1.6.0-beta6/Makefile.patch"
# 
# delete "packages/asterisk/asterisk-1.6.0-beta6/init"
# 
# delete "packages/asterisk/asterisk-1.6.0-beta6/logrotate"
# 
# delete "packages/asterisk/asterisk-1.6.0-beta6/sounds.xml.patch"
# 
# delete "packages/asterisk/asterisk-1.6.0-beta6/volatiles"
# 
# delete "packages/asterisk/asterisk_1.4.10.bb"
# 
# delete "packages/asterisk/asterisk_1.4.11.bb"
# 
# delete "packages/asterisk/asterisk_1.6.0-beta6.bb"
# 
# rename "packages/altboot/altboot_1.1.1+wip-SVNR80.bb"
#     to "packages/altboot/altboot_1.1.1+wip-SVNR81.bb"
# 
# rename "packages/gqview/gqview-2.1.1"
#     to "packages/gqview/gqview-2.1.5"
# 
# rename "packages/gqview/gqview_2.1.1.bb"
#     to "packages/gqview/gqview_2.1.5.bb"
# 
# rename "packages/ulxmlrpcpp/ulxmlrpcpp_1.5.2.bb"
#     to "packages/ulxmlrpcpp/ulxmlrpcpp_1.7.3.bb"
# 
# add_dir "packages/asterisk/asterisk-1.2.28"
# 
# add_dir "packages/asterisk/asterisk-1.4.19.1"
# 
# add_dir "packages/asterisk/asterisk-1.6.0-beta8"
# 
# add_dir "packages/u-boot/u-boot-1.1.4/at32stk1000"
# 
# add_file "conf/machine/d201gly2.conf"
#  content [7e34b9738d6c1869f61708e1fec04db2564f9d89]
# 
# add_file "conf/machine/include/tune-pentium4c.inc"
#  content [6d4588e5e8c363a3883c76fc49befb8c4e75864d]
# 
# add_file "packages/asterisk/asterisk-1.2.28/asterisk.patch"
#  content [cd980f6cc48c01f2394a731d2cf247809e5c2231]
# 
# add_file "packages/asterisk/asterisk-1.2.28/enable-speex.patch"
#  content [123420f2bb25f198d687ae8cfad1eef6e90725bb]
# 
# add_file "packages/asterisk/asterisk-1.2.28/uclibc-compat-getloadavg.patch"
#  content [750cd99592c157b993f2ccb9f63edbe274d9edd1]
# 
# add_file "packages/asterisk/asterisk-1.2.28/uclibc-dns.patch"
#  content [9dbcc47d6cfeefd0f4c1071f982806f49ffc262d]
# 
# add_file "packages/asterisk/asterisk-1.4.19.1/Makefile.patch"
#  content [ce55873b5855c020f4d4e987a386223d1a211911]
# 
# add_file "packages/asterisk/asterisk-1.4.19.1/init"
#  content [66ddc677ff3831fb4be746a9222e69f65a2c6a22]
# 
# add_file "packages/asterisk/asterisk-1.4.19.1/logrotate"
#  content [d1ec36f2b07760a1a2cd1c2b18215fc5e06b2f4f]
# 
# add_file "packages/asterisk/asterisk-1.4.19.1/sounds.xml.patch"
#  content [17999e17bf9a130a9e6e8a7a687092b2231d86c7]
# 
# add_file "packages/asterisk/asterisk-1.4.19.1/volatiles"
#  content [66814aff0fd07e02c83bf90010a95c0845067557]
# 
# add_file "packages/asterisk/asterisk-1.6.0-beta8/Makefile.patch"
#  content [83b3bcf804f60d8438696a8b8e54698c9c1dff09]
# 
# add_file "packages/asterisk/asterisk-1.6.0-beta8/init"
#  content [ab9f4c6af832cc4a94d2a5e256988be381675969]
# 
# add_file "packages/asterisk/asterisk-1.6.0-beta8/logrotate"
#  content [d1ec36f2b07760a1a2cd1c2b18215fc5e06b2f4f]
# 
# add_file "packages/asterisk/asterisk-1.6.0-beta8/sounds.xml.patch"
#  content [17999e17bf9a130a9e6e8a7a687092b2231d86c7]
# 
# add_file "packages/asterisk/asterisk-1.6.0-beta8/volatiles"
#  content [66814aff0fd07e02c83bf90010a95c0845067557]
# 
# add_file "packages/asterisk/asterisk_1.2.28.bb"
#  content [59adcd07ce9843da6a5209dbe439320b4e024fbc]
# 
# add_file "packages/asterisk/asterisk_1.4.19.1.bb"
#  content [04072cabaeacd15aab238077b9b08e107ebec94b]
# 
# add_file "packages/asterisk/asterisk_1.6.0-beta8.bb"
#  content [8fbf9884c3ab370083c2125640d541c7f0fc0388]
# 
# add_file "packages/boost/files/atomic_count_gcc_atomicity.patch"
#  content [b9084da134967c9093506c230f9af87b2bf74373]
# 
# add_file "packages/gnash/gnash-minimal_0.8.2.bb"
#  content [cab14e40ea2e0651767fbbc321620fc897c7e491]
# 
# add_file "packages/gpsd/gpsd_2.37.bb"
#  content [fcf9fa136398ac80a6cb1c8408ac6df26d0ddeaf]
# 
# add_file "packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb"
#  content [8be05efebbb61236f286d5dc98eff6c59fa29561]
# 
# add_file "packages/python/python-setuptools-native_0.6c6.bb"
#  content [37e35eebe4105610cad978ad7a92f12a2b9095d1]
# 
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/ap7000-add-spi-device-and-lcdc-base-address.patch"
#  content [264148f2ada6a081fe0b2e071b0edc80d5bb26d3]
# 
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-define-for-sdram-test.patch"
#  content [aacb40f62692f7f12d2594259831635533ea5254]
# 
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-framebuffer-address.patch"
#  content [0dc5903c7cb85cbda2a744d9ded9a86258089d87]
# 
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-spi-initcalls.patch"
#  content [758d34baadad1b76b6ed1ef398709646af1defbf]
# 
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-system-manager-header-file.patch"
#  content [0905f155e05eba575a0685462783708b8098af55]
# 
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-add-lcd-and-spi-to-config.patch"
#  content [174d54cdd69afafd05d72a0fd0c8751d0976a599]
# 
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-ltv350qv-display-support.patch"
#  content [c9bf5bf83f39696ee9f981ed85f847334f28c2b1]
# 
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-spi-support.patch"
#  content [a1ebfc54a394239909ae56d84e754d7ec80bbac3]
# 
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/avr32-boards-fix-flash-read.patch"
#  content [0687dbba73b78ddd353f834a58a26b02ce8f8ef8]
# 
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/cmd-bmp-add-gzip-compressed-bmp.patch"
#  content [80f5abd078487b50df179cad3b3d1a0f382b56ae]
# 
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/fix-mmc-data-timeout.patch"
#  content [70b1b5f471490abbf21b2c173a9863794616545c]
# 
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/lcd-add-24-bpp-support-and-atmel-lcdc-support.patch"
#  content [055ca79e80417f03df63174afb7a707a2e98e5a6]
# 
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/lcdc-driver-for-avr32.patch"
#  content [87dc7c19ee654a3223802b457bb82c44ff3c515e]
# 
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/libavr32-add-spi-and-lcd-board-support.patch"
#  content [f9cdf2cc1db97cbdcfbb811df1067fb7baec5542]
# 
# add_file "packages/u-boot/u-boot-1.1.4/at32stk1000/spi-driver-for-avr32.patch"
#  content [aaf3a5bcf5a60041e4da853c72c9417adca86a12]
# 
# add_file "packages/uclibc/uclibc-cvs/errno_values.h.patch"
#  content [449baeeb6e48f88f75f07d09cdee9bd3ffcba48e]
# 
# add_file "packages/uclibc/uclibc-cvs/uclibc-arm-ftruncate64.patch"
#  content [1cb65eede202f24b92dd4cb7724a5bea8785a592]
# 
# add_file "packages/ulxmlrpcpp/files/remove-local-includes.patch"
#  content [e7814096279dfa2c12d68522fac5c7bb06f70758]
# 
# patch "classes/setuptools.bbclass"
#  from [f0a6d602e9af754216e3616efb17302d0116fe3b]
#    to [de18f3769a72fd6890b414d5ad97471bd58ce683]
# 
# patch "conf/distro/generic-uclibc.conf"
#  from [4b6c77936994e0b78819a2d3d1f6a9e68262429f]
#    to [86d233ffa29fe7b850743b7e58fde2e37d4d6f5a]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [fcfcab76f058cc1c4d7421859eca5516729b13b7]
#    to [30a97196079a97d9c58ada036559086466b640f3]
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [0741783d8c451adac5e47265611069ee7296c2d7]
#    to [1fa5768d601b1fc24f2f64c740c2e5fc96c4fce3]
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [b34ef707dd219480ea6e208db87c67468bcaa33e]
#    to [ab98f16a11db3d5648ce60703f88e9417c3562d3]
# 
# patch "conf/distro/oplinux-uclibc.conf"
#  from [4d4e43572601100e99436c766449cf726eab951e]
#    to [ded77d3149a141de656d62e5c1ed7e161f1e500d]
# 
# patch "packages/altboot/altboot_1.1.1+wip-SVNR81.bb"
#  from [f680e42100ad09229fafcf525dd6cc4715616d19]
#    to [3cb071a1265832774030a51d3885a1105bbc1a1a]
# 
# patch "packages/asterisk/asterisk_1.2.24.bb"
#  from [75b0abfa9a0684f19edd02f4383136655d35b61d]
#    to [fc355188dbdd28065639fdd359c9a29372806bdd]
# 
# patch "packages/binutils/binutils-avr32.inc"
#  from [5bd29b107e09714fb7b1d4bf3f8e6d5196a9ca37]
#    to [7d4de5cdff8cbe23a79ceaf4ae9d202ba3b70583]
# 
# patch "packages/boost/boost_1.33.1.bb"
#  from [9e61fbe13da215613e0df5e8e49a650c399e667d]
#    to [f88f30ce00fdd7e116d616bca37b226e0075d922]
# 
# patch "packages/gpgme/gpgme.inc"
#  from [36ab592ddc0e1147ff7e3515f783b2f135903201]
#    to [03ed85bb76b7f3e2a6baf511ed9e657e18bdf6c4]
# 
# patch "packages/gpgme/gpgme_1.0.0.bb"
#  from [4efb9b2188257cb57c38b41a4054c273d6d32d3c]
#    to [1945518e229ff69cc0f28fb3a1f516569ff9d592]
# 
# patch "packages/gpgme/gpgme_1.0.3.bb"
#  from [4efb9b2188257cb57c38b41a4054c273d6d32d3c]
#    to [1945518e229ff69cc0f28fb3a1f516569ff9d592]
# 
# patch "packages/gpgme/gpgme_1.1.4.bb"
#  from [1945518e229ff69cc0f28fb3a1f516569ff9d592]
#    to [1f23f8d93534d9cbc07caca5c802ff0d984aadbd]
# 
# patch "packages/gqview/gqview_2.1.5.bb"
#  from [16d9b045dce6b8a8f231b03d2732fb4c4d51fb0b]
#    to [c6c051a6d62ff63d3dc2481d6a0fb0df3bbc9df3]
# 
# patch "packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb"
#  from [be915c43601a85e473bfe81da31c8f2179696358]
#    to [20e4cbd16fbc6711586e320ecc9be434d34cae66]
# 
# patch "packages/python/python-2.5-manifest.inc"
#  from [ce2d4136b474c7f902281410e54cde0b27751287]
#    to [e3df18f8f3a8373fd0bccb992c74a16321f20256]
# 
# patch "packages/python/python-setuptools_0.6c6.bb"
#  from [57994d92ba3eec5b7d6f145f3d08241becb3a6dc]
#    to [074cb8e81cb89426c6d897caeb5fd18c68571c9a]
# 
# patch "packages/python/python-simplejson_1.7.1.bb"
#  from [8890cca59935f213dfae3a402765e7bad90c9a89]
#    to [4abda6be3039a1c47c3bdc6c4c287078ff32fbe8]
# 
# patch "packages/python/python_2.5.2.bb"
#  from [43c9ad955282b5022b3a3db8b5b179589957f666]
#    to [3ca57f8a30e412707c0107dff460e0343840d9f1]
# 
# patch "packages/u-boot/u-boot_1.1.4.bb"
#  from [d038552bd2f9296f6e46ab33c2c4ebb364477fec]
#    to [f33798683ca5789d2b3c96f26805a5f148b78370]
# 
# patch "packages/uclibc/uclibc-0.9.29/avr32/uClibc.machine"
#  from [6eee945f4f60a18b512aca572845079a33e5fc2c]
#    to [982b86121dc5785e0853eea3beeb64e885a28474]
# 
# patch "packages/uclibc/uclibc-initial_svn.bb"
#  from [c4bf20bfed551d292d63e31314bf2c9277f9d30e]
#    to [2715cc791b3fdd1b8e62328291e3ef33973bacc0]
# 
# patch "packages/uclibc/uclibc_0.9.29.bb"
#  from [0eac903c662c67108b358b1ad2c6d1d976cc5419]
#    to [59c9209c18cebba61fe0d3b0d595b2953e6dd351]
# 
# patch "packages/uclibc/uclibc_svn.bb"
#  from [224dba45f3c9cfd8430a24a707222605c885e2fb]
#    to [97cfa7f99c8af9580b5f508636f27ddb5d1aa49d]
# 
# patch "packages/ulxmlrpcpp/ulxmlrpcpp_1.7.3.bb"
#  from [a12a466db6c83f5d3917dc47f9ddb865083e1cd2]
#    to [620ff88b9012aace94f197dadcdfaf0b6b770e62]
# 
# patch "packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb"
#  from [6d801f6abfc58aaf724ee5f32f75326a83882415]
#    to [d9999335a38fb49bae5419528a518ebff7e010b6]
#
============================================================
--- conf/machine/d201gly2.conf	7e34b9738d6c1869f61708e1fec04db2564f9d89
+++ conf/machine/d201gly2.conf	7e34b9738d6c1869f61708e1fec04db2564f9d89
@@ -0,0 +1,33 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+#@TYPE: Machine
+#@NAME: D201GLY2 
+#@DESCRIPTION: Machine configuration for Intel D201GLY2 board
+
+
+TARGET_ARCH = "i686"
+PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686 i686p4c"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux
+KERNEL_IMAGETYPE = "bzImage"
+OLDEST_KERNEL = "2.6.17"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER="xserver-kdrive-sis"
+
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+
+IMAGE_FSTYPES = "ext2.gz"
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+MACHINE_TASK_PROVIDER = "task-base"
+
+udevdir = "/dev"
+
+
+#tune for P4 celeron cpu
+require conf/machine/include/tune-pentium4c.inc
============================================================
--- conf/machine/include/tune-pentium4c.inc	6d4588e5e8c363a3883c76fc49befb8c4e75864d
+++ conf/machine/include/tune-pentium4c.inc	6d4588e5e8c363a3883c76fc49befb8c4e75864d
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-march=prescott"
+PACKAGE_ARCH = "i686p4c"
+
============================================================
--- packages/asterisk/asterisk-1.2.28/asterisk.patch	cd980f6cc48c01f2394a731d2cf247809e5c2231
+++ packages/asterisk/asterisk-1.2.28/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%s
>>> DIFF TRUNCATED @ 16K

More information about the Openembedded-commits mailing list