Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Mar 2019 18:49:45 +0000 (UTC)
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r345344 - in stable/11: share/man/man4 sys/conf sys/contrib/xz-embedded/freebsd sys/dev/xz sys/geom/uzip sys/mips/conf sys/modules sys/modules/geom/geom_uzip sys/modules/xz
Message-ID:  <201903201849.x2KInjeF063491@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kib
Date: Wed Mar 20 18:49:45 2019
New Revision: 345344
URL: https://svnweb.freebsd.org/changeset/base/345344

Log:
  MFC r344479 (by sobomax), r344605:
  Modularize xz.

Added:
  stable/11/sys/dev/xz/
     - copied from r344605, head/sys/dev/xz/
  stable/11/sys/modules/xz/
     - copied from r344605, head/sys/modules/xz/
Deleted:
  stable/11/sys/contrib/xz-embedded/freebsd/xz_malloc.c
Modified:
  stable/11/share/man/man4/geom_uzip.4
  stable/11/sys/conf/NOTES
  stable/11/sys/conf/files
  stable/11/sys/contrib/xz-embedded/freebsd/xz_config.h
  stable/11/sys/geom/uzip/g_uzip.c
  stable/11/sys/geom/uzip/g_uzip_lzma.c
  stable/11/sys/mips/conf/ALFA_HORNET_UB
  stable/11/sys/mips/conf/AP121
  stable/11/sys/mips/conf/AP135
  stable/11/sys/mips/conf/AP143
  stable/11/sys/mips/conf/AP91
  stable/11/sys/mips/conf/AP93
  stable/11/sys/mips/conf/AP94
  stable/11/sys/mips/conf/AP96
  stable/11/sys/mips/conf/BCM
  stable/11/sys/mips/conf/CARAMBOLA2
  stable/11/sys/mips/conf/DB120
  stable/11/sys/mips/conf/DIR-655A1
  stable/11/sys/mips/conf/DIR-825B1
  stable/11/sys/mips/conf/ENH200
  stable/11/sys/mips/conf/MT7620
  stable/11/sys/mips/conf/MT7620A_FDT
  stable/11/sys/mips/conf/MT7620N_FDT
  stable/11/sys/mips/conf/MT7621_FDT
  stable/11/sys/mips/conf/MT7628_FDT
  stable/11/sys/mips/conf/ONIONOMEGA
  stable/11/sys/mips/conf/PB47
  stable/11/sys/mips/conf/PB92
  stable/11/sys/mips/conf/PICOSTATION_M2HP
  stable/11/sys/mips/conf/ROUTERSTATION
  stable/11/sys/mips/conf/ROUTERSTATION_MFS
  stable/11/sys/mips/conf/RSPRO
  stable/11/sys/mips/conf/RSPRO_MFS
  stable/11/sys/mips/conf/RSPRO_STANDALONE
  stable/11/sys/mips/conf/RT3050_FDT
  stable/11/sys/mips/conf/RT3352_FDT
  stable/11/sys/mips/conf/RT3883_FDT
  stable/11/sys/mips/conf/RT5350
  stable/11/sys/mips/conf/RT5350_FDT
  stable/11/sys/mips/conf/TL-ARCHERC7V2
  stable/11/sys/mips/conf/TL-WDR4300
  stable/11/sys/mips/conf/TL-WR1043NDv2
  stable/11/sys/mips/conf/TL-WR740Nv4
  stable/11/sys/mips/conf/TP-WN1043ND
  stable/11/sys/mips/conf/WZR-300HP
  stable/11/sys/mips/conf/WZR-HPAG300H
  stable/11/sys/mips/conf/std.XLP
  stable/11/sys/modules/Makefile
  stable/11/sys/modules/geom/geom_uzip/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/man/man4/geom_uzip.4
==============================================================================
--- stable/11/share/man/man4/geom_uzip.4	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/share/man/man4/geom_uzip.4	Wed Mar 20 18:49:45 2019	(r345344)
@@ -36,6 +36,7 @@ To compile this driver into the kernel,
 place the following line in your
 kernel configuration file:
 .Bd -ragged -offset indent
