Johnny Hughes
2019-02-01 2ead969a54545c3651f205f8cef052be7078df3c
Manual CentOS Debranding
3 files modified
212 ■■■■ changed files
SOURCES/kernel-alt-4.14.0-aarch64.config 49 ●●●● patch | view | raw | blame | history
SOURCES/x509.genkey 6 ●●●● patch | view | raw | blame | history
SPECS/kernel-alt.spec 157 ●●●●● patch | view | raw | blame | history
SOURCES/kernel-alt-4.14.0-aarch64.config
@@ -418,8 +418,6 @@
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
CONFIG_LOCK_SPIN_ON_OWNER=y
CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
CONFIG_QUEUED_SPINLOCKS=y
CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
CONFIG_QUEUED_RWLOCKS=y
CONFIG_FREEZER=y
@@ -440,7 +438,7 @@
CONFIG_ARCH_HISI=y
# CONFIG_ARCH_MEDIATEK is not set
# CONFIG_ARCH_MESON is not set
# CONFIG_ARCH_MVEBU is not set
CONFIG_ARCH_MVEBU=y
CONFIG_ARCH_QCOM=y
# CONFIG_ARCH_REALTEK is not set
# CONFIG_ARCH_ROCKCHIP is not set
@@ -505,11 +503,13 @@
# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCI_HISI=y
# CONFIG_PCIE_QCOM is not set
CONFIG_PCIE_ARMADA_8K=y
# CONFIG_PCIE_KIRIN is not set
#
# PCI host controller drivers
#
CONFIG_PCI_AARDVARK=y
CONFIG_PCI_HOST_COMMON=y
CONFIG_PCI_HOST_GENERIC=y
CONFIG_PCI_XGENE=y
@@ -731,10 +731,10 @@
CONFIG_CPU_FREQ_GOV_ATTR_SET=y
CONFIG_CPU_FREQ_GOV_COMMON=y
CONFIG_CPU_FREQ_STAT=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
@@ -1628,7 +1628,7 @@
# CONFIG_TI_DAC7512 is not set
# CONFIG_USB_SWITCH_FSA9480 is not set
# CONFIG_LATTICE_ECP3_CONFIG is not set
# CONFIG_SRAM is not set
CONFIG_SRAM=y
CONFIG_VEXPRESS_SYSCFG=y
# CONFIG_PCI_ENDPOINT_TEST is not set
# CONFIG_C2PORT is not set
@@ -1827,6 +1827,7 @@
CONFIG_SATA_AHCI=y
CONFIG_SATA_AHCI_PLATFORM=m
# CONFIG_AHCI_CEVA is not set
CONFIG_AHCI_MVEBU=y
CONFIG_AHCI_XGENE=m
# CONFIG_AHCI_QORIQ is not set
CONFIG_SATA_AHCI_SEATTLE=m
@@ -2110,6 +2111,8 @@
# CONFIG_JME is not set
CONFIG_NET_VENDOR_MARVELL=y
CONFIG_MVMDIO=m
CONFIG_MVNETA=m
CONFIG_MVPP2=m
CONFIG_SKGE=m
# CONFIG_SKGE_DEBUG is not set
CONFIG_SKGE_GENESIS=y
@@ -2239,7 +2242,7 @@
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LXT_PHY=m
CONFIG_MARVELL_PHY=m
# CONFIG_MARVELL_10G_PHY is not set
CONFIG_MARVELL_10G_PHY=m
CONFIG_MICREL_PHY=m
CONFIG_MICROCHIP_PHY=m
# CONFIG_MICROSEMI_PHY is not set
@@ -2490,6 +2493,8 @@
# CONFIG_SERIAL_RP2 is not set
# CONFIG_SERIAL_FSL_LPUART is not set
# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
CONFIG_SERIAL_MVEBU_UART=y
CONFIG_SERIAL_MVEBU_CONSOLE=y
# CONFIG_SERIAL_DEV_BUS is not set
CONFIG_HVC_DRIVER=y
# CONFIG_HVC_DCC is not set
@@ -2505,6 +2510,7 @@
CONFIG_IPMI_POWEROFF=m
CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_TIMERIOMEM=m
CONFIG_HW_RANDOM_OMAP=m
CONFIG_HW_RANDOM_VIRTIO=m
CONFIG_HW_RANDOM_HISI=y
# CONFIG_HW_RANDOM_MSM is not set
@@ -2608,10 +2614,13 @@
# CONFIG_I2C_DESIGNWARE_PCI is not set
# CONFIG_I2C_EMEV2 is not set
CONFIG_I2C_GPIO=m
CONFIG_I2C_MV64XXX=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_OCORES is not set
CONFIG_I2C_PCA_PLATFORM=m
CONFIG_I2C_PXA=m
# CONFIG_I2C_PXA_PCI is not set
CONFIG_I2C_PXA_SLAVE=y
CONFIG_I2C_QUP=y
# CONFIG_I2C_RK3X is not set
CONFIG_I2C_SIMTEC=m
@@ -2647,6 +2656,7 @@
# SPI Master Controller Drivers
#
# CONFIG_SPI_ALTERA is not set
CONFIG_SPI_ARMADA_3700=m
# CONFIG_SPI_AXI_SPI_ENGINE is not set
# CONFIG_SPI_BITBANG is not set
CONFIG_SPI_CADENCE=m
@@ -2654,6 +2664,7 @@
# CONFIG_SPI_GPIO is not set
# CONFIG_SPI_FSL_SPI is not set
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_ORION=m
CONFIG_SPI_PL022=m
# CONFIG_SPI_PXA2XX is not set
# CONFIG_SPI_PXA2XX_PCI is not set
@@ -2707,6 +2718,10 @@
# CONFIG_PINCTRL_MCP23S08 is not set
# CONFIG_PINCTRL_SINGLE is not set
# CONFIG_PINCTRL_SX150X is not set
CONFIG_PINCTRL_MVEBU=y
CONFIG_PINCTRL_ARMADA_AP806=y
CONFIG_PINCTRL_ARMADA_CP110=y
CONFIG_PINCTRL_ARMADA_37XX=y
CONFIG_PINCTRL_MSM=y
# CONFIG_PINCTRL_APQ8064 is not set
# CONFIG_PINCTRL_APQ8084 is not set
@@ -2742,6 +2757,7 @@
CONFIG_GPIO_GENERIC_PLATFORM=m
# CONFIG_GPIO_GRGPIO is not set
# CONFIG_GPIO_MOCKUP is not set
CONFIG_GPIO_MVEBU=y
CONFIG_GPIO_PL061=y
# CONFIG_GPIO_SYSCON is not set
# CONFIG_GPIO_THUNDERX is not set
@@ -3007,6 +3023,7 @@
# CONFIG_THERMAL_EMULATION is not set
CONFIG_HISI_THERMAL=m
# CONFIG_QORIQ_THERMAL is not set
CONFIG_ARMADA_THERMAL=m
#
# ACPI INT340X thermal drivers
@@ -3528,10 +3545,12 @@
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_PCI=y
CONFIG_USB_XHCI_PLATFORM=y
CONFIG_USB_XHCI_MVEBU=m
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
CONFIG_USB_EHCI_PCI=y
CONFIG_USB_EHCI_HCD_ORION=m
# CONFIG_USB_EHCI_MSM is not set
CONFIG_USB_EHCI_HCD_PLATFORM=m
# CONFIG_USB_OXU210HP_HCD is not set
@@ -3735,6 +3754,7 @@
# CONFIG_MMC_SDHCI_OF_ARASAN is not set
# CONFIG_MMC_SDHCI_OF_AT91 is not set
# CONFIG_MMC_SDHCI_CADENCE is not set
CONFIG_MMC_SDHCI_PXAV3=m
# CONFIG_MMC_SDHCI_F_SDH30 is not set
# CONFIG_MMC_SDHCI_MSM is not set
CONFIG_MMC_TIFM_SD=m
@@ -3981,6 +4001,8 @@
#
# CONFIG_RTC_DRV_PL030 is not set
CONFIG_RTC_DRV_PL031=y
CONFIG_RTC_DRV_MV=m
CONFIG_RTC_DRV_ARMADA38X=m
# CONFIG_RTC_DRV_FTRTC010 is not set
# CONFIG_RTC_DRV_SNVS is not set
# CONFIG_RTC_DRV_XGENE is not set
@@ -3996,6 +4018,7 @@
#
# DMA Devices
#
CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
CONFIG_DMA_ENGINE=y
CONFIG_DMA_ACPI=y
CONFIG_DMA_OF=y
@@ -4005,6 +4028,7 @@
# CONFIG_FSL_EDMA is not set
# CONFIG_INTEL_IDMA64 is not set
# CONFIG_K3_DMA is not set
CONFIG_MV_XOR=y
# CONFIG_MV_XOR_V2 is not set
# CONFIG_PL330_DMA is not set
# CONFIG_XGENE_DMA is not set
@@ -4022,6 +4046,7 @@
#
CONFIG_ASYNC_TX_DMA=y
# CONFIG_DMATEST is not set
CONFIG_DMA_ENGINE_RAID=y
#
# DMABUF options
@@ -4107,6 +4132,9 @@
CONFIG_COMMON_CLK_HI3798CV200=y
# CONFIG_COMMON_CLK_HI6220 is not set
CONFIG_RESET_HISI=y
CONFIG_ARMADA_37XX_CLK=y
CONFIG_ARMADA_AP806_SYSCON=y
CONFIG_ARMADA_CP110_SYSCON=y
# CONFIG_COMMON_CLK_QCOM is not set
CONFIG_HWSPINLOCK=m
# CONFIG_HWSPINLOCK_QCOM is not set
@@ -4234,6 +4262,10 @@
CONFIG_ARM_GIC_V3=y
CONFIG_ARM_GIC_V3_ITS=y
CONFIG_HISILICON_IRQ_MBIGEN=y
CONFIG_MVEBU_GICP=y
CONFIG_MVEBU_ICU=y
CONFIG_MVEBU_ODMI=y
CONFIG_MVEBU_PIC=y
CONFIG_PARTITION_PERCPU=y
CONFIG_QCOM_IRQ_COMBINER=y
# CONFIG_IPACK_BUS is not set
@@ -4266,6 +4298,7 @@
CONFIG_PHY_XGENE=y
# CONFIG_BCM_KONA_USB2_PHY is not set
CONFIG_PHY_HI6220_USB=m
CONFIG_PHY_MVEBU_CP110_COMPHY=m
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
# CONFIG_PHY_QCOM_APQ8064_SATA is not set
@@ -5090,6 +5123,7 @@
CONFIG_CRYPTO_USER_API_AEAD=y
CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_MARVELL_CESA=m
# CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
CONFIG_CRYPTO_DEV_CCP=y
CONFIG_CRYPTO_DEV_CCP_DD=m
@@ -5102,6 +5136,7 @@
# CONFIG_CRYPTO_DEV_QCE is not set
CONFIG_CRYPTO_DEV_CHELSIO=m
CONFIG_CRYPTO_DEV_VIRTIO=m
CONFIG_CRYPTO_DEV_SAFEXCEL=m
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
CONFIG_X509_CERTIFICATE_PARSER=y
SOURCES/x509.genkey
@@ -5,9 +5,9 @@
x509_extensions = myexts
[ req_distinguished_name ]
O = Red Hat
CN = Red Hat Enterprise Linux kernel signing key
emailAddress = secalert@redhat.com
O = CentOS
CN = CentOS Linux kernel signing key
emailAddress = security@centos.org
[ myexts ]
basicConstraints=critical,CA:FALSE
SPECS/kernel-alt.spec
@@ -322,6 +322,7 @@
BuildRequires: openssl openssl-devel
BuildRequires: hmaccalc
BuildRequires: python-devel, newt-devel, perl(ExtUtils::Embed)
BuildRequires: git
%ifarch x86_64
BuildRequires: pesign >= 0.109-4
%endif
@@ -360,16 +361,16 @@
%define modsign_cmd %{SOURCE10}
Source11: x509.genkey
%if %{?released_kernel}
Source13: securebootca.cer
Source14: secureboot.cer
%define pesign_name redhatsecureboot301
Source13: centos-ca-secureboot.der
Source14: centossecureboot001.crt
%define pesign_name centossecureboot001
%else
Source13: redhatsecurebootca2.cer
Source14: redhatsecureboot003.cer
%define pesign_name redhatsecureboot003
Source13: centos-ca-secureboot.der
Source14: centossecureboot001.crt
%define pesign_name centossecureboot001
%endif
Source15: rheldup3.x509
Source16: rhelkpatch1.x509
Source15: centos-ldup.x509
Source16: centos-kpatch.x509
Source18: check-kabi
@@ -401,6 +402,66 @@
# empty final patch to facilitate testing of kernel patches
Patch999999: linux-kernel-test.patch
#Marvell Patches
Patch8001: 0001-net-mvpp2-remove-useless-goto.patch
Patch8002: 0002-net-mvpp2-set-the-Rx-FIFO-size-depending-on-the-port.patch
Patch8003: 0003-net-mvpp2-initialize-the-Tx-FIFO-size.patch
Patch8004: 0004-net-mvpp2-initialize-the-RSS-tables.patch
Patch8005: 0005-net-mvpp2-limit-TSO-segments-and-use-stop-wake-thres.patch
Patch8006: 0006-net-mvpp2-use-the-aggr-txq-size-define-everywhere.patch
Patch8007: 0007-net-mvpp2-simplify-the-Tx-desc-set-DMA-logic.patch
Patch8008: 0008-net-mvpp2-add-ethtool-GOP-statistics.patch
Patch8009: 0009-net-mvpp2-fix-GOP-statistics-loop-start-and-stop-con.patch
Patch8010: 0010-net-mvpp2-fix-the-txq_init-error-path.patch
Patch8011: 0011-net-mvpp2-cleanup-probed-ports-in-the-probe-error-pa.patch
Patch8012: 0012-net-mvpp2-do-not-disable-GMAC-padding.patch
Patch8013: 0013-net-mvpp2-check-ethtool-sets-the-Tx-ring-size-is-to-.patch
Patch8014: 0014-net-mvpp2-allocate-zeroed-tx-descriptors.patch
Patch8015: 0015-net-mvpp2-fix-the-RSS-table-entry-offset.patch
Patch8016: 0016-net-mvpp2-only-free-the-TSO-header-buffers-when-it-w.patch
Patch8017: 0017-net-mvpp2-split-the-max-ring-size-from-the-default-o.patch
Patch8018: 0018-net-mvpp2-align-values-in-ethtool-get_coalesce.patch
Patch8019: 0019-net-mvpp2-report-the-tx-usec-coalescing-information-.patch
Patch8020: 0020-net-mvpp2-adjust-the-coalescing-parameters.patch
Patch8021: 0021-device-property-Introduce-fwnode_get_mac_address.patch
Patch8022: 0022-device-property-Introduce-fwnode_get_phy_mode.patch
Patch8023: 0023-device-property-Introduce-fwnode_irq_get.patch
Patch8024: 0024-device-property-Allow-iterating-over-available-child.patch
Patch8025: 0025-net-mvpp2-simplify-maintaining-enabled-ports-list.patch
Patch8026: 0026-net-mvpp2-use-device_-fwnode_-APIs-instead-of-of_.patch
Patch8027: 0027-net-mvpp2-enable-ACPI-support-in-the-driver.patch
Patch8028: 0028-mvpp2-fix-multicast-address-filter.patch
Patch8029: 0029-net-mvpp2-Add-hardware-offloading-for-VLAN-filtering.patch
Patch8030: 0030-net-mvpp2-use-the-same-buffer-pool-for-all-ports.patch
Patch8031: 0031-net-mvpp2-update-the-BM-buffer-free-destroy-logic.patch
Patch8032: 0032-net-mvpp2-use-a-data-size-of-10kB-for-Tx-FIFO-on-por.patch
Patch8033: 0033-net-mvpp2-enable-UDP-TCP-checksum-over-IPv6.patch
Patch8034: 0034-net-mvpp2-jumbo-frames-support.patch
Patch8035: 0035-net-mvpp2-mvpp2_check_hw_buf_num-can-be-static.patch
Patch8036: 0036-net-mvpp2-Simplify-MAC-filtering-function-parameters.patch
Patch8037: 0037-net-mvpp2-Add-support-for-unicast-filtering.patch
Patch8038: 0038-net-mvpp2-use-correct-index-on-array-mvpp2_pools.patch
Patch8039: 0039-net-mvpp2-Make-mvpp2_prs_hw_read-a-parser-entry-init.patch
Patch8040: 0040-net-mvpp2-Don-t-use-dynamic-allocs-for-local-variabl.patch
Patch8041: 0041-net-mvpp2-Use-relaxed-I-O-in-data-path.patch
Patch8042: 0042-net-mvpp2-Fix-parser-entry-init-boundary-check.patch
Patch8043: 0043-net-mvpp2-Fix-TCAM-filter-reserved-range.patch
Patch8044: 0044-net-mvpp2-Fix-DMA-address-mask-size.patch
Patch8045: 0045-net-mvpp2-Fix-clk-error-path-in-mvpp2_probe.patch
Patch8046: 0046-net-mvpp2-Fix-clock-resource-by-adding-missing-mg_co.patch
#Ampere patches
Patch9001: 0001-BACKPORT-arm64-cmpwait-Clear-event-register-before-a.patch
Patch9002: 0002-BACKPORT-arm64-barrier-Implement-smp_cond_load_relax.patch
Patch9003: 0003-BACKPORT-arm64-locking-Replace-ticket-lock-implement.patch
Patch9004: 0004-BACKPORT-arm64-kconfig-Ensure-spinlock-fastpaths-are.patch
Patch9005: 0005-BACKPORT-ahci-Disable-LPM-on-Lenovo-50-series-laptop.patch
Patch9006: 0006-BACKPORT-ACPI-bus-Introduce-acpi_get_match_data-func.patch
Patch9007: 0007-BACKPORT-ACPI-bus-Remove-checks-in-acpi_get_match_da.patch
Patch9008: 0008-BACKPORT-ACPI-bus-Rename-acpi_get_match_data-to-acpi.patch
Patch9009: 0009-BACKPORT-ata-Disable-AHCI-ALPM-feature-for-Ampere-Co.patch
Patch9010: 0010-BACKPORT-perf-xgene-Fix-IOB-SLOW-PMU-parser-error.patch
Patch9011: 0011-BACKPORT-iommu-enable-bypass-transaction-caching-for.patch
BuildRoot: %{_tmppath}/%{src_pkg_name}-%{KVRA}-root
@@ -722,6 +783,75 @@
# Any further pre-build tree manipulations happen here.
if [ ! -d .git ]; then
  git init
  git config user.email "noreply@centos.org"
  git config user.name "AltArch Kernel"
  git config gc.auto 0
  git add .
  git commit -a -q -m "baseline"
