From 7bb27e4d4c4e3b2baf9d0b8ab0a83a7c3035f077 Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Sun, 11 Apr 2021 21:59:15 +0200
Subject: [PATCH] using our debian-build-essential img

---
 build-oxnas820.yaml | 46 ++++++++++++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/build-oxnas820.yaml b/build-oxnas820.yaml
index c99388f..e6600eb 100644
--- a/build-oxnas820.yaml
+++ b/build-oxnas820.yaml
@@ -30,43 +30,59 @@ spec:
         type: git
   steps:
     - name: setup
-      image: cr.lan/debian-kernel-build-stable
+      image: cr.lan/debian-stable-build-essential
       script: |
         #!/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
+        #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
+        export DEBIAN_FRONTEND=noninteractive
+        echo "HACK openjdk bug"
+        mkdir -p /etc/ssl/certs/java
+        touch /etc/ssl/certs/java/cacerts
+        mkdir -p /usr/share/man/man1
+        touch /usr/share/man/man1/rmid.1.gz.dpkg-tmp
+        apt install -y ca-certificates-java
+        dpkg --configure -a
+        apt install -y build-essential ccache ecj fastjar file g++ gawk \
+              gettext git java-propose-classpath libelf-dev libncurses5-dev \
+              libncursesw5-dev libssl-dev python python2.7-dev python3 unzip wget \
+              python3-distutils python3-setuptools rsync subversion swig time \
+              xsltproc zlib1g-dev 
     - name: openwrt-get
-      image: cr.lan/debian-kernel-build-stable
+      image: cr.lan/debian-stable-build-essential
       script: |
         #!/usr/bin/env bash
         if [ ! -d /usr/src/openwrt ]; then
-          git clone --depth=1 https://github.com/openwrt/openwrt.git /usr/src/openwrt
+          git clone https://github.com/openwrt/openwrt.git /usr/src/openwrt
         fi
         cd /usr/src/openwrt
         echo "O_VERS: $(params.version)"
-        git checkout $(params.version)
-        git pull 
+        git branch -l
+        git checkout $(params.version) || exit 1
+        git pull
     - name: build-openwrt
-      image: cr.lan/debian-kernel-build-stable
+      image: cr.lan/debian-stable-build-essential
       script: |
         #!/usr/bin/env bash
         
         echo $PATH
-        
         echo "res.input.ke...path: $(resources.inputs.openwrt-configs.path)"
         ls -altr /usr/src/
-        cp -v $(resources.inputs.openwrt-configs.path)/$(params.config) \
-                /usr/src/openwrt/.config || exit 1
-        cd /usr/src/openwrt
-        #distcc config
+         #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
         echo "ALL DISTCC HOSTS"
         distcc --show-hosts
         echo "/ALL DISTCC HOSTS"
-        ls -latr /usr/lib/distcc-pump/
+        
+        
+        cp -v $(resources.inputs.openwrt-configs.path)/$(params.config) \
+                /usr/src/openwrt/.config || exit 1
+        cd /usr/src/openwrt
+        ./scripts/feeds update -a
+        ./scripts/feeds install -a
         #distcc-pump make -j20 download world CC=distcc $(params.make_flags)
-        #make -j4 download world $(params.make_flags)
+        make -j2 download world $(params.make_flags)
   workspaces:
   - name: usr-src
     mountPath: /usr/src