manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding derivatives handling for progress.

This commit is contained in:
Daniel Baumann 2011-01-07 21:56:33 +01:00
parent 8f4fb88a71
commit 6d87f0dde3
19 changed files with 902 additions and 643 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
functions/defaults.sh
View File

@ -20,15 +20,24 @@ Set_defaults ()
# Setting distribution name # Setting distribution name
case "${LB_MODE}" in case "${LB_MODE}" in
progress) progress)
_DERIVATIVE="true"
LB_DISTRIBUTION="${LB_DISTRIBUTION:-artax}" LB_DISTRIBUTION="${LB_DISTRIBUTION:-artax}"
LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-squeeze}"
;; ;;
ubuntu) ubuntu)
_DERIVATIVE="false"
LB_DISTRIBUTION="${LB_DISTRIBUTION:-karmic}" LB_DISTRIBUTION="${LB_DISTRIBUTION:-karmic}"
LB_PARENT_DISTRIBUTION="${LB_DISTRIBUTION}"
;; ;;
*) *)
_DERIVATIVE="false"
LB_DISTRIBUTION="${LB_DISTRIBUTION:-squeeze}" LB_DISTRIBUTION="${LB_DISTRIBUTION:-squeeze}"
LB_PARENT_DISTRIBUTION="${LB_DISTRIBUTION}"
;; ;;
esac esac
@ -431,6 +440,15 @@ Set_defaults ()
LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER:-${LB_MIRROR_BOOTSTRAP}}" LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER:-${LB_MIRROR_BOOTSTRAP}}"
if [ -z "${LB_REPOSITORIES}" ]
then
case "${LB_MODE}" in
progress)
LB_REPOSITORIES="progress-linux_${LB_DISTRIBUTION}"
;;
esac
fi
# Setting archive areas value # Setting archive areas value
case "${LB_MODE}" in case "${LB_MODE}" in
ubuntu) ubuntu)
@ -761,7 +779,7 @@ Set_defaults ()
esac esac
# Setting debian-installer distribution # Setting debian-installer distribution
LB_DEBIAN_INSTALLER_DISTRIBUTION="${LB_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_DISTRIBUTION}}" LB_DEBIAN_INSTALLER_DISTRIBUTION="${LB_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}"
# Setting debian-installer-gui # Setting debian-installer-gui
case "${LB_MODE}" in case "${LB_MODE}" in
@ -891,7 +909,7 @@ Set_defaults ()
# Setting win32-loader option # Setting win32-loader option
case "${LB_MODE}" in case "${LB_MODE}" in
progress|ubuntu) progress|ubuntu)
::
;; ;;
*) *)

5
manpages/de/lb_config.de.1
View File

@ -89,6 +89,8 @@
[\fB\-\-debug\fP] [\fB\-\-debug\fP]
.br .br
[\-d|\fB\-\-distribution\fP \fICODENAME\fP] [\-d|\fB\-\-distribution\fP \fICODENAME\fP]
.br
[\fB\-\-parent\-distribution\fP \fICODENAME\fP]
.br .br
[\fB\-\-dump\fP] [\fB\-\-dump\fP]
.br .br
@ -435,6 +437,9 @@ whereas otherwise false, by default.
turn on debugging informational messages. turn on debugging informational messages.
.IP "\-d|\fB\-\-distribution\fP \fICODENAME\fP" 4 .IP "\-d|\fB\-\-distribution\fP \fICODENAME\fP" 4
defines the distribution of the resulting live system. defines the distribution of the resulting live system.
.IP "\-d|\fB\-\-parent\-distribution\fP \fICODENAME\fP" 4
defines the parent distribution for derivatives of the resulting live
system.
.IP \fB\-\-dump\fP 4 .IP \fB\-\-dump\fP 4
prepares a report of the currently present live system configuration and the prepares a report of the currently present live system configuration and the
version of live\-build used. This is useful to provide if you submit bug version of live\-build used. This is useful to provide if you submit bug

4
manpages/en/lb_config.1
View File

