[repo] drop gcc-config profile switch, it's in the package trigger now
This commit is contained in:
parent
ef5e2427ce
commit
2fde90a2c1
@ -10,7 +10,7 @@ NEW_BRANCH=$4
|
|||||||
echo -e "
|
echo -e "
|
||||||
>> requirements for this branch:
|
>> requirements for this branch:
|
||||||
app-admin/eselect-python
|
app-admin/eselect-python
|
||||||
sys-devel/base-gcc:4.6
|
sys-devel/base-gcc:<latest>
|
||||||
>> Entropy post-upgrade migration script
|
>> Entropy post-upgrade migration script
|
||||||
>> Repository: "${REPO_ID}"
|
>> Repository: "${REPO_ID}"
|
||||||
>> Root: "${ROOT}"
|
>> Root: "${ROOT}"
|
||||||
@ -58,12 +58,6 @@ fix_lib64_symlinks() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
latest_gcc_profile() {
|
|
||||||
local gcc_dir="/etc/env.d/gcc"
|
|
||||||
local latest=$(ls -1 ${gcc_dir}/$(uname -m)* | sort | tail -n 1 2> /dev/null)
|
|
||||||
[[ -n "${latest}" ]] && echo $(basename "${latest}")
|
|
||||||
}
|
|
||||||
|
|
||||||
three_four_to_five() {
|
three_four_to_five() {
|
||||||
|
|
||||||
local rc=0
|
local rc=0
|
||||||
@ -86,18 +80,6 @@ three_four_to_five() {
|
|||||||
rc=1
|
rc=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
## sys-devel/base-gcc:LATEST must be forced using
|
|
||||||
## packages.db.system_mask inside repository db dir
|
|
||||||
c_profile=$(latest_gcc_profile)
|
|
||||||
if [ -n "${c_profile}" ]; then
|
|
||||||
gcc-config "${c_profile}"
|
|
||||||
# update env
|
|
||||||
env-update
|
|
||||||
else
|
|
||||||
echo "gcc-config unable to set new profile: not detected"
|
|
||||||
rc=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# set proper eselect esd engine
|
# set proper eselect esd engine
|
||||||
if [ -f "${ROOT}/usr/bin/esdcompat" ]; then
|
if [ -f "${ROOT}/usr/bin/esdcompat" ]; then
|
||||||
eselect esd list | grep PulseAudio | cut -d"[" -f 2 | \
|
eselect esd list | grep PulseAudio | cut -d"[" -f 2 | \
|
||||||
|
@ -10,7 +10,7 @@ NEW_BRANCH=$4
|
|||||||
echo -e "
|
echo -e "
|
||||||
>> requirements for this branch:
|
>> requirements for this branch:
|
||||||
app-admin/eselect-python
|
app-admin/eselect-python
|
||||||
sys-devel/base-gcc:4.6
|
sys-devel/base-gcc:<latest>
|
||||||
>> Entropy post-upgrade migration script
|
>> Entropy post-upgrade migration script
|
||||||
>> Repository: "${REPO_ID}"
|
>> Repository: "${REPO_ID}"
|
||||||
>> Root: "${ROOT}"
|
>> Root: "${ROOT}"
|
||||||
@ -58,12 +58,6 @@ fix_lib64_symlinks() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
latest_gcc_profile() {
|
|
||||||
local gcc_dir="/etc/env.d/gcc"
|
|
||||||
local latest=$(ls -1 ${gcc_dir}/$(uname -m)* | sort | tail -n 1 2> /dev/null)
|
|
||||||
[[ -n "${latest}" ]] && echo $(basename "${latest}")
|
|
||||||
}
|
|
||||||
|
|
||||||
three_four_to_five() {
|
three_four_to_five() {
|
||||||
|
|
||||||
local rc=0
|
local rc=0
|
||||||
@ -86,18 +80,6 @@ three_four_to_five() {
|
|||||||
rc=1
|
rc=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
## sys-devel/base-gcc:LATEST must be forced using
|
|
||||||
## packages.db.system_mask inside repository db dir
|
|
||||||
c_profile=$(latest_gcc_profile)
|
|
||||||
if [ -n "${c_profile}" ]; then
|
|
||||||
gcc-config "${c_profile}"
|
|
||||||
# update env
|
|
||||||
env-update
|
|
||||||
else
|
|
||||||
echo "gcc-config unable to set new profile: not detected"
|
|
||||||
rc=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# set proper eselect esd engine
|
# set proper eselect esd engine
|
||||||
if [ -f "${ROOT}/usr/bin/esdcompat" ]; then
|
if [ -f "${ROOT}/usr/bin/esdcompat" ]; then
|
||||||
eselect esd list | grep PulseAudio | cut -d"[" -f 2 | \
|
eselect esd list | grep PulseAudio | cut -d"[" -f 2 | \
|
||||||
|
Loading…
Reference in New Issue
Block a user