Author: sobomax
Date: Wed Feb 24 00:39:36 2016
New Revision: 295945
URL: https://svnweb.freebsd.org/changeset/base/295945
Log:
Obsolete mkulzma(8) and geom_uncompress(4), their functionality
is now provided by mkuzip(8) and geom_uzip(4) respectively.
MFC after: 1 month
Deleted:
head/share/man/man4/geom_uncompress.4
head/sys/geom/uncompress/
head/sys/modules/geom/geom_uncompress/
head/usr.bin/mkulzma/
Modified:
head/ObsoleteFiles.inc
head/share/man/man4/Makefile
head/share/man/man4/geom_map.4
head/sys/boot/forth/loader.conf
head/sys/conf/files
head/sys/mips/conf/ALFA_HORNET_UB
head/sys/mips/conf/AP121
head/sys/mips/conf/AP135
head/sys/mips/conf/AP143
head/sys/mips/conf/AP91
head/sys/mips/conf/AP93
head/sys/mips/conf/AP96
head/sys/mips/conf/CARAMBOLA2
head/sys/mips/conf/DB120
head/sys/mips/conf/DIR-655A1
head/sys/mips/conf/DIR-825B1
head/sys/mips/conf/DIR-825C1
head/sys/mips/conf/ENH200
head/sys/mips/conf/MT7620
head/sys/mips/conf/ONIONOMEGA
head/sys/mips/conf/PB47
head/sys/mips/conf/PB92
head/sys/mips/conf/PICOSTATION_M2HP
head/sys/mips/conf/ROUTERSTATION
head/sys/mips/conf/RSPRO
head/sys/mips/conf/RT305X
head/sys/mips/conf/RT5350
head/sys/mips/conf/TL-ARCHERC7V2
head/sys/mips/conf/TL-WDR4300
head/sys/mips/conf/TL-WR1043NDv2
head/sys/mips/conf/TL-WR740Nv4
head/sys/mips/conf/TP-WN1043ND
head/sys/mips/conf/WZR-300HP
head/sys/mips/conf/WZR-HPAG300H
head/sys/modules/geom/Makefile
head/targets/pseudo/userland/Makefile.depend
head/usr.bin/Makefile
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Wed Feb 24 00:01:10 2016 (r295944)
+++ head/ObsoleteFiles.inc Wed Feb 24 00:39:36 2016 (r295945)
@@ -38,6 +38,8 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20160223: functionality from mkulzma(1) merged into mkuzip(1)
+OLD_FILES+=usr/bin/mkulzma
# 20160211: Remove obsolete unbound-control-setup
OLD_FILES+=usr/sbin/unbound-control-setup
# 20160116: Update mandoc to cvs snapshot 20160116
Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile Wed Feb 24 00:01:10 2016
(r295944)
+++ head/share/man/man4/Makefile Wed Feb 24 00:39:36 2016
(r295945)
@@ -165,7 +165,6 @@ MAN= aac.4 \
geom_fox.4 \
geom_linux_lvm.4 \
geom_map.4 \
- geom_uncompress.4 \
geom_uzip.4 \
gif.4 \
gpio.4 \
Modified: head/share/man/man4/geom_map.4
==============================================================================
--- head/share/man/man4/geom_map.4 Wed Feb 24 00:01:10 2016
(r295944)
+++ head/share/man/man4/geom_map.4 Wed Feb 24 00:39:36 2016
(r295945)
@@ -78,7 +78,7 @@ or by using
0 DISK cfid0 8388608 4 hd 0 sc 0
1 MAP map/config 131072 4 i 5 o 8257536 entry 0 dsize 131072
1 MAP map/rootfs 6881280 4 i 4 o 1376256 entry 0 dsize 6881280
-2 UNCOMPRESS map/rootfs.uncompress 18677760 512
+2 UZIP map/rootfs.uzip 18677760 512
1 MAP map/kernel 1114112 4 i 3 o 262144 entry 0 dsize 1114112
1 MAP map/upgrade 7995392 4 i 2 o 262144 entry 0 dsize 7995392
1 MAP map/factory 65536 4 i 1 o 196608 entry 0 dsize 65536
Modified: head/sys/boot/forth/loader.conf
==============================================================================
--- head/sys/boot/forth/loader.conf Wed Feb 24 00:01:10 2016
(r295944)
+++ head/sys/boot/forth/loader.conf Wed Feb 24 00:39:36 2016
(r295945)
@@ -238,7 +238,6 @@ geom_nop_load="NO" # Transparent disk d
geom_raid3_load="NO" # RAID3 disk driver (see graid3(8))
geom_shsec_load="NO" # Shared secret disk driver (see gshsec(8))
geom_stripe_load="NO" # RAID0 disk driver (see gstripe(8))
-geom_uncompress_load="NO" # Compressed disk images driver (see mkulzma(8))
geom_uzip_load="NO" # Compressed disk images driver (see mkuzip(8))
geom_vinum_load="NO" # Concatenated/mirror/raid driver (see vinum(4))
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Wed Feb 24 00:01:10 2016 (r295944)
+++ head/sys/conf/files Wed Feb 24 00:39:36 2016 (r295945)
@@ -3081,21 +3081,20 @@ geom/raid3/g_raid3.c optional geom_raid
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
-geom/uncompress/g_uncompress.c optional geom_uncompress
contrib/xz-embedded/freebsd/xz_malloc.c \
- optional xz_embedded | geom_uncompress | geom_uzip \
+ 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_uncompress | geom_uzip \
+ 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_uncompress | geom_uzip \
+ 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_uncompress | geom_uzip \
+ 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_uncompress | geom_uzip \
+ 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
@@ -3458,7 +3457,7 @@ libkern/strvalid.c standard
libkern/timingsafe_bcmp.c standard
libkern/zlib.c optional crypto | geom_uzip | ipsec | \
mxge | netgraph_deflate | \
- ddb_ctf | gzio | geom_uncompress
+ ddb_ctf | gzio
net/altq/altq_cbq.c optional altq
net/altq/altq_cdnr.c optional altq
net/altq/altq_codel.c optional altq
Modified: head/sys/mips/conf/ALFA_HORNET_UB
==============================================================================
--- head/sys/mips/conf/ALFA_HORNET_UB Wed Feb 24 00:01:10 2016
(r295944)
+++ head/sys/mips/conf/ALFA_HORNET_UB Wed Feb 24 00:39:36 2016
(r295945)
@@ -49,11 +49,11 @@ device arswitch
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
Modified: head/sys/mips/conf/AP121
==============================================================================
--- head/sys/mips/conf/AP121 Wed Feb 24 00:01:10 2016 (r295944)
+++ head/sys/mips/conf/AP121 Wed Feb 24 00:39:36 2016 (r295945)
@@ -43,11 +43,11 @@ device arswitch
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
Modified: head/sys/mips/conf/AP135
==============================================================================
--- head/sys/mips/conf/AP135 Wed Feb 24 00:01:10 2016 (r295944)
+++ head/sys/mips/conf/AP135 Wed Feb 24 00:39:36 2016 (r295945)
@@ -46,8 +46,8 @@ device arswitch
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
@@ -64,7 +64,7 @@ device firmware # Used by the
above
options ATH_EEPROM_FIRMWARE
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
# Default to accept
options IPFIREWALL_DEFAULT_TO_ACCEPT
Modified: head/sys/mips/conf/AP143
==============================================================================
--- head/sys/mips/conf/AP143 Wed Feb 24 00:01:10 2016 (r295944)
+++ head/sys/mips/conf/AP143 Wed Feb 24 00:39:36 2016 (r295945)
@@ -43,11 +43,11 @@ device arswitch
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
Modified: head/sys/mips/conf/AP91
==============================================================================
--- head/sys/mips/conf/AP91 Wed Feb 24 00:01:10 2016 (r295944)
+++ head/sys/mips/conf/AP91 Wed Feb 24 00:39:36 2016 (r295945)
@@ -38,9 +38,9 @@ options NO_SWAPPING
# options MSDOSFS
# uncompress - to boot read-only lzma natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+device geom_uzip
+options GEOM_UZIP
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
# Not enough space for these..
nooptions INVARIANTS
Modified: head/sys/mips/conf/AP93
==============================================================================
--- head/sys/mips/conf/AP93 Wed Feb 24 00:01:10 2016 (r295944)
+++ head/sys/mips/conf/AP93 Wed Feb 24 00:39:36 2016 (r295945)
@@ -26,9 +26,9 @@ options AR71XX_ENV_UBOOT
options MSDOSFS
# uncompress - to boot read-only lzma natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+device geom_uzip
+options GEOM_UZIP
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
# Used for the static uboot partition map
device geom_map
Modified: head/sys/mips/conf/AP96
==============================================================================
--- head/sys/mips/conf/AP96 Wed Feb 24 00:01:10 2016 (r295944)
+++ head/sys/mips/conf/AP96 Wed Feb 24 00:39:36 2016 (r295945)
@@ -27,9 +27,9 @@ options AR71XX_ENV_UBOOT
options MSDOSFS
# uncompress - to boot read-only lzma natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+device geom_uzip
+options GEOM_UZIP
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
# Used for the static uboot partition map
device geom_map
Modified: head/sys/mips/conf/CARAMBOLA2
==============================================================================
--- head/sys/mips/conf/CARAMBOLA2 Wed Feb 24 00:01:10 2016
(r295944)
+++ head/sys/mips/conf/CARAMBOLA2 Wed Feb 24 00:39:36 2016
(r295945)
@@ -45,11 +45,11 @@ device arswitch
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
Modified: head/sys/mips/conf/DB120
==============================================================================
--- head/sys/mips/conf/DB120 Wed Feb 24 00:01:10 2016 (r295944)
+++ head/sys/mips/conf/DB120 Wed Feb 24 00:39:36 2016 (r295945)
@@ -38,8 +38,8 @@ device arswitch
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
@@ -51,4 +51,4 @@ device firmware # Used by the
above
options ATH_EEPROM_FIRMWARE
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
Modified: head/sys/mips/conf/DIR-655A1
==============================================================================
--- head/sys/mips/conf/DIR-655A1 Wed Feb 24 00:01:10 2016
(r295944)
+++ head/sys/mips/conf/DIR-655A1 Wed Feb 24 00:39:36 2016
(r295945)
@@ -41,8 +41,8 @@ device arswitch
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
@@ -52,7 +52,7 @@ device firmware # Used by the
above
options ATH_EEPROM_FIRMWARE
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
# Default to accept
options IPFIREWALL_DEFAULT_TO_ACCEPT
Modified: head/sys/mips/conf/DIR-825B1
==============================================================================
--- head/sys/mips/conf/DIR-825B1 Wed Feb 24 00:01:10 2016
(r295944)
+++ head/sys/mips/conf/DIR-825B1 Wed Feb 24 00:39:36 2016
(r295945)
@@ -54,11 +54,11 @@ options NO_SYSCTL_DESCR
# GEOM modules
device geom_map # to get access to the SPI flash partitions
-device geom_uncompress # compressed in-memory filesystem hackery!
-options GEOM_UNCOMPRESS
+device geom_uzip # compressed in-memory filesystem hackery!
+options GEOM_UZIP
options GEOM_PART_GPT
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
options AR71XX_REALMEM=64*1024*1024
options AR71XX_ENV_UBOOT
Modified: head/sys/mips/conf/DIR-825C1
==============================================================================
--- head/sys/mips/conf/DIR-825C1 Wed Feb 24 00:01:10 2016
(r295944)
+++ head/sys/mips/conf/DIR-825C1 Wed Feb 24 00:39:36 2016
(r295945)
@@ -58,11 +58,11 @@ device firmware
options ATH_EEPROM_FIRMWARE
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
# In order to netboot, you have to build the mfsroot into the kernel
# 19443712 or 19M is the biggest rootfs via netboot this thing supports
#options MD_ROOT # md device usable as a potential root device
#options MD_ROOT_SIZE=19444
#makeoptions MFS_IMAGE=/tftpboot/mfsroot-dir825c1.img.ulzma
-#options ROOTDEVNAME=\"ufs:md0.uncompress\"
+#options ROOTDEVNAME=\"ufs:md0.uzip\"
Modified: head/sys/mips/conf/ENH200
==============================================================================
--- head/sys/mips/conf/ENH200 Wed Feb 24 00:01:10 2016 (r295944)
+++ head/sys/mips/conf/ENH200 Wed Feb 24 00:39:36 2016 (r295945)
@@ -26,9 +26,9 @@ options AR71XX_ENV_UBOOT
options MSDOSFS
# uncompress - to boot read-only lzma natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+device geom_uzip
+options GEOM_UZIP
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
# Used for the static uboot partition map
device geom_map
Modified: head/sys/mips/conf/MT7620
==============================================================================
--- head/sys/mips/conf/MT7620 Wed Feb 24 00:01:10 2016 (r295944)
+++ head/sys/mips/conf/MT7620 Wed Feb 24 00:39:36 2016 (r295945)
@@ -65,7 +65,7 @@ options PSEUDOFS #Pseudo-filesystem fr
#options BOOTP_WIRED_TO=rt0
#options BOOTP_COMPAT
#options CD9660 # ISO 9660 Filesystem
-#options ROOTDEVNAME=\"cd9660:/dev/map/rootfs.uncompress\"
+#options ROOTDEVNAME=\"cd9660:/dev/map/rootfs.uzip\"
#options TMPFS # TMP Memory Filesystem
options FFS #Berkeley Fast Filesystem
Modified: head/sys/mips/conf/ONIONOMEGA
==============================================================================
--- head/sys/mips/conf/ONIONOMEGA Wed Feb 24 00:01:10 2016
(r295944)
+++ head/sys/mips/conf/ONIONOMEGA Wed Feb 24 00:39:36 2016
(r295945)
@@ -45,11 +45,11 @@ device arswitch
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
Modified: head/sys/mips/conf/PB47
==============================================================================
--- head/sys/mips/conf/PB47 Wed Feb 24 00:01:10 2016 (r295944)
+++ head/sys/mips/conf/PB47 Wed Feb 24 00:39:36 2016 (r295945)
@@ -32,11 +32,11 @@ options AR71XX_REALMEM=64*1024*1024
options MSDOSFS
# uncompress - to boot read-only lzma natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
Modified: head/sys/mips/conf/PB92
==============================================================================
--- head/sys/mips/conf/PB92 Wed Feb 24 00:01:10 2016 (r295944)
+++ head/sys/mips/conf/PB92 Wed Feb 24 00:39:36 2016 (r295945)
@@ -54,9 +54,9 @@ options FFS
#options UFS_DIRHASH #Improve performance on big
directories
# Support uncompress lzma rootfs
-device geom_uncompress
-options GEOM_UNCOMPRESS
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+device geom_uzip
+options GEOM_UZIP
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
# PCI bus
device pci
Modified: head/sys/mips/conf/PICOSTATION_M2HP
==============================================================================
--- head/sys/mips/conf/PICOSTATION_M2HP Wed Feb 24 00:01:10 2016
(r295944)
+++ head/sys/mips/conf/PICOSTATION_M2HP Wed Feb 24 00:39:36 2016
(r295945)
@@ -38,9 +38,9 @@ options NO_SWAPPING
# options MSDOSFS
# uncompress - to boot read-only lzma natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+device geom_uzip
+options GEOM_UZIP
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
# Not enough space for these..
nooptions INVARIANTS
Modified: head/sys/mips/conf/ROUTERSTATION
==============================================================================
--- head/sys/mips/conf/ROUTERSTATION Wed Feb 24 00:01:10 2016
(r295944)
+++ head/sys/mips/conf/ROUTERSTATION Wed Feb 24 00:39:36 2016
(r295945)
@@ -14,8 +14,8 @@ hints "ROUTERSTATION.hints"
# GEOM modules
device geom_redboot # to get access to the SPI flash partitions
-device geom_uncompress # compressed in-memory filesystem support
-options GEOM_UNCOMPRESS
+device geom_uzip # compressed in-memory filesystem support
+options GEOM_UZIP
# For DOS
options MSDOSFS
@@ -27,4 +27,4 @@ device etherswitch
device ukswitch
# Boot path - redboot MFS
-options ROOTDEVNAME=\"ufs:redboot/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:redboot/rootfs.uzip\"
Modified: head/sys/mips/conf/RSPRO
==============================================================================
--- head/sys/mips/conf/RSPRO Wed Feb 24 00:01:10 2016 (r295944)
+++ head/sys/mips/conf/RSPRO Wed Feb 24 00:39:36 2016 (r295945)
@@ -15,8 +15,8 @@ device pcf2123_rtc
# GEOM modules
device geom_redboot # to get access to the SPI flash partitions
-device geom_uncompress # compressed in-memory filesystem support
-options GEOM_UNCOMPRESS
+device geom_uzip # compressed in-memory filesystem support
+options GEOM_UZIP
# For DOS
options MSDOSFS
@@ -28,5 +28,5 @@ device etherswitch
device arswitch
# Boot off of flash
-options ROOTDEVNAME=\"ufs:redboot/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:redboot/rootfs.uzip\"
Modified: head/sys/mips/conf/RT305X
==============================================================================
--- head/sys/mips/conf/RT305X Wed Feb 24 00:01:10 2016 (r295944)
+++ head/sys/mips/conf/RT305X Wed Feb 24 00:39:36 2016 (r295945)
@@ -64,7 +64,7 @@ options BOOTP_NFSV3
options BOOTP_WIRED_TO=rt0
options BOOTP_COMPAT
options CD9660 # ISO 9660 Filesystem
-options ROOTDEVNAME=\"cd9660:/dev/map/rootfs.uncompress\"
+options ROOTDEVNAME=\"cd9660:/dev/map/rootfs.uzip\"
options TMPFS # TMP Memory Filesystem
#options FFS #Berkeley Fast Filesystem
Modified: head/sys/mips/conf/RT5350
==============================================================================
--- head/sys/mips/conf/RT5350 Wed Feb 24 00:01:10 2016 (r295944)
+++ head/sys/mips/conf/RT5350 Wed Feb 24 00:39:36 2016 (r295945)
@@ -67,10 +67,10 @@ options TMPFS # TMP Memory Filesystem
options FFS #Berkeley Fast Filesystem
#options ROOTDEVNAME=\"nfs:193.178.153.200:/bsdmips\"
-#device geom_uncompress
-#options GEOM_UNCOMPRESS
+#device geom_uzip
+#options GEOM_UZIP
#options MD_ROOT
-#options ROOTDEVNAME=\"ufs:md0.uncompress\"
+#options ROOTDEVNAME=\"ufs:md0.uzip\"
# Options for making kernel less hangry
makeoptions INLINE_LIMIT=1024
Modified: head/sys/mips/conf/TL-ARCHERC7V2
==============================================================================
--- head/sys/mips/conf/TL-ARCHERC7V2 Wed Feb 24 00:01:10 2016
(r295944)
+++ head/sys/mips/conf/TL-ARCHERC7V2 Wed Feb 24 00:39:36 2016
(r295945)
@@ -46,8 +46,8 @@ options MSDOSFS
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
@@ -64,7 +64,7 @@ device firmware # Used by the
above
options ATH_EEPROM_FIRMWARE
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
# Default to accept
options IPFIREWALL_DEFAULT_TO_ACCEPT
Modified: head/sys/mips/conf/TL-WDR4300
==============================================================================
--- head/sys/mips/conf/TL-WDR4300 Wed Feb 24 00:01:10 2016
(r295944)
+++ head/sys/mips/conf/TL-WDR4300 Wed Feb 24 00:39:36 2016
(r295945)
@@ -38,8 +38,8 @@ options MSDOSFS
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
@@ -51,4 +51,4 @@ device firmware # Used by the
above
options ATH_EEPROM_FIRMWARE
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
Modified: head/sys/mips/conf/TL-WR1043NDv2
==============================================================================
--- head/sys/mips/conf/TL-WR1043NDv2 Wed Feb 24 00:01:10 2016
(r295944)
+++ head/sys/mips/conf/TL-WR1043NDv2 Wed Feb 24 00:39:36 2016
(r295945)
@@ -34,8 +34,8 @@ options MSDOSFS
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
@@ -47,7 +47,7 @@ device geom_map
#options ATH_EEPROM_FIRMWARE
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
# Default to accept
options IPFIREWALL_DEFAULT_TO_ACCEPT
Modified: head/sys/mips/conf/TL-WR740Nv4
==============================================================================
--- head/sys/mips/conf/TL-WR740Nv4 Wed Feb 24 00:01:10 2016
(r295944)
+++ head/sys/mips/conf/TL-WR740Nv4 Wed Feb 24 00:39:36 2016
(r295945)
@@ -43,13 +43,13 @@ device arswitch
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
# Boot off of the rootfs, as defined in the geom_map setup.
-# options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+# options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
# Note: we don't fit in 4MB flash, so the rootfs must be on USB for now
options ROOTDEVNAME=\"ufs:da0\"
Modified: head/sys/mips/conf/TP-WN1043ND
==============================================================================
--- head/sys/mips/conf/TP-WN1043ND Wed Feb 24 00:01:10 2016
(r295944)
+++ head/sys/mips/conf/TP-WN1043ND Wed Feb 24 00:39:36 2016
(r295945)
@@ -37,14 +37,14 @@ options MSDOSFS
options AR71XX_ENV_UBOOT
# uncompress - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
# We bite the performance overhead for now; the kernel won't
# fit if the mutexes are inlined.
Modified: head/sys/mips/conf/WZR-300HP
==============================================================================
--- head/sys/mips/conf/WZR-300HP Wed Feb 24 00:01:10 2016
(r295944)
+++ head/sys/mips/conf/WZR-300HP Wed Feb 24 00:39:36 2016
(r295945)
@@ -26,9 +26,9 @@ options BOOTVERBOSE
# GEOM modules
device geom_map # to get access to the SPI flash partitions
-device geom_uncompress # compressed in-memory filesystem hackery!
+device geom_uzip # compressed in-memory filesystem hackery!
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
options AR71XX_ATH_EEPROM # Fetch EEPROM/PCI config from flash
options ATH_EEPROM_FIRMWARE # Use EEPROM from flash
Modified: head/sys/mips/conf/WZR-HPAG300H
==============================================================================
--- head/sys/mips/conf/WZR-HPAG300H Wed Feb 24 00:01:10 2016
(r295944)
+++ head/sys/mips/conf/WZR-HPAG300H Wed Feb 24 00:39:36 2016
(r295945)
@@ -25,10 +25,10 @@ options AR71XX_ENV_UBOOT
options BOOTVERBOSE
# GEOM modules
-device geom_uncompress # compressed in-memory filesystem hackery!
+device geom_uzip # compressed in-memory filesystem hackery!
device geom_map # to get access to the SPI flash partitions
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
options AR71XX_ATH_EEPROM # Fetch EEPROM/PCI config from flash
options ATH_EEPROM_FIRMWARE # Use EEPROM from flash
Modified: head/sys/modules/geom/Makefile
==============================================================================
--- head/sys/modules/geom/Makefile Wed Feb 24 00:01:10 2016
(r295944)
+++ head/sys/modules/geom/Makefile Wed Feb 24 00:39:36 2016
(r295945)
@@ -21,7 +21,6 @@ SUBDIR= geom_bde \
geom_sched \
geom_shsec \
geom_stripe \
- geom_uncompress \
geom_uzip \
geom_vinum \
geom_virstor \
Modified: head/targets/pseudo/userland/Makefile.depend
==============================================================================
--- head/targets/pseudo/userland/Makefile.depend Wed Feb 24 00:01:10
2016 (r295944)
+++ head/targets/pseudo/userland/Makefile.depend Wed Feb 24 00:39:36
2016 (r295945)
@@ -297,7 +297,6 @@ DIRDEPS+= \
usr.bin/mklocale \
usr.bin/mkstr \
usr.bin/mktemp \
- usr.bin/mkulzma \
usr.bin/mkuzip \
usr.bin/msgs \
usr.bin/mt \
Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile Wed Feb 24 00:01:10 2016 (r295944)
+++ head/usr.bin/Makefile Wed Feb 24 00:39:36 2016 (r295945)
@@ -99,7 +99,6 @@ SUBDIR= alias \
mkimg \
mklocale \
mktemp \
- mkulzma \
mkuzip \
mt \
ncal \
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
