CCF_100/linux-tkg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Debian / Ubuntu compile due to .config (#217)

Browse Source 
* Update install.sh

* Update prepare
This commit is contained in:
Bringas4You 2021-04-04 23:17:58 -07:00 committed by GitHub
parent 8edd175caa
commit 8d174cf225
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
install.sh
View File

@ -260,16 +260,7 @@ if [ "$1" = "install" ] || [ "$1" = "config" ]; then
# cd in linux folder, copy Ubuntu's current config file, update with new params # cd in linux folder, copy Ubuntu's current config file, update with new params
cd "$_where"/linux-src-git cd "$_where"/linux-src-git
if [ "$_distro" = "Debian" ]; then
#Help Debian cert compile problem.
sed -i -e 's#CONFIG_SYSTEM_TRUSTED_KEYS="debian/certs/test-signing-certs.pem"#CONFIG_SYSTEM_TRUSTED_KEYS=""#g' .config
#Help Debian UEFI cert compile problem
sed -i -e 's#CONFIG_SYSTEM_TRUSTED_KEYS="debian/certs/debian-uefi-certs.pem"#CONFIG_SYSTEM_TRUSTED_KEYS=""#g' .config
fi
if [ "$_distro" = "Ubuntu" ]; then
#Help Ubuntu cert compile problem.
sed -i -e 's#CONFIG_SYSTEM_TRUSTED_KEYS="debian/canonical-certs.pem"#CONFIG_SYSTEM_TRUSTED_KEYS=""#g' .config
fi
yes '' | make ${llvm_opt} oldconfig yes '' | make ${llvm_opt} oldconfig
msg2 "Done" msg2 "Done"

12
linux-tkg-config/prepare
View File

@ -642,6 +642,18 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\n
sed -i -e 's/# CONFIG_MODULE_SIG_SHA1 is not set/CONFIG_MODULE_SIG_SHA1=y/' ./.config sed -i -e 's/# CONFIG_MODULE_SIG_SHA1 is not set/CONFIG_MODULE_SIG_SHA1=y/' ./.config
sed -i -e 's/CONFIG_MODULE_SIG_HASH="sha512"/CONFIG_MODULE_SIG_HASH="sha1"/' ./.config sed -i -e 's/CONFIG_MODULE_SIG_HASH="sha512"/CONFIG_MODULE_SIG_HASH="sha1"/' ./.config
fi fi
# Prevent Debian to sign certs (Bios/UEFI)
if [ "$_distro" = "Debian" ]; then
#Help Debian cert compile problem.
sed -i -e 's#CONFIG_SYSTEM_TRUSTED_KEYS="debian/certs/test-signing-certs.pem"#CONFIG_SYSTEM_TRUSTED_KEYS=""#g' .config
#Help Debian UEFI cert compile problem
sed -i -e 's#CONFIG_SYSTEM_TRUSTED_KEYS="debian/certs/debian-uefi-certs.pem"#CONFIG_SYSTEM_TRUSTED_KEYS=""#g' .config
fi
# Latest versions of Ubuntu require Canonical certifications.
if [ "$_distro" = "Ubuntu" ]; then
#Help Ubuntu cert compile problem.
sed -i -e 's#CONFIG_SYSTEM_TRUSTED_KEYS="debian/canonical-certs.pem"#CONFIG_SYSTEM_TRUSTED_KEYS=""#g' .config
fi
# Skip dbg package creation on non-Arch # Skip dbg package creation on non-Arch
if [ "$_distro" != "Arch" ]; then if [ "$_distro" != "Arch" ]; then
sed -i -e 's/CONFIG_DEBUG_INFO.*/CONFIG_DEBUG_INFO=n/' ./.config sed -i -e 's/CONFIG_DEBUG_INFO.*/CONFIG_DEBUG_INFO=n/' ./.config