From 9170c0b26ac19e817eee950d3f75578efacb3b64 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 19 Feb 2014 13:29:08 -0600 Subject: updates for packages.x86_64 and cache. build.sh: check if .caches lines are commented out and ignore if so. --- build_tools/archiso/mythvantage/build.sh | 23 ++++++++++++---------- .../mythvantage/profile_files/packages.x86_64 | 1 - .../profile_files/packages.x86_64.cache | 5 +++-- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/build_tools/archiso/mythvantage/build.sh b/build_tools/archiso/mythvantage/build.sh index a7d3c49..e2659f7 100755 --- a/build_tools/archiso/mythvantage/build.sh +++ b/build_tools/archiso/mythvantage/build.sh @@ -182,16 +182,19 @@ make_cache_repo() { 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} - curl -O ${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/${pacman_cache} diff --git a/build_tools/archiso/mythvantage/profile_files/packages.x86_64 b/build_tools/archiso/mythvantage/profile_files/packages.x86_64 index 62b0924..daba72a 100644 --- a/build_tools/archiso/mythvantage/profile_files/packages.x86_64 +++ b/build_tools/archiso/mythvantage/profile_files/packages.x86_64 @@ -74,7 +74,6 @@ python-parted python-pexpect python-netifaces python-iplib -openssh xorg-apps xorg-fonts windowmaker diff --git a/build_tools/archiso/mythvantage/profile_files/packages.x86_64.cache b/build_tools/archiso/mythvantage/profile_files/packages.x86_64.cache index c3abc54..a989fdb 100644 --- a/build_tools/archiso/mythvantage/profile_files/packages.x86_64.cache +++ b/build_tools/archiso/mythvantage/profile_files/packages.x86_64.cache @@ -16,8 +16,8 @@ mythappletrailers xscreensaver supplemental-web supplemental-web-slave -romdb -miro +#romdb +#miro oss xf86-input-vmmouse xf86-video-vmware @@ -25,3 +25,4 @@ xf86-video-vesa xf86-video-intel libgl svga-dri +nss-mdns -- cgit v0.12