commit e948107c363ab4a99852e1ef6d6601544283c9c8 Author: Arkadiusz Miśkiewicz <ar...@maven.pl> Date: Sun Oct 15 22:12:38 2023 +0200
Switch to maintained CIP 4.19 kernel (https://wiki.linuxfoundation.org/civilinfrastructureplatform/start) - cip103 kernel-multiarch.config | 45 ++++++++++++++++----------------------------- kernel.spec | 17 ++++++++++------- 2 files changed, 26 insertions(+), 36 deletions(-) --- diff --git a/kernel.spec b/kernel.spec index 28e8d581..bc4f22b0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -68,9 +68,10 @@ %define have_pcmcia 0 %endif -%define rel 1 +%define rel 2 %define basever 4.19 %define postver .295 +%define cipver cip103 # define this to '-%{basever}' for longterm branch %define versuffix -%{basever} @@ -120,9 +121,11 @@ Release: %{rel} Epoch: 3 License: GPL v2 Group: Base/Kernel -Source0: https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz -# Source0-md5: 740a90cf810c2105df8ee12e5d0bb900 -%if "%{postver}" != ".0" +# Source0: https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz +# https://wiki.linuxfoundation.org/civilinfrastructureplatform/start +Source0: https://www.kernel.org/pub/linux/kernel/projects/cip/4.19/linux-cip-%{basever}%{postver}-%{cipver}.tar.xz +# Source0-md5: 5d23dc75ee29c1f8081efdc2cbeccf6f +%if 0 && "%{postver}" != ".0" Patch0: https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz # Patch0-md5: 97959b550c97ae656f7e321cc0e4767e %endif @@ -343,7 +346,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %endif %define topdir %{_builddir}/%{name}-%{version} -%define srcdir %{topdir}/linux-%{basever} +%define srcdir %{topdir}/linux-cip-%{basever}%{postver}-%{cipver} %define objdir %{topdir}/%{targetobj} %define targetobj %{_target_base_arch}-gcc-%(%{__cc} -dumpversion) @@ -616,9 +619,9 @@ Pakiet zawiera dokumentację do jądra Linuksa pochodzącą z katalogu %setup -qc ln -s %{SOURCE7} kernel-module-build.pl ln -s %{SOURCE10} Makefile -cd linux-%{basever} +cd linux-cip-%{basever}%{postver}-%{cipver} -%if "%{postver}" != ".0" +%if 0 && "%{postver}" != ".0" %patch0 -p1 %endif diff --git a/kernel-multiarch.config b/kernel-multiarch.config index 938702e9..f602cd46 100644 --- a/kernel-multiarch.config +++ b/kernel-multiarch.config @@ -2069,6 +2069,7 @@ IIO_SW_DEVICE all=m IIO_SW_TRIGGER all=m #- file drivers/iio/accel/Kconfig goes here #- file drivers/iio/adc/Kconfig goes here +#- file drivers/iio/addac/Kconfig goes here #- file drivers/iio/afe/Kconfig goes here #- file drivers/iio/amplifiers/Kconfig goes here #- file drivers/iio/chemical/Kconfig goes here @@ -7314,7 +7315,6 @@ BLK_DEV_SD all=m CHR_DEV_ST all=m CHR_DEV_OSST all=m BLK_DEV_SR all=m -BLK_DEV_SR_VENDOR all=y CHR_DEV_SG all=m CHR_DEV_SCH all=m SCSI_ENCLOSURE all=m @@ -7724,7 +7724,6 @@ STAGING all=y #- file drivers/staging/mt7621-pinctrl/Kconfig goes here #- file drivers/staging/mt7621-spi/Kconfig goes here #- file drivers/staging/mt7621-dma/Kconfig goes here -#- file drivers/staging/mt7621-mmc/Kconfig goes here #- file drivers/staging/mt7621-eth/Kconfig goes here #- file drivers/staging/mt7621-dts/Kconfig goes here #- file drivers/staging/gasket/Kconfig goes here @@ -8130,13 +8129,6 @@ MOST_VIDEO all=m MTD_SPINAND_MT29F all=m MTD_SPINAND_ONDIEECC all=y -#- -#- *** FILE: drivers/staging/mt7621-mmc/Kconfig *** -#- -MTK_MMC all=m -MTK_AEE_KDUMP all=y -MTK_MMC_CD_POLL all=y - #- #- *** FILE: drivers/staging/pi433/Kconfig *** #- @@ -8761,7 +8753,6 @@ USB_EMI62 all=m USB_EMI26 all=m USB_ADUTUX all=m USB_SEVSEG all=m -USB_RIO500 all=m USB_LEGOTOWER all=m USB_LCD all=m USB_CYPRESS_CY7C63 all=m @@ -8917,6 +8908,7 @@ TYPEC_TCPCI all=m TYPEC_RT1711H all=m #- file drivers/usb/typec/fusb302/Kconfig goes here #- file drivers/usb/typec/ucsi/Kconfig goes here +TYPEC_HD3SS3220 all=m TYPEC_TPS6598X all=m #- file drivers/usb/typec/mux/Kconfig goes here #- file drivers/usb/typec/altmodes/Kconfig goes here @@ -9061,8 +9053,6 @@ BACKLIGHT_RAVE_SP all=m #- *** FILE: drivers/video/console/Kconfig *** #- VGA_CONSOLE all=y -VGACON_SOFT_SCROLLBACK all=n ia64=y -VGACON_SOFT_SCROLLBACK_SIZE ia64=64 MDA_CONSOLE alpha=m i386=m DUMMY_CONSOLE all=y DUMMY_CONSOLE_COLUMNS all=80 @@ -9198,10 +9188,10 @@ FB_MB862XX_I2C all=y FB_BROADSHEET all=m FB_HYPERV all=m FB_SIMPLE all=y +FB_SM712 all=m #- file drivers/video/fbdev/omap/Kconfig goes here #- file drivers/video/fbdev/omap2/Kconfig goes here #- file drivers/video/fbdev/mmp/Kconfig goes here -FB_SM712 all=m #- #- *** FILE: drivers/video/fbdev/geode/Kconfig *** @@ -10676,7 +10666,6 @@ BRIDGE_NETFILTER all=m #- file net/netfilter/Kconfig goes here #- file net/ipv4/netfilter/Kconfig goes here #- file net/ipv6/netfilter/Kconfig goes here -#- file net/decnet/netfilter/Kconfig goes here #- file net/bridge/netfilter/Kconfig goes here #- file net/bpfilter/Kconfig goes here #- file net/dccp/Kconfig goes here @@ -10689,7 +10678,6 @@ BRIDGE_NETFILTER all=m #- file net/bridge/Kconfig goes here #- file net/dsa/Kconfig goes here #- file net/8021q/Kconfig goes here -#- file net/decnet/Kconfig goes here #- file net/llc/Kconfig goes here #- file drivers/net/appletalk/Kconfig goes here #- file net/x25/Kconfig goes here @@ -10902,17 +10890,6 @@ IP_DCCP_CCID3 all=y IP_DCCP_CCID3_DEBUG all=n IP_DCCP_TFRC_LIB all=y -#- -#- *** FILE: net/decnet/Kconfig *** -#- -DECNET all=m -DECNET_ROUTER all=y - -#- -#- *** FILE: net/decnet/netfilter/Kconfig *** -#- -DECNET_NF_GRABULATOR all=m - #- #- *** FILE: net/dns_resolver/Kconfig *** #- @@ -11519,14 +11496,11 @@ DEFAULT_PFIFO_FAST all=y #- Classification NET_CLS all=y NET_CLS_BASIC all=m -NET_CLS_TCINDEX all=m NET_CLS_ROUTE4 all=m NET_CLS_FW all=m NET_CLS_U32 all=m CLS_U32_PERF all=y CLS_U32_MARK all=y -NET_CLS_RSVP all=m -NET_CLS_RSVP6 all=m NET_CLS_FLOW all=m NET_CLS_CGROUP all=y NET_CLS_BPF all=m @@ -12466,6 +12440,7 @@ ADE7759 all=m ADIS16060 all=m ALI_FIR all=m ASIX_PHY all=m +BLK_DEV_SR_VENDOR all=y BT_HCIBTUART all=m CIFS_SMB311 all=y CIFS_STATS all=n @@ -12475,6 +12450,9 @@ CRYPTO_SALSA20_586 all=m CRYPTO_SALSA20_X86_64 x86_64=m CRYPTO_SKEIN all=y CRYPTO_SPECK all=m +DECNET all=m +DECNET_NF_GRABULATOR all=m +DECNET_ROUTER all=y DONGLE all=y DRM_AMD_DC_FBC all=y DRM_AMD_DC_PRE_VEGA all=y @@ -12521,6 +12499,9 @@ MCS_FIR all=m MFD_CROS_EC_I2C all=m MFD_CROS_EC_SPI all=m MTD_GOLDFISH_NAND all=m +MTK_AEE_KDUMP all=y +MTK_MMC all=m +MTK_MMC_CD_POLL all=y NCPFS_EXTRAS all=y NCPFS_IOCTL_LOCKING all=y NCPFS_NFS_NS all=y @@ -12531,6 +12512,9 @@ NCPFS_SMALLDOS all=y NCPFS_STRONG all=y NCP_FS all=m NET_CADENCE all=y +NET_CLS_RSVP all=m +NET_CLS_RSVP6 all=m +NET_CLS_TCINDEX all=m NET_PACKET_ENGINE all=y NET_VENDOR_EXAR all=y NFT_BRIDGE_META all=m @@ -12574,6 +12558,9 @@ TSL2x7x all=m UDF_NLS all=y USB_CHIPIDEA_ULPI all=y USB_IRDA all=m +USB_RIO500 all=m +VGACON_SOFT_SCROLLBACK all=n ia64=y +VGACON_SOFT_SCROLLBACK_SIZE ia64=64 VIA_FIR all=m VIDEO_ATOMISP all=m VIDEO_ATOMISP_GC0310 all=m ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/e948107c363ab4a99852e1ef6d6601544283c9c8 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit