From b1e258e400438c09e067cee764a06405071cd4e6 Mon Sep 17 00:00:00 2001 From: Alexander M Pickering Date: Mon, 22 Jul 2024 16:40:28 -0500 Subject: Correct meta.lua --- image-clang32.yaml | 35 ++++++++++------------------------- init | 2 +- meta.lua | 2 +- 3 files changed, 12 insertions(+), 27 deletions(-) diff --git a/image-clang32.yaml b/image-clang32.yaml index 6558784..407f162 100644 --- a/image-clang32.yaml +++ b/image-clang32.yaml @@ -1,11 +1,12 @@ image: distribution: alpinelinux description: Build image for lua4.win - architecture: i386 + architecture: x86 + release: edge source: downloader: alpinelinux-http - same_as: 3.12 + same_as: 3.20 url: http://dl-cdn.alpinelinux.org/alpine files: @@ -15,22 +16,12 @@ files: - path: /etc/hosts generator: hosts -- path: /etc/machine-id - generator: dump - -- path: /etc/user/profile - generator: copy - source: /etc/profile - -- path: /etc/netplan/10-lxc.yaml +- path: /etc/network/interfaces generator: dump content: |- - network: - version: 2 - ethernets: - eth0: - dhcp4: true - dhcp-identifier: mac + auth eth0 + iface eth0 inet dhcp + hostname $(hostname) packages: manager: apk @@ -38,23 +29,17 @@ packages: cleanup: true sets: - packages: - - gcc - alpine-base - - neovim + - clang18 + - clang18-dev action: install actions: -- trigger: post-update - action: |- - #!/bin/sh - set -eux - systemctl enable systemd-networkd - trigger: post-packages action: |- #!/bin/sh set -eux - locale-gen en_US.UTF-8 - update-locale LANG=en_US.UTF-8 + rm -f /var/cache/apk/* mappings: architecture_map: diff --git a/init b/init index 242fe06..9e42dcc 100755 --- a/init +++ b/init @@ -1,6 +1,6 @@ #!/bin/bash -ex apt update apt install -yqq distrobuilder -distrobuilder build-incus image-clang32.yaml +distrobuilder build-incus image-clang32/image-clang32.yaml echo "Hello, world!" > hello.txt diff --git a/meta.lua b/meta.lua index ff0bbb5..28e3bfd 100644 --- a/meta.lua +++ b/meta.lua @@ -3,6 +3,6 @@ return { image = "images:debian/trixie", name = "image-clang32", requires = {}, - produces = {"hello.txt", "incus.tar.xz","rootfs.squashfs"}, + produces = {"incus.tar.xz","rootfs.squashfs"}, } } -- cgit v1.2.3-55-g6feb