From 3eccd7b68c1bd1553b5d2389f751e7f2ce72a5db Mon Sep 17 00:00:00 2001 From: ashraffouda Date: Tue, 14 Jul 2026 14:00:43 +0200 Subject: [PATCH] Rename module path zos4 -> zos_light (own identity) zos_light wrongly declared module github.com/threefoldtech/zos4 (a copy-paste leftover from when zos_v4 was forked from zoslight), colliding with zos_v4 and resolving to the wrong repo. Rename to github.com/threefoldtech/zos_light so it has a valid, importable, unambiguous module identity. Builds; zos_base stays v1.1.1. Companion to zos_v4#34 (which took the zos4 -> zos_v4 rename). Co-Authored-By: Claude Opus 4.8 (1M context) --- CONTRIBUTING.md | 6 +++--- VALUES.md | 2 +- cmds/Makefile | 2 +- cmds/zos/main.go | 24 ++++++++++++------------ go.mod | 2 +- specs/upgrade.md | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a75f5d82..e570ba6c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -40,8 +40,8 @@ exact code change can help focus discussions, so the choice is up to you. ## Setting up a development environment -Check out the [documentation](https://github.com/threefoldtech/zos4/tree/master/docs) learn about the code -base and setting up your [development environment](https://github.com/threefoldtech/zos4/blob/master/qemu/README.md). +Check out the [documentation](https://github.com/threefoldtech/zos_light/tree/master/docs) learn about the code +base and setting up your [development environment](https://github.com/threefoldtech/zos_light/blob/master/qemu/README.md). ## Pull requests @@ -74,7 +74,7 @@ pull requests. ## Issues -[GitHub issues](https://github.com/threefoldtech/zos4/issues/new) can be used to report bugs or submit feature requests. +[GitHub issues](https://github.com/threefoldtech/zos_light/issues/new) can be used to report bugs or submit feature requests. When reporting a bug please include the following key pieces of information: diff --git a/VALUES.md b/VALUES.md index 9b013a08..95b3d07b 100644 --- a/VALUES.md +++ b/VALUES.md @@ -20,7 +20,7 @@ values we hold as a team: personally. Consider other people’s perspectives. Empathize with our users. Focus on the specific issue at hand, and remember that we all care about the project, first and foremost. - - [GitHub issues](https://github.com/threefoldtech/zos4/issues/new), + - [GitHub issues](https://github.com/threefoldtech/zos_light/issues/new), document comments, or meetings are often better and higher bandwidth ways to communicate complex and nuanced design issues, as opposed to protracted heated live chats. diff --git a/cmds/Makefile b/cmds/Makefile index 96123152..c1c06c93 100644 --- a/cmds/Makefile +++ b/cmds/Makefile @@ -2,7 +2,7 @@ OUT = $(shell realpath -m ../bin) branch = $(shell git symbolic-ref -q --short HEAD || git describe --tags --exact-match) revision = $(shell git rev-parse HEAD) dirty = $(shell test -n "`git diff --shortstat 2> /dev/null | tail -n1`" && echo "*") -version = github.com/threefoldtech/zos4/pkg/version +version = github.com/threefoldtech/zos_light/pkg/version ldflags = '-w -s -X $(version).Branch=$(branch) -X $(version).Revision=$(revision) -X $(version).Dirty=$(dirty) -extldflags "-static"' all: identityd internet zos diff --git a/cmds/zos/main.go b/cmds/zos/main.go index d7754aea..053ab3af 100644 --- a/cmds/zos/main.go +++ b/cmds/zos/main.go @@ -7,20 +7,20 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - apigateway "github.com/threefoldtech/zos4/cmds/modules/api_gateway" - "github.com/threefoldtech/zos4/cmds/modules/contd" - "github.com/threefoldtech/zos4/cmds/modules/flistd" - "github.com/threefoldtech/zos4/cmds/modules/gateway" - "github.com/threefoldtech/zos4/cmds/modules/netlightd" - "github.com/threefoldtech/zos4/cmds/modules/noded" - "github.com/threefoldtech/zos4/cmds/modules/powerd" - "github.com/threefoldtech/zos4/cmds/modules/provisiond" - "github.com/threefoldtech/zos4/cmds/modules/storaged" - "github.com/threefoldtech/zos4/cmds/modules/vmd" - "github.com/threefoldtech/zos4/cmds/modules/zbusdebug" - "github.com/threefoldtech/zos4/cmds/modules/zui" "github.com/threefoldtech/zos_base/pkg/app" "github.com/threefoldtech/zos_base/pkg/version" + apigateway "github.com/threefoldtech/zos_light/cmds/modules/api_gateway" + "github.com/threefoldtech/zos_light/cmds/modules/contd" + "github.com/threefoldtech/zos_light/cmds/modules/flistd" + "github.com/threefoldtech/zos_light/cmds/modules/gateway" + "github.com/threefoldtech/zos_light/cmds/modules/netlightd" + "github.com/threefoldtech/zos_light/cmds/modules/noded" + "github.com/threefoldtech/zos_light/cmds/modules/powerd" + "github.com/threefoldtech/zos_light/cmds/modules/provisiond" + "github.com/threefoldtech/zos_light/cmds/modules/storaged" + "github.com/threefoldtech/zos_light/cmds/modules/vmd" + "github.com/threefoldtech/zos_light/cmds/modules/zbusdebug" + "github.com/threefoldtech/zos_light/cmds/modules/zui" "github.com/urfave/cli/v2" ) diff --git a/go.mod b/go.mod index 96c30238..42fc9628 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/threefoldtech/zos4 +module github.com/threefoldtech/zos_light go 1.25.0 diff --git a/specs/upgrade.md b/specs/upgrade.md index 74daceb0..fe150576 100644 --- a/specs/upgrade.md +++ b/specs/upgrade.md @@ -8,7 +8,7 @@ The purpose of this document is to discuss how zos should do the following: ## Current status is - We have a single 0-OS image that is updated manually by triggering a new build whenever we feel like it -- The live-upgrading is done using upgraded ([see doc](https://github.com/threefoldtech/zos4/tree/master/docs/upgrade)) and we have a development version of the "upgrade server" at https://versions.dev.grid.tf. This server list all the available version and detail of the flist to use to apply the upgrade +- The live-upgrading is done using upgraded ([see doc](https://github.com/threefoldtech/zos_light/tree/master/docs/upgrade)) and we have a development version of the "upgrade server" at https://versions.dev.grid.tf. This server list all the available version and detail of the flist to use to apply the upgrade Now with what we have at the moment there is already multiple issues: 1. there is no synchronization between the version publish for upgraded and the 0-OS images