Git-Mirrors/qusal
1
0
Fork 0
mirror of https://github.com/ben-grande/qusal.git synced 2025-12-17 09:24:29 -05:00
Code Issues Projects Releases Packages Wiki Activity

doc: remove outdated submodule workaround

Browse source
This commit is contained in:
Ben Grande 2025-01-17 19:34:05 +01:00
parent bc1072d099
commit 5e635d54b5
No known key found for this signature in database
GPG key ID: 00C64E14F51F9E56
2 changed files with 4 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

15
salt/qubes-builder/README.md
View file

@ -32,18 +32,6 @@ Qubes Executor lacking some dependencies on Debian such as
builder qube was Debian based, the executor qube still needs to be a Fedora builder qube was Debian based, the executor qube still needs to be a Fedora
template. template.
<!-- TODO: remove after 1 month: 2024-08-4 -->
If installation fails on non existent qubes-infrastructure-mirrors directory
during the `qubes-builder.configure` state, please
[manually pull new commits](#Pulling new commits) and then run the state
again. This issue will occur to everyone that ran the same state before
`2024-07-01`, due to [submodule addition](https://github.com/QubesOS/qubes-builderv2/commit/bc6d9a9954d985d2be3ec76ce86d44fea13d345b).
Qusal maintainer decision is not to handle such issue automatically as it
can lead to data loss in case user does manual changes, the installation would
need to `reset` the user changes and to do a clean `pull` that wouldn't fail.
After you've pulled the commit including the `.gitmodules` once, future
installations won't have this issue.
* Top: * Top:
```sh ```sh
@ -93,11 +81,12 @@ unattended build.
The installation will clone the repository but not pull new commits. You will The installation will clone the repository but not pull new commits. You will
need to pull new commits from time to time, their signature will be need to pull new commits from time to time, their signature will be
automatically verified before merging them to your git index. automatically verified them being merged to your git index.
Pull `qubes-builderv2` commits: Pull `qubes-builderv2` commits:
```sh ```sh
cd ~/src/qubes-builderv2
git pull git pull
``` ```

13
salt/qubes-builder/configure.sls
View file

@ -66,7 +66,7 @@ include:
- target: /home/user/src/qubes-builderv2 - target: /home/user/src/qubes-builderv2
- user: user - user: user
"{{ slsdotpath }}-git-clone-infrastructure-mirrors": "{{ slsdotpath }}-git-submodule-update":
cmd.run: cmd.run:
- require: - require:
- cmd: "{{ slsdotpath }}-import-keys" - cmd: "{{ slsdotpath }}-import-keys"
@ -88,7 +88,7 @@ include:
git.config_set: git.config_set:
- require: - require:
- cmd: "{{ slsdotpath }}-import-keys" - cmd: "{{ slsdotpath }}-import-keys"
- cmd: "{{ slsdotpath }}-git-clone-infrastructure-mirrors" - cmd: "{{ slsdotpath }}-git-submodule-update"
- name: gpg.program - name: gpg.program
- value: gpg-qubes-builder - value: gpg-qubes-builder
- repo: /home/user/src/qubes-builderv2/qubesbuilder/plugins/publish/mirrors - repo: /home/user/src/qubes-builderv2/qubesbuilder/plugins/publish/mirrors
@ -103,13 +103,4 @@ include:
- cwd: /home/user/src/qubes-builderv2 - cwd: /home/user/src/qubes-builderv2
- runas: user - runas: user
"{{ slsdotpath }}-git-verify-HEAD-infrastructure-mirrors":
cmd.run:
- require:
- cmd: "{{ slsdotpath }}-git-clone-infrastructure-mirrors"
- cmd: "{{ slsdotpath }}-import-ownertrust"
- name: GNUPGHOME="$HOME/.gnupg/qubes-builder" git -c gpg.program=gpg2 verify-commit "HEAD^{commit}"
- cwd: /home/user/src/qubes-builderv2/qubesbuilder/plugins/publish/mirrors
- runas: user
{% endif -%} {% endif -%}