Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/20 09:26:10-07:00 amd.com!jcrouse
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into forsteri.amd.com:/users/jcrouse/bk/openembedded

2005/05/20 09:25:44-07:00 amd.com!jcrouse
libxfce4util_4.2.2.bb:
  Stage .m4s needed by other XFCE apps
delete unneeded 4.0.5 files

2005/05/20 17:53:28+02:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/tmp/oe/openembedded

2005/05/20 17:09:33+02:00 hrw.one.pl!hrw
Add flags to help build omniorb into site files (patch by Philip Balister)

2005/05/20 17:08:07+02:00 hrw.one.pl!hrw
kernel changes for omap5912osk dev board (patch by Philip Balister)

2005/05/20 17:07:06+02:00 hrw.one.pl!hrw
switched distro openomap to glibc (patch by Philip Balister)

2005/05/20 17:05:35+02:00 hrw.one.pl!hrw
added xerces-c 2.6.0 (patch by Philip Balister)

2005/05/20 17:04:31+02:00 hrw.one.pl!hrw
added linux-omap1 2.6.12-rc2 (patch by Philip Balister)

2005/05/20 17:02:43+02:00 hrw.one.pl!hrw
added omnievents 2.6.1 (patch by Philip Balister)

2005/05/20 17:01:57+02:00 hrw.one.pl!hrw
added omniorb 4.0.5 (patch by Philip Balister)

2005/05/19 11:43:11-07:00 amd.com!jcrouse
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into forsteri.amd.com:/users/jcrouse/bk/openembedded

2005/05/19 11:09:32-07:00 amd.com!jcrouse
Remove xfce 4.0.5 etal, and add 4.2.2 (I hope)

BKrev: 428e12cf4xX-FRlRWgIlZ-_FowE0HQ

diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf
index af0f52a..6f0bca9 100644 (file)
--- a/conf/distro/openomap.conf
+++ b/conf/distro/openomap.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: OE Distribution for TI OMAP Development Boards
 
 INHERIT += " package_ipk debian"
-TARGET_OS ?= "linux-uclibc"
+TARGET_OS = "linux"
 TARGET_FPU ?= "soft"
 
 # 2.4 vs 2.6 is a distro decision.

diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index a01e970..de21822 100644 (file)
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -6,7 +6,7 @@ TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm armv5te ${MACHINE}"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6"
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel modutils-collateral"
@@ -15,4 +15,20 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
+# PCMCIA Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcmcia-core kernel-module-pcmcia"
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-omap-cf"
+# IDE modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-cs kernel-module-ide-disk"
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-core"
+# DOS and VFAT modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-msdos kernel-module-nls-iso8859-1"
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nls-cp437 kernel-module-nls-base"
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-vfat kernel-module-fat"
+# Video er LCD Driver
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-fb kernel-module-cfbimgblt kernel-module-cfbcopyarea"
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-cfbfillrect kernel-module-omapfb kernel-module-softcursor"
+# DSP Interface
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-dsp"
+
 include conf/machine/tune-arm926ejs.conf

diff --git a/packages/libxfce4mcs/libxfce4mcs_4.0.5.bb b/packages/libxfce4mcs/libxfce4mcs.inc
similarity index 100%
rename from packages/libxfce4mcs/libxfce4mcs_4.0.5.bb
rename to packages/libxfce4mcs/libxfce4mcs.inc

diff --git a/packages/libxfce4util/libxfce4util_4.0.5.bb b/packages/libxfce4mcs/libxfce4mcs_4.2.2.bb
similarity index 100%
rename from packages/libxfce4util/libxfce4util_4.0.5.bb
rename to packages/libxfce4mcs/libxfce4mcs_4.2.2.bb

diff --git a/packages/libxfcegui4/libxfcegui4_4.0.5.bb b/packages/libxfce4util/libxfce4util.inc
similarity index 100%
rename from packages/libxfcegui4/libxfcegui4_4.0.5.bb
rename to packages/libxfce4util/libxfce4util.inc

diff --git a/packages/xfce4-goodies/xfce4-mixer_4.0.5.bb b/packages/libxfce4util/libxfce4util_4.2.2.bb
similarity index 100%
rename from packages/xfce4-goodies/xfce4-mixer_4.0.5.bb
rename to packages/libxfce4util/libxfce4util_4.2.2.bb

diff --git a/packages/xfce4-panel/xfce4-panel_4.0.5.bb b/packages/libxfcegui4/libxfcegui4.inc
similarity index 100%
rename from packages/xfce4-panel/xfce4-panel_4.0.5.bb
rename to packages/libxfcegui4/libxfcegui4.inc

diff --git a/packages/xffm/xffm-4.0.5/link.patch b/packages/libxfcegui4/libxfcegui4_4.2.2.bb
similarity index 100%
rename from packages/xffm/xffm-4.0.5/link.patch
rename to packages/libxfcegui4/libxfcegui4_4.2.2.bb

diff --git a/packages/xffm/xffm_4.0.5.bb b/packages/linux/linux-omap1-2.6.12-rc2/omap5912osk/defconfig
similarity index 100%
rename from packages/xffm/xffm_4.0.5.bb
rename to packages/linux/linux-omap1-2.6.12-rc2/omap5912osk/defconfig

