dm-verity-img.bbclass: more overided fixups
PATCH 1/6 dm-verity-img.bbclass: more overided fixups
Signed-off-by Armin Kuster <[email protected]>
--- classes/dm-verity-img.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
classes/dm-verity-img.bbclass +2 -2
@@ -63,8 +63,8 @@ verity_setup() { VERITY_TYPES = "ext2.verity ext3.verity ext4.verity btrfs.verity" IMAGE_TYPES += "${VERITY_TYPES}" CONVERSIONTYPES += "verity" -CONVERSION_CMD_verity = "verity_setup ${type}" -CONVERSION_DEPENDS_verity = "cryptsetup-native" +CONVERSION_CMD:verity = "verity_setup ${type}" +CONVERSION_DEPENDS:verity = "cryptsetup-native" python __anonymous() { verity_image = d.getVar('DM_VERITY_IMAGE')
Signature · 1 line
2.25.1
PATCH 2/6 krill: Rust is in core now
drop dynamic-layer
Signed-off-by Armin Kuster <[email protected]>
---
.../krill/files/panic_workaround.patch | 0
.../recipes-security => recipes-security}/krill/krill.inc | 0
.../recipes-security => recipes-security}/krill/krill_0.9.1.bb | 0
3 files changed, 0 insertions(+), 0 deletions(-)
rename {dynamic-layers/meta-rust/recipes-security => recipes-security}/krill/files/panic_workaround.patch (100%)
rename {dynamic-layers/meta-rust/recipes-security => recipes-security}/krill/krill.inc (100%)
rename {dynamic-layers/meta-rust/recipes-security => recipes-security}/krill/krill_0.9.1.bb (100%)recipes-security/krill/files/panic_workaround.patch renamed from dynamic-layers/meta-rust/recipes-security/krill/files/panic_workaround.patch +0 -0
recipes-security/krill/krill.inc renamed from dynamic-layers/meta-rust/recipes-security/krill/krill.inc +0 -0
recipes-security/krill/krill_0.9.1.bb renamed from dynamic-layers/meta-rust/recipes-security/krill/krill_0.9.1.bb +0 -0
Signature · 1 line
2.25.1
PATCH 3/6 suricata: rust is in core
In reply to Armin Kusterdrop dynamic-layer
Signed-off-by Armin Kuster <[email protected]>
---
.../recipes-ids => recipes-ids}/suricata/files/fixup.patch | 0
.../recipes-ids => recipes-ids}/suricata/files/run-ptest | 0
.../recipes-ids => recipes-ids}/suricata/files/suricata.service | 0
.../recipes-ids => recipes-ids}/suricata/files/suricata.yaml | 0
.../recipes-ids => recipes-ids}/suricata/files/tmpfiles.suricata | 0
.../suricata/files/volatiles.03_suricata | 0
.../recipes-ids => recipes-ids}/suricata/libhtp_0.5.38.bb | 0
.../meta-rust/recipes-ids => recipes-ids}/suricata/suricata.inc | 0
.../recipes-ids => recipes-ids}/suricata/suricata_6.0.3.bb | 0
9 files changed, 0 insertions(+), 0 deletions(-)
rename {dynamic-layers/meta-rust/recipes-ids => recipes-ids}/suricata/files/fixup.patch (100%)
rename {dynamic-layers/meta-rust/recipes-ids => recipes-ids}/suricata/files/run-ptest (100%)
rename {dynamic-layers/meta-rust/recipes-ids => recipes-ids}/suricata/files/suricata.service (100%)
rename {dynamic-layers/meta-rust/recipes-ids => recipes-ids}/suricata/files/suricata.yaml (100%)
rename {dynamic-layers/meta-rust/recipes-ids => recipes-ids}/suricata/files/tmpfiles.suricata (100%)
rename {dynamic-layers/meta-rust/recipes-ids => recipes-ids}/suricata/files/volatiles.03_suricata (100%)
rename {dynamic-layers/meta-rust/recipes-ids => recipes-ids}/suricata/libhtp_0.5.38.bb (100%)
rename {dynamic-layers/meta-rust/recipes-ids => recipes-ids}/suricata/suricata.inc (100%)
rename {dynamic-layers/meta-rust/recipes-ids => recipes-ids}/suricata/suricata_6.0.3.bb (100%)recipes-ids/suricata/files/fixup.patch renamed from dynamic-layers/meta-rust/recipes-ids/suricata/files/fixup.patch +0 -0
recipes-ids/suricata/files/run-ptest renamed from dynamic-layers/meta-rust/recipes-ids/suricata/files/run-ptest +0 -0
recipes-ids/suricata/files/suricata.service renamed from dynamic-layers/meta-rust/recipes-ids/suricata/files/suricata.service +0 -0
recipes-ids/suricata/files/suricata.yaml renamed from dynamic-layers/meta-rust/recipes-ids/suricata/files/suricata.yaml +0 -0
recipes-ids/suricata/files/tmpfiles.suricata renamed from dynamic-layers/meta-rust/recipes-ids/suricata/files/tmpfiles.suricata +0 -0
recipes-ids/suricata/files/volatiles.03_suricata renamed from dynamic-layers/meta-rust/recipes-ids/suricata/files/volatiles.03_suricata +0 -0
recipes-ids/suricata/libhtp_0.5.38.bb renamed from dynamic-layers/meta-rust/recipes-ids/suricata/libhtp_0.5.38.bb +0 -0
recipes-ids/suricata/suricata.inc renamed from dynamic-layers/meta-rust/recipes-ids/suricata/suricata.inc +0 -0
recipes-ids/suricata/suricata_6.0.3.bb renamed from dynamic-layers/meta-rust/recipes-ids/suricata/suricata_6.0.3.bb +0 -0
Signature · 1 line
2.25.1
PATCH 4/6 layer.conf: drop dynamic-layer
In reply to Armin KusterSigned-off-by Armin Kuster <[email protected]>
--- conf/layer.conf | 4 ---- 1 file changed, 4 deletions(-)
conf/layer.conf +0 -4
@@ -16,7 +16,3 @@ LAYERDEPENDS_security = "core openembedded-layer perl-layer networking-layer met # Sanity check for meta-security layer. # Setting SKIP_META_SECURITY_SANITY_CHECK to "1" would skip the bbappend files check. INHERIT += "sanity-meta-security" - -BBFILES_DYNAMIC += " \ -rust-layer:${LAYERDIR}/dynamic-layers/meta-rust/recipes-*/*/*.bb \ -"
Signature · 1 line
2.25.1
PATCH 5/6 layer.conf: drop meta-rust
In reply to Armin KusterSigned-off-by Armin Kuster <[email protected]>
--- meta-parsec/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-parsec/conf/layer.conf +1 -1
@@ -10,5 +10,5 @@ BBFILE_PRIORITY_parsec-layer = "5" LAYERSERIES_COMPAT_parsec-layer = "honister" -LAYERDEPENDS_parsec-layer = "core rust-layer clang-layer tpm-layer" +LAYERDEPENDS_parsec-layer = "core clang-layer tpm-layer" BBLAYERS_LAYERINDEX_NAME_parsec-layer = "meta-parsec"
Signature · 1 line
2.25.1
PATCH 6/6 harden-image-minimal: fix useradd inherit
In reply to Armin KusterSigned-off-by Armin Kuster <[email protected]>
--- .../recipes-core/images/harden-image-minimal.bb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
meta-hardening/recipes-core/images/harden-image-minimal.bb +6 -5
@@ -10,7 +10,8 @@ LICENSE = "MIT" IMAGE_ROOTFS_SIZE ?= "8192" -inherit core-image extrausers +inherit core-image +IMAGE_CLASSES:append = " extrausers" ROOT_DEFAULT_PASSWORD ?= "1SimplePw!" DEFAULT_ADMIN_ACCOUNT ?= "myadmin"
@@ -19,7 +20,7 @@ DEFAULT_ADMIN_ACCOUNT_PASSWORD ?= "1SimplePw!" EXTRA_USERS_PARAMS = "${@bb.utils.contains('DISABLE_ROOT', 'True', "usermod -L root;", "usermod -P '${ROOT_DEFAULT_PASSWORD}' root;", d)}" -EXTRA_USERS_PARAMS += "useradd ${DEFAULT_ADMIN_ACCOUNT};" -EXTRA_USERS_PARAMS += "groupadd ${DEFAULT_ADMIN_GROUP};" -EXTRA_USERS_PARAMS += "usermod -P '${DEFAULT_ADMIN_ACCOUNT_PASSWORD}' ${DEFAULT_ADMIN_ACCOUNT};" -EXTRA_USERS_PARAMS += "usermod -aG ${DEFAULT_ADMIN_GROUP} ${DEFAULT_ADMIN_ACCOUNT};" +EXTRA_USERS_PARAMS:append = " useradd ${DEFAULT_ADMIN_ACCOUNT};" +EXTRA_USERS_PARAMS:append = " groupadd ${DEFAULT_ADMIN_GROUP};" +EXTRA_USERS_PARAMS:append = " usermod -P '${DEFAULT_ADMIN_ACCOUNT_PASSWORD}' ${DEFAULT_ADMIN_ACCOUNT};" +EXTRA_USERS_PARAMS:append = " usermod -aG ${DEFAULT_ADMIN_GROUP} ${DEFAULT_ADMIN_ACCOUNT};"
Signature · 1 line
2.25.1