Skip to contentSkip to conversation

Package upgrade v2, edwin, Aug2, 2011

PATCH New [email protected] 1 participant 9 messages Aug 2, 2011

lore
Share & tools
lore
#0 lore raw

cover Package upgrade v2, edwin, Aug2, 2011

From: Zhai Edwin <[email protected]>

All,
This is new version for some package upgrade according to Raj's comments:
* remove "patch=1" in recipe
* reasonble split files for apr-util

BTW, one bug fix[YOCTO #1211] is also sent.

Thanks,
Edwin

The following changes since commit 860a41bae6b863a289b06a9684d9cf6c58a307bd:

arch-ia32.inc: Fix up TUNE_ARCH variable conflicts (2011-07-26 22:39:59 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib gzhai/master2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/master2

Zhai Edwin (8):
lighttpd: Upgrade to 1.4.29
libsoup-2.4: Upgrade to 2.34.2
libassuan: Upgrade to 2.0.2
gpgme: Upgrade to 1.3.1
parted: Upgrade to 3.0
apr: Upgrade to 1.4.5
apr-util: Upgrade to 1.3.12
xserver-nodm-init: Fix X start failure on some platform

 .../{lighttpd_1.4.28.bb => lighttpd_1.4.29.bb}     |    6 ++--
 .../{parted-2.3 => parted-3.0}/no_check.patch      |    0
 .../{parted-2.3 => parted-3.0}/syscalls.patch      |    0
 .../parted/{parted_2.3.bb => parted_3.0.bb}        |    4 +-
 .../x11-common/xserver-nodm-init/xserver-nodm      |    6 +---
 .../apr/{apr-util_1.3.10.bb => apr-util_1.3.12.bb} |   12 ++++++---
 meta/recipes-support/apr/apr/buildconf_fix.patch   |   27 --------------------
 .../apr/{apr_1.4.2.bb => apr_1.4.5.bb}             |   13 +++++----
 .../disable_gpgconf_check.patch                    |    0
 .../gpgme/{gpgme_1.3.0.bb => gpgme_1.3.1.bb}       |   10 +++---
 .../{libassuan_2.0.1.bb => libassuan_2.0.2.bb}     |    4 +-
 ...libsoup-2.4_2.34.1.bb => libsoup-2.4_2.34.2.bb} |    4 +-
 12 files changed, 31 insertions(+), 55 deletions(-)
 rename meta/recipes-extended/lighttpd/{lighttpd_1.4.28.bb => lighttpd_1.4.29.bb} (90%)
 rename meta/recipes-extended/parted/{parted-2.3 => parted-3.0}/no_check.patch (100%)
 rename meta/recipes-extended/parted/{parted-2.3 => parted-3.0}/syscalls.patch (100%)
 rename meta/recipes-extended/parted/{parted_2.3.bb => parted_3.0.bb} (78%)
 rename meta/recipes-support/apr/{apr-util_1.3.10.bb => apr-util_1.3.12.bb} (67%)
 delete mode 100644 meta/recipes-support/apr/apr/buildconf_fix.patch
 rename meta/recipes-support/apr/{apr_1.4.2.bb => apr_1.4.5.bb} (81%)
 rename meta/recipes-support/gpgme/{gpgme-1.3.0 => gpgme-1.3.1}/disable_gpgconf_check.patch (100%)
 rename meta/recipes-support/gpgme/{gpgme_1.3.0.bb => gpgme_1.3.1.bb} (74%)
 rename meta/recipes-support/libassuan/{libassuan_2.0.1.bb => libassuan_2.0.2.bb} (82%)
 rename meta/recipes-support/libsoup/{libsoup-2.4_2.34.1.bb => libsoup-2.4_2.34.2.bb} (76%)
#1 lore raw

PATCH 1/8 lighttpd: Upgrade to 1.4.29

From: Zhai Edwin <[email protected]>

---
 .../{lighttpd_1.4.28.bb => lighttpd_1.4.29.bb}     |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-extended/lighttpd/{lighttpd_1.4.28.bb => lighttpd_1.4.29.bb} (90%)
meta/recipes-extended/lighttpd/lighttpd_1.4.29.bb renamed from meta/recipes-extended/lighttpd/lighttpd_1.4.28.bb +3 -3
similarity index 90%
rename from meta/recipes-extended/lighttpd/lighttpd_1.4.28.bb
rename to meta/recipes-extended/lighttpd/lighttpd_1.4.29.bb
index d43766c..c1d5f81 100644
@@ -18,14 +18,14 @@ RDEPENDS_${PN} += " \
 
 PR = "r0"
 
-SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.gz;name=src \
+SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.bz2 \
         file://index.html \
         file://lighttpd.conf \
         file://lighttpd \
 "
 
-SRC_URI[src.md5sum] = "202d36efc6324adb95a3600d2826ec6a"
-SRC_URI[src.sha256sum] = "efd7623f43182723b99c51d57a24158e22a207cd90dca35aaf3b2e3bac115712"
+SRC_URI[md5sum] = "e6e67b09986cb504db630b5a86b2dd76"
+SRC_URI[sha256sum] = "afd8af213e65afb48b397d004696c6620a7ae7f3d4f162ec46a04b9b9dbfd599"
 
 EXTRA_OECONF = " \
              --without-bzip2 \
Signature · 1 line
1.7.1
#2 lore raw

PATCH 2/8 libsoup-2.4: Upgrade to 2.34.2

In reply to [email protected]

From: Zhai Edwin <[email protected]>

---
 ...libsoup-2.4_2.34.1.bb => libsoup-2.4_2.34.2.bb} |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libsoup/{libsoup-2.4_2.34.1.bb => libsoup-2.4_2.34.2.bb} (76%)
