Skip to content

More fixes for sbase and ubase#275

Merged
Kron4ek merged 12 commits into
Kron4ek:masterfrom
hovercats:oasis
Jun 12, 2026
Merged

More fixes for sbase and ubase#275
Kron4ek merged 12 commits into
Kron4ek:masterfrom
hovercats:oasis

Conversation

@hovercats

Copy link
Copy Markdown
Contributor

Following up on my last PR. sbase/ubase users (and oasis linux, such as myself), should with this PR be able to build a conty image too.

Let me know if theres anything you dont like here.

Comment thread conty-start.sh Outdated

# If the previous download failed, get the URL from FlatHub repo
if [ ! -s nvidia.run ] || [[ "$(stat -c%s nvidia.run)" -lt 30000000 ]]; then
if [ ! -s nvidia.run ] || [[ "$(stat nvidia.run | grep Size | awk -F ' ' '{print $2}')" -lt 30000000 ]]; then

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not needed, because this function (nvidia_driver_handler) is executed inside the container. Better to not change this line.

Comment thread conty-start.sh Outdated
busybox_size=1181592
utils_size=4393102


Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Empty line.

@hovercats

Copy link
Copy Markdown
Contributor Author

Fixed and pushed. Thanks for pointing that out.

this also made it impossible to include utils, because stat would just error out, thus deactivating their inclusion into conty.
… use all cores/threads, unless otherwise specified. Users might also already have set MAKEFLAGS on their system, and using nproc in this manner will override this.

also; sbase/ubase does not have nproc command
…CXX to clang if avilable instead of forcing it
@Kron4ek Kron4ek merged commit f1f748b into Kron4ek:master Jun 12, 2026
hovercats added a commit to hovercats/Conty that referenced this pull request Jun 12, 2026
* enter-chroot.sh: follow the same mount flags as create-arch-bootstrap.sh to allow compability with ubase

* mounting /dev twice is redundant

* enter-chroot.sh: ubase umount does not have -R flag.

* conty-start.sh: use `-l` flag when lazy unmounting.
ubase umount does not have `--lazy` flag.

* workaround leftover `sed -i` usage I missed earlier

* create-conty.sh: pipe gzip into tar when unpacking utils tarballs. this avoids issues with tar implementations that lacks gzip support

* create-utils.sh: split tar usage for gzip and bzip2 to avoid issues with tar implementations without support for gzip/bzip2

* be consistent about how we unmount $bootstrap

* add bootstrap tarball and sha256sums.txt to .gitignore

* workaround for `stat -c` flag. sbase stat does not have this flag.
this also made it impossible to include utils, because stat would just error out, thus deactivating their inclusion into conty.

* using nproc is not neccessary when calling make, make will by default use all cores/threads, unless otherwise specified. Users might also already have set MAKEFLAGS on their system, and using nproc in this manner will override this.

also; sbase/ubase does not have nproc command

* clang might not be available on all systems, make a switch to set CC/CXX to clang if avilable instead of forcing it
@hovercats hovercats deleted the oasis branch June 12, 2026 22:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants