Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra 2024-09-12 11:32:16 +02:00
parent 87f26ec0bc
commit 8f0d1cc65e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend
View File

@ -1,12 +1,12 @@
# Copyright (C) 2013-2021, Digi International Inc. # Copyright (C) 2013-2024, Digi International Inc.
FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
SRC_URI += " \ SRC_URI:append:dey = " \
file://sysctl.conf \ file://sysctl.conf \
" "
do_install:append() { do_install:append:dey() {
install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/ 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)} 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"