Commit Graph

387 Commits

Author SHA1 Message Date
Red Bear OS a1bc3ff0f4 installer: Cargo.lock regenerated for upstream merge 2026-07-11 13:17:35 +03:00
Red Bear OS cefd7b3689 installer: regenerate Cargo.lock after upstream merge 2026-07-11 12:29:10 +03:00
Red Bear OS 6a37761695 Merge remote-tracking branch 'upstream/master' into installer-0.2.42-rb1
# Conflicts:
#	Cargo.lock
#	Cargo.toml
2026-07-11 11:33:14 +03:00
Red Bear OS 87fb1cb463 0.3.1: bump version suffix to +rb0.3.1 2026-07-11 11:22:32 +03:00
Jeremy Soller 05bf2eb429 Merge branch 'syscall-update' into 'master'
Update redox-syscall

See merge request redox-os/installer!84
2026-07-09 10:47:24 -06:00
Wildan M d96c9f82fe Update redox-syscall 2026-07-09 22:24:03 +07:00
Red Bear OS 6afa6e5035 0.3.0: refresh Cargo.lock for +rb0.3.0 local forks 2026-07-06 20:41:33 +03:00
vasilito 3559b6b969 0.3.0: bump version suffix to +rb0.3.0 2026-07-06 19:47:22 +03:00
Red Bear OS d90f84883e fix: use local path deps for redox_syscall, redoxfs, libredox 2026-07-05 23:54:35 +03:00
Red Bear OS e604868baf version: use +rb0.2.5 build metadata instead of -rb0.2.5 pre-release
Semver pre-release suffix (-rb0.2.5) breaks Cargo's [patch.crates-io]
matching for transitive deps. Build metadata (+rb0.2.5) is semver-
compatible: ^0.9.0 matches 0.9.0+rb0.2.5, patch redirection works,
and the Red Bear suffix is still visible in the version string.
2026-07-05 09:16:12 +03:00
Red Bear OS 386b19566d fork: add Red Bear author attribution to Cargo.toml 2026-07-05 08:48:16 +03:00
vasilito 4591fbabcc fork: rebased onto upstream 0.2.42 with Red Bear additions
This rebases the local installer fork onto upstream 0.2.42
(commit ed6013c295) and reapplies
the documented Red Bear OS additions from the local state.

  * Cargo.toml: bumped version to 0.2.42-rb1 per the no-fake-version-
    label policy. Also bumped dep versions (libc 0.2.70 -> with
    optional, pkgar 0.2 -> 0.2.2, redox-pkg 0.3 -> 0.3.1, ring with
    optional, libredox with optional) so the build matches the local
    fork ecosystem.

  * src/installer.rs: integrate the collision detection Red Bear
    added in Phase J. The installer now aborts on init-service file
    collisions (e.g. /usr/lib/init.d/ vs /etc/init.d/) and prints
    a clear error pointing to the local docs.

  * src/lib.rs: declare the collision module and re-export the
    CollisionDetector.

  * src/config/package.rs: extend PackageConfig with PartialEq so
    the new package-groups feature (added in commit e45ce4d) can
    compare configs.

  * src/bin/installer.rs, src/bin/installer_tui.rs: expose the
    --strict-collision / REDBEAR_STRICT_COLLISION env var to
    optionally make non-critical file collisions fatal.

  * gui/: new redox_installer_gui binary — the TUI installer. This
    is the new binary added in Red Bear OS Phase 3 and lives in
    local/patches/installer/0001-redbear-os-additions.patch as a
    documented Red Bear addition.

The previous redox.patch in local/patches/installer/ is removed
and replaced with this regenerated 0001-redbear-os-additions.patch
that applies cleanly with --fuzz=0 to upstream 0.2.42.

Verified by local/scripts/verify-fork-versions.sh: the local
installer-0.2.42-rb1 branch source content matches upstream 0.2.42
plus this single documented patch.
2026-07-05 05:57:10 +03:00
Jeremy Soller d195096aef Merge branch 'gui-fix' into 'master'
Fix build GUI and add CI check

See merge request redox-os/installer!83
2026-07-04 07:01:26 -06:00
Jeremy Soller e249630e51 Merge branch 'linux' into 'master'
gui: Implement sudo for linux

See merge request redox-os/installer!82
2026-07-03 06:06:30 -06:00
Wildan M 5b2f2ecd53 Fix build GUI and add CI check 2026-07-03 14:59:57 +07:00
Wildan M 3b4fd843a4 Update res config 2026-07-02 22:23:35 +07:00
Wildan M 227606752d Use builtin bytes format string 2026-06-16 14:48:13 +07:00
Wildan M 7166bee750 Implement sudo for linux 2026-06-16 14:02:40 +07:00
Wildan M fcdc88ded7 gui: Update libscosmic 2026-06-16 13:37:43 +07:00
Jeremy Soller 142b2d639e Merge branch 'fix/os-release-build-metadata' into 'master'
Added cookbook commit hash for /etc/os-release

