diff options
| -rw-r--r-- | qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 4 | ||||
| -rw-r--r-- | recipes-benchmark/cpuburn/cpuburn-a53_git.bb | 3 | ||||
| -rw-r--r-- | recipes-connectivity/hostapd-example/hostapd-example.bb | 2 | ||||
| -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 | ||||
| -rw-r--r-- | recipes-graphics/wayland-app-launch/wayland-app-launch.inc | 4 | ||||
| -rw-r--r-- | recipes-graphics/wayland/weston-init.bbappend | 4 | ||||
| -rw-r--r-- | recipes-multimedia/media-files/media-files_1.3.bb | 4 | ||||
| -rw-r--r-- | recipes-sato/webkit/webkitgtk_%.bbappend | 4 |
10 files changed, 26 insertions, 15 deletions
diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index 83eeb1af..628516ed 100644 --- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -28,9 +28,11 @@ SRC_URI:append = " \ file://qt5-${IMX_BACKEND}.sh \ " +OURFILEPATH = "${@d.getVar("UNPACKDIR") or '${WORKDIR}'}" + do_install:append () { install -d ${D}${sysconfdir}/profile.d/ - install -m 0755 ${WORKDIR}/qt5-${IMX_BACKEND}.sh ${D}${sysconfdir}/profile.d/ + install -m 0755 ${OURFILEPATH}/qt5-${IMX_BACKEND}.sh ${D}${sysconfdir}/profile.d/ } diff --git a/recipes-benchmark/cpuburn/cpuburn-a53_git.bb b/recipes-benchmark/cpuburn/cpuburn-a53_git.bb index fe9aa24e..08e02aa1 100644 --- a/recipes-benchmark/cpuburn/cpuburn-a53_git.bb +++ b/recipes-benchmark/cpuburn/cpuburn-a53_git.bb @@ -19,8 +19,7 @@ SRC_URI[ssvb.sha256sum] = "ce42ebdc71c876a33d9f7534355ef76cefa0d00ddb19ad69cf05a SRC_URI[ssvb53.md5sum] = "a32d75f7e1fa9afbb887bef71d89875a" SRC_URI[ssvb53.sha256sum] = "502b3a17186da34976cb97d7ae2083a66c42cddaffc1e900a4dd23efc64d97f1" - -S = "${WORKDIR}" +S = "${@d.getVar("UNPACKDIR") or '${WORKDIR}'}" do_compile() { ${CC} ${CFLAGS} ${LDFLAGS} burn.S -o burn diff --git a/recipes-connectivity/hostapd-example/hostapd-example.bb b/recipes-connectivity/hostapd-example/hostapd-example.bb index 17f52e85..62e1bf30 100644 --- a/recipes-connectivity/hostapd-example/hostapd-example.bb +++ b/recipes-connectivity/hostapd-example/hostapd-example.bb @@ -6,7 +6,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" RDEPENDS:${PN} = "hostapd" -S = "${WORKDIR}" +S = "${@d.getVar("UNPACKDIR") or '${WORKDIR}'}" SRC_URI = " \ file://enable-wifi.service \ 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 f04619e7..0b06e5b7 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 802daa2f..e6cb9bc7 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 914e610b..676a1538 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}" diff --git a/recipes-graphics/wayland-app-launch/wayland-app-launch.inc b/recipes-graphics/wayland-app-launch/wayland-app-launch.inc index 588ca4b0..7cac13bb 100644 --- a/recipes-graphics/wayland-app-launch/wayland-app-launch.inc +++ b/recipes-graphics/wayland-app-launch/wayland-app-launch.inc @@ -7,7 +7,7 @@ inherit allarch systemd RDEPENDS:${PN} += "weston-init ${INITIAL_APP_PKGS}" -S = "${WORKDIR}" +S = "${@d.getVar("UNPACKDIR") or '${WORKDIR}'}" SRC_URI = " \ file://wayland-app-launch.service.in \ @@ -24,7 +24,7 @@ do_compile () { do_install () { install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/wayland-app-launch.service ${D}${systemd_unitdir}/system + install -m 0644 ${S}/wayland-app-launch.service ${D}${systemd_unitdir}/system } SYSTEMD_PACKAGES = "${PN}" diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend index 223eb2cb..db05a962 100644 --- a/recipes-graphics/wayland/weston-init.bbappend +++ b/recipes-graphics/wayland/weston-init.bbappend @@ -2,6 +2,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRC_URI += "file://toradex-save-touchscreen-calibration.sh" +OURFILEPATH = "${@d.getVar("UNPACKDIR") or '${WORKDIR}'}" + PACKAGECONFIG[touchscreen-calibration] = ",," PACKAGECONFIG:append:tdx = " touchscreen-calibration" @@ -18,6 +20,6 @@ do_install:append:tdx() { sed -i -e "/enable_tap=/d" ${D}${sysconfdir}/xdg/weston/weston.ini sed -i -e "/^\[libinput\]/a enable_tap=true" ${D}${sysconfdir}/xdg/weston/weston.ini - install -Dm0755 ${WORKDIR}/toradex-save-touchscreen-calibration.sh ${D}${bindir}/toradex-save-touchscreen-calibration + install -Dm0755 ${OURFILEPATH}/toradex-save-touchscreen-calibration.sh ${D}${bindir}/toradex-save-touchscreen-calibration fi } diff --git a/recipes-multimedia/media-files/media-files_1.3.bb b/recipes-multimedia/media-files/media-files_1.3.bb index c51497fa..6eb35bdf 100644 --- a/recipes-multimedia/media-files/media-files_1.3.bb +++ b/recipes-multimedia/media-files/media-files_1.3.bb @@ -1,6 +1,6 @@ SUMMARY = "Media Files for tests" LICENSE = "CC0-1.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/CC0-1.0;md5=0ceb3372c9595f0a8067e55da801e4a1" +LIC_FILES_CHKSUM = "file://${S}/../CC0-1.0;md5=0ceb3372c9595f0a8067e55da801e4a1" inherit allarch bin_package @@ -8,7 +8,7 @@ SRC_URI = "https://docs1.toradex.com/114780-media-files-${PV}.tar.xz" SRC_URI[sha256sum] = "d6a3cd2003798fec80fb8008d2e48a5fa2c581f4ae66c03cd573d33b18341e67" -S = "${WORKDIR}/media-files" +S = "${@d.getVar("UNPACKDIR") or '${WORKDIR}'}/media-files" # Install the files to ${D}${ROOT_HOME} # Source code of original poky function: diff --git a/recipes-sato/webkit/webkitgtk_%.bbappend b/recipes-sato/webkit/webkitgtk_%.bbappend index 6b5c67ef..2ed1c89e 100644 --- a/recipes-sato/webkit/webkitgtk_%.bbappend +++ b/recipes-sato/webkit/webkitgtk_%.bbappend @@ -1,6 +1,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://minibrowser.desktop" +OURFILEPATH = "${@d.getVar("UNPACKDIR") or '${WORKDIR}'}" + do_install:append() { - install -m 0644 -D ${WORKDIR}/minibrowser.desktop ${D}${datadir}/applications/minibrowser.desktop + install -m 0644 -D ${OURFILEPATH}/minibrowser.desktop ${D}${datadir}/applications/minibrowser.desktop } |