From af90c6fa544b4b788986978aae1927c78b7f9fce Mon Sep 17 00:00:00 2001 From: Matt C Date: Mon, 24 May 2021 18:08:30 -0400 Subject: [PATCH] enable building iso from testing repo source --- .gitignore | 2 +- build_iso.sh | 8 ++- crystal/airootfs/etc/buildstamp | 2 +- crystal/pacman.conf => pacman.def | 0 pacman.testing | 113 ++++++++++++++++++++++++++++++ 5 files changed, 122 insertions(+), 3 deletions(-) rename crystal/pacman.conf => pacman.def (100%) create mode 100644 pacman.testing diff --git a/.gitignore b/.gitignore index f32dba2..f59e92e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ *.iso sysroot/ sysroot.* -.vagrant \ No newline at end of file +crystal/pacman.conf \ No newline at end of file diff --git a/build_iso.sh b/build_iso.sh index 5380ae0..aefdfba 100755 --- a/build_iso.sh +++ b/build_iso.sh @@ -10,10 +10,16 @@ else fi fi +if [[ "$2" == "testing" ]]; then + cp pacman.testing crystal/pacman.conf +else + cp pacman.def crystal/pacman.conf +fi + # idk if this would've happened automatically? cp crystal/pacman.conf crystal/airootfs/etc/. cp crystal/packages.x86_64 crystal/airootfs/etc/packages.x86_64 cp /etc/pacman.d/mirrorlist crystal/airootfs/etc/pacman.d/. echo "Built on $(date +"%D @ %T EST")" > crystal/airootfs/etc/buildstamp time sudo ./mkarchiso -v -w $WORKDIR -o . crystal -sudo rm -rf $WORKDIR +sudo rm -rf $WORKDIR \ No newline at end of file diff --git a/crystal/airootfs/etc/buildstamp b/crystal/airootfs/etc/buildstamp index 906d43b..7b390e6 100644 --- a/crystal/airootfs/etc/buildstamp +++ b/crystal/airootfs/etc/buildstamp @@ -1 +1 @@ -Built on 05/14/21 @ 21:02:34 EST +Built on 05/24/21 @ 18:06:44 EST diff --git a/crystal/pacman.conf b/pacman.def similarity index 100% rename from crystal/pacman.conf rename to pacman.def diff --git a/pacman.testing b/pacman.testing new file mode 100644 index 0000000..8880f4f --- /dev/null +++ b/pacman.testing @@ -0,0 +1,113 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives +# +# SPDX-License-Identifier: GPL-3.0-or-later + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ +HoldPkg = pacman glibc +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +Color +TotalDownload +ILoveCandy +# We cannot check disk space from within a chroot environment +#CheckSpace +#VerbosePkgLists + +# By default, pacman accepts packages signed by keys that its local keyring +# trusts (see pacman-key and its man page), as well as unsigned packages. +SigLevel = Never +LocalFileSigLevel = Never +RemoteFileSigLevel = Never + +# NOTE: You must run `pacman-key --init` before first using pacman; the local +# keyring can then be populated with the keys of all official Arch Linux +# packagers with `pacman-key --populate archlinux`. + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[crystal] +Server = https://github.com/crystalux-project/packages/raw/testing/crystal/ +SigLevel = Never + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +# Apparently this is a depend?? +# (ckbcomp to be exact) +[aur] +Server = https://repo.xhec.us/aur +SigLevel = Never + +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repositories as required here. + +#[multilib-testing] +#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