mk: pass --no-xattrs to tar by default Slightly improve the GITHUB_SUBMODULES change which _always_ overrode EXTRACT_OPTS_TAR.diff -r1.21 -r1.22 pkgsrc/mk/extract/extract
(wiz)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: extract,v 1.21 2022/01/06 10:30:50 schmonz Exp $
+# $NetBSD: extract,v 1.22 2024/04/28 18:07:33 wiz Exp $
#
# Copyright (c) 2006 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -258,7 +258,7 @@
$paxprog ${EXTRACT_OPTS_PAX} $exclude_flag -O -r ${1+"$@"}
;;
*tar)
- : ${EXTRACT_OPTS_TAR=}
+ : ${EXTRACT_OPTS_TAR=--no-xattrs}
case "$extract_using" in
/*) tarprog="$extract_using" ;;
*) tarprog="${TAR}" ;;
@@ -1,4 +1,4 @@
-# $NetBSD: extract.mk,v 1.44 2022/11/23 13:30:38 jperkin Exp $
+# $NetBSD: extract.mk,v 1.45 2024/04/28 18:07:33 wiz Exp $
#
# The following variables may be set by the package Makefile and
# specify how extraction happens:
@@ -220,7 +220,7 @@
do-extract: ${WRKDIR}
. for f in ${EXTRACT_ONLY}
${RUN} extract_file=${_DISTDIR:Q}/${f:Q}; export extract_file; \
- EXTRACT_OPTS_TAR=${EXTRACT_OPTS_TAR.${f}}; export EXTRACT_OPTS_TAR; \
+ if [ "" != "${EXTRACT_OPTS_TAR.${f}}" ]; then EXTRACT_OPTS_TAR=${EXTRACT_OPTS_TAR.${f}}; export EXTRACT_OPTS_TAR; fi; \
cd ${WRKDIR} && cd ${EXTRACT_DIR.${f}} && ${EXTRACT_CMD}
. endfor
.endif