From c8c07c711bd923748408d35111ab3c2efe78015c Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 25 Aug 2025 08:10:55 -0600 Subject: [PATCH 01/29] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index fc48fb9cf..6e527b435 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit fc48fb9cf460833a91d0fd76911b39c1ef9d57bf +Subproject commit 6e527b4350a0d02993d04e95e32f040cf5a32c72 From 947bd9de6d16e91e7a02078b4e40e91922ce4516 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 25 Aug 2025 15:51:57 -0600 Subject: [PATCH 02/29] Add rustconf 2025 image and update cookbook --- config/x86_64/rustconf2025.toml | 13 +++++++++++++ cookbook | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 config/x86_64/rustconf2025.toml diff --git a/config/x86_64/rustconf2025.toml b/config/x86_64/rustconf2025.toml new file mode 100644 index 000000000..b9e74c0ab --- /dev/null +++ b/config/x86_64/rustconf2025.toml @@ -0,0 +1,13 @@ +# Configuration for demonstration + +include = ["demo.toml"] + +# General settings +[general] +# Filesystem size in MiB +filesystem_size = 1536 + +# Package settings +[packages] +cosmic-reader = {} +rustconf2025 = {} diff --git a/cookbook b/cookbook index 6e527b435..64d98ed78 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 6e527b4350a0d02993d04e95e32f040cf5a32c72 +Subproject commit 64d98ed781780580d2c7e0d15ed58b4c14366760 From ccc94d8c2c8f14d63aaefd5ad53bef8bba4ae5d0 Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Tue, 26 Aug 2025 12:10:26 +0000 Subject: [PATCH 03/29] Avoid installing rustdoc --- podman/rustinstall.sh | 2 +- rust-toolchain.toml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/podman/rustinstall.sh b/podman/rustinstall.sh index 3cdd68643..3730d04db 100755 --- a/podman/rustinstall.sh +++ b/podman/rustinstall.sh @@ -3,7 +3,7 @@ # This script install the Rust toolchain and the build system dependencies # in Podman after the image has been built -curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable +curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable --profile minimal curl -sSLf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash cargo +stable binstall --no-confirm --force --version 0.10.0 sccache diff --git a/rust-toolchain.toml b/rust-toolchain.toml index e34f9fb80..65eb22714 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,4 @@ [toolchain] channel = "nightly-2025-01-12" -components = ["rust-src"] +components = ["rust-src", "rustfmt", "clippy"] +profile = "minimal" From 04a0dafcad86e4ef2bb76ab5de3b2dc9f0a2b3c3 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 28 Aug 2025 09:52:11 -0600 Subject: [PATCH 04/29] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 64d98ed78..b3515e03a 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 64d98ed781780580d2c7e0d15ed58b4c14366760 +Subproject commit b3515e03afa9709aeec4aeb1eb907838ea07771e From fabd08c9de71c970e18d7b45f7a85c5da9489ca0 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 28 Aug 2025 13:25:36 -0600 Subject: [PATCH 05/29] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index b3515e03a..d7eb18224 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit b3515e03afa9709aeec4aeb1eb907838ea07771e +Subproject commit d7eb182249e828b74b6455fc7a42945c6f9ebc7e From 10fbdef68917d76ea04b94ae8f7c33dc13a34587 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 28 Aug 2025 13:50:10 -0600 Subject: [PATCH 06/29] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index d7eb18224..4f3b3288c 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit d7eb182249e828b74b6455fc7a42945c6f9ebc7e +Subproject commit 4f3b3288c328bf838c4b120142a97c932027bf67 From 242e8d5b3fbee7c23611828fed9e58f09df1d276 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Sat, 30 Aug 2025 16:56:01 -0300 Subject: [PATCH 07/29] Fix and improve GitLab issue filters in CONTRIBUTING.md --- CONTRIBUTING.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e34370b6a..9a8b8dc1f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -135,7 +135,9 @@ If you don't know how to code in Rust, but know other programming languages: If you know how to code in Rust, but don't know operating system development: -- Look for issues labeled "good first issue", "easy", and/or "help wanted", e.g. [this GitLab filter](https://gitlab.redox-os.org/groups/redox-os/-/issues/?sort=updated_desc&state=opened&or%5Blabel_name%5D%5B%5D=good%20first%20issue&or%5Blabel_name%5D%5B%5D=Easy&or%5Blabel_name%5D%5B%5D=easy&or%5Blabel_name%5D%5B%5D=help%20wanted&first_page_size=20]). Worth noting the skill level varies between projects, but a large subset of these should be approachable by contributors familiar with regular Rust/Unix application programming. +- See the [easy](https://gitlab.redox-os.org/groups/redox-os/-/issues/?label_name[]=easy) issues +- See the "[good first issue](https://gitlab.redox-os.org/groups/redox-os/-/issues/?label_name[]=good%20first%20issue)" issues +- See the [help wanted](https://gitlab.redox-os.org/groups/redox-os/-/issues/?label_name[]=help%20wanted) issues (it's worth noting the skill level varies between projects, but a large subset of these should be approachable by contributors familiar with regular Rust/Unix application programming) - Improve the package manager, or other meta-tools like `redoxer` or `installer` - Improve the [Ion](https://gitlab.redox-os.org/redox-os/ion) shell, or other high-level or mid-level projects - Port Rust programs to Redox, possibly including dependencies, and C library extensions if necessary (also look for issues with the `port` label) @@ -163,10 +165,10 @@ For those who want to contribute to the Redox GUI, our GUI strategy has recently You can use the following GitLab label filters to know our development priorities on the moment: -- [Critical](https://gitlab.redox-os.org/redox-os/redox/-/issues/?sort=created_date&state=opened&label_name%5B%5D=critical&first_page_size=20) -- [High-priority](https://gitlab.redox-os.org/redox-os/redox/-/issues/?sort=created_date&state=opened&label_name%5B%5D=high-priority&first_page_size=20) -- [Medium-priority](https://gitlab.redox-os.org/redox-os/redox/-/issues/?sort=created_date&state=opened&label_name%5B%5D=medium-priority&first_page_size=20) -- [Low-priority](https://gitlab.redox-os.org/redox-os/redox/-/issues/?sort=created_date&state=opened&label_name%5B%5D=low-priority&first_page_size=20) +- [Critical](https://gitlab.redox-os.org/groups/redox-os/-/issues/?label_name[]=critical) +- [High-priority](https://gitlab.redox-os.org/groups/redox-os/-/issues/?label_name[]=high-priority) +- [Medium-priority](https://gitlab.redox-os.org/groups/redox-os/-/issues/?label_name[]=medium-priority) +- [Low-priority](https://gitlab.redox-os.org/groups/redox-os/-/issues/?label_name[]=low-priority) ## RFCs From f469e9f34a696672dfccbb6daf7d84ee85262594 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Sat, 30 Aug 2025 17:03:42 -0300 Subject: [PATCH 08/29] Improve the issue documentation in CONTRIBUTING.md --- CONTRIBUTING.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9a8b8dc1f..427fd5123 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -81,12 +81,14 @@ Once your GitLab account is created, you should add your Matrix or Discord usern ### Issues -To know how to create issues on the Redox GitLab, read the [Filing Issues](https://doc.redox-os.org/book/filing-issues.html) page. +We use issues to organize and track our current and pending work, to know how to create issues on the Redox GitLab read the [Filing Issues](https://doc.redox-os.org/book/filing-issues.html) page. Once you create an issue don't forget to post the link on the Dev or Support rooms of the chat, because the GitLab email notifications have distractions (service messages or spam) and most developers don't left their GitLab pages open to receive desktop notifications from the web browser (which require a custom setting to receive issue notifications). By doing this you help us to pay attention to your issues and avoid them to be accidentally forgotten. +You can see all issues on [this](https://gitlab.redox-os.org/groups/redox-os/-/issues) link. + ### Pull Requests Please follow [our process](https://doc.redox-os.org/book/creating-proper-pull-requests.html) for creating proper pull requests. From c1fabe9c8f545ce911b63d97772b383f8cdf8509 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 2 Sep 2025 07:45:11 -0600 Subject: [PATCH 09/29] Update jeremy config --- config/x86_64/jeremy.toml | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/config/x86_64/jeremy.toml b/config/x86_64/jeremy.toml index f7b653bff..20d19949a 100644 --- a/config/x86_64/jeremy.toml +++ b/config/x86_64/jeremy.toml @@ -10,31 +10,40 @@ filesystem_size = 8192 # Package settings [packages] # apps -#boxedwine = {} # not building +#boxedwine = {} +cosmic-player = {} +cosmic-reader = {} +#cosmic-settings = {} # requires recvmsg/sendmsg +cosmic-store = {} cosmic-term = {} cosmic-text = {} periodictable = {} pixelcannon = {} +qemu = {} schismtracker = {} sodium = {} # cli acid = {} cleye = {} +curl = {} ffmpeg6 = {} +git = {} gnu-grep = {} lua54 = {} nano = {} -nushell = {} +#nushell = {} perg = {} -relibc-tests = {} +#relibc-tests = {} ripgrep = {} +russh = {} sed = {} shellharden = {} +vim = {} xz = {} # demos -cairodemo = {} +#cairodemo = {} #cmatrix = {} # addwstr cpal = {} gears = {} @@ -47,11 +56,11 @@ osdemo = {} # does not show anything #pathfinder = {} # not building procedural-wallpapers-rs = {} rodioplay = {} -rust-cairo = {} -rust-cairo-demo = {} +#rust-cairo = {} +#rust-cairo-demo = {} sdl2-gears = {} vttest = {} -webrender = {} +#webrender = {} winit = {} # dev @@ -64,16 +73,18 @@ gnu-make = {} nasm = {} patch = {} pkg-config = {} -rust = {} -rustpython = {} +#rust = {} +#rustpython = {} # games devilutionx = {} dosbox = {} eduke32 = {} flycast = {} +freeciv = {} freedoom = {} gigalomania = {} +love = {} mednafen = {} mgba = {} neverball = {} @@ -84,6 +95,7 @@ openttd-opengfx = {} openttd-openmsx = {} openttd-opensfx = {} prboom = {} +quakespasm = {} redox-games = {} #retroarch = {} # need to package cores rs-nes = {} # need game for testing @@ -93,7 +105,7 @@ scummvm = {} # need game for testing sm64ex = {} sopwith = {} spacecadetpinball = {} -syobonaction = {} +#syobonaction = {} #vice = {} # broken on new toolchain #vvvvvv = {} # cannot find -lgcc_s @@ -104,5 +116,6 @@ intel-one-mono = {} jeremy = {} libc-bench = {} noto-color-emoji = {} +terminfo = {} timidity = {} ttf-hack = {} From 3952e17416f5d32cde8b24194ec5ed793033ec59 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 2 Sep 2025 07:47:16 -0600 Subject: [PATCH 10/29] Build jeremy config on top of demo config --- config/x86_64/jeremy.toml | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/config/x86_64/jeremy.toml b/config/x86_64/jeremy.toml index 20d19949a..c1a4e45b5 100644 --- a/config/x86_64/jeremy.toml +++ b/config/x86_64/jeremy.toml @@ -1,6 +1,6 @@ # Configuration for Jeremy Soller -include = ["../desktop.toml"] +include = ["../demo.toml"] # General settings [general] @@ -17,29 +17,20 @@ cosmic-reader = {} cosmic-store = {} cosmic-term = {} cosmic-text = {} -periodictable = {} -pixelcannon = {} qemu = {} schismtracker = {} -sodium = {} # cli -acid = {} cleye = {} -curl = {} ffmpeg6 = {} -git = {} -gnu-grep = {} lua54 = {} nano = {} #nushell = {} perg = {} #relibc-tests = {} -ripgrep = {} russh = {} sed = {} shellharden = {} -vim = {} xz = {} # demos @@ -51,11 +42,9 @@ glutin = {} #hematite = {} # not building iced = {} libcosmic = {} -orbclient = {} osdemo = {} # does not show anything #pathfinder = {} # not building procedural-wallpapers-rs = {} -rodioplay = {} #rust-cairo = {} #rust-cairo-demo = {} sdl2-gears = {} @@ -78,44 +67,35 @@ pkg-config = {} # games devilutionx = {} -dosbox = {} eduke32 = {} flycast = {} freeciv = {} -freedoom = {} gigalomania = {} love = {} mednafen = {} mgba = {} -neverball = {} openjazz = {} openjk = {} openttd = {} openttd-opengfx = {} openttd-openmsx = {} openttd-opensfx = {} -prboom = {} quakespasm = {} -redox-games = {} #retroarch = {} # need to package cores rs-nes = {} # need game for testing rust64 = {} # need roms rustual-boy = {} # need game for testing scummvm = {} # need game for testing sm64ex = {} -sopwith = {} spacecadetpinball = {} #syobonaction = {} #vice = {} # broken on new toolchain #vvvvvv = {} # cannot find -lgcc_s # stuff -freepats = {} generaluser-gs = {} -intel-one-mono = {} jeremy = {} libc-bench = {} noto-color-emoji = {} -terminfo = {} timidity = {} ttf-hack = {} From a521b5fc8c6bedc44c5fd87eb5be5fa10039d9ef Mon Sep 17 00:00:00 2001 From: Wildan M Date: Thu, 4 Sep 2025 23:37:38 +0700 Subject: [PATCH 11/29] Add push recipe to existing image --- mk/config.mk | 1 + mk/disk.mk | 26 +++++++++++++------------- mk/repo.mk | 28 ++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 13 deletions(-) diff --git a/mk/config.mk b/mk/config.mk index 121e80577..e625b1a57 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -109,6 +109,7 @@ else export GNU_TARGET=$(TARGET) endif BUILD=build/$(ARCH)/$(CONFIG_NAME) +MOUNT_DIR=$(BUILD)/filesystem HOST_FSTOOLS=build/fstools INSTALLER=$(HOST_FSTOOLS)/bin/redox_installer INSTALLER_OPTS= diff --git a/mk/disk.mk b/mk/disk.mk index c26d9a6cb..268c7809c 100644 --- a/mk/disk.mk +++ b/mk/disk.mk @@ -27,8 +27,8 @@ $(BUILD)/redox-live.iso: $(HOST_FSTOOLS) $(REPO_TAG) redox.ipxe $(BUILD)/filesystem.img: $(HOST_FSTOOLS) $(REPO_TAG) mkdir -p $(BUILD) - -$(FUMOUNT) $(BUILD)/filesystem/ || true - rm -rf $@ $@.partial $(BUILD)/filesystem/ + -$(FUMOUNT) $(MOUNT_DIR) || true + rm -rf $@ $@.partial $(MOUNT_DIR) -$(FUMOUNT) /tmp/redox_installer || true FILESYSTEM_SIZE=$(FILESYSTEM_SIZE) && \ if [ -z "$$FILESYSTEM_SIZE" ] ; then \ @@ -36,30 +36,30 @@ $(BUILD)/filesystem.img: $(HOST_FSTOOLS) $(REPO_TAG) fi && \ truncate -s "$$FILESYSTEM_SIZE"m $@.partial $(REDOXFS_MKFS) $(REDOXFS_MKFS_FLAGS) $@.partial - mkdir -p $(BUILD)/filesystem/ - $(REDOXFS) $@.partial $(BUILD)/filesystem/ + mkdir -p $(MOUNT_DIR) + $(REDOXFS) $@.partial $(MOUNT_DIR) sleep 1 pgrep redoxfs - umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) $(BUILD)/filesystem/ + umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) $(MOUNT_DIR) sync - -$(FUMOUNT) $(BUILD)/filesystem/ || true - rm -rf $(BUILD)/filesystem/ + -$(FUMOUNT) $(MOUNT_DIR) || true + rm -rf $(MOUNT_DIR) mv $@.partial $@ mount: $(HOST_FSTOOLS) FORCE - mkdir -p $(BUILD)/filesystem/ - $(REDOXFS) $(BUILD)/harddrive.img $(BUILD)/filesystem/ + mkdir -p $(MOUNT_DIR) + $(REDOXFS) $(BUILD)/harddrive.img $(MOUNT_DIR) sleep 2 pgrep redoxfs mount_extra: $(HOST_FSTOOLS) FORCE - mkdir -p $(BUILD)/filesystem/ - $(REDOXFS) $(BUILD)/extra.img $(BUILD)/filesystem/ + mkdir -p $(MOUNT_DIR) + $(REDOXFS) $(BUILD)/extra.img $(MOUNT_DIR) sleep 2 pgrep redoxfs unmount: FORCE sync - -$(FUMOUNT) $(BUILD)/filesystem/ || true - rm -rf $(BUILD)/filesystem/ + -$(FUMOUNT) $(MOUNT_DIR) || true + rm -rf $(MOUNT_DIR) -$(FUMOUNT) /tmp/redox_installer || true diff --git a/mk/repo.mk b/mk/repo.mk index d8f232d81..dedf72bbe 100644 --- a/mk/repo.mk +++ b/mk/repo.mk @@ -87,6 +87,34 @@ else fi endif +MOUNTED_TAG=$(MOUNT_DIR)~ + +# Push compiled package into existing image +# DO NOT RUN THIS WHILE QEMU ALIVE, THE DISK MIGHT CORRUPT IN DOING SO +p.%: $(FSTOOLS_TAG) FORCE + @rm -f $(MOUNTED_TAG) + @if [ ! -d "$(MOUNT_DIR)" ]; then \ + $(MAKE) mount; \ + touch $(MOUNTED_TAG); \ + fi +ifeq ($(PODMAN_BUILD),1) + $(PODMAN_RUN) make $@ +else + @if echo "$*" | grep -q ','; then \ + $(MAKE) $(foreach f,$(subst $(comma), ,$*),p.$(f)); \ + else \ + export RECIPE_PATH=cookbook/$(shell make find.$* | grep ^recipes) && \ + export RECIPE_STAGE=$$RECIPE_PATH/target/$(TARGET)/stage.pkgar && \ + ./cookbook/pkgar/target/release/pkgar extract $(MOUNT_DIR)/ --archive $$RECIPE_STAGE \ + --pkey ./cookbook/build/id_ed25519.pub.toml && \ + echo "extracted $$RECIPE_PATH"; \ + fi +endif + @if [ -f $(MOUNTED_TAG) ]; then \ + $(MAKE) unmount; && rm -f $(MOUNTED_TAG); \ + else echo "Not unmounting by ourself, don't forget to do it"; \ + fi + # Invoke unfetch.sh for one or more targets separated by comma u.%: $(FSTOOLS_TAG) FORCE ifeq ($(PODMAN_BUILD),1) From cedf58ed5de03ea95a7c840c56af346627e1cebe Mon Sep 17 00:00:00 2001 From: Wildan M Date: Fri, 5 Sep 2025 16:57:21 +0700 Subject: [PATCH 12/29] Fix typo --- mk/repo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/repo.mk b/mk/repo.mk index dedf72bbe..77bb7f29f 100644 --- a/mk/repo.mk +++ b/mk/repo.mk @@ -111,7 +111,7 @@ else fi endif @if [ -f $(MOUNTED_TAG) ]; then \ - $(MAKE) unmount; && rm -f $(MOUNTED_TAG); \ + $(MAKE) unmount && rm -f $(MOUNTED_TAG); \ else echo "Not unmounting by ourself, don't forget to do it"; \ fi From 12a5a00afe5dd95cf127de89c8cc4fda4d0a144c Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Tue, 2 Sep 2025 20:36:09 +0200 Subject: [PATCH 13/29] Only pass recipe name to fetch.sh and repo.sh --- mk/ci.mk | 2 +- mk/repo.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mk/ci.mk b/mk/ci.mk index 109807b1e..0eed1f6dc 100644 --- a/mk/ci.mk +++ b/mk/ci.mk @@ -31,7 +31,7 @@ else $(HOST_CARGO) build --manifest-path installer/Cargo.toml --release export PATH="$(PREFIX_PATH):$$PATH" && \ export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ - PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) -c config/$(ARCH)/ci.toml)" && \ + PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) --short -c config/$(ARCH)/ci.toml)" && \ cd cookbook && \ ./fetch.sh "$${PACKAGES}" && \ ./repo.sh $(REPO_NONSTOP) "$${PACKAGES}" diff --git a/mk/repo.mk b/mk/repo.mk index 77bb7f29f..dfbcacfe4 100644 --- a/mk/repo.mk +++ b/mk/repo.mk @@ -5,7 +5,7 @@ ifeq ($(PODMAN_BUILD),1) $(PODMAN_RUN) make $@ else export PATH="$(PREFIX_PATH):$$PATH" && \ - PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) -c $(FILESYSTEM_CONFIG))" && \ + PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) --short -c $(FILESYSTEM_CONFIG))" && \ export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ cd cookbook && \ ./fetch.sh $(REPO_NONSTOP) $(REPO_OFFLINE) "$${PACKAGES}" @@ -19,7 +19,7 @@ ifeq ($(PODMAN_BUILD),1) else export PATH="$(PREFIX_PATH):$$PATH" && \ export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ - PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) -c $(FILESYSTEM_CONFIG))" && \ + PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) --short -c $(FILESYSTEM_CONFIG))" && \ cd cookbook && \ ./repo.sh $(REPO_NONSTOP) $(REPO_OFFLINE) --with-package-deps "$${PACKAGES}" mkdir -p $(BUILD) From acc8bc59bcaa4b5169d9f603a1f42a8e70e6f7be Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Sat, 6 Sep 2025 15:17:13 +0200 Subject: [PATCH 14/29] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 4f3b3288c..687f4d207 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 4f3b3288c328bf838c4b120142a97c932027bf67 +Subproject commit 687f4d207f174de060b59d087f1b507d93bd24ab From 45c84f477e77b779f40625374f5814c8cd0c85c5 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 7 Sep 2025 12:49:19 -0600 Subject: [PATCH 15/29] Update cookbook and relibc --- cookbook | 2 +- relibc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbook b/cookbook index 687f4d207..00ff0c5ff 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 687f4d207f174de060b59d087f1b507d93bd24ab +Subproject commit 00ff0c5ff92e4fd78378604785b9278e7d26e5a4 diff --git a/relibc b/relibc index fd9a1c966..e291a2527 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit fd9a1c9668c10d122eab9839d0f0f7f4d88703ab +Subproject commit e291a2527a9e0f18703a50880b68310e43780e81 From 03bf1f54da990219aca04b32359ab5c3e23821e7 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 7 Sep 2025 13:36:49 -0600 Subject: [PATCH 16/29] Disable rustpython in i686 desktop --- config/i686/desktop.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/i686/desktop.toml b/config/i686/desktop.toml index ab1670ba4..bb2ae9b81 100644 --- a/config/i686/desktop.toml +++ b/config/i686/desktop.toml @@ -11,4 +11,5 @@ include = ["../desktop.toml"] # Package settings [packages] -# example = {} \ No newline at end of file +# example = {} +rustpython = "ignore" # https://github.com/Alexhuszagh/rust-lexical/issues/218 \ No newline at end of file From da74013fe887b426db8c16ddc1fc6e5faf992d37 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 7 Sep 2025 17:48:01 -0600 Subject: [PATCH 17/29] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 00ff0c5ff..5064d0e02 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 00ff0c5ff92e4fd78378604785b9278e7d26e5a4 +Subproject commit 5064d0e02e4b598262d856bc9626fc556ff80525 From 5d331c7b873e935afe4db5ed684b7c2b0a73412f Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 7 Sep 2025 19:01:41 -0600 Subject: [PATCH 18/29] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 5064d0e02..8e48e7358 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 5064d0e02e4b598262d856bc9626fc556ff80525 +Subproject commit 8e48e735846170c0ad5200a66a89a9c18c758ba0 From c519dda58849949c99a54c3cb2d5e60f0b84ed1a Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 7 Sep 2025 19:05:39 -0600 Subject: [PATCH 19/29] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 8e48e7358..03883bde8 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 8e48e735846170c0ad5200a66a89a9c18c758ba0 +Subproject commit 03883bde8532e5a10ea706dccf40cbd20453477a From 8e2512cc79339fb025ec11dc9b76fee9b8ff56a7 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 7 Sep 2025 20:04:40 -0600 Subject: [PATCH 20/29] Update relibc --- relibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relibc b/relibc index e291a2527..0a13e2574 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit e291a2527a9e0f18703a50880b68310e43780e81 +Subproject commit 0a13e2574fcd29e8109baeeca3fcdaae79d66814 From 462971242a77d98e7e3c9ac213fe84ecfe97de2d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 7 Sep 2025 20:07:48 -0600 Subject: [PATCH 21/29] Normalize riscv64 config with aarch64 --- config/riscv64gc/demo.toml | 36 ++------------------------- config/riscv64gc/desktop-minimal.toml | 29 +++------------------ config/riscv64gc/desktop.toml | 29 +++------------------ config/riscv64gc/jeremy.toml | 36 ++------------------------- config/riscv64gc/server.toml | 6 ++--- 5 files changed, 15 insertions(+), 121 deletions(-) diff --git a/config/riscv64gc/demo.toml b/config/riscv64gc/demo.toml index 7d58679f3..1f6e59b5e 100644 --- a/config/riscv64gc/demo.toml +++ b/config/riscv64gc/demo.toml @@ -1,35 +1,3 @@ -# Minimal network configuration +# Configuration for demonstration -include = ["../minimal-net.toml"] - -# Override the default settings here - -# General settings -[general] -# Filesystem size in MiB -filesystem_size = 256 - -# Package settings -[packages] -orbdata = {} -orbital = {} -orbterm = {} -orbutils-background = {} -orbutils-launcher = {} -orbutils-orblogin = {} - -[[files]] -path = "/usr/lib/init.d/20_orbital" -data = """ -export VT 3 -orbital orblogin launcher -unset VT -""" - -# Override console config to not switch to VT 2 -[[files]] -path = "/usr/lib/init.d/30_console" -data = """ -getty 2 -getty /scheme/debug/no-preserve -J -""" +include = ["desktop.toml"] diff --git a/config/riscv64gc/desktop-minimal.toml b/config/riscv64gc/desktop-minimal.toml index 7d58679f3..d5872d0d6 100644 --- a/config/riscv64gc/desktop-minimal.toml +++ b/config/riscv64gc/desktop-minimal.toml @@ -1,35 +1,14 @@ -# Minimal network configuration +# Minimal desktop configuration -include = ["../minimal-net.toml"] +include = ["../desktop-minimal.toml"] # Override the default settings here # General settings [general] # Filesystem size in MiB -filesystem_size = 256 +# filesystem_size = 1024 # Package settings [packages] -orbdata = {} -orbital = {} -orbterm = {} -orbutils-background = {} -orbutils-launcher = {} -orbutils-orblogin = {} - -[[files]] -path = "/usr/lib/init.d/20_orbital" -data = """ -export VT 3 -orbital orblogin launcher -unset VT -""" - -# Override console config to not switch to VT 2 -[[files]] -path = "/usr/lib/init.d/30_console" -data = """ -getty 2 -getty /scheme/debug/no-preserve -J -""" +# example = {} diff --git a/config/riscv64gc/desktop.toml b/config/riscv64gc/desktop.toml index 7d58679f3..e4e9fa6bc 100644 --- a/config/riscv64gc/desktop.toml +++ b/config/riscv64gc/desktop.toml @@ -1,35 +1,14 @@ -# Minimal network configuration +# Default build system configuration -include = ["../minimal-net.toml"] +include = ["../desktop.toml"] # Override the default settings here # General settings [general] # Filesystem size in MiB -filesystem_size = 256 +# filesystem_size = 1024 # Package settings [packages] -orbdata = {} -orbital = {} -orbterm = {} -orbutils-background = {} -orbutils-launcher = {} -orbutils-orblogin = {} - -[[files]] -path = "/usr/lib/init.d/20_orbital" -data = """ -export VT 3 -orbital orblogin launcher -unset VT -""" - -# Override console config to not switch to VT 2 -[[files]] -path = "/usr/lib/init.d/30_console" -data = """ -getty 2 -getty /scheme/debug/no-preserve -J -""" +# example = {} diff --git a/config/riscv64gc/jeremy.toml b/config/riscv64gc/jeremy.toml index 7d58679f3..f3d8c0abc 100644 --- a/config/riscv64gc/jeremy.toml +++ b/config/riscv64gc/jeremy.toml @@ -1,35 +1,3 @@ -# Minimal network configuration +# Configuration for Jeremy Soller -include = ["../minimal-net.toml"] - -# Override the default settings here - -# General settings -[general] -# Filesystem size in MiB -filesystem_size = 256 - -# Package settings -[packages] -orbdata = {} -orbital = {} -orbterm = {} -orbutils-background = {} -orbutils-launcher = {} -orbutils-orblogin = {} - -[[files]] -path = "/usr/lib/init.d/20_orbital" -data = """ -export VT 3 -orbital orblogin launcher -unset VT -""" - -# Override console config to not switch to VT 2 -[[files]] -path = "/usr/lib/init.d/30_console" -data = """ -getty 2 -getty /scheme/debug/no-preserve -J -""" +include = ["desktop.toml"] diff --git a/config/riscv64gc/server.toml b/config/riscv64gc/server.toml index bcdb3af01..01f518228 100644 --- a/config/riscv64gc/server.toml +++ b/config/riscv64gc/server.toml @@ -1,6 +1,6 @@ -# Minimal network configuration +# Server configuration -include = ["../minimal-net.toml"] +include = ["../server.toml"] # Override the default settings here @@ -11,4 +11,4 @@ include = ["../minimal-net.toml"] # Package settings [packages] -# example = {} \ No newline at end of file +# example = {} From 03a8db9c63c50cbcc49bb02da2d5ec5a376d441a Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 7 Sep 2025 20:20:00 -0600 Subject: [PATCH 22/29] config/server: disable contain recipe --- config/server.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/server.toml b/config/server.toml index 89bc0a4ae..e5dd11790 100644 --- a/config/server.toml +++ b/config/server.toml @@ -11,7 +11,7 @@ filesystem_size = 512 [packages] bash = {} ca-certificates = {} -contain = {} +#contain = {} # needs to update dependencies coreutils = {} curl = {} diffutils = {} From c9317f8217da24b0659910818b14ca1bb8824fd3 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 7 Sep 2025 21:17:29 -0600 Subject: [PATCH 23/29] Update relibc --- relibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relibc b/relibc index 0a13e2574..2f0d5eb97 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 0a13e2574fcd29e8109baeeca3fcdaae79d66814 +Subproject commit 2f0d5eb970337f595128505d1435a1086f998600 From 96a835e10f4d53d7ef21157744929d0128814e9c Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 7 Sep 2025 21:29:10 -0600 Subject: [PATCH 24/29] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 03883bde8..554893f86 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 03883bde8532e5a10ea706dccf40cbd20453477a +Subproject commit 554893f862bba7162bda40e34c39e6e8aad87cae From 5c55e4c858dbca5183aeeb3c0791663e6c7efc14 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 8 Sep 2025 08:03:13 -0600 Subject: [PATCH 25/29] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 554893f86..d601dc2ac 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 554893f862bba7162bda40e34c39e6e8aad87cae +Subproject commit d601dc2acb454b289554ce28b329ddcf1990bfaa From b6bfcdd41fe2bc890698cf28065c72fe260b8005 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 8 Sep 2025 15:02:17 -0600 Subject: [PATCH 26/29] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index d601dc2ac..5c17b6b07 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit d601dc2acb454b289554ce28b329ddcf1990bfaa +Subproject commit 5c17b6b073aa75f4b649f78cf197b0e2f68f4eb7 From 96fe2ea7c3ebdc2d007c74097284e7defaa8eb15 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 8 Sep 2025 15:23:15 -0600 Subject: [PATCH 27/29] Fix include of demo.toml in jeremy.toml --- config/x86_64/jeremy.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/x86_64/jeremy.toml b/config/x86_64/jeremy.toml index c1a4e45b5..931599743 100644 --- a/config/x86_64/jeremy.toml +++ b/config/x86_64/jeremy.toml @@ -1,6 +1,6 @@ # Configuration for Jeremy Soller -include = ["../demo.toml"] +include = ["demo.toml"] # General settings [general] From 94ad661a3051a250e160a947933f432cc442533b Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 8 Sep 2025 15:23:33 -0600 Subject: [PATCH 28/29] Disable netsurf in riscv64gc desktop image --- config/riscv64gc/desktop.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/riscv64gc/desktop.toml b/config/riscv64gc/desktop.toml index e4e9fa6bc..f523e7c23 100644 --- a/config/riscv64gc/desktop.toml +++ b/config/riscv64gc/desktop.toml @@ -12,3 +12,4 @@ include = ["../desktop.toml"] # Package settings [packages] # example = {} +netsurf = "ignore" # liborbital fails to link in due to mismatching float ABI From 3249caf92fed362c5739262898b0dad96a392ab9 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 9 Sep 2025 15:16:32 -0600 Subject: [PATCH 29/29] Ignore rustpython in other i686 configs --- config/i686/demo.toml | 2 ++ config/i686/dev.toml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/config/i686/demo.toml b/config/i686/demo.toml index 4230fc15e..eaaefbf10 100644 --- a/config/i686/demo.toml +++ b/config/i686/demo.toml @@ -9,6 +9,8 @@ filesystem_size = 768 # Package settings [packages] +rustpython = "ignore" # https://github.com/Alexhuszagh/rust-lexical/issues/218 + # Games dosbox = {} freedoom = {} diff --git a/config/i686/dev.toml b/config/i686/dev.toml index ecd30849a..b717059e7 100644 --- a/config/i686/dev.toml +++ b/config/i686/dev.toml @@ -11,4 +11,5 @@ include = ["../dev.toml"] # Package settings [packages] -# example = {} \ No newline at end of file +# example = {} +rustpython = "ignore" # https://github.com/Alexhuszagh/rust-lexical/issues/218 \ No newline at end of file