diff --git a/VERSION b/VERSION index eadcfe27..abbc7a37 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0-beta5 +1.0-beta6 diff --git a/docker/syno-compiler/Dockerfile.template b/docker/syno-compiler/Dockerfile.template index ba1558e4..e056516e 100644 --- a/docker/syno-compiler/Dockerfile.template +++ b/docker/syno-compiler/Dockerfile.template @@ -3,7 +3,7 @@ ARG PLATFORMS="@@@PLATFORMS@@@" ARG TOOLKIT_VER="@@@TOOLKIT_VER@@@" # Copy downloaded toolkits -ADD cache/$TOOLKIT_VER /cache +ADD cache /cache # Extract toolkits RUN for V in ${PLATFORMS}; do \ echo "${V}" | while IFS=':' read PLATFORM KVER; do \ diff --git a/docker/syno-compiler/build.sh b/docker/syno-compiler/build.sh index e4c8cf78..dd53d3b8 100755 --- a/docker/syno-compiler/build.sh +++ b/docker/syno-compiler/build.sh @@ -23,6 +23,7 @@ function prepare() { URLS["geminilake"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/Intel%20x86%20Linux%204.4.180%20%28GeminiLake%29/geminilake-${GCCLIB_VER}_x86_64-GPL.txz" URLS["v1000"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/Intel%20x86%20Linux%204.4.180%20%28V1000%29/v1000-${GCCLIB_VER}_x86_64-GPL.txz" URLS["r1000"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/AMD%20x86%20Linux%204.4.180%20%28r1000%29/r1000-${GCCLIB_VER}_x86_64-GPL.txz" + URLS["epyc7002"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/AMD%20x86%20Linux%20Linux%205.10.55%20%28epyc7002%29/epyc7002-${GCCLIB_VER}_x86_64-GPL.txz" # Read platforms/kerver version echo "Reading platforms" diff --git a/docker/syno-compiler/files/opt/do.sh b/docker/syno-compiler/files/opt/do.sh index 92d02ef5..3e7fc2e6 100755 --- a/docker/syno-compiler/files/opt/do.sh +++ b/docker/syno-compiler/files/opt/do.sh @@ -9,15 +9,16 @@ function export-vars() { echo "Use: export-vars " exit 1 fi + export PLATFORM="${1}" export KSRC="/opt/${1}/build" export CROSS_COMPILE="/opt/${1}/bin/x86_64-pc-linux-gnu-" export CFLAGS="-I/opt/${1}/include" export LDFLAGS="-I/opt/${1}/lib" export LD_LIBRARY_PATH="/opt/${1}/lib" export ARCH=x86_64 - export PATH="/opt/${1}/bin:${PATH}" export CC="x86_64-pc-linux-gnu-gcc" export LD="x86_64-pc-linux-gnu-ld" + export PATH="/opt/${1}/bin:${PATH}" } ############################################################################### diff --git a/docker/syno-toolkit/rootfs/etc/profile.d/login.sh b/docker/syno-toolkit/rootfs/etc/profile.d/login.sh old mode 100644 new mode 100755 index 69629346..aa0a4360 --- a/docker/syno-toolkit/rootfs/etc/profile.d/login.sh +++ b/docker/syno-toolkit/rootfs/etc/profile.d/login.sh @@ -1,3 +1,4 @@ +export PATH="/usr/local/x86_64-pc-linux-gnu/bin:${PATH}" [[ "$-" != *i* ]] && return export LS_OPTIONS='--color=auto' export SHELL='linux' @@ -7,4 +8,3 @@ alias ll='ls -l' alias l='ls -l -a' alias h='history 25' alias j='jobs -l' -export PATH="/opt/${PLATFORM}/bin:${PATH}" \ No newline at end of file diff --git a/docker/syno-toolkit/rootfs/usr/bin/do.sh b/docker/syno-toolkit/rootfs/usr/bin/do.sh index 522f19ef..af9b31ee 100755 --- a/docker/syno-toolkit/rootfs/usr/bin/do.sh +++ b/docker/syno-toolkit/rootfs/usr/bin/do.sh @@ -29,30 +29,6 @@ function compile-lkm { chown 1000.1000 /output/redpill-prod.ko } -############################################################################### -# function compile-drivers { -# while read platform kver; do -# SRC_PATH="/opt/${platform}" -# echo "Compiling for ${platform}-${kver}" -# cd /opt/linux-${kver}/drivers -# while read dir; do -# if [ -f "${dir}/Makefile" ]; then -# echo "Driver `basename ${dir}`" -# grep "CONFIG_.*/.*" "${dir}/Makefile" | sed 's/.*\(CONFIG_[^)]*\).*/\1=n/g' > /tmp/env -# grep "CONFIG_.*\.o.*" "${dir}/Makefile" | sed 's/.*\(CONFIG_[^)]*\).*/\1=m/g' >> /tmp/env -# make -C "${SRC_PATH}" M=$(readlink -f "${dir}") clean -# cat /tmp/env | xargs -d '\n' make -C "${SRC_PATH}" M=$(readlink -f "${dir}") modules $@ -# fi -# done < <(find -type d) -# DST_PATH="/output/compiled-mods/${platform}-${kver}" -# mkdir -p "${DST_PATH}" -# while read f; do -# strip -g "${f}" -# mv "${f}" "${DST_PATH}" -# done < <(find -name \*.ko) -# done /dev/null +dd if="/dev/zero" of="${IMAGE_FILE}" bs=1M count=1024 conv=sync 2>/dev/null # Copy grub stage1 to image dd if="${BOARD_PATH}/grub.bin" of="${IMAGE_FILE}" conv=notrunc,sync 2>/dev/null # Create partitions on image diff --git a/files/board/arpl/overlayfs/opt/arpl/include/consts.sh b/files/board/arpl/overlayfs/opt/arpl/include/consts.sh index afe1c6a3..0d1bc145 100644 --- a/files/board/arpl/overlayfs/opt/arpl/include/consts.sh +++ b/files/board/arpl/overlayfs/opt/arpl/include/consts.sh @@ -1,5 +1,5 @@ -ARPL_VERSION="1.0-beta5" +ARPL_VERSION="1.0-beta6" # Define paths TMP_PATH="/tmp" diff --git a/files/board/arpl/p3/addons/eudev/all.tgz b/files/board/arpl/p3/addons/eudev/all.tgz index c7a1cd19..7d08837b 100644 Binary files a/files/board/arpl/p3/addons/eudev/all.tgz and b/files/board/arpl/p3/addons/eudev/all.tgz differ diff --git a/files/board/arpl/p3/modules/apollolake-4.4.180.tgz b/files/board/arpl/p3/modules/apollolake-4.4.180.tgz index 774c254f..0bb69bbe 100644 Binary files a/files/board/arpl/p3/modules/apollolake-4.4.180.tgz and b/files/board/arpl/p3/modules/apollolake-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/broadwell-4.4.180.tgz b/files/board/arpl/p3/modules/broadwell-4.4.180.tgz index d00670e4..d7519c80 100644 Binary files a/files/board/arpl/p3/modules/broadwell-4.4.180.tgz and b/files/board/arpl/p3/modules/broadwell-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz b/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz index 83ccb178..c887b7e0 100644 Binary files a/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz and b/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/bromolow-3.10.108.tgz b/files/board/arpl/p3/modules/bromolow-3.10.108.tgz index a793c80a..46713a35 100644 Binary files a/files/board/arpl/p3/modules/bromolow-3.10.108.tgz and b/files/board/arpl/p3/modules/bromolow-3.10.108.tgz differ diff --git a/files/board/arpl/p3/modules/denverton-4.4.180.tgz b/files/board/arpl/p3/modules/denverton-4.4.180.tgz index 04262635..f4daf2dc 100644 Binary files a/files/board/arpl/p3/modules/denverton-4.4.180.tgz and b/files/board/arpl/p3/modules/denverton-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/geminilake-4.4.180.tgz b/files/board/arpl/p3/modules/geminilake-4.4.180.tgz index 78feefbf..3ff51516 100644 Binary files a/files/board/arpl/p3/modules/geminilake-4.4.180.tgz and b/files/board/arpl/p3/modules/geminilake-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/r1000-4.4.180.tgz b/files/board/arpl/p3/modules/r1000-4.4.180.tgz index 2f06366e..28472036 100644 Binary files a/files/board/arpl/p3/modules/r1000-4.4.180.tgz and b/files/board/arpl/p3/modules/r1000-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/v1000-4.4.180.tgz b/files/board/arpl/p3/modules/v1000-4.4.180.tgz index 54d725fc..b26c5923 100644 Binary files a/files/board/arpl/p3/modules/v1000-4.4.180.tgz and b/files/board/arpl/p3/modules/v1000-4.4.180.tgz differ