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

install.sh: Fix LLVM build restart config (#101)

Browse Source 
Fix MuQSS illegal character uppercase in source package name
Fix _cpusched not being sourced for package name
Fix llvm not in package name when using llvm
This commit is contained in:
Tony 2020-10-27 16:44:15 -04:00 committed by GitHub
parent 191febe4e8
commit dfbb291d5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
install.sh
View File

@ -196,12 +196,20 @@ if [ "$1" = "install" ] || [ "$1" = "config" ]; then
if [ "$_distro" = "Debian" ]; then #Help Debian cert problem. if [ "$_distro" = "Debian" ]; then #Help Debian cert problem.
sed -i -e 's#CONFIG_SYSTEM_TRUSTED_KEYS="debian/certs/test-signing-certs.pem"#CONFIG_SYSTEM_TRUSTED_KEYS=""#g' .config sed -i -e 's#CONFIG_SYSTEM_TRUSTED_KEYS="debian/certs/test-signing-certs.pem"#CONFIG_SYSTEM_TRUSTED_KEYS=""#g' .config
fi fi
yes '' | make oldconfig yes '' | make ${llvm_opt} oldconfig
msg2 "Done" msg2 "Done"
# apply linux-tkg patching script # apply linux-tkg patching script
_tkg_srcprep _tkg_srcprep
# source cpuschedset since _cpusched isn't set
source "$srcdir"/cpuschedset
# Uppercase characters are not allowed in source package name for debian based distros
if [ "$_distro" = "Debian" ] || [ "$_distro" = "Ubuntu" ] && [ "$_cpusched" = "MuQSS" ]; then
_cpusched="muqss"
fi
msg2 "Configuration done." msg2 "Configuration done."
fi fi
@ -237,14 +245,14 @@ if [ "$1" = "install" ]; then
fi fi
if [ -z $_kernel_localversion ]; then if [ -z $_kernel_localversion ]; then
_kernel_flavor="tkg-${_cpusched}" _kernel_flavor="tkg-${_cpusched}${_compiler_name}"
else else
_kernel_flavor="tkg-${_kernel_localversion}" _kernel_flavor="tkg-${_kernel_localversion}"
fi fi
if [ "$_distro" = "Ubuntu" ] || [ "$_distro" = "Debian" ]; then if [ "$_distro" = "Ubuntu" ] || [ "$_distro" = "Debian" ]; then
if make -j ${_thread_num} deb-pkg LOCALVERSION=-${_kernel_flavor}; then if make ${llvm_opt} -j ${_thread_num} deb-pkg LOCALVERSION=-${_kernel_flavor}; then
msg2 "Building successfully finished!" msg2 "Building successfully finished!"
cd "$_where" cd "$_where"
@ -284,7 +292,7 @@ if [ "$1" = "install" ]; then
_extra_ver_str="_${_kernel_flavor}" _extra_ver_str="_${_kernel_flavor}"
fi fi
if make -j ${_thread_num} rpm-pkg EXTRAVERSION="${_extra_ver_str}"; then if make ${llvm_opt} -j ${_thread_num} rpm-pkg EXTRAVERSION="${_extra_ver_str}"; then
msg2 "Building successfully finished!" msg2 "Building successfully finished!"
cd "$_where" cd "$_where"