fix: re-enable sxctl

This commit is contained in:
Lance R. Vick 2024-02-13 11:20:11 -08:00
parent b16ebee13c
commit 6bf477f38e
No known key found for this signature in database
GPG key ID: 8E47A1EC35A1551D
2 changed files with 289 additions and 281 deletions

View file

@ -49,13 +49,12 @@ digests.txt: all
out/graph.svg: Makefile
$(MAKE) -Bnd | make2graph | dot -Tsvg -o graph.svg
# Commented out until sxctl supports new folder layout
#src/packages.mk: out/sxctl/index.json $(shell find packages/*/Containerfile | tr '\n' ' ')
# env -C out/sxctl tar -cf - . | docker load
# docker run \
# --rm \
# --volume .:/src \
# --user $(shell id -u):$(shell id -g) \
# stagex/sxctl -baseDir=/src gen make
# touch $@
#
src/packages.mk: out/sxctl/index.json $(shell find packages/*/Containerfile | tr '\n' ' ')
env -C out/sxctl tar -cf - . | docker load
docker run \
--rm \
--volume .:/src \
--user $(shell id -u):$(shell id -g) \
stagex/sxctl -baseDir=/src gen make
touch $@

View file

@ -1,31 +1,4 @@
.PHONY: stage0
stage0: out/stage0/index.json
out/stage0/index.json: \
packages/stage0/Containerfile
$(call build,stage0)
.PHONY: stage1
stage1: out/stage1/index.json
out/stage1/index.json: \
packages/stage1/Containerfile \
out/stage0/index.json
$(call build,stage1)
.PHONY: stage2
stage2: out/stage2/index.json
out/stage2/index.json: \
packages/stage2/Containerfile \
out/stage1/index.json
$(call build,stage2)
.PHONY: stage3
stage3: out/stage3/index.json
out/stage3/index.json: \
packages/stage3/Containerfile \
out/stage2/index.json
$(call build,stage3)
.PHONY: argp-standalone
argp-standalone: out/argp-standalone/index.json
out/argp-standalone/index.json: \
@ -108,6 +81,12 @@ out/busybox/index.json: \
out/stage3/index.json
$(call build,busybox)
.PHONY: ca-certificates
ca-certificates: out/ca-certificates/index.json
out/ca-certificates/index.json: \
packages/ca-certificates/Containerfile
$(call build,ca-certificates)
.PHONY: cmake
cmake: out/cmake/index.json
out/cmake/index.json: \
@ -123,6 +102,39 @@ out/cmake/index.json: \
out/zlib/index.json
$(call build,cmake)
.PHONY: cpio
cpio: out/cpio/index.json
out/cpio/index.json: \
packages/cpio/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/make/index.json \
out/musl/index.json
$(call build,cpio)
.PHONY: curl
curl: out/curl/index.json
out/curl/index.json: \
packages/curl/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/make/index.json \
out/musl/index.json \
out/openssl/index.json
$(call build,curl)
.PHONY: eif_build
eif_build: out/eif_build/index.json
out/eif_build/index.json: \
packages/eif_build/Containerfile \
out/busybox/index.json \
out/libunwind/index.json \
out/musl/index.json \
out/rust/index.json
$(call build,eif_build)
.PHONY: elfutils
elfutils: out/elfutils/index.json
out/elfutils/index.json: \
@ -176,6 +188,16 @@ out/gcc/index.json: \
out/stage3/index.json
$(call build,gcc)
.PHONY: gen_initramfs
gen_initramfs: out/gen_initramfs/index.json
out/gen_initramfs/index.json: \
packages/gen_initramfs/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/musl/index.json
$(call build,gen_initramfs)
.PHONY: gettext
gettext: out/gettext/index.json
out/gettext/index.json: \
@ -188,15 +210,19 @@ out/gettext/index.json: \
out/musl/index.json
$(call build,gettext)
.PHONY: grub
grub: out/grub/index.json
out/grub/index.json: \
packages/grub/Containerfile \
.PHONY: git
git: out/git/index.json
out/git/index.json: \
packages/git/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/musl/index.json
$(call build,grub)
out/gettext/index.json \
out/make/index.json \
out/musl/index.json \
out/perl/index.json \
out/zlib/index.json
$(call build,git)
.PHONY: go
go: out/go/index.json
@ -209,6 +235,89 @@ out/go/index.json: \
out/musl/index.json
$(call build,go)
.PHONY: gpg
gpg: out/gpg/index.json
out/gpg/index.json: \
packages/gpg/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/libassuan/index.json \
out/libgcrypt/index.json \
out/libgpg-error/index.json \
out/libksba/index.json \
out/make/index.json \
out/musl/index.json \
out/npth/index.json \
out/zlib/index.json
$(call build,gpg)
.PHONY: grub
grub: out/grub/index.json
out/grub/index.json: \
packages/grub/Containerfile \
out/binutils/index.json \
out/bison/index.json \
out/busybox/index.json \
out/flex/index.json \
out/gcc/index.json \
out/linux-headers/index.json \
out/m4/index.json \
out/make/index.json \
out/musl/index.json \
out/python/index.json
$(call build,grub)
.PHONY: libassuan
libassuan: out/libassuan/index.json
out/libassuan/index.json: \
packages/libassuan/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/libgpg-error/index.json \
out/make/index.json \
out/musl/index.json
$(call build,libassuan)
.PHONY: libgcrypt
libgcrypt: out/libgcrypt/index.json
out/libgcrypt/index.json: \
packages/libgcrypt/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/libgpg-error/index.json \
out/make/index.json \
out/musl/index.json
$(call build,libgcrypt)
.PHONY: libgpg-error
libgpg-error: out/libgpg-error/index.json
out/libgpg-error/index.json: \
packages/libgpg-error/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/make/index.json \
out/musl/index.json \
out/npth/index.json
$(call build,libgpg-error)
.PHONY: libksba
libksba: out/libksba/index.json
out/libksba/index.json: \
packages/libksba/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/libgpg-error/index.json \
out/make/index.json \
out/musl/index.json \
out/npth/index.json \
out/zlib/index.json
$(call build,libksba)
.PHONY: libtool
libtool: out/libtool/index.json
out/libtool/index.json: \
@ -235,6 +344,25 @@ out/libunwind/index.json: \
out/musl/index.json
$(call build,libunwind)
.PHONY: libxml2
libxml2: out/libxml2/index.json
out/libxml2/index.json: \
packages/libxml2/Containerfile \
out/autoconf/index.json \
out/automake/index.json \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/libtool/index.json \
out/m4/index.json \
out/make/index.json \
out/musl/index.json \
out/perl/index.json \
out/pkgconf/index.json \
out/python/index.json \
out/zlib/index.json
$(call build,libxml2)
.PHONY: libzstd
libzstd: out/libzstd/index.json
out/libzstd/index.json: \
@ -250,6 +378,27 @@ out/libzstd/index.json: \
out/zlib/index.json
$(call build,libzstd)
.PHONY: linux-generic
linux-generic: out/linux-generic/index.json
out/linux-generic/index.json: \
packages/linux-generic/Containerfile \
out/binutils/index.json \
out/bison/index.json \
out/busybox/index.json \
out/elfutils/index.json \
out/flex/index.json \
out/gcc/index.json \
out/libzstd/index.json \
out/linux-headers/index.json \
out/m4/index.json \
out/make/index.json \
out/musl/index.json \
out/openssl/index.json \
out/perl/index.json \
out/pkgconf/index.json \
out/zlib/index.json
$(call build,linux-generic)
.PHONY: linux-headers
linux-headers: out/linux-headers/index.json
out/linux-headers/index.json: \
@ -257,6 +406,27 @@ out/linux-headers/index.json: \
out/stage3/index.json
$(call build,linux-headers)
.PHONY: linux-nitro
linux-nitro: out/linux-nitro/index.json
out/linux-nitro/index.json: \
packages/linux-nitro/Containerfile \
out/binutils/index.json \
out/bison/index.json \
out/busybox/index.json \
out/elfutils/index.json \
out/flex/index.json \
out/gcc/index.json \
out/libzstd/index.json \
out/linux-headers/index.json \
out/m4/index.json \
out/make/index.json \
out/musl/index.json \
out/openssl/index.json \
out/perl/index.json \
out/pkgconf/index.json \
out/zlib/index.json
$(call build,linux-nitro)
.PHONY: llvm
llvm: out/llvm/index.json
out/llvm/index.json: \
@ -372,6 +542,18 @@ out/ninja/index.json: \
out/python/index.json
$(call build,ninja)
.PHONY: npth
npth: out/npth/index.json
out/npth/index.json: \
packages/npth/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/make/index.json \
out/musl/index.json \
out/zlib/index.json
$(call build,npth)
.PHONY: openssl
openssl: out/openssl/index.json
out/openssl/index.json: \
@ -385,6 +567,20 @@ out/openssl/index.json: \
out/perl/index.json
$(call build,openssl)
.PHONY: pcsc-lite
pcsc-lite: out/pcsc-lite/index.json
out/pcsc-lite/index.json: \
packages/pcsc-lite/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/flex/index.json \
out/gcc/index.json \
out/m4/index.json \
out/make/index.json \
out/musl/index.json \
out/perl/index.json
$(call build,pcsc-lite)
.PHONY: perl
perl: out/perl/index.json
out/perl/index.json: \
@ -463,16 +659,58 @@ out/sed/index.json: \
out/musl/index.json
$(call build,sed)
.PHONY: pcsc-lite
pcsc-lite: out/pcsc-lite/index.json
out/pcsc-lite/index.json: \
packages/pcsc-lite/Containerfile \
out/binutils/index.json \
.PHONY: sops
sops: out/sops/index.json
out/sops/index.json: \
packages/sops/Containerfile \
out/busybox/index.json \
out/gcc/index.json \
out/make/index.json \
out/musl/index.json
$(call build,pcsc-lite)
out/ca-certificates/index.json \
out/go/index.json
$(call build,sops)
.PHONY: stage0
stage0: out/stage0/index.json
out/stage0/index.json: \
packages/stage0/Containerfile
$(call build,stage0)
.PHONY: stage1
stage1: out/stage1/index.json
out/stage1/index.json: \
packages/stage1/Containerfile \
out/stage0/index.json
$(call build,stage1)
.PHONY: stage2
stage2: out/stage2/index.json
out/stage2/index.json: \
packages/stage2/Containerfile \
out/stage1/index.json
$(call build,stage2)
.PHONY: stage3
stage3: out/stage3/index.json
out/stage3/index.json: \
packages/stage3/Containerfile \
out/stage2/index.json
$(call build,stage3)
.PHONY: sxctl
sxctl: out/sxctl/index.json
out/sxctl/index.json: \
packages/sxctl/Containerfile \
out/busybox/index.json \
out/go/index.json
$(call build,sxctl)
.PHONY: tofu
tofu: out/tofu/index.json
out/tofu/index.json: \
packages/tofu/Containerfile \
out/busybox/index.json \
out/ca-certificates/index.json \
out/go/index.json
$(call build,tofu)
.PHONY: xorriso
xorriso: out/xorriso/index.json
@ -497,232 +735,3 @@ out/zlib/index.json: \
out/musl/index.json
$(call build,zlib)
.PHONY: linux-generic
linux-generic: out/linux-generic/index.json
out/linux-generic/index.json: \
packages/linux-generic/Containerfile \
out/binutils/index.json \
out/bison/index.json \
out/busybox/index.json \
out/elfutils/index.json \
out/flex/index.json \
out/gcc/index.json \
out/libzstd/index.json \
out/linux-headers/index.json \
out/m4/index.json \
out/make/index.json \
out/musl/index.json \
out/openssl/index.json \
out/perl/index.json \
out/pkgconf/index.json \
out/zlib/index.json
$(call build,linux-generic)
.PHONY: linux-nitro
linux-nitro: out/linux-nitro/index.json
out/linux-nitro/index.json: \
packages/linux-nitro/Containerfile \
out/binutils/index.json \
out/bison/index.json \
out/busybox/index.json \
out/elfutils/index.json \
out/flex/index.json \
out/gcc/index.json \
out/libzstd/index.json \
out/linux-headers/index.json \
out/m4/index.json \
out/make/index.json \
out/musl/index.json \
out/openssl/index.json \
out/perl/index.json \
out/pkgconf/index.json \
out/zlib/index.json
$(call build,linux-nitro)
.PHONY: ca-certificates
ca-certificates: out/ca-certificates/index.json
out/ca-certificates/index.json: \
packages/ca-certificates/Containerfile
$(call build,ca-certificates)
.PHONY: libassuan
libassuan: out/libassuan/index.json
out/libassuan/index.json: \
packages/libassuan/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/libgpg-error/index.json \
out/make/index.json \
out/musl/index.json
$(call build,libassuan)
.PHONY: libgcrypt
libgcrypt: out/libgcrypt/index.json
out/libgcrypt/index.json: \
packages/libgcrypt/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/libgpg-error/index.json \
out/make/index.json \
out/musl/index.json
$(call build,libgcrypt)
.PHONY: libgpg-error
libgpg-error: out/libgpg-error/index.json
out/libgpg-error/index.json: \
packages/libgpg-error/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/make/index.json \
out/musl/index.json \
out/npth/index.json
$(call build,libgpg-error)
.PHONY: libksba
libksba: out/libksba/index.json
out/libksba/index.json: \
packages/libksba/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/libgpg-error/index.json \
out/make/index.json \
out/musl/index.json \
out/npth/index.json \
out/zlib/index.json
$(call build,libksba)
.PHONY: libxml2
libxml2: out/libxml2/index.json
out/libxml2/index.json: \
packages/libxml2/Containerfile \
out/autoconf/index.json \
out/automake/index.json \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/libtool/index.json \
out/m4/index.json \
out/make/index.json \
out/musl/index.json \
out/perl/index.json \
out/pkgconf/index.json \
out/python/index.json \
out/zlib/index.json
$(call build,libxml2)
.PHONY: npth
npth: out/npth/index.json
out/npth/index.json: \
packages/npth/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/make/index.json \
out/musl/index.json \
out/zlib/index.json
$(call build,npth)
.PHONY: cpio
cpio: out/cpio/index.json
out/cpio/index.json: \
packages/cpio/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/make/index.json \
out/musl/index.json
$(call build,cpio)
.PHONY: curl
curl: out/curl/index.json
out/curl/index.json: \
packages/curl/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/make/index.json \
out/musl/index.json \
out/openssl/index.json
$(call build,curl)
.PHONY: eif_build
eif_build: out/eif_build/index.json
out/eif_build/index.json: \
packages/eif_build/Containerfile \
out/busybox/index.json \
out/libunwind/index.json \
out/musl/index.json \
out/rust/index.json
$(call build,eif_build)
.PHONY: gen_initramfs
gen_initramfs: out/gen_initramfs/index.json
out/gen_initramfs/index.json: \
packages/gen_initramfs/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/musl/index.json
$(call build,gen_initramfs)
.PHONY: git
git: out/git/index.json
out/git/index.json: \
packages/git/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/gettext/index.json \
out/make/index.json \
out/musl/index.json \
out/perl/index.json \
out/zlib/index.json
$(call build,git)
.PHONY: gpg
gpg: out/gpg/index.json
out/gpg/index.json: \
packages/gpg/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/gcc/index.json \
out/libassuan/index.json \
out/libgcrypt/index.json \
out/libgpg-error/index.json \
out/libksba/index.json \
out/make/index.json \
out/musl/index.json \
out/npth/index.json \
out/zlib/index.json
$(call build,gpg)
.PHONY: sops
sops: out/sops/index.json
out/sops/index.json: \
packages/sops/Containerfile \
out/busybox/index.json \
out/ca-certificates/index.json \
out/go/index.json
$(call build,sops)
.PHONY: sxctl
sxctl: out/sxctl/index.json
out/sxctl/index.json: \
packages/sxctl/Containerfile \
out/busybox/index.json \
out/go/index.json
$(call build,sxctl)
.PHONY: tofu
tofu: out/tofu/index.json
out/tofu/index.json: \
packages/tofu/Containerfile \
out/busybox/index.json \
out/ca-certificates/index.json \
out/go/index.json
$(call build,tofu)