Switch away from cachyos repositories and build packages for non-native targets
This is because shire doesn't support newer x86 instruction sets
This commit is contained in:
parent
e042dbf274
commit
87b86ee8e0
4 changed files with 2 additions and 31 deletions
|
@ -143,10 +143,6 @@ dst = "/etc/pacserve/pacserve.service.conf"
|
||||||
src = "etc/mkinitcpio.d/linux.preset"
|
src = "etc/mkinitcpio.d/linux.preset"
|
||||||
dst = "/etc/mkinitcpio.d/linux.preset"
|
dst = "/etc/mkinitcpio.d/linux.preset"
|
||||||
|
|
||||||
[dotfiles."f_mkinitcpio_linux-cachyos.preset"]
|
|
||||||
src = "etc/mkinitcpio.d/linux-cachyos.preset"
|
|
||||||
dst = "/etc/mkinitcpio.d/linux-cachyos.preset"
|
|
||||||
|
|
||||||
[dotfiles.f_cmdline]
|
[dotfiles.f_cmdline]
|
||||||
src = "etc/kernel/cmdline"
|
src = "etc/kernel/cmdline"
|
||||||
dst = "/etc/kernel/cmdline"
|
dst = "/etc/kernel/cmdline"
|
||||||
|
@ -196,7 +192,6 @@ dotfiles = [
|
||||||
"f_logind.conf",
|
"f_logind.conf",
|
||||||
"f_mkinitcpio.conf",
|
"f_mkinitcpio.conf",
|
||||||
"f_mkinitcpio_linux.preset",
|
"f_mkinitcpio_linux.preset",
|
||||||
"f_mkinitcpio_linux-cachyos.preset",
|
|
||||||
"f_plymouthd.conf",
|
"f_plymouthd.conf",
|
||||||
"f_sshd_config",
|
"f_sshd_config",
|
||||||
"f_system.conf",
|
"f_system.conf",
|
||||||
|
@ -239,7 +234,6 @@ dotfiles = [
|
||||||
"f_adb.service",
|
"f_adb.service",
|
||||||
"f_mkinitcpio.conf",
|
"f_mkinitcpio.conf",
|
||||||
"f_mkinitcpio_linux.preset",
|
"f_mkinitcpio_linux.preset",
|
||||||
"f_mkinitcpio_linux-cachyos.preset",
|
|
||||||
"f_plymouthd.conf",
|
"f_plymouthd.conf",
|
||||||
"f_sshd_config",
|
"f_sshd_config",
|
||||||
"f_flexo.toml",
|
"f_flexo.toml",
|
||||||
|
|
|
@ -16,9 +16,9 @@ CARCH="x86_64"
|
||||||
CHOST="x86_64-pc-linux-gnu"
|
CHOST="x86_64-pc-linux-gnu"
|
||||||
|
|
||||||
CPPFLAGS="-D_FORTIFY_SOURCE=2"
|
CPPFLAGS="-D_FORTIFY_SOURCE=2"
|
||||||
CFLAGS="-march=native -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
|
#CFLAGS="-march=native -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
|
||||||
CXXFLAGS="${CFLAGS}"
|
CXXFLAGS="${CFLAGS}"
|
||||||
RUSTFLAGS="-C opt-level=3 -C target-cpu=native"
|
#RUSTFLAGS="-C opt-level=3 -C target-cpu=native"
|
||||||
LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
|
LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
|
||||||
MAKEFLAGS="-j$(nproc)"
|
MAKEFLAGS="-j$(nproc)"
|
||||||
DEBUG_CFLAGS="-g -fvar-tracking-assignments"
|
DEBUG_CFLAGS="-g -fvar-tracking-assignments"
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
PRESETS=('default')
|
|
||||||
|
|
||||||
ALL_config="/etc/mkinitcpio.conf"
|
|
||||||
ALL_kver="/boot/vmlinuz-linux-cachyos"
|
|
||||||
|
|
||||||
default_image="/boot/initramfs-linux-cachyos.img"
|
|
||||||
default_uki="/boot/EFI/Linux/archlinux-linux-cachyos.efi"
|
|
|
@ -13,22 +13,6 @@ CleanMethod=KeepCurrent
|
||||||
CacheDir= /var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64
|
CacheDir= /var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64
|
||||||
{%@@ endif @@%}
|
{%@@ endif @@%}
|
||||||
|
|
||||||
[cachyos-v3]
|
|
||||||
Include = /etc/pacman.d/pacserve
|
|
||||||
Include = /etc/pacman.d/cachyos-v3-mirrorlist
|
|
||||||
|
|
||||||
[cachyos-core-v3]
|
|
||||||
Include = /etc/pacman.d/pacserve
|
|
||||||
Include = /etc/pacman.d/cachyos-v3-mirrorlist
|
|
||||||
|
|
||||||
[cachyos-extra-v3]
|
|
||||||
Include = /etc/pacman.d/pacserve
|
|
||||||
Include = /etc/pacman.d/cachyos-v3-mirrorlist
|
|
||||||
|
|
||||||
[cachyos]
|
|
||||||
Include = /etc/pacman.d/pacserve
|
|
||||||
Include = /etc/pacman.d/cachyos-mirrorlist
|
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
Include = /etc/pacman.d/pacserve
|
Include = /etc/pacman.d/pacserve
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
Loading…
Reference in a new issue