[oe-commits] org.oe.dev merge of '1758ca8d5730da9557179027a29b7ec740792934'

rwhitby commit openembedded-commits at lists.openembedded.org
Sat Feb 9 20:47:02 UTC 2008 

merge of '1758ca8d5730da9557179027a29b7ec740792934'
     and '75e04836bf8c030852e29dbec000bd081b31009e'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: b36b4b65fad552470e8f307d8ec58001f8765563
ViewMTN: http://monotone.openembedded.org/revision/info/b36b4b65fad552470e8f307d8ec58001f8765563
Files:
1
packages/meta/slugos-packages.bb
contrib/angstrom/rss.php
packages/busybox/busybox-1.7.2/files
packages/busybox/slingbox-1.00
packages/busybox/slingbox-1.00/defconfig
packages/busybox/slingbox-1.00/lazy_umount.patch
packages/busybox/slingbox-1.00/slingbox.patch
packages/busybox/slingbox-1.1.3
packages/busybox/slingbox-1.1.3/Makefile_args.patch
packages/busybox/slingbox-1.1.3/defconfig
packages/busybox/slingbox-1.1.3/lazy_umount.patch
packages/busybox/slingbox-1.1.3/slingbox.patch
packages/busybox/slingbox-1.1.3/slingbox_name.patch
packages/busybox/slingbox-1.2.2
packages/busybox/slingbox-1.2.2/defconfig
packages/busybox/slingbox-1.2.2/df_rootfs.patch
packages/busybox/slingbox-1.2.2/halt.patch
packages/busybox/slingbox-1.2.2/lazy_umount.patch
packages/busybox/slingbox-1.2.2/slingbox.patch
packages/busybox/slingbox-1.2.2/slingbox_name.patch
packages/busybox/slingbox-1.2.2/wget-long-options.patch
packages/busybox/slingbox_1.00.bb
packages/busybox/slingbox_1.1.3.bb
packages/busybox/slingbox_1.2.2.bb
packages/efl1/ecore/configure.patch
packages/efl1/ecore/ecore_kernel_input_header.patch
packages/efl1/ecore/fix-tslib-configure.patch
packages/efl1/ecore/remove-bad-code.patch
packages/musicbrainz/libmusicbrainz_2.1.4.bb
packages/poppler/poppler_0.5.4.bb
packages/poppler/poppler_0.6.2.bb
packages/poppler/poppler_0.6.bb
packages/taglib/taglibc_1.4.bb
contrib/angstrom/rss2.php
packages/lightmediascanner
packages/logic-analyzer
packages/logic-analyzer/files
packages/rxtx
packages/rxtx/files
packages/taglib/files
conf/distro/include/preferred-xorg-versions-X11R7.4.inc
packages/jamvm/files/debian-jni.patch
packages/klibc/files/klibc-config-eabi.patch
packages/lightmediascanner/lightmediascanner_svn.bb
packages/logic-analyzer/files/client-makefile.patch
packages/logic-analyzer/files/cp-run-fix.patch
packages/logic-analyzer/logic-analyzer_0.8.bb
packages/poppler/poppler_0.6.4.bb
packages/python/python-lightmediascanner_svn.bb
packages/rxtx/files/rxtx-fixes-from-debian.patch
packages/rxtx/rxtx_2.1-7r2.bb
packages/taglib/files/taglib_1.4-8.diff.gz
packages/xorg-app/beforelight_1.0.3.bb
packages/xorg-app/xfs_1.0.5.bb
packages/xorg-app/xgamma_1.0.2.bb
packages/xorg-app/xpr_1.0.2.bb
packages/xorg-driver/xf86-input-acecad_1.2.1.bb
packages/xorg-driver/xf86-input-calcomp_1.1.1.bb
packages/xorg-driver/xf86-input-citron_2.2.1.bb
packages/xorg-driver/xf86-input-dmc_1.1.1.bb
packages/xorg-driver/xf86-input-dynapro_1.1.1.bb
packages/xorg-driver/xf86-input-elo2300_1.1.1.bb
packages/xorg-driver/xf86-input-elographics_1.1.0.bb
packages/xorg-driver/xf86-input-evdev_1.2.0.bb
packages/xorg-driver/xf86-input-joystick_1.3.1.bb
packages/xorg-driver/xf86-input-magellan_1.1.1.bb
packages/xorg-driver/xf86-input-microtouch_1.1.1.bb
packages/xorg-driver/xf86-input-mouse_1.2.3.bb
packages/xorg-driver/xf86-input-penmount_1.2.1.bb
packages/xorg-driver/xf86-input-spaceorb_1.1.1.bb
packages/xorg-driver/xf86-input-vmmouse_12.4.3.bb
packages/xorg-driver/xf86-input-void_1.1.1.bb
packages/xorg-driver/xf86-video-ati_6.7.197.bb
packages/xorg-driver/xf86-video-i128_1.2.1.bb
packages/xorg-driver/xf86-video-i810_1.7.4.bb
packages/xorg-driver/xf86-video-mga_1.9.99.bb
packages/xorg-driver/xf86-video-nsc_2.8.3.bb
packages/xorg-driver/xf86-video-nv_2.1.7.bb
packages/xorg-driver/xf86-video-sis_0.9.4.bb
packages/xorg-lib/libxmu_1.0.4.bb
packages/xorg-proto/xproto-native_7.0.11.bb
classes/bootimg.bbclass
classes/java.bbclass
conf/distro/include/sane-srcrevs.inc
conf/machine/at32stk1000.conf
conf/machine/at91sam9260ek.conf
conf/machine/at91sam9261ek.conf
conf/machine/at91sam9263ek.conf
conf/machine/bd-neon.conf
conf/machine/fic-gta01.conf
conf/machine/gesbc-9302.conf
conf/machine/include/motorola-ezx-base.inc
conf/machine/omap1510inn.conf
conf/machine/omap1610h2.conf
conf/machine/omap1710h3.conf
conf/machine/omap2420h4.conf
conf/machine/omap2430sdp.conf
conf/machine/omap5912osk.conf
conf/machine/shark.conf
conf/machine/triton.conf
conf/machine/xxs1500.conf
packages/busybox/busybox-1.2.1/angstrom/defconfig
packages/busybox/busybox-1.2.1/avr32/defconfig
packages/busybox/busybox-1.2.1/defconfig
packages/busybox/busybox-1.2.1/nylon/defconfig
packages/busybox/busybox-1.2.1/slugos/defconfig
packages/busybox/busybox-1.7.2/defconfig
packages/busybox/busybox-static-1.2.1/defconfig
packages/busybox/busybox-static_1.2.1.bb
packages/busybox/busybox_1.2.1.bb
packages/busybox/busybox_1.2.2.bb
packages/busybox/busybox_1.3.1.bb
packages/busybox/busybox_1.7.2.bb
packages/busybox/files/syslog
packages/cacao/cacao.inc
packages/cacao/cacao_0.98+hg20071001.bb
packages/dcop/dcopidl-native_3.5.4.bb
packages/dcop/dcopidl2cpp-native_3.5.4.bb
packages/e17/enna_cvs.bb
packages/gpsd/gpsd.inc
packages/gpsd/gpsd_2.28.bb
packages/gpsd/gpsd_2.34.bb
packages/gpsd/gpsd_2.36.bb
packages/jamvm/jamvm.inc
packages/jamvm/jamvm_1.5.0.bb
packages/klibc/klibc-utils-static_1.5.bb
packages/libxml/libxml++_2.14.0.bb
packages/php/php-native_4.4.4.bb
packages/php/php-native_5.2.0.bb
packages/taglib/taglib_1.4.bb
packages/tasks/task-openmoko-python-devel.bb
packages/tasks/task-python-everything.bb
mtn:manual_merge
true
Diffs:

