opensourcemirror
/
opnsense-tools
mirror of https://github.com/opnsense/tools.git
1
0
Fork 0
Code Issues Releases Wiki Activity

build/ports: correct origin for deps locking, add log line 

While here, move cleanup_packages to common for the sake of making
it easier to comment out for testing / development purposes.
This commit is contained in:
Franco Fichtner 2018-09-30 20:27:52 +02:00
parent a7f1af1ed2
commit d163224a84
2 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
build/common.sh
View File

@ -646,6 +646,43 @@ remove_packages()
done
}
cleanup_packages()
{
BASEDIR=${1}
for PKG in $(cd ${1}; find .${PACKAGESDIR}/All -type f); do
# all packages that install have their dependencies fulfilled
if pkg -c ${1} add ${PKG}; then
continue
fi
# some packages clash in files with others, check for conflicts
PKGORIGIN=$(pkg -c ${1} info -F ${PKG} | \
grep ^Origin | awk '{ print $3; }')
PKGGLOBS=
for CONFLICTS in CONFLICTS CONFLICTS_INSTALL; do
PKGGLOBS="${PKGGLOBS} $(make -C ${PORTSDIR}/${PKGORIGIN} -V ${CONFLICTS})"
done
for PKGGLOB in ${PKGGLOBS}; do
pkg -c ${1} remove -gy "${PKGGLOB}" || true
done
# if the conflicts are resolved this works now, but remove
# the package again as it may clash again later...
if pkg -c ${1} add ${PKG}; then
pkg -c ${1} remove -y ${PKGORIGIN}
continue
fi
# if nothing worked, we are missing a dependency and force
# a rebuild for it and its reverse dependencies later on
rm -f ${1}/${PKG}
done
pkg -c ${1} set -yaA1
pkg -c ${1} autoremove -y
}
lock_packages()
{
BASEDIR=${1}

34
build/ports.sh
View File

@ -99,36 +99,7 @@ setup_distfiles ${STAGEDIR}
extract_packages ${STAGEDIR}
remove_packages ${STAGEDIR} ${@} ${PRODUCT_CORES} ${PRODUCT_PLUGINS}
for PKG in $(cd ${STAGEDIR}; find .${PACKAGESDIR}/All -type f); do
# all packages that install have their dependencies fulfilled
if pkg -c ${STAGEDIR} add ${PKG}; then
continue
fi
# some packages clash in files with others, check for conflicts
PKGORIGIN=$(pkg -c ${STAGEDIR} info -F ${PKG} | grep ^Origin | awk '{ print $3; }')
PKGGLOBS=
for CONFLICTS in CONFLICTS CONFLICTS_INSTALL; do
PKGGLOBS="${PKGGLOBS} $(make -C ${PORTSDIR}/${PKGORIGIN} -V ${CONFLICTS})"
done
for PKGGLOB in ${PKGGLOBS}; do
pkg -c ${STAGEDIR} remove -gy "${PKGGLOB}" || true
done
# if the conflicts are resolved this works now, but remove
# the package again as it may clash again later...
if pkg -c ${STAGEDIR} add ${PKG}; then
pkg -c ${STAGEDIR} remove -y ${PKGORIGIN}
continue
fi
# if nothing worked, we are missing a dependency and force a rebuild
rm -f ${STAGEDIR}/${PKG}
done
pkg -c ${STAGEDIR} set -yaA1
pkg -c ${STAGEDIR} autoremove -y
cleanup_packages ${STAGEDIR}
MAKE_CONF="${CONFIGDIR}/make.conf"
if [ -f ${MAKE_CONF} ]; then
@ -192,8 +163,9 @@ UNAME_r=\$(freebsd-version)
(echo "${PORTS_LIST}"; echo "${PORTS_CACHE}") | \
while read PORT_DEPENDS; do
PORT_DEPNAME=\$(pkg query -e "%o == \${PORT_DEPENDS}" %n)
PORT_DEPNAME=\$(pkg query -e "%o == \${PORT_DEPENDS%%@*}" %n)
if [ -n "\${PORT_DEPNAME}" ]; then
echo ">>> Locking package dependency \${PORT_DEPNAME}"
pkg set -yA0 \${PORT_DEPNAME}
fi
done