meta/recipes-support/libsoup/libsoup-2.4_2.34.2.bb renamed from meta/recipes-support/libsoup/libsoup-2.4_2.34.1.bb +2 -2
similarity index 76%
rename from meta/recipes-support/libsoup/libsoup-2.4_2.34.1.bb
rename to meta/recipes-support/libsoup/libsoup-2.4_2.34.2.bb
index f9e8de5..57af8f7 100644
@@ -12,8 +12,8 @@ DEPENDS = "glib-2.0 gnutls libxml2 libproxy sqlite3 libgnome-keyring"
 
 SRC_URI = "${GNOME_MIRROR}/libsoup/2.34/libsoup-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "846779d898c11f97b5de28a79ea82254"
-SRC_URI[sha256sum] = "a2f846af2c4c08e15eacc9879c8c9be4d85f8105f960f96a9ba3dbabd9ee517b"
+SRC_URI[md5sum] = "2454b38681a6e082b613a781a501e721"
+SRC_URI[sha256sum] = "1d70edc48c309528635012269733739f9cd22548913125864318a65d1b6f1261"
 
 S = "${WORKDIR}/libsoup-${PV}"
 
Signature · 1 line
1.7.1
#3 lore raw

PATCH 3/8 libassuan: Upgrade to 2.0.2

In reply to [email protected]

From: Zhai Edwin <[email protected]>

---
 .../{libassuan_2.0.1.bb => libassuan_2.0.2.bb}     |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libassuan/{libassuan_2.0.1.bb => libassuan_2.0.2.bb} (82%)
meta/recipes-support/libassuan/libassuan_2.0.2.bb renamed from meta/recipes-support/libassuan/libassuan_2.0.1.bb +2 -2
similarity index 82%
rename from meta/recipes-support/libassuan/libassuan_2.0.1.bb
rename to meta/recipes-support/libassuan/libassuan_2.0.2.bb
index 5425673..53c1230 100644
@@ -12,7 +12,7 @@ DEPENDS = "libgpg-error"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "53a7d4c22af909d7236d17d454ef935b"
-SRC_URI[sha256sum] = "1117be532ac41b13790b4756df7fa747d3d04264f7b4544aa9d7ff468a24b457"
+SRC_URI[md5sum] = "3e7d00fd2ee8a0b9c51ac7616ef3f1ec"
+SRC_URI[sha256sum] = "61e0cba33dcbade2dce953b95f06b843af2a73de875303f2585227ecd475b4d8"
 
 inherit autotools binconfig
