Skip to content

Commit

Permalink
linux-esx: Enable VTARFS support
Browse files Browse the repository at this point in the history
-  VTARFS is a new file system which can be used to mount
   VTAR-Archive images.

Change-Id: Ia9a155db966f139b5d38f4a45d66344219e5b631
Signed-off-by: srinidhira0 <[email protected]>
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/11199
Tested-by: gerrit-photon <[email protected]>
Reviewed-by: Alexey Makhalov <[email protected]>
  • Loading branch information
srinidhira0 authored and YustasSwamp committed Oct 30, 2020
1 parent 9cbf775 commit 834e6b5
Show file tree
Hide file tree
Showing 3 changed files with 1,388 additions and 2 deletions.
26 changes: 25 additions & 1 deletion SPECS/linux/config-esx
Original file line number Diff line number Diff line change
Expand Up @@ -3303,7 +3303,31 @@ CONFIG_CONFIGFS_FS=m
CONFIG_EFIVAR_FS=m
# end of Pseudo filesystems

# CONFIG_MISC_FILESYSTEMS is not set
CONFIG_MISC_FILESYSTEMS=y
# CONFIG_ORANGEFS_FS is not set
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set
# CONFIG_ECRYPT_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_HFSPLUS_FS is not set
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
# CONFIG_CRAMFS is not set
# CONFIG_SQUASHFS is not set
# CONFIG_VXFS_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_OMFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
# CONFIG_QNX6FS_FS is not set
# CONFIG_ROMFS_FS is not set
# CONFIG_PSTORE is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set
# CONFIG_EROFS_FS is not set
# CONFIG_VTAR is not set
CONFIG_VTARFS=m
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=m
CONFIG_NFS_V2=m
Expand Down
6 changes: 5 additions & 1 deletion SPECS/linux/linux-esx.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Summary: Kernel
Name: linux-esx
Version: 5.9.0
Release: 1%{?kat_build:.kat}%{?dist}
Release: 2%{?kat_build:.kat}%{?dist}
License: GPLv2
URL: http://www.kernel.org/
Group: System Environment/Kernel
Expand Down Expand Up @@ -58,6 +58,7 @@ Patch58: 07-vmware-only.patch
Patch59: initramfs-support-for-page-aligned-format-newca.patch
Patch60: 0001-Remove-OOM_SCORE_ADJ_MAX-limit-check.patch
Patch61: 0001-fs-VTAR-archive-to-TPMFS-extractor.patch
Patch62: 0001-fs-A-new-VTARFS-file-system-to-mount-VTAR-archive.patch

# CVE:
Patch100: apparmor-fix-use-after-free-in-sk_peer_label.patch
Expand Down Expand Up @@ -239,6 +240,7 @@ This Linux package contains hmac sha generator kernel module.
%patch59 -p1
%patch60 -p1
%patch61 -p1
%patch62 -p1

# CVE
%patch100 -p1
Expand Down Expand Up @@ -456,6 +458,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
/lib/modules/%{uname_r}/extra/.hmac_generator.ko.xz.hmac

%changelog
* Tue Oct 27 2020 Srinidhi Rao <[email protected]> 5.9.0-2
- Enable vtarfs support as module
* Mon Oct 19 2020 Bo Gan <[email protected]> 5.9.0-1
- Update to 5.9.0
* Thu Oct 08 2020 Ankit Jain <[email protected]> 5.9.0-rc7.2
Expand Down
Loading

0 comments on commit 834e6b5

Please sign in to comment.