Merge pull request #10 from linuxserver/deprecate_cpu_core
deprecate cpu_core routine lack of scaling
This commit is contained in:
15
Dockerfile
15
Dockerfile
@ -42,25 +42,12 @@ RUN \
|
|||||||
LCDSUPPORT \
|
LCDSUPPORT \
|
||||||
LEDSUPPORT \
|
LEDSUPPORT \
|
||||||
READ_SDT_CHARSETS && \
|
READ_SDT_CHARSETS && \
|
||||||
echo "**** attempt to set number of cores available for make to use ****" && \
|
make \
|
||||||
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 \
|
|
||||||
CONF_DIR=/config \
|
CONF_DIR=/config \
|
||||||
DEFAULT_PCSC_FLAGS="-I/usr/include/PCSC" \
|
DEFAULT_PCSC_FLAGS="-I/usr/include/PCSC" \
|
||||||
NO_PLUS_TARGET=1 \
|
NO_PLUS_TARGET=1 \
|
||||||
OSCAM_BIN=/usr/bin/oscam \
|
OSCAM_BIN=/usr/bin/oscam \
|
||||||
pcsc-libusb && \
|
pcsc-libusb && \
|
||||||
set +ex && \
|
|
||||||
echo "**** fix broken permissions from pcscd install ****" && \
|
echo "**** fix broken permissions from pcscd install ****" && \
|
||||||
chown root:root \
|
chown root:root \
|
||||||
/usr/sbin/pcscd && \
|
/usr/sbin/pcscd && \
|
||||||
|
@ -100,6 +100,7 @@ The web interface is at port 8888.
|
|||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
|
+ **03.01.18:** Deprecate cpu_core routine lack of scaling.
|
||||||
+ **13.12.17:** Rebase to alpine 3.7.
|
+ **13.12.17:** Rebase to alpine 3.7.
|
||||||
+ **19.10.17:** Add ccid package for usb card readers.
|
+ **19.10.17:** Add ccid package for usb card readers.
|
||||||
+ **17.10.17:** Switch to using bzr for source code, streamboard awol.
|
+ **17.10.17:** Switch to using bzr for source code, streamboard awol.
|
||||||
|
Reference in New Issue
Block a user