drop: don't use delphix mirror

delphix · Feb 21, 2023 · b3d5b25 · b3d5b25
1 parent 40690ad
commit b3d5b25
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git a/live-build/config/archives/delphix-secondary-mirror.list.in b/live-build/config/archives/delphix-secondary-mirror.list.in
@@ -14,6 +14,6 @@
 # limitations under the License.
 #
 
-deb @@URL@@ jammy main multiverse universe contrib stable
-deb @@URL@@ jammy-updates main multiverse universe
-deb @@URL@@ jammy-pgdg main
+deb http://archive.ubuntu.com/ubuntu jammy main multiverse universe contrib stable
+deb http://archive.ubuntu.com/ubuntu jammy-updates main multiverse universe
+deb http://archive.ubuntu.com/ubuntu jammy-pgdg main
diff --git a/scripts/run-live-build.sh b/scripts/run-live-build.sh
@@ -207,26 +207,27 @@ else
 fi
 set -o errexit
 
-lb config \
-	--apt-recommends false \
-	--parent-mirror-bootstrap "$pkg_mirror_main" \
-	--parent-mirror-chroot "$pkg_mirror_main" \
-	--parent-mirror-chroot-security "$pkg_mirror_main" \
-	--parent-mirror-chroot-volatile "$pkg_mirror_main" \
-	--parent-mirror-chroot-backports "$pkg_mirror_main" \
-	--parent-mirror-binary "$pkg_mirror_main" \
-	--parent-mirror-binary-security "$pkg_mirror_main" \
-	--parent-mirror-binary-volatile "$pkg_mirror_main" \
-	--parent-mirror-binary-backports "$pkg_mirror_main" \
-	--mirror-bootstrap "$pkg_mirror_main" \
-	--mirror-chroot "$pkg_mirror_main" \
-	--mirror-chroot-security "$pkg_mirror_main" \
-	--mirror-chroot-volatile "$pkg_mirror_main" \
-	--mirror-chroot-backports "$pkg_mirror_main" \
-	--mirror-binary "$pkg_mirror_main" \
-	--mirror-binary-security "$pkg_mirror_main" \
-	--mirror-binary-volatile "$pkg_mirror_main" \
-	--mirror-binary-backports "$pkg_mirror_main"
+#lb config \
+#	--apt-recommends false \
+#	--parent-mirror-bootstrap "$pkg_mirror_main" \
+#	--parent-mirror-chroot "$pkg_mirror_main" \
+#	--parent-mirror-chroot-security "$pkg_mirror_main" \
+#	--parent-mirror-chroot-volatile "$pkg_mirror_main" \
+#	--parent-mirror-chroot-backports "$pkg_mirror_main" \
+#	--parent-mirror-binary "$pkg_mirror_main" \
+#	--parent-mirror-binary-security "$pkg_mirror_main" \
+#	--parent-mirror-binary-volatile "$pkg_mirror_main" \
+#	--parent-mirror-binary-backports "$pkg_mirror_main" \
+#	--mirror-bootstrap "$pkg_mirror_main" \
+#	--mirror-chroot "$pkg_mirror_main" \
+#	--mirror-chroot-security "$pkg_mirror_main" \
+#	--mirror-chroot-volatile "$pkg_mirror_main" \
+#	--mirror-chroot-backports "$pkg_mirror_main" \
+#	--mirror-binary "$pkg_mirror_main" \
+#	--mirror-binary-security "$pkg_mirror_main" \
+#	--mirror-binary-volatile "$pkg_mirror_main" \
+#	--mirror-binary-backports "$pkg_mirror_main"
+lb config --apt-recommends false
 
 lb build