From 43f7ebcbb2da0bc3d8e4c47eb223e58e2cbb752d Mon Sep 17 00:00:00 2001 From: "Suren A. Chilingaryan" Date: Wed, 23 Oct 2019 23:55:01 +0200 Subject: Support dice on non-suse systems --- kiwi/.gitignore | 2 ++ kiwi/Makefile | 38 +++++++++++++++++++++++++++-------- kiwi/adei/config.xml.69 | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 8 deletions(-) create mode 100644 kiwi/.gitignore create mode 100644 kiwi/adei/config.xml.69 diff --git a/kiwi/.gitignore b/kiwi/.gitignore new file mode 100644 index 0000000..fe78a6c --- /dev/null +++ b/kiwi/.gitignore @@ -0,0 +1,2 @@ +.dice +build/ 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 diff --git a/kiwi/adei/config.xml.69 b/kiwi/adei/config.xml.69 new file mode 100644 index 0000000..a5f725c --- /dev/null +++ b/kiwi/adei/config.xml.69 @@ -0,0 +1,53 @@ + + + + + Suren A. Chilingaryan + csa@suren.me + Minimal ADEI container + + + + + + 0.10.1 + zypper + false + true + en_US + us.map.gz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3