Date: Tue, 19 Mar 2019 17:16:38 +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-12@freebsd.org Subject: svn commit: r345301 - in stable/12: 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: <201903191716.x2JHGc9N047534@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Tue Mar 19 17:16:37 2019 New Revision: 345301 URL: https://svnweb.freebsd.org/changeset/base/345301 Log: MFC r344479 (by sobomax), r344605: Modularize xz. Added: stable/12/sys/dev/xz/ - copied from r344605, head/sys/dev/xz/ stable/12/sys/modules/xz/ - copied from r344605, head/sys/modules/xz/ Deleted: stable/12/sys/contrib/xz-embedded/freebsd/xz_malloc.c Modified: stable/12/share/man/man4/geom_uzip.4 stable/12/sys/conf/NOTES stable/12/sys/conf/files stable/12/sys/contrib/xz-embedded/freebsd/xz_config.h stable/12/sys/geom/uzip/g_uzip.c stable/12/sys/geom/uzip/g_uzip_lzma.c stable/12/sys/mips/conf/ALFA_HORNET_UB stable/12/sys/mips/conf/AP121 stable/12/sys/mips/conf/AP135 stable/12/sys/mips/conf/AP143 stable/12/sys/mips/conf/AP91 stable/12/sys/mips/conf/AP93 stable/12/sys/mips/conf/AP94 stable/12/sys/mips/conf/AP96 stable/12/sys/mips/conf/BCM stable/12/sys/mips/conf/CARAMBOLA2 stable/12/sys/mips/conf/DB120 stable/12/sys/mips/conf/DIR-655A1 stable/12/sys/mips/conf/DIR-825B1 stable/12/sys/mips/conf/ENH200 stable/12/sys/mips/conf/MT7620A_FDT stable/12/sys/mips/conf/MT7620N_FDT stable/12/sys/mips/conf/MT7621_FDT stable/12/sys/mips/conf/MT7628_FDT stable/12/sys/mips/conf/ONIONOMEGA stable/12/sys/mips/conf/PB47 stable/12/sys/mips/conf/PB92 stable/12/sys/mips/conf/PICOSTATION_M2HP stable/12/sys/mips/conf/ROCKET_M2HP stable/12/sys/mips/conf/ROUTERSTATION stable/12/sys/mips/conf/ROUTERSTATION_MFS stable/12/sys/mips/conf/RSPRO stable/12/sys/mips/conf/RSPRO_MFS stable/12/sys/mips/conf/RSPRO_STANDALONE stable/12/sys/mips/conf/RT3050_FDT stable/12/sys/mips/conf/RT3352_FDT stable/12/sys/mips/conf/RT3883_FDT stable/12/sys/mips/conf/RT5350_FDT stable/12/sys/mips/conf/TL-ARCHERC7V2 stable/12/sys/mips/conf/TL-WDR4300 stable/12/sys/mips/conf/TL-WR1043NDv2 stable/12/sys/mips/conf/TL-WR740Nv4 stable/12/sys/mips/conf/TP-MR3040 stable/12/sys/mips/conf/TP-WN1043ND stable/12/sys/mips/conf/WZR-300HP stable/12/sys/mips/conf/WZR-HPAG300H stable/12/sys/mips/conf/std.XLP stable/12/sys/modules/Makefile stable/12/sys/modules/geom/geom_uzip/Makefile Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man4/geom_uzip.4 ============================================================================== --- stable/12/share/man/man4/geom_uzip.4 Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/share/man/man4/geom_uzip.4 Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/conf/NOTES ============================================================================== --- stable/12/sys/conf/NOTES Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/conf/NOTES Tue Mar 19 17:16:37 2019 (r345301) @@ -3063,3 +3063,5 @@ device n25q # device spigen # Generic access to SPI devices from userland. # Enable legacy /dev/spigenN name aliases for /dev/spigenX.Y devices. options SPIGEN_LEGACY_CDEVNAME # legacy device names for spigen + +device xz # xz_embedded LZMA de-compression library Modified: stable/12/sys/conf/files ============================================================================== --- stable/12/sys/conf/files Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/conf/files Tue Mar 19 17:16:37 2019 (r345301) @@ -637,6 +637,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/" # Zstd contrib/zstd/lib/freebsd/zstd_kmalloc.c optional zstdio compile-with ${ZSTD_C} contrib/zstd/lib/common/zstd_common.c optional zstdio compile-with ${ZSTD_C} @@ -3718,21 +3729,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/12/sys/contrib/xz-embedded/freebsd/xz_config.h ============================================================================== --- stable/12/sys/contrib/xz-embedded/freebsd/xz_config.h Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/contrib/xz-embedded/freebsd/xz_config.h Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/geom/uzip/g_uzip.c ============================================================================== --- stable/12/sys/geom/uzip/g_uzip.c Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/geom/uzip/g_uzip.c Tue Mar 19 17:16:37 2019 (r345301) @@ -921,5 +921,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/12/sys/geom/uzip/g_uzip_lzma.c ============================================================================== --- stable/12/sys/geom/uzip/g_uzip_lzma.c Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/geom/uzip/g_uzip_lzma.c Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/ALFA_HORNET_UB ============================================================================== --- stable/12/sys/mips/conf/ALFA_HORNET_UB Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/ALFA_HORNET_UB Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/AP121 ============================================================================== --- stable/12/sys/mips/conf/AP121 Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/AP121 Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/AP135 ============================================================================== --- stable/12/sys/mips/conf/AP135 Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/AP135 Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/AP143 ============================================================================== --- stable/12/sys/mips/conf/AP143 Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/AP143 Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/AP91 ============================================================================== --- stable/12/sys/mips/conf/AP91 Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/AP91 Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/AP93 ============================================================================== --- stable/12/sys/mips/conf/AP93 Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/AP93 Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/AP94 ============================================================================== --- stable/12/sys/mips/conf/AP94 Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/AP94 Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/AP96 ============================================================================== --- stable/12/sys/mips/conf/AP96 Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/AP96 Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/BCM ============================================================================== --- stable/12/sys/mips/conf/BCM Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/BCM Tue Mar 19 17:16:37 2019 (r345301) @@ -39,7 +39,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/12/sys/mips/conf/CARAMBOLA2 ============================================================================== --- stable/12/sys/mips/conf/CARAMBOLA2 Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/CARAMBOLA2 Tue Mar 19 17:16:37 2019 (r345301) @@ -48,7 +48,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/12/sys/mips/conf/DB120 ============================================================================== --- stable/12/sys/mips/conf/DB120 Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/DB120 Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/DIR-655A1 ============================================================================== --- stable/12/sys/mips/conf/DIR-655A1 Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/DIR-655A1 Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/DIR-825B1 ============================================================================== --- stable/12/sys/mips/conf/DIR-825B1 Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/DIR-825B1 Tue Mar 19 17:16:37 2019 (r345301) @@ -47,7 +47,7 @@ nooptions INET6 # 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/12/sys/mips/conf/ENH200 ============================================================================== --- stable/12/sys/mips/conf/ENH200 Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/ENH200 Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/MT7620A_FDT ============================================================================== --- stable/12/sys/mips/conf/MT7620A_FDT Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/MT7620A_FDT Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/MT7620N_FDT ============================================================================== --- stable/12/sys/mips/conf/MT7620N_FDT Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/MT7620N_FDT Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/MT7621_FDT ============================================================================== --- stable/12/sys/mips/conf/MT7621_FDT Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/MT7621_FDT Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/MT7628_FDT ============================================================================== --- stable/12/sys/mips/conf/MT7628_FDT Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/MT7628_FDT Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/ONIONOMEGA ============================================================================== --- stable/12/sys/mips/conf/ONIONOMEGA Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/ONIONOMEGA Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/PB47 ============================================================================== --- stable/12/sys/mips/conf/PB47 Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/PB47 Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/PB92 ============================================================================== --- stable/12/sys/mips/conf/PB92 Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/PB92 Tue Mar 19 17:16:37 2019 (r345301) @@ -55,7 +55,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/12/sys/mips/conf/PICOSTATION_M2HP ============================================================================== --- stable/12/sys/mips/conf/PICOSTATION_M2HP Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/PICOSTATION_M2HP Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/ROCKET_M2HP ============================================================================== --- stable/12/sys/mips/conf/ROCKET_M2HP Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/ROCKET_M2HP Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/ROUTERSTATION ============================================================================== --- stable/12/sys/mips/conf/ROUTERSTATION Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/ROUTERSTATION Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/ROUTERSTATION_MFS ============================================================================== --- stable/12/sys/mips/conf/ROUTERSTATION_MFS Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/ROUTERSTATION_MFS Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/RSPRO ============================================================================== --- stable/12/sys/mips/conf/RSPRO Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/RSPRO Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/RSPRO_MFS ============================================================================== --- stable/12/sys/mips/conf/RSPRO_MFS Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/RSPRO_MFS Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/RSPRO_STANDALONE ============================================================================== --- stable/12/sys/mips/conf/RSPRO_STANDALONE Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/RSPRO_STANDALONE Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/RT3050_FDT ============================================================================== --- stable/12/sys/mips/conf/RT3050_FDT Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/RT3050_FDT Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/RT3352_FDT ============================================================================== --- stable/12/sys/mips/conf/RT3352_FDT Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/RT3352_FDT Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/RT3883_FDT ============================================================================== --- stable/12/sys/mips/conf/RT3883_FDT Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/RT3883_FDT Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/RT5350_FDT ============================================================================== --- stable/12/sys/mips/conf/RT5350_FDT Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/RT5350_FDT Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/TL-ARCHERC7V2 ============================================================================== --- stable/12/sys/mips/conf/TL-ARCHERC7V2 Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/TL-ARCHERC7V2 Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/TL-WDR4300 ============================================================================== --- stable/12/sys/mips/conf/TL-WDR4300 Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/TL-WDR4300 Tue Mar 19 17:16:37 2019 (r345301) @@ -39,7 +39,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/12/sys/mips/conf/TL-WR1043NDv2 ============================================================================== --- stable/12/sys/mips/conf/TL-WR1043NDv2 Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/TL-WR1043NDv2 Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/TL-WR740Nv4 ============================================================================== --- stable/12/sys/mips/conf/TL-WR740Nv4 Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/TL-WR740Nv4 Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/TP-MR3040 ============================================================================== --- stable/12/sys/mips/conf/TP-MR3040 Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/TP-MR3040 Tue Mar 19 17:16:37 2019 (r345301) @@ -48,7 +48,7 @@ device arswitch options AR71XX_ENV_UBOOT # uzip - 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/12/sys/mips/conf/TP-WN1043ND ============================================================================== --- stable/12/sys/mips/conf/TP-WN1043ND Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/TP-WN1043ND Tue Mar 19 17:16:37 2019 (r345301) @@ -39,7 +39,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/12/sys/mips/conf/WZR-300HP ============================================================================== --- stable/12/sys/mips/conf/WZR-300HP Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/WZR-300HP Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/WZR-HPAG300H ============================================================================== --- stable/12/sys/mips/conf/WZR-HPAG300H Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/WZR-HPAG300H Tue Mar 19 17:16:37 2019 (r345301) @@ -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/12/sys/mips/conf/std.XLP ============================================================================== --- stable/12/sys/mips/conf/std.XLP Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/mips/conf/std.XLP Tue Mar 19 17:16:37 2019 (r345301) @@ -56,6 +56,7 @@ options ALT_BREAK_TO_DEBUGGER #options LOCK_DEBUG #options LOCK_PROFILING +device xz options GEOM_UZIP # Device tree Modified: stable/12/sys/modules/Makefile ============================================================================== --- stable/12/sys/modules/Makefile Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/modules/Makefile Tue Mar 19 17:16:37 2019 (r345301) @@ -418,6 +418,7 @@ SUBDIR= \ ${_x86bios} \ ${_xe} \ xl \ + xz \ zlib .if ${MK_AUTOFS} != "no" || defined(ALL_MODULES) Modified: stable/12/sys/modules/geom/geom_uzip/Makefile ============================================================================== --- stable/12/sys/modules/geom/geom_uzip/Makefile Tue Mar 19 17:00:03 2019 (r345300) +++ stable/12/sys/modules/geom/geom_uzip/Makefile Tue Mar 19 17:16:37 2019 (r345301) @@ -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?201903191716.x2JHGc9N047534>