Carbon Bugs

greenjeans · 2025-11-08 03:52:39

johnraff wrote:

^I'm talking about the splash screen that the installer displays, which as you know has a size limit. ("grub-pc" is a bit bigger than syslinux at 800x600.)
We ship a grub boot image for the installed system which is 1024x765.
I'm pretty sure grub was unable to show anything bigger than that in the past, but you say it will now accept a fullsized wallpaper?
EDIT I found this: https://shallowsky.com/blog/linux/grub-splashimage.html
Use 640x480 at least initially. I think it's supposed to be possible to use other resolutions, but I haven't explored that yet. (Update: in 2025 I have successfully used a 1920 x 1200 image either as PNG or JPEG.)

^^Yep, been using a 1920x1200 in testing for a while now, I think you could go even larger if you like. The extra res is nice on desktop machines with larger monitors, and looks nice and sharp on laptops. I don't know when that changed but it looks nice and doesn't cost a lot in extra space.

Last edited by greenjeans (2025-11-08 04:26:04)

micko01 · 2025-11-08 04:51:03

On a different subject xwwall had some small bugs that are now fixed at github, xwwall-debian is updated too.

micko01 · 2025-11-08 05:03:58

Here's a tweaked sage 1024x768. I tweaked the logo marginally, and it may be a tiny bit crisper.

johnraff · 2025-11-08 06:00:07

OK in order:

greenjeans wrote:

been using a 1920x1200 in testing for a while now

I thought "why not also throw in a 1920x1200 for those who want it?" and fired up Gimp to scale the sage image. Unfortunately it's a different aspect ratio - wider - and would mean a Graphics Guy deciding how to crop or stretch the existing image, so let's leave it for now.

micko01 wrote:

xwwall had some small bugs that are now fixed at github, xwwall-debian is updated too

Thanks! I'll get the updated package built and uploaded today.

EDIT: I see that bunsenlabs xwwall and xwwall-debian have only "main" not "carbon" branches. My local fork's branch is "carbon" though, so I guess you renamed the branches to "main" at some point? Considering noone outside BL is likely to want "carbon" in their changelog, maybe you'd consider putting the bunsen-specific stuff in a carbon branch, at least for xwwall-debian?

Also, xwwall-debian on BL is ahead of the Micko repo, while BL xwwall is behind the Micko repo.

I'll wait till it settles down before building/uploading.

micko01 wrote:

Here's a tweaked sage 1024x768

Thanks for that too. Agree that the logo is a bit clearer.
Also noticed that the background is slightly squeezed horizontally (intentional?) and the filesize is slightly down.

micko01 · 2025-11-08 07:49:37

^ with xwall-debian I'll delete it on my github. AFAIK there was only the main branch on on BL github. Anyway that is moot really as far as a build is concerned. The only change was running dch to update the changelog. There was no carbon branch on 01micko/xwall-debian or my local copy.

--

Synced bunsenlabs/xwwall with 01micko/xwwall so should be good to go.

Details

johnraff · 2025-11-09 07:20:41

^No, indeed the "carbon" branch was a local one I added to do the packaging on so I could leave the upstream commit history clean. Sorry about the noise there.

Anyway, the new xwwall is safely up in the package repository now.

Last time I built it by copying out the contents of the debian/ directory in xwwall-debian, pasting it into xwwall carbon branch, committing the change: "Update debian/ directory from xwwall-debian package" and building. That works fine but felt a bit dirty somehow.

Did some research, learned about git submodules and worktrees, pulled xwwall-debian into a submodule of xwwall, "packaging" branch, put that branch in a separate worktree so the submodule directory wouldn't interfere with the upstream code when checking out "main". Now you can fetch the debian contents and merge it with xwwall and all the history is intact, while the upstream commits are in a separate "upstream" branch. OK looks good, but didn't build because of the extra xwwall-debian directory in the source.

