diff options
author | Ross Burton <ross@openedhand.com> | 2008-09-26 08:55:15 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2008-09-26 08:55:15 +0000 |
commit | 75f3f9bb6d823faec884569400f9dcb6c28ef732 (patch) | |
tree | d5d5ba3b7b351c091d771a5ce9ee4df65abc77da | |
parent | 148459e611bd67fc99f29146f95403ecacbd3793 (diff) | |
download | poky-75f3f9bb6d823faec884569400f9dcb6c28ef732.tar.gz |
Merged revisions 5177-5178,5181,5183,5185,5187 via svnmerge from
https://svn.o-hand.com/repos/poky/trunk
........
r5177 | richard | 2008-09-10 23:29:43 +0100 (Wed, 10 Sep 2008) | 1 line
package.bbclass: Adjust to handle split packages already being present in PACKAGES
........
r5178 | richard | 2008-09-10 23:32:22 +0100 (Wed, 10 Sep 2008) | 1 line
gst-plugins-good: Remove bogus RPROVIDES and add to PACKAGES instead now the package class can handle this
........
r5181 | richard | 2008-09-11 12:00:49 +0100 (Thu, 11 Sep 2008) | 1 line
poky-eabi.inc/poky-fixed-revisions.inc: Bump the matchbox-wm-2 revision and remove from the asneeded blacklist
........
r5183 | richard | 2008-09-11 16:43:25 +0100 (Thu, 11 Sep 2008) | 1 line
eds-dbus: Add missing DEPENDS on libglade
........
r5185 | ross | 2008-09-11 17:07:38 +0100 (Thu, 11 Sep 2008) | 1 line
eds-dbus: package the glade files into libedataserverui
........
r5187 | ross | 2008-09-11 17:57:47 +0100 (Thu, 11 Sep 2008) | 1 line
eds-dbus: add libedataserverui to PACKAGES, fixing the borked packaging
........
git-svn-id: https://svn.o-hand.com/repos/poky/branches/elroy@5283 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r-- | meta/classes/package.bbclass | 5 | ||||
-rw-r--r-- | meta/conf/distro/include/poky-eabi.inc | 1 | ||||
-rw-r--r-- | meta/conf/distro/include/poky-fixed-revisions.inc | 2 | ||||
-rw-r--r-- | meta/packages/eds/eds-dbus_svn.bb | 9 | ||||
-rw-r--r-- | meta/packages/gstreamer/gst-plugins-good_0.10.9.bb | 4 |
5 files changed, 10 insertions, 11 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 1732a114f4..a267403295 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -79,6 +79,8 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst | |||
79 | packages = [pkg] + packages | 79 | packages = [pkg] + packages |
80 | else: | 80 | else: |
81 | packages.append(pkg) | 81 | packages.append(pkg) |
82 | oldfiles = bb.data.getVar('FILES_' + pkg, d, 1) | ||
83 | if not oldfiles: | ||
82 | the_files = [os.path.join(root, o)] | 84 | the_files = [os.path.join(root, o)] |
83 | if aux_files_pattern: | 85 | if aux_files_pattern: |
84 | if type(aux_files_pattern) is list: | 86 | if type(aux_files_pattern) is list: |
@@ -106,9 +108,6 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst | |||
106 | if postrm: | 108 | if postrm: |
107 | bb.data.setVar('pkg_postrm_' + pkg, postrm, d) | 109 | bb.data.setVar('pkg_postrm_' + pkg, postrm, d) |
108 | else: | 110 | else: |
109 | oldfiles = bb.data.getVar('FILES_' + pkg, d, 1) | ||
110 | if not oldfiles: | ||
111 | bb.fatal("Package '%s' exists but has no files" % pkg) | ||
112 | bb.data.setVar('FILES_' + pkg, oldfiles + " " + os.path.join(root, o), d) | 111 | bb.data.setVar('FILES_' + pkg, oldfiles + " " + os.path.join(root, o), d) |
113 | if callable(hook): | 112 | if callable(hook): |
114 | hook(f, pkg, file_regex, output_pattern, m.group(1)) | 113 | hook(f, pkg, file_regex, output_pattern, m.group(1)) |
diff --git a/meta/conf/distro/include/poky-eabi.inc b/meta/conf/distro/include/poky-eabi.inc index f22a0ed02d..135012404c 100644 --- a/meta/conf/distro/include/poky-eabi.inc +++ b/meta/conf/distro/include/poky-eabi.inc | |||
@@ -42,6 +42,5 @@ ASNEEDED_pn-xserver-kdrive-xomap = "" | |||
42 | ASNEEDED_pn-minimo = "" | 42 | ASNEEDED_pn-minimo = "" |
43 | ASNEEDED_pn-pciutils = "" | 43 | ASNEEDED_pn-pciutils = "" |
44 | ASNEEDED_pn-puzzles = "" | 44 | ASNEEDED_pn-puzzles = "" |
45 | ASNEEDED_pn-matchbox-wm-2 = "" | ||
46 | 45 | ||
47 | TARGET_LDFLAGS += "${ASNEEDED}" | 46 | TARGET_LDFLAGS += "${ASNEEDED}" |
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc index f78c2f45d8..322b822fdd 100644 --- a/meta/conf/distro/include/poky-fixed-revisions.inc +++ b/meta/conf/distro/include/poky-fixed-revisions.inc | |||
@@ -55,7 +55,7 @@ SRCREV_pn-matchbox-terminal ?= "1612" | |||
55 | SRCREV_pn-matchbox-theme-sato-2 ?= "94" | 55 | SRCREV_pn-matchbox-theme-sato-2 ?= "94" |
56 | SRCREV_pn-matchbox-theme-sato ?= "90" | 56 | SRCREV_pn-matchbox-theme-sato ?= "90" |
57 | SRCREV_pn-matchbox-themes-extra ?= "1524" | 57 | SRCREV_pn-matchbox-themes-extra ?= "1524" |
58 | SRCREV_pn-matchbox-wm-2 ?= "2072" | 58 | SRCREV_pn-matchbox-wm-2 ?= "2073" |
59 | SRCREV_pn-matchbox-wm ?= "1524" | 59 | SRCREV_pn-matchbox-wm ?= "1524" |
60 | SRCREV_pn-oh-puzzles ?= "23" | 60 | SRCREV_pn-oh-puzzles ?= "23" |
61 | SRCREV_pn-opkg-native ?= "4545" | 61 | SRCREV_pn-opkg-native ?= "4545" |
diff --git a/meta/packages/eds/eds-dbus_svn.bb b/meta/packages/eds/eds-dbus_svn.bb index 75cb25ffa1..81d9e83cfb 100644 --- a/meta/packages/eds/eds-dbus_svn.bb +++ b/meta/packages/eds/eds-dbus_svn.bb | |||
@@ -1,10 +1,10 @@ | |||
1 | DESCRIPTION = "Evolution database backend server" | 1 | DESCRIPTION = "Evolution database backend server" |
2 | HOMEPAGE = "http://projects.o-hand.com/eds" | 2 | HOMEPAGE = "http://projects.o-hand.com/eds" |
3 | LICENSE = "LGPL" | 3 | LICENSE = "LGPL" |
4 | DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup" | 4 | DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup libglade" |
5 | 5 | ||
6 | PV = "1.4.0+svnr${SRCREV}" | 6 | PV = "1.4.0+svnr${SRCREV}" |
7 | PR = "r4" | 7 | PR = "r6" |
8 | 8 | ||
9 | SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ | 9 | SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ |
10 | file://oh-contact.patch;patch=1;pnum=0 \ | 10 | file://oh-contact.patch;patch=1;pnum=0 \ |
@@ -33,7 +33,8 @@ EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \ | |||
33 | 33 | ||
34 | PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \ | 34 | PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \ |
35 | libedata-book libedata-book-dev libedata-cal libedata-cal-dev \ | 35 | libedata-book libedata-book-dev libedata-cal libedata-cal-dev \ |
36 | libedataserver libedataserver-dev" | 36 | libedataserver libedataserver-dev \ |
37 | libedataserverui libedataserverui-dev" | ||
37 | 38 | ||
38 | FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc" | 39 | FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc" |
39 | FILES_${PN}-dbg =+ "${libdir}/evolution-data-server-*/camel-providers/.debug \ | 40 | FILES_${PN}-dbg =+ "${libdir}/evolution-data-server-*/camel-providers/.debug \ |
@@ -82,7 +83,7 @@ FILES_libedataserver-dev = "${libdir}/libedataserver-*.so \ | |||
82 | ${libdir}/pkgconfig/libedataserver-*.pc \ | 83 | ${libdir}/pkgconfig/libedataserver-*.pc \ |
83 | ${includedir}/evolution-data-server-*/libedataserver/*.h" | 84 | ${includedir}/evolution-data-server-*/libedataserver/*.h" |
84 | 85 | ||
85 | FILES_libedataserverui = "${libdir}/libedataserverui-*.so.*" | 86 | FILES_libedataserverui = "${libdir}/libedataserverui-*.so.* ${datadir}/evolution-data-server-1.4/glade/*.glade" |
86 | FILES_libedataserverui-dev = "${libdir}/libedataserverui-*.so \ | 87 | FILES_libedataserverui-dev = "${libdir}/libedataserverui-*.so \ |
87 | ${libdir}/pkgconfig/libedataserverui-*.pc \ | 88 | ${libdir}/pkgconfig/libedataserverui-*.pc \ |
88 | ${includedir}/evolution-data-server-*/libedataserverui/*.h" | 89 | ${includedir}/evolution-data-server-*/libedataserverui/*.h" |
diff --git a/meta/packages/gstreamer/gst-plugins-good_0.10.9.bb b/meta/packages/gstreamer/gst-plugins-good_0.10.9.bb index b5aa10b174..3b05ba8e72 100644 --- a/meta/packages/gstreamer/gst-plugins-good_0.10.9.bb +++ b/meta/packages/gstreamer/gst-plugins-good_0.10.9.bb | |||
@@ -1,11 +1,11 @@ | |||
1 | require gst-plugins.inc | 1 | require gst-plugins.inc |
2 | DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \ | 2 | DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \ |
3 | speex" | 3 | speex" |
4 | PR = "r3" | 4 | PR = "r4" |
5 | 5 | ||
6 | EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --without-check" | 6 | EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --without-check" |
7 | 7 | ||
8 | RPROVIDES = "gst-plugin-id3demux" | 8 | PACKAGES += "gst-plugin-id3demux" |
9 | 9 | ||
10 | do_configure_prepend() { | 10 | do_configure_prepend() { |
11 | # This m4 file contains nastiness which conflicts with libtool 2.2.2 | 11 | # This m4 file contains nastiness which conflicts with libtool 2.2.2 |