From 89b89b7c0b914f94027e47f9ccbdf9cf25c5ccee Mon Sep 17 00:00:00 2001 From: "Lance R. Vick" Date: Mon, 4 Dec 2023 22:23:14 -0800 Subject: [PATCH] move packages to root directory --- Makefile | 56 +++++++++---------- {packages/autoconf => autoconf}/Dockerfile | 0 {packages/automake => automake}/Dockerfile | 0 {packages/bash => bash}/Dockerfile | 0 {packages/binutils => binutils}/Dockerfile | 0 {packages/bootstrap => bootstrap}/Dockerfile | 0 {packages/busybox => busybox}/Dockerfile | 0 .../Dockerfile | 0 .../cacert.pem | 0 {packages/cmake => cmake}/Dockerfile | 0 {packages/curl => curl}/Dockerfile | 0 {packages/gcc => gcc}/Dockerfile | 0 {packages/go => go}/Dockerfile | 0 {packages/libtool => libtool}/Dockerfile | 0 {packages/libxml2 => libxml2}/Dockerfile | 0 .../Dockerfile | 0 {packages/llvm => llvm}/Dockerfile | 0 .../llvm => llvm}/rust-feature-tables.patch | 0 {packages/llvm13 => llvm13}/Dockerfile | 0 .../rust-feature-tables.patch | 0 {packages/m4 => m4}/Dockerfile | 0 {packages/make => make}/Dockerfile | 0 {packages/musl => musl}/Dockerfile | 0 {packages/musl => musl}/lfs64-2.patch | 0 {packages/musl => musl}/lfs64.patch | 0 {packages/ninja => ninja}/Dockerfile | 0 {packages/ninja => ninja}/fix-musl.patch | 0 {packages/openssl => openssl}/Dockerfile | 0 {packages/perl => perl}/Dockerfile | 0 {packages/pkgconf => pkgconf}/Dockerfile | 0 .../Dockerfile | 0 {packages/python => python}/Dockerfile | 0 {packages/rust => rust}/Dockerfile | 0 {packages/sed => sed}/Dockerfile | 0 {packages/zlib => zlib}/Dockerfile | 0 35 files changed, 28 insertions(+), 28 deletions(-) rename {packages/autoconf => autoconf}/Dockerfile (100%) rename {packages/automake => automake}/Dockerfile (100%) rename {packages/bash => bash}/Dockerfile (100%) rename {packages/binutils => binutils}/Dockerfile (100%) rename {packages/bootstrap => bootstrap}/Dockerfile (100%) rename {packages/busybox => busybox}/Dockerfile (100%) rename {packages/ca-certificates => ca-certificates}/Dockerfile (100%) rename {packages/ca-certificates => ca-certificates}/cacert.pem (100%) rename {packages/cmake => cmake}/Dockerfile (100%) rename {packages/curl => curl}/Dockerfile (100%) rename {packages/gcc => gcc}/Dockerfile (100%) rename {packages/go => go}/Dockerfile (100%) rename {packages/libtool => libtool}/Dockerfile (100%) rename {packages/libxml2 => libxml2}/Dockerfile (100%) rename {packages/linux-headers => linux-headers}/Dockerfile (100%) rename {packages/llvm => llvm}/Dockerfile (100%) rename {packages/llvm => llvm}/rust-feature-tables.patch (100%) rename {packages/llvm13 => llvm13}/Dockerfile (100%) rename {packages/llvm13 => llvm13}/rust-feature-tables.patch (100%) rename {packages/m4 => m4}/Dockerfile (100%) rename {packages/make => make}/Dockerfile (100%) rename {packages/musl => musl}/Dockerfile (100%) rename {packages/musl => musl}/lfs64-2.patch (100%) rename {packages/musl => musl}/lfs64.patch (100%) rename {packages/ninja => ninja}/Dockerfile (100%) rename {packages/ninja => ninja}/fix-musl.patch (100%) rename {packages/openssl => openssl}/Dockerfile (100%) rename {packages/perl => perl}/Dockerfile (100%) rename {packages/pkgconf => pkgconf}/Dockerfile (100%) rename {packages/py-setuptools => py-setuptools}/Dockerfile (100%) rename {packages/python => python}/Dockerfile (100%) rename {packages/rust => rust}/Dockerfile (100%) rename {packages/sed => sed}/Dockerfile (100%) rename {packages/zlib => zlib}/Dockerfile (100%) diff --git a/Makefile b/Makefile index 77c2ebb..909fa6d 100644 --- a/Makefile +++ b/Makefile @@ -1,40 +1,40 @@ export SOURCE_DATE_EPOCH = 0 out/bootstrap.oci.tgz: - docker build -t imgrep/bootstrap --output type=oci,dest=$@ packages/bootstrap + docker build -t imgrep/bootstrap --output type=oci,dest=$@ bootstrap out/musl.oci.tgz: \ out/bootstrap.oci.tgz - docker build -t imgrep/musl --output type=oci,dest=$@ packages/musl + docker build -t imgrep/musl --output type=oci,dest=$@ musl out/busybox.oci.tgz: \ out/bootstrap.oci.tgz - docker build -t imgrep/busybox --output type=oci,dest=$@ packages/busybox + docker build -t imgrep/busybox --output type=oci,dest=$@ busybox out/binutils.oci.tgz: \ out/bootstrap.oci.tgz \ out/musl.oci.tgz - docker build -t imgrep/binutils --output type=oci,dest=$@ packages/binutils + docker build -t imgrep/binutils --output type=oci,dest=$@ binutils out/linux-headers.oci.tgz: - docker build -t imgrep/linux-headers --output type=oci,dest=$@ packages/linux-headers + docker build -t imgrep/linux-headers --output type=oci,dest=$@ linux-headers out/gcc.oci.tgz: \ out/bootstrap.oci.tgz \ out/musl.oci.tgz - docker build -t imgrep/gcc --output type=oci,dest=$@ packages/gcc + docker build -t imgrep/gcc --output type=oci,dest=$@ gcc out/make.oci.tgz: \ out/bootstrap.oci.tgz \ out/musl.oci.tgz - docker build -t imgrep/make --output type=oci,dest=$@ packages/make + docker build -t imgrep/make --output type=oci,dest=$@ make out/ca-certificates.oci.tgz: - docker build -t imgrep/ca-certificates --output type=oci,dest=$@ packages/ca-certificates + docker build -t imgrep/ca-certificates --output type=oci,dest=$@ ca-certificates out/bash.oci.tgz: \ out/gcc.oci.tgz - docker build -t imgrep/bash --output type=oci,dest=$@ packages/bash + docker build -t imgrep/bash --output type=oci,dest=$@ bash out/m4.oci.tgz: \ out/busybox.oci.tgz \ @@ -42,7 +42,7 @@ out/m4.oci.tgz: \ out/binutils.oci.tgz \ out/musl.oci.tgz \ out/make.oci.tgz \ - docker build -t imgrep/m4 --output type=oci,dest=$@ packages/m4 + docker build -t imgrep/m4 --output type=oci,dest=$@ m4 out/autoconf.oci.tgz: \ out/busybox.oci.tgz \ @@ -52,7 +52,7 @@ out/autoconf.oci.tgz: \ out/make.oci.tgz \ out/perl.oci.tgz \ out/m4.oci.tgz - docker build -t imgrep/autoconf --output type=oci,dest=$@ packages/autoconf + docker build -t imgrep/autoconf --output type=oci,dest=$@ autoconf out/automake.oci.tgz: \ out/busybox.oci.tgz \ @@ -63,7 +63,7 @@ out/automake.oci.tgz: \ out/perl.oci.tgz \ out/autoconf.oci.tgz \ out/m4.oci.tgz - docker build -t imgrep/automake --output type=oci,dest=$@ packages/automake + docker build -t imgrep/automake --output type=oci,dest=$@ automake out/sed.oci.tgz: \ out/busybox.oci.tgz \ @@ -71,7 +71,7 @@ out/sed.oci.tgz: \ out/binutils.oci.tgz \ out/musl.oci.tgz \ out/make.oci.tgz - docker build -t imgrep/sed --output type=oci,dest=$@ packages/sed + docker build -t imgrep/sed --output type=oci,dest=$@ sed out/libtool.oci.tgz: \ out/busybox.oci.tgz \ @@ -82,7 +82,7 @@ out/libtool.oci.tgz: \ out/bash.oci.tgz \ out/sed.oci.tgz \ out/m4.oci.tgz - docker build -t imgrep/libtool --output type=oci,dest=$@ packages/libtool + docker build -t imgrep/libtool --output type=oci,dest=$@ libtool out/pkgconf.oci.tgz: \ out/busybox.oci.tgz \ @@ -91,7 +91,7 @@ out/pkgconf.oci.tgz: \ out/musl.oci.tgz \ out/make.oci.tgz \ out/libtool.oci.tgz - docker build -t imgrep/pkgconf --output type=oci,dest=$@ packages/pkgconf + docker build -t imgrep/pkgconf --output type=oci,dest=$@ pkgconf out/libxml2.oci.tgz: \ out/busybox.oci.tgz \ @@ -107,7 +107,7 @@ out/libxml2.oci.tgz: \ out/automake.oci.tgz \ out/pkgconf.oci.tgz \ out/libtool.oci.tgz - docker build -t imgrep/libxml2 --output type=oci,dest=$@ packages/libxml2 + docker build -t imgrep/libxml2 --output type=oci,dest=$@ libxml2 out/openssl.oci.tgz: \ out/gcc.oci.tgz \ @@ -115,7 +115,7 @@ out/openssl.oci.tgz: \ out/busybox.oci.tgz \ out/linux-headers.oci.tgz \ out/musl.oci.tgz - docker build -t imgrep/openssl --output type=oci,dest=$@ packages/openssl + docker build -t imgrep/openssl --output type=oci,dest=$@ openssl out/go.oci.tgz: \ out/gcc.oci.tgz \ @@ -123,7 +123,7 @@ out/go.oci.tgz: \ out/busybox.oci.tgz \ out/bash.oci.tgz \ out/musl.oci.tgz - docker build -t imgrep/go --output type=oci,dest=$@ packages/go + docker build -t imgrep/go --output type=oci,dest=$@ go out/perl.oci.tgz: \ out/gcc.oci.tgz \ @@ -131,7 +131,7 @@ out/perl.oci.tgz: \ out/busybox.oci.tgz \ out/make.oci.tgz \ out/musl.oci.tgz - docker build -t imgrep/perl --output type=oci,dest=$@ packages/perl + docker build -t imgrep/perl --output type=oci,dest=$@ perl out/curl.oci.tgz: \ out/gcc.oci.tgz \ @@ -141,7 +141,7 @@ out/curl.oci.tgz: \ out/binutils.oci.tgz \ out/openssl.oci.tgz \ out/ca-certificates.oci.tgz - docker build -t imgrep/curl --output type=oci,dest=$@ packages/curl + docker build -t imgrep/curl --output type=oci,dest=$@ curl out/python.oci.tgz: \ out/gcc.oci.tgz \ @@ -151,7 +151,7 @@ out/python.oci.tgz: \ out/openssl.oci.tgz \ out/make.oci.tgz \ out/musl.oci.tgz - docker build -t imgrep/python --output type=oci,dest=$@ packages/python + docker build -t imgrep/python --output type=oci,dest=$@ python out/ninja.oci.tgz: \ out/busybox.oci.tgz \ @@ -161,7 +161,7 @@ out/ninja.oci.tgz: \ out/make.oci.tgz \ out/openssl.oci.tgz \ out/python.oci.tgz - docker build -t imgrep/ninja --output type=oci,dest=$@ packages/ninja + docker build -t imgrep/ninja --output type=oci,dest=$@ ninja out/cmake.oci.tgz: \ out/busybox.oci.tgz \ @@ -171,12 +171,12 @@ out/cmake.oci.tgz: \ out/musl.oci.tgz \ out/make.oci.tgz \ out/linux-headers.oci.tgz - docker build -t imgrep/cmake --output type=oci,dest=$@ packages/cmake + docker build -t imgrep/cmake --output type=oci,dest=$@ cmake out/py-setuptools.oci.tgz: \ out/busybox.oci.tgz \ out/python.oci.tgz - docker build -t imgrep/py-setuptools --output type=oci,dest=$@ packages/py-setuptools + docker build -t imgrep/py-setuptools --output type=oci,dest=$@ py-setuptools out/zlib.oci.tgz: \ out/busybox.oci.tgz \ @@ -184,7 +184,7 @@ out/zlib.oci.tgz: \ out/binutils.oci.tgz \ out/musl.oci.tgz \ out/make.oci.tgz - docker build -t imgrep/zlib --output type=oci,dest=$@ packages/zlib + docker build -t imgrep/zlib --output type=oci,dest=$@ zlib out/llvm.oci.tgz: \ out/gcc.oci.tgz \ @@ -196,7 +196,7 @@ out/llvm.oci.tgz: \ out/ninja.oci.tgz \ out/busybox.oci.tgz \ out/musl.oci.tgz - docker build -t imgrep/llvm --output type=oci,dest=$@ packages/llvm + docker build -t imgrep/llvm --output type=oci,dest=$@ llvm out/llvm13.oci.tgz: \ out/gcc.oci.tgz \ @@ -208,7 +208,7 @@ out/llvm13.oci.tgz: \ out/ninja.oci.tgz \ out/busybox.oci.tgz \ out/musl.oci.tgz - docker build -t imgrep/llvm13 --output type=oci,dest=$@ packages/llvm13 + docker build -t imgrep/llvm13 --output type=oci,dest=$@ llvm13 out/rust.oci.tgz: \ out/gcc.oci.tgz \ @@ -220,7 +220,7 @@ out/rust.oci.tgz: \ out/make.oci.tgz \ out/busybox.oci.tgz \ out/musl.oci.tgz - docker build -t imgrep/rust --output type=oci,dest=$@ packages/rust + docker build -t imgrep/rust --output type=oci,dest=$@ rust test: docker build -t imgrep/test-c tests/c diff --git a/packages/autoconf/Dockerfile b/autoconf/Dockerfile similarity index 100% rename from packages/autoconf/Dockerfile rename to autoconf/Dockerfile diff --git a/packages/automake/Dockerfile b/automake/Dockerfile similarity index 100% rename from packages/automake/Dockerfile rename to automake/Dockerfile diff --git a/packages/bash/Dockerfile b/bash/Dockerfile similarity index 100% rename from packages/bash/Dockerfile rename to bash/Dockerfile diff --git a/packages/binutils/Dockerfile b/binutils/Dockerfile similarity index 100% rename from packages/binutils/Dockerfile rename to binutils/Dockerfile diff --git a/packages/bootstrap/Dockerfile b/bootstrap/Dockerfile similarity index 100% rename from packages/bootstrap/Dockerfile rename to bootstrap/Dockerfile diff --git a/packages/busybox/Dockerfile b/busybox/Dockerfile similarity index 100% rename from packages/busybox/Dockerfile rename to busybox/Dockerfile diff --git a/packages/ca-certificates/Dockerfile b/ca-certificates/Dockerfile similarity index 100% rename from packages/ca-certificates/Dockerfile rename to ca-certificates/Dockerfile diff --git a/packages/ca-certificates/cacert.pem b/ca-certificates/cacert.pem similarity index 100% rename from packages/ca-certificates/cacert.pem rename to ca-certificates/cacert.pem diff --git a/packages/cmake/Dockerfile b/cmake/Dockerfile similarity index 100% rename from packages/cmake/Dockerfile rename to cmake/Dockerfile diff --git a/packages/curl/Dockerfile b/curl/Dockerfile similarity index 100% rename from packages/curl/Dockerfile rename to curl/Dockerfile diff --git a/packages/gcc/Dockerfile b/gcc/Dockerfile similarity index 100% rename from packages/gcc/Dockerfile rename to gcc/Dockerfile diff --git a/packages/go/Dockerfile b/go/Dockerfile similarity index 100% rename from packages/go/Dockerfile rename to go/Dockerfile diff --git a/packages/libtool/Dockerfile b/libtool/Dockerfile similarity index 100% rename from packages/libtool/Dockerfile rename to libtool/Dockerfile diff --git a/packages/libxml2/Dockerfile b/libxml2/Dockerfile similarity index 100% rename from packages/libxml2/Dockerfile rename to libxml2/Dockerfile diff --git a/packages/linux-headers/Dockerfile b/linux-headers/Dockerfile similarity index 100% rename from packages/linux-headers/Dockerfile rename to linux-headers/Dockerfile diff --git a/packages/llvm/Dockerfile b/llvm/Dockerfile similarity index 100% rename from packages/llvm/Dockerfile rename to llvm/Dockerfile diff --git a/packages/llvm/rust-feature-tables.patch b/llvm/rust-feature-tables.patch similarity index 100% rename from packages/llvm/rust-feature-tables.patch rename to llvm/rust-feature-tables.patch diff --git a/packages/llvm13/Dockerfile b/llvm13/Dockerfile similarity index 100% rename from packages/llvm13/Dockerfile rename to llvm13/Dockerfile diff --git a/packages/llvm13/rust-feature-tables.patch b/llvm13/rust-feature-tables.patch similarity index 100% rename from packages/llvm13/rust-feature-tables.patch rename to llvm13/rust-feature-tables.patch diff --git a/packages/m4/Dockerfile b/m4/Dockerfile similarity index 100% rename from packages/m4/Dockerfile rename to m4/Dockerfile diff --git a/packages/make/Dockerfile b/make/Dockerfile similarity index 100% rename from packages/make/Dockerfile rename to make/Dockerfile diff --git a/packages/musl/Dockerfile b/musl/Dockerfile similarity index 100% rename from packages/musl/Dockerfile rename to musl/Dockerfile diff --git a/packages/musl/lfs64-2.patch b/musl/lfs64-2.patch similarity index 100% rename from packages/musl/lfs64-2.patch rename to musl/lfs64-2.patch diff --git a/packages/musl/lfs64.patch b/musl/lfs64.patch similarity index 100% rename from packages/musl/lfs64.patch rename to musl/lfs64.patch diff --git a/packages/ninja/Dockerfile b/ninja/Dockerfile similarity index 100% rename from packages/ninja/Dockerfile rename to ninja/Dockerfile diff --git a/packages/ninja/fix-musl.patch b/ninja/fix-musl.patch similarity index 100% rename from packages/ninja/fix-musl.patch rename to ninja/fix-musl.patch diff --git a/packages/openssl/Dockerfile b/openssl/Dockerfile similarity index 100% rename from packages/openssl/Dockerfile rename to openssl/Dockerfile diff --git a/packages/perl/Dockerfile b/perl/Dockerfile similarity index 100% rename from packages/perl/Dockerfile rename to perl/Dockerfile diff --git a/packages/pkgconf/Dockerfile b/pkgconf/Dockerfile similarity index 100% rename from packages/pkgconf/Dockerfile rename to pkgconf/Dockerfile diff --git a/packages/py-setuptools/Dockerfile b/py-setuptools/Dockerfile similarity index 100% rename from packages/py-setuptools/Dockerfile rename to py-setuptools/Dockerfile diff --git a/packages/python/Dockerfile b/python/Dockerfile similarity index 100% rename from packages/python/Dockerfile rename to python/Dockerfile diff --git a/packages/rust/Dockerfile b/rust/Dockerfile similarity index 100% rename from packages/rust/Dockerfile rename to rust/Dockerfile diff --git a/packages/sed/Dockerfile b/sed/Dockerfile similarity index 100% rename from packages/sed/Dockerfile rename to sed/Dockerfile diff --git a/packages/zlib/Dockerfile b/zlib/Dockerfile similarity index 100% rename from packages/zlib/Dockerfile rename to zlib/Dockerfile