From 6ca4ad4d8ade517460a8894b756e7891f6707073 Mon Sep 17 00:00:00 2001 From: Ella-0 <23418164+Ella-0@users.noreply.github.com> Date: Thu, 20 May 2021 22:09:29 +0100 Subject: [PATCH] disabled march native by default, switch to zstd compression for packages and switched to toybox tar --- iglupkg.sh | 13 ++++++++----- pkgs/busybox/build.sh | 1 + pkgs/toybox/build.sh | 3 ++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/iglupkg.sh b/iglupkg.sh index 5f1fd75..bc54b82 100755 --- a/iglupkg.sh +++ b/iglupkg.sh @@ -1,12 +1,12 @@ #!/bin/sh export JOBS="$(nproc)" -export RUSTFLAGS="-C target-cpu=native" +#export RUSTFLAGS="-C target-cpu=native" export CC=clang export CXX=clang++ -export CFLAGS="-march=native" -export CXXFLAGS="-march=native" +#export CFLAGS="-march=native" +#export CXXFLAGS="-march=native" stat /etc/iglupkg.conf > /dev/null 2> /dev/null && . /etc/iglupkg.conf @@ -26,6 +26,9 @@ function do_fetch() { srcdir=$(pwd)/src stat src > /dev/null 2>/dev/null || do_fetch +stat src > /dev/null 2>/dev/null && echo '==========================================' +stat src > /dev/null 2>/dev/null && echo 'Warning: `./src/` found: not running fetch' +stat src > /dev/null 2>/dev/null && echo '==========================================' cd $srcdir @@ -60,7 +63,7 @@ cd $dir/out/$pkgname/ find * >> $dir/out/$pkgname/usr/share/iglupkg/$pkgname cd $dir/out/$pkgname -tar -cf ../$pkgname.$pkgver.tar.xz * +tar -I zstd -cf ../$pkgname.$pkgver.tar.zst * if [ $ext ]; then echo $ext | tr ':' '\n' | while read e; do @@ -95,7 +98,7 @@ EOF find * >> $dir/out/$pkgname-\$e/usr/share/iglupkg/$pkgname-\$e cd $dir/out/$pkgname-\$e - tar -cf ../$pkgname-\$e.$pkgver.tar.xz * + tar -I zstd -cf ../$pkgname-\$e.$pkgver.tar.zst * done diff --git a/pkgs/busybox/build.sh b/pkgs/busybox/build.sh index 45c3a7c..aaad8b2 100644 --- a/pkgs/busybox/build.sh +++ b/pkgs/busybox/build.sh @@ -78,6 +78,7 @@ package() { rm $pkgdir/bin/true rm $pkgdir/bin/umount rm $pkgdir/bin/usleep + rm $pkgdir/bin/tar rm $pkgdir/sbin/blockdev rm $pkgdir/sbin/freeramdisk diff --git a/pkgs/toybox/build.sh b/pkgs/toybox/build.sh index dd9a5c8..981af97 100644 --- a/pkgs/toybox/build.sh +++ b/pkgs/toybox/build.sh @@ -29,7 +29,8 @@ package() { gmake PREFIX=$pkgdir install rm $pkgdir/usr/bin/clear - rm $pkgdir/usr/bin/tar + rm $pkgdir/usr/bin/reset +# rm $pkgdir/usr/bin/tar } license() {