infra: Add generic check_prog_host function
PATCH v2 1/2 infra: Add generic check_prog_host function
Avoid copy/pasting the same block of code to check if a program is available on the host machine.
Also, introduce, BR2_NEEDS_HOST_JAVAC and BR2_NEEDS_HOST_JAR. In a following patch, we will remove the specific check done for classpath, and the classpath package will use these generic variant.
---
Changes v1 -> v2:
- Uses check_prog_host for which and sed too (Thomas Petazzoni)
--- Config.in | 10 ++++++++++ support/dependencies/dependencies.sh | 38 +++++++++++++++++++++--------------- 2 files changed, 32 insertions(+), 16 deletions(-)
Config.in +10 -0
@@ -23,6 +23,16 @@ config BR2_EXTERNAL config BR2_NEEDS_HOST_JAVA bool +# Hidden boolean selected by packages in need of javac in order to build +# (example: classpath) +config BR2_NEEDS_HOST_JAVAC + bool + +# Hidden boolean selected by packages in need of jar in order to build +# (example: classpath) +config BR2_NEEDS_HOST_JAR + bool + # Hidden boolean selected by pre-built packages for x86, when they # need to run on x86-64 machines (example: pre-built external # toolchains, binary tools like SAM-BA, etc.).
support/dependencies/dependencies.sh +22 -16
@@ -51,18 +51,20 @@ if test -n "$PERL_MM_OPT" ; then exit 1 fi -# Verify that which is installed -if ! which which > /dev/null ; then - echo - echo "You must install 'which' on your build machine"; - exit 1; -fi; +check_prog_host() +{ + prog="$1" + if ! which $prog > /dev/null ; then + echo >&2 + echo "You must install '$prog' on your build machine" >&2 + exit 1 + fi +} -if ! which sed > /dev/null ; then - echo - echo "You must install 'sed' on your build machine" - exit 1 -fi +# Verify that which is installed +check_prog_host "which" +# Verify that sed is installed +check_prog_host "sed" # Check make MAKE=$(which make 2> /dev/null)
@@ -192,11 +194,15 @@ if grep -q ^BR2_PACKAGE_CLASSPATH=y $BR2_CONFIG ; then fi if grep -q ^BR2_NEEDS_HOST_JAVA=y $BR2_CONFIG ; then - if ! which java > /dev/null ; then - echo >&2 - echo "You must install 'java' on your build machine" >&2 - exit 1 - fi + check_prog_host "java" +fi + +if grep -q ^BR2_NEEDS_HOST_JAVAC=y $BR2_CONFIG ; then + check_prog_host "javac" +fi + +if grep -q ^BR2_NEEDS_HOST_JAR=y $BR2_CONFIG ; then + check_prog_host "jar" fi if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BR2_CONFIG ; then
Signature · 1 line
1.8.5.3
PATCH v2 2/2 classpath: Use generic check for host program
Remove the specific check that was done in dependencies.sh to use the generic one that were introduced by the previous patch.
---
Changes v1 -> v2:
- None
--- package/classpath/Config.in | 2 ++ support/dependencies/dependencies.sh | 10 ---------- 2 files changed, 2 insertions(+), 10 deletions(-)
package/classpath/Config.in +2 -0
@@ -1,5 +1,7 @@ config BR2_PACKAGE_CLASSPATH bool "classpath" + select BR2_HOST_NEEDS_JAVAC + select BR2_HOST_NEEDS_JAR depends on BR2_PACKAGE_JAMVM depends on BR2_INET_IPV6 help
support/dependencies/dependencies.sh +0 -10
@@ -183,16 +183,6 @@ if grep ^BR2_TOOLCHAIN_BUILDROOT=y $BR2_CONFIG > /dev/null && \ fi fi -if grep -q ^BR2_PACKAGE_CLASSPATH=y $BR2_CONFIG ; then - for prog in javac jar; do - if ! which $prog > /dev/null ; then - echo >&2 - echo "You must install '$prog' on your build machine" >&2 - exit 1 - fi - done -fi - if grep -q ^BR2_NEEDS_HOST_JAVA=y $BR2_CONFIG ; then check_prog_host "java" fi
Signature · 1 line
1.8.5.3
PATCH v2 1/2 infra: Add generic check_prog_host function
In reply to Maxime HadjinlianDear Maxime Hadjinlian,
support/dependencies/dependencies.sh if test -n "$PERL_MM_OPT" ; then · line 65
Quoted 2 lines · Maxime Hadjinlian
support/dependencies/dependencies.sh +2
-0+# Verify that which is installed +check_prog_host "which"
Since your function check_prog_host uses which to determine if the program exists, isn't it weird to use which to verify it?
Your check_host_prog function could also be used in:
# Check that a few mandatory programs are installed
missing_progs="no"
for prog in patch perl tar wget cpio python unzip rsync bc ${DL_TOOLS} ; do
if ! which $prog > /dev/null ; then
echo "You must install '$prog' on your build machine"; missing_progs="yes"
if test $prog = "svn" ; then
echo " svn is usually part of the subversion package in your distribution"
elif test $prog = "hg" ; then
echo " hg is usually part of the mercurial package in your distribution"
elif test $prog = "zcat" ; then
echo " zcat is usually part of the gzip package in your distribution"
elif test $prog = "bzcat" ; then
echo " bzcat is usually part of the bzip2 package in your distribution"
fi
fi
done
if test "${missing_progs}" = "yes" ; then
exit 1
fi
Though you see that this loop has this missing_progs variable that allows to list all the missing programs, and only abort at the end.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v2 1/2 infra: Add generic check_prog_host function
Quoted 9 lines · Thomas Petazzoni
Dear Maxime Hadjinlian,
support/dependencies/dependencies.sh if test -n "$PERL_MM_OPT" ; then · line 65
Quoted 2 lines · Maxime Hadjinlian
support/dependencies/dependencies.sh +2
-0+# Verify that which is installed +check_prog_host "which"Since your function
check_prog_hostuses which to determine if the program exists, isn't it weird to use which to verify it?
Agreed but that was the original check also which I found a little in the first place. But since this patch is here only to introduce and use a function, I didn't see how to change that here.
Quoted 21 lines
Your
check_host_progfunction could also be used in:# Check that a few mandatory programs are installed
missing_progs="no"
for prog in patch perl tar wget cpio python unzip rsync bc ${DL_TOOLS} ; do
if ! which $prog >/dev/null; then
echo "You must install '$prog' on your build machine"; missing_progs="yes"
if test $prog = "svn" ; then
echo " svn is usually part of the subversion package in your distribution"
elif test $prog = "hg" ; then
echo " hg is usually part of the mercurial package in your distribution"
elif test $prog = "zcat" ; then
echo " zcat is usually part of the gzip package in your distribution"
elif test $prog = "bzcat" ; then
echo " bzcat is usually part of the bzip2 package in your distribution"
fi
fi
done
Quoted 6 lines
if test "${missing_progs}" = "yes" ; then
exit 1
fiThough you see that this loop has this
missing_progsvariable that allows to list all the missing programs, and only abort at the end.
I wanted to keep this one as is for the moment.
As you point out, it uses the exact mechanisms we want for all the dependencies.sh, and it would be part of a follow up patch later one, which would uses the same mechanisms but all over the dependencies.sh. Which is want we want in the end.
This first patch is mostly a follow up of the previous one, which added the BR2_NEEDS_HOST_JAVA
Quoted 6 lines
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
PATCH v2 1/2 infra: Add generic check_prog_host function
Hi all,
Quoted 41 lines · Maxime Hadjinlian
Quoted 9 lines · Thomas Petazzoni
Dear Maxime Hadjinlian,
support/dependencies/dependencies.sh if test -n "$PERL_MM_OPT" ; then · line 65
Quoted 2 lines · Maxime Hadjinlian
support/dependencies/dependencies.sh +2
-0+# Verify that which is installed +check_prog_host "which"Since your function
check_prog_hostuses which to determine if the program exists, isn't it weird to use which to verify it?Agreed but that was the original check also which I found a little in the first place. But since this patch is here only to introduce and use a function, I didn't see how to change that here.
Quoted 21 lines
Your
check_host_progfunction could also be used in:# Check that a few mandatory programs are installed
missing_progs="no"
for prog in patch perl tar wget cpio python unzip rsync bc ${DL_TOOLS} ; do
if ! which $prog >/dev/null; then
echo "You must install '$prog' on your build machine"; missing_progs="yes"
if test $prog = "svn" ; then
echo " svn is usually part of the subversion package in your distribution"
elif test $prog = "hg" ; then
echo " hg is usually part of the mercurial package in your distribution"
elif test $prog = "zcat" ; then
echo " zcat is usually part of the gzip package in your distribution"
elif test $prog = "bzcat" ; then
echo " bzcat is usually part of the bzip2 package in your distribution"
fi
fi
doneQuoted 6 lines
if test "${missing_progs}" = "yes" ; then
exit 1
fiThough you see that this loop has this
missing_progsvariable that allows to list all the missing programs, and only abort at the end.
Quoted 13 lines
I wanted to keep this one as is for the moment.
As you point out, it uses the exact mechanisms we want for all thedependencies.sh, and it would be part of a follow up patch later one, which would uses the same mechanisms but all over thedependencies.sh. Which is want we want in the end.
This first patch is mostly a follow up of the previous one, which added theBR2_NEEDS_HOST_JAVAQuoted 6 lines
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Just a bump.
Thomas, if I remember correctly, you were not opposed to this patch ? As explained, it has been found that dependencies.sh needs a few other rounds of patch so it would be better shaped, but that can be done later.
PATCH v2 1/2 infra: Add generic check_prog_host function
Hi Maxime,
Quoted 59 lines · Maxime Hadjinlian
Hi all,
Quoted 41 lines · Maxime Hadjinlian
Quoted 9 lines · Thomas Petazzoni
Dear Maxime Hadjinlian,
support/dependencies/dependencies.sh if test -n "$PERL_MM_OPT" ; then · line 65
Quoted 2 lines · Maxime Hadjinlian
support/dependencies/dependencies.sh +2
-0+# Verify that which is installed +check_prog_host "which"Since your function
check_prog_hostuses which to determine if the program exists, isn't it weird to use which to verify it?Agreed but that was the original check also which I found a little in the first place. But since this patch is here only to introduce and use a function, I didn't see how to change that here.
Quoted 21 lines
Your
check_host_progfunction could also be used in:# Check that a few mandatory programs are installed
missing_progs="no"
for prog in patch perl tar wget cpio python unzip rsync bc ${DL_TOOLS} ; do
if ! which $prog >/dev/null; then
echo "You must install '$prog' on your build machine"; missing_progs="yes"
if test $prog = "svn" ; then
echo " svn is usually part of the subversion package in your distribution"
elif test $prog = "hg" ; then
echo " hg is usually part of the mercurial package in your distribution"
elif test $prog = "zcat" ; then
echo " zcat is usually part of the gzip package in your distribution"
elif test $prog = "bzcat" ; then
echo " bzcat is usually part of the bzip2 package in your distribution"
fi
fi
doneQuoted 6 lines
if test "${missing_progs}" = "yes" ; then
exit 1
fiThough you see that this loop has this
missing_progsvariable that allows to list all the missing programs, and only abort at the end.Quoted 13 lines
I wanted to keep this one as is for the moment.
As you point out, it uses the exact mechanisms we want for all thedependencies.sh, and it would be part of a follow up patch later one, which would uses the same mechanisms but all over thedependencies.sh. Which is want we want in the end.
This first patch is mostly a follow up of the previous one, which added theBR2_NEEDS_HOST_JAVAQuoted 6 lines
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Quoted 5 lines
Just a bump.
Thomas, if I remember correctly, you were not opposed to this patch ? As explained, it has been found thatdependencies.shneeds a few other rounds of patch so it would be better shaped, but that can be done later.
Is there a particular reason why the first part of the make check is not using check_prog_host ?
Another comment is that I find the split between this and the second patch (classpath) strange: I would move the addition of BR2_NEEDS_HOST_JAVAC / JAR to that second patch.
Best regards,
Thomas
PATCH v2 1/2 infra: Add generic check_prog_host function
Hi Thomas, all
Quoted 63 lines · Thomas De Schampheleire
Hi Maxime,
Quoted 59 lines · Maxime Hadjinlian
Hi all,
Quoted 54 lines · Maxime Hadjinlian
Quoted 9 lines · Thomas Petazzoni
Dear Maxime Hadjinlian,
support/dependencies/dependencies.sh if test -n "$PERL_MM_OPT" ; then · line 65
Quoted 2 lines · Maxime Hadjinlian
support/dependencies/dependencies.sh +2
-0+# Verify that which is installed +check_prog_host "which"Since your function
check_prog_hostuses which to determine if the program exists, isn't it weird to use which to verify it?Agreed but that was the original check also which I found a little in the first place. But since this patch is here only to introduce and use a function, I didn't see how to change that here.
Quoted 21 lines
Your
check_host_progfunction could also be used in:# Check that a few mandatory programs are installed
missing_progs="no"
for prog in patch perl tar wget cpio python unzip rsync bc ${DL_TOOLS} ; do
if ! which $prog >/dev/null; then
echo "You must install '$prog' on your build machine"; missing_progs="yes"
if test $prog = "svn" ; then
echo " svn is usually part of the subversion package in your distribution"
elif test $prog = "hg" ; then
echo " hg is usually part of the mercurial package in your distribution"
elif test $prog = "zcat" ; then
echo " zcat is usually part of the gzip package in your distribution"
elif test $prog = "bzcat" ; then
echo " bzcat is usually part of the bzip2 package in your distribution"
fi
fi
doneQuoted 6 lines
if test "${missing_progs}" = "yes" ; then
exit 1
fiThough you see that this loop has this
missing_progsvariable that allows to list all the missing programs, and only abort at the end.I wanted to keep this one as is for the moment.
As you point out, it uses the exact mechanisms we want for all thedependencies.sh, and it would be part of a follow up patch later one, which would uses the same mechanisms but all over thedependencies.sh. Which is want we want in the end.
This first patch is mostly a follow up of the previous one, which added theBR2_NEEDS_HOST_JAVAQuoted 6 lines
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Quoted 8 lines
Quoted 5 lines
Just a bump.
Thomas, if I remember correctly, you were not opposed to this patch ? As explained, it has been found thatdependencies.shneeds a few other rounds of patch so it would be better shaped, but that can be done later.Is there a particular reason why the first part of the make check is not using
check_prog_host?
Not really no, but as was said, there's a lot to be done for this script to be good, this patch doesn't aim to rework it fully. Simply refactor some code that was redundant.
Other patch needs to be done.
Quoted 4 lines
Another comment is that I find the split between this and the second patch (classpath) strange: I would move the addition of
BR2_NEEDS_HOST_JAVAC/ JAR to that second patch.
Agreed, but only for the HOST_JAVAC, because if I remember correctly, classpath doesn't need JAR. But, you are absolutely right, it would make more sense.
I'll try to cover that during the week end and resend. (famous last words...)
Quoted 3 lines
Best regards,
Thomas