From: q66 <q66@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] setup/git.sh: fix non-portable sed invocation
Date: Tue, 12 Sep 2023 14:46:14 +0200 [thread overview]
Message-ID: <20230912124614.e8bxHUfXvbs-LJo_RXs6WD-XlNUsomy7Z1SLcU-ior8@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46010@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1318 bytes --]
There is an updated pull request by q66 against master on the void-packages repository
https://github.com/q66/void-packages fix-nonportable-sed
https://github.com/void-linux/void-packages/pull/46010
setup/git.sh: fix non-portable sed invocation
This lets xbps-src work in non-GNU environments.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/46010.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-nonportable-sed-46010.patch --]
[-- Type: text/x-diff, Size: 5864 bytes --]
From 9fa5a9a5a50be4d4b6c17ce25f2f12a30941d045 Mon Sep 17 00:00:00 2001
From: q66 <q66@chimera-linux.org>
Date: Mon, 11 Sep 2023 04:30:55 +0200
Subject: [PATCH 1/2] setup/git.sh: fix non-portable sed invocation
This lets xbps-src work in non-GNU environments.
---
common/environment/setup/git.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/environment/setup/git.sh b/common/environment/setup/git.sh
index bd72f2eae3f07..4a7fa4175d2fe 100644
--- a/common/environment/setup/git.sh
+++ b/common/environment/setup/git.sh
@@ -18,7 +18,7 @@ elif [ -z "${SOURCE_DATE_EPOCH}" ]; then
export SOURCE_DATE_EPOCH="$(stat -c %Y ${XBPS_SRCPKGDIR}/${basepkg}/template)"
else
export SOURCE_DATE_EPOCH=$($XBPS_GIT_CMD -C ${XBPS_DISTDIR} cat-file commit HEAD |
- sed -n '/^committer /{s/.*> \([0-9][0-9]*\) [-+][0-9].*/\1/p;q}')
+ sed -n '/^committer /{s/.*> \([0-9][0-9]*\) [-+][0-9].*/\1/p;q;}')
fi
fi
From f62458e445e285a8873f89edf49eba6f9ce9c353 Mon Sep 17 00:00:00 2001
From: q66 <q66@chimera-linux.org>
Date: Mon, 11 Sep 2023 04:30:55 +0200
Subject: [PATCH 2/2] xbps-src: abstract away non-portable stat(1)
This implements semi-portable abstractions for both GNU and BSD
flavors of stat.
---
common/environment/setup/git.sh | 2 +-
common/hooks/do-fetch/00-distfiles.sh | 2 +-
common/xbps-src/shutils/common.sh | 36 ++++++++++++++++++++++
common/xbps-src/shutils/cross.sh | 2 +-
common/xbps-src/shutils/pkgtarget.sh | 4 +--
common/xbps-src/shutils/purge_distfiles.sh | 4 +--
6 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/common/environment/setup/git.sh b/common/environment/setup/git.sh
index 4a7fa4175d2fe..e3cf48354aff8 100644
--- a/common/environment/setup/git.sh
+++ b/common/environment/setup/git.sh
@@ -15,7 +15,7 @@ elif [ -z "${SOURCE_DATE_EPOCH}" ]; then
fi
# check if the template is under version control:
if [ -n "$basepkg" -a -z "$($XBPS_GIT_CMD -C ${XBPS_SRCPKGDIR}/${basepkg} ls-files template)" ]; then
- export SOURCE_DATE_EPOCH="$(stat -c %Y ${XBPS_SRCPKGDIR}/${basepkg}/template)"
+ export SOURCE_DATE_EPOCH="$(stat_mtime ${XBPS_SRCPKGDIR}/${basepkg}/template)"
else
export SOURCE_DATE_EPOCH=$($XBPS_GIT_CMD -C ${XBPS_DISTDIR} cat-file commit HEAD |
sed -n '/^committer /{s/.*> \([0-9][0-9]*\) [-+][0-9].*/\1/p;q;}')
diff --git a/common/hooks/do-fetch/00-distfiles.sh b/common/hooks/do-fetch/00-distfiles.sh
index 9ce2a1895bd0a..1adb86a516782 100644
--- a/common/hooks/do-fetch/00-distfiles.sh
+++ b/common/hooks/do-fetch/00-distfiles.sh
@@ -253,7 +253,7 @@ hook() {
if [[ $cksum = $filesum ]]; then
dfgood=$((dfgood + 1))
else
- inode=$(stat "$distfile" --printf "%i")
+ inode=$(stat_inode "$distfile")
msg_warn "$pkgver: wrong checksum found for ${curfile} - purging\n"
find ${XBPS_SRCDISTDIR} -inum ${inode} -delete -print
fi
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index fec84c8f85e0d..04247942decf2 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -1,5 +1,41 @@
# vim: set ts=4 sw=4 et:
+# A portable abstraction for stat(1)
+#
+# The stat(1) command has different syntaxes between GNU flavor
+# and BSD flavor; implementations generally follow one or the other
+#
+if ! stat -c "%s" / > /dev/null 2>&1; then
+ # BSD stat
+
+ stat_size() {
+ stat -f %z "$1"
+ }
+
+ stat_inode() {
+ stat -f %i "$1"
+ }
+
+ stat_mtime() {
+ stat -f %m "$1"
+ }
+else
+ # GNU stat
+
+ stat_size() {
+ stat -c %s "$1"
+ }
+
+ stat_inode() {
+ stat -c %i "$1"
+ }
+
+ stat_mtime() {
+ stat -c %Y "$1"
+ }
+fi
+
+
run_func() {
local func="$1" desc="$2" funcname="$3" restoretrap= logpipe= logfile= teepid=
diff --git a/common/xbps-src/shutils/cross.sh b/common/xbps-src/shutils/cross.sh
index fbf22f92b9f5b..c21bab1747875 100644
--- a/common/xbps-src/shutils/cross.sh
+++ b/common/xbps-src/shutils/cross.sh
@@ -16,7 +16,7 @@ remove_pkg_cross_deps() {
$XBPS_REMOVE_XCMD -Ryo > $tmplogf 2>&1
rval=$?
while [ $rval -eq 0 ]; do
- local curs=$(stat -c %s $tmplogf)
+ local curs=$(stat_size $tmplogf)
if [ $curs -eq $prevs ]; then
break
fi
diff --git a/common/xbps-src/shutils/pkgtarget.sh b/common/xbps-src/shutils/pkgtarget.sh
index 54b7c3429c2ff..1e76a1b93b19e 100644
--- a/common/xbps-src/shutils/pkgtarget.sh
+++ b/common/xbps-src/shutils/pkgtarget.sh
@@ -65,11 +65,11 @@ remove_pkg_autodeps() {
remove_pkg_cross_deps
$XBPS_RECONFIGURE_CMD -a >> $tmplogf 2>&1
- prevs=$(stat -c %s $tmplogf)
+ prevs=$(stat_size $tmplogf)
echo yes | $XBPS_REMOVE_CMD -Ryod 2>> $errlogf 1>> $tmplogf
rval=$?
while [ $rval -eq 0 ]; do
- local curs=$(stat -c %s $tmplogf)
+ local curs=$(stat_size $tmplogf)
if [ $curs -eq $prevs ]; then
break
fi
diff --git a/common/xbps-src/shutils/purge_distfiles.sh b/common/xbps-src/shutils/purge_distfiles.sh
index 838ac751684b4..4bd921aa2d469 100644
--- a/common/xbps-src/shutils/purge_distfiles.sh
+++ b/common/xbps-src/shutils/purge_distfiles.sh
@@ -57,7 +57,7 @@ purge_distfiles() {
cur=0
percent=-1
for distfile in ${distfiles[@]}; do
- inode=$(stat "$distfile" --printf "%i")
+ inode=$(stat_inode "$distfile")
if [ -z "${inodes[$inode]}" ]; then
inodes[$inode]="$distfile"
else
@@ -77,7 +77,7 @@ purge_distfiles() {
hash_distfile=${file##*/}
hash=${hash_distfile:0:$HASHLEN}
[ -n "${my_hashes[$hash]}" ] && continue
- inode=$(stat "$file" --printf "%i")
+ inode=$(stat_inode "$file")
echo "Obsolete $hash (inode: $inode)"
( IFS="|"; for f in ${inodes[$inode]}; do rm -vf "$f"; rmdir "${f%/*}" 2>/dev/null; done )
done
next prev parent reply other threads:[~2023-09-12 12:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-11 2:31 [PR PATCH] " q66
2023-09-11 11:38 ` q66
2023-09-12 3:41 ` [PR PATCH] [Updated] " q66
2023-09-12 3:41 ` q66
2023-09-12 4:18 ` [PR REVIEW] " sgn
2023-09-12 12:46 ` q66 [this message]
2023-09-14 1:49 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230912124614.e8bxHUfXvbs-LJo_RXs6WD-XlNUsomy7Z1SLcU-ior8@z \
--to=q66@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).