[PATCH 0/7] Package Upgrades

[PATCH 0/7] Package Upgrades

[Chen Qi]

The following changes since commit d5b0e6062a4e9f66a5b1813ed082a56cce5bee5d:

  boost : Add the atomic and chrono libraries to the build. (2014-12-25 22:05:29 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib ChenQi/package-upgrades
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/package-upgrades

Chen Qi (7):
  kmod: upgrade to 19
  tar: upgrade to 2.18
  sudo: upgrade to latest state version 1.8.11p2
  pciutils: upgrade to 3.3.0
  pciutils: add PACKAGECONFIG for 'hwdb'
  xz: upgrade to latest stable release 5.2.0
  grep: upgrade to 2.21

 .../pciutils/pciutils/lib-build-fix.patch          | 92 ----------------------
 .../{pciutils_3.2.1.bb => pciutils_3.3.0.bb}       | 19 ++---
 .../grep/{grep_2.19.bb => grep_2.21.bb}            |  4 +-
 meta/recipes-extended/sudo/sudo.inc                | 14 ++--
 .../sudo/{sudo_1.8.10p3.bb => sudo_1.8.11p2.bb}    |  6 +-
 ...ve_1.27.1.bb => tar-replacement-native_1.28.bb} |  0
 .../tar/{tar_1.27.1.bb => tar_1.28.bb}             |  5 +-
 .../xz/{xz_5.1.3alpha.bb => xz_5.2.0.bb}           |  4 +-
 meta/recipes-kernel/kmod/kmod.inc                  |  7 +-
 ...missing-O_CLOEXEC-in-kmod_module_get_size.patch | 27 -------
 ...alling-bswap_-instead-of-htobe-and-be-toh.patch | 21 ++---
 11 files changed, 39 insertions(+), 160 deletions(-)
 delete mode 100644 meta/recipes-bsp/pciutils/pciutils/lib-build-fix.patch
 rename meta/recipes-bsp/pciutils/{pciutils_3.2.1.bb => pciutils_3.3.0.bb} (78%)
 rename meta/recipes-extended/grep/{grep_2.19.bb => grep_2.21.bb} (87%)
 rename meta/recipes-extended/sudo/{sudo_1.8.10p3.bb => sudo_1.8.11p2.bb} (80%)
 rename meta/recipes-extended/tar/{tar-replacement-native_1.27.1.bb => tar-replacement-native_1.28.bb} (100%)
 rename meta/recipes-extended/tar/{tar_1.27.1.bb => tar_1.28.bb} (53%)
 rename meta/recipes-extended/xz/{xz_5.1.3alpha.bb => xz_5.2.0.bb} (92%)
 delete mode 100644 meta/recipes-kernel/kmod/kmod/0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch

-- 
1.9.1

[PATCH 1/7] kmod: upgrade to 19

[Chen Qi]

0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch is dropped
as it's in the new version.

Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch is modified
to match the new version.

License chesum is changed but it is confirmed that the license information
is not chagned.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-kernel/kmod/kmod.inc                  |  7 +++---
 ...missing-O_CLOEXEC-in-kmod_module_get_size.patch | 27 ----------------------
 ...alling-bswap_-instead-of-htobe-and-be-toh.patch | 21 +++++++++--------
 3 files changed, 14 insertions(+), 41 deletions(-)
 delete mode 100644 meta/recipes-kernel/kmod/kmod/0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch

diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index dda74c8..c26ea23 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -11,14 +11,14 @@ SECTION = "base"
 
 DEPENDS += "pkgconfig-native"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
+LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                     file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                    "
 inherit autotools gtk-doc ptest
 
-SRCREV = "ae58de0fcb4a6528dd365e23d383bbe2eaf2d566"
+SRCREV = "fd56638aed3fe147015bfa10ed4a5f7491303cb4"
 # Lookout for PV bump too when SRCREV is changed
-PV = "18+git${SRCPV}"
+PV = "19+git${SRCPV}"
 
 SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
            file://depmod-search.conf \
@@ -26,7 +26,6 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
            file://ptest.patch \
            file://avoid_parallel_tests.patch \
            file://fix-O_CLOEXEC.patch \
-           file://0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch \
           "
 
 S = "${WORKDIR}/git"
