From 29e5de9225f6682c22397f49146b4f1f1979dd7f Mon Sep 17 00:00:00 2001 From: "Lance R. Vick" Date: Tue, 13 Feb 2024 08:16:03 -0800 Subject: [PATCH] cleanup: move all packages to packages --- .../argp-standalone/Containerfile | 0 {src/core => packages}/autoconf/Containerfile | 0 {src/core => packages}/automake/Containerfile | 0 {src/core => packages}/bash/Containerfile | 0 {src/core => packages}/binutils/Containerfile | 0 {src/core => packages}/bison/Containerfile | 0 {src/core => packages}/busybox/Containerfile | 0 .../ca-certificates/Containerfile | 0 .../ca-certificates/cacert.pem | 0 {src/core => packages}/cmake/Containerfile | 0 {src/tools => packages}/cpio/Containerfile | 0 {src/tools => packages}/curl/Containerfile | 0 {src/tools => packages}/eif_build/Cargo.lock | 0 {src/tools => packages}/eif_build/Cargo.toml | 0 .../eif_build/Containerfile | 0 {src/core => packages}/elfutils/Containerfile | 0 .../elfutils/musl-macros.patch | 0 {src/core => packages}/flex/Containerfile | 0 {src/core => packages}/gcc/Containerfile | 0 .../gen_initramfs/Containerfile | 0 {src/core => packages}/gettext/Containerfile | 0 {src/tools => packages}/git/Containerfile | 0 {src/core => packages}/go/Containerfile | 0 {src/tools => packages}/gpg/Containerfile | 0 .../libs => packages}/libassuan/Containerfile | 0 .../libs => packages}/libgcrypt/Containerfile | 0 .../libgpg-error/Containerfile | 0 {src/libs => packages}/libksba/Containerfile | 0 {src/core => packages}/libtool/Containerfile | 0 .../core => packages}/libunwind/Containerfile | 0 {src/libs => packages}/libxml2/Containerfile | 0 {src/core => packages}/libzstd/Containerfile | 0 .../linux-generic/Containerfile | 0 .../linux-headers/Containerfile | 0 .../linux-nitro/Containerfile | 0 .../linux-nitro/linux.config | 0 {src/core => packages}/llvm/Containerfile | 0 {src/core => packages}/llvm13/Containerfile | 0 {src/core => packages}/m4/Containerfile | 0 {src/core => packages}/make/Containerfile | 0 {src/core => packages}/meson/Containerfile | 0 {src/core => packages}/musl-fts/Containerfile | 0 .../musl-obstack/Containerfile | 0 {src/core => packages}/musl/Containerfile | 0 {src/core => packages}/musl/lfs64-2.patch | 0 {src/core => packages}/musl/lfs64.patch | 0 .../musl/relr-typedefs.patch | 0 {src/core => packages}/ninja/Containerfile | 0 {src/core => packages}/ninja/fix-musl.patch | 0 {src/libs => packages}/npth/Containerfile | 0 {src/core => packages}/openssl/Containerfile | 0 {src/core => packages}/perl/Containerfile | 0 {src/core => packages}/pkgconf/Containerfile | 0 .../py-setuptools/Containerfile | 0 {src/core => packages}/python/Containerfile | 0 {src/core => packages}/rust/Containerfile | 0 {src/core => packages}/sed/Containerfile | 0 {src/tools => packages}/sops/Containerfile | 0 .../stage0/Containerfile | 0 .../stage1/Containerfile | 0 .../stage2/Containerfile | 0 .../stage3/Containerfile | 0 {src/tools => packages}/sxctl/Containerfile | 0 {src/tools => packages}/tofu/Containerfile | 0 {src/core => packages}/xorriso/Containerfile | 0 {src/core => packages}/zlib/Containerfile | 0 src/context.sh | 8 +- src/macros.mk | 15 +- src/packages.mk | 228 +++++++++--------- 69 files changed, 123 insertions(+), 128 deletions(-) rename {src/core => packages}/argp-standalone/Containerfile (100%) rename {src/core => packages}/autoconf/Containerfile (100%) rename {src/core => packages}/automake/Containerfile (100%) rename {src/core => packages}/bash/Containerfile (100%) rename {src/core => packages}/binutils/Containerfile (100%) rename {src/core => packages}/bison/Containerfile (100%) rename {src/core => packages}/busybox/Containerfile (100%) rename {src/libs => packages}/ca-certificates/Containerfile (100%) rename {src/libs => packages}/ca-certificates/cacert.pem (100%) rename {src/core => packages}/cmake/Containerfile (100%) rename {src/tools => packages}/cpio/Containerfile (100%) rename {src/tools => packages}/curl/Containerfile (100%) rename {src/tools => packages}/eif_build/Cargo.lock (100%) rename {src/tools => packages}/eif_build/Cargo.toml (100%) rename {src/tools => packages}/eif_build/Containerfile (100%) rename {src/core => packages}/elfutils/Containerfile (100%) rename {src/core => packages}/elfutils/musl-macros.patch (100%) rename {src/core => packages}/flex/Containerfile (100%) rename {src/core => packages}/gcc/Containerfile (100%) rename {src/tools => packages}/gen_initramfs/Containerfile (100%) rename {src/core => packages}/gettext/Containerfile (100%) rename {src/tools => packages}/git/Containerfile (100%) rename {src/core => packages}/go/Containerfile (100%) rename {src/tools => packages}/gpg/Containerfile (100%) rename {src/libs => packages}/libassuan/Containerfile (100%) rename {src/libs => packages}/libgcrypt/Containerfile (100%) rename {src/libs => packages}/libgpg-error/Containerfile (100%) rename {src/libs => packages}/libksba/Containerfile (100%) rename {src/core => packages}/libtool/Containerfile (100%) rename {src/core => packages}/libunwind/Containerfile (100%) rename {src/libs => packages}/libxml2/Containerfile (100%) rename {src/core => packages}/libzstd/Containerfile (100%) rename {src/kernel => packages}/linux-generic/Containerfile (100%) rename {src/core => packages}/linux-headers/Containerfile (100%) rename {src/kernel => packages}/linux-nitro/Containerfile (100%) rename {src/kernel => packages}/linux-nitro/linux.config (100%) rename {src/core => packages}/llvm/Containerfile (100%) rename {src/core => packages}/llvm13/Containerfile (100%) rename {src/core => packages}/m4/Containerfile (100%) rename {src/core => packages}/make/Containerfile (100%) rename {src/core => packages}/meson/Containerfile (100%) rename {src/core => packages}/musl-fts/Containerfile (100%) rename {src/core => packages}/musl-obstack/Containerfile (100%) rename {src/core => packages}/musl/Containerfile (100%) rename {src/core => packages}/musl/lfs64-2.patch (100%) rename {src/core => packages}/musl/lfs64.patch (100%) rename {src/core => packages}/musl/relr-typedefs.patch (100%) rename {src/core => packages}/ninja/Containerfile (100%) rename {src/core => packages}/ninja/fix-musl.patch (100%) rename {src/libs => packages}/npth/Containerfile (100%) rename {src/core => packages}/openssl/Containerfile (100%) rename {src/core => packages}/perl/Containerfile (100%) rename {src/core => packages}/pkgconf/Containerfile (100%) rename {src/core => packages}/py-setuptools/Containerfile (100%) rename {src/core => packages}/python/Containerfile (100%) rename {src/core => packages}/rust/Containerfile (100%) rename {src/core => packages}/sed/Containerfile (100%) rename {src/tools => packages}/sops/Containerfile (100%) rename {src/bootstrap => packages}/stage0/Containerfile (100%) rename {src/bootstrap => packages}/stage1/Containerfile (100%) rename {src/bootstrap => packages}/stage2/Containerfile (100%) rename {src/bootstrap => packages}/stage3/Containerfile (100%) rename {src/tools => packages}/sxctl/Containerfile (100%) rename {src/tools => packages}/tofu/Containerfile (100%) rename {src/core => packages}/xorriso/Containerfile (100%) rename {src/core => packages}/zlib/Containerfile (100%) diff --git a/src/core/argp-standalone/Containerfile b/packages/argp-standalone/Containerfile similarity index 100% rename from src/core/argp-standalone/Containerfile rename to packages/argp-standalone/Containerfile diff --git a/src/core/autoconf/Containerfile b/packages/autoconf/Containerfile similarity index 100% rename from src/core/autoconf/Containerfile rename to packages/autoconf/Containerfile diff --git a/src/core/automake/Containerfile b/packages/automake/Containerfile similarity index 100% rename from src/core/automake/Containerfile rename to packages/automake/Containerfile diff --git a/src/core/bash/Containerfile b/packages/bash/Containerfile similarity index 100% rename from src/core/bash/Containerfile rename to packages/bash/Containerfile diff --git a/src/core/binutils/Containerfile b/packages/binutils/Containerfile similarity index 100% rename from src/core/binutils/Containerfile rename to packages/binutils/Containerfile diff --git a/src/core/bison/Containerfile b/packages/bison/Containerfile similarity index 100% rename from src/core/bison/Containerfile rename to packages/bison/Containerfile diff --git a/src/core/busybox/Containerfile b/packages/busybox/Containerfile similarity index 100% rename from src/core/busybox/Containerfile rename to packages/busybox/Containerfile diff --git a/src/libs/ca-certificates/Containerfile b/packages/ca-certificates/Containerfile similarity index 100% rename from src/libs/ca-certificates/Containerfile rename to packages/ca-certificates/Containerfile diff --git a/src/libs/ca-certificates/cacert.pem b/packages/ca-certificates/cacert.pem similarity index 100% rename from src/libs/ca-certificates/cacert.pem rename to packages/ca-certificates/cacert.pem diff --git a/src/core/cmake/Containerfile b/packages/cmake/Containerfile similarity index 100% rename from src/core/cmake/Containerfile rename to packages/cmake/Containerfile diff --git a/src/tools/cpio/Containerfile b/packages/cpio/Containerfile similarity index 100% rename from src/tools/cpio/Containerfile rename to packages/cpio/Containerfile diff --git a/src/tools/curl/Containerfile b/packages/curl/Containerfile similarity index 100% rename from src/tools/curl/Containerfile rename to packages/curl/Containerfile diff --git a/src/tools/eif_build/Cargo.lock b/packages/eif_build/Cargo.lock similarity index 100% rename from src/tools/eif_build/Cargo.lock rename to packages/eif_build/Cargo.lock diff --git a/src/tools/eif_build/Cargo.toml b/packages/eif_build/Cargo.toml similarity index 100% rename from src/tools/eif_build/Cargo.toml rename to packages/eif_build/Cargo.toml diff --git a/src/tools/eif_build/Containerfile b/packages/eif_build/Containerfile similarity index 100% rename from src/tools/eif_build/Containerfile rename to packages/eif_build/Containerfile diff --git a/src/core/elfutils/Containerfile b/packages/elfutils/Containerfile similarity index 100% rename from src/core/elfutils/Containerfile rename to packages/elfutils/Containerfile diff --git a/src/core/elfutils/musl-macros.patch b/packages/elfutils/musl-macros.patch similarity index 100% rename from src/core/elfutils/musl-macros.patch rename to packages/elfutils/musl-macros.patch diff --git a/src/core/flex/Containerfile b/packages/flex/Containerfile similarity index 100% rename from src/core/flex/Containerfile rename to packages/flex/Containerfile diff --git a/src/core/gcc/Containerfile b/packages/gcc/Containerfile similarity index 100% rename from src/core/gcc/Containerfile rename to packages/gcc/Containerfile diff --git a/src/tools/gen_initramfs/Containerfile b/packages/gen_initramfs/Containerfile similarity index 100% rename from src/tools/gen_initramfs/Containerfile rename to packages/gen_initramfs/Containerfile diff --git a/src/core/gettext/Containerfile b/packages/gettext/Containerfile similarity index 100% rename from src/core/gettext/Containerfile rename to packages/gettext/Containerfile diff --git a/src/tools/git/Containerfile b/packages/git/Containerfile similarity index 100% rename from src/tools/git/Containerfile rename to packages/git/Containerfile diff --git a/src/core/go/Containerfile b/packages/go/Containerfile similarity index 100% rename from src/core/go/Containerfile rename to packages/go/Containerfile diff --git a/src/tools/gpg/Containerfile b/packages/gpg/Containerfile similarity index 100% rename from src/tools/gpg/Containerfile rename to packages/gpg/Containerfile diff --git a/src/libs/libassuan/Containerfile b/packages/libassuan/Containerfile similarity index 100% rename from src/libs/libassuan/Containerfile rename to packages/libassuan/Containerfile diff --git a/src/libs/libgcrypt/Containerfile b/packages/libgcrypt/Containerfile similarity index 100% rename from src/libs/libgcrypt/Containerfile rename to packages/libgcrypt/Containerfile diff --git a/src/libs/libgpg-error/Containerfile b/packages/libgpg-error/Containerfile similarity index 100% rename from src/libs/libgpg-error/Containerfile rename to packages/libgpg-error/Containerfile diff --git a/src/libs/libksba/Containerfile b/packages/libksba/Containerfile similarity index 100% rename from src/libs/libksba/Containerfile rename to packages/libksba/Containerfile diff --git a/src/core/libtool/Containerfile b/packages/libtool/Containerfile similarity index 100% rename from src/core/libtool/Containerfile rename to packages/libtool/Containerfile diff --git a/src/core/libunwind/Containerfile b/packages/libunwind/Containerfile similarity index 100% rename from src/core/libunwind/Containerfile rename to packages/libunwind/Containerfile diff --git a/src/libs/libxml2/Containerfile b/packages/libxml2/Containerfile similarity index 100% rename from src/libs/libxml2/Containerfile rename to packages/libxml2/Containerfile diff --git a/src/core/libzstd/Containerfile b/packages/libzstd/Containerfile similarity index 100% rename from src/core/libzstd/Containerfile rename to packages/libzstd/Containerfile diff --git a/src/kernel/linux-generic/Containerfile b/packages/linux-generic/Containerfile similarity index 100% rename from src/kernel/linux-generic/Containerfile rename to packages/linux-generic/Containerfile diff --git a/src/core/linux-headers/Containerfile b/packages/linux-headers/Containerfile similarity index 100% rename from src/core/linux-headers/Containerfile rename to packages/linux-headers/Containerfile diff --git a/src/kernel/linux-nitro/Containerfile b/packages/linux-nitro/Containerfile similarity index 100% rename from src/kernel/linux-nitro/Containerfile rename to packages/linux-nitro/Containerfile diff --git a/src/kernel/linux-nitro/linux.config b/packages/linux-nitro/linux.config similarity index 100% rename from src/kernel/linux-nitro/linux.config rename to packages/linux-nitro/linux.config diff --git a/src/core/llvm/Containerfile b/packages/llvm/Containerfile similarity index 100% rename from src/core/llvm/Containerfile rename to packages/llvm/Containerfile diff --git a/src/core/llvm13/Containerfile b/packages/llvm13/Containerfile similarity index 100% rename from src/core/llvm13/Containerfile rename to packages/llvm13/Containerfile diff --git a/src/core/m4/Containerfile b/packages/m4/Containerfile similarity index 100% rename from src/core/m4/Containerfile rename to packages/m4/Containerfile diff --git a/src/core/make/Containerfile b/packages/make/Containerfile similarity index 100% rename from src/core/make/Containerfile rename to packages/make/Containerfile diff --git a/src/core/meson/Containerfile b/packages/meson/Containerfile similarity index 100% rename from src/core/meson/Containerfile rename to packages/meson/Containerfile diff --git a/src/core/musl-fts/Containerfile b/packages/musl-fts/Containerfile similarity index 100% rename from src/core/musl-fts/Containerfile rename to packages/musl-fts/Containerfile diff --git a/src/core/musl-obstack/Containerfile b/packages/musl-obstack/Containerfile similarity index 100% rename from src/core/musl-obstack/Containerfile rename to packages/musl-obstack/Containerfile diff --git a/src/core/musl/Containerfile b/packages/musl/Containerfile similarity index 100% rename from src/core/musl/Containerfile rename to packages/musl/Containerfile diff --git a/src/core/musl/lfs64-2.patch b/packages/musl/lfs64-2.patch similarity index 100% rename from src/core/musl/lfs64-2.patch rename to packages/musl/lfs64-2.patch diff --git a/src/core/musl/lfs64.patch b/packages/musl/lfs64.patch similarity index 100% rename from src/core/musl/lfs64.patch rename to packages/musl/lfs64.patch diff --git a/src/core/musl/relr-typedefs.patch b/packages/musl/relr-typedefs.patch similarity index 100% rename from src/core/musl/relr-typedefs.patch rename to packages/musl/relr-typedefs.patch diff --git a/src/core/ninja/Containerfile b/packages/ninja/Containerfile similarity index 100% rename from src/core/ninja/Containerfile rename to packages/ninja/Containerfile diff --git a/src/core/ninja/fix-musl.patch b/packages/ninja/fix-musl.patch similarity index 100% rename from src/core/ninja/fix-musl.patch rename to packages/ninja/fix-musl.patch diff --git a/src/libs/npth/Containerfile b/packages/npth/Containerfile similarity index 100% rename from src/libs/npth/Containerfile rename to packages/npth/Containerfile diff --git a/src/core/openssl/Containerfile b/packages/openssl/Containerfile similarity index 100% rename from src/core/openssl/Containerfile rename to packages/openssl/Containerfile diff --git a/src/core/perl/Containerfile b/packages/perl/Containerfile similarity index 100% rename from src/core/perl/Containerfile rename to packages/perl/Containerfile diff --git a/src/core/pkgconf/Containerfile b/packages/pkgconf/Containerfile similarity index 100% rename from src/core/pkgconf/Containerfile rename to packages/pkgconf/Containerfile diff --git a/src/core/py-setuptools/Containerfile b/packages/py-setuptools/Containerfile similarity index 100% rename from src/core/py-setuptools/Containerfile rename to packages/py-setuptools/Containerfile diff --git a/src/core/python/Containerfile b/packages/python/Containerfile similarity index 100% rename from src/core/python/Containerfile rename to packages/python/Containerfile diff --git a/src/core/rust/Containerfile b/packages/rust/Containerfile similarity index 100% rename from src/core/rust/Containerfile rename to packages/rust/Containerfile diff --git a/src/core/sed/Containerfile b/packages/sed/Containerfile similarity index 100% rename from src/core/sed/Containerfile rename to packages/sed/Containerfile diff --git a/src/tools/sops/Containerfile b/packages/sops/Containerfile similarity index 100% rename from src/tools/sops/Containerfile rename to packages/sops/Containerfile diff --git a/src/bootstrap/stage0/Containerfile b/packages/stage0/Containerfile similarity index 100% rename from src/bootstrap/stage0/Containerfile rename to packages/stage0/Containerfile diff --git a/src/bootstrap/stage1/Containerfile b/packages/stage1/Containerfile similarity index 100% rename from src/bootstrap/stage1/Containerfile rename to packages/stage1/Containerfile diff --git a/src/bootstrap/stage2/Containerfile b/packages/stage2/Containerfile similarity index 100% rename from src/bootstrap/stage2/Containerfile rename to packages/stage2/Containerfile diff --git a/src/bootstrap/stage3/Containerfile b/packages/stage3/Containerfile similarity index 100% rename from src/bootstrap/stage3/Containerfile rename to packages/stage3/Containerfile diff --git a/src/tools/sxctl/Containerfile b/packages/sxctl/Containerfile similarity index 100% rename from src/tools/sxctl/Containerfile rename to packages/sxctl/Containerfile diff --git a/src/tools/tofu/Containerfile b/packages/tofu/Containerfile similarity index 100% rename from src/tools/tofu/Containerfile rename to packages/tofu/Containerfile diff --git a/src/core/xorriso/Containerfile b/packages/xorriso/Containerfile similarity index 100% rename from src/core/xorriso/Containerfile rename to packages/xorriso/Containerfile diff --git a/src/core/zlib/Containerfile b/packages/zlib/Containerfile similarity index 100% rename from src/core/zlib/Containerfile rename to packages/zlib/Containerfile diff --git a/src/context.sh b/src/context.sh index 3d2e545..49cffbb 100755 --- a/src/context.sh +++ b/src/context.sh @@ -1,11 +1,7 @@ #!/bin/bash self=${1} -for each in $(find src/*/*/Containerfile); do +for each in $(find out/*/index.json); do package=$(basename $(dirname ${each})) - digest_file=out/${package}/index.json - digest_line="" [ "$package" == "$self" ] && continue - if [ -e ${digest_file} ]; then - printf -- ' --build-context %s=oci-layout://./out/%s' "${package}" "${package}" - fi + printf -- ' --build-context %s=oci-layout://./out/%s' "${package}" "${package}" done diff --git a/src/macros.mk b/src/macros.mk index 927f538..a9989a8 100644 --- a/src/macros.mk +++ b/src/macros.mk @@ -21,12 +21,11 @@ # - output manifest.txt of all tar/digest hashes for an easy git diff # - support buildah and podman define build - $(eval CATEGORY := $(1)) - $(eval NAME := $(2)) - $(eval VERSION := $(if $(3),$(3),latest)) - $(eval TARGET := $(if $(4),$(4),package)) - $(eval EXTRA_ARGS := $(if $(5),$(5),)) - $(eval REVISION := $(shell git rev-list HEAD -1 src/$(CATEGORY)/$(NAME))) + $(eval NAME := $(1)) + $(eval VERSION := $(if $(2),$(2),latest)) + $(eval TARGET := $(if $(3),$(3),package)) + $(eval EXTRA_ARGS := $(if $(4),$(4),)) + $(eval REVISION := $(shell git rev-list HEAD -1 packages/$(NAME))) $(eval TEMPFILE := out/.$(notdir $(basename $@)).tmp.tar) $(eval BUILD_CMD := \ DOCKER_BUILDKIT=1 \ @@ -47,8 +46,8 @@ define build $(shell ./src/context.sh $(NAME)) \ $(EXTRA_ARGS) \ $(NOCACHE_FLAG) \ - -f src/$(CATEGORY)/$(NAME)/Containerfile \ - src/$(CATEGORY)/$(NAME) \ + -f packages/$(NAME)/Containerfile \ + packages/$(NAME) \ ) $(eval TIMESTAMP := $(shell TZ=GMT date +"%Y-%m-%dT%H:%M:%SZ")) mkdir -p out/ \ diff --git a/src/packages.mk b/src/packages.mk index 1b92200..a65cd6f 100644 --- a/src/packages.mk +++ b/src/packages.mk @@ -2,34 +2,34 @@ .PHONY: stage0 stage0: out/stage0/index.json out/stage0/index.json: \ - src/bootstrap/stage0/Containerfile - $(call build,bootstrap,stage0) + packages/stage0/Containerfile + $(call build,stage0) .PHONY: stage1 stage1: out/stage1/index.json out/stage1/index.json: \ - src/bootstrap/stage1/Containerfile \ + packages/stage1/Containerfile \ out/stage0/index.json - $(call build,bootstrap,stage1) + $(call build,stage1) .PHONY: stage2 stage2: out/stage2/index.json out/stage2/index.json: \ - src/bootstrap/stage2/Containerfile \ + packages/stage2/Containerfile \ out/stage1/index.json - $(call build,bootstrap,stage2) + $(call build,stage2) .PHONY: stage3 stage3: out/stage3/index.json out/stage3/index.json: \ - src/bootstrap/stage3/Containerfile \ + packages/stage3/Containerfile \ out/stage2/index.json - $(call build,bootstrap,stage3) + $(call build,stage3) .PHONY: argp-standalone argp-standalone: out/argp-standalone/index.json out/argp-standalone/index.json: \ - src/core/argp-standalone/Containerfile \ + packages/argp-standalone/Containerfile \ out/autoconf/index.json \ out/automake/index.json \ out/binutils/index.json \ @@ -39,12 +39,12 @@ out/argp-standalone/index.json: \ out/make/index.json \ out/musl/index.json \ out/perl/index.json - $(call build,core,argp-standalone) + $(call build,argp-standalone) .PHONY: autoconf autoconf: out/autoconf/index.json out/autoconf/index.json: \ - src/core/autoconf/Containerfile \ + packages/autoconf/Containerfile \ out/binutils/index.json \ out/busybox/index.json \ out/gcc/index.json \ @@ -52,12 +52,12 @@ out/autoconf/index.json: \ out/make/index.json \ out/musl/index.json \ out/perl/index.json - $(call build,core,autoconf) + $(call build,autoconf) .PHONY: automake automake: out/automake/index.json out/automake/index.json: \ - src/core/automake/Containerfile \ + packages/automake/Containerfile \ out/autoconf/index.json \ out/binutils/index.json \ out/busybox/index.json \ @@ -66,30 +66,30 @@ out/automake/index.json: \ out/make/index.json \ out/musl/index.json \ out/perl/index.json - $(call build,core,automake) + $(call build,automake) .PHONY: bash bash: out/bash/index.json out/bash/index.json: \ - src/core/bash/Containerfile \ + packages/bash/Containerfile \ out/binutils/index.json \ out/busybox/index.json \ out/gcc/index.json \ out/make/index.json \ out/musl/index.json - $(call build,core,bash) + $(call build,bash) .PHONY: binutils binutils: out/binutils/index.json out/binutils/index.json: \ - src/core/binutils/Containerfile \ + packages/binutils/Containerfile \ out/stage3/index.json - $(call build,core,binutils) + $(call build,binutils) .PHONY: bison bison: out/bison/index.json out/bison/index.json: \ - src/core/bison/Containerfile \ + packages/bison/Containerfile \ out/autoconf/index.json \ out/automake/index.json \ out/binutils/index.json \ @@ -99,19 +99,19 @@ out/bison/index.json: \ out/make/index.json \ out/musl/index.json \ out/perl/index.json - $(call build,core,bison) + $(call build,bison) .PHONY: busybox busybox: out/busybox/index.json out/busybox/index.json: \ - src/core/busybox/Containerfile \ + packages/busybox/Containerfile \ out/stage3/index.json - $(call build,core,busybox) + $(call build,busybox) .PHONY: cmake cmake: out/cmake/index.json out/cmake/index.json: \ - src/core/cmake/Containerfile \ + packages/cmake/Containerfile \ out/binutils/index.json \ out/busybox/index.json \ out/gcc/index.json \ @@ -121,12 +121,12 @@ out/cmake/index.json: \ out/ninja/index.json \ out/openssl/index.json \ out/zlib/index.json - $(call build,core,cmake) + $(call build,cmake) .PHONY: elfutils elfutils: out/elfutils/index.json out/elfutils/index.json: \ - src/core/elfutils/Containerfile \ + packages/elfutils/Containerfile \ out/argp-standalone/index.json \ out/autoconf/index.json \ out/automake/index.json \ @@ -147,12 +147,12 @@ out/elfutils/index.json: \ out/perl/index.json \ out/pkgconf/index.json \ out/zlib/index.json - $(call build,core,elfutils) + $(call build,elfutils) .PHONY: flex flex: out/flex/index.json out/flex/index.json: \ - src/core/flex/Containerfile \ + packages/flex/Containerfile \ out/autoconf/index.json \ out/automake/index.json \ out/binutils/index.json \ @@ -165,56 +165,56 @@ out/flex/index.json: \ out/make/index.json \ out/musl/index.json \ out/perl/index.json - $(call build,core,flex) + $(call build,flex) .PHONY: gcc gcc: out/gcc/index.json out/gcc/index.json: \ - src/core/gcc/Containerfile \ + packages/gcc/Containerfile \ out/binutils/index.json \ out/musl/index.json \ out/stage3/index.json - $(call build,core,gcc) + $(call build,gcc) .PHONY: gettext gettext: out/gettext/index.json out/gettext/index.json: \ - src/core/gettext/Containerfile \ + packages/gettext/Containerfile \ out/binutils/index.json \ out/busybox/index.json \ out/gcc/index.json \ out/libxml2/index.json \ out/make/index.json \ out/musl/index.json - $(call build,core,gettext) + $(call build,gettext) .PHONY: go go: out/go/index.json out/go/index.json: \ - src/core/go/Containerfile \ + packages/go/Containerfile \ out/bash/index.json \ out/binutils/index.json \ out/busybox/index.json \ out/gcc/index.json \ out/musl/index.json - $(call build,core,go) + $(call build,go) .PHONY: libtool libtool: out/libtool/index.json out/libtool/index.json: \ - src/core/libtool/Containerfile \ + packages/libtool/Containerfile \ out/binutils/index.json \ out/busybox/index.json \ out/gcc/index.json \ out/m4/index.json \ out/make/index.json \ out/musl/index.json - $(call build,core,libtool) + $(call build,libtool) .PHONY: libunwind libunwind: out/libunwind/index.json out/libunwind/index.json: \ - src/core/libunwind/Containerfile \ + packages/libunwind/Containerfile \ out/autoconf/index.json \ out/automake/index.json \ out/binutils/index.json \ @@ -223,12 +223,12 @@ out/libunwind/index.json: \ out/libtool/index.json \ out/make/index.json \ out/musl/index.json - $(call build,core,libunwind) + $(call build,libunwind) .PHONY: libzstd libzstd: out/libzstd/index.json out/libzstd/index.json: \ - src/core/libzstd/Containerfile \ + packages/libzstd/Containerfile \ out/binutils/index.json \ out/busybox/index.json \ out/gcc/index.json \ @@ -238,19 +238,19 @@ out/libzstd/index.json: \ out/pkgconf/index.json \ out/python/index.json \ out/zlib/index.json - $(call build,core,libzstd) + $(call build,libzstd) .PHONY: linux-headers linux-headers: out/linux-headers/index.json out/linux-headers/index.json: \ - src/core/linux-headers/Containerfile \ + packages/linux-headers/Containerfile \ out/stage3/index.json - $(call build,core,linux-headers) + $(call build,linux-headers) .PHONY: llvm llvm: out/llvm/index.json out/llvm/index.json: \ - src/core/llvm/Containerfile \ + packages/llvm/Containerfile \ out/binutils/index.json \ out/busybox/index.json \ out/cmake/index.json \ @@ -261,12 +261,12 @@ out/llvm/index.json: \ out/py-setuptools/index.json \ out/python/index.json \ out/zlib/index.json - $(call build,core,llvm) + $(call build,llvm) .PHONY: llvm13 llvm13: out/llvm13/index.json out/llvm13/index.json: \ - src/core/llvm13/Containerfile \ + packages/llvm13/Containerfile \ out/binutils/index.json \ out/busybox/index.json \ out/cmake/index.json \ @@ -277,48 +277,48 @@ out/llvm13/index.json: \ out/py-setuptools/index.json \ out/python/index.json \ out/zlib/index.json - $(call build,core,llvm13) + $(call build,llvm13) .PHONY: m4 m4: out/m4/index.json out/m4/index.json: \ - src/core/m4/Containerfile \ + packages/m4/Containerfile \ out/binutils/index.json \ out/busybox/index.json \ out/gcc/index.json \ out/make/index.json \ out/musl/index.json - $(call build,core,m4) + $(call build,m4) .PHONY: make make: out/make/index.json out/make/index.json: \ - src/core/make/Containerfile \ + packages/make/Containerfile \ out/stage3/index.json - $(call build,core,make) + $(call build,make) .PHONY: meson meson: out/meson/index.json out/meson/index.json: \ - src/core/meson/Containerfile \ + packages/meson/Containerfile \ out/busybox/index.json \ out/musl/index.json \ out/py-setuptools/index.json \ out/python/index.json \ out/zlib/index.json - $(call build,core,meson) + $(call build,meson) .PHONY: musl musl: out/musl/index.json out/musl/index.json: \ - src/core/musl/Containerfile \ + packages/musl/Containerfile \ out/stage3/index.json - $(call build,core,musl) + $(call build,musl) .PHONY: musl-fts musl-fts: out/musl-fts/index.json out/musl-fts/index.json: \ - src/core/musl-fts/Containerfile \ + packages/musl-fts/Containerfile \ out/autoconf/index.json \ out/automake/index.json \ out/binutils/index.json \ @@ -330,12 +330,12 @@ out/musl-fts/index.json: \ out/musl/index.json \ out/perl/index.json \ out/pkgconf/index.json - $(call build,core,musl-fts) + $(call build,musl-fts) .PHONY: musl-obstack musl-obstack: out/musl-obstack/index.json out/musl-obstack/index.json: \ - src/core/musl-obstack/Containerfile \ + packages/musl-obstack/Containerfile \ out/autoconf/index.json \ out/automake/index.json \ out/binutils/index.json \ @@ -347,12 +347,12 @@ out/musl-obstack/index.json: \ out/musl/index.json \ out/perl/index.json \ out/pkgconf/index.json - $(call build,core,musl-obstack) + $(call build,musl-obstack) .PHONY: ninja ninja: out/ninja/index.json out/ninja/index.json: \ - src/core/ninja/Containerfile \ + packages/ninja/Containerfile \ out/binutils/index.json \ out/busybox/index.json \ out/gcc/index.json \ @@ -360,12 +360,12 @@ out/ninja/index.json: \ out/musl/index.json \ out/openssl/index.json \ out/python/index.json - $(call build,core,ninja) + $(call build,ninja) .PHONY: openssl openssl: out/openssl/index.json out/openssl/index.json: \ - src/core/openssl/Containerfile \ + packages/openssl/Containerfile \ out/binutils/index.json \ out/busybox/index.json \ out/gcc/index.json \ @@ -373,44 +373,44 @@ out/openssl/index.json: \ out/make/index.json \ out/musl/index.json \ out/perl/index.json - $(call build,core,openssl) + $(call build,openssl) .PHONY: perl perl: out/perl/index.json out/perl/index.json: \ - src/core/perl/Containerfile \ + packages/perl/Containerfile \ out/binutils/index.json \ out/busybox/index.json \ out/gcc/index.json \ out/make/index.json \ out/musl/index.json - $(call build,core,perl) + $(call build,perl) .PHONY: pkgconf pkgconf: out/pkgconf/index.json out/pkgconf/index.json: \ - src/core/pkgconf/Containerfile \ + packages/pkgconf/Containerfile \ out/binutils/index.json \ out/busybox/index.json \ out/gcc/index.json \ out/make/index.json \ out/musl/index.json - $(call build,core,pkgconf) + $(call build,pkgconf) .PHONY: py-setuptools py-setuptools: out/py-setuptools/index.json out/py-setuptools/index.json: \ - src/core/py-setuptools/Containerfile \ + packages/py-setuptools/Containerfile \ out/busybox/index.json \ out/musl/index.json \ out/python/index.json \ out/zlib/index.json - $(call build,core,py-setuptools) + $(call build,py-setuptools) .PHONY: python python: out/python/index.json out/python/index.json: \ - src/core/python/Containerfile \ + packages/python/Containerfile \ out/binutils/index.json \ out/busybox/index.json \ out/gcc/index.json \ @@ -418,12 +418,12 @@ out/python/index.json: \ out/musl/index.json \ out/openssl/index.json \ out/zlib/index.json - $(call build,core,python) + $(call build,python) .PHONY: rust rust: out/rust/index.json out/rust/index.json: \ - src/core/rust/Containerfile \ + packages/rust/Containerfile \ out/bash/index.json \ out/binutils/index.json \ out/busybox/index.json \ @@ -440,46 +440,46 @@ out/rust/index.json: \ out/py-setuptools/index.json \ out/python/index.json \ out/zlib/index.json - $(call build,core,rust) + $(call build,rust) .PHONY: sed sed: out/sed/index.json out/sed/index.json: \ - src/core/sed/Containerfile \ + packages/sed/Containerfile \ out/binutils/index.json \ out/busybox/index.json \ out/gcc/index.json \ out/make/index.json \ out/musl/index.json - $(call build,core,sed) + $(call build,sed) .PHONY: xorriso xorriso: out/xorriso/index.json out/xorriso/index.json: \ - src/core/xorriso/Containerfile \ + packages/xorriso/Containerfile \ out/binutils/index.json \ out/busybox/index.json \ out/gcc/index.json \ out/linux-headers/index.json \ out/make/index.json \ out/musl/index.json - $(call build,core,xorriso) + $(call build,xorriso) .PHONY: zlib zlib: out/zlib/index.json out/zlib/index.json: \ - src/core/zlib/Containerfile \ + packages/zlib/Containerfile \ out/binutils/index.json \ out/busybox/index.json \ out/gcc/index.json \ out/make/index.json \ out/musl/index.json - $(call build,core,zlib) + $(call build,zlib) .PHONY: linux-generic linux-generic: out/linux-generic/index.json out/linux-generic/index.json: \ - src/kernel/linux-generic/Containerfile \ + packages/linux-generic/Containerfile \ out/binutils/index.json \ out/bison/index.json \ out/busybox/index.json \ @@ -495,12 +495,12 @@ out/linux-generic/index.json: \ out/perl/index.json \ out/pkgconf/index.json \ out/zlib/index.json - $(call build,kernel,linux-generic) + $(call build,linux-generic) .PHONY: linux-nitro linux-nitro: out/linux-nitro/index.json out/linux-nitro/index.json: \ - src/kernel/linux-nitro/Containerfile \ + packages/linux-nitro/Containerfile \ out/binutils/index.json \ out/bison/index.json \ out/busybox/index.json \ @@ -516,54 +516,54 @@ out/linux-nitro/index.json: \ out/perl/index.json \ out/pkgconf/index.json \ out/zlib/index.json - $(call build,kernel,linux-nitro) + $(call build,linux-nitro) .PHONY: ca-certificates ca-certificates: out/ca-certificates/index.json out/ca-certificates/index.json: \ - src/libs/ca-certificates/Containerfile - $(call build,libs,ca-certificates) + packages/ca-certificates/Containerfile + $(call build,ca-certificates) .PHONY: libassuan libassuan: out/libassuan/index.json out/libassuan/index.json: \ - src/libs/libassuan/Containerfile \ + 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,libs,libassuan) + $(call build,libassuan) .PHONY: libgcrypt libgcrypt: out/libgcrypt/index.json out/libgcrypt/index.json: \ - src/libs/libgcrypt/Containerfile \ + 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,libs,libgcrypt) + $(call build,libgcrypt) .PHONY: libgpg-error libgpg-error: out/libgpg-error/index.json out/libgpg-error/index.json: \ - src/libs/libgpg-error/Containerfile \ + 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,libs,libgpg-error) + $(call build,libgpg-error) .PHONY: libksba libksba: out/libksba/index.json out/libksba/index.json: \ - src/libs/libksba/Containerfile \ + packages/libksba/Containerfile \ out/binutils/index.json \ out/busybox/index.json \ out/gcc/index.json \ @@ -572,12 +572,12 @@ out/libksba/index.json: \ out/musl/index.json \ out/npth/index.json \ out/zlib/index.json - $(call build,libs,libksba) + $(call build,libksba) .PHONY: libxml2 libxml2: out/libxml2/index.json out/libxml2/index.json: \ - src/libs/libxml2/Containerfile \ + packages/libxml2/Containerfile \ out/autoconf/index.json \ out/automake/index.json \ out/binutils/index.json \ @@ -591,67 +591,67 @@ out/libxml2/index.json: \ out/pkgconf/index.json \ out/python/index.json \ out/zlib/index.json - $(call build,libs,libxml2) + $(call build,libxml2) .PHONY: npth npth: out/npth/index.json out/npth/index.json: \ - src/libs/npth/Containerfile \ + 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,libs,npth) + $(call build,npth) .PHONY: cpio cpio: out/cpio/index.json out/cpio/index.json: \ - src/tools/cpio/Containerfile \ + 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,tools,cpio) + $(call build,cpio) .PHONY: curl curl: out/curl/index.json out/curl/index.json: \ - src/tools/curl/Containerfile \ + 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,tools,curl) + $(call build,curl) .PHONY: eif_build eif_build: out/eif_build/index.json out/eif_build/index.json: \ - src/tools/eif_build/Containerfile \ + packages/eif_build/Containerfile \ out/busybox/index.json \ out/libunwind/index.json \ out/musl/index.json \ out/rust/index.json - $(call build,tools,eif_build) + $(call build,eif_build) .PHONY: gen_initramfs gen_initramfs: out/gen_initramfs/index.json out/gen_initramfs/index.json: \ - src/tools/gen_initramfs/Containerfile \ + packages/gen_initramfs/Containerfile \ out/binutils/index.json \ out/busybox/index.json \ out/gcc/index.json \ out/musl/index.json - $(call build,tools,gen_initramfs) + $(call build,gen_initramfs) .PHONY: git git: out/git/index.json out/git/index.json: \ - src/tools/git/Containerfile \ + packages/git/Containerfile \ out/binutils/index.json \ out/busybox/index.json \ out/gcc/index.json \ @@ -660,12 +660,12 @@ out/git/index.json: \ out/musl/index.json \ out/perl/index.json \ out/zlib/index.json - $(call build,tools,git) + $(call build,git) .PHONY: gpg gpg: out/gpg/index.json out/gpg/index.json: \ - src/tools/gpg/Containerfile \ + packages/gpg/Containerfile \ out/binutils/index.json \ out/busybox/index.json \ out/gcc/index.json \ @@ -677,31 +677,31 @@ out/gpg/index.json: \ out/musl/index.json \ out/npth/index.json \ out/zlib/index.json - $(call build,tools,gpg) + $(call build,gpg) .PHONY: sops sops: out/sops/index.json out/sops/index.json: \ - src/tools/sops/Containerfile \ + packages/sops/Containerfile \ out/busybox/index.json \ out/ca-certificates/index.json \ out/go/index.json - $(call build,tools,sops) + $(call build,sops) .PHONY: sxctl sxctl: out/sxctl/index.json out/sxctl/index.json: \ - src/tools/sxctl/Containerfile \ + packages/sxctl/Containerfile \ out/busybox/index.json \ out/go/index.json - $(call build,tools,sxctl) + $(call build,sxctl) .PHONY: tofu tofu: out/tofu/index.json out/tofu/index.json: \ - src/tools/tofu/Containerfile \ + packages/tofu/Containerfile \ out/busybox/index.json \ out/ca-certificates/index.json \ out/go/index.json - $(call build,tools,tofu) + $(call build,tofu)