[OE-core] [Consolidated & Tested 12/35] libcap: Update to 2.22 with License Clarification

[Saul Wold]

Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
 meta/recipes-support/libcap/libcap.inc     |    4 ++--
 meta/recipes-support/libcap/libcap_2.20.bb |    6 ------
 meta/recipes-support/libcap/libcap_2.22.bb |    6 ++++++
 3 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 meta/recipes-support/libcap/libcap_2.20.bb
 create mode 100644 meta/recipes-support/libcap/libcap_2.22.bb

diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index efa46d6..67f7579 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
@@ -2,8 +2,8 @@ DESCRIPTION = "support for getting/setting POSIX.1e capabilities"
 HOMEPAGE = "http://sites.google.com/site/fullycapable/"
 
 # no specific GPL version required
-LICENSE = "BSD | GPL"
-LIC_FILES_CHKSUM = "file://License;md5=731de803c1ccbcb05a9b3523279c8d7f"
+LICENSE = "BSD | GPLv2"
+LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1"
 
 DEPENDS = "libpam attr perl-native-runtime"
 # attr and pam are disabled by EXTRA_OEMAKE_virtclass-native
diff --git a/meta/recipes-support/libcap/libcap_2.20.bb b/meta/recipes-support/libcap/libcap_2.20.bb
deleted file mode 100644
index a2b49c6..0000000
--- a/meta/recipes-support/libcap/libcap_2.20.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libcap.inc
-
-PR = "r3"
-
-SRC_URI[md5sum] = "10e47ed32ca2214eb0e58780282d27b4"
-SRC_URI[sha256sum] = "20e7c1ea4d3d5c410efb3a6ff138dc417912fae316d883460dcd58d9803a9220"
diff --git a/meta/recipes-support/libcap/libcap_2.22.bb b/meta/recipes-support/libcap/libcap_2.22.bb
new file mode 100644
index 0000000..bb49c03
--- /dev/null
+++ b/meta/recipes-support/libcap/libcap_2.22.bb
@@ -0,0 +1,6 @@
+require libcap.inc
+
+PR = "r0"
+
+SRC_URI[md5sum] = "ce64058bdb3f086ddbfca8ce6c919845"
+SRC_URI[sha256sum] = "73ebbd4877b5f69dd28b72098e510c5b318bc480f8201c4061ac98b78c04050f"
-- 
1.7.3.4