diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-05 20:07:23 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-13 12:15:27 +0000 |
commit | 22ddc76b2fded4f8c62872d7644ae4c6e9f96bcb (patch) | |
tree | f8b30526a682d464b48bfd568480b8e31e1b56af | |
parent | b26b8f4f23f638651886cd29e969cdefb591eb74 (diff) | |
download | poky-22ddc76b2fded4f8c62872d7644ae4c6e9f96bcb.tar.gz |
gconf-dbus: Convert to BBCLASSEXTEND and drop custom staging append since its no longer needed
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r-- | meta/packages/gnome/gconf-dbus-native_svn.bb | 30 | ||||
-rw-r--r-- | meta/packages/gnome/gconf-dbus_svn.bb | 8 |
2 files changed, 3 insertions, 35 deletions
diff --git a/meta/packages/gnome/gconf-dbus-native_svn.bb b/meta/packages/gnome/gconf-dbus-native_svn.bb deleted file mode 100644 index 38109634a1..0000000000 --- a/meta/packages/gnome/gconf-dbus-native_svn.bb +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | SECTION = "x11/utils" | ||
2 | DEPENDS = "intltool-native glib-2.0-native dbus-native dbus-glib-native libxml2-native popt-native gtk-doc-native" | ||
3 | DESCRIPTION = "Settings daemon using DBUS for communication." | ||
4 | LICENSE = "GPL" | ||
5 | PROVIDES = "gconf-native" | ||
6 | RPROVIDES_${PN} = "gconf-native" | ||
7 | |||
8 | PV = "2.16.0+svnr${SRCREV}" | ||
9 | |||
10 | SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http" | ||
11 | |||
12 | inherit pkgconfig autotools native | ||
13 | S = "${WORKDIR}/trunk" | ||
14 | |||
15 | PARALLEL_MAKE = "" | ||
16 | |||
17 | FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*" | ||
18 | FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug" | ||
19 | |||
20 | EXTRA_OECONF = "--disable-gtk-doc --disable-gtk --enable-shared --disable-static --enable-debug=yes" | ||
21 | |||
22 | |||
23 | do_configure_prepend() { | ||
24 | touch gtk-doc.make | ||
25 | } | ||
26 | |||
27 | do_stage() { | ||
28 | autotools_stage_all | ||
29 | install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4 | ||
30 | } | ||
diff --git a/meta/packages/gnome/gconf-dbus_svn.bb b/meta/packages/gnome/gconf-dbus_svn.bb index 4e587295f6..61d46793b8 100644 --- a/meta/packages/gnome/gconf-dbus_svn.bb +++ b/meta/packages/gnome/gconf-dbus_svn.bb | |||
@@ -10,7 +10,7 @@ PV = "2.16.0+svnr${SRCREV}" | |||
10 | 10 | ||
11 | SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http" | 11 | SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http" |
12 | 12 | ||
13 | inherit pkgconfig autotools | 13 | inherit pkgconfig autotools_stage |
14 | S = "${WORKDIR}/trunk" | 14 | S = "${WORKDIR}/trunk" |
15 | 15 | ||
16 | PARALLEL_MAKE = "" | 16 | PARALLEL_MAKE = "" |
@@ -25,7 +25,5 @@ do_configure_prepend() { | |||
25 | touch gtk-doc.make | 25 | touch gtk-doc.make |
26 | } | 26 | } |
27 | 27 | ||
28 | do_stage() { | 28 | BBCLASSEXTEND = "native" |
29 | autotools_stage_all | 29 | |
30 | install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4 | ||
31 | } | ||