diff options
Diffstat (limited to 'build_tools/archiso/mythvantage/build.sh.backup')
| -rwxr-xr-x | build_tools/archiso/mythvantage/build.sh.backup | 63 |
1 files changed, 41 insertions, 22 deletions
diff --git a/build_tools/archiso/mythvantage/build.sh.backup b/build_tools/archiso/mythvantage/build.sh.backup index 243762e..e2659f7 100755 --- a/build_tools/archiso/mythvantage/build.sh.backup +++ b/build_tools/archiso/mythvantage/build.sh.backup @@ -5,19 +5,30 @@ iso_label="linhes_$(date +%Y%m)" iso_version=$(date +%Y.%m.%d) install_dir=arch arch=$(uname -m) -work_dir=work -out_dir=out +work_dir=/tmp/work +out_dir=/tmp verbose="" cmd_args="" script_path=$(readlink -f ${0%/*}) +pacman_cache_files="data-storage-disk0-pacman-pkg" +cache_dirs="/data/storage/disk0/pacman/pkg" +pacman_cache=${cache_dirs} + setup_workdir() { - cache_dirs=($(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g')) + #JM + #this is complicated way todo a mv ${script_path}/pacman.conf $work_dir/pacman.conf + #but we can't do a move because it's called at least 3 times. + #cache_dirs=($(pacman --config ${script_path}/pacman.conf -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g')) + #cache_dirs=($(pacman -C ${pacman_conf} -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g')) mkdir -p "${work_dir}" + pacman_conf="${work_dir}/pacman.conf" + sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${cache_dirs[@]})|g" \ "${script_path}/pacman.conf" > "${pacman_conf}" + } # Base installation (root-image) @@ -164,25 +175,29 @@ make_cache_repo() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]] then local _url _urls _pkg_name _dst _pkgs _cache_dir - mkdir -p ${work_dir}/root-image/var/cache/pacman/pkg + mkdir -p ${work_dir}/root-image/${pacman_cache} old_cache=${work_dir}/old_cache mkdir -p "$old_cache" pacman --config "${pacman_conf}" -Sy -r ${work_dir}/root-image echo "------------------------------------------" for i in $(cat $script_path/packages.${arch}.cache) do - echo "Adding $i to pacman cache" - _urls=$(pacman --config "${pacman_conf}" -Sp -r ${work_dir}/root-image ${i}) - cd $old_cache - for url in ${_urls} - do - echo "downloading $url" - wget -N ${url} - done - cd - + if [[ $i != "#"* ]] + then + echo "Adding $i to pacman cache" + _urls=$(pacman --config "${pacman_conf}" -Sp -r ${work_dir}/root-image ${i}) + cd $old_cache + for url in ${_urls} + do + echo "downloading $url" + #wget -N ${url} + curl -O ${url} + done + cd - + fi done - cp -rp $old_cache/* ${work_dir}/root-image/var/cache/pacman/pkg + cp -rp $old_cache/* ${work_dir}/root-image/${pacman_cache} fi echo "------------------------------------------" @@ -192,7 +207,7 @@ make_cache_repo() { make_var_cache_pacman(){ if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then - mv ${work_dir}/root-image/var/cache/pacman ${work_dir}/var-cache-pacman + mv ${work_dir}/root-image/${pacman_cache} ${work_dir}/${pacman_cache_files} : > ${work_dir}/build.${FUNCNAME} fi @@ -209,21 +224,25 @@ make_var_lib_pacman(){ # Customize installation (root-image) make_customize_root_image() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then + chown -R root:root ${script_path}/root-image cp -af ${script_path}/root-image ${work_dir} chmod 750 ${work_dir}/root-image/etc/sudoers.d - chmod 440 ${work_dir}/root-image/etc/sudoers.d/g_wheel + #JM + #chmod 440 ${work_dir}/root-image/etc/sudoers.d/g_wheel mkdir -p ${work_dir}/root-image/etc/pacman.d - wget -O ${work_dir}/root-image/etc/pacman.d/mirrorlist 'https://www.archlinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on' - sed -i "s/#Server/Server/g" ${work_dir}/root-image/etc/pacman.d/mirrorlist + #JM + #mkdir -p ${work_dir}/storage/data/home + #wget -O ${work_dir}/root-image/etc/pacman.d/mirrorlist 'https://www.archlinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on' + #sed -i "s/#Server/Server/g" ${work_dir}/root-image/etc/pacman.d/mirrorlist #sed -i 's/#\(en_US\.UTF-8\)/\1/' ${work_dir}/root-image/etc/locale.gen mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ -r 'locale-gen' \ run #JM - mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ -# -r 'useradd -m -p "" -G "audio,disk,optical,wheel,storage,video,users" mythtv' \ - run - : > ${work_dir}/build.${FUNCNAME} + #mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ + # -r 'useradd -b "/storage/data/home" -m -p "" -G "audio,disk,optical,wheel,storage,video,users" mythtv' \ + # run + #: > ${work_dir}/build.${FUNCNAME} fi } |