From 2f7951a352cbcbcfe4a0d08539f841dbc6a3bbe2 Mon Sep 17 00:00:00 2001 From: vxtls <187420201+vxtls@users.noreply.github.com> Date: Sun, 22 Mar 2026 13:09:38 -0400 Subject: [PATCH] fix(manifest): move payload-import after gcc and convert to pass1.sh --- steps/manifest | 2 +- steps/payload-import-1.0/pass1.kaem | 17 ----------------- steps/payload-import-1.0/pass1.sh | 21 +++++++++++++++++++++ 3 files changed, 22 insertions(+), 18 deletions(-) delete mode 100644 steps/payload-import-1.0/pass1.kaem create mode 100755 steps/payload-import-1.0/pass1.sh diff --git a/steps/manifest b/steps/manifest index 188b6e55..b5060e63 100644 --- a/steps/manifest +++ b/steps/manifest @@ -40,7 +40,6 @@ define: BUILD_FIWIX = ( KERNEL_BOOTSTRAP == True || BUILD_KERNELS == True ) build: fiwix-1.5.0-lb1 ( BUILD_FIWIX == True ) build: lwext4-1.0.0-lb1 ( BUILD_FIWIX == True ) build: kexec-fiwix-1.0 ( BUILD_FIWIX == True ) -build: payload-import-1.0 ( KERNEL_BOOTSTRAP == True ) jump: fiwix ( KERNEL_BOOTSTRAP == True ) improve: reconfigure ( CONFIGURATOR != True ) define: JOBS = 1 ( KERNEL_BOOTSTRAP == True ) @@ -116,6 +115,7 @@ build: findutils-4.2.33 build: musl-1.2.5 build: linux-headers-4.14.341-openela build: gcc-4.0.4 +build: payload-import-1.0 ( KERNEL_BOOTSTRAP == True ) build: util-linux-2.19.1 build: e2fsprogs-1.45.7 build: dhcpcd-10.0.1 diff --git a/steps/payload-import-1.0/pass1.kaem b/steps/payload-import-1.0/pass1.kaem deleted file mode 100644 index 340f2a33..00000000 --- a/steps/payload-import-1.0/pass1.kaem +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# -# SPDX-FileCopyrightText: 2026 live-bootstrap contributors -# SPDX-License-Identifier: MIT - -set -ex - -cd src -tcc -m32 -march=i386 -std=c89 -static -I../../tcc/tcc-0.9.27/include -o ${BINDIR}/payload-import payload-import.c -cd .. - -if match x${UPDATE_CHECKSUMS} xTrue; then - sha256sum -o ${pkg}.checksums \ - /usr/bin/payload-import - - cp ${pkg}.checksums ${SRCDIR} -fi diff --git a/steps/payload-import-1.0/pass1.sh b/steps/payload-import-1.0/pass1.sh new file mode 100755 index 00000000..ebe73540 --- /dev/null +++ b/steps/payload-import-1.0/pass1.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# +# SPDX-FileCopyrightText: 2026 live-bootstrap contributors +# SPDX-License-Identifier: MIT + +src_get() { + : +} + +src_unpack() { + dirname=. + cp -r ../src . +} + +src_compile() { + gcc -m32 -march=i386 -std=c89 -static -o payload-import src/payload-import.c +} + +src_install() { + install -D payload-import "${DESTDIR}${BINDIR}/payload-import" +}