Skip to content

Commit 3af8b24

Browse files
moulmoul
authored
Merge pull request scaleway#300 from QuentinPerez/patch-02
IP_SET/ SQUASHFS_XZ
2 parents 728763f + 04a6130 commit 3af8b24

File tree

12 files changed

+47
-34
lines changed

12 files changed

+47
-34
lines changed

‎armv7l/4.5.7-apparmor/.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@ CONFIG_NETFILTER_XTABLES=y
831831
#
832832
CONFIG_NETFILTER_XT_MARK=m
833833
CONFIG_NETFILTER_XT_CONNMARK=m
834-
CONFIG_NETFILTER_XT_SET=m
834+
CONFIG_NETFILTER_XT_SET=y
835835

836836
#
837837
# Xtables targets
@@ -909,7 +909,7 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
909909
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
910910
CONFIG_NETFILTER_XT_MATCH_TIME=m
911911
CONFIG_NETFILTER_XT_MATCH_U32=m
912-
CONFIG_IP_SET=m
912+
CONFIG_IP_SET=y
913913
CONFIG_IP_SET_MAX=256
914914
CONFIG_IP_SET_BITMAP_IP=m
915915
CONFIG_IP_SET_BITMAP_IPMAC=m
@@ -3503,7 +3503,7 @@ CONFIG_SQUASHFS_DECOMP_SINGLE=y
35033503
CONFIG_SQUASHFS_ZLIB=y
35043504
CONFIG_SQUASHFS_LZ4=y
35053505
# CONFIG_SQUASHFS_LZO is not set
3506-
# CONFIG_SQUASHFS_XZ is not set
3506+
CONFIG_SQUASHFS_XZ=y
35073507
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
35083508
# CONFIG_SQUASHFS_EMBEDDED is not set
35093509
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3

‎armv7l/4.5.7-debug/.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ CONFIG_BRIDGE_NETFILTER=m
778778
# Core Netfilter Configuration
779779
#
780780
CONFIG_NETFILTER_INGRESS=y
781-
CONFIG_NETFILTER_NETLINK=m
781+
CONFIG_NETFILTER_NETLINK=y
782782
CONFIG_NETFILTER_NETLINK_ACCT=m
783783
CONFIG_NETFILTER_NETLINK_QUEUE=m
784784
CONFIG_NETFILTER_NETLINK_LOG=m
@@ -846,7 +846,7 @@ CONFIG_NETFILTER_XTABLES=y
846846
#
847847
CONFIG_NETFILTER_XT_MARK=m
848848
CONFIG_NETFILTER_XT_CONNMARK=m
849-
CONFIG_NETFILTER_XT_SET=m
849+
CONFIG_NETFILTER_XT_SET=y
850850

851851
#
852852
# Xtables targets
@@ -924,7 +924,7 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
924924
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
925925
CONFIG_NETFILTER_XT_MATCH_TIME=m
926926
CONFIG_NETFILTER_XT_MATCH_U32=m
927-
CONFIG_IP_SET=m
927+
CONFIG_IP_SET=y
928928
CONFIG_IP_SET_MAX=256
929929
CONFIG_IP_SET_BITMAP_IP=m
930930
CONFIG_IP_SET_BITMAP_IPMAC=m
@@ -3544,7 +3544,7 @@ CONFIG_SQUASHFS_DECOMP_SINGLE=y
35443544
CONFIG_SQUASHFS_ZLIB=y
35453545
CONFIG_SQUASHFS_LZ4=y
35463546
# CONFIG_SQUASHFS_LZO is not set
3547-
# CONFIG_SQUASHFS_XZ is not set
3547+
CONFIG_SQUASHFS_XZ=y
35483548
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
35493549
# CONFIG_SQUASHFS_EMBEDDED is not set
35503550
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3

‎armv7l/4.5.7-docker/.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@ CONFIG_NETFILTER_XTABLES=y
831831
#
832832
CONFIG_NETFILTER_XT_MARK=y
833833
CONFIG_NETFILTER_XT_CONNMARK=y
834-
CONFIG_NETFILTER_XT_SET=m
834+
CONFIG_NETFILTER_XT_SET=y
835835

