move patches and sed lines above olddefconfig

This commit is contained in:
Josip Ponjavic 2019-02-15 22:24:13 +01:00
parent 46b8e29a97
commit f3eddefb28

View file

@ -112,27 +112,16 @@ prepare() {
patch -Np1 -i "$srcdir/clearlinux/${i}" patch -Np1 -i "$srcdir/clearlinux/${i}"
done done
### Patch source to unlock additional gcc CPU optimizations
# https://github.com/graysky2/kernel_gcc_patch
if [ "${_enable_gcc_more_v}" = "y" ]; then
msg2 "Enabling additional gcc CPU optimizations..."
patch -Np1 -i "$srcdir/kernel_gcc_patch-$_gcc_more_v/enable_additional_cpu_optimizations_for_gcc_v8.1+_kernel_v4.13+.patch"
fi
### Setting config ### Setting config
msg2 "Setting config..." msg2 "Setting config..."
cp -Tf $srcdir/clearlinux/config ./.config cp -Tf $srcdir/clearlinux/config ./.config
make olddefconfig
### Copying i915 firmware and intel-ucode
msg2 "Copying i915 firmware and intel-ucode..."
cp -a /usr/lib/firmware/i915 firmware/
cp -a ${srcdir}/intel-ucode firmware/
cp ${srcdir}/intel-ucode-with-caveats/06* firmware/intel-ucode/
rm -f firmware/intel-ucode/0f*
### Prepared version
make -s kernelrelease > ../version
msg2 "Prepared %s version %s" "$pkgbase" "$(<../version)"
### Set ACPI_REV_OVERRIDE_POSSIBLE to prevent optimus lockup
if [ "${_rev_override}" = "y" ]; then
msg2 "Enabling ACPI Rev Override Possible..."
sed -i "s|# CONFIG_ACPI_REV_OVERRIDE_POSSIBLE is not set|CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y|g" ./.config
fi
### Bluez package on arch needs this module for bluetooth to work ### Bluez package on arch needs this module for bluetooth to work
# https://bugs.archlinux.org/task/55880 # https://bugs.archlinux.org/task/55880
@ -146,13 +135,25 @@ CONFIG_MODULE_COMPRESS=y\
# CONFIG_MODULE_COMPRESS_GZIP is not set\ # CONFIG_MODULE_COMPRESS_GZIP is not set\
CONFIG_MODULE_COMPRESS_XZ=y|' ./.config CONFIG_MODULE_COMPRESS_XZ=y|' ./.config
### Patch source to unlock additional gcc CPU optimizations ### Set ACPI_REV_OVERRIDE_POSSIBLE to prevent optimus lockup
# https://github.com/graysky2/kernel_gcc_patch if [ "${_rev_override}" = "y" ]; then
if [ "${_enable_gcc_more_v}" = "y" ]; then msg2 "Enabling ACPI Rev Override Possible..."
msg2 "Enabling additional gcc CPU optimizations..." sed -i "s|# CONFIG_ACPI_REV_OVERRIDE_POSSIBLE is not set|CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y|g" ./.config
patch -Np1 -i "$srcdir/kernel_gcc_patch-$_gcc_more_v/enable_additional_cpu_optimizations_for_gcc_v8.1+_kernel_v4.13+.patch"
fi fi
make olddefconfig
### Copying i915 firmware and intel-ucode
msg2 "Copying i915 firmware and intel-ucode..."
cp -a /usr/lib/firmware/i915 firmware/
cp -a ${srcdir}/intel-ucode firmware/
cp ${srcdir}/intel-ucode-with-caveats/06* firmware/intel-ucode/
rm -f firmware/intel-ucode/0f*
### Prepared version
make -s kernelrelease > ../version
msg2 "Prepared %s version %s" "$pkgbase" "$(<../version)"
### Get kernel version ### Get kernel version
if [ "${_enable_gcc_more_v}" = "y" ] || [ -n "${_subarch}" ]; then if [ "${_enable_gcc_more_v}" = "y" ] || [ -n "${_subarch}" ]; then
yes "$_subarch" | make oldconfig yes "$_subarch" | make oldconfig