diff --git a/Dockerfile b/Dockerfile index 5ebae97..ec74766 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,5 +15,6 @@ RUN sed -i 's@deb.debian.org@apt-cache.lan/deb.debian.org@g' /etc/apt/sources.li apt-get clean -y && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /var/cache/apt/* && \ - rm /etc/distcc/hosts #no zeroconf for distcc + rm /etc/distcc/hosts #no zeroconf for distcc; \ + ln -s /usr/lib/distcc-pump/lib/python3.7/site-packages/include_server /usr/lib/distcc-pump/; #hack pythonpath issue diff --git a/kernel-build-pine64-armbian.yaml b/kernel-build-pine64-armbian.yaml index 5a39f42..38e0717 100644 --- a/kernel-build-pine64-armbian.yaml +++ b/kernel-build-pine64-armbian.yaml @@ -21,8 +21,8 @@ spec: #!/usr/bin/env bash echo 'deb-src http://apt-cache.lan/deb.debian.org/debian testing main' > /etc/apt/sources.list.d/src-testing.list echo 'deb http://apt-cache.lan/deb.debian.org/debian testing main' > /etc/apt/sources.list.d/testing.list - apt update -y - apt install -y linux-source $(apt-cache search linux-source |awk '{print $1}' |tail -1) + # apt update -y + # apt install -y linux-source $(apt-cache search linux-source |awk '{print $1}' |tail -1) - name: unpack-kernel-source image: cr.lan/debian-kernel-build-stable script: | @@ -44,11 +44,13 @@ spec: cd /usr/src/linux-source-5.10 #distcc config echo "localhost/1,cpp,lzo --randomize distcc-0.distcc,cpp,lzo distcc-1.distcc,cpp,lzo distcc-2.distcc,cpp,lzo distcc-3.distcc,cpp,lzo" >/etc/distcc/hosts - export CC=distcc GCC=distcc CPP=distcc echo "ALL DISTCC HOSTS" distcc --show-hosts echo "/ALL DISTCC HOSTS" - make -j4 bindeb-pkg LOCALVERSION=-pine1 + dpkg -L distcc-pump + #hack pythonpath issue + ln -s /usr/lib/distcc-pump/lib/python3.7/site-packages/include_server /usr/lib/distcc-pump/ + distcc-pump make -j20 bindeb-pkg LOCALVERSION=-pine1 CC=distcc - name: cleanup-workspace-post image: alpine command: diff --git a/kernel-build-riotboard.yaml b/kernel-build-riotboard.yaml index eb257cc..86cc101 100644 --- a/kernel-build-riotboard.yaml +++ b/kernel-build-riotboard.yaml @@ -21,8 +21,8 @@ spec: #!/usr/bin/env bash echo 'deb-src http://apt-cache.lan/deb.debian.org/debian testing main' > /etc/apt/sources.list.d/src-testing.list echo 'deb http://apt-cache.lan/deb.debian.org/debian testing main' > /etc/apt/sources.list.d/testing.list - apt update -y - apt install -y $(apt-cache search linux-source |awk '{print $1}' |tail -1) + #apt update -y + #apt install -y $(apt-cache search linux-source |awk '{print $1}' |tail -1) - name: unpack-kernel-source image: cr.lan/debian-kernel-build-stable script: | @@ -41,12 +41,11 @@ spec: cd /usr/src/linux-source-${VER} #distcc config echo "localhost/1,cpp,lzo --randomize distcc-0.distcc,cpp,lzo distcc-1.distcc,cpp,lzo distcc-2.distcc,cpp,lzo distcc-3.distcc,cpp,lzo" >/etc/distcc/hosts - export CC=distcc GCC=distcc CPP=distcc echo "ALL DISTCC HOSTS" distcc --show-hosts echo "/ALL DISTCC HOSTS" - make ARCH=arm KBUILD_DEBARCH=armhf CROSS_COMPILE=arm-linux-gnueabihf- \ - -j4 bindeb-pkg LOCALVERSION=-riot2 + distcc-pump make ARCH=arm KBUILD_DEBARCH=armhf CROSS_COMPILE=arm-linux-gnueabihf- \ + -j4 bindeb-pkg LOCALVERSION=-riot2 CC=distcc - name: cleanup-workspace-post image: alpine command: