Skip to contentSkip to conversation

Some fixes for RC2

PATCH Applied Saul Wold 3 participants 9 messages Sep 16, 2011

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

cover Some fixes for RC2

Richard,

This request has some fixes from the team for issues found today, alone with a distro-tracking update.

Thanks
Sau!

The following changes since commit f7f129b60d33e2758a3a9cc66a98251e1325664d:

liboil-0.3.17: add upstream Fix-enable-vfp-flag patch (2011-09-15 23:09:26 +0100)

are available in the git repository at:
git://git.yoctoproject.org/poky-contrib sgw/oe-rc2
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgw/oe-rc2

Dexuan Cui (1):
distro-tracking: Update package alias

Saul Wold (1):
web: Fix SRVREV due to lost commit in web-sato

Tom Zanussi (4):
liberation-fonts_1.04: add PN to RDEPENDS
liberation-fonts_1.06: add PN to RDEPENDS
ttf-bitstream-vera_1.10: add PN to RDEPENDS
grub_1.99: add PN to RDEPENDS

 .../conf/distro/include/distro_tracking_fields.inc |   11 ++++++++++-
 meta/recipes-bsp/grub/grub_1.99.bb                 |    2 +-
 .../ttf-fonts/liberation-fonts_1.04.bb             |    2 +-
 .../ttf-fonts/liberation-fonts_1.06.bb             |    2 +-
 .../ttf-fonts/ttf-bitstream-vera_1.10.bb           |    2 +-
 meta/recipes-sato/web/web_git.bb                   |    2 +-
 6 files changed, 15 insertions(+), 6 deletions(-)
Signature · 1 line
1.7.6
author
#1 lore raw

PATCH 1/6 distro-tracking: Update package alias

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>
---
 .../conf/distro/include/distro_tracking_fields.inc |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +10 -1
index 13106c0..b150af8 100644
@@ -1570,6 +1570,7 @@ RECIPE_LATEST_RELEASE_DATE_pn-nfs-utils = "02/2010"
 RECIPE_COMMENTS_pn-nfs-utils = ""
 
 RECIPE_STATUS_pn-dropbear = "green"
+DISTRO_PN_ALIAS_pn-dropbear = "Debian=dropbear Ubuntu=dropbear"
 RECIPE_LAST_UPDATE_pn-dropbear = "Jul 5, 2010"
 RECIPE_MAINTAINER_pn-dropbear = "Mei Lei <[email protected]>"
 RECIPE_DEPENDENCY_CHECK_pn-dropbear = "not done"

@@ -4560,6 +4561,7 @@ RECIPE_LAST_UPDATE_pn-librsvg = "Jan 5, 2011"
 RECIPE_MAINTAINER_pn-librsvg = "Dexuan Cui <[email protected]>"
 
 RECIPE_STATUS_pn-libx11 = "green"
+DISTRO_PN_ALIAS_pn-libx11 = "Debian=libx11-6 Fedora=libX11 Ubuntu=libx11-6 OpenSuSE=xorg-x11-libX11"
 RECIPE_DEPENDENCY_CHECK_pn-libx11 = "not done"
 RECIPE_LATEST_VERSION_pn-libx11 = "1.3.4"
 RECIPE_NO_OF_PATCHES_pn-libx11 = "3"

@@ -4573,7 +4575,11 @@ RECIPE_COMMENTS_pn-libx11 = ""
 RECIPE_LAST_UPDATE_pn-libx11 = "Jul 9, 2010"
 RECIPE_MAINTAINER_pn-libx11 = "Dexuan Cui <[email protected]>"
 
+RECIPE_STATUS_pn-libx11-diet = "green"
+DISTRO_PN_ALIAS_pn-libx11-diet = "Debian=libx11-6 Fedora=libX11 Ubuntu=libx11-6 OpenSuSE=xorg-x11-libX11"
+
 RECIPE_STATUS_pn-libx11-trim = "green"
+DISTRO_PN_ALIAS_pn-libx11-trim = "Debian=libx11-6 Fedora=libX11 Ubuntu=libx11-6 OpenSuSE=xorg-x11-libX11"
 RECIPE_DEPENDENCY_CHECK_pn-libx11-trim = "not done"
 RECIPE_LATEST_VERSION_pn-libx11-trim = "1.3.4"
 RECIPE_NO_OF_PATCHES_pn-libx11-trim = "3"

@@ -4621,6 +4627,7 @@ RECIPE_LAST_UPDATE_pn-startup-notification = "Jun 13, 2011"
 RECIPE_MAINTAINER_pn-startup-notification = "Dexuan Cui <[email protected]>"
 
 RECIPE_STATUS_pn-galago-daemon = "green"
+DISTRO_PN_ALIAS_pn-galago-daemon = "Debian=galago-daemon Ubuntu=galago-daemon"
 RECIPE_DEPENDENCY_CHECK_pn-galago-daemon = "not done"
 RECIPE_LATEST_VERSION_pn-galago-daemon = "0.5.1"
 RECIPE_NO_OF_PATCHES_pn-galago-daemon = "0"

@@ -4730,7 +4737,7 @@ RECIPE_LAST_UPDATE_pn-libxpm = "Nov 24, 2010"
 RECIPE_MAINTAINER_pn-libxpm = "Dexuan Cui <[email protected]>"
 
 RECIPE_STATUS_pn-libxprintapputil = "green"
-DISTRO_PN_ALIAS_pn-libxprintapputil1 = "Debian=libxprintapputil1 Ubuntu=libxprintapputil1 Mandriva=libxprintapputil"
+DISTRO_PN_ALIAS_pn-libxprintapputil = "Debian=libxprintapputil Ubuntu=libxprintapputil1 Mandriva=libxprintapputil"
 RECIPE_DEPENDENCY_CHECK_pn-libxprintapputil = "not done"
 RECIPE_LATEST_VERSION_pn-libxprintapputil = "1.0.1"
 RECIPE_NO_OF_PATCHES_pn-libxprintapputil = "0"

@@ -4765,6 +4772,7 @@ RECIPE_LAST_UPDATE_pn-libxscrnsaver = "Nov 16, 2010"
 RECIPE_MAINTAINER_pn-libxscrnsaver = "Dexuan Cui <[email protected]>"
 
 RECIPE_STATUS_pn-libxtrap = "green"
+DISTRO_PN_ALIAS_pn-libxtrap = "Debian=libxtrap6 Fedora=libXTrap"
 RECIPE_DEPENDENCY_CHECK_pn-libxtrap = "not done"
 RECIPE_LATEST_VERSION_pn-libxtrap = "1.0.0"
 RECIPE_NO_OF_PATCHES_pn-libxtrap = "0"

@@ -5735,6 +5743,7 @@ RECIPE_MANUAL_CHECK_DATE_pn-mailx = "Jul 28, 2011"
 RECIPE_MAINTAINER_pn-mailx = "Kai Kang <[email protected]>"
 
 RECIPE_LATEST_VERSION_pn-libgcc = "4.5.1"
+DISTRO_PN_ALIAS_pn-libgcc = "Debian=libgcc4 Ubuntu=libgcc1 OpenSuSE=libgcc45"
 RECIPE_MANUAL_CHECK_DATE_pn-libgcc = "Feb 28, 2011"
 
 RECIPE_STATUS_pn-transfig = "green"
Signature · 1 line
1.7.6
author
#2 lore raw

PATCH 2/6 web: Fix SRVREV due to lost commit in web-sato

In reply to Saul Wold