fi
#Altarch patches
git am %{PATCH8001}
git am %{PATCH8002}
git am %{PATCH8003}
git am %{PATCH8004}
git am %{PATCH8005}
git am %{PATCH8006}
git am %{PATCH8007}
git am %{PATCH8008}
git am %{PATCH8009}
git am %{PATCH8010}
git am %{PATCH8011}
git am %{PATCH8012}
git am %{PATCH8013}
git am %{PATCH8014}
git am %{PATCH8015}
git am %{PATCH8016}
git am %{PATCH8017}
git am %{PATCH8018}
git am %{PATCH8019}
git am %{PATCH8020}
git am %{PATCH8021}
git am %{PATCH8022}
git am %{PATCH8023}
git am %{PATCH8024}
git am %{PATCH8025}
git am %{PATCH8026}
git am %{PATCH8027}
git am %{PATCH8028}
git am %{PATCH8029}
git am %{PATCH8030}
git am %{PATCH8031}
git am %{PATCH8032}
git am %{PATCH8033}
git am %{PATCH8034}
git am %{PATCH8035}
git am %{PATCH8036}
git am %{PATCH8037}
git am %{PATCH8038}
git am %{PATCH8039}
git am %{PATCH8040}
git am %{PATCH8041}
git am %{PATCH8042}
git am %{PATCH8043}
git am %{PATCH8044}
git am %{PATCH8045}
git am %{PATCH8046}
git am %{PATCH9001}
#git am %{PATCH9002}
#git am %{PATCH9003}
git am %{PATCH9004}
git am %{PATCH9005}
git am %{PATCH9006}
git am %{PATCH9007}
git am %{PATCH9008}
git am %{PATCH9009}
git am %{PATCH9010}
git am %{PATCH9011}
chmod +x scripts/checkpatch.pl
# This Prevents scripts/setlocalversion from mucking with our version numbers.
@@ -758,12 +888,12 @@
# sure we create the file with certificates and copy key generation configuration
for i in *.config
do
  sed -i 's@CONFIG_SYSTEM_TRUSTED_KEYS=.*@CONFIG_SYSTEM_TRUSTED_KEYS="certs/rhel.pem"@' $i
  sed -i 's@CONFIG_SYSTEM_TRUSTED_KEYS=.*@CONFIG_SYSTEM_TRUSTED_KEYS="certs/centos.pem"@' $i
