Fix some compile issues

This commit is contained in:
Justin Hammond 2023-05-01 19:58:11 +08:00
parent 25dfadc343
commit 94edd06eab
12 changed files with 72 additions and 38 deletions

View file

@ -0,0 +1,12 @@
# SPDX-FileCopyrightText: 2023 Justin Hammond <justin@dynam.ac>
#
# SPDX-License-Identifier: MIT
#The Cmake files include the sysroot directory to pipewire and spa, delete the actual sysroot from the path.
do_install:prepend:class-target() {
if [ "0" -ne $(find . -name \*.cmake | grep '_usr\|Export' | wc -l) ]; then
echo sed -i 's#'${RECIPE_SYSROOT}/usr'#\$\{_IMPORT_PREFIX\}#g' $(find . -name "*.cmake" | grep '_usr\|Export' )
sed -i 's#'${RECIPE_SYSROOT}/usr'#\$\{_IMPORT_PREFIX\}#g' $(find . -name "*.cmake" | grep '_usr\|Export' )
fi
}

View file

@ -10,7 +10,7 @@ BBLAYERS ?= " \
##OEROOT##/../poky/meta-poky \
##OEROOT##/../poky/meta-yocto-bsp \
##OEROOT##/../meta-riscv \
##OEROOT##/../.. \
##OEROOT##/../../../meta-pine64 \
##OEROOT##/../meta-openembedded/meta-oe \
##OEROOT##/../meta-openembedded/meta-python \
##OEROOT##/../meta-openembedded/meta-networking \

View file

@ -1,5 +1,9 @@
Bitbake Setup for PinIx
Using Shared State Cache at pine64.my-ho.st to speed up builds on x86_64
By Default, this will create binaries/images for the Star64 Device. To build for different platforms, please use MACHINE="<machinename>" bitbake <command>
You can now build. Some sample images:
* star64-image-minimal

View file

@ -277,4 +277,4 @@ CONF_VERSION = "2"
PRSERV_HOST = "localhost:0"
PARALLEL_MAKE = "-j 4"
INHERIT += "rm_work"
RM_WORK_EXCLUDE += "linux-starfive-dev"
RM_WORK_EXCLUDE += "linux-starfive-dev kdoctools"

View file

@ -0,0 +1,25 @@
DESCRIPTION = "Minimal Star64 Packages"
inherit packagegroup
PACKAGES = " \
packagegroup-star64-minimal \
"
RDEPENDS:packagegroup-star64-minimal = " \
resize-rootfs \
mc \
joe \
ca-certificates \
networkmanager \
wpa-supplicant \
avahi-daemon \
networkmanager-nmtui \
ntpdate \
tzdata \
udev-rules-star64 \
openssh \
wget \
curl \
"

View file

@ -1,39 +1,10 @@
DESCRIPTION = "Minimal Star64 Packages"
DESCRIPTION = "Plasma Star64 Packages"
inherit packagegroup
PACKAGES = " \
packagegroup-star64-minimal \
packagegroup-star64-weston \
packagegroup-star64-plasma \
"
RDEPENDS:packagegroup-star64-minimal = " \
resize-rootfs \
mc \
joe \
ca-certificates \
networkmanager \
wpa-supplicant \
avahi-daemon \
networkmanager-nmtui \
ntpdate \
tzdata \
udev-rules-star64 \
openssh \
wget \
curl \
"
RDEPENDS:packagegroup-star64-weston = " \
packagegroup-star64-minimal \
gtk+3-demo \
weston \
sddm \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'weston-xwayland matchbox-terminal', '', d)} \
"
RDEPENDS:packagegroup-star64-plasma = " \
packagegroup-star64-minimal \
wayland \

View file

@ -0,0 +1,15 @@
DESCRIPTION = "Weston Star64 Packages"
inherit packagegroup
PACKAGES = " \
packagegroup-star64-weston \
"
RDEPENDS:packagegroup-star64-weston = " \
packagegroup-star64-minimal \
gtk+3-demo \
weston \
sddm \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'weston-xwayland matchbox-terminal', '', d)} \
"

View file

@ -0,0 +1,6 @@
do_install:append:class-target() {
if [ "0" -ne $(find . -name \*.cmake | grep '_usr\|Export' | grep 'noconfig' | wc -l) ]; then
echo sed -i 's#'\$\{_IMPORT_PREFIX\}'#\$\{OE_KF5_PATH_HOST_ROOT\}/usr/#g' $(find . -name "*.cmake" | grep '_usr\|Export' | grep 'noconfig' )
sed -i 's#'\$\{_IMPORT_PREFIX\}'#\$\{OE_KF5_PATH_HOST_ROOT\}/usr/#g' $(find . -name "*.cmake" | grep '_usr\|Export' | grep 'noconfig' )
fi
}

View file

@ -0,0 +1,2 @@
#The Cmake files include the sysroot directory to pipewire and spa, delete the actual sysroot from the path.
inherit cmake_sysroot

View file

@ -0,0 +1,2 @@
#The Cmake files include the sysroot directory to pipewire and spa, delete the actual sysroot from the path.
inherit cmake_sysroot

View file

@ -0,0 +1,2 @@
#The Cmake files include the sysroot directory to pipewire and spa, delete the actual sysroot from the path.
inherit cmake_sysroot

View file

@ -3,9 +3,4 @@ SRC_URI:append:jh7110 = " \
"
#The Cmake files include the sysroot directory to pipewire and spa, delete the actual sysroot from the path.
do_install:prepend() {
if [ "0" -ne $(find . -name \*.cmake | grep '_usr\|Export' | wc -l) ]; then
echo sed -i 's#'${RECIPE_SYSROOT}/usr'#\$\{_IMPORT_PREFIX\}#g' $(find . -name "*.cmake" | grep '_usr\|Export' )
sed -i 's#'${RECIPE_SYSROOT}/usr'#\$\{_IMPORT_PREFIX\}#g' $(find . -name "*.cmake" | grep '_usr\|Export' )
fi
}
inherit cmake_sysroot