added dynamic core count

this didn't run yet

.drone.yml

@@ -1,212 +0,0 @@
-global-variables:
-  env: &env
-    image: hoffmannhosting/gluon-builder
-    environment:
-      input_version: v2020.2.2
-      GLUON_SITEDIR: /drone/src/site
-      FORCE_UNSAFE_CONFIGURE: 1
-
-  gluon: &gluon
-    <<: *env
-    commands:
-      - cd gluon
-      - make -j6 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-      - make -j6 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-# Don´t build Experimental. The Experimental Firmware is in another Branch
-#      - make -j6 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
-
-  upload: &upload
-    image: appleboy/drone-scp
-    settings:
-      host: 46.4.138.183
-      user: fwupload
-      key:
-        from_secret: ssh-update
-      strip_components: 6
-    when:
-      branch: multidomain
-
-  patch: &patch
-    <<: *env
-    commands:
-      - cd gluon/openwrt/package
-      - grep -rl +iw kernel/mac80211/Makefile | xargs sed -i s/+iw/+iw-full/g
-      - grep -r iw-full *
-
-kind: pipeline
-type: docker
-name: gluon-build
-
-clone:
-  depth: 50
-
-steps: &steps
-  - name: submodules
-    image: docker:git
-    commands:
-    - git submodule update --recursive --init
-
-  - name: change site to multi
-    image: docker:git
-    commands:
-    - cd site
-    - git checkout multidomain
-
-  - name: make update
-    <<: *env
-    commands:
-    - cd gluon
-    - make update
-    environment:
-      GLUON_TARGET: ar71xx-generic
-
-  - name: patch iw to iw-full
-    <<: *patch
-
-  - name: build-ath79-generic
-    <<: *gluon
-    environment:
-      GLUON_TARGET: ath79-generic
-
-  - name: build-ar71xx-generic
-    <<: *gluon
-    environment:
-      GLUON_TARGET: ar71xx-generic
-
-  - name: build-ar71xx-tiny
-    <<: *gluon
-    environment:
-      GLUON_TARGET: ar71xx-tiny
-
-  - name: build-ar71xx-nand
-    <<: *gluon
-    environment:
-      GLUON_TARGET: ar71xx-nand
-
-  - name: build-brcm2708-bcm2708
-    <<: *gluon
-    environment:
-      GLUON_TARGET: brcm2708-bcm2708
-
-  - name: build-brcm2708-bcm2709
-    <<: *gluon
-    environment:
-      GLUON_TARGET: brcm2708-bcm2709
-
-  - name: build-mpc85xx-generic
-    <<: *gluon
-    environment:
-      GLUON_TARGET: mpc85xx-generic
-
-  - name: build-mpc85xx-p1020
-    <<: *gluon
-    environment:
-      GLUON_TARGET: mpc85xx-p1020
-
-  - name: build-x86-generic
-    <<: *gluon
-    environment:
-      GLUON_TARGET: x86-generic
-
-  - name: build-x86-geode
-    <<: *gluon
-    environment:
-      GLUON_TARGET: x86-geode
-
-  - name: build-x86-64
-    <<: *gluon
-    environment:
-      GLUON_TARGET: x86-64
-
-  - name: build-ipq40xx-generic
-    <<: *gluon
-    environment:
-      GLUON_TARGET: ipq40xx-generic
-
-  - name: ipq806x-generic
-    <<: *gluon
-    environment:
-      GLUON_TARGET: ipq806x-generic
-
-  - name: build-ramips-mt7620
-    <<: *gluon
-    environment:
-      GLUON_TARGET: ramips-mt7620
-
-  - name: build-ramips-mt7621
-    <<: *gluon
-    environment:
-      GLUON_TARGET: ramips-mt7621
-
-  - name: build-ramips-mt76x8
-    <<: *gluon
-    environment:
-      GLUON_TARGET: ramips-mt76x8
-
-  - name: build-ramips-rt305x
-    <<: *gluon
-    environment:
-      GLUON_TARGET: ramips-rt305x
-
-  - name: lantiq-xway
-    <<: *gluon
-    environment:
-      GLUON_TARGET: lantiq-xway
-
-  - name: lantiq-xrx200
-    <<: *gluon
-    environment:
-      GLUON_TARGET: lantiq-xrx200
-
-  - name: make manifest
-    <<: *env
-    commands:
-    - cd gluon
-    - make manifest GLUON_BRANCH=stable GLUON_OUTPUTDIR=output/stable GLUON_RELEASE=$input_version-stable
-    - make manifest GLUON_BRANCH=beta GLUON_OUTPUTDIR=output/beta GLUON_RELEASE=$input_version-beta
-# Don´t build Experimental. The Experimental Firmware is in another Branch
-#    - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp
-
-  - name: backup-old-firmware
-    image: appleboy/drone-ssh
-    settings:
-      host: 46.4.138.183
-      username: fwupload
-      key:
-        from_secret: ssh-update
-      port: 22
-      command_timeout: 120m
-      script:
-        #- ./rsync-backup-multi.sh
-        - rm -rf /srv/fwuploads/troisdorf/multi/stable
-        - rm -rf /srv/fwuploads/troisdorf/multi/beta
-        - mkdir /srv/fwuploads/troisdorf/multi/stable
-        - mkdir /srv/fwuploads/troisdorf/multi/beta
-    when:
-      branch: multidomain
-
-  - name: upload stable
-    <<: *upload
-    settings:
-      target: /srv/fwuploads/troisdorf/multi/stable
-      source: /drone/src/gluon/output/stable/images/*
-
-  - name: upload beta
-    <<: *upload
-    settings:
-      target: /srv/fwuploads/troisdorf/multi/beta
-      source: /drone/src/gluon/output/beta/images/*
-
-# Don´t build Experimental. The Experimental Firmware is in another Branch
-#  - name: upload experimental
-#    <<: *upload
-#    settings:
-#      target: /srv/fwuploads/troisdorf/multi/experimental
-#      source: /drone/src/gluon/output/experimental/images/*
-
-  - name: slack
-    image: plugins/slack
-    settings:
-      webhook:
-        from_secret: slack_webhook
-      channel: fftdf_firmware

.woodpecker/build.yml

@@ -0,0 +1,87 @@
+---
+platform: linux/arm64
+
+variables:
+  - &default
+    image: "git.freifunk-rhein-sieg.net/freifunk-troisdorf/docker-gluon-build:latest"
+    pull: true
+    environment:
+      - input_version=v2022.1.4
+      - GLUON_SITEDIR=../site
+      - FORCE_UNSAFE_CONFIGURE=1
+      - GLUON_TARGET=${TARGET}
+      - GLUON_DEPRECATED=1
+
+workspace:
+  base: /build
+
+clone:
+ git:
+   image: woodpeckerci/plugin-git
+   settings:
+     recursive: true
+
+pipeline:
+  make_update:
+    <<: *default
+    commands:
+      - cd gluon
+      - make update
+
+  patch-iw-to-iw-full:
+    <<: *default
+    commands:
+      - sed -i 's/+iw /+iw-full /g' gluon/openwrt/package/kernel/mac80211/Makefile
+
+  build:
+    <<: *default
+    commands:
+      - cd gluon
+      - make -j$(nproc) GLUON_AUTOUPDATER_BRANCH=stable GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
+  
+  list_images:
+    <<: *default
+    commands:
+      - mkdir -p gluon/output/stable/images/factory
+      - echo "${TARGET}" > gluon/output/stable/images/factory/${TARGET}
+      - ls -alh gluon/output/stable/images/factory
+
+  upload:
+    image: appleboy/drone-scp
+    settings:
+      host: 46.4.138.183
+      user: fwupload
+      key:
+        from_secret: ssh-key
+      strip_components: 2
+      target: /srv/fwuploads-testing/troisdorf/multi/incoming/
+      source: gluon/output/stable/*
+
+matrix:
+  TARGET:
+    - ath79-generic
+    - ath79-mikrotik
+    - ath79-nand
+    - bcm27xx-bcm2708
+    - bcm27xx-bcm2709
+    - ipq40xx-generic
+    - ipq40xx-mikrotik
+    - ipq806x-generic
+    - lantiq-xrx200
+    - lantiq-xway
+    - mediatek-mt7622
+    - mpc85xx-p1010
+    - mpc85xx-p1020
+    - ramips-mt7620
+    - ramips-mt7621
+    - ramips-mt76x8
+    - realtek-rtl838x
+    - rockchip-armv8
+    - sunxi-cortexa7
+    - x86-64
+    - x86-generic
+    - x86-geode
+    - x86-legacy
+
+depends_on:
+  - prepare

.woodpecker/cleanup.yml

@@ -0,0 +1,26 @@
+---
+platform: linux/arm64
+
+skip_clone: true
+
+workspace:
+  base: /build
+
+pipeline:
+  cleanup:
+    image: appleboy/drone-ssh
+    settings:
+      host: 46.4.138.183
+      username: fwupload
+      key:
+        from_secret: ssh-key
+      port: 22
+      command_timeout: 120m
+      script:
+        - ls -alh /srv/fwuploads-testing/troisdorf/multi/incoming/stable
+        - rm -rf /srv/fwuploads-testing/troisdorf/multi/stable/
+        - mkdir /srv/fwuploads-testing/troisdorf/multi/stable/
+        - mv /srv/fwuploads-testing/troisdorf/multi/incoming/stable/* /srv/fwuploads-testing/troisdorf/multi/stable/
+
+depends_on:
+  - build

.woodpecker/prepare.yml

@@ -0,0 +1,18 @@
+---
+platform: linux/arm64
+
+skip_clone: true
+
+pipeline:
+  prepare:
+    image: appleboy/drone-ssh
+    settings:
+      host: 46.4.138.183
+      username: fwupload
+      key:
+        from_secret: ssh-key
+      port: 22
+      command_timeout: 120m
+      script:
+        - rm -rf /srv/fwuploads-testing/troisdorf/multi/incoming/stable
+        - mkdir -p /srv/fwuploads-testing/troisdorf/multi/incoming/stable

gluon

@@ -1 +1 @@
-Subproject commit 90d0e33c619cef9e0af928ef4d6477f6c1bdc0de
+Subproject commit 1c76fcb58b83f5cda02d92b4658df8ccc9687a94

site

@@ -1 +1 @@
-Subproject commit 474b437a3f9235aa89f092e6b771eb13f8d48e3f
+Subproject commit a1bba934878d2317abd3219620a244dd328edca5