From 94edd06eab18afa50673f145c67ce45f764a703d Mon Sep 17 00:00:00 2001 From: Justin Hammond Date: Mon, 1 May 2023 19:58:11 +0800 Subject: [PATCH] Fix some compile issues --- classes/cmake_sysroot.bbclass | 12 +++++++ conf/templates/pinix/bblayers.conf.sample | 2 +- conf/templates/pinix/conf-notes.txt | 4 +++ conf/templates/pinix/local.conf.sample | 2 +- .../packagegroup-star64-minimal.bb | 25 +++++++++++++++ ...tar64.bb => packagegroup-star64-plasma.bb} | 31 +------------------ .../packagegroup-star64-weston.bb | 15 +++++++++ .../kdesignerplugin_%.bbappend | 6 ++++ recipes-kf5/ki18n/ki18n_%.bbappend | 2 ++ .../kwindowsystem/kwindowsystem_%.bbappend | 2 ++ .../modemmanager-qt_%.bbappend | 2 ++ recipes-plasma/kpipewire/kpipewire_%.bbappend | 7 +---- 12 files changed, 72 insertions(+), 38 deletions(-) create mode 100644 classes/cmake_sysroot.bbclass create mode 100644 recipes-core/packagegroups/packagegroup-star64-minimal.bb rename recipes-core/packagegroups/{packagegroup-star64.bb => packagegroup-star64-plasma.bb} (63%) create mode 100644 recipes-core/packagegroups/packagegroup-star64-weston.bb create mode 100644 recipes-kf5/kdesignerplugin/kdesignerplugin_%.bbappend create mode 100644 recipes-kf5/ki18n/ki18n_%.bbappend create mode 100644 recipes-kf5/kwindowsystem/kwindowsystem_%.bbappend create mode 100644 recipes-kf5/modemmanager-qt/modemmanager-qt_%.bbappend diff --git a/classes/cmake_sysroot.bbclass b/classes/cmake_sysroot.bbclass new file mode 100644 index 0000000..0a7c8c9 --- /dev/null +++ b/classes/cmake_sysroot.bbclass @@ -0,0 +1,12 @@ +# SPDX-FileCopyrightText: 2023 Justin Hammond +# +# 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 +} diff --git a/conf/templates/pinix/bblayers.conf.sample b/conf/templates/pinix/bblayers.conf.sample index 393e7dc..9eed959 100644 --- a/conf/templates/pinix/bblayers.conf.sample +++ b/conf/templates/pinix/bblayers.conf.sample @@ -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 \ diff --git a/conf/templates/pinix/conf-notes.txt b/conf/templates/pinix/conf-notes.txt index 5054a3a..c6664ec 100644 --- a/conf/templates/pinix/conf-notes.txt +++ b/conf/templates/pinix/conf-notes.txt @@ -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="" bitbake + You can now build. Some sample images: * star64-image-minimal diff --git a/conf/templates/pinix/local.conf.sample b/conf/templates/pinix/local.conf.sample index 4370884..46e21c3 100644 --- a/conf/templates/pinix/local.conf.sample +++ b/conf/templates/pinix/local.conf.sample @@ -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" diff --git a/recipes-core/packagegroups/packagegroup-star64-minimal.bb b/recipes-core/packagegroups/packagegroup-star64-minimal.bb new file mode 100644 index 0000000..affd4a0 --- /dev/null +++ b/recipes-core/packagegroups/packagegroup-star64-minimal.bb @@ -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 \ +" \ No newline at end of file diff --git a/recipes-core/packagegroups/packagegroup-star64.bb b/recipes-core/packagegroups/packagegroup-star64-plasma.bb similarity index 63% rename from recipes-core/packagegroups/packagegroup-star64.bb rename to recipes-core/packagegroups/packagegroup-star64-plasma.bb index 619a324..e86f3e7 100644 --- a/recipes-core/packagegroups/packagegroup-star64.bb +++ b/recipes-core/packagegroups/packagegroup-star64-plasma.bb @@ -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 \ diff --git a/recipes-core/packagegroups/packagegroup-star64-weston.bb b/recipes-core/packagegroups/packagegroup-star64-weston.bb new file mode 100644 index 0000000..50ef4ac --- /dev/null +++ b/recipes-core/packagegroups/packagegroup-star64-weston.bb @@ -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)} \ +" \ No newline at end of file diff --git a/recipes-kf5/kdesignerplugin/kdesignerplugin_%.bbappend b/recipes-kf5/kdesignerplugin/kdesignerplugin_%.bbappend new file mode 100644 index 0000000..42c608d --- /dev/null +++ b/recipes-kf5/kdesignerplugin/kdesignerplugin_%.bbappend @@ -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 +} \ No newline at end of file diff --git a/recipes-kf5/ki18n/ki18n_%.bbappend b/recipes-kf5/ki18n/ki18n_%.bbappend new file mode 100644 index 0000000..e466905 --- /dev/null +++ b/recipes-kf5/ki18n/ki18n_%.bbappend @@ -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 \ No newline at end of file diff --git a/recipes-kf5/kwindowsystem/kwindowsystem_%.bbappend b/recipes-kf5/kwindowsystem/kwindowsystem_%.bbappend new file mode 100644 index 0000000..96ad823 --- /dev/null +++ b/recipes-kf5/kwindowsystem/kwindowsystem_%.bbappend @@ -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 diff --git a/recipes-kf5/modemmanager-qt/modemmanager-qt_%.bbappend b/recipes-kf5/modemmanager-qt/modemmanager-qt_%.bbappend new file mode 100644 index 0000000..e466905 --- /dev/null +++ b/recipes-kf5/modemmanager-qt/modemmanager-qt_%.bbappend @@ -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 \ No newline at end of file diff --git a/recipes-plasma/kpipewire/kpipewire_%.bbappend b/recipes-plasma/kpipewire/kpipewire_%.bbappend index 2c6e989..f558483 100644 --- a/recipes-plasma/kpipewire/kpipewire_%.bbappend +++ b/recipes-plasma/kpipewire/kpipewire_%.bbappend @@ -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 -} \ No newline at end of file +inherit cmake_sysroot