@ -84,6 +84,8 @@
[\fB\-\-debug\fR] [\fB\-\-debug\fR]
.br .br
[\-d|\fB\-\-distribution\fR \fICODENAME\fR] [\-d|\fB\-\-distribution\fR \fICODENAME\fR]
.br
[\fB\-\-parent\-distribution\fR \fICODENAME\fR]
.br .br
[\fB\-\-dump\fR] [\fB\-\-dump\fR]
.br .br
@ -307,6 +309,8 @@ defines if the debian\-installer graphical GTK interface should be true or not.
turn on debugging informational messages. turn on debugging informational messages.
.IP "\-d|\fB\-\-distribution\fR \fICODENAME\fR" 4 .IP "\-d|\fB\-\-distribution\fR \fICODENAME\fR" 4
defines the distribution of the resulting live system. defines the distribution of the resulting live system.
.IP "\-d|\fB\-\-parent\-distribution\fR \fICODENAME\fR" 4
defines the parent distribution for derivatives of the resulting live system.
.IP "\fB\-\-dump\fR" 4 .IP "\fB\-\-dump\fR" 4
prepares a report of the currently present live system configuration and the version of live\-build used. This is useful to provide if you submit bug reports, we do get all informations required for us to locate and replicate an error. prepares a report of the currently present live system configuration and the version of live\-build used. This is useful to provide if you submit bug reports, we do get all informations required for us to locate and replicate an error.
.IP "\fB\-\-fdisk\fR fdisk|fdisk.dist" 4 .IP "\fB\-\-fdisk\fR fdisk|fdisk.dist" 4

613
manpages/po/de/lb_config.1.po
View File

File diff suppressed because it is too large Load Diff

613
manpages/pot/lb_config.1.pot
View File

File diff suppressed because it is too large Load Diff

7
repositories/progress-linux_artax Normal file
View File

@ -0,0 +1,7 @@
# 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@
deb http://archive.progress-linux.org/progress/ artax-staging @ARCHIVE_AREAS@
deb-src http://archive.progress-linux.org/progress/ artax-staging @ARCHIVE_AREAS@

15
repositories/progress-linux_artax-backports Normal file
View File

@ -0,0 +1,15 @@
# 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@
deb http://archive.progress-linux.org/progress/ artax-staging @ARCHIVE_AREAS@
deb-src http://archive.progress-linux.org/progress/ artax-staging @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@
deb http://archive.progress-linux.org/progress/ artax-backports-staging @ARCHIVE_AREAS@
deb-src http://archive.progress-linux.org/progress/ artax-backports-staging @ARCHIVE_AREAS@

53
repositories/progress-linux_artax-backports.gpg Normal file
View File

@ -0,0 +1,53 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.10 (GNU/Linux)
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
ynEx7mFdpU8WS9iMWrnEJC5G0aL6XA==
=eKf+
-----END PGP PUBLIC KEY BLOCK-----

53
repositories/progress-linux_artax.gpg Normal file
View File

@ -0,0 +1,53 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.10 (GNU/Linux)
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
ynEx7mFdpU8WS9iMWrnEJC5G0aL6XA==
=eKf+
-----END PGP PUBLIC KEY BLOCK-----

7
repositories/progress-linux_baureo Normal file
View File

@ -0,0 +1,7 @@
# 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@
deb http://archive.progress-linux.org/progress/ baureo-staging @ARCHIVE_AREAS@
deb-src http://archive.progress-linux.org/progress/ baureo-staging @ARCHIVE_AREAS@

53
repositories/progress-linux_baureo.gpg Normal file
View File

@ -0,0 +1,53 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.10 (GNU/Linux)
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
ynEx7mFdpU8WS9iMWrnEJC5G0aL6XA==
=eKf+
-----END PGP PUBLIC KEY BLOCK-----

12
scripts/build/lb_binary_debian-installer
View File

