diff --git a/.gitmodules b/.gitmodules index 56a5b38cf..70642dfa4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,3 @@ -[submodule "pkgar"] - path = pkgar - url = https://gitlab.redox-os.org/redox-os/pkgar.git - branch = master [submodule "rust"] path = rust url = https://gitlab.redox-os.org/redox-os/rust.git diff --git a/Cargo.lock b/Cargo.lock index 2598919cd..9b1567786 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1362,9 +1362,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" +checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" dependencies = [ "equivalent", "hashbrown 0.16.1", @@ -1708,19 +1708,6 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" -[[package]] -name = "pkgar" -version = "0.1.19" -dependencies = [ - "anyhow", - "blake3 0.3.8", - "bytemuck", - "clap", - "pkgar-core 0.1.19", - "pkgar-keys 0.1.19", - "thiserror 2.0.17", -] - [[package]] name = "pkgar" version = "0.1.19" @@ -1737,13 +1724,17 @@ dependencies = [ ] [[package]] -name = "pkgar-core" +name = "pkgar" version = "0.1.19" +source = "git+https://gitlab.redox-os.org/redox-os/pkgar.git#e265d32cc0bb149a9574d4500e5409cbb8b662d5" dependencies = [ - "bitflags 1.3.2", + "anyhow", "blake3 0.3.8", "bytemuck", - "dryoc", + "clap", + "pkgar-core 0.1.19 (git+https://gitlab.redox-os.org/redox-os/pkgar.git)", + "pkgar-keys 0.1.19 (git+https://gitlab.redox-os.org/redox-os/pkgar.git)", + "thiserror 2.0.17", ] [[package]] @@ -1759,20 +1750,14 @@ dependencies = [ ] [[package]] -name = "pkgar-keys" +name = "pkgar-core" version = "0.1.19" +source = "git+https://gitlab.redox-os.org/redox-os/pkgar.git#e265d32cc0bb149a9574d4500e5409cbb8b662d5" dependencies = [ - "anyhow", - "clap", - "dirs 3.0.2", - "hex", - "lazy_static", - "pkgar-core 0.1.19", - "seckey", - "serde", - "termion", - "thiserror 2.0.17", - "toml 0.8.23", + "bitflags 1.3.2", + "blake3 0.3.8", + "bytemuck", + "dryoc", ] [[package]] @@ -1794,6 +1779,24 @@ dependencies = [ "toml 0.8.23", ] +[[package]] +name = "pkgar-keys" +version = "0.1.19" +source = "git+https://gitlab.redox-os.org/redox-os/pkgar.git#e265d32cc0bb149a9574d4500e5409cbb8b662d5" +dependencies = [ + "anyhow", + "clap", + "dirs 6.0.0", + "hex", + "lazy_static", + "pkgar-core 0.1.19 (git+https://gitlab.redox-os.org/redox-os/pkgar.git)", + "seckey", + "serde", + "termion", + "thiserror 2.0.17", + "toml 0.8.23", +] + [[package]] name = "portable-atomic" version = "1.11.1" @@ -2065,9 +2068,9 @@ dependencies = [ "libc", "object", "pbr", - "pkgar 0.1.19", - "pkgar-core 0.1.19", - "pkgar-keys 0.1.19", + "pkgar 0.1.19 (git+https://gitlab.redox-os.org/redox-os/pkgar.git)", + "pkgar-core 0.1.19 (git+https://gitlab.redox-os.org/redox-os/pkgar.git)", + "pkgar-keys 0.1.19 (git+https://gitlab.redox-os.org/redox-os/pkgar.git)", "ratatui", "redox-pkg", "redox_installer", diff --git a/Cargo.toml b/Cargo.toml index 62e8eeaa1..dd212b993 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,9 +33,9 @@ libc = "0.2" ignore = "0.4" object = { version = "0.36", features = ["build_core"] } pbr = "1.0.2" -pkgar = { path = "pkgar/pkgar" } -pkgar-core = { path = "pkgar/pkgar-core" } -pkgar-keys = { path = "pkgar/pkgar-keys" } +pkgar = { git = "https://gitlab.redox-os.org/redox-os/pkgar.git" } +pkgar-core = { git = "https://gitlab.redox-os.org/redox-os/pkgar.git" } +pkgar-keys = { git = "https://gitlab.redox-os.org/redox-os/pkgar.git" } redox-pkg = "0.2.8" redox_installer = "0.2.37" redoxer = "0.2.60" diff --git a/config.sh b/config.sh index 8e9801985..9806b8ccf 100755 --- a/config.sh +++ b/config.sh @@ -57,22 +57,7 @@ export FIND if [ -z "${IS_REDOX}" ] then -function pkgar { - "$ROOT/pkgar/target/release/pkgar" "$@" -} -function cook { - "$ROOT/target/release/cook" "$@" -} function repo { "$ROOT/target/release/repo" "$@" } -function repo_builder { - "$ROOT/target/release/repo_builder" "$@" -} -function list_recipes { - "$ROOT/target/release/list_recipes" "$@" -} -function find_recipe { - "$ROOT/target/release/find_recipe" "$@" -} fi diff --git a/mk/ci.mk b/mk/ci.mk index a16c60a4d..e150b8003 100644 --- a/mk/ci.mk +++ b/mk/ci.mk @@ -27,7 +27,6 @@ ifeq ($(PODMAN_BUILD),1) $(PODMAN_RUN) make $@ else $(HOST_CARGO) build --manifest-path Cargo.toml --release - $(HOST_CARGO) build --manifest-path pkgar/Cargo.toml --release export CI=1 COOKBOOK_LOGS=true PATH="$(PREFIX_PATH):$$PATH" COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ ./repo.sh $(REPO_APPSTREAM) $(REPO_NONSTOP) --with-package-deps "--filesystem=config/$(ARCH)/ci.toml" endif diff --git a/mk/fstools.mk b/mk/fstools.mk index a1d1f8e1d..6a7a8e298 100644 --- a/mk/fstools.mk +++ b/mk/fstools.mk @@ -34,13 +34,11 @@ ifeq ($(PODMAN_BUILD),1) $(PODMAN_RUN) make $@ else $(HOST_CARGO) build --manifest-path Cargo.toml --release - $(HOST_CARGO) build --manifest-path pkgar/Cargo.toml --release touch $@ endif fstools_clean: FORCE rm -rf target - rm -rf pkgar/target rm -rf $(FSTOOLS) rm -rf $(FSTOOLS)-target rm -f $(FSTOOLS_TAG) diff --git a/pkgar b/pkgar deleted file mode 160000 index 98aecac8d..000000000 --- a/pkgar +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 98aecac8d40b6a47429e2a5585416ad90c02e6db