[oe-commits] org.oe.dev merge of '6fac15e307a3e92d647e9f142ee8341eec839a79'
pfalcon commit
openembedded-commits at lists.openembedded.org
Fri Jul 13 10:54:22 UTC 2007
merge of '6fac15e307a3e92d647e9f142ee8341eec839a79'
and 'c1286096ff5c06af943961004df6e2d4107937ea'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: c0b27fb20d3acf8fd54af737b63355f45246e05a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c0b27fb20d3acf8fd54af737b63355f45246e05a
Files:
1
packages/alsa/alsa-states
packages/alsa/alsa-states/fic-gta01
packages/alsa/alsa-states_0.0.0.bb
packages/file/file-native_4.20.bb
packages/file/file_4.20.bb
packages/alsa/alsa-states/fic-gta01/capturehandset.state
packages/alsa/alsa-state/fic-gta01/capturehandset.state
packages/alsa/alsa-states/fic-gta01/captureheadset.state
packages/alsa/alsa-state/fic-gta01/captureheadset.state
packages/alsa/alsa-states/fic-gta01/gsmbluetooth.state
packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state
packages/alsa/alsa-states/fic-gta01/gsmhandset.state
packages/alsa/alsa-state/fic-gta01/gsmhandset.state
packages/alsa/alsa-states/fic-gta01/gsmheadset.state
packages/alsa/alsa-state/fic-gta01/gsmheadset.state
packages/alsa/alsa-states/fic-gta01/stereoout.state
packages/alsa/alsa-state/fic-gta01/stereoout.state
packages/libsigc++-2.0/libsigc++-2.0-2.0.17
packages/evince/evince_0.9.2.bb
packages/file/file-native_4.21.bb
packages/file/file_4.21.bb
packages/gpephone/machined_svn.bb
packages/libsigc++-2.0/libsigc++-2.0-2.0.17/define_sigc_api.patch
packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb
packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01
packages/linux/linux-gta01_2.6.21.5.bb
packages/m4/m4-native_1.4.8.bb
classes/qt4x11.bbclass
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
packages/alsa/alsa-state.bb
packages/efl1/ecore-native_0.9.9.038.bb
packages/gpephone/gpe-session-scripts-phone/phonesession
packages/gpephone/gpe-session-scripts-phone_0.67.bb
packages/gpephone/ptim-engine_svn.bb
packages/gpephone/ptim-helper_svn.bb
packages/qmake/qmake2-native_2.01a.bb
packages/tasks/task-base.bb
packages/uicmoc/uicmoc4-native_4.3.0.bb
conf/bitbake.conf
Diffs:
#
# mt diff -r6fac15e307a3e92d647e9f142ee8341eec839a79 -rc0b27fb20d3acf8fd54af737b63355f45246e05a
#
#
#
# delete "packages/alsa/alsa-states"
#
# delete "packages/alsa/alsa-states/fic-gta01"
#
# delete "packages/alsa/alsa-states_0.0.0.bb"
#
# delete "packages/file/file-native_4.20.bb"
#
# delete "packages/file/file_4.20.bb"
#
# rename "packages/alsa/alsa-states/fic-gta01/capturehandset.state"
# to "packages/alsa/alsa-state/fic-gta01/capturehandset.state"
#
# rename "packages/alsa/alsa-states/fic-gta01/captureheadset.state"
# to "packages/alsa/alsa-state/fic-gta01/captureheadset.state"
#
# rename "packages/alsa/alsa-states/fic-gta01/gsmbluetooth.state"
# to "packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state"
#
# rename "packages/alsa/alsa-states/fic-gta01/gsmhandset.state"
# to "packages/alsa/alsa-state/fic-gta01/gsmhandset.state"
#
# rename "packages/alsa/alsa-states/fic-gta01/gsmheadset.state"
# to "packages/alsa/alsa-state/fic-gta01/gsmheadset.state"
#
# rename "packages/alsa/alsa-states/fic-gta01/stereoout.state"
# to "packages/alsa/alsa-state/fic-gta01/stereoout.state"
#
# add_dir "packages/libsigc++-2.0/libsigc++-2.0-2.0.17"
#
# add_file "packages/evince/evince_0.9.2.bb"
# content [c874b55da09d3037d303e145d2cc1507fa7402e6]
#
# add_file "packages/file/file-native_4.21.bb"
# content [7f56042d15332b2149b6e86a6180dd1e4707ae80]
#
# add_file "packages/file/file_4.21.bb"
# content [3754c0dea941ef3f376efa559fe6e981cedfa9bf]
#
# add_file "packages/gpephone/machined_svn.bb"
# content [c192d49beecd4b546ada28a1e7cd67964213339b]
#
# add_file "packages/libsigc++-2.0/libsigc++-2.0-2.0.17/define_sigc_api.patch"
# content [db5f96d73cd196054bec8489dc3bd6ad1c731c19]
#
# add_file "packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb"
# content [98e500f0096ee080083cac017c0910fe2a207c46]
#
# add_file "packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01"
# content [b13800e54f61edf724b8c70fbf5b508ea11f79e9]
#
# add_file "packages/linux/linux-gta01_2.6.21.5.bb"
# content [b1936abf638c2ef95ea6ca878f69b3ccc447851d]
#
# add_file "packages/m4/m4-native_1.4.8.bb"
# content [c4a8093ea1425f950c9db692a37b1bac632dc4eb]
#
# patch "classes/qt4x11.bbclass"
# from [7d466c81d6791bc2458fe1e2eadfd62d9cfb02bd]
# to [c1c773af617672d8ff38e8bd5f5d04d6773ae67c]
#
# patch "conf/machine/fic-gta01.conf"
# from [23aa3fc9534120dd38935869df0535f58909579d]
# to [1c8e90287feedbc8f33cb1859b4e13cbf1007c10]
#
# patch "conf/machine/fic-gta02.conf"
# from [dbb06e41897ef8d2e5a888b86e3e8157bb667557]
# to [35a3ed508f3117b908249db21b5778bc4578be37]
#
# patch "packages/alsa/alsa-state.bb"
# from [6674988c91d8b1501ec9a8967baf1226e06cbc7a]
# to [481e31f5bed1ac2d402c743d5464c9a931503c91]
#
# patch "packages/efl1/ecore-native_0.9.9.038.bb"
# from [a6c082e1855fe38962b17d575b31619fd89ddc28]
# to [17a8335856faa8d9c108f59dd7ce54f1db34ec00]
#
# patch "packages/gpephone/gpe-session-scripts-phone/phonesession"
# from [4eaaedce5e3bb2058cddbe9b64cd12f1149ec3f1]
# to [e0f4897cf03774795773888e2931554df0824118]
#
# patch "packages/gpephone/gpe-session-scripts-phone_0.67.bb"
# from [2f4b948c60bf6f34259951b866ad2c3ae4c3c28e]
# to [ea1d40745d9fe6c81ff23a05247b1fc791189eac]
#
# patch "packages/gpephone/ptim-engine_svn.bb"
# from [9edcf54a369610d5112dca943b1c77d6e80ec6be]
# to [7faa1b8b01b548efede423f2c32b31a4ae6ece7c]
#
# patch "packages/gpephone/ptim-helper_svn.bb"
# from [f1f55592accd9643cad1a245df07efeb0b9d663d]
# to [eaf5cdd4d29b32dfccd466b4b0e57015d3114c71]
#
# patch "packages/qmake/qmake2-native_2.01a.bb"
# from [17ddd6208bf05e7171ef2ba6625d25bf7c067677]
# to [b58e6dceed352069e13fc28ed8c4120809744506]
#
# patch "packages/tasks/task-base.bb"
# from [8063e1b226de759fef34b1a23b3845f05b89bb7c]
# to [2b89141c35420f2a2ec89ff47305e1e4034c4067]
#
# patch "packages/uicmoc/uicmoc4-native_4.3.0.bb"
# from [bb258bfafd5b03ee012d8e4530a8f4219b862463]
# to [8520da26a06ef5cd286a9749b5a8e78337c3f665]
#
============================================================
--- packages/evince/evince_0.9.2.bb c874b55da09d3037d303e145d2cc1507fa7402e6
+++ packages/evince/evince_0.9.2.bb c874b55da09d3037d303e145d2cc1507fa7402e6
@@ -0,0 +1,16 @@
+DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu."
+LICENSE = "GPL"
+SECTION = "x11/office"
+DEPENDS = "tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring "
+RDEPENDS = "espgs "
+RRECOMMENDS = "gnome-vfs-plugin-file"
+PR = "r1"
+
+inherit gnome pkgconfig gtk-icon-cache
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.9/${PN}-${PV}.tar.bz2 \
+ file://no-icon-theme.diff;patch=1;pnum=0 \
+ file://no-help-dir.patch;patch=1"
+
+EXTRA_OECONF = "--without-libgnome --disable-thumbnailer --disable-scrollkeeper"
+
============================================================
--- packages/file/file-native_4.21.bb 7f56042d15332b2149b6e86a6180dd1e4707ae80
+++ packages/file/file-native_4.21.bb 7f56042d15332b2149b6e86a6180dd1e4707ae80
@@ -0,0 +1,6 @@
+require file_${PV}.bb
+inherit native
+DEPENDS = ""
+PR = "r0"
+
+SRC_URI += "file://native-fix.diff;patch=1"
============================================================
--- packages/file/file_4.21.bb 3754c0dea941ef3f376efa559fe6e981cedfa9bf
+++ packages/file/file_4.21.bb 3754c0dea941ef3f376efa559fe6e981cedfa9bf
@@ -0,0 +1,18 @@
+DESCRIPTION = "File attempts to classify files depending \
+on their contents and prints a description if a match is found."
+SECTION = "console/utils"
+LICENSE = "BSD-ADV"
+DEPENDS = "file-native"
+
+SRC_URI = "ftp://ftp.fi.debian.org/pub/gentoo/distfiles/file-${PV}.tar.gz"
+S = "${WORKDIR}/file-${PV}"
+
+inherit autotools
+
+do_configure_prepend() {
+ sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am
+}
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/gpephone/machined_svn.bb c192d49beecd4b546ada28a1e7cd67964213339b
+++ packages/gpephone/machined_svn.bb c192d49beecd4b546ada28a1e7cd67964213339b
@@ -0,0 +1,18 @@
+DESCRIPTION = "Device abstraction and support daemon"
+SECTION = "gpephone"
+PRIORITY = "required"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0"
+PV = "0.1+svn-${SRCDATE}"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/;module=${PN}"
+
+S = "${WORKDIR}/${PN}"
+
+#FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/helper/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pixmaps"
+
============================================================
--- packages/libsigc++-2.0/libsigc++-2.0-2.0.17/define_sigc_api.patch db5f96d73cd196054bec8489dc3bd6ad1c731c19
+++ packages/libsigc++-2.0/libsigc++-2.0-2.0.17/define_sigc_api.patch db5f96d73cd196054bec8489dc3bd6ad1c731c19
@@ -0,0 +1,15 @@
+Index: libsigc++-2.0.17/configure.ac
+===================================================================
+--- libsigc++-2.0.17.orig/configure.ac 2005-12-20 08:41:21.000000000 +0000
++++ libsigc++-2.0.17/configure.ac 2007-07-11 11:33:55.000000000 +0100
+@@ -105,6 +105,10 @@
+ SIGC_CXX_HAS_NAMESPACE_STD()
+ SIGC_CXX_HAS_SUN_REVERSE_ITERATOR()
+
++dnl FIXME Define this here since it does not seem to be defined elsewhere
++AC_DEFINE(SIGC_API, [], [Empty specifier])
++AC_DEFINE(SIGC_USING_STD(Symbol), [], [Empty specifier])
++
+ if test "X$config_error" = "Xyes" ; then
+ AC_ERROR(
+ [One or more of the required compiler features is missing.
============================================================
--- packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb 98e500f0096ee080083cac017c0910fe2a207c46
+++ packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb 98e500f0096ee080083cac017c0910fe2a207c46
@@ -0,0 +1,45 @@
+DESCRIPTION = "A library for loose coupling of C++ method calls"
+SECTION = "libs"
+PRIORITY = "optional"
+PR = "r1"
+LICENSE = "GPL LGPL"
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.0/libsigc++-${PV}.tar.gz \
+ file://define_sigc_api.patch;patch=1 "
+S = "${WORKDIR}/libsigc++-${PV}"
+
+inherit autotools pkgconfig
+
+FILES_${PN}-dev += "${libdir}/sigc++-*/"
+
+# acpaths = ""
+
+do_stage() {
+ install -d ${STAGING_LIBDIR}/sigc++-2.0/include
+ install -m 0644 sigc++config.h ${STAGING_LIBDIR}/sigc++-2.0/include/
+ oe_libinstall -so -C sigc++ libsigc-2.0 ${STAGING_LIBDIR}
+
+ install -d ${STAGING_INCDIR}/sigc++-2.0/sigc++
+ for f in sigc++/*.h
+ do
+ install -m 0644 $f ${STAGING_INCDIR}/sigc++-2.0/sigc++/
+ done
+ install -d ${STAGING_INCDIR}/sigc++-2.0/sigc++/functors
+ for f in sigc++/functors/*.h
+ do
+ install -m 0644 $f ${STAGING_INCDIR}/sigc++-2.0/sigc++/functors
+ done
+
+ install -d ${STAGING_INCDIR}/sigc++-2.0/sigc++/adaptors
+ for f in sigc++/adaptors/*.h
+ do
+ install -m 0644 $f ${STAGING_INCDIR}/sigc++-2.0/sigc++/adaptors
+ done
+ install -d ${STAGING_INCDIR}/sigc++-2.0/sigc++/adaptors/lambda
+ for f in sigc++/adaptors/lambda/*.h
+ do
+ install -m 0644 $f ${STAGING_INCDIR}/sigc++-2.0/sigc++/adaptors/lambda
+ done
+
+
+}
+
============================================================
--- packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01 b13800e54f61edf724b8c70fbf5b508ea11f79e9
+++ packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01 b13800e54f61edf724b8c70fbf5b508ea11f79e9
@@ -0,0 +1,1857 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.21.3
+# Mon Jun 11 18:32:32 2007
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+# CONFIG_GENERIC_TIME is not set
+CONFIG_MMU=y
+CONFIG_NO_IOPORT=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION="-moko10"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=m
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_DEFAULT_AS is not set
+CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="deadline"
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+CONFIG_ARCH_S3C2410=y
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+CONFIG_PLAT_S3C24XX=y
+CONFIG_CPU_S3C244X=y
+# CONFIG_S3C2410_BOOT_WATCHDOG is not set
+CONFIG_S3C2410_BOOT_ERROR_RESET=y
+CONFIG_S3C2410_PM_DEBUG=y
+# CONFIG_S3C2410_PM_CHECK is not set
+CONFIG_S3C2410_LOWLEVEL_UART_PORT=0
+CONFIG_S3C2410_DMA=y
+# CONFIG_S3C2410_DMA_DEBUG is not set
+CONFIG_MACH_SMDK=y
+
+#
+# S3C2400 Machines
+#
+CONFIG_CPU_S3C2410=y
+CONFIG_CPU_S3C2410_DMA=y
+CONFIG_S3C2410_PM=y
+CONFIG_S3C2410_GPIO=y
+CONFIG_S3C2410_CLOCK=y
+
+#
+# S3C2410 Machines
+#
+# CONFIG_ARCH_SMDK2410 is not set
+# CONFIG_ARCH_H1940 is not set
+# CONFIG_MACH_N30 is not set
+# CONFIG_ARCH_BAST is not set
+# CONFIG_MACH_OTOM is not set
+# CONFIG_MACH_AML_M5900 is not set
+# CONFIG_MACH_VR1000 is not set
+CONFIG_MACH_QT2410=y
+CONFIG_MACH_NEO1973_GTA01=y
+
+#
+# S3C2412 Machines
+#
+# CONFIG_MACH_SMDK2413 is not set
+# CONFIG_MACH_VSTMS is not set
+CONFIG_CPU_S3C2440=y
+CONFIG_S3C2440_DMA=y
+
+#
+# S3C2440 Machines
+#
+# CONFIG_MACH_ANUBIS is not set
+# CONFIG_MACH_OSIRIS is not set
+# CONFIG_MACH_RX3715 is not set
+CONFIG_ARCH_S3C2440=y
+# CONFIG_MACH_NEXCODER_2440 is not set
+CONFIG_SMDK2440_CPU2440=y
+CONFIG_MACH_HXD8=y
+# CONFIG_MACH_NEO1973_GTA02 is not set
+
+#
+# S3C2442 Machines
+#
+# CONFIG_SMDK2440_CPU2442 is not set
+
+#
+# S3C2443 Machines
+#
+# CONFIG_MACH_SMDK2443 is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM920T=y
+CONFIG_CPU_32v4T=y
+CONFIG_CPU_ABRT_EV4T=y
+CONFIG_CPU_CACHE_V4WT=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_OUTER_CACHE is not set
+
+#
+# Bus support
+#
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+CONFIG_PREEMPT=y
+CONFIG_NO_IDLE_HZ=y
+CONFIG_HZ=200
+# CONFIG_AEABI is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="console=ttySAC0,115200n8 ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off debug"
+# CONFIG_XIP_KERNEL is not set
+CONFIG_KEXEC=y
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+# CONFIG_FPE_NWFPE is not set
+CONFIG_FPE_FASTFPE=y
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
+
+#
+# Power management options
+#
+CONFIG_PM=y
+CONFIG_PM_LEGACY=y
+CONFIG_PM_DEBUG=y
+CONFIG_DISABLE_CONSOLE_SUSPEND=y
+# CONFIG_PM_SYSFS_DEPRECATED is not set
+CONFIG_APM_EMULATION=y
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=m
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+CONFIG_XFRM_MIGRATE=y
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+# CONFIG_IP_ROUTE_MULTIPATH is not set
+# CONFIG_IP_ROUTE_VERBOSE is not set
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rc1286096ff5c06af943961004df6e2d4107937ea -rc0b27fb20d3acf8fd54af737b63355f45246e05a
#
#
#
# patch "conf/bitbake.conf"
# from [28be7aa3c03959211fa8fff38d1903e1ec2dd8de]
# to [1a40a8a4b4660be43379de36b41dceabe1bebd19]
#
============================================================
--- conf/bitbake.conf 28be7aa3c03959211fa8fff38d1903e1ec2dd8de
+++ conf/bitbake.conf 1a40a8a4b4660be43379de36b41dceabe1bebd19
@@ -468,7 +468,7 @@ OES_BITBAKE_CONF = "1"
OES_BITBAKE_CONF = "1"
##################################################################
-# Task-base stuff
+# Machine properties and task-base stuff
##################################################################
MACHINE_FEATURES ?= "kernel26"
@@ -477,7 +477,13 @@ ROOT_FLASH_SIZE ?= "256"
# This is used to limit what packages goes into images built, so set big by default
ROOT_FLASH_SIZE ?= "256"
-GUI_MACHINE_CLASS ?= "smallscreen"
+MACHINE_GUI_CLASS ?= "smallscreen"
+# GUI_MACHINE_CLASS is deprecated, please use MACHINE_GUI_CLASS instead
+GUI_MACHINE_CLASS ?= "${MACHINE_GUI_CLASS}"
+MACHINE_DISPLAY_WIDTH_PIXELS ?= "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS ?= "320"
+MACHINE_DISPLAY_ORIENTATION ?= "0"
+MACHINE_DISPLAY_BPP ?= "16"
DISTRO_EXTRA_RDEPENDS ?= ""
DISTRO_EXTRA_RRECOMMENDS ?= ""
More information about the Openembedded-commits
mailing list