I did not check if patches still applied yesterday, and it turns out
that almost all of them don't apply anymore (probably because the
changes are in the upstream source now?).
Note that I did not test if plasma mobile is working correctly again
with this version, I'm just making the build errors go away (which I
did not notice right away yesterday, as qt5-qtbase was still building
and we had to upgrade that anyway, so there was no point in waiting).
Build tested and working for x86_64.
Fixes: 86a0ecc04a ("temp/qt5-qt*: upgrade to 5.12.5")
The package was originally added with jemalloc to work around a deadlock
while compiling mesa. I've tested compiling the mesa-git package on
x86_64 for armhf and armv7 and it worked fine. Looking at the original
issue report, the problem only happened with the autotools build system
and not with meson - and as all our mesa or networkmanager aports are
using meson now, I think we can delete this.
[ci skip] Package output does not change except for meta
information (licenses), so don't build or verify checksums
of the packages to prevent outdated source URL's breaking it.
This will have to be looked at later
Increase pkgrels, so the resulting versions are higher than the aports
in Alpine. Seems like this was done in the upstream PR initially, but
then got lost during rebase.
Fork from Alpine to apply Martijn's patch:
https://github.com/alpinelinux/aports/pull/9894
"This makes wpa_supplicant run in dbus mode if no config file has been
created for it, fixing the networkmanager integration. This config has
been used for a long time in postmarketOS and works fine.
It also removes the iwd dependency from networkmanager again so
wpa_supplicant is used because iwd doesn't support as many chipsets as
wpa_supplicant and it doesn't run on older kernels."
[ci:skip-build]: already built successfully in CI for x86_64, I've
tested that it builds for armhf and aarch64 too.
Avoid build failure for x86:
>>> mesa-git-glapi*: Running postcheck for mesa-git-glapi
>>> ERROR: mesa-git-glapi*: Found textrels:
TEXTREL /home/pmos/build/pkg/mesa-git-glapi/usr/lib/libglapi.so.0.0.0
The package is only used for armhf, armv7, aarch64 devices currently, so
change the arch line in the APKBUILD accordingly.
$ cd device
$ for i in $(git grep mesa-git | cut -d/ -f1); do grep -H arch $i/deviceinfo; done
device-asus-flo/deviceinfo:deviceinfo_arch="armhf"
device-lg-hammerhead/deviceinfo:deviceinfo_arch="armv7"
device-pine-a64lts/deviceinfo:deviceinfo_arch="aarch64"
device-pine-dontbeevil/deviceinfo:deviceinfo_arch="aarch64"
device-sony-castor-windy/deviceinfo:deviceinfo_arch="armhf"
device-sony-sirius/deviceinfo:deviceinfo_arch="armv7"
[ci:skip-vercheck]: only changed arch line
Fixes: ce7e4d79e1 ("temp/mesa-git: new aport (!524)")
Freedreno is broken in latest mesa stable, but it is fixed in current
master. Let's use master for now.
Based on Brian Masney's patch, but with a hardcoded commit and a
separate package.
The description below is a quote from Brian Masney in #296.
The pmOS mesa packages need to have -Db_ndebug=true passed to the meson
build so that debug assertions and extra validations are disabled to
improve overall system performance. See [1] for more details. Fedora
also recently made this change: [2]
This change, along with using the master branch of mesa, gets the
Freedreno driver working properly with X11 on the Nexus 5 and presumably
other A3XX-based systems.
--buildtype=release should also be passed to meson for extra
optimizations. See the thread [3] for more details.
[1] https://gitlab.freedesktop.org/mesa/mesa/blob/master/docs/meson.html#L321
[2] https://bugzilla.redhat.com/show_bug.cgi?id=1692426.
[3] https://lists.freedesktop.org/archives/mesa-dev/2019-June/219960.html
[ci:skip-build]: already built successfully in CI
Alpine's build bot is stuck on another package, but this needs to be
rebuilt against the recently updated libhunspell. Otherwise Plasma
Mobile cannot be installed, as pmbootstrap fails with:
ERROR: Could not find dependency 'so:libhunspell-1.6.so.0' in any aports folder or APKINDEX.
I've tested that this builds properly.
Disable for arm arches, because there it fails with:
[89/300] Compiling C object 'xcursor/c7765ab@@wlr_xcursor@sta/xcursor.c.o'.
FAILED: xcursor/c7765ab@@wlr_xcursor@sta/xcursor.c.o
gcc -Ixcursor/c7765ab@@wlr_xcursor@sta -Ixcursor ...
cc1: error: /home/pmos/build/pkg/mesa/usr/include: No such file or directory [-Werror=missing-include-dirs]
I suspect, that this relates to our custom mesa packaging, which is only
built for arm architectures currently. Phosh isn't running on anything
other than x86_64 so far in postmarketOS, so let's just disable wlroots
arm too until this is figured out.
[ci:skip-vercheck]: only modified the arch line
Remove Alpine's maintainers and contributors from the APKBUILDs in temp
where we still had them. In general, we don't keep them there, because
we don't want them to get e-mailed about questions from the postmarketOS
aports. It is obvious that they were copy pasted from Alpine, with minor
adjustments.
Remove "Remember to increase pkgrel after changing _pkgver!" from
temp/mesa, because we have a CI check for that now.
[ci:skip-build]: cosmetic changes only
We need our build of qtdeclarative, otherwise building plasma/kde
components fails on arm with:
ld: /usr/lib/libQt5Quick.so.5.12.3: undefined reference to `QOpenGLFunctions_1_0::versionProfile()@Qt_5'
ld: /usr/lib/libQt5Quick.so.5.12.3: undefined reference to `QOpenGLFunctions_3_2_Core::versionProfile()@Qt_5'
That is, because Alpine's qt5-qtdeclarative is built against a
qt5-qtbase version, where the opengl version is not changed to
opengl es2, like it is done in pmaports.
Related: #270
Move Wayland meta packages to LightDM and replace ConsoleKit2 for
elogind for Plasma.
Now we don't need the hacky scripts in /etc/profile.d anymore!
This change requires elogind for both Weston and Plasma Mobile. Using
elogind allows us to use one patch less in kwin. Weston has logind
(which elogind provides) support disabled in Alpine Linux, so I put the
package in temp/ with it enabled for now, but will upstream this change
to Alpine.
Remove consolekit2 dependency in postmarketos-ui-xfce4.
[ci:skip-build]: already built successfully.
Fix the regression from the mesa refactoring and from switching to armv7
in hammerhead.
[ci:skip-build]: already built successfully in CI for x86_64; I've
tested manually that it builds for armv7.
- main: postmarketos-mkinitfs: Add /run
Create the /run directory in the initramfs so that cryptsetup doesn't
crash on not being able to create /run/cryptsetup for lockfiles
- device: pine-dontbeevil: Remove workaround for touchscreen
- main: linux-postmarketos-allwinner: Implemented supplies for touchscreen
This uses a slightly newer commit from the kernel repo that implements
requesting a regulator in the touchscreen driver
- device: pine-dontbeevil: Remove ethernet from initramfs
This actually makes debugging more complicated since networkmanager wont
touch the ethernet adapter afterwards and the initramfs can be debugged
over uart
- temp/u-boot: sync APKBUILD with upstream and update to 2019.04
- main: linux-postmarketos-allwinner: Use 20190521 git version
Fix missing symlink for the first driver in mv_dri() (caused by "shift"
at the wrong position). Build freedreno for arm only, not for all
arches.
Lima is for rendering and sun4i-drm (part of kmsro) for the display, so
split it into its own subpackage and use it in device-pine-*.
[ci:skip-build]: ollieparanoid made sure, that this builds. This won't
finish in time in CI.
Fix up for !359: the pkgrel was not bumped, and because the real mesa
version was stored in _pkgver instead of pkgver (which is set to 9999),
this means that the APKBUILD has exactly the same version as before. So
pmbootstrap will not try to build it, resulting in a missing
mesa-dri-lima package and general confusion.
See also:
https://gitlab.com/postmarketOS/pmaports/merge_requests/359#note_170054969
temp/mesa: enable mesa-dri-lima subpackage
temp/mesa: add a fix for Wayland on Lima
temp/mesa-purism-gc7000: update to latest Git and try to resolve conflicts with mesa
temp/mesa: switch version to 19.1.0-rc1
device/device-pine-a64lts: add mesa and mesa-dri-lima to depends
device/device-pine-dontbeevil: add mesa to depends
device/device-purism-librem5dev: remove now defunct mesa-purism-gc7000-dri-imx from depends
temp/mesa*: re-add X11 support
temp/mesa-purism-gc7000: fix build error which for some reason didn't cause problems earlier
temp/mesa*: fix X11 DRI symlinks
They are available in Alpine again for armhf and armv7.
Networkmanager is still missing, so we keep it it temp for now. Upstream
patch submitted: https://github.com/alpinelinux/aports/pull/7626
Related: #244
Due to the following dependency chain, it is currently not available
in Alpine for armhf and armv7. This breaks postmarketos-base.
postmarketos-base -> networkmanager -> polkit -> mozjs60
This can be reverted, when networkmanager is back for arm{hf,v7} in
Alpine. The mozjs60 arm fix is from here:
https://github.com/alpinelinux/aports/pull/7561
Related: #244
Rebuild to fix missing dependencies:
so:libicui18n.so.63, so:libicuuc.so.63
Currently we are facing another upstream compatibility issue with
Alpine, which is why CI will fail: polkit and therefore
networkmanager don't exist for armhf, armv7. See #244 for details.
Work around for issue #1715
Link qemu static binaries to jemalloc. This malloc implementation does not
appear to be susceptible to the deadlock after fork issue.
This is package is meant to work around the qemu static deadlock while
cross-compiling.
- pmbootstrap binfmt_misc chroots on arm hosts are untested
- upstream jemalloc package has armv7 disabled. It is uncertain what is
wrong with jemalloc for armv7.
For these reasons, disable the arm packages.
This updates the PKGBUILD to build tags instead of the release branch
(which will see commits until the specific release is EOL),
This commit also adds building the mesa-xatracker package.
[ci:skip-build]: already built successfully in CI
This adds a Mesa package overriding Mesa in Alpine, and:
1) builds a much newer version of Mesa than what is found in Alpine (by
*not* building amd/radeonsi support, so no dependency on llvm).
2) builds Mesa with tegra and etnaviv drivers (note, as of now, the
librem5 devkit gpu is not supported in the etnaviv driver here)
This breaks "pmbootstrap qemu" for some people, use --host-qemu as
workaround for now (a fix will be available soon):
https://wiki.postmarketos.org/wiki/Troubleshooting:QEMU#Using_QEMU_from_the_host_system
Since this also fixes the blackscreen bug on lg-hammerhead, the
trade-off with the qemu bug is worth it.
[ci:skip-build]: already built successfully in CI
This adds a package overriding the libdrm in Alpine with a newer
version, and also building libdrm with support for experimental devices
(etnaviv and tegra).
Fork the package from Alpine and undefine IFA_F_NOPREFIXROUTE during
compilation, so it works with the old downstream kernels that do not
have this feature yet.
Plasma-framework 5.55.0 isn't building for aarch64 without this patch.
Aleix Pol ran into the same problem with flatpak builds, and created the
patch: https://codereview.qt-project.org/#/c/253276/
* Mir starts up and is able to display system settings
* x86_64 only for now, because at least ubuntu-app-test did not build
on aarch64
Based on PureTryOut's work. Getting it to this stage was a huge effort
(as it shows in the package count: 111(!)). See the merge request for
details.
[skip ci]: this won't finish in CI; ollieparanoid made sure that
everything builds for x86_64.
Alpine Linux has updated their main/icu to 63.1, which means we have to
rebuild some of our packages too.
[skip ci]: simple pkgrel bumps, building won't finish in CI
Turns out we do need to fork this aport, as it builds qgpgme, which
Alpine's aport does not build as of now. Updated to 1.12.0 and changed
the pkgver to 9999, so it does not conflict with Alpine's aport.
We had probably added this, because no binary package was present in
Alpine at the time. Now it is present, and the package has been updated
in Alpine. No need to keep this outdated version around.
Workaround for a build error on aarch64, where the binary package
repository is currently stuck. Compiling it for aarch64 like this:
$ pmbootstrap build --strict --arch=aarch64 qemu
Resulted in:
>>> qemu: Analyzing dependencies...
ERROR: unsatisfiable constraints:
openssl-dev-1.1.1a-r0:
conflicts: libressl-dev-2.7.4-r2[pc:libcrypto=1.1.1a]
libressl-dev-2.7.4-r2[pc:libssl=1.1.1a]
libressl-dev-2.7.4-r2[pc:openssl=1.1.1a]
satisfies: curl-dev-7.62.0-r2[openssl-dev]
libssh2-dev-1.8.0-r4[pc:libcrypto]
libssh2-dev-1.8.0-r4[pc:libssl]
spice-dev-0.14.1-r3[pc:openssl]
libressl-dev-2.7.4-r2:
conflicts: openssl-dev-1.1.1a-r0[pc:libcrypto=2.7.4]
openssl-dev-1.1.1a-r0[pc:libssl=2.7.4]
openssl-dev-1.1.1a-r0[pc:openssl=2.7.4]
satisfies: world[libressl-dev]
libssh2-dev-1.8.0-r4[pc:libcrypto]
libssh2-dev-1.8.0-r4[pc:libssl]
spice-dev-0.14.1-r3[pc:openssl]
>>> ERROR: qemu: builddeps failed
Note that the only package not mentioned in both "satisfies" outputs is
curl-dev. The real questions are: why is libressl-dev getting pulled in
at all? (Alpine switched back from libressl to openssl, so this should
not happen). And why does this only happen for aarch64, but not for
x86_64 and armhf? But at least this patch unblocks the package builder.
The purpose of this package was to fill in until it is built in Alpine.
However, it takes forever to build the foreign arch versions. That's
due to the fact that GCC is compiling it self, and then the distcc
cross compiler magic does not work. Not worth it. [skip ci].
Further adjustments. It would have been better if I tried to build
it first, sorry for that. Another patch is coming in the pmbootstrap
repo, which makes it work even without the gcc6 pmaport.
Copy Alpine's gcc6 aport to temp. They don't have it built for aarch64
and armhf at the moment. Due to dependency checks, this means we can't
build the kernels that need gcc6, even when cross compiling with
gcc6-armhf etc. See #138 for details.
* Added linux-postmarketos-allwinner kernel
* Added copy of alpines u-boot package with pine-a64lts support
* Changed postmarketos-mkinitfs to add the plain .dtb file to the boot partition
Alpine's firmware packages have been updated to include the latest
raspberry pi firmware. This commit adjusts our aports.
Details:
* remove obsolete `aports/temp/linux-firmware`
* `firmware/firmware-pi-bluetooth`: rename to `device/bluetooth-raspberry-pi`
and remove firmware files (they are part of Alpine's `linux-firmware` now)
* `device-raspberry-pi`: depend on `bluetooth-raspberry-pi`
* `device-raspberry-pi`: note that Alpine's kernels depend non free firmware
* `device-raspberry-pi`: remove non free firmware subpackage
The package starts with "linux-", which means the "native" cross
compilation type is used:
https://wiki.postmarketos.org/wiki/Build_internals#Cross-compile_types
When using that, !tracedeps needs to be in the options, otherwise the
dependency tracing step fails the build. I've tested that this commit
fixes the build.
Fixes#1546
