diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2006-08-04 13:59:42 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2006-08-04 13:59:42 +0000 |
| commit | cfdb8d4196eb11aabbdd98c25ce79e3effc8f405 (patch) | |
| tree | 4a7a4484d9d40ae5f91979d8f33e63155003912c | |
| parent | 988dc86e7d6520de28747b2739a9f7697f9acfee (diff) | |
| parent | 3f59dd4dea40bf32a207763fcabd5e72a8a93553 (diff) | |
merge of 0c794d3c26ebf237e0cb48477ca29509caf0987c
and 1fabadea24c36f83b75bb8e13e7fe5bd38d9a6ce
57 files changed, 539 insertions, 409 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index a6354319ca..020e3f98a3 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -29,6 +29,8 @@ FEED_URIS += " \ #SRCDATE = "20060630" #SRCDATE_handhelds-pxa-2.6 = "20060622" +SRCDATE_gconf-dbus = "20060719" +SRCDATE_gnome-vfs-dbus = "20060803" CVS_TARBALL_STASH = "\ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ @@ -47,6 +49,13 @@ require conf/distro/include/preferred-gpe-versions-2.8.inc PREFERRED_VERSION_fontconfig = "2.3.95" PREFERRED_VERSION_freetype = "2.2.1" +#Small machines prefer kdrive, but we might ship full Xorg in other images +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" +PREFERRED_PROVIDER_xserver ?= "xserver-drive" + +require conf/distro/include/preferred-xorg-versions-X11R7.1.inc + + #zap extra stuff taking place in $MACHINE.conf GPE_EXTRA_INSTALL = "" @@ -76,7 +85,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive # Others: PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" PREFERRED_PROVIDER_gconf ?= gconf-dbus -PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs-dbus +PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs PREFERRED_PROVIDER_tslib ?= tslib #EABI stuff diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 9ecdf7de7e..d416842d9d 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -62,12 +62,12 @@ require conf/distro/include/sane-srcdates.inc # PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" PREFERRED_PROVIDER_tslib ?= tslib - +require conf/distro/include/preferred-x-versions-pre-X11R7.inc # # GPE # -require conf/distro/include/preferred-gpe-versions.inc +require conf/distro/include/preferred-gpe-versions-2.7.inc # # Opie diff --git a/conf/distro/include/preferred-gpe-versions-2.6.inc b/conf/distro/include/preferred-gpe-versions-2.6.inc index 1d09ae6051..ae3bc70d9b 100644 --- a/conf/distro/include/preferred-gpe-versions-2.6.inc +++ b/conf/distro/include/preferred-gpe-versions-2.6.inc @@ -32,6 +32,7 @@ PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" PREFERRED_VERSION_rxvt-unicode ?= "5.3" PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" PREFERRED_VERSION_xst ?= "0.14" +PREFERRED_PROVIDER_xextensions = "xextensions" #PREFERRED_VERSION_xextensions ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_xhost ?= "0.0+cvs20040413" diff --git a/conf/distro/include/preferred-gpe-versions-2.7.inc b/conf/distro/include/preferred-gpe-versions-2.7.inc index 933195977d..7c45b27342 100644 --- a/conf/distro/include/preferred-gpe-versions-2.7.inc +++ b/conf/distro/include/preferred-gpe-versions-2.7.inc @@ -37,6 +37,7 @@ PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" PREFERRED_VERSION_rxvt-unicode ?= "5.6" PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" PREFERRED_VERSION_xst ?= "0.15" +PREFERRED_PROVIDER_xextensions = "xextensions" PREFERRED_VERSION_xextensions ?= "1.0.1" PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207" PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc index 43353dcdcd..27a6164e54 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc @@ -1,185 +1,185 @@ -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +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_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.1" +PREFERRED_VERSION_task-xorg ?= "X11R7.1" -PREFERRED_VERSION_bitmap = "X11R7.1-1.0.2" -PREFERRED_VERSION_fstobdf = "X11R7.1-1.0.2" -PREFERRED_VERSION_mkfontdir-native = "X11R7.1-1.0.2" -PREFERRED_VERSION_mkfontdir = "X11R7.1-1.0.2" -PREFERRED_VERSION_rgb = "X11R7.1-1.0.1" -PREFERRED_VERSION_rstart = "X11R7.1-1.0.2" -PREFERRED_VERSION_setxkbmap = "X11R7.1-1.0.2" -PREFERRED_VERSION_smproxy = "X11R7.1-1.0.2" -PREFERRED_VERSION_x11perf = "X11R7.1-1.4.1" -PREFERRED_VERSION_xclock = "X11R7.1-1.0.2" -PREFERRED_VERSION_xconsole = "X11R7.1-1.0.2" -PREFERRED_VERSION_xcursorgen = "X11R7.1-1.0.1" -PREFERRED_VERSION_xdm = "X11R7.1-1.0.4" -PREFERRED_VERSION_xdriinfo = "X11R7.1-1.0.1" -PREFERRED_VERSION_xedit = "X11R7.1-1.0.2" -PREFERRED_VERSION_xfs = "X11R7.1-1.0.2" -PREFERRED_VERSION_xhost = "X11R7.1-1.0.1" -PREFERRED_VERSION_xinit = "X11R7.1-1.0.2" -PREFERRED_VERSION_xkbcomp = "X11R7.1-1.0.2" -PREFERRED_VERSION_xkbevd = "X11R7.1-1.0.2" -PREFERRED_VERSION_xman = "X11R7.1-1.0.2" -PREFERRED_VERSION_xmodmap = "X11R7.1-1.0.1" -PREFERRED_VERSION_xrandr = "X11R7.1-1.0.2" -PREFERRED_VERSION_xrdb = "X11R7.1-1.0.2" -PREFERRED_VERSION_xrefresh = "X11R7.1-1.0.2" -PREFERRED_VERSION_xset = "X11R7.1-1.0.2" -PREFERRED_VERSION_xtrap = "X11R7.1-1.0.2" -PREFERRED_VERSION_xwininfo = "X11R7.1-1.0.2" -PREFERRED_VERSION_xorg-docs = "X11R7.1-1.2" -PREFERRED_VERSION_xorg-sgml-doctools = "X11R7.1-1.1" -PREFERRED_VERSION_xf86-input-acecad = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-aiptek = "X11R7.1-1.0.1" -PREFERRED_VERSION_xf86-input-calcomp = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-citron = "X11R7.1-2.2.0" -PREFERRED_VERSION_xf86-input-digitaledge = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-dmc = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-dynapro = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-elo2300 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-evdev = "X11R7.1-1.1.2" -PREFERRED_VERSION_xf86-input-fpit = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-hyperpen = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-jamstudio = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-joystick = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-keyboard = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-magellan = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-magictouch = "X11R7.1-1.0.0.5" -PREFERRED_VERSION_xf86-input-microtouch = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-mouse = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-mutouch = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-palmax = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-penmount = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-spaceorb = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-summa = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-tek4957 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-ur98 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-vmmouse = "X11R7.1-12.4.0" -PREFERRED_VERSION_xf86-input-void = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-apm = "X11R7.1-1.1.1" -PREFERRED_VERSION_xf86-video-ark = "X11R7.1-0.6.0" -PREFERRED_VERSION_xf86-video-ast = "X11R7.1-0.81.0" -PREFERRED_VERSION_xf86-video-ati = "X11R7.1-6.6.0" -PREFERRED_VERSION_xf86-video-chips = "X11R7.1-1.1.1" -PREFERRED_VERSION_xf86-video-cirrus = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-cyrix = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-dummy = "X11R7.1-0.2.0" -PREFERRED_VERSION_xf86-video-fbdev = "X11R7.1-0.3.0" -PREFERRED_VERSION_xf86-video-glint = "X11R7.1-1.1.1" -PREFERRED_VERSION_xf86-video-i128 = "X11R7.1-1.1.0.5" -PREFERRED_VERSION_xf86-video-i740 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-i810 = "X11R7.1-1.6.0" -PREFERRED_VERSION_xf86-video-imstt = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-mga = "X11R7.1-1.4.1" -PREFERRED_VERSION_xf86-video-neomagic = "X11R7.1-1.1.1" -PREFERRED_VERSION_xf86-video-newport = "X11R7.1-0.2.0" -PREFERRED_VERSION_xf86-video-nsc = "X11R7.1-2.8.1" -PREFERRED_VERSION_xf86-video-nv = "X11R7.1-1.1.1" -PREFERRED_VERSION_xf86-video-rendition = "X11R7.1-4.1.0" -PREFERRED_VERSION_xf86-video-s3 = "X11R7.1-0.4.1" -PREFERRED_VERSION_xf86-video-s3virge = "X11R7.1-1.9.1" -PREFERRED_VERSION_xf86-video-savage = "X11R7.1-2.1.1" -PREFERRED_VERSION_xf86-video-siliconmotion = "X11R7.1-1.4.1" -PREFERRED_VERSION_xf86-video-sis = "X11R7.1-0.9.1" -PREFERRED_VERSION_xf86-video-sisusb = "X11R7.1-0.8.1" -PREFERRED_VERSION_xf86-video-sunbw2 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-suncg14 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-suncg3 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-suncg6 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-sunffb = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-sunleo = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-suntcx = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-tdfx = "X11R7.1-1.2.1" -PREFERRED_VERSION_xf86-video-tga = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-trident = "X11R7.1-1.2.1" -PREFERRED_VERSION_xf86-video-tseng = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-v4l = "X11R7.1-0.1.1" -PREFERRED_VERSION_xf86-video-vesa = "X11R7.1-1.2.0" -PREFERRED_VERSION_xf86-video-vga = "X11R7.1-4.1.0" -PREFERRED_VERSION_xf86-video-via = "X11R7.1-0.2.1" -PREFERRED_VERSION_xf86-video-vmware = "X11R7.1-10.13.0" -PREFERRED_VERSION_xf86-video-voodoo = "X11R7.1-1.1.0" -PREFERRED_VERSION_font-util-native = "X11R7.1-1.0.1" -PREFERRED_VERSION_font-util = "X11R7.1-1.0.1" -PREFERRED_VERSION_diet-x11 = "X11R7.1-1.0.1" -PREFERRED_VERSION_libdmx = "X11R7.1-1.0.2" -PREFERRED_VERSION_libfontenc-native = "X11R7.1-1.0.2" -PREFERRED_VERSION_libfontenc = "X11R7.1-1.0.2" -PREFERRED_VERSION_libice = "X11R7.1-1.0.1" -PREFERRED_VERSION_liblbxutil = "X11R7.1-1.0.1" -PREFERRED_VERSION_libsm = "X11R7.1-1.0.1" -PREFERRED_VERSION_libx11-native = "X11R7.1-1.0.1" -PREFERRED_VERSION_libx11 = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxau-native = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxau = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxaw = "X11R7.1-1.0.2" -PREFERRED_VERSION_libxcomposite = "X11R7.1-0.3" -PREFERRED_VERSION_libxcursor = "X11R7.1-1.1.6" -PREFERRED_VERSION_libxdamage = "X11R7.1-1.0.3" -PREFERRED_VERSION_libxdmcp-native = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxdmcp = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxevie = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxext = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxfixes = "X11R7.1-4.0.1" -PREFERRED_VERSION_libxfont-native = "X11R7.1-1.1.0" -PREFERRED_VERSION_libxfont = "X11R7.1-1.1.0" -PREFERRED_VERSION_libxfontcache = "X11R7.1-1.0.2" -PREFERRED_VERSION_libxi = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxkbfile = "X11R7.1-1.0.3" -PREFERRED_VERSION_libxkbui = "X11R7.1-1.0.2" -PREFERRED_VERSION_libxmu = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxpm = "X11R7.1-3.5.5" -PREFERRED_VERSION_libxrandr = "X11R7.1-1.1.1" -PREFERRED_VERSION_libxrender = "X11R7.1-0.9.1" -PREFERRED_VERSION_libxres = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxscrnsaver = "X11R7.1-1.1.0" -PREFERRED_VERSION_libxt = "X11R7.1-1.0.2" -PREFERRED_VERSION_libxvmc = "X11R7.1-1.0.2" -PREFERRED_VERSION_libxxf86dga = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxxf86misc = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxxf86vm = "X11R7.1-1.0.1" -PREFERRED_VERSION_compositeproto = "X11R7.1-0.3.1" -PREFERRED_VERSION_fixesproto = "X11R7.1-4.0" -PREFERRED_VERSION_glproto = "X11R7.1-1.4.7" -PREFERRED_VERSION_scrnsaverproto = "X11R7.1-1.1.0" -PREFERRED_VERSION_xproto-native = "X11R7.1-7.0.5" -PREFERRED_VERSION_xproto = "X11R7.1-7.0.5" -PREFERRED_VERSION_gccmakedep = "X11R7.1-1.0.2" -PREFERRED_VERSION_imake = "X11R7.1-1.0.2" -PREFERRED_VERSION_util-macros-native = "X11R7.1-1.0.2" -PREFERRED_VERSION_util-macros = "X11R7.1-1.0.2" -PREFERRED_VERSION_xorg-cf-files = "X11R7.1-1.0.2" -PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0" -PREFERRED_VERSION_xserver-xorg = "X11R7.1-1.1.0" +PREFERRED_VERSION_bitmap ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_fstobdf ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_mkfontdir-native ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_mkfontdir ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_rgb ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_rstart ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_setxkbmap ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_smproxy ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_x11perf ?= "X11R7.1-1.4.1" +PREFERRED_VERSION_xclock ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xconsole ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xcursorgen ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xdm ?= "X11R7.1-1.0.4" +PREFERRED_VERSION_xdriinfo ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xedit ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xfs ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xhost ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xinit ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xkbcomp ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xkbevd ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xman ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xmodmap ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xrandr ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xrdb ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xrefresh ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xset ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xtrap ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xwininfo ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xorg-docs ?= "X11R7.1-1.2" +PREFERRED_VERSION_xorg-sgml-doctools ?= "X11R7.1-1.1" +PREFERRED_VERSION_xf86-input-acecad ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-aiptek ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xf86-input-calcomp ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-citron ?= "X11R7.1-2.2.0" +PREFERRED_VERSION_xf86-input-digitaledge ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-dmc ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-dynapro ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-elo2300 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-evdev ?= "X11R7.1-1.1.2" +PREFERRED_VERSION_xf86-input-fpit ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-hyperpen ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-jamstudio ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-joystick ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-keyboard ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-magellan ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-magictouch ?= "X11R7.1-1.0.0.5" +PREFERRED_VERSION_xf86-input-microtouch ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-mouse ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-mutouch ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-palmax ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-penmount ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-spaceorb ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-summa ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-tek4957 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-ur98 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-vmmouse ?= "X11R7.1-12.4.0" +PREFERRED_VERSION_xf86-input-void ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-apm ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-ark ?= "X11R7.1-0.6.0" +PREFERRED_VERSION_xf86-video-ast ?= "X11R7.1-0.81.0" +PREFERRED_VERSION_xf86-video-ati ?= "X11R7.1-6.6.0" +PREFERRED_VERSION_xf86-video-chips ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-cirrus ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-cyrix ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-dummy ?= "X11R7.1-0.2.0" +PREFERRED_VERSION_xf86-video-fbdev ?= "X11R7.1-0.3.0" +PREFERRED_VERSION_xf86-video-glint ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-i128 ?= "X11R7.1-1.1.0.5" +PREFERRED_VERSION_xf86-video-i740 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-i810 ?= "X11R7.1-1.6.0" +PREFERRED_VERSION_xf86-video-imstt ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-mga ?= "X11R7.1-1.4.1" +PREFERRED_VERSION_xf86-video-neomagic ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-newport ?= "X11R7.1-0.2.0" +PREFERRED_VERSION_xf86-video-nsc ?= "X11R7.1-2.8.1" +PREFERRED_VERSION_xf86-video-nv ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-rendition ?= "X11R7.1-4.1.0" +PREFERRED_VERSION_xf86-video-s3 ?= "X11R7.1-0.4.1" +PREFERRED_VERSION_xf86-video-s3virge ?= "X11R7.1-1.9.1" +PREFERRED_VERSION_xf86-video-savage ?= "X11R7.1-2.1.1" +PREFERRED_VERSION_xf86-video-siliconmotion ?= "X11R7.1-1.4.1" +PREFERRED_VERSION_xf86-video-sis ?= "X11R7.1-0.9.1" +PREFERRED_VERSION_xf86-video-sisusb ?= "X11R7.1-0.8.1" +PREFERRED_VERSION_xf86-video-sunbw2 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suncg14 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suncg3 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suncg6 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-sunffb ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-sunleo ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suntcx ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-tdfx ?= "X11R7.1-1.2.1" +PREFERRED_VERSION_xf86-video-tga ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-trident ?= "X11R7.1-1.2.1" +PREFERRED_VERSION_xf86-video-tseng ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-v4l ?= "X11R7.1-0.1.1" +PREFERRED_VERSION_xf86-video-vesa ?= "X11R7.1-1.2.0" +PREFERRED_VERSION_xf86-video-vga ?= "X11R7.1-4.1.0" +PREFERRED_VERSION_xf86-video-via ?= "X11R7.1-0.2.1" +PREFERRED_VERSION_xf86-video-vmware ?= "X11R7.1-10.13.0" +PREFERRED_VERSION_xf86-video-voodoo ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_font-util-native ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_font-util ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_diet-x11 ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libdmx ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libfontenc-native ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libfontenc ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libice ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_liblbxutil ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libsm ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libx11-native ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libx11 ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxau-native ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxau ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxaw ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxcomposite ?= "X11R7.1-0.3" +PREFERRED_VERSION_libxcursor ?= "X11R7.1-1.1.6" +PREFERRED_VERSION_libxdamage ?= "X11R7.1-1.0.3" +PREFERRED_VERSION_libxdmcp-native ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxdmcp ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxevie ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxext ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxfixes ?= "X11R7.1-4.0.1" +PREFERRED_VERSION_libxfont-native ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_libxfont ?= "X11R7.1-1.2.0" +PREFERRED_VERSION_libxfontcache ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxi ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxkbfile ?= "X11R7.1-1.0.3" +PREFERRED_VERSION_libxkbui ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxmu ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxpm ?= "X11R7.1-3.5.5" +PREFERRED_VERSION_libxrandr ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_libxrender ?= "X11R7.1-0.9.1" +PREFERRED_VERSION_libxres ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxscrnsaver ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_libxt ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxvmc ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxxf86dga ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxxf86misc ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxxf86vm ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_compositeproto ?= "X11R7.1-0.3.1" +PREFERRED_VERSION_fixesproto ?= "X11R7.1-4.0" +PREFERRED_VERSION_glproto ?= "X11R7.1-1.4.7" +PREFERRED_VERSION_scrnsaverproto ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xproto-native ?= "X11R7.1-7.0.5" +PREFERRED_VERSION_xproto ?= "X11R7.1-7.0.5" +PREFERRED_VERSION_gccmakedep ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_imake ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_util-macros-native ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_util-macros ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xserver-kdrive ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xserver-xorg ?= "X11R7.1-1.1.0" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 9a88449e07..4c17800b7a 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -1,6 +1,6 @@ # Lock down some SRCDATEs, see http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version -SRCDATE_gconf-dbus ?= "20060119" +SRCDATE_gconf-dbus ?= "20060719" SRCDATE_gnome-vfs-dbus ?= "20060119" SRCDATE_contacts ?= "20060707" SRCDATE_dates ?= "20060707" @@ -26,4 +26,6 @@ SRCDATE_tslib ?= "20051101" SRCDATE_libfakekey ?= "20051101" SRCDATE_qemu-native ?= "20060526" SRCDATE_oprofile ?= "20060214" +SRCDATE_rosetta ?= "20060804" +SRCDATE_xcalibrate ?= "20060804" SRCDATE_zaurusd ?= "20060628" diff --git a/packages/acct/.mtn2git_empty b/packages/acct/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/acct/.mtn2git_empty diff --git a/packages/acct/acct_6.3.99+6.4pre1.bb b/packages/acct/acct_6.3.99+6.4pre1.bb new file mode 100644 index 0000000000..078013c39b --- /dev/null +++ b/packages/acct/acct_6.3.99+6.4pre1.bb @@ -0,0 +1,9 @@ +LICENSE = "GPL" +DESCRIPTION = "GNU Accounting Utilities - user and process accounting." + +SRC_URI = "http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/acct-6.4-pre1.tar.gz \ + file://cross-compile.patch;patch=1" + +S = "${WORKDIR}/acct-6.4-pre1" + +inherit autotools diff --git a/packages/acct/files/.mtn2git_empty b/packages/acct/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/acct/files/.mtn2git_empty diff --git a/packages/acct/files/cross-compile.patch b/packages/acct/files/cross-compile.patch new file mode 100644 index 0000000000..78b57104c7 --- /dev/null +++ b/packages/acct/files/cross-compile.patch @@ -0,0 +1,34 @@ +diff -ur acct-6.4-pre1.org/configure.in acct-6.4-pre1/configure.in +--- acct-6.4-pre1.org/configure.in 2006-01-07 23:56:46.000000000 +0200 ++++ acct-6.4-pre1/configure.in 2006-08-03 21:16:17.000000000 +0300 +@@ -87,6 +87,10 @@ + ACCTON_MAN=accton.8 + LASTCOMM_MAN=lastcomm.1 + SA_MAN=sa.8 ++ WTMP_FILE_LOC=/var/log/wtmp ++ ACCT_FILE_LOC=/var/account/pacct ++ SAVACCT_FILE_LOC=/var/account/savacct ++ USRACCT_FILE_LOC=/var/account/usracct + AC_DEFINE(HAVE_ACUTIME, , + [Define if <sys/acct.h> has the AC_UTIME field.]) + AC_DEFINE(ACUTIME_COMPT, , +@@ -130,6 +134,10 @@ + ACCTON_MAN=accton.8 + LASTCOMM_MAN=lastcomm.1 + SA_MAN=sa.8 ++ WTMP_FILE_LOC=/var/log/wtmp ++ ACCT_FILE_LOC=/var/account/pacct ++ SAVACCT_FILE_LOC=/var/account/savacct ++ USRACCT_FILE_LOC=/var/account/usracct + AC_HEADER_EGREP(ac_utime, sys/acct.h, + AC_DEFINE(HAVE_ACUTIME, , + [Define if <sys/acct.h> has the AC_UTIME field.]) +@@ -277,7 +285,7 @@ + } + ], . ./locs; rm locs, + echo "Error -- could not locate your wtmp and acct files."; exit 1, +- echo "Sorry -- you cannot cross-compile this package (FIXME)."; exit 1 ) ++ echo "Cross-compiling - cannot find out accounting file locations - using Linux defaults."; ) + AC_TYPE_PID_T dnl for sys/acct.h + AC_TYPE_UID_T dnl same as above + AC_TYPE_SIZE_T diff --git a/packages/bootchart/bootchart_0.9.bb b/packages/bootchart/bootchart_0.9.bb index b9b4029590..abbdda4488 100644 --- a/packages/bootchart/bootchart_0.9.bb +++ b/packages/bootchart/bootchart_0.9.bb @@ -2,28 +2,27 @@ DESCRIPTION = "Bootchart is a tool for performance analysis and visualization of LICENSE = "GPLv2" HOMEPAGE = "http://www.bootchart.org/" MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" - +PR = "r1" #this only installs the loggers, you will need to run the renderers on your workstation #boot with 'init=/sbin/bootchartd' and do '/sbin/bootchartd stop' to end the logging #needed for a real /bin/sh and /bin/sleep -DEPENDS = "bash coreutils" -RDEPENDS = "bash coreutils" +DEPENDS = "bash coreutils acct" +RDEPENDS = "bash coreutils acct" #this is a plain shell script PACKAGE_ARCH = "all" -SRC_URI = "file://bootchart \ - file://bootchartd \ - file://bootchartd.conf" +SRC_URI = "${SOURCEFORGE_MIRROR}/bootchart/bootchart-${PV}.tar.bz2\ + file://handheld.patch;patch=1" do_install() { install -d ${D}/sbin install -d ${D}/etc - install -m 755 ${WORKDIR}/bootchart ${D}/sbin - install -m 755 ${WORKDIR}/bootchartd ${D}/sbin - install -m 644 ${WORKDIR}/bootchart ${D}/etc + install -d ${D}/bootchart + install -m 755 ${S}/script/bootchartd ${D}/sbin + install -m 644 ${S}/script/bootchartd.conf ${D}/etc } diff --git a/packages/e17/e-wm_0.16.999.027.bb b/packages/e17/e-wm_0.16.999.032.bb index 5089ce23a4..fd8814a8ee 100644 --- a/packages/e17/e-wm_0.16.999.027.bb +++ b/packages/e17/e-wm_0.16.999.032.bb @@ -1,5 +1,5 @@ DESCRIPTION = "E17 - the Enlightenment Window Mananger" -DEPENDS = "evas-x11 ecore-x11 edje eet embryo e" +DEPENDS = "evas-x11 ecore-x11 edje eet embryo" LICENSE = "MIT" PR = "r3" diff --git a/packages/e17/engage_20060128.bb b/packages/e17/engage_20060128.bb index 0bf9f80895..d181d57ffd 100644 --- a/packages/e17/engage_20060128.bb +++ b/packages/e17/engage_20060128.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Engage is the E17 icon dock" -DEPENDS = "evas-x11 ecore-x11 esmart-x11 imlib2-x11 edje ewl e" +DEPENDS = "evas-x11 ecore-x11 esmart-x11 imlib2-x11 edje ewl e-wm" LICENSE = "MIT" PR = "r2" diff --git a/packages/efl/e_0.16.999.027.bb b/packages/efl/e_0.16.999.027.bb deleted file mode 100644 index 5078c71365..0000000000 --- a/packages/efl/e_0.16.999.027.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "Enlightenment Window Mananger Library" -DEPENDS = "virtual/evas virtual/ecore edje eet embryo" -LICENSE = "MIT" -PR = "r2" - -inherit efl - -SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz" -S = "${WORKDIR}/enlightenment-${PV}" - -PROFILE = "LOWRES_PDA" -PROFILE_c7x0 = "HIRES_PDA" -PROFILE_tosa = "HIRES_PDA" -PROFILE_spitz = "HIRES_PDA" -PROFILE_akita = "HIRES_PDA" - -EXTRA_OECONF = "--with-profile=${PROFILE} \ - --with-edje-cc=${STAGING_BINDIR}/edje_cc \ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR}" - -do_compile() { - oe_runmake -C src/lib -} - -headers = "E_Lib.h ../bin/e*.h" - -do_install() { - oe_runmake -C src/lib install DESTDIR=${D} -} diff --git a/packages/efl/ecore-fb_0.9.9.027.bb b/packages/efl/ecore-fb_0.9.9.032.bb index a957c5dd8c..a957c5dd8c 100644 --- a/packages/efl/ecore-fb_0.9.9.027.bb +++ b/packages/efl/ecore-fb_0.9.9.032.bb diff --git a/packages/efl/ecore-native_0.9.9.027.bb b/packages/efl/ecore-native_0.9.9.032.bb index 299470841c..299470841c 100644 --- a/packages/efl/ecore-native_0.9.9.027.bb +++ b/packages/efl/ecore-native_0.9.9.032.bb diff --git a/packages/efl/ecore-x11_0.9.9.027.bb b/packages/efl/ecore-x11_0.9.9.032.bb index 3a88ad229b..3a88ad229b 100644 --- a/packages/efl/ecore-x11_0.9.9.027.bb +++ b/packages/efl/ecore-x11_0.9.9.032.bb diff --git a/packages/efl/ecore/configure.patch b/packages/efl/ecore/configure.patch index cd38cb7218..1e4ec58f56 100644 --- a/packages/efl/ecore/configure.patch +++ b/packages/efl/ecore/configure.patch @@ -1,15 +1,15 @@ -diff -Nur ecore-0.9.9.015~/configure.in ecore-0.9.9.015/configure.in ---- ecore-0.9.9.015~/configure.in 2005-09-26 16:59:23.000000000 -0700 -+++ ecore-0.9.9.015/configure.in 2005-09-26 17:01:02.000000000 -0700 +diff -Nur ecore-0.9.9.032~/configure.in ecore-0.9.9.032/configure.in +--- ecore-0.9.9.032~/configure.in 2006-08-03 12:12:43.000000000 -0700 ++++ ecore-0.9.9.032/configure.in 2006-08-03 12:13:30.000000000 -0700 @@ -16,7 +16,6 @@ AC_CHECK_SIZEOF(long, 4) AM_ENABLE_SHARED AM_PROG_LIBTOOL -AC_C___ATTRIBUTE__ - - if test "x${bindir}" = 'x${exec_prefix}/bin'; then - if test "x${exec_prefix}" = "xNONE"; then -@@ -262,9 +261,7 @@ + + dnl Set PACKAGE_DATA_DIR in config.h. + if test "x${prefix}" = "xNONE"; then +@@ -205,10 +204,8 @@ AM_CONDITIONAL(BUILD_ECORE_X, true) AC_DEFINE(BUILD_ECORE_X, 1, [Build Ecore_X Module]) have_ecore_x="yes" @@ -20,3 +20,4 @@ diff -Nur ecore-0.9.9.015~/configure.in ecore-0.9.9.015/configure.in + x_libs="-lX11 -lXext" ecore_x_libs="-lecore_x"; ],[ + AM_CONDITIONAL(BUILD_ECORE_X, false) diff --git a/packages/efl/edje-native_0.5.0.027.bb b/packages/efl/edje-native_0.5.0.032.bb index 5eb077922a..5eb077922a 100644 --- a/packages/efl/edje-native_0.5.0.027.bb +++ b/packages/efl/edje-native_0.5.0.032.bb diff --git a/packages/efl/edje-utils_0.5.0.027.bb b/packages/efl/edje-utils_0.5.0.032.bb index f8eb917e4d..f8eb917e4d 100644 --- a/packages/efl/edje-utils_0.5.0.027.bb +++ b/packages/efl/edje-utils_0.5.0.032.bb diff --git a/packages/efl/edje_0.5.0.027.bb b/packages/efl/edje_0.5.0.032.bb index d51dd119e4..d51dd119e4 100644 --- a/packages/efl/edje_0.5.0.027.bb +++ b/packages/efl/edje_0.5.0.032.bb diff --git a/packages/efl/eet-native_0.9.10.027.bb b/packages/efl/eet-native_0.9.10.032.bb index fa20c9fb30..fa20c9fb30 100644 --- a/packages/efl/eet-native_0.9.10.027.bb +++ b/packages/efl/eet-native_0.9.10.032.bb diff --git a/packages/efl/eet_0.9.10.027.bb b/packages/efl/eet_0.9.10.032.bb index 6e6032e098..6e6032e098 100644 --- a/packages/efl/eet_0.9.10.027.bb +++ b/packages/efl/eet_0.9.10.032.bb diff --git a/packages/efl/embryo-native_0.9.1.027.bb b/packages/efl/embryo-native_0.9.1.032.bb index a33adb7bd2..a33adb7bd2 100644 --- a/packages/efl/embryo-native_0.9.1.027.bb +++ b/packages/efl/embryo-native_0.9.1.032.bb diff --git a/packages/efl/embryo-utils_0.9.1.027.bb b/packages/efl/embryo-utils_0.9.1.032.bb index d507c53cce..d507c53cce 100644 --- a/packages/efl/embryo-utils_0.9.1.027.bb +++ b/packages/efl/embryo-utils_0.9.1.032.bb diff --git a/packages/efl/embryo_0.9.1.027.bb b/packages/efl/embryo_0.9.1.032.bb index 0009c0a149..0009c0a149 100644 --- a/packages/efl/embryo_0.9.1.027.bb +++ b/packages/efl/embryo_0.9.1.032.bb diff --git a/packages/efl/esmart-fb_0.9.0.007.bb b/packages/efl/esmart-fb_0.9.0.007.bb index 35bef239ee..f0565c6a71 100644 --- a/packages/efl/esmart-fb_0.9.0.007.bb +++ b/packages/efl/esmart-fb_0.9.0.007.bb @@ -7,12 +7,12 @@ myheaders = "esmart_container/Esmart_Container.h \ esmart_draggies/Esmart_Draggies.h \ esmart_file_dialog/Esmart_File_Dialog.h \ esmart_text_entry/Esmart_Text_Entry.h \ - esmart_textarea/Esmart_Textarea.h \ +# esmart_textarea/Esmart_Textarea.h esmart_thumb/Esmart_Thumb.h" mylibraries = "esmart_container \ esmart_draggies \ esmart_file_dialog \ esmart_text_entry \ - esmart_textarea \ +# esmart_textarea esmart_thumb" diff --git a/packages/efl/esmart/disable-x-only-features.patch b/packages/efl/esmart/disable-x-only-features.patch index 54638841ee..68dd363f74 100644 --- a/packages/efl/esmart/disable-x-only-features.patch +++ b/packages/efl/esmart/disable-x-only-features.patch @@ -3,20 +3,21 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- esmart-0.9.0.004/src/lib/Makefile.am~disable-x-only-features.patch -+++ esmart-0.9.0.004/src/lib/Makefile.am -@@ -1,8 +1,5 @@ +--- esmart-0.9.0.007/src/lib/Makefile.am~disable-x-only-features.patch ++++ esmart-0.9.0.007/src/lib/Makefile.am +@@ -1,9 +1,7 @@ SUBDIRS = \ esmart_container \ - esmart_draggies \ esmart_text_entry \ esmart_file_dialog \ - esmart_thumb \ -- esmart_trans_x11 \ -- esmart_textarea +- esmart_trans_x11 + esmart_thumb ---- esmart-0.9.0.004/src/Makefile.am~disable-x-only-features.patch -+++ esmart-0.9.0.004/src/Makefile.am + + # esmart_textarea +--- esmart-0.9.0.007/src/Makefile.am~disable-x-only-features.patch ++++ esmart-0.9.0.007/src/Makefile.am @@ -1,3 +1,3 @@ MAINTAINERCLEANFILES = Makefile.in diff --git a/packages/efl/evas-fb_0.9.9.027.bb b/packages/efl/evas-fb_0.9.9.032.bb index 3f7847874c..3f7847874c 100644 --- a/packages/efl/evas-fb_0.9.9.027.bb +++ b/packages/efl/evas-fb_0.9.9.032.bb diff --git a/packages/efl/evas-native_0.9.9.027.bb b/packages/efl/evas-native_0.9.9.032.bb index cbcbe304e9..cbcbe304e9 100644 --- a/packages/efl/evas-native_0.9.9.027.bb +++ b/packages/efl/evas-native_0.9.9.032.bb diff --git a/packages/efl/evas-x11_0.9.9.027.bb b/packages/efl/evas-x11_0.9.9.032.bb index da163d31ad..da163d31ad 100644 --- a/packages/efl/evas-x11_0.9.9.027.bb +++ b/packages/efl/evas-x11_0.9.9.032.bb diff --git a/packages/emacs/emacs-x11_20060801.bb b/packages/emacs/emacs-x11_20060801.bb new file mode 100644 index 0000000000..003857e139 --- /dev/null +++ b/packages/emacs/emacs-x11_20060801.bb @@ -0,0 +1,3 @@ +include emacs-x11_cvs.bb +SRCDATE = "${PV}" +DEFAULT_PREFERENCE = "0" diff --git a/packages/emacs/emacs-x11_cvs.bb b/packages/emacs/emacs-x11_cvs.bb new file mode 100644 index 0000000000..874aacae4c --- /dev/null +++ b/packages/emacs/emacs-x11_cvs.bb @@ -0,0 +1,5 @@ +include emacs_cvs.bb +# full X (non-diet) is needed for X support +DEPENDS += "libx11" +EXTRA_OECONF = "" +RREPLACES = "emacs" diff --git a/packages/emacs/emacs_20060801.bb b/packages/emacs/emacs_20060801.bb new file mode 100644 index 0000000000..642ede82fe --- /dev/null +++ b/packages/emacs/emacs_20060801.bb @@ -0,0 +1,3 @@ +include emacs_cvs.bb +SRCDATE = "${PV}" +DEFAULT_PREFERENCE = "0" diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb index 8322e8f512..7e59cb23a0 100644 --- a/packages/emacs/emacs_cvs.bb +++ b/packages/emacs/emacs_cvs.bb @@ -3,14 +3,14 @@ HOMEPAGE = "http://www.gnu.org/software/emacs/" LICENSE = "GPLv2" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" SECTION = "editor" -# full X (non-diet) is needed for X support -DEPENDS = "libx11" # and it needs to run some generated binaries.. DEPENDS += "qemu-native" #NOTE: I have found that this only works with qemu-0.8.0. If I use 0.8.1 or 0.8.2 # the build gets hung up on compiling certain .el files -PR = "r5" +PR = "r6" + +DEFAULT_PREFERENCE = "-1" SRC_URI = "cvs://anoncvs:anonymous@cvs.savannah.gnu.org/sources/emacs;module=emacs \ file://use-qemu.patch;patch=1" @@ -27,6 +27,8 @@ QEMU = "qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}" LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib" +EXTRA_OECONF = "--without-x" + do_bootstrap() { cp "${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${S}" @@ -45,4 +47,4 @@ do_compile_prepend() { cp "${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${S}" export QEMU="${QEMU}" -}
\ No newline at end of file +} diff --git a/packages/gnome/libsoup_2.2.93.bb b/packages/gnome/libsoup_2.2.93.bb index 7ee1a1877e..9ee030d5c9 100644 --- a/packages/gnome/libsoup_2.2.93.bb +++ b/packages/gnome/libsoup_2.2.93.bb @@ -13,5 +13,5 @@ FILES_${PN}-doc = "${datadir}" do_stage() { autotools_stage_all - install -m 0644 ${STAGING_DATADIR}/pkgconfig/libsoup.pc ${STAGING_DATADIR}/pkgconfig/libsoup-2.2.pc + ln -s ${STAGING_DATADIR}/pkgconfig/libsoup.pc ${STAGING_DATADIR}/pkgconfig/libsoup-2.2.pc } diff --git a/packages/images/bootstrap-image-bootchart.bb b/packages/images/bootstrap-image-bootchart.bb new file mode 100644 index 0000000000..68cfac7490 --- /dev/null +++ b/packages/images/bootstrap-image-bootchart.bb @@ -0,0 +1,10 @@ +export IMAGE_BASENAME = "bootstrap-image-bootchart" +export IMAGE_LINGUAS = "" +export IPKG_INSTALL = "task-bootstrap bootchart acct" + +DEPENDS = "task-bootstrap bootchart" +RDEPENDS = "acct" + +inherit image_ipk + +LICENSE = MIT diff --git a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r3.patch b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r3.patch deleted file mode 100644 index b27fd09068..0000000000 --- a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r3.patch +++ /dev/null @@ -1,31 +0,0 @@ - -The ident for Seagate 8GB microdrive is -"SEAGATE", "ST1" -hash 0x76dc4190, 0xcfba9599 -manfid 0x0111, 0x0000 - -CF card: - product info: "SAMSUNG", "04/05/06", "", "" - manfid : 0x0000, 0x0000 - function 4 (fixed disk) - - -Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl> - - drivers/ide/legacy/ide-cs.c | 1 + - 1 file changed, 1 insertion(+) - -Index: linux-2.6.17/drivers/ide/legacy/ide-cs.c -=================================================================== ---- linux-2.6.17.orig/drivers/ide/legacy/ide-cs.c 2006-06-18 03:49:35.000000000 +0200 -+++ linux-2.6.17/drivers/ide/legacy/ide-cs.c 2006-07-10 23:29:28.696446000 +0200 -@@ -402,6 +402,9 @@ - PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), - PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), - PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), -+ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), /* Seagate 8GB microdrive */ -+ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), -+ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), - PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), - PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), - PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), diff --git a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r4.patch b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r4.patch new file mode 100644 index 0000000000..5e3a5eaa20 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r4.patch @@ -0,0 +1,48 @@ +From: Marcin Juszkiewicz <openembedded@hrw.one.pl> + +Few cards informations submitted by OpenZaurus users. + +Seagate 8GB microdrive: + product info: "SEAGATE", "ST1" + manfid 0x0111, 0x0000 + +One CF card: + product info: "SAMSUNG", "04/05/06", "", "" + manfid : 0x0000, 0x0000 + +Ridata 8GB Pro 150X Compact Flash Card: + product info: "SMI VENDOR", "SMI PRODUCT", "" + manfid: 0x000a, 0x0000 + + product info: "M-Systems", "CF500", "" + manfid: 0x000a, 0x0000 + +Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl> + +--- +Patch follow kernel version 2.6.17 + +Please Cc: me - I'm not subscribed to linux-pcmcia or linux-kernel + + ide-cs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +Index: linux/drivers/ide/legacy/ide-cs.c +=================================================================== +--- linux.orig/drivers/ide/legacy/ide-cs.c 2006-07-10 23:25:59.479162976 +0200 ++++ linux/drivers/ide/legacy/ide-cs.c 2006-08-02 23:02:22.997684384 +0200 +@@ -398,10 +398,14 @@ + PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149), + PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674), + PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2 ", 0xe37be2b5, 0x8671043b), ++ PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c), + PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79), + PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), + PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), + PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), ++ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), ++ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), ++ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), + PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), + PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), + PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), diff --git a/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r3.patch b/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r3.patch deleted file mode 100644 index b27fd09068..0000000000 --- a/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r3.patch +++ /dev/null @@ -1,31 +0,0 @@ - -The ident for Seagate 8GB microdrive is -"SEAGATE", "ST1" -hash 0x76dc4190, 0xcfba9599 -manfid 0x0111, 0x0000 - -CF card: - product info: "SAMSUNG", "04/05/06", "", "" - manfid : 0x0000, 0x0000 - function 4 (fixed disk) - - -Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl> - - drivers/ide/legacy/ide-cs.c | 1 + - 1 file changed, 1 insertion(+) - -Index: linux-2.6.17/drivers/ide/legacy/ide-cs.c -=================================================================== ---- linux-2.6.17.orig/drivers/ide/legacy/ide-cs.c 2006-06-18 03:49:35.000000000 +0200 -+++ linux-2.6.17/drivers/ide/legacy/ide-cs.c 2006-07-10 23:29:28.696446000 +0200 -@@ -402,6 +402,9 @@ - PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), - PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), - PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), -+ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), /* Seagate 8GB microdrive */ -+ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), -+ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), - PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), - PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), - PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), diff --git a/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r4.patch b/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r4.patch new file mode 100644 index 0000000000..5e3a5eaa20 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r4.patch @@ -0,0 +1,48 @@ +From: Marcin Juszkiewicz <openembedded@hrw.one.pl> + +Few cards informations submitted by OpenZaurus users. + +Seagate 8GB microdrive: + product info: "SEAGATE", "ST1" + manfid 0x0111, 0x0000 + +One CF card: + product info: "SAMSUNG", "04/05/06", "", "" + manfid : 0x0000, 0x0000 + +Ridata 8GB Pro 150X Compact Flash Card: + product info: "SMI VENDOR", "SMI PRODUCT", "" + manfid: 0x000a, 0x0000 + + product info: "M-Systems", "CF500", "" + manfid: 0x000a, 0x0000 + +Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl> + +--- +Patch follow kernel version 2.6.17 + +Please Cc: me - I'm not subscribed to linux-pcmcia or linux-kernel + + ide-cs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +Index: linux/drivers/ide/legacy/ide-cs.c +=================================================================== +--- linux.orig/drivers/ide/legacy/ide-cs.c 2006-07-10 23:25:59.479162976 +0200 ++++ linux/drivers/ide/legacy/ide-cs.c 2006-08-02 23:02:22.997684384 +0200 +@@ -398,10 +398,14 @@ + PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149), + PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674), + PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2 ", 0xe37be2b5, 0x8671043b), ++ PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c), + PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79), + PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), + PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), + PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), ++ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), ++ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), ++ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), + PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), + PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), + PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), diff --git a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch b/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch deleted file mode 100644 index b27fd09068..0000000000 --- a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch +++ /dev/null @@ -1,31 +0,0 @@ - -The ident for Seagate 8GB microdrive is -"SEAGATE", "ST1" -hash 0x76dc4190, 0xcfba9599 -manfid 0x0111, 0x0000 - -CF card: - product info: "SAMSUNG", "04/05/06", "", "" - manfid : 0x0000, 0x0000 - function 4 (fixed disk) - - -Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl> - - drivers/ide/legacy/ide-cs.c | 1 + - 1 file changed, 1 insertion(+) - -Index: linux-2.6.17/drivers/ide/legacy/ide-cs.c -=================================================================== ---- linux-2.6.17.orig/drivers/ide/legacy/ide-cs.c 2006-06-18 03:49:35.000000000 +0200 -+++ linux-2.6.17/drivers/ide/legacy/ide-cs.c 2006-07-10 23:29:28.696446000 +0200 -@@ -402,6 +402,9 @@ - PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), - PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), - PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), -+ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), /* Seagate 8GB microdrive */ -+ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), -+ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), - PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), - PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), - PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), diff --git a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r4.patch b/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r4.patch new file mode 100644 index 0000000000..5e3a5eaa20 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r4.patch @@ -0,0 +1,48 @@ +From: Marcin Juszkiewicz <openembedded@hrw.one.pl> + +Few cards informations submitted by OpenZaurus users. + +Seagate 8GB microdrive: + product info: "SEAGATE", "ST1" + manfid 0x0111, 0x0000 + +One CF card: + product info: "SAMSUNG", "04/05/06", "", "" + manfid : 0x0000, 0x0000 + +Ridata 8GB Pro 150X Compact Flash Card: + product info: "SMI VENDOR", "SMI PRODUCT", "" + manfid: 0x000a, 0x0000 + + product info: "M-Systems", "CF500", "" + manfid: 0x000a, 0x0000 + +Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl> + +--- +Patch follow kernel version 2.6.17 + +Please Cc: me - I'm not subscribed to linux-pcmcia or linux-kernel + + ide-cs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +Index: linux/drivers/ide/legacy/ide-cs.c +=================================================================== +--- linux.orig/drivers/ide/legacy/ide-cs.c 2006-07-10 23:25:59.479162976 +0200 ++++ linux/drivers/ide/legacy/ide-cs.c 2006-08-02 23:02:22.997684384 +0200 +@@ -398,10 +398,14 @@ + PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149), + PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674), + PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2 ", 0xe37be2b5, 0x8671043b), ++ PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c), + PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79), + PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), + PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), + PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), ++ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), ++ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), ++ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), + PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), + PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), + PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index 270d6d7060..4a667b895f 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r41" +PR = "r42" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -87,7 +87,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \ ${DOSRC}/kexec-arm-r2.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ - file://hrw-pcmcia-ids-r3.patch;patch=1 \ + file://hrw-pcmcia-ids-r4.patch;patch=1 \ file://locomo-kbd-hotkeys.patch;patch=1 \ file://locomo-sysrq+keyrepeat.patch;patch=1 \ file://locomo-lcd-def-bightness.patch;patch=1 \ diff --git a/packages/linux/linux-openzaurus_2.6.17+git.bb b/packages/linux/linux-openzaurus_2.6.17+git.bb index 56b79952ac..49e188860e 100644 --- a/packages/linux/linux-openzaurus_2.6.17+git.bb +++ b/packages/linux/linux-openzaurus_2.6.17+git.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r7" +PR = "r8" DEFAULT_PREFERENCE = "-1" @@ -38,7 +38,7 @@ SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gi ${RPSRC}/poodle_audio-r0.patch;patch=1 \ ${RPSRC}/nand_sharpsl_fix-r0.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ - file://hrw-pcmcia-ids-r3.patch;patch=1 \ + file://hrw-pcmcia-ids-r4.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb index 822cfca0bf..09855ef5c6 100644 --- a/packages/linux/linux-openzaurus_2.6.17.bb +++ b/packages/linux/linux-openzaurus_2.6.17.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r14" +PR = "r15" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -48,7 +48,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \ ${RPSRC}/poodle_audio-r1.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ - file://hrw-pcmcia-ids-r3.patch;patch=1 \ + file://hrw-pcmcia-ids-r4.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ diff --git a/packages/madwifi/madwifi-ng_r.inc b/packages/madwifi/madwifi-ng_r.inc new file mode 100644 index 0000000000..488d9aefa4 --- /dev/null +++ b/packages/madwifi/madwifi-ng_r.inc @@ -0,0 +1,49 @@ +DESCRIPTION = "Linux driver for 802.11a/b/g universal NIC cards using Atheros chip sets" +SECTION = "base" +PRIORITY = "optional" +MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>" +LICENSE = "GPL" +RDEPENDS = "kernel (${KERNEL_VERSION})" +DEPENDS = "virtual/kernel" +PR="r0" + +SRC_URI = "http://snapshots.madwifi.org/${PN}/${PN}-${PV}.tar.gz \ + file://10-xscale-be-elf-copts.patch;patch=1 \ + file://10-xscale-le-elf-copts.patch;patch=1 \ + file://10-sh4-le-elf-copts.patch;patch=1" + +S = "${WORKDIR}/${PN}-${PV}" + +inherit module-base + +EXTRA_OEMAKE = "LDFLAGS= KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX}" + +EXTRA_OEMAKE_prepend_slugos = "TARGET=xscale-${ARCH_BYTE_SEX}-elf " + +do_compile() { + oe_runmake all +} + +do_stage() { + install -d ${STAGING_INCDIR}/${PN}/include + install -d ${STAGING_INCDIR}/${PN}/net80211 + cp --dereference include/compat.h ${STAGING_INCDIR}/${PN}/include/ + cp --dereference net80211/*.h ${STAGING_INCDIR}/${PN}/net80211/ +} + +do_install() { + install -d ${D}${sbindir} + oe_runmake DESTDIR=${D} BINDIR=${sbindir} install +} + +pkg_postinst() { +if test "x$D" != "x"; then + exit 1 +else + depmod -ae +fi +} + +PACKAGES = "${PN}-modules ${PN}-tools" +FILES_${PN}-modules = "/lib/modules/" +FILES_${PN}-tools = "/usr/" diff --git a/packages/madwifi/madwifi-ng_r1527-20060425.bb b/packages/madwifi/madwifi-ng_r1527-20060425.bb index 488d9aefa4..78966bdb40 100644 --- a/packages/madwifi/madwifi-ng_r1527-20060425.bb +++ b/packages/madwifi/madwifi-ng_r1527-20060425.bb @@ -1,49 +1,2 @@ -DESCRIPTION = "Linux driver for 802.11a/b/g universal NIC cards using Atheros chip sets" -SECTION = "base" -PRIORITY = "optional" -MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>" -LICENSE = "GPL" -RDEPENDS = "kernel (${KERNEL_VERSION})" -DEPENDS = "virtual/kernel" +include madwifi-ng_r.inc PR="r0" - -SRC_URI = "http://snapshots.madwifi.org/${PN}/${PN}-${PV}.tar.gz \ - file://10-xscale-be-elf-copts.patch;patch=1 \ - file://10-xscale-le-elf-copts.patch;patch=1 \ - file://10-sh4-le-elf-copts.patch;patch=1" - -S = "${WORKDIR}/${PN}-${PV}" - -inherit module-base - -EXTRA_OEMAKE = "LDFLAGS= KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX}" - -EXTRA_OEMAKE_prepend_slugos = "TARGET=xscale-${ARCH_BYTE_SEX}-elf " - -do_compile() { - oe_runmake all -} - -do_stage() { - install -d ${STAGING_INCDIR}/${PN}/include - install -d ${STAGING_INCDIR}/${PN}/net80211 - cp --dereference include/compat.h ${STAGING_INCDIR}/${PN}/include/ - cp --dereference net80211/*.h ${STAGING_INCDIR}/${PN}/net80211/ -} - -do_install() { - install -d ${D}${sbindir} - oe_runmake DESTDIR=${D} BINDIR=${sbindir} install -} - -pkg_postinst() { -if test "x$D" != "x"; then - exit 1 -else - depmod -ae -fi -} - -PACKAGES = "${PN}-modules ${PN}-tools" -FILES_${PN}-modules = "/lib/modules/" -FILES_${PN}-tools = "/usr/" diff --git a/packages/madwifi/madwifi-ng_r1692-20060723.bb b/packages/madwifi/madwifi-ng_r1692-20060723.bb new file mode 100644 index 0000000000..78966bdb40 --- /dev/null +++ b/packages/madwifi/madwifi-ng_r1692-20060723.bb @@ -0,0 +1,2 @@ +include madwifi-ng_r.inc +PR="r0" diff --git a/packages/python/python-2.4.3-manifest.inc b/packages/python/python-2.4.3-manifest.inc index 92db34115b..82c886658c 100644 --- a/packages/python/python-2.4.3-manifest.inc +++ b/packages/python/python-2.4.3-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Sat Jul 8 12:48:43 2006 +### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Wed Aug 2 23:25:58 2006 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -8,9 +8,14 @@ ######################################################################################################################## -PROVIDES+="python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-profile " +PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " -PACKAGES="python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-profile " +PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " + +DESCRIPTION_python-profile="Python Basic Profiling Support" +PR_python-profile="ml0" +RDEPENDS_python-profile="python-core" +FILES_python-profile="${libdir}/python2.4/profile.* ${libdir}/python2.4/pstats.* " DESCRIPTION_python-threading="Python Threading & Synchronization Support" PR_python-threading="ml0" @@ -130,7 +135,7 @@ FILES_python-fcntl="${libdir}/python2.4/lib-dynload/fcntl.so " DESCRIPTION_python-netclient="Python Internet Protocol Clients" PR_python-netclient="ml1" RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime" -FILES_python-netclient="${libdir}/python2.4/_LWPCookieJar.* ${libdir}/python2.4/_MozillaCookieJar.* ${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* ${libdir}/python2.4/Cookie.*" +FILES_python-netclient="${libdir}/python2.4/*Cookie*.* ${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* " DESCRIPTION_python-pprint="Python Pretty-Print Support" PR_python-pprint="ml0" @@ -162,6 +167,11 @@ PR_python-readline="ml0" RDEPENDS_python-readline="python-core libreadline4" FILES_python-readline="${libdir}/python2.4/lib-dynload/readline.so ${libdir}/python2.4/rlcompleter.* " +DESCRIPTION_python-subprocess="Python Subprocess Support" +PR_python-subprocess="ml0" +RDEPENDS_python-subprocess="python-core python-io python-re" +FILES_python-subprocess="${libdir}/python2.4/subprocess.* " + DESCRIPTION_python-pydoc="Python Interactive Help Support" PR_python-pydoc="ml0" RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re" @@ -228,8 +238,8 @@ RDEPENDS_python-mmap="python-core python-io" FILES_python-mmap="${libdir}/python2.4/lib-dynload/mmap.so " DESCRIPTION_python-zlib="Python zlib Support." -PR_python-zlib="ml0" -RDEPENDS_python-zlib="python-core libz1" +PR_python-zlib="ml1" +RDEPENDS_python-zlib="python-core" FILES_python-zlib="${libdir}/python2.4/lib-dynload/zlib.so " DESCRIPTION_python-db="Python File-Based Database Support" @@ -258,9 +268,4 @@ RDEPENDS_python-audio="python-core" FILES_python-audio="${libdir}/python2.4/wave.* ${libdir}/python2.4/chunk.* ${libdir}/python2.4/lib-dynload/ossaudiodev.so ${libdir}/python2.4/lib-dynload/audioop.so " -DESCRIPTION_python-profile="Python Profiler Support" -PR_python-profile="ml0" -RDEPENDS_python-profile="python-core" -FILES_python-profile="${libdir}/python2.4/profile.* ${libdir}/python2.4/pstats.* " - diff --git a/packages/python/python-pyxml_0.8.4.bb b/packages/python/python-pyxml_0.8.4.bb index b5d277916d..edf1d21542 100644 --- a/packages/python/python-pyxml_0.8.4.bb +++ b/packages/python/python-pyxml_0.8.4.bb @@ -5,7 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "PSF" RDEPENDS = "python-core python-xml python-netclient" SRCNAME = "pyxml" -PV = "0.8.3" +PR = "ml0" SRC_URI = "${SOURCEFORGE_MIRROR}/pyxml/PyXML-${PV}.tar.gz" S = "${WORKDIR}/PyXML-${PV}" diff --git a/packages/xfwm4/xfwm4.inc b/packages/xfwm4/xfwm4.inc index 1b137c4261..fb85b4d9eb 100644 --- a/packages/xfwm4/xfwm4.inc +++ b/packages/xfwm4/xfwm4.inc @@ -9,10 +9,15 @@ inherit xfce FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*" DEPENDS = "startup-notification virtual/libx11 xpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager" +RDEPENDS = "xfwm4-theme-default" EXTRA_OECONF += " --enable-startup-notification" +do_configure_append() { + sed -i s:/usr/include/xfce4::g mcs-plugin/Makefile +} + PACKAGES_DYNAMIC = "xfwm4-theme-*" python populate_packages_prepend () { diff --git a/packages/xorg-app/rgb_X11R7.1-1.0.1.bb b/packages/xorg-app/rgb_X11R7.1-1.0.1.bb index 4077c44cfb..87194c44b8 100644 --- a/packages/xorg-app/rgb_X11R7.1-1.0.1.bb +++ b/packages/xorg-app/rgb_X11R7.1-1.0.1.bb @@ -1,7 +1,10 @@ include xorg-app-common.inc +PR = "r1" #DESCRIPTION = "" DEPENDS += " xproto util-macros" +FILES_${PN} += "${datadir}/X11" + diff --git a/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb b/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb new file mode 100644 index 0000000000..8501865871 --- /dev/null +++ b/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb @@ -0,0 +1,8 @@ +include xorg-proto-common.inc + +SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-1.0.3.tar.bz2" +S = "${WORKDIR}/${XORG_PN}-1.0.3" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index a7c92dcb83..cfb1294c09 100644 --- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -39,6 +39,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-dga --disable-dri --disable-xinerama \ --disable-xf86misc --disable-xf86vidmode \ --disable-xorg --disable-xorgcfg \ + --disable-dmx \ --disable-xkb --disable-xnest --disable-xvfb \ --disable-xevie --disable-xprint --disable-xtrap \ --with-default-font-path=built-ins \ diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index e667e36f2c..491e486b3d 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -1,4 +1,4 @@ -PV = "0.0+git" +PV = "1.1.0+git${SRCDATE}" DEFAULT_PREFERENCE = "-2" LICENSE = "MIT" @@ -26,7 +26,7 @@ SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ file://fbdev-not-fix.patch;patch=1 \ file://enable-builtin-fonts.patch;patch=1 \ file://optional-xkb.patch;patch=1 \ - file://disable-xf86-dga-xorgcfg.patch;patch=1 \ +# file://disable-xf86-dga-xorgcfg.patch;patch=1 \ file://enable-tslib.patch;patch=1" SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" @@ -43,5 +43,6 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-xorg --disable-xorgcfg \ --disable-xkb --disable-xnest --disable-xvfb \ --disable-xevie --disable-xprint --disable-xtrap \ + --disable-dmx \ --with-default-font-path=built-ins \ ac_cv_file__usr_share_X11_sgml_defs_ent=no" diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb index 674f1e5e64..42b5bb918d 100644 --- a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb @@ -2,6 +2,8 @@ include xorg-xserver-common.inc SRC_URI += "file://drmfix.patch;patch=1" +EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " + #DESCRIPTION = "" #DEPENDS += " " |