From adbb09982550baee7d2946d545d456ed9da74828 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Thu, 22 Aug 2024 09:07:07 -0700 Subject: [PATCH] repo fix --- elda/archiso/airootfs/etc/default/grub | 1 + elda/archiso/airootfs/etc/pacman.conf | 52 ++++++++++++++++++++++-- elda/archiso/packages.x86_64 | 1 + emily/archiso/airootfs/etc/default/grub | 1 + emily/archiso/airootfs/etc/pacman.conf | 52 ++++++++++++++++++++++-- emily/archiso/packages.x86_64 | 1 + kimberlyconfig-pkg/PKGBUILD | 6 +++ layla/archiso/airootfs/etc/default/grub | 1 + layla/archiso/airootfs/etc/pacman.conf | 52 ++++++++++++++++++++++-- layla/archiso/packages.x86_64 | 1 + lily/archiso/airootfs/etc/default/grub | 1 + lily/archiso/airootfs/etc/pacman.conf | 52 ++++++++++++++++++++++-- lily/archiso/packages.x86_64 | 1 + midori/archiso/airootfs/etc/default/grub | 1 + midori/archiso/airootfs/etc/pacman.conf | 52 ++++++++++++++++++++++-- midori/archiso/packages.x86_64 | 1 + 16 files changed, 256 insertions(+), 20 deletions(-) create mode 100644 kimberlyconfig-pkg/PKGBUILD diff --git a/elda/archiso/airootfs/etc/default/grub b/elda/archiso/airootfs/etc/default/grub index 889f998..c95a069 100644 --- a/elda/archiso/airootfs/etc/default/grub +++ b/elda/archiso/airootfs/etc/default/grub @@ -52,3 +52,4 @@ GRUB_DISABLE_RECOVERY=true # Uncomment to make GRUB remember the last selection. This requires # setting 'GRUB_DEFAULT=saved' above. #GRUB_SAVEDEFAULT="true" +GRUB_DISABLE_OS_PROBER=false diff --git a/elda/archiso/airootfs/etc/pacman.conf b/elda/archiso/airootfs/etc/pacman.conf index 6161dd7..3b21a02 100644 --- a/elda/archiso/airootfs/etc/pacman.conf +++ b/elda/archiso/airootfs/etc/pacman.conf @@ -2,8 +2,6 @@ # /etc/pacman.conf # # See the pacman.conf(5) manpage for option and repository directives -# -# SPDX-License-Identifier: GPL-3.0-or-later # # GENERAL OPTIONS @@ -34,6 +32,7 @@ Architecture = auto #UseSyslog #Color #NoProgressBar +# We cannot check disk space from within a chroot environment #CheckSpace #VerbosePkgLists ParallelDownloads = 8 @@ -71,6 +70,40 @@ LocalFileSigLevel = Optional # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. +#you can create packages and put them on your local repo +#the folder should be on your homedirectory with the name alci_local_repo +#see uploaded example -there is a copy of the local repo in your folder +#Copy/paste it to your homefolder +#update the packages database +#Change the name erik to your own username + +#Your local repository +#[alci_local_repo] +#SigLevel = Optional TrustedOnly +#Server = file:///home/erik/$repo/$arch + +#repository from ALCI +[alci_repo] +SigLevel = Optional TrustedOnly +Server = https://arch-linux-calamares-installer.github.io/$repo/$arch + +#repositories from ArcoLinux +#[arcolinux_repo_testing] +#SigLevel = Optional TrustedOnly +#Include = /etc/pacman.d/arcolinux-mirrorlist + +#[arcolinux_repo] +#SigLevel = Optional TrustedOnly +#Include = /etc/pacman.d/arcolinux-mirrorlist + +#[arcolinux_repo_3party] +#SigLevel = Optional TrustedOnly +#Include = /etc/pacman.d/arcolinux-mirrorlist + +#[arcolinux_repo_xlarge] +#SigLevel = Optional TrustedOnly +#Include = /etc/pacman.d/arcolinux-mirrorlist + #[core-testing] #Include = /etc/pacman.d/mirrorlist @@ -89,11 +122,22 @@ Include = /etc/pacman.d/mirrorlist #[multilib-testing] #Include = /etc/pacman.d/mirrorlist -#[multilib] -#Include = /etc/pacman.d/mirrorlist +[multilib] +Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] #SigLevel = Optional TrustAll #Server = file:///home/custompkgs + +#more repositories here : +#https://wiki.archlinux.org/index.php/unofficial_user_repositories + +#remember to add chaotic-mirrorlist and chaotic-keyring to the packages.x86_64 +#[chaotic-aur] +#Include = /etc/pacman.d/chaotic-mirrorlist + +[karchrepo] +SigLevel = Optional TrustAll +Server = https://s3.asgardius.company/$repo/$arch diff --git a/elda/archiso/packages.x86_64 b/elda/archiso/packages.x86_64 index c47f20b..8c55e3a 100644 --- a/elda/archiso/packages.x86_64 +++ b/elda/archiso/packages.x86_64 @@ -472,3 +472,4 @@ pysolfc-cardsets moonlight-qt antimicrox sunshine +kimberlyconfig diff --git a/emily/archiso/airootfs/etc/default/grub b/emily/archiso/airootfs/etc/default/grub index 889f998..c95a069 100644 --- a/emily/archiso/airootfs/etc/default/grub +++ b/emily/archiso/airootfs/etc/default/grub @@ -52,3 +52,4 @@ GRUB_DISABLE_RECOVERY=true # Uncomment to make GRUB remember the last selection. This requires # setting 'GRUB_DEFAULT=saved' above. #GRUB_SAVEDEFAULT="true" +GRUB_DISABLE_OS_PROBER=false diff --git a/emily/archiso/airootfs/etc/pacman.conf b/emily/archiso/airootfs/etc/pacman.conf index 6161dd7..3b21a02 100644 --- a/emily/archiso/airootfs/etc/pacman.conf +++ b/emily/archiso/airootfs/etc/pacman.conf @@ -2,8 +2,6 @@ # /etc/pacman.conf # # See the pacman.conf(5) manpage for option and repository directives -# -# SPDX-License-Identifier: GPL-3.0-or-later # # GENERAL OPTIONS @@ -34,6 +32,7 @@ Architecture = auto #UseSyslog #Color #NoProgressBar +# We cannot check disk space from within a chroot environment #CheckSpace #VerbosePkgLists ParallelDownloads = 8 @@ -71,6 +70,40 @@ LocalFileSigLevel = Optional # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. +#you can create packages and put them on your local repo +#the folder should be on your homedirectory with the name alci_local_repo +#see uploaded example -there is a copy of the local repo in your folder +#Copy/paste it to your homefolder +#update the packages database +#Change the name erik to your own username + +#Your local repository +#[alci_local_repo] +#SigLevel = Optional TrustedOnly +#Server = file:///home/erik/$repo/$arch + +#repository from ALCI +[alci_repo] +SigLevel = Optional TrustedOnly +Server = https://arch-linux-calamares-installer.github.io/$repo/$arch + +#repositories from ArcoLinux +#[arcolinux_repo_testing] +#SigLevel = Optional TrustedOnly +#Include = /etc/pacman.d/arcolinux-mirrorlist + +#[arcolinux_repo] +#SigLevel = Optional TrustedOnly +#Include = /etc/pacman.d/arcolinux-mirrorlist + +#[arcolinux_repo_3party] +#SigLevel = Optional TrustedOnly +#Include = /etc/pacman.d/arcolinux-mirrorlist + +#[arcolinux_repo_xlarge] +#SigLevel = Optional TrustedOnly +#Include = /etc/pacman.d/arcolinux-mirrorlist + #[core-testing] #Include = /etc/pacman.d/mirrorlist @@ -89,11 +122,22 @@ Include = /etc/pacman.d/mirrorlist #[multilib-testing] #Include = /etc/pacman.d/mirrorlist -#[multilib] -#Include = /etc/pacman.d/mirrorlist +[multilib] +Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] #SigLevel = Optional TrustAll #Server = file:///home/custompkgs + +#more repositories here : +#https://wiki.archlinux.org/index.php/unofficial_user_repositories + +#remember to add chaotic-mirrorlist and chaotic-keyring to the packages.x86_64 +#[chaotic-aur] +#Include = /etc/pacman.d/chaotic-mirrorlist + +[karchrepo] +SigLevel = Optional TrustAll +Server = https://s3.asgardius.company/$repo/$arch diff --git a/emily/archiso/packages.x86_64 b/emily/archiso/packages.x86_64 index 7bdcf87..8ce3678 100644 --- a/emily/archiso/packages.x86_64 +++ b/emily/archiso/packages.x86_64 @@ -480,3 +480,4 @@ gnome-disk-utility testdisk ddrescue clonezilla +kimberlyconfig diff --git a/kimberlyconfig-pkg/PKGBUILD b/kimberlyconfig-pkg/PKGBUILD new file mode 100644 index 0000000..b713fd6 --- /dev/null +++ b/kimberlyconfig-pkg/PKGBUILD @@ -0,0 +1,6 @@ +pkgname='kimberlyconfig' +pkgver=r3.0 +pkgrel=1 +pkgdesc="Config updates for Kimberly GNU/Linux" +arch=(any) +provides=('kimberlyconfig=r3.0') # thanks to loqs and allan pointing it out diff --git a/layla/archiso/airootfs/etc/default/grub b/layla/archiso/airootfs/etc/default/grub index 889f998..c95a069 100644 --- a/layla/archiso/airootfs/etc/default/grub +++ b/layla/archiso/airootfs/etc/default/grub @@ -52,3 +52,4 @@ GRUB_DISABLE_RECOVERY=true # Uncomment to make GRUB remember the last selection. This requires # setting 'GRUB_DEFAULT=saved' above. #GRUB_SAVEDEFAULT="true" +GRUB_DISABLE_OS_PROBER=false diff --git a/layla/archiso/airootfs/etc/pacman.conf b/layla/archiso/airootfs/etc/pacman.conf index 6161dd7..3b21a02 100644 --- a/layla/archiso/airootfs/etc/pacman.conf +++ b/layla/archiso/airootfs/etc/pacman.conf @@ -2,8 +2,6 @@ # /etc/pacman.conf # # See the pacman.conf(5) manpage for option and repository directives -# -# SPDX-License-Identifier: GPL-3.0-or-later # # GENERAL OPTIONS @@ -34,6 +32,7 @@ Architecture = auto #UseSyslog #Color #NoProgressBar +# We cannot check disk space from within a chroot environment #CheckSpace #VerbosePkgLists ParallelDownloads = 8 @@ -71,6 +70,40 @@ LocalFileSigLevel = Optional # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. +#you can create packages and put them on your local repo +#the folder should be on your homedirectory with the name alci_local_repo +#see uploaded example -there is a copy of the local repo in your folder +#Copy/paste it to your homefolder +#update the packages database +#Change the name erik to your own username + +#Your local repository +#[alci_local_repo] +#SigLevel = Optional TrustedOnly +#Server = file:///home/erik/$repo/$arch + +#repository from ALCI +[alci_repo] +SigLevel = Optional TrustedOnly +Server = https://arch-linux-calamares-installer.github.io/$repo/$arch + +#repositories from ArcoLinux +#[arcolinux_repo_testing] +#SigLevel = Optional TrustedOnly +#Include = /etc/pacman.d/arcolinux-mirrorlist + +#[arcolinux_repo] +#SigLevel = Optional TrustedOnly +#Include = /etc/pacman.d/arcolinux-mirrorlist + +#[arcolinux_repo_3party] +#SigLevel = Optional TrustedOnly +#Include = /etc/pacman.d/arcolinux-mirrorlist + +#[arcolinux_repo_xlarge] +#SigLevel = Optional TrustedOnly +#Include = /etc/pacman.d/arcolinux-mirrorlist + #[core-testing] #Include = /etc/pacman.d/mirrorlist @@ -89,11 +122,22 @@ Include = /etc/pacman.d/mirrorlist #[multilib-testing] #Include = /etc/pacman.d/mirrorlist -#[multilib] -#Include = /etc/pacman.d/mirrorlist +[multilib] +Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] #SigLevel = Optional TrustAll #Server = file:///home/custompkgs + +#more repositories here : +#https://wiki.archlinux.org/index.php/unofficial_user_repositories + +#remember to add chaotic-mirrorlist and chaotic-keyring to the packages.x86_64 +#[chaotic-aur] +#Include = /etc/pacman.d/chaotic-mirrorlist + +[karchrepo] +SigLevel = Optional TrustAll +Server = https://s3.asgardius.company/$repo/$arch diff --git a/layla/archiso/packages.x86_64 b/layla/archiso/packages.x86_64 index 32429ba..0e66e29 100644 --- a/layla/archiso/packages.x86_64 +++ b/layla/archiso/packages.x86_64 @@ -588,3 +588,4 @@ libreoffice-fresh-zu epson-inkjet-printer-escpr2 hplip cups +kimberlyconfig diff --git a/lily/archiso/airootfs/etc/default/grub b/lily/archiso/airootfs/etc/default/grub index 889f998..c95a069 100644 --- a/lily/archiso/airootfs/etc/default/grub +++ b/lily/archiso/airootfs/etc/default/grub @@ -52,3 +52,4 @@ GRUB_DISABLE_RECOVERY=true # Uncomment to make GRUB remember the last selection. This requires # setting 'GRUB_DEFAULT=saved' above. #GRUB_SAVEDEFAULT="true" +GRUB_DISABLE_OS_PROBER=false diff --git a/lily/archiso/airootfs/etc/pacman.conf b/lily/archiso/airootfs/etc/pacman.conf index 6161dd7..3b21a02 100644 --- a/lily/archiso/airootfs/etc/pacman.conf +++ b/lily/archiso/airootfs/etc/pacman.conf @@ -2,8 +2,6 @@ # /etc/pacman.conf # # See the pacman.conf(5) manpage for option and repository directives -# -# SPDX-License-Identifier: GPL-3.0-or-later # # GENERAL OPTIONS @@ -34,6 +32,7 @@ Architecture = auto #UseSyslog #Color #NoProgressBar +# We cannot check disk space from within a chroot environment #CheckSpace #VerbosePkgLists ParallelDownloads = 8 @@ -71,6 +70,40 @@ LocalFileSigLevel = Optional # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. +#you can create packages and put them on your local repo +#the folder should be on your homedirectory with the name alci_local_repo +#see uploaded example -there is a copy of the local repo in your folder +#Copy/paste it to your homefolder +#update the packages database +#Change the name erik to your own username + +#Your local repository +#[alci_local_repo] +#SigLevel = Optional TrustedOnly +#Server = file:///home/erik/$repo/$arch + +#repository from ALCI +[alci_repo] +SigLevel = Optional TrustedOnly +Server = https://arch-linux-calamares-installer.github.io/$repo/$arch + +#repositories from ArcoLinux +#[arcolinux_repo_testing] +#SigLevel = Optional TrustedOnly +#Include = /etc/pacman.d/arcolinux-mirrorlist + +#[arcolinux_repo] +#SigLevel = Optional TrustedOnly +#Include = /etc/pacman.d/arcolinux-mirrorlist + +#[arcolinux_repo_3party] +#SigLevel = Optional TrustedOnly +#Include = /etc/pacman.d/arcolinux-mirrorlist + +#[arcolinux_repo_xlarge] +#SigLevel = Optional TrustedOnly +#Include = /etc/pacman.d/arcolinux-mirrorlist + #[core-testing] #Include = /etc/pacman.d/mirrorlist @@ -89,11 +122,22 @@ Include = /etc/pacman.d/mirrorlist #[multilib-testing] #Include = /etc/pacman.d/mirrorlist -#[multilib] -#Include = /etc/pacman.d/mirrorlist +[multilib] +Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] #SigLevel = Optional TrustAll #Server = file:///home/custompkgs + +#more repositories here : +#https://wiki.archlinux.org/index.php/unofficial_user_repositories + +#remember to add chaotic-mirrorlist and chaotic-keyring to the packages.x86_64 +#[chaotic-aur] +#Include = /etc/pacman.d/chaotic-mirrorlist + +[karchrepo] +SigLevel = Optional TrustAll +Server = https://s3.asgardius.company/$repo/$arch diff --git a/lily/archiso/packages.x86_64 b/lily/archiso/packages.x86_64 index 6959282..054cd0e 100644 --- a/lily/archiso/packages.x86_64 +++ b/lily/archiso/packages.x86_64 @@ -472,3 +472,4 @@ audacity soundconverter handbrake gnome-subtitles +kimberlyconfig diff --git a/midori/archiso/airootfs/etc/default/grub b/midori/archiso/airootfs/etc/default/grub index 889f998..c95a069 100644 --- a/midori/archiso/airootfs/etc/default/grub +++ b/midori/archiso/airootfs/etc/default/grub @@ -52,3 +52,4 @@ GRUB_DISABLE_RECOVERY=true # Uncomment to make GRUB remember the last selection. This requires # setting 'GRUB_DEFAULT=saved' above. #GRUB_SAVEDEFAULT="true" +GRUB_DISABLE_OS_PROBER=false diff --git a/midori/archiso/airootfs/etc/pacman.conf b/midori/archiso/airootfs/etc/pacman.conf index 6161dd7..3b21a02 100644 --- a/midori/archiso/airootfs/etc/pacman.conf +++ b/midori/archiso/airootfs/etc/pacman.conf @@ -2,8 +2,6 @@ # /etc/pacman.conf # # See the pacman.conf(5) manpage for option and repository directives -# -# SPDX-License-Identifier: GPL-3.0-or-later # # GENERAL OPTIONS @@ -34,6 +32,7 @@ Architecture = auto #UseSyslog #Color #NoProgressBar +# We cannot check disk space from within a chroot environment #CheckSpace #VerbosePkgLists ParallelDownloads = 8 @@ -71,6 +70,40 @@ LocalFileSigLevel = Optional # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. +#you can create packages and put them on your local repo +#the folder should be on your homedirectory with the name alci_local_repo +#see uploaded example -there is a copy of the local repo in your folder +#Copy/paste it to your homefolder +#update the packages database +#Change the name erik to your own username + +#Your local repository +#[alci_local_repo] +#SigLevel = Optional TrustedOnly +#Server = file:///home/erik/$repo/$arch + +#repository from ALCI +[alci_repo] +SigLevel = Optional TrustedOnly +Server = https://arch-linux-calamares-installer.github.io/$repo/$arch + +#repositories from ArcoLinux +#[arcolinux_repo_testing] +#SigLevel = Optional TrustedOnly +#Include = /etc/pacman.d/arcolinux-mirrorlist + +#[arcolinux_repo] +#SigLevel = Optional TrustedOnly +#Include = /etc/pacman.d/arcolinux-mirrorlist + +#[arcolinux_repo_3party] +#SigLevel = Optional TrustedOnly +#Include = /etc/pacman.d/arcolinux-mirrorlist + +#[arcolinux_repo_xlarge] +#SigLevel = Optional TrustedOnly +#Include = /etc/pacman.d/arcolinux-mirrorlist + #[core-testing] #Include = /etc/pacman.d/mirrorlist @@ -89,11 +122,22 @@ Include = /etc/pacman.d/mirrorlist #[multilib-testing] #Include = /etc/pacman.d/mirrorlist -#[multilib] -#Include = /etc/pacman.d/mirrorlist +[multilib] +Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] #SigLevel = Optional TrustAll #Server = file:///home/custompkgs + +#more repositories here : +#https://wiki.archlinux.org/index.php/unofficial_user_repositories + +#remember to add chaotic-mirrorlist and chaotic-keyring to the packages.x86_64 +#[chaotic-aur] +#Include = /etc/pacman.d/chaotic-mirrorlist + +[karchrepo] +SigLevel = Optional TrustAll +Server = https://s3.asgardius.company/$repo/$arch diff --git a/midori/archiso/packages.x86_64 b/midori/archiso/packages.x86_64 index e8826fa..2a40952 100644 --- a/midori/archiso/packages.x86_64 +++ b/midori/archiso/packages.x86_64 @@ -464,3 +464,4 @@ firefox-i18n-xh firefox-i18n-zh-cn firefox-i18n-zh-tw vlc-git +kimberlyconfig