diff --git a/.github/workflows/main.yml b/.github/workflows/lcm.yml similarity index 84% rename from .github/workflows/main.yml rename to .github/workflows/lcm.yml index 5178ef6b3..9b8553781 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/lcm.yml @@ -1,11 +1,14 @@ -name: Build and test +name: Build and test (8.3) on: push: + branches: + - "6.99-lcm" + tags: + - "*" pull_request: - schedule: - # run daily, for initializing the cache if not generated yet. - - cron: '41 3 * * *' + branches: + - "6.99-lcm" jobs: build: @@ -16,15 +19,7 @@ jobs: ocaml-version: ["4.14.2"] runs-on: ["ubuntu-22.04"] experimental: [false] - include: - - ocaml-version: "4.14.2" - runs-on: ["ubuntu-22.04-arm"] - experimental: true - - ocaml-version: "5.3.0" - runs-on: ["ubuntu-22.04"] - experimental: true - continue-on-error: ${{ matrix.experimental }} runs-on: ${{ matrix.runs-on }} env: OCAML_VERSION: ${{ matrix.ocaml-version }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index ba22ea9e5..000000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Create release from tag - -on: - push: - tags: - - '6.*' - -jobs: - release: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Install opam - uses: ocaml/setup-ocaml@v3 - with: - ocaml-compiler: "4.14.2" - opam-repositories: | - xs-opam: "." - opam-pin: false - dune-cache: true - allow-prerelease-opam: true - - - name: Collect licenses - run: ./tools/print-licenses.sh > licenses.txt - - - name: Archive upstream libraries - run: make archive - - - name: Create Release ${{ github.ref_name }} - run: | - gh release create ${{ github.ref_name }} --repo ${{ github.repository }} --generate-notes \ - licenses.txt xs-opam-repo-${{ github.ref_name }}.tar.gz - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/yangtze-lcm.yml b/.github/workflows/yangtze-lcm.yml deleted file mode 100644 index ce6afae31..000000000 --- a/.github/workflows/yangtze-lcm.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: Build and test (Yangtze, scheduled) - -on: - schedule: - # run daily - - cron: '51 2 * * *' - -jobs: - build: - runs-on: ubuntu-22.04 - steps: - - name: Update apt cache - run: sudo apt-get update - - - name: Checkout - uses: actions/checkout@v4 - with: - ref: 'release/yangtze/lcm' - - - name: Check whether there are unlicensed packages - run: tools/license-check.sh - - - name: Use ocaml - uses: ocaml/setup-ocaml@v2 - with: - ocaml-compiler: "4.08.1" - opam-repositories: | - xs-opam: "." - opam-disable-sandboxing: true - opam-pin: false - - - name: Build xs-toolstack, test its dependencies - # opam install may ignore installing depexts sometimes - # OPAMCOLOR is set to "always" by default and it breaks piping - run: | - OPAMERRLOGLEN=10000 OPAMCOLOR=NEVER opam list -s --required-by xs-toolstack | xargs opam depext -tu - OPAMERRLOGLEN=10000 OPAMCOLOR=NEVER opam list -s --required-by xs-toolstack | xargs opam install -t - - - name: Uninstall unversioned packages - # This should purge them from the cache, unversioned package have - # 'master' as its version - run: opam list | awk -F " " '$2 == "master" { print $1 }' | xargs opam uninstall diff --git a/README.md b/README.md index 3bc8026db..53b412cc8 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ most useful for development outside a build system for the complete XenServer distribution. ```bash -opam repo add xs-opam https://github.com/xapi-project/xs-opam.git +opam repo add xs-8.3 git+ssh://github.com/xapi-project/xs-opam#6.99-lcm ``` ### Installing packages diff --git a/packages/clock/clock.master/opam b/packages/clock/clock.26.1-lcm/opam similarity index 92% rename from packages/clock/clock.master/opam rename to packages/clock/clock.26.1-lcm/opam index 9cd7b207b..26afe70a5 100644 --- a/packages/clock/clock.master/opam +++ b/packages/clock/clock.26.1-lcm/opam @@ -36,5 +36,5 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/cohttp-posix/cohttp-posix.master/opam b/packages/cohttp-posix/cohttp-posix.26.1-lcm/opam similarity index 91% rename from packages/cohttp-posix/cohttp-posix.master/opam rename to packages/cohttp-posix/cohttp-posix.26.1-lcm/opam index 9702e0b74..5243c7b6a 100644 --- a/packages/cohttp-posix/cohttp-posix.master/opam +++ b/packages/cohttp-posix/cohttp-posix.26.1-lcm/opam @@ -21,5 +21,5 @@ These libraries are provided for backwards compatibility only. No new code should use these libraries.""" url { src: - "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/dune-private-libs/dune-private-libs.3.20.2/opam b/packages/dune-private-libs/dune-private-libs.3.20.2/opam deleted file mode 100644 index 56d6d0a4f..000000000 --- a/packages/dune-private-libs/dune-private-libs.3.20.2/opam +++ /dev/null @@ -1,44 +0,0 @@ -opam-version: "2.0" -name: "dune-private-libs" -version: "3.20.2" -synopsis: "Private libraries of Dune" -description: """\ -!!!!!!!!!!!!!!!!!!!!!! -!!!!! DO NOT USE !!!!! -!!!!!!!!!!!!!!!!!!!!!! - -This package contains code that is shared between various dune-xxx -packages. However, it is not meant for public consumption and provides -no stability guarantee.""" -maintainer: "Jane Street Group, LLC " -authors: "Jane Street Group, LLC " -license: "MIT" -homepage: "https://github.com/ocaml/dune" -doc: "https://dune.readthedocs.io/" -bug-reports: "https://github.com/ocaml/dune/issues" -depends: [ - "dune" {>= "3.20"} - "csexp" {>= "1.5.0"} - "pp" {>= "1.1.0"} - "dyn" {= version} - "stdune" {= version} - "ocaml" {>= "4.08"} - "odoc" {with-doc} -] -build: [ - ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] - ["dune" "build" "-p" name "-j" jobs "@install" "@doc" {with-doc}] -] -dev-repo: "git+https://github.com/ocaml/dune.git" -url { - src: - "https://github.com/ocaml/dune/releases/download/3.20.2/dune-3.20.2.tbz" - checksum: [ - "sha256=b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549" - "sha512=ed14df9163e487d4ae7d0a2427eaab7823ef1f0ef2d93f0b783e6f163bbd5b44ba73f055d60b84e76f476fe11d38e794013628a1da776d9ec13cca9666e7b7ff" - ] -} -x-commit-hash: "1e54fd3f450aae7fb41ffb6b7c8b7a5aed754777" -x-maintenance-intent: ["(latest)"] diff --git a/packages/dune-site/dune-site.3.20.2/opam b/packages/dune-site/dune-site.3.20.2/opam deleted file mode 100644 index 51a45ba46..000000000 --- a/packages/dune-site/dune-site.3.20.2/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -name: "dune-site" -version: "3.20.2" -synopsis: "Embed locations information inside executable and libraries" -maintainer: "Jane Street Group, LLC " -authors: "Jane Street Group, LLC " -license: "MIT" -homepage: "https://github.com/ocaml/dune" -doc: "https://dune.readthedocs.io/" -bug-reports: "https://github.com/ocaml/dune/issues" -depends: [ - "dune" {>= "3.20"} - "dune-private-libs" {= version} - "odoc" {with-doc} -] -build: [ - ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] - ["dune" "build" "-p" name "-j" jobs "@install" "@doc" {with-doc}] -] -dev-repo: "git+https://github.com/ocaml/dune.git" -url { - src: - "https://github.com/ocaml/dune/releases/download/3.20.2/dune-3.20.2.tbz" - checksum: [ - "sha256=b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549" - "sha512=ed14df9163e487d4ae7d0a2427eaab7823ef1f0ef2d93f0b783e6f163bbd5b44ba73f055d60b84e76f476fe11d38e794013628a1da776d9ec13cca9666e7b7ff" - ] -} -x-commit-hash: "1e54fd3f450aae7fb41ffb6b7c8b7a5aed754777" -x-maintenance-intent: ["(latest)"] diff --git a/packages/ezxenstore/ezxenstore.master/opam b/packages/ezxenstore/ezxenstore.26.1-lcm/opam similarity index 91% rename from packages/ezxenstore/ezxenstore.master/opam rename to packages/ezxenstore/ezxenstore.26.1-lcm/opam index 13ae6bb99..3c8dd4213 100644 --- a/packages/ezxenstore/ezxenstore.master/opam +++ b/packages/ezxenstore/ezxenstore.26.1-lcm/opam @@ -26,5 +26,5 @@ An easy-to-use xenstore library with a simplified interface geared towards use within a daemon that maintains a single connection to xenstored.""" url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/forkexec/forkexec.master/opam b/packages/forkexec/forkexec.26.1-lcm/opam similarity index 93% rename from packages/forkexec/forkexec.master/opam rename to packages/forkexec/forkexec.26.1-lcm/opam index e34c12b48..b7cdd5396 100644 --- a/packages/forkexec/forkexec.master/opam +++ b/packages/forkexec/forkexec.26.1-lcm/opam @@ -39,5 +39,5 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/zstd/zstd.master/opam b/packages/gzip/gzip.26.1-lcm/opam similarity index 91% rename from packages/zstd/zstd.master/opam rename to packages/gzip/gzip.26.1-lcm/opam index a88183276..21c0677c5 100644 --- a/packages/zstd/zstd.master/opam +++ b/packages/gzip/gzip.26.1-lcm/opam @@ -21,5 +21,5 @@ These libraries are provided for backwards compatibility only. No new code should use these libraries.""" url { src: - "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/http-lib/http-lib.master/opam b/packages/http-lib/http-lib.26.1-lcm/opam similarity index 94% rename from packages/http-lib/http-lib.master/opam rename to packages/http-lib/http-lib.26.1-lcm/opam index 5689afcb4..1e1730520 100644 --- a/packages/http-lib/http-lib.master/opam +++ b/packages/http-lib/http-lib.26.1-lcm/opam @@ -52,5 +52,5 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/message-switch-cli/message-switch-cli.master/opam b/packages/message-switch-cli/message-switch-cli.26.1-lcm/opam similarity index 92% rename from packages/message-switch-cli/message-switch-cli.master/opam rename to packages/message-switch-cli/message-switch-cli.26.1-lcm/opam index 1db2f9889..66b8fe7a8 100644 --- a/packages/message-switch-cli/message-switch-cli.master/opam +++ b/packages/message-switch-cli/message-switch-cli.26.1-lcm/opam @@ -26,5 +26,5 @@ description: """ The switch stores messages in queues with well-known names. Clients use a simple HTTP protocol to enqueue and dequeue messages.""" url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/message-switch-core/message-switch-core.master/opam b/packages/message-switch-core/message-switch-core.26.1-lcm/opam similarity index 93% rename from packages/message-switch-core/message-switch-core.master/opam rename to packages/message-switch-core/message-switch-core.26.1-lcm/opam index 864c5607e..84afad9d6 100644 --- a/packages/message-switch-core/message-switch-core.master/opam +++ b/packages/message-switch-core/message-switch-core.26.1-lcm/opam @@ -40,5 +40,5 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/message-switch-lwt/message-switch-lwt.master/opam b/packages/message-switch-lwt/message-switch-lwt.26.1-lcm/opam similarity index 92% rename from packages/message-switch-lwt/message-switch-lwt.master/opam rename to packages/message-switch-lwt/message-switch-lwt.26.1-lcm/opam index 0b13843c0..85a253a9c 100644 --- a/packages/message-switch-lwt/message-switch-lwt.master/opam +++ b/packages/message-switch-lwt/message-switch-lwt.26.1-lcm/opam @@ -26,5 +26,5 @@ description: """ The switch stores messages in queues with well-known names. Clients use a simple HTTP protocol to enqueue and dequeue messages.""" url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/message-switch-unix/message-switch-unix.master/opam b/packages/message-switch-unix/message-switch-unix.26.1-lcm/opam similarity index 93% rename from packages/message-switch-unix/message-switch-unix.master/opam rename to packages/message-switch-unix/message-switch-unix.26.1-lcm/opam index 0edf3b318..e3f05b667 100644 --- a/packages/message-switch-unix/message-switch-unix.master/opam +++ b/packages/message-switch-unix/message-switch-unix.26.1-lcm/opam @@ -36,5 +36,5 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/message-switch/message-switch.master/opam b/packages/message-switch/message-switch.26.1-lcm/opam similarity index 94% rename from packages/message-switch/message-switch.master/opam rename to packages/message-switch/message-switch.26.1-lcm/opam index ff7273d5e..3db9af036 100644 --- a/packages/message-switch/message-switch.master/opam +++ b/packages/message-switch/message-switch.26.1-lcm/opam @@ -38,5 +38,5 @@ description: """ The switch stores messages in queues with well-known names. Clients use a simple HTTP protocol to enqueue and dequeue messages.""" url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/oxenstored/oxenstored.master/opam b/packages/oxenstored/oxenstored.master/opam deleted file mode 100644 index cbdb66b04..000000000 --- a/packages/oxenstored/oxenstored.master/opam +++ /dev/null @@ -1,35 +0,0 @@ -# This file is generated by dune, edit dune-project instead -opam-version: "2.0" -synopsis: "Oxenstored" -maintainer: ["Xapi project maintainers"] -authors: ["xen-api@lists.xen.org"] -license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" -homepage: "https://xapi-project.github.io/" -bug-reports: "https://github.com/xapi-project/oxenstored/issues" -depends: [ - "dune" {>= "3.20"} - "dune-site" - "alcotest" {with-test} - "odoc" {with-doc} -] -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "--promote-install-files=false" - "@install" - "@runtest" {with-test} - "@doc" {with-doc} - ] - ["dune" "install" "-p" name "--create-install-files" name] -] -dev-repo: "git+https://github.com/xapi-project/oxenstored.git" -x-maintenance-intent: ["(latest)"] -url { - src: "https://github.com/xapi-project/oxenstored/archive/master.tar.gz" -} diff --git a/packages/pciutil/pciutil.master/opam b/packages/pciutil/pciutil.26.1-lcm/opam similarity index 91% rename from packages/pciutil/pciutil.master/opam rename to packages/pciutil/pciutil.26.1-lcm/opam index 9bb2334b4..854707beb 100644 --- a/packages/pciutil/pciutil.master/opam +++ b/packages/pciutil/pciutil.26.1-lcm/opam @@ -21,5 +21,5 @@ These libraries are provided for backwards compatibility only. No new code should use these libraries.""" url { src: - "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/qcow-stream-tool/qcow-stream-tool.master/opam b/packages/qcow-stream-tool/qcow-stream-tool.26.1-lcm/opam similarity index 90% rename from packages/qcow-stream-tool/qcow-stream-tool.master/opam rename to packages/qcow-stream-tool/qcow-stream-tool.26.1-lcm/opam index c0d493709..a5192e20d 100644 --- a/packages/qcow-stream-tool/qcow-stream-tool.master/opam +++ b/packages/qcow-stream-tool/qcow-stream-tool.26.1-lcm/opam @@ -30,5 +30,5 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/rrd-transport/rrd-transport.master/opam b/packages/rrd-transport/rrd-transport.26.1-lcm/opam similarity index 93% rename from packages/rrd-transport/rrd-transport.master/opam rename to packages/rrd-transport/rrd-transport.26.1-lcm/opam index e32fb70e6..56952e1d9 100644 --- a/packages/rrd-transport/rrd-transport.master/opam +++ b/packages/rrd-transport/rrd-transport.26.1-lcm/opam @@ -39,5 +39,5 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/rrdd-plugin/rrdd-plugin.master/opam b/packages/rrdd-plugin/rrdd-plugin.26.1-lcm/opam similarity index 93% rename from packages/rrdd-plugin/rrdd-plugin.master/opam rename to packages/rrdd-plugin/rrdd-plugin.26.1-lcm/opam index 34bf7b15c..c08da09c5 100644 --- a/packages/rrdd-plugin/rrdd-plugin.master/opam +++ b/packages/rrdd-plugin/rrdd-plugin.26.1-lcm/opam @@ -41,5 +41,5 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/safe-resources/safe-resources.master/opam b/packages/safe-resources/safe-resources.26.1-lcm/opam similarity index 92% rename from packages/safe-resources/safe-resources.master/opam rename to packages/safe-resources/safe-resources.26.1-lcm/opam index e4bd199a6..ced7115dc 100644 --- a/packages/safe-resources/safe-resources.master/opam +++ b/packages/safe-resources/safe-resources.26.1-lcm/opam @@ -28,5 +28,5 @@ Safe resource handling: protection against double close and file descriptor leak """ url { src: - "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/sexpr/sexpr.master/opam b/packages/sexpr/sexpr.26.1-lcm/opam similarity index 92% rename from packages/sexpr/sexpr.master/opam rename to packages/sexpr/sexpr.26.1-lcm/opam index 0adfec4b1..99dc93be5 100644 --- a/packages/sexpr/sexpr.master/opam +++ b/packages/sexpr/sexpr.26.1-lcm/opam @@ -25,5 +25,5 @@ These libraries are provided for backwards compatibility only. No new code should use these libraries.""" url { src: - "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/stunnel/stunnel.master/opam b/packages/stunnel/stunnel.26.1-lcm/opam similarity index 93% rename from packages/stunnel/stunnel.master/opam rename to packages/stunnel/stunnel.26.1-lcm/opam index 61a45c07d..65ebcd497 100644 --- a/packages/stunnel/stunnel.master/opam +++ b/packages/stunnel/stunnel.26.1-lcm/opam @@ -40,5 +40,5 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/tgroup/tgroup.master/opam b/packages/tgroup/tgroup.26.1-lcm/opam similarity index 90% rename from packages/tgroup/tgroup.master/opam rename to packages/tgroup/tgroup.26.1-lcm/opam index 8e50e8eb0..783c64cae 100644 --- a/packages/tgroup/tgroup.master/opam +++ b/packages/tgroup/tgroup.26.1-lcm/opam @@ -28,5 +28,5 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/uuid/uuid.master/opam b/packages/uuid/uuid.26.1-lcm/opam similarity index 92% rename from packages/uuid/uuid.master/opam rename to packages/uuid/uuid.26.1-lcm/opam index ea0f595c3..46c0b900b 100644 --- a/packages/uuid/uuid.master/opam +++ b/packages/uuid/uuid.26.1-lcm/opam @@ -34,5 +34,5 @@ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] available: [ os = "linux" | os = "macos" ] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/varstored-guard/varstored-guard.master/opam b/packages/varstored-guard/varstored-guard.26.1-lcm/opam similarity index 92% rename from packages/varstored-guard/varstored-guard.master/opam rename to packages/varstored-guard/varstored-guard.26.1-lcm/opam index 4c509a349..0aaacd4e5 100644 --- a/packages/varstored-guard/varstored-guard.master/opam +++ b/packages/varstored-guard/varstored-guard.26.1-lcm/opam @@ -27,5 +27,5 @@ depends: [ synopsis: "Supervising daemon for varstored daemons" description: "" url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/vhd-format-lwt/vhd-format-lwt.master/opam b/packages/vhd-format-lwt/vhd-format-lwt.26.1-lcm/opam similarity index 95% rename from packages/vhd-format-lwt/vhd-format-lwt.master/opam rename to packages/vhd-format-lwt/vhd-format-lwt.26.1-lcm/opam index 2aa78ce9f..5ae7d6fc5 100644 --- a/packages/vhd-format-lwt/vhd-format-lwt.master/opam +++ b/packages/vhd-format-lwt/vhd-format-lwt.26.1-lcm/opam @@ -50,5 +50,5 @@ x-maintenance-intent: ["(latest)"] available: os = "linux" | os = "macos" depexts: ["linux-headers"] {os-distribution = "alpine"} url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/vhd-format/vhd-format.master/opam b/packages/vhd-format/vhd-format.26.1-lcm/opam similarity index 95% rename from packages/vhd-format/vhd-format.master/opam rename to packages/vhd-format/vhd-format.26.1-lcm/opam index 0ded12991..67519e87a 100644 --- a/packages/vhd-format/vhd-format.master/opam +++ b/packages/vhd-format/vhd-format.26.1-lcm/opam @@ -43,5 +43,5 @@ available: os = "linux" | os = "macos" depexts: ["linux-headers"] {os-distribution = "alpine"} url { src: - "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/vhd-tool/vhd-tool.master/opam b/packages/vhd-tool/vhd-tool.26.1-lcm/opam similarity index 93% rename from packages/vhd-tool/vhd-tool.master/opam rename to packages/vhd-tool/vhd-tool.26.1-lcm/opam index 8ffbf103f..9448da71d 100644 --- a/packages/vhd-tool/vhd-tool.master/opam +++ b/packages/vhd-tool/vhd-tool.26.1-lcm/opam @@ -40,6 +40,7 @@ depends: [ "xen-api-client-lwt" {= version} "xenstore" "xenstore_transport" + "yojson" "odoc" {with-doc} ] build: [ @@ -59,5 +60,5 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-cli-protocol/xapi-cli-protocol.master/opam b/packages/xapi-cli-protocol/xapi-cli-protocol.26.1-lcm/opam similarity index 92% rename from packages/xapi-cli-protocol/xapi-cli-protocol.master/opam rename to packages/xapi-cli-protocol/xapi-cli-protocol.26.1-lcm/opam index 31f6cdfef..50ecf55e9 100644 --- a/packages/xapi-cli-protocol/xapi-cli-protocol.master/opam +++ b/packages/xapi-cli-protocol/xapi-cli-protocol.26.1-lcm/opam @@ -26,5 +26,5 @@ description: """ This daemon exposes the XenAPI and is used by clients such as 'xe' and 'XenCenter' to manage clusters of Xen-enabled hosts.""" url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-client/xapi-client.master/opam b/packages/xapi-client/xapi-client.26.1-lcm/opam similarity index 93% rename from packages/xapi-client/xapi-client.master/opam rename to packages/xapi-client/xapi-client.26.1-lcm/opam index 4ab1b3638..3836dfc0f 100644 --- a/packages/xapi-client/xapi-client.master/opam +++ b/packages/xapi-client/xapi-client.26.1-lcm/opam @@ -32,5 +32,5 @@ description: """ This daemon exposes the XenAPI and is used by clients such as 'xe' and 'XenCenter' to manage clusters of Xen-enabled hosts.""" url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-clusterd-test/xapi-clusterd-test.master/opam b/packages/xapi-clusterd-test/xapi-clusterd-test.26.1-lcm/opam similarity index 100% rename from packages/xapi-clusterd-test/xapi-clusterd-test.master/opam rename to packages/xapi-clusterd-test/xapi-clusterd-test.26.1-lcm/opam diff --git a/packages/xapi-clusterd/xapi-clusterd.master/opam b/packages/xapi-clusterd/xapi-clusterd.26.1-lcm/opam similarity index 100% rename from packages/xapi-clusterd/xapi-clusterd.master/opam rename to packages/xapi-clusterd/xapi-clusterd.26.1-lcm/opam diff --git a/packages/xapi-compression/xapi-compression.master/opam b/packages/xapi-compression/xapi-compression.26.1-lcm/opam similarity index 91% rename from packages/xapi-compression/xapi-compression.master/opam rename to packages/xapi-compression/xapi-compression.26.1-lcm/opam index 7d2e82930..c32766102 100644 --- a/packages/xapi-compression/xapi-compression.master/opam +++ b/packages/xapi-compression/xapi-compression.26.1-lcm/opam @@ -25,5 +25,5 @@ These libraries are provided for backwards compatibility only. No new code should use these libraries.""" url { src: - "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-consts/xapi-consts.master/opam b/packages/xapi-consts/xapi-consts.26.1-lcm/opam similarity index 91% rename from packages/xapi-consts/xapi-consts.master/opam rename to packages/xapi-consts/xapi-consts.26.1-lcm/opam index c164d2e0d..954b284e3 100644 --- a/packages/xapi-consts/xapi-consts.master/opam +++ b/packages/xapi-consts/xapi-consts.26.1-lcm/opam @@ -22,5 +22,5 @@ description: """ This daemon exposes the XenAPI and is used by clients such as 'xe' and 'XenCenter' to manage clusters of Xen-enabled hosts.""" url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-datamodel/xapi-datamodel.master/opam b/packages/xapi-datamodel/xapi-datamodel.26.1-lcm/opam similarity index 93% rename from packages/xapi-datamodel/xapi-datamodel.master/opam rename to packages/xapi-datamodel/xapi-datamodel.26.1-lcm/opam index e2da59cee..03e9825ba 100644 --- a/packages/xapi-datamodel/xapi-datamodel.master/opam +++ b/packages/xapi-datamodel/xapi-datamodel.26.1-lcm/opam @@ -32,5 +32,5 @@ description: """ This daemon exposes the XenAPI and is used by clients such as 'xe' and 'XenCenter' to manage clusters of Xen-enabled hosts.""" url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-debug/xapi-debug.master/opam b/packages/xapi-debug/xapi-debug.26.1-lcm/opam similarity index 95% rename from packages/xapi-debug/xapi-debug.master/opam rename to packages/xapi-debug/xapi-debug.26.1-lcm/opam index 0b42b8269..51f2d6949 100644 --- a/packages/xapi-debug/xapi-debug.master/opam +++ b/packages/xapi-debug/xapi-debug.26.1-lcm/opam @@ -84,5 +84,5 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-expiry-alerts/xapi-expiry-alerts.master/opam b/packages/xapi-expiry-alerts/xapi-expiry-alerts.26.1-lcm/opam similarity index 93% rename from packages/xapi-expiry-alerts/xapi-expiry-alerts.master/opam rename to packages/xapi-expiry-alerts/xapi-expiry-alerts.26.1-lcm/opam index 02bdf5c72..0f1020096 100644 --- a/packages/xapi-expiry-alerts/xapi-expiry-alerts.master/opam +++ b/packages/xapi-expiry-alerts/xapi-expiry-alerts.26.1-lcm/opam @@ -29,5 +29,5 @@ build: [ ] dev-repo: "git+https://github.com/xapi-project/xen-api.git" url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-forkexecd/xapi-forkexecd.master/opam b/packages/xapi-forkexecd/xapi-forkexecd.26.1-lcm/opam similarity index 92% rename from packages/xapi-forkexecd/xapi-forkexecd.master/opam rename to packages/xapi-forkexecd/xapi-forkexecd.26.1-lcm/opam index c0636930f..46f19fc0b 100644 --- a/packages/xapi-forkexecd/xapi-forkexecd.master/opam +++ b/packages/xapi-forkexecd/xapi-forkexecd.26.1-lcm/opam @@ -33,5 +33,5 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-idl/xapi-idl.master/opam b/packages/xapi-idl/xapi-idl.26.1-lcm/opam similarity index 95% rename from packages/xapi-idl/xapi-idl.master/opam rename to packages/xapi-idl/xapi-idl.26.1-lcm/opam index ad3a9e5da..efc6f9c8c 100644 --- a/packages/xapi-idl/xapi-idl.master/opam +++ b/packages/xapi-idl/xapi-idl.26.1-lcm/opam @@ -59,5 +59,5 @@ The xapi toolstack is a set of communicating services including - rrdd: manages datasources and records history plus storage 'plugins'""" url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-inventory/xapi-inventory.master/opam b/packages/xapi-inventory/xapi-inventory.26.1-lcm/opam similarity index 91% rename from packages/xapi-inventory/xapi-inventory.master/opam rename to packages/xapi-inventory/xapi-inventory.26.1-lcm/opam index ee539b01b..93b434c10 100644 --- a/packages/xapi-inventory/xapi-inventory.master/opam +++ b/packages/xapi-inventory/xapi-inventory.26.1-lcm/opam @@ -27,5 +27,5 @@ build: [ ] dev-repo: "git+http://github.com/xapi-project/xcp-inventory.git" url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-log/xapi-log.master/opam b/packages/xapi-log/xapi-log.26.1-lcm/opam similarity index 92% rename from packages/xapi-log/xapi-log.master/opam rename to packages/xapi-log/xapi-log.26.1-lcm/opam index ceacb0afb..788dcb548 100644 --- a/packages/xapi-log/xapi-log.master/opam +++ b/packages/xapi-log/xapi-log.26.1-lcm/opam @@ -35,5 +35,5 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-nbd/xapi-nbd.master/opam b/packages/xapi-nbd/xapi-nbd.26.1-lcm/opam similarity index 92% rename from packages/xapi-nbd/xapi-nbd.master/opam rename to packages/xapi-nbd/xapi-nbd.26.1-lcm/opam index b39c334a2..513b89bd9 100644 --- a/packages/xapi-nbd/xapi-nbd.master/opam +++ b/packages/xapi-nbd/xapi-nbd.26.1-lcm/opam @@ -31,5 +31,5 @@ tags: [ "org:mirage" "org:xapi-project" ] synopsis: "Expose XenServer disks conveniently over NBD" url { src: - "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-open-uri/xapi-open-uri.master/opam b/packages/xapi-open-uri/xapi-open-uri.26.1-lcm/opam similarity index 92% rename from packages/xapi-open-uri/xapi-open-uri.master/opam rename to packages/xapi-open-uri/xapi-open-uri.26.1-lcm/opam index 0823c9c10..f69348c16 100644 --- a/packages/xapi-open-uri/xapi-open-uri.master/opam +++ b/packages/xapi-open-uri/xapi-open-uri.26.1-lcm/opam @@ -27,5 +27,5 @@ These libraries are provided for backwards compatibility only. No new code should use these libraries.""" url { src: - "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-rrd/xapi-rrd.master/opam b/packages/xapi-rrd/xapi-rrd.26.1-lcm/opam similarity index 93% rename from packages/xapi-rrd/xapi-rrd.master/opam rename to packages/xapi-rrd/xapi-rrd.26.1-lcm/opam index 82f35e8ea..40f5adb2e 100644 --- a/packages/xapi-rrd/xapi-rrd.master/opam +++ b/packages/xapi-rrd/xapi-rrd.26.1-lcm/opam @@ -33,5 +33,5 @@ build: [ ] dev-repo: "git+https://github.com/xapi-project/xcp-rrd.git" url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-schema/xapi-schema.master/opam b/packages/xapi-schema/xapi-schema.26.1-lcm/opam similarity index 92% rename from packages/xapi-schema/xapi-schema.master/opam rename to packages/xapi-schema/xapi-schema.26.1-lcm/opam index 99d06a4c5..fa4706a78 100644 --- a/packages/xapi-schema/xapi-schema.master/opam +++ b/packages/xapi-schema/xapi-schema.26.1-lcm/opam @@ -24,5 +24,5 @@ description: """ This daemon exposes the XenAPI and is used by clients such as 'xe' and 'XenCenter' to manage clusters of Xen-enabled hosts.""" url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-sdk/xapi-sdk.master/opam b/packages/xapi-sdk/xapi-sdk.26.1-lcm/opam similarity index 91% rename from packages/xapi-sdk/xapi-sdk.master/opam rename to packages/xapi-sdk/xapi-sdk.26.1-lcm/opam index 52ee926d6..28fc450e4 100644 --- a/packages/xapi-sdk/xapi-sdk.master/opam +++ b/packages/xapi-sdk/xapi-sdk.26.1-lcm/opam @@ -34,5 +34,5 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-stdext-encodings/xapi-stdext-encodings.master/opam b/packages/xapi-stdext-encodings/xapi-stdext-encodings.26.1-lcm/opam similarity index 92% rename from packages/xapi-stdext-encodings/xapi-stdext-encodings.master/opam rename to packages/xapi-stdext-encodings/xapi-stdext-encodings.26.1-lcm/opam index ee77e2ffb..c838339f0 100644 --- a/packages/xapi-stdext-encodings/xapi-stdext-encodings.master/opam +++ b/packages/xapi-stdext-encodings/xapi-stdext-encodings.26.1-lcm/opam @@ -33,5 +33,5 @@ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] available: arch != "arm32" & arch != "x86_32" url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-stdext-pervasives/xapi-stdext-pervasives.master/opam b/packages/xapi-stdext-pervasives/xapi-stdext-pervasives.26.1-lcm/opam similarity index 91% rename from packages/xapi-stdext-pervasives/xapi-stdext-pervasives.master/opam rename to packages/xapi-stdext-pervasives/xapi-stdext-pervasives.26.1-lcm/opam index 62c65aada..3d8819b54 100644 --- a/packages/xapi-stdext-pervasives/xapi-stdext-pervasives.master/opam +++ b/packages/xapi-stdext-pervasives/xapi-stdext-pervasives.26.1-lcm/opam @@ -30,5 +30,5 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-stdext-std/xapi-stdext-std.master/opam b/packages/xapi-stdext-std/xapi-stdext-std.26.1-lcm/opam similarity index 91% rename from packages/xapi-stdext-std/xapi-stdext-std.master/opam rename to packages/xapi-stdext-std/xapi-stdext-std.26.1-lcm/opam index abedde9e1..fabe8847b 100644 --- a/packages/xapi-stdext-std/xapi-stdext-std.master/opam +++ b/packages/xapi-stdext-std/xapi-stdext-std.26.1-lcm/opam @@ -29,5 +29,5 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-stdext-threads/xapi-stdext-threads.master/opam b/packages/xapi-stdext-threads/xapi-stdext-threads.26.1-lcm/opam similarity index 92% rename from packages/xapi-stdext-threads/xapi-stdext-threads.master/opam rename to packages/xapi-stdext-threads/xapi-stdext-threads.26.1-lcm/opam index 29086edbd..d3db68c92 100644 --- a/packages/xapi-stdext-threads/xapi-stdext-threads.master/opam +++ b/packages/xapi-stdext-threads/xapi-stdext-threads.26.1-lcm/opam @@ -38,5 +38,5 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-stdext-unix/xapi-stdext-unix.master/opam b/packages/xapi-stdext-unix/xapi-stdext-unix.26.1-lcm/opam similarity index 93% rename from packages/xapi-stdext-unix/xapi-stdext-unix.master/opam rename to packages/xapi-stdext-unix/xapi-stdext-unix.26.1-lcm/opam index 6172b26f8..3703b6d22 100644 --- a/packages/xapi-stdext-unix/xapi-stdext-unix.master/opam +++ b/packages/xapi-stdext-unix/xapi-stdext-unix.26.1-lcm/opam @@ -44,5 +44,5 @@ x-maintenance-intent: ["(latest)"] depexts: ["linux-headers"] {os-distribution = "alpine"} available: [ os = "linux" ] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-stdext-zerocheck/xapi-stdext-zerocheck.master/opam b/packages/xapi-stdext-zerocheck/xapi-stdext-zerocheck.26.1-lcm/opam similarity index 90% rename from packages/xapi-stdext-zerocheck/xapi-stdext-zerocheck.master/opam rename to packages/xapi-stdext-zerocheck/xapi-stdext-zerocheck.26.1-lcm/opam index 4af308dd1..27c5ac773 100644 --- a/packages/xapi-stdext-zerocheck/xapi-stdext-zerocheck.master/opam +++ b/packages/xapi-stdext-zerocheck/xapi-stdext-zerocheck.26.1-lcm/opam @@ -28,5 +28,5 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-storage-cli/xapi-storage-cli.master/opam b/packages/xapi-storage-cli/xapi-storage-cli.26.1-lcm/opam similarity index 93% rename from packages/xapi-storage-cli/xapi-storage-cli.master/opam rename to packages/xapi-storage-cli/xapi-storage-cli.26.1-lcm/opam index e88fcf4bb..f124ab9ff 100644 --- a/packages/xapi-storage-cli/xapi-storage-cli.master/opam +++ b/packages/xapi-storage-cli/xapi-storage-cli.26.1-lcm/opam @@ -37,5 +37,5 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-storage-script/xapi-storage-script.master/opam b/packages/xapi-storage-script/xapi-storage-script.26.1-lcm/opam similarity index 93% rename from packages/xapi-storage-script/xapi-storage-script.master/opam rename to packages/xapi-storage-script/xapi-storage-script.26.1-lcm/opam index 8b1ba6590..2212aeb20 100644 --- a/packages/xapi-storage-script/xapi-storage-script.master/opam +++ b/packages/xapi-storage-script/xapi-storage-script.26.1-lcm/opam @@ -34,5 +34,5 @@ This daemon watches a directory for subdirectories, and when a subdir is created a storage service is registered.""" url { src: - "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-storage/xapi-storage.master/opam b/packages/xapi-storage/xapi-storage.26.1-lcm/opam similarity index 91% rename from packages/xapi-storage/xapi-storage.master/opam rename to packages/xapi-storage/xapi-storage.26.1-lcm/opam index 9fcf82b5d..55fea9639 100644 --- a/packages/xapi-storage/xapi-storage.master/opam +++ b/packages/xapi-storage/xapi-storage.26.1-lcm/opam @@ -27,5 +27,5 @@ depends: [ ] synopsis: "Code and documentation generator for the Xapi storage interface" url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-tools/xapi-tools.master/opam b/packages/xapi-tools/xapi-tools.26.1-lcm/opam similarity index 92% rename from packages/xapi-tools/xapi-tools.master/opam rename to packages/xapi-tools/xapi-tools.26.1-lcm/opam index 6570b02d0..8de910312 100644 --- a/packages/xapi-tools/xapi-tools.master/opam +++ b/packages/xapi-tools/xapi-tools.26.1-lcm/opam @@ -30,6 +30,7 @@ depends: [ "yojson" "rrd-transport" "rrdd-plugin" + "xapi-stdext-std" "xapi-tracing-export" "xen-api-client" "alcotest" {with-test} @@ -57,5 +58,5 @@ build: [ ] ] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-tracing-export/xapi-tracing-export.master/opam b/packages/xapi-tracing-export/xapi-tracing-export.26.1-lcm/opam similarity index 94% rename from packages/xapi-tracing-export/xapi-tracing-export.master/opam rename to packages/xapi-tracing-export/xapi-tracing-export.26.1-lcm/opam index ad040083b..f91eac921 100644 --- a/packages/xapi-tracing-export/xapi-tracing-export.master/opam +++ b/packages/xapi-tracing-export/xapi-tracing-export.26.1-lcm/opam @@ -45,5 +45,5 @@ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] available: [ os = "linux" ] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-tracing/xapi-tracing.master/opam b/packages/xapi-tracing/xapi-tracing.26.1-lcm/opam similarity index 93% rename from packages/xapi-tracing/xapi-tracing.master/opam rename to packages/xapi-tracing/xapi-tracing.26.1-lcm/opam index b475461ab..48ca4ff42 100644 --- a/packages/xapi-tracing/xapi-tracing.master/opam +++ b/packages/xapi-tracing/xapi-tracing.26.1-lcm/opam @@ -40,5 +40,5 @@ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] available: [ os = "linux" ] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi-types/xapi-types.master/opam b/packages/xapi-types/xapi-types.26.1-lcm/opam similarity index 93% rename from packages/xapi-types/xapi-types.master/opam rename to packages/xapi-types/xapi-types.26.1-lcm/opam index d09bb8747..e222a287a 100644 --- a/packages/xapi-types/xapi-types.master/opam +++ b/packages/xapi-types/xapi-types.26.1-lcm/opam @@ -34,5 +34,5 @@ description: """ This daemon exposes the XenAPI and is used by clients such as 'xe' and 'XenCenter' to manage clusters of Xen-enabled hosts.""" url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xapi/xapi.master/opam b/packages/xapi/xapi.26.1-lcm/opam similarity index 97% rename from packages/xapi/xapi.master/opam rename to packages/xapi/xapi.26.1-lcm/opam index f7cf11be1..9a75b0203 100644 --- a/packages/xapi/xapi.master/opam +++ b/packages/xapi/xapi.26.1-lcm/opam @@ -121,5 +121,5 @@ depexts: [ ["hwdata" "xxhash-dev" "xxhash"] {os-distribution = "alpine"} ] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xe/xe.master/opam b/packages/xe/xe.26.1-lcm/opam similarity index 93% rename from packages/xe/xe.master/opam rename to packages/xe/xe.26.1-lcm/opam index 81da07a08..63fcb0637 100644 --- a/packages/xe/xe.master/opam +++ b/packages/xe/xe.26.1-lcm/opam @@ -33,5 +33,5 @@ description: """ This daemon exposes the XenAPI and is used by clients such as 'xe' and 'XenCenter' to manage clusters of Xen-enabled hosts.""" url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xen-api-client-lwt/xen-api-client-lwt.master/opam b/packages/xen-api-client-lwt/xen-api-client-lwt.26.1-lcm/opam similarity index 92% rename from packages/xen-api-client-lwt/xen-api-client-lwt.master/opam rename to packages/xen-api-client-lwt/xen-api-client-lwt.26.1-lcm/opam index 5b1878a36..fb08d1ac0 100644 --- a/packages/xen-api-client-lwt/xen-api-client-lwt.master/opam +++ b/packages/xen-api-client-lwt/xen-api-client-lwt.26.1-lcm/opam @@ -34,5 +34,5 @@ depends: [ synopsis: "Xen-API client library for remotely-controlling a xapi host" url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xen-api-client/xen-api-client.master/opam b/packages/xen-api-client/xen-api-client.26.1-lcm/opam similarity index 93% rename from packages/xen-api-client/xen-api-client.master/opam rename to packages/xen-api-client/xen-api-client.26.1-lcm/opam index 347b3fa40..fc883d4e4 100644 --- a/packages/xen-api-client/xen-api-client.master/opam +++ b/packages/xen-api-client/xen-api-client.26.1-lcm/opam @@ -47,5 +47,5 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xen-api.git" x-maintenance-intent: ["(latest)"] url { - src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + src: "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xenctrl/xenctrl.master/opam b/packages/xenctrl/xenctrl.1.3-lcm/opam similarity index 88% rename from packages/xenctrl/xenctrl.master/opam rename to packages/xenctrl/xenctrl.1.3-lcm/opam index 4978e43b4..9eff823fa 100644 --- a/packages/xenctrl/xenctrl.master/opam +++ b/packages/xenctrl/xenctrl.1.3-lcm/opam @@ -16,5 +16,5 @@ build: ["dune" "build" "-p" name "-j" jobs] dev-repo: "git+https://github.com/xapi-project/xenctrl.git" url { - src: "https://github.com/xapi-project/xenctrl/archive/master.tar.gz" + src: "https://github.com/xapi-project/xenctrl/archive/1.3-lcm.tar.gz" } diff --git a/packages/xenmmap/xenmmap.master/opam b/packages/xenmmap/xenmmap.1.3-lcm/opam similarity index 87% rename from packages/xenmmap/xenmmap.master/opam rename to packages/xenmmap/xenmmap.1.3-lcm/opam index fb2692f72..85b647d8f 100644 --- a/packages/xenmmap/xenmmap.master/opam +++ b/packages/xenmmap/xenmmap.1.3-lcm/opam @@ -15,5 +15,5 @@ build: ["dune" "build" "-p" name "-j" jobs] dev-repo: "git+https://github.com/xapi-project/xenctrl.git" url { - src: "https://github.com/xapi-project/xenctrl/archive/master.tar.gz" + src: "https://github.com/xapi-project/xenctrl/archive/1.3-lcm.tar.gz" } diff --git a/packages/xml-light2/xml-light2.master/opam b/packages/xml-light2/xml-light2.26.1-lcm/opam similarity index 91% rename from packages/xml-light2/xml-light2.master/opam rename to packages/xml-light2/xml-light2.26.1-lcm/opam index 92f1b4771..b33ac47f1 100644 --- a/packages/xml-light2/xml-light2.master/opam +++ b/packages/xml-light2/xml-light2.26.1-lcm/opam @@ -21,5 +21,5 @@ These libraries are provided for backwards compatibility only. No new code should use these libraries.""" url { src: - "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/packages/xs-toolstack/xs-toolstack.master/opam b/packages/xs-toolstack/xs-toolstack.master/opam index dc5e71344..93d60f209 100644 --- a/packages/xs-toolstack/xs-toolstack.master/opam +++ b/packages/xs-toolstack/xs-toolstack.master/opam @@ -19,7 +19,6 @@ depends: [ "message-switch" "message-switch-cli" "nbd-tool" - "oxenstored" "pciutil" "polly" "qcow-stream-tool" diff --git a/packages/gzip/gzip.master/opam b/packages/zstd/zstd.26.1-lcm/opam similarity index 91% rename from packages/gzip/gzip.master/opam rename to packages/zstd/zstd.26.1-lcm/opam index a88183276..21c0677c5 100644 --- a/packages/gzip/gzip.master/opam +++ b/packages/zstd/zstd.26.1-lcm/opam @@ -21,5 +21,5 @@ These libraries are provided for backwards compatibility only. No new code should use these libraries.""" url { src: - "https://github.com/xapi-project/xen-api/archive/master.tar.gz" + "https://github.com/xapi-project/xen-api/archive/26.1-lcm.tar.gz" } diff --git a/tools/license-check.sh b/tools/license-check.sh index c3cb120fc..772f2b51c 100755 --- a/tools/license-check.sh +++ b/tools/license-check.sh @@ -20,7 +20,7 @@ OPAMCOLOR=NEVER # make sure splits are done by newlines SAVEDIFS=$IFS IFS=$'\n' -for package in $(opam list --required-by xs-toolstack --recursive --short | xargs opam info -f name:,license:,version: | paste -d ";" - - - | grep -ve 'version: "base"' -e 'version: "master"'); +for package in $(opam list --required-by xs-toolstack --recursive --short | xargs opam info -f name:,license:,version: | paste -d ";" - - - | grep -ve 'version: "base"' -e 'version: "26.1-lcm"' -e 'version: "1.3-lcm"'); do IFS=$SAVEDIFS name=$(echo "$package" | cut -f 1 -d ";" | cut -f 2 -d ":" | tr -d '"') diff --git a/tools/sync-xapi-metadata.sh b/tools/sync-xapi-metadata.sh index 48f427d7b..f7138c3fa 100755 --- a/tools/sync-xapi-metadata.sh +++ b/tools/sync-xapi-metadata.sh @@ -17,7 +17,6 @@ message-switch-cli $XAPI/xen-api message-switch-core $XAPI/xen-api message-switch-lwt $XAPI/xen-api message-switch-unix $XAPI/xen-api -oxenstored $XAPI/oxenstored pciutil $XAPI/xen-api qcow-stream-tool $XAPI/xen-api rrd-transport $XAPI/xen-api diff --git a/tools/xs-opam-ci.env b/tools/xs-opam-ci.env index c0481f0a0..4c4e57c9c 100644 --- a/tools/xs-opam-ci.env +++ b/tools/xs-opam-ci.env @@ -2,5 +2,6 @@ export OCAML_VERSION="4.14" export OCAML_VERSION_FULL="4.14.2" export DISTRO="debian-10" export BASE_REMOTE="https://github.com/xapi-project/xs-opam.git" -export REPOSITORY="https://github.com/xapi-project/xs-opam.git" +export BASE_REMOTE_BRANCH="6.99-lcm" +export REPOSITORY="https://github.com/xapi-project/xs-opam.git#6.99-lcm" export OPAMERRLOGLEN=10000