From 83200b7ac53429c82c8a81f5078fbd97deb4d923 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sat, 17 Mar 2018 11:41:43 -0400 Subject: deleteme --- configs/profile/build.sh | 37 ++++++++++++++++++++----------------- configs/profile/pacman.conf | 5 +++++ configs/profile/rebuild.sh | 12 ++++++------ 3 files changed, 31 insertions(+), 23 deletions(-) (limited to 'configs/profile') diff --git a/configs/profile/build.sh b/configs/profile/build.sh index d3e519f..b016ca8 100755 --- a/configs/profile/build.sh +++ b/configs/profile/build.sh @@ -130,6 +130,9 @@ make_packages() { [ "${_install_gui_packages}" ] && echo "Installing ${_gui_packages_msg}" && echo "${_install_gui_lists}" | sed "s/.*\//\t/" [ "${_cache_gui_packages}" ] && echo "Caching ${_gui_packages_msg}" && echo "${_cache_gui_lists}" | sed "s/.*\//\t/" +# FIXME: KLUDGE begin +setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${iso_dirname} -p 'boost-libs=1.65.1-2' install +# FIXME: KLUDGE end # install packages setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${iso_dirname} -p "${_install_packages}" install @@ -149,23 +152,23 @@ make_packages() { fi # refresh pacman keyring in chroot -cp -r /etc/pacman.d/gnupg/ ./hostgnupg/ -cp -r ${work_dir}/${arch}/root-image/etc/pacman.d/gnupg/ ./chrootgnupg/ - arch-chroot ${work_dir}/${arch}/root-image rm -rf /etc/pacman.d/gnupg/ && \ - pacman-key --init && \ - pacman -S --noconfirm archlinux-keyring \ - archlinux32-keyring \ - archlinuxarm-keyring \ - parabola-keyring && \ - pacman-key --populate archlinux archlinux32 \ - archlinuxarm parabola && \ - pacman-key --refresh && \ - pacman -S --noconfirm archlinux-keyring \ - archlinux32-keyring \ - archlinuxarm-keyring \ - parabola-keyring ; -echo "ls ./hostgnupg/" ; ls -al /etc/pacman.d/gnupg/ ./hostgnupg/ -echo "ls ./chrootgnupg/" ; ls -al ${work_dir}/${arch}/root-image/etc/pacman.d/gnupg/ ./chrootgnupg/ +# cp -r /etc/pacman.d/gnupg/ ./hostgnupg/ +# cp -r ${work_dir}/${arch}/root-image/etc/pacman.d/gnupg/ ./chrootgnupg/ +# arch-chroot ${work_dir}/${arch}/root-image rm -rf /etc/pacman.d/gnupg/ && \ +# pacman-key --init && \ +# pacman -S --noconfirm archlinux-keyring \ +# archlinux32-keyring \ +# archlinuxarm-keyring \ +# parabola-keyring && \ +# pacman-key --populate archlinux archlinux32 \ +# archlinuxarm parabola && \ +# pacman-key --refresh && \ +# pacman -S --noconfirm archlinux-keyring \ +# archlinux32-keyring \ +# archlinuxarm-keyring \ +# parabola-keyring ; +# echo "ls ./hostgnupg/" ; ls -al /etc/pacman.d/gnupg/ ./hostgnupg/ +# echo "ls ./chrootgnupg/" ; ls -al ${work_dir}/${arch}/root-image/etc/pacman.d/gnupg/ ./chrootgnupg/ } # Copy mkinitcpio parabolaiso hooks and build initramfs (root-image) diff --git a/configs/profile/pacman.conf b/configs/profile/pacman.conf index 942f59d..4c7e7fa 100644 --- a/configs/profile/pacman.conf +++ b/configs/profile/pacman.conf @@ -103,3 +103,8 @@ Include = /etc/pacman.d/mirrorlist #[custom] #SigLevel = Optional TrustAll #Server = file:///home/custompkgs + + +[isorepo] +SigLevel = Optional TrustAll +Server = file:///home/bill/parabolaiso/configs/profile/work/x86_64/root-image/isorepo/ diff --git a/configs/profile/rebuild.sh b/configs/profile/rebuild.sh index 3f212c6..72bb176 100755 --- a/configs/profile/rebuild.sh +++ b/configs/profile/rebuild.sh @@ -3,15 +3,15 @@ readonly MODE='wipe' # total wipe of work dir preserving package cache # readonly MODE='rebuild' # full update rebuild preserving work dir # readonly MODE='tweak' # chroot customization tweaks only -readonly TARGET='dual' # dual-arch (default) +# readonly TARGET='dual' # dual-arch (default) # readonly TARGET='i686' # i686 target only -# readonly TARGET='x86_64' # x86_64 target only +readonly TARGET='x86_64' # x86_64 target only # readonly EDITION='OpenRC/CLI' # OpenRC/CLI init/WM-DE pair # readonly EDITION='OpenRC/LXDE' # OpenRC/LXDE init/WM-DE pair -readonly EDITION='SystemD/CLI' # SystemD/CLI init/WM-DE pair (default) -# readonly EDITION='SystemD/LXDE' # SystemD/LXDE init/WM-DE pair -readonly CACHE='' # net-install (default) -# readonly CACHE='-O' # offline install +# readonly EDITION='SystemD/CLI' # SystemD/CLI init/WM-DE pair (default) +readonly EDITION='SystemD/LXDE' # SystemD/LXDE init/WM-DE pair +# readonly CACHE='' # net-install (default) +readonly CACHE='-O' # offline install readonly VERSION="`date +%Y.%m.%d-%H.%M`-alpha" # ISO filename like: parabola---.iso -- cgit v1.2.2