[oe-commits] org.oe.dev merge of 'e57c2aac5313ef7f2859dbe9a325d8705d5d3eef'
mickeyl commit
oe at amethyst.openembedded.net
Tue Jun 10 00:32:56 UTC 2008
merge of 'e57c2aac5313ef7f2859dbe9a325d8705d5d3eef'
and 'f5fc316539225d7382054c92b8d6cc7f1bca9b73'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 30fc86774a3da064f530c39eeff1e97d6a7020a0
ViewMTN: http://monotone.openembedded.org/revision/info/30fc86774a3da064f530c39eeff1e97d6a7020a0
Files:
1
packages/linux/linux-rt-2.6.25/efika
packages/devio/devio-sdk.inc
packages/devio/devio-sdk_1.2.bb
packages/libopie/libopie2/ipaq_rotate_fix.patch
packages/linux/linux-rt-2.6.25/efika/defconfig
packages/meta/meta-toolchain-slugos.bb
packages/tasks/task-slugos-toolchain-host.bb
packages/keymaps/files/tosa/keymap-2.6.map
packages/keymaps/keymaps_1.0.bb
packages/linux/linux-kaiser_2.6.24+git.bb
packages/linux/linux-rt_2.6.25.bb
packages/linux/linux.inc
packages/gstreamer/gst-plugin-pulse_0.9.4.bb
packages/bash/files
packages/bash/files/builtins.patch
conf/distro/include/preferred-om-2008-versions.inc
packages/bash/bash.inc
packages/bash/bash_3.0.bb
packages/bash/bash_3.2.bb
Diffs:
#
# mt diff -re57c2aac5313ef7f2859dbe9a325d8705d5d3eef -r30fc86774a3da064f530c39eeff1e97d6a7020a0
#
#
#
# add_dir "packages/linux/linux-rt-2.6.25/efika"
#
# add_file "packages/devio/devio-sdk.inc"
# content [1c7af478205106bc6e492b4c12447529ed48dff6]
#
# add_file "packages/devio/devio-sdk_1.2.bb"
# content [d77b06e459f4b840ffbf33c3d46ac1ba26638bf0]
#
# add_file "packages/libopie/libopie2/ipaq_rotate_fix.patch"
# content [1129069abce417b89f7e1a975dd2f426736c6db5]
#
# add_file "packages/linux/linux-rt-2.6.25/efika/defconfig"
# content [035378c797c9c2641730a264a740adc0617c4d46]
#
# add_file "packages/meta/meta-toolchain-slugos.bb"
# content [13c90521af43d63cabeb02d46e7aa1458318d5f0]
#
# add_file "packages/tasks/task-slugos-toolchain-host.bb"
# content [b8ec3022f159eb44d3cc58bd2b7f652e0d7b4bfc]
#
# patch "packages/keymaps/files/tosa/keymap-2.6.map"
# from [d31f331d2aa8f5c3b6a525e6d896254e0de31b80]
# to [ca6f9018b4349221c754ec336da113b01066f05b]
#
# patch "packages/keymaps/keymaps_1.0.bb"
# from [3ca60513019e86146c6189d1b3436b35b168c96b]
# to [5dbbf11e709fbfd0c371921a5f538d7f93867ec3]
#
# patch "packages/linux/linux-kaiser_2.6.24+git.bb"
# from [f35b44d6d3ebfde341c328a3b1e8362f8dec89de]
# to [4c1d297ed2650a9ec5c683f87ef9189967a1afde]
#
# patch "packages/linux/linux-rt_2.6.25.bb"
# from [4751e7e5accade67eb352aa496eeb9d61b4c2c24]
# to [84c5b1838ebba67985b3769dec496a761481d5c4]
#
# patch "packages/linux/linux.inc"
# from [84e23d6654d03f41189dedbe431e5923276dbe6e]
# to [16ea4b3bf41ca24e786353fa1bb3196adacc96da]
#
============================================================
--- packages/devio/devio-sdk.inc 1c7af478205106bc6e492b4c12447529ed48dff6
+++ packages/devio/devio-sdk.inc 1c7af478205106bc6e492b4c12447529ed48dff6
@@ -0,0 +1,5 @@
+# Set the installation dir back to the default
+sbindir = "${exec_prefix}/sbin"
+bindir = "${exec_prefix}/bin"
+
+inherit sdk
============================================================
--- packages/devio/devio-sdk_1.2.bb d77b06e459f4b840ffbf33c3d46ac1ba26638bf0
+++ packages/devio/devio-sdk_1.2.bb d77b06e459f4b840ffbf33c3d46ac1ba26638bf0
@@ -0,0 +1,3 @@
+# This package builds the devio program for the build architecture
+require devio.inc
+require devio-sdk.inc
============================================================
--- packages/libopie/libopie2/ipaq_rotate_fix.patch 1129069abce417b89f7e1a975dd2f426736c6db5
+++ packages/libopie/libopie2/ipaq_rotate_fix.patch 1129069abce417b89f7e1a975dd2f426736c6db5
@@ -0,0 +1,23 @@
+--- libopie2/opiecore/device/odevice_ipaq.cpp 2008-05-26 16:33:01.000000000 +0100
++++ libopie2/opiecore/device/odevice_ipaq.cpp 2008-05-26 16:33:40.000000000 +0100
+@@ -331,16 +331,10 @@
+ case Key_Down : {
+ int quarters;
+ switch (d->m_rotation) {
+- case Rot0: quarters = 3/*270deg*/; break;
+- case Rot90: quarters = 2/*270deg*/; break;
+- case Rot180: quarters = 1/*270deg*/; break;
+- case Rot270: quarters = 0/*270deg*/; break;
+- }
+- if( d->m_model == Model_iPAQ_H22xx ) {
+- // FIXME: there's something screwed with the keycodes being sent on h2200. I have
+- // added a temporary workaround for this here, but the bug should be fixed properly
+- // later in the right place. - Paul Eggleton 25/07/2007
+- quarters = 0;
++ case Rot0: quarters = 0/*0deg*/; break;
++ case Rot90: quarters = 1/*90deg*/; break;
++ case Rot180: quarters = 2/*180deg*/; break;
++ case Rot270: quarters = 3/*270deg*/; break;
+ }
+ newkeycode = Key_Left + ( keycode - Key_Left + quarters ) % 4;
+ break;
============================================================
--- packages/linux/linux-rt-2.6.25/efika/defconfig 035378c797c9c2641730a264a740adc0617c4d46
+++ packages/linux/linux-rt-2.6.25/efika/defconfig 035378c797c9c2641730a264a740adc0617c4d46
@@ -0,0 +1,1771 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.25.4-rt6
+# Mon Jun 9 23:03:10 2008
+#
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+# CONFIG_ALTIVEC is not set
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
+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_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 is not set
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+# CONFIG_DEFAULT_UIMAGE is not set
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+# CONFIG_PPC_DCR_NATIVE is not set
+# CONFIG_PPC_DCR_MMIO is not set
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_SWAP is not set
+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 is not set
+# 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_RADIX_TREE_CONCURRENT is not set
+CONFIG_EMBEDDED=y
+CONFIG_SYSCTL_SYSCALL=y
+# CONFIG_KALLSYMS is not set
+CONFIG_HOTPLUG=y
+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 is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+# CONFIG_SHMEM is not set
+# CONFIG_VM_EVENT_COUNTERS is not set
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+CONFIG_MARKERS=y
+CONFIG_OPROFILE=m
+CONFIG_HAVE_OPROFILE=y
+CONFIG_PROFILE_NMI=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_TINY_SHMEM=y
+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 is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+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 is not set
+
+#
+# Platform support
+#
+CONFIG_PPC_MULTIPLATFORM=y
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
+CONFIG_CLASSIC32=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_MPC512x is not set
+# CONFIG_PPC_MPC5121 is not set
+# CONFIG_MPC5121_ADS is not set
+CONFIG_PPC_MPC52xx=y
+# CONFIG_PPC_MPC5200_SIMPLE is not set
+CONFIG_PPC_EFIKA=y
+# CONFIG_PPC_LITE5200 is not set
+# CONFIG_PPC_MPC5200_BUGFIX is not set
+# CONFIG_PPC_PMAC is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+# CONFIG_EMBEDDED6xx is not set
+CONFIG_PPC_NATIVE=y
+# CONFIG_UDBG_RTAS_CONSOLE is not set
+# 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=y
+# CONFIG_RTAS_ERROR_LOGGING is not set
+CONFIG_RTAS_PROC=y
+# 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_TAU is not set
+# CONFIG_FSL_ULI1575 is not set
+CONFIG_PPC_BESTCOMM=y
+CONFIG_PPC_BESTCOMM_ATA=y
+CONFIG_PPC_BESTCOMM_FEC=y
+CONFIG_PPC_BESTCOMM_GEN_BD=y
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+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 is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT_DESKTOP is not set
+CONFIG_PREEMPT_RT=y
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_SOFTIRQS=y
+CONFIG_PREEMPT_HARDIRQS=y
+CONFIG_PREEMPT_RCU=y
+CONFIG_PREEMPT_RCU_BOOST=y
+CONFIG_RCU_TRACE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_ASM_SEMAPHORES=y
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC 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_KEXEC is not set
+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 is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_PM is not set
+# CONFIG_SECCOMP is not set
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_GENERIC_ISA_DMA=y
+# CONFIG_PPC_INDIRECT_PCI is not set
+CONFIG_FSL_SOC=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI 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_BOOT_LOAD=0x00800000
+
+#
+# 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=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# 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=y
+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 is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IP_VS is not set
+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=m
+# 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=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_FI%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rf5fc316539225d7382054c92b8d6cc7f1bca9b73 -r30fc86774a3da064f530c39eeff1e97d6a7020a0
#
#
#
# delete "packages/gstreamer/gst-plugin-pulse_0.9.4.bb"
#
# add_dir "packages/bash/files"
#
# add_file "packages/bash/files/builtins.patch"
# content [21d040e26c126f8e174f1eb97b4deb63f560a3cb]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [b3bb0751aa30b51468709221b4b693ab53b1c6e0]
# to [94d02ccc8116860a8fd6d6ae6bba2978ced283fa]
#
# patch "packages/bash/bash.inc"
# from [c7397201014de3cb47c54cc11eab2fb64058dc02]
# to [85c09d626fa7c301ecaee196dc6b1dcd78c764b1]
#
# patch "packages/bash/bash_3.0.bb"
# from [a8cbd9f528543fa43f70dbc8e2f010addf0dce4c]
# to [c5b357d7c2bbc27e3e02dd73d7b532faeb0461f5]
#
# patch "packages/bash/bash_3.2.bb"
# from [d81916136f2b12a18f2b0d1de7cb3ad834c70471]
# to [efdb38a0bc9dd6aa39807b4101582e878d9bd101]
#
============================================================
--- packages/bash/files/builtins.patch 21d040e26c126f8e174f1eb97b4deb63f560a3cb
+++ packages/bash/files/builtins.patch 21d040e26c126f8e174f1eb97b4deb63f560a3cb
@@ -0,0 +1,13 @@
+Index: bash-3.2/builtins/Makefile.in
+===================================================================
+--- bash-3.2.orig/builtins/Makefile.in
++++ bash-3.2/builtins/Makefile.in
+@@ -189,7 +189,7 @@ install: @HELPINSTALL@
+
+ mkbuiltins.o: ../config.h
+ mkbuiltins.o: mkbuiltins.c
+- $(RM) $@
++ echo $(RM) $@
+ $(CC_FOR_BUILD) -c $(CCFLAGS_FOR_BUILD) $<
+
+ mkbuiltins$(EXEEXT): mkbuiltins.o
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc b3bb0751aa30b51468709221b4b693ab53b1c6e0
+++ conf/distro/include/preferred-om-2008-versions.inc 94d02ccc8116860a8fd6d6ae6bba2978ced283fa
@@ -59,7 +59,7 @@ PREFERRED_VERSION_avahi ?= "0.6.22"
PREFERRED_VERSION_automake ?= "1.9.6"
PREFERRED_VERSION_automake-native ?= "1.9.6"
PREFERRED_VERSION_avahi ?= "0.6.22"
-PREFERRED_VERSION_avahi-python ?= "0.6.22"
+PREFERRED_VERSION_avahi-python ?= "0.6.21"
PREFERRED_VERSION_avahi-ui ?= "0.6.22"
PREFERRED_VERSION_avetanabt ?= "20060413"
PREFERRED_VERSION_bacula-client ?= "1.38.11"
@@ -117,7 +117,7 @@ PREFERRED_VERSION_btxml ?= "1.0"
PREFERRED_VERSION_btsco ?= "0.42"
PREFERRED_VERSION_btsco-module ?= "0.42"
PREFERRED_VERSION_btxml ?= "1.0"
-PREFERRED_VERSION_busybox = "1.9.1"
+PREFERRED_VERSION_busybox = "1.9.2"
PREFERRED_VERSION_busybox-static ?= "1.2.1"
PREFERRED_VERSION_bvi ?= "1.3.1"
PREFERRED_VERSION_bwmon ?= "1.3"
@@ -201,8 +201,8 @@ PREFERRED_VERSION_cups ?= "1.2.12"
PREFERRED_VERSION_ctrlproxy ?= "2.6.2"
PREFERRED_VERSION_cumulus ?= "1.2.1"
PREFERRED_VERSION_cups ?= "1.2.12"
-PREFERRED_VERSION_curl ?= "7.16.4"
-PREFERRED_VERSION_curl-native ?= "7.16.4"
+PREFERRED_VERSION_curl ?= "7.18.0"
+PREFERRED_VERSION_curl-native ?= "7.18.0"
PREFERRED_VERSION_custominput ?= "1.1.0"
PREFERRED_VERSION_cvs ?= "1.12.9"
PREFERRED_VERSION_cxcrypt ?= "1.0"
@@ -221,6 +221,7 @@ PREFERRED_VERSION_dbus ?= "1.2.1"
PREFERRED_VERSION_dbh ?= "1.0-18"
PREFERRED_VERSION_db-native ?= "4.3.29"
PREFERRED_VERSION_dbus ?= "1.2.1"
+PREFERRED_VERSION_dbus-native ?= "1.2.1"
PREFERRED_VERSION_dbus-glib ?= "0.74"
PREFERRED_VERSION_dbus-glib-native ?= "0.74"
PREFERRED_VERSION_dbus-native ?= "1.0.3"
@@ -606,7 +607,7 @@ PREFERRED_VERSION_gst-meta-base ?= "0.10
PREFERRED_VERSION_gspcav1 ?= "20070110"
PREFERRED_VERSION_gst-ffmpeg ?= "0.10.2"
PREFERRED_VERSION_gst-meta-base ?= "0.10"
-PREFERRED_VERSION_gst-plugin-pulse ?= "0.9.4"
+PREFERRED_VERSION_gst-plugin-pulse ?= "0.9.7"
PREFERRED_VERSION_gst-plugins-bad ?= "0.10.6"
PREFERRED_VERSION_gst-plugins-base ?= "0.10.17"
PREFERRED_VERSION_gst-plugins-farsight ?= "0.10.1"
@@ -1296,7 +1297,7 @@ PREFERRED_VERSION_nail ?= "11.21"
PREFERRED_VERSION_mythfront-session ?= "1.5"
PREFERRED_VERSION_nabi ?= "0.17"
PREFERRED_VERSION_nail ?= "11.21"
-PREFERRED_VERSION_nano ?= "2.0.6"
+PREFERRED_VERSION_nano ?= "2.0.7"
PREFERRED_VERSION_nasm-native ?= "0.98.38"
PREFERRED_VERSION_nautilus ?= "2.12.2"
PREFERRED_VERSION_nautilus-cd-burner ?= "2.8.5"
@@ -1499,7 +1500,7 @@ PREFERRED_VERSION_python-gnosis ?= "1.2.
PREFERRED_VERSION_python-gammu ?= "0.24"
PREFERRED_VERSION_python-gmpy ?= "1.0.1"
PREFERRED_VERSION_python-gnosis ?= "1.2.2"
-PREFERRED_VERSION_python-gst ?= "0.10.8"
+PREFERRED_VERSION_python-gst ?= "0.10.10"
PREFERRED_VERSION_python-hmm ?= "0.4"
PREFERRED_VERSION_python-imaging ?= "1.1.6"
PREFERRED_VERSION_python-imdbpy ?= "3.1"
@@ -1958,9 +1959,7 @@ PREFERRED_VERSION_wpa-gui ?= "0.4.8"
PREFERRED_VERSION_wlan-ng-utils ?= "0.2.7"
PREFERRED_VERSION_wmctrl ?= "1.07"
PREFERRED_VERSION_wpa-gui ?= "0.4.8"
-PREFERRED_VERSION_wpa-supplicant ?= "0.5.5"
-PREFERRED_VERSION_wpa-supplicant-nossl ?= "0.2.6"
-PREFERRED_VERSION_wpa-supplicant-ssl ?= "0.2.6"
+PREFERRED_VERSION_wpa-supplicant ?= "0.5.10"
PREFERRED_VERSION_wrt-imagetools-native ?= "1.0"
PREFERRED_VERSION_wrt-init ?= "1.0"
PREFERRED_VERSION_wrt-utils ?= "1.0"
============================================================
--- packages/bash/bash.inc c7397201014de3cb47c54cc11eab2fb64058dc02
+++ packages/bash/bash.inc 85c09d626fa7c301ecaee196dc6b1dcd78c764b1
@@ -8,17 +8,26 @@ PARALLEL_MAKE = ""
PARALLEL_MAKE = ""
+SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz"
+S = "${WORKDIR}/bash-${PV}"
+
bindir = "/bin"
sbindir = "/sbin"
EXTRA_OECONF = "--with-ncurses"
-export CC_FOR_BUILD = "${BUILD_CC}"
do_configure () {
gnu-configize
oe_runconf
}
+do_compile_prepend() {
+ cd builtins
+ touch mkbuiltins.o
+ ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} -I${S}/include -I${S} -o mkbuiltins mkbuiltins.c
+ cd ${S}
+}
+
pkg_postinst () {
touch $D${sysconfdir}/shells
grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells
============================================================
--- packages/bash/bash_3.0.bb a8cbd9f528543fa43f70dbc8e2f010addf0dce4c
+++ packages/bash/bash_3.0.bb c5b357d7c2bbc27e3e02dd73d7b532faeb0461f5
@@ -1,6 +1,7 @@ require bash.inc
require bash.inc
-PR = "r9"
+PR = "r10"
+SRC_URI += "\
+ file://bash-3.0-fixes.patch;patch=1 \
+ file://signames-mipsel.diff;patch=1 \
+"
-SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
- file://bash-3.0-fixes.patch;patch=1 \
- file://signames-mipsel.diff;patch=1"
============================================================
--- packages/bash/bash_3.2.bb d81916136f2b12a18f2b0d1de7cb3ad834c70471
+++ packages/bash/bash_3.2.bb efdb38a0bc9dd6aa39807b4101582e878d9bd101
@@ -1,7 +1,9 @@ require bash.inc
require bash.inc
-PR = "r4"
-SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
+PR = "r5"
+
+SRC_URI += "\
+ file://builtins.patch;patch=1 \
http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-001;patch=1;pnum=0 \
http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-002;patch=1;pnum=0 \
http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-003;patch=1;pnum=0 \
More information about the Openembedded-commits
mailing list