From bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 28 Jul 2021 23:28:15 +0100 Subject: Convert to new override syntax This is the result of automated script conversion: scripts/contrib/convert-overrides.py converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie --- meta/recipes-core/base-files/base-files_3.0.14.bb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'meta/recipes-core/base-files/base-files_3.0.14.bb') diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index 94299431f6..032827a0d0 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -28,7 +28,7 @@ S = "${WORKDIR}" INHIBIT_DEFAULT_DEPS = "1" -docdir_append = "/${P}" +docdir:append = "/${P}" dirs1777 = "/tmp ${localstatedir}/volatile/tmp" dirs2775 = "" dirs555 = "/sys /proc" @@ -64,7 +64,7 @@ conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ # hostnames. # # The hostname can be changed outside of this recipe by using -# hostname_pn-base-files = "my-host-name". +# hostname:pn-base-files = "my-host-name". hostname = "${MACHINE}" BASEFILESISSUEINSTALL ?= "do_install_basefilesissue" @@ -77,7 +77,7 @@ BASEFILESISSUEINSTALL ?= "do_install_basefilesissue" # Otherwise the directory creation will fail and we will have circular symbolic # links. # -pkg_preinst_${PN} () { +pkg_preinst:${PN} () { #!/bin/sh -e if [ x"$D" = "x" ]; then if [ -h "/var/lock" ]; then @@ -139,7 +139,7 @@ do_install () { fi } -do_install_append_libc-glibc () { +do_install:append:libc-glibc () { install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf } @@ -162,7 +162,7 @@ do_install_basefilesissue () { } do_install_basefilesissue[vardepsexclude] += "DATE" -do_install_append_linuxstdbase() { +do_install:append:linuxstdbase() { for d in ${dirs755-lsb}; do install -m 0755 -d ${D}$d done @@ -175,10 +175,10 @@ do_install_append_linuxstdbase() { SYSROOT_DIRS += "${sysconfdir}/skel" PACKAGES = "${PN}-doc ${PN} ${PN}-dev ${PN}-dbg" -FILES_${PN} = "/" -FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses" +FILES:${PN} = "/" +FILES:${PN}-doc = "${docdir} ${datadir}/common-licenses" PACKAGE_ARCH = "${MACHINE_ARCH}" -CONFFILES_${PN} = "${sysconfdir}/fstab ${@['', '${sysconfdir}/hostname ${sysconfdir}/hosts'][(d.getVar('hostname') != '')]} ${sysconfdir}/shells" -CONFFILES_${PN} += "${sysconfdir}/motd ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile" +CONFFILES:${PN} = "${sysconfdir}/fstab ${@['', '${sysconfdir}/hostname ${sysconfdir}/hosts'][(d.getVar('hostname') != '')]} ${sysconfdir}/shells" +CONFFILES:${PN} += "${sysconfdir}/motd ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile" -- cgit v1.2.3-54-g00ecf