Merge pull request #67 from linuxserver/deprecate_cpu_core

deprecate cpu_core routine lack of scaling
This commit is contained in:
sparklyballs
2018-01-04 20:45:13 +00:00
committed by GitHub
2 changed files with 22 additions and 34 deletions

View File

@@ -162,19 +162,7 @@ RUN \
--mandir=/usr/share/man \
--prefix=/usr \
--sysconfdir=/config && \
echo "**** attempt to set number of cores available for make to use ****" && \
set -ex && \
CPU_CORES=$( < /proc/cpuinfo grep -c processor ) || echo "failed cpu look up" && \
if echo $CPU_CORES | grep -E -q '^[0-9]+$'; then \
: ;\
if [ "$CPU_CORES" -gt 7 ]; then \
CPU_CORES=$(( CPU_CORES - 3 )); \
elif [ "$CPU_CORES" -gt 5 ]; then \
CPU_CORES=$(( CPU_CORES - 2 )); \
elif [ "$CPU_CORES" -gt 3 ]; then \
CPU_CORES=$(( CPU_CORES - 1 )); fi \
else CPU_CORES="1"; fi && \
make -j $CPU_CORES && \
make && \
make install && \
echo "**** build XMLTV ****" && \
curl -o \
@@ -193,7 +181,7 @@ RUN \
sed "s/\(lib\/Ask\/Term.pm';\)/.\/\1/" -i Makefile.PL && \
PERL5LIB=`pwd` && \
echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \
make -j $CPU_CORES && \
make && \
make test && \
make install && \
echo "**** build argtable2 ****" && \
@@ -210,7 +198,7 @@ RUN \
cd /tmp/argtable && \
./configure \
--prefix=/usr && \
make -j $CPU_CORES && \
make && \
make check && \
make install && \
echo "***** build comskip ****" && \
@@ -220,8 +208,7 @@ RUN \
./configure \
--bindir=/usr/bin \
--sysconfdir=/config/comskip && \
make -j $CPU_CORES && \
set +ex && \
make && \
make install && \
echo "***** cleanup ****" && \
apk del --purge \

View File

@@ -160,20 +160,21 @@ You need to enable minimum advanced view level to see the picons options.
## Versions
+ **11.12.2017:** Rebase to alpine 3.7, linting fixes.
+ **02.09.2017:** Add codec dependencies.
+ **13.07.2017:** Increase uniformity across all archs.
+ **08.07.2017:** Update README with full path for comskip.
+ **02.07.2017:** Move to one branch for all 4.2 releases.
+ **27.05.2017:** Rebase to alpine 3.6.
+ **01.05.2017:** Update to tvheadend 4.2.1 stable.
+ **18.04.2017:** Use repo version of gnu-libiconv rather than compiling.
+ **09.04.2017:** Chain cpanm installs in one block and use --installdeps.
+ **09.02.2017:** Perl changes, add picons file to gitignore and update XMLTV to 0.5.69.
+ **07.02.2017:** Add variable to add additional runtime paramters.
+ **05.02.2017:** Update to alpine 3.5 and change dvb-apps to only compile needed libs.
+ **14.11.2016:** Add picons from picons.xyz to /picons folder and add info to README.
+ **22.09.2016:** Fix broken tv_grab_wg, libs for xmltv and update README.
+ **18.09.2016:** Update XMLTV to 0.5.68 and update README.
+ **10.09.2016:** Add layer badges to README.
+ **05.09.2016:** Initial release.
+ **04.01.18:** Deprecate cpu_core routine lack of scaling.
+ **11.12.17:** Rebase to alpine 3.7, linting fixes.
+ **02.09.17:** Add codec dependencies.
+ **13.07.17:** Increase uniformity across all archs.
+ **08.07.17:** Update README with full path for comskip.
+ **02.07.17:** Move to one branch for all 4.2 releases.
+ **27.05.17:** Rebase to alpine 3.6.
+ **01.05.17:** Update to tvheadend 4.2.1 stable.
+ **18.04.17:** Use repo version of gnu-libiconv rather than compiling.
+ **09.04.17:** Chain cpanm installs in one block and use --installdeps.
+ **09.02.17:** Perl changes, add picons file to gitignore and update XMLTV to 0.5.69.
+ **07.02.17:** Add variable to add additional runtime paramters.
+ **05.02.17:** Update to alpine 3.5 and change dvb-apps to only compile needed libs.
+ **14.11.16:** Add picons from picons.xyz to /picons folder and add info to README.
+ **22.09.16:** Fix broken tv_grab_wg, libs for xmltv and update README.
+ **18.09.16:** Update XMLTV to 0.5.68 and update README.
+ **10.09.16:** Add layer badges to README.
+ **05.09.16:** Initial release.