Skip to content

Commit 1a05bb8

Browse files
committed
workflows: next try to build LE13
1 parent 15bd6b0 commit 1a05bb8

2 files changed

Lines changed: 14 additions & 25 deletions

File tree

.github/workflows/build-vdrsternelec.yml

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -76,34 +76,23 @@ jobs:
7676
python3 python3-build python3-installer python3-setuptools python3-wheel python-is-python3 \
7777
rdfind rsync sed libjson-parse-perl tar unzip upx-ucl wget \
7878
xfonts-utils xsltproc xz-utils zip zstd parallel
79-
80-
81-
# ssudo apt-get install -y cpp-13 g++-13 gcc-13 || true
82-
8379
84-
if [[ "${{ inputs.config }}" == CoreELEC-20* ]] || [[ "${{ inputs.config }}" == CoreELEC-21* ]] || [[ "${{ inputs.config }}" == LibreELEC-12* ]] ; then
80+
if [[ "${{ inputs.config }}" == CoreELEC-20* ]] || [[ "${{ inputs.config }}" == CoreELEC-21* ]] || [[ "${{ inputs.config }}" == LibreELEC-12* ]] ; then
8581
sudo apt-get install -y cpp-12 g++-12 gcc-12 || true
86-
#sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100
87-
#sudo update-alternatives --install /usr/bin/cpp cpp /usr/bin/cpp-12 100
88-
#sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 100
89-
#sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-12 100
90-
#
91-
#sudo update-alternatives --config gcc
82+
83+
sudo rm /usr/bin/gcc /usr/bin/cpp /usr/bin/g++ /usr/bin/gcov
84+
sudo ln -s /usr/bin/gcc-12 /usr/bin/gcc
85+
sudo ln -s /usr/bin/cpp-12 /usr/bin/cpp
86+
sudo ln -s /usr/bin/g++-12 /usr/bin/g++
87+
sudo ln -s /usr/bin/gcov-12 /usr/bin/gcov
9288
elif [[ "${{ inputs.config }}" == CoreELEC-22* ]] || [[ "${{ inputs.config }}" == LibreELEC-13* ]] ; then
9389
sudo apt-get install -y cpp-14 g++-14 gcc-14 || true
9490
9591
sudo rm /usr/bin/gcc /usr/bin/cpp /usr/bin/g++ /usr/bin/gcov
9692
sudo ln -s /usr/bin/gcc-14 /usr/bin/gcc
9793
sudo ln -s /usr/bin/cpp-14 /usr/bin/cpp
9894
sudo ln -s /usr/bin/g++-14 /usr/bin/g++
99-
sudo ln -s /usr/bin/gcov-14 /usr/bin/gcov
100-
101-
#sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100 \
102-
# --slave /usr/bin/g++ g++ /usr/bin/g++-14 \
103-
# --slave /usr/bin/gcov gcov /usr/bin/gcov-14
104-
#
105-
#sudo update-alternatives --install /usr/bin/cpp cpp /usr/bin/cpp-14 100
106-
#sudo update-alternatives --config gcc
95+
sudo ln -s /usr/bin/gcov-14 /usr/bin/gcov
10796
fi
10897
10998
if [ "$(uname -m)" = "aarch64" ]; then

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -246,13 +246,13 @@ jobs:
246246
elif [[ "${{ inputs.target }}" == "LibreELEC-13" ]]; then
247247
for i in $ALL_DEFAULT; do
248248
if [[ "$i" == LibreELEC-13* ]]; then
249-
BUILDX8624="$BUILDX8624 $i"
249+
# BUILDX8624="$BUILDX8624 $i"
250250
251-
#if [[ "$i" == *x86_64* ]]; then
252-
# BUILDX8624="$BUILDX8624 $i"
253-
#else
254-
# BUILDARM22="$BUILDARM22 $i"
255-
#fi
251+
if [[ "$i" == *x86_64* ]]; then
252+
BUILDX8624="$BUILDX8624 $i"
253+
else
254+
BUILDARM24="$BUILDARM24 $i"
255+
fi
256256
fi
257257
done
258258
elif [[ "${{ inputs.target }}" == "LibreELEC-Generic" ]]; then

0 commit comments

Comments
 (0)