+.Cd "device xz"
 .Cd "options GEOM_UZIP"
 .Ed
 .Pp

Modified: stable/11/sys/conf/NOTES
==============================================================================
--- stable/11/sys/conf/NOTES	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/conf/NOTES	Wed Mar 20 18:49:45 2019	(r345344)
@@ -3073,3 +3073,5 @@ options 	EVDEV_SUPPORT	# evdev support in legacy drive
 options 	EVDEV_DEBUG	# enable event debug msgs
 device		uinput		# install /dev/uinput cdev
 options 	UINPUT_DEBUG	# enable uinput debug msgs
+
+device		xz		# xz_embedded LZMA de-compression library

Modified: stable/11/sys/conf/files
==============================================================================
--- stable/11/sys/conf/files	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/conf/files	Wed Mar 20 18:49:45 2019	(r345344)
@@ -633,6 +633,17 @@ contrib/ngatm/netnatm/sig/sig_unimsgcpy.c optional nga
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/sig/sig_verify.c optional ngatm_uni \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+# xz
+dev/xz/xz_mod.c	optional xz \
+	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
+contrib/xz-embedded/linux/lib/xz/xz_crc32.c	optional xz \
+	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
+contrib/xz-embedded/linux/lib/xz/xz_dec_bcj.c	optional xz \
+	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
+contrib/xz-embedded/linux/lib/xz/xz_dec_lzma2.c	optional xz \
+	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
+contrib/xz-embedded/linux/lib/xz/xz_dec_stream.c optional xz \
+	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
 crypto/blowfish/bf_ecb.c	optional ipsec | ipsec_support
 crypto/blowfish/bf_skey.c	optional crypto | ipsec | ipsec_support
 crypto/camellia/camellia.c	optional crypto | ipsec | ipsec_support
@@ -3507,21 +3518,6 @@ geom/raid3/g_raid3.c		optional geom_raid3
 geom/raid3/g_raid3_ctl.c	optional geom_raid3
 geom/shsec/g_shsec.c		optional geom_shsec
 geom/stripe/g_stripe.c		optional geom_stripe
-contrib/xz-embedded/freebsd/xz_malloc.c	\
-	optional xz_embedded | geom_uzip \
-	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
-contrib/xz-embedded/linux/lib/xz/xz_crc32.c \
-	optional xz_embedded | geom_uzip \
-	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
-contrib/xz-embedded/linux/lib/xz/xz_dec_bcj.c \
-	optional xz_embedded | geom_uzip \
-	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
-contrib/xz-embedded/linux/lib/xz/xz_dec_lzma2.c \
-	optional xz_embedded | geom_uzip \
-	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
-contrib/xz-embedded/linux/lib/xz/xz_dec_stream.c \
-	optional xz_embedded | geom_uzip \
-	compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
 geom/uzip/g_uzip.c		optional geom_uzip
 geom/uzip/g_uzip_lzma.c		optional geom_uzip
 geom/uzip/g_uzip_wrkthr.c	optional geom_uzip

Modified: stable/11/sys/contrib/xz-embedded/freebsd/xz_config.h
==============================================================================
--- stable/11/sys/contrib/xz-embedded/freebsd/xz_config.h	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/contrib/xz-embedded/freebsd/xz_config.h	Wed Mar 20 18:49:45 2019	(r345344)
@@ -35,7 +35,6 @@
 #include <contrib/xz-embedded/linux/include/linux/xz.h>
 #include "xz_malloc.h"
 
-#define	XZ_DEC_SINGLE	1
 #define	XZ_PREBOOT	1
 
 #undef	XZ_EXTERN

Modified: stable/11/sys/geom/uzip/g_uzip.c
==============================================================================
--- stable/11/sys/geom/uzip/g_uzip.c	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/geom/uzip/g_uzip.c	Wed Mar 20 18:49:45 2019	(r345344)
@@ -898,5 +898,6 @@ static struct g_class g_uzip_class = {
 };
 
 DECLARE_GEOM_CLASS(g_uzip_class, g_uzip);
