diff --git a/docker/Dockerfile.template b/docker/Dockerfile.template index 84d05b4d..fbc44ad5 100644 --- a/docker/Dockerfile.template +++ b/docker/Dockerfile.template @@ -11,7 +11,12 @@ RUN for V in ${PLATFORMS}; do \ mkdir "/opt/${PLATFORM}" && \ tar -xaf "/cache/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz" -C "/opt/${PLATFORM}" --strip-components=10 \ "usr/local/x86_64-pc-linux-gnu/x86_64-pc-linux-gnu/sys-root/usr/lib/modules/DSM-7.0/build" && \ - echo -e "${PLATFORM}\t${KVER}" >> /opt/platforms; \ + echo -e "${PLATFORM}\t${KVER}" >> /opt/platforms && \ + if [ ! -d "/opt/linux-${KVER}" ]; then \ + mkdir "/opt/linux-${KVER}" && \ + echo "Extracting linux-${KVER}.tar.xz" && \ + tar -xaf "/cache/linux-${KVER}.tar.xz" -C "/opt/linux-${KVER}" --strip-components=1; \ + fi; \ done; \ done @@ -22,7 +27,8 @@ ENV SHELL=/bin/bash \ RUN apt update --yes && \ apt install --yes --no-install-recommends --no-install-suggests \ - build-essential nano make && \ + nano curl bc kmod \ + build-essential make ncurses-dev libssl-dev autogen automake pkg-config libtool xsltproc gperf && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* diff --git a/docker/build.sh b/docker/build.sh index 995765b1..386def5d 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -20,6 +20,7 @@ done <../PLATFORMS mkdir -p cache TOOLKIT_VER="7.0" for PLATFORM in ${!PLATFORMS[@]}; do + KVER="${PLATFORMS[${PLATFORM}]}" echo -n "Checking cache/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz... " if [ ! -f "cache/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz" ]; then URL="https://global.download.synology.com/download/ToolChain/toolkit/${TOOLKIT_VER}/${PLATFORM}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz" @@ -28,6 +29,14 @@ for PLATFORM in ${!PLATFORMS[@]}; do else echo "OK" fi + echo -n "Checking cache/linux-${KVER}.tar.xz... " + if [ ! -f "cache/linux-${KVER}.tar.xz" ]; then + URL="https://cdn.kernel.org/pub/linux/kernel/v${KVER:0:1}.x/linux-${KVER}.tar.xz" + echo "Downloading ${URL}" + curl -L "${URL}" -o "cache/linux-${KVER}.tar.xz" + else + echo "OK" + fi done # Generate Dockerfile diff --git a/files/board/arpl/p3/addons/mpt3sas/apollolake-4.4.180.tgz b/files/board/arpl/p3/addons/mpt3sas/apollolake-4.4.180.tgz index 5e1bc182..06b9fbd1 100644 Binary files a/files/board/arpl/p3/addons/mpt3sas/apollolake-4.4.180.tgz and b/files/board/arpl/p3/addons/mpt3sas/apollolake-4.4.180.tgz differ diff --git a/files/board/arpl/p3/addons/mpt3sas/broadwell-4.4.180.tgz b/files/board/arpl/p3/addons/mpt3sas/broadwell-4.4.180.tgz index 07c9d4df..d92fbcd4 100644 Binary files a/files/board/arpl/p3/addons/mpt3sas/broadwell-4.4.180.tgz and b/files/board/arpl/p3/addons/mpt3sas/broadwell-4.4.180.tgz differ diff --git a/files/board/arpl/p3/addons/mpt3sas/broadwellnk-4.4.180.tgz b/files/board/arpl/p3/addons/mpt3sas/broadwellnk-4.4.180.tgz index 95eda66a..93684b4d 100644 Binary files a/files/board/arpl/p3/addons/mpt3sas/broadwellnk-4.4.180.tgz and b/files/board/arpl/p3/addons/mpt3sas/broadwellnk-4.4.180.tgz differ diff --git a/files/board/arpl/p3/addons/mpt3sas/bromolow-3.10.108.tgz b/files/board/arpl/p3/addons/mpt3sas/bromolow-3.10.108.tgz index 2658e760..382f2267 100644 Binary files a/files/board/arpl/p3/addons/mpt3sas/bromolow-3.10.108.tgz and b/files/board/arpl/p3/addons/mpt3sas/bromolow-3.10.108.tgz differ diff --git a/files/board/arpl/p3/addons/mpt3sas/denverton-4.4.180.tgz b/files/board/arpl/p3/addons/mpt3sas/denverton-4.4.180.tgz index 127615db..0e0fd1a8 100644 Binary files a/files/board/arpl/p3/addons/mpt3sas/denverton-4.4.180.tgz and b/files/board/arpl/p3/addons/mpt3sas/denverton-4.4.180.tgz differ diff --git a/files/board/arpl/p3/addons/mpt3sas/geminilake-4.4.180.tgz b/files/board/arpl/p3/addons/mpt3sas/geminilake-4.4.180.tgz index 4befda22..de2aa765 100644 Binary files a/files/board/arpl/p3/addons/mpt3sas/geminilake-4.4.180.tgz and b/files/board/arpl/p3/addons/mpt3sas/geminilake-4.4.180.tgz differ diff --git a/files/board/arpl/p3/addons/mpt3sas/v1000-4.4.180.tgz b/files/board/arpl/p3/addons/mpt3sas/v1000-4.4.180.tgz index 2977fd41..9064cf68 100644 Binary files a/files/board/arpl/p3/addons/mpt3sas/v1000-4.4.180.tgz and b/files/board/arpl/p3/addons/mpt3sas/v1000-4.4.180.tgz differ diff --git a/files/board/arpl/p3/addons/tg3/apollolake-4.4.180.tgz b/files/board/arpl/p3/addons/tg3/apollolake-4.4.180.tgz index 86fbe751..6616038a 100644 Binary files a/files/board/arpl/p3/addons/tg3/apollolake-4.4.180.tgz and b/files/board/arpl/p3/addons/tg3/apollolake-4.4.180.tgz differ diff --git a/files/board/arpl/p3/addons/tg3/broadwell-4.4.180.tgz b/files/board/arpl/p3/addons/tg3/broadwell-4.4.180.tgz index 0274ccf7..9c9cc852 100644 Binary files a/files/board/arpl/p3/addons/tg3/broadwell-4.4.180.tgz and b/files/board/arpl/p3/addons/tg3/broadwell-4.4.180.tgz differ diff --git a/files/board/arpl/p3/addons/tg3/broadwellnk-4.4.180.tgz b/files/board/arpl/p3/addons/tg3/broadwellnk-4.4.180.tgz index ea60a2f1..03cfabfe 100644 Binary files a/files/board/arpl/p3/addons/tg3/broadwellnk-4.4.180.tgz and b/files/board/arpl/p3/addons/tg3/broadwellnk-4.4.180.tgz differ diff --git a/files/board/arpl/p3/addons/tg3/bromolow-3.10.108.tgz b/files/board/arpl/p3/addons/tg3/bromolow-3.10.108.tgz index ee863767..c1a88cab 100644 Binary files a/files/board/arpl/p3/addons/tg3/bromolow-3.10.108.tgz and b/files/board/arpl/p3/addons/tg3/bromolow-3.10.108.tgz differ diff --git a/files/board/arpl/p3/addons/tg3/denverton-4.4.180.tgz b/files/board/arpl/p3/addons/tg3/denverton-4.4.180.tgz index 8cb1d354..5fb8778b 100644 Binary files a/files/board/arpl/p3/addons/tg3/denverton-4.4.180.tgz and b/files/board/arpl/p3/addons/tg3/denverton-4.4.180.tgz differ diff --git a/files/board/arpl/p3/addons/tg3/geminilake-4.4.180.tgz b/files/board/arpl/p3/addons/tg3/geminilake-4.4.180.tgz index 8cc250a9..c2ac2d07 100644 Binary files a/files/board/arpl/p3/addons/tg3/geminilake-4.4.180.tgz and b/files/board/arpl/p3/addons/tg3/geminilake-4.4.180.tgz differ