[SCM] live-build branch, debian-next, updated. debian/3.0_a11-1-20-g25bf239
Daniel Baumann
daniel at debian.org
Mon Feb 14 14:37:42 UTC 2011
The following commit has been merged in the debian-next branch:
commit 25bf2396da1ed5dd9aac16a742493174813da9f0
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Feb 14 14:32:10 2011 +0100
Adding mirror handling for derivatives.
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 93f724f..ccb756e 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -21,14 +21,17 @@ Set_defaults ()
case "${LB_MODE}" in
progress)
LB_DISTRIBUTION="${LB_DISTRIBUTION:-artax}"
+ LB_DERIVATIVE="true"
;;
ubuntu)
LB_DISTRIBUTION="${LB_DISTRIBUTION:-karmic}"
+ LB_DERIVATIVE="false"
;;
*)
LB_DISTRIBUTION="${LB_DISTRIBUTION:-squeeze}"
+ LB_DERIVATIVE="false"
;;
esac
@@ -367,7 +370,7 @@ Set_defaults ()
progress)
LB_PARENT_MIRROR_CHROOT_VOLATILE="${LB_PARENT_MIRROR_CHROOT_VOLATILE:-${LB_PARENT_MIRROR_CHROOT}}"
- LB_MIRROR_CHROOT_VOLATILE="${LB_MIRROR_CHROOT_VOLATILE:-${LB_MIRROR_CHROOT}}"
+ LB_MIRROR_CHROOT_VOLATILE="${LB_MIRROR_CHROOT_VOLATILE:-none}"
;;
ubuntu)
@@ -530,15 +533,6 @@ Set_defaults ()
;;
esac
- if [ -z "${LB_REPOSITORIES}" ]
- then
- case "${LB_MODE}" in
- progress)
- LB_REPOSITORIES="progress-linux_${LB_DISTRIBUTION}"
- ;;
- esac
- fi
-
# Setting archive areas value
case "${LB_MODE}" in
ubuntu)
diff --git a/repositories/progress-linux_artax b/repositories/progress-linux_artax
deleted file mode 100644
index 291e753..0000000
--- a/repositories/progress-linux_artax
+++ /dev/null
@@ -1,9 +0,0 @@
-# Progress Linux 1.0 (artax)
-
-deb http://archive.progress-linux.org/progress/ artax @ARCHIVE_AREAS@
-deb-src http://archive.progress-linux.org/progress/ artax @ARCHIVE_AREAS@
-
-# Progress Linux 1.0 (artax) - updates
-
-deb http://archive.progress-linux.org/progress/ artax-updates @ARCHIVE_AREAS@
-deb-src http://archive.progress-linux.org/progress/ artax-updates @ARCHIVE_AREAS@
diff --git a/repositories/progress-linux_artax-backports b/repositories/progress-linux_artax-backports
deleted file mode 100644
index e5b7e61..0000000
--- a/repositories/progress-linux_artax-backports
+++ /dev/null
@@ -1,14 +0,0 @@
-# Progress Linux 1.0 (artax)
-
-deb http://archive.progress-linux.org/progress/ artax @ARCHIVE_AREAS@
-deb-src http://archive.progress-linux.org/progress/ artax @ARCHIVE_AREAS@
-
-# Progress Linux 1.0 (artax) - updates
-
-deb http://archive.progress-linux.org/progress/ artax-updates @ARCHIVE_AREAS@
-deb-src http://archive.progress-linux.org/progress/ artax-updates @ARCHIVE_AREAS@
-
-# Progress Linux 1.0 (artax) - backports
-
-deb http://archive.progress-linux.org/progress/ artax-backports @ARCHIVE_AREAS@
-deb-src http://archive.progress-linux.org/progress/ artax-backports @ARCHIVE_AREAS@
diff --git a/repositories/progress-linux_artax-backports.gpg b/repositories/progress-linux_artax-backports.gpg
deleted file mode 100644
index c4a248f..0000000
--- a/repositories/progress-linux_artax-backports.gpg
+++ /dev/null
@@ -1,53 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-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
-ynEx7mFdpU8WS9iMWrnEJC5G0aL6XA==
-=eKf+
------END PGP PUBLIC KEY BLOCK-----
diff --git a/repositories/progress-linux_artax.gpg b/repositories/progress-linux_artax.gpg
deleted file mode 100644
index c4a248f..0000000
--- a/repositories/progress-linux_artax.gpg
+++ /dev/null
@@ -1,53 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-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
-ynEx7mFdpU8WS9iMWrnEJC5G0aL6XA==
-=eKf+
------END PGP PUBLIC KEY BLOCK-----
diff --git a/repositories/progress-linux_baureo b/repositories/progress-linux_baureo
deleted file mode 100644
index 61f1a75..0000000
--- a/repositories/progress-linux_baureo
+++ /dev/null
@@ -1,9 +0,0 @@
-# Progress Linux 2.0 (baureo) - unreleased
-
-deb http://archive.progress-linux.org/progress/ baureo @ARCHIVE_AREAS@
-deb-src http://archive.progress-linux.org/progress/ baureo @ARCHIVE_AREAS@
-
-# Progress Linux 2.0 (baureo) - updates unreleased
-
-deb http://archive.progress-linux.org/progress/ baureo-updates @ARCHIVE_AREAS@
-deb-src http://archive.progress-linux.org/progress/ baureo-updates @ARCHIVE_AREAS@
diff --git a/repositories/progress-linux_baureo.gpg b/repositories/progress-linux_baureo.gpg
deleted file mode 100644
index c4a248f..0000000
--- a/repositories/progress-linux_baureo.gpg
+++ /dev/null
@@ -1,53 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-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
-ynEx7mFdpU8WS9iMWrnEJC5G0aL6XA==
-=eKf+
------END PGP PUBLIC KEY BLOCK-----
diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources
index e41cf5b..76e843f 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -53,34 +53,70 @@ cat > chroot/etc/apt/sources.list << EOF
deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_ARCHIVE_AREAS}
EOF
+ if [ "${LB_DERIVATIVE}" = "true" ]
+ then
+
+cat > chroot/etc/apt/sources.list.d/${LB_MODE}.list << EOF
+# /etc/apt/sources.list.d/${LB_MODE}.list
+
+deb ${LB_MIRROR_CHROOT} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}
+EOF
+
+ fi
+
if [ "${LB_SOURCE}" = "true" ]
then
echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+ if [ "${LB_DERIVATIVE}" = "true" ]
+ then
+ echo "deb-src ${LB_MIRROR_CHROOT} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+ fi
fi
if [ "${LB_SECURITY}" = "true" ]
then
case "${LB_MODE}" in
- ubuntu)
- echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-
- if [ "${LB_SOURCE}" = "true" ]
+ debian|progress)
+ if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ]
then
- echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+ if [ "${LB_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ fi
fi
- ;;
- *)
- if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ] && [ "${LB_PARENT_DISTRIBUTION}" != "unstable" ]
+ if [ "${LB_MODE}" = progress ]
then
- echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+ fi
+ else
+ if [ "${LB_DERIVATIVE}" = "true" ]
+ then
+ echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+
+ if [ "${LB_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+ fi
fi
fi
;;
+
+ ubuntu)
+ echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+ if [ "${LB_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ fi
+ ;;
esac
fi
@@ -96,13 +132,23 @@ EOF
fi
;;
esac
+
+ if [ "${LB_DERIVATIVE}" = "true" ] && [ "${LB_MIRROR_CHROOT_VOLATILE}" != "none" ]
+ then
+ echo "deb ${LB_MIRROR_CHROOT_VOLATILE} ${LB_ARENT_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+
+ if [ "${LB_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LB_ARENT_MIRROR_CHROOT_VOLATILE} ${LB_ARENT_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+ fi
+ fi
fi
if [ "${LB_BACKPORTS}" = "true" ]
then
case "${LB_MODE}" in
debian)
- if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ] && [ "${LB_PARENT_DISTRIBUTION}" != "unstable" ]
+ if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ]
then
echo "deb ${LB_PARENT_MIRROR_CHROOT_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
@@ -113,6 +159,16 @@ EOF
fi
;;
esac
+
+ if [ "${LB_DERIVATIVE}" = "true" ] && [ "${LB_MIRROR_CHROOT_BACKPORTS}" != "none" ]
+ then
+ echo "deb ${LB_MIRROR_CHROOT_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+
+ if [ "${LB_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LB_MIRROR_CHROOT_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+ fi
+ fi
fi
# Check local sources.list
@@ -411,9 +467,15 @@ EOF
Chroot chroot "apt-get ${APT_OPTIONS} install aptitude"
fi
+ # Temporary hack (FIXME)
+ if [ "${LB_DERIVATIVE}" = "true" ]
+ then
+ _APT="--force-yes"
+ fi
+
Apt chroot update
- Apt chroot upgrade
- Apt chroot dist-upgrade
+ Apt chroot upgrade ${_APT}
+ Apt chroot dist-upgrade ${_APT}
# Installing keyring packages
if [ -n "${LB_KEYRING_PACKAGES}" ]
@@ -479,38 +541,76 @@ EOF
rm -rf chroot/var/lib/apt/lists
mkdir -p chroot/var/lib/apt/lists/partial
+ # Configure custom sources.list
+
cat > chroot/etc/apt/sources.list << EOF
# /etc/apt/sources.list
deb ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_ARCHIVE_AREAS}
EOF
+ if [ "${LB_DERIVATIVE}" = "true" ]
+ then
+
+cat > chroot/etc/apt/sources.list.d/${LB_MODE}.list << EOF
+# /etc/apt/sources.list.d/${LB_MODE}.list
+
+deb ${LB_MIRROR_BINARY} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}
+EOF
+
+ fi
+
if [ "${LB_SOURCE}" = "true" ]
then
echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+ if [ "${LB_DERIVATIVE}" = "true" ]
+ then
+ echo "deb-src ${LB_MIRROR_BINARY} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+ fi
fi
if [ "${LB_SECURITY}" = "true" ]
then
case "${LB_MODE}" in
- ubuntu)
- echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-
- if [ "${LB_SOURCE}" = "true" ]
+ debian|progress)
+ if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ]
then
- echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+ if [ "${LB_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ fi
fi
- ;;
- *)
- if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ] && [ "${LB_PARENT_DISTRIBUTION}" != "unstable" ]
+ if [ "${LB_MODE}" = progress ]
then
- echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
fi
+ else
+ if [ "${LB_DERIVATIVE}" = "true" ]
+ then
+ echo "deb ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+
+ if [ "${LB_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+ fi
+ fi
+ fi
+ ;;
+
+ ubuntu)
+ echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+ if [ "${LB_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
;;
esac
@@ -528,13 +628,23 @@ EOF
fi
;;
esac
+
+ if [ "${LB_DERIVATIVE}" = "true" ] && [ "${LB_MIRROR_BINARY_VOLATILE}" != "none" ]
+ then
+ echo "deb ${LB_MIRROR_BINARY_VOLATILE} ${LB_ARENT_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+
+ if [ "${LB_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LB_ARENT_MIRROR_BINARY_VOLATILE} ${LB_ARENT_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+ fi
+ fi
fi
if [ "${LB_BACKPORTS}" = "true" ]
then
case "${LB_MODE}" in
debian)
- if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ] && [ "${LB_PARENT_DISTRIBUTION}" != "unstable" ]
+ if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ]
then
echo "deb ${LB_PARENT_MIRROR_BINARY_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
@@ -545,6 +655,16 @@ EOF
fi
;;
esac
+
+ if [ "${LB_DERIVATIVE}" = "true" ] && [ "${LB_MIRROR_BINARY_BACKPORTS}" != "none" ]
+ then
+ echo "deb ${LB_MIRROR_BINARY_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+
+ if [ "${LB_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LB_MIRROR_BINARY_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
+ fi
+ fi
fi
# Configure third-party repositories
diff --git a/scripts/build/lb_source_disk b/scripts/build/lb_source_disk
index e88a92b..3d21223 100755
--- a/scripts/build/lb_source_disk
+++ b/scripts/build/lb_source_disk
@@ -74,8 +74,20 @@ esac
if [ -n "${TRACE}" ]
then
- echo "$(wget -q ${LB_PARENT_MIRROR_BOOTSTRAP}/${TRACE} -O - | head -n 1)" \
- > source/.disk/archive_trace
+ case "${LB_DERIVATIVE}" in
+ true)
+ echo "$(echo ${LB_PARENT_MIRROR_BOOTSTRAP} | awk -F:// '{ print $2 }'): $(wget -q ${LB_PARENT_MIRROR_BOOTSTRAP}/${TRACE} -O - | head -n 1)" \
+ > source/.disk/archive_trace
+
+ echo "$(echo ${LB_MIRROR_BOOTSTRAP} | awk -F:// '{ print $2 }'): $(wget -q ${LB_MIRROR_BOOTSTRAP}/${TRACE} -O - | head -n 1)" \
+ >> source/.disk/archive_trace
+ ;;
+
+ false)
+ echo "$(wget -q ${LB_PARENT_MIRROR_BOOTSTRAP}/${TRACE} -O - | head -n 1)" \
+ > source/.disk/archive_trace
+ ;;
+ esac
fi
case "${LB_DEBIAN_INSTALLER}" in
--
live-build
More information about the debian-live-changes
mailing list