Signature · 1 line
1.7.1
#4 lore raw

PATCH 4/8 gpgme: Upgrade to 1.3.1

In reply to [email protected]

From: Zhai Edwin <[email protected]>

---
 .../disable_gpgconf_check.patch                    |    0
 .../gpgme/{gpgme_1.3.0.bb => gpgme_1.3.1.bb}       |   10 +++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename meta/recipes-support/gpgme/{gpgme-1.3.0 => gpgme-1.3.1}/disable_gpgconf_check.patch (100%)
 rename meta/recipes-support/gpgme/{gpgme_1.3.0.bb => gpgme_1.3.1.bb} (74%)
meta/recipes-support/gpgme/gpgme-1.3.1/disable_gpgconf_check.patch renamed from meta/recipes-support/gpgme/gpgme-1.3.0/disable_gpgconf_check.patch +0 -0
similarity index 100%
rename from meta/recipes-support/gpgme/gpgme-1.3.0/disable_gpgconf_check.patch
rename to meta/recipes-support/gpgme/gpgme-1.3.1/disable_gpgconf_check.patch
meta/recipes-support/gpgme/gpgme_1.3.1.bb renamed from meta/recipes-support/gpgme/gpgme_1.3.0.bb +5 -5
similarity index 74%
rename from meta/recipes-support/gpgme/gpgme_1.3.0.bb
rename to meta/recipes-support/gpgme/gpgme_1.3.1.bb
index 4c45a44..9ffedba 100644
@@ -5,14 +5,14 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
 LICENSE = "GPLv2+ & LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \
-                    file://src/gpgme.h;endline=23;md5=2775a99d3dd524c4f848ff1c59093038 \
+                    file://src/gpgme.h.in;endline=23;md5=942b47052c0674c6a3b9b9e6127628a4 \
                     file://src/engine.h;endline=22;md5=e96acfaab1cff82dd8fbefddd2f5c436"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \
-           file://disable_gpgconf_check.patch;patch=1;pnum=1"
+           file://disable_gpgconf_check.patch"
 
-SRC_URI[md5sum] = "4784e3c6086c9c25e9a1b4d9f7c5aa96"
-SRC_URI[sha256sum] = "74e040fcd46061f6b0d8b621a2a2a48100a7ba5c9f69e7cf207259a6e2e3e6a1"
+SRC_URI[md5sum] = "90afa8436ce2b2683c001c824bd22601"
+SRC_URI[sha256sum] = "15ef27a875ae0d79d7446fd931deda11438e724ffbeac74449ed19cba23df4d4"
 DEPENDS = "libgpg-error libassuan pth"
 PR = "r0"
 
@@ -25,4 +25,4 @@ PACKAGES =+ "${PN}-pth ${PN}-pthread"
 FILES_${PN}-pth = "${libdir}/libgpgme-pth.so.*"
 FILES_${PN}-pthread = "${libdir}/libgpgme-pthread.so.*"
 FILES_${PN} = "${libdir}/libgpgme.so.*"
-FILES_${PN}-dev += "${bindir}/gpgme-config"
+FILES_${PN}-dev += "${bindir}/gpgme-config ${datadir}/common-lisp/source/gpgme/*"
Signature · 1 line
1.7.1
#5 lore raw

PATCH 5/8 parted: Upgrade to 3.0

In reply to [email protected]

From: Zhai Edwin <[email protected]>

---
 .../{parted-2.3 => parted-3.0}/no_check.patch      |    0
 .../{parted-2.3 => parted-3.0}/syscalls.patch      |    0
 .../parted/{parted_2.3.bb => parted_3.0.bb}        |    4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/parted/{parted-2.3 => parted-3.0}/no_check.patch (100%)
 rename meta/recipes-extended/parted/{parted-2.3 => parted-3.0}/syscalls.patch (100%)
 rename meta/recipes-extended/parted/{parted_2.3.bb => parted_3.0.bb} (78%)
