| 1 |
commit: 67ac02f3abb1bacda57b6166662a1b526814225e |
| 2 |
Author: Sven Wegener <swegener <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 31 11:08:16 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 31 12:22:35 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=67ac02f3 |
| 7 |
|
| 8 |
crossdev: stop maintaining /etc/portage/categories |
| 9 |
|
| 10 |
portage uses profiles/categories from all overlays and we don't need to |
| 11 |
define them in /etc/portage/categories |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/762772 |
| 14 |
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org> |
| 15 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 16 |
|
| 17 |
crossdev | 16 ++++++++-------- |
| 18 |
1 file changed, 8 insertions(+), 8 deletions(-) |
| 19 |
|
| 20 |
diff --git a/crossdev b/crossdev |
| 21 |
index 3f75778..d53a6e8 100755 |
| 22 |
--- a/crossdev |
| 23 |
+++ b/crossdev |
| 24 |
@@ -595,7 +595,7 @@ uninstall() { |
| 25 |
done < <(find "${CONFIGROOT}"/repos.conf -type f -print0) |
| 26 |
fi |
| 27 |
# crossdev stopped creating 'package.keywords' in Jan 2020 |
| 28 |
- for f in categories package.{accept_keywords,env,mask,keywords,use} profile/package.use.{force,mask} ; do |
| 29 |
+ for f in package.{accept_keywords,env,mask,keywords,use} profile/package.use.{force,mask} ; do |
| 30 |
f="${CONFIGROOT}/${f}" |
| 31 |
rm -f "${f}"/cross-${CTARGET} |
| 32 |
rmdir "${f}" 2>/dev/null |
| 33 |
@@ -1336,13 +1336,13 @@ set_metadata() { |
| 34 |
fi |
| 35 |
} |
| 36 |
|
| 37 |
-xmkdir -p "${CONFIGROOT}" "${CROSSDEV_OVERLAY}"/{cross-${CTARGET},profiles} |
| 38 |
-for f in "${CONFIGROOT}" "${CROSSDEV_OVERLAY}"/profiles ; do |
| 39 |
- f+="/categories" |
| 40 |
- check_trailing_newline "${f}" |
| 41 |
- grep -qs "^cross-${CTARGET}$" "${f}" \ |
| 42 |
- || echo cross-${CTARGET} >> "${f}" |
| 43 |
-done |
| 44 |
+xmkdir -p "${CROSSDEV_OVERLAY}"/{cross-${CTARGET},profiles} |
| 45 |
+f="${CROSSDEV_OVERLAY}"/profiles/categories |
| 46 |
+check_trailing_newline "${f}" |
| 47 |
+grep -qs "^cross-${CTARGET}$" "${f}" \ |
| 48 |
+ || echo cross-${CTARGET} >> "${f}" |
| 49 |
+ |
| 50 |
+xmkdir -p "${CONFIGROOT}" |
| 51 |
cd "${CONFIGROOT}" || die "wtf!?" |
| 52 |
for f in package.{accept_keywords,env,mask,use} env/cross-${CTARGET} profile/package.use.{force,mask} ; do |
| 53 |
[[ -f ${f} ]] && die "please convert ${CONFIGROOT}/${f} to a directory" |
Archives