[oe-commits] org.oe.dev merge of '3fc90cd6e5ca8fdb9040cd52f97c35c106987f7b'
hrw commit
openembedded-commits at lists.openembedded.org
Thu Aug 23 11:32:45 UTC 2007
merge of '3fc90cd6e5ca8fdb9040cd52f97c35c106987f7b'
and 'dd6e61bbe142013de981e7c21ec321925aa41d52'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 62f43ef2955b9032c28da638a32780b667fd7501
ViewMTN: http://monotone.openembedded.org/revision.psp?id=62f43ef2955b9032c28da638a32780b667fd7501
Files:
1
packages/gsm/files/fic-gta01
packages/gsm/files/fic-gta01/default
packages/gsm/files/fix-mlbuf.patch
packages/gsm/files/htcuniversal
packages/gsm/files/htcuniversal/default
packages/gsm/files/magician
packages/gsm/files/magician/default
packages/gaim/pidgin_2.1.0.bb
packages/gaim/pidgin_2.1.1.bb
packages/python/python-openmoko
packages/gtk-webcore/midori_0.0.5.bb
packages/librsvg/librsvg_2.11.1.bb
packages/linux/linux-gta01/defconfig-2.6.21.6-fic-gta01
packages/linux/linux-gta01_2.6.21.6.bb
packages/openmoko2/openmoko-tasks2_svn.bb
packages/python/python-openmoko/python-path.patch
MAINTAINERS
classes/seppuku.bbclass
contrib/python/generate-manifest-2.5.py
packages/classpath/classpath-minimal_0.95.bb
packages/fbreader/fbreader_0.8.2a.bb
packages/gaim/pidgin.inc
packages/gpe-bootsplash/files/angstrom/splash-p.svg
packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
packages/gpephone/libsettings_0.3.bb
packages/gsm/files/default
packages/gsm/libgsmd_svn.bb
packages/gstreamer/gst-common.inc
packages/gstreamer/gst-plugins-bad_0.10.5.bb
packages/gstreamer/gst-plugins.inc
packages/linux/linux-gta01_2.6.21.3.bb
packages/linux/linux-gta01_2.6.21.5.bb
packages/python/python-2.5-manifest.inc
packages/python/python-openmoko_0.1.bb
packages/python/python_2.5.1.bb
packages/tasks/task-openmoko.bb
packages/uboot/uboot-openmoko_svn.bb
packages/python/python-dbus/python-path.patch
packages/python/python-pygobject-native_2.12.2.bb
packages/python/python-pygobject_2.12.2.bb
packages/python/python-dbus_0.81.1.bb
Diffs:
#
# mt diff -r3fc90cd6e5ca8fdb9040cd52f97c35c106987f7b -r62f43ef2955b9032c28da638a32780b667fd7501
#
#
#
# delete "packages/gsm/files/fic-gta01"
#
# delete "packages/gsm/files/fic-gta01/default"
#
# delete "packages/gsm/files/fix-mlbuf.patch"
#
# delete "packages/gsm/files/htcuniversal"
#
# delete "packages/gsm/files/htcuniversal/default"
#
# delete "packages/gsm/files/magician"
#
# delete "packages/gsm/files/magician/default"
#
# rename "packages/gaim/pidgin_2.1.0.bb"
# to "packages/gaim/pidgin_2.1.1.bb"
#
# add_dir "packages/python/python-openmoko"
#
# add_file "packages/gtk-webcore/midori_0.0.5.bb"
# content [02453b1794116c17e282c8cce5aacd1375feeae2]
#
# add_file "packages/librsvg/librsvg_2.11.1.bb"
# content [59bdb0233bda87be9c3b73a68049d017505cb1f7]
#
# add_file "packages/linux/linux-gta01/defconfig-2.6.21.6-fic-gta01"
# content [f3b3a05ebb9609a899206b0eda2a008c3322f3d8]
#
# add_file "packages/linux/linux-gta01_2.6.21.6.bb"
# content [3579e619e87a73512648f35c46663521f55f4cac]
#
# add_file "packages/openmoko2/openmoko-tasks2_svn.bb"
# content [450e5e7f51113ebcee7b13cd3dca55240602492b]
#
# add_file "packages/python/python-openmoko/python-path.patch"
# content [40983bb354b660303ebeaaa838b0b8332b6eaf8d]
#
# patch "MAINTAINERS"
# from [8ffc9d9c53d1c82d913a1247e91ed10c148c0ce7]
# to [6d6d2143443bc57017864bfbfe353d4f1b8258b6]
#
# patch "classes/seppuku.bbclass"
# from [a69586a66f285bca06d5d46b92195f56ece0749d]
# to [600990318f058b4d0322d76c901d7805b090a8c3]
#
# patch "contrib/python/generate-manifest-2.5.py"
# from [5e2c4eeae20efcc683a01183fd67d30123f8c597]
# to [90398aba7274ea64d9a4977150cd9ef93776d19d]
#
# patch "packages/classpath/classpath-minimal_0.95.bb"
# from [85a438ea63e8e5790dca42e27ef3b9318d4dee3f]
# to [22d3ae706725316f5f70a7ed0da7a369f15a89db]
#
# patch "packages/fbreader/fbreader_0.8.2a.bb"
# from [ffa657fea62b85620be6838f5166e8c9d3be06ee]
# to [bfe9fc8a8216d59eb9cfb3b1456b94f3ee163ef2]
#
# patch "packages/gaim/pidgin.inc"
# from [f2b101bebf0f41aa0943a55e76c86c0933428cbc]
# to [a61050ebce8d74b7d431c386794283d9035140de]
#
# patch "packages/gaim/pidgin_2.1.1.bb"
# from [5d1d81cb5f095264cf7a6ca63aaa7e1fa5b87668]
# to [18a62469805cd0b09aba51c45868c641823089df]
#
# patch "packages/gpe-bootsplash/files/angstrom/splash-p.svg"
# from [6be1f5435b8289fbc1de3c211009b92b7f27c96b]
# to [7cf599aa7f704cf4cf87639ddf59a8706bffb64d]
#
# patch "packages/gpe-bootsplash/gpe-bootsplash_1.15.bb"
# from [ec2e88f8463e277d67b8e301d189e6d150571985]
# to [9ba1f9aab7534858cfcdcb71836bf5268f118a7e]
#
# patch "packages/gpephone/libsettings_0.3.bb"
# from [61c18c3f3f7c85c3f6b358e60597da6b601f3126]
# to [0be3d5ce6ebc66f934461ed122c1ef795c929608]
#
# patch "packages/gsm/files/default"
# from [7ce0e5ef1d869657220f2726615b4248e22cf672]
# to [f0238ff8fc0e3123941c19055fb0dd74d4fc5ed4]
#
# patch "packages/gsm/libgsmd_svn.bb"
# from [5bfef07ab90056b98c4bcf253d3d8773ff46f2e9]
# to [ff7c3845f7e03d5a5327937e2feb3a7d129fd962]
#
# patch "packages/gstreamer/gst-common.inc"
# from [27ceb74f764523f7d0708087bd16ae8a3627c39e]
# to [860249c91df6da7ad81a6dffba9d5529cc114c67]
#
# patch "packages/gstreamer/gst-plugins-bad_0.10.5.bb"
# from [f7278fed1af9fcc35b052a8c231322246a53e65e]
# to [75bf6241ad32f530a27b0904e7a6c3053c231c9d]
#
# patch "packages/gstreamer/gst-plugins.inc"
# from [6293327f294676ab88b8ec6b36906d0113b3566a]
# to [5dc5a74a21bc2ea4d9870acdac9615b821137cec]
#
# patch "packages/linux/linux-gta01_2.6.21.3.bb"
# from [b3c4657d21eee337514632f216cab7f23b395109]
# to [acd227935007845df97a6553327d244e552ec2bd]
#
# patch "packages/linux/linux-gta01_2.6.21.5.bb"
# from [42a58603d3240f81b7d74124c8ec6cdaa5255b22]
# to [4eb9060769acef7ed830d6556b1dc64ca53b73a8]
#
# patch "packages/python/python-2.5-manifest.inc"
# from [a74424a3075d7b89ba717468b2314ab62775f5f4]
# to [8f4af7922885099c50e0dfdadbed99abe53fd2fe]
#
# patch "packages/python/python-openmoko_0.1.bb"
# from [f5da0eaa8107b799301f621fa8dca1a37b9541ac]
# to [718047398e690d79f5a31a2a007d7bedcc7ae4f0]
#
# patch "packages/python/python_2.5.1.bb"
# from [1c43c7d7b6a272f1d3fd288f6428e3d8f97b9599]
# to [8def8e66f0d5def464971fd93ac725b403d4e709]
#
# patch "packages/tasks/task-openmoko.bb"
# from [6b1416c92dd8ec8abdc9cdb30e309d9b3885f8d9]
# to [d07b9cd90e2a77b275934886cf40b954014b09c2]
#
# patch "packages/uboot/uboot-openmoko_svn.bb"
# from [7fb04be5e94ef40416414b3cfb7df47f13ab00b0]
# to [870615bc9d98dfc6baa61146842125cab59a49bc]
#
============================================================
--- packages/gtk-webcore/midori_0.0.5.bb 02453b1794116c17e282c8cce5aacd1375feeae2
+++ packages/gtk-webcore/midori_0.0.5.bb 02453b1794116c17e282c8cce5aacd1375feeae2
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz"
+
+
+
============================================================
--- packages/librsvg/librsvg_2.11.1.bb 59bdb0233bda87be9c3b73a68049d017505cb1f7
+++ packages/librsvg/librsvg_2.11.1.bb 59bdb0233bda87be9c3b73a68049d017505cb1f7
@@ -0,0 +1,36 @@
+DESCRIPTION = "Library for rendering SVG files"
+SECTION = "x11/utils"
+DEPENDS = "gtk+ libcroco libart-lgpl libxml2 popt"
+LICENSE = "LGPL"
+
+PR = "r2"
+
+inherit autotools pkgconfig gnome
+
+EXTRA_OECONF = "--disable-mozilla-plugin"
+
+
+PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
+FILES_${PN} = "${libdir}/*.so.*"
+FILES_rsvg = "${bindir}/rsvg \
+ ${bindir}/rsvg-view \
+ ${bindir}/rsvg-convert \
+ ${datadir}/pixmaps/svg-viewer.svg"
+FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so"
+FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.la \
+ ${libdir}/gtk-2.0/*/*.la \
+ ${libdir}/gtk-2.0/*/*/*.la \
+ "
+FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug \
+ ${libdir}/gtk-2.0/*/*/.debug"
+
+pkg_postinst_librsvg-gtk() {
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+ gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
+}
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/linux/linux-gta01/defconfig-2.6.21.6-fic-gta01 f3b3a05ebb9609a899206b0eda2a008c3322f3d8
+++ packages/linux/linux-gta01/defconfig-2.6.21.6-fic-gta01 f3b3a05ebb9609a899206b0eda2a008c3322f3d8
@@ -0,0 +1,1861 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.21.3
+# Mon Jun 11 18:32:32 2007
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+# CONFIG_GENERIC_TIME is not set
+CONFIG_MMU=y
+CONFIG_NO_IOPORT=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION="-moko11"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=m
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_DEFAULT_AS is not set
+CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="deadline"
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+CONFIG_ARCH_S3C2410=y
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+CONFIG_PLAT_S3C24XX=y
+CONFIG_CPU_S3C244X=y
+# CONFIG_S3C2410_BOOT_WATCHDOG is not set
+CONFIG_S3C2410_BOOT_ERROR_RESET=y
+CONFIG_S3C2410_PM_DEBUG=y
+# CONFIG_S3C2410_PM_CHECK is not set
+CONFIG_S3C2410_LOWLEVEL_UART_PORT=0
+CONFIG_S3C2410_DMA=y
+# CONFIG_S3C2410_DMA_DEBUG is not set
+CONFIG_MACH_SMDK=y
+
+#
+# S3C2400 Machines
+#
+CONFIG_CPU_S3C2410=y
+CONFIG_CPU_S3C2410_DMA=y
+CONFIG_S3C2410_PM=y
+CONFIG_S3C2410_GPIO=y
+CONFIG_S3C2410_CLOCK=y
+
+#
+# S3C2410 Machines
+#
+# CONFIG_ARCH_SMDK2410 is not set
+# CONFIG_ARCH_H1940 is not set
+# CONFIG_MACH_N30 is not set
+# CONFIG_ARCH_BAST is not set
+# CONFIG_MACH_OTOM is not set
+# CONFIG_MACH_AML_M5900 is not set
+# CONFIG_MACH_VR1000 is not set
+CONFIG_MACH_QT2410=y
+CONFIG_MACH_NEO1973_GTA01=y
+
+#
+# S3C2412 Machines
+#
+# CONFIG_MACH_SMDK2413 is not set
+# CONFIG_MACH_VSTMS is not set
+CONFIG_CPU_S3C2440=y
+CONFIG_S3C2440_DMA=y
+
+#
+# S3C2440 Machines
+#
+# CONFIG_MACH_ANUBIS is not set
+# CONFIG_MACH_OSIRIS is not set
+# CONFIG_MACH_RX3715 is not set
+CONFIG_ARCH_S3C2440=y
+# CONFIG_MACH_NEXCODER_2440 is not set
+CONFIG_SMDK2440_CPU2440=y
+CONFIG_MACH_HXD8=y
+CONFIG_MACH_NEO1973_GTA02=y
+
+#
+# S3C2442 Machines
+#
+# CONFIG_SMDK2440_CPU2442 is not set
+
+#
+# S3C2443 Machines
+#
+# CONFIG_MACH_SMDK2443 is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM920T=y
+CONFIG_CPU_32v4T=y
+CONFIG_CPU_ABRT_EV4T=y
+CONFIG_CPU_CACHE_V4WT=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_OUTER_CACHE is not set
+
+#
+# Bus support
+#
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+CONFIG_PREEMPT=y
+CONFIG_NO_IDLE_HZ=y
+CONFIG_HZ=200
+# CONFIG_AEABI is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+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_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="console=ttySAC0,115200n8 ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off debug"
+# CONFIG_XIP_KERNEL is not set
+CONFIG_KEXEC=y
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_FASTFPE is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
+
+#
+# Power management options
+#
+CONFIG_PM=y
+CONFIG_PM_LEGACY=y
+CONFIG_PM_DEBUG=y
+CONFIG_DISABLE_CONSOLE_SUSPEND=y
+# CONFIG_PM_SYSFS_DEPRECATED is not set
+CONFIG_APM_EMULATION=y
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=m
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+CONFIG_XFRM_MIGRATE=y
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+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 is not set
+# CONFIG_IP_ROUTE_VERBOSE is not set
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+# 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=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_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=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+# CONFIG_IPV6_MIP6 is not set
+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 is not set
+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_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK_ENABLED=m
+CONFIG_NF_CONNTRACK_SUPPORT=y
+# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+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_TCPMSS=m
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=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_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=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_REALM=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETF%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rdd6e61bbe142013de981e7c21ec321925aa41d52 -r62f43ef2955b9032c28da638a32780b667fd7501
#
#
#
# delete "packages/python/python-dbus/python-path.patch"
#
# add_file "packages/python/python-pygobject-native_2.12.2.bb"
# content [4919e0f135ff74036bb0effdae616d58f1c15f3a]
#
# add_file "packages/python/python-pygobject_2.12.2.bb"
# content [2608f9e9a904319912666247a24388fb2c10d258]
#
# patch "packages/python/python-dbus_0.81.1.bb"
# from [f5cd93db72bf6173350f548037e52ecb2b42cd60]
# to [5bfcd82edc7fda46c67b545945bde583f85b9f45]
#
============================================================
--- packages/python/python-pygobject-native_2.12.2.bb 4919e0f135ff74036bb0effdae616d58f1c15f3a
+++ packages/python/python-pygobject-native_2.12.2.bb 4919e0f135ff74036bb0effdae616d58f1c15f3a
@@ -0,0 +1,3 @@
+require python-pygobject_${PV}.bb
+
+DEPENDS = "python-native"
============================================================
--- packages/python/python-pygobject_2.12.2.bb 2608f9e9a904319912666247a24388fb2c10d258
+++ packages/python/python-pygobject_2.12.2.bb 2608f9e9a904319912666247a24388fb2c10d258
@@ -0,0 +1,23 @@
+DESCRIPTION = "Python GObject bindings"
+SECTION = "devel/python"
+LICENSE = "LGPL"
+DEPENDS = "python-pygobject-native"
+PR = "ml2"
+
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2"
+S = "${WORKDIR}/pygobject-${PV}"
+
+inherit autotools distutils-base pkgconfig
+
+# otherwise the main package keeps snatching the .pc file away
+# and therefore depends on glib-2.0-dev (which only the -dev
+# package should).
+PACKAGES =+ "${PN}-dev"
+
+do_stage() {
+ autotools_stage_all
+ install -d ${STAGING_LIBDIR}/../share/pygobject/
+ cp -dpfR docs/* ${STAGING_LIBDIR}/../share/pygobject/
+ install -d ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
+ cp docs/style.css ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
+}
============================================================
--- packages/python/python-dbus_0.81.1.bb f5cd93db72bf6173350f548037e52ecb2b42cd60
+++ packages/python/python-dbus_0.81.1.bb 5bfcd82edc7fda46c67b545945bde583f85b9f45
@@ -1,18 +1,14 @@ RDEPENDS = "dbus python-threading python
DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for interprocess communication"
SECTION = "devel/python"
HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
LICENSE = "GPL"
DEPENDS = "expat glib-2.0 virtual/libintl python-pyrex-native python"
RDEPENDS = "dbus python-threading python-io python-stringold python-logging"
-PR = "ml1"
+PR = "ml0"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \
- file://allow-older-autotools.patch;patch=1 \
- file://python-path.patch;patch=1"
-
+ file://allow-older-autotools.patch;patch=1"
S = "${WORKDIR}/dbus-python-${PV}"
inherit distutils-base autotools
-EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
-
More information about the Openembedded-commits
mailing list