meta/recipes-extended/parted/parted-3.0/no_check.patch renamed from meta/recipes-extended/parted/parted-2.3/no_check.patch +0 -0
similarity index 100%
rename from meta/recipes-extended/parted/parted-2.3/no_check.patch
rename to meta/recipes-extended/parted/parted-3.0/no_check.patch
meta/recipes-extended/parted/parted-3.0/syscalls.patch renamed from meta/recipes-extended/parted/parted-2.3/syscalls.patch +0 -0
similarity index 100%
rename from meta/recipes-extended/parted/parted-2.3/syscalls.patch
rename to meta/recipes-extended/parted/parted-3.0/syscalls.patch
meta/recipes-extended/parted/parted_3.0.bb renamed from meta/recipes-extended/parted/parted_2.3.bb +2 -2
similarity index 78%
rename from meta/recipes-extended/parted/parted_2.3.bb
rename to meta/recipes-extended/parted/parted_3.0.bb
index 14c9c25..29daf01 100644
@@ -10,8 +10,8 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \
            file://no_check.patch \
            file://syscalls.patch "
 
-SRC_URI[md5sum] = "30ceb6df7e8681891e865e2fe5a7903d"
-SRC_URI[sha256sum] = "e81fa140805b5cd029ff6dda5cfa94d223e83ac182ebcae94f841d62ce468829"
+SRC_URI[md5sum] = "a94e84a9b9944715c4453f82ccc639bf"
+SRC_URI[sha256sum] = "8886eece015202f6bd5ce8414f4b68838452cef509f2e3389ad56128219837b7"
 
 EXTRA_OECONF = "--disable-Werror --disable-device-mapper"
 
Signature · 1 line
1.7.1
#6 lore raw

PATCH 6/8 apr: Upgrade to 1.4.5

In reply to [email protected]

From: Zhai Edwin <[email protected]>

Remove buildconf_fix.patch as already in upstream.

---
 meta/recipes-support/apr/apr/buildconf_fix.patch   |   27 --------------------
 .../apr/{apr_1.4.2.bb => apr_1.4.5.bb}             |   13 +++++----
 2 files changed, 7 insertions(+), 33 deletions(-)
 delete mode 100644 meta/recipes-support/apr/apr/buildconf_fix.patch
 rename meta/recipes-support/apr/{apr_1.4.2.bb => apr_1.4.5.bb} (81%)