diff --git a/meta/recipes-kernel/kmod/kmod/0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch b/meta/recipes-kernel/kmod/kmod/0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch
deleted file mode 100644
index 77624ce..0000000
--- a/meta/recipes-kernel/kmod/kmod/0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 74c26943f1228870022d116a1fda25be3a55a38e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
-Date: Wed, 18 Jun 2014 20:51:00 -0400
-Subject: [PATCH] Add missing O_CLOEXEC in kmod_module_get_size()
-
-Upstream-Status: Backport 
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
----
- libkmod/libkmod-module.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
-index e3cc5a7..b81b451 100644
---- a/libkmod/libkmod-module.c
-+++ b/libkmod/libkmod-module.c
-@@ -1783,7 +1783,7 @@ KMOD_EXPORT long kmod_module_get_size(const struct kmod_module *mod)
- 	 * loaded.
- 	 */
- 	snprintf(line, sizeof(line), "/sys/module/%s", mod->name);
--	dfd = open(line, O_RDONLY);
-+	dfd = open(line, O_RDONLY|O_CLOEXEC);
- 	if (dfd < 0)
- 		return -errno;
- 
--- 
-1.8.3.1
-
diff --git a/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch b/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
index 2320b92..7c0a275 100644
--- a/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
+++ b/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
@@ -1,6 +1,6 @@
-From 0c4dbadc9db3cda1cfca64e44ea08c6e89919ea7 Mon Sep 17 00:00:00 2001
-From: Ting Liu <b28495@freescale.com>
-Date: Tue, 10 Sep 2013 13:44:18 +0800
+From 4b68940b1ed46c54a5a0bdf6bb9d4599bc64e6f4 Mon Sep 17 00:00:00 2001
+From: Chen Qi <Qi.Chen@windriver.com>
+Date: Wed, 24 Dec 2014 10:12:40 +0800
 Subject: [PATCH] Change to calling bswap_* instead of htobe* and be*toh
 
 We can't use htobe* and be*toh functions because they are not
@@ -11,12 +11,13 @@ Change to directly calling bswap_* as defined in+byteswap.h.
 Upstream-Status: Inappropriate
 
 Signed-off-by: Ting Liu <b28495@freescale.com>
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
 ---
- libkmod/libkmod-signature.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ libkmod/libkmod-signature.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
-index 6b80caa..3544a36 100644
+index 2b976a5..ffe58c2 100644
 --- a/libkmod/libkmod-signature.c
 +++ b/libkmod/libkmod-signature.c
 @@ -19,6 +19,7 @@
@@ -24,10 +25,10 @@ index 6b80caa..3544a36 100644
  
  #include <endian.h>
 +#include <byteswap.h>
- #include <stdint.h>
+ #include <inttypes.h>
+ #include <stdio.h>
  #include <stdlib.h>
- #include <string.h>
-@@ -121,7 +122,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat
+@@ -124,7 +125,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat
  			modsig->hash >= PKEY_HASH__LAST ||
  			modsig->id_type >= PKEY_ID_TYPE__LAST)
  		return false;
@@ -37,5 +38,5 @@ index 6b80caa..3544a36 100644
  		return false;
  
 -- 
-1.7.5.4
+1.9.1
 
-- 
1.9.1

[PATCH 2/7] tar: upgrade to 2.18

[Chen Qi]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 ...r-replacement-native_1.27.1.bb => tar-replacement-native_1.28.bb} | 0
 meta/recipes-extended/tar/{tar_1.27.1.bb => tar_1.28.bb}             | 5 ++---
 2 files changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-extended/tar/{tar-replacement-native_1.27.1.bb => tar-replacement-native_1.28.bb} (100%)
 rename meta/recipes-extended/tar/{tar_1.27.1.bb => tar_1.28.bb} (53%)

diff --git a/meta/recipes-extended/tar/tar-replacement-native_1.27.1.bb b/meta/recipes-extended/tar/tar-replacement-native_1.28.bb
similarity index 100%
rename from meta/recipes-extended/tar/tar-replacement-native_1.27.1.bb
rename to meta/recipes-extended/tar/tar-replacement-native_1.28.bb
diff --git a/meta/recipes-extended/tar/tar_1.27.1.bb b/meta/recipes-extended/tar/tar_1.28.bb
similarity index 53%
rename from meta/recipes-extended/tar/tar_1.27.1.bb
rename to meta/recipes-extended/tar/tar_1.28.bb
index 439bb50..a15b4b6 100644
--- a/meta/recipes-extended/tar/tar_1.27.1.bb
+++ b/meta/recipes-extended/tar/tar_1.28.bb
@@ -5,6 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 SRC_URI += "file://remove-gets.patch \
            "
