diff options
author | Trevor Woerner <twoerner@gmail.com> | 2020-12-11 00:52:36 -0500 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.ro> | 2020-12-11 17:00:15 +0000 |
commit | 4b89f636992b822d13ac748a9f959fbedd962fd4 (patch) | |
tree | 2d88d8ed19e8a67519d3f918a92787d62f20dacc | |
parent | f82376c44432c55772941e46224f43edd1cbf2fc (diff) | |
download | meta-raspberrypi-4b89f636992b822d13ac748a9f959fbedd962fd4.tar.gz |
userland: fix invalid packageconfig
Fix the "allapps" PACKAGECONFIG to avoid the QA warning/error:
userland-20201027-r0 do_configure: QA Issue: userland: invalid PACKAGECONFIG: allapps [invalid-packageconfig]
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
-rw-r--r-- | recipes-graphics/userland/userland_git.bb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb index 4a9fd21..6dfc8a3 100644 --- a/recipes-graphics/userland/userland_git.bb +++ b/recipes-graphics/userland/userland_git.bb | |||
@@ -55,10 +55,8 @@ inherit cmake pkgconfig | |||
55 | 55 | ||
56 | ASNEEDED = "" | 56 | ASNEEDED = "" |
57 | 57 | ||
58 | ALLAPPS = "${@bb.utils.contains('PACKAGECONFIG', 'allapps', '-DALL_APPS=true', '', d)}" | ||
59 | EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS='-Wl,--no-as-needed' \ | 58 | EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS='-Wl,--no-as-needed' \ |
60 | -DVMCS_INSTALL_PREFIX=${exec_prefix} \ | 59 | -DVMCS_INSTALL_PREFIX=${exec_prefix} \ |
61 | ${ALLAPPS} \ | ||
62 | " | 60 | " |
63 | 61 | ||
64 | EXTRA_OECMAKE_append_aarch64 = " -DARM64=ON " | 62 | EXTRA_OECMAKE_append_aarch64 = " -DARM64=ON " |
@@ -67,6 +65,7 @@ EXTRA_OECMAKE_append_aarch64 = " -DARM64=ON " | |||
67 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" | 65 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" |
68 | 66 | ||
69 | PACKAGECONFIG[wayland] = "-DBUILD_WAYLAND=TRUE -DWAYLAND_SCANNER_EXECUTABLE:FILEPATH=${STAGING_BINDIR_NATIVE}/wayland-scanner,,wayland-native wayland" | 67 | PACKAGECONFIG[wayland] = "-DBUILD_WAYLAND=TRUE -DWAYLAND_SCANNER_EXECUTABLE:FILEPATH=${STAGING_BINDIR_NATIVE}/wayland-scanner,,wayland-native wayland" |
68 | PACKAGECONFIG[allapps] = "-DALL_APPS=true,,," | ||
70 | 69 | ||
71 | CFLAGS_append = " -fPIC" | 70 | CFLAGS_append = " -fPIC" |
72 | 71 | ||