Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7caddaa9 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Greg Kroah-Hartman
Browse files

kheaders: remove the last bashism to allow sh to run it 



commit 1463f74f492eea7191f0178e01f3d38371a48210 upstream.

'pushd' ... 'popd' is the last bash-specific code in this script.
One way to avoid it is to run the code in a sub-shell.

With that addressed, you can run this script with sh.

I replaced $(BASH) with $(CONFIG_SHELL), and I changed the hashbang
to #!/bin/sh.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarMatthias Maennich <maennich@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 18f48708

kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ $(obj)/config_data.gz: $(KCONFIG_CONFIG) FORCE 
$(obj)/kheaders.o: $(obj)/kheaders_data.tar.xz



quiet_cmd_genikh = CHK     $(obj)/kheaders_data.tar.xz

      cmd_genikh = $(BASH) $(srctree)/kernel/gen_kheaders.sh $@

      cmd_genikh = $(CONFIG_SHELL) $(srctree)/kernel/gen_kheaders.sh $@

$(obj)/kheaders_data.tar.xz: FORCE

	$(call cmd,genikh)

kernel/gen_kheaders.sh

+7 −6
Original line number Diff line number Diff line 
#!/bin/bash

#!/bin/sh

# SPDX-License-Identifier: GPL-2.0



# This script generates an archive consisting of kernel headers
@@ -57,11 +57,12 @@ rm -rf $cpio_dir 
mkdir $cpio_dir



if [ "$building_out_of_srctree" ]; then

	pushd $srctree > /dev/null

	(

		cd $srctree

		for f in $dir_list

			do find "$f" -name "*.h";

		done | cpio --quiet -pd $cpio_dir

	popd > /dev/null

	)

fi



# The second CPIO can complain if files already exist which can happen with out