diff --git a/README.md b/README.md index f262491..872b3b2 100644 --- a/README.md +++ b/README.md @@ -23,14 +23,17 @@ In order to switch quickly we copy/paste the content of the other files in archi arcolinux-chaotic-pacman.conf contains both ArcoLinux and chaotic-aur needs extra packages - mirrorlist and keys + extra line in pacman-init.service arcolinux-pacman.conf contains only ArcoLinux needs extra packages - mirrorlist and keys + extra line in pacman-init.service chaotic-pacman.conf contains only chaotic-aur needs extra packages - mirrorlist and keys + extra line in pacman-init.service no-extra-pacman.conf as vanilla as Arch Linux @@ -47,15 +50,16 @@ It will not be used to build the iso. ## ArcoLinux keys and mirror -Since this is an ArcoLinux project after all, the ArcoLinux keys are in by default. -Want a vanilla Arch Linux without any ArcoLinux packages then you do not need our keys. -Delete the ArcoLinux line in +Add the ArcoLinux keys and Arcolinux mirrors to the packages.x86_64. +Add the ArcoLinux line in `/archiso/airootfs/etc/systemd/system/pacman-init.service` -and they will not be installed. + ## Chaotic keys and mirror -If you want to include packages from the Chaotic-aur repo then add its packages to archiso/packages.x86-64. +Add the Chaotic keys and Chaotic mirrors to the packages.x86_64. +Add the Chaotic line in +`/archiso/airootfs/etc/systemd/system/pacman-init.service` # Archiso/packages.x86_64 @@ -88,10 +92,22 @@ I am thinking about xf86-video-intel, nvidia or other drivers. # Build process -Install these two packages on your system if you want to include Chaotic packages on the iso +Install these two packages on your system if you want to include **Chaotic packages** on the iso `sudo pacman -S chaotic-mirror chaotic-keyring` +If not on ArcoLinux you can install them from AUR. + + +Install these two packages on your system if you want to include **ArcoLinux packages** on the iso + +`sudo pacman -S arcolinux-mirrorlist-git arcolinux-keyring` + +If not on ArcoLinux you can install from the ALCI-repo with sudo pacman -U. + +https://github.com/arcolinuxiso/alci_repo + + Accept the **key of Pedro** from Chaotic during installation or install chaotic-keyring. After editing the necessary files you can start building. diff --git a/archiso/airootfs/etc/systemd/system/pacman-init.service b/archiso/airootfs/etc/systemd/system/pacman-init.service index 5d5fb85..70e0ca5 100644 --- a/archiso/airootfs/etc/systemd/system/pacman-init.service +++ b/archiso/airootfs/etc/systemd/system/pacman-init.service @@ -13,7 +13,8 @@ Type=oneshot RemainAfterExit=yes ExecStart=/usr/bin/pacman-key --init ExecStart=/usr/bin/pacman-key --populate archlinux -ExecStart=/usr/bin/pacman-key --populate arcolinux +#ExecStart=/usr/bin/pacman-key --populate arcolinux +#ExecStart=/usr/bin/pacman-key --populate chaotic [Install] WantedBy=multi-user.target diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64 index ce7c763..e7f132c 100644 --- a/archiso/packages.x86_64 +++ b/archiso/packages.x86_64 @@ -197,6 +197,7 @@ network-manager-applet #test #xfce4 #xfce4-goodies +#neofetch diff --git a/archiso/pacman.conf b/archiso/pacman.conf index ba93379..ca18b4d 100644 --- a/archiso/pacman.conf +++ b/archiso/pacman.conf @@ -105,3 +105,18 @@ Include = /etc/pacman.d/mirrorlist SigLevel = Optional TrustedOnly Server = https://arcolinuxiso.github.io/$repo/$arch +#you can create packages and put them on your local repo +#change erik to your own username +#the folder is on your homedirectory with the name alci_local_repo +#see uploaded example + +#[alci_local_repo] +#SigLevel = Optional TrustedOnly +#Server = file:///home/erik/$repo/$arch + +#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 diff --git a/example-alci-local_repo/update-database.sh b/example-alci-local_repo/update-database.sh new file mode 100755 index 0000000..f088b65 --- /dev/null +++ b/example-alci-local_repo/update-database.sh @@ -0,0 +1,21 @@ +#!/bin/bash +#set -e +################################################################################################################## +# Author : Erik Dubois +# Website : https://www.erikdubois.be +# Website : https://www.arcolinux.info +# Website : https://www.arcolinux.com +# Website : https://www.arcolinuxd.com +# Website : https://www.arcolinuxforum.com +################################################################################################################## +# +# DO NOT JUST RUN THIS. EXAMINE AND JUDGE. RUN AT YOUR OWN RISK. +# +################################################################################################################## + +cd x86_64 +sh ./update_repo.sh + +echo "################################################################" +echo "################### Update Done ######################" +echo "################################################################" diff --git a/example-alci-local_repo/x86_64/alci_local_repo.db b/example-alci-local_repo/x86_64/alci_local_repo.db new file mode 120000 index 0000000..9da8485 --- /dev/null +++ b/example-alci-local_repo/x86_64/alci_local_repo.db @@ -0,0 +1 @@ +alci_local_repo.db.tar.gz \ No newline at end of file diff --git a/example-alci-local_repo/x86_64/alci_local_repo.db.tar.gz b/example-alci-local_repo/x86_64/alci_local_repo.db.tar.gz new file mode 100644 index 0000000..e83a7ef Binary files /dev/null and b/example-alci-local_repo/x86_64/alci_local_repo.db.tar.gz differ diff --git a/example-alci-local_repo/x86_64/alci_local_repo.files b/example-alci-local_repo/x86_64/alci_local_repo.files new file mode 120000 index 0000000..f08872e --- /dev/null +++ b/example-alci-local_repo/x86_64/alci_local_repo.files @@ -0,0 +1 @@ +alci_local_repo.files.tar.gz \ No newline at end of file diff --git a/example-alci-local_repo/x86_64/alci_local_repo.files.tar.gz b/example-alci-local_repo/x86_64/alci_local_repo.files.tar.gz new file mode 100644 index 0000000..49c7b70 Binary files /dev/null and b/example-alci-local_repo/x86_64/alci_local_repo.files.tar.gz differ diff --git a/example-alci-local_repo/x86_64/nemesis-wallpapers-21.02-1-any.pkg.tar.zst b/example-alci-local_repo/x86_64/nemesis-wallpapers-21.02-1-any.pkg.tar.zst new file mode 100644 index 0000000..5420836 Binary files /dev/null and b/example-alci-local_repo/x86_64/nemesis-wallpapers-21.02-1-any.pkg.tar.zst differ diff --git a/example-alci-local_repo/x86_64/update_repo.sh b/example-alci-local_repo/x86_64/update_repo.sh new file mode 100755 index 0000000..2fa6a5a --- /dev/null +++ b/example-alci-local_repo/x86_64/update_repo.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +rm alci_local_repo* + +echo "repo-add" +repo-add -n -R alci_local_repo.db.tar.gz *.pkg.tar.zst + +echo "####################################" +echo "Repo Updated!!" +echo "####################################"