mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-19 06:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 5177-5178,5181,5183,5185,5187 via svnmerge from

Browse Source 
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
This commit is contained in:
Ross Burton
2008-09-26 08:55:15 +00:00
parent 148459e611
commit 75f3f9bb6d
5 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
meta/classes/package.bbclass
View File

@@ -79,6 +79,8 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
packages = [pkg] + packages
else:
packages.append(pkg)
oldfiles = bb.data.getVar('FILES_' + pkg, d, 1)
if not oldfiles:
the_files = [os.path.join(root, o)]
if aux_files_pattern:
if type(aux_files_pattern) is list:
@@ -106,9 +108,6 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
if postrm:
bb.data.setVar('pkg_postrm_' + pkg, postrm, d)
else:
oldfiles = bb.data.getVar('FILES_' + pkg, d, 1)
if not oldfiles:
bb.fatal("Package '%s' exists but has no files" % pkg)
bb.data.setVar('FILES_' + pkg, oldfiles + " " + os.path.join(root, o), d)
if callable(hook):
hook(f, pkg, file_regex, output_pattern, m.group(1))

1
meta/conf/distro/include/poky-eabi.inc
View File

@@ -42,6 +42,5 @@ ASNEEDED_pn-xserver-kdrive-xomap = ""
ASNEEDED_pn-minimo = ""
ASNEEDED_pn-pciutils = ""
ASNEEDED_pn-puzzles = ""
ASNEEDED_pn-matchbox-wm-2 = ""
TARGET_LDFLAGS += "${ASNEEDED}"

2
meta/conf/distro/include/poky-fixed-revisions.inc
View File

@@ -55,7 +55,7 @@ SRCREV_pn-matchbox-terminal ?= "1612"
SRCREV_pn-matchbox-theme-sato-2 ?= "94"
SRCREV_pn-matchbox-theme-sato ?= "90"
SRCREV_pn-matchbox-themes-extra ?= "1524"
SRCREV_pn-matchbox-wm-2 ?= "2072"
SRCREV_pn-matchbox-wm-2 ?= "2073"
SRCREV_pn-matchbox-wm ?= "1524"
SRCREV_pn-oh-puzzles ?= "23"
SRCREV_pn-opkg-native ?= "4545"

9
meta/packages/eds/eds-dbus_svn.bb
View File

@@ -1,10 +1,10 @@
DESCRIPTION = "Evolution database backend server"
HOMEPAGE = "http://projects.o-hand.com/eds"
LICENSE = "LGPL"
DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup"
DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup libglade"
PV = "1.4.0+svnr${SRCREV}"
PR = "r4"
PR = "r6"
SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
file://oh-contact.patch;patch=1;pnum=0 \
@@ -33,7 +33,8 @@ EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \
PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \
libedata-book libedata-book-dev libedata-cal libedata-cal-dev \
libedataserver libedataserver-dev"
libedataserver libedataserver-dev \
libedataserverui libedataserverui-dev"
FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc"
FILES_${PN}-dbg =+ "${libdir}/evolution-data-server-*/camel-providers/.debug \
@@ -82,7 +83,7 @@ FILES_libedataserver-dev = "${libdir}/libedataserver-*.so \
${libdir}/pkgconfig/libedataserver-*.pc \
${includedir}/evolution-data-server-*/libedataserver/*.h"
FILES_libedataserverui = "${libdir}/libedataserverui-*.so.*"
FILES_libedataserverui = "${libdir}/libedataserverui-*.so.* ${datadir}/evolution-data-server-1.4/glade/*.glade"
FILES_libedataserverui-dev = "${libdir}/libedataserverui-*.so \
${libdir}/pkgconfig/libedataserverui-*.pc \
${includedir}/evolution-data-server-*/libedataserverui/*.h"

4
meta/packages/gstreamer/gst-plugins-good_0.10.9.bb
View File

@@ -1,11 +1,11 @@
require gst-plugins.inc
DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \
speex"
PR = "r3"
PR = "r4"
EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --without-check"
RPROVIDES = "gst-plugin-id3demux"
PACKAGES += "gst-plugin-id3demux"
do_configure_prepend() {
# This m4 file contains nastiness which conflicts with libtool 2.2.2