Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjust for UNPACKDIR #475

Merged
merged 2 commits into from
May 23, 2024
Merged

Adjust for UNPACKDIR #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
034d4f1
linux-firmware-beaglev-bcm43430: Switch away from S = WORKDIR
kraj May 15, 2024
41101db
recipes: Use UNPACKDIR instead of WORKDIR
kraj May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion recipes-bsp/opensbi/opensbi_%.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ _DEPS:milkv-duo = "u-boot:do_deploy"
do_compile[depends] += "${_DEPS}"

do_deploy:append:jh7110() {
install -m 0644 ${WORKDIR}/visionfive2-uboot-fit-image.its ${DEPLOYDIR}/visionfive2-uboot-fit-image.its
install -m 0644 ${UNPACKDIR}/visionfive2-uboot-fit-image.its ${DEPLOYDIR}/visionfive2-uboot-fit-image.its
cd ${DEPLOYDIR}
mkimage -f visionfive2-uboot-fit-image.its -A riscv -O u-boot -T firmware visionfive2_fw_payload.img
}
6 changes: 3 additions & 3 deletions recipes-bsp/u-boot/u-boot-allwinnerd1.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ TFTP_SERVER_IP ?= "127.0.0.1"
do_compile[depends] = "opensbi:do_deploy"

do_configure:prepend() {
sed -i -e 's,@SERVERIP@,${TFTP_SERVER_IP},g' ${WORKDIR}/tftp-mmc-boot.txt
sed -i -e 's,@SERVERIP@,${TFTP_SERVER_IP},g' ${UNPACKDIR}/tftp-mmc-boot.txt
mkimage -O linux -T script -C none -n "U-Boot boot script" \
-d ${WORKDIR}/tftp-mmc-boot.txt ${WORKDIR}/${UBOOT_ENV_BINARY}
-d ${UNPACKDIR}/tftp-mmc-boot.txt ${UNPACKDIR}/${UBOOT_ENV_BINARY}
}

