diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2018-04-18 03:05:08 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2018-04-18 03:52:02 -0400 |
| commit | 1fa241be2bc01ccddae427862fd4c5aeb87fb1e8 (patch) | |
| tree | 1190aba2dad4b50cbbd038ffed8c57708c5ec17d /configs/profile/build.sh | |
| parent | 83200b7ac53429c82c8a81f5078fbd97deb4d923 (diff) | |
squashme - updated package list
Diffstat (limited to 'configs/profile/build.sh')
| -rwxr-xr-x | configs/profile/build.sh | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/configs/profile/build.sh b/configs/profile/build.sh index b016ca8..40b5404 100755 --- a/configs/profile/build.sh +++ b/configs/profile/build.sh @@ -17,6 +17,7 @@ iso_version=$(date +%Y.%m.%d) iso_label="PARA_$(date +%Y%m)" iso_dirname='parabola' enable_offline_install='false' +offline_switch='' work_dir=./work out_dir=./out target='' @@ -130,9 +131,6 @@ 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 @@ -140,7 +138,7 @@ setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf if [[ "$enable_offline_install" == 'true' ]]; then if [[ -n ${_cache_packages} ]]; then # 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 + setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${iso_dirname} -p "${_cache_packages}" ${offline_switch} cache fi # create 'isorepo' for offline install pushd ${work_dir}/${arch}/root-image/isorepo > /dev/null @@ -186,7 +184,6 @@ make_setup_mkinitcpio() { # Customize installation (root-image) make_customize_root_image() { - [[ "$enable_offline_install" == 'true' ]] && offline='-O' || offline='' cp -af ${releng_dir}/root-image ${work_dir}/${arch} @@ -199,7 +196,7 @@ make_customize_root_image() { setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} \ -C ${pacman_conf} \ -D ${iso_dirname} \ - ${offline} \ + ${offline_switch} \ -r /root/customize_root_image.sh \ run rm ${work_dir}/${arch}/root-image/root/customize_root_image* @@ -332,11 +329,9 @@ make_aitab() { # Build all filesystem images specified in aitab (.fs.sfs .sfs) make_prepare() { - [[ "$enable_offline_install" == 'true' ]] && offline='-O' || offline='' - cp -a -l -f ${work_dir}/${arch}/root-image ${work_dir} setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${iso_dirname} pkglist - setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${iso_dirname} -C ${pacman_conf} ${offline} prepare + setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${iso_dirname} -C ${pacman_conf} ${offline_switch} prepare rm -rf ${work_dir}/root-image # rm -rf ${work_dir}/${arch}/root-image (if low space, this helps) @@ -359,7 +354,7 @@ while getopts 'E:T:V:L:D:OC:w:o:vh' arg; do V) iso_version="${OPTARG}" ;; L) iso_label="${OPTARG}" ;; D) iso_dirname="${OPTARG}" ;; - O) enable_offline_install='true' ;; + O) enable_offline_install='true' offline_switch='-O' ;; C) pacman_conf="${OPTARG}" ;; w) work_dir="${OPTARG}" ;; o) out_dir="${OPTARG}" ;; |