diff --git a/bin/cpio-clean b/bin/cpio-clean index c7e7ea51..8eaa81f1 100755 --- a/bin/cpio-clean +++ b/bin/cpio-clean @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl # Clean all non-deterministric fields in a newc cpio file # # Items fixed: diff --git a/bin/verity-sign b/bin/verity-sign index d616a0d3..2074555e 100755 --- a/bin/verity-sign +++ b/bin/verity-sign @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl # Generate dm-verity hashes and sign the root hash # # Output looks like diff --git a/blobs/haswell/obtain-mrc b/blobs/haswell/obtain-mrc index 42a6daab..3e87cab3 100755 --- a/blobs/haswell/obtain-mrc +++ b/blobs/haswell/obtain-mrc @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/blobs/p8z77-m_pro/download_BIOS_clean.sh b/blobs/p8z77-m_pro/download_BIOS_clean.sh index 673a617e..6f604106 100755 --- a/blobs/p8z77-m_pro/download_BIOS_clean.sh +++ b/blobs/p8z77-m_pro/download_BIOS_clean.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # P7 ASUS function printusage { diff --git a/blobs/t420/extract.sh b/blobs/t420/extract.sh index 42292474..3c892043 100755 --- a/blobs/t420/extract.sh +++ b/blobs/t420/extract.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function printusage { echo "Usage: $0 -f -m (optional) -i (optional)" diff --git a/blobs/t440p/download-clean-me b/blobs/t440p/download-clean-me index 26297d89..37411a40 100755 --- a/blobs/t440p/download-clean-me +++ b/blobs/t440p/download-clean-me @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/blobs/t440p/extract b/blobs/t440p/extract index 0307b93b..88a66bbc 100755 --- a/blobs/t440p/extract +++ b/blobs/t440p/extract @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/blobs/w541/download-clean-me b/blobs/w541/download-clean-me index 26297d89..37411a40 100755 --- a/blobs/w541/download-clean-me +++ b/blobs/w541/download-clean-me @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/blobs/w541/extract b/blobs/w541/extract index 0307b93b..88a66bbc 100755 --- a/blobs/w541/extract +++ b/blobs/w541/extract @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/blobs/x220/extract.sh b/blobs/x220/extract.sh index 42292474..3c892043 100755 --- a/blobs/x220/extract.sh +++ b/blobs/x220/extract.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function printusage { echo "Usage: $0 -f -m (optional) -i (optional)" diff --git a/blobs/xx20/download_parse_me.sh b/blobs/xx20/download_parse_me.sh index 894a2e06..1289c66a 100755 --- a/blobs/xx20/download_parse_me.sh +++ b/blobs/xx20/download_parse_me.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash BLOBDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" diff --git a/blobs/xx20/me7_update_parser.py b/blobs/xx20/me7_update_parser.py index 8f201c26..f862140d 100644 --- a/blobs/xx20/me7_update_parser.py +++ b/blobs/xx20/me7_update_parser.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python """ME7 Update binary parser.""" diff --git a/blobs/xx30/download_clean_me.sh b/blobs/xx30/download_clean_me.sh index a259a647..994f1cdb 100755 --- a/blobs/xx30/download_clean_me.sh +++ b/blobs/xx30/download_clean_me.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function printusage { echo "Usage: $0 -m (optional)" diff --git a/blobs/xx30/download_clean_me_manually.sh b/blobs/xx30/download_clean_me_manually.sh index c2cfc9d3..d7e44d01 100755 --- a/blobs/xx30/download_clean_me_manually.sh +++ b/blobs/xx30/download_clean_me_manually.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function printusage { echo "Usage: $0 -m (optional)" diff --git a/blobs/xx30/extract.sh b/blobs/xx30/extract.sh index f63c4d31..3a5ee504 100755 --- a/blobs/xx30/extract.sh +++ b/blobs/xx30/extract.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function printusage { echo "Usage: $0 -f -m (optional) -i (optional)" diff --git a/blobs/xx30/me_cleaner.py b/blobs/xx30/me_cleaner.py index c2adf0e8..46f883e3 100755 --- a/blobs/xx30/me_cleaner.py +++ b/blobs/xx30/me_cleaner.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # me_cleaner - Tool for partial deblobbing of Intel ME/TXE firmware images # Copyright (C) 2016-2018 Nicola Corna diff --git a/blobs/xx30/vbios_t530.sh b/blobs/xx30/vbios_t530.sh index 0669859d..dae75f3f 100755 --- a/blobs/xx30/vbios_t530.sh +++ b/blobs/xx30/vbios_t530.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash BLOBDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" ROMPARSER="94a615302f89b94e70446270197e0f5138d678f3" diff --git a/blobs/xx30/vbios_w530.sh b/blobs/xx30/vbios_w530.sh index b5230e0a..bbff9c8b 100755 --- a/blobs/xx30/vbios_w530.sh +++ b/blobs/xx30/vbios_w530.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash BLOBDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" ROMPARSER="94a615302f89b94e70446270197e0f5138d678f3" diff --git a/blobs/z220/download_BIOS_clean.sh b/blobs/z220/download_BIOS_clean.sh index 870574c7..b21ae3b2 100755 --- a/blobs/z220/download_BIOS_clean.sh +++ b/blobs/z220/download_BIOS_clean.sh @@ -1,4 +1,5 @@ -#!/bin/bash +#!/usr/bin/env bash + # Z220 CMT HP function printusage { @@ -65,4 +66,4 @@ echo "$FINAL_ME_SHA256SUM" | sha256sum --check || { echo "Failed sha256sum verif echo "###Cleaning up..." cd - -rm -r "$extractdir" \ No newline at end of file +rm -r "$extractdir" diff --git a/modules/slang b/modules/slang index 91c57402..779d6db6 100644 --- a/modules/slang +++ b/modules/slang @@ -8,7 +8,7 @@ slang_hash := 54f0c3007fde918039c058965dffdfd6c5aec0bad0f4227192cc486021f08c36 slang_configure := ./configure \ $(CROSS_TOOLS) \ - ac_cv_path_nc5config=no \ + ac_cv_path_nc5config=ncurses-config \ --prefix "/" \ --host $(MUSL_ARCH)-elf-linux \ --with-z=no \ diff --git a/patches/linux-5.10.5/shebangs.patch b/patches/linux-5.10.5/shebangs.patch new file mode 100644 index 00000000..76a73b5d --- /dev/null +++ b/patches/linux-5.10.5/shebangs.patch @@ -0,0 +1,100 @@ +diff --git a/scripts/bloat-o-meter b/scripts/bloat-o-meter +index d7ca46c612b3..652e9542043f 100755 +--- a/scripts/bloat-o-meter ++++ b/scripts/bloat-o-meter +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python + # + # Copyright 2004 Matt Mackall + # +diff --git a/scripts/check-sysctl-docs b/scripts/check-sysctl-docs +index 8bcb9e26c7bc..90137319c50a 100755 +--- a/scripts/check-sysctl-docs ++++ b/scripts/check-sysctl-docs +@@ -1,4 +1,4 @@ +-#!/usr/bin/gawk -f ++#!/usr/bin/env -S gawk -f + # SPDX-License-Identifier: GPL-2.0 + + # Script to check sysctl documentation against source files +diff --git a/scripts/diffconfig b/scripts/diffconfig +index 89abf777f197..627eba5849b5 100755 +--- a/scripts/diffconfig ++++ b/scripts/diffconfig +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python + # SPDX-License-Identifier: GPL-2.0 + # + # diffconfig - a tool to compare .config files. +diff --git a/scripts/get_abi.pl b/scripts/get_abi.pl +index 68dab828a722..92d9aa6cc4f5 100755 +--- a/scripts/get_abi.pl ++++ b/scripts/get_abi.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/bin/env perl + # SPDX-License-Identifier: GPL-2.0 + + use strict; +diff --git a/scripts/ld-version.sh b/scripts/ld-version.sh +index f2be0ff9a738..7a5b546ece16 100755 +--- a/scripts/ld-version.sh ++++ b/scripts/ld-version.sh +@@ -1,4 +1,4 @@ +-#!/usr/bin/awk -f ++#!/usr/bin/env -S awk -f + # SPDX-License-Identifier: GPL-2.0 + # extract linker version number from stdin and turn into single number + { +diff --git a/scripts/parse-maintainers.pl b/scripts/parse-maintainers.pl +index 2ca4eb3f190d..9515765158fa 100755 +--- a/scripts/parse-maintainers.pl ++++ b/scripts/parse-maintainers.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/usr/bin/env -S perl -w + # SPDX-License-Identifier: GPL-2.0 + + use strict; +diff --git a/scripts/show_delta b/scripts/show_delta +index 264399307c4f..28e67e178194 100755 +--- a/scripts/show_delta ++++ b/scripts/show_delta +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python + # SPDX-License-Identifier: GPL-2.0-only + # + # show_deltas: Read list of printk messages instrumented with +diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install +index 40fa6923e80a..828a8615a918 100755 +--- a/scripts/sphinx-pre-install ++++ b/scripts/sphinx-pre-install +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/bin/env perl + # SPDX-License-Identifier: GPL-2.0-or-later + use strict; + +diff --git a/scripts/split-man.pl b/scripts/split-man.pl +index c3db607ee9ec..96bd99dc977a 100755 +--- a/scripts/split-man.pl ++++ b/scripts/split-man.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/bin/env perl + # SPDX-License-Identifier: GPL-2.0 + # + # Author: Mauro Carvalho Chehab +diff --git a/scripts/ver_linux b/scripts/ver_linux +index 0968a3070eff..345b92f71d2d 100755 +--- a/scripts/ver_linux ++++ b/scripts/ver_linux +@@ -1,4 +1,4 @@ +-#!/usr/bin/awk -f ++#!/usr/bin/env -S awk -f + # SPDX-License-Identifier: GPL-2.0 + # Before running this script please ensure that your PATH is + # typical as you use for compilation/installation. I use diff --git a/patches/linux-5.5-openpower/shebangs.patch b/patches/linux-5.5-openpower/shebangs.patch new file mode 100644 index 00000000..38f5cb53 --- /dev/null +++ b/patches/linux-5.5-openpower/shebangs.patch @@ -0,0 +1,190 @@ +diff --git a/scripts/bloat-o-meter b/scripts/bloat-o-meter +index 8c965f6a9881..bcd66a014453 100755 +--- a/scripts/bloat-o-meter ++++ b/scripts/bloat-o-meter +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python + # + # Copyright 2004 Matt Mackall + # +diff --git a/scripts/coccicheck b/scripts/coccicheck +index e04d328210ac..851c3307ca74 100755 +--- a/scripts/coccicheck ++++ b/scripts/coccicheck +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + # SPDX-License-Identifier: GPL-2.0 + # Linux kernel coccicheck + # +diff --git a/scripts/config b/scripts/config +index e0e39826dae9..ba11e350e8af 100755 +--- a/scripts/config ++++ b/scripts/config +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + # SPDX-License-Identifier: GPL-2.0 + # Manipulate options in a .config file from the command line + +diff --git a/scripts/decode_stacktrace.sh b/scripts/decode_stacktrace.sh +index 13e5fbafdf2f..8c22ac90123b 100755 +--- a/scripts/decode_stacktrace.sh ++++ b/scripts/decode_stacktrace.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + # SPDX-License-Identifier: GPL-2.0 + # (c) 2014, Sasha Levin + #set -x +diff --git a/scripts/diffconfig b/scripts/diffconfig +index 89abf777f197..627eba5849b5 100755 +--- a/scripts/diffconfig ++++ b/scripts/diffconfig +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python + # SPDX-License-Identifier: GPL-2.0 + # + # diffconfig - a tool to compare .config files. +diff --git a/scripts/faddr2line b/scripts/faddr2line +index 6c6439f69a72..5079957d4993 100755 +--- a/scripts/faddr2line ++++ b/scripts/faddr2line +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + # SPDX-License-Identifier: GPL-2.0 + # + # Translate stack dump function offsets. +diff --git a/scripts/find-unused-docs.sh b/scripts/find-unused-docs.sh +index 3f46f8977dc4..363e7ecab554 100755 +--- a/scripts/find-unused-docs.sh ++++ b/scripts/find-unused-docs.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + # (c) 2017, Jonathan Corbet + # sayli karnik + # +diff --git a/scripts/get_abi.pl b/scripts/get_abi.pl +index c738cb795514..ba87b230fe0a 100755 +--- a/scripts/get_abi.pl ++++ b/scripts/get_abi.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/bin/env perl + # SPDX-License-Identifier: GPL-2.0 + + use strict; +diff --git a/scripts/gfp-translate b/scripts/gfp-translate +index b2ce416d944b..2fcea3e9afb3 100755 +--- a/scripts/gfp-translate ++++ b/scripts/gfp-translate +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + # SPDX-License-Identifier: GPL-2.0-only + # Translate the bits making up a GFP mask + # (c) 2009, Mel Gorman +diff --git a/scripts/ld-version.sh b/scripts/ld-version.sh +index f2be0ff9a738..081efc679705 100755 +--- a/scripts/ld-version.sh ++++ b/scripts/ld-version.sh +@@ -1,4 +1,4 @@ +-#!/usr/bin/awk -f ++#!/usr/bin/env -S awk -f + # SPDX-License-Identifier: GPL-2.0 + # extract linker version number from stdin and turn into single number + { +diff --git a/scripts/mkuboot.sh b/scripts/mkuboot.sh +index 4b1fe09e9042..0b6df121a3b5 100755 +--- a/scripts/mkuboot.sh ++++ b/scripts/mkuboot.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + # SPDX-License-Identifier: GPL-2.0 + + # +diff --git a/scripts/objdiff b/scripts/objdiff +index 72b0b63c3fe1..95f087300637 100755 +--- a/scripts/objdiff ++++ b/scripts/objdiff +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + # SPDX-License-Identifier: GPL-2.0-only + + # objdiff - a small script for validating that a commit or series of commits +diff --git a/scripts/parse-maintainers.pl b/scripts/parse-maintainers.pl +index 255cef1b098d..c2d11c87fdb4 100644 +--- a/scripts/parse-maintainers.pl ++++ b/scripts/parse-maintainers.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/usr/bin/env -S perl -w + # SPDX-License-Identifier: GPL-2.0 + + use strict; +diff --git a/scripts/prune-kernel b/scripts/prune-kernel +index e8aa940bc0a9..620230f677bc 100755 +--- a/scripts/prune-kernel ++++ b/scripts/prune-kernel +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + # SPDX-License-Identifier: GPL-2.0 + + # because I use CONFIG_LOCALVERSION_AUTO, not the same version again and +diff --git a/scripts/show_delta b/scripts/show_delta +index 264399307c4f..28e67e178194 100755 +--- a/scripts/show_delta ++++ b/scripts/show_delta +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python + # SPDX-License-Identifier: GPL-2.0-only + # + # show_deltas: Read list of printk messages instrumented with +diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install +index 470ccfe678aa..214ed660c0d0 100755 +--- a/scripts/sphinx-pre-install ++++ b/scripts/sphinx-pre-install +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/bin/env perl + # SPDX-License-Identifier: GPL-2.0-or-later + use strict; + +diff --git a/scripts/split-man.pl b/scripts/split-man.pl +index c3db607ee9ec..96bd99dc977a 100755 +--- a/scripts/split-man.pl ++++ b/scripts/split-man.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/bin/env perl + # SPDX-License-Identifier: GPL-2.0 + # + # Author: Mauro Carvalho Chehab +diff --git a/scripts/tags.sh b/scripts/tags.sh +index 4e18ae5282a6..02c08d460997 100755 +--- a/scripts/tags.sh ++++ b/scripts/tags.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + # SPDX-License-Identifier: GPL-2.0-only + # Generate tags or cscope files + # Usage tags.sh +diff --git a/scripts/ver_linux b/scripts/ver_linux +index 85005d6b7f10..34e4530fd5b6 100755 +--- a/scripts/ver_linux ++++ b/scripts/ver_linux +@@ -1,4 +1,4 @@ +-#!/usr/bin/awk -f ++#!/usr/bin/env -S awk -f + # SPDX-License-Identifier: GPL-2.0 + # Before running this script please ensure that your PATH is + # typical as you use for compilation/installation. I use diff --git a/patches/slang-2.3.1a/unhardcode-ln-in-Makefile.patch b/patches/slang-2.3.1a/unhardcode-ln-in-Makefile.patch new file mode 100644 index 00000000..590e0691 --- /dev/null +++ b/patches/slang-2.3.1a/unhardcode-ln-in-Makefile.patch @@ -0,0 +1,13 @@ +diff --git a/src/Makefile.in b/src/Makefile.in +index 7fe4dc2..38fe174 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -75,7 +75,7 @@ RM = rm -f + RM_R = rm -rf + AR_CR = ar cr + RMDIR = rmdir +-LN = /bin/ln -sf ++LN = ln -sf + CP = cp + @SET_MAKE@ + #---------------------------------------------------------------------------