2026-02-01 09:07:53 Will reboot gbr2-dev1, which hosts a number of webfacing applications like pkgs.alpinelinux.org an security.alpinelinux.org 2026-02-01 09:11:38 It's back 2026-02-01 10:33:59 Anyone at Fosdem? 2026-02-01 15:14:43 Heya heya! Can anyone lend me a small hand? Trying to update the branch I'm working on my fork of aports. it is behind by a... small margin(9600 commits behind, 19 commits ahead). I did added upstream(aports git repo directly), fetched master just to make sure that my local changes are right, then used 'git merge upstream/master' to merge it in. Is this correct? would this mess the git history? 2026-02-01 15:25:42 leviakatsuki: you want to make sure it's a fast-forward merge 2026-02-01 15:26:14 ie, it should not open an edit asking for a commit message for example 2026-02-01 15:27:39 Yeah good thing I didn't pushed XD cuz it did asked 2026-02-01 15:35:11 okay I can't use 'git merge --ff-only master' cuz it says I'm diverging? git tells me to either 'git merge --no-ff'(afaik that'd mess things up) or 'git rebase' 2026-02-01 15:41:51 That means you have created commits on your local master branch 2026-02-01 15:42:17 If you do not care about those commits, I would reset your local master branch to match the upstream version 2026-02-01 15:48:56 my local master branch is clear? even did 'git branch -D master; git checkout -b master upstream/master', then 'git branch -D fchat-horizon; git checkout -b fchat-horizon origin/fchat-horizon', but when I do either 'git merge --ff-only master' or 'git merge --ff-only upstream/master', it says that the branches are diverging. 'fchat-horizon' is the branch I actually made changes to (the APKBUILD I'm working on to add the horizon package) 2026-02-02 00:42:07 anyone try virtualbox kvm backend 2026-02-02 07:11:39 ncopa: could you take a look at !95130, it is ready (copy from the past) 2026-02-02 11:44:23 qaqland: ncopa is away atm 2026-02-02 12:23:52 In /etc/fonts/fonts.conf, only /usr/share/fonts and $XDG_DATA_HOME/fonts are listed as font directories, omitting /usr/local/share/fonts 2026-02-02 12:24:42 fc-list will still list fonts under /usr/local/share/fonts, but f.ex rust package fontdb won't detect them 2026-02-02 12:28:41 looking at fontconfigs configure script, im not quite sure how to add it 2026-02-02 13:39:49 is there support for a pkgdesc for sub packages? 2026-02-02 13:41:31 sure there is. assign pkgdesc="whatever" in the subpackage function 2026-02-02 13:42:02 yep, just found the example in aports, thanks! 2026-02-03 10:58:08 Hey, I'm having a little trouble upgrading `cargo-insta`, due to differences in behaviour with the `diff` command in CI vs local `abuild-rootbld`: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/96906#note_580653 2026-02-03 15:01:01 it's so strange, two lines output are missing only on armv7 and s390x. https://gitlab.alpinelinux.org/qaqland/aports/-/jobs/2203641#L1354 2026-02-03 15:17:42 My only guess would be something like IO buffers that aren't flushed