CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

blueman: fix installation paths

Browse Source 
* pass systemdsystemunitdir and systemduserunitdir to set correct directories
  instead of using libdir from:
  meson.build:systemd_base_path = join_paths(libdir, 'systemd')
  which is wrong e.g. with multilib where libdir might be /usr/lib64 instead of
  usr/lib used in ${nonarch_base_libdir} which is used by systemd_* variables:

  export systemd_system_unitdir="/usr/lib/systemd/system"
  export systemd_user_unitdir="/usr/lib/systemd/user"

  fixes:
  ERROR: Didn't find service unit 'blueman-mechanism.service', specified in SYSTEMD_SERVICE:blueman.

* inherit python3targetconfig to install into right python site-packages
  without this it installs into
  /usr/lib/python3.12/site-packages/
  instead of /usr/lib64/python3.12/site-packages set in PYTHON_SITEPACKAGES_DIR
  variable used in FILES, causing
  blueman: 295 installed and not shipped files. [installed-vs-shipped]

  # $PYTHON_SITEPACKAGES_DIR
  #   set oe-core/meta/classes-recipe/python3-dir.bbclass:11
  #     "${libdir}/${PYTHON_DIR}/site-packages"
  PYTHON_SITEPACKAGES_DIR="/usr/lib64/python3.12/site-packages"

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Martin Jansa 2024-08-19 13:54:42 +02:00 committed by Khem Raj
parent c4594daeab
commit 202bcbd9d9
No known key found for this signature in database
GPG Key ID: BB053355919D3314
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta-networking/recipes-connectivity/blueman/blueman_2.4.3.bb
View File

@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
DEPENDS = "gtk+3 glib-2.0 bluez5 python3-pygobject python3-cython-native"
inherit meson gettext systemd gsettings pkgconfig python3native gtk-icon-cache useradd features_check
inherit meson gettext systemd gsettings pkgconfig python3native gtk-icon-cache useradd features_check python3targetconfig
REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
@ -13,7 +13,10 @@ SRC_URI = "git://github.com/blueman-project/blueman.git;protocol=https;branch=2-
S = "${WORKDIR}/git"
SRCREV = "7bcf919ad6ac0ee9a8c66b18b0ca98af877d4c8f"
EXTRA_OEMESON = "-Druntime_deps_check=false"
EXTRA_OEMESON = "-Druntime_deps_check=false \
-Dsystemdsystemunitdir=${systemd_system_unitdir} \
-Dsystemduserunitdir=${systemd_user_unitdir} \
"
SYSTEMD_SERVICE:${PN} = "${BPN}-mechanism.service"
SYSTEMD_AUTO_ENABLE:${PN} = "disable"
@ -40,8 +43,8 @@ PACKAGECONFIG[polkit] = "-Dpolicykit=true,-Dpolicykit=false"
FILES:${PN} += " \
${datadir} \
${systemd_user_unitdir} \
${systemd_system_unitdir} \
${PYTHON_SITEPACKAGES_DIR} \
${prefix}${systemd_system_unitdir} \
"
# In code, path to python is a variable that is replaced with path to native version of it