repo fix

2024-08-22 09:07:07 -07:00 · 2024-08-22 09:07:07 -07:00 · adbb099825
commit adbb099825
parent 3022bd30c7
16 changed files with 256 additions and 20 deletions
--- 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
--- 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
--- a/elda/archiso/packages.x86_64
+++ b/elda/archiso/packages.x86_64
@ -472,3 +472,4 @@ pysolfc-cardsets
 moonlight-qt
 antimicrox
 sunshine
+kimberlyconfig
--- 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
--- 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
--- a/emily/archiso/packages.x86_64
+++ b/emily/archiso/packages.x86_64
@ -480,3 +480,4 @@ gnome-disk-utility
 testdisk
 ddrescue
 clonezilla
+kimberlyconfig
--- a/kimberlyconfig-pkg/PKGBUILD
+++ 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/lily/archiso/packages.x86_64
+++ b/lily/archiso/packages.x86_64
@ -472,3 +472,4 @@ audacity
 soundconverter
 handbrake
 gnome-subtitles
+kimberlyconfig
--- 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
--- 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
--- 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