| Message ID | 1438601749-5557-1-git-send-email-maxim.uvarov@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 3 August 2015 at 07:35, Maxim Uvarov <maxim.uvarov@linaro.org> wrote: > git_hash.sh is used to generate version string. Each platform > should have it's own version of that script. > > Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> > I think that this patch makes it easier for all platforms to co exist with the same upper level code and that feels right. Reviewed-by: Mike Holmes <mike.holmes@linaro.org> --- > configure.ac | 2 +- > platform/Makefile.inc | 2 +- > {scripts => platform/linux-generic/scripts}/Makefile.am | 0 > {scripts => platform/linux-generic/scripts}/git_hash.sh | 0 > 4 files changed, 2 insertions(+), 2 deletions(-) > rename {scripts => platform/linux-generic/scripts}/Makefile.am (100%) > rename {scripts => platform/linux-generic/scripts}/git_hash.sh (100%) > > diff --git a/configure.ac b/configure.ac > index 24a3fa1..8b535be 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -300,7 +300,7 @@ AC_CONFIG_FILES([Makefile > pkgconfig/libodphelper.pc > platform/linux-generic/Makefile > platform/linux-generic/test/pktio/Makefile > - scripts/Makefile > + platform/linux-generic/scripts/Makefile > test/Makefile > test/api_test/Makefile > test/performance/Makefile > diff --git a/platform/Makefile.inc b/platform/Makefile.inc > index f64e37c..f26a8c5 100644 > --- a/platform/Makefile.inc > +++ b/platform/Makefile.inc > @@ -12,6 +12,6 @@ lib_LTLIBRARIES = $(LIB)/libodp.la > > AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)' > > -GIT_DESC = `$(top_srcdir)/scripts/git_hash.sh` > +GIT_DESC = `$(top_srcdir)/platform/linux-generic/scripts/git_hash.sh` > AM_CFLAGS += "-DGIT_HASH=$(GIT_DESC)" > AM_CFLAGS += -DPLATFORM=${with_platform} > diff --git a/scripts/Makefile.am > b/platform/linux-generic/scripts/Makefile.am > similarity index 100% > rename from scripts/Makefile.am > rename to platform/linux-generic/scripts/Makefile.am > diff --git a/scripts/git_hash.sh > b/platform/linux-generic/scripts/git_hash.sh > similarity index 100% > rename from scripts/git_hash.sh > rename to platform/linux-generic/scripts/git_hash.sh > -- > 1.9.1 > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/lng-odp >
diff --git a/configure.ac b/configure.ac index 24a3fa1..8b535be 100644 --- a/configure.ac +++ b/configure.ac @@ -300,7 +300,7 @@ AC_CONFIG_FILES([Makefile pkgconfig/libodphelper.pc platform/linux-generic/Makefile platform/linux-generic/test/pktio/Makefile - scripts/Makefile + platform/linux-generic/scripts/Makefile test/Makefile test/api_test/Makefile test/performance/Makefile diff --git a/platform/Makefile.inc b/platform/Makefile.inc index f64e37c..f26a8c5 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -12,6 +12,6 @@ lib_LTLIBRARIES = $(LIB)/libodp.la AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)' -GIT_DESC = `$(top_srcdir)/scripts/git_hash.sh` +GIT_DESC = `$(top_srcdir)/platform/linux-generic/scripts/git_hash.sh` AM_CFLAGS += "-DGIT_HASH=$(GIT_DESC)" AM_CFLAGS += -DPLATFORM=${with_platform}
git_hash.sh is used to generate version string. Each platform should have it's own version of that script. Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> --- configure.ac | 2 +- platform/Makefile.inc | 2 +- {scripts => platform/linux-generic/scripts}/Makefile.am | 0 {scripts => platform/linux-generic/scripts}/git_hash.sh | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename {scripts => platform/linux-generic/scripts}/Makefile.am (100%) rename {scripts => platform/linux-generic/scripts}/git_hash.sh (100%) diff --git a/scripts/Makefile.am b/platform/linux-generic/scripts/Makefile.am similarity index 100% rename from scripts/Makefile.am rename to platform/linux-generic/scripts/Makefile.am diff --git a/scripts/git_hash.sh b/platform/linux-generic/scripts/git_hash.sh similarity index 100% rename from scripts/git_hash.sh rename to platform/linux-generic/scripts/git_hash.sh