diff --git a/Makefile b/Makefile index 1155a8ce09951..28d8cbeb40ed9 100644 --- a/Makefile +++ b/Makefile @@ -499,9 +499,6 @@ LINUXINCLUDE := \ -I$(objtree)/include \ $(USERINCLUDE) -# UBUNTU: Include our third party driver stuff too -LINUXINCLUDE += -Iubuntu/include $(if $(KBUILD_SRC),-I$(srctree)/ubuntu/include) - KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE KBUILD_CFLAGS := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \ @@ -662,7 +659,7 @@ endif ifeq ($(KBUILD_EXTMOD),) # Objects we will link into vmlinux / subdirs we need to visit init-y := init/ -drivers-y := drivers/ sound/ ubuntu/ +drivers-y := drivers/ sound/ drivers-$(CONFIG_SAMPLES) += samples/ net-y := net/ libs-y := lib/ @@ -1258,7 +1255,6 @@ headers: $(version_h) scripts_unifdef uapi-asm-generic archheaders archscripts $(error Headers not exportable for the $(SRCARCH) architecture)) $(Q)$(MAKE) $(hdr-inst)=include/uapi $(Q)$(MAKE) $(hdr-inst)=arch/$(SRCARCH)/include/uapi - $(Q)$(MAKE) $(hdr-inst)=ubuntu/include dst=include oldheaders= # Deprecated. It is no-op now. PHONY += headers_check diff --git a/debian.azure/config/OVERRIDES b/debian.azure/config/OVERRIDES new file mode 100644 index 0000000000000..52486cc6a94f0 --- /dev/null +++ b/debian.azure/config/OVERRIDES @@ -0,0 +1,233 @@ +# +# Disable various "net" modules which we don't use. +# +CONFIG_6LOWPAN=n +CONFIG_6LOWPAN_NHC=n +CONFIG_BT=n +CONFIG_CAIF=n +CONFIG_HAMRADIO=n +CONFIG_IEEE802154=n +CONFIG_NET_9P=n +CONFIG_NET_DSA=n +CONFIG_NFC=n +CONFIG_RFKILL=n +CONFIG_WIMAX=n +CONFIG_WIRELESS=n + +# +# Disable various "drivers" modules which we don't use. +# +CONFIG_ACCESSIBILITY=n +CONFIG_ATA=n +CONFIG_ATM_DRIVERS=n +CONFIG_AUXDISPLAY=n +CONFIG_BCMA=n +CONFIG_CONNECTOR=n +CONFIG_CRYPTO_HW=n +CONFIG_DAX=n +CONFIG_EISA=n +CONFIG_EXTCON=n +CONFIG_FPGA=n +CONFIG_FSI=n +CONFIG_GNSS=n +CONFIG_GPIOLIB=n +CONFIG_GREYBUS=n +CONFIG_HSI=n +CONFIG_I3C=n +CONFIG_IDE=n +CONFIG_IIO=n +CONFIG_INFINIBAND=n +CONFIG_INTERCONNECT=n +CONFIG_IPACK_BUS=n +CONFIG_LIBNVDIMM=n +CONFIG_MAILBOX=n +CONFIG_MCB=n +CONFIG_MEDIA_SUPPORT=n +CONFIG_MEMSTICK=n +CONFIG_MMC=n +CONFIG_MTD=n +CONFIG_NEW_LEDS=n +CONFIG_NTB=n +CONFIG_NVM=n +CONFIG_NVMEM=n +CONFIG_OF=n +CONFIG_PARPORT=n +CONFIG_PARPORT_PANEL=n +CONFIG_PCCARD=n +CONFIG_PINCTRL=n +CONFIG_PMIC_OPREGION=n +CONFIG_PM_DEVFREQ=n +CONFIG_POWERCAP=n +CONFIG_PPS=n +CONFIG_RAPIDIO=n +CONFIG_REGULATOR=n +CONFIG_RESET_CONTROLLER=n +CONFIG_RTC_CLASS=n +CONFIG_SFI=n +CONFIG_SIOX=n +CONFIG_SLIMBUS=n +CONFIG_SOUNDWIRE=n +CONFIG_SPI=n +CONFIG_SPMI=n +CONFIG_STAGING=n +CONFIG_THERMAL=n +CONFIG_THUNDERBOLT=n +CONFIG_UIO=n +CONFIG_USB_SUPPORT=n +CONFIG_VFIO=n +CONFIG_W1=n + +# +# Disable various filesystem which we don't use. +# +CONFIG_9P_FS=n +CONFIG_ADFS_FS=n +CONFIG_AFFS_FS=n +CONFIG_AFS_FS=n +CONFIG_AUFS_FS=n +CONFIG_BEFS_FS=n +CONFIG_BFS_FS=n +CONFIG_BTRFS_FS=n +CONFIG_CEPH_FS=n +CONFIG_CODA_FS=n +CONFIG_ECRYPT_FS=n +CONFIG_EFS_FS=n +CONFIG_EROFS_FS=n +CONFIG_EXFAT_FS=n +CONFIG_EXT2_FS=n +CONFIG_EXT3_FS=n +CONFIG_F2FS_FS=n +CONFIG_FAT_FS=n +CONFIG_GFS2_FS=n +CONFIG_HFSPLUS_FS=n +CONFIG_HFS_FS=n +CONFIG_HPFS_FS=n +CONFIG_JFFS2_FS=n +CONFIG_JFS_FS=n +CONFIG_MINIX_FS=n +CONFIG_MSDOS_FS=n +CONFIG_NILFS2_FS=n +CONFIG_OCFS2_FS=n +CONFIG_OMFS_FS=n +CONFIG_ORANGEFS_FS=n +CONFIG_QNX4FS_FS=n +CONFIG_QNX6FS_FS=n +CONFIG_REISERFS_FS=n +CONFIG_REISERFS_FS=n +CONFIG_ROMFS_FS=n +CONFIG_SYSV_FS=n +CONFIG_UBIFS_FS=n +CONFIG_UDF_FS=n +CONFIG_UFS_FS=n +CONFIG_VFAT_FS=n +CONFIG_VXFS_FS=n +CONFIG_XFS_FS=n + +# +# Disable other misc. modules which we don't use. +# +CONFIG_AGP=n +CONFIG_ANDROID=n +CONFIG_AQUANTIA_PHY=n +CONFIG_ATALK=n +CONFIG_BATMAN_ADV=n +CONFIG_BCACHE=n +CONFIG_BE2ISCSI=n +CONFIG_BE2NET=n +CONFIG_BLK_DEV_PCIESSD_MTIP32XX=n +CONFIG_BLK_DEV_RSXX=n +CONFIG_BNA=n +CONFIG_BNX2=n +CONFIG_BNX2X=n +CONFIG_BNXT=n +CONFIG_BROADCOM_PHY=n +CONFIG_CASSINI=n +CONFIG_CDROM=n +CONFIG_CEPH_LIB=n +CONFIG_CIFS=n +CONFIG_CRAMFS=n +CONFIG_CYCLADES=n +CONFIG_DRM=n +CONFIG_ENIC=n +CONFIG_FM10K=n +CONFIG_FORCEDETH=n +CONFIG_GENWQE=n +CONFIG_GVE=n +CONFIG_HABANA_AI=n +CONFIG_HID=n +CONFIG_HIO=n +CONFIG_HWMON=n +CONFIG_IAVF=n +CONFIG_ICE=n +CONFIG_INFINIBAND=n +CONFIG_INTEL_IOATDMA=n +CONFIG_INTEL_MEI=n +CONFIG_IONIC=n +CONFIG_JME=n +CONFIG_KVM=n +CONFIG_LIBFC=n +CONFIG_LIQUIDIO=n +CONFIG_MEGARAID_LEGACY=n +CONFIG_MEGARAID_MAILBOX=n +CONFIG_MEGARAID_MM=n +CONFIG_MEGARAID_NEWGEN=n +CONFIG_MEGARAID_SAS=n +CONFIG_MFD_MADERA=n +CONFIG_MLX4_CORE=n +CONFIG_MLX4_INFINIBAND=n +CONFIG_MLX5_CORE=n +CONFIG_MLX5_INFINIBAND=n +CONFIG_MLXSW_SPECTRUM=n +CONFIG_MSCC_OCELOT_SWITCH=n +CONFIG_MWAVE=n +CONFIG_NETXEN_NIC=n +CONFIG_NET_TEAM=n +CONFIG_NET_VENDOR_AQUANTIA=n +CONFIG_NET_VENDOR_ATHEROS=n +CONFIG_NET_VENDOR_CAVIUM=n +CONFIG_NET_VENDOR_CHELSIO=n +CONFIG_NET_VENDOR_CHELSIO=n +CONFIG_NET_VENDOR_MARVELL=n +CONFIG_NET_VENDOR_MICREL=n +CONFIG_NET_VENDOR_MYRI=n +CONFIG_NET_VENDOR_NETERION=n +CONFIG_NET_VENDOR_ROCKER=n +CONFIG_NFC=n +CONFIG_NFP=n +CONFIG_NOZOMI=n +CONFIG_QED=n +CONFIG_QLCNIC=n +CONFIG_RDS=n +CONFIG_REALTEK_PHY=n +CONFIG_SCIF=n +CONFIG_SCSI_ADVANSYS=n +CONFIG_SCSI_AIC7XXX=n +CONFIG_SCSI_AIC94XX=n +CONFIG_SCSI_ARCMSR=n +CONFIG_SCSI_BFA_FC=n +CONFIG_SCSI_ESAS2R=n +CONFIG_SCSI_GDTH=n +CONFIG_SCSI_HPSA=n +CONFIG_SCSI_IPS=n +CONFIG_SCSI_LPFC=n +CONFIG_SCSI_MVSAS=n +CONFIG_SCSI_MYRB=n +CONFIG_SCSI_MYRS=n +CONFIG_SCSI_PM8001=n +CONFIG_SCSI_PMCRAID=n +CONFIG_SCSI_QLA_FC=n +CONFIG_SCSI_SMARTPQI=n +CONFIG_SCSI_SNIC=n +CONFIG_SCSI_SYM53C8XX_2=n +CONFIG_SCSI_UFSHCD=n +CONFIG_SENSORS_LM93=n +CONFIG_SFC=n +CONFIG_SOUND=n +CONFIG_SSB=n +CONFIG_STMMAC_ETH=n +CONFIG_SXGBE_ETH=n +CONFIG_SYNCLINK=n +CONFIG_SYNCLINK=n +CONFIG_USB=n +CONFIG_VBOXGUEST=n +CONFIG_VOP=n diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 747cc9992e7de..73d28f7729cdc 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -20,7 +20,7 @@ shlibdeps_opts = $(if $(CROSS_COMPILE),-- -l$(CROSS_COMPILE:%-=/usr/%)/lib) debian/scripts/fix-filenames: debian/scripts/fix-filenames.c $(CC) -o $@ $^ -$(stampdir)/stamp-prepare-%: config-prepare-check-% +$(stampdir)/stamp-prepare-%: $(stampdir)/stamp-prepare-tree-% @echo Debug: $@ @touch $@ $(stampdir)/stamp-prepare-tree-%: target_flavour = $* diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk index b99a1023fe5bd..b3aa4b71b2057 100644 --- a/debian/rules.d/4-checks.mk +++ b/debian/rules.d/4-checks.mk @@ -16,7 +16,7 @@ retpoline-check-%: install-% $(SHELL) $(DROOT)/scripts/retpoline-check "$*" \ "$(prev_abidir)" "$(abidir)" "$(skipretpoline)" "$(builddir)/build-$*" -checks-%: module-check-% abi-check-% retpoline-check-% +checks-%: abi-check-% retpoline-check-% @echo Debug: $@ # Check the config against the known options list.