diff options
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 2 | ||||
| -rwxr-xr-x | choose-gcc-optimization.sh | 7 |
3 files changed, 6 insertions, 5 deletions
@@ -22,7 +22,7 @@ pkgbase = linux-xanmod-edge sha256sums = 555fef61dddb591a83d62dd04e252792f9af4ba9ef14683f64840e46fa20b1b1 sha256sums = SKIP sha256sums = c2d1d3f7ed027d8fee2a55dc78bc3deff0f1e228f7098a077bad833e741605b3 - sha256sums = bbc66f6fd1c9028bd2c57ca9a4c6000f2cf47d1c09d207fe5087ef3afdd96eeb + sha256sums = dda2e928f3b02c28e71d4e99f90b499b4c99a265d30fceec7dc1dd7082afc285 pkgname = linux-xanmod-edge pkgdesc = The Linux kernel and modules with Xanmod patches @@ -109,7 +109,7 @@ done sha256sums=('555fef61dddb591a83d62dd04e252792f9af4ba9ef14683f64840e46fa20b1b1' 'SKIP' 'c2d1d3f7ed027d8fee2a55dc78bc3deff0f1e228f7098a077bad833e741605b3' - 'bbc66f6fd1c9028bd2c57ca9a4c6000f2cf47d1c09d207fe5087ef3afdd96eeb') + 'dda2e928f3b02c28e71d4e99f90b499b4c99a265d30fceec7dc1dd7082afc285') export KBUILD_BUILD_HOST=${KBUILD_BUILD_HOST:-archlinux} export KBUILD_BUILD_USER=${KBUILD_BUILD_USER:-makepkg} diff --git a/choose-gcc-optimization.sh b/choose-gcc-optimization.sh index dd26aefb10bd..3422f1b18be9 100755 --- a/choose-gcc-optimization.sh +++ b/choose-gcc-optimization.sh @@ -66,7 +66,7 @@ cat << EOF 98) Intel-Native optimizations autodetected by GCC 99) AMD-Native optimizations autodetected by GCC - 0) Generic (default) + 0) Generic x64-v2 (default) EOF @@ -126,22 +126,23 @@ case $answer in 94) Microarchitecture=CONFIG_GENERIC_CPU4 ;; 98) Microarchitecture=CONFIG_MNATIVE_INTEL ;; 99) Microarchitecture=CONFIG_MNATIVE_AMD ;; - *) default=CONFIG_GENERIC_CPU ; _localversion=-x64v1 ;; + *) default=CONFIG_GENERIC_CPU2 ;; esac warning "According to PKGBUILD variable _microarchitecture, your choice is $answer" msg "Building this package for microarchitecture: $Microarchitecture$default" sleep 5 +_defaultmicro=$(grep ^CONFIG_LOCALVERSION .config) if [ -z "${default}" ]; then _localversion=$(echo ${Microarchitecture,,} | sed -e 's/config_m/-/g' -e 's/config_generic_cpu/-x64v/g') + sed -e "s|^$_defaultmicro|CONFIG_LOCALVERSION=\"$_localversion\"|g" -i .config fi sed -e 's|^CONFIG_GENERIC_CPU=y|# CONFIG_GENERIC_CPU is not set|g' -i .config sed -e 's|^CONFIG_GENERIC_CPU2=y|# CONFIG_GENERIC_CPU2 is not set|g' -i .config sed -e 's|^CONFIG_GENERIC_CPU3=y|# CONFIG_GENERIC_CPU3 is not set|g' -i .config sed -e 's|^CONFIG_GENERIC_CPU4=y|# CONFIG_GENERIC_CPU4 is not set|g' -i .config -sed -e "s|^CONFIG_LOCALVERSION=\"-x64v2\"|CONFIG_LOCALVERSION=\"$_localversion\"|g" -i .config sed -e "s|^# $Microarchitecture is not set|$Microarchitecture=y|g" -i .config echo |