836836
#
837837
# Xtables targets
@@ -909,7 +909,7 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
909909
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
910910
CONFIG_NETFILTER_XT_MATCH_TIME=m
911911
CONFIG_NETFILTER_XT_MATCH_U32=m
912-
CONFIG_IP_SET=m
912+
CONFIG_IP_SET=y
913913
CONFIG_IP_SET_MAX=256
914914
CONFIG_IP_SET_BITMAP_IP=m
915915
CONFIG_IP_SET_BITMAP_IPMAC=m
@@ -3515,7 +3515,7 @@ CONFIG_SQUASHFS_DECOMP_SINGLE=y
35153515
CONFIG_SQUASHFS_ZLIB=y
35163516
CONFIG_SQUASHFS_LZ4=y
35173517
# CONFIG_SQUASHFS_LZO is not set
3518-
# CONFIG_SQUASHFS_XZ is not set
3518+
CONFIG_SQUASHFS_XZ=y
35193519
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
35203520
# CONFIG_SQUASHFS_EMBEDDED is not set
35213521
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3

‎armv7l/4.5.7-fedora/.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ CONFIG_NETFILTER_XTABLES=y
832832
#
833833
CONFIG_NETFILTER_XT_MARK=m
834834
CONFIG_NETFILTER_XT_CONNMARK=m
835-
CONFIG_NETFILTER_XT_SET=m
835+
CONFIG_NETFILTER_XT_SET=y
836836

837837
#
838838
# Xtables targets
@@ -911,7 +911,7 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
911911
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
912912
CONFIG_NETFILTER_XT_MATCH_TIME=m
913913
CONFIG_NETFILTER_XT_MATCH_U32=m
914-
CONFIG_IP_SET=m
914+
CONFIG_IP_SET=y
915915
CONFIG_IP_SET_MAX=256
916916
CONFIG_IP_SET_BITMAP_IP=m
917917
CONFIG_IP_SET_BITMAP_IPMAC=m
@@ -3506,7 +3506,7 @@ CONFIG_SQUASHFS_DECOMP_SINGLE=y
35063506
CONFIG_SQUASHFS_ZLIB=y
35073507
CONFIG_SQUASHFS_LZ4=y
35083508
# CONFIG_SQUASHFS_LZO is not set
3509-
# CONFIG_SQUASHFS_XZ is not set
3509+
CONFIG_SQUASHFS_XZ=y
35103510
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
35113511
# CONFIG_SQUASHFS_EMBEDDED is not set
35123512
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3

‎armv7l/4.5.7-std/.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,7 @@ CONFIG_NETFILTER_XTABLES=y
852852
#
853853
CONFIG_NETFILTER_XT_MARK=y
854854
CONFIG_NETFILTER_XT_CONNMARK=m
855-
CONFIG_NETFILTER_XT_SET=m
855+
CONFIG_NETFILTER_XT_SET=y
856856

857857
#
858858
# Xtables targets
@@ -930,7 +930,7 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
930930
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
931931
CONFIG_NETFILTER_XT_MATCH_TIME=m
932932
CONFIG_NETFILTER_XT_MATCH_U32=m
933-
CONFIG_IP_SET=m
933+
CONFIG_IP_SET=y
934934
CONFIG_IP_SET_MAX=256
935935
CONFIG_IP_SET_BITMAP_IP=m
936936
CONFIG_IP_SET_BITMAP_IPMAC=m
@@ -3558,7 +3558,7 @@ CONFIG_SQUASHFS_DECOMP_SINGLE=y
35583558
CONFIG_SQUASHFS_ZLIB=y
35593559
CONFIG_SQUASHFS_LZ4=y
35603560
# CONFIG_SQUASHFS_LZO is not set
3561-
# CONFIG_SQUASHFS_XZ is not set
3561+
CONFIG_SQUASHFS_XZ=y
35623562
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
35633563
# CONFIG_SQUASHFS_EMBEDDED is not set
35643564
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3

‎x86_64/4.5.7-apparmor/.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,7 @@ CONFIG_NETFILTER_XTABLES=y
843843
#
844844
CONFIG_NETFILTER_XT_MARK=y
845845
CONFIG_NETFILTER_XT_CONNMARK=m
846-
# CONFIG_NETFILTER_XT_SET is not set
846+
CONFIG_NETFILTER_XT_SET=y
847847

