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

Correct derivative main sources.list entries.

This commit is contained in:
Daniel Baumann 2011-05-15 21:23:03 +02:00
parent ebc3788bf2
commit 6d04c078db
2 changed files with 85 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
scripts/build/lb_chroot_apt
View File

@ -133,6 +133,43 @@ case "${1}" in
esac
fi
case "${LB_MODE}" in
progress)
echo "# /etc/apt/preferences.d/progress.pref" > chroot/etc/apt/preferences.d/progress.pref
case "${LB_DISTRIBUTION}" in
*-backports)
_DISTRIBUTIONS="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||') ${LB_DISTRIBUTION}"
;;
*)
_DISTRIBUTIONS="${LB_DISTRIBUTION}"
;;
esac
if [ "${LB_SECURITY}" = "true" ]
then
case "${LB_DISTRIBUTION}" in
artax)
_DISTRIBUTION="${_DISTRIBUTION} ${LB_DISTRIBUTION}-security"
;;
esac
fi
for _DISTRIBUTION in ${_DISTRIBUTIONS}
do
cat >> chroot/etc/apt/preferences.d/progress.pref << EOF
Package: *
Pin: release n=${_DISTRIBUTION}
Pin-Priority: 999
EOF
done
;;
esac
# Creating stage file
Create_stagefile .stage/chroot_apt
;;
@ -216,6 +253,8 @@ case "${1}" in
fi
rm -f "chroot/etc/apt/preferences.d/${LB_MODE}.pref"
# Removing stage file
rm -f .stage/chroot_apt
;;

64
scripts/build/lb_chroot_sources
View File

@ -53,25 +53,39 @@ cat > chroot/etc/apt/sources.list << EOF
deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}
EOF
if [ "${LB_SOURCE}" = "true" ]
then
echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
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
case "${LB_DISTRIBUTION}" in
*-backports)
_DISTRIBUTIONS="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||') ${LB_DISTRIBUTION}"
;;
if [ "${LB_SOURCE}" = "true" ]
then
echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
*)
_DISTRIBUTIONS="${LB_DISTRIBUTION}"
;;
esac
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
for _DISTRIBUTION in ${_DISTRIBUTIONS}
do
echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
if [ "${LB_SOURCE}" = "true" ]
then
echo "deb-src ${LB_MIRROR_CHROOT} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
fi
done
fi
if [ "${LB_SECURITY}" = "true" ]
@ -572,25 +586,39 @@ cat > chroot/etc/apt/sources.list << EOF
deb ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}
EOF
if [ "${LB_SOURCE}" = "true" ]
then
echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
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
case "${LB_DISTRIBUTION}" in
*-backports)
_DISTRIBUTIONS="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||') ${LB_DISTRIBUTION}"
;;
if [ "${LB_SOURCE}" = "true" ]
then
echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
*)
_DISTRIBUTIONS="${LB_DISTRIBUTION}"
;;
esac
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
for _DISTRIBUTION in ${_DISTRIBUTIONS}
do
echo "deb ${LB_MIRROR_BINARY} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
if [ "${LB_SOURCE}" = "true" ]
then
echo "deb-src ${LB_MIRROR_BINARY} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
fi
done
fi
if [ "${LB_SECURITY}" = "true" ]