diff --git a/packages/xfprint/xfprint_4.0.5.bb b/packages/linux/linux-omap1_2.6.12_rc2.bb
similarity index 100%
rename from packages/xfprint/xfprint_4.0.5.bb
rename to packages/linux/linux-omap1_2.6.12_rc2.bb

diff --git a/packages/xfwm4-themes/xfwm4-themes_4.0.5.bb b/packages/omnievents/files/omniidl-cross.patch
similarity index 100%
rename from packages/xfwm4-themes/xfwm4-themes_4.0.5.bb
rename to packages/omnievents/files/omniidl-cross.patch

diff --git a/packages/xfwm4/xfwm4_4.0.5.bb b/packages/omnievents/omnievents_2.6.1.bb
similarity index 100%
rename from packages/xfwm4/xfwm4_4.0.5.bb
rename to packages/omnievents/omnievents_2.6.1.bb

diff --git a/packages/omniorb/files/omniORB-cross.patch b/packages/omniorb/files/omniORB-cross.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/omniorb/files/omniORB_embedded_appl.patch b/packages/omniorb/files/omniORB_embedded_appl.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/omniorb/omniorb-native_4.0.5.bb b/packages/omniorb/omniorb-native_4.0.5.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/omniorb/omniorb_4.0.5.bb b/packages/omniorb/omniorb_4.0.5.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xerces-c/xerces-c_2.6.0.bb b/packages/xerces-c/xerces-c_2.6.0.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xfcalendar/xfcalendar.inc b/packages/xfcalendar/xfcalendar.inc
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xfcalendar/xfcalendar_4.2.2.bb b/packages/xfcalendar/xfcalendar_4.2.2.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager.inc b/packages/xfce-mcs-manager/xfce-mcs-manager.inc
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager_4.0.5.bb b/packages/xfce-mcs-manager/xfce-mcs-manager_4.0.5.bb
deleted file mode 100644 (file)
index 5a71703..0000000
--- a/packages/xfce-mcs-manager/xfce-mcs-manager_4.0.5.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-# xfce-mcs-manager OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-DESCRIPTION="XFCE4 Settings manager."
-SECTION = "x11/wm"
-
-DEPENDS="libxfcegui4 libxfce4mcs"
-
-inherit xfce 
-
-FILES_${PN} += " ${datadir}/xfce4/doc/C"
-
-do_stage() {
-       install -d ${STAGING_INCDIR}/xfce4
-       install -d ${STAGING_INCDIR}/xfce4/xfce-mcs-manager
-       install -m 644 xfce-mcs-manager/manager-plugin.h ${STAGING_INCDIR}/xfce4/xfce-mcs-manager
-}
-
-# xfce-mcs-manager.pc uses ${libdir} to indicate where the mcs plugins live
-# the standard pkgconfig mangling was confusing us.  Mangling is not required
-# for this particular .pc, so the following will suffice:
-
-do_stage_append () {
-       install -d ${PKG_CONFIG_PATH}
-       install -m 0644 ${S}/xfce-mcs-manager/xfce-mcs-manager.pc ${PKG_CONFIG_PATH}/xfce-mcs-manager.pc
-}

diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.2.bb b/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.2.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc b/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.0.5.bb b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.0.5.bb
deleted file mode 100644 (file)
index 0ea48dd..0000000
--- a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.0.5.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-# xfce-mcs-plugins OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-DESCRIPTION="Common XFCE4 configuration plugins."
-SECTION = "x11"
-
-PACKAGES="${PN}"
-FILES_${PN}="${libdir}/xfce4/mcs-plugins/*.so ${datadir}/xfce4/doc/C"
-
-DEPENDS="libxfcegui4 xfce-mcs-manager gtk+"
-inherit xfce

diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.2.bb b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.2.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xfce-utils/xfce-utils.inc b/packages/xfce-utils/xfce-utils.inc
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xfce-utils/xfce-utils_4.0.5.bb b/packages/xfce-utils/xfce-utils_4.0.5.bb
deleted file mode 100644 (file)
index 8cb3b63..0000000
--- a/packages/xfce-utils/xfce-utils_4.0.5.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-# xfce-mcs-plugins OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-PR="r1"
-
-DESCRIPTION="XFCE4 Utilities"
-SECTION = "x11/utils"
-
-PACKAGES="xfce-utils xfce-utils-mcs-plugins"
-
-FILES_xfce-utils-mcs-plugins="${libdir}/xfce4/mcs-plugins/*.so"
-FILES_${PN} += " ${datadir}/xfce4/AUTHORS \
-        ${datadir}/xfce4/BSD \
-        ${datadir}/xfce4/COPYING \
-        ${datadir}/xfce4/GPL \
-       ${datadir}/xfce4/INFO \
-        ${datadir}/xfce4/LGPL \
-        ${datadir}/xfce4/AUTHORS.html \
-        ${datadir}/xfce4/BSD.html \
-        ${datadir}/xfce4/COPYING.html \
-        ${datadir}/xfce4/GPL.html \
-       ${datadir}/xfce4/INFO.html \
-        ${datadir}/xfce4/LGPL.html \
-       ${datadir}/xfce4/doc/C"
-
-DEPENDS="x11 libxfcegui4 xfce-mcs-manager"
-inherit xfce
-
-# NOTE:  This package takes a --with-browser for the default browser
-# NOTE:  Works with gdm also gtkhtml