do_compile:prepend() {
Expand All @@ -40,7 +40,7 @@ do_compile:prepend() {

do_deploy:append() {
install -m 644 ${B}/u-boot-sunxi-with-spl.bin ${DEPLOYDIR}
install -m 644 ${WORKDIR}/uEnv-nezha.txt ${DEPLOYDIR}/uEnv.txt
install -m 644 ${UNPACKDIR}/uEnv-nezha.txt ${DEPLOYDIR}/uEnv.txt
}

TOOLCHAIN = "gcc"
Expand Down
9 changes: 4 additions & 5 deletions recipes-bsp/u-boot/u-boot-starfive_v2021.04.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@ DEPENDS:append = " u-boot-tools-native"
TFTP_SERVER_IP ?= "127.0.0.1"

do_configure:prepend() {
sed -i -e 's,@SERVERIP@,${TFTP_SERVER_IP},g' ${WORKDIR}/tftp-mmc-boot.txt
sed -i -e 's,@SERVERIP@,${TFTP_SERVER_IP},g' ${UNPACKDIR}/tftp-mmc-boot.txt
mkimage -O linux -T script -C none -n "U-Boot boot script" \
-d ${WORKDIR}/tftp-mmc-boot.txt ${WORKDIR}/${UBOOT_ENV_BINARY}
-d ${UNPACKDIR}/tftp-mmc-boot.txt ${WORKDIR}/${UBOOT_ENV_BINARY}
}

do_deploy:append:visionfive() {
install -m 644 ${WORKDIR}/uEnv-visionfive.txt ${DEPLOYDIR}/uEnv.txt
install -m 644 ${UNPACKDIR}/uEnv-visionfive.txt ${DEPLOYDIR}/uEnv.txt
}

do_deploy:append:visionfive2() {
install -m 644 ${WORKDIR}/uEnv-visionfive2.txt ${DEPLOYDIR}/uEnv.txt
install -m 644 ${UNPACKDIR}/uEnv-visionfive2.txt ${DEPLOYDIR}/uEnv.txt
}

COMPATIBLE_MACHINE = "(visionfive|visionfive2)"
Expand All @@ -52,4 +52,3 @@ TOOLCHAIN = "gcc"

# U-boot sets O=... which needs it to build outside of S
B = "${WORKDIR}/build"

4 changes: 2 additions & 2 deletions recipes-bsp/u-boot/u-boot-starfive_v2021.07.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ DEPENDS:append = " u-boot-tools-native"
TFTP_SERVER_IP ?= "127.0.0.1"

do_configure:prepend() {
sed -i -e 's,@SERVERIP@,${TFTP_SERVER_IP},g' ${WORKDIR}/tftp-mmc-boot.txt
sed -i -e 's,@SERVERIP@,${TFTP_SERVER_IP},g' ${UNPACKDIR}/tftp-mmc-boot.txt
mkimage -O linux -T script -C none -n "U-Boot boot script" \
-d ${WORKDIR}/tftp-mmc-boot.txt ${WORKDIR}/${UBOOT_ENV_BINARY}
-d ${UNPACKDIR}/tftp-mmc-boot.txt ${WORKDIR}/${UBOOT_ENV_BINARY}
}

COMPATIBLE_MACHINE = "(beaglev-starlight-jh7100)"
Expand Down
8 changes: 4 additions & 4 deletions recipes-bsp/u-boot/u-boot-starfive_v2021.10.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,20 @@ DEPENDS:append:jh7110 = " jh7110-spl-tool-native"
TFTP_SERVER_IP ?= "127.0.0.1"

do_configure:prepend() {
sed -i -e 's,@SERVERIP@,${TFTP_SERVER_IP},g' ${WORKDIR}/tftp-mmc-boot.txt
sed -i -e 's,@SERVERIP@,${TFTP_SERVER_IP},g' ${UNPACKDIR}/tftp-mmc-boot.txt
mkimage -O linux -T script -C none -n "U-Boot boot script" \
-d ${WORKDIR}/tftp-mmc-boot.txt ${WORKDIR}/${UBOOT_ENV_BINARY}
-d ${UNPACKDIR}/tftp-mmc-boot.txt ${WORKDIR}/${UBOOT_ENV_BINARY}
}

do_deploy:append:visionfive2() {
install -m 644 ${WORKDIR}/uEnv-visionfive2.txt ${DEPLOYDIR}/vf2_uEnv.txt
install -m 644 ${UNPACKDIR}/uEnv-visionfive2.txt ${DEPLOYDIR}/vf2_uEnv.txt
spl_tool -c -f ${DEPLOYDIR}/${SPL_IMAGE}
ln -sf ${SPL_IMAGE}.normal.out ${DEPLOYDIR}/${SPL_BINARYNAME}.normal.out
ln -sf ${SPL_IMAGE}.normal.out ${DEPLOYDIR}/${SPL_SYMLINK}.normal.out
}

do_deploy:append:star64() {
install -m 644 ${WORKDIR}/uEnv-star64.txt ${DEPLOYDIR}/vf2_uEnv.txt
install -m 644 ${UNPACKDIR}/uEnv-star64.txt ${DEPLOYDIR}/vf2_uEnv.txt
spl_tool -c -f ${DEPLOYDIR}/${SPL_IMAGE}
ln -sf ${SPL_IMAGE}.normal.out ${DEPLOYDIR}/${SPL_BINARYNAME}.normal.out
ln -sf ${SPL_IMAGE}.normal.out ${DEPLOYDIR}/${SPL_SYMLINK}.normal.out
Expand Down
36 changes: 18 additions & 18 deletions recipes-bsp/u-boot/u-boot_%.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,23 @@ DEPENDS:append:milkv-duo = " xxd-native"
TFTP_SERVER_IP ?= "127.0.0.1"

do_configure:prepend:freedom-u540() {
sed -i -e 's,@SERVERIP@,${TFTP_SERVER_IP},g' ${WORKDIR}/tftp-mmc-boot.txt
sed -i -e 's,@SERVERIP@,${TFTP_SERVER_IP},g' ${UNPACKDIR}/tftp-mmc-boot.txt

if [ -f "${WORKDIR}/${UBOOT_ENV}.txt" ]; then
if [ -f "${UNPACKDIR}/${UBOOT_ENV}.txt" ]; then
mkimage -O linux -T script -C none -n "U-Boot boot script" \
-d ${WORKDIR}/${UBOOT_ENV}.txt ${WORKDIR}/boot.scr.uimg
-d ${UNPACKDIR}/${UBOOT_ENV}.txt ${UNPACKDIR}/boot.scr.uimg
fi
}

do_deploy:append:freedom-u540() {
if [ -f "${WORKDIR}/boot.scr.uimg" ]; then
if [ -f "${UNPACKDIR}/boot.scr.uimg" ]; then
install -d ${DEPLOY_DIR_IMAGE}
install -m 755 ${WORKDIR}/boot.scr.uimg ${DEPLOY_DIR_IMAGE}
install -m 755 ${UNPACKDIR}/boot.scr.uimg ${DEPLOY_DIR_IMAGE}
fi

if [ -f "${WORKDIR}/uEnv.txt" ]; then
if [ -f "${UNPACKDIR}/uEnv.txt" ]; then
install -d ${DEPLOY_DIR_IMAGE}
install -m 755 ${WORKDIR}/uEnv.txt ${DEPLOY_DIR_IMAGE}
install -m 755 ${UNPACKDIR}/uEnv.txt ${DEPLOY_DIR_IMAGE}
fi
}

Expand All @@ -76,34 +76,34 @@ do_compile:prepend:freedom-u540() {
}

do_configure:prepend:ae350-ax45mp() {
if [ -f "${WORKDIR}/tftp-mmc-boot.txt" ]; then
sed -i -e 's,@SERVERIP@,${TFTP_SERVER_IP},g' ${WORKDIR}/tftp-mmc-boot.txt
if [ -f "${UNPACKDIR}/tftp-mmc-boot.txt" ]; then
sed -i -e 's,@SERVERIP@,${TFTP_SERVER_IP},g' ${UNPACKDIR}/tftp-mmc-boot.txt
mkimage -A riscv -O linux -T script -C none -n "U-Boot boot script" \
-d ${WORKDIR}/tftp-mmc-boot.txt ${WORKDIR}/boot.scr.uimg
-d ${UNPACKDIR}/tftp-mmc-boot.txt ${UNPACKDIR}/boot.scr.uimg
fi
}

do_deploy:append:ae350-ax45mp() {
if [ -f "${WORKDIR}/boot.scr.uimg" ]; then
if [ -f "${UNPACKDIR}/boot.scr.uimg" ]; then
install -d ${DEPLOY_DIR_IMAGE}
install -m 755 ${WORKDIR}/boot.scr.uimg ${DEPLOYDIR}
install -m 755 ${UNPACKDIR}/boot.scr.uimg ${DEPLOYDIR}
fi

if [ -f "${WORKDIR}/uEnv-ae350.txt" ]; then
if [ -f "${UNPACKDIR}/uEnv-ae350.txt" ]; then
install -d ${DEPLOY_DIR_IMAGE}
install -m 644 ${WORKDIR}/uEnv-ae350.txt ${DEPLOYDIR}/uEnv.txt
install -m 644 ${UNPACKDIR}/uEnv-ae350.txt ${DEPLOYDIR}/uEnv.txt
fi
}

do_configure:prepend:milkv-duo() {
if [ -f "${WORKDIR}/uboot-milkv-duo.env" ]; then
cp ${WORKDIR}/uboot-milkv-duo.env ${S}/include/milkv-duo.env
if [ -f "${UNPACKDIR}/uboot-milkv-duo.env" ]; then
cp ${UNPACKDIR}/uboot-milkv-duo.env ${S}/include/milkv-duo.env
fi
}

do_deploy:append:milkv-duo() {
if [ -f "${WORKDIR}/uEnv-milkv-duo.txt" ]; then
cp ${WORKDIR}/uEnv-milkv-duo.txt ${DEPLOYDIR}/uEnv.txt
if [ -f "${UNPACKDIR}/uEnv-milkv-duo.txt" ]; then
cp ${UNPACKDIR}/uEnv-milkv-duo.txt ${DEPLOYDIR}/uEnv.txt
fi
install -m 0644 ${B}/u-boot.dtb ${DEPLOYDIR}
}
Expand Down
4 changes: 2 additions & 2 deletions recipes-graphics/drivers/visionfive2-pvr-graphics_1.19.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ do_install () {
cp -r ${D}/${IMG_GPU_POWERVR_VERSION}/staging/usr/include/GLES3/ ${D}/usr/include/
install -d ${D}/usr/lib/pkgconfig/
cp -r ${D}/${IMG_GPU_POWERVR_VERSION}/staging/usr/lib/pkgconfig/* ${D}/usr/lib/pkgconfig/
install -Dm0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
install -Dm0644 ${UNPACKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
sed -i -e 's|^#!/bin/bash|#!/usr/bin/env sh|g' ${D}${sysconfdir}/init.d/rc.pvr
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
install -d ${D}${bindir}
mv ${D}${sysconfdir}/init.d/rc.pvr ${D}${bindir}
rmdir ${D}${sysconfdir}/init.d
install -Dm 644 ${WORKDIR}/rc.pvr.service ${D}/${systemd_unitdir}/system/rc.pvr.service
install -Dm 644 ${UNPACKDIR}/rc.pvr.service ${D}/${systemd_unitdir}/system/rc.pvr.service
else
rm -rf ${D}/lib/systemd
fi
Expand Down
3 changes: 2 additions & 1 deletion recipes-kernel/firmware/linux-firmware-beaglev-bcm43430.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ SRC_URI[brcmfmac43430-clm.sha256sum] = "3ce2e8884dbd37d63ca8bae07bf7ea17c110070f
SRC_URI[AP6212.sha256sum] = "fdef0603345dd023ad28c0eff2d5167915c617bee2d6944da9a6da1c4ac87ca5"
SRC_URI[license.sha256sum] = "b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d"

S = "${WORKDIR}"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"

inherit allarch

Expand Down
2 changes: 1 addition & 1 deletion recipes-multimedia/vpu/libsf-codaj12.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ do_install() {


install -d ${D}/${base_libdir}/udev/rules.d/
install -m 0644 ${WORKDIR}/20_jpu.rules ${D}/${base_libdir}/udev/rules.d/
install -m 0644 ${UNPACKDIR}/20_jpu.rules ${D}/${base_libdir}/udev/rules.d/
}

FILES:${PN} += " \
Expand Down
2 changes: 1 addition & 1 deletion recipes-multimedia/vpu/libsf-wave420l.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ do_install() {
install -m 0644 ${S}/libsfenc.so ${D}/usr/lib/

install -d ${D}/${base_libdir}/udev/rules.d/
install -m 0644 ${WORKDIR}/20_venc.rules ${D}/${base_libdir}/udev/rules.d/
install -m 0644 ${UNPACKDIR}/20_venc.rules ${D}/${base_libdir}/udev/rules.d/
}

FILES:${PN} += " \
Expand Down
2 changes: 1 addition & 1 deletion recipes-multimedia/vpu/libsf-wave511.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ do_install() {
install -m 0644 ${S}/libsfdec.so ${D}/usr/lib/

install -d ${D}/${base_libdir}/udev/rules.d/
install -m 0644 ${WORKDIR}/20_vdec.rules ${D}/${base_libdir}/udev/rules.d/
install -m 0644 ${UNPACKDIR}/20_vdec.rules ${D}/${base_libdir}/udev/rules.d/
}

FILES:${PN} += " \
Expand Down