848848
#
849849
# Xtables targets
@@ -921,7 +921,7 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
921921
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
922922
CONFIG_NETFILTER_XT_MATCH_TIME=m
923923
CONFIG_NETFILTER_XT_MATCH_U32=m
924-
CONFIG_IP_SET=m
924+
CONFIG_IP_SET=y
925925
CONFIG_IP_SET_MAX=512
926926
CONFIG_IP_SET_BITMAP_IP=m
927927
CONFIG_IP_SET_BITMAP_IPMAC=m
@@ -3693,7 +3693,7 @@ CONFIG_SQUASHFS_DECOMP_SINGLE=y
36933693
CONFIG_SQUASHFS_ZLIB=y
36943694
CONFIG_SQUASHFS_LZ4=y
36953695
# CONFIG_SQUASHFS_LZO is not set
3696-
# CONFIG_SQUASHFS_XZ is not set
3696+
CONFIG_SQUASHFS_XZ=y
36973697
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
36983698
# CONFIG_SQUASHFS_EMBEDDED is not set
36993699
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3

‎x86_64/4.5.7-coreos/.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -937,7 +937,7 @@ CONFIG_NETFILTER_XTABLES=y
937937
#
938938
CONFIG_NETFILTER_XT_MARK=m
939939
CONFIG_NETFILTER_XT_CONNMARK=m
940-
CONFIG_NETFILTER_XT_SET=m
940+
CONFIG_NETFILTER_XT_SET=y
941941

942942
#
943943
# Xtables targets
@@ -1017,7 +1017,7 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
10171017
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
10181018
CONFIG_NETFILTER_XT_MATCH_TIME=m
10191019
CONFIG_NETFILTER_XT_MATCH_U32=m
1020-
CONFIG_IP_SET=m
1020+
CONFIG_IP_SET=y
10211021
CONFIG_IP_SET_MAX=512
10221022
CONFIG_IP_SET_BITMAP_IP=m
10231023
CONFIG_IP_SET_BITMAP_IPMAC=m

‎x86_64/4.5.7-debug/.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -845,7 +845,7 @@ CONFIG_NETFILTER_XTABLES=y
845845
#
846846
CONFIG_NETFILTER_XT_MARK=m
847847
CONFIG_NETFILTER_XT_CONNMARK=m
848-
# CONFIG_NETFILTER_XT_SET is not set
848+
CONFIG_NETFILTER_XT_SET=y
849849

850850
#
851851
# Xtables targets
@@ -923,7 +923,7 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
923923
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
924924
CONFIG_NETFILTER_XT_MATCH_TIME=m
925925
CONFIG_NETFILTER_XT_MATCH_U32=m
926-
CONFIG_IP_SET=m
926+
CONFIG_IP_SET=y
927927
CONFIG_IP_SET_MAX=512
928928
CONFIG_IP_SET_BITMAP_IP=m
929929
CONFIG_IP_SET_BITMAP_IPMAC=m
@@ -3692,7 +3692,7 @@ CONFIG_SQUASHFS_DECOMP_SINGLE=y
36923692
CONFIG_SQUASHFS_ZLIB=y
36933693
CONFIG_SQUASHFS_LZ4=y
36943694
# CONFIG_SQUASHFS_LZO is not set
3695-
# CONFIG_SQUASHFS_XZ is not set
3695+
CONFIG_SQUASHFS_XZ=y
36963696
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
36973697
# CONFIG_SQUASHFS_EMBEDDED is not set
36983698
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3

‎x86_64/4.5.7-docker/.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,7 @@ CONFIG_NETFILTER_XTABLES=y
850850
#
851851
CONFIG_NETFILTER_XT_MARK=y
852852
CONFIG_NETFILTER_XT_CONNMARK=y
853-
# CONFIG_NETFILTER_XT_SET is not set
853+
CONFIG_NETFILTER_XT_SET=y
854854

855855
#
856856
# Xtables targets
@@ -929,7 +929,7 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
929929
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
930930
CONFIG_NETFILTER_XT_MATCH_TIME=m
931931
CONFIG_NETFILTER_XT_MATCH_U32=m
932-
CONFIG_IP_SET=m
932+
CONFIG_IP_SET=y
933933
CONFIG_IP_SET_MAX=512
934934
CONFIG_IP_SET_BITMAP_IP=m
935935
CONFIG_IP_SET_BITMAP_IPMAC=m
@@ -3736,7 +3736,7 @@ CONFIG_SQUASHFS_DECOMP_SINGLE=y
37363736
CONFIG_SQUASHFS_ZLIB=y
37373737
CONFIG_SQUASHFS_LZ4=y
37383738
# CONFIG_SQUASHFS_LZO is not set
3739-
# CONFIG_SQUASHFS_XZ is not set
3739+
CONFIG_SQUASHFS_XZ=y
37403740
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
37413741
# CONFIG_SQUASHFS_EMBEDDED is not set
37423742
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3

