[oe-commits] org.oe.dev merge of '90c9a3c552c3bc731dad4d54e5e92acc8d37eb6d'
mickeyl commit
openembedded-commits at lists.openembedded.org
Wed Feb 13 11:27:19 UTC 2008
merge of '90c9a3c552c3bc731dad4d54e5e92acc8d37eb6d'
and 'f3ae86a7e3727c818dc1f9d62c2fe35ab49f951c'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 26932c1868d2c936be488a377a426a567f9b099b
ViewMTN: http://monotone.openembedded.org/revision/info/26932c1868d2c936be488a377a426a567f9b099b
Files:
1
packages/tslib/tslib/ts.conf
packages/tslib/tslib-1.0/bd-neon
packages/tslib/tslib/bd-neon
packages/tslib/tslib-1.0/fic-gta01
packages/tslib/tslib/fic-gta01
packages/tslib/tslib-1.0/ts.conf
packages/tslib/tslib-1.0/tslib-input_raw-grab_events.patch
packages/tslib/tslib/tslib-input_raw-grab_events.patch
packages/gnome/gconf-dbus/gconf-dbus-update.patch
packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch
packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch
packages/gnome/gconf-dbus_cvs.bb
packages/udev/udev-115/noasmlinkage.patch
packages/udev/udev-115
packages/udev/udev-118
packages/udev/udev_115.bb
packages/udev/udev_118.bb
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
packages/gnome/gconf-dbus_svn.bb
Diffs:
#
# mt diff -r90c9a3c552c3bc731dad4d54e5e92acc8d37eb6d -r26932c1868d2c936be488a377a426a567f9b099b
#
#
#
# delete "packages/tslib/tslib/ts.conf"
#
# rename "packages/tslib/tslib-1.0/bd-neon"
# to "packages/tslib/tslib/bd-neon"
#
# rename "packages/tslib/tslib-1.0/fic-gta01"
# to "packages/tslib/tslib/fic-gta01"
#
# rename "packages/tslib/tslib-1.0/ts.conf"
# to "packages/tslib/tslib/ts.conf"
#
# rename "packages/tslib/tslib-1.0/tslib-input_raw-grab_events.patch"
# to "packages/tslib/tslib/tslib-input_raw-grab_events.patch"
#
#
# mt diff -rf3ae86a7e3727c818dc1f9d62c2fe35ab49f951c -r26932c1868d2c936be488a377a426a567f9b099b
#
#
#
# delete "packages/gnome/gconf-dbus/gconf-dbus-update.patch"
#
# delete "packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch"
#
# delete "packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch"
#
# delete "packages/gnome/gconf-dbus_cvs.bb"
#
# delete "packages/udev/udev-115/noasmlinkage.patch"
#
# rename "packages/udev/udev-115"
# to "packages/udev/udev-118"
#
# rename "packages/udev/udev_115.bb"
# to "packages/udev/udev_118.bb"
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [f09fc00fcb956472364428627b653deb21fa27ae]
# to [e6538ea5a9a6fef243d6bee42554ee3b4846a5bf]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [a20012ca4a3de383c6062b1c564166182a18c681]
# to [458c1cdc7fdad7be3787a02fe3c5ab93a2b03733]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [fb163a1560e2e33896cf337a40acbf4fc419e625]
# to [06c680c836e1f326a6ad003d8e7198e317e64709]
#
# patch "packages/gnome/gconf-dbus_svn.bb"
# from [17c69da4bd130d92af8af24b002ef34409149a33]
# to [0ae937994dd634efb5800bcac5e79d9dcfb531b6]
#
# patch "packages/udev/udev_118.bb"
# from [7291914002cb179304f1fa3a8206dbf86247b426]
# to [ea5479f679eae83985b0d677a1317948a47e3ac4]
#
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc f09fc00fcb956472364428627b653deb21fa27ae
+++ conf/distro/include/preferred-om-2008-versions.inc e6538ea5a9a6fef243d6bee42554ee3b4846a5bf
@@ -1 +1,5 @@ PREFERRED_VERSION_vte = "0.16.10"
PREFERRED_VERSION_vte = "0.16.10"
+PREFERRED_VERSION_dbus = "1.1.4"
+PREFERRED_VERSION_udev = "118"
+PREFERRED_VERSION_busybox = "1.7.2"
+
============================================================
--- conf/distro/include/sane-srcdates.inc a20012ca4a3de383c6062b1c564166182a18c681
+++ conf/distro/include/sane-srcdates.inc 458c1cdc7fdad7be3787a02fe3c5ab93a2b03733
@@ -46,7 +46,6 @@ SRCDATE_gpesyncd ?= "20070701"
SRCDATE_gpesyncd ?= "20070701"
# GNOME
-SRCDATE_gconf-dbus ?= "20070512"
SRCDATE_gnome-vfs ?= "20060119"
SRCDATE_gtkhtml2 ?= "20060323"
============================================================
--- conf/distro/include/sane-srcrevs.inc fb163a1560e2e33896cf337a40acbf4fc419e625
+++ conf/distro/include/sane-srcrevs.inc 06c680c836e1f326a6ad003d8e7198e317e64709
@@ -23,7 +23,7 @@ SRCREV_pn-fstests ?= "204"
SRCREV_pn-epiphany ?= "7650"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
SRCREV_pn-fstests ?= "204"
-SRCREV_pn-gconf-dbus ?= "606"
+SRCREV_pn-gconf-dbus ?= "641"
SRCREV_pn-gnuradio ?= "6377"
SRCREV_pn-gpe-contacts ?= "9312"
SRCREV_pn-gsm0710muxd ?= "73"
============================================================
--- packages/gnome/gconf-dbus_svn.bb 17c69da4bd130d92af8af24b002ef34409149a33
+++ packages/gnome/gconf-dbus_svn.bb 0ae937994dd634efb5800bcac5e79d9dcfb531b6
@@ -1,39 +1,38 @@
-SECTION = "x11/utils"
+DESCRIPTION = "The GNOME Settings daemon using DBUS for communication."
DEPENDS = "intltool-native virtual/libintl glib-2.0 dbus dbus-glib libxml2 popt gtk-doc-native"
-DESCRIPTION = "Settings daemon using DBUS for communication."
LICENSE = "GPL"
+SECTION = "x11/utils"
PROVIDES = "gconf"
RPROVIDES_${PN} = "gconf"
RPROVIDES_${PN}-dev = "gconf-dev"
-
PV = "2.16.0+svnr${SRCREV}"
-PR = "r5"
+PR = "r0"
+inherit autotools pkgconfig
+
SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
- file://69gconfd-dbus"
-
-inherit pkgconfig autotools
+ file://69gconfd-dbus"
S = "${WORKDIR}/trunk"
PARALLEL_MAKE = ""
-FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
-FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
-FILES_${PN}-dev += "${libdir}/GConf-dbus/2/*.la ${datadir}/sgml/gconf/gconf-1.0.dtd"
+EXTRA_OECONF = "--with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static"
-EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static"
-
-
do_configure_prepend() {
- touch gtk-doc.make
+ touch gtk-doc.make
}
do_stage() {
- autotools_stage_all
- install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
+ autotools_stage_all
+ install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
}
-do_install_append () {
+do_install_append() {
install -d ${D}/${sysconfdir}/X11/Xsession.d
install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
}
+
+FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
+FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
+FILES_${PN}-dev += "${libdir}/GConf-dbus/2/*.la ${datadir}/sgml/gconf/gconf-1.0.dtd"
+
============================================================
--- packages/udev/udev_115.bb 7291914002cb179304f1fa3a8206dbf86247b426
+++ packages/udev/udev_118.bb ea5479f679eae83985b0d677a1317948a47e3ac4
@@ -7,13 +7,13 @@ DEFAULT_PREFERENCE = "-115"
DEFAULT_PREFERENCE = "-115"
-SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
- file://noasmlinkage.patch;patch=1 \
- file://flags.patch;patch=1 \
- file://vol_id_ld.patch;patch=1 \
- file://udevtrigger_add_devname_filtering.patch;patch=1 \
- file://mount.blacklist \
- "
+SRC_URI = "\
+ http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+ file://flags.patch;patch=1 \
+ file://vol_id_ld.patch;patch=1 \
+ file://udevtrigger_add_devname_filtering.patch;patch=1 \
+ file://mount.blacklist \
+"
require udev.inc
@@ -24,6 +24,10 @@ EXTRA_OEMAKE += "libudevdir=/lib/udev li
UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix="
+do_compile_prepend() {
+ sed -i s,asmlinkage,, *.c
+}
+
do_install () {
install -d ${D}${usrsbindir} \
${D}${sysconfdir} \
More information about the Openembedded-commits
mailing list