@ -604,15 +604,15 @@ then
# Generating release file # Generating release file
mv binary chroot/root mv binary chroot/root
eval _VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`" eval _VERSION="$`echo RELEASE_${LB_PARENT_DISTRIBUTION}`"
case "${LB_DISTRIBUTION}" in case "${LB_PARENT_DISTRIBUTION}" in
sid) sid)
_SUITE="unstable" _SUITE="unstable"
;; ;;
*) *)
_SUITE="${LB_DISTRIBUTION}" _SUITE="${LB_PARENT_DISTRIBUTION}"
;; ;;
esac esac
@ -622,7 +622,7 @@ cd /root/binary && apt-ftparchive \
-o APT::FTPArchive::Release::Label="Debian" \ -o APT::FTPArchive::Release::Label="Debian" \
-o APT::FTPArchive::Release::Suite="${_SUITE}" \ -o APT::FTPArchive::Release::Suite="${_SUITE}" \
-o APT::FTPArchive::Release::Version="${_VERSION}" \ -o APT::FTPArchive::Release::Version="${_VERSION}" \
-o APT::FTPArchive::Release::Codename="${LB_DISTRIBUTION}" \ -o APT::FTPArchive::Release::Codename="${LB_PARENT_DISTRIBUTION}" \
-o APT::FTPArchive::Release::Date="$(date -R)" \ -o APT::FTPArchive::Release::Date="$(date -R)" \
-o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURES}" \ -o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURES}" \
-o APT::FTPArchive::Release::Components="main" \ -o APT::FTPArchive::Release::Components="main" \
@ -636,9 +636,9 @@ EOF
DISTRIBUTIONS="frozen stable testing unstable" DISTRIBUTIONS="frozen stable testing unstable"
if [ "${LB_DEBIAN_INSTALLER_DISTRIBUTION}" != "${LB_DISTRIBUTION}" ] if [ "${LB_DEBIAN_INSTALLER_DISTRIBUTION}" != "${LB_PARENT_DISTRIBUTION}" ]
then then
DISTRIBUTIONS="${DISTRIBUTIONS} ${LB_DISTRIBUTION}" DISTRIBUTIONS="${DISTRIBUTIONS} ${LB_PARENT_DISTRIBUTION}"
fi fi
case "${LB_BINARY_IMAGES}" in case "${LB_BINARY_IMAGES}" in

6
scripts/build/lb_binary_disk
View File

@ -110,7 +110,7 @@ case "${LB_DEBIAN_INSTALLER}" in
echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/CD Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/CD Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
cp "${LB_BASE}"/data/debian-cd/${LB_DISTRIBUTION}/${LB_ARCHITECTURES}_udeb_include binary/.disk/udeb_include cp "${LB_BASE}"/data/debian-cd/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_udeb_include binary/.disk/udeb_include
;; ;;
true|netinst|live) true|netinst|live)
@ -128,7 +128,7 @@ case "${LB_DEBIAN_INSTALLER}" in
fi fi
cp "${LB_BASE}"/data/debian-cd/${LB_DISTRIBUTION}/${LB_ARCHITECTURES}_netinst_udeb_include binary/.disk/udeb_include cp "${LB_BASE}"/data/debian-cd/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_netinst_udeb_include binary/.disk/udeb_include
if [ "${LB_DEBIAN_INSTALLER}" = "live" ] if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
then then
@ -143,7 +143,7 @@ case "${LB_DEBIAN_INSTALLER}" in
echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/BC Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/BC Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
cp "${LB_BASE}"/data/debian-cd/${LB_DISTRIBUTION}/${LB_ARCHITECTURES}_businesscard_udeb_include binary/.disk/udeb_include cp "${LB_BASE}"/data/debian-cd/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_businesscard_udeb_include binary/.disk/udeb_include
;; ;;
false) false)

6
scripts/build/lb_binary_local-packagelists
View File

@ -108,9 +108,9 @@ then
do do
SECTION="$(basename ${SECTION})" SECTION="$(basename ${SECTION})"
mkdir -p dists/${LB_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES} mkdir -p dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}
apt-ftparchive packages pool/${SECTION} > dists/${LB_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages apt-ftparchive packages pool/${SECTION} > dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages
gzip -9 -c dists/${LB_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages > dists/${LB_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages.gz gzip -9 -c dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages > dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages.gz
done done
cd "${OLDPWD}" cd "${OLDPWD}"

4
scripts/build/lb_bootstrap_cdebootstrap
View File

@ -131,7 +131,7 @@ then
fi fi
Echo_breakage "Running ${LB_BOOTSTRAP} (download-only)... " Echo_breakage "Running ${LB_BOOTSTRAP} (download-only)... "
${LB_ROOT_COMMAND} ${LB_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} --download-only "${LB_DISTRIBUTION}" chroot "${LB_MIRROR_BOOTSTRAP}" ${LB_ROOT_COMMAND} ${LB_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION}" chroot "${LB_MIRROR_BOOTSTRAP}"
if [ -n "${LB_ROOT_COMMAND}" ] if [ -n "${LB_ROOT_COMMAND}" ]
then then
@ -147,7 +147,7 @@ then
fi fi
Echo_breakage "Running ${LB_BOOTSTRAP}... " Echo_breakage "Running ${LB_BOOTSTRAP}... "
${LB_ROOT_COMMAND} ${LB_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} "${LB_DISTRIBUTION}" chroot "${LB_MIRROR_BOOTSTRAP}" ${LB_ROOT_COMMAND} ${LB_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION}" chroot "${LB_MIRROR_BOOTSTRAP}"
if [ -n "${LB_ROOT_COMMAND}" ] if [ -n "${LB_ROOT_COMMAND}" ]
then then

4
scripts/build/lb_bootstrap_debootstrap
View File

@ -124,7 +124,7 @@ then
fi fi
Echo_breakage "Running debootstrap (download-only)... " Echo_breakage "Running debootstrap (download-only)... "
${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_DISTRIBUTION}" chroot "${LB_MIRROR_BOOTSTRAP}" "${LB_DEBOOTSTRAP_SCRIPT}" ${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION}" chroot "${LB_MIRROR_BOOTSTRAP}" "${LB_DEBOOTSTRAP_SCRIPT}"
if [ -n "${LB_ROOT_COMMAND}" ] if [ -n "${LB_ROOT_COMMAND}" ]
then then
@ -140,7 +140,7 @@ then
fi fi
Echo_breakage "Running debootstrap... " Echo_breakage "Running debootstrap... "
${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_DISTRIBUTION}" chroot "${LB_MIRROR_BOOTSTRAP}" "${LB_DEBOOTSTRAP_SCRIPT}" ${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION}" chroot "${LB_MIRROR_BOOTSTRAP}" "${LB_DEBOOTSTRAP_SCRIPT}"
if [ -n "${LB_ROOT_COMMAND}" ] if [ -n "${LB_ROOT_COMMAND}" ]
then then

2
scripts/build/lb_chroot_hacks
View File

@ -38,7 +38,7 @@ Check_lockfile .lock
# Creating lock file # Creating lock file
Create_lockfile .lock Create_lockfile .lock
case "${LB_DISTRIBUTION}" in case "${LB_PARENT_DISTRIBUTION}" in
squeeze|sid) squeeze|sid)
if echo "${LB_TASKS}" | grep -qs lxde || if echo "${LB_TASKS}" | grep -qs lxde ||
echo "${LB_TASKS}" | grep -qs xfce echo "${LB_TASKS}" | grep -qs xfce

54
scripts/build/lb_chroot_sources
View File

@ -50,34 +50,34 @@ case "${1}" in
cat > chroot/etc/apt/sources.list << EOF cat > chroot/etc/apt/sources.list << EOF
# /etc/apt/sources.list # /etc/apt/sources.list
deb ${LB_MIRROR_CHROOT} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS} deb ${LB_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_ARCHIVE_AREAS}
EOF EOF
if [ "${LB_SOURCE}" = "true" ] if [ "${LB_SOURCE}" = "true" ]
then then
echo "deb-src ${LB_MIRROR_CHROOT} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list echo "deb-src ${LB_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi fi
if [ "${LB_SECURITY}" = "true" ] if [ "${LB_SECURITY}" = "true" ]
then then
case "${LB_MODE}" in case "${LB_MODE}" in
ubuntu) ubuntu)
echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LB_SOURCE}" = "true" ] if [ "${LB_SOURCE}" = "true" ]
then then
echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi fi
;; ;;
*) *)
if [ "${LB_DISTRIBUTION}" != "sid" ] && [ "${LB_DISTRIBUTION}" != "unstable" ] if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ] && [ "${LB_PARENT_DISTRIBUTION}" != "unstable" ]
then then
echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LB_SOURCE}" = "true" ] if [ "${LB_SOURCE}" = "true" ]
then then
echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi fi
fi fi
;; ;;
@ -88,11 +88,11 @@ EOF
then then
case "${LB_MODE}" in case "${LB_MODE}" in
debian|ubuntu) debian|ubuntu)
echo "deb ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list echo "deb ${LB_MIRROR_CHROOT_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LB_SOURCE}" = "true" ] if [ "${LB_SOURCE}" = "true" ]
then then
echo "deb-src ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list echo "deb-src ${LB_MIRROR_CHROOT_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi fi
;; ;;
esac esac
@ -102,13 +102,13 @@ EOF
then then
case "${LB_MODE}" in case "${LB_MODE}" in
debian) debian)
if [ "${LB_DISTRIBUTION}" != "sid" ] && [ "${LB_DISTRIBUTION}" != "unstable" ] if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ] && [ "${LB_PARENT_DISTRIBUTION}" != "unstable" ]
then then
echo "deb ${LB_MIRROR_CHROOT_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list echo "deb ${LB_MIRROR_CHROOT_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LB_SOURCE}" = "true" ] if [ "${LB_SOURCE}" = "true" ]
then then
echo "deb-src ${LB_MIRROR_CHROOT_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list echo "deb-src ${LB_MIRROR_CHROOT_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi fi
fi fi
;; ;;
@ -144,7 +144,7 @@ EOF
then then
_DISTRIBUTION="sid" _DISTRIBUTION="sid"
else else
_DISTRIBUTION="${LB_DISTRIBUTION}" _DISTRIBUTION="${LB_PARENT_DISTRIBUTION}"
fi fi
for PLACE in config/repositories "${LB_BASE}/repositories" for PLACE in config/repositories "${LB_BASE}/repositories"
@ -482,34 +482,34 @@ EOF
cat > chroot/etc/apt/sources.list << EOF cat > chroot/etc/apt/sources.list << EOF
# /etc/apt/sources.list # /etc/apt/sources.list
deb ${LB_MIRROR_BINARY} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS} deb ${LB_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_ARCHIVE_AREAS}
EOF EOF
if [ "${LB_SOURCE}" = "true" ] if [ "${LB_SOURCE}" = "true" ]
then then
echo "deb-src ${LB_MIRROR_BINARY} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list echo "deb-src ${LB_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi fi
if [ "${LB_SECURITY}" = "true" ] if [ "${LB_SECURITY}" = "true" ]
then then
case "${LB_MODE}" in case "${LB_MODE}" in
ubuntu) ubuntu)
echo "deb ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list echo "deb ${LB_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LB_SOURCE}" = "true" ] if [ "${LB_SOURCE}" = "true" ]
then then
echo "deb-src ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list echo "deb-src ${LB_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi fi
;; ;;
*) *)
if [ "${LB_DISTRIBUTION}" != "sid" ] && [ "${LB_DISTRIBUTION}" != "unstable" ] if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ] && [ "${LB_PARENT_DISTRIBUTION}" != "unstable" ]
then then
echo "deb ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list echo "deb ${LB_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LB_SOURCE}" = "true" ] if [ "${LB_SOURCE}" = "true" ]
then then
echo "deb-src ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list echo "deb-src ${LB_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi fi
fi fi
;; ;;
@ -520,11 +520,11 @@ EOF
then then
case "${LB_MODE}" in case "${LB_MODE}" in
debian|ubuntu) debian|ubuntu)
echo "deb ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list echo "deb ${LB_MIRROR_BINARY_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LB_SOURCE}" = "true" ] if [ "${LB_SOURCE}" = "true" ]
then then
echo "deb-src ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list echo "deb-src ${LB_MIRROR_BINARY_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi fi
;; ;;
esac esac
@ -534,13 +534,13 @@ EOF
then then
case "${LB_MODE}" in case "${LB_MODE}" in
debian) debian)
if [ "${LB_DISTRIBUTION}" != "sid" ] && [ "${LB_DISTRIBUTION}" != "unstable" ] if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ] && [ "${LB_PARENT_DISTRIBUTION}" != "unstable" ]
then then
echo "deb ${LB_MIRROR_BINARY_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list echo "deb ${LB_MIRROR_BINARY_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LB_SOURCE}" = "true" ] if [ "${LB_SOURCE}" = "true" ]
then then
echo "deb-src ${LB_MIRROR_BINARY_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list echo "deb-src ${LB_MIRROR_BINARY_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi fi
fi fi
;; ;;
@ -567,13 +567,13 @@ EOF
# Adding sources.list entries (binary) # Adding sources.list entries (binary)
if [ -e "${PLACE}/${REPOSITORY}.binary" ] if [ -e "${PLACE}/${REPOSITORY}.binary" ]
then then
sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \ sed -e "s|@DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
-e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \ -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
"${PLACE}/${REPOSITORY}.binary" > \ "${PLACE}/${REPOSITORY}.binary" > \
"chroot/etc/apt/sources.list.d/${REPOSITORY}.list" "chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
elif [ -e "${PLACE}/${REPOSITORY}" ] elif [ -e "${PLACE}/${REPOSITORY}" ]
then then
sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \ sed -e "s|@DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
-e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \ -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
"${PLACE}/${REPOSITORY}" > \ "${PLACE}/${REPOSITORY}" > \
"chroot/etc/apt/sources.list.d/${REPOSITORY}.list" "chroot/etc/apt/sources.list.d/${REPOSITORY}.list"

12
scripts/build/lb_config
View File

@ -67,6 +67,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--debian-installer-gui true|false]\n\ \t [--debian-installer-gui true|false]\n\
\t [--debug]\n\ \t [--debug]\n\
\t [-d|--distribution CODENAME]\n\ \t [-d|--distribution CODENAME]\n\
\t [--parent-distribution CODENAME]\n\
\t [--dump]\n\ \t [--dump]\n\
\t [--fdisk fdisk|fdisk.dist]\n\ \t [--fdisk fdisk|fdisk.dist]\n\
\t [--force]\n\ \t [--force]\n\
@ -139,7 +140,7 @@ Local_arguments ()
cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump, cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump,
initramfs:,fdisk:,losetup:,mode:,repositories:,root-command:,use-fakeroot:,tasksel:,includes:, initramfs:,fdisk:,losetup:,mode:,repositories:,root-command:,use-fakeroot:,tasksel:,includes:,
templates:,architectures:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean, templates:,architectures:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean,
distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-volatile:,mirror-chroot-backports:,mirror-binary:, distribution:,parent-distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-volatile:,mirror-chroot-backports:,mirror-binary:,
mirror-binary-security:,mirror-binary-volatile:,mirror-binary-backports:,mirror-debian-installer:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:, mirror-binary-security:,mirror-binary-volatile:,mirror-binary-backports:,mirror-debian-installer:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:,
gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:, gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
packages:,package-lists:,tasks:,security:,volatile:,backports:,binary-filesystem:,binary-images:, packages:,package-lists:,tasks:,security:,volatile:,backports:,binary-filesystem:,binary-images:,
@ -382,6 +383,11 @@ Local_arguments ()
esac esac
;; ;;
--parent-distribution)
LB_PARENT_DISTRIBUTION="${2}"
shift 2
;;
-m|--mirror-bootstrap) -m|--mirror-bootstrap)
LB_MIRROR_BOOTSTRAP="${2}" LB_MIRROR_BOOTSTRAP="${2}"
shift 2 shift 2
@ -963,6 +969,10 @@ LB_BOOTSTRAP_KEYRING="${LB_BOOTSTRAP_KEYRING}"
# (Default: ${LB_DISTRIBUTION}) # (Default: ${LB_DISTRIBUTION})
LB_DISTRIBUTION="${LB_DISTRIBUTION}" LB_DISTRIBUTION="${LB_DISTRIBUTION}"
# \$LB_PARENT_DISTRIBUTION: select parent distribution to use
# (Default: ${LB_PARENT_DISTRIBUTION})
LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION}"
# \$LB_MIRROR_BOOTSTRAP: set mirror to bootstrap from # \$LB_MIRROR_BOOTSTRAP: set mirror to bootstrap from
# (Default: ${LB_MIRROR_BOOTSTRAP}) # (Default: ${LB_MIRROR_BOOTSTRAP})
LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP}" LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP}"