commit: 67ac02f3abb1bacda57b6166662a1b526814225e Author: Sven Wegener <swegener <AT> gentoo <DOT> org> AuthorDate: Thu Dec 31 11:08:16 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Thu Dec 31 12:22:35 2020 +0000 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=67ac02f3
crossdev: stop maintaining /etc/portage/categories portage uses profiles/categories from all overlays and we don't need to define them in /etc/portage/categories Closes: https://bugs.gentoo.org/762772 Signed-off-by: Sven Wegener <swegener <AT> gentoo.org> Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> crossdev | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/crossdev b/crossdev index 3f75778..d53a6e8 100755 --- a/crossdev +++ b/crossdev @@ -595,7 +595,7 @@ uninstall() { done < <(find "${CONFIGROOT}"/repos.conf -type f -print0) fi # crossdev stopped creating 'package.keywords' in Jan 2020 - for f in categories package.{accept_keywords,env,mask,keywords,use} profile/package.use.{force,mask} ; do + for f in package.{accept_keywords,env,mask,keywords,use} profile/package.use.{force,mask} ; do f="${CONFIGROOT}/${f}" rm -f "${f}"/cross-${CTARGET} rmdir "${f}" 2>/dev/null @@ -1336,13 +1336,13 @@ set_metadata() { fi } -xmkdir -p "${CONFIGROOT}" "${CROSSDEV_OVERLAY}"/{cross-${CTARGET},profiles} -for f in "${CONFIGROOT}" "${CROSSDEV_OVERLAY}"/profiles ; do - f+="/categories" - check_trailing_newline "${f}" - grep -qs "^cross-${CTARGET}$" "${f}" \ - || echo cross-${CTARGET} >> "${f}" -done +xmkdir -p "${CROSSDEV_OVERLAY}"/{cross-${CTARGET},profiles} +f="${CROSSDEV_OVERLAY}"/profiles/categories +check_trailing_newline "${f}" +grep -qs "^cross-${CTARGET}$" "${f}" \ + || echo cross-${CTARGET} >> "${f}" + +xmkdir -p "${CONFIGROOT}" cd "${CONFIGROOT}" || die "wtf!?" for f in package.{accept_keywords,env,mask,use} env/cross-${CTARGET} profile/package.use.{force,mask} ; do [[ -f ${f} ]] && die "please convert ${CONFIGROOT}/${f} to a directory"
