Collection of patches

GIT PULL Applied Saul Wold 2 participants 7 messages Sep 6, 2011 – Sep 7, 2011

lore

Share & tools

lore

Saul Wold

author

2011-09-06 17:31 UTC #0 lore raw

Richard,

This is a collection of patches that have been sitting around, and unless I missed some comments should be good to go.

I bumped gettext's PR in this request.

Sau!

The following changes since commit 41b7c955cfdc7b4d5c667c8a8742237d5edaca4f:

icu-3.6: fix building with big make -j (2011-09-05 20:38:50 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage

Denis Carikli (1):
mtd-utils: update to version to 1.4.6

Kumar Gala (1):
scripts/oe-buildenv-internal: Add SOCKS5_{USER, PASSWD} to
BB_ENV_EXTRAWHITE

Phil Blundell (1):
pango: use qemu to generate pango.modules during rootfs construction

Saul Wold (2):
gettext: use included libxml and libcroco
web: Update SRCREV to address ccs_parser_parse_stylesheet arg
mismatch

 meta/recipes-core/gettext/gettext_0.18.1.1.bb      |    4 +-
 .../add-exclusion-to-mkfs-jffs2-git-2.patch        |    0
 .../add-exclusion-to-mkfs-jffs2-git-2.patch        |  103 ++++++++++++++++++++
 .../mtd/{mtd-utils_1.4.1.bb => mtd-utils_1.4.6.bb} |    7 +-
 meta/recipes-graphics/pango/pango.inc              |   11 ++-
 meta/recipes-graphics/pango/pango_1.28.4.bb        |    2 +-
 meta/recipes-sato/web/web_git.bb                   |    4 +-
 scripts/oe-buildenv-internal                       |    2 +-
 8 files changed, 119 insertions(+), 14 deletions(-)
 rename meta/recipes-devtools/mtd/{mtd-utils-1.4.1 => mtd-utils-1.4.6}/add-exclusion-to-mkfs-jffs2-git-2.patch (100%)
 create mode 100644 meta/recipes-devtools/mtd/mtd-utils-1.4.6/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch
 rename meta/recipes-devtools/mtd/{mtd-utils_1.4.1.bb => mtd-utils_1.4.6.bb} (81%)

Signature · 1 line

1.7.6

Saul Wold

author

2011-09-06 17:31 UTC #1 lore raw

[CONSOLIDATED PULL 1/5] pango: use qemu to generate pango.modules during rootfs construction

From: Phil Blundell <[email protected]>

This allows pango to be installed in an image with read-only-rootfs.

Signed-off-by Phil Blundell <[email protected]>

---
 meta/recipes-graphics/pango/pango.inc       |   11 +++++++----
 meta/recipes-graphics/pango/pango_1.28.4.bb |    2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

meta/recipes-graphics/pango/pango.inc +7 -4

index a8e99e2..ff3f5dd 100644
@@ -10,13 +10,13 @@ SECTION = "libs"
 LICENSE = "LGPL"
 
 X11DEPENDS = "virtual/libx11 libxft"
-DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo qemu-native ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
 
 PACKAGES_DYNAMIC = "pango-module-*"
 
 RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc" 
 
-inherit gnome
+inherit gnome qemu
 
 EXTRA_AUTORECONF = ""

@@ -33,9 +33,12 @@ LIBV = "1.6.0"
 
 postinst_prologue() {
 if [ "x$D" != "x" ]; then
-  exit 1
+	if [ ! -f "$D${sysconfdir}/pango/pango.modules" ]; then
+		mkdir -p $D${sysconfdir}/pango
+		PSEUDO_RELOADED=YES ${@qemu_target_binary(d)} -L $D $D${bindir}/pango-querymodules > "$D${sysconfdir}/pango/pango.modules"
+	fi
+	exit 0
 fi
-
 }
 
 python populate_packages_prepend () {

meta/recipes-graphics/pango/pango_1.28.4.bb +1 -1

index 68ab700..33eac21 100644
@@ -2,7 +2,7 @@ require pango.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 
-PR = "r1"
+PR = "r4"
 
 SRC_URI += "file://no-tests.patch"

Signature · 1 line

1.7.6

Saul Wold

author

2011-09-06 17:31 UTC #2 lore raw

[CONSOLIDATED PULL 2/5] mtd-utils: update to version to 1.4.6

In reply to Saul Wold

From: Denis Carikli <[email protected]>

mtd-utils 1.4.6 is the lastest release of mtd-utils
at this time.

Signed-off-by Denis Carikli <[email protected]>

---
 .../add-exclusion-to-mkfs-jffs2-git-2.patch        |    0
 .../add-exclusion-to-mkfs-jffs2-git-2.patch        |  103 ++++++++++++++++++++
 .../mtd/{mtd-utils_1.4.1.bb => mtd-utils_1.4.6.bb} |    7 +-
 3 files changed, 105 insertions(+), 5 deletions(-)
 rename meta/recipes-devtools/mtd/{mtd-utils-1.4.1 => mtd-utils-1.4.6}/add-exclusion-to-mkfs-jffs2-git-2.patch (100%)
 create mode 100644 meta/recipes-devtools/mtd/mtd-utils-1.4.6/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch
 rename meta/recipes-devtools/mtd/{mtd-utils_1.4.1.bb => mtd-utils_1.4.6.bb} (81%)

meta/recipes-devtools/mtd/mtd-utils-1.4.6/add-exclusion-to-mkfs-jffs2-git-2.patch renamed from meta/recipes-devtools/mtd/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch +0 -0

similarity index 100%
rename from meta/recipes-devtools/mtd/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch
rename to meta/recipes-devtools/mtd/mtd-utils-1.4.6/add-exclusion-to-mkfs-jffs2-git-2.patch

meta/recipes-devtools/mtd/mtd-utils-1.4.6/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch new file +103 -0

103 lines not on this page · raw message

meta/recipes-devtools/mtd/mtd-utils_1.4.6.bb renamed from meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb +2 -5

similarity index 81%
rename from meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb
rename to meta/recipes-devtools/mtd/mtd-utils_1.4.6.bb
index c05149d..79f4f15 100644
@@ -6,12 +6,12 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c"
 
-SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=3c3674a6e1d3f59554b0ff68ca59be2fd4134e0c \
+SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=baafd8ace3301e9d2ba314a376bad008314b34ff \
 		file://add-exclusion-to-mkfs-jffs2-git-2.patch"
 
 S = "${WORKDIR}/git/"
 
-PR = "r1"
+PR = "r0"
 
 EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'BUILDDIR=${S}'"

@@ -26,6 +26,3 @@ do_install () {
 PARALLEL_MAKE = ""
 
 BBCLASSEXTEND = "native"
-
-SRC_URI[md5sum] = "645519b753b364d52c4b941dcee3dd7e"
-SRC_URI[sha256sum] = "51d6a77c7e673219bb89c4b119f336d9f2f5a5e065a12ecf9636c5348d099a0e"

Signature · 1 line

1.7.6

Saul Wold

author

2011-09-06 17:31 UTC #3 lore raw

[CONSOLIDATED PULL 3/5] scripts/oe-buildenv-internal: Add SOCKS5_{USER, PASSWD} to BB_ENV_EXTRAWHITE

In reply to Saul Wold

From: Kumar Gala <[email protected]>

If a SOCKS5 gateway is needed for a proxy access like git it might also require authentication to the proxy via a password and username. Adding SOCKS5_USER & SOCKS5_PASSWD to BB_ENV_EXTRAWHITE allow for automation of the authentication request to occur when something like a git fetch is going through the proxy.

Signed-off-by Kumar Gala <[email protected]>

---
 scripts/oe-buildenv-internal |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

scripts/oe-buildenv-internal +1 -1

index 61ac18c..5e0eb6e 100755
@@ -71,4 +71,4 @@ unset BITBAKEDIR
 export BUILDDIR
 export PATH
 
-export BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND"
+export BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND SOCKS5_PASSWD SOCSK5_USER"

Signature · 1 line

1.7.6

Saul Wold

author

2011-09-06 17:31 UTC #4 lore raw

[CONSOLIDATED PULL 4/5] gettext: use included libxml and libcroco

In reply to Saul Wold

[YOCTO #1400]

By using the included libxml and libcroco, we do not create additional on this core library. There was an ordering issue that when one library was not built, but gettext detected the other library a compliation would fail, this will force it to always use the included libraries.

Signed-off-by Saul Wold <[email protected]>

---
 meta/recipes-core/gettext/gettext_0.18.1.1.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

meta/recipes-core/gettext/gettext_0.18.1.1.bb +3 -1

index 9ec851e..2c0b2f8 100644
@@ -5,7 +5,7 @@ SECTION = "libs"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-PR = "r2"
+PR = "r3"
 DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat"
 DEPENDS_virtclass-native = "libxml2-native"
 PROVIDES = "virtual/libintl virtual/gettext"

@@ -36,6 +36,8 @@ EXTRA_OECONF += "--without-lispdir \
                  --without-emacs \
                  --without-cvs \
                  --without-git \
+                 --with-included-libxml \
+                 --with-included-libcroco \
                 "
 
 acpaths = '-I ${S}/gettext-runtime/m4 \

Signature · 1 line

1.7.6

Saul Wold

author

2011-09-06 17:31 UTC #5 lore raw

[CONSOLIDATED PULL 5/5] web: Update SRCREV to address ccs_parser_parse_stylesheet arg mismatch

In reply to Saul Wold

[YOCTO #1454]

Signed-off-by Saul Wold <[email protected]>

---
 meta/recipes-sato/web/web_git.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

meta/recipes-sato/web/web_git.bb +2 -2

index c1a1334..b606e64 100644
@@ -2,9 +2,9 @@ LICENSE = "GPLv2"
 SECTION = "x11"
 DEPENDS = "libxml2 glib-2.0 gtk+ libglade gtkhtml2 curl gconf js libowl"
 DESCRIPTION = "Web is a multi-platform web browsing application."
-PR = "r2"
+PR = "r0"
 
-SRCREV = "96da839f65e17ecc6d5261c1d74accd88423dd7a"
+SRCREV = "3fad2eb32b2312093dcd750612bafeff84e32bc9"
 PV = "0.0+git${SRCPV}"
 
 SRC_URI = 	"git://git.yoctoproject.org/web-sato;protocol=git \

Signature · 1 line

1.7.6

Richard Purdie

Applied

2011-09-07 22:41 UTC #6 lore raw

In reply to Saul Wold

Quoted 25 lines · Saul Wold

Richard,
This is a collection of patches that have been sitting around, and unless I missed some comments should be good to go.
I bumped gettext's PR in this request.
Sau!
The following changes since commit 41b7c955cfdc7b4d5c667c8a8742237d5edaca4f:
icu-3.6: fix building with big make -j (2011-09-05 20:38:50 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
Denis Carikli (1):
mtd-utils: update to version to 1.4.6
Kumar Gala (1):
scripts/oe-buildenv-internal: Add SOCKS5_{USER, PASSWD} to
BB_ENV_EXTRAWHITE

Quoted 7 lines

Phil Blundell (1):
pango: use qemu to generate pango.modules during rootfs construction
Saul Wold (2):
gettext: use included libxml and libcroco
web: Update SRCREV to address ccs_parser_parse_stylesheet arg
mismatch

Merged to master with the exception of Kumar's change which I've followed up with in the original thread.

Cheers,

Richard