done
cp %{SOURCE11} ./certs # x509.genkey
openssl x509 -inform der -in %{_sourcedir}/rheldup3.x509 -out rheldup3.pem
openssl x509 -inform der -in %{_sourcedir}/rhelkpatch1.x509 -out rhelkpatch1.pem
cat rheldup3.pem rhelkpatch1.pem > ./certs/rhel.pem
openssl x509 -inform der -in %{_sourcedir}/centos-ldup.x509 -out centos-ldup.pem
openssl x509 -inform der -in %{_sourcedir}/centos-kpatch.x509 -out centos-kpatch.pem
cat centos-ldup.pem centos-kpatch.pem > ./certs/centos.pem
# now run oldconfig over all the config files
for i in *.config
@@ -1580,6 +1710,9 @@
%kernel_variant_files %{with_kdump} kdump
%changelog
* Fri Feb 01 2019 Johnny Hughes <johnny@centos.org> [4.14.0-115.5.1.el7a]
- Manual CentOS Debranding
* Tue Dec 18 2018 Augusto Caringi <acaringi@redhat.com> [4.14.0-115.5.1.el7a]
- [powerpc] kvm: book3s hv: Fix ppc_breakpoint_available compile error (Steve Best) [1649716]
- [powerpc] kvm: Fix guest boot failure on Power9 since DAWR changes (Steve Best) [1649716]