e2fsprogs-libs, util-linux-ng: sort out libblkid move some more

* we're using libblkid from u-l-ng nowadays, but e-l was still install a .pc breaking apps checking for libblkid > 2.15

diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc
index f5e974b..35b93db 100644 (file)
--- a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc
+++ b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc
@@ -4,7 +4,7 @@ SECTION = "base"
 PRIORITY = "optional"
 DEPENDS = "util-linux-ng"
 
-inherit autotools_stage gettext pkgconfig
+inherit autotools_stage gettext
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
            file://configure.patch;patch=1 \

diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.8.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.8.bb
index 1eca5f3..086492c 100644 (file)
--- a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.8.bb
+++ b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.8.bb
@@ -2,6 +2,8 @@ require e2fsprogs-libs.inc
 SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
          "
 
+PR = "r1"
+
 EXTRA_OECONF += " --enable-elf-shlibs "
 
 do_configure() {

diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index 8129c53..7f4333b 100644 (file)
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -3,8 +3,7 @@ SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "udev zlib ncurses virtual/libintl"
 
-inherit autotools_stage
-AUTOTOOLS_STAGE_PKGCONFIG = "1"
+inherit autotools
 
 DEFAULT_PREFERENCE = "-1"
 

diff --git a/recipes/util-linux-ng/util-linux-ng_2.16.bb b/recipes/util-linux-ng/util-linux-ng_2.16.bb
index c677fba..bbcc9ce 100644 (file)
--- a/recipes/util-linux-ng/util-linux-ng_2.16.bb
+++ b/recipes/util-linux-ng/util-linux-ng_2.16.bb
@@ -1,6 +1,6 @@
 require util-linux-ng.inc
 
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 
 SRC_URI += "file://uclibc-compile.patch;patch=1 \
             file://tls.patch;patch=1 \