commit: 7f98a6c73cfe78dea746425dd0c7751e35cbe1de
parent 4ef45ea6b7960a81eb0bf88a98516bbcc5d09baf
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Sun, 15 Dec 2024 21:02:27 +0100
Copy tarballs into ./distfiles/
Diffstat:
13 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/extras/bearssl.sh b/extras/bearssl.sh
@@ -1,7 +1,7 @@
#!/bin/sh
set -ex
-tar xof /bearssl-*.tar.gz
+tar xof /distfiles/bearssl-*.tar.gz
cd bearssl-*/
# Maybe consider setting the soname to libbearssl.so.${pkgver%%.*} as done in aports
diff --git a/extras/e2fsprogs.sh b/extras/e2fsprogs.sh
@@ -8,7 +8,7 @@ die() {
command -v make || die "Run /bootstrap-make.sh"
-tar xof /e2fsprogs-*.tar.gz
+tar xof /distfiles/e2fsprogs-*.tar.gz
cd ./e2fsprogs-*/
# workaround bug in utils-std ln(1)
diff --git a/extras/gettext-tiny.sh b/extras/gettext-tiny.sh
@@ -8,7 +8,7 @@ die() {
command -v make || die "Run /bootstrap-make.sh"
-tar xof /gettext-tiny-*.tar.gz
+tar xof /distfiles/gettext-tiny-*.tar.gz
cd gettext-tiny-*/
export RANLIB=true
diff --git a/extras/git.sh b/extras/git.sh
@@ -10,7 +10,7 @@ command -v make || die "Run /bootstrap-make.sh"
command -v curl || die "Run /bootstrap-tiny-curl.sh"
command -v msgfmt || die "Run /bootstrap-gettext-tiny.sh"
-tar xof /git-*.tar.gz
+tar xof /distfiles/git-*.tar.gz
cd git-*/
LD=$CC ./configure --prefix=/usr --with-curl
diff --git a/extras/iproute2.sh b/extras/iproute2.sh
@@ -9,7 +9,7 @@ die() {
command -v make || die "Run /bootstrap-make.sh"
command -v pkg-config || die "Run /bootstrap-pkgconf.sh"
-tar xof /iproute2-*.tar.gz
+tar xof /distfiles/iproute2-*.tar.gz
cd ./iproute2-*/
./configure --prefix /usr
diff --git a/extras/lua.sh b/extras/lua.sh
@@ -3,7 +3,7 @@ set -ex
# TODO (need ed / sed -i): https://www.lua.org/tests/lua-5.4.6-tests.tar.gz
-tar xof /lua-*.tar.gz
+tar xof /distfiles/lua-*.tar.gz
cd lua-*/
pdpmake -C src all CC="$CC -std=gnu99" SYSCFLAGS="-DLUA_USE_LINUX" RANLIB=true
diff --git a/extras/make.sh b/extras/make.sh
@@ -2,8 +2,7 @@
set -ex
P="make-4.4.1"
-gzip -d -k /${P}.tar.gz
-tar xof /${P}.tar
+tar xof /distfiles/${P}.tar.gz
cd ./$P
export LD="tcc"
@@ -14,4 +13,4 @@ pdpmake ARFLAGS='-r'
pdpmake install INSTALL=install
cd ..
-rm -r ./$P /${P}.tar
+rm -r ./$P
diff --git a/extras/mdevd.sh b/extras/mdevd.sh
@@ -9,7 +9,7 @@ die() {
command -v make || die "Run /bootstrap-make.sh"
test -f /usr/lib/libskarnet.so || die "Run /bootstrap-skalibs.sh"
-tar xof /mdevd-*.tar.gz
+tar xof /distfiles/mdevd-*.tar.gz
cd mdevd-*/
sed 's;-iquote ;-I;' configure > configure.new
diff --git a/extras/pkgconf.sh b/extras/pkgconf.sh
@@ -6,7 +6,7 @@ die() {
exit 1
}
-tar xof /pkgconf-*.tar.gz
+tar xof /distfiles/pkgconf-*.tar.gz
cd ./pkgconf-*/
export LD="tcc"
diff --git a/extras/skalibs.sh b/extras/skalibs.sh
@@ -8,7 +8,7 @@ die() {
command -v make || die "Run /bootstrap-make.sh"
-tar xof /skalibs-*.tar.gz
+tar xof /distfiles/skalibs-*.tar.gz
cd skalibs-*/
./configure --prefix=/usr
diff --git a/extras/tiny-curl.sh b/extras/tiny-curl.sh
@@ -11,7 +11,7 @@ die() {
# Works with gmake and bmake
command -v make || die "Run /bootstrap-make.sh"
-tar xof /tiny-curl-*.tar.gz
+tar xof /distfiles/tiny-curl-*.tar.gz
cd tiny-curl-*/
LD=$CC ./configure --prefix=/usr --with-bearssl --with-ca-bundle=/usr/share/cacert/cert.pem
diff --git a/extras/xz.sh b/extras/xz.sh
@@ -12,7 +12,7 @@ die() {
# Works with GNU make and bmake
command -v make || die "Run /bootstrap-make.sh"
-tar xof /xz-*.tar.gz
+tar xof /distfiles/xz-*.tar.gz
cd xz-*/
export LD="tcc"
diff --git a/make-root.sh b/make-root.sh
@@ -101,9 +101,10 @@ if ! test "${EXCLUDE_EXTRAS:+y}" = "y"; then
cp "${WORKDIR}/$i" ./"$i" || die "Failed copying $i"
done
+ mkdir -p ./distfiles
for i in $distfiles
do
- cp "${WORKDIR}/distfiles/$i" ./ || die "Failed copying $i"
+ cp "${WORKDIR}/distfiles/$i" ./distfiles/ || die "Failed copying $i"
done
fi
