Skip to contentSkip to conversation

meson: drop keymaps symlink

PATCH In review Gerd Hoffmann 4 participants 4 messages Aug 24, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 meson: drop keymaps symlink

We are building the keymaps by default now. Drop the keymaps symlink so the generated files are actually written to the build tree not the source tree.

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configure +1 -1
index 67832e3bab76..428fa33be140 100755
@@ -8119,7 +8119,7 @@ DIRS="$DIRS roms/seabios"
 LINKS="Makefile"
 LINKS="$LINKS tests/tcg/lm32/Makefile"
 LINKS="$LINKS tests/tcg/Makefile.target"
-LINKS="$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps"
+LINKS="$LINKS pc-bios/optionrom/Makefile"
 LINKS="$LINKS pc-bios/s390-ccw/Makefile"
 LINKS="$LINKS roms/seabios/Makefile"
 LINKS="$LINKS pc-bios/qemu-icon.bmp"
Signature · 1 line
2.27.0
Tested-by on v1 1/1
#1 lore raw
Quoted 25 lines · Gerd Hoffmann

We are building the keymaps by default now. Drop the keymaps symlink so the generated files are actually written to the build tree not the source tree.

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configure +1 -1
index 67832e3bab76..428fa33be140 100755
@@ -8119,7 +8119,7 @@ DIRS="$DIRS roms/seabios"
 LINKS="Makefile"
 LINKS="$LINKS tests/tcg/lm32/Makefile"
 LINKS="$LINKS tests/tcg/Makefile.target"
-LINKS="$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps"
+LINKS="$LINKS pc-bios/optionrom/Makefile"
 LINKS="$LINKS pc-bios/s390-ccw/Makefile"
 LINKS="$LINKS roms/seabios/Makefile"
 LINKS="$LINKS pc-bios/qemu-icon.bmp"
Signature · 1 line
2.27.0

Awesome! This fixes cluttering of the source tree with changed pc-bios/keymaps/ files for me.

Tested-by on v1 1/1
#2 lore raw
In reply to Gerd Hoffmann
Quoted 15 lines · Gerd Hoffmann

We are building the keymaps by default now. Drop the keymaps symlink so the generated files are actually written to the build tree not the source tree.

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configure +0 -0
index 67832e3bab76..428fa33be140 100755

configure DIRS="$DIRS roms/seabios" · line 8125

Quoted 8 lines
configure +1 -1
@@ -8119,7 +8119,7 @@ DIRS="$DIRS roms/seabios"
 LINKS="Makefile"
 LINKS="$LINKS tests/tcg/lm32/Makefile"
 LINKS="$LINKS tests/tcg/Makefile.target"
-LINKS="$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps"
+LINKS="$LINKS pc-bios/optionrom/Makefile"
 LINKS="$LINKS pc-bios/s390-ccw/Makefile"
 LINKS="$LINKS roms/seabios/Makefile"
 LINKS="$LINKS pc-bios/qemu-icon.bmp"

This fixes the annoying pc-bios/keymaps/* file changes every time after a new build. Thanks!

Regards,
Bin

Reviewed-by on v1 1/1
#3 lore raw
In reply to Gerd Hoffmann
Quoted 6 lines · Gerd Hoffmann

We are building the keymaps by default now. Drop the keymaps symlink so the generated files are actually written to the build tree not the source tree.

Alistair

Quoted 21 lines
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configure +1 -2
index 67832e3bab76..428fa33be140 100755
@@ -8119,7 +8119,7 @@ DIRS="$DIRS roms/seabios"
 LINKS="Makefile"
 LINKS="$LINKS tests/tcg/lm32/Makefile"
 LINKS="$LINKS tests/tcg/Makefile.target"
-LINKS="$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps"
+LINKS="$LINKS pc-bios/optionrom/Makefile"
 LINKS="$LINKS pc-bios/s390-ccw/Makefile"
 LINKS="$LINKS roms/seabios/Makefile"
 LINKS="$LINKS pc-bios/qemu-icon.bmp"
--

2.27.0