From d9bac27cdb912b18b7fd8d5096c4612025493ef6 Mon Sep 17 00:00:00 2001
From: José Bollo <jose.bollo@iot.bzh>
Date: Wed, 24 Jan 2018 11:52:04 +0100
Subject: Remove smack recipe
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

smack user space library is provided by meta-security

Change-Id: Ifb5e88e5f5a1aab3e695ab91a56d8c55c33fd004
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---
 meta-security/recipes-security/cynara/cynara.inc   |  4 ++--
 .../recipes-security/smack/smack-userspace_git.bb  | 27 ----------------------
 2 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 meta-security/recipes-security/smack/smack-userspace_git.bb

(limited to 'meta-security/recipes-security')

diff --git a/meta-security/recipes-security/cynara/cynara.inc b/meta-security/recipes-security/cynara/cynara.inc
index 0e823edcc..1e80b6163 100644
--- a/meta-security/recipes-security/cynara/cynara.inc
+++ b/meta-security/recipes-security/cynara/cynara.inc
@@ -113,8 +113,8 @@ FILES_${PN} += "${systemd_unitdir}/system"
 # the postinst completes, but that is a general problem. It gets
 # avoided entirely when calling this script while building the
 # rootfs.
-RDEPENDS_${PN}_append_with-lsm-smack = " smack-userspace"
-DEPENDS_append_with-lsm-smack = " smack-userspace-native"
+RDEPENDS_${PN}_append_with-lsm-smack = " smack"
+DEPENDS_append_with-lsm-smack = " smack-native"
 CHSMACK_with-lsm-smack = "chsmack"
 CHSMACK = "true"
 pkg_postinst_${PN} () {
diff --git a/meta-security/recipes-security/smack/smack-userspace_git.bb b/meta-security/recipes-security/smack/smack-userspace_git.bb
deleted file mode 100644
index aa6d5fa6f..000000000
--- a/meta-security/recipes-security/smack/smack-userspace_git.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Selection of tools for developers working with Smack"
-HOMEPAGE = "https://github.com/smack-team/smack"
-SECTION = "Security/Access Control"
-LICENSE = "LGPL-2.1"
-
-# Alias needed to satisfy dependencies in other recipes.
-# This recipe itself cannot be named "smack" because that
-# would conflict with the "smack" override.
-PROVIDES = "smack"
-RPROVIDES_${PN} += "smack"
-
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-PV = "1.2.0+git${SRCPV}"
-SRCREV = "d82bac7dac69823fd40015dffad1a128505a2258"
-SRC_URI += "git://github.com/smack-team/smack.git;protocol=https;branch=v1.2.x"
-S = "${WORKDIR}/git"
-
-inherit autotools
-
-BBCLASSEXTEND = "native"
-
-# Fix copied from meta-tizen.
-do_configure_prepend() {
-  export ac_cv_prog_DOXYGEN=""
-  sed -i 's@systemd_new=no@systemd_new=yes@' ${S}/configure.ac
-  sed -i '/PKG_CHECK_MODULES(/,/)/{s/b/r/p;d}' ${S}/configure.ac
-}
-- 
cgit 1.2.3-korg