diff options
| author | davidovski <david@davidovski.xyz> | 2022-06-06 14:05:30 +0100 | 
|---|---|---|
| committer | davidovski <david@davidovski.xyz> | 2022-06-06 14:05:30 +0100 | 
| commit | a84f62f95abe203970efe15c25cf9f74328d0efc (patch) | |
| tree | b88eeb1666c5be7a213bed5e4cdfce1639daf26c | |
| parent | 72807ab22c0d44ff7dcadb154b35d550a207b34d (diff) | |
fixed date formatting
| -rw-r--r-- | xi_buildscript.sh | 5 | ||||
| -rw-r--r-- | xibuild.sh | 9 | 
2 files changed, 10 insertions, 4 deletions
| diff --git a/xi_buildscript.sh b/xi_buildscript.sh index a60efe9..b465c74 100644 --- a/xi_buildscript.sh +++ b/xi_buildscript.sh @@ -67,10 +67,11 @@ for xibuild in $PKG_NAME.xibuild $(ls *.xibuild | grep -v "^$PKG_NAME.xibuild$")          fi          for t in $stages; do -            type $t >/dev/null && { +            type $t >/dev/null 2>/dev/null && {                  echo "==========================$t stage=========================="                  $t || exit 1              }          done -  done + +exit 0 @@ -149,7 +149,12 @@ xibuild_strip () {              strip --strip-unneeded $file 2>&1 -            ldd $file 2>/dev/null | grep "=>" | cut -d"=>" -f2 | awk '{ print $1 }' | xargs xi -r $root -q file >> $out_dir/$pkgname.deps  +            { +                [ "$root" = "/" ] \ +                    && ldd $file \ +                    || xichroot "$root" ldd "${file#$root}" +            } 2>>$logfile | grep "=>" | cut -d"=>" -f2 | awk '{ print $1 }' \ +              | xargs xi -r $root -q file 2>>$logfile >> $out_dir/$pkgname.deps           done      done @@ -204,7 +209,7 @@ xibuild_describe () {              echo "VERSION=$pkg_ver"              echo "REVISION=$(cat ${buildfile%/*}/*.xibuild | sha512sum | cut -d' ' -f1)"              echo "SOURCE=$SOURCE" -            echo "DATE=$(stat -t $xipkg | cut -d' ' -f13 | xargs date -d)" +            echo "DATE=$(date -d @$(stat -t $xipkg | cut -d' ' -f13))"              echo "DEPS=${deps}"              echo "MAKE_DEPS=${MAKE_DEPS} ${DEPS}"              echo "ORIGIN=$NAME" | 
