From 1372e7b7d235cd8ebdfed504ca7960b07dfba351 Mon Sep 17 00:00:00 2001 From: Xin Ouyang Date: Wed, 12 Dec 2012 17:40:06 +0800 Subject: util-linux: fix build failures for version 2.22.1. Signed-off-by: Xin Ouyang --- .../util-linux/fix-libmount_la_DEPENDENCIES.patch | 28 ++++++++++++++++++++++ .../util-linux/util-linux/util-linux-selinux.patch | 14 ----------- recipes-core/util-linux/util-linux_2.22.1.bbappend | 5 ++-- 3 files changed, 31 insertions(+), 16 deletions(-) create mode 100644 recipes-core/util-linux/util-linux/fix-libmount_la_DEPENDENCIES.patch delete mode 100644 recipes-core/util-linux/util-linux/util-linux-selinux.patch (limited to 'recipes-core') diff --git a/recipes-core/util-linux/util-linux/fix-libmount_la_DEPENDENCIES.patch b/recipes-core/util-linux/util-linux/fix-libmount_la_DEPENDENCIES.patch new file mode 100644 index 0000000..ab54818 --- /dev/null +++ b/recipes-core/util-linux/util-linux/fix-libmount_la_DEPENDENCIES.patch @@ -0,0 +1,28 @@ +Subject: [PATCH] util-linux: fix libmount_la_DEPENDENCIES. + +Upstream-Status: Pending + +libmount_la_LIBADD contains "-lselinux", this is not a object that +could consider as a dependency target. So fix this. + +Signed-off-by: Xin Ouyang +--- + libmount/src/Makemodule.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am +index 494e02a..bf494a4 100644 +--- a/libmount/src/Makemodule.am ++++ b/libmount/src/Makemodule.am +@@ -38,7 +38,7 @@ libmount_la_CFLAGS = \ + -I$(top_srcdir)/libmount/src + + libmount_la_DEPENDENCIES = \ +- $(libmount_la_LIBADD) \ ++ libcommon.la libblkid.la \ + libmount/src/libmount.sym \ + libmount/src/libmount.h.in + +-- +1.7.5.4 + diff --git a/recipes-core/util-linux/util-linux/util-linux-selinux.patch b/recipes-core/util-linux/util-linux/util-linux-selinux.patch deleted file mode 100644 index a10d464..0000000 --- a/recipes-core/util-linux/util-linux/util-linux-selinux.patch +++ /dev/null @@ -1,14 +0,0 @@ - -Upstream-Status: pending -Signed-Off-By: Xiaofeng Yan ---- util-linux-2.21.1/libmount/src/Makefile.am 2012-03-29 21:11:14.456615759 +0800 -+++ util-linux-2.21.1/libmount/src/Makefile.am.new 2012-06-21 11:02:39.971163392 +0800 -@@ -30,7 +30,7 @@ - - libmount_la_LIBADD = $(ul_libblkid_la) $(SELINUX_LIBS) - --libmount_la_DEPENDENCIES = $(libmount_la_LIBADD) libmount.sym libmount.h.in -+libmount_la_DEPENDENCIES = $(ul_libblkid_la) libmount.sym libmount.h.in - - libmount_la_LDFLAGS = -Wl,--version-script=$(ul_libmount_srcdir)/libmount.sym \ - -version-info $(LIBMOUNT_VERSION_INFO) diff --git a/recipes-core/util-linux/util-linux_2.22.1.bbappend b/recipes-core/util-linux/util-linux_2.22.1.bbappend index b9a09b5..58d5344 100644 --- a/recipes-core/util-linux/util-linux_2.22.1.bbappend +++ b/recipes-core/util-linux/util-linux_2.22.1.bbappend @@ -1,9 +1,10 @@ -PR .= ".1" +PR .= ".2" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://util-linux-selinux.patch \ +SRC_URI += "file://fix-libmount_la_DEPENDENCIES.patch \ " + DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" -- cgit v1.2.3-54-g00ecf