profile: more fixups and keep it hidden for now

This commit is contained in:
Rick Farina (Zero_Chaos) 2020-11-11 13:27:13 -05:00
parent c9a6509b6b
commit a4cb4ace62
No known key found for this signature in database
GPG key ID: A29433C0AA431DDC
2 changed files with 7 additions and 7 deletions

View file

@ -3,9 +3,9 @@ amd64 pentoo/hardened/linux/amd64 stable
amd64 pentoo/hardened/linux/amd64/binary stable
amd64 pentoo/hardened/linux/amd64/bleeding_edge dev
#17.1 based
amd64 pentoo/hardened/linux/amd64_r1 stable
amd64 pentoo/hardened/linux/amd64_r1/binary stable
amd64 pentoo/hardened/linux/amd64_r1/bleeding_edge dev
#amd64 pentoo/hardened/linux/amd64_r1 stable
#amd64 pentoo/hardened/linux/amd64_r1/binary stable
#amd64 pentoo/hardened/linux/amd64_r1/bleeding_edge dev
x86 pentoo/hardened/linux/x86 stable
x86 pentoo/hardened/linux/x86/binary stable

View file

@ -147,7 +147,7 @@ check_profile () {
fi
#if [ -L "/lib" ] || [ -d "/lib32" ] || [ -d "/usr/lib32" ]; then
#if [ -L "/lib" ] || [ -e "/lib32" ] || [ -e "/usr/lib32" ]; then
# migrate_profile
#fi
}
@ -165,7 +165,7 @@ migrate_profile() {
check_profile force
fi
fi
emerge -1v /usr/lib/gcc || exit 1
#emerge -1v /usr/lib/gcc || exit 1
REBUILD_DIRS=""
if [ -d "/lib32" ]; then
REBUILD_DIRS="/lib32"
@ -174,10 +174,10 @@ migrate_profile() {
REBUILD_DIRS=" ${REBUILD_DIRS} /usr/lib32"
fi
emerge -1v --deep ${REBUILD_DIRS} "/usr/lib/llvm/*/lib32" || exit 1
if [ -d "/lib32" ] && ! qfile /lib32; then
if [ -L "/lib32" ] && ! qfile /lib32; then
rm -rf "/lib32"
fi
if [ -d "/usr/lib32" ] && ! qfile /usr/lib32; then
if [ -L "/usr/lib32" ] && ! qfile /usr/lib32; then
rm -rf "/usr/lib32"
fi
}