[oe-commits] org.oe.dev merge of '66573a06c1ee62e38d70a6c82f8d99a41243cd5c'

florian commit openembedded-commits at lists.openembedded.org
Fri Jul 6 16:45:48 UTC 2007


merge of '66573a06c1ee62e38d70a6c82f8d99a41243cd5c'
     and '77ccc19a41dcb49d566dc709b5d6a8a4043567b4'

Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: fa76ecef37e2cdf7add00cf988b60dd14eeff878
ViewMTN: http://monotone.openembedded.org/revision.psp?id=fa76ecef37e2cdf7add00cf988b60dd14eeff878
Files:
1
packages/gpe-scap/gpe-scap_1.3.bb
packages/openmoko-apps/openmoko-mainmenu_svn.bb
packages/openmoko-pim/openmoko-contacts
packages/openmoko-pim/openmoko-contacts/index.theme
packages/openmoko-pim/openmoko-contacts/intltool-update.in
packages/openmoko-pim/openmoko-contacts/stock_contact.png
packages/openmoko-pim/openmoko-contacts/stock_person.png
packages/openmoko-pim/openmoko-dates
packages/openmoko-pim/openmoko-dates/compile-fix.patch
packages/openmoko-pim/openmoko-dates/intltool-update.in
packages/openmoko-pim/openmoko-dates/om-dates-temp-buildfix_20070308.patch
packages/openmoko-pim/openmoko-dates/remove-bogus-include.patch
packages/perl/perl-5.8.8/native-makedepend-dash.patch
packages/openmoko-base/files
packages/openmoko-base/openmoko-session
packages/gtkhtml/gtkhtml-3.6
packages/linux/linux-handhelds-2.6/htcapache
packages/linux/linux-handhelds-2.6/htcsable
packages/openmoko-apps/openmoko-terminal
packages/openmoko-base/openmoko-sound-system
packages/openmoko-pim/files
packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch
packages/libtool/libtool-1.5.10/rpath-control.patch
packages/linux/linux-handhelds-2.6/htcapache/defconfig
packages/linux/linux-handhelds-2.6/htcsable/defconfig
packages/obexftp/files/iconv.patch
packages/openmoko-apps/openmoko-calculator_svn.bb
packages/openmoko-apps/openmoko-terminal/gtkterm2rc
packages/openmoko-apps/openmoko-terminal/openmoko-terminal.desktop
packages/openmoko-apps/openmoko-terminal/openmoko-terminal.png
packages/openmoko-apps/openmoko-terminal_svn.bb
packages/openmoko-base/openmoko-sound-system/pulseaudio
packages/openmoko-base/openmoko-sound-system/session
packages/openmoko-base/openmoko-sound-system_0.1.0.bb
packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
packages/openmoko-pim/files/index.theme
packages/openmoko-pim/files/intltool-update.in
packages/openmoko-pim/files/openmoko-dates.desktop
packages/openmoko-pim/files/openmoko-dates.png
packages/openmoko-pim/files/stock_contact.png
packages/openmoko-pim/files/stock_person.png
packages/openmoko-pim/openmoko-tasks_svn.bb
packages/opie-taskbar/opie-taskbar-images.inc
packages/opie-taskbar/opie-taskbar-images_cvs.bb
packages/perl/perl-5.8.8/asm-pageh-fix.patch
packages/perl/perl-5.8.8/makedepend-dash.patch
classes/kernel.bbclass
conf/distro/angstrom-2007.1.conf
conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
contrib/feed-browser/includes/functions.inc
contrib/feed-browser/index.php
contrib/feed-browser/update.php
packages/gaim/pidgin.inc
packages/gaim/pidgin_2.0.2.bb
packages/gtkhtml/gtkhtml-3.6_3.6.2.bb
packages/libtool/libtool-cross_1.5.10.bb
packages/libtool/libtool-native_1.5.10.bb
packages/obexftp/obexftp_0.20.bb
packages/openmoko-base/openmoko-icon-theme-standard_svn.bb
packages/openmoko-base/openmoko-libs_svn.bb
packages/openmoko-base/openmoko-session/session
packages/openmoko-base/openmoko-session_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
packages/openmoko-pim/openmoko-dates_svn.bb
packages/openmoko-pim/openmoko-today_svn.bb
packages/opie-icon-reload/opie-icon-reload.inc
packages/opie-icon-reload/opie-icon-reload_1.2.2.bb
packages/opie-taskbar/opie-taskbar.inc
packages/opie-taskbar/opie-taskbar_cvs.bb
packages/perl/perl-native_5.8.8.bb
packages/perl/perl_5.8.8.bb
packages/qemu/qemu-native.inc
packages/qt/qt4_arch.inc
packages/tasks/task-openmoko.bb
packages/tasks/task-opie.bb
mtn:manual_merge
true
mtn:execute
Diffs:

#
# mt diff -r66573a06c1ee62e38d70a6c82f8d99a41243cd5c -rfa76ecef37e2cdf7add00cf988b60dd14eeff878
#
# 
# 
# add_file "packages/gpe-scap/gpe-scap_1.3.bb"
#  content [ea05f8ee476d853b1883d58d4bc62e8d23ba9041]
# 
============================================================
--- packages/gpe-scap/gpe-scap_1.3.bb	ea05f8ee476d853b1883d58d4bc62e8d23ba9041
+++ packages/gpe-scap/gpe-scap_1.3.bb	ea05f8ee476d853b1883d58d4bc62e8d23ba9041
@@ -0,0 +1,13 @@
+DESCRIPTION = "GPE screenshot application"
+LICENSE = "GPL"
+PRIORITY = "optional"
+SECTION = "gpe"
+PR = "r0"
+
+RREPLACES = "gpe-screenshot"
+
+DEPENDS = "glib-2.0 gtk+ libgpewidget libglade libsoup"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit gpe autotools


#
# mt diff -r77ccc19a41dcb49d566dc709b5d6a8a4043567b4 -rfa76ecef37e2cdf7add00cf988b60dd14eeff878
#
# 
# 
# delete "packages/openmoko-apps/openmoko-mainmenu_svn.bb"
# 
# delete "packages/openmoko-pim/openmoko-contacts"
# 
# delete "packages/openmoko-pim/openmoko-contacts/index.theme"
# 
# delete "packages/openmoko-pim/openmoko-contacts/intltool-update.in"
# 
# delete "packages/openmoko-pim/openmoko-contacts/stock_contact.png"
# 
# delete "packages/openmoko-pim/openmoko-contacts/stock_person.png"
# 
# delete "packages/openmoko-pim/openmoko-dates"
# 
# delete "packages/openmoko-pim/openmoko-dates/compile-fix.patch"
# 
# delete "packages/openmoko-pim/openmoko-dates/intltool-update.in"
# 
# delete "packages/openmoko-pim/openmoko-dates/om-dates-temp-buildfix_20070308.patch"
# 
# delete "packages/openmoko-pim/openmoko-dates/remove-bogus-include.patch"
# 
# delete "packages/perl/perl-5.8.8/native-makedepend-dash.patch"
# 
# rename "packages/openmoko-base/files"
#     to "packages/openmoko-base/openmoko-session"
# 
# add_dir "packages/gtkhtml/gtkhtml-3.6"
# 
# add_dir "packages/linux/linux-handhelds-2.6/htcapache"
# 
# add_dir "packages/linux/linux-handhelds-2.6/htcsable"
# 
# add_dir "packages/openmoko-apps/openmoko-terminal"
# 
# add_dir "packages/openmoko-base/openmoko-sound-system"
# 
# add_dir "packages/openmoko-pim/files"
# 
# add_file "packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch"
#  content [24ca1839c8f9660e8791e4a91370e3e6f805a70f]
# 
# add_file "packages/libtool/libtool-1.5.10/rpath-control.patch"
#  content [4b31b6687ccede8fff1b635bac99942b42df9243]
# 
# add_file "packages/linux/linux-handhelds-2.6/htcapache/defconfig"
#  content [7addd9dd4ac5d4edc0a0214f42a704e645017508]
# 
# add_file "packages/linux/linux-handhelds-2.6/htcsable/defconfig"
#  content [8859f0978e3ec80e423cf6fa402235335902f60a]
# 
# add_file "packages/obexftp/files/iconv.patch"
#  content [25e8a86e111c7a9bf5dea96abfd1ab46176c8e4c]
# 
# add_file "packages/openmoko-apps/openmoko-calculator_svn.bb"
#  content [337cc4cd117cefda5d1110edcb0ff572ffdda2ca]
# 
# add_file "packages/openmoko-apps/openmoko-terminal/gtkterm2rc"
#  content [cb9f7dc9458766f12f26d77224f3cf15425c5e6c]
# 
# add_file "packages/openmoko-apps/openmoko-terminal/openmoko-terminal.desktop"
#  content [c6a4e2f10cf669b9feb999ea6a2fcda0201d0a1d]
# 
# add_file "packages/openmoko-apps/openmoko-terminal/openmoko-terminal.png"
#  content [e7db9d314755face71a3ad7fd49d186333e1202f]
# 
# add_file "packages/openmoko-apps/openmoko-terminal_svn.bb"
#  content [5b909c837b04c515be7224d5aac6d622a8c27550]
# 
# add_file "packages/openmoko-base/openmoko-sound-system/pulseaudio"
#  content [d433451e55cb5437d6d11869506ebab909fc386b]
# 
# add_file "packages/openmoko-base/openmoko-sound-system/session"
#  content [2d729d476a1b9fa1ab08c40c8f8d00ff7e126359]
# 
# add_file "packages/openmoko-base/openmoko-sound-system_0.1.0.bb"
#  content [b17f4014d9d87df4e995907d56b14ff983834d1d]
# 
# add_file "packages/openmoko-base/openmoko-sound-theme-standard_svn.bb"
#  content [6e57e9b6ea74759e04f0c76d6855305a93ded158]
# 
# add_file "packages/openmoko-pim/files/index.theme"
#  content [86a7df229b6c78109d39db118f65d6d384a89ffc]
# 
# add_file "packages/openmoko-pim/files/intltool-update.in"
#  content [b66bce5c6724910ec058c62cc14d5987adb6ff75]
# 
# add_file "packages/openmoko-pim/files/openmoko-dates.desktop"
#  content [6c99efb02f5b06ed514caa4d21f5730b547fe276]
# 
# add_file "packages/openmoko-pim/files/openmoko-dates.png"
#  content [b55c10b47a4d5d1aa15e5e26584f951ecc39c092]
# 
# add_file "packages/openmoko-pim/files/stock_contact.png"
#  content [1b6ef3d87bd8e2e471c29e26cc36bf881f7a19b8]
# 
# add_file "packages/openmoko-pim/files/stock_person.png"
#  content [2a100b56cdbb251c95db843ad5142a01a40d9be5]
# 
# add_file "packages/openmoko-pim/openmoko-tasks_svn.bb"
#  content [9c4d4168ec79558e95869d4094bbb093beb1bf0e]
# 
# add_file "packages/opie-taskbar/opie-taskbar-images.inc"
#  content [d360a128f6873d3f280eb4f83502e056159dc8df]
# 
# add_file "packages/opie-taskbar/opie-taskbar-images_cvs.bb"
#  content [f3d0e51204ca5fdab33a587c2c7f69acfa799f9e]
# 
# add_file "packages/perl/perl-5.8.8/asm-pageh-fix.patch"
#  content [88de907a5838bef4de53f3c7515dad79964e02c0]
# 
# add_file "packages/perl/perl-5.8.8/makedepend-dash.patch"
#  content [a32ff3bf1b75c57f6ff7ac58b232cc44f2648a27]
# 
# patch "classes/kernel.bbclass"
#  from [ee5ce321b13cfb7f7f7a9981e5fc1c14e4f65e81]
#    to [2e82e59b9e169550dbe74e03b862098d7257369f]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [5f9d6cf541be67c463ff4f89b5de124a851e5dc5]
#    to [492fb6241aa69eb82747c0c5b369480a2ed86c6f]
# 
# patch "conf/distro/include/preferred-opie-versions-1.2.3-pre.inc"
#  from [5045ef2e767e1eb852ad651743f8406528e34237]
#    to [07a52b1c21aa01167bd3a2e275bec12dab2a4797]
# 
# patch "contrib/feed-browser/includes/functions.inc"
#  from [f33374987037202cd21d7f82a93b7da3f0c573a9]
#    to [041208fd72802891209d607c7a4f1777a946ed1d]
# 
# patch "contrib/feed-browser/index.php"
#  from [0b5bfe48e5be2823cc55d1688b30f73ac2c85dcf]
#    to [b7a98a4213e06372bea54a7e27ea29b13d1e615a]
# 
# patch "contrib/feed-browser/update.php"
#  from [0a6696349338576e60018f0f8fbbf645cec91913]
#    to [9b418cf2e8cefddae617ffd8e121293445ea1ee1]
# 
# patch "packages/gaim/pidgin.inc"
#  from [e29a09b918f8e325f24898d1a61c57d3a11e50e7]
#    to [f2b101bebf0f41aa0943a55e76c86c0933428cbc]
# 
# patch "packages/gaim/pidgin_2.0.2.bb"
#  from [f38dd9af51ab37706164482bcece1477daca655a]
#    to [a9a41db903f3d596482445b8db09f363c20c02fd]
# 
# patch "packages/gtkhtml/gtkhtml-3.6_3.6.2.bb"
#  from [8e6b36356e74e2e1e8b0ca6bb493a488f4df5610]
#    to [635c93b9d318b910d01d772af59963371fdab2cd]
# 
# patch "packages/libtool/libtool-cross_1.5.10.bb"
#  from [3b24a14b6df3c0d9f7064a5bab60102a3ebe1b57]
#    to [1d9d18b4a0241cde485f05db92de7f18738d2507]
# 
# patch "packages/libtool/libtool-native_1.5.10.bb"
#  from [bc799a0464069f3531cbb0a017c4d8d2a1afd63e]
#    to [3db44cdc921e61d2528664266cd0eda2cbf4d430]
# 
# patch "packages/obexftp/obexftp_0.20.bb"
#  from [c55f1af56071cfbe2fd0843c1abd7a675d5daae6]
#    to [88ca8420c7a7c5c71bdaefdd48cba8b53cfac57d]
# 
# patch "packages/openmoko-base/openmoko-icon-theme-standard_svn.bb"
#  from [1bb8567e5884cb5cfff6a978969c2bdda39a17b0]
#    to [80697dbfe450a8f2d4047ec78dde405e797d5a57]
# 
# patch "packages/openmoko-base/openmoko-libs_svn.bb"
#  from [dd7eb1f538df699f20256d8f379700b3a72f2cef]
#    to [adf0ca211a78e2352a7a4ba89dc18d49eb8f2ee7]
# 
# patch "packages/openmoko-base/openmoko-session/session"
#  from [63f0b0b66b735a4c931d806d858d877a7b0b0ba0]
#    to [63b586046c1425b8e3e086e9c21de425e61b893c]
# 
# patch "packages/openmoko-base/openmoko-session_svn.bb"
#  from [48ddee5be6a27435d476a746622d29fc73e5c6a9]
#    to [718fa6627900d5dca4f892c41ae12c3e48cc8ff2]
# 
# patch "packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb"
#  from [991954459f09926de2d3e390938d130774c1f2b8]
#    to [260a4ef2e7491dfc23d96d055a0a0e1ed674ee54]
# 
# patch "packages/openmoko-pim/openmoko-dates_svn.bb"
#  from [6d104d0313f76959c66df4b901536055301d1467]
#    to [bfc63108e3dc559f00f3a76883668682fdd583c0]
# 
# patch "packages/openmoko-pim/openmoko-today_svn.bb"
#  from [8868668fe6c32f7f8815bebb4e74929cfed7db2b]
#    to [df476ab7fc344063de78fe6a654104181e61337e]
# 
# patch "packages/opie-icon-reload/opie-icon-reload.inc"
#  from [a5b24579195caa423b671354921f67484f70f4dd]
#    to [3f5d81e3d57ca295eedaf901f2db0dddda8585bf]
# 
# patch "packages/opie-icon-reload/opie-icon-reload_1.2.2.bb"
#  from [a4dc069932cd82ceeda5ee8d13e64bc4171aec22]
#    to [b3c3f0eee0c1e20e63f1f40d650b617e4e8ab934]
# 
# patch "packages/opie-taskbar/opie-taskbar.inc"
#  from [612634b0a0376dfe1e4b563804c51987a32320b0]
#    to [be2742efc78e19b24da24ffd4ac78bff559fed6e]
# 
# patch "packages/opie-taskbar/opie-taskbar_cvs.bb"
#  from [0081cd5790b5ddf838977339678872f2b347b50c]
#    to [6ab03fd59add9cd0437b756d1e8d70378db9023c]
# 
# patch "packages/perl/perl-native_5.8.8.bb"
#  from [2f2d7163b1fd47aa9554cf3e954cd81ea1e73556]
#    to [2cae048240cb214c212fca8f25326366a6306e02]
# 
# patch "packages/perl/perl_5.8.8.bb"
#  from [f198d25a435c2c098c223920580b19b2aca03755]
#    to [c97084e319193690d0222303aa7f475971c1dff9]
# 
# patch "packages/qemu/qemu-native.inc"
#  from [71d3322a1e1cff08495c023c071fdd6a29e15a80]
#    to [740a86de6db274cb5c05df97968b02f1bc33a4cf]
# 
# patch "packages/qt/qt4_arch.inc"
#  from [8912a21d98b8e45e7143daad589738537496a81a]
#    to [43091f9af06d057e17db4730361caf8d5fc177c6]
# 
# patch "packages/tasks/task-openmoko.bb"
#  from [9d1d4ea6b3f7a6edb9b60d090084b5ce649b06b6]
#    to [4c34acfd5d530e57627e163ab546ffbfebf5988d]
# 
# patch "packages/tasks/task-opie.bb"
#  from [104850af17afa7f7a6340e0cbf3ef4e4bb8351ad]
#    to [d9b3a961501d5c121f18763d6efbd94634b0ebb4]
# 
#   set "packages/openmoko-apps/openmoko-terminal/openmoko-terminal.png"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/openmoko-base/openmoko-sound-system/pulseaudio"
#  attr "mtn:execute"
# value "true"
# 
#   set "packages/openmoko-pim/files/openmoko-dates.png"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/openmoko-pim/files/stock_contact.png"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/openmoko-pim/files/stock_person.png"
#  attr "mtn:manual_merge"
# value "true"
# 
============================================================
--- packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch	24ca1839c8f9660e8791e4a91370e3e6f805a70f
+++ packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch	24ca1839c8f9660e8791e4a91370e3e6f805a70f
@@ -0,0 +1,25 @@
+diff --git a/components/html-editor/Makefile.am b/components/html-editor/Makefile.am
+index 7fda5ae..925e409 100644
+--- a/components/html-editor/Makefile.am
++++ b/components/html-editor/Makefile.am
+@@ -5,7 +5,7 @@ gtkhtml_data = $(datadir)/gtkhtml- at GTKHTML_API_VERSION@
+ gladedir = $(gtkhtml_data)
+ glade_DATA = gtkhtml-editor-properties.glade
+ 
+-INCLUDES = -I$(top_srcdir)/src -I$(srcdir) -I$(includedir) $(GTKHTML_CFLAGS) $(SOUP_CFLAGS) \
++INCLUDES = -I$(top_srcdir)/src -I$(srcdir) $(GTKHTML_CFLAGS) $(SOUP_CFLAGS) \
+ 	-DG_LOG_DOMAIN=\"gtkhtml\" \
+ 	-DSRCDIR=\"$(srcdir)\" \
+ 	-DPREFIX=\"$(prefix)\"
+diff --git a/src/Makefile.am b/src/Makefile.am
+index f76178f..2d70183 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -3,7 +3,6 @@ NULL=
+ INCLUDES = 				\
+ 	-I$(top_srcdir)			\
+ 	-I$(srcdir)			\
+-	-I$(includedir)			\
+ 	$(GTKHTML_CFLAGS)		\
+ 	$(SOUP_CFLAGS)			\
+ 	-DG_LOG_DOMAIN=\"gtkhtml\"	\
============================================================
--- packages/libtool/libtool-1.5.10/rpath-control.patch	4b31b6687ccede8fff1b635bac99942b42df9243
+++ packages/libtool/libtool-1.5.10/rpath-control.patch	4b31b6687ccede8fff1b635bac99942b42df9243
@@ -0,0 +1,21 @@
+diff --git a/ltmain.in b/ltmain.in
+--- a/ltmain.in
++++ b/ltmain.in
+@@ -3688,6 +3705,7 @@ EOF
+ 	  rpath="$finalize_rpath"
+ 	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+ 	  for libdir in $rpath; do
++	   if test "$OE_LT_RPATH_ALLOW" = "any" -o "${OE_LT_RPATH_ALLOW/:${libdir}:/}" != "$OE_LT_RPATH_ALLOW" ; then
+ 	    if test -n "$hardcode_libdir_flag_spec"; then
+ 	      if test -n "$hardcode_libdir_separator"; then
+ 		if test -z "$hardcode_libdirs"; then
+@@ -3712,6 +3730,9 @@ EOF
+ 	      *) perm_rpath="$perm_rpath $libdir" ;;
+ 	      esac
+ 	    fi
++	   else
++	    echo "OE: Not hardcoding '$libdir' into rpath"
++	   fi
+ 	  done
+ 	  # Substitute the hardcoded libdirs into the rpath.
+ 	  if test -n "$hardcode_libdir_separator" &&
============================================================
--- packages/linux/linux-handhelds-2.6/htcapache/defconfig	7addd9dd4ac5d4edc0a0214f42a704e645017508
+++ packages/linux/linux-handhelds-2.6/htcapache/defconfig	7addd9dd4ac5d4edc0a0214f42a704e645017508
@@ -0,0 +1,1362 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.21-hh10
+# Fri Jul  6 13:14:59 2007
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
+CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+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_ARCH_MTD_XIP=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=""
+CONFIG_LOCALVERSION_AUTO=y
+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=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+# CONFIG_UID16 is not set
+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=y
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# 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=y
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+CONFIG_BOARD_IRQ_MAP_SMALL=y
+# CONFIG_BOARD_IRQ_MAP_BIG is not set
+
+#
+# Intel PXA2xx Implementations
+#
+# CONFIG_ARCH_LUBBOCK is not set
+# CONFIG_MACH_LOGICPD_PXA270 is not set
+# CONFIG_MACH_MAINSTONE is not set
+# CONFIG_ARCH_PXA_IDP is not set
+# CONFIG_TOSHIBA_TMIO_OHCI is not set
+# CONFIG_ARCH_ESERIES is not set
+# CONFIG_MACH_A620 is not set
+# CONFIG_MACH_A716 is not set
+# CONFIG_MACH_A730 is not set
+# CONFIG_ARCH_H1900 is not set
+# CONFIG_ARCH_H2200 is not set
+# CONFIG_MACH_H3900 is not set
+# CONFIG_MACH_H4000 is not set
+# CONFIG_MACH_H4700 is not set
+# CONFIG_MACH_HX2750 is not set
+# CONFIG_ARCH_H5400 is not set
+# CONFIG_MACH_HIMALAYA is not set
+# CONFIG_MACH_HTCUNIVERSAL is not set
+# CONFIG_MACH_HTCALPINE is not set
+# CONFIG_MACH_MAGICIAN is not set
+CONFIG_MACH_HTCAPACHE=y
+# CONFIG_MACH_BLUEANGEL is not set
+# CONFIG_MACH_HTCBEETLES is not set
+# CONFIG_MACH_HW6900 is not set
+# CONFIG_MACH_HTCATHENA is not set
+# CONFIG_ARCH_AXIMX3 is not set
+# CONFIG_ARCH_AXIMX5 is not set
+# CONFIG_MACH_X50 is not set
+# CONFIG_ARCH_ROVERP1 is not set
+# CONFIG_ARCH_ROVERP5P is not set
+# CONFIG_MACH_XSCALE_PALMLD is not set
+# CONFIG_MACH_T3XSCALE is not set
+# %s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list