[oe-commits] org.oe.dev merge of '14e97fe0b2064e524213634d9ffbc49971355012'

ifaistos commit oe at amethyst.openembedded.net
Mon May 5 10:43:21 UTC 2008


merge of '14e97fe0b2064e524213634d9ffbc49971355012'
     and '6a17da034d40be82432b199217a8b5154f13f48a'

Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: 996e4e3c8e89056619f693368ad07d4870016cd6
ViewMTN: http://monotone.openembedded.org/revision/info/996e4e3c8e89056619f693368ad07d4870016cd6
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/xapian/xapian-quickstartindex_1.0.bb
packages/xapian/xapian-quickstart.inc
packages/geany
packages/libgcrypt/libgcrypt-1.4.1
conf/distro/jlime-henchman.conf
conf/distro/jlime-mongo.conf
conf/machine/mp900c.conf
packages/geany/geany_0.14.bb
packages/gnome/epiphany_2.22.1.bb
packages/gnome/libsoup_2.4.1.bb
packages/keymaps/files/jornada6xx/keymap-620lx-660lx.map
packages/keymaps/files/jornada6xx/keymap-br.map
packages/libgcrypt/libgcrypt-1.4.1/add-pkgconfig-support.patch
packages/libgcrypt/libgcrypt_1.4.1.bb
packages/linux/linux-2.6.24/ts72xx/ts72xx-rs485.patch
packages/linux/linux-omap2-git/beagleboard/l2-cache.patch
packages/xapian/xapian-core-native_1.0.5.bb
packages/xapian/xapian-quickstartindex-native_1.0.bb
packages/xapian/xapian-quickstartsearch_1.0.bb
classes/seppuku.bbclass
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom-2007-for-openmoko.inc
conf/distro/include/angstrom-2008-preferred-versions.inc
conf/distro/include/angstrom-eglibc.inc
conf/distro/include/angstrom-glibc.inc
conf/distro/include/angstrom-uclibc.inc
conf/distro/include/angstrom.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/jlime-donkey.conf
conf/documentation.conf
contrib/mtn2cl/mtn2cl.sh
packages/alsa/alsa-utils_1.0.13.bb
packages/bitchx/bitchx_1.1.bb
packages/gnome/libsoup_2.2.100.bb
packages/images/sdr-image.bb
packages/keymaps/files/jornada6xx/keymap-de.map
packages/keymaps/files/jornada6xx/keymap-sp.map
packages/keymaps/files/jornada6xx/keymap-uk.map
packages/libgcrypt/libgcrypt.inc
packages/linux/linux-omap2_git.bb
packages/mozilla/minimo/bug-322806.diff
packages/perl/files/perl-5.8.8-gcc-4.2.patch
packages/perl/perl-5.8.8/native-ssp.patch
packages/xserver-common/files/kdrive-1.4-fixes.patch
packages/xserver-common/xserver-common_1.22.bb
packages/zaurusd/files/alsa-cxx00-default.state.patch
Diffs:

