[oe-commits] org.oe.dev merge of '2c62d5f53df6ab7b1ada734c156e6c252c1ef900'
ifaistos commit
oe at amethyst.openembedded.net
Mon May 5 10:43:27 UTC 2008
merge of '2c62d5f53df6ab7b1ada734c156e6c252c1ef900'
and '996e4e3c8e89056619f693368ad07d4870016cd6'
Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: 1cf8e387e67d4b38535ab0887e00773c87374433
ViewMTN: http://monotone.openembedded.org/revision/info/1cf8e387e67d4b38535ab0887e00773c87374433
Files:
1
packages/linux/linux-2.6.25/sequoia
packages/linux/linux-2.6.25/sequoia/defconfig
conf/machine/sequoia.conf
packages/linux/linux.inc
packages/linux/linux_2.6.25.bb
packages/gtk+/gtk+-2.10.14/gtklabel-resize-patch
packages/gtk+/gtk+-2.10.14/xsettings.patch
packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch
packages/gtk+/gtk+-2.12.0/xsettings.patch
packages/gtk+/gtk+-2.6.10/gtklabel-resize-patch
packages/gtk+/gtk+-2.6.10/xsettings.patch
packages/gtk+/gtk+-2.8.16/gtklabel-resize-patch
packages/gtk+/gtk+-2.8.16/xsettings.patch
packages/gtk+/gtk+-2.8.9/gtklabel-resize-patch
packages/gtk+/gtk+-2.8.9/xsettings.patch
packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch
packages/gtk+/files/gtklabel-resize-patch
packages/gtk+/gtk+-2.12.3/xsettings.patch
packages/gtk+/files/xsettings.patch
conf/distro/include/angstrom.inc
conf/machine/beagleboard.conf
conf/machine/htckaiser.conf
conf/machine/lsarm.conf
conf/machine/mpc8323e-rdb.conf
conf/machine/mx31ads.conf
conf/machine/mx31moboard.conf
conf/machine/n2100.conf
conf/machine/nokia800.conf
conf/machine/storcenter.conf
conf/machine/turbostation.conf
packages/uim/uim-native_1.3.1.bb
packages/uim/uim.inc
Diffs:
#
# mt diff -r2c62d5f53df6ab7b1ada734c156e6c252c1ef900 -r1cf8e387e67d4b38535ab0887e00773c87374433
#
#
#
# add_dir "packages/linux/linux-2.6.25/sequoia"
#
# add_file "packages/linux/linux-2.6.25/sequoia/defconfig"
# content [ce75f28395b81a44bb99ccbb1bde820c92142ff5]
#
# patch "conf/machine/sequoia.conf"
# from [7daeb88263a3a4261fdb4b2b4c5de54ff5b25c7d]
# to [1fe627040a76a769c0559761d42aac1dcebd54e3]
#
# patch "packages/linux/linux.inc"
# from [f51f2695a26e28a98c85271790ac60e689d971fd]
# to [f1aa05046da57692f765c8cf904367093ee01958]
#
# patch "packages/linux/linux_2.6.25.bb"
# from [7357de969e9609eeedf602d412814cadda96d7cb]
# to [cc090c604f64fcaff28a9afac75840fd99f449fa]
#
============================================================
--- packages/linux/linux-2.6.25/sequoia/defconfig ce75f28395b81a44bb99ccbb1bde820c92142ff5
+++ packages/linux/linux-2.6.25/sequoia/defconfig ce75f28395b81a44bb99ccbb1bde820c92142ff5
@@ -0,0 +1,2158 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.25
+# Mon May 5 11:59:35 2008
+#
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+# CONFIG_6xx is not set
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+CONFIG_44x=y
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+CONFIG_4xx=y
+CONFIG_BOOKE=y
+CONFIG_PTE_64BIT=y
+CONFIG_PHYS_64BIT=y
+# CONFIG_PPC_MM_SLICES is not set
+CONFIG_NOT_COHERENT_CACHE=y
+CONFIG_PPC32=y
+CONFIG_WORD_SIZE=32
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
+CONFIG_IRQ_PER_CPU=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+CONFIG_OF=y
+CONFIG_PPC_UDBG_16550=y
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+# CONFIG_DEFAULT_UIMAGE is not set
+CONFIG_PPC_DCR_NATIVE=y
+# CONFIG_PPC_DCR_MMIO is not set
+CONFIG_PPC_DCR=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_GROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+# CONFIG_HOTPLUG is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_CLASSIC_RCU=y
+# CONFIG_PPC4xx_PCI_EXPRESS is not set
+
+#
+# Platform support
+#
+# CONFIG_PPC_MPC512x is not set
+# CONFIG_PPC_MPC5121 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+# CONFIG_BAMBOO is not set
+# CONFIG_EBONY is not set
+CONFIG_SEQUOIA=y
+# CONFIG_TAISHAN is not set
+# CONFIG_KATMAI is not set
+# CONFIG_RAINIER is not set
+# CONFIG_WARP is not set
+CONFIG_440EPX=y
+# CONFIG_IPIC is not set
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_FSL_ULI1575 is not set
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+# CONFIG_SCHED_HRTICK is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_MATH_EMULATION is not set
+# CONFIG_IOMMU_HELPER is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_HAS_WALK_MEMORY=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+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_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_RESOURCES_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_PROC_DEVICETREE is not set
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE=" debug "
+CONFIG_SECCOMP=y
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_DEBUG is not set
+
+#
+# Advanced setup
+#
+CONFIG_ADVANCED_OPTIONS=y
+CONFIG_HIGHMEM_START=0xfe000000
+# CONFIG_LOWMEM_SIZE_BOOL is not set
+CONFIG_LOWMEM_SIZE=0x30000000
+# CONFIG_KERNEL_START_BOOL is not set
+CONFIG_KERNEL_START=0xc0000000
+# CONFIG_TASK_SIZE_BOOL is not set
+CONFIG_TASK_SIZE=0xc0000000
+# CONFIG_CONSISTENT_START_BOOL is not set
+CONFIG_CONSISTENT_START=0xff100000
+# CONFIG_CONSISTENT_SIZE_BOOL is not set
+CONFIG_CONSISTENT_SIZE=0x00200000
+# CONFIG_BOOT_LOAD_BOOL is not set
+CONFIG_BOOT_LOAD=0x01000000
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_NET_KEY is not set
+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=y
+# CONFIG_IP_ROUTE_VERBOSE is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+# CONFIG_NET_IPGRE_BROADCAST is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=m
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+# CONFIG_DEFAULT_BIC is not set
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_HTCP is not set
+# CONFIG_DEFAULT_VEGAS is not set
+# CONFIG_DEFAULT_WESTWOOD is not set
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IP_VS=m
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+# CONFIG_IP_VS_PROTO_TCP is not set
+# CONFIG_IP_VS_PROTO_UDP is not set
+# CONFIG_IP_VS_PROTO_ESP is not set
+# CONFIG_IP_VS_PROTO_AH is not set
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS application helper
+#
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+# CONFIG_NF_CONNTRACK is not set
+# CONFIG_NETFILTER_XTABLES is not set
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_IP_NF_QUEUE is not set
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+
+#
+# DECnet: Netfilter Configuration
+#
+# CONFIG_DECNET_NF_GRABULATOR is not set
+
+#
+# Bridge: Netfilter Configuration
+#
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+CONFIG_DECNET=m
+# CONFIG_DECNET_ROUTER is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+# CONFIG_IPDDP is not set
+CONFIG_X25=m
+CONFIG_LAPB=m
+CONFIG_ECONET=m
+# CONFIG_ECONET_AUNUDP is not set
+# CONFIG_ECONET_NATIVE is not set
+CONFIG_WAN_ROUTER=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_RR=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_INGRESS=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CLS_U32_MARK is not set
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+# CONFIG_GACT_PROB is not set
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_CLS_IND=y
+CONFIG_NET_SCH_FIFO=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+# CONFIG_CAN_DEBUG_DEVICES is not set
+# CONFIG_IRDA is not set
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+# CONFIG_BT_BNEP_MC_FILTER is not set
+# CONFIG_BT_BNEP_PROTO_FILTER is not set
+# CONFIG_BT_CMTP is not set
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUSB=m
+CONFIG_BT_HCIUSB_SCO=y
+# CONFIG_BT_HCIBTSDIO is not set
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIVHCI=m
+# CONFIG_AF_RXRPC is not set
+CONFIG_FIB_RULES=y
+
+#
+# Wireless
+#
+CONFIG_CFG80211=m
+CONFIG_NL80211=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_MAC80211=m
+
+#
+# Rate control algorithm selection
+#
+CONFIG_MAC80211_RC_DEFAULT_PID=y
+# CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set
+# CONFIG_MAC80211_RC_DEFAULT_NONE is not set
+
+#
+# Selecting 'y' for an algorithm will
+#
+
+#
+# build the algorithm into mac80211.
+#
+CONFIG_MAC80211_RC_DEFAULT="pid"
+CONFIG_MAC80211_RC_PID=y
+# CONFIG_MAC80211_RC_SIMPLE is not set
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
+# CONFIG_MAC80211_DEBUG is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
+CONFIG_RFKILL=m
+# CONFIG_RFKILL_INPUT is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+# CONFIG_STANDALONE is not set
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_OF_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_START=0x8000000
+CONFIG_MTD_PHYSMAP_LEN=0x0
+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
+# CONFIG_MTD_PHYSMAP_OF is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS i%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r996e4e3c8e89056619f693368ad07d4870016cd6 -r1cf8e387e67d4b38535ab0887e00773c87374433
#
#
#
# delete "packages/gtk+/gtk+-2.10.14/gtklabel-resize-patch"
#
# delete "packages/gtk+/gtk+-2.10.14/xsettings.patch"
#
# delete "packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch"
#
# delete "packages/gtk+/gtk+-2.12.0/xsettings.patch"
#
# delete "packages/gtk+/gtk+-2.6.10/gtklabel-resize-patch"
#
# delete "packages/gtk+/gtk+-2.6.10/xsettings.patch"
#
# delete "packages/gtk+/gtk+-2.8.16/gtklabel-resize-patch"
#
# delete "packages/gtk+/gtk+-2.8.16/xsettings.patch"
#
# delete "packages/gtk+/gtk+-2.8.9/gtklabel-resize-patch"
#
# delete "packages/gtk+/gtk+-2.8.9/xsettings.patch"
#
# rename "packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch"
# to "packages/gtk+/files/gtklabel-resize-patch"
#
# rename "packages/gtk+/gtk+-2.12.3/xsettings.patch"
# to "packages/gtk+/files/xsettings.patch"
#
# patch "conf/distro/include/angstrom.inc"
# from [ae413c4fcb5e789d84028cb2149ae50b4177be84]
# to [07055167d1e686bc6894c9e490f73d1ff54f7c89]
#
# patch "conf/machine/beagleboard.conf"
# from [0aca1472398cfb3f3a6fc65d9d84b22667811ff5]
# to [147a7e06fda58ac16bc45831f200a7e2447ac8ac]
#
# patch "conf/machine/htckaiser.conf"
# from [8ecec3cc2692888e23f7f4ac09f4cb55c7234e4b]
# to [daed3c3a075ede90bec1e6302f724e7805689cfb]
#
# patch "conf/machine/lsarm.conf"
# from [d394193bdeced3417b65be1f2d80b14c4896f695]
# to [4c5c9bea04a16c9c14f46202786f950e366a12d0]
#
# patch "conf/machine/mpc8323e-rdb.conf"
# from [95d39d551aee527b03446910655fcd130ec9b845]
# to [be2f9d14e14a1432cc22b15fc0e1e91c48b8bbca]
#
# patch "conf/machine/mx31ads.conf"
# from [16e5038eddf144f583858f15d4f50581465c8f2e]
# to [08ae32d35d76a42010a78f9ffd685e5a2b4ca00e]
#
# patch "conf/machine/mx31moboard.conf"
# from [4fbbc4efbfa3c6a7e53d028698e453da918a952c]
# to [5db03404a1c6f98021c65d4e217b9fe96bfd97a8]
#
# patch "conf/machine/n2100.conf"
# from [2878d1aee27d82598beb6a7f5d57edbe7a0309e1]
# to [22e23ffbf75a54193ba720ae9ad289aa963dea68]
#
# patch "conf/machine/nokia800.conf"
# from [b067467a5bc022fe4141b381f0900eac3a8c5239]
# to [5dfcd6bfc2942d1bf9edddb033192891485cc2b9]
#
# patch "conf/machine/storcenter.conf"
# from [d6d0332b212ef555e874615f6b130151a4913bfc]
# to [23d4e24772062937d437c89b719be89463334a9f]
#
# patch "conf/machine/turbostation.conf"
# from [3ec43c366955c759467dbfda39e7c16d4b62fcd9]
# to [d9e07573a5eef493c1d4f53ef764cd45e62f2c98]
#
# patch "packages/uim/uim-native_1.3.1.bb"
# from [f06e89091a998191e8abec41fb27c08aad836c59]
# to [8fb7a3d85f37d5eac8bf30aff5d2e1f6cf51c9fd]
#
# patch "packages/uim/uim.inc"
# from [14e1f43be243a5721dd3aaa3f1be157b79c1042e]
# to [a5fbe9af22c1b0a4a0f3a6b77e0f37451cd7d3c2]
#
============================================================
--- conf/distro/include/angstrom.inc ae413c4fcb5e789d84028cb2149ae50b4177be84
+++ conf/distro/include/angstrom.inc 07055167d1e686bc6894c9e490f73d1ff54f7c89
@@ -76,8 +76,11 @@ TARGET_FPU_ixp4xx ?= "soft"
TARGET_FPU_arm ?= "soft"
TARGET_FPU_armeb ?= "soft"
TARGET_FPU_ixp4xx ?= "soft"
+TARGET_FPU_ppc405 ?= "soft"
-TARGET_FPU_dht-walnut ?= "soft"
+TARGET_FPU_armv6 ?= "hard"
+TARGET_FPU_armv7a ?= "hard"
+TARGET_FPU_ppc603e ?= "hard"
#Set the right arch for the feeds
#Alphabetically sorted
============================================================
--- conf/machine/beagleboard.conf 0aca1472398cfb3f3a6fc65d9d84b22667811ff5
+++ conf/machine/beagleboard.conf 147a7e06fda58ac16bc45831f200a7e2447ac8ac
@@ -13,7 +13,6 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-mod
#Ship all kernel modules till the board support has matured enough
MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-TARGET_FPU = "hard"
include conf/machine/include/tune-arm1136jf-s.inc
# requires gcc 4.3.0:
#include conf/machine/include/tune-cortexa8.inc
============================================================
--- conf/machine/htckaiser.conf 8ecec3cc2692888e23f7f4ac09f4cb55c7234e4b
+++ conf/machine/htckaiser.conf daed3c3a075ede90bec1e6302f724e7805689cfb
@@ -11,7 +11,6 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
MACHINE_DISPLAY_WIDTH_PIXELS = "240"
MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-TARGET_FPU = "soft"
TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s"
FEED_ARCH = "armv6"
PACKAGE_ARCH = "armv6"
============================================================
--- conf/machine/lsarm.conf d394193bdeced3417b65be1f2d80b14c4896f695
+++ conf/machine/lsarm.conf 4c5c9bea04a16c9c14f46202786f950e366a12d0
@@ -8,7 +8,6 @@ MACHINE_FEATURES = "kernel26 usbhost ext
MACHINE_EXTRA_RDEPENDS = "miconapl micro-evtd"
MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot"
-TARGET_FPU = "soft"
PREFERRED_PROVIDER_virtual/bootloader = ""
============================================================
--- conf/machine/mpc8323e-rdb.conf 95d39d551aee527b03446910655fcd130ec9b845
+++ conf/machine/mpc8323e-rdb.conf be2f9d14e14a1432cc22b15fc0e1e91c48b8bbca
@@ -3,7 +3,6 @@ TARGET_ARCH = "powerpc"
#@DESCRIPTION: Machine configuration for the Freescale MPC8323E-RDB
TARGET_ARCH = "powerpc"
-TARGET_FPU ?= "soft"
PACKAGE_EXTRA_ARCHS = "ppce300c2"
PREFERRED_PROVIDER_virtual/kernel ?= "linux"
============================================================
--- conf/machine/mx31ads.conf 16e5038eddf144f583858f15d4f50581465c8f2e
+++ conf/machine/mx31ads.conf 08ae32d35d76a42010a78f9ffd685e5a2b4ca00e
@@ -3,7 +3,6 @@ TARGET_ARCH = "arm"
#@DESCRIPTION: Machine configuration for Freescale MX31ADS
TARGET_ARCH = "arm"
-TARGET_FPU_arm = "hard"
MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget"
============================================================
--- conf/machine/mx31moboard.conf 4fbbc4efbfa3c6a7e53d028698e453da918a952c
+++ conf/machine/mx31moboard.conf 5db03404a1c6f98021c65d4e217b9fe96bfd97a8
@@ -4,7 +4,6 @@ TARGET_ARCH = "arm"
#@Website: http://mobots.epfl.ch/mx31MoBoard.html
TARGET_ARCH = "arm"
-TARGET_FPU_arm = "hard"
MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget"
============================================================
--- conf/machine/n2100.conf 2878d1aee27d82598beb6a7f5d57edbe7a0309e1
+++ conf/machine/n2100.conf 22e23ffbf75a54193ba720ae9ad289aa963dea68
@@ -1,6 +1,5 @@ TARGET_OS = "linux"
TARGET_ARCH = "arm"
TARGET_OS = "linux"
-TARGET_FPU = "soft"
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
INHERIT += "n2100-image"
============================================================
--- conf/machine/nokia800.conf b067467a5bc022fe4141b381f0900eac3a8c5239
+++ conf/machine/nokia800.conf 5dfcd6bfc2942d1bf9edddb033192891485cc2b9
@@ -11,7 +11,6 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
MACHINE_DISPLAY_WIDTH_PIXELS = "800"
MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
-TARGET_FPU = "hard"
include conf/machine/include/tune-arm1136jf-s.inc
ROOT_FLASH_SIZE = "174"
============================================================
--- conf/machine/storcenter.conf d6d0332b212ef555e874615f6b130151a4913bfc
+++ conf/machine/storcenter.conf 23d4e24772062937d437c89b719be89463334a9f
@@ -1,5 +1,4 @@ TARGET_ARCH = "powerpc"
TARGET_ARCH = "powerpc"
-TARGET_FPU = "hard"
PACKAGE_EXTRA_ARCHS = "ppc603e"
# terminal specs - console, but no other ports
============================================================
--- conf/machine/turbostation.conf 3ec43c366955c759467dbfda39e7c16d4b62fcd9
+++ conf/machine/turbostation.conf d9e07573a5eef493c1d4f53ef764cd45e62f2c98
@@ -1,6 +1,5 @@ TARGET_OS = "linux"
TARGET_ARCH = "powerpc"
TARGET_OS = "linux"
-TARGET_FPU = "hard"
PACKAGE_EXTRA_ARCHS = "ppc603e"
INHERIT += "turbostation-image"
============================================================
--- packages/uim/uim-native_1.3.1.bb f06e89091a998191e8abec41fb27c08aad836c59
+++ packages/uim/uim-native_1.3.1.bb 8fb7a3d85f37d5eac8bf30aff5d2e1f6cf51c9fd
@@ -1,6 +1,8 @@ inherit native autotools pkgconfig
require uim.inc
DEPENDS = "gtk+ anthy intltool-native"
inherit native autotools pkgconfig
-PR = "r1"
+PR = "r2"
S = "${WORKDIR}/uim-${PV}"
+
+EXTRA_OECONF += "--disable-xim"
============================================================
--- packages/uim/uim.inc 14e1f43be243a5721dd3aaa3f1be157b79c1042e
+++ packages/uim/uim.inc a5fbe9af22c1b0a4a0f3a6b77e0f37451cd7d3c2
@@ -15,4 +15,5 @@ SRC_URI = "http://uim.freedesktop.org/re
SRC_URI = "http://uim.freedesktop.org/releases/uim/stable/uim-${PV}.tar.bz2"
+FILES_${PN}-dbg += "${libdir}/*/*/*/.debug ${libdir}/*/*/.debug"
+FILES_${PN}-dev += "${libdir}/uim/plugin/*.la"
-FILES_${PN}-dbg += "${libdir}/*/*/immodules/.debug ${libdir}/uim/plugin"
More information about the Openembedded-commits
mailing list