Module Name: src
Committed By: martin
Date: Thu Nov 14 13:58:22 UTC 2019
Modified Files:
src/usr.sbin/sysinst: Makefile.inc defs.h util.c
Log Message:
Make tar extraction flags depend on our usage of pax-as-tar or bsdtar.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/sysinst/Makefile.inc
cvs rdiff -u -r1.47 -r1.48 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/Makefile.inc
diff -u src/usr.sbin/sysinst/Makefile.inc:1.29 src/usr.sbin/sysinst/Makefile.inc:1.30
--- src/usr.sbin/sysinst/Makefile.inc:1.29 Wed Nov 13 18:57:26 2019
+++ src/usr.sbin/sysinst/Makefile.inc Thu Nov 14 13:58:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.29 2019/11/13 18:57:26 martin Exp $
+# $NetBSD: Makefile.inc,v 1.30 2019/11/14 13:58:22 martin Exp $
#
# Makefile for sysinst
@@ -68,6 +68,10 @@ MSG_CMP_SH= ${.CURDIR}/../../msg_cmp.sh
SETS_TAR_SUFF=${"${USE_XZ_SETS:Uno}"!="no":?"tar.xz":"tgz"}
+.if ${MKBSDTAR:Uno} == "no"
+CPPFLAGS+= -DUSING_PAXASTAR
+.endif
+
CATALOGDIR= /usr/share/sysinst/catalog
CPPFLAGS+= -I. -I${.CURDIR}/../.. -I${.CURDIR} \
-I${.CURDIR}/../../../../sbin/fsck \
Index: src/usr.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.47 src/usr.sbin/sysinst/defs.h:1.48
--- src/usr.sbin/sysinst/defs.h:1.47 Wed Nov 13 18:57:26 2019
+++ src/usr.sbin/sysinst/defs.h Thu Nov 14 13:58:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.47 2019/11/13 18:57:26 martin Exp $ */
+/* $NetBSD: defs.h,v 1.48 2019/11/14 13:58:22 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -508,6 +508,12 @@ int clean_xfer_dir;
#define SETS_TAR_SUFF "tgz"
#endif
+#ifdef USING_PAXASTAR
+#define TAR_EXTRACT_FLAGS "-xhepf"
+#else
+#define TAR_EXTRACT_FLAGS "-xpPf"
+#endif
+
/* Abs. path we extract binary sets from */
char ext_dir_bin[STRSIZE];
Index: src/usr.sbin/sysinst/util.c
diff -u src/usr.sbin/sysinst/util.c:1.37 src/usr.sbin/sysinst/util.c:1.38
--- src/usr.sbin/sysinst/util.c:1.37 Wed Nov 13 18:57:26 2019
+++ src/usr.sbin/sysinst/util.c Thu Nov 14 13:58:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.37 2019/11/13 18:57:26 martin Exp $ */
+/* $NetBSD: util.c,v 1.38 2019/11/14 13:58:22 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -975,7 +975,8 @@ extract_file(distinfo *dist, int update)
/* now extract set files into "./". */
rval = run_program(RUN_DISPLAY | RUN_PROGRESS,
- "progress -zf %s tar --chroot -xpPf -", path);
+ "progress -zf %s tar --chroot "
+ TAR_EXTRACT_FLAGS " -", path);
chdir(owd);
free(owd);
