[oe-commits] org.oe.dev merge of '2d7114b5bd553a86afdf241ba00411ba1e6d9bec'
oe commit
openembedded-commits at lists.openembedded.org
Fri Feb 8 23:18:28 UTC 2008
merge of '2d7114b5bd553a86afdf241ba00411ba1e6d9bec'
and '2e4d5c372cfad0e6d1d535ecbebee7006a637b97'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: b2ea52ce04064a3b4f6a30840bee34239d895345
ViewMTN: http://monotone.openembedded.org/revision/info/b2ea52ce04064a3b4f6a30840bee34239d895345
Files:
1
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/lightmediascanner
conf/distro/include/preferred-xorg-versions-X11R7.4.inc
packages/lightmediascanner/lightmediascanner_svn.bb
packages/python/python-lightmediascanner_svn.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
conf/distro/include/sane-srcrevs.inc
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/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/tasks/task-python-everything.bb
packages/klibc/files/klibc-config-eabi.patch
packages/klibc/klibc-utils-static_1.5.bb
Diffs:
#
# mt diff -r2d7114b5bd553a86afdf241ba00411ba1e6d9bec -rb2ea52ce04064a3b4f6a30840bee34239d895345
#
#
#
# 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"
#
# add_dir "packages/lightmediascanner"
#
# add_file "conf/distro/include/preferred-xorg-versions-X11R7.4.inc"
# content [2bd8404a566895df3ee956c8fec2fb169386ffc9]
#
# add_file "packages/lightmediascanner/lightmediascanner_svn.bb"
# content [c999d5865ce2ca59dbeb57b0713c8e32d64bb618]
#
# add_file "packages/python/python-lightmediascanner_svn.bb"
# content [ed36f161da571ebe8825db20d3e604b2b97c3ff6]
#
# 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 "conf/distro/include/sane-srcrevs.inc"
# from [d9ecb75e478216b945025c5144333e894be2663a]
# to [fb163a1560e2e33896cf337a40acbf4fc419e625]
#
# 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/e17/enna_cvs.bb"
# from [bcbb18440565786cb1060088e96f59aa85ade0e5]
# to [85178607c7932e6f49e8e5ac0cecf5631cc84b2c]
#
# 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/tasks/task-python-everything.bb"
# from [f5a91e04a875fab4ab65964647105b0303fd6575]
# to [4205f773c7e409cd6521c0a3a73c501e4c6a15bc]
#
============================================================
--- 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_beforelight ?= "1.0.3"
+PREFERRED_VERSION_bitmap ?= "1.0.3"
+PREFERRED_VERSION_editres ?= "1.0.3"
+PREFERRED_VERSION_fontosfnt ?= "1.0.3"
+PREFERRED_VERSION_fslsfonts ?= "1.0.1"
+PREFERRED_VERSION_fstobdf ?= "1.0.2"
+PREFERRED_VERSION_iceauth ?= "1.0.2"
+PREFERRED_VERSION_ico ?= "1.0.2"
+PREFERRED_VERSION_lbxproxy ?= "1.0.1"
+PREFERRED_VERSION_listres ?= "1.0.1"
+PREFERRED_VERSION_luit ?= "1.0.3"
+PREFERRED_VERSION_mkfontdir-native ?= "1.0.3"
+PREFERRED_VERSION_mkfontdir ?= "1.0.3"
+PREFERRED_VERSION_mkfontscale ?= "1.0.3"
+PREFERRED_VERSION_oclock ?= "1.0.1"
+PREFERRED_VERSION_proxymngr ?= "1.0.1"
+PREFERRED_VERSION_rgb ?= "1.0.1"
+PREFERRED_VERSION_rstart ?= "1.0.2"
+PREFERRED_VERSION_scripts ?= "1.0.1"
+PREFERRED_VERSION_sessreg ?= "1.0.3"
+PREFERRED_VERSION_setxkbmap ?= "1.0.4"
+PREFERRED_VERSION_smproxy ?= "1.0.2"
+PREFERRED_VERSION_twm ?= "1.0.3"
+PREFERRED_VERSION_viewres ?= "1.0.1"
+PREFERRED_VERSION_x11perf ?= "1.4.1"
+PREFERRED_VERSION_xauth ?= "1.0.2"
+PREFERRED_VERSION_xbacklight ?= "1.1"
+PREFERRED_VERSION_xbiff ?= "1.0.1"
+PREFERRED_VERSION_xcalc ?= "1.0.2"
+PREFERRED_VERSION_xclipboard ?= "1.0.1"
+PREFERRED_VERSION_xclock ?= "1.0.3"
+PREFERRED_VERSION_xcmsdb ?= "1.0.1"
+PREFERRED_VERSION_xconsole ?= "1.0.3"
+PREFERRED_VERSION_xcursorgen ?= "1.0.2"
+PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
+PREFERRED_VERSION_xditview ?= "1.0.1"
+PREFERRED_VERSION_xdm ?= "1.1.6"
+PREFERRED_VERSION_xdpyinfo ?= "1.0.2"
+PREFERRED_VERSION_xdriinfo ?= "1.0.2"
+PREFERRED_VERSION_xedit ?= "1.0.2"
+PREFERRED_VERSION_xev ?= "1.0.2"
+PREFERRED_VERSION_xeyes ?= "1.0.1"
+PREFERRED_VERSION_xxf86dga ?= "1.0.2"
+PREFERRED_VERSION_xfd ?= "1.0.1"
+PREFERRED_VERSION_xfindproxy ?= "1.0.1"
+PREFERRED_VERSION_xfontsel ?= "1.0.2"
+PREFERRED_VERSION_xfs ?= "1.0.5"
+PREFERRED_VERSION_xfsinfo ?= "1.0.1"
+PREFERRED_VERSION_xfwp ?= "1.0.1"
+PREFERRED_VERSION_xgamma ?= "1.0.2"
+PREFERRED_VERSION_xgc ?= "1.0.1"
+PREFERRED_VERSION_xhost ?= "1.0.2"
+PREFERRED_VERSION_xinit ?= "1.0.7"
+PREFERRED_VERSION_xinput ?= "1.3.0"
+PREFERRED_VERSION_xkbcomp ?= "1.0.3"
+PREFERRED_VERSION_xkbevd ?= "1.0.2"
+PREFERRED_VERSION_xkbprint ?= "1.0.1"
+PREFERRED_VERSION_xkbutils ?= "1.0.1"
+PREFERRED_VERSION_xkill ?= "1.0.1"
+PREFERRED_VERSION_xload ?= "1.0.2"
+PREFERRED_VERSION_xlogo ?= "1.0.1"
+PREFERRED_VERSION_xlsatoms ?= "1.0.1"
+PREFERRED_VERSION_xlsclients ?= "1.0.1"
+PREFERRED_VERSION_xlsfonts ?= "1.0.2"
+PREFERRED_VERSION_xmag ?= "1.0.2"
+PREFERRED_VERSION_xman ?= "1.0.3"
+PREFERRED_VERSION_xmessage ?= "1.0.2"
+PREFERRED_VERSION_xmh ?= "1.0.1"
+PREFERRED_VERSION_xmodmap ?= "1.0.3"
+PREFERRED_VERSION_xmore ?= "1.0.1"
+PREFERRED_VERSION_xphelloworld ?= "1.0.1"
+PREFERRED_VERSION_xplsprinters ?= "1.0.1"
+PREFERRED_VERSION_xpr ?= "1.0.2"
+PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1"
+PREFERRED_VERSION_xprop ?= "1.0.3"
+PREFERRED_VERSION_xrandr ?= "1.2.2"
+PREFERRED_VERSION_xrdb ?= "1.0.4"
+PREFERRED_VERSION_xrefresh ?= "1.0.2"
+PREFERRED_VERSION_xrx ?= "1.0.1"
+PREFERRED_VERSION_xset ?= "1.0.3"
+PREFERRED_VERSION_xsetmode ?= "1.0.0"
+PREFERRED_VERSION_xsetpointer ?= "1.0.1"
+PREFERRED_VERSION_xsetroot ?= "1.0.2"
+PREFERRED_VERSION_xsm ?= "1.0.1"
+PREFERRED_VERSION_xstdcmap ?= "1.0.1"
+PREFERRED_VERSION_xtrap ?= "1.0.2"
+PREFERRED_VERSION_xvidtune ?= "1.0.1"
+PREFERRED_VERSION_xvinfo ?= "1.0.2"
+PREFERRED_VERSION_xwd ?= "1.0.1"
+PREFERRED_VERSION_xwininfo ?= "1.0.3"
+PREFERRED_VERSION_xwud ?= "1.0.1"
+
+# data
+PREFERRED_VERSION_xbitmaps ?= "1.0.1"
+PREFERRED_VERSION_xcursor-themes ?= "1.0.1"
+
+# doc
+PREFERRED_VERSION_xorg-docs ?= "1.4"
+PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2"
+
+# driver
+PREFERRED_VERSION_xf86-input-acecad ?= "1.2.1"
+PREFERRED_VERSION_xf86-input-aiptek ?= "1.0.1"
+PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-citron ?= "2.2.1"
+PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-dmc ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-elographics ?= "1.0.0.5"
+PREFERRED_VERSION_xf86-input-evdev ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-fpit ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-hyperpen ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-jamstudio ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-joystick ?= "1.3.1"
+PREFERRED_VERSION_xf86-input-keyboard ?= "1.2.2"
+PREFERRED_VERSION_xf86-input-magellan ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5"
+PREFERRED_VERSION_xf86-input-microtouch ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-mouse ?= "1.2.3"
+PREFERRED_VERSION_xf86-input-mutouch ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-palmax ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-penmount ?= "1.2.1"
+PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-summa ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-tek4957 ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-vmmouse ?= "12.4.3"
+PREFERRED_VERSION_xf86-input-void ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-apm ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-ark ?= "0.6.0"
+PREFERRED_VERSION_xf86-video-ast ?= "0.81.0"
+PREFERRED_VERSION_xf86-video-ati ?= "6.6.193"
+PREFERRED_VERSION_xf86-video-chips ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-cirrus ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-dummy ?= "0.2.0"
+PREFERRED_VERSION_xf86-video-fbdev ?= "0.3.1"
+PREFERRED_VERSION_xf86-video-glide ?= "1.0.0"
+PREFERRED_VERSION_xf86-video-glint ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-i128 ?= "1.1.0.6"
+PREFERRED_VERSION_xf86-video-i740 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5"
+PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-intel ?= "2.2.0"
+PREFERRED_VERSION_xf86-video-mga ?= "1.4.8"
+PREFERRED_VERSION_xf86-video-neomagic ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-newport ?= "0.2.1"
+PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3"
+PREFERRED_VERSION_xf86-video-nv ?= "2.1.7"
+PREFERRED_VERSION_xf86-video-radeonhd ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-rendition ?= "4.1.3"
+PREFERRED_VERSION_xf86-video-s3 ?= "0.5.0"
+PREFERRED_VERSION_xf86-video-s3virge ?= "1.9.1"
+PREFERRED_VERSION_xf86-video-savage ?= "2.1.3"
+PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.4.2"
+PREFERRED_VERSION_xf86-video-sis ?= "0.9.4"
+PREFERRED_VERSION_xf86-video-sisusb ?= "0.8.1"
+PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-sunffb ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-sunleo ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-tdfx ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-tga ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-trident ?= "1.2.3"%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r2e4d5c372cfad0e6d1d535ecbebee7006a637b97 -rb2ea52ce04064a3b4f6a30840bee34239d895345
#
#
#
# add_file "packages/klibc/files/klibc-config-eabi.patch"
# content [9ce82e5d2cc7597ec66f40fd0abe36685b998028]
#
# patch "packages/klibc/klibc-utils-static_1.5.bb"
# from [41e2472d9b51fdff4af9dcd02e9a0fdc3be79d9f]
# to [0aeaa25067f4778c45bbbd7ec34c5031db9f1f12]
#
============================================================
--- packages/klibc/files/klibc-config-eabi.patch 9ce82e5d2cc7597ec66f40fd0abe36685b998028
+++ packages/klibc/files/klibc-config-eabi.patch 9ce82e5d2cc7597ec66f40fd0abe36685b998028
@@ -0,0 +1,9 @@
+diff -Nur klibc-1.5/defconfig klibc-1.5p/defconfig
+--- klibc-1.5/defconfig 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5p/defconfig 2008-02-08 19:24:22.337127756 +0100
+@@ -5,4 +5,4 @@
+ CONFIG_REGPARM=y
+ # ARM options
+ # CONFIG_KLIBC_THUMB is not set
+-# CONFIG_AEABI is not set
++CONFIG_AEABI=y
============================================================
--- packages/klibc/klibc-utils-static_1.5.bb 41e2472d9b51fdff4af9dcd02e9a0fdc3be79d9f
+++ packages/klibc/klibc-utils-static_1.5.bb 0aeaa25067f4778c45bbbd7ec34c5031db9f1f12
@@ -1,9 +1,12 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux
require klibc-common.inc
PR = "r3"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2"
+SRC_URI_append_linux-gnueabi = "\
+ file://klibc-config-eabi.patch;patch=1"
+
EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \
'CROSS_COMPILE=${TARGET_PREFIX}' \
"
@@ -36,7 +39,6 @@ do_install() {
install -m 755 usr/utils/static/uname ${D}${base_bindir}
}
-PACKAGE_ARCH = "${MACHINE_ARCH}"
PACKAGES = "klibc-utils-static-sh klibc-utils-static-gzip \
klibc-utils-static-cat klibc-utils-static-chroot \
klibc-utils-static-cpio klibc-utils-static-dd \
@@ -71,11 +73,3 @@ FILES_klibc-utils-static-uname = "${base
FILES_klibc-utils-static-true = "${base_bindir}/true"
FILES_klibc-utils-static-umount = "${base_bindir}/umount"
FILES_klibc-utils-static-uname = "${base_bindir}/uname"
-
-# the klibc code contains ARM instructions (for ARM), this
-# could be fixed, but for the moment:
-ARM_INSTRUCTION_SET = "arm"
-
-KLIBC_ARCH = "'${TARGET_ARCH}'"
-KLIBC_ARCH_armeb = "'arm'"
-KLIBC_ARCH_mipsel = "'mips'"
More information about the Openembedded-commits
mailing list