Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build for Halium #742

Open
wants to merge 3 commits into
base: scarthgap
Choose a base branch
from
+8 −2
Open

Fix build for Halium #742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e6501f
mobile-broadband-provider-info: fix build
Tofee Jan 5, 2025
f118fc9
broadband: fix
Tofee Jan 5, 2025
2e82d07
ofono-halium: fix missing RPROVIDES
Tofee Jan 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...mobile-broadband-provide-info/meson.build → ...obile-broadband-provider-info/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ pkgconfig.generate(
dataonly: true,
)

if false
custom_target('build-apns-conf',
build_by_default: true,
output: 'apns-conf.xml',
Expand All @@ -32,6 +33,7 @@ custom_target('build-apns-conf',
install: true,
install_dir: pkgdatadir,
)
endif

install_data(
[sp_xml_db, 'serviceproviders.2.dtd'],
Expand Down
7 changes: 5 additions & 2 deletions ...s-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"

#Mer uses their own version of MBPI which has some elements added. So we want to use their version only in case we're using their oFono version. In other cases where we use upstream oFono we want to use the regular MBPI from Yocto.

SRC_URI:halium = " \
Tofee marked this conversation as resolved.
Show resolved Hide resolved
git://github.com/sailfishos/mobile-broadband-provider-info.git;protocol=https;branch=master \
file://meson.build \
file://meson.build;subdir=git/${BPN} \
"

S:halium = "${WORKDIR}/git/${PN}"
S:halium = "${WORKDIR}/git/${BPN}"

SRCREV:halium = "fe500f1b19e8525d09655a38ac111a0fe127b5f9"
LIC_FILES_CHKSUM:halium = "file://COPYING;md5=87964579b2a8ece4bc6744d2dc9a8b04"

1 change: 1 addition & 0 deletions meta-luneos/recipes-connectivity/ofono/ofono-halium_1.29.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ COMPATIBLE_MACHINE = "^halium$"
# This recipe acts as a replacement for the ofono recipe
PROVIDES += "ofono"
RPROVIDES:${PN} += "ofono"
RPROVIDES:${PN}-tests += "ofono-tests"

Tofee marked this conversation as resolved.
Show resolved Hide resolved
SRC_URI = " \
git://github.com/sailfishos/ofono.git;protocol=https;branch=master \
Expand Down