[Sound-open-firmware] [PATCH] configure: reset build count every time autogen.sh is run.
autogen.sh rebuilds the build system so also reset any build count to 0.
Signed-off-by: Liam Girdwood liam.r.girdwood@linux.intel.com --- autogen.sh | 1 + configure.ac | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/autogen.sh b/autogen.sh index 3b379b6..e0ce846 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,5 @@ #!/bin/bash +rm -f .build libtoolize -c --force aclocal -I m4 --install autoconf -Wall diff --git a/configure.ac b/configure.ac index e8c8edf..f51849b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,5 @@ - AC_PREREQ([2.69]) -AC_INIT([Reef],[m4_esyscmd(./git-version.sh), m4_esyscmd(rm -f .build)],[sound-open-firmware@alsa-project.org]) +AC_INIT([Reef],[m4_esyscmd(./git-version.sh)],[sound-open-firmware@alsa-project.org]) AC_CONFIG_SRCDIR([src/init/init.c]) AC_CONFIG_HEADERS([src/include/config.h]) AC_CONFIG_MACRO_DIRS([m4])
AC_INIT needs version information for building shared libraries.
Signed-off-by: Liam Girdwood liam.r.girdwood@linux.intel.com --- git-version.sh | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/git-version.sh b/git-version.sh index c6beb40..faa0daa 100755 --- a/git-version.sh +++ b/git-version.sh @@ -20,3 +20,5 @@ fi echo $num > .build echo "#define REEF_BUILD $num" >> src/include/version.h
+#echo version for AC_INIT +echo -n `cat .version | cut -dv -f2 | cut -d. -f1`:`cat .version | cut -d. -f2 | cut -d- -f1`
Always runs AM_CONDITIONAL macros as placing inside conditional logic can confuse autotools.
Signed-off-by: Liam Girdwood liam.r.girdwood@linux.intel.com --- configure.ac | 18 +++++++----------- src/arch/xtensa/xtos/Makefile.am | 4 ++-- 2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/configure.ac b/configure.ac index f51849b..091cc69 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,6 @@ AC_ARG_WITH([arch],
case "$with_arch" in xtensa*) - AM_CONDITIONAL(BUILD_XTENSA, true)
ARCH_CFLAGS="-mtext-section-literals" AC_SUBST(ARCH_CFLAGS) @@ -58,6 +57,8 @@ case "$with_arch" in ;; esac
+AM_CONDITIONAL(BUILD_XTENSA, test "$ARCH" = "xtensa") +
# Platform support AC_ARG_WITH([platform], @@ -66,11 +67,6 @@ AC_ARG_WITH([platform],
case "$with_platform" in baytrail*) - AM_CONDITIONAL(BUILD_BAYTRAIL, true) - AM_CONDITIONAL(BUILD_CHERRYTRAIL, false) - AM_CONDITIONAL(BUILD_HASWELL, false) - AM_CONDITIONAL(BUILD_BROADWELL, false) - AM_CONDITIONAL(BUILD_BROXTON, false)
PLATFORM_LDSCRIPT="baytrail.x" AC_SUBST(PLATFORM_LDSCRIPT) @@ -87,11 +83,6 @@ case "$with_platform" in AC_DEFINE([CONFIG_BAYTRAIL], [1], [Configure for Baytrail]) ;; cherrytrail*) - AM_CONDITIONAL(BUILD_BAYTRAIL, false) - AM_CONDITIONAL(BUILD_CHERRYTRAIL, true) - AM_CONDITIONAL(BUILD_HASWELL, false) - AM_CONDITIONAL(BUILD_BROADWELL, false) - AM_CONDITIONAL(BUILD_BROXTON, false)
PLATFORM_LDSCRIPT="baytrail.x" AC_SUBST(PLATFORM_LDSCRIPT) @@ -112,6 +103,11 @@ case "$with_platform" in ;; esac
+AM_CONDITIONAL(BUILD_BAYTRAIL, test "$FW_NAME" = "byt") +AM_CONDITIONAL(BUILD_CHERRYTRAIL, test "$FW_NAME" = "cht") +AM_CONDITIONAL(BUILD_HASWELL, test "$FW_NAME" = "hsw") +AM_CONDITIONAL(BUILD_BROADWELL, test "$FW_NAME" = "bdw") +AM_CONDITIONAL(BUILD_APOLLOLAKE, test "$FW_NAME" = "apl") # DSP core support (Optional) AC_ARG_WITH([dsp-core], AS_HELP_STRING([--with-dsp-core], [Specify DSP Core]), diff --git a/src/arch/xtensa/xtos/Makefile.am b/src/arch/xtensa/xtos/Makefile.am index 19dbcd6..6bf882e 100644 --- a/src/arch/xtensa/xtos/Makefile.am +++ b/src/arch/xtensa/xtos/Makefile.am @@ -24,7 +24,7 @@ if BUILD_CHERRYTRAIL PLATFORM_DEFS = $(VECTOR_DEFS) endif
-if BUILD_BROXTON +if BUILD_APOLLOLAKE PLATFORM_DEFS = $(VECTOR_DEFS) lib_LIBRARIES += libxlevel6.a VECTOR_DEFS += -D__SPLIT__level6 @@ -83,7 +83,7 @@ libxlevel5_a_CCASFLAGS = \ $(PLATFORM_DEFS) \ -D_INTERRUPT_LEVEL=5
-if BUILD_BROXTON +if BUILD_APOLLOLAKE libxlevel6_a_SOURCES = \ $(LEVEL_SRC)
Signed-off-by: Liam Girdwood liam.r.girdwood@linux.intel.com --- src/include/uapi/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/include/uapi/Makefile.am b/src/include/uapi/Makefile.am index c4c2fe6..103d692 100644 --- a/src/include/uapi/Makefile.am +++ b/src/include/uapi/Makefile.am @@ -1,3 +1,7 @@ +includedir = $(prefix)/include/sof + include_HEADERS = \ ipc.h \ - abi.h + abi.h \ + eq.h \ + tone.h
On 11/30/17 5:29 AM, Liam Girdwood wrote:
autogen.sh rebuilds the build system so also reset any build count to 0.
what happens if you run
./configure --with-platform=baytrail make ./configure --with-platform=cherrytrail make
Looks to me like the build count will be misleading?
Signed-off-by: Liam Girdwood liam.r.girdwood@linux.intel.com
autogen.sh | 1 + configure.ac | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/autogen.sh b/autogen.sh index 3b379b6..e0ce846 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,5 @@ #!/bin/bash +rm -f .build libtoolize -c --force aclocal -I m4 --install autoconf -Wall diff --git a/configure.ac b/configure.ac index e8c8edf..f51849b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,5 @@
- AC_PREREQ([2.69])
-AC_INIT([Reef],[m4_esyscmd(./git-version.sh), m4_esyscmd(rm -f .build)],[sound-open-firmware@alsa-project.org]) +AC_INIT([Reef],[m4_esyscmd(./git-version.sh)],[sound-open-firmware@alsa-project.org]) AC_CONFIG_SRCDIR([src/init/init.c]) AC_CONFIG_HEADERS([src/include/config.h]) AC_CONFIG_MACRO_DIRS([m4])
On Thu, 2017-11-30 at 10:39 -0600, Pierre-Louis Bossart wrote:
On 11/30/17 5:29 AM, Liam Girdwood wrote:
autogen.sh rebuilds the build system so also reset any build count to 0.
what happens if you run
./configure --with-platform=baytrail make ./configure --with-platform=cherrytrail make
Looks to me like the build count will be misleading?
IMO this is not really for versioning, but just a number that is meaningful/useful only to the developer. i.e. as a way to track running development binaries match the last build. Using autgen.sh just allows the number to grow so that we don't see lots of build 0 when testing changes on multiple platforms.
Liam
On 11/30/17 1:44 PM, Liam Girdwood wrote:
On Thu, 2017-11-30 at 10:39 -0600, Pierre-Louis Bossart wrote:
On 11/30/17 5:29 AM, Liam Girdwood wrote:
autogen.sh rebuilds the build system so also reset any build count to 0.
what happens if you run
./configure --with-platform=baytrail make ./configure --with-platform=cherrytrail make
Looks to me like the build count will be misleading?
IMO this is not really for versioning, but just a number that is meaningful/useful only to the developer. i.e. as a way to track running development binaries match the last build. Using autgen.sh just allows the number to grow so that we don't see lots of build 0 when testing changes on multiple platforms.
Fair-enough. I still think we should have a platform identifier matching the build configuration to detect potential issues, e.g. using a baytrail firmware for a cherrytrail device.
participants (2)
-
Liam Girdwood -
Pierre-Louis Bossart