From c2ecca9f2a16dc35a268eb94ea2b8c03584b4a22 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 15 Mar 2020 01:24:07 -0500 Subject: meta: Handle underscores in architecture names Otherwise, x86_64 and aarch64_be fail instantly: installfile:6: error: arch: expected CPU architecture name: 'x86_64' is not a valid CPU architecture name --- hscript/meta.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hscript/meta.cc b/hscript/meta.cc index 8fedb32..2f4e4eb 100644 --- a/hscript/meta.cc +++ b/hscript/meta.cc @@ -179,7 +179,7 @@ static std::set valid_arches = { Key *Arch::parseFromData(const std::string &data, int lineno, int *errors, int *warnings, const Script *script) { - if(data.find_first_not_of("abcdefghijklmnopqrstuvwyxz1234567890") != + if(data.find_first_not_of("abcdefghijklmnopqrstuvwyxz1234567890_") != std::string::npos) { if(errors) *errors += 1; output_error("installfile:" + std::to_string(lineno), -- cgit v1.2.3-70-g09d2