Closes redox#1813

See merge request redox-os/installer!81
2026-05-27 05:22:01 -06:00
Frank Li e1b20c59c4 Added cookbook commit hash for /etc/os-release 2026-05-27 05:22:01 -06:00
Jeremy Soller 847dca49c8 Merge branch 'add-files-append' into 'master'
Add append support for filesystem files

Closes redox#1700

See merge request redox-os/installer!80
2026-05-21 06:44:21 -06:00
Ziwen Li(Frank) be3e5097bc Add append support for filesystem files 2026-05-21 12:23:49 +12:00
Jeremy Soller 948bfdcce9 Merge branch 'installer-merge' into 'master'
Installer merge, update winit

See merge request redox-os/installer!79
2026-04-18 06:57:31 -06:00
Wildan M c867ae1528 Update winit and installer 2026-04-18 05:05:35 +07:00
Wildan M 6ec7747b71 Merge commit '88143858c780c144f1fc08c5adbb696e94979a92' into installer-merge 2026-04-18 04:54:21 +07:00
Wildan M 88143858c7 Move to gui subdirectory 2026-04-18 04:51:00 +07:00
Jeremy Soller bac755f440 Merge branch 'update-deps' into 'main'
Update dependencies, Add a hint to run with sudo

See merge request redox-os/installer-gui!2
2026-04-11 06:40:53 -06:00
Wildan M aab8c5f5ea Add a hint to run with sudo 2026-04-11 07:00:57 +07:00
Wildan M 4ee2101d01 Update dependencies 2026-04-11 06:59:51 +07:00
Jeremy Soller 1c2534e44c Merge branch 'bump-deps' into 'master'
Update cargo versions

See merge request redox-os/installer!78
2026-03-30 10:59:09 -06:00
Wildan M a9d6a925e8 Update cargo versions 2026-03-30 21:44:17 +07:00
Jeremy Soller 0ace1223e4 Merge branch 'wrap-inst-feature' into 'master'
Wrap more deps behind installer feature

See merge request redox-os/installer!77
2026-03-19 08:25:52 -06:00
Wildan M 49f8f74125 Wrap more deps behind installer feature 2026-03-19 17:15:05 +07:00
Jeremy Soller ed6013c295 Merge branch 'bump-argon' into 'master'
Bump argon deps

See merge request redox-os/installer!76
2026-03-17 05:46:41 -06:00
Wildan M e79c1be43e Bump argon deps 2026-03-16 21:27:44 +07:00
Jeremy Soller b5b9bfd825 Merge branch 'bump-ver' into 'master'
Bump redox_syscall and version

See merge request redox-os/installer!75
2026-03-15 13:23:48 -06:00
Wildan M 8c2b0f9de7 Bump redox_syscall and version 2026-03-15 18:44:08 +07:00
Jeremy Soller 9800eac87c Merge branch 'misc_changes2' into 'master'
Make arg_parser non-optional

See merge request redox-os/installer!74
2026-03-11 14:42:10 -06:00
bjorn3 e61506c50f Make arg_parser non-optional
It is used by a Debug impl in the config code.
2026-03-11 21:01:48 +01:00
Jeremy Soller b29021c352 Merge branch 'misc_changes' into 'master'
Misc changes

See merge request redox-os/installer!73
2026-03-11 14:00:12 -06:00
bjorn3 474ff08431 Fix bootloader location 2026-03-11 20:53:46 +01:00
bjorn3 f691afabab Fix usage message 2026-03-11 20:31:03 +01:00
bjorn3 f74e3fad19 Make home directories 700 instead of 777 2026-03-11 20:12:40 +01:00
Jeremy Soller 3ef2cac56d Merge branch 'new-pkg' into 'master'
Update pkg to use new API

See merge request redox-os/installer!72
2026-03-08 13:25:42 -06:00
Wildan M aa9c978f90 Resolve ring dependency 2026-03-08 21:04:32 +07:00
Wildan M a6fd457652 Update pkg to use new API 2026-03-08 20:53:33 +07:00
Jeremy Soller 7806f87c56 Merge branch 'move_bootloader_to_user' into 'master'
Bootloader is now stored in /usr/lib/boot

See merge request redox-os/installer!71
2026-03-07 08:36:04 -07:00
bjorn3 70b8cb0e37 Bootloader is now stored in /usr/lib/boot 2026-03-07 16:30:35 +01:00
Jeremy Soller 397974cb68 Workaround for existing symlinks by overwriting them 2026-03-04 11:18:14 -07:00