Skip to contentSkip to conversation

Misc fixes, July 19

PATCH Applied Tom Rini 2 participants 6 messages Jul 19, 2011 – Jul 20, 2011

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

cover Misc fixes, July 19

Hey all,

As part of doing some "fix builds in very long paths" builds of world I've hit a few DEPENDS problems. The following series is mostly adding DEPENDS where they're missing today. While I was fixing up gnome-doc-utils-native I noticed it has the installed but not packaged QA problem so I fixed that while in here.

The following changes since commit e66c2999afa2b3efbce8bb46c89f9db5e15f35c7:
Saul Wold (1):
libx11: ensure nativesdk uses correct DEPENDS and XCB flags

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib trini/misc-fixes-19july
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=trini/misc-fixes-19july

Tom Rini (4):
metacity: Add gnome-doc-utils to DEPENDS
gnome-doc-utils: Package up python site packages, bump PR
iptuils: Add sgmlspl-native to DEPENDS
btrfs-tools: Add util-linux to DEPENDS

 .../btrfs-tools/btrfs-tools_git.bb                 |    3 ++-
 meta/recipes-extended/iputils/iputils_s20101006.bb |    4 ++--
 meta/recipes-gnome/gnome/gnome-doc-utils.inc       |    4 ++--
 meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb |    2 +-
 meta/recipes-gnome/gnome/metacity_2.30.3.bb        |    4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)
author
#1 lore raw

PATCH 1/4 metacity: Add gnome-doc-utils to DEPENDS

Signed-off-by Tom Rini <[email protected]>
---
 meta/recipes-gnome/gnome/metacity_2.30.3.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-gnome/gnome/metacity_2.30.3.bb +2 -2
index 44e21c9..92ddd68 100644
@@ -4,8 +4,8 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://src/include/main.h;endline=24;md5=c2242df552c880280315989bab626b90"
 
-DEPENDS = "startup-notification gtk+ gconf gdk-pixbuf-native libcanberra"
-PR = "r1"
+DEPENDS = "startup-notification gtk+ gconf gdk-pixbuf-native libcanberra gnome-doc-utils"
+PR = "r2"
 
 inherit gnome update-alternatives
Signature · 1 line
1.7.0.4
author
#2 lore raw

PATCH 2/4 gnome-doc-utils: Package up python site packages, bump PR

In reply to Tom Rini

Add python-dir to the inherits list so we can grab the python site packages files as well. This fixes a 'installed but not packaged' QA problem with the python site package files.

Signed-off-by Tom Rini <[email protected]>
---
 meta/recipes-gnome/gnome/gnome-doc-utils.inc       |    4 ++--
 meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-gnome/gnome/gnome-doc-utils.inc +2 -2
index 7f1ab83..bd7c615 100644
@@ -2,7 +2,7 @@ LICENSE = "GPL & LGPL"
 DEPENDS = "libxml2 libxslt libxslt-native gnome-doc-utils-native"
 DEPENDS_virtclass-native = "libxml2-native libxslt-native intltool-native"
 
-inherit gnome gettext
+inherit gnome gettext python-dir
 
 EXTRA_OECONF = "--disable-scrollkeeper"
 

@@ -13,7 +13,7 @@ do_install_append() {
 	chown -R root:root ${D}
 }
 
-FILES_${PN} += "${datadir}/xml*"
+FILES_${PN} += "${datadir}/xml* ${PYTHON_SITEPACKAGES_DIR}/*"
 
 RDEPENDS_${PN} = "bash"
meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb +1 -1
index 0019f45..4554122 100644
@@ -1,7 +1,7 @@
 require gnome-doc-utils.inc
 LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
 		    file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343"
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://xsltproc_nonet.patch"
Signature · 1 line
1.7.0.4
author
#3 lore raw

PATCH 3/4 iptuils: Add sgmlspl-native to DEPENDS

In reply to Tom Rini

This is 4fc7d465d684d4952c52adafc1e7032b63039e53 in oe.dev.

Signed-off-by Tom Rini <[email protected]>
---
 meta/recipes-extended/iputils/iputils_s20101006.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-extended/iputils/iputils_s20101006.bb +2 -2
index a7ef40c..c97fce7 100644
@@ -11,9 +11,9 @@ LIC_FILES_CHKSUM = "file://ping.c;beginline=1;endline=35;md5=f9ceb201733e9a6cf8f
                     file://arping.c;beginline=1;endline=10;md5=ada2a6d06acc90f943bddf40d15e0541 \
                     file://tftpd.c;beginline=1;endline=32;md5=28834bf8a91a5b8a92755dbee709ef96 "
 
-DEPENDS = "sysfsutils openssl docbook-utils-native"
+DEPENDS = "sysfsutils openssl docbook-utils-native sgmlspl-native"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.skbuff.net/iputils/${BPN}-${PV}.tar.bz2 \
            file://debian/fix-dead-host-ping-stats.diff \
Signature · 1 line
1.7.0.4
author
#4 lore raw

PATCH 4/4 btrfs-tools: Add util-linux to DEPENDS

In reply to Tom Rini

This needs libuuid bits in order to build.

Signed-off-by Tom Rini <[email protected]>
---
 .../btrfs-tools/btrfs-tools_git.bb                 |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb +2 -1
index a5c556d..9b5a17a 100644
@@ -10,12 +10,13 @@ HOMEPAGE = "https://btrfs.wiki.kernel.org"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067"
 SECTION = "base"
+DEPENDS = "util-linux"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs-unstable.git;protocol=git;tag=1b444cd2e6ab8dcafdd47dbaeaae369dd1517c17;branch=master"
 
 S = "${WORKDIR}/git"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://upstream-tmp/0001-Btrfs-progs-add-a-btrfs-select-super-command-to-over.patch \
 	    file://upstream-tmp/0002-Btrfs-progs-use-safe-string-manipulation-functions.patch \
Signature · 1 line
1.7.0.4
Applied
#5 lore raw
In reply to Tom Rini
Quoted 31 lines · Tom Rini

Hey all,

As part of doing some "fix builds in very long paths" builds of world I've hit a few DEPENDS problems. The following series is mostly adding DEPENDS where they're missing today. While I was fixing up gnome-doc-utils-native I noticed it has the installed but not packaged QA problem so I fixed that while in here.

The following changes since commit e66c2999afa2b3efbce8bb46c89f9db5e15f35c7:
Saul Wold (1):
libx11: ensure nativesdk uses correct DEPENDS and XCB flags

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib trini/misc-fixes-19july
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=trini/misc-fixes-19july

Tom Rini (4):
metacity: Add gnome-doc-utils to DEPENDS
gnome-doc-utils: Package up python site packages, bump PR
iptuils: Add sgmlspl-native to DEPENDS
btrfs-tools: Add util-linux to DEPENDS

  .../btrfs-tools/btrfs-tools_git.bb                 |    3 ++-
  meta/recipes-extended/iputils/iputils_s20101006.bb |    4 ++--
  meta/recipes-gnome/gnome/gnome-doc-utils.inc       |    4 ++--
  meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb |    2 +-
  meta/recipes-gnome/gnome/metacity_2.30.3.bb        |    4 ++--
  5 files changed, 9 insertions(+), 8 deletions(-)
Quoted 5 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Merged into OE-Core

Thanks
Sau!