diff --git a/packages/xfce-utils/xfce-utils_4.2.2.bb b/packages/xfce-utils/xfce-utils_4.2.2.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xfce4-goodies/xfce4-appfinder.inc b/packages/xfce4-goodies/xfce4-appfinder.inc
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xfce4-goodies/xfce4-appfinder_4.2.2.bb b/packages/xfce4-goodies/xfce4-appfinder_4.2.2.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xfce4-goodies/xfce4-mixer.inc b/packages/xfce4-goodies/xfce4-mixer.inc
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xfce4-goodies/xfce4-mixer_4.2.2.bb b/packages/xfce4-goodies/xfce4-mixer_4.2.2.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xfce4-panel/xfce4-panel.inc b/packages/xfce4-panel/xfce4-panel.inc
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xfce4-panel/xfce4-panel_4.2.2.bb b/packages/xfce4-panel/xfce4-panel_4.2.2.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xfdesktop/xfdesktop.inc b/packages/xfdesktop/xfdesktop.inc
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xfdesktop/xfdesktop_4.0.5.bb b/packages/xfdesktop/xfdesktop_4.0.5.bb
deleted file mode 100644 (file)
index 21eb7c9..0000000
--- a/packages/xfdesktop/xfdesktop_4.0.5.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-# xfdesktop OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-DESCRIPTION="xfce4 Desktop Background Manager"
-SECTION = "x11/base"
-
-PACKAGES="xfdesktop xfdesktop-backdrops xfdesktop-mcs-plugins ${PN}-doc"
-
-FILES_xfdesktop-mcs-plugins="${libdir}/xfce4/mcs-plugins/*.so"
-FILES_xfdesktop-backdrops="${datadir}/xfce4/backdrops/"
-
-DEPENDS="x11 libxfcegui4 libxfce4mcs libxml2"
-inherit xfce
-
-# Get rid of the (for now) useless internationalization menus
-# In the future, we would copy over the desired internationalization
-
-do_install() {
-       oe_runmake DESTDIR=${D} install
-       rm -rf ${D}${sysconfdir}/xfce4/menu.xml.*
-}

diff --git a/packages/xfdesktop/xfdesktop_4.2.2.bb b/packages/xfdesktop/xfdesktop_4.2.2.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xffm/xffm.inc b/packages/xffm/xffm.inc
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xffm/xffm_4.2.2.bb b/packages/xffm/xffm_4.2.2.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xfwm4-themes/xfwm4-themes.inc b/packages/xfwm4-themes/xfwm4-themes.inc
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xfwm4-themes/xfwm4-themes_4.2.2.bb b/packages/xfwm4-themes/xfwm4-themes_4.2.2.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xfwm4/xfwm4.inc b/packages/xfwm4/xfwm4.inc
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xfwm4/xfwm4_4.2.2.bb b/packages/xfwm4/xfwm4_4.2.2.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/site/arm-linux b/site/arm-linux
index ae00964..fe0e020 100644 (file)
--- a/site/arm-linux
+++ b/site/arm-linux
@@ -7,6 +7,9 @@ ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
 ac_cv_func_setvbuf_reversed=no
 ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
 ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
+ac_cv_sizeof_wchar_t=${ac_cv_sizeof_wchar_t=1}
+ac_cv_sizeof_unsigned_char=${ac_cv_sizeof_unsigned_char=1}
+ac_cv_sizeof_bool=${ac_cv_sizeof_bool=1}
 ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
 ac_cv_sizeof_long=${ac_cv_sizeof_long=4}
 ac_cv_sizeof_long_int=${ac_cv_sizeof_long_int=4}
@@ -15,6 +18,8 @@ ac_cv_sizeof_short=${ac_cv_sizeof_short=2}
 ac_cv_sizeof_short_int=${ac_cv_sizeof_short_int=2}
 ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4}
 ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=4}
+ac_cv_sizeof_float=${ac_cv_sizeof_float=4}
+ac_cv_sizeof_double=${ac_cv_sizeof_double=8}
 ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=8}
 ac_cv_sizeof_unsigned_short=${ac_cv_sizeof_unsigned_short=2}
 ac_cv_sizeof_unsigned_int=${ac_cv_sizeof_unsigned_int=4}

diff --git a/site/i686-linux b/site/i686-linux
index 138c65b..f5915e8 100644 (file)
--- a/site/i686-linux
+++ b/site/i686-linux
@@ -21,6 +21,7 @@ ac_cv_sizeof_short=${ac_cv_sizeof_short=2}
 ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4}
 ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4}
 ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=4}
+ac_cv_sizeof_float=${ac_cv_sizeof_float=4}
 apr_cv_process_shared_works=${apr_cv_process_shared_works=no}
 bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes}
 db_cv_alignp_t=${db_cv_alignp_t='unsigned long'}