#
# mt diff -r14e97fe0b2064e524213634d9ffbc49971355012 -r996e4e3c8e89056619f693368ad07d4870016cd6
#
#
#
# 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 -r6a17da034d40be82432b199217a8b5154f13f48a -r996e4e3c8e89056619f693368ad07d4870016cd6
#
#
#
# rename "packages/xapian/xapian-quickstartindex_1.0.bb"
#     to "packages/xapian/xapian-quickstart.inc"
# 
# add_dir "packages/geany"
# 
# add_dir "packages/libgcrypt/libgcrypt-1.4.1"
# 
# add_file "conf/distro/jlime-henchman.conf"
#  content [c5c0029ec6fcea5daaf00874e1a20e1d514d7586]
# 
# add_file "conf/distro/jlime-mongo.conf"
#  content [649596799adddbe974beb9a95120de0c9db17b28]
# 
# add_file "conf/machine/mp900c.conf"
#  content [41f2c85c9af298c3c7eca1d376f152b85701d980]
# 
# add_file "packages/geany/geany_0.14.bb"
#  content [e9b4cac4e48f2bb791e6ae247a3a3c18a516e6e5]
# 
# add_file "packages/gnome/epiphany_2.22.1.bb"
#  content [e11dacf27365b72ec178166a6d92a04de4366667]
# 
# add_file "packages/gnome/libsoup_2.4.1.bb"
#  content [e6b86e13ebc986c00649745b8980213d3a4641d2]
# 
# add_file "packages/keymaps/files/jornada6xx/keymap-620lx-660lx.map"
#  content [4720cd8bc99db2c6c1712dc6eb290f18578e9b23]
# 
# add_file "packages/keymaps/files/jornada6xx/keymap-br.map"
#  content [da4660529884767c7991680011b59cc00a2b8a25]
# 
# add_file "packages/libgcrypt/libgcrypt-1.4.1/add-pkgconfig-support.patch"
#  content [b1721a7c1917fbbedd8c8384cba1b945ca321d73]
# 
# add_file "packages/libgcrypt/libgcrypt_1.4.1.bb"
#  content [739f80799762bff94c485c0068d6d67bc1e823c3]
# 
# add_file "packages/linux/linux-2.6.24/ts72xx/ts72xx-rs485.patch"
#  content [bf8b5960a3374edaa12ff48191b73f12ed963a98]
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/l2-cache.patch"
#  content [d6003f16c293392c2b1bb62d8e05ec0d2c77ac3d]
# 
# add_file "packages/xapian/xapian-core-native_1.0.5.bb"
#  content [f53f0f3d23a4986dd1f3b808b4b7a7a4acea202c]
# 
# add_file "packages/xapian/xapian-quickstartindex-native_1.0.bb"
#  content [d07b07ae26ee893e4a8fbc8401c86a23920792a3]
# 
# add_file "packages/xapian/xapian-quickstartindex_1.0.bb"
#  content [503ae28911dc24fe53a2bcf189638f089205b4c9]
# 
# add_file "packages/xapian/xapian-quickstartsearch_1.0.bb"
#  content [c1a70c8535df3383bcc91c64ecfbe94ef458d3fd]
# 
# patch "classes/seppuku.bbclass"
#  from [dea90de0839b4319cddfd278ce07f7f46f244309]
#    to [97be1cf15677f7c326c40bcc51d7b2a31f25260f]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [dd2138b465f663603f99ce6be674dfd46af8c33f]
#    to [580a8e8bdd2e455c1aa7545e2c8d9d1f7c19f983]
# 
# patch "conf/distro/include/angstrom-2007-for-openmoko.inc"
#  from [a717aa544a7276462523eba422c16b077bee6039]
#    to [4e926bdf5178cce4d068eeb210aba5adf7982351]
# 
# patch "conf/distro/include/angstrom-2008-preferred-versions.inc"
#  from [d3e88061dc045abd484e366a596f3accf7445889]
#    to [14c6b4a552e2c80acee490345dee361941a819ac]
# 
# patch "conf/distro/include/angstrom-eglibc.inc"
#  from [9ef21815795e68510a165699686baf65d3897a7d]
#    to [aac527cd139a2782eecccc8d1215ea89ca5b27b2]
# 
# patch "conf/distro/include/angstrom-glibc.inc"
#  from [a902b60d693bd9d292860e99c2423a71397b7318]
#    to [586f7087f5d3251e88bcbb32dc31647dc11d7375]
# 
# patch "conf/distro/include/angstrom-uclibc.inc"
#  from [ed3615a8cce5b329c1b4354ca91a98190a64f862]
#    to [ca2fe974b58e8678de2abda68a7ace8c061523a2]
# 
# patch "conf/distro/include/angstrom.inc"
#  from [9ab5c13a8aa37b473022beb3a0bade56230f0d49]
#    to [ae413c4fcb5e789d84028cb2149ae50b4177be84]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [aa5b5d5f2b35e5caadd9d80cc912891617afe639]
#    to [76eb7bae7361467379802b9566a246c1bcf3364c]
# 
# patch "conf/distro/jlime-donkey.conf"
#  from [c7cba5e1fa79492679592aa01e6b8b42497afa0e]
#    to [50f90b05f62918f1b8efc4d5f311a7d80b424ad9]
# 
# patch "conf/documentation.conf"
#  from [d10c13b6402c7c828d664a5fda04d2ad3050a4cc]
#    to [c064b8c62fcb33d8148c3ff70821e40c67c0f466]
# 
# patch "contrib/mtn2cl/mtn2cl.sh"
#  from [ea613a6b9c807fd6939677392252634926996ebf]
#    to [ebc3d87f6ffe8fb41bd9aa23e3607970ea70d638]
# 
# patch "packages/alsa/alsa-utils_1.0.13.bb"
#  from [32b3714001d9cf34c7dc17a9d8ba3515c860bf01]
#    to [7919ed3471d1cc0a49060b126ee5f680d82054ff]
# 
# patch "packages/bitchx/bitchx_1.1.bb"
#  from [d623ab0eb969be94749279c54efa84a610246738]
#    to [71d9b09d5f8bec54554dd6add5d25bd1394c1f64]
# 
# patch "packages/gnome/libsoup_2.2.100.bb"
#  from [22afb236c2cc359570b54864b80ade06bd669f76]
#    to [491aa1955094e7376b536438f3637e57ec00d02c]
# 
# patch "packages/images/sdr-image.bb"
#  from [241b2b3b56e218b3bf887378f5eab66ef049a4b9]
#    to [b98be7ed4825c6edd9d9db45907e271785280358]
# 
# patch "packages/keymaps/files/jornada6xx/keymap-de.map"
#  from [a75d85ffe763e7d3a07b2b5946455708ab9180dd]
#    to [25237075aa4520b254b6affbe7d05e40841011aa]
# 
# patch "packages/keymaps/files/jornada6xx/keymap-sp.map"
#  from [94a7710e5ef0c6474055b0bbaa005eeddae2ede6]
#    to [43a93ccc335be732033bddc1d2fdfd0bdcd8a308]
# 
# patch "packages/keymaps/files/jornada6xx/keymap-uk.map"
#  from [d1c2822f29a65bdd5faddb78981fbb4c573f92f4]
#    to [fc943c31f0479283b40467b68da13630062b5b61]
# 
# patch "packages/libgcrypt/libgcrypt.inc"
#  from [8e21adfdd89aea4f3065efcdd7086b8a9e5e455e]
#    to [f4dfeb6d39585d87730512fe8f03a115a442e9be]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [d2df9d873b73d322c1d6a7918ef9c8786b091e48]
#    to [99e634f6d619f025715a2fded7d772dd67561890]
# 
# patch "packages/mozilla/minimo/bug-322806.diff"
#  from [291835329006b330a7e9cdf2e962f8afd23df8cf]
#    to [b41d98a79d017d16d7d231133c59fe8a8731ccd2]
# 
# patch "packages/perl/files/perl-5.8.8-gcc-4.2.patch"
#  from [e5a683173b0d9469b46af6e117df37bc0de7fe76]
#    to [96946b7ca1f4ee5d891973144a7e9b6dfa5a826c]
# 
# patch "packages/perl/perl-5.8.8/native-ssp.patch"
#  from [4c615884d98871a7a8c0e32556ada8193f43bce5]
#    to [93cec2ab28a84c163fd888bdb0608984866c7cdf]
# 
# patch "packages/xapian/xapian-quickstart.inc"
#  from [1c7028dd7343e73e3fcc0fe3750699b578adb9d9]
#    to [3ada22f1aec5b46950e441445b902e7e7fc06a12]
# 
# patch "packages/xserver-common/files/kdrive-1.4-fixes.patch"
#  from [8f5baf832334e48f1611b7ad8a89d1dc103d81b5]
#    to [7f355080ef17fdb1125f0be003cd4ca2ecbc6b1e]
# 
# patch "packages/xserver-common/xserver-common_1.22.bb"
#  from [9291843b220f9d344ce56e4f5ac171696e38b2ad]
#    to [8752f199e55d1213507046c386dc15d5f4cf3a0c]
# 
# patch "packages/zaurusd/files/alsa-cxx00-default.state.patch"
#  from [5134186c26707a1d7ee7b2e4904d429218a8a96a]
#    to [ed3369363c47b75facdc7c10c263f810e46cf969]
#
============================================================
--- conf/distro/jlime-henchman.conf	c5c0029ec6fcea5daaf00874e1a20e1d514d7586
+++ conf/distro/jlime-henchman.conf	c5c0029ec6fcea5daaf00874e1a20e1d514d7586
@@ -0,0 +1,106 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Jlime Henchman <jlime.com>
+#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the
+#              NEC Mobile Pro 900/900c handheld pc.
+#@MAINTAINER: Matt Oudenhoven <wicked5850 at yahoo.com>
+#-----------------------------------------------------------------------------
+
+#
+# Header
+#
+DISTRO_NAME = "Jlime"
+DISTRO_VERSION = "Henchman"
+#DISTRO_TYPE = "release"
+#DISTRO_TYPE = "debug"
+
+#export FEED_URLS_jlime = "henchman##http://henchman.jlime.com/feed"
+
+#<>------------------------------------------------------------------>
+#<>What we want on the bootstrap image (extra) 
+#<>                                            
+#<>------------------------------------------------------------------<
+DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
+			console-tools tslib-tests parted dialog"
+
+#<>------------------------------------------------------------------>
+#<>Our Image files should look abit better.
+#<>
+#<>------------------------------------------------------------------<
+IMAGE_NAME = "${IMAGE_BASENAME}-Henchman-${MACHINE}"
+
+#
+# Naming schemes
+#
+INHERIT += "debian multimachine"
+
+#
+# Packaging and output format
+#
+INHERIT += "package_ipk"
+IMAGE_FSTYPES = "tar.bz2"
+
+#
+# Kernel
+#
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+#
+# Binutils & Compiler
+#
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+PREFERRED_VERSION_gcc = "4.2.2"
+PREFERRED_VERSION_gcc-cross = "4.2.2"
+PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
+PREFERRED_VERSION_binutils = "2.18"
+PREFERRED_VERSION_binutils-cross = "2.18"
+
+#
+# Target OS & FPU system
+# 
+TARGET_OS = "linux"
+TARGET_FPU_arm = "fixed"
+TARGET_FPU_armeb = "fixed"
+
+PREFERRED_PROVIDER_virtual/libiconv = "glibc"
+PREFERRED_PROVIDER_virtual/libintl = "glibc"
+PREFERRED_PROVIDER_virtual/libc = "glibc"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_VERSION_linux-libc-headers = "2.6.23"
+PREFERRED_VERSION_glibc = "2.5"
+PREFERRED_VERSION_glibc-intermediate = "2.5"
+
+#
+# Bootstrap & Init
+#
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+
+#
+# Framebuffer & X
+#
+PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
+PREFERRED_PROVIDER_tslib = "tslib"
+PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+
+#
+# GPE
+#
+require conf/distro/include/preferred-gpe-versions-2.8.inc
+
+#
+# Opie
+#
+QTE_VERSION = "2.3.10"
+PALMTOP_USE_MULTITHREADED_QTE = "yes"
+OPIE_VERSION = "1.2.3"
+require conf/distro/include/preferred-opie-versions.inc
============================================================
--- conf/distro/jlime-mongo.conf	649596799adddbe974beb9a95120de0c9db17b28
+++ conf/distro/jlime-mongo.conf	649596799adddbe974beb9a95120de0c9db17b28
@@ -0,0 +1,107 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Jlime Mongo <jlime.com>
+#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the
+#              HP Jornada 720/728 handheld pc.
+#@MAINTAINER: Matt Oudenhoven <wicked5850 at yahoo.com>
+#-----------------------------------------------------------------------------
+
+#
+# Header
+#
+DISTRO_NAME = "Jlime"
+DISTRO_VERSION = "Mongo"
+#DISTRO_TYPE = "release"
+#DISTRO_TYPE = "debug"
+
+export FEED_URLS_jlime = "http://mongo.jlime.com/feed"
+
+#<>------------------------------------------------------------------>
+#<>What we want on the bootstrap image (extra) 
+#<>                                            
+#<>------------------------------------------------------------------<
+DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
+			console-tools tslib-tests parted dialog"
+
+#<>------------------------------------------------------------------>
+#<>Our Image files should look abit better.
+#<>
+#<>------------------------------------------------------------------<
+IMAGE_NAME = "${IMAGE_BASENAME}-Mongo-${MACHINE}"
+
+#
+# Naming schemes
+#
+INHERIT += "debian multimachine"
+
+#
+# Packaging and output format
+#
+INHERIT += "package_ipk"
+#INHERIT += "package_tar"
+IMAGE_FSTYPES = "tar.bz2"
+
+#
+# Kernel
+#
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+#
+# Binutils & Compiler
+#
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+PREFERRED_VERSION_gcc = "4.2.2"
+PREFERRED_VERSION_gcc-cross = "4.2.2"
+PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
+PREFERRED_VERSION_binutils = "2.18"
+PREFERRED_VERSION_binutils-cross = "2.18"
+
+#
+# Target OS & FPU system
+# 
+TARGET_OS = "linux"
+TARGET_FPU_arm = "soft"
+TARGET_FPU_armeb = "soft"
+
+PREFERRED_PROVIDER_virtual/libiconv = "glibc"
+PREFERRED_PROVIDER_virtual/libintl = "glibc"
+PREFERRED_PROVIDER_virtual/libc = "glibc"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_VERSION_linux-libc-headers = "2.6.18"
+PREFERRED_VERSION_glibc = "2.5"
+PREFERRED_VERSION_glibc-intermediate = "2.5"
+
+#
+# Bootstrap & Init
+#
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+
+#
+# Framebuffer & X
+#
+PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
+PREFERRED_PROVIDER_tslib = "tslib"
+PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+
+#
+# GPE
+#
+require conf/distro/include/preferred-gpe-versions-2.8.inc
+
+#
+# Opie
+#
+QTE_VERSION = "2.3.10"
+PALMTOP_USE_MULTITHREADED_QTE = "yes"
+OPIE_VERSION = "1.2.3"
+require conf/distro/include/preferred-opie-versions.inc
============================================================
--- conf/machine/mp900c.conf	41f2c85c9af298c3c7eca1d376f152b85701d980
+++ conf/machine/mp900c.conf	41f2c85c9af298c3c7eca1d376f152b85701d980
@@ -0,0 +1,13 @@
+#@TYPE: Machine
+#@NAME: NEC Mobile Pro 900/900c 
+#@DESCRIPTION: Machine configuration for the PXA255 based Mobile Pro 9xx palmtop computer
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
+
+require conf/machine/include/tune-xscale.inc
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-mobilepro900"
+PCMCIA_MANAGER = "pcmciautils"
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen screen"
+MACHINE_EXTRA_RDEPENDS = "kernel-modules"
============================================================
--- packages/geany/geany_0.14.bb	e9b4cac4e48f2bb791e6ae247a3a3c18a516e6e5
+++ packages/geany/geany_0.14.bb	e9b4cac4e48f2bb791e6ae247a3a3c18a516e6e5
@@ -0,0 +1,13 @@
+DESCRIPTION = "Text editor with some IDE functionality"
+HOMEPAGE = "http://geany.sf.net"
+SECTION = "editors"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/geany/${P}.tar.bz2"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-plugins --disable-vte"
============================================================
--- packages/gnome/epiphany_2.22.1.bb	e11dacf27365b72ec178166a6d92a04de4366667
+++ packages/gnome/epiphany_2.22.1.bb	e11dacf27365b72ec178166a6d92a04de4366667
@@ -0,0 +1,17 @@
+DESCRIPTION = "GNOME default webbrowser"
+DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
+RDEPENDS = "gnome-vfs-plugin-http"
+
+inherit gnome
+
+
+EXTRA_OECONF = "--with-engine=webkit --with-distributor-name=${DISTRO}"
+
+do_configure_prepend() {
+        touch ${S}/gnome-doc-utils.make
+        sed -i -e s:help::g Makefile.am
+}
+
+FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1"
+
+
============================================================
--- packages/gnome/libsoup_2.4.1.bb	e6b86e13ebc986c00649745b8980213d3a4641d2
+++ packages/gnome/libsoup_2.4.1.bb	e6b86e13ebc986c00649745b8980213d3a4641d2
@@ -0,0 +1,19 @@
+DEFAULT_PREFERENCE = "-1"
+
+DESCRIPTION = "An HTTP library implementation in C"
+SECTION = "x11/gnome/libs"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 gnutls libxml2"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.4/${PN}-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+do_stage() {
+        autotools_stage_all
+        cp ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.4.pc
+}
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev = "${includedir}/ ${libdir}/"
+FILES_${PN}-doc = "${datadir}/"
============================================================
--- packages/keymaps/files/jornada6xx/keymap-620lx-660lx.map	4720cd8bc99db2c6c1712dc6eb290f18578e9b23
+++ packages/keymaps/files/jornada6xx/keymap-620lx-660lx.map	4720cd8bc99db2c6c1712dc6eb290f18578e9b23
@@ -0,0 +1,239 @@
+# English keymap for Jornada 620/660 devices.
+# for the jornada680.c driver
+#
+# plain, shift, altgr,  ctrl, shift + ctrl,  alt,  ctrl + alt
+
+keymaps 0-2,4-5,8,12
+keycode   57 = Escape           Escape          
+	alt	keycode   1 = Meta_Escape     
+keycode   59 = one              exclam		asciitilde
+	alt	keycode   2 = Meta_%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list