‎x86_64/4.5.7-fedora/.config

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2117,7 +2117,20 @@ CONFIG_MISC_FILESYSTEMS=y
21172117
# CONFIG_EFS_FS is not set
21182118
# CONFIG_LOGFS is not set
21192119
# CONFIG_CRAMFS is not set
2120-
# CONFIG_SQUASHFS is not set
2120+
CONFIG_SQUASHFS=m
2121+
CONFIG_SQUASHFS_FILE_CACHE=y
2122+
# CONFIG_SQUASHFS_FILE_DIRECT is not set
2123+
CONFIG_SQUASHFS_DECOMP_SINGLE=y
2124+
# CONFIG_SQUASHFS_DECOMP_MULTI is not set
2125+
# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
2126+
# CONFIG_SQUASHFS_XATTR is not set
2127+
CONFIG_SQUASHFS_ZLIB=y
2128+
# CONFIG_SQUASHFS_LZ4 is not set
2129+
# CONFIG_SQUASHFS_LZO is not set
2130+
CONFIG_SQUASHFS_XZ=y
2131+
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
2132+
# CONFIG_SQUASHFS_EMBEDDED is not set
2133+
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
21212134
# CONFIG_VXFS_FS is not set
21222135
# CONFIG_MINIX_FS is not set
21232136
# CONFIG_OMFS_FS is not set

‎x86_64/4.5.7-rancher/.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -949,7 +949,7 @@ CONFIG_NETFILTER_XTABLES=y
949949
#
950950
CONFIG_NETFILTER_XT_MARK=m
951951
CONFIG_NETFILTER_XT_CONNMARK=m
952-
CONFIG_NETFILTER_XT_SET=m
952+
CONFIG_NETFILTER_XT_SET=y
953953

954954
#
955955
# Xtables targets
@@ -1029,7 +1029,7 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
10291029
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
10301030
CONFIG_NETFILTER_XT_MATCH_TIME=m
10311031
CONFIG_NETFILTER_XT_MATCH_U32=m
1032-
CONFIG_IP_SET=m
1032+
CONFIG_IP_SET=y
10331033
CONFIG_IP_SET_MAX=512
10341034
CONFIG_IP_SET_BITMAP_IP=m
10351035
CONFIG_IP_SET_BITMAP_IPMAC=m
@@ -3852,7 +3852,7 @@ CONFIG_MISC_FILESYSTEMS=y
38523852
# CONFIG_EFS_FS is not set
38533853
# CONFIG_LOGFS is not set
38543854
# CONFIG_CRAMFS is not set
3855-
CONFIG_SQUASHFS=m
3855+
CONFIG_SQUASHFS=y
38563856
CONFIG_SQUASHFS_FILE_CACHE=y
38573857
# CONFIG_SQUASHFS_FILE_DIRECT is not set
38583858
CONFIG_SQUASHFS_DECOMP_SINGLE=y

‎x86_64/4.5.7-std/.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ CONFIG_NETFILTER_XTABLES=y
842842
#
843843
CONFIG_NETFILTER_XT_MARK=m
844844
CONFIG_NETFILTER_XT_CONNMARK=m
845-
# CONFIG_NETFILTER_XT_SET is not set
845+
CONFIG_NETFILTER_XT_SET=y
846846

847847
#
848848
# Xtables targets
@@ -920,7 +920,7 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
920920
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
921921
CONFIG_NETFILTER_XT_MATCH_TIME=m
922922
CONFIG_NETFILTER_XT_MATCH_U32=m
923-
CONFIG_IP_SET=m
923+
CONFIG_IP_SET=y
924924
CONFIG_IP_SET_MAX=512
925925
CONFIG_IP_SET_BITMAP_IP=m
926926
CONFIG_IP_SET_BITMAP_IPMAC=m
@@ -3709,7 +3709,7 @@ CONFIG_SQUASHFS_DECOMP_SINGLE=y
37093709
CONFIG_SQUASHFS_ZLIB=y
37103710
CONFIG_SQUASHFS_LZ4=y
37113711
# CONFIG_SQUASHFS_LZO is not set
3712-
# CONFIG_SQUASHFS_XZ is not set
3712+
CONFIG_SQUASHFS_XZ=y
37133713
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
37143714
# CONFIG_SQUASHFS_EMBEDDED is not set
37153715
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3

0 commit comments

Comments
 (0)