Merge branch 'master' of https://github.com/pisilinux/core
This commit is contained in:
@@ -12,10 +12,11 @@
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>Userland logical volume management tools</Summary>
|
||||
<Description>LVM2 includes all of the support for handling read/write operations physical and logical volumes.</Description>
|
||||
<Archive sha1sum="2a7cce6407d91847731d8f2ca2b4ba7dee03225a" type="targz">ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.142.tgz</Archive>
|
||||
<Archive sha1sum="35b7358ebefefbf1fceb50bf282c328203248bdb" type="targz">ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.167.tgz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>libutil-linux-devel</Dependency>
|
||||
<Dependency>eudev-devel</Dependency>
|
||||
<Dependency>autoconf-archive</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!--<Patch level="1">lvm2-2.02.63-always-make-static-libdm.patch</Patch>
|
||||
@@ -188,6 +189,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-29</Date>
|
||||
<Version>2.02.167</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>2.02.142</Version>
|
||||
|
||||
@@ -13,6 +13,9 @@
|
||||
<Summary>Utility to control Linux MD devices (software RAID arrays)</Summary>
|
||||
<Description>mdadm is used to create, manage, and monitor Linux MD (software RAID) devices.</Description>
|
||||
<Archive sha1sum="0b6c284970567bfa30dbc14ea5c0e2320582b80c" type="tarxz">https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-3.4.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>dietlibc</Dependency>
|
||||
</BuildDependencies>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
@@ -51,6 +54,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-29</Date>
|
||||
<Version>3.4</Version>
|
||||
<Comment>Release Bump</Comment>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>3.4</Version>
|
||||
|
||||
@@ -27,6 +27,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-29</Date>
|
||||
<Version>4.0.18</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>4.0.18</Version>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86_64 4.8.13 Kernel Configuration
|
||||
# Linux/x86_64 4.9.6 Kernel Configuration
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
CONFIG_X86_64=y
|
||||
@@ -46,6 +46,7 @@ CONFIG_PGTABLE_LEVELS=4
|
||||
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
|
||||
CONFIG_IRQ_WORK=y
|
||||
CONFIG_BUILDTIME_EXTABLE_SORT=y
|
||||
CONFIG_THREAD_INFO_IN_TASK=y
|
||||
|
||||
#
|
||||
# General setup
|
||||
@@ -311,6 +312,8 @@ CONFIG_HAVE_STACK_VALIDATION=y
|
||||
CONFIG_OLD_SIGSUSPEND3=y
|
||||
CONFIG_COMPAT_OLD_SIGACTION=y
|
||||
# CONFIG_CPU_NO_EFFICIENT_FFS is not set
|
||||
CONFIG_HAVE_ARCH_VMAP_STACK=y
|
||||
CONFIG_VMAP_STACK=y
|
||||
|
||||
#
|
||||
# GCOV-based kernel profiling
|
||||
@@ -361,6 +364,7 @@ CONFIG_EFI_PARTITION=y
|
||||
# CONFIG_SYSV68_PARTITION is not set
|
||||
CONFIG_CMDLINE_PARTITION=y
|
||||
CONFIG_BLOCK_COMPAT=y
|
||||
CONFIG_BLK_MQ_PCI=y
|
||||
|
||||
#
|
||||
# IO Schedulers
|
||||
@@ -409,6 +413,7 @@ CONFIG_X86_EXTENDED_PLATFORM=y
|
||||
# CONFIG_X86_UV is not set
|
||||
# CONFIG_X86_GOLDFISH is not set
|
||||
# CONFIG_X86_INTEL_MID is not set
|
||||
# CONFIG_MLX_PLATFORM is not set
|
||||
# CONFIG_X86_INTEL_LPSS is not set
|
||||
CONFIG_X86_AMD_PLATFORM_DEVICE=y
|
||||
CONFIG_IOSF_MBI=m
|
||||
@@ -622,7 +627,6 @@ CONFIG_PM_DEBUG=y
|
||||
# CONFIG_PM_ADVANCED_DEBUG is not set
|
||||
CONFIG_PM_TEST_SUSPEND=y
|
||||
CONFIG_PM_SLEEP_DEBUG=y
|
||||
# CONFIG_DPM_WATCHDOG is not set
|
||||
CONFIG_PM_TRACE=y
|
||||
CONFIG_PM_TRACE_RTC=y
|
||||
CONFIG_PM_CLK=y
|
||||
@@ -677,6 +681,7 @@ CONFIG_ACPI_APEI_MEMORY_FAILURE=y
|
||||
# CONFIG_ACPI_APEI_EINJ is not set
|
||||
# CONFIG_ACPI_APEI_ERST_DEBUG is not set
|
||||
CONFIG_DPTF_POWER=m
|
||||
CONFIG_ACPI_WATCHDOG=y
|
||||
CONFIG_ACPI_EXTLOG=m
|
||||
# CONFIG_PMIC_OPREGION is not set
|
||||
CONFIG_ACPI_CONFIGFS=m
|
||||
@@ -755,6 +760,7 @@ CONFIG_PCIEASPM_DEFAULT=y
|
||||
# CONFIG_PCIEASPM_PERFORMANCE is not set
|
||||
CONFIG_PCIE_PME=y
|
||||
# CONFIG_PCIE_DPC is not set
|
||||
# CONFIG_PCIE_PTM is not set
|
||||
CONFIG_PCI_BUS_ADDR_T_64BIT=y
|
||||
CONFIG_PCI_MSI=y
|
||||
CONFIG_PCI_MSI_IRQ_DOMAIN=y
|
||||
@@ -778,6 +784,7 @@ CONFIG_HOTPLUG_PCI_SHPC=m
|
||||
# PCI host controller drivers
|
||||
#
|
||||
# CONFIG_PCIE_DW_PLAT is not set
|
||||
# CONFIG_VMD is not set
|
||||
CONFIG_ISA_DMA_API=y
|
||||
CONFIG_AMD_NB=y
|
||||
CONFIG_PCCARD=y
|
||||
@@ -820,7 +827,6 @@ CONFIG_SYSVIPC_COMPAT=y
|
||||
CONFIG_KEYS_COMPAT=y
|
||||
CONFIG_X86_DEV_DMA_OPS=y
|
||||
CONFIG_PMC_ATOM=y
|
||||
# CONFIG_VMD is not set
|
||||
CONFIG_NET=y
|
||||
CONFIG_COMPAT_NETLINK_MESSAGES=y
|
||||
CONFIG_NET_INGRESS=y
|
||||
@@ -893,6 +899,7 @@ CONFIG_TCP_CONG_YEAH=m
|
||||
CONFIG_TCP_CONG_ILLINOIS=m
|
||||
# CONFIG_TCP_CONG_DCTCP is not set
|
||||
# CONFIG_TCP_CONG_CDG is not set
|
||||
# CONFIG_TCP_CONG_BBR is not set
|
||||
CONFIG_DEFAULT_CUBIC=y
|
||||
# CONFIG_DEFAULT_RENO is not set
|
||||
CONFIG_DEFAULT_TCP_CONG="cubic"
|
||||
@@ -986,9 +993,10 @@ CONFIG_NF_TABLES_INET=m
|
||||
# CONFIG_NF_TABLES_NETDEV is not set
|
||||
CONFIG_NFT_EXTHDR=m
|
||||
CONFIG_NFT_META=m
|
||||
# CONFIG_NFT_NUMGEN is not set
|
||||
CONFIG_NFT_CT=m
|
||||
CONFIG_NFT_RBTREE=m
|
||||
CONFIG_NFT_HASH=m
|
||||
# CONFIG_NFT_SET_RBTREE is not set
|
||||
# CONFIG_NFT_SET_HASH is not set
|
||||
CONFIG_NFT_COUNTER=m
|
||||
CONFIG_NFT_LOG=m
|
||||
CONFIG_NFT_LIMIT=m
|
||||
@@ -996,9 +1004,11 @@ CONFIG_NFT_LIMIT=m
|
||||
# CONFIG_NFT_REDIR is not set
|
||||
CONFIG_NFT_NAT=m
|
||||
CONFIG_NFT_QUEUE=m
|
||||
# CONFIG_NFT_QUOTA is not set
|
||||
CONFIG_NFT_REJECT=m
|
||||
CONFIG_NFT_REJECT_INET=m
|
||||
CONFIG_NFT_COMPAT=m
|
||||
CONFIG_NFT_HASH=m
|
||||
CONFIG_NETFILTER_XTABLES=y
|
||||
|
||||
#
|
||||
@@ -1152,7 +1162,6 @@ CONFIG_IP_VS_PE_SIP=m
|
||||
#
|
||||
CONFIG_NF_DEFRAG_IPV4=m
|
||||
CONFIG_NF_CONNTRACK_IPV4=m
|
||||
# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
|
||||
CONFIG_NF_TABLES_IPV4=m
|
||||
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
|
||||
CONFIG_NFT_REJECT_IPV4=m
|
||||
@@ -1403,7 +1412,9 @@ CONFIG_NET_ACT_CSUM=m
|
||||
# CONFIG_NET_ACT_VLAN is not set
|
||||
CONFIG_NET_ACT_BPF=m
|
||||
CONFIG_NET_ACT_CONNMARK=m
|
||||
# CONFIG_NET_ACT_SKBMOD is not set
|
||||
# CONFIG_NET_ACT_IFE is not set
|
||||
# CONFIG_NET_ACT_TUNNEL_KEY is not set
|
||||
CONFIG_NET_CLS_IND=y
|
||||
CONFIG_NET_SCH_FIFO=y
|
||||
CONFIG_DCB=y
|
||||
@@ -1414,6 +1425,7 @@ CONFIG_BATMAN_ADV_BLA=y
|
||||
CONFIG_BATMAN_ADV_DAT=y
|
||||
# CONFIG_BATMAN_ADV_NC is not set
|
||||
# CONFIG_BATMAN_ADV_MCAST is not set
|
||||
CONFIG_BATMAN_ADV_DEBUGFS=y
|
||||
# CONFIG_BATMAN_ADV_DEBUG is not set
|
||||
CONFIG_OPENVSWITCH=m
|
||||
CONFIG_OPENVSWITCH_GRE=m
|
||||
@@ -1562,6 +1574,7 @@ CONFIG_BT_HCIUART_INTEL=y
|
||||
CONFIG_BT_HCIUART_BCM=y
|
||||
CONFIG_BT_HCIUART_QCA=y
|
||||
# CONFIG_BT_HCIUART_AG6XX is not set
|
||||
# CONFIG_BT_HCIUART_MRVL is not set
|
||||
CONFIG_BT_HCIBCM203X=m
|
||||
CONFIG_BT_HCIBPA10X=m
|
||||
CONFIG_BT_HCIBFUSB=m
|
||||
@@ -1576,6 +1589,7 @@ CONFIG_BT_ATH3K=m
|
||||
CONFIG_BT_WILINK=m
|
||||
# CONFIG_AF_RXRPC is not set
|
||||
# CONFIG_AF_KCM is not set
|
||||
# CONFIG_STREAM_PARSER is not set
|
||||
CONFIG_FIB_RULES=y
|
||||
CONFIG_WIRELESS=y
|
||||
CONFIG_WIRELESS_EXT=y
|
||||
@@ -1859,7 +1873,6 @@ CONFIG_SENSORS_APDS990X=m
|
||||
# CONFIG_HMC6352 is not set
|
||||
# CONFIG_DS1682 is not set
|
||||
CONFIG_VMWARE_BALLOON=m
|
||||
# CONFIG_BMP085_I2C is not set
|
||||
# CONFIG_USB_SWITCH_FSA9480 is not set
|
||||
# CONFIG_SRAM is not set
|
||||
# CONFIG_PANEL is not set
|
||||
@@ -2015,6 +2028,7 @@ CONFIG_SCSI_MPT3SAS=m
|
||||
CONFIG_SCSI_MPT2SAS_MAX_SGE=128
|
||||
CONFIG_SCSI_MPT3SAS_MAX_SGE=128
|
||||
CONFIG_SCSI_MPT2SAS=m
|
||||
# CONFIG_SCSI_SMARTPQI is not set
|
||||
CONFIG_SCSI_UFSHCD=m
|
||||
CONFIG_SCSI_UFSHCD_PCI=m
|
||||
CONFIG_SCSI_UFS_DWC_TC_PCI=m
|
||||
@@ -2256,7 +2270,6 @@ CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
|
||||
CONFIG_NET_TEAM_MODE_LOADBALANCE=m
|
||||
CONFIG_MACVLAN=m
|
||||
CONFIG_MACVTAP=m
|
||||
CONFIG_IPVLAN=m
|
||||
CONFIG_VXLAN=m
|
||||
CONFIG_GENEVE=m
|
||||
# CONFIG_GTP is not set
|
||||
@@ -2315,6 +2328,8 @@ CONFIG_NET_VENDOR_ALTEON=y
|
||||
CONFIG_ACENIC=m
|
||||
# CONFIG_ACENIC_OMIT_TIGON_I is not set
|
||||
CONFIG_ALTERA_TSE=m
|
||||
CONFIG_NET_VENDOR_AMAZON=y
|
||||
CONFIG_ENA_ETHERNET=m
|
||||
CONFIG_NET_VENDOR_AMD=y
|
||||
CONFIG_AMD8111_ETH=m
|
||||
CONFIG_PCNET32=m
|
||||
@@ -2348,6 +2363,7 @@ CONFIG_NET_VENDOR_CAVIUM=y
|
||||
# CONFIG_THUNDER_NIC_PF is not set
|
||||
# CONFIG_THUNDER_NIC_VF is not set
|
||||
# CONFIG_THUNDER_NIC_BGX is not set
|
||||
CONFIG_THUNDER_NIC_RGX=m
|
||||
# CONFIG_LIQUIDIO is not set
|
||||
CONFIG_NET_VENDOR_CHELSIO=y
|
||||
CONFIG_CHELSIO_T1=m
|
||||
@@ -2461,9 +2477,12 @@ CONFIG_QLCNIC_HWMON=y
|
||||
CONFIG_QLGE=m
|
||||
CONFIG_NETXEN_NIC=m
|
||||
CONFIG_QED=m
|
||||
CONFIG_QED_LL2=y
|
||||
CONFIG_QED_SRIOV=y
|
||||
CONFIG_QEDE=m
|
||||
CONFIG_QED_RDMA=y
|
||||
CONFIG_NET_VENDOR_QUALCOMM=y
|
||||
CONFIG_QCOM_EMAC=m
|
||||
CONFIG_NET_VENDOR_REALTEK=y
|
||||
CONFIG_ATP=m
|
||||
CONFIG_8139CP=m
|
||||
@@ -2529,41 +2548,47 @@ CONFIG_PCMCIA_XIRC2PS=m
|
||||
CONFIG_PHYLIB=y
|
||||
CONFIG_SWPHY=y
|
||||
|
||||
#
|
||||
# MDIO bus device drivers
|
||||
#
|
||||
# CONFIG_MDIO_BCM_UNIMAC is not set
|
||||
CONFIG_MDIO_BITBANG=m
|
||||
CONFIG_MDIO_CAVIUM=m
|
||||
CONFIG_MDIO_GPIO=m
|
||||
CONFIG_MDIO_OCTEON=m
|
||||
CONFIG_MDIO_THUNDER=m
|
||||
|
||||
#
|
||||
# MII PHY device drivers
|
||||
#
|
||||
CONFIG_AMD_PHY=m
|
||||
CONFIG_AQUANTIA_PHY=m
|
||||
CONFIG_AT803X_PHY=m
|
||||
CONFIG_AMD_PHY=m
|
||||
CONFIG_MARVELL_PHY=m
|
||||
CONFIG_DAVICOM_PHY=m
|
||||
CONFIG_QSEMI_PHY=m
|
||||
CONFIG_LXT_PHY=m
|
||||
CONFIG_CICADA_PHY=m
|
||||
CONFIG_VITESSE_PHY=m
|
||||
CONFIG_TERANETICS_PHY=m
|
||||
CONFIG_SMSC_PHY=m
|
||||
CONFIG_BCM_NET_PHYLIB=m
|
||||
CONFIG_BROADCOM_PHY=m
|
||||
CONFIG_BCM7XXX_PHY=m
|
||||
CONFIG_BCM87XX_PHY=m
|
||||
CONFIG_ICPLUS_PHY=m
|
||||
CONFIG_REALTEK_PHY=m
|
||||
CONFIG_NATIONAL_PHY=m
|
||||
CONFIG_STE10XP=m
|
||||
CONFIG_LSI_ET1011C_PHY=m
|
||||
CONFIG_MICREL_PHY=m
|
||||
CONFIG_BCM_NET_PHYLIB=m
|
||||
CONFIG_BROADCOM_PHY=m
|
||||
CONFIG_CICADA_PHY=m
|
||||
CONFIG_DAVICOM_PHY=m
|
||||
CONFIG_DP83848_PHY=m
|
||||
# CONFIG_DP83867_PHY is not set
|
||||
CONFIG_MICROCHIP_PHY=m
|
||||
CONFIG_FIXED_PHY=y
|
||||
CONFIG_MDIO_BITBANG=m
|
||||
CONFIG_MDIO_GPIO=m
|
||||
CONFIG_MDIO_CAVIUM=m
|
||||
CONFIG_MDIO_OCTEON=m
|
||||
# CONFIG_MDIO_THUNDER is not set
|
||||
# CONFIG_MDIO_BCM_UNIMAC is not set
|
||||
CONFIG_ICPLUS_PHY=m
|
||||
CONFIG_INTEL_XWAY_PHY=m
|
||||
CONFIG_LSI_ET1011C_PHY=m
|
||||
CONFIG_LXT_PHY=m
|
||||
CONFIG_MARVELL_PHY=m
|
||||
CONFIG_MICREL_PHY=m
|
||||
CONFIG_MICROCHIP_PHY=m
|
||||
CONFIG_MICROSEMI_PHY=m
|
||||
CONFIG_NATIONAL_PHY=m
|
||||
CONFIG_QSEMI_PHY=m
|
||||
CONFIG_REALTEK_PHY=m
|
||||
CONFIG_SMSC_PHY=m
|
||||
CONFIG_STE10XP=m
|
||||
CONFIG_TERANETICS_PHY=m
|
||||
CONFIG_VITESSE_PHY=m
|
||||
CONFIG_XILINX_GMII2RGMII=m
|
||||
# CONFIG_PLIP is not set
|
||||
CONFIG_PPP=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
@@ -3109,6 +3134,7 @@ CONFIG_TOUCHSCREEN_PROPERTIES=y
|
||||
CONFIG_TOUCHSCREEN_AD7879=m
|
||||
CONFIG_TOUCHSCREEN_AD7879_I2C=m
|
||||
CONFIG_TOUCHSCREEN_ATMEL_MXT=m
|
||||
CONFIG_TOUCHSCREEN_ATMEL_MXT_T37=y
|
||||
CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
|
||||
CONFIG_TOUCHSCREEN_BU21013=m
|
||||
CONFIG_TOUCHSCREEN_CY8CTMG110=m
|
||||
@@ -3120,11 +3146,11 @@ CONFIG_TOUCHSCREEN_DYNAPRO=m
|
||||
CONFIG_TOUCHSCREEN_HAMPSHIRE=m
|
||||
CONFIG_TOUCHSCREEN_EETI=m
|
||||
# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
|
||||
CONFIG_TOUCHSCREEN_FT6236=m
|
||||
CONFIG_TOUCHSCREEN_FUJITSU=m
|
||||
# CONFIG_TOUCHSCREEN_GOODIX is not set
|
||||
CONFIG_TOUCHSCREEN_ILI210X=m
|
||||
CONFIG_TOUCHSCREEN_GUNZE=m
|
||||
CONFIG_TOUCHSCREEN_EKTF2127=m
|
||||
# CONFIG_TOUCHSCREEN_ELAN is not set
|
||||
CONFIG_TOUCHSCREEN_ELO=m
|
||||
CONFIG_TOUCHSCREEN_WACOM_W8001=m
|
||||
@@ -3192,6 +3218,7 @@ CONFIG_INPUT_APANEL=m
|
||||
CONFIG_INPUT_GP2A=m
|
||||
CONFIG_INPUT_GPIO_BEEPER=m
|
||||
CONFIG_INPUT_GPIO_TILT_POLLED=m
|
||||
CONFIG_INPUT_GPIO_DECODER=m
|
||||
CONFIG_INPUT_ATLAS_BTNS=m
|
||||
CONFIG_INPUT_ATI_REMOTE2=m
|
||||
CONFIG_INPUT_KEYSPAN_REMOTE=m
|
||||
@@ -3292,6 +3319,7 @@ CONFIG_SERIAL_8250_RSA=y
|
||||
# CONFIG_SERIAL_8250_FSL is not set
|
||||
CONFIG_SERIAL_8250_DW=m
|
||||
# CONFIG_SERIAL_8250_RT288X is not set
|
||||
CONFIG_SERIAL_8250_LPSS=y
|
||||
CONFIG_SERIAL_8250_MID=y
|
||||
# CONFIG_SERIAL_8250_MOXA is not set
|
||||
|
||||
@@ -3504,7 +3532,6 @@ CONFIG_PINCTRL_INTEL=m
|
||||
CONFIG_PINCTRL_BROXTON=m
|
||||
CONFIG_PINCTRL_SUNRISEPOINT=m
|
||||
CONFIG_GPIOLIB=y
|
||||
CONFIG_GPIO_DEVRES=y
|
||||
CONFIG_GPIO_ACPI=y
|
||||
CONFIG_GPIOLIB_IRQCHIP=y
|
||||
CONFIG_GPIO_SYSFS=y
|
||||
@@ -3519,6 +3546,7 @@ CONFIG_GPIO_DWAPB=m
|
||||
CONFIG_GPIO_GENERIC_PLATFORM=y
|
||||
CONFIG_GPIO_ICH=m
|
||||
CONFIG_GPIO_LYNXPOINT=m
|
||||
CONFIG_GPIO_MOCKUP=m
|
||||
CONFIG_GPIO_VX855=m
|
||||
# CONFIG_GPIO_ZX is not set
|
||||
|
||||
@@ -3539,11 +3567,13 @@ CONFIG_GPIO_MAX732X=m
|
||||
CONFIG_GPIO_PCA953X=m
|
||||
CONFIG_GPIO_PCF857X=m
|
||||
# CONFIG_GPIO_TPIC2810 is not set
|
||||
CONFIG_GPIO_TS4900=m
|
||||
|
||||
#
|
||||
# MFD GPIO expanders
|
||||
#
|
||||
CONFIG_GPIO_LP3943=m
|
||||
CONFIG_GPIO_LP873X=m
|
||||
# CONFIG_GPIO_TPS65218 is not set
|
||||
CONFIG_GPIO_UCB1400=m
|
||||
|
||||
@@ -3592,6 +3622,8 @@ CONFIG_W1_SLAVE_DS2780=m
|
||||
CONFIG_W1_SLAVE_DS2781=m
|
||||
CONFIG_W1_SLAVE_DS28E04=m
|
||||
CONFIG_W1_SLAVE_BQ27000=m
|
||||
CONFIG_POWER_AVS=y
|
||||
# CONFIG_POWER_RESET is not set
|
||||
CONFIG_POWER_SUPPLY=y
|
||||
# CONFIG_POWER_SUPPLY_DEBUG is not set
|
||||
# CONFIG_PDA_POWER is not set
|
||||
@@ -3618,8 +3650,6 @@ CONFIG_CHARGER_BQ24735=m
|
||||
CONFIG_CHARGER_SMB347=m
|
||||
CONFIG_BATTERY_GAUGE_LTC2941=m
|
||||
# CONFIG_CHARGER_RT9455 is not set
|
||||
# CONFIG_POWER_RESET is not set
|
||||
CONFIG_POWER_AVS=y
|
||||
CONFIG_HWMON=y
|
||||
CONFIG_HWMON_VID=m
|
||||
# CONFIG_HWMON_DEBUG_CHIP is not set
|
||||
@@ -3810,6 +3840,7 @@ CONFIG_WATCHDOG_CORE=y
|
||||
# Watchdog Device Drivers
|
||||
#
|
||||
CONFIG_SOFT_WATCHDOG=m
|
||||
CONFIG_WDAT_WDT=m
|
||||
# CONFIG_XILINX_WATCHDOG is not set
|
||||
# CONFIG_ZIIRAVE_WATCHDOG is not set
|
||||
CONFIG_CADENCE_WATCHDOG=m
|
||||
@@ -3863,6 +3894,15 @@ CONFIG_WDTPCI=m
|
||||
# USB-based Watchdog Cards
|
||||
#
|
||||
CONFIG_USBPCWATCHDOG=m
|
||||
|
||||
#
|
||||
# Watchdog Pretimeout Governors
|
||||
#
|
||||
CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
|
||||
# CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP is not set
|
||||
CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC=y
|
||||
CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP=m
|
||||
CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=y
|
||||
CONFIG_SSB_POSSIBLE=y
|
||||
|
||||
#
|
||||
@@ -3909,6 +3949,7 @@ CONFIG_MFD_CROS_EC_I2C=m
|
||||
# CONFIG_MFD_DA9063 is not set
|
||||
# CONFIG_MFD_DA9150 is not set
|
||||
# CONFIG_MFD_DLN2 is not set
|
||||
CONFIG_MFD_EXYNOS_LPASS=m
|
||||
# CONFIG_MFD_MC13XXX_I2C is not set
|
||||
# CONFIG_HTC_PASIC3 is not set
|
||||
CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
|
||||
@@ -3947,6 +3988,7 @@ CONFIG_TPS65010=m
|
||||
# CONFIG_TPS6507X is not set
|
||||
# CONFIG_MFD_TPS65086 is not set
|
||||
# CONFIG_MFD_TPS65217 is not set
|
||||
CONFIG_MFD_TI_LP873X=m
|
||||
CONFIG_MFD_TPS65218=m
|
||||
# CONFIG_MFD_TPS65912_I2C is not set
|
||||
CONFIG_MFD_WL1273_CORE=m
|
||||
@@ -3974,6 +4016,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
|
||||
CONFIG_VIDEO_V4L2=m
|
||||
# CONFIG_VIDEO_ADV_DEBUG is not set
|
||||
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
|
||||
CONFIG_VIDEO_PCI_SKELETON=m
|
||||
CONFIG_VIDEO_TUNER=m
|
||||
CONFIG_V4L2_MEM2MEM_DEV=m
|
||||
# CONFIG_V4L2_FLASH_LED_CLASS is not set
|
||||
@@ -4126,6 +4169,7 @@ CONFIG_VIDEO_TM6000_DVB=m
|
||||
#
|
||||
CONFIG_DVB_USB=m
|
||||
# CONFIG_DVB_USB_DEBUG is not set
|
||||
CONFIG_DVB_USB_DIB3000MC=m
|
||||
CONFIG_DVB_USB_A800=m
|
||||
CONFIG_DVB_USB_DIBUSB_MB=m
|
||||
# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
|
||||
@@ -4192,6 +4236,7 @@ CONFIG_MEDIA_PCI_SUPPORT=y
|
||||
#
|
||||
CONFIG_VIDEO_MEYE=m
|
||||
CONFIG_VIDEO_SOLO6X10=m
|
||||
CONFIG_VIDEO_TW5864=m
|
||||
# CONFIG_VIDEO_TW68 is not set
|
||||
# CONFIG_VIDEO_TW686X is not set
|
||||
CONFIG_VIDEO_ZORAN=m
|
||||
@@ -4321,7 +4366,7 @@ CONFIG_SMS_SIANO_RC=y
|
||||
# CONFIG_SMS_SIANO_DEBUGFS is not set
|
||||
|
||||
#
|
||||
# Media ancillary drivers (tuners, sensors, i2c, frontends)
|
||||
# Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
|
||||
#
|
||||
CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
|
||||
CONFIG_MEDIA_ATTACH=y
|
||||
@@ -4513,6 +4558,7 @@ CONFIG_DVB_RTL2832=m
|
||||
CONFIG_DVB_RTL2832_SDR=m
|
||||
CONFIG_DVB_SI2168=m
|
||||
# CONFIG_DVB_AS102_FE is not set
|
||||
CONFIG_DVB_GP8PSK_FE=m
|
||||
|
||||
#
|
||||
# DVB-C (cable) frontends
|
||||
@@ -4607,8 +4653,6 @@ CONFIG_DRM_TTM=m
|
||||
CONFIG_DRM_I2C_CH7006=m
|
||||
CONFIG_DRM_I2C_SIL164=m
|
||||
CONFIG_DRM_I2C_NXP_TDA998X=m
|
||||
CONFIG_DRM_TDFX=m
|
||||
CONFIG_DRM_R128=m
|
||||
CONFIG_DRM_RADEON=m
|
||||
CONFIG_DRM_RADEON_USERPTR=y
|
||||
# CONFIG_DRM_AMDGPU is not set
|
||||
@@ -4620,15 +4664,10 @@ CONFIG_DRM_NOUVEAU=m
|
||||
CONFIG_NOUVEAU_DEBUG=5
|
||||
CONFIG_NOUVEAU_DEBUG_DEFAULT=3
|
||||
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
|
||||
CONFIG_DRM_I810=m
|
||||
CONFIG_DRM_I915=m
|
||||
CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=y
|
||||
CONFIG_DRM_I915_USERPTR=y
|
||||
CONFIG_DRM_I915_GVT=y
|
||||
CONFIG_DRM_MGA=m
|
||||
CONFIG_DRM_SIS=m
|
||||
CONFIG_DRM_VIA=m
|
||||
CONFIG_DRM_SAVAGE=m
|
||||
CONFIG_DRM_VGEM=m
|
||||
CONFIG_DRM_VMWGFX=m
|
||||
CONFIG_DRM_VMWGFX_FBCON=y
|
||||
@@ -4654,6 +4693,7 @@ CONFIG_DRM_BRIDGE=y
|
||||
#
|
||||
# CONFIG_DRM_ANALOGIX_ANX78XX is not set
|
||||
# CONFIG_HSA_AMD is not set
|
||||
# CONFIG_DRM_LEGACY is not set
|
||||
|
||||
#
|
||||
# Frame buffer Devices
|
||||
@@ -5064,6 +5104,11 @@ CONFIG_USB_HIDDEV=y
|
||||
# I2C HID support
|
||||
#
|
||||
CONFIG_I2C_HID=m
|
||||
|
||||
#
|
||||
# Intel ISH HID support
|
||||
#
|
||||
CONFIG_INTEL_ISH_HID=m
|
||||
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
|
||||
CONFIG_USB_SUPPORT=y
|
||||
CONFIG_USB_COMMON=y
|
||||
@@ -5080,7 +5125,7 @@ CONFIG_USB_OTG=y
|
||||
# CONFIG_USB_OTG_WHITELIST is not set
|
||||
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
|
||||
CONFIG_USB_OTG_FSM=m
|
||||
# CONFIG_USB_ULPI_BUS is not set
|
||||
CONFIG_USB_LEDS_TRIGGER_USBPORT=m
|
||||
CONFIG_USB_MON=y
|
||||
CONFIG_USB_WUSB=m
|
||||
CONFIG_USB_WUSB_CBAF=m
|
||||
@@ -5274,6 +5319,7 @@ CONFIG_USB_ISIGHTFW=m
|
||||
CONFIG_USB_YUREX=m
|
||||
CONFIG_USB_EZUSB_FX2=m
|
||||
CONFIG_USB_HSIC_USB3503=m
|
||||
CONFIG_USB_HSIC_USB4604=m
|
||||
# CONFIG_USB_LINK_LAYER_TEST is not set
|
||||
CONFIG_USB_CHAOSKEY=m
|
||||
# CONFIG_UCSI is not set
|
||||
@@ -5292,6 +5338,7 @@ CONFIG_USB_GPIO_VBUS=m
|
||||
CONFIG_USB_ISP1301=m
|
||||
# CONFIG_USB_GADGET is not set
|
||||
# CONFIG_USB_LED_TRIG is not set
|
||||
# CONFIG_USB_ULPI_BUS is not set
|
||||
CONFIG_UWB=m
|
||||
CONFIG_UWB_HWA=m
|
||||
CONFIG_UWB_WHCI=m
|
||||
@@ -5381,6 +5428,7 @@ CONFIG_LEDS_LM355x=m
|
||||
# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
|
||||
#
|
||||
CONFIG_LEDS_BLINKM=m
|
||||
CONFIG_LEDS_MLXCPLD=m
|
||||
|
||||
#
|
||||
# LED Triggers
|
||||
@@ -5438,6 +5486,7 @@ CONFIG_INFINIBAND_HFI1=m
|
||||
CONFIG_HFI1_DEBUG_SDMA_ORDER=y
|
||||
CONFIG_HFI1_VERBS_31BIT_PSN=y
|
||||
CONFIG_SDMA_VERBOSITY=y
|
||||
CONFIG_INFINIBAND_QEDR=m
|
||||
CONFIG_EDAC_ATOMIC_SCRUB=y
|
||||
CONFIG_EDAC_SUPPORT=y
|
||||
CONFIG_EDAC=y
|
||||
@@ -5485,6 +5534,7 @@ CONFIG_RTC_DRV_ABB5ZES3=m
|
||||
CONFIG_RTC_DRV_ABX80X=m
|
||||
CONFIG_RTC_DRV_DS1307=m
|
||||
CONFIG_RTC_DRV_DS1307_HWMON=y
|
||||
# CONFIG_RTC_DRV_DS1307_CENTURY is not set
|
||||
CONFIG_RTC_DRV_DS1374=m
|
||||
# CONFIG_RTC_DRV_DS1374_WDT is not set
|
||||
CONFIG_RTC_DRV_DS1672=m
|
||||
@@ -5492,7 +5542,6 @@ CONFIG_RTC_DRV_MAX6900=m
|
||||
CONFIG_RTC_DRV_RS5C372=m
|
||||
CONFIG_RTC_DRV_ISL1208=m
|
||||
CONFIG_RTC_DRV_ISL12022=m
|
||||
CONFIG_RTC_DRV_ISL12057=m
|
||||
CONFIG_RTC_DRV_X1205=m
|
||||
CONFIG_RTC_DRV_PCF8523=m
|
||||
CONFIG_RTC_DRV_PCF85063=m
|
||||
@@ -5571,6 +5620,7 @@ CONFIG_INTEL_IOATDMA=m
|
||||
CONFIG_INTEL_MIC_X100_DMA=m
|
||||
# CONFIG_QCOM_HIDMA_MGMT is not set
|
||||
# CONFIG_QCOM_HIDMA is not set
|
||||
CONFIG_DW_DMAC_CORE=y
|
||||
# CONFIG_DW_DMAC is not set
|
||||
# CONFIG_DW_DMAC_PCI is not set
|
||||
CONFIG_HSU_DMA=y
|
||||
@@ -5593,6 +5643,7 @@ CONFIG_KS0108_PORT=0x378
|
||||
CONFIG_KS0108_DELAY=2
|
||||
CONFIG_CFAG12864B=m
|
||||
CONFIG_CFAG12864B_RATE=20
|
||||
# CONFIG_IMG_ASCII_LCD is not set
|
||||
CONFIG_UIO=m
|
||||
CONFIG_UIO_CIF=m
|
||||
# CONFIG_UIO_PDRV_GENIRQ is not set
|
||||
@@ -5670,9 +5721,6 @@ CONFIG_STAGING=y
|
||||
CONFIG_R8712U=m
|
||||
CONFIG_R8188EU=m
|
||||
CONFIG_88EU_AP_MODE=y
|
||||
CONFIG_R8723AU=m
|
||||
CONFIG_8723AU_AP_MODE=y
|
||||
CONFIG_8723AU_BT_COEXIST=y
|
||||
CONFIG_RTS5208=m
|
||||
# CONFIG_VT6655 is not set
|
||||
# CONFIG_VT6656 is not set
|
||||
@@ -5687,7 +5735,6 @@ CONFIG_STAGING_MEDIA=y
|
||||
CONFIG_I2C_BCM2048=m
|
||||
# CONFIG_MEDIA_CEC is not set
|
||||
# CONFIG_DVB_CXD2099 is not set
|
||||
# CONFIG_VIDEO_TW686X_KH is not set
|
||||
CONFIG_LIRC_STAGING=y
|
||||
CONFIG_LIRC_BT829=m
|
||||
CONFIG_LIRC_IMON=m
|
||||
@@ -5729,6 +5776,24 @@ CONFIG_HDM_USB=m
|
||||
# Old ISDN4Linux (deprecated)
|
||||
#
|
||||
CONFIG_KS7010=m
|
||||
CONFIG_GREYBUS=m
|
||||
CONFIG_GREYBUS_ES2=m
|
||||
CONFIG_GREYBUS_AUDIO=m
|
||||
CONFIG_GREYBUS_BOOTROM=m
|
||||
CONFIG_GREYBUS_HID=m
|
||||
CONFIG_GREYBUS_LIGHT=m
|
||||
CONFIG_GREYBUS_LOG=m
|
||||
CONFIG_GREYBUS_LOOPBACK=m
|
||||
CONFIG_GREYBUS_POWER=m
|
||||
CONFIG_GREYBUS_RAW=m
|
||||
CONFIG_GREYBUS_VIBRATOR=m
|
||||
CONFIG_GREYBUS_BRIDGED_PHY=m
|
||||
CONFIG_GREYBUS_GPIO=m
|
||||
CONFIG_GREYBUS_I2C=m
|
||||
CONFIG_GREYBUS_PWM=m
|
||||
CONFIG_GREYBUS_SDIO=m
|
||||
CONFIG_GREYBUS_UART=m
|
||||
CONFIG_GREYBUS_USB=m
|
||||
CONFIG_X86_PLATFORM_DEVICES=y
|
||||
CONFIG_ACER_WMI=m
|
||||
CONFIG_ACERHDF=m
|
||||
@@ -5811,7 +5876,6 @@ CONFIG_COMMON_CLK_CDCE706=m
|
||||
CONFIG_COMMON_CLK_PWM=m
|
||||
# CONFIG_COMMON_CLK_PXA is not set
|
||||
# CONFIG_COMMON_CLK_PIC32 is not set
|
||||
# CONFIG_SUNXI_CCU is not set
|
||||
|
||||
#
|
||||
# Hardware Spinlock drivers
|
||||
@@ -5902,7 +5966,16 @@ CONFIG_PWM_PCA9685=m
|
||||
CONFIG_ARM_GIC_MAX_NR=1
|
||||
# CONFIG_IPACK_BUS is not set
|
||||
CONFIG_RESET_CONTROLLER=y
|
||||
# CONFIG_RESET_ATH79 is not set
|
||||
# CONFIG_RESET_BERLIN is not set
|
||||
# CONFIG_RESET_LPC18XX is not set
|
||||
# CONFIG_RESET_MESON is not set
|
||||
# CONFIG_RESET_PISTACHIO is not set
|
||||
# CONFIG_RESET_SOCFPGA is not set
|
||||
# CONFIG_RESET_STM32 is not set
|
||||
# CONFIG_RESET_SUNXI is not set
|
||||
CONFIG_TI_SYSCON_RESET=m
|
||||
# CONFIG_RESET_ZYNQ is not set
|
||||
# CONFIG_FMC is not set
|
||||
|
||||
#
|
||||
@@ -5951,7 +6024,6 @@ CONFIG_INTEL_TH_PTI=m
|
||||
# FPGA Configuration Support
|
||||
#
|
||||
CONFIG_FPGA=m
|
||||
CONFIG_FPGA_MGR_ZYNQ_FPGA=m
|
||||
|
||||
#
|
||||
# Firmware Drivers
|
||||
@@ -5989,6 +6061,7 @@ CONFIG_EFI_RUNTIME_MAP=y
|
||||
CONFIG_EFI_RUNTIME_WRAPPERS=y
|
||||
CONFIG_EFI_BOOTLOADER_CONTROL=m
|
||||
CONFIG_EFI_CAPSULE_LOADER=m
|
||||
CONFIG_EFI_TEST=m
|
||||
CONFIG_UEFI_CPER=y
|
||||
|
||||
#
|
||||
@@ -6127,6 +6200,7 @@ CONFIG_TMPFS_POSIX_ACL=y
|
||||
CONFIG_TMPFS_XATTR=y
|
||||
CONFIG_HUGETLBFS=y
|
||||
CONFIG_HUGETLB_PAGE=y
|
||||
CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
|
||||
CONFIG_CONFIGFS_FS=y
|
||||
CONFIG_EFIVAR_FS=y
|
||||
CONFIG_MISC_FILESYSTEMS=y
|
||||
@@ -6405,7 +6479,6 @@ CONFIG_USER_STACKTRACE_SUPPORT=y
|
||||
CONFIG_NOP_TRACER=y
|
||||
CONFIG_HAVE_FUNCTION_TRACER=y
|
||||
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
|
||||
CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
|
||||
CONFIG_HAVE_DYNAMIC_FTRACE=y
|
||||
CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
|
||||
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
|
||||
@@ -6426,6 +6499,7 @@ CONFIG_FUNCTION_TRACER=y
|
||||
CONFIG_FUNCTION_GRAPH_TRACER=y
|
||||
# CONFIG_IRQSOFF_TRACER is not set
|
||||
CONFIG_SCHED_TRACER=y
|
||||
# CONFIG_HWLAT_TRACER is not set
|
||||
CONFIG_FTRACE_SYSCALLS=y
|
||||
CONFIG_TRACER_SNAPSHOT=y
|
||||
CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y
|
||||
@@ -6465,7 +6539,6 @@ CONFIG_TEST_PRINTF=m
|
||||
# CONFIG_TEST_RHASHTABLE is not set
|
||||
# CONFIG_TEST_HASH is not set
|
||||
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
|
||||
# CONFIG_BUILD_DOCSRC is not set
|
||||
# CONFIG_DMA_API_DEBUG is not set
|
||||
# CONFIG_TEST_LKM is not set
|
||||
# CONFIG_TEST_USER_COPY is not set
|
||||
@@ -6477,6 +6550,7 @@ CONFIG_TEST_STATIC_KEYS=m
|
||||
# CONFIG_SAMPLES is not set
|
||||
CONFIG_HAVE_ARCH_KGDB=y
|
||||
CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
|
||||
# CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
|
||||
# CONFIG_UBSAN is not set
|
||||
CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
|
||||
CONFIG_STRICT_DEVMEM=y
|
||||
@@ -6733,6 +6807,7 @@ CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
|
||||
CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
|
||||
# CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set
|
||||
# CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
|
||||
CONFIG_CRYPTO_DEV_CHELSIO=m
|
||||
# CONFIG_ASYMMETRIC_KEY_TYPE is not set
|
||||
|
||||
#
|
||||
@@ -6838,7 +6913,6 @@ CONFIG_DQL=y
|
||||
CONFIG_GLOB=y
|
||||
# CONFIG_GLOB_SELFTEST is not set
|
||||
CONFIG_NLATTR=y
|
||||
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
|
||||
CONFIG_LRU_CACHE=m
|
||||
CONFIG_CLZ_TAB=y
|
||||
CONFIG_CORDIC=m
|
||||
@@ -6856,11 +6930,12 @@ CONFIG_SG_POOL=y
|
||||
CONFIG_ARCH_HAS_SG_CHAIN=y
|
||||
CONFIG_ARCH_HAS_PMEM_API=y
|
||||
CONFIG_ARCH_HAS_MMIO_FLUSH=y
|
||||
CONFIG_SBITMAP=y
|
||||
|
||||
#
|
||||
# Unofficial 3rd party kernel additions
|
||||
#
|
||||
CONFIG_NDISWRAPPER=m
|
||||
CONFIG_VIAHSS=m
|
||||
CONFIG_RTL8723BS=m
|
||||
CONFIG_WLAN_SDIO=y
|
||||
CONFIG_VIAHSS=m
|
||||
|
||||
Binary file not shown.
@@ -83,10 +83,10 @@ diff -Nurp linux-4.2.2/Makefile linux-4.2.2-3rd/Makefile
|
||||
net-y := net/
|
||||
libs-y := lib/
|
||||
core-y := usr/
|
||||
diff -Nurp linux-4.6/scripts/kconfig/Makefile linux-4.6-3rd/scripts/kconfig/Makefile
|
||||
--- linux-4.6/scripts/kconfig/Makefile
|
||||
+++ linux-4.6-3rd/scripts/kconfig/Makefile
|
||||
@@ -18,26 +18,26 @@ endif
|
||||
diff -Nurp linux-4.9/scripts/kconfig/Makefile linux-4.9-3rd/scripts/kconfig/Makefile
|
||||
--- linux-4.9/scripts/kconfig/Makefile
|
||||
+++ linux-4.9-3rd/scripts/kconfig/Makefile
|
||||
@@ -18,28 +18,28 @@ endif
|
||||
# We need this, in case the user has it in its environment
|
||||
unexport CONFIG_
|
||||
|
||||
@@ -113,6 +113,8 @@ diff -Nurp linux-4.6/scripts/kconfig/Makefile linux-4.6-3rd/scripts/kconfig/Make
|
||||
-silentoldconfig: $(obj)/conf
|
||||
+silentoldconfig: $(obj)/conf 3rdparty/Makefile
|
||||
$(Q)mkdir -p include/config include/generated
|
||||
$(Q)test -e include/generated/autoksyms.h || \
|
||||
touch include/generated/autoksyms.h
|
||||
$< $(silent) --$@ $(Kconfig)
|
||||
|
||||
-localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
|
||||
@@ -120,7 +122,7 @@ diff -Nurp linux-4.6/scripts/kconfig/Makefile linux-4.6-3rd/scripts/kconfig/Make
|
||||
$(Q)mkdir -p include/config include/generated
|
||||
$(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config
|
||||
$(Q)if [ -f .config ]; then \
|
||||
@@ -80,7 +80,7 @@ simple-targets := oldconfig allnoconfig
|
||||
@@ -82,7 +82,7 @@ simple-targets := oldconfig allnoconfig
|
||||
alldefconfig randconfig listnewconfig olddefconfig
|
||||
PHONY += $(simple-targets)
|
||||
|
||||
@@ -129,7 +131,7 @@ diff -Nurp linux-4.6/scripts/kconfig/Makefile linux-4.6-3rd/scripts/kconfig/Make
|
||||
$< $(silent) --$@ $(Kconfig)
|
||||
|
||||
PHONY += oldnoconfig savedefconfig defconfig
|
||||
@@ -88,12 +88,12 @@ PHONY += oldnoconfig savedefconfig defco
|
||||
@@ -90,12 +90,12 @@ PHONY += oldnoconfig savedefconfig defco
|
||||
# oldnoconfig is an alias of olddefconfig, because people already are dependent
|
||||
# on its behavior (sets new symbols to their default value but not 'n') with the
|
||||
# counter-intuitive name.
|
||||
@@ -145,7 +147,7 @@ diff -Nurp linux-4.6/scripts/kconfig/Makefile linux-4.6-3rd/scripts/kconfig/Make
|
||||
ifeq ($(KBUILD_DEFCONFIG),)
|
||||
$< $(silent) --defconfig $(Kconfig)
|
||||
else
|
||||
@@ -106,26 +106,26 @@ else
|
||||
@@ -108,26 +108,26 @@ else
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -177,7 +179,7 @@ diff -Nurp linux-4.6/scripts/kconfig/Makefile linux-4.6-3rd/scripts/kconfig/Make
|
||||
$(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config
|
||||
|
||||
# Help text used by make help
|
||||
@@ -188,6 +188,9 @@ gconf-objs := gconf.o zconf.tab.o
|
||||
@@ -190,6 +190,9 @@ gconf-objs := gconf.o zconf.tab.o
|
||||
|
||||
hostprogs-y := conf nconf mconf kxgettext qconf gconf
|
||||
|
||||
|
||||
@@ -1,178 +0,0 @@
|
||||
|
||||
Fix building with kernel-4.7 series.
|
||||
|
||||
Signed-off-by: Thomas Backlund <tmb@mageia.org>
|
||||
|
||||
3rdparty/rtl8723bs/os_dep/ioctl_cfg80211.c | 32 ++++++++++++++---------------
|
||||
3rdparty/rtl8723bs/os_dep/wifi_regd.c | 6 ++---
|
||||
2 files changed, 19 insertions(+), 19 deletions(-)
|
||||
|
||||
diff -urp linux/3rdparty/rtl8723bs.orig/os_dep/ioctl_cfg80211.c linux/3rdparty/rtl8723bs/os_dep/ioctl_cfg80211.c
|
||||
--- linux/3rdparty/rtl8723bs.orig/os_dep/ioctl_cfg80211.c 2016-07-04 20:00:13.000000000 +0300
|
||||
+++ linux/3rdparty/rtl8723bs/os_dep/ioctl_cfg80211.c 2016-07-04 20:37:45.054379270 +0300
|
||||
@@ -44,7 +44,7 @@ static const u32 rtw_cipher_suites[] = {
|
||||
}
|
||||
|
||||
#define CHAN2G(_channel, _freq, _flags) { \
|
||||
- .band = IEEE80211_BAND_2GHZ, \
|
||||
+ .band = NL80211_BAND_2GHZ, \
|
||||
.center_freq = (_freq), \
|
||||
.hw_value = (_channel), \
|
||||
.flags = (_flags), \
|
||||
@@ -120,13 +120,13 @@ static void rtw_2g_rates_init(struct iee
|
||||
}
|
||||
|
||||
static struct ieee80211_supported_band *rtw_spt_band_alloc(
|
||||
- enum ieee80211_band band
|
||||
+ enum nl80211_band band
|
||||
)
|
||||
{
|
||||
struct ieee80211_supported_band *spt_band = NULL;
|
||||
int n_channels, n_bitrates;
|
||||
|
||||
- if (band == IEEE80211_BAND_2GHZ)
|
||||
+ if (band == NL80211_BAND_2GHZ)
|
||||
{
|
||||
n_channels = RTW_2G_CHANNELS_NUM;
|
||||
n_bitrates = RTW_G_RATES_NUM;
|
||||
@@ -150,7 +150,7 @@ static struct ieee80211_supported_band *
|
||||
spt_band->n_channels = n_channels;
|
||||
spt_band->n_bitrates = n_bitrates;
|
||||
|
||||
- if (band == IEEE80211_BAND_2GHZ)
|
||||
+ if (band == NL80211_BAND_2GHZ)
|
||||
{
|
||||
rtw_2g_channels_init(spt_band->channels);
|
||||
rtw_2g_rates_init(spt_band->bitrates);
|
||||
@@ -170,7 +170,7 @@ static void rtw_spt_band_free(struct iee
|
||||
if (!spt_band)
|
||||
return;
|
||||
|
||||
- if (spt_band->band == IEEE80211_BAND_2GHZ)
|
||||
+ if (spt_band->band == NL80211_BAND_2GHZ)
|
||||
{
|
||||
size = sizeof(struct ieee80211_supported_band)
|
||||
+ sizeof(struct ieee80211_channel)*RTW_2G_CHANNELS_NUM
|
||||
@@ -232,7 +232,7 @@ static int rtw_ieee80211_channel_to_freq
|
||||
{
|
||||
/* see 802.11 17.3.8.3.2 and Annex J
|
||||
* there are overlapping channel numbers in 5GHz and 2GHz bands */
|
||||
- if (band == IEEE80211_BAND_2GHZ) {
|
||||
+ if (band == NL80211_BAND_2GHZ) {
|
||||
if (chan == 14)
|
||||
return 2484;
|
||||
else if (chan < 14)
|
||||
@@ -336,7 +336,7 @@ struct cfg80211_bss *rtw_cfg80211_inform
|
||||
|
||||
|
||||
channel = pnetwork->network.Configuration.DSConfig;
|
||||
- freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
|
||||
+ freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
|
||||
|
||||
notify_channel = ieee80211_get_channel(wiphy, freq);
|
||||
|
||||
@@ -420,7 +420,7 @@ int rtw_cfg80211_check_bss(struct adapte
|
||||
if (!(pnetwork) || !(padapter->rtw_wdev))
|
||||
return false;
|
||||
|
||||
- freq = rtw_ieee80211_channel_to_frequency(pnetwork->Configuration.DSConfig, IEEE80211_BAND_2GHZ);
|
||||
+ freq = rtw_ieee80211_channel_to_frequency(pnetwork->Configuration.DSConfig, NL80211_BAND_2GHZ);
|
||||
|
||||
notify_channel = ieee80211_get_channel(padapter->rtw_wdev->wiphy, freq);
|
||||
bss = cfg80211_get_bss(padapter->rtw_wdev->wiphy, notify_channel,
|
||||
@@ -542,7 +542,7 @@ check_bss:
|
||||
u32 freq;
|
||||
u16 channel = cur_network->network.Configuration.DSConfig;
|
||||
|
||||
- freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
|
||||
+ freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
|
||||
|
||||
notify_channel = ieee80211_get_channel(wiphy, freq);
|
||||
|
||||
@@ -3064,7 +3064,7 @@ void rtw_cfg80211_rx_action(struct adapt
|
||||
else
|
||||
DBG_871X("RTW_Rx:category(%u), action(%u)\n", category, action);
|
||||
|
||||
- freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
|
||||
+ freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
|
||||
|
||||
rtw_cfg80211_rx_mgmt(adapter, freq, 0, frame, frame_len, GFP_ATOMIC);
|
||||
}
|
||||
@@ -3311,7 +3311,7 @@ static int cfg80211_rtw_sched_scan_stop(
|
||||
}
|
||||
#endif /* CONFIG_PNO_SUPPORT */
|
||||
|
||||
-static void rtw_cfg80211_init_ht_capab(struct ieee80211_sta_ht_cap *ht_cap, enum ieee80211_band band, u8 rf_type)
|
||||
+static void rtw_cfg80211_init_ht_capab(struct ieee80211_sta_ht_cap *ht_cap, enum nl80211_band band, u8 rf_type)
|
||||
{
|
||||
|
||||
#define MAX_BIT_RATE_40MHZ_MCS15 300 /* Mbps */
|
||||
@@ -3335,7 +3335,7 @@ static void rtw_cfg80211_init_ht_capab(s
|
||||
ht_cap->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
|
||||
|
||||
/*
|
||||
- *hw->wiphy->bands[IEEE80211_BAND_2GHZ]
|
||||
+ *hw->wiphy->bands[NL80211_BAND_2GHZ]
|
||||
*base on ant_num
|
||||
*rx_mask: RX mask
|
||||
*if rx_ant = 1 rx_mask[0]= 0xff;==>MCS0-MCS7
|
||||
@@ -3379,9 +3379,9 @@ void rtw_cfg80211_init_wiphy(struct adap
|
||||
DBG_8192C("%s:rf_type =%d\n", __func__, rf_type);
|
||||
|
||||
{
|
||||
- bands = wiphy->bands[IEEE80211_BAND_2GHZ];
|
||||
+ bands = wiphy->bands[NL80211_BAND_2GHZ];
|
||||
if (bands)
|
||||
- rtw_cfg80211_init_ht_capab(&bands->ht_cap, IEEE80211_BAND_2GHZ, rf_type);
|
||||
+ rtw_cfg80211_init_ht_capab(&bands->ht_cap, NL80211_BAND_2GHZ, rf_type);
|
||||
}
|
||||
|
||||
/* init regulary domain */
|
||||
@@ -3417,7 +3417,7 @@ static void rtw_cfg80211_preinit_wiphy(s
|
||||
wiphy->n_cipher_suites = ARRAY_SIZE(rtw_cipher_suites);
|
||||
|
||||
/* if (padapter->registrypriv.wireless_mode & WIRELESS_11G) */
|
||||
- wiphy->bands[IEEE80211_BAND_2GHZ] = rtw_spt_band_alloc(IEEE80211_BAND_2GHZ);
|
||||
+ wiphy->bands[NL80211_BAND_2GHZ] = rtw_spt_band_alloc(NL80211_BAND_2GHZ);
|
||||
|
||||
wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
|
||||
wiphy->flags |= WIPHY_FLAG_OFFCHAN_TX | WIPHY_FLAG_HAVE_AP_SME;
|
||||
@@ -3564,7 +3564,7 @@ void rtw_wdev_free(struct wireless_dev *
|
||||
if (!wdev)
|
||||
return;
|
||||
|
||||
- rtw_spt_band_free(wdev->wiphy->bands[IEEE80211_BAND_2GHZ]);
|
||||
+ rtw_spt_band_free(wdev->wiphy->bands[NL80211_BAND_2GHZ]);
|
||||
|
||||
wiphy_free(wdev->wiphy);
|
||||
|
||||
diff -urp linux/3rdparty/rtl8723bs.orig/os_dep/wifi_regd.c linux/3rdparty/rtl8723bs/os_dep/wifi_regd.c
|
||||
--- linux/3rdparty/rtl8723bs.orig/os_dep/wifi_regd.c 2016-07-04 20:00:13.000000000 +0300
|
||||
+++ linux/3rdparty/rtl8723bs/os_dep/wifi_regd.c 2016-07-04 20:35:31.427278665 +0300
|
||||
@@ -105,7 +105,7 @@ static int rtw_ieee80211_channel_to_freq
|
||||
/* see 802.11 17.3.8.3.2 and Annex J
|
||||
* there are overlapping channel numbers in 5GHz and 2GHz bands */
|
||||
|
||||
- /* IEEE80211_BAND_2GHZ */
|
||||
+ /* NL80211_BAND_2GHZ */
|
||||
if (chan == 14)
|
||||
return 2484;
|
||||
else if (chan < 14)
|
||||
@@ -128,7 +128,7 @@ static void _rtw_reg_apply_flags(struct
|
||||
u32 freq;
|
||||
|
||||
/* all channels disable */
|
||||
- for (i = 0; i < IEEE80211_NUM_BANDS; i++) {
|
||||
+ for (i = 0; i < NUM_NL80211_BANDS; i++) {
|
||||
sband = wiphy->bands[i];
|
||||
|
||||
if (sband) {
|
||||
@@ -146,7 +146,7 @@ static void _rtw_reg_apply_flags(struct
|
||||
channel = channel_set[i].ChannelNum;
|
||||
freq =
|
||||
rtw_ieee80211_channel_to_frequency(channel,
|
||||
- IEEE80211_BAND_2GHZ);
|
||||
+ NL80211_BAND_2GHZ);
|
||||
|
||||
ch = ieee80211_get_channel(wiphy, freq);
|
||||
if (ch) {
|
||||
@@ -1,19 +0,0 @@
|
||||
|
||||
Adjust for cfg80211_scan_done() changes in kernel 4.8
|
||||
|
||||
Signed-off-by: Thomas Backlund <tmb@mageia.org>
|
||||
|
||||
--- linux/3rdparty/rtl8723bs/os_dep/ioctl_cfg80211.c.orig
|
||||
+++ linux/3rdparty/rtl8723bs/os_dep/ioctl_cfg80211.c
|
||||
@@ -1413,7 +1413,10 @@ void rtw_cfg80211_indicate_scan_done(str
|
||||
}
|
||||
else
|
||||
{
|
||||
- cfg80211_scan_done(pwdev_priv->scan_request, aborted);
|
||||
+ struct cfg80211_scan_info info = {
|
||||
+ .aborted = aborted,
|
||||
+ };
|
||||
+ cfg80211_scan_done(pwdev_priv->scan_request, &info);
|
||||
}
|
||||
|
||||
pwdev_priv->scan_request = NULL;
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,394 +0,0 @@
|
||||
|
||||
fs/aufs/Kconfig | 2 +-
|
||||
fs/dcache.c | 1 +
|
||||
fs/exec.c | 1 +
|
||||
fs/fcntl.c | 1 +
|
||||
fs/file_table.c | 4 ++++
|
||||
fs/inode.c | 1 +
|
||||
fs/namespace.c | 2 ++
|
||||
fs/notify/group.c | 4 ++++
|
||||
fs/notify/mark.c | 4 ++++
|
||||
fs/open.c | 2 ++
|
||||
fs/read_write.c | 2 ++
|
||||
fs/splice.c | 2 ++
|
||||
fs/xattr.c | 1 +
|
||||
kernel/task_work.c | 1 +
|
||||
security/commoncap.c | 2 ++
|
||||
security/device_cgroup.c | 2 ++
|
||||
security/security.c | 10 ++++++++++
|
||||
17 files changed, 41 insertions(+), 1 deletion(-)
|
||||
|
||||
diff -Nurp linux-4.8-aufs/fs/aufs/Kconfig linux-4.8-aufs-mod/fs/aufs/Kconfig
|
||||
--- linux-4.8-aufs/fs/aufs/Kconfig 2016-07-04 19:02:29.246286120 +0300
|
||||
+++ linux-4.8-aufs-mod/fs/aufs/Kconfig 2016-07-04 19:03:53.653714965 +0300
|
||||
@@ -1,5 +1,5 @@
|
||||
config AUFS_FS
|
||||
- bool "Aufs (Advanced multi layered unification filesystem) support"
|
||||
+ tristate "Aufs (Advanced multi layered unification filesystem) support"
|
||||
help
|
||||
Aufs is a stackable unification filesystem such as Unionfs,
|
||||
which unifies several directories and provides a merged single
|
||||
diff -Nurp linux-4.8-aufs/fs/dcache.c linux-4.8-aufs-mod/fs/dcache.c
|
||||
--- linux-4.8-aufs/fs/dcache.c 2016-07-04 19:02:29.260286196 +0300
|
||||
+++ linux-4.8-aufs-mod/fs/dcache.c 2016-07-04 19:03:53.653714965 +0300
|
||||
@@ -1310,6 +1310,7 @@ rename_retry:
|
||||
seq = 1;
|
||||
goto again;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(d_walk);
|
||||
|
||||
/*
|
||||
* Search for at least 1 mount point in the dentry's subdirs.
|
||||
diff -Nurp linux-4.8-aufs/fs/exec.c linux-4.8-aufs-mod/fs/exec.c
|
||||
--- linux-4.8-aufs/fs/exec.c 2016-07-04 17:58:15.707773651 +0300
|
||||
+++ linux-4.8-aufs-mod/fs/exec.c 2016-07-04 19:03:53.654714970 +0300
|
||||
@@ -104,6 +104,7 @@ bool path_noexec(const struct path *path
|
||||
return (path->mnt->mnt_flags & MNT_NOEXEC) ||
|
||||
(path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(path_noexec);
|
||||
|
||||
#ifdef CONFIG_USELIB
|
||||
/*
|
||||
diff -Nurp linux-4.8-aufs/fs/fcntl.c linux-4.8-aufs-mod/fs/fcntl.c
|
||||
--- linux-4.8-aufs/fs/fcntl.c 2016-07-04 19:02:29.260286196 +0300
|
||||
+++ linux-4.8-aufs-mod/fs/fcntl.c 2016-07-04 19:03:53.654714970 +0300
|
||||
@@ -82,6 +82,7 @@ int setfl(int fd, struct file * filp, un
|
||||
out:
|
||||
return error;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(setfl);
|
||||
|
||||
static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
|
||||
int force)
|
||||
diff -Nurp linux-4.8-aufs/fs/file_table.c linux-4.8-aufs-mod/fs/file_table.c
|
||||
--- linux-4.8-aufs/fs/file_table.c 2016-05-16 01:43:13.000000000 +0300
|
||||
+++ linux-4.8-aufs-mod/fs/file_table.c 2016-07-04 19:03:53.654714970 +0300
|
||||
@@ -147,6 +147,7 @@ over:
|
||||
}
|
||||
return ERR_PTR(-ENFILE);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(get_empty_filp);
|
||||
|
||||
/**
|
||||
* alloc_file - allocate and initialize a 'struct file'
|
||||
@@ -258,6 +259,7 @@ void flush_delayed_fput(void)
|
||||
{
|
||||
delayed_fput(NULL);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(flush_delayed_fput);
|
||||
|
||||
static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput);
|
||||
|
||||
@@ -300,6 +302,7 @@ void __fput_sync(struct file *file)
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(fput);
|
||||
+EXPORT_SYMBOL_GPL(__fput_sync);
|
||||
|
||||
void put_filp(struct file *file)
|
||||
{
|
||||
@@ -308,6 +311,7 @@ void put_filp(struct file *file)
|
||||
file_free(file);
|
||||
}
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(put_filp);
|
||||
|
||||
void __init files_init(void)
|
||||
{
|
||||
diff -Nurp linux-4.8-aufs/fs/inode.c linux-4.8-aufs-mod/fs/inode.c
|
||||
--- linux-4.8-aufs/fs/inode.c 2016-07-04 19:02:29.261286202 +0300
|
||||
+++ linux-4.8-aufs-mod/fs/inode.c 2016-07-04 20:51:39.805168596 +0300
|
||||
@@ -1600,6 +1600,7 @@ int update_time(struct inode *inode, str
|
||||
|
||||
return update_time(inode, time, flags);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(update_time);
|
||||
|
||||
/**
|
||||
* touch_atime - update the access time
|
||||
diff -Nurp linux-4.8-aufs/fs/namespace.c linux-4.8-aufs-mod/fs/namespace.c
|
||||
--- linux-4.8-aufs/fs/namespace.c 2016-07-04 17:58:15.729773645 +0300
|
||||
+++ linux-4.8-aufs-mod/fs/namespace.c 2016-07-04 19:03:53.654714970 +0300
|
||||
@@ -463,6 +463,7 @@ void __mnt_drop_write(struct vfsmount *m
|
||||
mnt_dec_writers(real_mount(mnt));
|
||||
preempt_enable();
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(__mnt_drop_write);
|
||||
|
||||
/**
|
||||
* mnt_drop_write - give up write access to a mount
|
||||
@@ -1812,6 +1813,7 @@ int iterate_mounts(int (*f)(struct vfsmo
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(iterate_mounts);
|
||||
|
||||
static void cleanup_group_ids(struct mount *mnt, struct mount *end)
|
||||
{
|
||||
diff -Nurp linux-4.8-aufs/fs/notify/group.c linux-4.8-aufs-mod/fs/notify/group.c
|
||||
--- linux-4.8-aufs/fs/notify/group.c 2016-07-04 17:58:15.742773641 +0300
|
||||
+++ linux-4.8-aufs-mod/fs/notify/group.c 2016-07-04 19:03:53.655714975 +0300
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <linux/srcu.h>
|
||||
#include <linux/rculist.h>
|
||||
#include <linux/wait.h>
|
||||
+#include <linux/module.h>
|
||||
|
||||
#include <linux/fsnotify_backend.h>
|
||||
#include "fsnotify.h"
|
||||
@@ -81,6 +82,7 @@ void fsnotify_get_group(struct fsnotify_
|
||||
{
|
||||
atomic_inc(&group->refcnt);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(fsnotify_get_group);
|
||||
|
||||
/*
|
||||
* Drop a reference to a group. Free it if it's through.
|
||||
@@ -90,6 +92,7 @@ void fsnotify_put_group(struct fsnotify_
|
||||
if (atomic_dec_and_test(&group->refcnt))
|
||||
fsnotify_final_destroy_group(group);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(fsnotify_put_group);
|
||||
|
||||
/*
|
||||
* Create a new fsnotify_group and hold a reference for the group returned.
|
||||
@@ -118,6 +121,7 @@ struct fsnotify_group *fsnotify_alloc_gr
|
||||
|
||||
return group;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(fsnotify_alloc_group);
|
||||
|
||||
int fsnotify_fasync(int fd, struct file *file, int on)
|
||||
{
|
||||
diff -Nurp linux-4.8-aufs/fs/notify/mark.c linux-4.8-aufs-mod/fs/notify/mark.c
|
||||
--- linux-4.8-aufs/fs/notify/mark.c 2016-07-04 17:58:15.742773641 +0300
|
||||
+++ linux-4.8-aufs-mod/fs/notify/mark.c 2016-07-04 19:03:53.655714975 +0300
|
||||
@@ -113,6 +113,7 @@ void fsnotify_put_mark(struct fsnotify_m
|
||||
mark->free_mark(mark);
|
||||
}
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(fsnotify_put_mark);
|
||||
|
||||
/* Calculate mask of events for a list of marks */
|
||||
u32 fsnotify_recalc_mask(struct hlist_head *head)
|
||||
@@ -230,6 +231,7 @@ void fsnotify_destroy_mark(struct fsnoti
|
||||
mutex_unlock(&group->mark_mutex);
|
||||
fsnotify_free_mark(mark);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(fsnotify_destroy_mark);
|
||||
|
||||
void fsnotify_destroy_marks(struct hlist_head *head, spinlock_t *lock)
|
||||
{
|
||||
@@ -415,6 +417,7 @@ err:
|
||||
|
||||
return ret;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(fsnotify_add_mark);
|
||||
|
||||
int fsnotify_add_mark(struct fsnotify_mark *mark, struct fsnotify_group *group,
|
||||
struct inode *inode, struct vfsmount *mnt, int allow_dups)
|
||||
@@ -521,6 +524,7 @@ void fsnotify_duplicate_mark(struct fsno
|
||||
new->mask = old->mask;
|
||||
new->free_mark = old->free_mark;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(fsnotify_init_mark);
|
||||
|
||||
/*
|
||||
* Nothing fancy, just initialize lists and locks and counters.
|
||||
diff -Nurp linux-4.8-aufs/fs/open.c linux-4.8-aufs-mod/fs/open.c
|
||||
--- linux-4.8-aufs/fs/open.c 2016-07-04 17:58:15.746773640 +0300
|
||||
+++ linux-4.8-aufs-mod/fs/open.c 2016-07-04 19:03:53.655714975 +0300
|
||||
@@ -64,6 +64,7 @@ int do_truncate(struct dentry *dentry, l
|
||||
inode_unlock(dentry->d_inode);
|
||||
return ret;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(do_truncate);
|
||||
|
||||
long vfs_truncate(const struct path *path, loff_t length)
|
||||
{
|
||||
@@ -678,6 +679,7 @@ int open_check_o_direct(struct file *f)
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(open_check_o_direct);
|
||||
|
||||
static int do_dentry_open(struct file *f,
|
||||
struct inode *inode,
|
||||
diff -Nurp linux-4.8-aufs/fs/read_write.c linux-4.8-aufs-mod/fs/read_write.c
|
||||
--- linux-4.8-aufs/fs/read_write.c 2016-07-04 19:02:29.262286207 +0300
|
||||
+++ linux-4.8-aufs-mod/fs/read_write.c 2016-07-04 19:03:53.655714975 +0300
|
||||
@@ -525,6 +525,7 @@ vfs_readf_t vfs_readf(struct file *file)
|
||||
return new_sync_read;
|
||||
return ERR_PTR(-ENOSYS);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(vfs_readf);
|
||||
|
||||
vfs_writef_t vfs_writef(struct file *file)
|
||||
{
|
||||
@@ -536,6 +537,7 @@ vfs_writef_t vfs_writef(struct file *fil
|
||||
return new_sync_write;
|
||||
return ERR_PTR(-ENOSYS);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(vfs_writef);
|
||||
|
||||
ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t *pos)
|
||||
{
|
||||
diff -Nurp linux-4.8-aufs/fs/splice.c linux-4.8-aufs-mod/fs/splice.c
|
||||
--- linux-4.8-aufs/fs/splice.c 2016-07-04 19:02:29.262286207 +0300
|
||||
+++ linux-4.8-aufs-mod/fs/splice.c 2016-07-04 19:03:53.656714979 +0300
|
||||
@@ -1124,6 +1124,7 @@ long do_splice_from(struct pipe_inode_in
|
||||
|
||||
return splice_write(pipe, out, ppos, len, flags);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(do_splice_from);
|
||||
|
||||
/*
|
||||
* Attempt to initiate a splice from a file to a pipe.
|
||||
@@ -1153,6 +1154,7 @@ long do_splice_to(struct file *in, loff_
|
||||
|
||||
return splice_read(in, ppos, pipe, len, flags);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(do_splice_to);
|
||||
|
||||
/**
|
||||
* splice_direct_to_actor - splices data directly between two non-pipes
|
||||
diff -Nurp linux-4.8-aufs/fs/xattr.c linux-4.8-aufs-mod/fs/xattr.c
|
||||
--- linux-4.8-aufs/fs/xattr.c 2016-07-04 17:58:15.754773638 +0300
|
||||
+++ linux-4.8-aufs-mod/fs/xattr.c 2016-07-04 19:03:53.656714979 +0300
|
||||
@@ -207,6 +207,7 @@ vfs_getxattr_alloc(struct dentry *dentry
|
||||
*xattr_value = value;
|
||||
return error;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(vfs_getxattr_alloc);
|
||||
|
||||
ssize_t
|
||||
vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
|
||||
diff -Nurp linux-4.8-aufs/kernel/task_work.c linux-4.8-aufs-mod/kernel/task_work.c
|
||||
--- linux-4.8-aufs/kernel/task_work.c 2016-05-16 01:43:13.000000000 +0300
|
||||
+++ linux-4.8-aufs-mod/kernel/task_work.c 2016-07-04 19:03:53.656714979 +0300
|
||||
@@ -118,3 +118,4 @@ void task_work_run(void)
|
||||
} while (work);
|
||||
}
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(task_work_run);
|
||||
diff -Nurp linux-4.8-aufs/security/commoncap.c linux-4.8-aufs-mod/security/commoncap.c
|
||||
--- linux-4.8-aufs/security/commoncap.c 2016-07-04 17:58:15.945773585 +0300
|
||||
+++ linux-4.8-aufs-mod/security/commoncap.c 2016-07-04 19:03:53.656714979 +0300
|
||||
@@ -1058,12 +1058,14 @@ int cap_mmap_addr(unsigned long addr)
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(cap_mmap_addr);
|
||||
|
||||
int cap_mmap_file(struct file *file, unsigned long reqprot,
|
||||
unsigned long prot, unsigned long flags)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(cap_mmap_file);
|
||||
|
||||
#ifdef CONFIG_SECURITY
|
||||
|
||||
diff -Nurp linux-4.8-aufs/security/device_cgroup.c linux-4.8-aufs-mod/security/device_cgroup.c
|
||||
--- linux-4.8-aufs/security/device_cgroup.c 2016-05-16 01:43:13.000000000 +0300
|
||||
+++ linux-4.8-aufs-mod/security/device_cgroup.c 2016-07-04 19:03:53.656714979 +0300
|
||||
@@ -7,6 +7,7 @@
|
||||
#include <linux/device_cgroup.h>
|
||||
#include <linux/cgroup.h>
|
||||
#include <linux/ctype.h>
|
||||
+#include <linux/export.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <linux/seq_file.h>
|
||||
@@ -849,6 +850,7 @@ int __devcgroup_inode_permission(struct
|
||||
return __devcgroup_check_permission(type, imajor(inode), iminor(inode),
|
||||
access);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(__devcgroup_inode_permission);
|
||||
|
||||
int devcgroup_inode_mknod(int mode, dev_t dev)
|
||||
{
|
||||
diff -Nurp linux-4.8-aufs/security/security.c linux-4.8-aufs-mod/security/security.c
|
||||
--- linux-4.8-aufs/security/security.c 2016-07-04 17:58:15.948773584 +0300
|
||||
+++ linux-4.8-aufs-mod/security/security.c 2016-07-04 19:03:53.657714984 +0300
|
||||
@@ -434,6 +434,7 @@ int security_path_rmdir(const struct pat
|
||||
return 0;
|
||||
return call_int_hook(path_rmdir, 0, dir, dentry);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_path_rmdir);
|
||||
|
||||
int security_path_unlink(const struct path *dir, struct dentry *dentry)
|
||||
{
|
||||
@@ -450,6 +451,7 @@ int security_path_symlink(const struct p
|
||||
return 0;
|
||||
return call_int_hook(path_symlink, 0, dir, dentry, old_name);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_path_symlink);
|
||||
|
||||
int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
|
||||
struct dentry *new_dentry)
|
||||
@@ -458,6 +460,7 @@ int security_path_link(struct dentry *ol
|
||||
return 0;
|
||||
return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_path_link);
|
||||
|
||||
int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
|
||||
const struct path *new_dir, struct dentry *new_dentry,
|
||||
@@ -485,6 +488,7 @@ int security_path_truncate(const struct
|
||||
return 0;
|
||||
return call_int_hook(path_truncate, 0, path);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_path_truncate);
|
||||
|
||||
int security_path_chmod(const struct path *path, umode_t mode)
|
||||
{
|
||||
@@ -492,6 +496,7 @@ int security_path_chmod(const struct pat
|
||||
return 0;
|
||||
return call_int_hook(path_chmod, 0, path, mode);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_path_chmod);
|
||||
|
||||
int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
|
||||
{
|
||||
@@ -499,6 +504,7 @@ int security_path_chown(const struct pat
|
||||
return 0;
|
||||
return call_int_hook(path_chown, 0, path, uid, gid);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_path_chown);
|
||||
|
||||
int security_path_chroot(const struct path *path)
|
||||
{
|
||||
@@ -584,6 +590,7 @@ int security_inode_readlink(struct dentr
|
||||
return 0;
|
||||
return call_int_hook(inode_readlink, 0, dentry);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_inode_readlink);
|
||||
|
||||
int security_inode_follow_link(struct dentry *dentry, struct inode *inode,
|
||||
bool rcu)
|
||||
@@ -599,6 +606,7 @@ int security_inode_permission(struct ino
|
||||
return 0;
|
||||
return call_int_hook(inode_permission, 0, inode, mask);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_inode_permission);
|
||||
|
||||
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
|
||||
{
|
||||
@@ -737,6 +745,7 @@ int security_file_permission(struct file
|
||||
|
||||
return fsnotify_perm(file, mask);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_file_permission);
|
||||
|
||||
int security_file_alloc(struct file *file)
|
||||
{
|
||||
@@ -796,6 +805,7 @@ int security_mmap_file(struct file *file
|
||||
return ret;
|
||||
return ima_file_mmap(file, prot);
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(security_mmap_file);
|
||||
|
||||
int security_mmap_addr(unsigned long addr)
|
||||
{
|
||||
File diff suppressed because it is too large
Load Diff
@@ -4112,11 +4112,11 @@ head: c99566fb810c9d8cae5e9cd39d1772b55e2f514c
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
--- linux/drivers/gpu/drm/Kconfig.gpu-drm-mach64.orig 2014-03-08 18:52:34.979768492 +0200
|
||||
+++ linux/drivers/gpu/drm/Kconfig 2014-03-08 18:55:18.769681473 +0200
|
||||
@@ -130,6 +130,17 @@ config DRM_I810
|
||||
|
||||
source "drivers/gpu/drm/i915/Kconfig"
|
||||
--- linux/drivers/gpu/drm/Kconfig.gpu-drm-mach64.orig
|
||||
+++ linux/drivers/gpu/drm/Kconfig
|
||||
@@ -267,6 +267,17 @@ config DRM_I810
|
||||
selected, the module will be called i810. AGP support is required
|
||||
for this driver to work.
|
||||
|
||||
+config DRM_MACH64
|
||||
+ tristate "ATI Rage Pro (Mach64)"
|
||||
@@ -4134,11 +4134,11 @@ head: c99566fb810c9d8cae5e9cd39d1772b55e2f514c
|
||||
depends on DRM && PCI
|
||||
--- linux/drivers/gpu/drm/Makefile.gpu-drm-mach64.orig
|
||||
+++ linux/drivers/gpu/drm/Makefile
|
||||
@@ -38,6 +38,7 @@ obj-$(CONFIG_DRM_R128) += r128/
|
||||
@@ -47,6 +47,7 @@ obj-$(CONFIG_DRM_R128) += r128/
|
||||
obj-$(CONFIG_HSA_AMD) += amd/amdkfd/
|
||||
obj-$(CONFIG_DRM_RADEON)+= radeon/
|
||||
obj-$(CONFIG_DRM_AMDGPU)+= amd/amdgpu/
|
||||
+obj-$(CONFIG_DRM_MACH64)+= mach64/
|
||||
obj-$(CONFIG_DRM_MGA) += mga/
|
||||
obj-$(CONFIG_DRM_I810) += i810/
|
||||
obj-$(CONFIG_DRM_I915) += i915/
|
||||
obj-$(CONFIG_DRM_I915) += i915/
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
-429
@@ -1,429 +0,0 @@
|
||||
From cf4747d7535a936105f0abe8d8109d3fe339162b Mon Sep 17 00:00:00 2001
|
||||
From: Larry Finger <Larry.Finger@lwfinger.net>
|
||||
Date: Wed, 12 Oct 2016 13:54:04 -0500
|
||||
Subject: [PATCH] rtlwifi: Fix regression caused by commit d86e64768859
|
||||
|
||||
In commit d86e64768859 ("rtlwifi: rtl818x: constify local structures"),
|
||||
the configuration struct for most of the drivers was changed to be
|
||||
constant. The problem is that five of the modified drivers need to be
|
||||
able to update the firmware name based on the exact model of the card.
|
||||
As the file names were stored in one of the members of that struct,
|
||||
these drivers would fail with a kernel BUG splat when they tried to
|
||||
update the firmware name.
|
||||
|
||||
Rather than reverting the previous commit, I used a suggestion by
|
||||
Johannes Berg and made the firmware file name pointers be local to
|
||||
the routines that update the software variables.
|
||||
|
||||
The configuration struct of rtl8192cu, which was not touched in the
|
||||
previous patch, is now constantfied.
|
||||
|
||||
Fixes: d86e64768859 ("rtlwifi: rtl818x: constify local structures")
|
||||
Suggested-by: Johannes Berg <johannes@sipsolutions.net>
|
||||
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
|
||||
Cc: Stable <stable@vger.kernel.org> # 4.8
|
||||
Cc: Julia Lawall <Julia.Lawall@lip6.fr>
|
||||
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
||||
---
|
||||
drivers/net/wireless/realtek/rtlwifi/core.c | 2 +-
|
||||
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 8 ++++----
|
||||
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 13 +++++--------
|
||||
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c | 12 ++++++------
|
||||
drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 6 +++---
|
||||
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c | 8 ++++----
|
||||
drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 9 +++++----
|
||||
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 12 +++++-------
|
||||
drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 6 +++---
|
||||
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 18 +++++++++---------
|
||||
drivers/net/wireless/realtek/rtlwifi/wifi.h | 2 --
|
||||
11 files changed, 45 insertions(+), 51 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c
|
||||
index f95760c..8e7f23c 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/core.c
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/core.c
|
||||
@@ -111,7 +111,7 @@ static void rtl_fw_do_work(const struct firmware *firmware, void *context,
|
||||
if (!err)
|
||||
goto found_alt;
|
||||
}
|
||||
- pr_err("Firmware %s not available\n", rtlpriv->cfg->fw_name);
|
||||
+ pr_err("Selected firmware is not available\n");
|
||||
rtlpriv->max_fw_size = 0;
|
||||
return;
|
||||
}
|
||||
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
|
||||
index e7b11b4..f361808 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
|
||||
@@ -86,6 +86,7 @@ int rtl88e_init_sw_vars(struct ieee80211_hw *hw)
|
||||
struct rtl_priv *rtlpriv = rtl_priv(hw);
|
||||
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
|
||||
u8 tid;
|
||||
+ char *fw_name;
|
||||
|
||||
rtl8188ee_bt_reg_init(hw);
|
||||
rtlpriv->dm.dm_initialgain_enable = 1;
|
||||
@@ -169,10 +170,10 @@ int rtl88e_init_sw_vars(struct ieee80211_hw *hw)
|
||||
return 1;
|
||||
}
|
||||
|
||||
- rtlpriv->cfg->fw_name = "rtlwifi/rtl8188efw.bin";
|
||||
+ fw_name = "rtlwifi/rtl8188efw.bin";
|
||||
rtlpriv->max_fw_size = 0x8000;
|
||||
- pr_info("Using firmware %s\n", rtlpriv->cfg->fw_name);
|
||||
- err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,
|
||||
+ pr_info("Using firmware %s\n", fw_name);
|
||||
+ err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
|
||||
rtlpriv->io.dev, GFP_KERNEL, hw,
|
||||
rtl_fw_cb);
|
||||
if (err) {
|
||||
@@ -284,7 +285,6 @@ static const struct rtl_hal_cfg rtl88ee_hal_cfg = {
|
||||
.bar_id = 2,
|
||||
.write_readback = true,
|
||||
.name = "rtl88e_pci",
|
||||
- .fw_name = "rtlwifi/rtl8188efw.bin",
|
||||
.ops = &rtl8188ee_hal_ops,
|
||||
.mod_params = &rtl88ee_mod_params,
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c
|
||||
index 87aa209..8b6e37c 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c
|
||||
@@ -96,6 +96,7 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw)
|
||||
struct rtl_priv *rtlpriv = rtl_priv(hw);
|
||||
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
|
||||
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
|
||||
+ char *fw_name = "rtlwifi/rtl8192cfwU.bin";
|
||||
|
||||
rtl8192ce_bt_reg_init(hw);
|
||||
|
||||
@@ -167,15 +168,12 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw)
|
||||
}
|
||||
|
||||
/* request fw */
|
||||
- if (IS_VENDOR_UMC_A_CUT(rtlhal->version) &&
|
||||
- !IS_92C_SERIAL(rtlhal->version))
|
||||
- rtlpriv->cfg->fw_name = "rtlwifi/rtl8192cfwU.bin";
|
||||
- else if (IS_81XXC_VENDOR_UMC_B_CUT(rtlhal->version))
|
||||
- rtlpriv->cfg->fw_name = "rtlwifi/rtl8192cfwU_B.bin";
|
||||
+ if (IS_81XXC_VENDOR_UMC_B_CUT(rtlhal->version))
|
||||
+ fw_name = "rtlwifi/rtl8192cfwU_B.bin";
|
||||
|
||||
rtlpriv->max_fw_size = 0x4000;
|
||||
- pr_info("Using firmware %s\n", rtlpriv->cfg->fw_name);
|
||||
- err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,
|
||||
+ pr_info("Using firmware %s\n", fw_name);
|
||||
+ err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
|
||||
rtlpriv->io.dev, GFP_KERNEL, hw,
|
||||
rtl_fw_cb);
|
||||
if (err) {
|
||||
@@ -262,7 +260,6 @@ static const struct rtl_hal_cfg rtl92ce_hal_cfg = {
|
||||
.bar_id = 2,
|
||||
.write_readback = true,
|
||||
.name = "rtl92c_pci",
|
||||
- .fw_name = "rtlwifi/rtl8192cfw.bin",
|
||||
.ops = &rtl8192ce_hal_ops,
|
||||
.mod_params = &rtl92ce_mod_params,
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c
|
||||
index 7c6f7f0..f953320 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c
|
||||
@@ -59,6 +59,7 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
|
||||
{
|
||||
struct rtl_priv *rtlpriv = rtl_priv(hw);
|
||||
int err;
|
||||
+ char *fw_name;
|
||||
|
||||
rtlpriv->dm.dm_initialgain_enable = true;
|
||||
rtlpriv->dm.dm_flag = 0;
|
||||
@@ -77,18 +78,18 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
|
||||
}
|
||||
if (IS_VENDOR_UMC_A_CUT(rtlpriv->rtlhal.version) &&
|
||||
!IS_92C_SERIAL(rtlpriv->rtlhal.version)) {
|
||||
- rtlpriv->cfg->fw_name = "rtlwifi/rtl8192cufw_A.bin";
|
||||
+ fw_name = "rtlwifi/rtl8192cufw_A.bin";
|
||||
} else if (IS_81XXC_VENDOR_UMC_B_CUT(rtlpriv->rtlhal.version)) {
|
||||
- rtlpriv->cfg->fw_name = "rtlwifi/rtl8192cufw_B.bin";
|
||||
+ fw_name = "rtlwifi/rtl8192cufw_B.bin";
|
||||
} else {
|
||||
- rtlpriv->cfg->fw_name = "rtlwifi/rtl8192cufw_TMSC.bin";
|
||||
+ fw_name = "rtlwifi/rtl8192cufw_TMSC.bin";
|
||||
}
|
||||
/* provide name of alternative file */
|
||||
rtlpriv->cfg->alt_fw_name = "rtlwifi/rtl8192cufw.bin";
|
||||
- pr_info("Loading firmware %s\n", rtlpriv->cfg->fw_name);
|
||||
+ pr_info("Loading firmware %s\n", fw_name);
|
||||
rtlpriv->max_fw_size = 0x4000;
|
||||
err = request_firmware_nowait(THIS_MODULE, 1,
|
||||
- rtlpriv->cfg->fw_name, rtlpriv->io.dev,
|
||||
+ fw_name, rtlpriv->io.dev,
|
||||
GFP_KERNEL, hw, rtl_fw_cb);
|
||||
return err;
|
||||
}
|
||||
@@ -187,7 +188,6 @@ static struct rtl_hal_usbint_cfg rtl92cu_interface_cfg = {
|
||||
|
||||
static struct rtl_hal_cfg rtl92cu_hal_cfg = {
|
||||
.name = "rtl92c_usb",
|
||||
- .fw_name = "rtlwifi/rtl8192cufw.bin",
|
||||
.ops = &rtl8192cu_hal_ops,
|
||||
.mod_params = &rtl92cu_mod_params,
|
||||
.usb_interface_cfg = &rtl92cu_interface_cfg,
|
||||
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c
|
||||
index 0538a4d..1ebfee1 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c
|
||||
@@ -92,6 +92,7 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)
|
||||
u8 tid;
|
||||
struct rtl_priv *rtlpriv = rtl_priv(hw);
|
||||
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
|
||||
+ char *fw_name = "rtlwifi/rtl8192defw.bin";
|
||||
|
||||
rtlpriv->dm.dm_initialgain_enable = true;
|
||||
rtlpriv->dm.dm_flag = 0;
|
||||
@@ -181,10 +182,10 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)
|
||||
|
||||
rtlpriv->max_fw_size = 0x8000;
|
||||
pr_info("Driver for Realtek RTL8192DE WLAN interface\n");
|
||||
- pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
|
||||
+ pr_info("Loading firmware file %s\n", fw_name);
|
||||
|
||||
/* request fw */
|
||||
- err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,
|
||||
+ err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
|
||||
rtlpriv->io.dev, GFP_KERNEL, hw,
|
||||
rtl_fw_cb);
|
||||
if (err) {
|
||||
@@ -266,7 +267,6 @@ static const struct rtl_hal_cfg rtl92de_hal_cfg = {
|
||||
.bar_id = 2,
|
||||
.write_readback = true,
|
||||
.name = "rtl8192de",
|
||||
- .fw_name = "rtlwifi/rtl8192defw.bin",
|
||||
.ops = &rtl8192de_hal_ops,
|
||||
.mod_params = &rtl92de_mod_params,
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
|
||||
index ac299cb..46b605de3 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
|
||||
@@ -91,6 +91,7 @@ int rtl92ee_init_sw_vars(struct ieee80211_hw *hw)
|
||||
struct rtl_priv *rtlpriv = rtl_priv(hw);
|
||||
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
|
||||
int err = 0;
|
||||
+ char *fw_name;
|
||||
|
||||
rtl92ee_bt_reg_init(hw);
|
||||
rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support;
|
||||
@@ -170,11 +171,11 @@ int rtl92ee_init_sw_vars(struct ieee80211_hw *hw)
|
||||
}
|
||||
|
||||
/* request fw */
|
||||
- rtlpriv->cfg->fw_name = "rtlwifi/rtl8192eefw.bin";
|
||||
+ fw_name = "rtlwifi/rtl8192eefw.bin";
|
||||
|
||||
rtlpriv->max_fw_size = 0x8000;
|
||||
- pr_info("Using firmware %s\n", rtlpriv->cfg->fw_name);
|
||||
- err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,
|
||||
+ pr_info("Using firmware %s\n", fw_name);
|
||||
+ err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
|
||||
rtlpriv->io.dev, GFP_KERNEL, hw,
|
||||
rtl_fw_cb);
|
||||
if (err) {
|
||||
@@ -266,7 +267,6 @@ static const struct rtl_hal_cfg rtl92ee_hal_cfg = {
|
||||
.bar_id = 2,
|
||||
.write_readback = true,
|
||||
.name = "rtl92ee_pci",
|
||||
- .fw_name = "rtlwifi/rtl8192eefw.bin",
|
||||
.ops = &rtl8192ee_hal_ops,
|
||||
.mod_params = &rtl92ee_mod_params,
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c
|
||||
index 5e8e02d..3e1eaea 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c
|
||||
@@ -89,12 +89,13 @@ static void rtl92se_fw_cb(const struct firmware *firmware, void *context)
|
||||
struct ieee80211_hw *hw = context;
|
||||
struct rtl_priv *rtlpriv = rtl_priv(hw);
|
||||
struct rt_firmware *pfirmware = NULL;
|
||||
+ char *fw_name = "rtlwifi/rtl8192sefw.bin";
|
||||
|
||||
RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
|
||||
"Firmware callback routine entered!\n");
|
||||
complete(&rtlpriv->firmware_loading_complete);
|
||||
if (!firmware) {
|
||||
- pr_err("Firmware %s not available\n", rtlpriv->cfg->fw_name);
|
||||
+ pr_err("Firmware %s not available\n", fw_name);
|
||||
rtlpriv->max_fw_size = 0;
|
||||
return;
|
||||
}
|
||||
@@ -117,6 +118,7 @@ static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)
|
||||
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
|
||||
int err = 0;
|
||||
u16 earlyrxthreshold = 7;
|
||||
+ char *fw_name = "rtlwifi/rtl8192sefw.bin";
|
||||
|
||||
rtlpriv->dm.dm_initialgain_enable = true;
|
||||
rtlpriv->dm.dm_flag = 0;
|
||||
@@ -214,9 +216,9 @@ static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)
|
||||
rtlpriv->max_fw_size = RTL8190_MAX_FIRMWARE_CODE_SIZE*2 +
|
||||
sizeof(struct fw_hdr);
|
||||
pr_info("Driver for Realtek RTL8192SE/RTL8191SE\n"
|
||||
- "Loading firmware %s\n", rtlpriv->cfg->fw_name);
|
||||
+ "Loading firmware %s\n", fw_name);
|
||||
/* request fw */
|
||||
- err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,
|
||||
+ err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
|
||||
rtlpriv->io.dev, GFP_KERNEL, hw,
|
||||
rtl92se_fw_cb);
|
||||
if (err) {
|
||||
@@ -310,7 +312,6 @@ static const struct rtl_hal_cfg rtl92se_hal_cfg = {
|
||||
.bar_id = 1,
|
||||
.write_readback = false,
|
||||
.name = "rtl92s_pci",
|
||||
- .fw_name = "rtlwifi/rtl8192sefw.bin",
|
||||
.ops = &rtl8192se_hal_ops,
|
||||
.mod_params = &rtl92se_mod_params,
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
|
||||
index 89c828a..c51a9e8 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
|
||||
@@ -94,6 +94,7 @@ int rtl8723e_init_sw_vars(struct ieee80211_hw *hw)
|
||||
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
|
||||
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
|
||||
int err = 0;
|
||||
+ char *fw_name = "rtlwifi/rtl8723fw.bin";
|
||||
|
||||
rtl8723e_bt_reg_init(hw);
|
||||
|
||||
@@ -176,14 +177,12 @@ int rtl8723e_init_sw_vars(struct ieee80211_hw *hw)
|
||||
return 1;
|
||||
}
|
||||
|
||||
- if (IS_VENDOR_8723_A_CUT(rtlhal->version))
|
||||
- rtlpriv->cfg->fw_name = "rtlwifi/rtl8723fw.bin";
|
||||
- else if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version))
|
||||
- rtlpriv->cfg->fw_name = "rtlwifi/rtl8723fw_B.bin";
|
||||
+ if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version))
|
||||
+ fw_name = "rtlwifi/rtl8723fw_B.bin";
|
||||
|
||||
rtlpriv->max_fw_size = 0x6000;
|
||||
- pr_info("Using firmware %s\n", rtlpriv->cfg->fw_name);
|
||||
- err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,
|
||||
+ pr_info("Using firmware %s\n", fw_name);
|
||||
+ err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
|
||||
rtlpriv->io.dev, GFP_KERNEL, hw,
|
||||
rtl_fw_cb);
|
||||
if (err) {
|
||||
@@ -280,7 +279,6 @@ static const struct rtl_hal_cfg rtl8723e_hal_cfg = {
|
||||
.bar_id = 2,
|
||||
.write_readback = true,
|
||||
.name = "rtl8723e_pci",
|
||||
- .fw_name = "rtlwifi/rtl8723efw.bin",
|
||||
.ops = &rtl8723e_hal_ops,
|
||||
.mod_params = &rtl8723e_mod_params,
|
||||
.maps[SYS_ISO_CTRL] = REG_SYS_ISO_CTRL,
|
||||
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
|
||||
index 20b53f0..847644d 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
|
||||
@@ -91,6 +91,7 @@ int rtl8723be_init_sw_vars(struct ieee80211_hw *hw)
|
||||
struct rtl_priv *rtlpriv = rtl_priv(hw);
|
||||
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
|
||||
struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
|
||||
+ char *fw_name = "rtlwifi/rtl8723befw.bin";
|
||||
|
||||
rtl8723be_bt_reg_init(hw);
|
||||
rtlpriv->btcoexist.btc_ops = rtl_btc_get_ops_pointer();
|
||||
@@ -184,8 +185,8 @@ int rtl8723be_init_sw_vars(struct ieee80211_hw *hw)
|
||||
}
|
||||
|
||||
rtlpriv->max_fw_size = 0x8000;
|
||||
- pr_info("Using firmware %s\n", rtlpriv->cfg->fw_name);
|
||||
- err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,
|
||||
+ pr_info("Using firmware %s\n", fw_name);
|
||||
+ err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
|
||||
rtlpriv->io.dev, GFP_KERNEL, hw,
|
||||
rtl_fw_cb);
|
||||
if (err) {
|
||||
@@ -280,7 +281,6 @@ static const struct rtl_hal_cfg rtl8723be_hal_cfg = {
|
||||
.bar_id = 2,
|
||||
.write_readback = true,
|
||||
.name = "rtl8723be_pci",
|
||||
- .fw_name = "rtlwifi/rtl8723befw.bin",
|
||||
.ops = &rtl8723be_hal_ops,
|
||||
.mod_params = &rtl8723be_mod_params,
|
||||
.maps[SYS_ISO_CTRL] = REG_SYS_ISO_CTRL,
|
||||
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
|
||||
index 22f687b1..297938e 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
|
||||
@@ -93,6 +93,7 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw)
|
||||
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
|
||||
struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
|
||||
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
|
||||
+ char *fw_name, *wowlan_fw_name;
|
||||
|
||||
rtl8821ae_bt_reg_init(hw);
|
||||
rtlpriv->btcoexist.btc_ops = rtl_btc_get_ops_pointer();
|
||||
@@ -203,17 +204,17 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw)
|
||||
}
|
||||
|
||||
if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
|
||||
- rtlpriv->cfg->fw_name = "rtlwifi/rtl8812aefw.bin";
|
||||
- rtlpriv->cfg->wowlan_fw_name = "rtlwifi/rtl8812aefw_wowlan.bin";
|
||||
+ fw_name = "rtlwifi/rtl8812aefw.bin";
|
||||
+ wowlan_fw_name = "rtlwifi/rtl8812aefw_wowlan.bin";
|
||||
} else {
|
||||
- rtlpriv->cfg->fw_name = "rtlwifi/rtl8821aefw.bin";
|
||||
- rtlpriv->cfg->wowlan_fw_name = "rtlwifi/rtl8821aefw_wowlan.bin";
|
||||
+ fw_name = "rtlwifi/rtl8821aefw.bin";
|
||||
+ wowlan_fw_name = "rtlwifi/rtl8821aefw_wowlan.bin";
|
||||
}
|
||||
|
||||
rtlpriv->max_fw_size = 0x8000;
|
||||
/*load normal firmware*/
|
||||
- pr_info("Using firmware %s\n", rtlpriv->cfg->fw_name);
|
||||
- err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,
|
||||
+ pr_info("Using firmware %s\n", fw_name);
|
||||
+ err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
|
||||
rtlpriv->io.dev, GFP_KERNEL, hw,
|
||||
rtl_fw_cb);
|
||||
if (err) {
|
||||
@@ -222,9 +223,9 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw)
|
||||
return 1;
|
||||
}
|
||||
/*load wowlan firmware*/
|
||||
- pr_info("Using firmware %s\n", rtlpriv->cfg->wowlan_fw_name);
|
||||
+ pr_info("Using firmware %s\n", wowlan_fw_name);
|
||||
err = request_firmware_nowait(THIS_MODULE, 1,
|
||||
- rtlpriv->cfg->wowlan_fw_name,
|
||||
+ wowlan_fw_name,
|
||||
rtlpriv->io.dev, GFP_KERNEL, hw,
|
||||
rtl_wowlan_fw_cb);
|
||||
if (err) {
|
||||
@@ -320,7 +321,6 @@ static const struct rtl_hal_cfg rtl8821ae_hal_cfg = {
|
||||
.bar_id = 2,
|
||||
.write_readback = true,
|
||||
.name = "rtl8821ae_pci",
|
||||
- .fw_name = "rtlwifi/rtl8821aefw.bin",
|
||||
.ops = &rtl8821ae_hal_ops,
|
||||
.mod_params = &rtl8821ae_mod_params,
|
||||
.maps[SYS_ISO_CTRL] = REG_SYS_ISO_CTRL,
|
||||
diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h
|
||||
index 595f7d5..dafe486 100644
|
||||
--- a/drivers/net/wireless/realtek/rtlwifi/wifi.h
|
||||
+++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h
|
||||
@@ -2278,9 +2278,7 @@ struct rtl_hal_cfg {
|
||||
u8 bar_id;
|
||||
bool write_readback;
|
||||
char *name;
|
||||
- char *fw_name;
|
||||
char *alt_fw_name;
|
||||
- char *wowlan_fw_name;
|
||||
struct rtl_hal_ops *ops;
|
||||
struct rtl_mod_params *mod_params;
|
||||
struct rtl_hal_usbint_cfg *usb_interface_cfg;
|
||||
--
|
||||
2.10.1
|
||||
|
||||
@@ -1,111 +0,0 @@
|
||||
diff --git a/drivers/nvme/host/scsi.c b/drivers/nvme/host/scsi.c
|
||||
index e947e298a737..44009105f8c8 100644
|
||||
--- a/drivers/nvme/host/scsi.c
|
||||
+++ b/drivers/nvme/host/scsi.c
|
||||
@@ -72,15 +72,6 @@ static int sg_version_num = 30534; /* 2 digits for each component */
|
||||
#define ALL_LUNS_RETURNED 0x02
|
||||
#define ALL_WELL_KNOWN_LUNS_RETURNED 0x01
|
||||
#define RESTRICTED_LUNS_RETURNED 0x00
|
||||
-#define NVME_POWER_STATE_START_VALID 0x00
|
||||
-#define NVME_POWER_STATE_ACTIVE 0x01
|
||||
-#define NVME_POWER_STATE_IDLE 0x02
|
||||
-#define NVME_POWER_STATE_STANDBY 0x03
|
||||
-#define NVME_POWER_STATE_LU_CONTROL 0x07
|
||||
-#define POWER_STATE_0 0
|
||||
-#define POWER_STATE_1 1
|
||||
-#define POWER_STATE_2 2
|
||||
-#define POWER_STATE_3 3
|
||||
#define DOWNLOAD_SAVE_ACTIVATE 0x05
|
||||
#define DOWNLOAD_SAVE_DEFER_ACTIVATE 0x0E
|
||||
#define ACTIVATE_DEFERRED_MICROCODE 0x0F
|
||||
@@ -1229,64 +1220,6 @@ static void nvme_trans_fill_read_cap(u8 *response, struct nvme_id_ns *id_ns,
|
||||
|
||||
/* Start Stop Unit Helper Functions */
|
||||
|
||||
-static int nvme_trans_power_state(struct nvme_ns *ns, struct sg_io_hdr *hdr,
|
||||
- u8 pc, u8 pcmod, u8 start)
|
||||
-{
|
||||
- int res;
|
||||
- int nvme_sc;
|
||||
- struct nvme_id_ctrl *id_ctrl;
|
||||
- int lowest_pow_st; /* max npss = lowest power consumption */
|
||||
- unsigned ps_desired = 0;
|
||||
-
|
||||
- nvme_sc = nvme_identify_ctrl(ns->ctrl, &id_ctrl);
|
||||
- res = nvme_trans_status_code(hdr, nvme_sc);
|
||||
- if (res)
|
||||
- return res;
|
||||
-
|
||||
- lowest_pow_st = max(POWER_STATE_0, (int)(id_ctrl->npss - 1));
|
||||
- kfree(id_ctrl);
|
||||
-
|
||||
- switch (pc) {
|
||||
- case NVME_POWER_STATE_START_VALID:
|
||||
- /* Action unspecified if POWER CONDITION MODIFIER != 0 */
|
||||
- if (pcmod == 0 && start == 0x1)
|
||||
- ps_desired = POWER_STATE_0;
|
||||
- if (pcmod == 0 && start == 0x0)
|
||||
- ps_desired = lowest_pow_st;
|
||||
- break;
|
||||
- case NVME_POWER_STATE_ACTIVE:
|
||||
- /* Action unspecified if POWER CONDITION MODIFIER != 0 */
|
||||
- if (pcmod == 0)
|
||||
- ps_desired = POWER_STATE_0;
|
||||
- break;
|
||||
- case NVME_POWER_STATE_IDLE:
|
||||
- /* Action unspecified if POWER CONDITION MODIFIER != [0,1,2] */
|
||||
- if (pcmod == 0x0)
|
||||
- ps_desired = POWER_STATE_1;
|
||||
- else if (pcmod == 0x1)
|
||||
- ps_desired = POWER_STATE_2;
|
||||
- else if (pcmod == 0x2)
|
||||
- ps_desired = POWER_STATE_3;
|
||||
- break;
|
||||
- case NVME_POWER_STATE_STANDBY:
|
||||
- /* Action unspecified if POWER CONDITION MODIFIER != [0,1] */
|
||||
- if (pcmod == 0x0)
|
||||
- ps_desired = max(POWER_STATE_0, (lowest_pow_st - 2));
|
||||
- else if (pcmod == 0x1)
|
||||
- ps_desired = max(POWER_STATE_0, (lowest_pow_st - 1));
|
||||
- break;
|
||||
- case NVME_POWER_STATE_LU_CONTROL:
|
||||
- default:
|
||||
- res = nvme_trans_completion(hdr, SAM_STAT_CHECK_CONDITION,
|
||||
- ILLEGAL_REQUEST, SCSI_ASC_INVALID_CDB,
|
||||
- SCSI_ASCQ_CAUSE_NOT_REPORTABLE);
|
||||
- break;
|
||||
- }
|
||||
- nvme_sc = nvme_set_features(ns->ctrl, NVME_FEAT_POWER_MGMT, ps_desired, 0,
|
||||
- NULL);
|
||||
- return nvme_trans_status_code(hdr, nvme_sc);
|
||||
-}
|
||||
-
|
||||
static int nvme_trans_send_activate_fw_cmd(struct nvme_ns *ns, struct sg_io_hdr *hdr,
|
||||
u8 buffer_id)
|
||||
{
|
||||
@@ -2235,11 +2168,10 @@ static int nvme_trans_synchronize_cache(struct nvme_ns *ns,
|
||||
static int nvme_trans_start_stop(struct nvme_ns *ns, struct sg_io_hdr *hdr,
|
||||
u8 *cmd)
|
||||
{
|
||||
- u8 immed, pcmod, pc, no_flush, start;
|
||||
+ u8 immed, pcmod, no_flush, start;
|
||||
|
||||
immed = cmd[1] & 0x01;
|
||||
pcmod = cmd[3] & 0x0f;
|
||||
- pc = (cmd[4] & 0xf0) >> 4;
|
||||
no_flush = cmd[4] & 0x04;
|
||||
start = cmd[4] & 0x01;
|
||||
|
||||
@@ -2254,8 +2186,8 @@ static int nvme_trans_start_stop(struct nvme_ns *ns, struct sg_io_hdr *hdr,
|
||||
if (res)
|
||||
return res;
|
||||
}
|
||||
- /* Setup the expected power state transition */
|
||||
- return nvme_trans_power_state(ns, hdr, pc, pcmod, start);
|
||||
+
|
||||
+ return 0;
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.7.4
|
||||
@@ -1,107 +0,0 @@
|
||||
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
|
||||
index 2feacc70bf61..b92a7f767bfc 100644
|
||||
--- a/drivers/nvme/host/core.c
|
||||
+++ b/drivers/nvme/host/core.c
|
||||
@@ -597,7 +597,7 @@ int nvme_identify_ns(struct nvme_ctrl *dev, unsigned nsid,
|
||||
}
|
||||
|
||||
int nvme_get_features(struct nvme_ctrl *dev, unsigned fid, unsigned nsid,
|
||||
- dma_addr_t dma_addr, u32 *result)
|
||||
+ void *buffer, size_t buflen, u32 *result)
|
||||
{
|
||||
struct nvme_command c;
|
||||
struct nvme_completion cqe;
|
||||
@@ -606,10 +606,9 @@ int nvme_get_features(struct nvme_ctrl *dev, unsigned fid, unsigned nsid,
|
||||
memset(&c, 0, sizeof(c));
|
||||
c.features.opcode = nvme_admin_get_features;
|
||||
c.features.nsid = cpu_to_le32(nsid);
|
||||
- c.features.dptr.prp1 = cpu_to_le64(dma_addr);
|
||||
c.features.fid = cpu_to_le32(fid);
|
||||
|
||||
- ret = __nvme_submit_sync_cmd(dev->admin_q, &c, &cqe, NULL, 0, 0,
|
||||
+ ret = __nvme_submit_sync_cmd(dev->admin_q, &c, &cqe, buffer, buflen, 0,
|
||||
NVME_QID_ANY, 0, 0);
|
||||
if (ret >= 0 && result)
|
||||
*result = le32_to_cpu(cqe.result);
|
||||
@@ -617,7 +616,7 @@ int nvme_get_features(struct nvme_ctrl *dev, unsigned fid, unsigned nsid,
|
||||
}
|
||||
|
||||
int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword11,
|
||||
- dma_addr_t dma_addr, u32 *result)
|
||||
+ void *buffer, size_t buflen, u32 *result)
|
||||
{
|
||||
struct nvme_command c;
|
||||
struct nvme_completion cqe;
|
||||
@@ -625,12 +624,11 @@ int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword11,
|
||||
|
||||
memset(&c, 0, sizeof(c));
|
||||
c.features.opcode = nvme_admin_set_features;
|
||||
- c.features.dptr.prp1 = cpu_to_le64(dma_addr);
|
||||
c.features.fid = cpu_to_le32(fid);
|
||||
c.features.dword11 = cpu_to_le32(dword11);
|
||||
|
||||
- ret = __nvme_submit_sync_cmd(dev->admin_q, &c, &cqe, NULL, 0, 0,
|
||||
- NVME_QID_ANY, 0, 0);
|
||||
+ ret = __nvme_submit_sync_cmd(dev->admin_q, &c, &cqe,
|
||||
+ buffer, buflen, 0, NVME_QID_ANY, 0, 0);
|
||||
if (ret >= 0 && result)
|
||||
*result = le32_to_cpu(cqe.result);
|
||||
return ret;
|
||||
@@ -664,7 +662,7 @@ int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count)
|
||||
u32 result;
|
||||
int status, nr_io_queues;
|
||||
|
||||
- status = nvme_set_features(ctrl, NVME_FEAT_NUM_QUEUES, q_count, 0,
|
||||
+ status = nvme_set_features(ctrl, NVME_FEAT_NUM_QUEUES, q_count, NULL, 0,
|
||||
&result);
|
||||
if (status < 0)
|
||||
return status;
|
||||
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
|
||||
index ab18b78102bf..c2151761ec5f 100644
|
||||
--- a/drivers/nvme/host/nvme.h
|
||||
+++ b/drivers/nvme/host/nvme.h
|
||||
@@ -292,9 +292,9 @@ int nvme_identify_ns(struct nvme_ctrl *dev, unsigned nsid,
|
||||
struct nvme_id_ns **id);
|
||||
int nvme_get_log_page(struct nvme_ctrl *dev, struct nvme_smart_log **log);
|
||||
int nvme_get_features(struct nvme_ctrl *dev, unsigned fid, unsigned nsid,
|
||||
- dma_addr_t dma_addr, u32 *result);
|
||||
+ void *buffer, size_t buflen, u32 *result);
|
||||
int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword11,
|
||||
- dma_addr_t dma_addr, u32 *result);
|
||||
+ void *buffer, size_t buflen, u32 *result);
|
||||
int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count);
|
||||
void nvme_start_keep_alive(struct nvme_ctrl *ctrl);
|
||||
void nvme_stop_keep_alive(struct nvme_ctrl *ctrl);
|
||||
diff --git a/drivers/nvme/host/scsi.c b/drivers/nvme/host/scsi.c
|
||||
index 44009105f8c8..c2a0a1c7d05d 100644
|
||||
--- a/drivers/nvme/host/scsi.c
|
||||
+++ b/drivers/nvme/host/scsi.c
|
||||
@@ -906,7 +906,7 @@ static int nvme_trans_log_temperature(struct nvme_ns *ns, struct sg_io_hdr *hdr,
|
||||
kfree(smart_log);
|
||||
|
||||
/* Get Features for Temp Threshold */
|
||||
- res = nvme_get_features(ns->ctrl, NVME_FEAT_TEMP_THRESH, 0, 0,
|
||||
+ res = nvme_get_features(ns->ctrl, NVME_FEAT_TEMP_THRESH, 0, NULL, 0,
|
||||
&feature_resp);
|
||||
if (res != NVME_SC_SUCCESS)
|
||||
temp_c_thresh = LOG_TEMP_UNKNOWN;
|
||||
@@ -1039,7 +1039,7 @@ static int nvme_trans_fill_caching_page(struct nvme_ns *ns,
|
||||
if (len < MODE_PAGE_CACHING_LEN)
|
||||
return -EINVAL;
|
||||
|
||||
- nvme_sc = nvme_get_features(ns->ctrl, NVME_FEAT_VOLATILE_WC, 0, 0,
|
||||
+ nvme_sc = nvme_get_features(ns->ctrl, NVME_FEAT_VOLATILE_WC, 0, NULL, 0,
|
||||
&feature_resp);
|
||||
res = nvme_trans_status_code(hdr, nvme_sc);
|
||||
if (res)
|
||||
@@ -1328,7 +1328,7 @@ static int nvme_trans_modesel_get_mp(struct nvme_ns *ns, struct sg_io_hdr *hdr,
|
||||
case MODE_PAGE_CACHING:
|
||||
dword11 = ((mode_page[2] & CACHING_MODE_PAGE_WCE_MASK) ? 1 : 0);
|
||||
nvme_sc = nvme_set_features(ns->ctrl, NVME_FEAT_VOLATILE_WC,
|
||||
- dword11, 0, NULL);
|
||||
+ dword11, NULL, 0, NULL);
|
||||
res = nvme_trans_status_code(hdr, nvme_sc);
|
||||
break;
|
||||
case MODE_PAGE_CONTROL:
|
||||
--
|
||||
2.7.4
|
||||
@@ -1,264 +0,0 @@
|
||||
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
|
||||
index b92a7f767bfc..a143c72c3d0d 100644
|
||||
--- a/drivers/nvme/host/core.c
|
||||
+++ b/drivers/nvme/host/core.c
|
||||
@@ -56,6 +56,11 @@ EXPORT_SYMBOL_GPL(nvme_max_retries);
|
||||
static int nvme_char_major;
|
||||
module_param(nvme_char_major, int, 0);
|
||||
|
||||
+static unsigned long default_ps_max_latency_us = 25000;
|
||||
+module_param(default_ps_max_latency_us, ulong, 0644);
|
||||
+MODULE_PARM_DESC(ps_max_latency_us,
|
||||
+ "default max power saving latency; overridden per device in sysfs");
|
||||
+
|
||||
static LIST_HEAD(nvme_ctrl_list);
|
||||
static DEFINE_SPINLOCK(dev_list_lock);
|
||||
|
||||
@@ -1205,6 +1210,98 @@ static void nvme_set_queue_limits(struct nvme_ctrl *ctrl,
|
||||
blk_queue_write_cache(q, vwc, vwc);
|
||||
}
|
||||
|
||||
+static void nvme_configure_apst(struct nvme_ctrl *ctrl)
|
||||
+{
|
||||
+ /*
|
||||
+ * APST (Autonomous Power State Transition) lets us program a
|
||||
+ * table of power state transitions that the controller will
|
||||
+ * perform automatically. We configure it with a simple
|
||||
+ * heuristic: we are willing to spend at most 2% of the time
|
||||
+ * transitioning between power states. Therefore, when running
|
||||
+ * in any given state, we will enter the next lower-power
|
||||
+ * non-operational state after waiting 100 * (enlat + exlat)
|
||||
+ * microseconds, as long as that state's total latency is under
|
||||
+ * the requested maximum latency.
|
||||
+ *
|
||||
+ * We will not autonomously enter any non-operational state for
|
||||
+ * which the total latency exceeds ps_max_latency_us. Users
|
||||
+ * can set ps_max_latency_us to zero to turn off APST.
|
||||
+ */
|
||||
+
|
||||
+ unsigned apste;
|
||||
+ struct nvme_feat_auto_pst *table;
|
||||
+ int ret;
|
||||
+
|
||||
+ if (!ctrl->apsta)
|
||||
+ return; /* APST isn't supported. */
|
||||
+
|
||||
+ if (ctrl->npss > 31) {
|
||||
+ dev_warn(ctrl->device, "NPSS is invalid; not using APST\n");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ table = kzalloc(sizeof(*table), GFP_KERNEL);
|
||||
+ if (!table)
|
||||
+ return;
|
||||
+
|
||||
+ if (ctrl->ps_max_latency_us == 0) {
|
||||
+ /* Turn off APST. */
|
||||
+ apste = 0;
|
||||
+ } else {
|
||||
+ __le64 target = cpu_to_le64(0);
|
||||
+ int state;
|
||||
+
|
||||
+ /*
|
||||
+ * Walk through all states from lowest- to highest-power.
|
||||
+ * According to the spec, lower-numbered states use more
|
||||
+ * power. NPSS, despite the name, is the index of the
|
||||
+ * lowest-power state, not the number of states.
|
||||
+ */
|
||||
+ for (state = (int)ctrl->npss; state >= 0; state--) {
|
||||
+ u64 total_latency_us, transition_ms;
|
||||
+
|
||||
+ if (target)
|
||||
+ table->entries[state] = target;
|
||||
+
|
||||
+ /*
|
||||
+ * Is this state a useful non-operational state for
|
||||
+ * higher-power states to autonomously transition to?
|
||||
+ */
|
||||
+ if (!(ctrl->psd[state].flags & 2))
|
||||
+ continue; /* It's an operational state. */
|
||||
+
|
||||
+ total_latency_us =
|
||||
+ (u64)cpu_to_le32(ctrl->psd[state].entry_lat) +
|
||||
+ + cpu_to_le32(ctrl->psd[state].exit_lat);
|
||||
+ if (total_latency_us > ctrl->ps_max_latency_us)
|
||||
+ continue;
|
||||
+
|
||||
+ /*
|
||||
+ * This state is good. Use it as the APST idle
|
||||
+ * target for higher power states.
|
||||
+ */
|
||||
+ transition_ms = total_latency_us + 19;
|
||||
+ do_div(transition_ms, 20);
|
||||
+ if (transition_ms >= (1 << 24))
|
||||
+ transition_ms = (1 << 24);
|
||||
+
|
||||
+ target = cpu_to_le64((state << 3) |
|
||||
+ (transition_ms << 8));
|
||||
+ }
|
||||
+
|
||||
+ apste = 1;
|
||||
+ }
|
||||
+
|
||||
+ ret = nvme_set_features(ctrl, NVME_FEAT_AUTO_PST, apste,
|
||||
+ table, sizeof(*table), NULL);
|
||||
+ if (ret)
|
||||
+ dev_err(ctrl->device, "failed to set APST feature (%d)\n", ret);
|
||||
+
|
||||
+ kfree(table);
|
||||
+}
|
||||
+
|
||||
+static struct attribute_group nvme_dev_dynamic_attrs_group;
|
||||
+
|
||||
/*
|
||||
* Initialize the cached copies of the Identify data and various controller
|
||||
* register in our nvme_ctrl structure. This should be called as soon as
|
||||
@@ -1271,6 +1368,10 @@ int nvme_init_identify(struct nvme_ctrl *ctrl)
|
||||
ctrl->sgls = le32_to_cpu(id->sgls);
|
||||
ctrl->kas = le16_to_cpu(id->kas);
|
||||
|
||||
+ ctrl->npss = id->npss;
|
||||
+ ctrl->apsta = id->apsta;
|
||||
+ memcpy(ctrl->psd, id->psd, sizeof(ctrl->psd));
|
||||
+
|
||||
if (ctrl->ops->is_fabrics) {
|
||||
ctrl->icdoff = le16_to_cpu(id->icdoff);
|
||||
ctrl->ioccsz = le32_to_cpu(id->ioccsz);
|
||||
@@ -1294,6 +1395,10 @@ int nvme_init_identify(struct nvme_ctrl *ctrl)
|
||||
}
|
||||
|
||||
kfree(id);
|
||||
+
|
||||
+ nvme_configure_apst(ctrl);
|
||||
+
|
||||
+ sysfs_update_group(&ctrl->device->kobj, &nvme_dev_dynamic_attrs_group);
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(nvme_init_identify);
|
||||
@@ -1564,6 +1669,41 @@ static ssize_t nvme_sysfs_show_address(struct device *dev,
|
||||
}
|
||||
static DEVICE_ATTR(address, S_IRUGO, nvme_sysfs_show_address, NULL);
|
||||
|
||||
+static ssize_t nvme_sysfs_show_ps_max_latency_us(
|
||||
+ struct device *dev,
|
||||
+ struct device_attribute *attr,
|
||||
+ char *buf)
|
||||
+{
|
||||
+ struct nvme_ctrl *ctrl = dev_get_drvdata(dev);
|
||||
+
|
||||
+ return snprintf(buf, PAGE_SIZE, "%llu\n", ctrl->ps_max_latency_us);
|
||||
+}
|
||||
+
|
||||
+static ssize_t nvme_sysfs_store_ps_max_latency_us(
|
||||
+ struct device *dev,
|
||||
+ struct device_attribute *attr,
|
||||
+ const char *buf, size_t size)
|
||||
+{
|
||||
+ struct nvme_ctrl *ctrl = dev_get_drvdata(dev);
|
||||
+ int ret;
|
||||
+ u64 val;
|
||||
+
|
||||
+ ret = kstrtoull(buf, 10, &val);
|
||||
+ if (ret)
|
||||
+ return ret;
|
||||
+
|
||||
+ if (ctrl->ps_max_latency_us != val) {
|
||||
+ ctrl->ps_max_latency_us = val;
|
||||
+ nvme_configure_apst(ctrl);
|
||||
+ }
|
||||
+
|
||||
+ return size;
|
||||
+}
|
||||
+
|
||||
+static DEVICE_ATTR(ps_max_latency_us, 0644,
|
||||
+ nvme_sysfs_show_ps_max_latency_us,
|
||||
+ nvme_sysfs_store_ps_max_latency_us);
|
||||
+
|
||||
static struct attribute *nvme_dev_attrs[] = {
|
||||
&dev_attr_reset_controller.attr,
|
||||
&dev_attr_rescan_controller.attr,
|
||||
@@ -1605,8 +1745,33 @@ static struct attribute_group nvme_dev_attrs_group = {
|
||||
.is_visible = nvme_dev_attrs_are_visible,
|
||||
};
|
||||
|
||||
+static struct attribute *nvme_dev_dynamic_attrs[] = {
|
||||
+ &dev_attr_ps_max_latency_us.attr,
|
||||
+ NULL
|
||||
+};
|
||||
+
|
||||
+static umode_t nvme_dev_dynamic_attrs_are_visible(struct kobject *kobj,
|
||||
+ struct attribute *a, int n)
|
||||
+{
|
||||
+ struct device *dev = container_of(kobj, struct device, kobj);
|
||||
+ struct nvme_ctrl *ctrl = dev_get_drvdata(dev);
|
||||
+
|
||||
+ if (a == &dev_attr_ps_max_latency_us.attr) {
|
||||
+ if (!ctrl->apsta)
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ return a->mode;
|
||||
+}
|
||||
+
|
||||
+static struct attribute_group nvme_dev_dynamic_attrs_group = {
|
||||
+ .attrs = nvme_dev_dynamic_attrs,
|
||||
+ .is_visible = nvme_dev_dynamic_attrs_are_visible,
|
||||
+};
|
||||
+
|
||||
static const struct attribute_group *nvme_dev_attr_groups[] = {
|
||||
&nvme_dev_attrs_group,
|
||||
+ &nvme_dev_dynamic_attrs_group,
|
||||
NULL,
|
||||
};
|
||||
|
||||
@@ -1991,6 +2156,7 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev,
|
||||
ctrl->quirks = quirks;
|
||||
INIT_WORK(&ctrl->scan_work, nvme_scan_work);
|
||||
INIT_WORK(&ctrl->async_event_work, nvme_async_event_work);
|
||||
+ ctrl->ps_max_latency_us = default_ps_max_latency_us;
|
||||
|
||||
ret = nvme_set_instance(ctrl);
|
||||
if (ret)
|
||||
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
|
||||
index c2151761ec5f..16d51006afc0 100644
|
||||
--- a/drivers/nvme/host/nvme.h
|
||||
+++ b/drivers/nvme/host/nvme.h
|
||||
@@ -129,13 +129,19 @@ struct nvme_ctrl {
|
||||
u32 vs;
|
||||
u32 sgls;
|
||||
u16 kas;
|
||||
+ u8 npss;
|
||||
+ u8 apsta;
|
||||
unsigned int kato;
|
||||
bool subsystem;
|
||||
unsigned long quirks;
|
||||
+ struct nvme_id_power_state psd[32];
|
||||
struct work_struct scan_work;
|
||||
struct work_struct async_event_work;
|
||||
struct delayed_work ka_work;
|
||||
|
||||
+ /* Power saving configuration */
|
||||
+ u64 ps_max_latency_us;
|
||||
+
|
||||
/* Fabrics only */
|
||||
u16 sqsize;
|
||||
u32 ioccsz;
|
||||
diff --git a/include/linux/nvme.h b/include/linux/nvme.h
|
||||
index d8b37bab2887..a76237dac4b0 100644
|
||||
--- a/include/linux/nvme.h
|
||||
+++ b/include/linux/nvme.h
|
||||
@@ -543,6 +543,12 @@ struct nvme_dsm_range {
|
||||
__le64 slba;
|
||||
};
|
||||
|
||||
+/* Features */
|
||||
+
|
||||
+struct nvme_feat_auto_pst {
|
||||
+ __le64 entries[32];
|
||||
+};
|
||||
+
|
||||
/* Admin commands */
|
||||
|
||||
enum nvme_admin_opcode {
|
||||
--
|
||||
2.7.4
|
||||
@@ -14,7 +14,14 @@
|
||||
###
|
||||
### Stable Queue
|
||||
###
|
||||
patch-4.8.10-rc1.patch
|
||||
|
||||
# CVE-2016-8405
|
||||
stable-fbdev-color-map-copying-bounds-checking.patch
|
||||
|
||||
stable-tile-ptrace-preserve-previous-registers-for-short-regset-write.patch
|
||||
stable-drm-schedule-the-output_poll_work-with-1s-delay-if-we-have-delayed-event.patch
|
||||
stable-drm-fix-broken-vt-switch-with-video-1366x768-option.patch
|
||||
stable-drm-i915-ignore-bogus-plane-coordinates-on-skl-when-the-plane-is-not-visible.patch
|
||||
|
||||
###
|
||||
### Arch x86
|
||||
@@ -78,6 +85,9 @@ acpi-processor-M720SR-limit-to-C2.patch
|
||||
# backlight fixes
|
||||
ACPI-video-Add-a-quirk-to-force-acpi-video-backlight.patch
|
||||
|
||||
# drop obsolete warn
|
||||
acpi-do-not-warn-if-_BQC-does-not-exist.patch
|
||||
|
||||
###
|
||||
### Block
|
||||
###
|
||||
@@ -122,15 +132,10 @@ block-Make-CFQ-default-to-IOPS-mode-on-SSDs.patch
|
||||
|
||||
# Include new BFQ I/O scheduler
|
||||
# (See http://algo.ing.unimo.it/people/paolo/disk_sched)
|
||||
#
|
||||
# Release of BFQ I/O scheduler v8r4 (rediffed from git https://github.com/linusw/linux-bfq)
|
||||
linux-BFQ-v8r4.patch
|
||||
|
||||
# Let NVME drives enter in power state
|
||||
# (see https://github.com/damige/linux-nvme/tree/master/src)
|
||||
nvmepatch1-V4.patch
|
||||
nvmepatch2-V4.patch
|
||||
nvmepatch3-V4.patch
|
||||
block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.5.0.patch
|
||||
block-introduce-the-BFQ-v7r11-I-O-sched-for-4.5.0.patch
|
||||
block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch
|
||||
block-Turn-into-BFQ-v8r6-for-4.9.0.patch
|
||||
|
||||
###
|
||||
### Char
|
||||
@@ -139,13 +144,22 @@ nvmepatch3-V4.patch
|
||||
# hard locks Dell R720xd
|
||||
Revert-ipmi-Start-the-timer-and-thread-on-internal-m.patch
|
||||
|
||||
# tpm_crb fixes for SkyLake
|
||||
char-tpm-tpm_crb-implement-tpm-crb-idle-state.patch
|
||||
char-tmp-tpm_crb-fix-Intel-PTT-hw-bug-during-idle-state.patch
|
||||
char-tpm-tpm_crb-open-code-the-crb_init-into-acpi_add.patch
|
||||
char-tmp-tpm_crb-implement-runtime-pm-for-tpm_crb.patch
|
||||
|
||||
###
|
||||
### File-system
|
||||
###
|
||||
|
||||
# aufs from: http://aufs.sourceforge.net/ (mga#8314)
|
||||
fs-aufs-4.8.patch
|
||||
fs-aufs-4.8-modular.patch
|
||||
fs-aufs-4.9.patch
|
||||
fs-aufs-4.9-modular.patch
|
||||
|
||||
# needed for mdadm: imsm: enable bad block support for imsm metadata
|
||||
fs-seq_file-reset-iterator-to-first-record-for-zero-off.patch
|
||||
|
||||
###
|
||||
### FireWire
|
||||
@@ -180,6 +194,12 @@ gpu-drm-mach64-linux-3.14-buildfix.patch
|
||||
gpu-drm-mach64-3.17-buildfix.patch
|
||||
gpu-drm-mach64-3.18-buildfix.patch
|
||||
|
||||
# i915 skl/kbl speedup
|
||||
gpu-drm-i915-skl-drop-workarounds-for-A0-and-B0-revisions.patch
|
||||
gpu-drm-i915-skl-drop-workarounds-for-D0-revision.patch
|
||||
gpu-drm-i915-skl-drop-workarounds-for-E0-revision.patch
|
||||
gpu-drm-i915-Remove-WaDisableLSQCROPERFforOCL-KBL-workaround.patch
|
||||
|
||||
###
|
||||
### Hardware Monitoring
|
||||
###
|
||||
@@ -230,9 +250,14 @@ net-netfilter-IFWLOG-remove-unused-label.patch
|
||||
net-netfilter-psd.patch
|
||||
net-netfilter-psd-mdv.patch
|
||||
net-netfilter-psd-2.6.35-buildfix.patch
|
||||
net-netfilter-psd-fix-redefines.patch
|
||||
|
||||
# rtlwifi regression
|
||||
net-wireless-rtlwifi-Fix-regression-caused-by-commit-d86e64768859.patch
|
||||
# rtlwifi fixes
|
||||
net-wireless-rtlwifi-Use-dev_kfree_skb_irq-instead-of-kfree_skb.patch
|
||||
net-wireless-rtlwifi-Fix-kernel-oops-introduced-with-commit-e4965.patch
|
||||
|
||||
# fix speed regression
|
||||
net-wireless-brcmfmac-fix-incorrect-event-channel-deduction.patch
|
||||
|
||||
###
|
||||
### Platform drivers
|
||||
@@ -338,8 +363,6 @@ video-mageia-logo.patch
|
||||
|
||||
# add rtl8723bs support (mga#15874)
|
||||
3rd-rtl8723bs.patch
|
||||
3rd-rtl8723bs-4.7-buildfix.patch
|
||||
3rd-rtl8723bs-4.8-buildfix.patch
|
||||
|
||||
###
|
||||
### Security
|
||||
@@ -368,6 +391,11 @@ video-mageia-logo.patch
|
||||
# wipe powerpc refrence so we can nuke dangling symlinks (mga#17676)
|
||||
tools-testing-selftest-Makefile-remove-powerpc-reference.patch
|
||||
|
||||
# perf build fixes
|
||||
tools-build-Make-fixdep-parsing-wait-for-last-target.patch
|
||||
tools-perf-tools-Force-fixdep-compilation-at-the-start-of-.patch
|
||||
tools-perf-tools-Move-perf-build-related-variables-under-n.patch
|
||||
|
||||
###
|
||||
### UAPI
|
||||
###
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
--- linux/tools/testing/selftests/Makefile.orig
|
||||
+++ linux/tools/testing/selftests/Makefile
|
||||
@@ -15,7 +15,6 @@ TARGETS += memory-hotplug
|
||||
TARGETS += mount
|
||||
@@ -16,7 +16,6 @@ TARGETS += mount
|
||||
TARGETS += mqueue
|
||||
TARGETS += net
|
||||
TARGETS += nsfs
|
||||
-TARGETS += powerpc
|
||||
TARGETS += pstore
|
||||
TARGETS += ptrace
|
||||
|
||||
+44
-18
@@ -12,7 +12,7 @@
|
||||
<IsA>kernel</IsA>
|
||||
<Summary>The Linux kernel (the core of the Linux operating system) for Pisi Linux</Summary>
|
||||
<Description>kernel contains the Linux kernel, the core of any Linux operating system. The kernel handles the basic functions of the operating system: memory allocation, process allocation, device input and output, etc.</Description>
|
||||
<Archive sha1sum="a85e6ca968b10ec0eace2daaaa59fc8734d0db74" type="targz">https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.8.tar.gz</Archive>
|
||||
<Archive sha1sum="60a47e858fce153c5bedd7e293a1b45e8d2db054" type="targz">https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.gz</Archive>
|
||||
<AdditionalFiles>
|
||||
<AdditionalFile target="configs/kernel-i686-config">configs/kernel-i686-config</AdditionalFile>
|
||||
<AdditionalFile target="configs/kernel-x86_64-config">configs/kernel-x86_64-config</AdditionalFile>
|
||||
@@ -28,15 +28,16 @@
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!-- Linux patches -->
|
||||
<Patch level="1" compressionType="xz">patches/linux/patch-4.8.13.xz</Patch>
|
||||
<!-- Mageia Linux patches // compatible with http://svnweb.mageia.org/packages/cauldron/kernel/releases/4.8.9/1.mga6/PATCHES/patches/series-->
|
||||
<Patch level="1" compressionType="xz">patches/linux/patch-4.9.6.xz</Patch>
|
||||
<!-- Mageia Linux patches // compatible with http://svnweb.mageia.org/packages/cauldron/kernel/releases/4.9.6/1.mga6/PATCHES/patches/series-->
|
||||
<!--stable patches-->
|
||||
<!--CVE-2016-8405-->
|
||||
<Patch level="1">patches/mageia/stable-fbdev-color-map-copying-bounds-checking.patch</Patch>
|
||||
<Patch level="1">patches/mageia/stable-tile-ptrace-preserve-previous-registers-for-short-regset-write.patch</Patch>
|
||||
<Patch level="1">patches/mageia/stable-drm-schedule-the-output_poll_work-with-1s-delay-if-we-have-delayed-event.patch</Patch>
|
||||
<Patch level="1">patches/mageia/stable-drm-fix-broken-vt-switch-with-video-1366x768-option.patch</Patch>
|
||||
<Patch level="1">patches/mageia/stable-drm-i915-ignore-bogus-plane-coordinates-on-skl-when-the-plane-is-not-visible.patch</Patch>
|
||||
<!--other patches-->
|
||||
<Patch level="1">patches/mageia/Revert-ipmi-Start-the-timer-and-thread-on-internal-m.patch</Patch>
|
||||
<Patch level="1">patches/mageia/x86-pci-toshiba-equium-a60-assign-busses.patch</Patch>
|
||||
<Patch level="1">patches/mageia/x86-boot-video-80x25-if-break.patch</Patch>
|
||||
<Patch level="1">patches/mageia/x86-default_poweroff_up_machines.patch</Patch>
|
||||
<Patch level="1">patches/mageia/x86-increase-default-minimum-vmalloc-area-by-64MB-to-192MB.patch</Patch>
|
||||
<Patch level="1">patches/mageia/Revert-cpufreq-pcc-Enable-autoload-of-pcc-cpufreq-fo.patch</Patch>
|
||||
<Patch level="1">patches/mageia/Revert-x86-mm-mtrr-Remove-kernel-internal-MTRR-inter.patch</Patch>
|
||||
<Patch level="1">patches/mageia/base-cacheinfo-silence-DT-warnings.patch</Patch>
|
||||
@@ -45,6 +46,7 @@
|
||||
<Patch level="1">patches/mageia/acpi-CLEVO-M360S-disable_acpi_irq.patch</Patch>
|
||||
<Patch level="1">patches/mageia/acpi-processor-M720SR-limit-to-C2.patch</Patch>
|
||||
<Patch level="1">patches/mageia/ACPI-video-Add-a-quirk-to-force-acpi-video-backlight.patch</Patch>
|
||||
<Patch level="1">patches/mageia/acpi-do-not-warn-if-_BQC-does-not-exist.patch</Patch>
|
||||
<!--Patch level="1">patches/mageia/scsi-ppscsi-2.6.2.patch</Patch>
|
||||
<Patch level="1">patches/mageia/scsi-ppscsi_fixes.patch</Patch>
|
||||
<Patch level="1">patches/mageia/scsi-ppscsi-sg-helper-update.patch</Patch>
|
||||
@@ -58,12 +60,17 @@
|
||||
<Patch level="1">patches/mageia/block-floppy-disable-pnp-modalias.patch</Patch>
|
||||
<Patch level="1">patches/mageia/ata-prefer-ata-drivers-over-ide-drivers-when-both-are-built.patch</Patch>
|
||||
<Patch level="1">patches/mageia/block-Make-CFQ-default-to-IOPS-mode-on-SSDs.patch</Patch>
|
||||
<Patch level="1">patches/mageia/linux-BFQ-v8r4.patch</Patch>
|
||||
<Patch level="1">patches/mageia/nvmepatch1-V4.patch</Patch>
|
||||
<Patch level="1">patches/mageia/nvmepatch2-V4.patch</Patch>
|
||||
<Patch level="1">patches/mageia/nvmepatch3-V4.patch</Patch>
|
||||
<Patch level="1">patches/mageia/fs-aufs-4.8.patch</Patch>
|
||||
<Patch level="1">patches/mageia/fs-aufs-4.8-modular.patch</Patch>
|
||||
<!--Patch level="1">patches/mageia/block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.5.0.patch</Patch>
|
||||
<Patch level="1">patches/mageia/block-introduce-the-BFQ-v7r11-I-O-sched-for-4.5.0.patch</Patch>
|
||||
<Patch level="1">patches/mageia/block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch</Patch>
|
||||
<Patch level="1">patches/mageia/block-Turn-into-BFQ-v8r6-for-4.9.0.patch</Patch>--><!--2-->
|
||||
<Patch level="1">patches/mageia/char-tpm-tpm_crb-implement-tpm-crb-idle-state.patch</Patch>
|
||||
<Patch level="1">patches/mageia/char-tmp-tpm_crb-fix-Intel-PTT-hw-bug-during-idle-state.patch</Patch>
|
||||
<Patch level="1">patches/mageia/char-tpm-tpm_crb-open-code-the-crb_init-into-acpi_add.patch</Patch>
|
||||
<Patch level="1">patches/mageia/char-tmp-tpm_crb-implement-runtime-pm-for-tpm_crb.patch</Patch>
|
||||
<Patch level="1">patches/mageia/fs-aufs-4.9.patch</Patch>
|
||||
<Patch level="1">patches/mageia/fs-aufs-4.9-modular.patch</Patch>
|
||||
<Patch level="1">patches/mageia/fs-seq_file-reset-iterator-to-first-record-for-zero-off.patch</Patch>
|
||||
<Patch level="1">patches/mageia/firewire-ieee1394-module-aliases.patch</Patch>
|
||||
<Patch level="1">patches/mageia/char-agp-intel-new-Q57-id.patch</Patch>
|
||||
<!--remove external mach64 support for buildfix-->
|
||||
@@ -83,7 +90,11 @@
|
||||
<Patch level="1">patches/mageia/gpu-drm-mach64-restore-mach64_PCI_IDS.patch</Patch>
|
||||
<Patch level="1">patches/mageia/gpu-drm-mach64-linux-3.14-buildfix.patch</Patch>
|
||||
<Patch level="1">patches/mageia/gpu-drm-mach64-3.17-buildfix.patch</Patch>
|
||||
<Patch level="1">patches/mageia/gpu-drm-mach64-3.18-buildfix.patch</Patch--><!--1-->
|
||||
<Patch level="1">patches/mageia/gpu-drm-mach64-3.18-buildfix.patch</Patch--><!--1-->
|
||||
<Patch level="1">patches/mageia/gpu-drm-i915-skl-drop-workarounds-for-A0-and-B0-revisions.patch</Patch>
|
||||
<Patch level="1">patches/mageia/gpu-drm-i915-skl-drop-workarounds-for-D0-revision.patch</Patch>
|
||||
<Patch level="1">patches/mageia/gpu-drm-i915-skl-drop-workarounds-for-E0-revision.patch</Patch>
|
||||
<Patch level="1">patches/mageia/gpu-drm-i915-Remove-WaDisableLSQCROPERFforOCL-KBL-workaround.patch</Patch>
|
||||
<Patch level="1">patches/mageia/input-i8042-quirks-for-Fujitsu-Lifebook-A544-and-Lif.patch</Patch>
|
||||
<Patch level="1">patches/mageia/net-sis190-fix-list-usage.patch</Patch>
|
||||
<Patch level="1">patches/mageia/net-netfilter-IFWLOG.patch</Patch>
|
||||
@@ -96,7 +107,10 @@
|
||||
<Patch level="1">patches/mageia/net-netfilter-psd.patch</Patch>
|
||||
<Patch level="1">patches/mageia/net-netfilter-psd-mdv.patch</Patch>
|
||||
<Patch level="1">patches/mageia/net-netfilter-psd-2.6.35-buildfix.patch</Patch>
|
||||
<Patch level="1">patches/mageia/net-wireless-rtlwifi-Fix-regression-caused-by-commit-d86e64768859.patch</Patch>
|
||||
<Patch level="1">patches/mageia/net-netfilter-psd-fix-redefines.patch</Patch>
|
||||
<Patch level="1">patches/mageia/net-wireless-rtlwifi-Use-dev_kfree_skb_irq-instead-of-kfree_skb.patch</Patch>
|
||||
<Patch level="1">patches/mageia/net-wireless-rtlwifi-Fix-kernel-oops-introduced-with-commit-e4965.patch</Patch>
|
||||
<Patch level="1">patches/mageia/net-wireless-brcmfmac-fix-incorrect-event-channel-deduction.patch</Patch>
|
||||
<Patch level="1">patches/mageia/platform-x86-add-shuttle-wmi-driver.patch</Patch>
|
||||
<Patch level="1">patches/mageia/platform-x86-shuttle-wmi-drop-devinit-exit.patch</Patch>
|
||||
<Patch level="1">patches/mageia/platform-x86-shuttle-wmi-4.2-buildfix.patch</Patch>
|
||||
@@ -131,9 +145,10 @@
|
||||
<Patch level="1">patches/mageia/3rd-viahss-2.6.35-buildfix.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-viahss-3.0-buildfix.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-rtl8723bs.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-rtl8723bs-4.7-buildfix.patch</Patch>
|
||||
<Patch level="1">patches/mageia/3rd-rtl8723bs-4.8-buildfix.patch</Patch>
|
||||
<Patch level="1">patches/mageia/tools-testing-selftest-Makefile-remove-powerpc-reference.patch</Patch>
|
||||
<Patch level="1">patches/mageia/tools-build-Make-fixdep-parsing-wait-for-last-target.patch</Patch>
|
||||
<Patch level="1">patches/mageia/tools-perf-tools-Force-fixdep-compilation-at-the-start-of-.patch</Patch>
|
||||
<Patch level="1">patches/mageia/tools-perf-tools-Move-perf-build-related-variables-under-n.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
@@ -189,6 +204,17 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="9">
|
||||
<Date>2017-01-27</Date>
|
||||
<Version>4.9.6</Version>
|
||||
<Comment>Version Bump.</Comment>
|
||||
<Type package="kernel">security</Type>
|
||||
<Requires>
|
||||
<Action package="kernel">systemRestart</Action>
|
||||
</Requires>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="8">
|
||||
<Date>2016-12-10</Date>
|
||||
<Version>4.8.13</Version>
|
||||
|
||||
+11174
-10996
File diff suppressed because it is too large
Load Diff
@@ -1 +1 @@
|
||||
3fdf69a4da88ebe64b94f8f3d7f053efd5020e60
|
||||
ae415efc1d21b843ef6f5cd02493b4cc063938b3
|
||||
Binary file not shown.
@@ -1 +1 @@
|
||||
e643f96538f903259a0eb67dba5db7d07354a080
|
||||
4532ef03864e2f30a2801067564ee70af78d4497
|
||||
@@ -1,9 +1,10 @@
|
||||
diff -up bash-4.2-rc2/config.h.in.interpreter bash-4.2-rc2/config.h.in
|
||||
--- bash-4.2-rc2/config.h.in.interpreter 2011-02-09 07:59:21.000000000 +0100
|
||||
+++ bash-4.2-rc2/config.h.in 2011-02-09 07:59:21.000000000 +0100
|
||||
@@ -706,6 +706,9 @@
|
||||
/* Define if you have the pathconf function. */
|
||||
#undef HAVE_PATHCONF
|
||||
diff --git a/config.h.in b/config.h.in
|
||||
index a5ad9e7..62a6b32 100644
|
||||
--- a/config.h.in
|
||||
+++ b/config.h.in
|
||||
@@ -748,6 +748,9 @@
|
||||
/* Define if you have the pselect function. */
|
||||
#undef HAVE_PSELECT
|
||||
|
||||
+/* Define if you have the pread function. */
|
||||
+#undef HAVE_PREAD
|
||||
@@ -11,7 +12,7 @@ diff -up bash-4.2-rc2/config.h.in.interpreter bash-4.2-rc2/config.h.in
|
||||
/* Define if you have the putenv function. */
|
||||
#undef HAVE_PUTENV
|
||||
|
||||
@@ -898,6 +901,9 @@
|
||||
@@ -946,6 +949,9 @@
|
||||
/* Define if you have the <dlfcn.h> header file. */
|
||||
#undef HAVE_DLFCN_H
|
||||
|
||||
@@ -21,30 +22,32 @@ diff -up bash-4.2-rc2/config.h.in.interpreter bash-4.2-rc2/config.h.in
|
||||
/* Define if you have the <grp.h> header file. */
|
||||
#undef HAVE_GRP_H
|
||||
|
||||
diff -up bash-4.2-rc2/configure.in.interpreter bash-4.2-rc2/configure.in
|
||||
--- bash-4.2-rc2/configure.in.interpreter 2011-01-16 21:31:12.000000000 +0100
|
||||
+++ bash-4.2-rc2/configure.ac 2011-02-09 08:02:27.000000000 +0100
|
||||
@@ -659,7 +659,7 @@ BASH_HEADER_INTTYPES
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index ce4e9b6..eda95d6 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -700,7 +700,7 @@ BASH_HEADER_INTTYPES
|
||||
AC_CHECK_HEADERS(unistd.h stdlib.h stdarg.h varargs.h limits.h string.h \
|
||||
memory.h locale.h termcap.h termio.h termios.h dlfcn.h \
|
||||
stdbool.h stddef.h stdint.h netdb.h pwd.h grp.h strings.h \
|
||||
- regex.h syslog.h ulimit.h)
|
||||
+ regex.h syslog.h ulimit.h elf.h)
|
||||
AC_CHECK_HEADERS(sys/pte.h sys/stream.h sys/select.h sys/file.h \
|
||||
sys/resource.h sys/param.h sys/socket.h sys/stat.h \
|
||||
AC_CHECK_HEADERS(sys/pte.h sys/stream.h sys/select.h sys/file.h sys/ioctl.h \
|
||||
sys/param.h sys/socket.h sys/stat.h \
|
||||
sys/time.h sys/times.h sys/types.h sys/wait.h)
|
||||
@@ -723,7 +723,7 @@ dnl checks for system calls
|
||||
@@ -771,7 +771,7 @@ dnl checks for system calls
|
||||
AC_CHECK_FUNCS(dup2 eaccess fcntl getdtablesize getgroups gethostname \
|
||||
getpagesize getpeername getrlimit getrusage gettimeofday \
|
||||
kill killpg lstat readlink sbrk select setdtablesize \
|
||||
kill killpg lstat pselect readlink sbrk select setdtablesize \
|
||||
- setitimer tcgetpgrp uname ulimit waitpid)
|
||||
+ setitimer tcgetpgrp uname ulimit waitpid pread)
|
||||
AC_REPLACE_FUNCS(rename)
|
||||
|
||||
dnl checks for c library functions
|
||||
diff -up bash-4.2-rc2/execute_cmd.c.interpreter bash-4.2-rc2/execute_cmd.c
|
||||
--- bash-4.2-rc2/execute_cmd.c.interpreter 2011-01-20 04:24:47.000000000 +0100
|
||||
+++ bash-4.2-rc2/execute_cmd.c 2011-02-09 07:59:21.000000000 +0100
|
||||
diff --git a/execute_cmd.c b/execute_cmd.c
|
||||
index 2a3df6d..b5cd405 100644
|
||||
--- a/execute_cmd.c
|
||||
+++ b/execute_cmd.c
|
||||
@@ -41,6 +41,10 @@
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
@@ -56,31 +59,30 @@ diff -up bash-4.2-rc2/execute_cmd.c.interpreter bash-4.2-rc2/execute_cmd.c
|
||||
#include "posixtime.h"
|
||||
|
||||
#if defined (HAVE_SYS_RESOURCE_H) && !defined (RLIMTYPE)
|
||||
@@ -4975,14 +4979,22 @@ shell_execve (command, args, env)
|
||||
@@ -5486,6 +5490,14 @@ shell_execve (command, args, env)
|
||||
{
|
||||
/* The file has the execute bits set, but the kernel refuses to
|
||||
run it for some reason. See why. */
|
||||
+#if defined (HAVE_HASH_BANG_EXEC) || defined (HAVE_ELF_H)
|
||||
+ int fd = open (command, O_RDONLY);
|
||||
+ int fd = open (command, O_RDONLY);
|
||||
+
|
||||
+ if (fd >= 0)
|
||||
+ sample_len = read (fd, sample, sizeof (sample));
|
||||
+ else
|
||||
+ sample_len = -1;
|
||||
+ if (fd >= 0)
|
||||
+ sample_len = read (fd, sample, sizeof (sample));
|
||||
+ else
|
||||
+ sample_len = -1;
|
||||
+#endif
|
||||
#if defined (HAVE_HASH_BANG_EXEC)
|
||||
- READ_SAMPLE_BUF (command, sample, sample_len);
|
||||
sample[sample_len - 1] = '\0';
|
||||
if (sample_len > 2 && sample[0] == '#' && sample[1] == '!')
|
||||
{
|
||||
READ_SAMPLE_BUF (command, sample, sample_len);
|
||||
if (sample_len > 0)
|
||||
@@ -5495,6 +5507,7 @@ shell_execve (command, args, env)
|
||||
char *interp;
|
||||
int ilen;
|
||||
|
||||
+ close (fd);
|
||||
+ close (fd);
|
||||
interp = getinterp (sample, sample_len, (int *)NULL);
|
||||
ilen = strlen (interp);
|
||||
errno = i;
|
||||
@@ -4997,6 +5009,136 @@ shell_execve (command, args, env)
|
||||
@@ -5510,6 +5523,136 @@ shell_execve (command, args, env)
|
||||
return (EX_NOEXEC);
|
||||
}
|
||||
#endif
|
||||
@@ -217,3 +219,6 @@ diff -up bash-4.2-rc2/execute_cmd.c.interpreter bash-4.2-rc2/execute_cmd.c
|
||||
errno = i;
|
||||
file_error (command);
|
||||
}
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
diff -up bash-3.2/config-top.h.logout bash-3.2/config-top.h
|
||||
--- bash-3.2/config-top.h.logout 2011-04-14 08:55:55.000000000 +0200
|
||||
+++ bash-3.2/config-top.h 2011-04-14 08:55:55.000000000 +0200
|
||||
@@ -78,7 +78,7 @@
|
||||
diff --git a/config-top.h b/config-top.h
|
||||
index 026d4a4..cb0e002 100644
|
||||
--- a/config-top.h
|
||||
+++ b/config-top.h
|
||||
@@ -92,7 +92,7 @@
|
||||
/* #define SYS_BASHRC "/etc/bash.bashrc" */
|
||||
|
||||
/* System-wide .bash_logout for login shells. */
|
||||
@@ -10,12 +11,13 @@ diff -up bash-3.2/config-top.h.logout bash-3.2/config-top.h
|
||||
|
||||
/* Define this to make non-interactive shells begun with argv[0][0] == '-'
|
||||
run the startup files when not in posix mode. */
|
||||
diff -up bash-3.2/doc/bash.1.logout bash-3.2/doc/bash.1
|
||||
--- bash-3.2/doc/bash.1.logout 2011-04-14 09:16:32.000000000 +0200
|
||||
+++ bash-3.2/doc/bash.1 2011-04-14 11:59:33.000000000 +0200
|
||||
@@ -326,8 +326,8 @@ option may be used when the shell is sta
|
||||
.PP
|
||||
When a login shell exits,
|
||||
diff --git a/doc/bash.1 b/doc/bash.1
|
||||
index 04ce845..bfde55e 100644
|
||||
--- a/doc/bash.1
|
||||
+++ b/doc/bash.1
|
||||
@@ -335,8 +335,8 @@ option may be used when the shell is started to inhibit this behavior.
|
||||
When an interactive login shell exits,
|
||||
or a non-interactive login shell executes the \fBexit\fP builtin command,
|
||||
.B bash
|
||||
-reads and executes commands from the file \fI~/.bash_logout\fP, if it
|
||||
-exists.
|
||||
@@ -24,7 +26,7 @@ diff -up bash-3.2/doc/bash.1.logout bash-3.2/doc/bash.1
|
||||
.PP
|
||||
When an interactive shell that is not a login shell is started,
|
||||
.B bash
|
||||
@@ -8814,6 +8814,9 @@ The \fBbash\fP executable
|
||||
@@ -10558,6 +10558,9 @@ The \fBbash\fP executable
|
||||
.FN /etc/profile
|
||||
The systemwide initialization file, executed for login shells
|
||||
.TP
|
||||
@@ -34,3 +36,6 @@ diff -up bash-3.2/doc/bash.1.logout bash-3.2/doc/bash.1
|
||||
.FN ~/.bash_profile
|
||||
The personal initialization file, executed for login shells
|
||||
.TP
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
||||
+35
-33
@@ -12,30 +12,23 @@
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>The standard GNU Bourne again shell</Summary>
|
||||
<Description>Bash is the GNU Project's Bourne Again SHell, a complete implementation of the IEEE POSIX and Open Group shell specification with interactive command line editing, csh-like features such as history substitution.</Description>
|
||||
<Archive sha1sum="33b1bcc5dca1b72f28b2baeca6efa0d422097964" type="targz">mirrors://gnu/bash/bash-4.3.30.tar.gz</Archive>
|
||||
<Archive sha1sum="8de012df1e4f3e91f571c3eb8ec45b43d7c747eb" type="targz">mirrors://gnu/bash/bash-4.4.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>ncurses-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!-- Official Patches ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/ -->
|
||||
<Patch level="0" compressionType="gzip">official/bash43-031.tar.gz</Patch>
|
||||
<Patch level="0" compressionType="gzip">official/bash43-032.tar.gz</Patch>
|
||||
<Patch level="0" compressionType="gzip">official/bash43-033.tar.gz</Patch>
|
||||
<Patch level="0" compressionType="gzip">official/bash43-034.tar.gz</Patch>
|
||||
<Patch level="0" compressionType="gzip">official/bash43-035.tar.gz</Patch>
|
||||
<Patch level="0" compressionType="gzip">official/bash43-036.tar.gz</Patch>
|
||||
<Patch level="0" compressionType="gzip">official/bash43-037.tar.gz</Patch>
|
||||
<Patch level="0" compressionType="gzip">official/bash43-038.tar.gz</Patch>
|
||||
<Patch level="0" compressionType="gzip">official/bash43-039.tar.gz</Patch>
|
||||
<Patch level="0" compressionType="gzip">official/bash43-040.tar.gz</Patch>
|
||||
<Patch level="0" compressionType="gzip">official/bash43-041.tar.gz</Patch>
|
||||
<Patch level="0" compressionType="gzip">official/bash43-042.tar.gz</Patch>
|
||||
<Patch level="0" compressionType="gzip">official/bash43-043.tar.gz</Patch>
|
||||
<Patch level="0" compressionType="gzip">official/bash43-044.tar.gz</Patch>
|
||||
<Patch level="0" compressionType="gzip">official/bash43-045.tar.gz</Patch>
|
||||
<Patch level="0" compressionType="gzip">official/bash43-046.tar.gz</Patch>
|
||||
<Patch level="0" compressionType="gzip">official/bash43-047.tar.gz</Patch>
|
||||
<Patch level="0" compressionType="gzip">official/bash43-048.tar.gz</Patch>
|
||||
<!-- Official Patches -->
|
||||
<Patch level="1">official/bash-4.4-patch-1.patch</Patch>
|
||||
<Patch level="1">official/bash-4.4-patch-2.patch</Patch>
|
||||
<Patch level="1">official/bash-4.4-patch-3.patch</Patch>
|
||||
<Patch level="1">official/bash-4.4-patch-4.patch</Patch>
|
||||
<Patch level="1">official/bash-4.4-patch-5.patch</Patch>
|
||||
<Patch level="1">official/bash-4.4-patch-6.patch</Patch>
|
||||
<Patch level="1">official/bash-4.4-patch-7.patch</Patch>
|
||||
<Patch level="1">official/bash-4.4-patch-8.patch</Patch>
|
||||
<Patch level="1">official/bash-4.4-patch-9.patch</Patch>
|
||||
<Patch level="1">official/bash-4.4-patch-10.patch</Patch>
|
||||
<Patch level="1">official/bash-4.4-patch-11.patch</Patch>
|
||||
|
||||
<!-- Fedora patches -->
|
||||
<Patch level="1">fedora/bash-2.02-security.patch</Patch>
|
||||
@@ -45,24 +38,26 @@
|
||||
<Patch level="1">fedora/bash-2.05b-debuginfo.patch</Patch>
|
||||
<Patch level="1">fedora/bash-2.05b-manso.patch</Patch>
|
||||
<Patch level="1">fedora/bash-2.05b-pgrp_sync.patch</Patch>
|
||||
<Patch level="1">fedora/bash-2.05b-readline-oom.patch</Patch>
|
||||
<Patch level="1">fedora/bash-2.05b-xcc.patch</Patch>
|
||||
<Patch level="1">fedora/bash-3.2-audit.patch</Patch>
|
||||
<Patch level="1">fedora/bash-3.2-ssh_source_bash.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.0-nobits.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.1-broken_pipe.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.1-defer-sigchld-trap.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.1-examples.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.2-coverity.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.2-manpage_trap.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.2-rc2-logout.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.2-size_type.patch</Patch>
|
||||
<Patch level="1">fedora/bash-bashbug.patch</Patch>
|
||||
<!--Patch level="1">fedora/bash-bashbug.patch</Patch>
|
||||
<Patch level="1">fedora/bash-infotags.patch</Patch>
|
||||
<Patch level="1">fedora/bash-requires.patch</Patch>
|
||||
<Patch level="1">fedora/bash-requires.patch</Patch-->
|
||||
<Patch level="1">fedora/bash-setlocale.patch</Patch>
|
||||
<Patch level="1">fedora/bash-tty-tests.patch</Patch>
|
||||
<!-- <Patch level="1">fedora/bash-4.2-trap.patch</Patch> -->
|
||||
<Patch level="1">fedora/bash-tty-tests.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.0-nobits.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.1-examples.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.1-broken_pipe.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.2-rc2-logout.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.2-coverity.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.1-defer-sigchld-trap.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.2-manpage_trap.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.2-size_type.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.3-man-ulimit.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.3-noecho.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.3-memleak-lc_all.patch</Patch>
|
||||
<Patch level="1">fedora/bash-4.4-no-loadable-builtins.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
@@ -87,6 +82,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="5">
|
||||
<Date>2017-01-29</Date>
|
||||
<Version>4.4.11</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2017-01-06</Date>
|
||||
<Version>4.3_p48</Version>
|
||||
|
||||
@@ -22,6 +22,8 @@
|
||||
<Patch level="1">fedora/bc-1.06.95-memleak.patch</Patch>
|
||||
<Patch level="1">fedora/bc-1.06-dc_ibase.patch</Patch>
|
||||
<Patch level="1">fedora/bc-1.06.95-matlib.patch</Patch>
|
||||
<Patch level="1">fedora/bc-1.06.95-sigintmasking.patch</Patch>
|
||||
<Patch level="1">fedora/bc-1.06.95-doc.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
@@ -39,6 +41,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-27</Date>
|
||||
<Version>1.06.95</Version>
|
||||
<Comment>Release Bump</Comment>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>1.06.95</Version>
|
||||
|
||||
@@ -13,9 +13,9 @@
|
||||
<IsA>app:gui</IsA>
|
||||
<Summary>Biosdevname is a udev helper utility developed</Summary>
|
||||
<Description>Biosdevname is a udev helper utility developed by Dell and released under the GNU General Public License (GPL). It provides a consistent naming mechanism for network devices based on their physical location as suggested by the system BIOS.</Description>
|
||||
<Archive sha1sum="972dc94c81cdbe12216fcf379453587ae505054f" type="targz">http://linux.dell.com/biosdevname/biosdevname-0.7.1/biosdevname-0.7.1.tar.gz</Archive>
|
||||
<Archive sha1sum="5d3b758317b79f28003ca8ffb8a4614ca6b4fe2a" type="targz">http://linux.dell.com/biosdevname/biosdevname-0.7.2/biosdevname-0.7.2.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>pciutils-devel</Dependency>
|
||||
<Dependency versionFrom="3.5.2">pciutils-devel</Dependency>
|
||||
<Dependency>glibc-devel</Dependency>
|
||||
<Dependency>zlib-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
@@ -36,6 +36,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-29</Date>
|
||||
<Version>0.7.2</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>0.7.1</Version>
|
||||
|
||||
+619
-587
File diff suppressed because it is too large
Load Diff
@@ -12,14 +12,14 @@
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>Statically linked binary providing simplified versions of system commands</Summary>
|
||||
<Description>busybox is a single binary which includes versions of a large number of system commands, including a shell.</Description>
|
||||
<Archive sha1sum="157d14d24748b4505b1a418535688706a2b81680" type="tarbz2">http://busybox.net/downloads/busybox-1.24.1.tar.bz2</Archive>
|
||||
<Archive sha1sum="8b227b3efdb4c4aa94750f80cc63429aec6daa0b" type="tarbz2">https://busybox.net/downloads/busybox-1.25.1.tar.bz2</Archive>
|
||||
<AdditionalFiles>
|
||||
<AdditionalFile target=".config">config</AdditionalFile>
|
||||
</AdditionalFiles>
|
||||
<Patches>
|
||||
<!-- This patch is essential for udhcp to request root-path from dhcpd and required by ptsp -->
|
||||
<!--Patch level="1">udhcp-rootpath-rq.patch</Patch>
|
||||
<Patch level="1">suppress-job-control-warning.patch</Patch>
|
||||
<!--Patch level="1">busybox-1.25.1-setfiles.patch</Patch>-->
|
||||
<!--Patch level="1">suppress-job-control-warning.patch</Patch>
|
||||
<Patch level="1">fix-include.patch</Patch-->
|
||||
<!--Patch>ifplugd.patch</Patch-->
|
||||
</Patches>
|
||||
@@ -33,6 +33,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-28</Date>
|
||||
<Version>1.25.1</Version>
|
||||
<Comment>Release Bump.</Comment>
|
||||
<Name>Stefan Gronewold(groni)</Name>
|
||||
<Email>groni@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>1.24.1</Version>
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
<IsA>app:cli</IsA>
|
||||
<Summary>Userspace setup tool for transparent encryption of block devices using dm-crypt</Summary>
|
||||
<Description>Userspace setup tool for transparent encryption of block devices using dm-crypt</Description>
|
||||
<Archive sha1sum="0299b944441bc6665bce5f1dce6b9d6daf529bec" type="tarxz">https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.1.tar.xz</Archive>
|
||||
<Archive sha1sum="eaf688f2ae74c562bc341573b8c0dca63727e9c8" type="tarxz">https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.3.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency versionFrom="2.02.118">device-mapper-devel</Dependency>
|
||||
<Dependency>libgpg-error-devel</Dependency>
|
||||
@@ -82,6 +82,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-29</Date>
|
||||
<Version>1.7.3</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>1.7.1</Version>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>A dhcp client only</Summary>
|
||||
<Description>An RFC2131 and RFC1541 compliant DHCP client daemon. dhcpcd gets an IP address and other information from a corresponding DHCP server, configures the network interface automatically, and tries to renew the lease time according to RFC2131 or RFC1541 depending on the command line option.</Description>
|
||||
<Archive sha1sum="bb37e0211858df8a919c494e14a6bbfb67b1f72c" type="tarxz">http://ftp.osuosl.org/pub/blfs/conglomeration/dhcpcd/dhcpcd-6.10.1.tar.xz</Archive>
|
||||
<Archive sha1sum="aa0a97682cb7dad3ea0acfe623a67da42614a2d8" type="tarxz">http://ftp.osuosl.org/pub/blfs/conglomeration/dhcpcd/dhcpcd-6.11.5.tar.xz</Archive>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
@@ -30,6 +30,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-29</Date>
|
||||
<Version>6.11.5</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>6.10.1</Version>
|
||||
|
||||
@@ -38,4 +38,4 @@ def install():
|
||||
# Unneeded stuff
|
||||
pisitools.remove("/usr/lib/*.a")
|
||||
|
||||
pisitools.dodoc("COPYING", "README", "RELEASE-NOTES")
|
||||
pisitools.dodoc("README", "RELEASE-NOTES")
|
||||
|
||||
@@ -12,12 +12,12 @@
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>Standard ext2/3/4 filesystem utilities</Summary>
|
||||
<Description>e2fsprogs provides the filesystem utilities for use with the ext2 filesystem. It also supports the ext3/4 filesystem with journaling support.</Description>
|
||||
<Archive sha1sum="77d1412472ac5a67f8954166ec16c37616074c37" type="targz">mirrors://sourceforge/e2fsprogs/e2fsprogs-1.42.13.tar.gz</Archive>
|
||||
<Archive sha1sum="927cb79c6399c559a83b4fa528ec8912a82d122f" type="targz">mirrors://sourceforge/e2fsprogs/e2fsprogs-1.43.3.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>libutil-linux-devel</Dependency>
|
||||
<!-- The first release shipped within util-linux -->
|
||||
<!-- <Dependency>libutil-linux</Dependency> -->
|
||||
<Dependency>gettext-devel</Dependency>
|
||||
<Dependency>gettext</Dependency>
|
||||
<!-- <Dependency>util-linux</Dependency> -->
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
@@ -66,6 +66,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-29</Date>
|
||||
<Version>1.43.3</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>1.42.13</Version>
|
||||
|
||||
@@ -6,13 +6,15 @@
|
||||
from pisi.actionsapi import get
|
||||
from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import shelltools
|
||||
|
||||
def setup():
|
||||
autotools.autoreconf("-vif")
|
||||
|
||||
shelltools.system("sh makeconf.sh")
|
||||
|
||||
# Disable device node creation during build/install
|
||||
pisitools.dosed("util/Makefile.in", "mknod", "echo Disabled: mknod ")
|
||||
|
||||
|
||||
autotools.configure("--disable-static \
|
||||
--disable-rpath \
|
||||
--enable-lib \
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>An interface for filesystems implemented in userspace</Summary>
|
||||
<Description>fuse is a backend allowing regular users to (un)mount filesystems for their own use.</Description>
|
||||
<Archive sha1sum="bf71181cdc25f65e5757a8a14d352296722de2e3" type="targz">https://github.com/libfuse/libfuse/releases/download/fuse_2_9_5/fuse-2.9.5.tar.gz</Archive>
|
||||
<Archive sha1sum="fcb3641d5297938f4e183296eccaf0ccc1a0f892" type="targz">https://github.com/libfuse/libfuse/archive/fuse-2.9.7.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>gettext-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
@@ -50,6 +50,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-29</Date>
|
||||
<Version>2.9.7</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>2.9.5</Version>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>A perfect hash function generator</Summary>
|
||||
<Description>gperf is a perfect hash function generator. For a given list of strings, it produces a hash function and hash table, in form of C or C++ code, for looking up a value depending on the input string. The hash function is perfect, which means that the hash table has no collisions, and the hash table lookup needs a single string comparison only.</Description>
|
||||
<Archive sha1sum="e32d4aff8f0c730c9a56554377b2c6d82d0951b8" type="targz">mirrors://gnu/gperf/gperf-3.0.4.tar.gz</Archive>
|
||||
<Archive sha1sum="e3c0618c2d2e5586eda9498c867d5e4858a3b0e2" type="targz">mirrors://gnu/gperf/gperf-3.1.tar.gz</Archive>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
@@ -29,6 +29,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-29</Date>
|
||||
<Version>3.1</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>3.0.4</Version>
|
||||
|
||||
@@ -37,6 +37,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-28</Date>
|
||||
<Version>1.47.3</Version>
|
||||
<Comment>Release Bump</Comment>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>1.47.3</Version>
|
||||
@@ -52,4 +59,4 @@
|
||||
<Email>alihan@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
</PISI>
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>A JSON implementation in C</Summary>
|
||||
<Description>json-c implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects.</Description>
|
||||
<Archive sha1sum="b33872f8b2837c7909e9bd8734855669c57a67ce" type="targz">https://github.com/json-c/json-c/archive/json-c-0.12-20140410.tar.gz</Archive>
|
||||
<Archive sha1sum="e7fcdbe41f1f3307c036f4e9e04b715de533896e" type="targz">https://s3.amazonaws.com/json-c_releases/releases/json-c-0.12.1.tar.gz</Archive>
|
||||
<Patches>
|
||||
<Patch>wno-werror.patch</Patch>
|
||||
</Patches>
|
||||
@@ -55,6 +55,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-29</Date>
|
||||
<Version>0.12.1</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>0.12</Version>
|
||||
|
||||
@@ -12,10 +12,10 @@
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>Keyboard and console utilities</Summary>
|
||||
<Description>The kbd package contains keytable files and keyboard utilities compatible with kernel version 1.1.54 and later.</Description>
|
||||
<Archive sha1sum="0a58dc928386f0f9c981fbefd24f05fc0b8226d7" type="tarxz">https://www.kernel.org/pub/linux/utils/kbd/kbd-2.0.3.tar.xz</Archive>
|
||||
<Archive sha1sum="17625849ecf4dedf755aefa06d78406b92c31743" type="tarbz2" target="kbd-2.0.3">http://source.pisilinux.org/1.0/kbd-latarcyrheb-16-fixed.tar.bz2</Archive>
|
||||
<Archive sha1sum="a5f6d9dff7a8a484cd5014ec7ffdf1eaed27084a" type="tarbz2" target="kbd-2.0.3">http://source.pisilinux.org/1.0/kbd-latsun-fonts.tar.bz2</Archive>
|
||||
<Archive sha1sum="d52f95fdc761cead041d23992f8802be5ac4bc12" type="tarbz2" target="kbd-2.0.3">http://source.pisilinux.org/1.0/ro_maps.tar.bz2</Archive>
|
||||
<Archive sha1sum="9aeac5556b827a9f13ccdb25257a1ac4b0243387" type="tarxz">https://www.kernel.org/pub/linux/utils/kbd/kbd-2.0.4.tar.xz</Archive>
|
||||
<Archive sha1sum="17625849ecf4dedf755aefa06d78406b92c31743" type="tarbz2" target="kbd-2.0.4">http://source.pisilinux.org/1.0/kbd-latarcyrheb-16-fixed.tar.bz2</Archive>
|
||||
<Archive sha1sum="a5f6d9dff7a8a484cd5014ec7ffdf1eaed27084a" type="tarbz2" target="kbd-2.0.4">http://source.pisilinux.org/1.0/kbd-latsun-fonts.tar.bz2</Archive>
|
||||
<Archive sha1sum="d52f95fdc761cead041d23992f8802be5ac4bc12" type="tarbz2" target="kbd-2.0.4">http://source.pisilinux.org/1.0/ro_maps.tar.bz2</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>gettext</Dependency>
|
||||
<Dependency>gzip</Dependency>
|
||||
@@ -72,6 +72,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-29</Date>
|
||||
<Version>2.0.4</Version>
|
||||
<Comment>Release Bump</Comment>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>2.0.3</Version>
|
||||
|
||||
@@ -12,13 +12,17 @@
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>Various utilities dealing with the PCI bus</Summary>
|
||||
<Description>The PCI Utilities are a collection of programs for inspecting and manipulating configuration of PCI devices.</Description>
|
||||
<Archive sha1sum="c4582e05ef7113ae9fc9b0502e7b2f4285b1a1b2" type="tarxz">ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-3.4.1.tar.xz</Archive>
|
||||
<Archive sha1sum="29d9a75ce2a2d92721b6e92c7c89236b4c91041f" type="tarxz">ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-3.5.2.tar.xz</Archive>
|
||||
<AdditionalFiles>
|
||||
<!-- 20100714
|
||||
from: http://pciids.sourceforge.net/v2.2/pci.ids
|
||||
-->
|
||||
<AdditionalFile target="pci.ids">pci.ids</AdditionalFile>
|
||||
</AdditionalFiles>
|
||||
<BuildDependencies>
|
||||
<Dependency>eudev-devel</Dependency>
|
||||
<Dependency>libkmod-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!-- Disable gz support of pciids file -->
|
||||
<Patch level="1">pciutils-nogz.patch</Patch>
|
||||
@@ -58,6 +62,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-29</Date>
|
||||
<Version>3.5.2</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>3.4.1</Version>
|
||||
|
||||
@@ -83,6 +83,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-29</Date>
|
||||
<Version>0.113</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>0.113</Version>
|
||||
|
||||
@@ -54,6 +54,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-29</Date>
|
||||
<Version>17.0.0</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>17.0.0</Version>
|
||||
|
||||
@@ -65,6 +65,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-28</Date>
|
||||
<Version>7.6</Version>
|
||||
<Comment>Release Bump</Comment>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>7.6</Version>
|
||||
@@ -80,4 +87,4 @@
|
||||
<Email>alihan@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
</PISI>
|
||||
@@ -48,6 +48,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-29</Date>
|
||||
<Version>0.10.0</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>0.10.0</Version>
|
||||
|
||||
@@ -34,6 +34,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-29</Date>
|
||||
<Version>0.33.20120825</Version>
|
||||
<Comment>Release Bump</Comment>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>0.33.20120825</Version>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>Integer Set Library</Summary>
|
||||
<Description>isl is a library for manipulating sets and relations of integer points bounded by linear constraints.</Description>
|
||||
<Archive sha1sum="c5a2b201bf05229647e73203c0bf2d9679d4d21f" type="tarbz2">http://isl.gforge.inria.fr/isl-0.16.1.tar.bz2</Archive>
|
||||
<Archive sha1sum="bbffc5a2b05e4f0c97e882f96c448504491dc4ed" type="tarbz2">http://isl.gforge.inria.fr/isl-0.18.tar.bz2</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>gmp-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
@@ -42,6 +42,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-27</Date>
|
||||
<Version>0.18</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>0.16.1</Version>
|
||||
|
||||
@@ -12,10 +12,10 @@
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>GNU macro processor</Summary>
|
||||
<Description>The m4 utility is a macro processor that shall read one or more text files, process them according to their included macro statements, and write the results to standard output</Description>
|
||||
<Archive sha1sum="4f80aed6d8ae3dacf97a0cb6e989845269e342f0" type="targz">mirrors://gnu/m4/m4-1.4.17.tar.gz</Archive>
|
||||
<Archive sha1sum="228604686ca23f42e48b98930babeb5d217f1899" type="tarxz">mirrors://gnu/m4/m4-1.4.18.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>gettext-devel</Dependency>
|
||||
<Dependency>libsigsegv</Dependency>
|
||||
<Dependency>gettext</Dependency>
|
||||
<Dependency>libsigsegv-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
</Source>
|
||||
|
||||
@@ -33,6 +33,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-27</Date>
|
||||
<Version>1.4.18</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>1.4.17</Version>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>data</IsA>
|
||||
<Summary>XCB protocol descriptions</Summary>
|
||||
<Description>XCB is a project to enable efficient language bindings to the X11 protocol. This package contains the protocol descriptions themselves. Language bindings use these protocol descriptions to generate code for marshalling the protocol.</Description>
|
||||
<Archive sha1sum="608bd60663e223464d38acec0183ddb827776401" type="tarbz2">http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.bz2</Archive>
|
||||
<Archive sha1sum="e93da374ecef9359370edc0160bcb8b2a2f7d9f6" type="tarbz2">https://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>libxml2</Dependency>
|
||||
</BuildDependencies>
|
||||
@@ -29,6 +29,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-01-27</Date>
|
||||
<Version>1.12</Version>
|
||||
<Comment>Version Bump</Comment>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>1.11</Version>
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
<Archive sha1sum="23e861f40ba0f0cbbfd7db7ba2ef623762ffca17" type="tarbz2">mirrors://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2</Archive>
|
||||
<Archive sha1sum="11d54c3210887631ea71e8f8030a77692e964fc4" type="tarbz2">mirrors://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2</Archive>
|
||||
<Archive sha1sum="818bffc16139d6e3de4344c83f00c495d3536753" type="tarbz2">mirrors://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2</Archive>
|
||||
<Archive sha1sum="886ad6f989f3314a083af91d6d4e91f63563c489" type="targz">mirrors://xorg/individual/proto/xproto-7.0.28.tar.gz</Archive><!--3-->
|
||||
<Archive sha1sum="f496ce16048c0b6b854fd6aefd6efb183eb61822" type="targz">mirrors://xorg/individual/proto/xproto-7.0.31.tar.gz</Archive><!--3-->
|
||||
<Archive sha1sum="4abb036371670ecc25d32e48b3277fe203ae5203" type="tarbz2">mirrors://xorg/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2</Archive>
|
||||
<Archive sha1sum="90f8600fb06c0c347551ad7096ef50492d86ba45" type="tarbz2">https://github.com/bbidulock/vncproto/releases/download/vncproto-1.1/vncproto-1.1.tar.bz2</Archive>
|
||||
<BuildDependencies>
|
||||
@@ -65,6 +65,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="4">
|
||||
<Date>2017-01-27</Date>
|
||||
<Version>7.6</Version>
|
||||
<Comment>xproto updates</Comment>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="3">
|
||||
<Date>2016-04-27</Date>
|
||||
<Version>7.6</Version>
|
||||
|
||||
Reference in New Issue
Block a user