diff options
| author | Arve Hjønnevåg <arve@android.com> | 2022-04-25 12:08:37 -0700 |
|---|---|---|
| committer | Stephen Crane <cranes@google.com> | 2023-05-02 07:35:15 +0000 |
| commit | b92208892bd362985d91b9e9bce69c59b4e76be8 (patch) | |
| tree | 8ebe22ea85e8380857604c6ba56d5c7e7bdcfa76 | |
| parent | 7b83014511e14a9fc45c75b2fad29a50da7ce961 (diff) | |
| download | qemu-merge-test.tar.gz | |
gitmodules: Restore but rename upstream .gitmodulesHEADmerge-testmastermain
Rename .gitmodules to .gitmodules.unused since our tools/servers don't
support .gitmodules from external projects. Also restore the entries we
removed before. Hopefully this will produce fewer merge conflicts while
still allowing us to replace the needed submodlues with symlinks to
other projects in our manifest.
Bug: 230374325
Change-Id: I833c0c4ad407471ea331ca0b21b6a6f9a5d4535d
| -rw-r--r-- | .gitmodules.unused (renamed from .gitmodules) | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules.unused index 7bc0c50811..6b91176098 100644 --- a/.gitmodules +++ b/.gitmodules.unused @@ -19,6 +19,9 @@ [submodule "roms/sgabios"] path = roms/sgabios url = https://git.qemu.org/git/sgabios.git +[submodule "dtc"] + path = dtc + url = https://git.qemu.org/git/dtc.git [submodule "roms/u-boot"] path = roms/u-boot url = https://git.qemu.org/git/u-boot.git @@ -28,6 +31,12 @@ [submodule "roms/QemuMacDrivers"] path = roms/QemuMacDrivers url = https://git.qemu.org/git/QemuMacDrivers.git +[submodule "ui/keycodemapdb"] + path = ui/keycodemapdb + url = https://git.qemu.org/git/keycodemapdb.git +[submodule "capstone"] + path = capstone + url = https://git.qemu.org/git/capstone.git [submodule "roms/seabios-hppa"] path = roms/seabios-hppa url = https://github.com/hdeller/seabios-hppa.git |