-
Notifications
You must be signed in to change notification settings - Fork 652
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
meson: fix incorrect substitutions in configured files
The custom Makefile rules performed this substitution: @@var@@ -> VAL However, meson did this substitution: @@var@@ -> @Val@ This produced incorrect behavior, such as configuring a udev file to read: install_items+=" @/usr/etc/udev/rules.d@/70-nvmf-autoconnect.rules " muon, meanwhile, failed loudly with: /tmp/nvme-cli/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in:1:19: error: key of zero length not supported 1 | install_items+=" @@UDEVRULESDIR@@/70-nvmf-autoconnect.rules " ^ /tmp/nvme-cli/meson.build:161:1: error: in function configure_file 161 | configure_file( ^ Since meson does not support custom token rules for configuring replacements, and there is no real benefit to doubling the @@, just fix this to use one @.
- Loading branch information
1 parent
6e6e4ea
commit bdec225
Showing
4 changed files
with
9 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
Package: nvme | ||
Version: @@VERSION@@ | ||
Version: @VERSION@ | ||
Section: base | ||
Priority: optional | ||
Architecture: amd64 | ||
Depends: @@DEPENDS@@ | ||
Depends: @DEPENDS@ | ||
Maintainer: Keith Busch <kbusch@kernel.org> | ||
Description: NVM-Express Command Line Interface | ||
The nvme management tool |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
install_items+=" @@UDEVRULESDIR@@/70-nvmf-autoconnect.rules " | ||
install_items+=" @UDEVRULESDIR@/70-nvmf-autoconnect.rules " |