[oe-commits] org.oe.dev merge of '95849379549ff4dd11d6dd203053b1bd43f8ab26'
koen commit
openembedded-commits at lists.openembedded.org
Mon Aug 27 13:13:49 UTC 2007
merge of '95849379549ff4dd11d6dd203053b1bd43f8ab26'
and 'fd79f1d31b405d2489723f78bb2e2479e44b0e5b'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 23ca474a9b8158ff4608c0bbd8ce769d4e3d9348
ViewMTN: http://monotone.openembedded.org/revision.psp?id=23ca474a9b8158ff4608c0bbd8ce769d4e3d9348
Files:
1
conf/distro/include/angstrom.inc
packages/xserver-common/xserver-common_1.10.bb
packages/xserver-common/xserver-common_1.3.bb
packages/xserver-common/xserver-common_1.8.bb
packages/xserver-common/xserver-common_1.9.bb
packages/xserver-common/xserver-common_1.17.bb
packages/xserver-common/xserver-common_1.18.bb
packages/portmap/portmap-6.0
packages/alsa/alsa-lib/unbreak_plugindir.patch
packages/alsa/alsa-lib_1.0.14.bb
packages/alsa/alsa-oss_1.0.14.bb
packages/alsa/alsa-utils_1.0.14.bb
packages/portmap/portmap-6.0/destdir-no-strip.patch
packages/portmap/portmap-6.0/no-libwrap.patch
packages/portmap/portmap-6.0/no-tcpd-support.patch
packages/portmap/portmap_6.0.bb
conf/distro/angstrom-2007.1.conf
packages/avahi/avahi-python_0.6.21.bb
packages/avahi/avahi.inc
packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch
packages/fbreader/fbreader_0.8.2a.bb
packages/lm_sensors/lmsensors-apps_2.10.1.bb
packages/portmap/portmap.inc
Diffs:
#
# mt diff -r95849379549ff4dd11d6dd203053b1bd43f8ab26 -r23ca474a9b8158ff4608c0bbd8ce769d4e3d9348
#
#
#
# patch "conf/distro/include/angstrom.inc"
# from [cd8e6ee81497e36eceda2ade49b5706c6f03d464]
# to [043bdb9ee8805eeed9861b06795cf28aa5761f77]
#
============================================================
--- conf/distro/include/angstrom.inc cd8e6ee81497e36eceda2ade49b5706c6f03d464
+++ conf/distro/include/angstrom.inc 043bdb9ee8805eeed9861b06795cf28aa5761f77
@@ -210,6 +210,54 @@ DISTRO_CHECK := "${@bb.data.getVar("DIST
# Angstrom *always* has some form of release config, so error out if someone thinks he knows better
DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
+
+# Configuration for tinderbox, so people only need:
+# INHERIT += "tinderclient"
+# in their local.conf
+
+#Name of the client
+TINDER_MACHINE = "${MACHINE}-${ANGSTROM_MODE}-build-image"
+
+# Which lof file to write to, which tree to report to
+TINDER_LOG = "${TMPDIR}/tinder.log"
+TINDER_TREE = "Angstrom"
+
+# HTTP posting
+TINDER_HOST ?= "ewi546.ewi.utwente.nl"
+TINDER_URL ?= "/tinderbox"
+
+# Which branch do we build
+TINDER_BRANCH = "org.openembedded.dev"
+
+## Clobbing
+## 0 for rebuilding everything from scratch
+## 1 for incremental builds
+TINDER_CLOBBER = "1"
+TINDER_AUTOBUILD = "1"
+
+## Do a report at all
+TINDER_REPORT = "1"
+
+# Configuration for seppuku autobuilder, people only need to put:
+# INHERIT += "seppuku"
+# SEPPUKU_USER = "your_bugzilla at user.id"
+# SEPPUKU_PASS = "your_bugzilla_password"
+# in their local.conf
+
+# seppuku bbclass
+SEPPUKU_LOGIN = "http://bugs.openembedded.org/query.cgi?"
+SEPPUKU_QUERY = "http://bugs.openembedded.org/buglist.cgi?"
+SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+SEPPUKU_ADDCOMMENT = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"SEPPUKU_ATTACHMENT = "http://bugs.openembedded.org/attachment.cgi?"
+SEPPUKU_AUTOBUILD = "1"
+
+SEPPUKU_PRODUCT = "Openembedded"
+SEPPUKU_COMPONENT = "build"
+
+
+
+
+
# We want images supporting the following features (for task-base)
DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci"
DISTRO_FEATURES_nslu2 = "nfs smbfs alsa bluetooth ext2 usbhost pci"
#
# mt diff -rfd79f1d31b405d2489723f78bb2e2479e44b0e5b -r23ca474a9b8158ff4608c0bbd8ce769d4e3d9348
#
#
#
# delete "packages/xserver-common/xserver-common_1.10.bb"
#
# delete "packages/xserver-common/xserver-common_1.3.bb"
#
# delete "packages/xserver-common/xserver-common_1.8.bb"
#
# delete "packages/xserver-common/xserver-common_1.9.bb"
#
# rename "packages/xserver-common/xserver-common_1.17.bb"
# to "packages/xserver-common/xserver-common_1.18.bb"
#
# add_dir "packages/portmap/portmap-6.0"
#
# add_file "packages/alsa/alsa-lib/unbreak_plugindir.patch"
# content [a16e20ebbbcde514ae86abd3664bf70c4279e5e3]
#
# add_file "packages/alsa/alsa-lib_1.0.14.bb"
# content [60431b66fbe642b84eebb662e02f977ce4cf8e9d]
#
# add_file "packages/alsa/alsa-oss_1.0.14.bb"
# content [7ca8c991dd2976fe24201983328f2b96c073e203]
#
# add_file "packages/alsa/alsa-utils_1.0.14.bb"
# content [a96036a12ca994ce724e4448bb897a719e94a500]
#
# add_file "packages/portmap/portmap-6.0/destdir-no-strip.patch"
# content [f8c1fc10af211a706c2d9e98872ddaaeef1c165e]
#
# add_file "packages/portmap/portmap-6.0/no-libwrap.patch"
# content [fc32321b7bf0534d84414d6f1aac381c2ff2475f]
#
# add_file "packages/portmap/portmap-6.0/no-tcpd-support.patch"
# content [e0c8679553ae5264003fc7b888634771ed4c4f3d]
#
# add_file "packages/portmap/portmap_6.0.bb"
# content [ca392f1e64fd7197d9e3a2fda7b4573b8ca5f289]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [4d18aa56eca5e569ebbf0b616734cb7b5ca678fe]
# to [854daa8fca5bd432a53da00b9cfe542bb9051a48]
#
# patch "packages/avahi/avahi-python_0.6.21.bb"
# from [3d4b1b5c3ed23ff0bab2bd72c1cdb67561178a56]
# to [91ec6e3aec765ad2c28ed09baa8424126d0b5baa]
#
# patch "packages/avahi/avahi.inc"
# from [8b9c1e9f1c3c321d890f95dad3f772fd5e727b12]
# to [caffb4223742bd86a6d49f717b86d9172d22e5e6]
#
# patch "packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch"
# from [fc88b8e91f46ae81818e65b7ee832fc7b3db915f]
# to [8b922bc76887bc8127d62d1af083f6868a493c90]
#
# patch "packages/fbreader/fbreader_0.8.2a.bb"
# from [bfe9fc8a8216d59eb9cfb3b1456b94f3ee163ef2]
# to [d21eeca9a1bb496e84541d55957587838aaa33e9]
#
# patch "packages/lm_sensors/lmsensors-apps_2.10.1.bb"
# from [77da97f05946e612c7e93275f599fd5891b3876c]
# to [cfb415f977c0f9b8a4e012bd39fe5df35f0e6b2b]
#
# patch "packages/portmap/portmap.inc"
# from [fe3c7fd20199a597bf47cca11fec9bcafa5bc049]
# to [03a075d623238bc9402ae2882f8f05d638c80ab6]
#
============================================================
--- packages/alsa/alsa-lib/unbreak_plugindir.patch a16e20ebbbcde514ae86abd3664bf70c4279e5e3
+++ packages/alsa/alsa-lib/unbreak_plugindir.patch a16e20ebbbcde514ae86abd3664bf70c4279e5e3
@@ -0,0 +1,12 @@
+diff -Nur alsa-lib-1.0.14.orig/configure.in alsa-lib-1.0.14/configure.in
+--- alsa-lib-1.0.14.orig/configure.in 2007-05-31 03:05:13.000000000 -0500
++++ alsa-lib-1.0.14/configure.in 2007-08-18 13:05:49.000000000 -0500
+@@ -93,7 +93,7 @@
+ esac
+ plugindir="$dir/$PACKAGE"
+ fi
+-AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "plugindir", [directory containing ALSA add-on modules])
++AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "${plugindir}", [directory containing ALSA add-on modules])
+ ALSA_PLUGIN_DIR="$plugindir"
+ AC_SUBST(ALSA_PLUGIN_DIR)
+
============================================================
--- packages/alsa/alsa-lib_1.0.14.bb 60431b66fbe642b84eebb662e02f977ce4cf8e9d
+++ packages/alsa/alsa-lib_1.0.14.bb 60431b66fbe642b84eebb662e02f977ce4cf8e9d
@@ -0,0 +1,44 @@
+DESCRIPTION = "Alsa sound library"
+HOMEPAGE = "http://www.alsa-project.org"
+SECTION = "libs/multimedia"
+LICENSE = "GPL"
+
+PR = "r1"
+
+# configure.in sets -D__arm__ on the command line for any arm system
+# (not just those with the ARM instruction set), this should be removed,
+# (or replaced by a permitted #define).
+#FIXME: remove the following
+ARM_INSTRUCTION_SET = "arm"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
+ file://fix-tstamp-declaration.patch;patch=1 \
+ file://unbreak_plugindir.patch;patch=1"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes"
+
+do_stage () {
+ oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/
+ install -d ${STAGING_INCDIR}/alsa/sound
+ install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/
+ install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/
+ install -d ${STAGING_DATADIR}/aclocal
+ install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev"
+FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
+FILES_libasound = "${libdir}/libasound.so.*"
+FILES_alsa-server = "${bindir}/*"
+FILES_alsa-conf = "${datadir}/alsa/"
+FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
+FILES_alsa-conf-base = "\
+${datadir}/alsa/alsa.conf \
+${datadir}/alsa/cards/aliases.conf \
+${datadir}/alsa/pcm/default.conf \
+${datadir}/alsa/pcm/dmix.conf \
+${datadir}/alsa/pcm/dsnoop.conf"
+
+RDEPENDS_libasound = "alsa-conf-base"
============================================================
--- packages/alsa/alsa-oss_1.0.14.bb 7ca8c991dd2976fe24201983328f2b96c073e203
+++ packages/alsa/alsa-oss_1.0.14.bb 7ca8c991dd2976fe24201983328f2b96c073e203
@@ -0,0 +1,17 @@
+DESCRIPTION = "Alsa OSS Compatibility Package"
+SECTION = "libs/multimedia"
+LICENSE = "GPL"
+DEPENDS = "alsa-lib"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2"
+
+inherit autotools
+
+do_configure_prepend () {
+ touch NEWS README AUTHORS ChangeLog
+}
+
+do_stage () {
+ oe_libinstall -C alsa -a -so libaoss ${STAGING_LIBDIR}
+ oe_libinstall -C alsa -a -so libalsatoss ${STAGING_LIBDIR}
+}
============================================================
--- packages/alsa/alsa-utils_1.0.14.bb a96036a12ca994ce724e4448bb897a719e94a500
+++ packages/alsa/alsa-utils_1.0.14.bb a96036a12ca994ce724e4448bb897a719e94a500
@@ -0,0 +1,61 @@
+DESCRIPTION = "ALSA Utilities"
+HOMEPAGE = "http://www.alsa-project.org"
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "alsa-lib ncurses"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
+
+# lazy hack. needs proper fixing in gettext.m4, see
+# http://bugs.openembedded.org/show_bug.cgi?id=2348
+# please close bug and remove this comment when properly fixed
+#
+EXTRA_OECONF_linux-uclibc = "--disable-nls"
+EXTRA_OECONF_linux-uclibcgnueabi = "--disable-nls"
+
+inherit autotools
+
+# This are all packages that we need to make. Also, the now empty alsa-utils
+# ipk depend on them.
+
+PACKAGES += "\
+ alsa-utils-alsamixer \
+ alsa-utils-midi \
+ alsa-utils-aplay \
+ alsa-utils-amixer \
+ alsa-utils-aconnect \
+ alsa-utils-iecset \
+ alsa-utils-speakertest \
+ alsa-utils-aseqnet \
+ alsa-utils-aseqdump \
+ alsa-utils-alsaconf \
+ alsa-utils-alsactl "
+
+# We omit alsaconf, because
+# a) this is a bash script
+# b) it creates config files not suitable for OE-based distros
+
+FILES_${PN} = ""
+FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord"
+FILES_alsa-utils-amixer = "${bindir}/amixer"
+FILES_alsa-utils-alsamixer = "${bindir}/alsamixer"
+FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/"
+FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi"
+FILES_alsa-utils-aconnect = "${bindir}/aconnect"
+FILES_alsa-utils-aseqnet = "${bindir}/aseqnet"
+FILES_alsa-utils-iecset = "${bindir}/iecset"
+FILES_alsa-utils-alsactl = "${sbindir}/alsactl"
+FILES_alsa-utils-aseqdump = "${bindir}/aseqdump"
+FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf"
+
+DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA"
+DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings"
+DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings"
+DESCRIPTION_alsa-utils-speakertest = "ALSA surround speaker test utility"
+DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA"
+DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager"
+DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer"
+DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state"
+DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files"
+
+ALLOW_EMPTY_alsa-utils = "1"
============================================================
--- packages/portmap/portmap-6.0/destdir-no-strip.patch f8c1fc10af211a706c2d9e98872ddaaeef1c165e
+++ packages/portmap/portmap-6.0/destdir-no-strip.patch f8c1fc10af211a706c2d9e98872ddaaeef1c165e
@@ -0,0 +1,44 @@
+From: Mike Frysinger <vapier at gentoo.org>
+Date: Sun, 13 May 2007 21:15:12 +0000 (-0400)
+Subject: respect DESTDIR and dont use -s with install
+X-Git-Url: http://neil.brown.name/git?p=portmap;a=commitdiff_plain;h=603c59b978c04df2354f68d4a2dc676a758ff46d
+
+respect DESTDIR and dont use -s with install
+
+$(DESTDIR) is the standard for installing into other trees, not $(BASEDIR) ...
+so I've converted the Makefile to use that. I've also left in $(BASEDIR) as a
+default to support old installs; not sure if you'd just cut it.
+
+Stripping should be left to the person to handle, not automatically done by
+the install step. Also, `install -s` always calls `strip` which is
+wrong/undesired in cross-compiling scenarios.
+
+Signed-off-by: Mike Frysinger <vapier at gentoo.org>
+Signed-off-by: Neil Brown <neilb at suse.de>
+---
+
+diff --git a/Makefile b/Makefile
+index 9e9a4b4..5343428 100644
+--- a/Makefile
++++ b/Makefile
+@@ -135,13 +135,14 @@ from_local: CPPFLAGS += -DTEST
+ portmap.man : portmap.8
+ sed $(MAN_SED) < portmap.8 > portmap.man
+
++DESTDIR = $(BASEDIR)
+ install: all
+- install -o root -g root -m 0755 -s portmap ${BASEDIR}/sbin
+- install -o root -g root -m 0755 -s pmap_dump ${BASEDIR}/sbin
+- install -o root -g root -m 0755 -s pmap_set ${BASEDIR}/sbin
+- install -o root -g root -m 0644 portmap.man ${BASEDIR}/usr/share/man/man8/portmap.8
+- install -o root -g root -m 0644 pmap_dump.8 ${BASEDIR}/usr/share/man/man8
+- install -o root -g root -m 0644 pmap_set.8 ${BASEDIR}/usr/share/man/man8
++ install -o root -g root -m 0755 portmap $(DESTDIR)/sbin
++ install -o root -g root -m 0755 pmap_dump $(DESTDIR)/sbin
++ install -o root -g root -m 0755 pmap_set $(DESTDIR)/sbin
++ install -o root -g root -m 0644 portmap.man $(DESTDIR)/usr/share/man/man8/portmap.8
++ install -o root -g root -m 0644 pmap_dump.8 $(DESTDIR)/usr/share/man/man8
++ install -o root -g root -m 0644 pmap_set.8 $(DESTDIR)/usr/share/man/man8
+
+ clean:
+ rm -f *.o portmap pmap_dump pmap_set from_local \
============================================================
--- packages/portmap/portmap-6.0/no-libwrap.patch fc32321b7bf0534d84414d6f1aac381c2ff2475f
+++ packages/portmap/portmap-6.0/no-libwrap.patch fc32321b7bf0534d84414d6f1aac381c2ff2475f
@@ -0,0 +1,15 @@
+Index: Makefile
+===================================================================
+--- Makefile.orig 2007-05-15 16:00:17.000000000 +0200
++++ Makefile 2007-05-15 16:00:55.000000000 +0200
+@@ -19,8 +19,8 @@
+ # USE_DNS to add hostname tests in hosts.allow/deny.
+
+ ifeq ($(NO_TCP_WRAPPER),)
+-CPPFLAGS += -DHOSTS_ACCESS
+-WRAP_LIB = -lwrap
++#CPPFLAGS += -DHOSTS_ACCESS
++#WRAP_LIB = -lwrap
+ ifdef USE_DNS
+ CPPFLAGS += -DENABLE_DNS
+ MAN_SED += -e 's/USE_DNS/yes/'
============================================================
--- packages/portmap/portmap-6.0/no-tcpd-support.patch e0c8679553ae5264003fc7b888634771ed4c4f3d
+++ packages/portmap/portmap-6.0/no-tcpd-support.patch e0c8679553ae5264003fc7b888634771ed4c4f3d
@@ -0,0 +1,28 @@
+From: Mike Frysinger <vapier at gentoo.org>
+Date: Sun, 13 May 2007 21:17:32 +0000 (-0400)
+Subject: fix building with tcpd support disabled
+X-Git-Url: http://neil.brown.name/git?p=portmap;a=commitdiff_plain;h=7847207aed1b44faf077eed14a9ac9c68244eba5
+
+fix building with tcpd support disabled
+
+Make sure pmap_check.c only includes tcpd.h when HOSTS_ACCESS is defined.
+
+Signed-off-by: Timothy Redaelli <drizzt at gentoo.org>
+Signed-off-by: Mike Frysinger <vapier at gentoo.org>
+Signed-off-by: Neil Brown <neilb at suse.de>
+---
+
+diff --git a/pmap_check.c b/pmap_check.c
+index 84f2c12..443a822 100644
+--- a/pmap_check.c
++++ b/pmap_check.c
+@@ -44,7 +44,9 @@
+ #include <netinet/in.h>
+ #include <rpc/rpcent.h>
+ #endif
++#ifdef HOSTS_ACCESS
+ #include <tcpd.h>
++#endif
+ #include <arpa/inet.h>
+ #include <grp.h>
+
============================================================
--- packages/portmap/portmap_6.0.bb ca392f1e64fd7197d9e3a2fda7b4573b8ca5f289
+++ packages/portmap/portmap_6.0.bb ca392f1e64fd7197d9e3a2fda7b4573b8ca5f289
@@ -0,0 +1,18 @@
+require portmap.inc
+
+SRC_URI = "http://neil.brown.name/portmap/portmap-6.0.tgz \
+ file://destdir-no-strip.patch;patch=1 \
+ file://no-tcpd-support.patch;patch=1 \
+ file://no-libwrap.patch;patch=1;pnum=0 \
+ file://portmap.init "
+
+S = "${WORKDIR}/${PN}_${PV}/"
+
+CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS"
+
+fakeroot do_install() {
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
+ install -d ${D}${mandir}/man8/ ${D}${base_sbindir}
+ oe_runmake install DESTDIR=${D}
+}
============================================================
--- conf/distro/angstrom-2007.1.conf 4d18aa56eca5e569ebbf0b616734cb7b5ca678fe
+++ conf/distro/angstrom-2007.1.conf 854daa8fca5bd432a53da00b9cfe542bb9051a48
@@ -220,8 +220,6 @@ RDEPENDS_kernel-base_htcuniversal = ""
RDEPENDS_kernel-base_hx4700 = ""
RDEPENDS_kernel-base_htcuniversal = ""
-PREFERRED_VERSION_linux_at91sam9263ek ?= "2.6.20"
-
# Needed for crappy ipaqs with broken hostap in the kernel
PREFERRED_VERSION_hostap-modules ?= "0.4.7"
PREFERRED_VERSION_hostap-utils ?= "0.4.7"
@@ -249,6 +247,8 @@ PREFERRED_VERSION_osb-nrcore = "0.
PREFERRED_VERSION_osb-nrcit = "0.5.2+svn${SRCDATE}"
PREFERRED_VERSION_osb-nrcore = "0.5.2+svn${SRCDATE}"
+PREFERRED_PROVIDER_avahi = "avahi"
+
#Small machines prefer kdrive, but we might ship full Xorg in other images
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
============================================================
--- packages/avahi/avahi-python_0.6.21.bb 3d4b1b5c3ed23ff0bab2bd72c1cdb67561178a56
+++ packages/avahi/avahi-python_0.6.21.bb 91ec6e3aec765ad2c28ed09baa8424126d0b5baa
@@ -11,4 +11,8 @@ S = "${WORKDIR}/avahi-${PV}"
file://configure-check-pymod.patch;patch=1"
S = "${WORKDIR}/avahi-${PV}"
+RDEPENDS_avahi-discover = "python-avahi python-pygtk"
+RDEPENDS_python-avahi = "python-dbus"
+PACKAGES =+ "python-avahi"
+
AVAHI_PYTHON = "--enable-python"
============================================================
--- packages/avahi/avahi.inc 8b9c1e9f1c3c321d890f95dad3f772fd5e727b12
+++ packages/avahi/avahi.inc caffb4223742bd86a6d49f717b86d9172d22e5e6
@@ -12,8 +12,6 @@ RDEPENDS_avahi-autoipd = "update-rc.d"
RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns"
RDEPENDS_avahi-daemon = "sysvinit-pidof update-rc.d"
RDEPENDS_avahi-autoipd = "update-rc.d"
-RDEPENDS_avahi-discover = "python-avahi python-pygtk"
-RDEPENDS_python-avahi = "python-dbus"
SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
file://00avahi-autoipd file://99avahi-autoipd"
@@ -28,7 +26,7 @@ AVAHI_GTK = "--disable-gtk"
AVAHI_PYTHON = "--disable-python"
AVAHI_GTK = "--disable-gtk"
-PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils python-avahi"
+PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils"
FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
============================================================
--- packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch fc88b8e91f46ae81818e65b7ee832fc7b3d%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list