[oe-commits] org.oe.dev explicit merge of '77323b379f377a67b4d5bc05f4194d1d01309b52'
pH5 commit
openembedded-commits at lists.openembedded.org
Thu Aug 23 12:43:55 UTC 2007
explicit merge of '77323b379f377a67b4d5bc05f4194d1d01309b52'
and 'e0613a176614c74d38f49dfbdb46b6f368ef64ca'
Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: ddf650a0cb7bb395770eac25e38c0ba82c1ec204
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ddf650a0cb7bb395770eac25e38c0ba82c1ec204
Files:
1
packages/python/python-dbus/python-path.patch
conf/machine/gumstix.conf
conf/machine/include/gumstix.inc
packages/gaim/pidgin_2.1.0.bb
packages/gaim/pidgin_2.1.1.bb
packages/linux/linux-2.6.21/gumstix
packages/linux/linux-2.6.21/gumstix-verdex
packages/gnuplot/gnuplot-4.2.0
packages/linux/linux-2.6.21/gumstix-connex
conf/machine/gumstix-connex.conf
conf/machine/gumstix-verdex.conf
packages/gnuplot/gnuplot-4.2.0/subdirs.patch
packages/gnuplot/gnuplot_4.2.0.bb
packages/librsvg/librsvg_2.11.1.bb
packages/linux/linux-2.6.21/gumstix-connex/defconfig
packages/openmoko2/openmoko-tasks2_svn.bb
packages/python/python-pygobject-native_2.12.2.bb
packages/python/python-pygobject_2.12.2.bb
MAINTAINERS
conf/distro/angstrom-2007.1.conf
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/python/python-2.5-manifest.inc
packages/python/python_2.5.1.bb
packages/tasks/task-openmoko.bb
packages/avahi/avahi-0.6.15
packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch
packages/avahi/avahi_0.6.15.bb
packages/avahi/avahi_0.6.16.bb
packages/avahi/avahi_0.6.17.bb
packages/avahi/avahi_0.6.18.bb
packages/avahi/avahi-python_0.6.21.bb
packages/avahi/files/configure-check-pymod.patch
packages/xorg-app/sessreg_1.0.3.bb
packages/xorg-app/setxkbmap_1.0.4.bb
packages/xorg-app/xdm_1.1.6.bb
packages/xorg-app/xmodmap_1.0.3.bb
packages/xorg-app/xprop_1.0.3.bb
packages/xorg-app/xrdb_1.0.4.bb
packages/xorg-app/xsetroot_1.0.2.bb
packages/xorg-app/xvinfo_1.0.2.bb
packages/xorg-doc/xorg-sgml-doctools_1.2.bb
packages/xorg-driver/xf86-input-mouse_1.2.2.bb
packages/xorg-driver/xf86-video-ati_6.6.193.bb
packages/xorg-driver/xf86-video-nv_2.1.3.bb
packages/xorg-driver/xf86-video-savage_2.1.3.bb
packages/xorg-lib/diet-x11_1.1.3.bb
packages/xorg-lib/libice_1.0.4.bb
packages/xorg-lib/libx11_1.1.3.bb
packages/xorg-lib/libxaw_1.0.4.bb
packages/xorg-lib/libxpm_3.5.7.bb
packages/xorg-lib/libxrender_0.9.3.bb
packages/xorg-lib/libxtst_1.0.3.bb
packages/xorg-lib/xtrans_1.0.4.bb
packages/angstrom/angstrom-gpe-task-apps.bb
packages/angstrom/angstrom-gpe-task-base.bb
packages/angstrom/angstrom-gpe-task-game.bb
packages/angstrom/angstrom-gpe-task-pim.bb
packages/angstrom/angstrom-gpe-task-settings.bb
packages/angstrom/angstrom-ohand-task-pim.bb
packages/angstrom/angstrom-task-office.bb
packages/angstrom/angstrom-task-printing.bb
packages/angstrom/angstrom-task-sectest.bb
packages/avahi/avahi.inc
packages/avahi/avahi_0.6.19.bb
packages/avahi/avahi_0.6.20.bb
packages/avahi/avahi_0.6.21.bb
packages/tasks/task-base.bb
packages/tasks/task-boot.bb
packages/tasks/task-dvb.bb
packages/tasks/task-e-x11.bb
packages/tasks/task-gmae.bb
packages/tasks/task-gpe-apps.bb
packages/tasks/task-gpe-base.bb
packages/tasks/task-gpe-connectivity.bb
packages/tasks/task-gpe-desktopapps.bb
packages/tasks/task-gpe-games.bb
packages/tasks/task-gpe-pim.bb
packages/tasks/task-gpe-sectest.bb
packages/tasks/task-gpe-settings.bb
packages/tasks/task-gpe-web.bb
packages/tasks/task-gpe.bb
packages/tasks/task-gpephone.bb
packages/tasks/task-mokogateway.bb
packages/tasks/task-mythfront.bb
packages/tasks/task-opie-16mb.bb
packages/tasks/task-opie-all.bb
packages/tasks/task-opie-apps.bb
packages/tasks/task-opie-games.bb
packages/tasks/task-opie.bb
packages/tasks/task-proper-tools.bb
packages/tasks/task-qpe.bb
packages/tasks/task-sdl.bb
packages/tasks/task-xfce-base.bb
packages/tasks/task-xterminal.bb
Diffs:
#
# mt diff -r77323b379f377a67b4d5bc05f4194d1d01309b52 -rddf650a0cb7bb395770eac25e38c0ba82c1ec204
#
#
#
# delete "packages/python/python-dbus/python-path.patch"
#
# rename "conf/machine/gumstix.conf"
# to "conf/machine/include/gumstix.inc"
#
# rename "packages/gaim/pidgin_2.1.0.bb"
# to "packages/gaim/pidgin_2.1.1.bb"
#
# rename "packages/linux/linux-2.6.21/gumstix"
# to "packages/linux/linux-2.6.21/gumstix-verdex"
#
# add_dir "packages/gnuplot/gnuplot-4.2.0"
#
# add_dir "packages/linux/linux-2.6.21/gumstix-connex"
#
# add_file "conf/machine/gumstix-connex.conf"
# content [40931b717032f2f77d845644dd98f36188404e43]
#
# add_file "conf/machine/gumstix-verdex.conf"
# content [634247a26215a0709ef800ab53ad7f65b87b5342]
#
# add_file "packages/gnuplot/gnuplot-4.2.0/subdirs.patch"
# content [88702c005e97394a0b14b28aeb80f53cfc20e908]
#
# add_file "packages/gnuplot/gnuplot_4.2.0.bb"
# content [d0d263d1d61f807aceb758a99edb727172c050bf]
#
# add_file "packages/librsvg/librsvg_2.11.1.bb"
# content [59bdb0233bda87be9c3b73a68049d017505cb1f7]
#
# add_file "packages/linux/linux-2.6.21/gumstix-connex/defconfig"
# content [7d5c57d58c405ba8cc4468aba4ebf28e41c1dec7]
#
# add_file "packages/openmoko2/openmoko-tasks2_svn.bb"
# content [450e5e7f51113ebcee7b13cd3dca55240602492b]
#
# add_file "packages/python/python-dbus/python-path.patch"
# content [82cbc113e66f67ef9fac47fe70ef097309fe50e9]
#
# 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 "MAINTAINERS"
# from [62c24f84655e13b38f5d355bfbaf4b75fef8a959]
# to [2b82e9a7ab1b0bd1c997519a4297c0fee2ec2ec7]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [cbb26b56003ff6c1919690adefb14b18f3846797]
# to [4d18aa56eca5e569ebbf0b616734cb7b5ca678fe]
#
# 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/python/python-2.5-manifest.inc"
# from [a74424a3075d7b89ba717468b2314ab62775f5f4]
# to [8f4af7922885099c50e0dfdadbed99abe53fd2fe]
#
# patch "packages/python/python_2.5.1.bb"
# from [1c43c7d7b6a272f1d3fd288f6428e3d8f97b9599]
# to [8def8e66f0d5def464971fd93ac725b403d4e709]
#
# patch "packages/tasks/task-openmoko.bb"
# from [6b1416c92dd8ec8abdc9cdb30e309d9b3885f8d9]
# to [d07b9cd90e2a77b275934886cf40b954014b09c2]
#
============================================================
--- conf/machine/gumstix-connex.conf 40931b717032f2f77d845644dd98f36188404e43
+++ conf/machine/gumstix-connex.conf 40931b717032f2f77d845644dd98f36188404e43
@@ -0,0 +1,2 @@
+require conf/machine/include/gumstix.inc
+
============================================================
--- conf/machine/gumstix-verdex.conf 634247a26215a0709ef800ab53ad7f65b87b5342
+++ conf/machine/gumstix-verdex.conf 634247a26215a0709ef800ab53ad7f65b87b5342
@@ -0,0 +1,4 @@
+require conf/machine/include/gumstix.inc
+
+PACKAGE_EXTRA_ARCHS += " iwmmxt "
+
============================================================
--- packages/gnuplot/gnuplot-4.2.0/subdirs.patch 88702c005e97394a0b14b28aeb80f53cfc20e908
+++ packages/gnuplot/gnuplot-4.2.0/subdirs.patch 88702c005e97394a0b14b28aeb80f53cfc20e908
@@ -0,0 +1,11 @@
+--- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200
++++ gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in -*-Makefile-*-
+ AUTOMAKE_OPTIONS = foreign 1.2h
+
+-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share
++SUBDIRS = config m4 term src $(LISPDIR) man share
+
+ EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALL INSTALL.gnu \
+ Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \
============================================================
--- packages/gnuplot/gnuplot_4.2.0.bb d0d263d1d61f807aceb758a99edb727172c050bf
+++ packages/gnuplot/gnuplot_4.2.0.bb d0d263d1d61f807aceb758a99edb727172c050bf
@@ -0,0 +1,41 @@
+DESCRIPTION = "Gnuplot is a portable command-line driven interactive datafile \
+(text or binary) and function plotting utility."
+SECTION = "console/scientific"
+LICENSE = "BSD-4"
+PRIORITY = "optional"
+DEPENDS = "pango cairo virtual/libx11 libpng gd readline"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz \
+ file://subdirs.patch;patch=1 \
+ file://matrix.patch;patch=1 \
+ file://gnuplot.desktop \
+ file://gnuplot.png"
+
+inherit autotools
+
+acpaths = ""
+EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \
+ --without-plot \
+ --with-png=${STAGING_LIBDIR}/.. \
+ --with-gd=${STAGING_LIBDIR}/.. \
+ --without-lisp-files \
+ --without-tutorial"
+
+do_install_append() {
+ install -d ${D}${datadir}/applications/
+ install -m 0644 ${WORKDIR}/gnuplot.desktop ${D}${datadir}/applications/
+ install -d ${D}${datadir}/pixmaps/
+ install -m 0644 ${WORKDIR}/gnuplot.png ${D}${datadir}/pixmaps/
+}
+
+
+PACKAGES =+ "${PN}-x11-dbg ${PN}-x11"
+DESCRIPTION_${PN}-x11 = "X11 display terminal for Gnuplot."
+SECTION_${PN}-x11 = "x11/scientific"
+FILES_${PN}-x11 = "${libexecdir} ${datadir}/applications ${datadir}/pixmaps ${libdir}/X11 "
+
+FILES_${PN} += "${datadir}/texmf"
+FILES_${PN}-x11-dbg += "${libexecdir}/gnuplot/*/.debug"
+
+
============================================================
--- 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-2.6.21/gumstix-connex/defconfig 7d5c57d58c405ba8cc4468aba4ebf28e41c1dec7
+++ packages/linux/linux-2.6.21/gumstix-connex/defconfig 7d5c57d58c405ba8cc4468aba4ebf28e41c1dec7
@@ -0,0 +1,1558 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.21
+# Mon Jul 2 16:48:14 2007
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
+CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+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_ARCH_MTD_XIP=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=""
+CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_SWAP is not set
+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 is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+# CONFIG_SYSCTL_SYSCALL is not set
+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 is not set
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+# CONFIG_EPOLL is not set
+# CONFIG_SHMEM is not set
+CONFIG_SLAB=y
+# CONFIG_VM_EVENT_COUNTERS is not set
+CONFIG_RT_MUTEXES=y
+CONFIG_TINY_SHMEM=y
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+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
+
+#
+# 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 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"
+
+#
+# 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=y
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+
+#
+# Intel PXA2xx Implementations
+#
+CONFIG_ARCH_GUMSTIX=y
+# CONFIG_ARCH_LUBBOCK is not set
+# CONFIG_MACH_LOGICPD_PXA270 is not set
+# CONFIG_MACH_MAINSTONE is not set
+# CONFIG_ARCH_PXA_IDP is not set
+# CONFIG_PXA_SHARPSL is not set
+# CONFIG_MACH_TRIZEPS4 is not set
+# CONFIG_ARCH_GUMSTIX_ORIG is not set
+CONFIG_ARCH_GUMSTIX_F=y
+# CONFIG_ARCH_GUMSTIX_VERDEX is not set
+CONFIG_PXA25x=y
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_XSCALE=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5T=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_OUTER_CACHE is not set
+# CONFIG_IWMMXT is not set
+CONFIG_XSCALE_PMU=y
+
+#
+# Bus support
+#
+CONFIG_PROC_GPIO=m
+# CONFIG_PROC_GPIO_DEBUG is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+CONFIG_PCCARD=m
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+# CONFIG_PCMCIA_IOCTL is not set
+
+#
+# PC-card bridges
+#
+CONFIG_PCMCIA_PXA2XX=m
+
+#
+# Kernel Features
+#
+CONFIG_PREEMPT=y
+CONFIG_NO_IDLE_HZ=y
+CONFIG_HZ=100
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT 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
+CONFIG_ALIGNMENT_HANDLING=0x02
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="console=ttyS0,115200n8 root=1f01 rootfstype=jffs2"
+# CONFIG_XIP_KERNEL is not set
+CONFIG_KEXEC=y
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
+# CONFIG_PM_DEBUG is not set
+# CONFIG_PM_SYSFS_DEPRECATED is not set
+CONFIG_APM_EMULATION=m
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=m
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=m
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+# CONFIG_NET_IPGRE 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_DIAG is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+
+#
+# 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=y
+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 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_BRIDGE_NETFILTER is not set
+
+#
+# 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_SCTP is not set
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+CONFIG_NF_CONNTRACK_FTP=m
+# CONFIG_NF_CONNTRACK_H323 is not set
+# CONFIG_NF_CONNTRACK_IRC is not set
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NF_CONNTRACK_PPTP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
+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 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_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+#%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -re0613a176614c74d38f49dfbdb46b6f368ef64ca -rddf650a0cb7bb395770eac25e38c0ba82c1ec204
#
#
#
# delete "packages/avahi/avahi-0.6.15"
#
# delete "packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch"
#
# delete "packages/avahi/avahi_0.6.15.bb"
#
# delete "packages/avahi/avahi_0.6.16.bb"
#
# delete "packages/avahi/avahi_0.6.17.bb"
#
# delete "packages/avahi/avahi_0.6.18.bb"
#
# add_file "packages/avahi/avahi-python_0.6.21.bb"
# content [3d4b1b5c3ed23ff0bab2bd72c1cdb67561178a56]
#
# add_file "packages/avahi/files/configure-check-pymod.patch"
# content [fb42206ea64396e348587b85e86e397a4a94004a]
#
# add_file "packages/xorg-app/sessreg_1.0.3.bb"
# content [01867a4953d810e2f0804b3354cfcb2a2ff73954]
#
# add_file "packages/xorg-app/setxkbmap_1.0.4.bb"
# content [51d21b1d9395a9a3c45b74eb2f35d90d14b6f258]
#
# add_file "packages/xorg-app/xdm_1.1.6.bb"
# content [13b745771af2f8c3b3752f2d1017ad34f48d91bc]
#
# add_file "packages/xorg-app/xmodmap_1.0.3.bb"
# content [3fab59376a8e08e17227a84ab1610760fca1276d]
#
# add_file "packages/xorg-app/xprop_1.0.3.bb"
# content [8572c25f6c26e8e8d5512f4b8183271f3cb8a081]
#
# add_file "packages/xorg-app/xrdb_1.0.4.bb"
# content [50cb61f5911a30c66e5aa43a50bad7edfac2a5f7]
#
# add_file "packages/xorg-app/xsetroot_1.0.2.bb"
# content [c84c12a9d20aa36a5ccb5fc39af4a91c858026d5]
#
# add_file "packages/xorg-app/xvinfo_1.0.2.bb"
# content [fe0a792dccad6a93c31149fed9582885467428e6]
#
# add_file "packages/xorg-doc/xorg-sgml-doctools_1.2.bb"
# content [7a47d59f2ede9eabf6bd8d30f45dcc020b0dea84]
#
# add_file "packages/xorg-driver/xf86-input-mouse_1.2.2.bb"
# content [af8eb32d6b4525f9c5962de994c8bbb87154b4af]
#
# add_file "packages/xorg-driver/xf86-video-ati_6.6.193.bb"
# content [a5d730e0a406f5ff8c5e5388053285718be0b15d]
#
# add_file "packages/xorg-driver/xf86-video-nv_2.1.3.bb"
# content [7e13fbaf1644b16fa1b4445ea7812bbe2b0c1a19]
#
# add_file "packages/xorg-driver/xf86-video-savage_2.1.3.bb"
# content [431c6f688a9a38de51d5980ebe5f0bfd1693d54b]
#
# add_file "packages/xorg-lib/diet-x11_1.1.3.bb"
# content [0b9ad63b2f6a6a514ffed24a05cbc8a348bbf82e]
#
# add_file "packages/xorg-lib/libice_1.0.4.bb"
# content [fccec7b08bd14f0a08f831b0716cf3130db09a1e]
#
# add_file "packages/xorg-lib/libx11_1.1.3.bb"
# content [54883ca7615919e5526df001f747727753b7c581]
#
# add_file "packages/xorg-lib/libxaw_1.0.4.bb"
# content [6bbfc6ccb9ebb2dd0386423df1b2f7061c5b3870]
#
# add_file "packages/xorg-lib/libxpm_3.5.7.bb"
# content [ae7544893d044dd97a8dd5a5c39383e3961707f3]
#
# add_file "packages/xorg-lib/libxrender_0.9.3.bb"
# content [4fa851509027bb6c796e012747ddcf719eded455]
#
# add_file "packages/xorg-lib/libxtst_1.0.3.bb"
# content [37a48e5c85460c1182084d396c7e2cd90cc8e227]
#
# add_file "packages/xorg-lib/xtrans_1.0.4.bb"
# content [5adfa3a5c753b71a9a61e266569ccbd26e940b09]
#
# patch "MAINTAINERS"
# from [78ace1245c132c22dcfc3a54a4a76692d9d0259a]
# to [2b82e9a7ab1b0bd1c997519a4297c0fee2ec2ec7]
#
# patch "packages/angstrom/angstrom-gpe-task-apps.bb"
# from [43aa72a3f7bfd92362d682fdd4919d1bc0233364]
# to [4e9cfc056a3b0448c82b619628fae2c396889c5f]
#
# patch "packages/angstrom/angstrom-gpe-task-base.bb"
# from [0bf76d6738a5513300fb44b9e760c30e6afefb63]
# to [30a23f6dee4925d21a3bf27405e8f4c25f29be2c]
#
# patch "packages/angstrom/angstrom-gpe-task-game.bb"
# from [574b4b40ba91344f20ee266f571947eaf0bfabbf]
# to [71196080803ea00dd59109c8bfa62ada41174b88]
#
# patch "packages/angstrom/angstrom-gpe-task-pim.bb"
# from [f95eb6c7ed13685671dbf9265a2096da41d4ec9a]
# to [4720d5f026284dfb4a8f89cf99a2292cde8f4146]
#
# patch "packages/angstrom/angstrom-gpe-task-settings.bb"
# from [56e2c9ad5b4b1f6a1e92d8cd9ba55e2686f6cdcc]
# to [04963f41f9195b2a20bddc9409a53ad153e779ff]
#
# patch "packages/angstrom/angstrom-ohand-task-pim.bb"
# from [6bd39e8996516c93fbf18298e7db73e5d6c7b5d2]
# to [29117cd156e8860200d303c5d915d94029800006]
#
# patch "packages/angstrom/angstrom-task-office.bb"
# from [00b86208ff79a87aa59575a1613ff5dd050b9455]
# to [68c13e992cbf4346142df95f6e0603b303c26778]
#
# patch "packages/angstrom/angstrom-task-printing.bb"
# from [1ed146611164572e7746082b18da64219484cd54]
# to [37b5d726438ed3ba8ab86c1f272d8150c4e2dd8d]
#
# patch "packages/angstrom/angstrom-task-sectest.bb"
# from [0b52dec0b07a55dc09bbd4baefb5ac4ec3cab5b7]
# to [0df8c6eb7d44b4b09ee6daecc100e47abb3ede24]
#
# patch "packages/avahi/avahi.inc"
# from [03b0814e1e63c9be9351f7fae999fbddef477289]
# to [8b9c1e9f1c3c321d890f95dad3f772fd5e727b12]
#
# patch "packages/avahi/avahi_0.6.19.bb"
# from [d05ccdc8b01300ebcd02a122fc5e269a287b8749]
# to [80d86f2e2b46546f508edb4d277fa1ef7bceb3b7]
#
# patch "packages/avahi/avahi_0.6.20.bb"
# from [efe6d7c1e1a4684e2c363eb2dd156224be266a30]
# to [617eee50014403513ca14be25fd16c61c19bac14]
#
# patch "packages/avahi/avahi_0.6.21.bb"
# from [cac0fe1735df745ea9c7a235c47d4a31fcf7f7e1]
# to [5650246fb735e81ed906707d2b67bb821765b83c]
#
# patch "packages/tasks/task-base.bb"
# from [fe2979cb73be668163bfcc4d8438f2aef96d197b]
# to [f226a9b74f22d388d492ca278393475a549a6469]
#
# patch "packages/tasks/task-boot.bb"
# from [0a607d5e5b7ae509d565fbbb3b925a3b21b28292]
# to [c23c7a613f0b88d6f60bc742ec8af93640b7ebc7]
#
# patch "packages/tasks/task-dvb.bb"
# from [e97311dda09c583e443eb8d584d70013d5a9752a]
# to [d0b580515a75dbbdb39c4b7e4f845033652fca41]
#
# patch "packages/tasks/task-e-x11.bb"
# from [5d4cab35fb3d671aabdf25040e26d1b8c29ae706]
# to [6b5175734cf987a2e61042f94659d72151ac8838]
#
# patch "packages/tasks/task-gmae.bb"
# from [da0fc8581e2e382338b0673b4e59d4d4af906fff]
# to [bc361109a67390638c62cd8ad9951d21c26a3f06]
#
# patch "packages/tasks/task-gpe-apps.bb"
# from [f9b0521eb9c70cf4c727468de9f158d4862e3913]
# to [441eab197bd9798e82d054b10892ef79ea23c9c4]
#
# patch "packages/tasks/task-gpe-base.bb"
# from [248daeca565cf97b75e833c4dcd52f3d687f634e]
# to [ab132c0f7f2cb6b6cfb49188855c0c5345502b81]
#
# patch "packages/tasks/task-gpe-connectivity.bb"
# from [56c43e4bde77ad931eb095aadde525e8c8a325e4]
# to [66a16f3b25fa29c93f5f8c58dfcb6eb17ae71761]
#
# patch "packages/tasks/task-gpe-desktopapps.bb"
# from [81a2bc87d3c4d7f54827c23561a6a3d789f7db2b]
# to [fb7ce22094506055002c2309838eeeff2877f5eb]
#
# patch "packages/tasks/task-gpe-games.bb"
# from [5c5d0cd44736fa92600e96f9cbf0183021fa85dd]
# to [f2538ca710d41e9be3bce81471173111863558a2]
#
# patch "packages/tasks/task-gpe-pim.bb"
# from [820d21530a16077c66ee1e05f9b90d472c4829ff]
# to [45b2dc91fcf50d2b57117f70a762176a664f6ae4]
#
# patch "packages/tasks/task-gpe-sectest.bb"
# from [84fa13529206a1c3f88d6fdffc5da80b79bcd10c]
# to [01b6679530b92aa7e2abffbbd20421ac63960b09]
#
# patch "packages/tasks/task-gpe-settings.bb"
# from [e2954cba1dede6e2a966fbf9589afbd2de1cb6d7]
# to [22acf3e3699630d32f32ad8c00db79dd9bca992d]
#
# patch "packages/tasks/task-gpe-web.bb"
# from [0a675047bd8b7c48761317cbcded83167b1800d4]
# to [c8f046b12c0ba8dbf6d7510848ea437f21929e91]
#
# patch "packages/tasks/task-gpe.bb"
# from [cb4baeeea50ecdf6485cc9fdd8b4a96b6f2b00e2]
# to [6d67c2a586f7786deaf06a8760041f2b4f96e72e]
#
# patch "packages/tasks/task-gpephone.bb"
# from [8ad1cb7e128bf7c713a3601294598f2f45cbdbf2]
# to [32f3ddece27b455887f907603ffe167f70aaadd7]
#
# patch "packages/tasks/task-mokogateway.bb"
# from [cca68ea72f5d84032e651bc005390558dc96dcb5]
# to [5e12100a7a593a84f09f7bd4ebce36d0ba4865f8]
#
# patch "packages/tasks/task-mythfront.bb"
# from [99f682fdb8786fe44425466c0e958e57d9f4d0cf]
# to [9f4ca916db04dc5d9df509fd4ea8b7cbd368bfb9]
#
# patch "packages/tasks/task-opie-16mb.bb"
# from [c0a18727fc19ff18cf71d626b50d65ff16793273]
# to [3573b05667876fc3c7747ce95d4433bd8d14b416]
#
# patch "packages/tasks/task-opie-all.bb"
# from [f882913a23b727a2f228423837f49cd69400af8b]
# to [86ca8dc0275a5b8803e7637f1535121d73aa1fbb]
#
# patch "packages/tasks/task-opie-apps.bb"
# from [e192666adc8ea55dfd2d13880e39567451ff691b]
# to [a0cf1520578fa36ea0181cd808c6885c6cf7d8b5]
#
# patch "packages/tasks/task-opie-games.bb"
# from [16c0e4e90b8f2a1107b929ac2cb5ddb8abd15f10]
# to [62413c817012ca1ca8a7342ea3fae26b92672e23]
#
# patch "packages/tasks/task-opie.bb"
# from [3dd6719f9c7ba4832d9d3d9e23b649733e187673]
# to [33f680faf713d2b125f51eb210a4b761bb5784c2]
#
# patch "packages/tasks/task-proper-tools.bb"
# from [ef2689130c9052ea04a979f29a265f575b783aa0]
# to [19579ef6eea2dd2ffcf3fc6b9647a580c5f51cab]
#
# patch "packages/tasks/task-qpe.bb"
# from [067b3304f1e3f987b06d5928cff877b86572bc8e]
# to [3c20204c3ba7122687a68e5d4dcb334d32570826]
#
# patch "packages/tasks/task-sdl.bb"
# from [149ccaa5d730299d35fb73acc6d38481deba29ea]
# to [ccc842048039b23bb776391ae8290cc24e96148b]
#
# patch "packages/tasks/task-xfce-base.bb"
# from [2ba45c027c2fde294c2bb4ad584d788bc330038d]
# to [addec9b6129ccc1aa3a126f2d93a26c0dcc691ce]
#
# patch "packages/tasks/task-xterminal.bb"
# from [a90c170fd1a87a96fd18a14180b2abbc80d180c7]
# to [3d1ffb522b93aa212cfa3b349e262727063ac56c]
#
============================================================
--- packages/avahi/avahi-python_0.6.21.bb 3d4b1b5c3ed23ff0bab2bd72c1cdb67561178a56
+++ packages/avahi/avahi-python_0.6.21.bb 3d4b1b5c3ed23ff0bab2bd72c1cdb67561178a56
@@ -0,0 +1,14 @@
+require avahi.inc
+PR = "r0"
+
+# FIXME: without --enable-gtk, avahi-discover (pygtk) won't be built
+FILES_avahi-discover = ""
+
+PROVIDES = "avahi"
+DEPENDS += "python-native"
+
+SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1 \
+ file://configure-check-pymod.patch;patch=1"
+S = "${WORKDIR}/avahi-${PV}"
+
+AVAHI_PYTHON = "--enable-python"
============================================================
--- packages/avahi/files/configure-check-pymod.patch fb42206ea64396e348587b85e86e397a4a94004a
+++ packages/avahi/files/configure-check-pymod.patch fb42206ea64396e348587b85e86e397a4a94004a
@@ -0,0 +1,27 @@
+Index: avahi-0.6.21/configure.ac
+===================================================================
+--- avahi-0.6.21.orig/configure.ac 2007-08-16 21:36:12.000000000 +0200
++++ avahi-0.6.21/configure.ac 2007-08-16 21:45:14.000000000 +0200
+@@ -700,10 +700,6 @@
+ esac],
+ [HAVE_PYGTK=yes])
+
+- if test "x$HAVE_PYGTK" = "xyes" ; then
+- AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(Could not find Python module gtk)])
+- fi
+-
+
+ if test "x$HAVE_DBUS" = "xyes" ; then
+ AC_ARG_ENABLE(python-dbus,
+@@ -715,11 +711,6 @@
+ esac],
+ [HAVE_PYTHON_DBUS=yes])
+
+- if test "x$HAVE_PYTHON_DBUS" = "xyes"; then
+- AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find Python module dbus)])
+- fi
+-
+- AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)])
+ if test "x$HAVE_GDBM" = "xyes"; then
+ AM_CHECK_PYMOD(gdbm,,,[AC_MSG_ERROR(Could not find Python module gdbm)])
+ fi
============================================================
--- packages/xorg-app/sessreg_1.0.3.bb 01867a4953d810e2f0804b3354cfcb2a2ff73954
+++ packages/xorg-app/sessreg_1.0.3.bb 01867a4953d810e2f0804b3354cfcb2a2ff73954
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " virtual/libx11"
+
============================================================
--- packages/xorg-app/setxkbmap_1.0.4.bb 51d21b1d9395a9a3c45b74eb2f35d90d14b6f258
+++ packages/xorg-app/setxkbmap_1.0.4.bb 51d21b1d9395a9a3c45b74eb2f35d90d14b6f258
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxkbfile virtual/libx11"
+
============================================================
--- packages/xorg-app/xdm_1.1.6.bb 13b745771af2f8c3b3752f2d1017ad34f48d91bc
+++ packages/xorg-app/xdm_1.1.6.bb 13b745771af2f8c3b3752f2d1017ad34f48d91bc
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+PE = "1"
+
+DESCRIPTION = "X display manager"
+
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt"
+
+EXTRA_OECONF += " --with-random-device=/dev/urandom"
============================================================
--- packages/xorg-app/xmodmap_1.0.3.bb 3fab59376a8e08e17227a84ab1610760fca1276d
+++ packages/xorg-app/xmodmap_1.0.3.bb 3fab59376a8e08e17227a84ab1610760fca1276d
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
+LICENSE = "MIT"
+PE = "1"
============================================================
--- packages/xorg-app/xprop_1.0.3.bb 8572c25f6c26e8e8d5512f4b8183271f3cb8a081
+++ packages/xorg-app/xprop_1.0.3.bb 8572c25f6c26e8e8d5512f4b8183271f3cb8a081
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxmu virtual/libx11"
+
============================================================
--- packages/xorg-app/xrdb_1.0.4.bb 50cb61f5911a30c66e5aa43a50bad7edfac2a5f7
+++ packages/xorg-app/xrdb_1.0.4.bb 50cb61f5911a30c66e5aa43a50bad7edfac2a5f7
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "X server resource database utility"
+LICENSE = "xrdb"
+DEPENDS += "libxmu"
+PE = "1"
============================================================
--- packages/xorg-app/xsetroot_1.0.2.bb c84c12a9d20aa36a5ccb5fc39af4a91c858026d5
+++ packages/xorg-app/xsetroot_1.0.2.bb c84c12a9d20aa36a5ccb5fc39af4a91c858026d5
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "Sets the visual appearance of the X root window"
+LICENSE = "MIT"
+DEPENDS += "libxmu xbitmaps"
+PE = "1"
============================================================
--- packages/xorg-app/xvinfo_1.0.2.bb fe0a792dccad6a93c31149fed9582885467428e6
+++ packages/xorg-app/xvinfo_1.0.2.bb fe0a792dccad6a93c31149fed9582885467428e6
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "Print out X-Video extension adaptor information"
+DEPENDS += " libxv"
+PE = "1"
============================================================
--- packages/xorg-doc/xorg-sgml-doctools_1.2.bb 7a47d59f2ede9eabf6bd8d30f45dcc020b0dea84
+++ packages/xorg-doc/xorg-sgml-doctools_1.2.bb 7a47d59f2ede9eabf6bd8d30f45dcc020b0dea84
@@ -0,0 +1,8 @@
+require xorg-doc-common.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+FILES_${PN} += " /usr/share/X11/sgml"
============================================================
--- packages/xorg-driver/xf86-input-mouse_1.2.2.bb af8eb32d6b4525f9c5962de994c8bbb87154b4af
+++ packages/xorg-driver/xf86-input-mouse_1.2.2.bb af8eb32d6b4525f9c5962de994c8bbb87154b4af
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+PE = "1"
+
+DESCRIPTION = "Mouse Support in X11"
+
+#DEPENDS += " "
+
============================================================
--- packages/xorg-driver/xf86-video-ati_6.6.193.bb a5d730e0a406f5ff8c5e5388053285718be0b15d
+++ packages/xorg-driver/xf86-video-ati_6.6.193.bb a5d730e0a406f5ff8c5e5388053285718be0b15d
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
============================================================
--- packages/xorg-driver/xf86-video-nv_2.1.3.bb 7e13fbaf1644b16fa1b4445ea7812bbe2b0c1a19
+++ packages/xorg-driver/xf86-video-nv_2.1.3.bb 7e13fbaf1644b16fa1b4445ea7812bbe2b0c1a19
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
============================================================
--- packages/xorg-driver/xf86-video-savage_2.1.3.bb 431c6f688a9a38de51d5980ebe5f0bfd1693d54b
+++ packages/xorg-driver/xf86-video-savage_2.1.3.bb 431c6f688a9a38de51d5980ebe5f0bfd1693d54b
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " drm xf86driproto"
============================================================
--- packages/xorg-lib/diet-x11_1.1.3.bb 0b9ad63b2f6a6a514ffed24a05cbc8a348bbf82e
+++ packages/xorg-lib/diet-x11_1.1.3.bb 0b9ad63b2f6a6a514ffed24a05cbc8a348bbf82e
@@ -0,0 +1,8 @@
+require libx11_${PV}.bb
+
+SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
+ file://fix-disable-xlocale.diff;patch=1 \
+ file://fix-utf8-wrong-define.patch;patch=1"
+
+EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
============================================================
--- packages/xorg-lib/libice_1.0.4.bb fccec7b08bd14f0a08f831b0716cf3130db09a1e
+++ pack%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list