[oe-commits] org.oe.dev merge of '283054912f3356d2c4ff5789698b6e711bf35c43'
oe commit
oe at amethyst.openembedded.net
Fri Apr 18 13:00:32 UTC 2008
merge of '283054912f3356d2c4ff5789698b6e711bf35c43'
and 'd8895e78d633e44885169498f3566ac510d55c97'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: a53cfa600ac3c1abcb907810a886a0c8a160dc3f
ViewMTN: http://monotone.openembedded.org/revision/info/a53cfa600ac3c1abcb907810a886a0c8a160dc3f
Files:
1
packages/gsm/libgsmd-devel_svn.bb
packages/spandsp/spandsp_0.0.2+0.0.3pre27.bb
packages/dtc/dtc-native_1.0.0.bb
packages/dtc/dtc-native_1.1.0.bb
packages/spandsp/spandsp_0.0.3+0.0.4pre16.bb
packages/spandsp/spandsp_0.0.4-pre16.bb
packages/speex/speex_1.1.12+1.2beta1.bb
packages/speex/speex_1.2-beta3.bb
packages/linux/linux-2.6.25
packages/linux/linux-2.6.25/mpc8313e-rdb
packages/mplayer/mplayer-0.0+1.0rc1
packages/mplayer/mplayer-0.0+1.0rc2
packages/slcalc/files
packages/dtc/dtc_1.1.0.bb
packages/linux/linux-2.6.25/mpc8313e-rdb/defconfig
packages/linux/linux-2.6.25/mpc8313e-rdb/mpc8313e-rdb-cardbus.patch
packages/linux/linux-2.6.25/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux-2.6.25/mpc8313e-rdb/mpc831x-nand.patch
packages/linux/linux_2.6.25.bb
packages/mplayer/mplayer-0.0+1.0rc1/Makefile-codec-cfg.patch
packages/mplayer/mplayer-0.0+1.0rc2/Makefile-codec-cfg.patch
packages/slcalc/files/slcalc.png
packages/slcalc/files/slcalc2.png
packages/spandsp/spandsp.inc
packages/xorg-xserver/xserver-kdrive-1.4.0.90/no_xkb.patch
conf/distro/include/sane-srcrevs.inc
packages/mplayer/files/Makefile-codec-cfg.patch
packages/mplayer/files/makefile-nostrip-svn.patch
packages/mplayer/mplayer_0.0+1.0rc2.bb
packages/mplayer/mplayer_svn.bb
packages/slcalc/slcalc_1.2.1.bb
packages/spandsp/spandsp_0.0.3.bb
packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb
mtn:manual_merge
true
packages/python/python-pygtk/prevent_to_get_display_during_import.patch
packages/python/python-pygtk_2.10.4.bb
Diffs:
#
# mt diff -r283054912f3356d2c4ff5789698b6e711bf35c43 -ra53cfa600ac3c1abcb907810a886a0c8a160dc3f
#
#
#
# delete "packages/gsm/libgsmd-devel_svn.bb"
#
# delete "packages/spandsp/spandsp_0.0.2+0.0.3pre27.bb"
#
# rename "packages/dtc/dtc-native_1.0.0.bb"
# to "packages/dtc/dtc-native_1.1.0.bb"
#
# rename "packages/spandsp/spandsp_0.0.3+0.0.4pre16.bb"
# to "packages/spandsp/spandsp_0.0.4-pre16.bb"
#
# rename "packages/speex/speex_1.1.12+1.2beta1.bb"
# to "packages/speex/speex_1.2-beta3.bb"
#
# add_dir "packages/linux/linux-2.6.25"
#
# add_dir "packages/linux/linux-2.6.25/mpc8313e-rdb"
#
# add_dir "packages/mplayer/mplayer-0.0+1.0rc1"
#
# add_dir "packages/mplayer/mplayer-0.0+1.0rc2"
#
# add_dir "packages/slcalc/files"
#
# add_file "packages/dtc/dtc_1.1.0.bb"
# content [8714f1319884278718ff0d6512dd33bb3ef5ce0a]
#
# add_file "packages/linux/linux-2.6.25/mpc8313e-rdb/defconfig"
# content [bfcfb7e1a02a40d23b355c353decccac44e0aded]
#
# add_file "packages/linux/linux-2.6.25/mpc8313e-rdb/mpc8313e-rdb-cardbus.patch"
# content [bf271d9de4ce4c25b913e724dd0f6f56435f7f9a]
#
# add_file "packages/linux/linux-2.6.25/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
# content [8909d6e4ed52b9c1718ad6d3bddfe8073e87938b]
#
# add_file "packages/linux/linux-2.6.25/mpc8313e-rdb/mpc831x-nand.patch"
# content [c54850135d92c5b4e8a6112f6baf6464d25753a9]
#
# add_file "packages/linux/linux_2.6.25.bb"
# content [669d13d7f3c46839d97b9bcad5d9991a3805b362]
#
# add_file "packages/mplayer/mplayer-0.0+1.0rc1/Makefile-codec-cfg.patch"
# content [c5fded49be17d1fdfc9058a11f51704a9e9bbc2c]
#
# add_file "packages/mplayer/mplayer-0.0+1.0rc2/Makefile-codec-cfg.patch"
# content [c5fded49be17d1fdfc9058a11f51704a9e9bbc2c]
#
# add_file "packages/slcalc/files/slcalc.png"
# content [aaf9140271fc816bb3414ba68c16cf1930096ce3]
#
# add_file "packages/slcalc/files/slcalc2.png"
# content [808e869b4babbd39dbac87aaa3073d4558a3e68f]
#
# add_file "packages/spandsp/spandsp.inc"
# content [7a5c5ca2cf5ff4a844e530c565b7d883200eba67]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.0.90/no_xkb.patch"
# content [17027e633e5809ba281942d8c0a5d96710ff3b44]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [fc9f6d1a44b49314cb26b36c070e7c89ad2be228]
# to [d0d87ab571957347c93128a5a4c12c23b6f74746]
#
# patch "packages/dtc/dtc-native_1.1.0.bb"
# from [a6cfb4d12568399421737e9db3bec79674a9c14a]
# to [0d6989a1806612c6439172969ea6bb25f11edcf2]
#
# patch "packages/mplayer/files/Makefile-codec-cfg.patch"
# from [c5fded49be17d1fdfc9058a11f51704a9e9bbc2c]
# to [8f20ee3f42444885368ec66e356a21c2a53dfcdd]
#
# patch "packages/mplayer/files/makefile-nostrip-svn.patch"
# from [a56997c18d0d3b9bbe0a65391debcd74767affc1]
# to [183a1b568605abf4a0dbf75a383fe15163e0c857]
#
# patch "packages/mplayer/mplayer_0.0+1.0rc2.bb"
# from [37c40e25494bcb21a0d0fd808398354c2ead6c55]
# to [3420c1879e19fda18e7e246be96e261fec49e7c4]
#
# patch "packages/mplayer/mplayer_svn.bb"
# from [f0026979fe652d6ac626761aaf876e7c3bdcf065]
# to [bca5c726d4d1951bc676f2e3b85e918a3ca0db54]
#
# patch "packages/slcalc/slcalc_1.2.1.bb"
# from [a842821dff7bb097fffed6b8cb5091c0dad1ec71]
# to [86b9baeb4be2153b6290369fc4312ff67f12e964]
#
# patch "packages/spandsp/spandsp_0.0.3.bb"
# from [eabce9404047737c74f5e7710878f500f27fc5b3]
# to [3299ad935f81769ffe792924086078142e52f310]
#
# patch "packages/spandsp/spandsp_0.0.4-pre16.bb"
# from [cbf596364dc7d8cbafb87b41aa8550243180eef5]
# to [c407c189154e9ff32b8c3ce3c0f698ea193fc8b2]
#
# patch "packages/speex/speex_1.2-beta3.bb"
# from [f4e404c373cafd1d01bf094caec29533e4be9d2c]
# to [0b3702f32d103a331bd8a2c594cacf37253f220f]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb"
# from [c45a81192919a98109d7b2e1550ccc2a98830f7e]
# to [caaa6c6290239b9a702134c8c8c3b5b7f3208c61]
#
# set "packages/slcalc/files/slcalc.png"
# attr "mtn:manual_merge"
# value "true"
#
# set "packages/slcalc/files/slcalc2.png"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
--- packages/dtc/dtc_1.1.0.bb 8714f1319884278718ff0d6512dd33bb3ef5ce0a
+++ packages/dtc/dtc_1.1.0.bb 8714f1319884278718ff0d6512dd33bb3ef5ce0a
@@ -0,0 +1,17 @@
+DESCRIPTION = "The Device Tree Compiler is a tool used to manipulate the Open-Firmware-like device tree used by PowerPC kernels."
+SECTION = "bootloader"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEFAULT_PREFERENCE = "1"
+
+SRC_URI = "http://www.jdl.com/software/dtc-v${PV}.tgz"
+
+S = "${WORKDIR}/dtc-v${PV}"
+
+inherit autotools
+
+do_install() {
+ install -m 0755 -d ${D}${bindir}
+ install -m 755 dtc ${D}${bindir}/dtc
+}
============================================================
--- packages/linux/linux-2.6.25/mpc8313e-rdb/defconfig bfcfb7e1a02a40d23b355c353decccac44e0aded
+++ packages/linux/linux-2.6.25/mpc8313e-rdb/defconfig bfcfb7e1a02a40d23b355c353decccac44e0aded
@@ -0,0 +1,1970 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.25
+# Fri Apr 18 13:24:58 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_FSL_EMB_PERFMON 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_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=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_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 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=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+# CONFIG_MARKERS is not set
+CONFIG_OPROFILE=m
+CONFIG_HAVE_OPROFILE=y
+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=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_CLASSIC_RCU=y
+
+#
+# Platform support
+#
+# CONFIG_PPC_MULTIPLATFORM is not set
+# CONFIG_PPC_82xx is not set
+CONFIG_PPC_83xx=y
+# CONFIG_PPC_86xx is not set
+# 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_MPC83xx=y
+CONFIG_MPC831x_RDB=y
+# CONFIG_MPC832x_MDS is not set
+# CONFIG_MPC832x_RDB is not set
+# CONFIG_MPC834x_MDS is not set
+# CONFIG_MPC834x_ITX is not set
+# CONFIG_MPC836x_MDS is not set
+# CONFIG_MPC837x_MDS is not set
+# CONFIG_MPC837x_RDB is not set
+# CONFIG_SBC834x is not set
+CONFIG_PPC_MPC831x=y
+CONFIG_IPIC=y
+# 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_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 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=y
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_PPC_INDIRECT_PCI=y
+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_PCCARD=m
+# CONFIG_PCMCIA_DEBUG is not set
+# CONFIG_PCMCIA is not set
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PCCARD_NONSTATIC=m
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_HIGHMEM_START=0xfe000000
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_KERNEL_START=0xc0000000
+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=y
+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=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+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=m
+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=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+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=m
+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 Configur%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rd8895e78d633e44885169498f3566ac510d55c97 -ra53cfa600ac3c1abcb907810a886a0c8a160dc3f
#
#
#
# patch "packages/python/python-pygtk/prevent_to_get_display_during_import.patch"
# from [f9fd2d212befeeeec03b1fa306b56cc23f02f0f3]
# to [2e8b9609d347c70c06283d55746b650ab11d3c58]
#
# patch "packages/python/python-pygtk_2.10.4.bb"
# from [f60288eea0692b27b7b07ff9273844bfc4e49051]
# to [7480a2de0d1f999ba0bfe0eafcf5aa21770f1592]
#
============================================================
--- packages/python/python-pygtk/prevent_to_get_display_during_import.patch f9fd2d212befeeeec03b1fa306b56cc23f02f0f3
+++ packages/python/python-pygtk/prevent_to_get_display_during_import.patch 2e8b9609d347c70c06283d55746b650ab11d3c58
@@ -8,7 +8,7 @@ Index: pygtk-2.10.4/gtk/__init__.py
-_init()
+if not hasattr(sys.modules['__main__'], 'python_launcher_enabled'):
-+ init()
++ _init()
# CAPI
_PyGtk_API = _gtk._PyGtk_API
============================================================
--- packages/python/python-pygtk_2.10.4.bb f60288eea0692b27b7b07ff9273844bfc4e49051
+++ packages/python/python-pygtk_2.10.4.bb 7480a2de0d1f999ba0bfe0eafcf5aa21770f1592
@@ -6,7 +6,7 @@ LICENSE = "LGPL"
PROVIDES = "python-pygtk2"
SRCNAME = "pygtk"
LICENSE = "LGPL"
-PR = "ml7"
+PR = "ml8"
SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \
file://fix-gtkunixprint.patch;patch=1 \
More information about the Openembedded-commits
mailing list