-
-SRC_URI[md5sum] = "490e074dd7e71f553df8357a7ef9bdcf"
-SRC_URI[sha256sum] = "9b0fb3ce8512059337add0da5f8f0f7d7647f2201f5ece24581d620ea60337c6"
+SRC_URI[md5sum] = "8f32b2bc1ed7ddf4cf4e4a39711341b0"
+SRC_URI[sha256sum] = "60e4bfe0602fef34cd908d91cf638e17eeb09394d7b98c2487217dc4d3147562"
-- 
1.9.1

[PATCH 3/7] sudo: upgrade to latest state version 1.8.11p2

[Chen Qi]

Files containing license information have changed position.
FILES_${PN}-dev needs to be modified to contain correct files.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-extended/sudo/sudo.inc                        | 14 +++++++-------
 .../sudo/{sudo_1.8.10p3.bb => sudo_1.8.11p2.bb}            |  6 ++++--
 2 files changed, 11 insertions(+), 9 deletions(-)
 rename meta/recipes-extended/sudo/{sudo_1.8.10p3.bb => sudo_1.8.11p2.bb} (80%)

diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index 1d7e541..6e9aec8 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -6,12 +6,12 @@ SECTION = "admin"
 LICENSE = "ISC & BSD & Zlib"
 LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=69e337d679950e304953813158595256 \
                     file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=e2dbb155fc49beea947515300bab99e0 \
-                    file://compat/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \
-                    file://compat/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \
-                    file://compat/glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \
-                    file://compat/snprintf.c;beginline=6;endline=31;md5=c98b24f02967c095d7a70ae2e4d4d4ea \
-                    file://include/queue.h;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \
-                    file://compat/inet_pton.c;beginline=3;endline=17;md5=3970ab0518ab79cbd0bafb697f10b33a"
+                    file://lib/util/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \
+                    file://lib/util/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \
+                    file://lib/util/glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \
+                    file://lib/util/snprintf.c;beginline=6;endline=31;md5=c98b24f02967c095d7a70ae2e4d4d4ea \
+                    file://include/sudo_queue.h;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \
+                    file://lib/util/inet_pton.c;beginline=3;endline=17;md5=3970ab0518ab79cbd0bafb697f10b33a"
 
 inherit autotools
 
