[oe-commits] org.oe.dev merge of '966f676702aa63ef60cf920469fe2209089901c4'
mickeyl commit
openembedded-commits at lists.openembedded.org
Fri Feb 8 19:23:01 UTC 2008
merge of '966f676702aa63ef60cf920469fe2209089901c4'
and 'c22e6cdc0081f060e54d4e152ce8e2adb2546893'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 22cc98d229d91b673ad9fc00bee5afb6433109c6
ViewMTN: http://monotone.openembedded.org/revision/info/22cc98d229d91b673ad9fc00bee5afb6433109c6
Files:
1
conf/distro/include/preferred-xorg-versions-X11R7.4.inc
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/php/php-native_4.4.4.bb
packages/php/php-native_5.2.0.bb
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/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
Diffs:
#
# mt diff -r966f676702aa63ef60cf920469fe2209089901c4 -r22cc98d229d91b673ad9fc00bee5afb6433109c6
#
#
#
# add_file "conf/distro/include/preferred-xorg-versions-X11R7.4.inc"
# content [2bd8404a566895df3ee956c8fec2fb169386ffc9]
#
# 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]
#
# 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]
#
============================================================
--- 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"
+PREFERRED_VERSION_xf86-video-tseng ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-v4l ?= "0.1.1"
+PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.0"
+PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-vga ?= "4.1.0"
+PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
+PREFERRED_VERSION_xf86-video-vmware ?= "10.15.2"
+PREFERRED_VERSION_xf86-video-voodoo ?= "1.1.1"
+
+# font
+PREFERRED_VERSION_encodings ?= "1.0.2"
+PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.1"
+PREFERRED_VERSION_font-util-native ?= "1.0.1"
+PREFERRED_VERSION_font-util ?= "1.0.1"
+
+# lib
+PREFERRED_VERSION_diet-x11 ?= "1.1.3"
+PREFERRED_VERSION_libdmx ?= "1.0.2"
+PREFERRED_VERSION_libfontenc ?= "1.0.4"
+PREFERRED_VERSION_libice ?= "1.0.4"
+PREFERRED_VERSION_liblbxutil ?= "1.0.1"
+PREFERRED_VERSION_libsm ?= "1.0.3"
+PREFERRED_VERSION_libx11 ?= "1.1.3"
+PREFERRED_VERSION_libx11-native ?= "1.1.1"
+PREFERRED_VERSION_libxau ?= "1.0.3"
+PREFERRED_VERSION_libxaw ?= "1.0.4"
+PREFERRED_VERSION_libxcomposite ?= "0.4.0"
+PREFERRED_VERSION_libxcursor ?= "1.1.9"
+PREFERRED_VERSION_libxdamage ?= "1.0.4"
+PREFERRED_VERSION_libxdmcp-native ?= "1.0.2"
+PREFERRED_VERSION_libxdmcp ?= "1.0.2"
+PREFERRED_VERSION_libxevie ?= "1.0.2"
+PREFERRED_VERSION_libxext ?= "1.0.3"
+PREFERRED_VERSION_libxfixes ?= "4.0.3"
+PREFERRED_VERSION_libxfont ?= "1.3.1"
+PREFERRED_VERSION_libxfontcache ?= "1.0.4"
+PREFERRED_VERSION_libxi ?= "1.1.3"
+PREFERRED_VERSION_libxinerama ?= "1.0.2"
+PREFERRED_VERSION_libxkbfile ?= "1.0.4"
+PREFERRED_VERSION_libxkbui ?= "1.0.2"
+PREFERRED_VERSION_libxmu ?= "1.0.4"
+PREFERRED_VERSION_libxpm ?= "3.5.7"
+PREFERRED_VERSION_libxrandr ?= "1.2.2"
+PREFERRED_VERSION_libxrender ?= "0.9.4"
+PREFERRED_VERSION_libxres ?= "1.0.3"
+PREFERRED_VERSION_libxscrnsaver ?= "1.1.2"
+PREFERRED_VERSION_libxt ?= "1.0.5"
+PREFERRED_VERSION_libxtst ?= "1.0.3"
+PREFERRED_VERSION_libxvmc ?= "1.0.4"
+PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
+PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
+PREFERRED_VERSION_libxxf86vm ?= "1.0.1"
+PREFERRED_VERSION_xtrans ?= "1.0.4"
+
+# proto
+PREFERRED_VERSION_compositeproto ?= "0.4"
+PREFERRED_VERSION_damageproto ?= "1.1.0"
+PREFERRED_VERSION_fixesproto ?= "4.0"
+PREFERRED_VERSION_glproto ?= "1.4.9"
+PREFERRED_VERSION_inputproto ?= "1.4.2.1"
+PREFERRED_VERSION_kbproto ?= "1.0.3"
+PREFERRED_VERSION_randrproto ?= "1.2.1"
+PREFERRED_VERSION_renderproto ?= "0.9.3"
+PREFERRED_VERSION_scrnsaverproto ?= "1.1.0"
+PREFERRED_VERSION_xf86dgaproto ?= "2.0.3"
+PREFERRED_VERSION_xproto-native ?= "7.0.11"
+PREFERRED_VERSION_xproto ?= "7.0.11"
+
+# util
+PREFERRED_VERSION_gccmakedep ?= "1.0.2"
+PREFERRED_VERSION_imake ?= "1.0.2"
+PREFERRED_VERSION_makedepend ?= "1.0.1"
+PREFERRED_VERSION_util-macros-native ?= "1.1.5"
+PREFERRED_VERSION_util-macros ?= "1.1.5"
+PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
+
+# xserver
+PREFERRED_VERSION_xserver-kdrive ?= "1.4"
+PREFERRED_VERSION_xserver-xorg ?= "1.4"
============================================================
--- packages/xorg-app/beforelight_1.0.3.bb 27554e7b2f2333aafa425e3f4e57c30a57ae9b48
+++ packages/xorg-app/beforelight_1.0.3.bb 27554e7b2f2333aafa425e3f4e57c30a57ae9b48
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "a sample implementation of a screen saver for X"
+DEPENDS += " virtual/libx11 libxscrnsaver libxt libxaw libxt"
+PE = "1"
============================================================
--- packages/xorg-app/xfs_1.0.5.bb 0f312249fdc3c96ad553e5eb574ba3fef73ff790
+++ packages/xorg-app/xfs_1.0.5.bb 0f312249fdc3c96ad553e5eb574ba3fef73ff790
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "X fontserver"
+DEPENDS += " libfs libxfont xtrans"
+PE = "1"
============================================================
--- packages/xorg-app/xgamma_1.0.2.bb d9e384e7b3d1e8568f6e7935bf18de886e62272f
+++ packages/xorg-app/xgamma_1.0.2.bb d9e384e7b3d1e8568f6e7935bf18de886e62272f
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "Alter a monitor's gamma correction through the X server"
+DEPENDS += " virtual/libx11 libxxf86vm"
+PE = "1"
============================================================
--- packages/xorg-app/xpr_1.0.2.bb 2f0ae1124192ed49e42f86d83315e1daf31f9455
+++ packages/xorg-app/xpr_1.0.2.bb 2f0ae1124192ed49e42f86d83315e1daf31f9455
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "print an X window dump"
+DEPENDS += " libxmu virtual/libx11"
+PE = "1"
============================================================
--- packages/php/php-native_4.4.4.bb 47e925f0ddbe96be21e9dba73e3412fe38ce6f0a
+++ packages/php/php-native_4.4.4.bb 81749d29004d2548150a7ff5f23fcde4394ae29c
@@ -1,6 +1,8 @@ DEPENDS = "zlib-native"
SECTION = "console/network"
require php_${PV}.bb
inherit native
FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files"
DEPENDS = "zlib-native"
+PR = "r2"
+
+S = "${WORKDIR}/php-${PV}"
-PR = "r1"
============================================================
--- packages/php/php-native_5.2.0.bb d63921a825ab9861b0bdfe0b1f761b44f25c414e
+++ packages/php/php-native_5.2.0.bb afcfc4ccde9ff42bdd27725eddbfa53791632cd8
@@ -6,4 +6,6 @@ DEPENDS = "zlib-native libxml2-native"
FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files"
DEPENDS = "zlib-native libxml2-native"
+PR = "r2"
+
+S = "${WORKDIR}/php-${PV}"
-PR = "r1"
#
# mt diff -rc22e6cdc0081f060e54d4e152ce8e2adb2546893 -r22cc98d229d91b673ad9fc00bee5afb6433109c6
#
#
#
# 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"
#
# 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 [3a8c57b53179682933ad1804bed0f9339f137534]
#
# patch "packages/busybox/files/syslog"
# from [5b9375f3b0598527a9439e42acc988ba51a9a980]
# to [0bddb715d3ba24004b13800ad07a56d4a07d6a9a]
#
============================================================
--- packages/busybox/busybox-static_1.2.1.bb 6188142c6538e150b17df1a61af6eb200ed871c6
+++ packages/busybox/busybox-static_1.2.1.bb 964734881c9c473a4514d47484b493b41dfd98c8
@@ -1,5 +1,5 @@ require busybox_${PV}.bb
require busybox_${PV}.bb
-PR = "r1"
+PR = "r2"
S = "${WORKDIR}/busybox-1.2.1"
============================================================
--- packages/busybox/busybox_1.2.1.bb 987a597ce6f20e1fede26562311f1e50fd7834ab
+++ packages/busybox/busybox_1.2.1.bb ed6ba775d0a82f9355ab82f0adfc2a97c840c9d7
@@ -1,6 +1,6 @@ require busybox.inc
require busybox.inc
-PR = "r15"
+PR = "r16"
SRC_URI += "file://wget-long-options.patch;patch=1 \
file://df_rootfs.patch;patch=1 \
============================================================
--- packages/busybox/busybox_1.2.2.bb 9a7b3b424e39aba49cdf21789617b9acfdcff337
+++ packages/busybox/busybox_1.2.2.bb aabc3559e3dbf6202246fa76ec81735688a94a39
@@ -1,6 +1,6 @@ require busybox.inc
require busybox.inc
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/busybox/busybox_1.3.1.bb 1c0b219537af9fa60794f49a044ab901d094d22e
+++ packages/busybox/busybox_1.3.1.bb 796375007e59d3356bee97868ee4a9484607272b
@@ -1,6 +1,6 @@ require busybox.inc
require busybox.inc
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/busybox/busybox_1.7.2.bb b36dbe80767a5b3102277eba2a87fb322d3c40d3
+++ packages/busybox/busybox_1.7.2.bb 3a8c57b53179682933ad1804bed0f9339f137534
@@ -1,7 +1,6 @@ require busybox.inc
require busybox.inc
+PR = "r5"
-PR = "r4"
-
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://busybox-cron \
file://busybox-httpd \
============================================================
--- packages/busybox/files/syslog 5b9375f3b0598527a9439e42acc988ba51a9a980
+++ packages/busybox/files/syslog 0bddb715d3ba24004b13800ad07a56d4a07d6a9a
@@ -11,7 +11,7 @@ if [ -f /etc/syslog.conf ]; then
LOG_REMOTE=0
for D in $DESTINATION; do
if [ "$D" = "buffer" ]; then
- SYSLOG_ARGS="$SYSLOG_ARGS -C $BUFFERSIZE"
+ SYSLOG_ARGS="$SYSLOG_ARGS -C$BUFFERSIZE"
LOG_LOCAL=1
elif [ "$D" = "file" ]; then
if [ -n "$LOGFILE" ]; then
More information about the Openembedded-commits
mailing list