From 70ebea74f9c557b811181eda75fccb594f5f9a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 23 Feb 2022 23:08:07 +0100 Subject: [PATCH] Follow oe-core's variable changes / class shuffle MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- conf/distro/include/mortsgna-inherits.inc | 5 ----- conf/distro/include/mortsgna-libc-glibc.inc | 2 +- conf/distro/mortsgna.conf | 10 +++++----- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/conf/distro/include/mortsgna-inherits.inc b/conf/distro/include/mortsgna-inherits.inc index 5fc09c4..9f4804d 100644 --- a/conf/distro/include/mortsgna-inherits.inc +++ b/conf/distro/include/mortsgna-inherits.inc @@ -4,9 +4,6 @@ INHERIT += "debian" # activate config checker INHERIT += "sanity" -# activate the blacklister -INHERIT += "blacklist" - # make devshell available as task INHERIT += "devshell" @@ -22,5 +19,3 @@ INHERIT += "sstate" # drop buildinfo to /etc/build INHERIT += "image-buildinfo-mortsgna" -# Prelink images -INHERIT += "image-prelink" diff --git a/conf/distro/include/mortsgna-libc-glibc.inc b/conf/distro/include/mortsgna-libc-glibc.inc index 2b02695..eebb56b 100644 --- a/conf/distro/include/mortsgna-libc-glibc.inc +++ b/conf/distro/include/mortsgna-libc-glibc.inc @@ -1,2 +1,2 @@ # glibc: -PNBLACKLIST[libiconv] = "the glibc provided iconv library is used" +SKIP_RECIPE[libiconv] = "the glibc provided iconv library is used" diff --git a/conf/distro/mortsgna.conf b/conf/distro/mortsgna.conf index aa71a13..22a094f 100644 --- a/conf/distro/mortsgna.conf +++ b/conf/distro/mortsgna.conf @@ -54,7 +54,7 @@ ONLINE_PACKAGE_MANAGEMENT = "full" BB_SIGNATURE_HANDLER ?= "OEBasicHash" # We want to build a superset for the default config -LICENSE_FLAGS_WHITELIST += "commercial" +LICENSE_FLAGS_ACCEPTED += "commercial" # Can be "glibc" or "musl" TCLIBC ?= "glibc" @@ -114,10 +114,10 @@ ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0" ENABLE_BINARY_LOCALE_GENERATION:armeb = "0" # blacklist policy -PNBLACKLIST[pn-fso-apm] = "regular apmd is good enough" -PNBLACKLIST[weston-init] = "A passwordless root session reachable by two keys - security???" -PNBLACKLIST[packagegroup-core-x11] = "Conflicts with mortsgna-images" -PNBLACKLIST[xserver-nodm-init] = "Mortsgna-images use graphical display managers" +SKIP_RECIPE[pn-fso-apm] = "regular apmd is good enough" +SKIP_RECIPE[weston-init] = "A passwordless root session reachable by two keys - security???" +SKIP_RECIPE[packagegroup-core-x11] = "Conflicts with mortsgna-images" +SKIP_RECIPE[xserver-nodm-init] = "Mortsgna-images use graphical display managers" ############################################################################### # Quality & security hardening