From 5392cb9baaf7bb0e3fd530c79ec44757bbde5569 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Fri, 24 Jul 2020 11:11:24 -0700 Subject: security images: Move to recipe-core Signed-off-by: Armin Kuster --- recipes-core/images/security-build-image.bb | 19 ++++++++++++++ recipes-core/images/security-client-image.bb | 16 ++++++++++++ recipes-core/images/security-server-image.bb | 19 ++++++++++++++ recipes-core/images/security-test-image.bb | 33 ++++++++++++++++++++++++ recipes-security/images/security-build-image.bb | 19 -------------- recipes-security/images/security-client-image.bb | 16 ------------ recipes-security/images/security-server-image.bb | 19 -------------- recipes-security/images/security-test-image.bb | 33 ------------------------ 8 files changed, 87 insertions(+), 87 deletions(-) create mode 100644 recipes-core/images/security-build-image.bb create mode 100644 recipes-core/images/security-client-image.bb create mode 100644 recipes-core/images/security-server-image.bb create mode 100644 recipes-core/images/security-test-image.bb delete mode 100644 recipes-security/images/security-build-image.bb delete mode 100644 recipes-security/images/security-client-image.bb delete mode 100644 recipes-security/images/security-server-image.bb delete mode 100644 recipes-security/images/security-test-image.bb diff --git a/recipes-core/images/security-build-image.bb b/recipes-core/images/security-build-image.bb new file mode 100644 index 0000000..a8757f9 --- /dev/null +++ b/recipes-core/images/security-build-image.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "A small image for building meta-security packages" + +IMAGE_FEATURES += "ssh-server-openssh" + +IMAGE_INSTALL = "\ + packagegroup-base \ + packagegroup-core-boot \ + packagegroup-core-security \ + os-release" + +IMAGE_LINGUAS ?= " " + +LICENSE = "MIT" + +inherit core-image + +export IMAGE_BASENAME = "security-build-image" + +IMAGE_ROOTFS_EXTRA_SPACE = "5242880" diff --git a/recipes-core/images/security-client-image.bb b/recipes-core/images/security-client-image.bb new file mode 100644 index 0000000..f4ebc69 --- /dev/null +++ b/recipes-core/images/security-client-image.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "A Client side Security example" + +IMAGE_INSTALL = "\ + packagegroup-base \ + packagegroup-core-boot \ + os-release \ + samhain-client \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-xfce-base", "", d)}" + +IMAGE_LINGUAS ?= " " + +LICENSE = "MIT" + +inherit core-image + +export IMAGE_BASENAME = "security-client-image" diff --git a/recipes-core/images/security-server-image.bb b/recipes-core/images/security-server-image.bb new file mode 100644 index 0000000..4927e0e --- /dev/null +++ b/recipes-core/images/security-server-image.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "A Serve side image for Security example " + +IMAGE_FEATURES += "ssh-server-openssh" + +IMAGE_INSTALL = "\ + packagegroup-base \ + packagegroup-core-boot \ + samhain-server \ + os-release " + +IMAGE_LINGUAS ?= " " + +LICENSE = "MIT" + +inherit core-image + +export IMAGE_BASENAME = "security-server-image" + +IMAGE_ROOTFS_EXTRA_SPACE = "5242880" diff --git a/recipes-core/images/security-test-image.bb b/recipes-core/images/security-test-image.bb new file mode 100644 index 0000000..c71d726 --- /dev/null +++ b/recipes-core/images/security-test-image.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "A small image for testing meta-security packages" + +IMAGE_FEATURES += "ssh-server-openssh" + +TEST_SUITES = "ssh ping ptest apparmor clamav samhain sssd tripwire checksec smack suricata" + +INSTALL_CLAMAV_CVD = "1" + +IMAGE_INSTALL = "\ + packagegroup-base \ + packagegroup-core-boot \ + packagegroup-core-security-ptest \ + clamav \ + tripwire \ + checksec \ + suricata \ + samhain-standalone \ + ${@bb.utils.contains("DISTRO_FEATURES", "pam", "sssd", "",d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", "apparmor", "",d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "smack", "smack-test", "",d)} \ + os-release \ + " + + +IMAGE_LINGUAS ?= " " + +LICENSE = "MIT" + +inherit core-image + +export IMAGE_BASENAME = "security-test-image" + +IMAGE_ROOTFS_EXTRA_SPACE = "5242880" diff --git a/recipes-security/images/security-build-image.bb b/recipes-security/images/security-build-image.bb deleted file mode 100644 index a8757f9..0000000 --- a/recipes-security/images/security-build-image.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "A small image for building meta-security packages" - -IMAGE_FEATURES += "ssh-server-openssh" - -IMAGE_INSTALL = "\ - packagegroup-base \ - packagegroup-core-boot \ - packagegroup-core-security \ - os-release" - -IMAGE_LINGUAS ?= " " - -LICENSE = "MIT" - -inherit core-image - -export IMAGE_BASENAME = "security-build-image" - -IMAGE_ROOTFS_EXTRA_SPACE = "5242880" diff --git a/recipes-security/images/security-client-image.bb b/recipes-security/images/security-client-image.bb deleted file mode 100644 index f4ebc69..0000000 --- a/recipes-security/images/security-client-image.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "A Client side Security example" - -IMAGE_INSTALL = "\ - packagegroup-base \ - packagegroup-core-boot \ - os-release \ - samhain-client \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-xfce-base", "", d)}" - -IMAGE_LINGUAS ?= " " - -LICENSE = "MIT" - -inherit core-image - -export IMAGE_BASENAME = "security-client-image" diff --git a/recipes-security/images/security-server-image.bb b/recipes-security/images/security-server-image.bb deleted file mode 100644 index 4927e0e..0000000 --- a/recipes-security/images/security-server-image.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "A Serve side image for Security example " - -IMAGE_FEATURES += "ssh-server-openssh" - -IMAGE_INSTALL = "\ - packagegroup-base \ - packagegroup-core-boot \ - samhain-server \ - os-release " - -IMAGE_LINGUAS ?= " " - -LICENSE = "MIT" - -inherit core-image - -export IMAGE_BASENAME = "security-server-image" - -IMAGE_ROOTFS_EXTRA_SPACE = "5242880" diff --git a/recipes-security/images/security-test-image.bb b/recipes-security/images/security-test-image.bb deleted file mode 100644 index c71d726..0000000 --- a/recipes-security/images/security-test-image.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "A small image for testing meta-security packages" - -IMAGE_FEATURES += "ssh-server-openssh" - -TEST_SUITES = "ssh ping ptest apparmor clamav samhain sssd tripwire checksec smack suricata" - -INSTALL_CLAMAV_CVD = "1" - -IMAGE_INSTALL = "\ - packagegroup-base \ - packagegroup-core-boot \ - packagegroup-core-security-ptest \ - clamav \ - tripwire \ - checksec \ - suricata \ - samhain-standalone \ - ${@bb.utils.contains("DISTRO_FEATURES", "pam", "sssd", "",d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", "apparmor", "",d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "smack", "smack-test", "",d)} \ - os-release \ - " - - -IMAGE_LINGUAS ?= " " - -LICENSE = "MIT" - -inherit core-image - -export IMAGE_BASENAME = "security-test-image" - -IMAGE_ROOTFS_EXTRA_SPACE = "5242880" -- cgit v1.2.3-54-g00ecf