summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Hovland <erik@hovland.org>2006-05-08 19:19:53 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-05-08 19:19:53 +0000
commitceb9beb6476d646012e9ba52f2a67eb0038f90ae (patch)
tree07c52d11c290ca332f9ef23ac2f35764a25d54e4
parentfcb80fdd84521a656ec4e57dde83c10c7f589182 (diff)
parent7ed412e1e868f20a0e803e91e3d7e3529f61b44e (diff)
merge of 59f97700899a07187b176ccd4ee9885184f096ae
and b1db4ad66d7affe171f6be3fc1e203540febb857
-rw-r--r--classes/base.bbclass4
-rw-r--r--classes/qt3x11.bbclass20
-rw-r--r--classes/qt4x11.bbclass25
-rw-r--r--conf/distro/angstrom-2006.9.conf1
-rw-r--r--conf/distro/slugos-packages.conf1
-rw-r--r--conf/machine/h2200.conf1
-rw-r--r--conf/machine/ipaq-pxa270.conf6
-rw-r--r--conf/machine/simpad.conf4
-rw-r--r--packages/altboot/altboot_0.0.0.bb70
-rw-r--r--packages/altboot/files/akita/altboot-2.4.cfg4
-rw-r--r--packages/altboot/files/akita/altboot-2.6.cfg4
-rw-r--r--packages/altboot/files/altboot.func72
-rw-r--r--packages/altboot/files/c7x0/altboot-2.4.cfg4
-rw-r--r--packages/altboot/files/c7x0/altboot-2.6.cfg4
-rw-r--r--packages/altboot/files/collie/altboot-2.4.cfg4
-rw-r--r--packages/altboot/files/init.altboot72
-rw-r--r--packages/altboot/files/poodle/altboot-2.4.cfg4
-rw-r--r--packages/altboot/files/spitz/altboot-2.6.cfg4
-rw-r--r--packages/altboot/files/tosa/altboot-2.4.cfg4
-rw-r--r--packages/avahi/avahi_0.6.10.bb (renamed from packages/avahi/avahi_0.6.9.bb)0
-rw-r--r--packages/dhclient/README3
-rw-r--r--packages/fuse/fuse-module_2.5.3.bb35
-rw-r--r--packages/fuse/fuse_2.5.3.bb30
-rw-r--r--packages/gpe-bootsplash/files/init.patch2
-rw-r--r--packages/gpe-bootsplash/gpe-bootsplash_1.15.bb2
-rw-r--r--packages/gstreamer/gst-plugins.inc6
-rw-r--r--packages/gstreamer/gstreamer_0.10.4.bb2
-rw-r--r--packages/gstreamer/gstreamer_0.10.5.bb6
-rw-r--r--packages/libgpewidget/libgpewidget_0.111.bb26
-rw-r--r--packages/libqanava/libqanava_0.0.7.bb1
-rw-r--r--packages/linux/handhelds-pxa-2.6/24-hostap_cs_id.diff107
-rw-r--r--packages/linux/handhelds-pxa-2.6/hrw-pcmcia-ids-r2.patch35
-rw-r--r--packages/linux/handhelds-pxa-2.6_cvs.bb4
-rw-r--r--packages/linux/linux-openzaurus-2.6.15/gcc4-ledclass-static-order-hack.patch29
-rw-r--r--packages/linux/linux-openzaurus-2.6.16+git/.mtn2git_empty (renamed from packages/linux/linux-openzaurus-2.6.15/.mtn2git_empty)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.16+git/24-hostap_cs_id.diff107
-rw-r--r--packages/linux/linux-openzaurus-2.6.16+git/add-oz-release-string.patch (renamed from packages/linux/linux-openzaurus-2.6.15/add-oz-release-string.patch)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.16+git/connectplus-remove-ide-HACK.patch (renamed from packages/linux/linux-openzaurus-2.6.15/connectplus-remove-ide-HACK.patch)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.16+git/defconfig-akita (renamed from packages/linux/linux-openzaurus-2.6.15/defconfig-akita)238
-rw-r--r--packages/linux/linux-openzaurus-2.6.16+git/defconfig-c7x0 (renamed from packages/linux/linux-openzaurus-2.6.15/defconfig-c7x0)246
-rw-r--r--packages/linux/linux-openzaurus-2.6.16+git/defconfig-collie (renamed from packages/linux/linux-openzaurus-2.6.15/defconfig-collie)320
-rw-r--r--packages/linux/linux-openzaurus-2.6.16+git/defconfig-ipaq-pxa270 (renamed from packages/linux/linux-openzaurus-2.6.15/defconfig-ipaq-pxa270)8
-rw-r--r--packages/linux/linux-openzaurus-2.6.16+git/defconfig-poodle (renamed from packages/linux/linux-openzaurus-2.6.15/defconfig-poodle)339
-rw-r--r--packages/linux/linux-openzaurus-2.6.16+git/defconfig-qemuarm (renamed from packages/linux/linux-openzaurus-2.6.15/defconfig-qemuarm)4
-rw-r--r--packages/linux/linux-openzaurus-2.6.16+git/defconfig-spitz (renamed from packages/linux/linux-openzaurus-2.6.15/defconfig-spitz)238
-rw-r--r--packages/linux/linux-openzaurus-2.6.16+git/defconfig-tosa (renamed from packages/linux/linux-openzaurus-2.6.15/defconfig-tosa)452
-rw-r--r--packages/linux/linux-openzaurus-2.6.16+git/hrw-pcmcia-ids-r2.patch35
-rw-r--r--packages/linux/linux-openzaurus-2.6.16+git/pxa-serial-hack.patch (renamed from packages/linux/linux-openzaurus-2.6.15/pxa-serial-hack.patch)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.16+git/rmk-mmc1.patch61
-rw-r--r--packages/linux/linux-openzaurus-2.6.16+git/rmk-mmc2.patch26
-rw-r--r--packages/linux/linux-openzaurus-2.6.16+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch (renamed from packages/linux/linux-openzaurus-2.6.15/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch)0
-rw-r--r--packages/linux/linux-openzaurus.inc7
-rw-r--r--packages/linux/linux-openzaurus_2.6.15.bb115
-rw-r--r--packages/linux/linux-openzaurus_2.6.16+git.bb109
-rw-r--r--packages/linux/linux-openzaurus_2.6.16.bb7
-rw-r--r--packages/lyx/lyx_1.4.0.bb2
-rw-r--r--packages/lyx/lyx_1.4.1.bb2
-rw-r--r--packages/nkf/.mtn2git_empty0
-rw-r--r--packages/nkf/nkf-native_2.06.bb11
-rw-r--r--packages/nkf/nkf_2.06.bb12
-rw-r--r--packages/poboxserver/files/OpenPOBox-1.25.diff6
-rw-r--r--packages/poboxserver/poboxserver_1.2.5.bb25
-rw-r--r--packages/slugos-init/files/turnup12
-rw-r--r--packages/slugos-init/slugos-init_0.10.bb2
-rw-r--r--packages/texmaker/texmaker_1.3.bb1
-rw-r--r--packages/ulxmlrpcpp/.mtn2git_empty0
-rw-r--r--packages/ulxmlrpcpp/files/.mtn2git_empty0
-rw-r--r--packages/ulxmlrpcpp/files/disable-docs.patch15
-rw-r--r--packages/ulxmlrpcpp/ulxmlrpcpp_1.5.2.bb23
-rw-r--r--packages/wpa-supplicant/wpa-gui_0.4.8.bb3
-rw-r--r--packages/xdpyinfo/xdpyinfo_1.0.1.bb3
-rw-r--r--packages/xev/xev_1.0.1.bb3
-rw-r--r--packages/xhost/xhost_1.0.0.bb3
-rw-r--r--packages/xlibs/libfontenc_1.0.1.bb8
-rw-r--r--packages/xlibs/libice_X11R7.0-1.0.0.bb9
-rw-r--r--packages/xlibs/liblbxutil_1.0.0.bb12
-rw-r--r--packages/xlibs/libsm_X11R7.0-1.0.0.bb9
-rw-r--r--packages/xlibs/libx11_X11R7.0-1.0.0.bb9
-rw-r--r--packages/xlibs/libxau_1.0.0.bb8
-rw-r--r--packages/xlibs/libxaw_X11R7.0-1.0.1.bb9
-rw-r--r--packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb11
-rw-r--r--packages/xlibs/libxcursor_1.1.5.2.bb11
-rw-r--r--packages/xlibs/libxdamage_1.0.2.2.bb9
-rw-r--r--packages/xlibs/libxdmcp_1.0.0.bb9
-rw-r--r--packages/xlibs/libxext_1.0.0.bb10
-rw-r--r--packages/xlibs/libxfixes_3.0.1.2.bb9
-rw-r--r--packages/xlibs/libxfont_X11R7.0-1.0.0.bb9
-rw-r--r--packages/xlibs/libxft_2.1.8.2.bb12
-rw-r--r--packages/xlibs/libxi_X11R7.0-1.0.0.bb9
-rw-r--r--packages/xlibs/libxinerama_X11R7.0-1.0.1.bb9
-rw-r--r--packages/xlibs/libxkbfile_1.0.1.bb8
-rw-r--r--packages/xlibs/libxkbui_1.0.1.bb7
-rw-r--r--packages/xlibs/libxmu_1.0.0.bb11
-rw-r--r--packages/xlibs/libxp_1.0.0.bb9
-rw-r--r--packages/xlibs/libxpm_3.5.4.2.bb5
-rw-r--r--packages/xlibs/libxrandr_1.1.0.2.bb9
-rw-r--r--packages/xlibs/libxrender_0.9.0.2.bb9
-rw-r--r--packages/xlibs/libxres_X11R7.0-1.0.0.bb9
-rw-r--r--packages/xlibs/libxss_1.0.1.bb9
-rw-r--r--packages/xlibs/libxt_1.0.0.bb9
-rw-r--r--packages/xlibs/libxtst_1.0.1.bb9
-rw-r--r--packages/xlibs/libxv_X11R7.0-1.0.1.bb9
-rw-r--r--packages/xlibs/libxxf86dga_1.0.0.bb5
-rw-r--r--packages/xlibs/libxxf86misc_1.0.0.bb9
-rw-r--r--packages/xlibs/libxxf86vm_1.0.0.bb8
-rw-r--r--packages/xlibs/util-macros_1.0.1.bb10
-rw-r--r--packages/xlibs/xorg-xlibs.inc9
-rw-r--r--packages/xlibs/xtrans_1.0.0.bb8
-rw-r--r--packages/xmodmap/xmodmap_1.0.0.bb3
-rw-r--r--packages/xorg-data/data-common.inc3
-rw-r--r--packages/xorg-fonts/font-common.inc3
-rw-r--r--packages/xrandr/xrandr_1.0.1.bb4
-rw-r--r--packages/xrdb/xrdb_1.0.1.bb4
-rw-r--r--packages/xset/xset_1.0.1.bb3
-rw-r--r--packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch65
-rw-r--r--packages/zaurusd/files/zaurus-hinge.in91
-rw-r--r--packages/zaurusd/zaurusd_svn.bb17
-rw-r--r--packages/zeroconf/files/.mtn2git_empty0
-rw-r--r--packages/zeroconf/files/debian-zeroconf51
-rw-r--r--packages/zeroconf/files/zeroconf-default (renamed from packages/zeroconf/zeroconf-0.6.1/zeroconf-default)0
-rw-r--r--packages/zeroconf/zeroconf_0.9.bb21
121 files changed, 2105 insertions, 1505 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 6a9077d55a..56008e66cc 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -520,8 +520,8 @@ python base_eventhandler() {
except IOError:
pass
bb.data.setVar( 'OE_REVISION', monotone_revision, e.data )
- statusvars = ['BB_VERSION', 'OE_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'TARGET_FPU']
- statuslines = ["%-13s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars]
+ statusvars = ['BB_VERSION', 'OE_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'DISTRO_VERSION','TARGET_FPU']
+ statuslines = ["%-14s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars]
statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines)
print statusmsg
diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass
index 09b9cbac96..6e3d5f8ba2 100644
--- a/