From 6375ef3a8cd8b1b1e057334ab680c5c701123395 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 15 Nov 2018 09:35:38 +0100 Subject: sync with kernel 4.1[89] --- images/NEWS | 2 ++ kernel/list_modules.pm | 25 ++++++++++++------------ mdk-stage1/NEWS | 2 ++ perl-install/NEWS | 2 ++ perl-install/install/NEWS | 2 ++ perl-install/install/pkgs.pm | 45 ++++++++++++++++++++++++++++---------------- 6 files changed, 50 insertions(+), 28 deletions(-) diff --git a/images/NEWS b/images/NEWS index 79e0cd517..01c7d9892 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,5 @@ +- sync with kernel 4.1[89] + Version 2.52 - 25 July 2018 by Thomas Backlund - add missing smartpqi driver (mga#23305) diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm index 52a4f858c..b01c21d3c 100644 --- a/kernel/list_modules.pm +++ b/kernel/list_modules.pm @@ -27,21 +27,22 @@ our %l = ( qw(tc35815 tlan uli526x ), qw(b44 com20020-pci de2104x), qw(defxx), # most unused - qw(dgrs e100 eepro100 epic100 fealnx hamachi mlxsw_pci natsemi), + qw(dgrs e100 eepro100 epic100 fealnx hamachi mlx5_core mlxsw_pci natsemi), qw(ne2k-pci pcnet32 plip qede sis900 skfp starfire stmmac-platform tulip), qw(typhoon via-rhine winbond-840 xgene-enet forcedeth), qw(sungem sunhme), # drivers for ultrasparc, but compiled in ix86 kernels... qw(3c59x 8139too 8139cp cpmac niu sundance), #rtl8139 # add all phys qw(amd aquantia at803x bcm7xxx bcm87xx broadcom cicada cortina davicom dp83848 dp83867 et1011c fixed_phy icplus intel-xway), - qw(lxt marwell marwell10g mdio-bitbang mdio-cavium mdio-gpio mdio-thunder micrel microchip mscc national), + qw(lxt marwell macb macb_pci marwell10g mdio-bcm-unimac mdio-bitbang mdio-cavium mdio-gpio mdio-i2c), + qw(mdio-mscc-mii mdio-thunder micrel microchip microchip_t1 mscc national phylink), qw(phy-bcm-kona-usb2 phy-cpcap-usb phy-exynos-usb2 phy-pxa-28nm-hsic), qw(phy-pxa-28nm-usb2 phy-qcom-usb-hs phy-qcom-usb-hsic phy-tusb1210), - qw(qsemi r8152 r815x realtek rockchip smsc spi_ks8995 ste10Xp teranetics vitesse xilinx_gmii2rgmii), + qw(qsemi r8152 r815x realtek rockchip sfp smsc spi_ks8995 ste10Xp teranetics vitesse xilinx_gmii2rgmii), ], firewire => [ qw(eth1394 pcilynx) ], gigabit => [ - qw(amd-xgbe alx atl1 atl1c atl1e atlantic at91_ether ax88179_178a be2net bna bnx2 bnx2x bnxt_en cxgb cxgb3 cxgb4 dl2k dwc-xlgmac e1000 e1000e et131x), + qw(amd-xgbe alx atl1 atl1c atl1e atlantic at91_ether ax88179_178a bcmsysport be2net bna bnx2 bnx2x bnxt_en cxgb cxgb3 cxgb4 dl2k dwc-xlgmac e1000 e1000e et131x), qw(hinic hfi1 igb ipg ixgb ixgbe lan78xx liquidio liquidio_vf macb mlx4_core mlx4_en mlx5_core mvmdio myri_sbus myri10ge netxen_nic ns83820 pch_gbe), qw(qla3xxx r8169 s2io samsung-sxgbe sfc sfc-falcon sxg_nic sis190 sk98lin skge sky2 slicoss spidernet stmmac tehuti tg3 via-velocity vxge yellowfin), qw(bcm5820 bcm5700), #- encrypted @@ -67,7 +68,7 @@ our %l = ( qw(ath_pci atmel_cs atmel_pci b43 b43legacy bcm43xx bcm_wimax bcma brcm80211 brcmsmac brcmfmac carl9170 com20020_cs), qw(dyc_ar5 hostap_cs hostap_pci hostap_plx i2400m_usb ipw2100), qw(ipw2200 ipw3945 iwl3945 iwl4965 iwlagn iwldvm iwlmvm iwlwifi libertas_spi madwifi_pci), - qw(mt76x2e mt7601u mwifiex_pcie mwifiex_sdio mwifiex_usb mwl8k ndiswrapper netwave_cs orinoco orinoco_cs), + qw(mt76x0 mt76x2e mt76x2u mt7601u mwifiex_pcie mwifiex_sdio mwifiex_usb mwl8k ndiswrapper netwave_cs orinoco orinoco_cs), qw(orinoco_nortel orinoco_pci orinoco_plx orinoco_tmd orinoco_usb p54pci p54spi), qw(p54usb prism2_cs prism2_pci prism2_usb prism54 qmi_wwan qtnfmac qtnfmac_pearl_pcie r8180), qw(r8187se rtl8188ee rtl8192ce r8192_pci r8192s_usb r8192u_usb r8712u r8723bs r8822be ray_cs rndis_wlan rsi_sdio rsi_usb rt2400 rt2400pci rt2500), @@ -156,7 +157,7 @@ our %l = ( bus => { - usb => [ qw(bcma-hcd c67x00 dwc3 dwc3-pci ehci-hcd ehci-pci ehci-platform ehci-tegra fhci fusbh200-hcd hwa-hc + usb => [ qw(bcma-hcd c67x00 dwc3-haps dwc3 dwc3-pci ehci-hcd ehci-pci ehci-platform ehci-tegra fhci fusbh200-hcd hwa-hc imx21-hcd isp116x-hcd isp1362-hcd isp1760 ohci-hcd ohci-pci ohci-platform oxu210hp-hcd r8a66597-hcd renesas-usbhs sl811_cs sl811-hcd ssb-hcd u132-hcd uhci-hcd usb-ohci usb-uhci vhci-hcd whci-hcd xhci-hcd xhci-pci xhci-plat-hcd) ], @@ -171,15 +172,15 @@ our %l = ( qw(au1x00_ss i82365 i82092 pd6729 tcic vrc4171_card vrc4173_cardu yenta_socket), # cb_enabler ], hid => [ qw(ff-memless hid hid-a4tech hid-apple hid-appleir hid-asus hid-aureal hid-axff hid-belkin hid-betopff - hid-cherry hid-chicony hid-cmedia hid-corsair hid-cp2112 hid-cypress hid-dr hid-drff hid-elan hid-elecom hid-elo hid-emsff + hid-cherry hid-chicony hid-cmedia hid-corsair hid-cougar hid-cp2112 hid-cypress hid-dr hid-drff hid-elan hid-elecom hid-elo hid-emsff hid-ezkey hid-gaff hid-gembird hid-generic hid-gfrm hid-google-hammer hid-gt683r hid-gyration hid-holtek-kbd hid-holtekff hid-holtek-mouse hid-hyperv hid-icade hid-ite hid-jabra hid-kensington hid-keytouch hid-kye hid-lcpower hid-led hid-lenovo hid-lenovo-tpkbd hid-logitech hid-logitech-dj hid-logitech-hidpp hid-magicmouse hid-mf hid-microsoft hid-monterey hid-multilaser hid-multitouch hid-ntrig hid-ortek hid-penmount hid-petalynx hid-picolcd - hid-pl hid-plantronics hid-primax hid-prodikeys hid-retrode hid-roccat hid-roccat-arvo hid-roccat-common hid-rmi + hid-pl hid-plantronics hid-primax hid-prodikeys hid_redragon hid-retrode hid-roccat hid-roccat-arvo hid-roccat-common hid-rmi hid-roccat-isku hid-roccat-kone hid-roccat-koneplus hid-roccat-konepure hid-roccat-kovaplus hid-roccat-lua hid-roccat-pyra hid-roccat-ryos hid-roccat-savu hid-saitek hid-samsung hid-sensor-hub hid_sensor_accel_3d hid_sensor_gyro_3d hid_sensor_trigger hid-sjoy hid-sony - hid-speedlink hid-steelseries hid-sunplus hid-tivo hid-tmff hid-topseed hid-twinhan + hid-speedlink hid_steam hid-steelseries hid-sunplus hid-tivo hid-tmff hid-topseed hid-twinhan hid-uclogic hid-waltop hid-wiimote hid-xinmo hid-zpff hid-zydacron wacom intel-ish-ipc intel-ishtp-hid intel-ishtp) ], @@ -223,7 +224,7 @@ our %l = ( qw(snd-opl3sa2 snd-opti92x-ad1848 snd-opti92x-cs4231 snd-opti93x snd-oxygen snd-pcsp snd-pcxhr snd-riptide snd-rme32), qw(snd-rme96 snd-rme9652 snd-sb16 snd-sb8 snd-sbawe snd-sc6000 snd-sgalaxy snd-sis7019 snd-sonicvibes), qw(snd-sscape snd-trident snd-usb-variax snd-via82xx snd-virtuoso snd-vx222 snd-vxp440 snd-vxpocket snd-wavefront), - qw(snd-ymfpci sonicvibes sscape trident via82cxxx_audio wavefront ymfpci), + qw(snd_xen_front snd-ymfpci sonicvibes sscape trident via82cxxx_audio wavefront ymfpci), ], tv => [ qw(bt878 bttv cx23885 cx25821 cx8800 cx8802 cx88-blackbird dpc7146), qw(em28xx ivtv mxb pvrusb2 saa7134 saa7164 zr36067) ], @@ -282,7 +283,7 @@ our %l = ( remote => [ qw(ati_remote) ], # USB tablets and touchscreens: tablet => [ qw(acecad aiptek wacom wacom_serial4 kbtab) ], - touchscreen => [ qw(ads7846_ts gunze hp680_ts_input itmtouch mk712 mtouch sur40 usbtouchscreen) ], + touchscreen => [ qw(ads7846_ts bu21013_ts bu21029_ts gunze hp680_ts_input itmtouch mk712 mtouch sur40 usbtouchscreen) ], }, various => @@ -319,7 +320,7 @@ our %l = ( 'cryptoloop', 'ulpi', qw(hv_balloon hyperv_fb pci-hyperv), - qw(vboxguest vboxvideo virtio_balloon vmw_balloon), + qw(vboxsf vboxguest vboxvideo virtio_balloon vmw_balloon), qw(crc32c crc32c-intel), 'nvme', diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index 08009af26..2be4183e8 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -1,3 +1,5 @@ +- sync with kernel 4.1[89] + 2.30 - add missing smartpqi driver (mga#23305) diff --git a/perl-install/NEWS b/perl-install/NEWS index 7780e56d5..f00adf34c 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- recognize new kernel 4.1[89] drivers + Version 18.4 - 4 Nov 2018 - adapt drakdm and set_autologin for display-manager service, not prefdm (mga#22593) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 350c28d1d..18d4c09c4 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- recognize new kernel 4.1[89] drivers + Version 18.4 - 4 Nov 2018 - adapt set_autologin for display-manager service, not prefdm (mga#22593) diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index c859fb880..87ff120bb 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -842,10 +842,18 @@ sub _unselect_package { sub is_package_installed { my ($db, $pkg) = @_; my $check_installed; + my $done; + my $n=$pkg->name; $db->traverse_tag('name', [ $pkg->name ], sub { my ($p) = @_; + $done = 1; $check_installed ||= $pkg->compare_pkg($p) == 0; + log::l(">> ". $pkg->EVR . " vs ". $p->EVR. " --> check_installed=$check_installed\n"); + warn ">> ". $pkg->EVR . " vs ". $p->EVR. " --> check_installed=$check_installed\n"; + }); + my $real = `rpm -q $n`; + log::l("check_installed=0 for $n b/c pkg wasn't found in db VS $real") if !$done; return $check_installed; } @@ -865,26 +873,21 @@ sub _install_raw { log::l("rpm transactions start"); - my ($is_installing, $verify_just_closed); + my ($is_installing); my $exit_code = urpm::main_loop::run($packages, $packages->{state}, undef, undef, { - open_helper => $callback, + open_helper => sub { + my ($db, $packages, $type, $id) = @_; + log::l("OPENING (is_installing=$is_installing) ($db, $packages, $type, $id)\n"); + &$callback; + }, verify => sub { - my ($_data, $_cb_type, $_pkg_id, $subtype, $_amout, $_total, $_pkg_name) = @_; - if ($subtype eq 'start') { - $is_installing = 0; - } elsif ($subtype eq 'stop') { - $is_installing = 1; - $verify_just_closed = 1; - } + my ($data, $cb_type, $pkg_id, $subtype, $amout, $total) = @_; + log::l("VERIFY($data, $cb_type, $pkg_id, $subtype, $amout, $total)\n"); }, close_helper => sub { - my ($db, $packages, $_type, $id) = @_; + my ($db, $packages, $type, $id) = @_; + log::l("CLOSING (is_installing=$is_installing) ($db, $packages, $type, $id)\n"); &$callback; - # ignore first close after end of verify: - if ($is_installing && $verify_just_closed) { - undef $verify_just_closed; - return; - } return if !$is_installing; # don't check if it's installed if it's being verified my $pkg = defined $id && $packages->{depslist}[$id] or return; print $LOG $pkg->fullname . "\n"; @@ -898,7 +901,17 @@ sub _install_raw { } else { log::l($pkg->name . " not installed, " . URPM::rpmErrorString()); } - }, inst => $callback, + }, inst => sub { + my ($data, $cb_type, $pkg_id, $subtype, $amout, $total) = @_; + log::l("INSTALL($data, $cb_type, $pkg_id, $subtype, $amout, $total)\n"); + #eg: * VERIFY(urpm=HASH(0x35cd608), verify, 17729, progress, 1, 51, ) + if ($subtype eq 'start') { + $is_installing = 1; + } elsif ($subtype eq 'stop') { + $is_installing = 0; + } + &$callback; + }, trans => $callback, # FIXME: implement already_installed_or_not_installable bad_signature => sub { -- cgit v1.2.1