Split mirroring into own script

Change-Id: I1280b5e06ab9ab1fec015b51836d07da85c9f61f
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh
index c166e28..4aa45a1 100644 (file)
--- a/packer/provision/agl_dependencies.sh
+++ b/packer/provision/agl_dependencies.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+DEBIAN_FRONTEND=noninteractive apt-get update && apt-get -y -u dist-upgrade
+
 DEBIAN_FRONTEND=noninteractive apt-get update && \
     apt-get -y install gawk wget git-core diffstat unzip texinfo gcc-multilib build-essential chrpath socat \
                        libsdl1.2-dev xterm make xsltproc docbook-utils fop dblatex xmlto autoconf automake \
@@ -17,20 +19,3 @@ cat <<EOFHOSTS >> /etc/hosts
 199.19.213.77 download-new.automotivelinux.org
 
 EOFHOSTS
-
-
-# Preclone the gerrit repos for speed (use with --reference=/opt/AGL/preclone)
-mkdir -p /opt/AGL/preclone
-cd /opt/AGL/preclone
-repo init -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
-repo sync
-cd
-
-#mirror sstate-cache into /opt/AGL/sstate-mirror
-mkdir -p /opt/AGL/sstate-mirror
-cd /opt/AGL/sstate-mirror
-wget --mirror -np -nH --convert-links "https://download-new.automotivelinux.org/sstate-mirror/" -A siginfo -A tgz --cut-dirs=1
-ls
-ls *
-cd
-

diff --git a/packer/provision/agl_mirror.sh b/packer/provision/agl_mirror.sh
new file mode 100644 (file)
index 0000000..e2a6b8c
--- /dev/null
+++ b/packer/provision/agl_mirror.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Preclone the gerrit repos for speed (use with --reference=/opt/AGL/preclone)
+mkdir -p /opt/AGL/preclone
+cd /opt/AGL/preclone
+repo init -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
+repo sync
+cd
+
+#mirror sstate-cache into /opt/AGL/sstate-mirror
+mkdir -p /opt/AGL/sstate-mirror
+cd /opt/AGL/sstate-mirror
+wget --mirror -np -nH --convert-links "https://download-new.automotivelinux.org/sstate-mirror/" -A siginfo -A tgz --cut-dirs=1
+ls
+ls *
+cd
+

diff --git a/packer/templates/basebuild.json b/packer/templates/basebuild.json
index cb103f4..b757f6a 100644 (file)
--- a/packer/templates/basebuild.json
+++ b/packer/templates/basebuild.json
@@ -45,6 +45,7 @@
         "provision/baseline.sh",
         "provision/basebuild.sh",
         "provision/agl_dependencies.sh",
+        "provision/agl_mirror.sh",
         "provision/system_reseal.sh"
       ],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"