diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2017-12-24 20:09:39 -0500 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2018-01-01 00:53:50 -0500 |
| commit | 795b8df7108a65e836acffb093747b333927dbb8 (patch) | |
| tree | 9d9ad2bdaa2558eec845c5888b29cad2b42d9441 /configs/profile/build.sh | |
| parent | f119f660183875f5e525d263db91347e7a55e45f (diff) | |
stash
Diffstat (limited to 'configs/profile/build.sh')
| -rwxr-xr-x | configs/profile/build.sh | 9 |
1 files changed, 5 insertions, 4 deletions
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) |