Had to rename the submodule's directory .xwwall-debian so it was ignored - then it built. (Also needed a symlink from .xwwall-debian/debian to debian in the source root.)

Anyone interested in the details, I listed up the commands so I wouldn't have to spend 3~4 hours searching the internet next time I had to do something like this:

If debian packaging is in a different git repo from the app itself,
put it in a submodule, and move that to a new worktree to keep the packaging
from dirtying the upstream code:
(on software repo, "main" branch)

git checkout -b packaging
git submodule add git@github.com:BunsenLabs/xwwall-debian.git .xwwall-debian
git commit -m 'Add debian submodule from git@github.com:BunsenLabs/xwwall-debian.git in hidden directory .xwwall-debian'
ln -s .xwwall-debian/debian debian
(because debian/ is a subfolder, not root of xwwall-debian)
git commit -m 'add symlink "debian" to .xwwall-debian/debian/ '
git submodule set-branch --branch packaging -- xwwall-debian
git commit -m 'set xwwall-debian submodule to packaging branch'
git worktree add ../xwwall-packaging packaging
(now "packaging" branch is inside ../xwwall-packaging and
submodule contents are in ./xwwall-debian on "packaging" branch)
cd .xwwall-debian
git fetch origin
(refresh upstream data)
git checkout -b upstream origin/main
git checkout main
git merge upstream

Now "packaging" branch is in its own worktree "xwwall-packaging",
xwwall-debian submodule:
    packaging work and commits in "main"
    clean upstream history in "upstream".

"xwwall-packaging" is still linked to the base "xwwall" repo.
"main" branch only available in xwwall
"packaging" branch only in xwwall-packaging
NB: but don't forget the submodule in .xwwall-debian/ also has its own "main" branch.

Do 'git pull' in main "xwwall" repo to update software.

To update debianization,
in xwwall-packaging directory:
    'git merge main' to pull software upgrades from the separated-off xwwall's "main" branch
    'cd .xwwall-debian' (now in submodule)
    'git checkout upstream'
    'git pull'
    'git checkout main' (submodule's main)
    'git merge upstream'
    cd ../ (back in parent repo's "packaging" branch)

Now can do package build in  xwwall-packaging/

Maybe there's an easier way to do this...

Last edited by johnraff (2025-11-10 06:27:53)

micko01 · 2025-11-09 08:50:41

^Nice!

Maybe there's an easier way to do this...

Maybe, but some clever scripting could make it less cumbersome.

johnraff · 2025-11-10 06:44:18

micko01 wrote:

Maybe there's an easier way to do this...
Maybe, but some clever scripting could make it less cumbersome.

In fact only the last few commands would need to be scripted, so it wouldn't be that hard:

cd xwwall
git branch
echo 'only "main" branch is available here
"packaging" branch is in ../xwwall-packaging'
git pull
cd ../xwwall-packaging
echo 'only the "packaging" branch is available here'
echo 'pulling in any software upgrades from the separated-off xwwall "main" branch...'
git merge main
cd .xwwall-debian
echo 'Now in xwwall-debian submodule'
git checkout upstream
git pull
git checkout main
git merge upstream
cd ../
echo 'now back in xwwall-packaging "packaging" branch'
echo "now you can build the package"

It would be good to add some error-checking...

And I suppose the whole git repo setup process could be scripted too.

#261 2025-11-08 03:52:39

Re: Carbon Bugs

#262 2025-11-08 04:51:03

Re: Carbon Bugs

#263 2025-11-08 05:03:58

Re: Carbon Bugs

#264 2025-11-08 06:00:07

Re: Carbon Bugs

#265 2025-11-08 07:49:37

Re: Carbon Bugs

#266 2025-11-09 07:20:41

Re: Carbon Bugs

#267 2025-11-09 08:50:41

Re: Carbon Bugs

#268 2025-11-10 06:44:18

Re: Carbon Bugs

Board footer