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

Add support for proposed-update archives 

Can be selected in much the same vain as backports, updates and security
archive sources. Defaults to false like backports.

Closes: #1069045
This commit is contained in:
Nick Brown 2024-04-15 15:05:30 +01:00 committed by Luca Boccassi
parent 719441e744
commit 9ae2c0105c
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
functions/configuration.sh
View File

@ -280,20 +280,14 @@ Prepare_config ()
case "${LB_PARENT_DISTRIBUTION_BINARY}" in
sid|unstable)
LB_SECURITY="${LB_SECURITY:-false}"
LB_UPDATES="${LB_UPDATES:-false}"
LB_PROPOSED_UPDATES="${LB_PROPOSED_UPDATES:-false}"
;;
*)
LB_SECURITY="${LB_SECURITY:-true}"
;;
esac
case "${LB_PARENT_DISTRIBUTION_BINARY}" in
sid|unstable)
LB_UPDATES="${LB_UPDATES:-false}"
;;
*)
LB_UPDATES="${LB_UPDATES:-true}"
LB_PROPOSED_UPDATES="${LB_PROPOSED_UPDATES:-false}"
;;
esac
@ -568,6 +562,10 @@ Validate_config_permitted_values ()
Echo_error "Value for LB_ONIE (--onie) can only be 'true' or 'false'!"
exit 1
fi
if [ "${LB_PROPOSED_UPDATES}" != "true" ] && [ "${LB_PROPOSED_UPDATES}" != "false" ]; then
Echo_error "Value for LB_PROPOSED_UPDATES (--proposed-updates) can only be 'true' or 'false'!"
exit 1
fi
if [ "${LB_SECURITY}" != "true" ] && [ "${LB_SECURITY}" != "false" ]; then
Echo_error "Value for LB_SECURITY (--security) can only be 'true' or 'false'!"
exit 1

11
functions/sourcelist.sh
View File

@ -112,6 +112,17 @@ Create_apt_sources_list ()
fi
fi
# Set proposed-updates repo
if [ "${LB_PROPOSED_UPDATES}" = "true" ]; then
echo "deb ${PARENT_MIRROR} ${PARENT_DISTRIBUTION}-proposed-updates ${LB_PARENT_ARCHIVE_AREAS}" >> "${PARENT_LIST_FILE}"
echo "deb-src ${PARENT_MIRROR} ${PARENT_DISTRIBUTION}-proposed-updates ${LB_PARENT_ARCHIVE_AREAS}" >> "${PARENT_LIST_FILE}"
if [ "${LB_DERIVATIVE}" = "true" ]; then
echo "deb ${MIRROR} ${_DISTRIBUTION}-proposed-updates ${LB_ARCHIVE_AREAS}" >> "${LIST_FILE}"
echo "deb-src ${MIRROR} ${_DISTRIBUTION}-proposed-updates ${LB_ARCHIVE_AREAS}" >> "${LIST_FILE}"
fi
fi
# Set backports repo
if [ "${LB_BACKPORTS}" = "true" ]; then
case "${LB_MODE}" in

10
scripts/build/config
View File

@ -114,6 +114,7 @@ USAGE="${PROGRAM} [--apt apt|apt-get|aptitude]\n\
\t [--parent-mirror-chroot URL]\n\
\t [--parent-mirror-chroot-security URL]\n\
\t [--parent-mirror-debian-installer URL]\n\
\t [--proposed-updates true|false]\n\
\t [--quiet]\n\
\t [--security true|false]\n\
\t [--source true|false]\n\
@ -170,6 +171,7 @@ Local_arguments ()
parent-mirror-binary-security:,parent-mirror-bootstrap:,
parent-mirror-chroot:,parent-mirror-chroot-security:,
parent-mirror-debian-installer:,
proposed-updates:,
quiet,
security:,source:,source-images:,swap-file-path:,swap-file-size:,system:,
tasksel:,
@ -775,6 +777,11 @@ Local_arguments ()
shift 2
;;
--proposed-updates)
LB_PROPOSED_UPDATES="${2}"
shift 2
;;
--security)
LB_SECURITY="${2}"
shift 2
@ -1188,6 +1195,9 @@ LB_UPDATES="${LB_UPDATES}"
# Enable backports updates
LB_BACKPORTS="${LB_BACKPORTS}"
# Enable proposed updates
LB_PROPOSED_UPDATES="${LB_PROPOSED_UPDATES}"
EOF
# Creating lb_binary_* configuration