| Message ID | 1433879197-15307-1-git-send-email-mike.holmes@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 2015-06-09 15:46, Mike Holmes wrote: > Signed-off-by: Mike Holmes <mike.holmes@linaro.org> > --- > apply-and-build.sh | 2 ++ > build.sh | 2 ++ > helper/generic | 4 ++++ > 3 files changed, 8 insertions(+) > > diff --git a/apply-and-build.sh b/apply-and-build.sh > index 5c30e8c..a02e446 100755 > --- a/apply-and-build.sh > +++ b/apply-and-build.sh > @@ -56,6 +56,8 @@ PLATFORM=${PLATFORM:-linux-generic} > [[ ${ENABLE_NETMAP} -eq 1 ]] && PLATFORM="linux-netmap" > [[ ${ENABLE_DPDK} -eq 1 ]] && PLATFORM="linux-dpdk" > > +display_os > + > prepare_platform > > GPLATFORM="--with-platform=${PLATFORM}" > diff --git a/build.sh b/build.sh > index 045bdd2..113cc0e 100755 > --- a/build.sh > +++ b/build.sh > @@ -118,6 +118,8 @@ cleanup_exit() > ###### > # Main execution > > +display_os > + > prepare_platform > > if [[ "x$1" = "x-h" || "x$1" = "x--help" ]]; then > diff --git a/helper/generic b/helper/generic > index 1866ef0..b3b0fa2 100644 > --- a/helper/generic > +++ b/helper/generic > @@ -33,6 +33,10 @@ common_usage() { > echo -e "\tDISTCHECK:\t set to 1 to enable DISTCHECK build, default: 0" > } > > +display_os(){ > + cat /etc/*-release | uniq -u > +} > + > remote_name(){ > retval=$(echo ${1} |tr ':/.-' '_') > echo "${retval}" > -- > 2.1.4 > Applied. Cheers, Anders
diff --git a/apply-and-build.sh b/apply-and-build.sh index 5c30e8c..a02e446 100755 --- a/apply-and-build.sh +++ b/apply-and-build.sh @@ -56,6 +56,8 @@ PLATFORM=${PLATFORM:-linux-generic} [[ ${ENABLE_NETMAP} -eq 1 ]] && PLATFORM="linux-netmap" [[ ${ENABLE_DPDK} -eq 1 ]] && PLATFORM="linux-dpdk" +display_os + prepare_platform GPLATFORM="--with-platform=${PLATFORM}" diff --git a/build.sh b/build.sh index 045bdd2..113cc0e 100755 --- a/build.sh +++ b/build.sh @@ -118,6 +118,8 @@ cleanup_exit() ###### # Main execution +display_os + prepare_platform if [[ "x$1" = "x-h" || "x$1" = "x--help" ]]; then diff --git a/helper/generic b/helper/generic index 1866ef0..b3b0fa2 100644 --- a/helper/generic +++ b/helper/generic @@ -33,6 +33,10 @@ common_usage() { echo -e "\tDISTCHECK:\t set to 1 to enable DISTCHECK build, default: 0" } +display_os(){ + cat /etc/*-release | uniq -u +} + remote_name(){ retval=$(echo ${1} |tr ':/.-' '_') echo "${retval}"
Signed-off-by: Mike Holmes <mike.holmes@linaro.org> --- apply-and-build.sh | 2 ++ build.sh | 2 ++ helper/generic | 4 ++++ 3 files changed, 8 insertions(+)