mirrors
/
meta-sunxi
mirror of https://github.com/linux-sunxi/meta-sunxi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #413 from alperak/master 

recipes: Switch away from S = WORKDIR and use UNPACKDIR instead of WO…
master
Marek Belisko 2024-06-17 16:04:33 +02:00 committed by GitHub
parent 322843f576 33d7e2bb51
commit a83a18e526
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/layer.conf
View File

@ -14,4 +14,4 @@ LAYERVERSION_sunxi = "1"
LAYERDEPENDS_sunxi = "core meta-python meta-arm"
LAYERSERIES_COMPAT_sunxi = "honister kirkstone langdale mickledore nanbield scarthgap"
LAYERSERIES_COMPAT_sunxi = "styhead"

14
recipes-bsp/u-boot/u-boot_%.bbappend
View File

@ -12,12 +12,12 @@ DEFAULT_PREFERENCE:sun8i = "1"
DEFAULT_PREFERENCE:sun50i = "1"
SRC_URI:append:sunxi = " \
file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \
file://0002-Added-nanopi-r1-board-support.patch \
file://0003-sunxi-H6-Enable-Ethernet-on-Orange-Pi-One-Plus.patch \
file://0004-mangopi-mq-r-t113-Fix-serial-console.patch \
file://0004-OrangePi-3-LTS-support.patch \
file://boot.cmd \
file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \
file://0002-Added-nanopi-r1-board-support.patch \
file://0003-sunxi-H6-Enable-Ethernet-on-Orange-Pi-One-Plus.patch \
file://0004-mangopi-mq-r-t113-Fix-serial-console.patch \
file://0004-OrangePi-3-LTS-support.patch \
file://boot.cmd \
"
UBOOT_ENV_SUFFIX:sunxi = "scr"
@ -29,5 +29,5 @@ EXTRA_OEMAKE:append:sun50i = " BL31=${DEPLOY_DIR_IMAGE}/bl31.bin SCP=/dev/null"
do_compile:sun50i[depends] += "trusted-firmware-a:do_deploy"
do_compile:append:sunxi() {
${B}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY}
${B}/tools/mkimage -C none -A arm -T script -d ${UNPACKDIR}/boot.cmd ${UNPACKDIR}/${UBOOT_ENV_BINARY}
}

2
recipes-devtools/python/pya20_0.2.12.bb
View File

@ -16,7 +16,7 @@ S = "${WORKDIR}/pyA20-${PV}"
inherit distutils3
do_compile:prepend() {
cp ${WORKDIR}/mapping.h ${S}/pyA20/gpio/mapping.h
cp ${UNPACKDIR}/mapping.h ${S}/pyA20/gpio/mapping.h
}
SRC_URI[md5sum] = "cab03b4931199804603d1074f6d8f48f"

2
recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb
View File

@ -20,7 +20,7 @@ CFLAGS += " -I${STAGING_INCDIR}/xorg "
do_install:append() {
install -d ${D}${datadir}/X11/xorg.conf.d
install -m 0644 ${WORKDIR}/20-fbturbo.conf ${D}${datadir}/X11/xorg.conf.d
install -m 0644 ${UNPACKDIR}/20-fbturbo.conf ${D}${datadir}/X11/xorg.conf.d
}
FILES:${PN} += "${datadir}/X11/xorg.conf.d/20-fbturbo.conf"

4
recipes-kernel/linux/linux.inc
View File

@ -45,8 +45,8 @@ do_configure:prepend() {
#
# logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it's going to be used
#
if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then
install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
if [ -e ${UNPACKDIR}/logo_linux_clut224.ppm ]; then
install -m 0644 ${UNPACKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
kernel_conf_variable LOGO y
kernel_conf_variable LOGO_LINUX_CLUT224 y
fi

3
recipes-kernel/uwe5622-firmware/uwe5622-firmware.bb
View File

@ -2,7 +2,8 @@ DESCRIPTION = "UWE5622 Wifi firmware"
LICENSE = "CC0-1.0"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=0ceb3372c9595f0a8067e55da801e4a1"
S = "${WORKDIR}"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"
COMPATIBLE_MACHINE = "(orange-pi-zero2|orange-pi-3lts)"