From: Zhang Bingwu <[email protected]>
When running 'make zinstall INSTALL_PATH=somepath'
where 'somepath' does not exist, the install
scripts (install.sh) print error messages
but also return a success status code.
This will make 'make' regard 'install' (and 'zinstall', etc)
succeeded.
When there are also other targets at the same time,
for example, 'make zinstall dtbs_install modules_install',
make will keep going on and other outputs will fill stdout,
and make the error message hard to find.
dtbs_install and modules_install creates the target directory
if it does not exist. install, zinstall and others should
have the same behaviour.
If INSTALL_PATH is not a valid directory, we should create it.
If the installation process still fails with errors, for example,
insufficient space on disk or permission denied, make should regard
the install target failed, stop as soon as possible,
and exit with error.
Zhang Bingwu (2):
kbuild: Abort make on install failures
kbuild: Create INSTALL_PATH directory if it does not exist
arch/arm/boot/install.sh | 2 ++
arch/arm64/boot/install.sh | 2 ++
arch/m68k/install.sh | 2 ++
arch/nios2/boot/install.sh | 2 ++
arch/parisc/install.sh | 2 ++
arch/riscv/boot/install.sh | 2 ++
arch/s390/boot/install.sh | 2 ++
arch/sparc/boot/install.sh | 2 ++
arch/x86/boot/install.sh | 2 ++
scripts/install.sh | 4 ++++
10 files changed, 22 insertions(+)
base-commit: d0f86d080e3d7d5e1e75a56d88daf8e5f56a4146
--
2.43.0
From: Zhang Bingwu <[email protected]>
Setting '-e' flag tells shells to exit with error exit code immediately
after any of commands fails, and causes make(1) to regard recipes as
failed.
Before this, make will still continue to succeed even after the
installation failed, for example, for insufficient permission or
directory does not exist.
Signed-off-by: Zhang Bingwu <[email protected]>
---
arch/arm/boot/install.sh | 2 ++
arch/arm64/boot/install.sh | 2 ++
arch/m68k/install.sh | 2 ++
arch/nios2/boot/install.sh | 2 ++
arch/parisc/install.sh | 2 ++
arch/riscv/boot/install.sh | 2 ++
arch/s390/boot/install.sh | 2 ++
arch/sparc/boot/install.sh | 2 ++
arch/x86/boot/install.sh | 2 ++
9 files changed, 18 insertions(+)
diff --git a/arch/arm/boot/install.sh b/arch/arm/boot/install.sh
index 9ec11fac7d8d..34e2c6e31fd1 100755
--- a/arch/arm/boot/install.sh
+++ b/arch/arm/boot/install.sh
@@ -17,6 +17,8 @@
# $3 - kernel map file
# $4 - default install path (blank if root directory)
+set -e
+
if [ "$(basename $2)" = "zImage" ]; then
# Compressed install
echo "Installing compressed kernel"
diff --git a/arch/arm64/boot/install.sh b/arch/arm64/boot/install.sh
index 9b7a09808a3d..cc2f4ccca6c0 100755
--- a/arch/arm64/boot/install.sh
+++ b/arch/arm64/boot/install.sh
@@ -17,6 +17,8 @@
# $3 - kernel map file
# $4 - default install path (blank if root directory)
+set -e
+
if [ "$(basename $2)" = "Image.gz" ] || [ "$(basename $2)" = "vmlinuz.efi" ]
then
# Compressed install
diff --git a/arch/m68k/install.sh b/arch/m68k/install.sh
index af65e16e5147..b6829b3942b3 100755
--- a/arch/m68k/install.sh
+++ b/arch/m68k/install.sh
@@ -16,6 +16,8 @@
# $3 - kernel map file
# $4 - default install path (blank if root directory)
+set -e
+
if [ -f $4/vmlinuz ]; then
mv $4/vmlinuz $4/vmlinuz.old
fi
diff --git a/arch/nios2/boot/install.sh b/arch/nios2/boot/install.sh
index 34a2feec42c8..1161f2bf59ec 100755
--- a/arch/nios2/boot/install.sh
+++ b/arch/nios2/boot/install.sh
@@ -16,6 +16,8 @@
# $3 - kernel map file
# $4 - default install path (blank if root directory)
+set -e
+
if [ -f $4/vmlinuz ]; then
mv $4/vmlinuz $4/vmlinuz.old
fi
diff --git a/arch/parisc/install.sh b/arch/parisc/install.sh
index 933d031c249a..664c2d77f776 100755
--- a/arch/parisc/install.sh
+++ b/arch/parisc/install.sh
@@ -16,6 +16,8 @@
# $3 - kernel map file
# $4 - default install path (blank if root directory)
+set -e
+
if [ "$(basename $2)" = "vmlinuz" ]; then
# Compressed install
echo "Installing compressed kernel"
diff --git a/arch/riscv/boot/install.sh b/arch/riscv/boot/install.sh
index 4c63f3f0643d..a59639dff64f 100755
--- a/arch/riscv/boot/install.sh
+++ b/arch/riscv/boot/install.sh
@@ -17,6 +17,8 @@
# $3 - kernel map file
# $4 - default install path (blank if root directory)
+set -e
+
if [ "$(basename $2)" = "Image.gz" ]; then
# Compressed install
echo "Installing compressed kernel"
diff --git a/arch/s390/boot/install.sh b/arch/s390/boot/install.sh
index a13dd2f2aa1c..fa41486258ee 100755
--- a/arch/s390/boot/install.sh
+++ b/arch/s390/boot/install.sh
@@ -15,6 +15,8 @@
# $3 - kernel map file
# $4 - default install path (blank if root directory)
+set -e
+
echo "Warning: '${INSTALLKERNEL}' command not available - additional " \
"bootloader config required" >&2
if [ -f "$4/vmlinuz-$1" ]; then mv -- "$4/vmlinuz-$1" "$4/vmlinuz-$1.old"; fi
diff --git a/arch/sparc/boot/install.sh b/arch/sparc/boot/install.sh
index 4f130f3f30d6..68de67c5621e 100755
--- a/arch/sparc/boot/install.sh
+++ b/arch/sparc/boot/install.sh
@@ -16,6 +16,8 @@
# $3 - kernel map file
# $4 - default install path (blank if root directory)
+set -e
+
if [ -f $4/vmlinuz ]; then
mv $4/vmlinuz $4/vmlinuz.old
fi
diff --git a/arch/x86/boot/install.sh b/arch/x86/boot/install.sh
index 0849f4b42745..93784abcd66d 100755
--- a/arch/x86/boot/install.sh
+++ b/arch/x86/boot/install.sh
@@ -16,6 +16,8 @@
# $3 - kernel map file
# $4 - default install path (blank if root directory)
+set -e
+
if [ -f $4/vmlinuz ]; then
mv $4/vmlinuz $4/vmlinuz.old
fi
--
2.43.0
From: Zhang Bingwu <[email protected]>
If INSTALL_PATH is not a valid directory, create it, like what
modules_install and dtbs_install will do in the same situation.
Signed-off-by: Zhang Bingwu <[email protected]>
---
scripts/install.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/scripts/install.sh b/scripts/install.sh
index 9bb0fb44f04a..02b845e7ab33 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -20,6 +20,10 @@ do
fi
done
+if [ "${INSTALL_PATH}" != "" ] && ! [ -e "${INSTALL_PATH}" ]; then
+ mkdir -p "${INSTALL_PATH}"
+fi
+
# User/arch may have a custom install script
for file in "${HOME}/bin/${INSTALLKERNEL}" \
"/sbin/${INSTALLKERNEL}" \
--
2.43.0
On Sat, Feb 10, 2024 at 03:46:00PM +0800, Zhang Bingwu wrote:
> From: Zhang Bingwu <[email protected]>
>
> Setting '-e' flag tells shells to exit with error exit code immediately
> after any of commands fails, and causes make(1) to regard recipes as
> failed.
>
> Before this, make will still continue to succeed even after the
> installation failed, for example, for insufficient permission or
> directory does not exist.
>
> Signed-off-by: Zhang Bingwu <[email protected]>
> ---
> arch/arm/boot/install.sh | 2 ++
> arch/arm64/boot/install.sh | 2 ++
> arch/m68k/install.sh | 2 ++
> arch/nios2/boot/install.sh | 2 ++
> arch/parisc/install.sh | 2 ++
> arch/riscv/boot/install.sh | 2 ++
> arch/s390/boot/install.sh | 2 ++
> arch/sparc/boot/install.sh | 2 ++
> arch/x86/boot/install.sh | 2 ++
> 9 files changed, 18 insertions(+)
>
> diff --git a/arch/arm/boot/install.sh b/arch/arm/boot/install.sh
> index 9ec11fac7d8d..34e2c6e31fd1 100755
> --- a/arch/arm/boot/install.sh
> +++ b/arch/arm/boot/install.sh
> @@ -17,6 +17,8 @@
> # $3 - kernel map file
> # $4 - default install path (blank if root directory)
>
> +set -e
> +
What about #!/bin/sh -e on the first line, which is the more normal way
to do this for an entire script?
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
On Saturday, February 10, 2024 6:29:00 PM CST Russell King (Oracle) wrote:
> What about #!/bin/sh -e on the first line, which is the more normal way
> to do this for an entire script?
Will do this in V2.
--
xtex @ Sat Feb 10 10:32:32 AM UTC 2024
On Sat, Feb 10, 2024 at 10:29:00AM +0000 Russell King (Oracle) wrote:
> On Sat, Feb 10, 2024 at 03:46:00PM +0800, Zhang Bingwu wrote:
> > From: Zhang Bingwu <[email protected]>
> >
> > Setting '-e' flag tells shells to exit with error exit code immediately
> > after any of commands fails, and causes make(1) to regard recipes as
> > failed.
> >
> > Before this, make will still continue to succeed even after the
> > installation failed, for example, for insufficient permission or
> > directory does not exist.
> >
> > Signed-off-by: Zhang Bingwu <[email protected]>
> > ---
Thanks for fixing!
[...]
> > diff --git a/arch/arm/boot/install.sh b/arch/arm/boot/install.sh
> > index 9ec11fac7d8d..34e2c6e31fd1 100755
> > --- a/arch/arm/boot/install.sh
> > +++ b/arch/arm/boot/install.sh
> > @@ -17,6 +17,8 @@
> > # $3 - kernel map file
> > # $4 - default install path (blank if root directory)
> >
> > +set -e
> > +
>
> What about #!/bin/sh -e on the first line, which is the more normal way
> to do this for an entire script?
are you sure? I can find many more occurrences of 'set -e' than the
shebang version in the Linux tree, especially in the kbuild scripts, thus
it's bike-shedding, isn't it?
Reviewed-by: Nicolas Schier <[email protected]>
Kind regards,
Nicolas
On Sat, Feb 10, 2024 at 03:46:01PM +0800 Zhang Bingwu wrote:
> From: Zhang Bingwu <[email protected]>
>
> If INSTALL_PATH is not a valid directory, create it, like what
> modules_install and dtbs_install will do in the same situation.
>
> Signed-off-by: Zhang Bingwu <[email protected]>
> ---
> scripts/install.sh | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/scripts/install.sh b/scripts/install.sh
> index 9bb0fb44f04a..02b845e7ab33 100755
> --- a/scripts/install.sh
> +++ b/scripts/install.sh
> @@ -20,6 +20,10 @@ do
> fi
> done
>
> +if [ "${INSTALL_PATH}" != "" ] && ! [ -e "${INSTALL_PATH}" ]; then
> + mkdir -p "${INSTALL_PATH}"
> +fi
> +
> # User/arch may have a custom install script
> for file in "${HOME}/bin/${INSTALLKERNEL}" \
> "/sbin/${INSTALLKERNEL}" \
> --
> 2.43.0
>
Thanks.
Reviewed-by: Nicolas Schier <[email protected]>
On Sun, Feb 11, 2024 at 6:21 AM Nicolas Schier <[email protected]> wrote:
>
> On Sat, Feb 10, 2024 at 10:29:00AM +0000 Russell King (Oracle) wrote:
> > On Sat, Feb 10, 2024 at 03:46:00PM +0800, Zhang Bingwu wrote:
> > > From: Zhang Bingwu <[email protected]>
> > >
> > > Setting '-e' flag tells shells to exit with error exit code immediately
> > > after any of commands fails, and causes make(1) to regard recipes as
> > > failed.
> > >
> > > Before this, make will still continue to succeed even after the
> > > installation failed, for example, for insufficient permission or
> > > directory does not exist.
> > >
> > > Signed-off-by: Zhang Bingwu <[email protected]>
> > > ---
>
> Thanks for fixing!
>
> [...]
> > > diff --git a/arch/arm/boot/install.sh b/arch/arm/boot/install.sh
> > > index 9ec11fac7d8d..34e2c6e31fd1 100755
> > > --- a/arch/arm/boot/install.sh
> > > +++ b/arch/arm/boot/install.sh
> > > @@ -17,6 +17,8 @@
> > > # $3 - kernel map file
> > > # $4 - default install path (blank if root directory)
> > >
> > > +set -e
> > > +
> >
> > What about #!/bin/sh -e on the first line, which is the more normal way
> > to do this for an entire script?
>
> are you sure? I can find many more occurrences of 'set -e' than the
> shebang version in the Linux tree, especially in the kbuild scripts, thus
> it's bike-shedding, isn't it?
>
> Reviewed-by: Nicolas Schier <[email protected]>
>
> Kind regards,
> Nicolas
When you put -e on the shebang line, like
#!/bin/sh -e
the option -e is set when you do:
$ arch/arm/boot/install.sh
But, -e is not set when you do:
$ sh arch/arm/boot/install.sh
The reason is obvious because the latter case
does not use the shebang line.
In Kbuild, some places run the script directly like the former case,
and others use CONFIG_SHELL like
$(CONFIG_SHELL) arch/arm/boot/install.sh
The inconsistency is not nice, but that is a different issue.
The separate 'set -e' statement works for both cases,
so I think this is safer, though it is kind of bike-shedding.
--
Best Regards
Masahiro Yamada
On Sunday, February 11, 2024 7:35:35 AM CST Masahiro Yamada wrote:
>
> The separate 'set -e' statement works for both cases,
> so I think this is safer, though it is kind of bike-shedding.
Thanks!
I also think it is safer to use 'set -e' in the case of 'sh install.sh',
so I support not to use 'sh -e' in the shebang line. The planned V2 patch for
this disappeared.
--
Zhang Bingwu @ Sun Feb 11 10:27:48 AM UTC 2024