From a56fc8a1217b19d8b704d5caa7f86ce052ded3d3 Mon Sep 17 00:00:00 2001 From: psykose Date: Mon, 3 Apr 2023 06:57:39 +0000 Subject: [PATCH] abr: add rootbld eatmydata --- abr/APKBUILD | 4 ++-- abr/abr | 29 +++++++++++++++++++++-------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/abr/APKBUILD b/abr/APKBUILD index 08ba94c..3c3ffb6 100644 --- a/abr/APKBUILD +++ b/abr/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: psykose pkgname=abr -pkgver=3 +pkgver=4 pkgrel=0 pkgdesc="abr~!" url="https://git.ddd.rip/ptrcnull/aports" @@ -40,6 +40,6 @@ package() { } sha512sums=" -3e24e18734af45abce844bb7d14e325fc8b7661b21c045f0edd0abfebac3ecdb866322ef2d36a14a7f3c28d2730ee3a93eb859f74f69c4caf9e20a209d6ace2a abr +9b05f5dec556feb26079637f7a1b0fcde4233fbf6803377c67b29700e264b467617b86e696b1274ee4de6cdb850585453ef76983d92ce65846b6e9efa0c83330 abr 71d8cb1e5e57ff739915fa4de1f5699afa60ab36e2e5219c4c366af5ceab24dc6ee55e738d29ca2b63dd5e387de7661594fc86bf2183d787932e75b4c03c6a9f apkbuild-anitya " diff --git a/abr/abr b/abr/abr index c2b68db..d9becb3 100755 --- a/abr/abr +++ b/abr/abr @@ -33,6 +33,9 @@ while getopts "j:fmnsx" opt; do # also run checksum/checkapk full=1 ;; + 'h') + nofsynchack=1 + ;; 'm') # don't set LD_PRELOAD for another alloc # since i set this normally, this unexports it. @@ -61,19 +64,29 @@ shift "$((OPTIND - 1))" # loop again to check if rootbld for arg; do - if eltest "$arg" =~ "rootbld" || [ -n "$nosccache" ]; then - # pointless in rootbld - # TODO: maybe we can mount something into rootbld without patches - : - else - extra="$extra sccache" - export RUSTC_WRAPPER=sccache + if eltest "$arg" =~ "rootbld"; then + rootbld=1 fi done +if [ -n "$rootbld" ]; then + if [ -z "$nofsynchack" ]; then + # in rootbld, should be safe to skip fsync + extra="$extra libeatmydata" + export LD_PRELOAD="$LD_PRELOAD /usr/lib/libeatmydata.so" + fi +else + if [ -z "$nosccache" ]; then + # not rootbld use sccache + # TODO: maybe we can mount something into rootbld without patches + extra="$extra sccache" + export RUSTC_WRAPPER=sccache + fi +fi + if [ -z "$nomemhack" ]; then extra="$extra scudo-malloc" - export LD_PRELOAD="/usr/lib/libscudo.so" + export LD_PRELOAD="$LD_PRELOAD /usr/lib/libscudo.so" fi if [ -z "$nonice" ]; then