diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2019-10-23 23:55:01 +0200 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2019-10-23 23:55:01 +0200 |
| commit | 43f7ebcbb2da0bc3d8e4c47eb223e58e2cbb752d (patch) | |
| tree | 411c6b1ccfb03c9ee205b1b7cd3b661f1d912844 /kiwi/Makefile | |
| parent | 1c3a5b60c8dcaa3b941d539d4323e5cd43585a85 (diff) | |
| download | adei-43f7ebcbb2da0bc3d8e4c47eb223e58e2cbb752d.tar.gz adei-43f7ebcbb2da0bc3d8e4c47eb223e58e2cbb752d.tar.bz2 adei-43f7ebcbb2da0bc3d8e4c47eb223e58e2cbb752d.tar.xz adei-43f7ebcbb2da0bc3d8e4c47eb223e58e2cbb752d.zip | |
Diffstat (limited to 'kiwi/Makefile')
| -rw-r--r-- | kiwi/Makefile | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/kiwi/Makefile b/kiwi/Makefile index f8f7497..c83d56a 100644 --- a/kiwi/Makefile +++ b/kiwi/Makefile @@ -1,19 +1,41 @@ -all: build/microadei.x86_64-0.10.1.docker.tar.xz +version := 0.10.1 +kiwi := "kiwi-ng" +dice := "dice" +suse := $(shell sh -c '[ -f /etc/SUSE-brand ] && echo "suse"') + +ifeq ($(suse), "suse") + image := "microadei.x86_64-$(version).docker.tar.xz" +else + image := "microadei.x86_64-$(version)-DiceBuild.docker.tar.xz" +endif + +.PHONY: import push clean run + +all: build/$(image) install: push -build/microadei.x86_64-0.10.1.docker.tar.xz: adei/config.xml adei/config.sh - rm -rf build/* - kiwi --type docker system build --description adei/ --target-dir ./build/ - du -sm build/build +build/$(image): adei/config.xml adei/config.sh + mkdir -p build ;\ + rm -rf build/* ;\ + if [ "$(suse)" = "suse" ]; then \ + $(kiwi) --type docker system build --description adei/ --target-dir ./build/ ;\ + du -sm build/build ;\ + else \ + $(dice) build adei ;\ + tar xf adei/.dice/build_results.tar -C build/ ;\ + fi -import: build/microadei.x86_64-0.10.1.docker.tar.xz - docker load < build/microadei.x86_64-0.10.1.docker.tar.xz +import: build/$(image) + docker load < build/$(image) push: import docker push chsa/microadei:latest clean: - rm -rf build/* + rm -rf build/* adei/.dice + +#check: adei/config.xml +# jing /usr/lib64/python3*/site-packages/kiwi/schema/kiwi.rng adei/config.xml run: docker run -it chsa/microadei:latest /bin/bash |