From 8f0d1cc65efc63c193ab25b02ffb8bd71660a038 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Thu, 12 Sep 2024 11:32:16 +0200 Subject: [PATCH] base-files: fix conflict with procps about sysctl.conf This commit fixes a build issue by including the procps recipe which also installs the sysctl.conf file. Since adding this config file in base-file recipe is something custom from DEY, we include this file only for "dey" distribution to avoid conflicts. Signed-off-by: Arturo Buzarra --- .../recipes-core/base-files/base-files_3.0.14.bbappend | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend index 31ce3d1d7..6c165d9e9 100644 --- a/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend +++ b/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend @@ -1,12 +1,12 @@ -# Copyright (C) 2013-2021, Digi International Inc. +# Copyright (C) 2013-2024, Digi International Inc. FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -SRC_URI += " \ +SRC_URI:append:dey = " \ file://sysctl.conf \ " -do_install:append() { +do_install:append:dey() { install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/ } @@ -56,4 +56,4 @@ pkg_postinst_ontarget:${PN}() { inherit ${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "remove-pkg-postinst-ontarget", "", d)} -CONFFILES:${PN} += "${sysconfdir}/sysctl.conf" +CONFFILES:${PN}:dey += "${sysconfdir}/sysctl.conf"