+MODULE_DEPEND(g_uzip, xz, 1, 1, 1);
 MODULE_DEPEND(g_uzip, zlib, 1, 1, 1);
 MODULE_VERSION(geom_uzip, 0);

Modified: stable/11/sys/geom/uzip/g_uzip_lzma.c
==============================================================================
--- stable/11/sys/geom/uzip/g_uzip_lzma.c	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/geom/uzip/g_uzip_lzma.c	Wed Mar 20 18:49:45 2019	(r345344)
@@ -103,7 +103,6 @@ g_uzip_lzma_ctor(uint32_t blksz)
 	struct g_uzip_lzma *lzp;
 
 	lzp = malloc(sizeof(struct g_uzip_lzma), M_GEOM_UZIP, M_WAITOK);
-	xz_crc32_init();
 	lzp->s = xz_dec_init(XZ_SINGLE, 0);
 	if (lzp->s == NULL) {
 		goto e1;

Modified: stable/11/sys/mips/conf/ALFA_HORNET_UB
==============================================================================
--- stable/11/sys/mips/conf/ALFA_HORNET_UB	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/ALFA_HORNET_UB	Wed Mar 20 18:49:45 2019	(r345344)
@@ -49,7 +49,7 @@ device		arswitch
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
-device		geom_uzip
+device		xz
 options 	GEOM_UZIP
 
 # Used for the static uboot partition map

Modified: stable/11/sys/mips/conf/AP121
==============================================================================
--- stable/11/sys/mips/conf/AP121	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/AP121	Wed Mar 20 18:49:45 2019	(r345344)
@@ -43,7 +43,7 @@ device		arswitch
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
-device		geom_uzip
+device		xz
 options 	GEOM_UZIP
 
 # Used for the static uboot partition map

Modified: stable/11/sys/mips/conf/AP135
==============================================================================
--- stable/11/sys/mips/conf/AP135	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/AP135	Wed Mar 20 18:49:45 2019	(r345344)
@@ -46,7 +46,7 @@ device		arswitch
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
-device		geom_uzip
+device		xz
 options 	GEOM_UZIP
 
 # Used for the static uboot partition map

Modified: stable/11/sys/mips/conf/AP143
==============================================================================
--- stable/11/sys/mips/conf/AP143	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/AP143	Wed Mar 20 18:49:45 2019	(r345344)
@@ -43,7 +43,7 @@ device		arswitch
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
-device		geom_uzip
+device		xz
 options 	GEOM_UZIP
 
 # Used for the static uboot partition map

Modified: stable/11/sys/mips/conf/AP91
==============================================================================
--- stable/11/sys/mips/conf/AP91	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/AP91	Wed Mar 20 18:49:45 2019	(r345344)
@@ -38,7 +38,7 @@ options 	NO_SWAPPING
 # options 	MSDOSFS
 
 # uncompress - to boot read-only lzma natively from flash
-device		geom_uzip
+device		xz
 options 	GEOM_UZIP
 options 	ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
 

Modified: stable/11/sys/mips/conf/AP93
==============================================================================
--- stable/11/sys/mips/conf/AP93	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/AP93	Wed Mar 20 18:49:45 2019	(r345344)
@@ -26,7 +26,7 @@ options 	AR71XX_ENV_UBOOT
 options 	MSDOSFS
 
 # uncompress - to boot read-only lzma natively from flash
-device		geom_uzip
+device		xz
 options 	GEOM_UZIP
 options 	ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
 

Modified: stable/11/sys/mips/conf/AP94
==============================================================================
--- stable/11/sys/mips/conf/AP94	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/AP94	Wed Mar 20 18:49:45 2019	(r345344)
@@ -21,7 +21,7 @@ hints		"AP94.hints"
 
 # GEOM modules
 device		geom_redboot	# to get access to the SPI flash partitions
-device		geom_uzip	# compressed in-memory filesystem hackery!
+device		xz
 options 	GEOM_UZIP
 
 options 	ROOTDEVNAME=\"ufs:md0.uzip\"

Modified: stable/11/sys/mips/conf/AP96
==============================================================================
--- stable/11/sys/mips/conf/AP96	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/AP96	Wed Mar 20 18:49:45 2019	(r345344)
@@ -27,7 +27,7 @@ options 	AR71XX_ENV_UBOOT
 options 	MSDOSFS
 
 # uncompress - to boot read-only lzma natively from flash
-device		geom_uzip
+device		xz
 options 	GEOM_UZIP
 options 	ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
 

Modified: stable/11/sys/mips/conf/BCM
==============================================================================
--- stable/11/sys/mips/conf/BCM	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/BCM	Wed Mar 20 18:49:45 2019	(r345344)
@@ -36,7 +36,7 @@ options         SOFTUPDATES             #Enable FFS so
 options         UFS_ACL                 #Support for access control lists
 options         UFS_DIRHASH             #Improve performance on big directories
 
-device		geom_uzip
+device		xz
 options		GEOM_UZIP
 options		GEOM_LABEL		# Providers labelization.
 options		ROOTDEVNAME=\"ufs:ufs/FBSD\"	# assumes FW built by 

Modified: stable/11/sys/mips/conf/CARAMBOLA2
==============================================================================
--- stable/11/sys/mips/conf/CARAMBOLA2	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/CARAMBOLA2	Wed Mar 20 18:49:45 2019	(r345344)
@@ -45,7 +45,7 @@ device		arswitch
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
-device		geom_uzip
+device		xz
 options 	GEOM_UZIP
 
 # Used for the static uboot partition map

Modified: stable/11/sys/mips/conf/DB120
==============================================================================
--- stable/11/sys/mips/conf/DB120	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/DB120	Wed Mar 20 18:49:45 2019	(r345344)
@@ -38,7 +38,7 @@ device		arswitch
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
-device		geom_uzip
+device		xz
 options 	GEOM_UZIP
 
 # Used for the static uboot partition map

Modified: stable/11/sys/mips/conf/DIR-655A1
==============================================================================
--- stable/11/sys/mips/conf/DIR-655A1	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/DIR-655A1	Wed Mar 20 18:49:45 2019	(r345344)
@@ -41,7 +41,7 @@ device		arswitch
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
-device		geom_uzip
+device		xz
 options 	GEOM_UZIP
 
 # Used for the static uboot partition map

Modified: stable/11/sys/mips/conf/DIR-825B1
==============================================================================
--- stable/11/sys/mips/conf/DIR-825B1	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/DIR-825B1	Wed Mar 20 18:49:45 2019	(r345344)
@@ -54,7 +54,7 @@ options 	NO_SYSCTL_DESCR
 
 # GEOM modules
 device		geom_map	# to get access to the SPI flash partitions
-device		geom_uzip	# compressed in-memory filesystem hackery!
+device		xz
 options 	GEOM_UZIP
 options 	GEOM_PART_GPT
 

Modified: stable/11/sys/mips/conf/ENH200
==============================================================================
--- stable/11/sys/mips/conf/ENH200	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/ENH200	Wed Mar 20 18:49:45 2019	(r345344)
@@ -26,7 +26,7 @@ options 	AR71XX_ENV_UBOOT
 options 	MSDOSFS
 
 # uncompress - to boot read-only lzma natively from flash
-device		geom_uzip
+device		xz
 options 	GEOM_UZIP
 options 	ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
 

Modified: stable/11/sys/mips/conf/MT7620
==============================================================================
--- stable/11/sys/mips/conf/MT7620	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/MT7620	Wed Mar 20 18:49:45 2019	(r345344)
@@ -93,6 +93,7 @@ options 	FFS			#Berkeley Fast Filesystem
 options         MROUTING                # Multicast routing
 options 	IPFIREWALL_DEFAULT_TO_ACCEPT
 
+device		xz
 options		GEOM_UZIP
 options		MD_ROOT
 options		ROOTDEVNAME=\"ufs:da0s1\"

Modified: stable/11/sys/mips/conf/MT7620A_FDT
==============================================================================
--- stable/11/sys/mips/conf/MT7620A_FDT	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/MT7620A_FDT	Wed Mar 20 18:49:45 2019	(r345344)
@@ -26,7 +26,7 @@ makeoptions 	MODULES_OVERRIDE=""
 options 	ROOTDEVNAME=\"ufs:md0.uzip\"
 
 # Support geom_uzip(4) compressed disk images
-device 		geom_uzip
+device		xz
 options 	GEOM_UZIP
 
 # Support md(4) and md-based rootfs

Modified: stable/11/sys/mips/conf/MT7620N_FDT
==============================================================================
--- stable/11/sys/mips/conf/MT7620N_FDT	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/MT7620N_FDT	Wed Mar 20 18:49:45 2019	(r345344)
@@ -26,7 +26,7 @@ makeoptions 	MODULES_OVERRIDE=""
 options 	ROOTDEVNAME=\"ufs:md0.uzip\"
 
 # Support geom_uzip(4) compressed disk images
-device 		geom_uzip
+device		xz
 options 	GEOM_UZIP
 
 # Support md(4) and md-based rootfs

Modified: stable/11/sys/mips/conf/MT7621_FDT
==============================================================================
--- stable/11/sys/mips/conf/MT7621_FDT	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/MT7621_FDT	Wed Mar 20 18:49:45 2019	(r345344)
@@ -26,7 +26,7 @@ makeoptions 	MODULES_OVERRIDE=""
 options 	ROOTDEVNAME=\"ufs:md0.uzip\"
 
 # Support geom_uzip(4) compressed disk images
-device 		geom_uzip
+device		xz
 options 	GEOM_UZIP
 
 # Support md(4) and md-based rootfs

Modified: stable/11/sys/mips/conf/MT7628_FDT
==============================================================================
--- stable/11/sys/mips/conf/MT7628_FDT	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/MT7628_FDT	Wed Mar 20 18:49:45 2019	(r345344)
@@ -27,7 +27,7 @@ makeoptions 	MODULES_OVERRIDE=""
 options 	ROOTDEVNAME=\"ufs:md0.uzip\"
 
 # Support geom_uzip(4) compressed disk images
-device 		geom_uzip
+device		xz
 options 	GEOM_UZIP
 
 # Support md(4) and md-based rootfs

Modified: stable/11/sys/mips/conf/ONIONOMEGA
==============================================================================
--- stable/11/sys/mips/conf/ONIONOMEGA	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/ONIONOMEGA	Wed Mar 20 18:49:45 2019	(r345344)
@@ -45,7 +45,7 @@ device		arswitch
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
-device		geom_uzip
+device		xz
 options 	GEOM_UZIP
 
 # Used for the static uboot partition map

Modified: stable/11/sys/mips/conf/PB47
==============================================================================
--- stable/11/sys/mips/conf/PB47	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/PB47	Wed Mar 20 18:49:45 2019	(r345344)
@@ -32,7 +32,7 @@ options 	AR71XX_REALMEM=64*1024*1024
 options 	MSDOSFS
 
 # uncompress - to boot read-only lzma natively from flash
-device		geom_uzip
+device		xz
 options 	GEOM_UZIP
 
 # Used for the static uboot partition map

Modified: stable/11/sys/mips/conf/PB92
==============================================================================
--- stable/11/sys/mips/conf/PB92	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/PB92	Wed Mar 20 18:49:45 2019	(r345344)
@@ -54,7 +54,7 @@ options         FFS                     #Berkeley Fast
 #options         UFS_DIRHASH             #Improve performance on big directories
 
 # Support uncompress lzma rootfs
-device		geom_uzip
+device		xz
 options 	GEOM_UZIP
 options 	ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
 

Modified: stable/11/sys/mips/conf/PICOSTATION_M2HP
==============================================================================
--- stable/11/sys/mips/conf/PICOSTATION_M2HP	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/PICOSTATION_M2HP	Wed Mar 20 18:49:45 2019	(r345344)
@@ -38,7 +38,7 @@ options 	NO_SWAPPING
 # options 	MSDOSFS
 
 # uncompress - to boot read-only lzma natively from flash
-device		geom_uzip
+device		xz
 options 	GEOM_UZIP
 options 	ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
 

Modified: stable/11/sys/mips/conf/ROUTERSTATION
==============================================================================
--- stable/11/sys/mips/conf/ROUTERSTATION	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/ROUTERSTATION	Wed Mar 20 18:49:45 2019	(r345344)
@@ -14,7 +14,7 @@ hints		"ROUTERSTATION.hints"
 
 # GEOM modules
 device		geom_redboot	# to get access to the SPI flash partitions
-device		geom_uzip	# compressed in-memory filesystem support
+device		xz
 options 	GEOM_UZIP
 
 # For DOS

Modified: stable/11/sys/mips/conf/ROUTERSTATION_MFS
==============================================================================
--- stable/11/sys/mips/conf/ROUTERSTATION_MFS	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/ROUTERSTATION_MFS	Wed Mar 20 18:49:45 2019	(r345344)
@@ -12,7 +12,7 @@ hints		"ROUTERSTATION.hints"
 
 # GEOM modules
 device		geom_redboot	# to get access to the SPI flash partitions
-device		geom_uzip	# compressed in-memory filesystem hackery!
+device		xz
 options 	GEOM_UZIP
 
 options 	ROOTDEVNAME=\"ufs:md0.uzip\"

Modified: stable/11/sys/mips/conf/RSPRO
==============================================================================
--- stable/11/sys/mips/conf/RSPRO	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/RSPRO	Wed Mar 20 18:49:45 2019	(r345344)
@@ -15,7 +15,7 @@ device		pcf2123_rtc
 
 # GEOM modules
 device		geom_redboot	# to get access to the SPI flash partitions
-device		geom_uzip	# compressed in-memory filesystem support
+device		xz
 options 	GEOM_UZIP
 
 # For DOS

Modified: stable/11/sys/mips/conf/RSPRO_MFS
==============================================================================
--- stable/11/sys/mips/conf/RSPRO_MFS	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/RSPRO_MFS	Wed Mar 20 18:49:45 2019	(r345344)
@@ -15,7 +15,7 @@ device		pcf2123_rtc
 
 # GEOM modules
 device		geom_redboot	# to get access to the SPI flash partitions
-device		geom_uzip	# compressed in-memory filesystem hackery!
+device		xz
 options 	GEOM_UZIP
 
 # Boot from the first MFS uzip

Modified: stable/11/sys/mips/conf/RSPRO_STANDALONE
==============================================================================
--- stable/11/sys/mips/conf/RSPRO_STANDALONE	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/RSPRO_STANDALONE	Wed Mar 20 18:49:45 2019	(r345344)
@@ -14,7 +14,7 @@ device		pcf2123_rtc
 
 # GEOM modules
 device		geom_redboot	# to get access to the SPI flash partitions
-device		geom_uzip	# compressed in-memory filesystem support
+device		xz
 options 	GEOM_UZIP
 
 # For DOS

Modified: stable/11/sys/mips/conf/RT3050_FDT
==============================================================================
--- stable/11/sys/mips/conf/RT3050_FDT	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/RT3050_FDT	Wed Mar 20 18:49:45 2019	(r345344)
@@ -27,7 +27,7 @@ makeoptions 	MODULES_OVERRIDE=""
 options 	ROOTDEVNAME=\"ufs:md0.uzip\"
 
 # Support geom_uzip(4) compressed disk images
-device 		geom_uzip
+device		xz
 options 	GEOM_UZIP
 
 # Support md(4) and md-based rootfs

Modified: stable/11/sys/mips/conf/RT3352_FDT
==============================================================================
--- stable/11/sys/mips/conf/RT3352_FDT	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/RT3352_FDT	Wed Mar 20 18:49:45 2019	(r345344)
@@ -26,7 +26,7 @@ makeoptions 	MODULES_OVERRIDE=""
 options 	ROOTDEVNAME=\"ufs:md0.uzip\"
 
 # Support geom_uzip(4) compressed disk images
-device 		geom_uzip
+device		xz
 options 	GEOM_UZIP
 
 # Support md(4) and md-based rootfs

Modified: stable/11/sys/mips/conf/RT3883_FDT
==============================================================================
--- stable/11/sys/mips/conf/RT3883_FDT	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/RT3883_FDT	Wed Mar 20 18:49:45 2019	(r345344)
@@ -27,7 +27,7 @@ makeoptions 	MODULES_OVERRIDE=""
 options 	ROOTDEVNAME=\"ufs:md0.uzip\"
 
 # Support geom_uzip(4) compressed disk images
-device 		geom_uzip
+device		xz
 options 	GEOM_UZIP
 
 # Support md(4) and md-based rootfs

Modified: stable/11/sys/mips/conf/RT5350
==============================================================================
--- stable/11/sys/mips/conf/RT5350	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/RT5350	Wed Mar 20 18:49:45 2019	(r345344)
@@ -67,7 +67,7 @@ options 	TMPFS			# TMP Memory Filesystem
 options 	FFS			#Berkeley Fast Filesystem
 #options		ROOTDEVNAME=\"nfs:193.178.153.200:/bsdmips\"
 
-#device		geom_uzip
+#device		xz
 #options		GEOM_UZIP
 #options		MD_ROOT
 #options		ROOTDEVNAME=\"ufs:md0.uzip\"

Modified: stable/11/sys/mips/conf/RT5350_FDT
==============================================================================
--- stable/11/sys/mips/conf/RT5350_FDT	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/RT5350_FDT	Wed Mar 20 18:49:45 2019	(r345344)
@@ -26,7 +26,7 @@ makeoptions 	MODULES_OVERRIDE=""
 options 	ROOTDEVNAME=\"ufs:md0.uzip\"
 
 # Support geom_uzip(4) compressed disk images
-device 		geom_uzip
+device		xz
 options 	GEOM_UZIP
 
 # Support md(4) and md-based rootfs

Modified: stable/11/sys/mips/conf/TL-ARCHERC7V2
==============================================================================
--- stable/11/sys/mips/conf/TL-ARCHERC7V2	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/TL-ARCHERC7V2	Wed Mar 20 18:49:45 2019	(r345344)
@@ -46,7 +46,7 @@ options 	MSDOSFS
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
-device		geom_uzip
+device		xz
 options 	GEOM_UZIP
 
 # Used for the static uboot partition map

Modified: stable/11/sys/mips/conf/TL-WDR4300
==============================================================================
--- stable/11/sys/mips/conf/TL-WDR4300	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/TL-WDR4300	Wed Mar 20 18:49:45 2019	(r345344)
@@ -38,7 +38,7 @@ options 	MSDOSFS
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
-device		geom_uzip
+device		xz
 options 	GEOM_UZIP
 
 # Used for the static uboot partition map

Modified: stable/11/sys/mips/conf/TL-WR1043NDv2
==============================================================================
--- stable/11/sys/mips/conf/TL-WR1043NDv2	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/TL-WR1043NDv2	Wed Mar 20 18:49:45 2019	(r345344)
@@ -34,7 +34,7 @@ options 	MSDOSFS
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
-device		geom_uzip
+device		xz
 options 	GEOM_UZIP
 
 # Used for the static uboot partition map

Modified: stable/11/sys/mips/conf/TL-WR740Nv4
==============================================================================
--- stable/11/sys/mips/conf/TL-WR740Nv4	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/TL-WR740Nv4	Wed Mar 20 18:49:45 2019	(r345344)
@@ -43,7 +43,7 @@ device		arswitch
 options 	AR71XX_ENV_UBOOT
 
 # uzip - to boot natively from flash
-device		geom_uzip
+device		xz
 options 	GEOM_UZIP
 
 # Used for the static uboot partition map

Modified: stable/11/sys/mips/conf/TP-WN1043ND
==============================================================================
--- stable/11/sys/mips/conf/TP-WN1043ND	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/TP-WN1043ND	Wed Mar 20 18:49:45 2019	(r345344)
@@ -37,7 +37,7 @@ options 	MSDOSFS
 options 	AR71XX_ENV_UBOOT
 
 # uncompress - to boot natively from flash
-device         geom_uzip
+device		xz
 options        GEOM_UZIP
 
 # Used for the static uboot partition map

Modified: stable/11/sys/mips/conf/WZR-300HP
==============================================================================
--- stable/11/sys/mips/conf/WZR-300HP	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/WZR-300HP	Wed Mar 20 18:49:45 2019	(r345344)
@@ -26,7 +26,8 @@ options 	BOOTVERBOSE
 
 # GEOM modules
 device		geom_map	# to get access to the SPI flash partitions
-device		geom_uzip	# compressed in-memory filesystem hackery!
+device		xz
+options		GEOM_UZIP
 
 options 	ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
 

Modified: stable/11/sys/mips/conf/WZR-HPAG300H
==============================================================================
--- stable/11/sys/mips/conf/WZR-HPAG300H	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/WZR-HPAG300H	Wed Mar 20 18:49:45 2019	(r345344)
@@ -25,7 +25,8 @@ options 	AR71XX_ENV_UBOOT
 options 	BOOTVERBOSE
 
 # GEOM modules
-device		geom_uzip	# compressed in-memory filesystem hackery!
+device		xz
+options		GEOM_UZIP
 device		geom_map	# to get access to the SPI flash partitions
 
 options 	ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"

Modified: stable/11/sys/mips/conf/std.XLP
==============================================================================
--- stable/11/sys/mips/conf/std.XLP	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/mips/conf/std.XLP	Wed Mar 20 18:49:45 2019	(r345344)
@@ -55,6 +55,7 @@ options 	ALT_BREAK_TO_DEBUGGER
 #options 	LOCK_DEBUG
 #options 	LOCK_PROFILING
 
+device		xz
 options 	GEOM_UZIP
 
 # Device tree

Modified: stable/11/sys/modules/Makefile
==============================================================================
--- stable/11/sys/modules/Makefile	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/modules/Makefile	Wed Mar 20 18:49:45 2019	(r345344)
@@ -429,6 +429,7 @@ SUBDIR=	\
 	${_x86bios} \
 	${_xe} \
 	xl \
+	xz \
 	zlib
 
 .if ${MK_AUTOFS} != "no" || defined(ALL_MODULES)

Modified: stable/11/sys/modules/geom/geom_uzip/Makefile
==============================================================================
--- stable/11/sys/modules/geom/geom_uzip/Makefile	Wed Mar 20 17:46:59 2019	(r345343)
+++ stable/11/sys/modules/geom/geom_uzip/Makefile	Wed Mar 20 18:49:45 2019	(r345344)
@@ -8,16 +8,10 @@ SRCS+=	g_uzip.h g_uzip_dapi.h g_uzip_lzma.h g_uzip_zli
     g_uzip_wrkthr.h
 #CFLAGS=	-g -DINVARIANT_SUPPORT -DINVARIANTS
 
-.PATH: ${SRCTOP}/sys/contrib/xz-embedded/freebsd/ \
-	${SRCTOP}/sys/contrib/xz-embedded/linux/lib/xz/ \
-	${SRCTOP}/sys/contrib/xz-embedded/linux/include/linux/ \
-	${SRCTOP}/sys/net
+.PATH:	${SRCTOP}/sys/net
 
 CFLAGS+= -I${SRCTOP}/sys/contrib/xz-embedded/freebsd \
 	-I${SRCTOP}/sys/contrib/xz-embedded/linux/lib/xz/
-SRCS+=	xz_crc32.c xz_dec_bcj.c xz_dec_lzma2.c xz_dec_stream.c \
-    xz_malloc.c
-SRCS+=  xz.h xz_config.h xz_lzma2.h xz_malloc.h xz_private.h xz_stream.h
 SRCS+=	opt_geom.h
 
 .include <bsd.kmod.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903201849.x2KInjeF063491>