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

If the same file exists in multiple locations, take the version from the 

first.

The LIVE_BUILD location will only be added if LIVE_BUILD is set.
This commit is contained in:
Roland Clobus 2023-01-08 17:27:35 +01:00 committed by Luca Boccassi
parent 8dd3579278
commit 7e7544c446
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/build/binary_disk
View File

@ -130,10 +130,15 @@ case "${LB_DEBIAN_INSTALLER}" in
;;
esac
#FIXME review the netboot case
for LOCATION in /usr/share/live/build/data/debian-cd "${LIVE_BUILD}/data/debian-cd"
# If the same file exists in multiple locations, take the version from the first
LOCATIONS="/usr/share/live/build/data/debian-cd"
if [ -n "${LIVE_BUILD}" ]
then
LOCATIONS="${LIVE_BUILD}/data/debian-cd ${LOCATIONS}"
fi
for LOCATION in ${LOCATIONS}
do
if [ -e "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}" ]
if [ -e "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}" ] && [ ! -e binary/.disk/udeb_include ]
then
case "${LB_DEBIAN_INSTALLER}" in
cdrom)
@ -146,6 +151,7 @@ do
cp -a "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}/${LB_ARCHITECTURE}_businesscard_udeb_include" binary/.disk/udeb_include
;;
none|netboot)
#FIXME review the netboot case
;;
esac
fi

12
scripts/build/installer_debian-installer
View File

@ -685,15 +685,19 @@ EOF
Echo_debug "Generating exclude list"
# Excluding udebs
for LOCATION in /usr/share/live/build/data/debian-cd "${LIVE_BUILD}/data/debian-cd"
# If the same file exists in multiple locations, take the version from the first
LOCATIONS="/usr/share/live/build/data/debian-cd"
if [ -n "${LIVE_BUILD}" ]
then
LOCATIONS="${LIVE_BUILD}/data/debian-cd ${LOCATIONS}"
fi
for LOCATION in ${LOCATIONS}
do
if [ -e "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" ]
if [ -e "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" ] && [ ! -e exclude ]
then
grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/udeb_exclude" > exclude || true
grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/exclude-udebs" >> exclude || true
grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/exclude-udebs-${LB_ARCHITECTURE}" >> exclude || true
continue
fi
done