Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
X
x2gokdriveclient
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
X2Go
Client
x2gokdriveclient
Commits
ed53784a
Verified
Commit
ed53784a
authored
7 months ago
by
Mihai Moldovan
Browse files
Options
Downloads
Plain Diff
Merge branch 'personal/Ionic/workaround/arm-user-mode-emulation-lrelease-v2' into 'master'
debian/rules: actually rework workaround so that it triggers. Attributes GL MR
!5
:
!5
parents
94063921
b4973225
Branches
master
No related tags found
1 merge request
!5
debian/rules: actually rework workaround so that it triggers.
Pipeline
#201
passed
7 months ago
Stage: external
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
debian/changelog
+4
-0
4 additions, 0 deletions
debian/changelog
debian/rules
+10
-5
10 additions, 5 deletions
debian/rules
with
14 additions
and
5 deletions
debian/changelog
+
4
−
0
View file @
ed53784a
...
...
@@ -43,6 +43,10 @@ x2gokdriveclient (0.0.0.2-0x2go1) UNRELEASED; urgency=medium
Debian 12+ only for now. Note that this is not an issue with
full-machine emulation, since the inner system is unsuspecting to the
actual bare-metal host.
+ Actually rework workaround so that it triggers. Previously, it didn't,
because the workaround only triggered if the trigger variable was
non-zero, which naturally won't work. Initialize it to "auto" instead
and check if "auto" has been used, otherwise do nothing.
* debian/control:
+ Add BD on lsb-release for the arm* user-mode emulation workaround to
actually trigger.
...
...
This diff is collapsed.
Click to expand it.
debian/rules
+
10
−
5
View file @
ed53784a
...
...
@@ -82,14 +82,19 @@ else
endif
endif
# lrelease fails to run when calling it via user mode emulation, because it
# (wrongly) "detects" a cross-compiling situation and then fails to load the
# default mkspec, for reasons I wasn't able to easily debug.
# lrelease fails to run when calling it via user-mode emulation, because the
# lprodump binary tries to fetch the default mkspec by calling "qmake -query"
# and parsing its output, but does so via QProcess. QProcess fails to work in
# user-mode emulation, at least when using the default vfork-like clone ()
# call, so no data can be queried, leading to a hardcoded value being used,
# which can't be resolved and ultimately leads to lprodump and release
# failing.
# Thankfully, we can work around this issue by specifying QMAKESPEC directly.
LRELEASE_WORKAROUND
?=
0
LRELEASE_WORKAROUND
?=
auto
LRELEASE_OVERRIDE
:=
ifneq
($(LRELEASE_WORKAROUND),0)
ifeq
($(LRELEASE_WORKAROUND),auto)
LRELEASE_WORKAROUND
:=
0
ifeq
($(VENDOR_DEBIAN),yes)
ifeq
($(shell /bin/bash -c '(( $(RELEASE_VER) >= 12 )) && echo '"'"'yes'"'"),yes)
ifeq
($(DEB_BUILD_GNU_TYPE),aarch64-linux-gnu)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment