[oe-commits] org.oe.dev merge of '5135d5b0b85d509b8af80d221f18563d4ce62475'
likewise commit
oe at amethyst.openembedded.net
Fri May 23 18:27:43 UTC 2008
merge of '5135d5b0b85d509b8af80d221f18563d4ce62475'
and '8b21a69e52feb768f1d096aa78e44dd20ce3aed4'
Author: likewise at openembedded.org
Branch: org.openembedded.dev
Revision: 1df29e1460d8a531894547a2df150e7ba591c83d
ViewMTN: http://monotone.openembedded.org/revision/info/1df29e1460d8a531894547a2df150e7ba591c83d
Files:
1
packages/efl1/epsilon
packages/efl1/epsilon/fix_alignment_error.patch
packages/glibmm/glibmm_2.14.2.bb
packages/jpeg/jpeg-6b/install.patch
packages/php/php-5.2.5/autotools.patch
packages/glibmm/glibmm_2.12.10.bb
packages/glibmm/glibmm_2.16.2.bb
packages/jpeg/jpeg-6b/libtool.patch
packages/jpeg/jpeg-6b/libtool_tweak.patch
packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex
packages/linux/gumstix-kernel-2.6.21/gumstix-connex
packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex
packages/linux/gumstix-kernel-2.6.21/gumstix-verdex
packages/mtools/mtools-native_3.9.9.bb
packages/mtools/mtools-native_3.9.11.bb
packages/mtools/mtools_3.9.9.bb
packages/mtools/mtools_3.9.11.bb
packages/php/files
packages/nonworking/php/files
packages/php/php-native_4.4.4.bb
packages/nonworking/php/php-native_4.4.4.bb
packages/php/php_4.4.4.bb
packages/nonworking/php/php_4.4.4.bb
packages/rt-tests/rt-tests_0.19.bb
packages/rt-tests/rt-tests_0.21.bb
packages/syslinux/syslinux-native_3.36.bb
packages/syslinux/syslinux-native_3.63.bb
contrib/marketing
packages/keyring/keyring-0.6.8
packages/nonworking/php
packages/wwwoffle
packages/wwwoffle/files
contrib/marketing/oe-flyer.pdf
contrib/marketing/oe-poster.pdf
contrib/mtn-bisect.sh
packages/acpid/acpid_1.0.6.bb
packages/cacao/cacao_0.98+hg20080519.bb
packages/cacao/cacaoh-native_0.98+hg20080519.bb
packages/cacao/files/cacao-hg20080519-classpath_var.patch
packages/cacao/files/cacao-hg20080519-libdir.patch
packages/ctorrent/ctcs_1.4.1.bb
packages/ctorrent/ctorrent_3.3.1.bb
packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch
packages/linux/linux-omap2-git/beagleboard/00001-mcbsp-transform.patch
packages/linux/linux-omap2-git/beagleboard/00002-mcbsp-omap1.patch
packages/linux/linux-omap2-git/beagleboard/00003-mcbsp-omap3-clock.patch
packages/linux/linux-omap2-git/beagleboard/00004-omap2-mcbsp.patch
packages/linux/linux-omap2-git/beagleboard/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch
packages/oprofile/oprofile/opcontrol-busybox-compat.patch
packages/u-boot/files/sffsdr-u-boot.patch
packages/wwwoffle/files/wwwoffle.if-down
packages/wwwoffle/files/wwwoffle.if-up
packages/wwwoffle/files/wwwoffle.init
packages/wwwoffle/wwwoffle_2.9c.bb
packages/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch
classes/base.bbclass
classes/devshell.bbclass
classes/gtk-icon-cache.bbclass
classes/image.bbclass
classes/kernel.bbclass
classes/oestats-client.bbclass
classes/seppuku.bbclass
conf/bitbake.conf
conf/distro/include/angstrom.inc
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcdates.inc
packages/avahi/avahi.inc
packages/avahi/avahi_0.6.19.bb
packages/avahi/avahi_0.6.20.bb
packages/avahi/avahi_0.6.21.bb
packages/avahi/avahi_0.6.22.bb
packages/ctorrent/ctorrent.inc
packages/dropbear/dropbear-early_1.0.bb
packages/dropbear/dropbear_0.49.bb
packages/dropbear/dropbear_0.50.bb
packages/dsplink/dsplink_1.50.bb
packages/efl1/ecore-native_cvs.bb
packages/efl1/ecore.inc
packages/efl1/ecore_cvs.bb
packages/efl1/edb_cvs.bb
packages/efl1/edbus_cvs.bb
packages/efl1/edje_cvs.bb
packages/efl1/eet_cvs.bb
packages/efl1/efreet_cvs.bb
packages/efl1/embryo_cvs.bb
packages/efl1/epsilon_cvs.bb
packages/efl1/esmart_cvs.bb
packages/efl1/evas-native_cvs.bb
packages/efl1/evas.inc
packages/efl1/evas_cvs.bb
packages/glibc/eglibc_svn.bb
packages/glibc/glibc-package.bbclass
packages/glibc/glibc_2.2.5.bb
packages/glibc/glibc_2.3.2+cvs20040726.bb
packages/glibc/glibc_2.3.2.bb
packages/glibc/glibc_2.3.3+cvs20041128.bb
packages/glibc/glibc_2.3.3+cvs20050221.bb
packages/glibc/glibc_2.3.3+cvs20050420.bb
packages/glibc/glibc_2.3.3.bb
packages/glibc/glibc_2.3.5+cvs20050627.bb
packages/glibc/glibc_2.4.bb
packages/glibc/glibc_2.5.bb
packages/glibc/glibc_2.6.1.bb
packages/glibc/glibc_2.7.bb
packages/glibc/glibc_cvs.bb
packages/images/minimal-gpe-image.bb
packages/images/nas-server-image.bb
packages/images/x11-sato-image.bb
packages/jpeg/jpeg-6b/debian.patch
packages/jpeg/jpeg_6b.bb
packages/keyring/keyring_0.6.8.bb
packages/linux/gumstix-kernel_2.6.21.bb
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
packages/linux/linux-rp-2.6.24/defconfig-akita
packages/linux/linux-rp-2.6.24/defconfig-bootcdx86
packages/linux/linux-rp-2.6.24/defconfig-c7x0
packages/linux/linux-rp-2.6.24/defconfig-hx2000
packages/linux/linux-rp-2.6.24/defconfig-poodle
packages/linux/linux-rp-2.6.24/defconfig-qemuarm
packages/linux/linux-rp-2.6.24/defconfig-qemux86
packages/linux/linux-rp-2.6.24/defconfig-spitz
packages/linux/linux-rp-2.6.24/defconfig-tosa
packages/linux/linux-rp-2.6.24/defconfig-zylonite
packages/linux/linux-rp_2.6.24.bb
packages/linux-libc-headers/linux-libc-headers.inc
packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb
packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
packages/mtd/mtd-utils_1.1.0.bb
packages/oprofile/oprofile_0.9.3.bb
packages/php/php-native_5.2.5.bb
packages/php/php.inc
packages/php/php_5.1.4.bb
packages/php/php_5.2.5.bb
packages/python/python-efl.inc
packages/python/python-setuptools-native_0.6c6.bb
packages/python/python-setuptools_0.6c6.bb
packages/python/python_2.5.2.bb
packages/samba/samba-essential_3.0.20.bb
packages/samba/samba.inc
packages/samba/samba_3.0.10.bb
packages/samba/samba_3.0.14a.bb
packages/samba/samba_3.0.20.bb
packages/samba/samba_3.0.23c.bb
packages/samba/samba_3.0.5.bb
packages/samba/samba_3.0.9.bb
packages/startup-notification/startup-notification_0.8.bb
packages/u-boot/u-boot_git.bb
packages/vnc/x11vnc_0.9.3.bb
packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
mtn:manual_merge
true
mtn:execute
packages/agg/agg-minimal_2.5.bb
Diffs:
#
# mt diff -r5135d5b0b85d509b8af80d221f18563d4ce62475 -r1df29e1460d8a531894547a2df150e7ba591c83d
#
#
#
# delete "packages/efl1/epsilon"
#
# delete "packages/efl1/epsilon/fix_alignment_error.patch"
#
# delete "packages/glibmm/glibmm_2.14.2.bb"
#
# delete "packages/jpeg/jpeg-6b/install.patch"
#
# delete "packages/php/php-5.2.5/autotools.patch"
#
# rename "packages/glibmm/glibmm_2.12.10.bb"
# to "packages/glibmm/glibmm_2.16.2.bb"
#
# rename "packages/jpeg/jpeg-6b/libtool.patch"
# to "packages/jpeg/jpeg-6b/libtool_tweak.patch"
#
# rename "packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex"
# to "packages/linux/gumstix-kernel-2.6.21/gumstix-connex"
#
# rename "packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex"
# to "packages/linux/gumstix-kernel-2.6.21/gumstix-verdex"
#
# rename "packages/mtools/mtools-native_3.9.9.bb"
# to "packages/mtools/mtools-native_3.9.11.bb"
#
# rename "packages/mtools/mtools_3.9.9.bb"
# to "packages/mtools/mtools_3.9.11.bb"
#
# rename "packages/php/files"
# to "packages/nonworking/php/files"
#
# rename "packages/php/php-native_4.4.4.bb"
# to "packages/nonworking/php/php-native_4.4.4.bb"
#
# rename "packages/php/php_4.4.4.bb"
# to "packages/nonworking/php/php_4.4.4.bb"
#
# rename "packages/rt-tests/rt-tests_0.19.bb"
# to "packages/rt-tests/rt-tests_0.21.bb"
#
# rename "packages/syslinux/syslinux-native_3.36.bb"
# to "packages/syslinux/syslinux-native_3.63.bb"
#
# add_dir "contrib/marketing"
#
# add_dir "packages/keyring/keyring-0.6.8"
#
# add_dir "packages/nonworking/php"
#
# add_dir "packages/wwwoffle"
#
# add_dir "packages/wwwoffle/files"
#
# add_file "contrib/marketing/oe-flyer.pdf"
# content [b963e650a847d1f3d4d567e056167985a51efc0d]
#
# add_file "contrib/marketing/oe-poster.pdf"
# content [68a7e59df4fe6e80f6ee801fac05b9add2157de5]
#
# add_file "contrib/mtn-bisect.sh"
# content [230e3a1f735e3f6f46b4f117657494175ee86928]
#
# add_file "packages/acpid/acpid_1.0.6.bb"
# content [c44a19e28b91e0ba71888ce49af8c2a1e1a36bf4]
#
# add_file "packages/cacao/cacao_0.98+hg20080519.bb"
# content [a332104661010fe20cb8578a21fb16b673c5c620]
#
# add_file "packages/cacao/cacaoh-native_0.98+hg20080519.bb"
# content [887b06266366e3ca536ec57e0200f64db2cf6e0f]
#
# add_file "packages/cacao/files/cacao-hg20080519-classpath_var.patch"
# content [62477b682d6cb20be67ab015423d22c6412ac5f8]
#
# add_file "packages/cacao/files/cacao-hg20080519-libdir.patch"
# content [7b12857a339294deb7df47da33c5e9db8290107a]
#
# add_file "packages/ctorrent/ctcs_1.4.1.bb"
# content [53b8c816f3d50399e26f9520a6b3f8d6a269fcc8]
#
# add_file "packages/ctorrent/ctorrent_3.3.1.bb"
# content [6914eee9fe703d58fb9628578497925236f73475]
#
# add_file "packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch"
# content [20aad83748060bdeaff7f817d93e61f7f3d10d42]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/00001-mcbsp-transform.patch"
# content [f31603696f1a604d2fc6f2bd863fbda17bf1d04b]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/00002-mcbsp-omap1.patch"
# content [7a3f0e554d44ad43bee539b08f1553c6bd221ba4]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/00003-mcbsp-omap3-clock.patch"
# content [0535b86a1ff751f854c6f6b9a47caaae5987325c]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/00004-omap2-mcbsp.patch"
# content [125c19af3d820d497bf81db6c861752782cba591]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch"
# content [c8f4b8935cd2abedc7760cf9594494dc4faa445c]
#
# add_file "packages/oprofile/oprofile/opcontrol-busybox-compat.patch"
# content [a28510c61c28ca4ebbff5efaf0175e9767234f19]
#
# add_file "packages/u-boot/files/sffsdr-u-boot.patch"
# content [67e25c07eec4f1caf5f01ac25be7aee562717fc4]
#
# add_file "packages/wwwoffle/files/wwwoffle.if-down"
# content [e4aa7cb1319be94b2bda9198bd0a2d8c7fbdf8b9]
#
# add_file "packages/wwwoffle/files/wwwoffle.if-up"
# content [df3f0c05b29192684fce6d5734a28ca7c6681c66]
#
# add_file "packages/wwwoffle/files/wwwoffle.init"
# content [3648bf9fdc09412336b5bf1671b1d16da01d54e9]
#
# add_file "packages/wwwoffle/wwwoffle_2.9c.bb"
# content [d9fd9a242f353e3916f1d36829b96f70732c14df]
#
# add_file "packages/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch"
# content [0a664afb7d51c2cd332153d72b4d8bd35559d350]
#
# patch "classes/base.bbclass"
# from [c242e6f11b981f8ccf61b3c389fc7514c69dd9bc]
# to [d846aa59ec39d60c1f61a21e2b483cb0350bff34]
#
# patch "classes/devshell.bbclass"
# from [778ca888b6de0136d3c80ac91d2fdef0d979e664]
# to [79c6ae3a2a7283eeb05ffe32a32256370272c15b]
#
# patch "classes/gtk-icon-cache.bbclass"
# from [75b805566ae03614fdfdd691b5b9542ed54bf96c]
# to [328279a52c22c9296f097b015b4b3579453ab3c4]
#
# patch "classes/image.bbclass"
# from [e1da20bc3a6143fb41abbfe3d0a7070416bdde17]
# to [44279bf54f1b30ecbdb1a4c243b766c6d86cd800]
#
# patch "classes/kernel.bbclass"
# from [8ed575119a74e50c5bcb39266997cba3f60792c2]
# to [8bfcc768d0866b5f1fce354eb3490df2d206628b]
#
# patch "classes/oestats-client.bbclass"
# from [c171db6462110869cb93b9aeaddec289573fca56]
# to [589563f5373f1a4448a5ea5dd3915a3010a96e46]
#
# patch "classes/seppuku.bbclass"
# from [97be1cf15677f7c326c40bcc51d7b2a31f25260f]
# to [503bd4965d85136d5e8b8f6a4cad80e3d82e7440]
#
# patch "conf/bitbake.conf"
# from [0015241781b03dc2f3ac5f831d982fd4e9661b7f]
# to [1ed88e1003b951952075fb58350fd8c3b2feec06]
#
# patch "conf/distro/include/angstrom.inc"
# from [07055167d1e686bc6894c9e490f73d1ff54f7c89]
# to [81b35f382e812295b2b67a266c4c3751b2b7ff59]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [cf51729787fd2fd25f76ebaf652e629b2c27a8b4]
# to [89ce7f49f72eea705ed63b4f98b6ffa6d6a02bed]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [e993ffd4e275abdc019bd768b83fe75481e9f12a]
# to [a840f12073131fc6d5922a4f7d4eaf3c0fbe93ba]
#
# patch "packages/avahi/avahi.inc"
# from [4fa00bfeab78501b5f96381ad7362170b9b43670]
# to [43834b0521bfa682033d94ab0f585788c3343deb]
#
# patch "packages/avahi/avahi_0.6.19.bb"
# from [b79ad80e97d4543f28d1a53c5b017057371d031f]
# to [31876c8a22a42cf1aa6837bb7555de371381d3cf]
#
# patch "packages/avahi/avahi_0.6.20.bb"
# from [b79ad80e97d4543f28d1a53c5b017057371d031f]
# to [31876c8a22a42cf1aa6837bb7555de371381d3cf]
#
# patch "packages/avahi/avahi_0.6.21.bb"
# from [26918362d7839d99e5016a6b67015a2f5e442910]
# to [601996f503c03a8271af8251c380475caeb88960]
#
# patch "packages/avahi/avahi_0.6.22.bb"
# from [7cc7310ab622a94d9c9df777edca8e64664ab30d]
# to [2e254bff547105d0abcbff5c287d52affacd37fa]
#
# patch "packages/ctorrent/ctorrent.inc"
# from [4b8fc0a73230f74e56d7a4bff5fdcfd686b5034e]
# to [bc2471ce8f2f52152c931e02994c6e907fa5287f]
#
# patch "packages/dropbear/dropbear-early_1.0.bb"
# from [5b7702b9d74427e400988330fbd7c6fcff176371]
# to [f1e7db2a9ec4fc0155567720a008f3158be5d187]
#
# patch "packages/dropbear/dropbear_0.49.bb"
# from [251634540a152574b870f74866d793a0dedefae3]
# to [78fcce6b1a8d01f370d8c3b57fe9feea4faa3d77]
#
# patch "packages/dropbear/dropbear_0.50.bb"
# from [1f1e5b54696006b7f8484bd48dff9fa684992830]
# to [61b1e18c0d8254b164c4d1ed3bf6b6b20d9fc200]
#
# patch "packages/dsplink/dsplink_1.50.bb"
# from [a2dba60ef70a6be005343a5420ec39fe0d6b7126]
# to [ba3fbbc36f80f856194516e3676c4be8ff95593f]
#
# patch "packages/efl1/ecore-native_cvs.bb"
# from [454bc7eb7c9a1579123625d9b419ea0982f3b381]
# to [47c2a5e1692381f93bef6ef8180ff7daaf1a3760]
#
# patch "packages/efl1/ecore.inc"
# from [b736e8d906a16691f28e2de920bf7b69469cb020]
# to [d132e5d100eb3a87ef5d6cb123c586e203ef5143]
#
# patch "packages/efl1/ecore_cvs.bb"
# from [8e141a68d3fb8691ee914a2ac970129fe14f8aed]
# to [db9ceefb6209514dcc2b22c3b7d8e0816820f762]
#
# patch "packages/efl1/edb_cvs.bb"
# from [cfec22c11caa4150e22a2640ef1292b5fc9dd9df]
# to [7d8fdec465a882e0ed9272e63c54cbdfd4aa19d2]
#
# patch "packages/efl1/edbus_cvs.bb"
# from [ecd6cb444aeac48cd019c31f15055fb2cca6157a]
# to [e051cb48a3921952f001b55f34a5f92b4234574a]
#
# patch "packages/efl1/edje_cvs.bb"
# from [c97e863a88bf2970d41f1107b5d64b248abf57e0]
# to [62eea4a4a904f412cb2ae26142d346a3a70cd876]
#
# patch "packages/efl1/eet_cvs.bb"
# from [eada78b9148d3a22f1b46d69d3aabbdfe747410c]
# to [9979a56ebf0921e6b1c374aaf525e1fbdce50a27]
#
# patch "packages/efl1/efreet_cvs.bb"
# from [4b80740afd5106d5bc474fa4921c6522ca473d30]
# to [c7934aa1ab83cf5bde841da90247d731b5dff0de]
#
# patch "packages/efl1/embryo_cvs.bb"
# from [d1e3b9f6212724c6df80aec5468b565a407a77bb]
# to [5e61b438e4ebdca460ac0b5b906d852025c76747]
#
# patch "packages/efl1/epsilon_cvs.bb"
# from [06a4ccc0ac1208566731c847fc2ac20246de3ec5]
# to [83ada598b7cf56e16b6d9c1101d88249c5112649]
#
# patch "packages/efl1/esmart_cvs.bb"
# from [6502bab7ea2f2d0380e49644e4204603a1395ff1]
# to [ffe66023913a2de6c11a7669d205c89954fd43c7]
#
# patch "packages/efl1/evas-native_cvs.bb"
# from [6187f8e7ba476dd0db7fa8a5c523f6a000d9e5fa]
# to [6d464a30990003574c9db7b5255cf707856408c4]
#
# patch "packages/efl1/evas.inc"
# from [9c61e64a2a646cac813a4701bd1a5c5a4ac16964]
# to [3832fb27b48f99ab029bbdcd20863a3daa1a3009]
#
# patch "packages/efl1/evas_cvs.bb"
# from [82f126668ed700106fce2efb55f6d16c371b4bd1]
# to [698aa57979dcff374e859909316b7b53c0a2b985]
#
# patch "packages/glibc/eglibc_svn.bb"
# from [c35e8bfcdde601cae0e1daac27f6eadc06d385d8]
# to [693cfbc95cb7166e12ced9da2affddab022ac474]
#
# patch "packages/glibc/glibc-package.bbclass"
# from [ad5d2085797fa01b1f94d1ff231db24757badb90]
# to [cc608cf169b73c5795935b63f2ff1bb56dd743d8]
#
# patch "packages/glibc/glibc_2.2.5.bb"
# from [34af38798fe6eb076ee1e44612cfb2e740abf174]
# to [d3eb7489c6594b3f99cf2bc22dcb08f3ebea954d]
#
# patch "packages/glibc/glibc_2.3.2+cvs20040726.bb"
# from [808ed86ced75140a1d3fc3218b2496f9cc4bf940]
# to [2796a2ca3f43cc68cb8dcab23c538f9d43671bfc]
#
# patch "packages/glibc/glibc_2.3.2.bb"
# from [c9271dd5bdf2fac00df5b90d4757176c5c7bb687]
# to [6ce928a3a50aaa74484d58ca109097ecf56dfdf6]
#
# patch "packages/glibc/glibc_2.3.3+cvs20041128.bb"
# from [de5dc3446aa94c3abfdc1f8edff39f19084142f7]
# to [c52302457e46cbf50f3c743a36911af5c5ef5249]
#
# patch "packages/glibc/glibc_2.3.3+cvs20050221.bb"
# from [cb07d9d3c55c4fcfc23ddfe1650281885b9ea5f6]
# to [6fcb1be9e4e8d1a32a5f67f6c5d828934cc23bfa]
#
# patch "packages/glibc/glibc_2.3.3+cvs20050420.bb"
# from [07a49aaf94192d47ee2118328e09b13cf4c5aaa4]
# to [f54bdcea04b98f19a0b0200969fc2346af827228]
#
# patch "packages/glibc/glibc_2.3.3.bb"
# from [94f418faf76e360cb344f13e886941c63faeaa1c]
# to [a2b16ae14389f9b1f928da2651ce17295e946eb8]
#
# patch "packages/glibc/glibc_2.3.5+cvs20050627.bb"
# from [002681533641cc0727653c163caa2b89d9554585]
# to [e767bb71ec3f4cc71f4c93cb973621df12f2ffa8]
#
# patch "packages/glibc/glibc_2.4.bb"
# from [90ea22d4701fd976ebf54996b4f0f0f75fcbcb15]
# to [06f918a79a1f11a8d3ec0bb653752c014ce40e33]
#
# patch "packages/glibc/glibc_2.5.bb"
# from [0df9115aff23a65cf60cf318463e92afd9d4187d]
# to [1e078613766f3dd8fc94f432bbe07c4e1f98e30f]
#
# patch "packages/glibc/glibc_2.6.1.bb"
# from [e44cc81d7e42c307cc3fa0165f19e3c2cc9c1dab]
# to [157296447567bd27d06a4c65f01df9c9fb53b53d]
#
# patch "packages/glibc/glibc_2.7.bb"
# from [0315c4d0fd55ed746d83fbe2e7512ce1dfe46237]
# to [bb41e38f1cd4eaa7b688b45abf9e3ba2b19d20c8]
#
# patch "packages/glibc/glibc_cvs.bb"
# from [65a43c48f600ea8305861ae2b9bc8d44ac65c8d6]
# to [7822dea5a8190361462aaba3a5865a3f1a2c82d8]
#
# patch "packages/images/minimal-gpe-image.bb"
# from [b6ec94cbbd30d656387b5fc96133954bd84abaaa]
# to [803dc5fad5d3e6b5e37fbd2991ce0aba70c4aee5]
#
# patch "packages/images/nas-server-image.bb"
# from [560048e8fa92ea93876cac92e66f0d4241079ad6]
# to [569c1b6bb8ec4aea022dd50dd0c3ef14a155f28b]
#
# patch "packages/images/x11-sato-image.bb"
# from [ba6ee9b7eb840b773a10d6d81c1e5a3b78b04c68]
# to [a2fdff4124ec3089640314c249f06ec32ea9fd96]
#
# patch "packages/jpeg/jpeg-6b/debian.patch"
# from [99bf3d9e426841282a723c49d473082b018f76d2]
# to [6224a5ac1ce196fc588a069308a8526109ab4571]
#
# patch "packages/jpeg/jpeg-6b/libtool_tweak.patch"
# from [e1f50f78f3e34e8ef56df9ac7bd8f38d088b84d8]
# to [f77f2f59ccee20a2199db6cbf30ef5f5243cf96a]
#
# patch "packages/jpeg/jpeg_6b.bb"
# from [0f825c07e85f10fdd361d224cb45a1f833962d0d]
# to [2f1cd5402f50d3be05860e5fd4688329e8337c73]
#
# patch "packages/keyring/keyring_0.6.8.bb"
# from [2cfb564b37ee4f9a7f8fc38d6a1ef53cf057ac03]
# to [e0d93d0a4a92bc44db6eeeafa9ecbcf49ef6babe]
#
# patch "packages/linux/gumstix-kernel_2.6.21.bb"
# from [abcf379ae73f3805d3364fbbf7d4e735d4c887b2]
# to [1f1a51ddd361d503ab44e816d5c0dee09e9bbff2]
#
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
# from [964a8dabe7c00485c6abaca8fd364eb631810716]
# to [2c7debe2bcbaf6c6bdefa0a63a33254f23ad30d4]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [91d936879c9fac0d051b7c80b290a712b953d3e0]
# to [2bf99a7eea2115a72cbcfa13926816fe88ac7e7d]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-akita"
# from [d714658790b6d290f5220e92a762c59d1755f521]
# to [1d797e5ffd81b69e0985d2fe9663db5a798b79a1]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-bootcdx86"
# from [ff935bd0c61befdc4d68c43b5c60ef4cb05c4753]
# to [f9ecd99888aa68cb846f0d56cee5bca5371c9d4b]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-c7x0"
# from [df65683d9a629e20e3adaf2ca96f9b5e7b77710b]
# to [ddc33aec79255b267fcfce9b3fc13ea540b0ae1f]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-hx2000"
# from [673369cff9f4de86044b4e3e7d0a32f40f7ddb1f]
# to [957a7113b116599f4ae7309f217801c829f7211b]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-poodle"
# from [19043385a06385c41f9d8be31ee1b42171e5d4e5]
# to [2c9baccc4098e9b1d1e1392f20c2b55aa947bb28]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-qemuarm"
# from [5cc1a20209d9bfde5ad851a89437c08c721815c5]
# to [e74d23a59f5aad6fe732ed3b3e3b1a0b16d03ebc]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-qemux86"
# from [680641c4ecbfa3499fbdd079095535f629587647]
# to [3c92e257aaa1496dfd2123064691c6dd459e62b9]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-spitz"
# from [1c089b38d34a93c68659ef90bec902bbbcf436ae]
# to [1f2f1fd61af250329c4ee2ae60d0315acf2f95c0]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-tosa"
# from [9309f0f56b45754f03ad35209dcb54e4cfb7df83]
# to [a69c2dbac0a15fbbcf77f0f6b52223e92fa6210d]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-zylonite"
# from [01f7a0f6b6bb0cbdd5daa28ff680349a8d8cddbb]
# to [d6bbc8912bcc1fc8d6774c5c7211f49f73ebf102]
#
# patch "packages/linux/linux-rp_2.6.24.bb"
# from [a462636fa146486f11ad987d424ad2ebdd235df2]
# to [bdf515f4dba80c6b7d3022a76de73a5130b8ed5a]
#
# patch "packages/linux-libc-headers/linux-libc-headers.inc"
# from [5c98632deeb64f09ea2d1409ebfb3f52ca329b18]
# to [b2222f137bb2d5024aabdd95ce25e23a2b0a3b9e]
#
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb"
# from [a5e398b392cdf0d939f0d10034f2326567a46b5e]
# to [47e4d26b80d13dc103a57f5405e696bb41fa6482]
#
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb"
# from [2462887f80c983eb3bd388e906229f9f58bc4aa7]
# to [15a52afa51d66a10c4e65d8999d9150de03b1ecf]
#
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.18.bb"
# from [1591ece17925b88a031d76f96246cad5d04d3424]
# to [315b1efcbbcf61f41ebcdd6ff78e4306089eb779]
#
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.20.bb"
# from [6ca5c4e670c6594210c1afa9d59511ab71dfe839]
# to [bb5b016cdec7c47517f8a6f0f98bb2bf0553754b]
#
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.22.bb"
# from [66ed33603a1599bc68718e22c5e7fe1d81ff51cc]
# to [9848fbf9a03e26527896520878c57d533bebc91e]
#
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.23.bb"
# from [9848fbf9a03e26527896520878c57d533bebc91e]
# to [bf5ec08a1649841a180f829658d288158043c847]
#
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb"
# from [a9f62e9c41ff4489d4ce3097d04a44c1688c5b9b]
# to [db7b347929e1b904058af4bf2e4aaa167edee882]
#
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb"
# from [d9d8521f857b98b5a68a1e131113d039c7fe6854]
# to %s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r8b21a69e52feb768f1d096aa78e44dd20ce3aed4 -r1df29e1460d8a531894547a2df150e7ba591c83d
#
#
#
# add_file "packages/agg/agg-minimal_2.5.bb"
# content [c884277a9dc797a77960e57b352bda34e8b2d413]
#
============================================================
--- packages/agg/agg-minimal_2.5.bb c884277a9dc797a77960e57b352bda34e8b2d413
+++ packages/agg/agg-minimal_2.5.bb c884277a9dc797a77960e57b352bda34e8b2d413
@@ -0,0 +1,46 @@
+DESCRIPTION = "Anti Grain Geometry - A High Quality Rendering Engine for C++"
+AUTHOR = "mcseem at antigrain.com"
+HOMEPAGE = "http://www.antigrain.com"
+SECTION = "libs"
+LICENSE = "AGG License"
+DEPENDS = "freetype"
+
+PR = "r0"
+
+SRC_URI = "http://www.antigrain.com/agg-${PV}.tar.gz"
+# this patch is needed to build without SDL
+SRC_URI += "http://www.wxsvg.org/files/agg-2.5_cygming.patch;patch=1"
+S = "${WORKDIR}/agg-${PV}"
+
+inherit autotools pkgconfig
+
+CFLAGS += " -I{$STAGING_INCDIR} "
+
+FILES_${PN} = "${libdir}/libagg.so.* \
+ ${libdir}/libaggfontfreetype.so.*"
+
+LEAD_SONAME = "libagg.so"
+
+# configured for minimal external dependencies (no X, no SDL) for use by
+# framebuffer driven applications.
+EXTRA_OECONF = "--enable-gpc --without-x --disable-examples --disable-ctrl \
+--disable-platform --disable-win32tt --disable-sdltest"
+
+do_stage() {
+ oe_libinstall -a -so libagg ${STAGING_LIBDIR}
+ oe_libinstall -a -so libaggfontfreetype ${STAGING_LIBDIR}
+ install -m 0644 libagg.m4 ${STAGING_DATADIR}/aclocal/
+ install -d ${STAGING_INCDIR}/agg2
+
+ for f in font_freetype font_win32_tt gpc
+ do
+ install -m 0644 ${S}/$f/*.h ${STAGING_INCDIR}/agg2/
+ done
+
+ cd include
+ headers=`find . -name "*.h"`
+ for f in $headers
+ do
+ install -D -m 0644 $f ${STAGING_INCDIR}/agg2/$f
+ done
+}
More information about the Openembedded-commits
mailing list