commit: 407b02d6b45bb73252c57cadd68591ee43376dc9
parent 86bb6b1d6ff3aeeec4e838cb073d553dd59f0701
Author: Andrius Štikonas <andrius@stikonas.eu>
Date: Thu, 2 Jun 2022 22:44:02 +0100
Update stage0-posix to latest snapshot.
Diffstat:
7 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/sysa/after.kaem b/sysa/after.kaem
@@ -38,6 +38,7 @@ cp /${ARCH_DIR}/bin/sha256sum ${bindir}/sha256sum
cp /${ARCH_DIR}/bin/ungz ${bindir}/ungz
cp /${ARCH_DIR}/bin/untar ${bindir}/untar
cp /${ARCH_DIR}/bin/cp ${bindir}/cp
+cp /${ARCH_DIR}/bin/rm ${bindir}/rm
chmod 755 ${bindir}/blood-elf
chmod 755 ${bindir}/catm
@@ -53,6 +54,7 @@ chmod 755 ${bindir}/mkdir
chmod 755 ${bindir}/sha256sum
chmod 755 ${bindir}/ungz
chmod 755 ${bindir}/untar
+chmod 755 ${bindir}/rm
PATH=${bindir}
diff --git a/sysa/bzip2-1.0.8/patches/coreutils.patch b/sysa/bzip2-1.0.8/patches/coreutils.patch
@@ -19,11 +19,9 @@ diff -r -N -U3 Makefile Makefile
# Where you want it installed when you do 'make install'
PREFIX=/usr/local
-@@ -44,13 +44,7 @@
- $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o
+@@ -44,11 +44,6 @@
libbz2.a: $(OBJS)
-- rm -f libbz2.a
$(AR) cq libbz2.a $(OBJS)
- @if ( test -f $(RANLIB) -o -f /usr/bin/ranlib -o \
- -f /bin/ranlib -o -f /usr/ccs/bin/ranlib ) ; then \
diff --git a/sysa/gzip-1.2.4/gzip-1.2.4.kaem b/sysa/gzip-1.2.4/gzip-1.2.4.kaem
@@ -15,9 +15,9 @@ catm gzip.c.new ../../files/stat_override.c gzip.c
cp gzip.c.new gzip.c
# Extract
-cp ${distfiles}/${pkg}.tar.gz ../src/
-ungz ../src/${pkg}.tar.gz
-untar ../src/${pkg}.tar
+ungz --file ${distfiles}/${pkg}.tar.gz --output ../src/${pkg}.tar
+untar --file ../src/${pkg}.tar
+rm ../src/${pkg}.tar
cd ${pkg}
# Prepare
diff --git a/sysa/make-3.80/make-3.80.kaem b/sysa/make-3.80/make-3.80.kaem
@@ -10,9 +10,9 @@ mkdir build src
cd build
# Extract
-cp ${distfiles}/${pkg}.tar.gz ../src/
-ungz ../src/${pkg}.tar.gz
-untar ../src/${pkg}.tar
+ungz --file ${distfiles}/${pkg}.tar.gz --output ../src/${pkg}.tar
+untar --file ../src/${pkg}.tar
+rm ../src/${pkg}.tar
cd ${pkg}
# Create .h files
diff --git a/sysa/mes-0.24/mes-0.24.kaem b/sysa/mes-0.24/mes-0.24.kaem
@@ -20,15 +20,15 @@ chmod 755 ${bindir}/mescc.scm
# Unpack
mkdir src build
cd src
-cp ${distfiles}/${NYACC_PKG}.tar.gz ${NYACC_PKG}.tar.gz
-ungz ${NYACC_PKG}.tar.gz
-cp ${distfiles}/${MES_PKG}.tar.gz ${MES_PKG}.tar.gz
-ungz ${MES_PKG}.tar.gz
+ungz --file ${distfiles}/${NYACC_PKG}.tar.gz --output ${NYACC_PKG}.tar
+ungz --file ${distfiles}/${MES_PKG}.tar.gz --output ${MES_PKG}.tar
cd ..
cd build
-untar ../src/${NYACC_PKG}.tar
-untar ../src/${MES_PKG}.tar
+untar --file ../src/${NYACC_PKG}.tar
+untar --non-strict --file ../src/${MES_PKG}.tar # ignore symlinks
+
+rm ../src/${NYACC_PKG}.tar ../src/${MES_PKG}.tar
cp ../files/config.h ${MES_PREFIX}/include/mes
diff --git a/sysa/tar-1.12/tar-1.12.kaem b/sysa/tar-1.12/tar-1.12.kaem
@@ -14,7 +14,8 @@ cd build
# Extract
cp ${distfiles}/${pkg}.tar.gz ../src/
gzip -d -f ../src/${pkg}.tar.gz
-untar ../src/${pkg}.tar
+untar --file ../src/${pkg}.tar
+rm ../src/${pkg}.tar
cd ${pkg}
diff --git a/sysa/tcc-0.9.26/tcc-0.9.26.kaem b/sysa/tcc-0.9.26/tcc-0.9.26.kaem
@@ -19,17 +19,15 @@ TCC_PKG=tcc-0.9.26-1136-g5bba73cc
# Unpack
mkdir src build
-cp ${distfiles}/${TCC_TAR}.tar.gz src
-cp ${distfiles}/${MES_PKG}.tar.gz src
cd src
-ungz ${TCC_TAR}.tar.gz
-ungz ${MES_PKG}.tar.gz
+ungz --file ${distfiles}/${TCC_TAR}.tar.gz --output ${TCC_TAR}.tar
+ungz --file ${distfiles}/${MES_PKG}.tar.gz --output ${MES_PKG}.tar
cd ..
cd build
-untar ../src/${TCC_TAR}.tar
-untar ../src/${MES_PKG}.tar
+untar --file ../src/${TCC_TAR}.tar
+untar --non-strict --file ../src/${MES_PKG}.tar
# Create config.h
cd ${TCC_PKG}