@@ -30,7 +30,7 @@ do_configure_prepend () {
 
 # mksigname/mksiglist are used on build host to generate source files
 do_compile_prepend () {
-	oe_runmake SSP_CFLAGS="" SSP_LDFLAGS="" CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS="$BUILD_CPPFLAGS -I${S}/include -I${S} -I${B}"  -C compat mksigname mksiglist
+	oe_runmake SSP_CFLAGS="" SSP_LDFLAGS="" CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS="$BUILD_CPPFLAGS -I${S}/include -I${S} -I${B}"  -C lib/util mksigname mksiglist
 }
 
 # Explicitly create ${localstatedir}/lib before do_install to ensure
diff --git a/meta/recipes-extended/sudo/sudo_1.8.10p3.bb b/meta/recipes-extended/sudo/sudo_1.8.11p2.bb
similarity index 80%
rename from meta/recipes-extended/sudo/sudo_1.8.10p3.bb
rename to meta/recipes-extended/sudo/sudo_1.8.11p2.bb
index 4c53032..c5e2545 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.10p3.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.11p2.bb
@@ -6,8 +6,8 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
 
 PAM_SRC_URI = "file://sudo.pam"
 
-SRC_URI[md5sum] = "fcd8d0d9f9f0397d076ee901e242ed39"
-SRC_URI[sha256sum] = "6eda135fa68163108f1c24de6975de5ddb09d75730bb62d6390bda7b04345400"
+SRC_URI[md5sum] = "84012b4871b6c775c957cd310d5bad87"
+SRC_URI[sha256sum] = "8133849418fa18cf6b6bb6893d1855ff7afe21db8923234a00bf045c90fba1ad"
 
 DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
@@ -25,3 +25,5 @@ do_install_append () {
 	# Explicitly remove the ${localstatedir}/run directory to avoid QA error
 	rmdir -p --ignore-fail-on-non-empty ${D}${localstatedir}/run/sudo
 }
+
+FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/*.la"
-- 
1.9.1

[PATCH 4/7] pciutils: upgrade to 3.3.0

[Chen Qi]

lib-build-fix.patch is removed as it doesn't seem useful.
do_compile_prepend is removed because it's not useful for the new version.
The following line is removed as I don't see any problem without it.
PARALLEL_MAKE = ""

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 .../pciutils/pciutils/lib-build-fix.patch          | 92 ----------------------
 .../{pciutils_3.2.1.bb => pciutils_3.3.0.bb}       | 14 +---
 2 files changed, 3 insertions(+), 103 deletions(-)
 delete mode 100644 meta/recipes-bsp/pciutils/pciutils/lib-build-fix.patch
 rename meta/recipes-bsp/pciutils/{pciutils_3.2.1.bb => pciutils_3.3.0.bb} (82%)

diff --git a/meta/recipes-bsp/pciutils/pciutils/lib-build-fix.patch b/meta/recipes-bsp/pciutils/pciutils/lib-build-fix.patch
deleted file mode 100644
index 413ef0e..0000000
--- a/meta/recipes-bsp/pciutils/pciutils/lib-build-fix.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Link directly to lib/libpci.so.3.1.5 will hard code this versioned
-string into lspci and other utilities, which is not desirable and
-won't work. In the other hand, linking to a symbolic link lib/libpci.so
-doesn't have this issue.
-
-Upstream-Status: Pending
-
-7/30/2010 - created by Qing He <qing.he@intel.com>
-
-diff --git a/Makefile b/Makefile
-index 74c570a..31337e0 100644
---- a/Makefile
-+++ b/Makefile
-@@ -56,9 +56,9 @@ PCIINC_INS=lib/config.h lib/header.h lib/pci.h lib/types.h
- 
- export
- 
--all: lib/$(PCILIB) lspci setpci example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS)
-+all: lib/$(PCILIB_DEV) lspci setpci example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS)
- 
--lib/$(PCILIB): $(PCIINC) force
-+lib/$(PCILIB) lib/$(PCILIB_DEV): $(PCIINC) force
- 	$(MAKE) -C lib all
- 
- force:
-@@ -66,8 +66,8 @@ force:
- lib/config.h lib/config.mk:
- 	cd lib && ./configure
- 
--lspci: lspci.o ls-vpd.o ls-caps.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o common.o lib/$(PCILIB)
--setpci: setpci.o common.o lib/$(PCILIB)
-+lspci: lspci.o ls-vpd.o ls-caps.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o common.o lib/$(PCILIB_DEV)
-+setpci: setpci.o common.o lib/$(PCILIB_DEV)
- 
- LSPCIINC=lspci.h pciutils.h $(PCIINC)
- lspci.o: lspci.c $(LSPCIINC)
-@@ -89,7 +89,7 @@ update-pciids: update-pciids.sh
- 	chmod +x $@
- 
- # The example of use of libpci
--example: example.o lib/$(PCILIB)
-+example: example.o lib/$(PCILIB_DEV)
- example.o: example.c $(PCIINC)
- 
- %: %.o
-diff --git a/lib/Makefile b/lib/Makefile
-index 1eb06a5..a8dab56 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -42,7 +42,7 @@ ifdef PCI_HAVE_PM_NBSD_LIBPCI
- OBJS += nbsd-libpci
- endif
- 
--all: $(PCILIB) $(PCILIBPC)
-+all: $(PCILIB_DEV) $(PCILIBPC)
- 
- ifeq ($(SHARED),no)
- $(PCILIB): $(addsuffix .o,$(OBJS))
-@@ -53,6 +53,9 @@ else
- CFLAGS += -fPIC -fvisibility=hidden
- $(PCILIB): $(addsuffix .o,$(OBJS))
- 	$(CC) -shared $(LDFLAGS) $(SONAME) -Wl,--version-script=libpci.ver -o $@ $^ $(LIB_LDLIBS)
-+
-+$(PCILIB_DEV): $(PCILIB)
-+	ln -s $< $@
- endif
- 
- $(PCILIBPC): libpci.pc.in
-diff --git a/lib/configure b/lib/configure
-index 27388bc..6c508cf 100755
---- a/lib/configure
-+++ b/lib/configure
-@@ -216,16 +216,18 @@ fi
- echo "Checking whether to build a shared library... $SHARED (set manually)"
- if [ "$SHARED" = no ] ; then
- 	echo >>$m 'PCILIB=$(LIBNAME).a'
-+	echo >>$m 'PCILIB_DEV=$(LIBNAME).a'
- 	echo >>$m 'LDLIBS=$(WITH_LIBS)'
- 	echo >>$m 'LIB_LDLIBS='
- else
- 	echo >>$m 'PCILIB=$(LIBNAME).so.$(VERSION)'
-+	echo >>$m 'PCILIB_DEV=$(LIBNAME).so'
- 	# We link the dependencies _to_ the library, so we do not need explicit deps in .pc
- 	echo >>$m 'LDLIBS='
- 	echo >>$m 'LIB_LDLIBS=$(WITH_LIBS)'
- 	echo >>$c '#define PCI_SHARED_LIB'
- 	if [ "$SHARED" = yes ] ; then
--		echo >>$m 'SONAME=-Wl,-soname,$(LIBNAME).so$(ABI_VERSION)'
-+		echo >>$m 'SONAME=-Wl,-soname -Wl,$(LIBNAME).so$(ABI_VERSION)'
- 	fi
- fi
- echo >>$m 'PCILIBPC=$(LIBNAME).pc'
diff --git a/meta/recipes-bsp/pciutils/pciutils_3.2.1.bb b/meta/recipes-bsp/pciutils/pciutils_3.3.0.bb
similarity index 82%
rename from meta/recipes-bsp/pciutils/pciutils_3.2.1.bb
rename to meta/recipes-bsp/pciutils/pciutils_3.3.0.bb
index 6e29953..71f7e04 100644
--- a/meta/recipes-bsp/pciutils/pciutils_3.2.1.bb
+++ b/meta/recipes-bsp/pciutils/pciutils_3.3.0.bb
@@ -8,19 +8,16 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 DEPENDS = "zlib kmod"
 
-SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \
            file://configure.patch \
-           file://lib-build-fix.patch \
            file://guess-fix.patch \
            file://makefile.patch"
 
-SRC_URI[md5sum] = "425b1acad6854cc2bbb06ac8e48e76fc"
-SRC_URI[sha256sum] = "12d52b19042e2fd058af12e7d877bbbce72213cb3a0b5ec7ff0703ac09e3dcde"
+SRC_URI[md5sum] = "3c19adf32a8457983b71ff376ef7dafe"
+SRC_URI[sha256sum] = "413395d4bdc66fdedd6c993ed9083d1dd73812bf2a679d320f73de35c7801301"
 
 inherit multilib_header
 
-PARALLEL_MAKE = ""
-
 PCI_CONF_FLAG = "ZLIB=yes DNS=yes SHARED=yes"
 
 # see configure.patch
@@ -31,11 +28,6 @@ do_configure () {
 	)
 }
 
-do_compile_prepend () {
-	# Avoid this error:  ln: failed to create symbolic link `libpci.so': File exists
-	rm -f ${S}/lib/libpci.so
-}
-
 export PREFIX = "${prefix}"
 export SBINDIR = "${sbindir}"
 export SHAREDIR = "${datadir}"
-- 
1.9.1

[PATCH 5/7] pciutils: add PACKAGECONFIG for 'hwdb'

[Chen Qi]

Add PACKAGECONFIG for 'hwdb' to fix the following QA warning.
WARNING: QA Issue: libpci rdepends on libudev, but it isn't a build dependency? [build-deps]
WARNING: QA Issue: pciutils rdepends on libudev, but it isn't a build dependency? [build-deps]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-bsp/pciutils/pciutils_3.3.0.bb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-bsp/pciutils/pciutils_3.3.0.bb b/meta/recipes-bsp/pciutils/pciutils_3.3.0.bb
index 71f7e04..f544919 100644
--- a/meta/recipes-bsp/pciutils/pciutils_3.3.0.bb
+++ b/meta/recipes-bsp/pciutils/pciutils_3.3.0.bb
@@ -18,13 +18,18 @@ SRC_URI[sha256sum] = "413395d4bdc66fdedd6c993ed9083d1dd73812bf2a679d320f73de35c7
 
 inherit multilib_header
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[hwdb] = "HWDB=yes,HWDB=no,udev"
+
 PCI_CONF_FLAG = "ZLIB=yes DNS=yes SHARED=yes"
 
 # see configure.patch
 do_configure () {
 	(
 	  cd lib && \
-	  ${PCI_CONF_FLAG} ./configure ${PV} ${datadir} ${TARGET_OS} ${TARGET_ARCH}
+	  # EXTRA_OECONF for this recipe could only possibly contain 'HWDB=yes/no', so we put it
+	  # before ./configure
+	  ${PCI_CONF_FLAG} ${EXTRA_OECONF} ./configure ${PV} ${datadir} ${TARGET_OS} ${TARGET_ARCH}
 	)
 }
 
-- 
1.9.1

[PATCH 6/7] xz: upgrade to latest stable release 5.2.0

[Chen Qi]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-extended/xz/{xz_5.1.3alpha.bb => xz_5.2.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/xz/{xz_5.1.3alpha.bb => xz_5.2.0.bb} (92%)

diff --git a/meta/recipes-extended/xz/xz_5.1.3alpha.bb b/meta/recipes-extended/xz/xz_5.2.0.bb
similarity index 92%
rename from meta/recipes-extended/xz/xz_5.1.3alpha.bb
rename to meta/recipes-extended/xz/xz_5.2.0.bb
index 168e383..3439ec9 100644
--- a/meta/recipes-extended/xz/xz_5.1.3alpha.bb
+++ b/meta/recipes-extended/xz/xz_5.2.0.bb
@@ -25,8 +25,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \
                     file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 "
 
 SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.gz"
-SRC_URI[md5sum] = "bbb2daa876c87fb2cf9fe4590af9694e"
-SRC_URI[sha256sum] = "9f94506e301d5b6863921bba861a99ba00de384dafb4e5f409679a93e41613d4"
+SRC_URI[md5sum] = "be585bdf8672e4406632eda3d819e284"
+SRC_URI[sha256sum] = "231ef369982240bb20ed7cffa52bb12a4a297ce6871f480ab85e8a7ba98bf3d6"
 
 inherit autotools gettext
 
-- 
1.9.1

[PATCH 7/7] grep: upgrade to 2.21

[Chen Qi]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-extended/grep/{grep_2.19.bb => grep_2.21.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/grep/{grep_2.19.bb => grep_2.21.bb} (87%)

diff --git a/meta/recipes-extended/grep/grep_2.19.bb b/meta/recipes-extended/grep/grep_2.21.bb
similarity index 87%
rename from meta/recipes-extended/grep/grep_2.19.bb
rename to meta/recipes-extended/grep/grep_2.21.bb
index 9c162cc..2c378d8 100644
--- a/meta/recipes-extended/grep/grep_2.19.bb
+++ b/meta/recipes-extended/grep/grep_2.21.bb
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8006d9c814277c1bfc4ca22af94b59ee"
 
 SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "ac732142227d9fe9567d71301e127979"
-SRC_URI[sha256sum] = "6388295be48cfcaf7665d9cd3914e6625ea000e9414132bfefd45cf1d8eec34d"
+SRC_URI[md5sum] = "43c48064d6409862b8a850db83c8038a"
+SRC_URI[sha256sum] = "5244a11c00dee8e7e5e714b9aaa053ac6cbfa27e104abee20d3c778e4bb0e5de"
 
 inherit autotools gettext texinfo
 
-- 
1.9.1

Re: [PATCH 5/7] pciutils: add PACKAGECONFIG for 'hwdb'

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 492 bytes --]

Hi Chen,

On 26 December 2014 at 09:35, Chen Qi <Qi.Chen@windriver.com> wrote:

> Add PACKAGECONFIG for 'hwdb' to fix the following QA warning.
> WARNING: QA Issue: libpci rdepends on libudev, but it isn't a build
> dependency? [build-deps]
> WARNING: QA Issue: pciutils rdepends on libudev, but it isn't a build
> dependency? [build-deps]
>

Respecting the systemd DISTRO_FEATURE to enable/disable the hwdb
PACKAGECONFIG would make a lot of sense, can you send a patch?

Ross

[-- Attachment #2: Type: text/html, Size: 948 bytes --]

Re: [PATCH 5/7] pciutils: add PACKAGECONFIG for 'hwdb'

[ChenQi]

[-- Attachment #1: Type: text/plain, Size: 708 bytes --]

On 12/29/2014 07:45 PM, Burton, Ross wrote:
> Hi Chen,
>
> On 26 December 2014 at 09:35, Chen Qi <Qi.Chen@windriver.com 
> <mailto:Qi.Chen@windriver.com>> wrote:
>
>     Add PACKAGECONFIG for 'hwdb' to fix the following QA warning.
>     WARNING: QA Issue: libpci rdepends on libudev, but it isn't a
>     build dependency? [build-deps]
>     WARNING: QA Issue: pciutils rdepends on libudev, but it isn't a
>     build dependency? [build-deps]
>
>
> Respecting the systemd DISTRO_FEATURE to enable/disable the hwdb 
> PACKAGECONFIG would make a lot of sense, can you send a patch?
>
> Ross

Yes.
The default value will be "hwdb" if 'systemd' is in distro features.

Regards,
Chen Qi


[-- Attachment #2: Type: text/html, Size: 2005 bytes --]