[PATCH] rename musl submodule to musl_0.9.12 and add new submodule musl_1.1.24

[Waldemar Kozaczuk]

This patch renames existing submodule musl to musl_0.9.12 and adds new
submodule musl_1.1.24 that point to new musl copy repo. It also adds a
symlink musl pointing to musl_0.9.12. These change are aimed to help
us upgrade musl from version 0.9.12 to 1.1.24.

This patch is equivalent of following chain of commands:

```
git submodule deinit musl
git rm musl
git submodule add https://github.com/cloudius-systems/musl musl_0.9.12
pushd musl_0.9.12 && git checkout v0.9.12 && popd && git add musl_0.9.12

ln -s musl_0.9.12/ musl

git submodule add https://github.com/osvunikernel/musl musl_1.1.24
pushd musl_1.1.24 && git checkout v1.1.24 && popd && git add musl_1.1.24
```

and hopefully can be applied as a patch without any manual intervention.

Signed-off-by: Waldemar Kozaczuk <jwkoz...@gmail.com>
---
.gitmodules | 9 ++++++---
musl | 2 +-
musl => musl_0.9.12 | 0
musl_1.1.24 | 1 +
4 files changed, 8 insertions(+), 4 deletions(-)
mode change 160000 => 120000 musl
copy musl => musl_0.9.12 (100%)
create mode 160000 musl_1.1.24

diff --git a/.gitmodules b/.gitmodules
index 17a2c18e..f4ff7ebd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,9 +9,12 @@
[submodule "modules/httpserver/swagger-ui"]
path = modules/httpserver-html5-gui/swagger-ui
url = ../../cloudius-systems/swagger-ui.git
-[submodule "musl"]
- path = musl
- url = ../../cloudius-systems/musl.git
[submodule "modules/httpserver/osv-gui"]
path = modules/httpserver-html5-gui/osv-gui
url = ../../cloudius-systems/osv-gui.git
+[submodule "musl_1.1.24"]
+ path = musl_1.1.24
+ url = https://github.com/osvunikernel/musl
+[submodule "musl_0.9.12"]
+ path = musl_0.9.12
+ url = https://github.com/cloudius-systems/musl
diff --git a/musl b/musl
deleted file mode 160000
index 372a948b..00000000
--- a/musl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 372a948b8139c6583045b2cd91b6b91fcb2e5881
diff --git a/musl b/musl
new file mode 120000
index 00000000..f3576a45
--- /dev/null
+++ b/musl
@@ -0,0 +1 @@
+musl_0.9.12/
\ No newline at end of file
diff --git a/musl b/musl_0.9.12
similarity index 100%
copy from musl
copy to musl_0.9.12
diff --git a/musl_1.1.24 b/musl_1.1.24
new file mode 160000
index 00000000..ea9525c8
--- /dev/null
+++ b/musl_1.1.24
@@ -0,0 +1 @@
+Subproject commit ea9525c8bcf6170df59364c4bcd616de1acf8703
--
2.26.2

[Nadav Har'El]

Unfortunately, "git am" didn't really manage to do this. I suggest that you do the manual commands yourself and commit the results directly, instead of trying to send this as a patch.

--
You received this message because you are subscribed to the Google Groups "OSv Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email to osv-dev+u...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/osv-dev/20200921044034.366170-1-jwkozaczuk%40gmail.com.

[Commit Bot]

From: Waldemar Kozaczuk <jwkoz...@gmail.com>
Committer: Waldemar Kozaczuk <jwkoz...@gmail.com>
Branch: master

rename musl submodule to musl_0.9.12 and add new submodule musl_1.1.24

This patch renames existing submodule musl to musl_0.9.12 and adds new

submodule musl_1.1.24 pointing to new musl repo copy. It also adds a
symlink 'musl' pointing to musl_0.9.12. These changes are aimed to help

us upgrade musl from version 0.9.12 to 1.1.24.

This patch is equivalent of following chain of commands:

```
git submodule deinit musl
git rm musl
git submodule add https://github.com/cloudius-systems/musl musl_0.9.12
pushd musl_0.9.12 && git checkout v0.9.12 && popd && git add musl_0.9.12

ln -s musl_0.9.12/ musl

git submodule add https://github.com/osvunikernel/musl musl_1.1.24
pushd musl_1.1.24 && git checkout v1.1.24 && popd && git add musl_1.1.24
```

Signed-off-by: Waldemar Kozaczuk <jwkoz...@gmail.com>

---

diff --git a/.gitmodules b/.gitmodules

--- a/.gitmodules
+++ b/.gitmodules
@@ -9,9 +9,12 @@
[submodule "modules/httpserver/swagger-ui"]
path = modules/httpserver-html5-gui/swagger-ui
url = ../../cloudius-systems/swagger-ui.git
-[submodule "musl"]
- path = musl
- url = ../../cloudius-systems/musl.git
[submodule "modules/httpserver/osv-gui"]
path = modules/httpserver-html5-gui/osv-gui
url = ../../cloudius-systems/osv-gui.git

+[submodule "musl_0.9.12"]
+ path = musl_0.9.12
+ url = https://github.com/cloudius-systems/musl
+[submodule "musl_1.1.24"]
+ path = musl_1.1.24
+ url = https://github.com/osvunikernel/musl

diff --git a/musl b/musl
--- a/musl
+++ b/musl

@@ -1 +0,0 @@
-Subproject commit 372a948b8139c6583045b2cd91b6b91fcb2e5881
diff --git a/musl b/musl

--- a/musl

+++ b/musl
@@ -0,0 +1 @@
+musl_0.9.12/
\ No newline at end of file

diff --git a/musl_0.9.12 b/musl_0.9.12
--- a/musl_0.9.12
+++ b/musl_0.9.12
@@ -0,0 +1 @@
+Subproject commit 372a948b8139c6583045b2cd91b6b91fcb2e5881
diff --git a/musl_1.1.24 b/musl_1.1.24
--- a/musl_1.1.24

[Waldek Kozaczuk]

I just dit it. I tested with a fresh checkout (git clone https://github.com/cloudius-systems/osv && git submodule update --init --recursive). But I am not sure what will happen on the build machine.

[Nadav Har'El]

Thanks. It seems to have worked - both in a manual run (I just needed to do "git submodule update --init") and also appears to have worked on Jenkins.

--
Nadav Har'El

n...@scylladb.com

To view this discussion on the web visit https://groups.google.com/d/msgid/osv-dev/f0d6ec15-dff8-4523-8a15-4ba1d6ac69fdn%40googlegroups.com.