MIRRORS/meta-freescale-3rdparty
1
0
Fork 0
mirror of https://github.com/Freescale/meta-freescale-3rdparty.git synced 2025-07-04 21:05:24 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix issues with the UNPACKDIR transition

Browse Source 
Update a few recipes to use UNPACKDIR instead of WORKDIR directly.
This fixes building against newer master openembedded-core.
This commit is contained in:
Dan McGregor 2024-06-13 10:57:38 -06:00
parent 4026001c3e
commit d576b2f2f1
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recipes-bsp/broadcom-nvram-config/broadcom-nvram-config.inc
View File

@ -5,14 +5,14 @@ SRC_URI = " \
file://LICENCE.broadcom_bcm43xx \ file://LICENCE.broadcom_bcm43xx \
" "
S = "${WORKDIR}" S = "${UNPACKDIR}"
BRCM_FWDIR = "${nonarch_base_libdir}/firmware/brcm" BRCM_FWDIR = "${nonarch_base_libdir}/firmware/brcm"
CHIP_MODEL ?= "Invalid" CHIP_MODEL ?= "Invalid"
do_install() { do_install() {
install -d ${D}${BRCM_FWDIR} install -d ${D}${BRCM_FWDIR}
cp -r ${WORKDIR}/brcmfmac${CHIP_MODEL}-sdio.txt \ cp -r ${UNPACKDIR}/brcmfmac${CHIP_MODEL}-sdio.txt \
${D}${BRCM_FWDIR} ${D}${BRCM_FWDIR}
} }

2
recipes-bsp/u-boot/u-boot-script-qoriq_2019.10.bb
View File

@ -26,7 +26,7 @@ do_compile() {
kernel_devicetree="${kernel_devicetree_tmp}" kernel_devicetree="${kernel_devicetree_tmp}"
sed -e 's/@KERNEL_BOOTCMD[@]/${KERNEL_BOOTCMD}/' -e "s,@KERNEL_IMAGETYPE[@],${KERNEL_IMAGETYPE},g" \ sed -e 's/@KERNEL_BOOTCMD[@]/${KERNEL_BOOTCMD}/' -e "s,@KERNEL_IMAGETYPE[@],${KERNEL_IMAGETYPE},g" \
-e "s,@KERNEL_DEVICETREE[@],${kernel_devicetree},g" \ -e "s,@KERNEL_DEVICETREE[@],${kernel_devicetree},g" \
"${WORKDIR}/boot.cmd.in" > ${B}/boot.cmd "${UNPACKDIR}/boot.cmd.in" > ${B}/boot.cmd
target_arch="${TARGET_ARCH}" target_arch="${TARGET_ARCH}"
test "${TARGET_ARCH}" = "aarch64" && target_arch="arm64" test "${TARGET_ARCH}" = "aarch64" && target_arch="arm64"
mkimage -A ${target_arch} -T script -C none -n "Distro boot script" -d ${B}/boot.cmd ${B}/boot.scr mkimage -A ${target_arch} -T script -C none -n "Distro boot script" -d ${B}/boot.cmd ${B}/boot.scr

2
recipes-bsp/u-boot/u-boot-script-toradex_2020.07.bb
View File

@ -20,7 +20,7 @@ do_compile[noexec] = "1"
do_mkimage() { do_mkimage() {
sed -e 's/@@KERNEL_BOOTCMD@@/${KERNEL_BOOTCMD}/' \ sed -e 's/@@KERNEL_BOOTCMD@@/${KERNEL_BOOTCMD}/' \
-e 's/@@KERNEL_IMAGETYPE@@/${KERNEL_IMAGETYPE}/' \ -e 's/@@KERNEL_IMAGETYPE@@/${KERNEL_IMAGETYPE}/' \
"${WORKDIR}/boot.cmd.in" > ${B}/boot.cmd "${UNPACKDIR}/boot.cmd.in" > ${B}/boot.cmd
mkimage -T script -C none -n "Distro boot script" -d ${B}/boot.cmd ${B}/boot.scr mkimage -T script -C none -n "Distro boot script" -d ${B}/boot.cmd ${B}/boot.scr
} }

4
recipes-core/net-persistent-mac/net-persistent-mac.bb
View File

@ -14,10 +14,10 @@ SRC_URI = "file://init \
do_install () { do_install () {
install -d ${D}${sysconfdir}/init.d install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/${PN} install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/${PN}
install -d ${D}${sysconfdir}/default install -d ${D}${sysconfdir}/default
install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/${PN} install -m 0644 ${UNPACKDIR}/default ${D}${sysconfdir}/default/${PN}
} }
PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGE_ARCH = "${MACHINE_ARCH}"

2
recipes-kernel/linux-firmware/linux-firmware_%.bbappend
View File

@ -8,7 +8,7 @@ SRC_URI:append:imx6qdl-variscite-som = "\
SRC_URI[TIInit_11.8.32.sha256sum] = "26ab0608e39fab95a6a55070c2f8364c92aad34442e8349abda71cee4da3277a" SRC_URI[TIInit_11.8.32.sha256sum] = "26ab0608e39fab95a6a55070c2f8364c92aad34442e8349abda71cee4da3277a"
do_install:append:imx6qdl-variscite-som() { do_install:append:imx6qdl-variscite-som() {
cp ${WORKDIR}/TIInit_11.8.32.bts ${D}${nonarch_base_libdir}/firmware/ti-connectivity/ cp ${UNPACKDIR}/TIInit_11.8.32.bts ${D}${nonarch_base_libdir}/firmware/ti-connectivity/
} }
PACKAGE_ARCH:imx6qdl-variscite-som = "${MACHINE_ARCH}" PACKAGE_ARCH:imx6qdl-variscite-som = "${MACHINE_ARCH}"

2
recipes-kernel/linux/linux-fslc_%.bbappend
View File

@ -9,5 +9,5 @@ SRC_URI:append:imx6qdl-variscite-som:use-mainline-bsp = " \
" "
do_configure:prepend:imx6qdl-variscite-som() { do_configure:prepend:imx6qdl-variscite-som() {
cp ${WORKDIR}/imx6*-var*.dts* ${S}/arch/arm/boot/dts cp ${UNPACKDIR}/imx6*-var*.dts* ${S}/arch/arm/boot/dts
} }