* [PATCH] populate_sdk: Handle OLDEST_KERNEL
@ 2015-02-16 16:24 Richard Purdie
2015-02-16 17:07 ` Otavio Salvador
0 siblings, 1 reply; 3+ messages in thread
From: Richard Purdie @ 2015-02-16 16:24 UTC (permalink / raw)
To: openembedded-core
Add a check to the SDK so that it only runs on systems with kernel versions
it supports.
[YOCTO #6856]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 8b7e9ea..e3adacb 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -126,6 +126,7 @@ EOF
# substitute variables
sed -i -e 's#@SDK_ARCH@#${SDK_ARCH}#g' \
-e 's#@SDKPATH@#${SDKPATH}#g' \
+ -e 's#@OLDEST_KERNEL@#${OLDEST_KERNEL}#g' \
-e 's#@REAL_MULTIMACH_TARGET_SYS@#${REAL_MULTIMACH_TARGET_SYS}#g' \
-e '/@SDK_POST_INSTALL_COMMAND@/d' \
${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh
diff --git a/meta/files/toolchain-shar-template.sh b/meta/files/toolchain-shar-template.sh
index 4a7fbd5..64e87a2 100644
--- a/meta/files/toolchain-shar-template.sh
+++ b/meta/files/toolchain-shar-template.sh
@@ -3,6 +3,24 @@
INST_ARCH=$(uname -m | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/")
SDK_ARCH=$(echo @SDK_ARCH@ | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/")
+verlte () {
+ [ "$1" = "`printf "$1\n$2" | sort -V | head -n1`" ]
+}
+
+verlt() {
+ [ "$1" = "$2" ] && return 1 || verlte $1 $2
+}
+
+verlt `uname -r` @OLDEST_KERNEL@
+if [ $? = 0 ]; then
+ echo "Error: The SDK needs a kernel > @OLDEST_KERNEL@"
+ exit 1
+fi
+
+
+verlte `uname -r` 3.18.0 && echo "yes" || echo "no"
+verlte 4.16 3.18.0 && echo "yes" || echo "no"
+
if [ "$INST_ARCH" != "$SDK_ARCH" ]; then
# Allow for installation of ix86 SDK on x86_64 host
if [ "$INST_ARCH" != x86_64 -o "$SDK_ARCH" != ix86 ]; then
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] populate_sdk: Handle OLDEST_KERNEL
2015-02-16 16:24 [PATCH] populate_sdk: Handle OLDEST_KERNEL Richard Purdie
@ 2015-02-16 17:07 ` Otavio Salvador
2015-02-16 17:32 ` Richard Purdie
0 siblings, 1 reply; 3+ messages in thread
From: Otavio Salvador @ 2015-02-16 17:07 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
On Mon, Feb 16, 2015 at 2:24 PM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> Add a check to the SDK so that it only runs on systems with kernel versions
> it supports.
>
> [YOCTO #6856]
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
> index 8b7e9ea..e3adacb 100644
> --- a/meta/classes/populate_sdk_base.bbclass
> +++ b/meta/classes/populate_sdk_base.bbclass
> @@ -126,6 +126,7 @@ EOF
> # substitute variables
> sed -i -e 's#@SDK_ARCH@#${SDK_ARCH}#g' \
> -e 's#@SDKPATH@#${SDKPATH}#g' \
> + -e 's#@OLDEST_KERNEL@#${OLDEST_KERNEL}#g' \
> -e 's#@REAL_MULTIMACH_TARGET_SYS@#${REAL_MULTIMACH_TARGET_SYS}#g' \
> -e '/@SDK_POST_INSTALL_COMMAND@/d' \
> ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh
> diff --git a/meta/files/toolchain-shar-template.sh b/meta/files/toolchain-shar-template.sh
> index 4a7fbd5..64e87a2 100644
> --- a/meta/files/toolchain-shar-template.sh
> +++ b/meta/files/toolchain-shar-template.sh
> @@ -3,6 +3,24 @@
> INST_ARCH=$(uname -m | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/")
> SDK_ARCH=$(echo @SDK_ARCH@ | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/")
>
> +verlte () {
> + [ "$1" = "`printf "$1\n$2" | sort -V | head -n1`" ]
> +}
> +
> +verlt() {
> + [ "$1" = "$2" ] && return 1 || verlte $1 $2
> +}
> +
> +verlt `uname -r` @OLDEST_KERNEL@
> +if [ $? = 0 ]; then
> + echo "Error: The SDK needs a kernel > @OLDEST_KERNEL@"
> + exit 1
> +fi
> +
> +
> +verlte `uname -r` 3.18.0 && echo "yes" || echo "no"
> +verlte 4.16 3.18.0 && echo "yes" || echo "no"
Is this a development code forgotten? :)
> if [ "$INST_ARCH" != "$SDK_ARCH" ]; then
> # Allow for installation of ix86 SDK on x86_64 host
> if [ "$INST_ARCH" != x86_64 -o "$SDK_ARCH" != ix86 ]; then
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] populate_sdk: Handle OLDEST_KERNEL
2015-02-16 17:07 ` Otavio Salvador
@ 2015-02-16 17:32 ` Richard Purdie
0 siblings, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2015-02-16 17:32 UTC (permalink / raw)
To: Otavio Salvador; +Cc: openembedded-core
On Mon, 2015-02-16 at 15:07 -0200, Otavio Salvador wrote:
> On Mon, Feb 16, 2015 at 2:24 PM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > Add a check to the SDK so that it only runs on systems with kernel versions
> > it supports.
> >
> > [YOCTO #6856]
> >
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> >
> > diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
> > index 8b7e9ea..e3adacb 100644
> > --- a/meta/classes/populate_sdk_base.bbclass
> > +++ b/meta/classes/populate_sdk_base.bbclass
> > @@ -126,6 +126,7 @@ EOF
> > # substitute variables
> > sed -i -e 's#@SDK_ARCH@#${SDK_ARCH}#g' \
> > -e 's#@SDKPATH@#${SDKPATH}#g' \
> > + -e 's#@OLDEST_KERNEL@#${OLDEST_KERNEL}#g' \
> > -e 's#@REAL_MULTIMACH_TARGET_SYS@#${REAL_MULTIMACH_TARGET_SYS}#g' \
> > -e '/@SDK_POST_INSTALL_COMMAND@/d' \
> > ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh
> > diff --git a/meta/files/toolchain-shar-template.sh b/meta/files/toolchain-shar-template.sh
> > index 4a7fbd5..64e87a2 100644
> > --- a/meta/files/toolchain-shar-template.sh
> > +++ b/meta/files/toolchain-shar-template.sh
> > @@ -3,6 +3,24 @@
> > INST_ARCH=$(uname -m | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/")
> > SDK_ARCH=$(echo @SDK_ARCH@ | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/")
> >
> > +verlte () {
> > + [ "$1" = "`printf "$1\n$2" | sort -V | head -n1`" ]
> > +}
> > +
> > +verlt() {
> > + [ "$1" = "$2" ] && return 1 || verlte $1 $2
> > +}
> > +
> > +verlt `uname -r` @OLDEST_KERNEL@
> > +if [ $? = 0 ]; then
> > + echo "Error: The SDK needs a kernel > @OLDEST_KERNEL@"
> > + exit 1
> > +fi
> > +
> > +
> > +verlte `uname -r` 3.18.0 && echo "yes" || echo "no"
> > +verlte 4.16 3.18.0 && echo "yes" || echo "no"
>
> Is this a development code forgotten? :)
Yes, well spotted, thanks!
I'll remove those two lines
Cheers,
Richard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-02-16 17:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-16 16:24 [PATCH] populate_sdk: Handle OLDEST_KERNEL Richard Purdie
2015-02-16 17:07 ` Otavio Salvador
2015-02-16 17:32 ` Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox