From 795b8df7108a65e836acffb093747b333927dbb8 Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Sun, 24 Dec 2017 20:09:39 -0500
Subject: stash

---
 configs/profile/build.sh                           |  9 ++++----
 configs/profile/packages/cache-all.all             |  6 +++++
 configs/profile/root-image/etc/pacman.conf         | 26 +++++++++++++++++++++-
 .../root-image/root/customize_root_image.sh        |  2 +-
 4 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 configs/profile/packages/cache-all.all
 mode change 120000 => 100644 configs/profile/root-image/etc/pacman.conf

(limited to 'configs/profile')

diff --git a/configs/profile/build.sh b/configs/profile/build.sh
index ecd1351..8922ed1 100755
--- a/configs/profile/build.sh
+++ b/configs/profile/build.sh
@@ -136,8 +136,8 @@ make_packages() {
     # create live environment local repo or stash package cache
     if [[ "$enable_offline_install" == 'true' ]]; then
         if [[ -n ${_cache_packages} ]]; then
-            # download cache packages
-            setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${iso_dirname} -p "${_cache_packages}" -O install
+            # download any cache packages and prune obsolete packages
+            cache_only='true' setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${iso_dirname} -p "${_cache_packages}" -O install
         fi
         # create 'isorepo' for offline install
         pushd ${work_dir}/${arch}/root-image/isorepo > /dev/null
@@ -145,14 +145,15 @@ make_packages() {
         popd > /dev/null
     else
         # stash package cache for next build
-        mv ${work_dir}/${arch}/root-image/isorepo ${work_dir}/../isorepo-${arch}
+        mv ${work_dir}/${arch}/root-image/isorepo ${work_dir}/../isorepo-${arch} || true
     fi
-
+echo "diff IN" ; ls -al ${work_dir}/${arch}/root-image/etc/pacman.d/gnupg/ ; diff -r /etc/pacman.d/gnupg/ ${work_dir}/${arch}/root-image/etc/pacman.d/gnupg/
     # refresh pacman keyring in chroot
     arch-chroot ${work_dir}/${arch}/root-image pacman-key --init                           && \
                                                pacman-key --populate archlinux archlinux32    \
                                                                      archlinuxarm parabola && \
                                                pacman-key --refresh
+echo "diff OUT" ; ls -al ${work_dir}/${arch}/root-image/etc/pacman.d/gnupg/ ; diff -r /etc/pacman.d/gnupg/ ${work_dir}/${arch}/root-image/etc/pacman.d/gnupg/
 }
 
 # Copy mkinitcpio parabolaiso hooks and build initramfs (root-image)
diff --git a/configs/profile/packages/cache-all.all b/configs/profile/packages/cache-all.all
new file mode 100644
index 0000000..e692cee
--- /dev/null
+++ b/configs/profile/packages/cache-all.all
@@ -0,0 +1,6 @@
+# this file specifies the packages that are to be downloaded
+# and cached in the /isorepo directory for offline install in all live environments
+# regardless of the architecture, init system, or graphical environment
+
+
+mkinitcpio-openswap
diff --git a/configs/profile/root-image/etc/pacman.conf b/configs/profile/root-image/etc/pacman.conf
deleted file mode 120000
index cec8b80..0000000
--- a/configs/profile/root-image/etc/pacman.conf
+++ /dev/null
@@ -1 +0,0 @@
-root-image/etc/pacman-online.conf
\ No newline at end of file
diff --git a/configs/profile/root-image/etc/pacman.conf b/configs/profile/root-image/etc/pacman.conf
new file mode 100644
index 0000000..d77556f
--- /dev/null
+++ b/configs/profile/root-image/etc/pacman.conf
@@ -0,0 +1,25 @@
+
+[options]
+HoldPkg           = pacman glibc
+Architecture      = auto
+CheckSpace
+SigLevel          = Required DatabaseOptional
+LocalFileSigLevel = Optional
+
+[libre]
+Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+[pcr]
+Include = /etc/pacman.d/mirrorlist
+
+[pcr-testing]
+Include = /etc/pacman.d/mirrorlist
diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh
index ba890b6..1c979e8 100755
--- a/configs/profile/root-image/root/customize_root_image.sh
+++ b/configs/profile/root-image/root/customize_root_image.sh
@@ -23,7 +23,7 @@ then echo "Server = https://repo.parabola.nu/\$repo/os/\$arch" > /etc/pacman.d/m
 fi
 # KLUDGE end
 # KLUDGE begin temp until next calamares rebuild # FIXME:
-cp /etc/pacman.conf /etc/pacman-offline.conf ; cp /etc/pacman.conf /etc/pacman-online.conf
+# cp /etc/pacman.conf /etc/pacman-offline.conf ; cp /etc/pacman.conf /etc/pacman-online.conf
 sed -i 's|requiredStorage:.*|requiredStorage:    8.9|' /usr/share/calamares/modules/welcome.conf
 # KLUDGE end
 
-- 
cgit v1.2.2