[5/6] build/meson: change linuxapp to linux in meson cross files

Message ID 20190306162242.65375-6-bruce.richardson@intel.com
State Accepted, archived
Delegated to: Thomas Monjalon
Headers show
Series
  • change legacy linuxapp/bsdapp names
Related show

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Bruce Richardson March 6, 2019, 4:22 p.m.
Rename the cross files for meson compilation from having linuxapp
in the name to just linux in the name.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 .../arm/{arm64_armv8_linuxapp_gcc => arm64_armv8_linux_gcc}   | 0
 .../arm/{arm64_dpaa2_linuxapp_gcc => arm64_dpaa2_linux_gcc}   | 0
 config/arm/{arm64_dpaa_linuxapp_gcc => arm64_dpaa_linux_gcc}  | 0
 .../{arm64_thunderx_linuxapp_gcc => arm64_thunderx_linux_gcc} | 0
 devtools/test-meson-builds.sh                                 | 2 +-
 doc/build-sdk-meson.txt                                       | 4 ++--
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename config/arm/{arm64_armv8_linuxapp_gcc => arm64_armv8_linux_gcc} (100%)
 rename config/arm/{arm64_dpaa2_linuxapp_gcc => arm64_dpaa2_linux_gcc} (100%)
 rename config/arm/{arm64_dpaa_linuxapp_gcc => arm64_dpaa_linux_gcc} (100%)
 rename config/arm/{arm64_thunderx_linuxapp_gcc => arm64_thunderx_linux_gcc} (100%)

Patch

diff --git a/config/arm/arm64_armv8_linuxapp_gcc b/config/arm/arm64_armv8_linux_gcc
similarity index 100%
rename from config/arm/arm64_armv8_linuxapp_gcc
rename to config/arm/arm64_armv8_linux_gcc
diff --git a/config/arm/arm64_dpaa2_linuxapp_gcc b/config/arm/arm64_dpaa2_linux_gcc
similarity index 100%
rename from config/arm/arm64_dpaa2_linuxapp_gcc
rename to config/arm/arm64_dpaa2_linux_gcc
diff --git a/config/arm/arm64_dpaa_linuxapp_gcc b/config/arm/arm64_dpaa_linux_gcc
similarity index 100%
rename from config/arm/arm64_dpaa_linuxapp_gcc
rename to config/arm/arm64_dpaa_linux_gcc
diff --git a/config/arm/arm64_thunderx_linuxapp_gcc b/config/arm/arm64_thunderx_linux_gcc
similarity index 100%
rename from config/arm/arm64_thunderx_linuxapp_gcc
rename to config/arm/arm64_thunderx_linux_gcc
diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index e59474d53..f81a71434 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -51,7 +51,7 @@  if command -v $c >/dev/null 2>&1 ; then
 	# compile the general v8a also for clang to increase coverage
 	export CC="ccache clang"
 	build build-arm64-host-clang $use_shared \
-		--cross-file config/arm/arm64_armv8_linuxapp_gcc
+		--cross-file config/arm/arm64_armv8_linux_gcc
 
 	for f in config/arm/arm*gcc ; do
 		export CC="ccache gcc"
diff --git a/doc/build-sdk-meson.txt b/doc/build-sdk-meson.txt
index 0a3316386..912cb3a8c 100644
--- a/doc/build-sdk-meson.txt
+++ b/doc/build-sdk-meson.txt
@@ -157,9 +157,9 @@  command::
 
 For example if the target machine is arm64 we can use the following
 command::
-	meson arm-build --cross-file config/arm/arm64_armv8_linuxapp_gcc
+	meson arm-build --cross-file config/arm/arm64_armv8_linux_gcc
 
-where config/arm/arm64_armv8_linuxapp_gcc contains the following
+where config/arm/arm64_armv8_linux_gcc contains the following
 parameters::
 
 	[binaries]