diff options
Diffstat (limited to 'recipes-core')
| -rw-r--r-- | recipes-core/base-files/base-files_3.0.14.bbappend | 6 | ||||
| -rw-r--r-- | recipes-core/systemd/systemd_%.bbappend | 4 | ||||
| -rw-r--r-- | recipes-core/systemd/timestamp-service.bb | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/recipes-core/base-files/base-files_3.0.14.bbappend b/recipes-core/base-files/base-files_3.0.14.bbappend index f04619e..0b06e5b 100644 --- a/recipes-core/base-files/base-files_3.0.14.bbappend +++ b/recipes-core/base-files/base-files_3.0.14.bbappend @@ -5,10 +5,12 @@ SRC_URI += " \ file://x11-display-var.sh \ " +OURFILEPATH = "${@d.getVar("UNPACKDIR") or '${WORKDIR}'}" + do_install:append () { install -m 0755 -d ${D}${sysconfdir}/profile.d - install -m 0644 ${WORKDIR}/disable_systemd_coloroutput.sh ${D}${sysconfdir}/profile.d/ - install -m 0644 ${WORKDIR}/x11-display-var.sh ${D}${sysconfdir}/profile.d/ + install -m 0644 ${OURFILEPATH}/disable_systemd_coloroutput.sh ${D}${sysconfdir}/profile.d/ + install -m 0644 ${OURFILEPATH}/x11-display-var.sh ${D}${sysconfdir}/profile.d/ # Make /media a symbolic link to /run/media rmdir ${D}/media ln -sf run/media ${D}/media diff --git a/recipes-core/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd_%.bbappend index 802daa2..e6cb9bc 100644 --- a/recipes-core/systemd/systemd_%.bbappend +++ b/recipes-core/systemd/systemd_%.bbappend @@ -2,6 +2,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/systemd:" SRC_URI += "file://rndis.network" +OURFILEPATH = "${@d.getVar("UNPACKDIR") or '${WORKDIR}'}" + PACKAGECONFIG:append = " networkd" PACKAGECONFIG[acl] = "-Dacl=true,-Dacl=false,acl" @@ -9,7 +11,7 @@ PACKAGECONFIG[acl] = "-Dacl=true,-Dacl=false,acl" do_install:append() { # The network files need to be in /usr/lib/systemd, not ${systemd_unitdir}... install -d ${D}${prefix}/lib/systemd/network/ - install -m 0644 ${WORKDIR}/rndis.network ${D}${prefix}/lib/systemd/network/ + install -m 0644 ${OURFILEPATH}/rndis.network ${D}${prefix}/lib/systemd/network/ } FILES:${PN} += " \ diff --git a/recipes-core/systemd/timestamp-service.bb b/recipes-core/systemd/timestamp-service.bb index 914e610..676a153 100644 --- a/recipes-core/systemd/timestamp-service.bb +++ b/recipes-core/systemd/timestamp-service.bb @@ -8,13 +8,15 @@ SRC_URI = "file://timestamp.service \ file://load-timestamp.sh \ " +S = "${@d.getVar("UNPACKDIR") or '${WORKDIR}'}" + do_install () { install -d ${D}/${bindir} - install -m 0755 ${WORKDIR}/load-timestamp.sh ${D}/${bindir} + install -m 0755 ${S}/load-timestamp.sh ${D}/${bindir} install -d ${D}/${base_libdir}/systemd/system - install -m 0644 ${WORKDIR}/timestamp.service ${D}/${base_libdir}/systemd/system/ + install -m 0644 ${S}/timestamp.service ${D}/${base_libdir}/systemd/system/ } SYSTEMD_PACKAGES = "${PN}" |