gitlabci: run Turris build in CI

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aae60b941b9169efacdf261d897ff0d9079360df..77e880cda02ad7df5f4c23fabbc5291928e0b3f0 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,12 +42,34 @@ stages:
 build:linux:amd64:
   <<: *build
 
-
 build:asan:linux:amd64:
   <<: *build
   variables:
     CFLAGS: -ggdb3 -O0 -fsanitize=address -fno-omit-frame-pointer
 
+build:turris:omnia:
+  image: $CI_REGISTRY/knot/knot-resolver/ci/turris:omnia
+  stage: build
+  except:
+    - master
+  script:
+    - ./scripts/make-archive.sh
+    - cp knot-resolver*.tar.xz /tmp/turris/dl/
+    - ./scripts/make-distrofiles.sh
+    - cp -r distro/turris /tmp/turris/package/knot-resolver
+    - pushd /tmp/turris
+    - export PATH=$PATH:$PWD/staging_dir/toolchain-*/bin
+    - USE_CCACHE=n make CC=arm-openwrt-linux-gcc CXX=arm-openwrt-linux-g++ LD=arm-openwrt-linux-ld -C $PWD V=s
+    - popd
+    - cp /tmp/turris/bin/mvebu-musl/packages/base/*.ipk ./
+  artifacts:
+    paths:
+      - "*.ipk"
+  tags:
+    - docker
+    - linux
+    - amd64
+
 lint:pedantic:
   stage: test  # could be in build already, but let's not block the test stage if this fails
   dependencies: []  # do not download build artifacts

diff --git a/distro/turris/Makefile b/distro/turris/Makefile
index c6f9888df8339227756602a0b9ebc4dfec96fe7d..57f08ed6bef3c9d56f78ec2c33f1042e0955e6bb 100644 (file)
--- a/distro/turris/Makefile
+++ b/distro/turris/Makefile
@@ -15,7 +15,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Knot DNS <knot-dns@labs.nic.cz>
 PKG_LICENSE:=GPL-3.0