public
/
stagex
Archived
5
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

stage3: Use binutils AR instead of broken busybox ar

This commit is contained in:
Lance Vick 2024-01-23 15:10:42 -08:00
parent 355322796f
commit 8286e33e52
Signed by: lrvick
GPG Key ID: 8E47A1EC35A1551D
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bootstrap/stage3/Dockerfile
View File

@ -104,7 +104,7 @@ RUN set -eux; \
--build=${BUILD} \ --build=${BUILD} \
--host=${TARGET} \ --host=${TARGET} \
--prefix=/usr \ --prefix=/usr \
--bindir=/bin \ --bindir=/usr/bin \
--mandir=/usr/share/man \ --mandir=/usr/share/man \
--infodir=/usr/share/info \ --infodir=/usr/share/info \
--sysconfdir=/etc \ --sysconfdir=/etc \
@ -157,9 +157,6 @@ RUN set -eux; \
WORKDIR ${BUSYBOX_DIR} WORKDIR ${BUSYBOX_DIR}
RUN set -eux; \ RUN set -eux; \
setConfs=' \ setConfs=' \
CONFIG_AR=y \
CONFIG_FEATURE_AR_CREATE=y \
CONFIG_FEATURE_AR_LONG_FILENAMES=y \
CONFIG_LAST_SUPPORTED_WCHAR=0 \ CONFIG_LAST_SUPPORTED_WCHAR=0 \
CONFIG_STATIC=y \ CONFIG_STATIC=y \
'; \ '; \
@ -198,7 +195,6 @@ RUN set -eux; \
grep -q "^$confV\$" .config; \ grep -q "^$confV\$" .config; \
done; \ done; \
make CROSS_COMPILE=${TARGET}- make CROSS_COMPILE=${TARGET}-
# Phase 7: Generate linux headers
WORKDIR ${HOME}/linux-${LINUX_VERSION} WORKDIR ${HOME}/linux-${LINUX_VERSION}
RUN set -eux; \ RUN set -eux; \
make ARCH=${ARCH} headers; \ make ARCH=${ARCH} headers; \
@ -210,14 +206,14 @@ RUN set -eux; \
FROM build as install FROM build as install
USER 0:0 USER 0:0
RUN set -eux; \ RUN set -eux; \
env -C ${MUSL_DIR} make DESTDIR=/rootfs install; \
env -C ${BINUTILS_DIR} make DESTDIR=/rootfs install; \
env -C ${MAKE_DIR} make DESTDIR=/rootfs install; \
env -C ${GCC_DIR} make DESTDIR=/rootfs install; \
env -C ${BUSYBOX_DIR} make \ env -C ${BUSYBOX_DIR} make \
CROSS_COMPILE=${TARGET}- \ CROSS_COMPILE=${TARGET}- \
CONFIG_PREFIX=/rootfs \ CONFIG_PREFIX=/rootfs \
install ; \ install ; \
env -C ${MUSL_DIR} make DESTDIR=/rootfs install; \
env -C ${BINUTILS_DIR} make DESTDIR=/rootfs install; \
env -C ${MAKE_DIR} make DESTDIR=/rootfs install; \
env -C ${GCC_DIR} make DESTDIR=/rootfs install; \
cp -Rv ${LINUX_DIR}/* /rootfs/usr/include/; \ cp -Rv ${LINUX_DIR}/* /rootfs/usr/include/; \
mkdir -p /home/user; \ mkdir -p /home/user; \
find /rootfs -exec touch -hcd "@0" "{}" + find /rootfs -exec touch -hcd "@0" "{}" +