Module Name: src
Committed By: martin
Date: Mon Oct 1 17:50:08 UTC 2018
Modified Files:
src/distrib/alpha/instkernel/ramdisk: list
src/distrib/amd64/ramdisks/common: list.ramdisk
src/distrib/sparc64/instfs: list
src/distrib/utils/x_gzip: Makefile
Log Message:
Make gzip on some crunched install media support xz decompression
(just like our base version does).
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/distrib/alpha/instkernel/ramdisk/list
cvs rdiff -u -r1.20 -r1.21 src/distrib/amd64/ramdisks/common/list.ramdisk
cvs rdiff -u -r1.27 -r1.28 src/distrib/sparc64/instfs/list
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/x_gzip/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/alpha/instkernel/ramdisk/list
diff -u src/distrib/alpha/instkernel/ramdisk/list:1.45 src/distrib/alpha/instkernel/ramdisk/list:1.46
--- src/distrib/alpha/instkernel/ramdisk/list:1.45 Sat Aug 2 19:35:13 2014
+++ src/distrib/alpha/instkernel/ramdisk/list Mon Oct 1 17:50:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.45 2014/08/02 19:35:13 martin Exp $
+# $NetBSD: list,v 1.46 2018/10/01 17:50:08 martin Exp $
SRCDIRS bin sbin external/bsd/less/bin usr.bin usr.sbin
@@ -61,7 +61,7 @@ ARGVLN sh -sh
SPECIAL gzip srcdir distrib/utils/x_gzip
SPECIAL ping srcdir distrib/utils/x_ping
-LIBS -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop
+LIBS -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -llzma -lprop
# we need the boot blocks /usr/mdec
COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot
Index: src/distrib/amd64/ramdisks/common/list.ramdisk
diff -u src/distrib/amd64/ramdisks/common/list.ramdisk:1.20 src/distrib/amd64/ramdisks/common/list.ramdisk:1.21
--- src/distrib/amd64/ramdisks/common/list.ramdisk:1.20 Wed Oct 7 14:09:04 2015
+++ src/distrib/amd64/ramdisks/common/list.ramdisk Mon Oct 1 17:50:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: list.ramdisk,v 1.20 2015/10/07 14:09:04 martin Exp $
+# $NetBSD: list.ramdisk,v 1.21 2018/10/01 17:50:08 martin Exp $
SRCDIRS external/bsd/less/bin
SRCDIRS bin sbin usr.bin usr.sbin libexec
@@ -66,7 +66,7 @@ SPECIAL route srcdir distrib/utils/x_ro
ARGVLN sh -sh
# libhack.o is built by Makefile & included Makefile.inc
-LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop
+LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -llzma -lprop
# various files that we need in /etc for the install
COPY ${NETBSDSRCDIR}/etc/group etc/group
Index: src/distrib/sparc64/instfs/list
diff -u src/distrib/sparc64/instfs/list:1.27 src/distrib/sparc64/instfs/list:1.28
--- src/distrib/sparc64/instfs/list:1.27 Fri Sep 28 15:05:23 2018
+++ src/distrib/sparc64/instfs/list Mon Oct 1 17:50:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.27 2018/09/28 15:05:23 martin Exp $
+# $NetBSD: list,v 1.28 2018/10/01 17:50:08 martin Exp $
SRCDIRS bin sbin libexec external/bsd/less/bin usr.bin usr.sbin
@@ -79,7 +79,7 @@ SPECIAL route srcdir distrib/utils/x_ro
# SPECIAL xz srcdir external/public-domain/xz/bin
LIBS libhack.o
-LIBS -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lpcap -lz -lprop
+LIBS -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lpcap -lz -llzma -lprop
# various files that we need in /etc for the install
COPY ${NETBSDSRCDIR}/etc/group etc/group
Index: src/distrib/utils/x_gzip/Makefile
diff -u src/distrib/utils/x_gzip/Makefile:1.8 src/distrib/utils/x_gzip/Makefile:1.9
--- src/distrib/utils/x_gzip/Makefile:1.8 Sun Jun 19 01:25:35 2011
+++ src/distrib/utils/x_gzip/Makefile Mon Oct 1 17:50:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/06/19 01:25:35 tsutsui Exp $
+# $NetBSD: Makefile,v 1.9 2018/10/01 17:50:08 martin Exp $
# Build a tiny limited gzip (i.e. for tiny boot media)
SRCDIR= ${.CURDIR}/../../../usr.bin/gzip
@@ -10,10 +10,12 @@ CPPFLAGS+= -DSMALL
CPPFLAGS+= -DNO_BZIP2_SUPPORT
CPPFLAGS+= -DNO_COMPRESS_SUPPORT
CPPFLAGS+= -DNO_PACK_SUPPORT
-CPPFLAGS+= -DNO_XZ_SUPPORT
+CPPFLAGS+= ${"${USE_XZ_SETS:Uno}"!="no":?:-DNO_XZ_SUPPORT}
-DPADD= ${LIBZ}
-LDADD= -lz
+# for crunched binaries this does not take effect, also check the
+# LIBS entry in the lists file
+DPADD= ${LIBZ} ${LIBLZMA}
+LDADD= -lz -llzma
.include <bsd.prog.mk>
