Commit f928e3f2 authored by Mikko Rapeli's avatar Mikko Rapeli
Browse files

Merge branch 'yocto_update_24july' into 'main' 

base-files: UNPACKDIR fixes

See merge request !214

/assign_reviewer @mikko.rapeli
parents 542723aa 3bd166f5

meta-trs/recipes-core/base-files/base-files_%.bbappend

+1 −1
Original line number Diff line number Diff line
@@ -11,6 +11,6 @@ do_install:append() { 


    # Others are given 'read' permission so that profile env vars are passed

    # through to other user accounts correctly

    install -m 0644 ${WORKDIR}/path.sh \

    install -m 0644 ${S}/path.sh \

        ${D}${sysconfdir}/profile.d/path.sh

}

meta-trs/recipes-core/images/trs-image.bb

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ TEST_SUITES = "\ 
do_deploy() {

    # to customise oeqa tests

    mkdir -p "${DEPLOYDIR}"

    install "${WORKDIR}/testimage_data.json" "${DEPLOYDIR}"

    install "${UNPACKDIR}/testimage_data.json" "${DEPLOYDIR}"

}



do_deploy:append:qemuarm() {

meta-trs/recipes-core/systemd/lava-systemd-metrics.bb

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ SRC_URI = "file://lava-report-systemd-metrics.sh" 
inherit allarch



do_install() {

	install -Dm0755 ${WORKDIR}/lava-report-systemd-metrics.sh ${D}${bindir}/lava-report-systemd-metrics.sh

	install -Dm0755 ${UNPACKDIR}/lava-report-systemd-metrics.sh ${D}${bindir}/lava-report-systemd-metrics.sh

}



RDEPENDS:${PN} += "bash"

meta-trs/recipes-core/systemd/systemd-conf_%.bbappend

+4 −4
Original line number Diff line number Diff line
@@ -27,16 +27,16 @@ do_install:append() { 


    if ${@bb.utils.contains('PACKAGECONFIG', 'dhcp-ethernet', 'true', 'false', d)}; then

            NETWORK_CONF_DIR="${sysconfdir}/systemd/network/80-wired.network.d"

            install -Dm 0644 ${WORKDIR}/${NETWORK_CONF_FILE} \

            install -Dm 0644 ${UNPACKDIR}/${NETWORK_CONF_FILE} \

                ${D}${NETWORK_CONF_DIR}/${NETWORK_CONF_FILE}

    fi



    if [ "${@bb.utils.contains("DISTRO_FEATURES", "xen", "true", "false", d)}" = "true" ] ; then

        install -Dm 0644 ${WORKDIR}/${XENBR_NETDEV} \

        install -Dm 0644 ${UNPACKDIR}/${XENBR_NETDEV} \

            ${D}${sysconfdir}/systemd/network/${XENBR_NETDEV}

        install -Dm 0644 ${WORKDIR}/${XENBR_NETWORK} \

        install -Dm 0644 ${UNPACKDIR}/${XENBR_NETWORK} \

            ${D}${sysconfdir}/systemd/network/${XENBR_NETWORK}

        install -Dm 0644 ${WORKDIR}/${XENBR_LINK} \

        install -Dm 0644 ${UNPACKDIR}/${XENBR_LINK} \

            ${D}${sysconfdir}/systemd/network/${XENBR_LINK}

    fi

}

meta-trs/recipes-extended/procps/procps_%.bbappend

+1 −1
Original line number Diff line number Diff line
@@ -7,5 +7,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" 
SRC_URI += "file://20-quiet-printk.conf"



do_install:append() {

    install -Dm 0640 "${WORKDIR}/20-quiet-printk.conf" "${D}${sysconfdir}/sysctl.d/20-quiet-printk.conf"

    install -Dm 0640 "${UNPACKDIR}/20-quiet-printk.conf" "${D}${sysconfdir}/sysctl.d/20-quiet-printk.conf"

}