#
# mt diff -r1758ca8d5730da9557179027a29b7ec740792934 -rb36b4b65fad552470e8f307d8ec58001f8765563
#
# 
# 
# patch "packages/meta/slugos-packages.bb"
#  from [5245a17c2f735fe2b2c50779e12e2bd525d82c8a]
#    to [49ebdfc64be77f73c5822ee9dab75bd89fe8cb25]
# 
============================================================
--- packages/meta/slugos-packages.bb	5245a17c2f735fe2b2c50779e12e2bd525d82c8a
+++ packages/meta/slugos-packages.bb	49ebdfc64be77f73c5822ee9dab75bd89fe8cb25
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r44"
+PR = "r45"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -76,7 +76,6 @@ SLUGOS_PACKAGES = "\
 	dnsmasq \
 	e2fsprogs \
 	e2fsprogs-libs \
-	eciadsl \
 	expat \
 	ez-ipupdate \
 	fconfig \
@@ -245,6 +244,7 @@ SLUGOS_BROKEN_PACKAGES = "\
 SLUGOS_BROKEN_PACKAGES = "\
 	bwmon \
 	dsniff \
+	eciadsl \
 	fetchmail \
 	lirc-modules lirc \
 	madfu \


#
# mt diff -r75e04836bf8c030852e29dbec000bd081b31009e -rb36b4b65fad552470e8f307d8ec58001f8765563
#
# 
# 
# delete "contrib/angstrom/rss.php"
# 
# delete "packages/busybox/busybox-1.7.2/files"
# 
# delete "packages/busybox/slingbox-1.00"
# 
# delete "packages/busybox/slingbox-1.00/defconfig"
# 
# delete "packages/busybox/slingbox-1.00/lazy_umount.patch"
# 
# delete "packages/busybox/slingbox-1.00/slingbox.patch"
# 
# delete "packages/busybox/slingbox-1.1.3"
# 
# delete "packages/busybox/slingbox-1.1.3/Makefile_args.patch"
# 
# delete "packages/busybox/slingbox-1.1.3/defconfig"
# 
# delete "packages/busybox/slingbox-1.1.3/lazy_umount.patch"
# 
# delete "packages/busybox/slingbox-1.1.3/slingbox.patch"
# 
# delete "packages/busybox/slingbox-1.1.3/slingbox_name.patch"
# 
# delete "packages/busybox/slingbox-1.2.2"
# 
# delete "packages/busybox/slingbox-1.2.2/defconfig"
# 
# delete "packages/busybox/slingbox-1.2.2/df_rootfs.patch"
# 
# delete "packages/busybox/slingbox-1.2.2/halt.patch"
# 
# delete "packages/busybox/slingbox-1.2.2/lazy_umount.patch"
# 
# delete "packages/busybox/slingbox-1.2.2/slingbox.patch"
# 
# delete "packages/busybox/slingbox-1.2.2/slingbox_name.patch"
# 
# delete "packages/busybox/slingbox-1.2.2/wget-long-options.patch"
# 
# delete "packages/busybox/slingbox_1.00.bb"
# 
# delete "packages/busybox/slingbox_1.1.3.bb"
# 
# delete "packages/busybox/slingbox_1.2.2.bb"
# 
# delete "packages/efl1/ecore/configure.patch"
# 
# delete "packages/efl1/ecore/ecore_kernel_input_header.patch"
# 
# delete "packages/efl1/ecore/fix-tslib-configure.patch"
# 
# delete "packages/efl1/ecore/remove-bad-code.patch"
# 
# delete "packages/musicbrainz/libmusicbrainz_2.1.4.bb"
# 
# delete "packages/poppler/poppler_0.5.4.bb"
# 
# delete "packages/poppler/poppler_0.6.2.bb"
# 
# delete "packages/poppler/poppler_0.6.bb"
# 
# delete "packages/taglib/taglibc_1.4.bb"
# 
# rename "contrib/angstrom/rss2.php"
#     to "contrib/angstrom/rss.php"
# 
# add_dir "packages/lightmediascanner"
# 
# add_dir "packages/logic-analyzer"
# 
# add_dir "packages/logic-analyzer/files"
# 
# add_dir "packages/rxtx"
# 
# add_dir "packages/rxtx/files"
# 
# add_dir "packages/taglib/files"
# 
# add_file "conf/distro/include/preferred-xorg-versions-X11R7.4.inc"
#  content [2bd8404a566895df3ee956c8fec2fb169386ffc9]
# 
# add_file "packages/jamvm/files/debian-jni.patch"
#  content [fde8e06ffb742cd42a2d3f9da5e021a1188c7bce]
# 
# add_file "packages/klibc/files/klibc-config-eabi.patch"
#  content [9ce82e5d2cc7597ec66f40fd0abe36685b998028]
# 
# add_file "packages/lightmediascanner/lightmediascanner_svn.bb"
#  content [c999d5865ce2ca59dbeb57b0713c8e32d64bb618]
# 
# add_file "packages/logic-analyzer/files/client-makefile.patch"
#  content [c6a0d4c4968fb621afe03dae451df33433205b87]
# 
# add_file "packages/logic-analyzer/files/cp-run-fix.patch"
#  content [16eb0d71c743389d198d7d289f721763d14a58df]
# 
# add_file "packages/logic-analyzer/logic-analyzer_0.8.bb"
#  content [1ee8013dcfa98eec177fbdfbfbb2ecb8167f8dad]
# 
# add_file "packages/poppler/poppler_0.6.4.bb"
#  content [5051018c95108165af0a9b9d2a66681132cac581]
# 
# add_file "packages/python/python-lightmediascanner_svn.bb"
#  content [ed36f161da571ebe8825db20d3e604b2b97c3ff6]
# 
# add_file "packages/rxtx/files/rxtx-fixes-from-debian.patch"
#  content [394e9d1873a38846dcb70eb3fa5e4d44fde48b82]
# 
# add_file "packages/rxtx/rxtx_2.1-7r2.bb"
#  content [3974ebf631b2b9bafd21186daeaaa81409ba5eec]
# 
# add_file "packages/taglib/files/taglib_1.4-8.diff.gz"
#  content [c71a982f1f2f332c4477100d574d2031d3bf4b18]
# 
# add_file "packages/xorg-app/beforelight_1.0.3.bb"
#  content [27554e7b2f2333aafa425e3f4e57c30a57ae9b48]
# 
# add_file "packages/xorg-app/xfs_1.0.5.bb"
#  content [0f312249fdc3c96ad553e5eb574ba3fef73ff790]
# 
# add_file "packages/xorg-app/xgamma_1.0.2.bb"
#  content [d9e384e7b3d1e8568f6e7935bf18de886e62272f]
# 
# add_file "packages/xorg-app/xpr_1.0.2.bb"
#  content [2f0ae1124192ed49e42f86d83315e1daf31f9455]
# 
# add_file "packages/xorg-driver/xf86-input-acecad_1.2.1.bb"
#  content [d4eed3f09ab330e51e578d372d2836bf56e12c97]
# 
# add_file "packages/xorg-driver/xf86-input-calcomp_1.1.1.bb"
#  content [decf1925caef5ee90fbc1f3229efd19ce76d504c]
# 
# add_file "packages/xorg-driver/xf86-input-citron_2.2.1.bb"
#  content [9620bdf1e664442dbc8b6947f0e2793c8fb9436b]
# 
# add_file "packages/xorg-driver/xf86-input-dmc_1.1.1.bb"
#  content [b16e5813ce5b2d77ab82f1772c66f0927b81b860]
# 
# add_file "packages/xorg-driver/xf86-input-dynapro_1.1.1.bb"
#  content [b447a0878534562285a317ca04d9b53a567976c8]
# 
# add_file "packages/xorg-driver/xf86-input-elo2300_1.1.1.bb"
#  content [9bcaa8881c8602d41ec33a34cee6d303607cf256]
# 
# add_file "packages/xorg-driver/xf86-input-elographics_1.1.0.bb"
#  content [0eca43ba102499cf7d66da3eea2f1357b5b19b86]
# 
# add_file "packages/xorg-driver/xf86-input-evdev_1.2.0.bb"
#  content [a87982a9bd27a1742c9e6bdb32d13fc88506d1b9]
# 
# add_file "packages/xorg-driver/xf86-input-joystick_1.3.1.bb"
#  content [49ad169a5497357b8a5e44dc554814c722d7560e]
# 
# add_file "packages/xorg-driver/xf86-input-magellan_1.1.1.bb"
#  content [afe6c35e368a8824676ccec320aa6b9806eedbc0]
# 
# add_file "packages/xorg-driver/xf86-input-microtouch_1.1.1.bb"
#  content [8b956e01215b30a3dd8ee475e06c058e6c16dc96]
# 
# add_file "packages/xorg-driver/xf86-input-mouse_1.2.3.bb"
#  content [2778f83d149677442ccc536b9bb2482de1b25545]
# 
# add_file "packages/xorg-driver/xf86-input-penmount_1.2.1.bb"
#  content [68bc88f8b2006c4d131c7eb6945a804ee101eb38]
# 
# add_file "packages/xorg-driver/xf86-input-spaceorb_1.1.1.bb"
#  content [78e925957c9f5723611cabe2eea3a438973b134c]
# 
# add_file "packages/xorg-driver/xf86-input-vmmouse_12.4.3.bb"
#  content [6165375cd26aa1ca1d3118105d37635ce34d842e]
# 
# add_file "packages/xorg-driver/xf86-input-void_1.1.1.bb"
#  content [d91fc2f7b9f40496d9aed07297d9117fce277f7a]
# 
# add_file "packages/xorg-driver/xf86-video-ati_6.7.197.bb"
#  content [8dfbd6e912eac11000c7b5fa1970558b0195c15b]
# 
# add_file "packages/xorg-driver/xf86-video-i128_1.2.1.bb"
#  content [fdbd246d33a8cf7a87f52a0cdde00c41de87d3eb]
# 
# add_file "packages/xorg-driver/xf86-video-i810_1.7.4.bb"
#  content [427082621e76e5e4f3c00aa6b62d40dccdfca10e]
# 
# add_file "packages/xorg-driver/xf86-video-mga_1.9.99.bb"
#  content [a935f7fbe600f29aa684328e6ef0d387741524d1]
# 
# add_file "packages/xorg-driver/xf86-video-nsc_2.8.3.bb"
#  content [caf114a184695c3ad04d13960ca11ccd828e1244]
# 
# add_file "packages/xorg-driver/xf86-video-nv_2.1.7.bb"
#  content [279f389bebf36784ac5d86be9734b6f7b2d2fc1d]
# 
# add_file "packages/xorg-driver/xf86-video-sis_0.9.4.bb"
#  content [0da25e795f6916d5ca21c68aca6bb3097821181a]
# 
# add_file "packages/xorg-lib/libxmu_1.0.4.bb"
#  content [758aee7cae1f5618a4fa571316cbf22953c8a35b]
# 
# add_file "packages/xorg-proto/xproto-native_7.0.11.bb"
#  content [e7f3f450dba40db4cf5a8eca8a1136eafddc8ae0]
# 
# patch "classes/bootimg.bbclass"
#  from [544e1bd8298e4b8bfd4f4bdbcda498e13fd198d6]
#    to [909b0eea9ac7f80516183ef728693122266f4447]
# 
# patch "classes/java.bbclass"
#  from [4c1064a0c1677fa3f136bebf5736ace413a11f30]
#    to [4a470d4978ae2ef918625aa0f94f81ced60914df]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [d9ecb75e478216b945025c5144333e894be2663a]
#    to [fb163a1560e2e33896cf337a40acbf4fc419e625]
# 
# patch "conf/machine/at32stk1000.conf"
#  from [f879f3d6c973dc116c1b2c1f62ef587d4b4906fe]
#    to [994d60f948a5739d6823d08b129b0b578c266e6b]
# 
# patch "conf/machine/at91sam9260ek.conf"
#  from [ccdf7373c8151b655be9d0e00012b96f491fda02]
#    to [198beed11366de7d9f545e7bfda78eb9cf0ce095]
# 
# patch "conf/machine/at91sam9261ek.conf"
#  from [082d4e7a74e6d03983cfdd96e32c42c037e91cfe]
#    to [270e9486850b1af0ca0a68799bc7b72207c08f48]
# 
# patch "conf/machine/at91sam9263ek.conf"
#  from [de1f41bf42f63494406ba30edb623326df2ef493]
#    to [37b3bd0952c5460ffaee6ffe55a2d0bcb1a48218]
# 
# patch "conf/machine/bd-neon.conf"
#  from [9fa6c07cfe1ff6d86ec74eb25fb64f830946df9d]
#    to [439369ac7261d620a450ea451ea0558950224dcb]
# 
# patch "conf/machine/fic-gta01.conf"
#  from [b884bb7e142967c6cfb71b21c05365cd18d0f886]
#    to [433821750971ab00daad7e3d8a37643c2ddae10a]
# 
# patch "conf/machine/gesbc-9302.conf"
#  from [8aeacd090eb3f72b84ac45925eb0315d117f1c1d]
#    to [01af8f7dc52ca36b5cc7e523777c89597bde5b4b]
# 
# patch "conf/machine/include/motorola-ezx-base.inc"
#  from [d5cfb7d52855969fe44f35731389ab20bbe67a0e]
#    to [110c709cf7f23dd101d3f5d0637d361d93fa163a]
# 
# patch "conf/machine/omap1510inn.conf"
#  from [b16fd3d2cd68c0834a6426702d4caab37f6072ca]
#    to [8c17377309d00fdb256c779a5c747775d94253a8]
# 
# patch "conf/machine/omap1610h2.conf"
#  from [b16fd3d2cd68c0834a6426702d4caab37f6072ca]
#    to [8c17377309d00fdb256c779a5c747775d94253a8]
# 
# patch "conf/machine/omap1710h3.conf"
#  from [cb830228728963e9421a6a7521641fafa6d3d11e]
#    to [a6b802ed2d322e8cb455acaa1c577b5e4ea18d8d]
# 
# patch "conf/machine/omap2420h4.conf"
#  from [2854c32466fdb67a8e9782d56215753a34407d6c]
#    to [7d0d66886ecf2be6ecb4712295977d8e671093ef]
# 
# patch "conf/machine/omap2430sdp.conf"
#  from [9eef79d6524729bfa7de111047f0e9ab82373353]
#    to [cddcd4d01970087121700bf0cbdd356415ed34c7]
# 
# patch "conf/machine/omap5912osk.conf"
#  from [e1b832be81c4577a78b18536406e78bab2ffa518]
#    to [0e95b09a1be375036ac3d8c2bde78501405ef4e3]
# 
# patch "conf/machine/shark.conf"
#  from [8a744b9daf9db02c05297d317225e9f6d6cb012e]
#    to [8e4aeeb70530e6ab7d774480479debf77ecd4f85]
# 
# patch "conf/machine/triton.conf"
#  from [85b820f8c11f485586f8ddf9fe57eda723faa37a]
#    to [564d2e8d50e5fc5bf8ad74d0fdbfb2a2535283ac]
# 
# patch "conf/machine/xxs1500.conf"
#  from [5a7873168cad2f8e5d64454b4ee4685f6f3928d4]
#    to [e1fef73d3c073f86870109d0104a53e35515b27e]
# 
# patch "contrib/angstrom/rss.php"
#  from [30cfd581394ae7f5e17996503a966670e246c014]
#    to [e7777fbd2d572c613ee592f6e59c2c79731ffca0]
# 
# patch "packages/busybox/busybox-1.2.1/angstrom/defconfig"
#  from [74661e9906a21f52200ff69389c9b0a841175d30]
#    to [fbff5e22041a6c623361e0d4d23aaff2e683e113]
# 
# patch "packages/busybox/busybox-1.2.1/avr32/defconfig"
#  from [c4ba2cec2e4d0ed152ed6dc827b52bbbc2e234d1]
#    to [682ab5071ff4030b750803c921a2f29ecf2775c2]
# 
# patch "packages/busybox/busybox-1.2.1/defconfig"
#  from [fed758e3d92b8b50b9b7aee6de4c42ba95f091b2]
#    to [89a71f05f8238b03599af63462d16107b593e44c]
# 
# patch "packages/busybox/busybox-1.2.1/nylon/defconfig"
#  from [19122527ad056cce31e3848d0b6292848b441c81]
#    to [6c789ca42213941d26d0f27440b7ee2c8cf9bb1d]
# 
# patch "packages/busybox/busybox-1.2.1/slugos/defconfig"
#  from [14df10da19af8808910351fc6d18084ce0b9c571]
#    to [c8da299bf45183bda94e1409b52373c0a078adf0]
# 
# patch "packages/busybox/busybox-1.7.2/defconfig"
#  from [b2015308c3dbe5a40f9858b53ba54a6038b14b90]
#    to [1b817a040175f1743b843c14af87276af8dcfdff]
# 
# patch "packages/busybox/busybox-static-1.2.1/defconfig"
#  from [74661e9906a21f52200ff69389c9b0a841175d30]
#    to [fbff5e22041a6c623361e0d4d23aaff2e683e113]
# 
# patch "packages/busybox/busybox-static_1.2.1.bb"
#  from [6188142c6538e150b17df1a61af6eb200ed871c6]
#    to [964734881c9c473a4514d47484b493b41dfd98c8]
# 
# patch "packages/busybox/busybox_1.2.1.bb"
#  from [987a597ce6f20e1fede26562311f1e50fd7834ab]
#    to [ed6ba775d0a82f9355ab82f0adfc2a97c840c9d7]
# 
# patch "packages/busybox/busybox_1.2.2.bb"
#  from [9a7b3b424e39aba49cdf21789617b9acfdcff337]
#    to [aabc3559e3dbf6202246fa76ec81735688a94a39]
# 
# patch "packages/busybox/busybox_1.3.1.bb"
#  from [1c0b219537af9fa60794f49a044ab901d094d22e]
#    to [796375007e59d3356bee97868ee4a9484607272b]
# 
# patch "packages/busybox/busybox_1.7.2.bb"
#  from [b36dbe80767a5b3102277eba2a87fb322d3c40d3]
#    to [c8c69ef36216408dc67cc3ed0cee0e19674a311e]
# 
# patch "packages/busybox/files/syslog"
#  from [5b9375f3b0598527a9439e42acc988ba51a9a980]
#    to [0bddb715d3ba24004b13800ad07a56d4a07d6a9a]
# 
# patch "packages/cacao/cacao.inc"
#  from [595f9dee8b31829f4c2a1e6565e8b3d7e4522473]
#    to [d1fb162242cfc59d0aecad7027643cdec90b4b4d]
# 
# patch "packages/cacao/cacao_0.98+hg20071001.bb"
#  from [6b579068c4284eea4bb711e240a0e1ff839a8583]
#    to [ac5e51b47c7d3446078d237ac95abd0fa9c668cc]
# 
# patch "packages/dcop/dcopidl-native_3.5.4.bb"
#  from [d59a902debf6b381a27d4ada33b9ac1a2b0fa225]
#    to [1578e74d509d78b5e2e421c869dfcbbf69f3bdfc]
# 
# patch "packages/dcop/dcopidl2cpp-native_3.5.4.bb"
#  from [51ee91734486bf0055de5dee7bf715a896dcb520]
#    to [70114ba9db0b75943f6fab62b2fc49d1dd2b0cd3]
# 
# patch "packages/e17/enna_cvs.bb"
#  from [bcbb18440565786cb1060088e96f59aa85ade0e5]
#    to [829b76d4efae3a18edc2a557c1e41e509f4b1c30]
# 
# patch "packages/gpsd/gpsd.inc"
#  from [31c98872bb132b08fab52b701f0d91b961f71d9b]
#    to [a16d778f065e8b4d348344592fbcb3d42a89619f]
# 
# patch "packages/gpsd/gpsd_2.28.bb"
#  from [55b0e4d9cd1f621bd6f0f8049044f2512a411011]
#    to [48529815e8ff6267731d55f44d89e38ba38a9ffe]
# 
# patch "packages/gpsd/gpsd_2.34.bb"
#  from [968a1c12ab0cf22874a5a029daa69b00eedac21c]
#    to [f9f1474f260ed4ff05883d5d6fce8fbbd2773d9f]
# 
# patch "packages/gpsd/gpsd_2.36.bb"
#  from [e7423c783c6edfa634685a22f2821e44fa28c764]
#    to [5c67664accded5685267e05323a07cd05b6745e8]
# 
# patch "packages/jamvm/jamvm.inc"
#  from [5edcfc7c22cf4daf00c3d364962aa42af749237e]
#    to [1eb0be17dafb30f822a0fad779c2d82f62088d2a]
# 
# patch "packages/jamvm/jamvm_1.5.0.bb"
#  from [645cab3c8ecedf36901ba0d416cb8956c85f04b1]
#    to [7f3f0abf4aff253a69554613cd74fe49da01168d]
# 
# patch "packages/klibc/klibc-utils-static_1.5.bb"
#  from [41e2472d9b51fdff4af9dcd02e9a0fdc3be79d9f]
#    to [0aeaa25067f4778c45bbbd7ec34c5031db9f1f12]
# 
# patch "packages/libxml/libxml++_2.14.0.bb"
#  from [187d10dec4db1b74dddc6d4bdbd94e1405d4b1d7]
#    to [e3fd57cf2ced465e6ef806bf639ccfa210bf9810]
# 
# patch "packages/php/php-native_4.4.4.bb"
#  from [47e925f0ddbe96be21e9dba73e3412fe38ce6f0a]
#    to [81749d29004d2548150a7ff5f23fcde4394ae29c]
# 
# patch "packages/php/php-native_5.2.0.bb"
#  from [d63921a825ab9861b0bdfe0b1f761b44f25c414e]
#    to [afcfc4ccde9ff42bdd27725eddbfa53791632cd8]
# 
# patch "packages/taglib/taglib_1.4.bb"
#  from [ba6c47f548d00f94ed177f8934c40cbaea043095]
#    to [be06346f9694f8bab9ce367bdfcaeff9f45d0345]
# 
# patch "packages/tasks/task-openmoko-python-devel.bb"
#  from [9e274c55cc6f029b3adec34e38bedeacbb8c2ca9]
#    to [cb71bae786a4c3afdb8e584ce30ec3ae8ebabdc3]
# 
# patch "packages/tasks/task-python-everything.bb"
#  from [f5a91e04a875fab4ab65964647105b0303fd6575]
#    to [4205f773c7e409cd6521c0a3a73c501e4c6a15bc]
# 
#   set "packages/taglib/files/taglib_1.4-8.diff.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
============================================================
--- conf/distro/include/preferred-xorg-versions-X11R7.4.inc	2bd8404a566895df3ee956c8fec2fb169386ffc9
+++ conf/distro/include/preferred-xorg-versions-X11R7.4.inc	2bd8404a566895df3ee956c8fec2fb169386ffc9
@@ -0,0 +1,286 @@
+# see http://www.x.org/wiki/Releases/7.4
+# WORK IN PROGRESS, 7.4 will be released on 2008-03-01
+
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+
+PREFERRED_PROVIDER_libxext ?= "libxext"
+PREFERRED_PROVIDER_xext ?= "libxext"
+PREFERRED_PROVIDER_libxi ?= "libxi"
+PREFERRED_PROVIDER_libxft ?= "libxft"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+PREFERRED_PROVIDER_libxpm ?= "libxpm"
+PREFERRED_PROVIDER_xpm ?= "libxpm"
+PREFERRED_PROVIDER_libxt ?= "libxt"
+PREFERRED_PROVIDER_libxaw ?= "libxaw"
+PREFERRED_PROVIDER_libice ?= "libice"
+PREFERRED_PROVIDER_libxrender ?= "libxrender"
+PREFERRED_PROVIDER_libxcursor ?= "libxcursor"
+PREFERRED_PROVIDER_xextensions ?= "xextensions"
+PREFERRED_PROVIDER_xproto ?= "xproto"
+PREFERRED_PROVIDER_x11 ?= "libx11"
+PREFERRED_PROVIDER_libxv ?= "libxv"
+PREFERRED_PROVIDER_xft ?= "libxft"
+PREFERRED_PROVIDER_libxrandr ?= "libxrandr"
+PREFERRED_PROVIDER_libxdamage ?= "libxdamage"
+PREFERRED_PROVIDER_libxcomposite ?= "libxcomposite"
+PREFERRED_PROVIDER_libxfixes ?= "libxfixes"
+PREFERRED_PROVIDER_libxinerama ?= "libxinerama"
+PREFERRED_PROVIDER_libxxf86vm ?= "libxxf86vm"
+PREFERRED_PROVIDER_libxmu ?= "libxmu"
+PREFERRED_PROVIDER_libsm ?= "libsm"
+PREFERRED_PROVIDER_xrandr ?= "xrandr"
+PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xorg ?= "xserver-xorg"
+
+PREFERRED_VERSION_task-xorg ?= "X11R7.4"
+
+# app
+PREFERRED_VERSION_appres ?= "1.0.1"
+PREFERRED_VERSION_bdftopcf ?= "1.0.1"
+PREFERRED_VERSION_b%s
>>> DIFF TRUNCATED @ 16K

More information about the Openembedded-commits mailing list