[YOCTO #1454]

This SRCREV fixes the number of parameters

Signed-off-by Saul Wold <[email protected]>
---
 meta/recipes-sato/web/web_git.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-sato/web/web_git.bb +1 -1
index b606e64..9e2474f 100644
@@ -4,7 +4,7 @@ DEPENDS = "libxml2 glib-2.0 gtk+ libglade gtkhtml2 curl gconf js libowl"
 DESCRIPTION = "Web is a multi-platform web browsing application."
 PR = "r0"
 
-SRCREV = "3fad2eb32b2312093dcd750612bafeff84e32bc9"
+SRCREV = "e9a1c9433b9500feb7e3b9bb135debcea3a3e651"
 PV = "0.0+git${SRCPV}"
 
 SRC_URI = 	"git://git.yoctoproject.org/web-sato;protocol=git \
Signature · 1 line
1.7.6
author
#3 lore raw

PATCH 3/6 liberation-fonts_1.04: add PN to RDEPENDS

In reply to Saul Wold

From: Tom Zanussi <[email protected]>

RDEPENDS is package-specific, so add ${PN} to it.

Signed-off-by Tom Zanussi <[email protected]>
---
 .../ttf-fonts/liberation-fonts_1.04.bb             |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb +1 -1
index 3b2d479..185bfd3 100644
@@ -9,7 +9,7 @@ SECTION = "x11/fonts"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 PACKAGE_ARCH = "all"
-RDEPENDS = "fontconfig-utils"
+RDEPENDS_${PN} = "fontconfig-utils"
 PE = "1"
 
 SRC_URI = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-${PV}.tar.gz \
Signature · 1 line
1.7.6
author
#4 lore raw

PATCH 4/6 liberation-fonts_1.06: add PN to RDEPENDS

In reply to Saul Wold

From: Tom Zanussi <[email protected]>

RDEPENDS is package-specific, so add ${PN} to it.

Signed-off-by Tom Zanussi <[email protected]>
---
 .../ttf-fonts/liberation-fonts_1.06.bb             |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb +1 -1
index e1f9ffb..e8239c1 100644
@@ -9,7 +9,7 @@ SECTION = "x11/fonts"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 PACKAGE_ARCH = "all"
-RDEPENDS = "fontconfig-utils"
+RDEPENDS_${PN} = "fontconfig-utils"
 PE = "1"
 PR = "r0"
Signature · 1 line
1.7.6
author
#5 lore raw

PATCH 5/6 ttf-bitstream-vera_1.10: add PN to RDEPENDS

In reply to Saul Wold

From: Tom Zanussi <[email protected]>

RDEPENDS is package-specific, so add ${PN} to it.

Signed-off-by Tom Zanussi <[email protected]>
---
 .../ttf-fonts/ttf-bitstream-vera_1.10.bb           |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb +1 -1
index f1a8265..c96294e 100644
@@ -9,7 +9,7 @@ LICENSE = "Bitstream_Vera"
 LIC_FILES_CHKSUM = "file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be"
 PACKAGE_ARCH = "all"
 PR = "r3"
-RDEPENDS = "fontconfig-utils"
+RDEPENDS_${PN} = "fontconfig-utils"
 
 SRC_URI = "${GNOME_MIRROR}/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2"
Signature · 1 line
1.7.6
author
#6 lore raw

PATCH 6/6 grub_1.99: add PN to RDEPENDS

In reply to Saul Wold

From: Tom Zanussi <[email protected]>

RDEPENDS is package-specific, so add ${PN} to it.

Signed-off-by Tom Zanussi <[email protected]>
---
 meta/recipes-bsp/grub/grub_1.99.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-bsp/grub/grub_1.99.bb +1 -1
index d9df573..75196fa 100644
@@ -12,7 +12,7 @@ PRIORITY = "optional"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-RDEPENDS = "diffutils freetype"
+RDEPENDS_${PN} = "diffutils freetype"
 PR = "r0"
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
Signature · 1 line
1.7.6
#7 lore raw
In reply to Saul Wold

Op 16 sep. 2011, om 04:20 heeft Saul Wold het volgende geschreven:

Quoted 5 lines

Richard,

Saul Wold (1):
web: Fix SRVREV due to lost commit in web-sato

typo in commit message

Quoted 5 lines

Tom Zanussi (4):
liberation-fonts_1.04: add PN to RDEPENDS
liberation-fonts_1.06: add PN to RDEPENDS
ttf-bitstream-vera_1.10: add PN to RDEPENDS
grub_1.99: add PN to RDEPENDS

And those are all missing a PR bump, which is needed when changing the packaging output

Applied
#8 lore raw
In reply to Saul Wold
Quoted 19 lines · Saul Wold

Richard,

This request has some fixes from the team for issues found today, alone with a distro-tracking update.

Thanks
Sau!

The following changes since commit f7f129b60d33e2758a3a9cc66a98251e1325664d:

liboil-0.3.17: add upstream Fix-enable-vfp-flag patch (2011-09-15 23:09:26 +0100)

are available in the git repository at:
git://git.yoctoproject.org/poky-contrib sgw/oe-rc2
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgw/oe-rc2

Dexuan Cui (1):
distro-tracking: Update package alias

Quoted 8 lines

Saul Wold (1):
web: Fix SRVREV due to lost commit in web-sato

Tom Zanussi (4):
liberation-fonts_1.04: add PN to RDEPENDS
liberation-fonts_1.06: add PN to RDEPENDS
ttf-bitstream-vera_1.10: add PN to RDEPENDS
grub_1.99: add PN to RDEPENDS

Merged to master with the fixes Koen mentioned were needed made.

Cheers,

Richard