From 13dd6069f1c6e77e066f40df90726cacf183eaa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20Garc=C3=ADa=20Veytia=20=28Puerco=29?= Date: Wed, 7 Sep 2022 21:12:12 -0500 Subject: [PATCH 01/11] Add binutils configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Adolfo García Veytia (Puerco) --- binutils.yaml | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 binutils.yaml diff --git a/binutils.yaml b/binutils.yaml new file mode 100644 index 00000000000..b634061ba1b --- /dev/null +++ b/binutils.yaml @@ -0,0 +1,52 @@ +package: + name: binutils + version: 2.39 + epoch: 1 + description: "GNU binutils" + target-architecture: + - all + copyright: + - paths: + - "*" + attestation: TODO + license: GPL-3.0-or-later + dependencies: + runtime: + +environment: + contents: + repositories: + - https://packages.wolfi.dev/bootstrap/stage3 + keyring: + - https://packages.wolfi.dev/bootstrap/stage3/wolfi-signing.rsa.pub + packages: + - wolfi-baselayout + - busybox + - ca-certificates-bundle + - build-base + - isl + - texinfo + +pipeline: + - uses: fetch + with: + uri: https://ftp.gnu.org/gnu/binutils/binutils-${{package.version}}.tar.gz + expected-sha256: d12ea6f239f1ffe3533ea11ad6e224ffcb89eb5d01bbea589e9158780fa11f10 + - name: 'Configure binutils' + runs: | + ./configure \ + --prefix=/usr \ + --build=$(./config.guess) \ + --host=$(uname -m)-pc-linux-gnu \ + --target=$(uname -m)-pc-linux-gnu \ + --disable-nls \ + --disable-werror \ + --disable-multilib \ + --disable-gprofng + - runs: | + make -j$(nproc) V=1 + - uses: autoconf/make-install + - name: 'Clean up documentation' + runs: | + rm -rf ${{targets.destdir}}/usr/share/info + - uses: strip From 58fd7a36152a47632405dc5a5dc2313418bbd554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20Garc=C3=ADa=20Veytia=20=28Puerco=29?= Date: Wed, 7 Sep 2022 21:52:12 -0500 Subject: [PATCH 02/11] Add binutils -deb subpackage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Adolfo García Veytia (Puerco) --- binutils.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/binutils.yaml b/binutils.yaml index b634061ba1b..bcedfacac54 100644 --- a/binutils.yaml +++ b/binutils.yaml @@ -1,3 +1,4 @@ +--- package: name: binutils version: 2.39 @@ -50,3 +51,15 @@ pipeline: runs: | rm -rf ${{targets.destdir}}/usr/share/info - uses: strip + +subpackages: + - name: "binutils-dev" + description: "binutils development headers" + pipeline: + - runs: | + mkdir -p "${{targets.subpkgdir}}"/usr/lib + mkdir -p "${{targets.subpkgdir}}"/usr/include/libiberty + mv "${{targets.destdir}}"/usr/lib/lib*.so "${{targets.subpkgdir}}"/usr/lib/ + mv "${{targets.destdir}}"/usr/lib/lib*.a "${{targets.subpkgdir}}"/usr/lib/ + mv "${{targets.destdir}}"/usr/include/*.h "${{targets.subpkgdir}}"/usr/include/ + mv "${{targets.destdir}}"/usr/include/libiberty/*.h "${{targets.subpkgdir}}"/usr/include/libiberty/ From 60a475b47c4b5ef91d4a3d39e115d7b030447b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20Garc=C3=ADa=20Veytia=20=28Puerco=29?= Date: Wed, 7 Sep 2022 21:57:47 -0500 Subject: [PATCH 03/11] Add bison, flex and texinfo configurations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Adolfo García Veytia (Puerco) --- bison.yaml | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ flex.yaml | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ texinfo.yaml | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 155 insertions(+) create mode 100644 bison.yaml create mode 100644 flex.yaml create mode 100644 texinfo.yaml diff --git a/bison.yaml b/bison.yaml new file mode 100644 index 00000000000..263ea8fffd2 --- /dev/null +++ b/bison.yaml @@ -0,0 +1,51 @@ +package: + name: bison + version: 3.8.2 + epoch: 1 + description: "The GNU general-purposes parser generator" + target-architecture: + - all + copyright: + - paths: + - "*" + attestation: TODO + license: GPL-3.0-or-later + dependencies: + runtime: + - m4 + +environment: + contents: + repositories: + - https://packages.wolfi.dev/bootstrap/stage3 + keyring: + - https://packages.wolfi.dev/bootstrap/stage3/wolfi-signing.rsa.pub + packages: + - wolfi-baselayout + - busybox + - ca-certificates-bundle + - build-base + - m4 + +pipeline: + - uses: fetch + with: + uri: https://ftp.gnu.org/gnu/bison/bison-${{package.version}}.tar.gz + expected-sha256: 06c9e13bdf7eb24d4ceb6b59205a4f67c2c7e7213119644430fe82fbd14a0abb + - name: 'Configure bison' + runs: | + ./configure \ + --prefix=/usr \ + --libdir=/lib \ + --sysconfdir=/etc \ + --datadir=/usr/share \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --host=$(uname -m)-pc-linux-gnu \ + --target=$(uname -m)-pc-linux-gnu + - runs: | + make -j$(nproc) V=1 + - uses: autoconf/make-install + - runs: | + rm -rf "${{targets.destdir}}"/usr/lib + - uses: strip diff --git a/flex.yaml b/flex.yaml new file mode 100644 index 00000000000..dfb800346f3 --- /dev/null +++ b/flex.yaml @@ -0,0 +1,51 @@ +package: + name: flex + version: 2.6.4 + epoch: 0 + description: "tool for generating text-scanning programs" + target-architecture: + - all + copyright: + - paths: + - "*" + attestation: TODO + license: BSD-2-Clause AND LGPL-2.0-or-later + dependencies: + runtime: + - m4 + +environment: + contents: + repositories: + - https://packages.wolfi.dev/bootstrap/stage3 + keyring: + - https://packages.wolfi.dev/bootstrap/stage3/wolfi-signing.rsa.pub + packages: + - wolfi-baselayout + - busybox + - ca-certificates-bundle + - build-base + - bison + +pipeline: + - uses: fetch + with: + uri: https://github.com/westes/flex/releases/download/v${{package.version}}/flex-${{package.version}}.tar.gz + expected-sha256: e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 + - name: 'Configure flex' + runs: | + ./configure \ + --prefix=/usr \ + --libdir=/lib \ + --sysconfdir=/etc \ + --datadir=/usr/share \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --host=$(uname -m)-pc-linux-gnu \ + --target=$(uname -m)-pc-linux-gnu + - runs: | + make -j$(nproc) V=1 + - uses: autoconf/make-install + - runs: | + ln -s flex ${{target.destdir}}/usr/bin/lex + - uses: strip diff --git a/texinfo.yaml b/texinfo.yaml new file mode 100644 index 00000000000..7364bca1581 --- /dev/null +++ b/texinfo.yaml @@ -0,0 +1,53 @@ +package: + name: texinfo + version: 6.8 + epoch: 0 + description: "GNU documentation tool" + target-architecture: + - all + copyright: + - paths: + - "*" + attestation: TODO + license: GPL-3.0-or-later + dependencies: + runtime: + - perl + +environment: + contents: + repositories: + - https://packages.wolfi.dev/bootstrap/stage3 + keyring: + - https://packages.wolfi.dev/bootstrap/stage3/wolfi-signing.rsa.pub + packages: + - wolfi-baselayout + - busybox + - ca-certificates-bundle + - build-base + - ncurses + - perl + - xz + +pipeline: + - uses: fetch + with: + uri: https://ftp.gnu.org/gnu/texinfo/texinfo-${{package.version}}.tar.xz + expected-sha256: 8eb753ed28bca21f8f56c1a180362aed789229bd62fff58bf8368e9beb59fec4 + - name: 'Configure texinfo' + runs: | + ./configure \ + --prefix=/usr \ + --libdir=/lib \ + --sysconfdir=/etc \ + --datadir=/usr/share \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --host=$(uname -m)-pc-linux-gnu \ + --target=$(uname -m)-pc-linux-gnu + - runs: | + make -j$(nproc) V=1 + - uses: autoconf/make-install + - runs: | + rm -f "${{targets.destdir}}"/usr/share/info/dir + - uses: strip From 03a35476ce156ddbbdfb51212509351306eb186d Mon Sep 17 00:00:00 2001 From: "Adolfo Garcia Veytia (puerco)" Date: Wed, 7 Sep 2022 23:35:19 -0400 Subject: [PATCH 04/11] Use split/dev pipeline instead of manual Signed-off-by: Adolfo Garcia Veytia (puerco) --- binutils.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/binutils.yaml b/binutils.yaml index bcedfacac54..d1e2c1a4a85 100644 --- a/binutils.yaml +++ b/binutils.yaml @@ -56,10 +56,4 @@ subpackages: - name: "binutils-dev" description: "binutils development headers" pipeline: - - runs: | - mkdir -p "${{targets.subpkgdir}}"/usr/lib - mkdir -p "${{targets.subpkgdir}}"/usr/include/libiberty - mv "${{targets.destdir}}"/usr/lib/lib*.so "${{targets.subpkgdir}}"/usr/lib/ - mv "${{targets.destdir}}"/usr/lib/lib*.a "${{targets.subpkgdir}}"/usr/lib/ - mv "${{targets.destdir}}"/usr/include/*.h "${{targets.subpkgdir}}"/usr/include/ - mv "${{targets.destdir}}"/usr/include/libiberty/*.h "${{targets.subpkgdir}}"/usr/include/libiberty/ + - uses: split/dev From 527d5e0a1b18fa6f45f93f9fda9c45803f6a4699 Mon Sep 17 00:00:00 2001 From: "Adolfo Garcia Veytia (puerco)" Date: Wed, 7 Sep 2022 23:44:17 -0400 Subject: [PATCH 05/11] Add binutils to workflow config Signed-off-by: Adolfo Garcia Veytia (puerco) --- .github/workflows/push.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 54827c0a743..28a71e64f10 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -55,6 +55,12 @@ jobs: empty-workspace: false source-dir: ${{ github.workspace }}/glibc + - uses: chainguard-dev/actions/inky-build-pkg@main + with: + package-name: binutils + empty-workspace: false + source-dir: ${{ github.workspace }}/binutils + - uses: chainguard-dev/actions/inky-build-pkg@main with: package-name: build-base From 9e5a3093511b88aa986950f5996033322f2da533 Mon Sep 17 00:00:00 2001 From: "Adolfo Garcia Veytia (puerco)" Date: Wed, 7 Sep 2022 23:48:54 -0400 Subject: [PATCH 06/11] Add binutils 2.39 to makefile Signed-off-by: Adolfo Garcia Veytia (puerco) --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index 6e1e06374c2..7db05b98f56 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ REPO ?= $(shell pwd)/packages GLIBC_VERSION ?= 2.36-r0 BUILD_BASE_VERSION ?= 1-r3 OPENSSL_VERSION ?= 3.0.5-r3 +BINUTILS_VERSION ?= 2.39-r1 MELANGE_OPTS ?= \ --repository-append ${REPO} \ @@ -21,6 +22,8 @@ PACKAGES = \ packages/${ARCH}/glibc-${GLIBC_VERSION}.apk \ packages/${ARCH}/build-base-${BUILD_BASE_VERSION}.apk \ packages/${ARCH}/openssl-${OPENSSL_VERSION}.apk + packages/${ARCH}/build-base-${BUILD_BASE_VERSION}.apk + packages/${ARCH}/binutils-${BINUTILS_VERSION}.apk \ all: ${KEY} ${PACKAGES} @@ -38,6 +41,11 @@ packages/${ARCH}/openssl-${OPENSSL_VERSION}.apk: ${MELANGE} build openssl.yaml ${MELANGE_OPTS} ${MELANGE_DEFOPTS} apk index -o packages/${ARCH}/APKINDEX.tar.gz packages/${ARCH}/*.apk --allow-untrusted melange sign-index --signing-key ${KEY} packages/${ARCH}/APKINDEX.tar.gz + +packages/${ARCH}/binutils-${BINUTILS_VERSION}.apk: + ${MELANGE} build binutils.yaml ${MELANGE_OPTS} ${MELANGE_DEFOPTS} + apk index -o packages/${ARCH}/APKINDEX.tar.gz packages/${ARCH}/*.apk --allow-untrusted + melange sign-index --signing-key ${KEY} packages/${ARCH}/APKINDEX.tar.gz ${KEY}: ${MELANGE} keygen ${KEY} From 8530604bc1803946ba14b33c9e4f151339b51327 Mon Sep 17 00:00:00 2001 From: "Adolfo Garcia Veytia (puerco)" Date: Wed, 7 Sep 2022 23:50:03 -0400 Subject: [PATCH 07/11] Add flex to Makefile Signed-off-by: Adolfo Garcia Veytia (puerco) --- Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Makefile b/Makefile index 7db05b98f56..cadbe9d37c0 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,7 @@ GLIBC_VERSION ?= 2.36-r0 BUILD_BASE_VERSION ?= 1-r3 OPENSSL_VERSION ?= 3.0.5-r3 BINUTILS_VERSION ?= 2.39-r1 +FLEX_VERSION ?= 2.6.4-r0 MELANGE_OPTS ?= \ --repository-append ${REPO} \ @@ -24,6 +25,7 @@ PACKAGES = \ packages/${ARCH}/openssl-${OPENSSL_VERSION}.apk packages/${ARCH}/build-base-${BUILD_BASE_VERSION}.apk packages/${ARCH}/binutils-${BINUTILS_VERSION}.apk \ + packages/${ARCH}/flex-${FLEX_VERSION}.apk \ all: ${KEY} ${PACKAGES} @@ -47,6 +49,11 @@ packages/${ARCH}/binutils-${BINUTILS_VERSION}.apk: apk index -o packages/${ARCH}/APKINDEX.tar.gz packages/${ARCH}/*.apk --allow-untrusted melange sign-index --signing-key ${KEY} packages/${ARCH}/APKINDEX.tar.gz +packages/${ARCH}/flex-${FLEX_VERSION}.apk: + ${MELANGE} build flex.yaml ${MELANGE_OPTS} ${MELANGE_DEFOPTS} + apk index -o packages/${ARCH}/APKINDEX.tar.gz packages/${ARCH}/*.apk --allow-untrusted + melange sign-index --signing-key ${KEY} packages/${ARCH}/APKINDEX.tar.gz + ${KEY}: ${MELANGE} keygen ${KEY} From 22f80cc4baeca49577c00a6acfbc556308476a01 Mon Sep 17 00:00:00 2001 From: "Adolfo Garcia Veytia (puerco)" Date: Wed, 7 Sep 2022 23:51:23 -0400 Subject: [PATCH 08/11] Add bison 3.8.2-r1 to Makefile Signed-off-by: Adolfo Garcia Veytia (puerco) --- Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Makefile b/Makefile index cadbe9d37c0..619b2e42518 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ BUILD_BASE_VERSION ?= 1-r3 OPENSSL_VERSION ?= 3.0.5-r3 BINUTILS_VERSION ?= 2.39-r1 FLEX_VERSION ?= 2.6.4-r0 +BISON_VERSION ?= 3.8.2-r1 MELANGE_OPTS ?= \ --repository-append ${REPO} \ @@ -26,6 +27,7 @@ PACKAGES = \ packages/${ARCH}/build-base-${BUILD_BASE_VERSION}.apk packages/${ARCH}/binutils-${BINUTILS_VERSION}.apk \ packages/${ARCH}/flex-${FLEX_VERSION}.apk \ + packages/${ARCH}/bison-${BISON_VERSION}.apk \ all: ${KEY} ${PACKAGES} @@ -54,6 +56,11 @@ packages/${ARCH}/flex-${FLEX_VERSION}.apk: apk index -o packages/${ARCH}/APKINDEX.tar.gz packages/${ARCH}/*.apk --allow-untrusted melange sign-index --signing-key ${KEY} packages/${ARCH}/APKINDEX.tar.gz +packages/${ARCH}/bison-${BISON_VERSION}.apk: + ${MELANGE} build bison.yaml ${MELANGE_OPTS} ${MELANGE_DEFOPTS} + apk index -o packages/${ARCH}/APKINDEX.tar.gz packages/${ARCH}/*.apk --allow-untrusted + melange sign-index --signing-key ${KEY} packages/${ARCH}/APKINDEX.tar.gz + ${KEY}: ${MELANGE} keygen ${KEY} From d59b3e6d3afdf5df61b1919f1202dd752226a734 Mon Sep 17 00:00:00 2001 From: "Adolfo Garcia Veytia (puerco)" Date: Wed, 7 Sep 2022 23:52:36 -0400 Subject: [PATCH 09/11] Add texinfo 6.8-r0 to Makefile Signed-off-by: Adolfo Garcia Veytia (puerco) --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index 619b2e42518..498bacde023 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,8 @@ OPENSSL_VERSION ?= 3.0.5-r3 BINUTILS_VERSION ?= 2.39-r1 FLEX_VERSION ?= 2.6.4-r0 BISON_VERSION ?= 3.8.2-r1 +TEXINFO_VERSION ?= 6.8-r0 + MELANGE_OPTS ?= \ --repository-append ${REPO} \ @@ -28,6 +30,7 @@ PACKAGES = \ packages/${ARCH}/binutils-${BINUTILS_VERSION}.apk \ packages/${ARCH}/flex-${FLEX_VERSION}.apk \ packages/${ARCH}/bison-${BISON_VERSION}.apk \ + packages/${ARCH}/texinfo-${TEXINFO_VERSION}.apk \ all: ${KEY} ${PACKAGES} @@ -61,6 +64,11 @@ packages/${ARCH}/bison-${BISON_VERSION}.apk: apk index -o packages/${ARCH}/APKINDEX.tar.gz packages/${ARCH}/*.apk --allow-untrusted melange sign-index --signing-key ${KEY} packages/${ARCH}/APKINDEX.tar.gz +packages/${ARCH}/texinfo-${TEXINFO_VERSION}.apk: + ${MELANGE} build texinfo.yaml ${MELANGE_OPTS} ${MELANGE_DEFOPTS} + apk index -o packages/${ARCH}/APKINDEX.tar.gz packages/${ARCH}/*.apk --allow-untrusted + melange sign-index --signing-key ${KEY} packages/${ARCH}/APKINDEX.tar.gz + ${KEY}: ${MELANGE} keygen ${KEY} From 358a3a0505ca9548e1f51fdab7b4f1a63ebd7fc8 Mon Sep 17 00:00:00 2001 From: "Adolfo Garcia Veytia (puerco)" Date: Thu, 8 Sep 2022 00:09:07 -0400 Subject: [PATCH 10/11] Add bison, flex and texinfo to action Signed-off-by: Adolfo Garcia Veytia (puerco) --- .github/workflows/push.yaml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 28a71e64f10..bbdf1760777 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -58,8 +58,18 @@ jobs: - uses: chainguard-dev/actions/inky-build-pkg@main with: package-name: binutils - empty-workspace: false - source-dir: ${{ github.workspace }}/binutils + + - uses: chainguard-dev/actions/inky-build-pkg@main + with: + package-name: flex + + - uses: chainguard-dev/actions/inky-build-pkg@main + with: + package-name: bison + + - uses: chainguard-dev/actions/inky-build-pkg@main + with: + package-name: texinfo - uses: chainguard-dev/actions/inky-build-pkg@main with: From 9671657eecade504bac693c5afd80c3c6c270a8d Mon Sep 17 00:00:00 2001 From: "Adolfo Garcia Veytia (puerco)" Date: Thu, 8 Sep 2022 00:25:11 -0400 Subject: [PATCH 11/11] Drop duplicate buildbase from Makefile Signed-off-by: Adolfo Garcia Veytia (puerco) --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 498bacde023..29cc4385ab4 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,6 @@ PACKAGES = \ packages/${ARCH}/glibc-${GLIBC_VERSION}.apk \ packages/${ARCH}/build-base-${BUILD_BASE_VERSION}.apk \ packages/${ARCH}/openssl-${OPENSSL_VERSION}.apk - packages/${ARCH}/build-base-${BUILD_BASE_VERSION}.apk packages/${ARCH}/binutils-${BINUTILS_VERSION}.apk \ packages/${ARCH}/flex-${FLEX_VERSION}.apk \ packages/${ARCH}/bison-${BISON_VERSION}.apk \