Misc recipe fixes & upgrades
cover Misc recipe fixes & upgrades
From: Nitin A Kamble <[email protected]>
Thanks,
Nitin
The following changes since commit 4a8a3c503fd896593b787c26edbe46a7324e494e:
Revert "site/common-uclibc: Cache gl_cv_func_wcwidth_works" (2012-01-10 18:33:25 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/misc
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/misc
Nitin A Kamble (6):
locale: fix package's "provides" tag
diffstat: upgrade from 1.54 to 1.55
insane.bbclass: fix elf.arch not matching error for x32 kernel
libpcre: upgrade from 8.20 to 8.21
btrfs-tools: upgrade to newer git commit
distro_tracking: update manual_check_date fields
meta/classes/insane.bbclass | 3 +-
meta/classes/libc-package.bbclass | 3 --
.../conf/distro/include/distro_tracking_fields.inc | 36 +++++++++++---------
meta/recipes-core/eglibc/eglibc-locale.inc | 2 +-
.../btrfs-tools/btrfs-tools_git.bb | 4 +-
.../{diffstat_1.54.bb => diffstat_1.55.bb} | 6 ++--
.../libpcre/{libpcre_8.20.bb => libpcre_8.21.bb} | 5 ++-
7 files changed, 31 insertions(+), 28 deletions(-)
rename meta/recipes-devtools/diffstat/{diffstat_1.54.bb => diffstat_1.55.bb} (82%)
rename meta/recipes-support/libpcre/{libpcre_8.20.bb => libpcre_8.21.bb} (93%)Signature · 1 line
1.7.6.4
PATCH 1/6 locale: fix package's "provides" tag
From: Nitin A Kamble <[email protected]>
Fixes this bug: [YOCTO #1874]
Fixes an issue where a locale package depends on one package while it also provides the same, as seen bellow.
Package: locale-base-de-de
Version: 2.12-r19
Depends: eglibc-binary-localedata-de-de
Provides: virtual-locale-de-de, virtual-locale-de, eglibc-binary-localedata-de-de
Actually the eglibc-binary-localedata-de-de is ia separate package,
and it should not be part of provides of the locale-base-de-de.
--- meta/classes/libc-package.bbclass | 3 --- meta/recipes-core/eglibc/eglibc-locale.inc | 2 +- 2 files changed, 1 insertions(+), 4 deletions(-)
meta/classes/libc-package.bbclass +0 -3
@@ -248,9 +248,6 @@ python package_do_split_gconvs () { libc_name = name d.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \ % (bpn, libc_name))) - rprovides = (d.getVar('RPROVIDES_%s' % pkgname, True) or "").split() - rprovides.append(legitimize_package_name('%s-binary-localedata-%s' % (bpn, libc_name))) - d.setVar('RPROVIDES_%s' % pkgname, " ".join(rprovides)) commands = {}
meta/recipes-core/eglibc/eglibc-locale.inc +1 -1
@@ -26,7 +26,7 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips" # set "0" for qemu emulation of native localedef for locale generation LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" -PR = "r18" +PR = "r19" PKGSUFFIX = "" PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
Signature · 1 line
1.7.6.4
PATCH 2/6 diffstat: upgrade from 1.54 to 1.55
From: Nitin A Kamble <[email protected]>
---
.../{diffstat_1.54.bb => diffstat_1.55.bb} | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/diffstat/{diffstat_1.54.bb => diffstat_1.55.bb} (82%)meta/recipes-devtools/diffstat/diffstat_1.55.bb renamed from meta/recipes-devtools/diffstat/diffstat_1.54.bb +3 -3
@@ -6,13 +6,13 @@ HOMEPAGE = "http://invisible-island.net/diffstat/" SECTION = "devel" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0ca4a5" -PR = "r1" +PR = "r0" SRC_URI = "ftp://invisible-island.net/diffstat/diffstat-${PV}.tgz \ file://dirfix.patch" -SRC_URI[md5sum] = "af08bef2eb37050ceb0c4fddedb2ee36" -SRC_URI[sha256sum] = "d8e67660ec85be597f8548ecdd088926639dac34ec7184aaf9d09c1e6ecb83e5" +SRC_URI[md5sum] = "630d5278f1cd874dc3cc68cff3fddecf" +SRC_URI[sha256sum] = "59a46c75a99f2c373a81880051adc43a17b71c55478691e702c61c13c6d61b55" S = "${WORKDIR}/diffstat-${PV}"
Signature · 1 line
1.7.6.4
PATCH 3/6 insane.bbclass: fix elf.arch not matching error for x32 kernel
In reply to [email protected]From: Nitin A Kamble <[email protected]>
For x32 the user space is 32bit and the kernel is 64bit. So the elf.arch for vmlinuz is x86_64 and not x86. This commit fixes this QA error thrown for x32 kernel.
| ERROR: QA Issue: Architecture did not match (62 to 3) on /work/qemux86_64-poky-linux-gnux32/linux-korg-3.1+git1+e2bf8464ddbf5da24d3d320cded5691828a91a0b-r1/packages-split/kernel-vmlinux/boot/vmlinux-3.1.0-yocto-standard-01628-ge2bf846
--- meta/classes/insane.bbclass | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
meta/classes/insane.bbclass +2 -1
@@ -331,7 +331,8 @@ def package_qa_check_arch(path,name,d, elf, messages): = package_qa_get_machine_dict()[target_os][target_arch] # Check the architecture and endiannes of the binary - if not machine == elf.machine(): + if not ((machine == elf.machine()) or \ + ("virtual/kernel" in provides) and (target_os == "linux-gnux32")): messages.append("Architecture did not match (%d to %d) on %s" % \ (machine, elf.machine(), package_qa_clean_path(path,d))) elif not ((bits == elf.abiSize()) or \
Signature · 1 line
1.7.6.4
PATCH 4/6 libpcre: upgrade from 8.20 to 8.21
In reply to [email protected]From: Nitin A Kamble <[email protected]>
---
.../libpcre/{libpcre_8.20.bb => libpcre_8.21.bb} | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
rename meta/recipes-support/libpcre/{libpcre_8.20.bb => libpcre_8.21.bb} (93%)meta/recipes-support/libpcre/libpcre_8.21.bb renamed from meta/recipes-support/libpcre/libpcre_8.20.bb +3 -2
@@ -12,8 +12,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \ file://pcre-cross.patch \ file://fix-pcre-name-collision.patch" -SRC_URI[md5sum] = "a1931c70e1273e3450d5036fe273d25c" -SRC_URI[sha256sum] = "e06b0943ce4b0f15324a20020d6086760a75b72f5ad7c23b9b2bfe690ed49acd" +SRC_URI[md5sum] = "0a7b592bea64b7aa7f4011fc7171a730" +SRC_URI[sha256sum] = "a4b8509d11fc2764fb4e1415b764ad2c214459edc011ce48aeeb6bbe1ac599e3" + S = "${WORKDIR}/pcre-${PV}" PROVIDES = "pcre"
Signature · 1 line
1.7.6.4
PATCH 5/6 btrfs-tools: upgrade to newer git commit
In reply to [email protected]From: Nitin A Kamble <[email protected]>
--- .../btrfs-tools/btrfs-tools_git.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb +2 -2
@@ -12,11 +12,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067" SECTION = "base" DEPENDS = "util-linux attr" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git;protocol=git;tag=13eced9a0c2b6bd6bc38e6f0f46a1977b1167e67;branch=master" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git;protocol=git;tag=fdb6c0402337d9607c7a39155088eaf033742752;branch=master" S = "${WORKDIR}/git" -PR = "r5" +PR = "r6" SRC_URI += " file://fix_use_of_gcc.patch \ file://weak-defaults.patch \
Signature · 1 line
1.7.6.4
PATCH 6/6 distro_tracking: update manual_check_date fields
In reply to [email protected]From: Nitin A Kamble <[email protected]>
--- .../conf/distro/include/distro_tracking_fields.inc | 36 +++++++++++--------- 1 files changed, 20 insertions(+), 16 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +20 -16
@@ -31,9 +31,9 @@ RECIPE_MAINTAINER_pn-gtk-theme-torturer = "Zhai Edwin <[email protected]>" DISTRO_PN_ALIAS_pn-gtk-theme-torturer = "OSPDT upstream=http://wiki.laptop.org/go/GTK_for_OLPC" RECIPE_STATUS_pn-libpcre = "green" -RECIPE_LATEST_VERSION_pn-libpcre = "8.20" -RECIPE_LAST_UPDATE_pn-libpcre = "Nov 15, 2011" -RECIPE_MANUAL_CHECK_DATE_pn-libpcre = "Nov 15, 2011" +RECIPE_LATEST_VERSION_pn-libpcre = "8.21" +RECIPE_LAST_UPDATE_pn-libpcre = "Jan 10, 2012" +RECIPE_MANUAL_CHECK_DATE_pn-libpcre = "Jan 10, 2012" RECIPE_MAINTAINER_pn-libpcre = "Nitin A Kamble <[email protected]>" DISTRO_PN_ALIAS_pn-libpcre = "Mandriva=libpcre0 Fedora=pcre"
@@ -2979,13 +2979,20 @@ RECIPE_STATUS_pn-ldconfig-native = "red" RECIPE_LAST_UPDATE_pn-ldconfig-native = "Nov 23, 2007" DISTRO_PN_ALIAS_pn-ldconfig-native = "Ubuntu=libc-bin Fedora=glibc" -RECIPE_STATUS_pn-gcc="red" -RECIPE_LATEST_VERSION_pn-gcc="4.6.1" +RECIPE_LATEST_VERSION_pn-gcc="4.6.2+git" RECIPE_LAST_UPDATE_pn-gcc = "May 1, 2011" -RECIPE_MANUAL_CHECK_DATE_pn-gcc = "Jul 06, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-gcc = "Jan 10, 2012" RECIPE_MAINTAINER_pn-gcc = "Nitin A Kamble <[email protected]>" DISTRO_PN_ALIAS_pn-gcc-runtime = "Ubuntu=gcc Fedora=gcc" +RECIPE_LATEST_VERSION_pn-libgcc = "4.6.2+git" +RECIPE_LAST_UPDATE_pn-libgcc = "May 1, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-libgcc = "Jan 10, 2012" +DISTRO_PN_ALIAS_pn-libgcc = "Debian=libgcc4 Ubuntu=libgcc1 OpenSuSE=libgcc46" + +RECIPE_LATEST_VERSION_pn-gcc-runtime = "4.6.2+git" +RECIPE_LAST_UPDATE_pn-gcc-runtime = "May 1, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-gcc-runtime = "Jan 10, 2012" RECIPE_STATUS_pn-autoconf="red" RECIPE_LATEST_VERSION_pn-autoconf="2.68"
@@ -3018,7 +3025,7 @@ DISTRO_PN_ALIAS_pn-distcc = "Debian=distcc Fedora=distcc" RECIPE_STATUS_pn-flex="green" RECIPE_LATEST_VERSION_pn-flex="2.5.35" RECIPE_LAST_UPDATE_pn-flex = "Jun 20, 2010" -RECIPE_MANUAL_CHECK_DATE_pn-flex = "Nov 16, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-flex = "Jan 10, 2012" RECIPE_MAINTAINER_pn-flex = "Nitin A Kamble <[email protected]>" RECIPE_STATUS_pn-fstests="green"
@@ -3075,14 +3082,14 @@ RECIPE_MAINTAINER_pn-postinsts = "Nitin A Kamble <[email protected]>" RECIPE_STATUS_pn-nasm="green" RECIPE_LATEST_VERSION_pn-nasm="2.07" -RECIPE_MANUAL_CHECK_DATE_pn-nasm = "Nov 16, 2011" RECIPE_LAST_UPDATE_pn-nasm = "Jun 23, 2010" +RECIPE_MANUAL_CHECK_DATE_pn-nasm = "Jan 10, 2012" RECIPE_MAINTAINER_pn-nasm = "Nitin A Kamble <[email protected]>" RECIPE_STATUS_pn-btrfs-tools="green" RECIPE_LATEST_VERSION_pn-btrfs-tools="git" -RECIPE_MANUAL_CHECK_DATE_pn-btrfs-tools = "Oct 18, 2011" -RECIPE_LAST_UPDATE_pn-btrfs-tools = "Jun 09, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-btrfs-tools = "Jan 10, 2012" +RECIPE_LAST_UPDATE_pn-btrfs-tools = "Jan 10, 2012" RECIPE_MAINTAINER_pn-btrfs-tools = "Nitin A Kamble <[email protected]>" DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs"
@@ -3143,6 +3150,7 @@ DISTRO_PN_ALIAS_pn-python-pyrex = "Mandriva=python-pyrex Ubuntu=python-pyrex" RECIPE_STATUS_pn-python-scons="green" RECIPE_LATEST_VERSION_pn-python-scons="2.1.0" RECIPE_LAST_UPDATE_pn-python-scons = "Oct 18, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-python-scons = "Jan 10, 2012" DISTRO_PN_ALIAS_pn-python-scons = "Fedora=scons OpenSuSE=scons Ubuntu=scons Mandriva=scons Debian=scons" RECIPE_MANUAL_CHECK_DATE_pn-python-scons = "Nov 16, 2011" RECIPE_MAINTAINER_pn-python-scons = "Nitin A Kamble <[email protected]>"
@@ -3160,7 +3168,7 @@ RECIPE_MAINTAINER_pn-quilt = "Nitin A Kamble <[email protected]>" RECIPE_STATUS_pn-tcl="green" RECIPE_LATEST_VERSION_pn-tcl="8.5.11" RECIPE_LAST_UPDATE_pn-tcl = "Nov 16, 2011" -RECIPE_MANUAL_CHECK_DATE_pn-tcl = "Nov 16, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-tcl = "Jan 10, 2012" RECIPE_MAINTAINER_pn-tcl = "Nitin A Kamble <[email protected]>" RECIPE_STATUS_pn-unifdef="green" # poky local source files
@@ -3176,7 +3184,7 @@ RECIPE_MAINTAINER_pn-gnu-config = "Nitin A Kamble <[email protected]>" RECIPE_STATUS_pn-mpfr="green" RECIPE_LATEST_VERSION_pn-mpfr="3.1.0" -RECIPE_MANUAL_CHECK_DATE_pn-mpfr = "Nov 15, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-mpfr = "Jan 10, 2012" RECIPE_LAST_UPDATE_pn-mpfr = "Nov 15, 2011" RECIPE_MAINTAINER_pn-mpfr = "Nitin A Kamble <[email protected]>"
@@ -5992,10 +6000,6 @@ RECIPE_LAST_UPDATE_pn-mailx = "Jul 1, 2011" 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" RECIPE_DEPENDENCY_CHECK_pn-transfig = "not done" RECIPE_LATEST_VERSION_pn-transfig = "3.2.5d"
Signature · 1 line
1.7.6.4
Saul Wold
AppliedQuoted 30 lines · On 01/10/2012 06:27 PM, [email protected] wrote:
From: Nitin A Kamble<[email protected]>
Thanks,
NitinThe following changes since commit
4a8a3c503fd896593b787c26edbe46a7324e494e:Revert "site/common-uclibc: Cache gl_cv_func_wcwidth_works" (2012-01-10 18:33:25 +0000)are available in the git repository at:
git://git.pokylinux.org/poky-contribnitin/misc
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/miscNitin A Kamble (6):
locale: fix package's "provides" tag
diffstat: upgrade from 1.54 to 1.55
insane.bbclass: fix elf.arch not matching error for x32 kernel
libpcre: upgrade from 8.20 to 8.21
btrfs-tools: upgrade to newer git commit
distro_tracking: updatemanual_check_datefieldsmeta/classes/insane.bbclass | 3 +- meta/classes/libc-package.bbclass | 3 -- .../conf/distro/include/distro_tracking_fields.inc | 36 +++++++++++--------- meta/recipes-core/eglibc/eglibc-locale.inc | 2 +- .../btrfs-tools/btrfs-tools_git.bb | 4 +- .../{diffstat_1.54.bb => diffstat_1.55.bb} | 6 ++-- .../libpcre/{libpcre_8.20.bb => libpcre_8.21.bb} | 5 ++- 7 files changed, 31 insertions(+), 28 deletions(-)
Quoted 3 lines
rename meta/recipes-devtools/diffstat/{diffstat_1.54.bb => diffstat_1.55.bb} (82%) rename meta/recipes-support/libpcre/{libpcre_8.20.bb => libpcre_8.21.bb} (93%)
Merged into OE-Core
Thanks
Sau!