meta/recipes-support/apr/apr/buildconf_fix.patch deleted +0 -27
deleted file mode 100644
index 2c9d62e..0000000
@@ -1,27 +0,0 @@
-Remove the new libtool detection method to avoid config failure. Poky's libtool
-has different format for "aclocaldir", and there is no elegant parsing method,
-so fall back to old detection.
-
-Signed-off-by: Zhai Edwin <[email protected]>
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: apr-1.4.2/buildconf
-===================================================================
---- apr-1.4.2.orig/buildconf	2009-11-13 06:19:49.000000000 +0800
-+++ apr-1.4.2/buildconf	2010-11-29 14:39:19.000000000 +0800
-@@ -50,14 +50,6 @@
- 
- if [ -f libtool.m4 ]; then 
-    ltfile=`pwd`/libtool.m4
--elif grep all_pkgmacro_files $libtoolize > /dev/null; then
--    # libtool 2.x
--   aclocal_dir=`sed -n '/^aclocaldir=/{s/.*=//;p;q;}' < $libtoolize`
--   ltfiles=`sed -n '/^all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize`
--   for f in $ltfiles; do
--       test -f "$aclocal_dir/$f" && cp "$aclocal_dir/$f" build
--   done
--   ltfile=$aclocal_dir/libtool.m4
- else
-    ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \
-                    < $libtoolize`"
meta/recipes-support/apr/apr_1.4.5.bb renamed from meta/recipes-support/apr/apr_1.4.2.bb +7 -6
similarity index 81%
rename from meta/recipes-support/apr/apr_1.4.2.bb
rename to meta/recipes-support/apr/apr_1.4.5.bb
index 89bdadf..05babd3 100644
@@ -9,13 +9,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \
 PR = "r0"
 
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
-           file://configure_fixes.patch;patch=1 \
-	   file://cleanup.patch;patch=1 \
-           file://configfix.patch;patch=1 \
-           file://buildconf_fix.patch;patch=1"
+           file://configure_fixes.patch \
+           file://cleanup.patch \
+           file://configfix.patch"
 
-SRC_URI[md5sum] = "4b00e8f70c067893d075577962656b35"
-SRC_URI[sha256sum] = "2017ca700694d09d2b0b21dd7c4d195e43a48735aac88526160c6195ee8f5391"
+SRC_URI[md5sum] = "8b53f5a5669d0597f2da889a2f576eb6"
+SRC_URI[sha256sum] = "38c61cacb39be649411cdab212979c71ce29495549c249c2e9a1b0d12480c93e"
 
 inherit autotools lib_package binconfig
 
@@ -26,6 +25,8 @@ do_configure_prepend() {
 	./buildconf
 }
 
+FILES_${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*"
+
 #for some reason, build/libtool.m4 handled by buildconf still be overwritten
 #when autoconf, so handle it again.
 do_configure_append() {
Signature · 1 line
1.7.1
#7 lore raw

PATCH 7/8 apr-util: Upgrade to 1.3.12

In reply to [email protected]

From: Zhai Edwin <[email protected]>

---
 .../apr/{apr-util_1.3.10.bb => apr-util_1.3.12.bb} |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
 rename meta/recipes-support/apr/{apr-util_1.3.10.bb => apr-util_1.3.12.bb} (67%)
meta/recipes-support/apr/apr-util_1.3.12.bb renamed from meta/recipes-support/apr/apr-util_1.3.10.bb +8 -4
similarity index 67%
rename from meta/recipes-support/apr/apr-util_1.3.10.bb
rename to meta/recipes-support/apr/apr-util_1.3.12.bb
index 7071b90..067835a 100644
@@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \
 PR = "r0"
 
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
-           file://configfix.patch;patch=1 \
-           file://configure_fixes.patch;patch=1"
+           file://configfix.patch \
+           file://configure_fixes.patch"
 
-SRC_URI[md5sum] = "82acd25cf3df8c72eba44eaee8b80c19"
-SRC_URI[sha256sum] = "7c37ac40b2351bfc23000fb6b7b54a67e0872255df315c82eb60c821bcef4b23"
+SRC_URI[md5sum] = "d1977289889592ef998e3f777f68efe4"
+SRC_URI[sha256sum] = "815b6fc82950f61050a5e711a7f3c20fd9b6ffcc7a4cacfe9f291fb241210cd8"
 
 EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ 
 		--without-odbc \
@@ -33,3 +33,7 @@ do_configure_prepend() {
 	cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
 }
 
+FILES_${PN}     += "${libdir}/apr-util-1/apr_dbm_gdbm-1.so"
+FILES_${PN}-dev += "${libdir}/aprutil.exp ${libdir}/apr-util-1/apr_dbm_gdbm.*"
+FILES_${PN}-dbg += "${libdir}/apr-util-1/.debug/*"
+
Signature · 1 line
1.7.1
#8 lore raw

PATCH 8/8 xserver-nodm-init: Fix X start failure on some platform

In reply to [email protected]

From: Zhai Edwin <[email protected]>

sudo is used to run rootless X in xserver-nodm, and start to fail with "xf86OpenConsole: Cannot open /dev/tty0" error after upgrade to 1.8.1. sudo seems wait for some resource that is unavailable in early phase of booting. This patch swith to "su" for rootless X starting as a fix.

[YOCTO #1211] got fixed

---
 .../x11-common/xserver-nodm-init/xserver-nodm      |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm +2 -4
index d8c4ba0..3b71983 100755
@@ -35,10 +35,8 @@ case "$1" in
            chmod g+r /dev/tty[0-3]
            chmod o+rw /dev/input/*
        fi
-       # Using sudo -i here has the nice side effect of making sire
-       # HOME, USER and other previously problematic variables
-       # are set correctly
-       sudo -b -i -u $username /etc/X11/Xserver
+       # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211]
+       su -l -c '/etc/X11/Xserver&' $username 
        # Wait for the desktop to say its finished loading
        dbus-wait org.matchbox_project.desktop Loaded
   ;;
Signature · 1 line
1.7.1