From 3d2417bdd4cef48d836ee01695d134107aaaa7d0a9d4e12664287e1701cc7ae2 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 12 Aug 2019 13:15:06 +0000 Subject: [PATCH] Accepting request 721876 from home:michals - Shorten module list by using wildcards. OBS-URL: https://build.opensuse.org/request/show/721876 OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-default-base?expand=0&rev=14 --- kernel-default-base.changes | 5 ++++ kernel-default-base.spec | 57 ++++--------------------------------- 2 files changed, 11 insertions(+), 51 deletions(-) diff --git a/kernel-default-base.changes b/kernel-default-base.changes index a6b7f93..8c632a6 100644 --- a/kernel-default-base.changes +++ b/kernel-default-base.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 8 21:35:08 UTC 2019 - Michal Suchanek + +- Shorten module list by using wildcards. + ------------------------------------------------------------------- Fri Jul 26 12:43:32 UTC 2019 - Fabian Vogt diff --git a/kernel-default-base.spec b/kernel-default-base.spec index 5faa45d..435f985 100644 --- a/kernel-default-base.spec +++ b/kernel-default-base.spec @@ -27,13 +27,11 @@ %define misc_modules button edd iscsi_ibft i6300esb -%define virtio_modules virtio_blk virtio-rng virtio_console virtio-gpu \ -virtio_net virtio_scsi virtio virtio_balloon virtio_input virtio_mmio \ -virtio_pci virtio_ring +%define virtio_modules virtio virtio_.* virtio-.* -%define xen_modules xen-blkfront xen-kbdfront xen-netfront xen-fbfront xenblk xennet +%define xen_modules xenblk xennet xen-.* -%define vmware_modules vmw_balloon vmw_vmci vmxnet3 vmw_pvscsi vmw_vsock_vmci_transport +%define vmware_modules vmxnet3 vmw_.* %define hyperv_modules hid-hyperv hv_balloon hv_utils \ hv_vmbus hyperv-keyboard hv_netvsc hv_storvsc scsi_transport_fc hyperv_fb @@ -53,52 +51,9 @@ ums-realtek ums-sddr09 ums-sddr55 ums-usbat usb-storage nls_cp437 nls_iso8859-1 %define networking \ -af_packet arptable_filter arp_tables arpt_mangle bpfilter bridge br_netfilter \ -ebt_802_3 ebtable_broute ebtable_filter ebtable_nat ebtables ebt_among ebt_arp \ -ebt_arpreply ebt_dnat ebt_ip ebt_ip6 ebt_limit ebt_log ebt_mark ebt_mark_m \ -ebt_nflog ebt_pkttype ebt_redirect ebt_snat ebt_stp ebt_vlan ip6table_filter \ -ip6table_mangle ip6table_nat ip6table_raw ip6_tables ip6table_security ip6t_ah \ -ip6t_eui64 ip6t_frag ip6t_hbh ip6t_ipv6header ip6t_MASQUERADE ip6t_mh ip6t_NPT \ -ip6t_REJECT ip6t_rpfilter ip6t_rt ip6t_srh ip6t_SYNPROXY ip_set \ -ip_set_bitmap_ip ip_set_bitmap_ipmac ip_set_bitmap_port ip_set_hash_ip \ -ip_set_hash_ipmac ip_set_hash_ipmark ip_set_hash_ipport ip_set_hash_ipportip \ -ip_set_hash_ipportnet ip_set_hash_mac ip_set_hash_net ip_set_hash_netiface \ -ip_set_hash_netnet ip_set_hash_netport ip_set_hash_netportnet ip_set_list_set \ -iptable_filter iptable_mangle iptable_nat iptable_raw ip_tables \ -iptable_security ipt_ah ipt_CLUSTERIP ipt_ECN ipt_MASQUERADE ipt_REJECT \ -ipt_rpfilter ipt_SYNPROXY ip_vs ip_vs_dh ip_vs_fo ip_vs_ftp ip_vs_lblc \ -ip_vs_lblcr ip_vs_lc ip_vs_mh ip_vs_nq ip_vs_ovf ip_vs_pe_sip ip_vs_rr \ -ip_vs_sed ip_vs_sh ip_vs_wlc ip_vs_wrr nf_conncount nf_conntrack \ -nf_conntrack_amanda nf_conntrack_broadcast nf_conntrack_ftp nf_conntrack_h323 \ -nf_conntrack_ipv4 nf_conntrack_ipv6 nf_conntrack_irc nf_conntrack_netbios_ns \ -nf_conntrack_netlink nf_conntrack_pptp nf_conntrack_proto_gre nf_conntrack_sane \ -nf_conntrack_sip nf_conntrack_slp nf_conntrack_snmp nf_conntrack_tftp \ -nf_defrag_ipv4 nf_defrag_ipv6 nf_dup_ipv4 nf_dup_ipv6 nf_dup_netdev \ -nf_flow_table nf_flow_table_inet nf_flow_table_ipv4 nf_flow_table_ipv6 \ -nf_log_arp nf_log_bridge nf_log_common nf_log_ipv4 nf_log_ipv6 nf_log_netdev \ -nf_nat nf_nat_amanda nf_nat_ftp nf_nat_h323 nf_nat_ipv4 nf_nat_ipv6 nf_nat_irc \ -nf_nat_masquerade_ipv4 nf_nat_masquerade_ipv6 nf_nat_pptp nf_nat_proto_gre \ -nf_nat_redirect nf_nat_sip nf_nat_snmp_basic nf_nat_tftp nfnetlink \ -nfnetlink_acct nfnetlink_cthelper nfnetlink_cttimeout nfnetlink_log \ -nfnetlink_osf nfnetlink_queue nf_reject_ipv4 nf_reject_ipv6 nf_socket_ipv4 \ -nf_socket_ipv6 nf_synproxy_core nf_tables nf_tables_set nft_chain_nat \ -nft_compat nft_connlimit nft_counter nft_ct nft_dup_ipv4 nft_dup_ipv6 \ -nft_dup_netdev nft_fib nft_fib_inet nft_fib_ipv4 nft_fib_ipv6 nft_fib_netdev \ -nft_flow_offload nft_fwd_netdev nft_hash nft_limit nft_log nft_masq nft_nat \ -nft_numgen nft_objref nft_osf nf_tproxy_ipv4 nf_tproxy_ipv6 nft_queue nft_quota \ -nft_redir nft_reject nft_reject_bridge nft_reject_inet nft_reject_ipv4 \ -nft_reject_ipv6 nft_socket nft_tproxy nft_tunnel nft_xfrm tun veth xfrm4_tunnel \ -xfrm6_tunnel xfrm_algo xfrm_interface xfrm_ipcomp xfrm_user x_tables \ -xt_addrtype xt_AUDIT xt_bpf xt_cgroup xt_CHECKSUM xt_CLASSIFY xt_cluster \ -xt_comment xt_connbytes xt_connlabel xt_connlimit xt_connmark xt_CONNSECMARK \ -xt_conntrack xt_cpu xt_CT xt_dccp xt_devgroup xt_dscp xt_DSCP xt_ecn xt_esp \ -xt_hashlimit xt_helper xt_hl xt_HL xt_HMARK xt_IDLETIMER xt_ipcomp xt_iprange \ -xt_ipvs xt_l2tp xt_LED xt_length xt_limit xt_LOG xt_mac xt_mark xt_MASQUERADE \ -xt_multiport xt_nat xt_NETMAP xt_nfacct xt_NFLOG xt_NFQUEUE xt_osf xt_owner \ -xt_physdev xt_pkttype xt_policy xt_quota xt_rateest xt_RATEEST xt_realm \ -xt_recent xt_REDIRECT xt_sctp xt_SECMARK xt_set xt_socket xt_state xt_statistic \ -xt_string xt_tcpmss xt_TCPMSS xt_TCPOPTSTRIP xt_tcpudp xt_TEE xt_time xt_TPROXY \ -xt_TRACE xt_u32 +af_packet arptable_filter arp_tables arpt_mangle bpfilter bridge br_netfilter \ +ebt_.* ebtable_.* ebtables ip6table_.* ip6_tables ip6t_* ip_.* ipt_.* iptable_.* \ +nf_.* nfnetlink.* nft_.* tun veth xfrm._tunnel xfrm_.* x_tables xt_.* %define modules %usb_modules %net_drivers %scsi_modules %block_drivers \ %hyperv_modules %virtio_modules %vmware_modules %xen_modules \